diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8400aa5c684..14f60b936f8 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -14,14 +14,22 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. * Format the commits in the following way: - `(pkg-name | service-name): (from -> to | init at version | refactor | etc)` + ``` + (pkg-name | service-name): (from -> to | init at version | refactor | etc) + + (Motivation for change. Additional information.) + ``` Examples: * nginx: init at 2.0.1 * firefox: 3.0 -> 3.1.1 * hydra service: add bazBaz option + + Dual baz behavior is needed to do foo. * nginx service: refactor config generation + + The old config generation system used impure shell scripts and could break in specific circumstances (see #1234). * `meta.description` should: * Be capitalized @@ -30,6 +38,12 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes). +## Writing good commit messages + +In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list archives, pull request discussions or upstream changes, it may require a lot of work. + +For package version upgrades and such a one-line commit message is usually sufficient. + ## Reviewing contributions See the nixpkgs manual for more details on how to [Review contributions](https://nixos.org/nixpkgs/manual/#sec-reviewing-contributions). diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index 4348dc8bf72..f89437af445 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -623,7 +623,7 @@ evaluate correctly. from bad to good: - Uses git:// which won't be proxied. + Bad: Uses git:// which won't be proxied. src = fetchgit { url = "git://github.com/NixOS/nix.git"; @@ -634,7 +634,7 @@ src = fetchgit { - This is ok, but an archive fetch will still be faster. + Better: This is ok, but an archive fetch will still be faster. src = fetchgit { url = "https://github.com/NixOS/nix.git"; @@ -645,7 +645,7 @@ src = fetchgit { - Fetches a snapshot archive and you get the rev you want. + Best: Fetches a snapshot archive and you get the rev you want. src = fetchFromGitHub { owner = "NixOS"; diff --git a/doc/configuration.xml b/doc/configuration.xml index caff1e510cd..12e3b8ae851 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -2,12 +2,12 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="chap-packageconfig"> -<filename>~/.nixpkgs/config.nix</filename>: global configuration +Global configuration Nix packages can be configured to allow or deny certain options. To apply the configuration edit -~/.nixpkgs/config.nix and set it like +~/.config/nixpkgs/config.nix and set it like { @@ -89,7 +89,7 @@ packages via packageOverrides You can define a function called packageOverrides in your local -~/.nixpkgs/config.nix to overide nix packages. It +~/.config/nixpkgs/config.nix to overide nix packages. It must be a function that takes pkgs as an argument and return modified set of packages. diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml new file mode 100644 index 00000000000..8e981a4318e --- /dev/null +++ b/doc/cross-compilation.xml @@ -0,0 +1,168 @@ + + +Cross-compilation + +
+ Introduction + + "Cross-compilation" means compiling a program on one machine for another type of machine. + For example, a typical use of cross compilation is to compile programs for embedded devices. + These devices often don't have the computing power and memory to compile their own programs. + One might think that cross-compilation is a fairly niche concern, but there are advantages to being rigorous about distinguishing build-time vs run-time environments even when one is developing and deploying on the same machine. + Nixpkgs is increasingly adopting this opinion in that packages should be written with cross-compilation in mind, and nixpkgs should evaluate in a similar way (by minimizing cross-compilation-specific special cases) whether or not one is cross-compiling. + + + + This chapter will be organized in three parts. + First, it will describe the basics of how to package software in a way that supports cross-compilation. + Second, it will describe how to use Nixpkgs when cross-compiling. + Third, it will describe the internal infrastructure supporting cross-compilation. + +
+ + + +
+ Packaging in a cross-friendly manner + +
+ Platform parameters + + The three GNU Autoconf platforms, build, host, and cross, are historically the result of much confusion. + clears this up somewhat but there is more to be said. + An important advice to get out the way is, unless you are packaging a compiler or other build tool, just worry about the build and host platforms. + Dealing with just two platforms usually better matches people's preconceptions, and in this case is completely correct. + + + In Nixpkgs, these three platforms are defined as attribute sets under the names buildPlatform, hostPlatform, and targetPlatform. + All are guaranteed to contain at least a platform field, which contains detailed information on the platform. + All three are always defined at the top level, so one can get at them just like a dependency in a function that is imported with callPackage: + { stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ... + + + These platforms should all have the same structure in all scenarios, but that is currently not the case. + When not cross-compiling, they will each contain a system field with a short 2-part, hyphen-separated summering string name for the platform. + But, when when cross compiling, hostPlatform and targetPlatform may instead contain config with a fuller 3- or 4-part string in the manner of LLVM. + We should have all 3 platforms always contain both, and maybe give config a better name while we are at it. + + + + buildPlatform + + The "build platform" is the platform on which a package is built. + Once someone has a built package, or pre-built binary package, the build platform should not matter and be safe to ignore. + + + + hostPlatform + + The "host platform" is the platform on which a package is run. + This is the simplest platform to understand, but also the one with the worst name. + + + + targetPlatform + + + The "target platform" is black sheep. + The other two intrinsically apply to all compiled software—or any build process with a notion of "build-time" followed by "run-time". + The target platform only applies to programming tools, and even then only is a good for for some of them. + Briefly, GCC, Binutils, GHC, and certain other tools are written in such a way such that a single build can only compiler code for a single platform. + Thus, when building them, one must think ahead about what platforms they wish to use the tool to produce machine code for, and build binaries for each. + + + There is no fundamental need to think about the target ahead of time like this. + LLVM, for example, was designed from the beginning with cross-compilation in mind, and so a normal LLVM binary will support every architecture that LLVM supports. + If the tool supports modular or pluggable backends, one might imagine specifying a set of target platforms / backends one wishes to support, rather than a single one. + + + The biggest reason for mess, if there is one, is that many compilers have the bad habit a build process that builds the compiler and standard library/runtime together. + Then the specifying target platform is essential, because it determines the host platform of the standard library/runtime. + Nixpkgs tries to avoid this where possible too, but still, because the concept of a target platform is so ingrained now in Autoconf and other tools, it is best to support it as is. + Tools like LLVM that don't need up-front target platforms can safely ignore it like normal packages, and it will do no harm. + + + + + + If you dig around nixpkgs, you may notice there is also stdenv.cross. + This field defined as hostPlatform when the host and build platforms differ, but otherwise not defined at all. + This field is obsolete and will soon disappear—please do not use it. + +
+ +
+ Specifying Dependencies + + As mentioned in the introduction to this chapter, one can think about a build time vs run time distinction whether cross-compiling or not. + In the case of cross-compilation, this corresponds with whether a derivation running on the native or foreign platform is produced. + An interesting thing to think about is how this corresponds with the three Autoconf platforms. + In the run-time case, the depending and depended-on package simply have matching build, host, and target platforms. + But in the build-time case, one can imagine "sliding" the platforms one over. + The depended-on package's host and target platforms (respectively) become the depending package's build and host platforms. + This is the most important guiding principle behind cross-compilation with Nixpkgs, and will be called the sliding window principle. + In this manner, given the 3 platforms for one package, we can determine the three platforms for all its transitive dependencies. + + + Some examples will probably make this clearer. + If a package is being built with a (build, host, target) platform triple of (foo, bar, bar), then its build-time dependencies would have a triple of (foo, foo, bar), and those packages' build-time dependencies would have triple of (foo, foo, foo). + In other words, it should take two "rounds" of following build-time dependency edges before one reaches a fixed point where, by the sliding window principle, the platform triple no longer changes. + Indeed, this happens with cross compilation, where only rounds of native dependencies starting with the second necessarily coincide with native packages. + + + The depending package's target platform is unconstrained by the sliding window principle, which makes sense in that one can in principle build cross compilers targeting arbitrary platforms. + + + How does this work in practice? Nixpkgs is now structured so that build-time dependencies are taken from 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 . + 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. + For now, feel free to use either method. + +
+ +
+ + + +
+ Cross-building packages + + More information needs to moved from the old wiki, especially , for this section. + + + Many sources (manual, wiki, etc) probably mention passing system, platform, and, optionally, crossSystem to nixpkgs: + import <nixpkgs> { system = ..; platform = ..; crossSystem = ..; }. + system and platform together determine the system on which packages are built, and crossSystem specifies the platform on which packages are ultimately intended to run, if it is different. + This still works, but with more recent changes, one can alternatively pass localSystem, containing system and platform, for symmetry. + + + One would think that localSystem and crossSystem overlap horribly with the three *Platforms (buildPlatform, hostPlatform, and targetPlatform; see stage.nix or the manual). + Actually, those identifiers are purposefully not used here to draw a subtle but important distinction: + While the granularity of having 3 platforms is necessary to properly *build* packages, it is overkill for specifying the user's *intent* when making a build plan or package set. + A simple "build vs deploy" dichotomy is adequate: the sliding window principle described in the previous section shows how to interpolate between the these two "end points" to get the 3 platform triple for each bootstrapping stage. + That means for any package a given package set, even those not bound on the top level but only reachable via dependencies or buildPackages, the three platforms will be defined as one of localSystem or crossSystem, with the former replacing the latter as one traverses build-time dependencies. + A last simple difference then is crossSystem should be null when one doesn't want to cross-compile, while the *Platforms are always non-null. + localSystem is always non-null. + +
+ + + +
+ Cross-compilation infrastructure + To be written. + + If one explores nixpkgs, they will see derivations with names like gccCross. + Such *Cross derivations is a holdover from before we properly distinguished between the host and target platforms + —the derivation with "Cross" in the name covered the build = host != target case, while the other covered the host = target, with build platform the same or not based on whether one was using its .nativeDrv or .crossDrv. + This ugliness will disappear soon. + +
+ + diff --git a/doc/default.nix b/doc/default.nix index 625c716b031..eaf3bb8d7a8 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -68,6 +68,10 @@ pkgs.stdenv.mkDerivation { inputFile = ../pkgs/development/r-modules/README.md; outputFile = "languages-frameworks/r.xml"; } + + toDocbook { + inputFile = ./languages-frameworks/vim.md; + outputFile = "./languages-frameworks/vim.xml"; + } + '' echo ${lib.nixpkgsVersion} > .version diff --git a/doc/functions.xml b/doc/functions.xml index 6374c15ddf2..5c654ffb956 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -119,7 +119,7 @@ evaluation-per-function application incurs a performance penalty, which can become a problem if many overrides are used. It is only intended for ad-hoc customisation, such as in - ~/.nixpkgs/config.nix. + ~/.config/nixpkgs/config.nix. diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index 6728f4abba0..6d898482174 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -195,7 +195,7 @@ its normal core packages: mtl-2.2.1 This function allows users to define their own development environment by means -of an override. After adding the following snippet to `~/.nixpkgs/config.nix`, +of an override. After adding the following snippet to `~/.config/nixpkgs/config.nix`, { packageOverrides = super: let self = super.pkgs; in @@ -522,7 +522,7 @@ file with `cabal2nix`: $ cd ~/src/foo && cabal2nix . >default.nix $ cd ~/src/bar && cabal2nix . >default.nix -Then edit your `~/.nixpkgs/config.nix` file to register those builds in the +Then edit your `~/.config/nixpkgs/config.nix` file to register those builds in the default Haskell package set: { @@ -554,7 +554,7 @@ 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 `~/.nixpkgs/config.nix` file: +following snippet in your `~/.config/nixpkgs/config.nix` file: { packageOverrides = super: let self = super.pkgs; in @@ -583,7 +583,7 @@ The first step is to generate Nix build instructions with `cabal2nix`: $ cabal2nix cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix -Then add the override in `~/.nixpkgs/config.nix`: +Then add the override in `~/.config/nixpkgs/config.nix`: { packageOverrides = super: let self = super.pkgs; in @@ -793,6 +793,64 @@ It's important to realize, however, that most system libraries in Nix are built as shared libraries only, i.e. there is just no static library available that Cabal could link! +### Building GHC with integer-simple + +By default GHC implements the Integer type using the +[GNU Multiple Precision Arithmetic (GMP) library](https://gmplib.org/). +The implementation can be found in the +[integer-gmp](http://hackage.haskell.org/package/integer-gmp) package. + +A potential problem with this is that GMP is licensed under the +[​GNU Lesser General Public License (LGPL)](http://www.gnu.org/copyleft/lesser.html), +a kind of "copyleft" license. According to the terms of the LGPL, paragraph 5, +you may distribute a program that is designed to be compiled and dynamically +linked with the library under the terms of your choice (i.e., commercially) but +if your program incorporates portions of the library, if it is linked +statically, then your program is a "derivative"--a "work based on the +library"--and according to paragraph 2, section c, you "must cause the whole of +the work to be licensed" under the terms of the LGPL (including for free). + +The LGPL licensing for GMP is a problem for the overall licensing of binary +programs compiled with GHC because most distributions (and builds) of GHC use +static libraries. (Dynamic libraries are currently distributed only for OS X.) +The LGPL licensing situation may be worse: even though +​[The Glasgow Haskell Compiler License](https://www.haskell.org/ghc/license) +is essentially a "free software" license (BSD3), according to +paragraph 2 of the LGPL, GHC must be distributed under the terms of the LGPL! + +To work around these problems GHC can be build with a slower but LGPL-free +alternative implemention for Integer called +[integer-simple](http://hackage.haskell.org/package/integer-simple). + +To get a GHC compiler build with `integer-simple` instead of `integer-gmp` use +the attribute: `pkgs.haskell.compiler.integer-simple."${ghcVersion}"`. +For example: + + $ nix-build -E '(import {}).pkgs.haskell.compiler.integer-simple.ghc802' + ... + $ result/bin/ghc-pkg list | grep integer + integer-simple-0.1.1.1 + +The following command displays the complete list of GHC compilers build with `integer-simple`: + + $ nix-env -f "" -qaP -A haskell.compiler.integer-simple + haskell.compiler.integer-simple.ghc7102 ghc-7.10.2 + haskell.compiler.integer-simple.ghc7103 ghc-7.10.3 + haskell.compiler.integer-simple.ghc722 ghc-7.2.2 + haskell.compiler.integer-simple.ghc742 ghc-7.4.2 + haskell.compiler.integer-simple.ghc763 ghc-7.6.3 + haskell.compiler.integer-simple.ghc783 ghc-7.8.3 + haskell.compiler.integer-simple.ghc784 ghc-7.8.4 + haskell.compiler.integer-simple.ghc801 ghc-8.0.1 + haskell.compiler.integer-simple.ghc802 ghc-8.0.2 + haskell.compiler.integer-simple.ghcHEAD ghc-8.1.20170106 + +To get a package set supporting `integer-simple` use the attribute: +`pkgs.haskell.packages.integer-simple."${ghcVersion}"`. For example +use the following to get the `scientific` package build with `integer-simple`: + + $ nix-build -A pkgs.haskell.packages.integer-simple.ghc802.scientific + ## Other resources diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 81352ec2a9a..32a89860ec8 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -28,6 +28,7 @@ such as Perl or Haskell. These are described in this chapter. + diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 3f5d500620b..83d47b6f43a 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -781,7 +781,7 @@ If you get the following error: could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc': Permission denied -This is a [known bug](https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix) in setuptools. +This is a [known bug](https://github.com/pypa/setuptools/issues/130) in setuptools. Setuptools `install_data` does not respect `--prefix`. An example of such package using the feature is `pkgs/tools/X11/xpra/default.nix`. As workaround install it as an extra `preInstall` step: diff --git a/doc/languages-frameworks/vim.md b/doc/languages-frameworks/vim.md new file mode 100644 index 00000000000..5442d706cb0 --- /dev/null +++ b/doc/languages-frameworks/vim.md @@ -0,0 +1,102 @@ +--- +title: User's Guide for Vim in Nixpkgs +author: Marc Weber +date: 2016-06-25 +--- +# User's Guide to Vim Plugins/Addons/Bundles/Scripts in Nixpkgs + +You'll get a vim(-your-suffix) in PATH also loading the plugins you want. +Loading can be deferred; see examples. + +VAM (=vim-addon-manager) and Pathogen plugin managers are supported. +Vundle, NeoBundle could be your turn. + +## dependencies by Vim plugins + +VAM introduced .json files supporting dependencies without versioning +assuming that "using latest version" is ok most of the time. + +## HOWTO + +First create a vim-scripts file having one plugin name per line. Example: + + "tlib" + {'name': 'vim-addon-sql'} + {'filetype_regex': '\%(vim)$', 'names': ['reload', 'vim-dev-plugin']} + +Such vim-scripts file can be read by VAM as well like this: + + call vam#Scripts(expand('~/.vim-scripts'), {}) + +Create a default.nix file: + + { nixpkgs ? import {}, compiler ? "ghc7102" }: + nixpkgs.vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; } + +Create a generate.vim file: + + ActivateAddons vim-addon-vim2nix + let vim_scripts = "vim-scripts" + call nix#ExportPluginsForNix({ + \ 'path_to_nixpkgs': eval('{"'.substitute(substitute(substitute($NIX_PATH, ':', ',', 'g'), '=',':', 'g'), '\([:,]\)', '"\1"',"g").'"}')["nixpkgs"], + \ 'cache_file': '/tmp/vim2nix-cache', + \ 'try_catch': 0, + \ 'plugin_dictionaries': ["vim-addon-manager"]+map(readfile(vim_scripts), 'eval(v:val)') + \ }) + +Then run + + nix-shell -p vimUtils.vim_with_vim2nix --command "vim -c 'source generate.vim'" + +You should get a Vim buffer with the nix derivations (output1) and vam.pluginDictionaries (output2). +You can add your vim to your system's configuration file like this and start it by "vim-my": + + my-vim = + let plugins = let inherit (vimUtils) buildVimPluginFrom2Nix; in { + copy paste output1 here + }; in vim_configurable.customize { + name = "vim-my"; + + vimrcConfig.vam.knownPlugins = plugins; # optional + vimrcConfig.vam.pluginDictionaries = [ + copy paste output2 here + ]; + + # Pathogen would be + # vimrcConfig.pathogen.knownPlugins = plugins; # plugins + # vimrcConfig.pathogen.pluginNames = ["tlib"]; + }; + + +Sample output1: + + "reload" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "reload"; + src = fetchgit { + url = "git://github.com/xolox/vim-reload"; + rev = "0a601a668727f5b675cb1ddc19f6861f3f7ab9e1"; + sha256 = "0vb832l9yxj919f5hfg6qj6bn9ni57gnjd3bj7zpq7d4iv2s4wdh"; + }; + dependencies = ["nim-misc"]; + + }; + [...] + +Sample output2: + + [ + ''vim-addon-manager'' + ''tlib'' + { "name" = ''vim-addon-sql''; } + { "filetype_regex" = ''\%(vim)$$''; "names" = [ ''reload'' ''vim-dev-plugin'' ]; } + ] + + +## Important repositories + +- [vim-pi](https://bitbucket.org/vimcommunity/vim-pi) is a plugin repository + from VAM plugin manager meant to be used by others as well used by + +- [vim2nix](http://github.com/MarcWeber/vim-addon-vim2nix) which generates the + .nix code + diff --git a/doc/manual.xml b/doc/manual.xml index 1c0dac6e4df..75bd21557fd 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -13,6 +13,7 @@ + diff --git a/doc/old/cross.txt b/doc/old/cross.txt index 82a69f6f379..73103ea0c6d 100644 --- a/doc/old/cross.txt +++ b/doc/old/cross.txt @@ -61,7 +61,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2; - md5 = "6a9d529efb285071dad10e1f3d2b2967"; + sha256 = "1ian3kwh2vg6hr3ymrv48s04gijs539vzrq62xr76bxbhbwnz2np"; }; inherit noSysDirs; configureFlags = "--target=arm-linux"; @@ -81,11 +81,11 @@ Step 2: build kernel headers for the target architecture assert stdenv.system == "i686-linux"; stdenv.mkDerivation { - name = "linux-headers-2.6.13.4-arm"; + name = "linux-headers-2.6.13.1-arm"; builder = ./builder.sh; src = fetchurl { - url = http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.4.tar.bz2; - md5 = "94768d7eef90a9d8174639b2a7d3f58d"; + url = http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.1.tar.bz2; + sha256 = "12qxmc827fjhaz53kjy7vyrzsaqcg78amiqsb3qm20z26w705lma"; }; } --- @@ -152,9 +152,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-4.0.2/gcc-core-4.0.2.tar.bz2; - md5 = "f7781398ada62ba255486673e6274b26"; - #url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-4.0.2/gcc-4.0.2.tar.bz2; - #md5 = "a659b8388cac9db2b13e056e574ceeb0"; + sha256 = "02fxh0asflm8825w23l2jq1wvs7hbnam0jayrivg7zdv2ifnc0rc"; }; # !!! apply only if noSysDirs is set patches = [./no-sys-dirs.patch ./gcc-inhibit.patch]; diff --git a/doc/overlays.xml b/doc/overlays.xml index cb54c33cf65..540c83e0a39 100644 --- a/doc/overlays.xml +++ b/doc/overlays.xml @@ -28,8 +28,8 @@ first one present is considered, and all the rest are ignored: - In the directory pointed by the environment variable - NIXPKGS_OVERLAYS. + In the directory pointed to by the Nix search path entry + <nixpkgs-overlays>. diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 0ba7ec4c44d..0f148f5c898 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -278,7 +278,7 @@ packageOverrides = pkgs: { to your Nixpkgs configuration - (~/.nixpkgs/config.nix) and install it by + (~/.config/nixpkgs/config.nix) and install it by running nix-env -f '<nixpkgs>' -iA myEclipse and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 44a0e4601fc..a2530e102ca 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -194,33 +194,52 @@ genericBuild tools. + + + + 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 - stdenv to set up the environment for the build. - 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. + + 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 propagatedBuildInputs = [X], and package Z has buildInputs = [Y], then package X will appear in Z’s build environment automatically. + + + propagatedBuildInputs - Like buildInputs, but these - dependencies are propagated: that is, the - dependencies listed here are added to the - buildInputs of any package that uses - this package as a dependency. So if package - Y has propagatedBuildInputs = [X], and package - Z has buildInputs = [Y], then package X will - appear in Z’s build environment automatically. + + 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. + - @@ -322,7 +341,7 @@ executed and in what order: $preInstallPhases installPhase fixupPhase $preDistPhases distPhase $postPhases. - + Usually, if you just want to add a few phases, it’s more convenient to set one of the variables below (such as preInstallPhases), as you then don’t specify @@ -706,7 +725,7 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") - + You can set flags for make through the makeFlags variable. @@ -773,7 +792,7 @@ doCheck = true; - + @@ -840,12 +859,12 @@ install phase. The default fixupPhase does the following: - + It moves the man/, doc/ and info/ subdirectories of $out to share/. - + It strips libraries and executables of debug information. @@ -1091,13 +1110,41 @@ functions. + + + makeWrapper + executable + wrapperfile + args + Constructs a wrapper for a program with various + possible arguments. For example: + + +# adds `FOOBAR=baz` to `$out/bin/foo`’s environment +makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz + +# prefixes the binary paths of `hello` and `git` +# Be advised that paths often should be patched in directly +# (via string replacements or in `configurePhase`). +makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello git ]} + + + There’s many more kinds of arguments, they are documented in + nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh. + + wrapProgram is a convenience function you probably + want to use most of the time. + + + + substitute infile outfile subs - + Performs string substitution on the contents of infile, writing the result to @@ -1125,7 +1172,7 @@ functions. @...@ in the template as placeholders. - + varName @@ -1134,7 +1181,7 @@ functions. @varName@ by the string s. - + @@ -1162,7 +1209,7 @@ substitute ./foo.in ./foo.out \ - + substituteInPlace @@ -1173,7 +1220,7 @@ substitute ./foo.in ./foo.out \ file. - + substituteAll infile @@ -1233,7 +1280,7 @@ echo @foo@ Strips the directory and hash part of a store path, outputting the name part to stdout. For example: - + # prints coreutils-8.24 stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24" @@ -1241,7 +1288,7 @@ stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24" If you wish to store the result in another variable, then the following idiom may be useful: - + name="/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24" someVar=$(stripHash $name) @@ -1249,8 +1296,24 @@ someVar=$(stripHash $name) - + + + wrapProgram + executable + makeWrapperArgs + Convenience function for makeWrapper + that automatically creates a sane wrapper file + + It takes all the same arguments as makeWrapper, + except for --argv0. + + It cannot be applied multiple times, since it will overwrite the wrapper + file. + + + + @@ -1607,4 +1670,3 @@ Arch Wiki. - diff --git a/lib/customisation.nix b/lib/customisation.nix index 3e6e279824b..bedb91af773 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -15,10 +15,10 @@ rec { the original derivation attributes. `overrideDerivation' allows certain "ad-hoc" customisation - scenarios (e.g. in ~/.nixpkgs/config.nix). For instance, if you - want to "patch" the derivation returned by a package function in - Nixpkgs to build another version than what the function itself - provides, you can do something like this: + scenarios (e.g. in ~/.config/nixpkgs/config.nix). For instance, + if you want to "patch" the derivation returned by a package + function in Nixpkgs to build another version than what the + function itself provides, you can do something like this: mySed = overrideDerivation pkgs.gnused (oldAttrs: { name = "sed-4.2.2-pre"; @@ -106,11 +106,9 @@ rec { let f = if builtins.isFunction fn then fn else import fn; auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs; - finalArgs = auto // args; - pkgs = f finalArgs; - mkAttrOverridable = name: pkg: pkg // { - override = newArgs: mkAttrOverridable name (f (finalArgs // newArgs)).${name}; - }; + origArgs = auto // args; + pkgs = f origArgs; + mkAttrOverridable = name: pkg: makeOverridable (newArgs: (f newArgs).${name}) origArgs; in lib.mapAttrs mkAttrOverridable pkgs; diff --git a/lib/licenses.nix b/lib/licenses.nix index e5784ce2202..4d4a3c1a954 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -191,6 +191,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { free = false; }; + eupl11 = spdx { + spdxId = "EUPL-1.1"; + fullname = "European Union Public License 1.1"; + }; + fdl12 = spdx { spdxId = "GFDL-1.2"; fullName = "GNU Free Documentation License v1.2"; @@ -374,6 +379,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Mozilla Public License 2.0"; }; + mspl = spdx { + spdxId = "MS-PL"; + fullName = "Microsoft Public License"; + }; + msrla = { fullName = "Microsoft Research License Agreement"; url = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 1e9a6fe0f0d..fba18ac75a7 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -20,6 +20,7 @@ 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 "; @@ -81,11 +82,13 @@ c0dehero = "CodeHero "; calrama = "Moritz Maxeiner "; campadrenalin = "Philip Horger "; + canndrew = "Andrew Cann "; carlsverre = "Carl Sverre "; cdepillabout = "Dennis Gosnell "; cfouche = "Chaddaï Fouché "; chaoflow = "Florian Friesdorf "; chattered = "Phil Scott "; + changlinli = "Changlin Li "; choochootrain = "Hurshal Patel "; chris-martin = "Chris Martin "; chrisjefferson = "Christopher Jefferson "; @@ -111,6 +114,7 @@ cwoac = "Oliver Matthews "; DamienCassou = "Damien Cassou "; danbst = "Danylo Hlynskyi "; + dancek = "Hannu Hartikainen "; danielfullmer = "Daniel Fullmer "; dasuxullebt = "Christoph-Simon Senjak "; davidak = "David Kleuker "; @@ -138,6 +142,7 @@ dtzWill = "Will Dietz "; e-user = "Alexander Kahl "; ebzzry = "Rommel Martinez "; + edanaher = "Evan Danaher "; ederoyd46 = "Matthew Brown "; eduarrrd = "Eduard Bachmakov "; edwtjo = "Edward Tjörnhammar "; @@ -227,6 +232,7 @@ joko = "Ioannis Koutras "; jonafato = "Jon Banafato "; jpbernardy = "Jean-Philippe Bernardy "; + jpierre03 = "Jean-Pierre PRUNARET "; jraygauthier = "Raymond Gauthier "; juliendehos = "Julien Dehos "; jwiegley = "John Wiegley "; @@ -244,6 +250,7 @@ koral = "Koral "; kovirobi = "Kovacsics Robert "; kragniz = "Louis Taylor "; + kristoff3r = "Kristoffer Søholm "; ktosiek = "Tomasz Kontusz "; lassulus = "Lassulus "; layus = "Guillaume Maudoux "; @@ -270,6 +277,7 @@ luispedro = "Luis Pedro Coelho "; lukego = "Luke Gorrie "; lw = "Sergey Sofeychuk "; + ma27 = "Maximilian Bosch "; madjar = "Georges Dubus "; magnetophon = "Bart Brouns "; mahe = "Matthias Herrmann "; @@ -290,12 +298,14 @@ mbbx6spp = "Susan Potter "; mbe = "Brandon Edens "; mboes = "Mathieu Boespflug "; + mbrgm = "Marius Bergmann "; mcmtroffaes = "Matthias C. M. Troffaes "; mdaiter = "Matthew S. Daiter "; meditans = "Carlo Nucera "; meisternu = "Matt Miemiec "; + metabar = "Celine Mercier "; mguentner = "Maximilian Güntner "; - mic92 = "Jörg Thalheim "; + mic92 = "Jörg Thalheim "; michaelpj = "Michael Peyton Jones "; michalrus = "Michal Rus "; michelk = "Michel Kuhlmann "; @@ -329,6 +339,7 @@ Nate-Devv = "Nathan Moore "; nathan-gs = "Nathan Bijnens "; nckx = "Tobias Geerinckx-Rice "; + ndowens = "Nathan Owens "; nequissimus = "Tim Steinbach "; nfjinjing = "Jinjing Wang "; nhooyr = "Anmol Sethi "; @@ -336,6 +347,7 @@ nico202 = "Nicolò Balzarotti "; NikolaMandic = "Ratko Mladic "; nixy = "Andrew R. M. "; + nocoolnametom = "Tom Doggett "; notthemessiah = "Brian Cohen "; np = "Nicolas Pouillard "; nslqqq = "Nikita Mikhailov "; @@ -349,12 +361,14 @@ olejorgenb = "Ole Jørgen Brønner "; orbekk = "KJ Ørbekk "; orbitz = "Malcolm Matalka "; + orivej = "Orivej Desh "; osener = "Ozan Sener "; otwieracz = "Slawomir Gonet "; oxij = "Jan Malakhovski "; paholg = "Paho Lurie-Gregg "; pakhfn = "Fedor Pakhomov "; palo = "Ingolf Wanger "; + paperdigits = "Mica Semrick "; pashev = "Igor Pashev "; pawelpacana = "Paweł Pacana "; periklis = "theopompos@gmail.com"; @@ -375,6 +389,7 @@ pmahoney = "Patrick Mahoney "; pmiddend = "Philipp Middendorf "; polyrod = "Maurizio Di Pietro "; + pradeepchhetri = "Pradeep Chhetri "; prikhi = "Pavan Rikhi "; primeos = "Michael Weiss "; profpatsch = "Profpatsch "; @@ -411,8 +426,10 @@ roblabla = "Robin Lambertz "; roconnor = "Russell O'Connor "; romildo = "José Romildo Malaquias "; + rongcuid = "Rongcui Dong "; ronny = "Ronny Pfannschmidt "; rszibele = "Richard Szibele "; + rtreffer = "Rene Treffer "; rushmorem = "Rushmore Mushambi "; rvl = "Rodney Lorrimar "; rvlander = "Gaëtan André "; @@ -453,6 +470,7 @@ SShrike = "Severen Redwood "; stephenmw = "Stephen Weinberg "; sternenseemann = "Lukas Epple "; + stesie = "Stefan Siegl "; steveej = "Stefan Junker "; swarren83 = "Shawn Warren "; swistak35 = "Rafał Łasocha "; @@ -477,7 +495,7 @@ travisbhartwell = "Travis B. Hartwell "; trino = "Hubert Mühlhans "; tstrobel = "Thomas Strobel <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>"; - ttuegel = "Thomas Tuegel "; + ttuegel = "Thomas Tuegel "; tv = "Tomislav Viljetić "; tvestelind = "Tomas Vestelind "; tvorog = "Marsel Zaripov "; @@ -492,6 +510,7 @@ vcunat = "Vladimír Čunát "; vdemeester = "Vincent Demeester "; veprbl = "Dmitry Kalinkin "; + vifino = "Adrian Pistol "; viric = "Lluís Batlle i Rossell "; vizanto = "Danny Wilson "; vklquevs = "vklquevs "; @@ -511,8 +530,10 @@ womfoo = "Kranium Gikos Mendoza "; wscott = "Wayne Scott "; wyvie = "Elijah Rum "; + xwvvvvwx = "David Terry "; yarr = "Dmitry V. "; yochai = "Yochai "; + yorickvp = "Yorick van Pelt "; yurrriq = "Eric Bailey "; z77z = "Marco Maggesi "; zagy = "Christian Zagrodnick "; diff --git a/lib/modules.nix b/lib/modules.nix index 256d49ba27d..4eee41306cd 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -326,7 +326,7 @@ rec { # Type-check the remaining definitions, and merge them. mergedValue = foldl' (res: def: if type.check def.value then res - else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.name}.") + else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.description}.") (type.merge loc defsFinal) defsFinal; isDefined = defsFinal != []; diff --git a/lib/platforms.nix b/lib/platforms.nix index b068d080e75..6b56e1734ad 100644 --- a/lib/platforms.nix +++ b/lib/platforms.nix @@ -15,10 +15,10 @@ rec { freebsd = ["i686-freebsd" "x86_64-freebsd"]; gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */ illumos = ["x86_64-solaris"]; - linux = ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "mips64el-linux"]; + linux = ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux"]; netbsd = ["i686-netbsd" "x86_64-netbsd"]; openbsd = ["i686-openbsd" "x86_64-openbsd"]; unix = linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; - mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux"]; + mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux"]; } diff --git a/lib/sources.nix b/lib/sources.nix index f41abe1e1ea..8f312a9db5c 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -26,6 +26,12 @@ rec { cleanSource = builtins.filterSource cleanSourceFilter; + # 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; # Get all files ending with the specified suffices from the given # directory or its descendants. E.g. `sourceFilesBySuffices ./dir diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 65de8e378c7..8b476a5d3dc 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -115,6 +115,11 @@ set -- config.enable ./declare-enable.nix ./define-enable.nix ./define-loaOfSub- checkConfigError 'The option .* defined in .* does not exist.' "$@" checkConfigOutput "true" "$@" ./define-module-check.nix +# Check coerced value. +checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix +checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix +checkConfigError 'The option value .* in .* is not a string or integer.' config.value ./declare-coerced-value.nix ./define-value-list.nix + cat < y then x else y; - /* Reads a JSON file. It is useful to import pure data into other nix - expressions. - - Example: - - mkDerivation { - src = fetchgit (importJSON ./repo.json) - #... - } - - where repo.json contains: - - { - "url": "git://some-domain/some/repo", - "rev": "265de7283488964f44f0257a8b4a055ad8af984d", - "sha256": "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h" - } - - */ + /* Reads a JSON file. */ importJSON = path: builtins.fromJSON (builtins.readFile path); diff --git a/lib/types.nix b/lib/types.nix index 9366d394da7..0d1a88a00f2 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -352,6 +352,28 @@ rec { functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; }; }; + coercedTo = coercedType: coerceFunc: finalType: + assert coercedType.getSubModules == null; + mkOptionType rec { + name = "coercedTo"; + description = "${finalType.description} or ${coercedType.description}"; + check = x: finalType.check x || coercedType.check x; + merge = loc: defs: + let + coerceVal = val: + if finalType.check val then val + else let + coerced = coerceFunc val; + in assert finalType.check coerced; coerced; + + in finalType.merge loc (map (def: def // { value = coerceVal def.value; }) defs); + getSubOptions = finalType.getSubOptions; + getSubModules = finalType.getSubModules; + substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m); + typeMerge = t1: t2: null; + functor = (defaultFunctor name) // { wrapped = finalType; }; + }; + # Obsolete alternative to configOf. It takes its option # declarations from the ‘options’ attribute of containing option # declaration. diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py new file mode 100755 index 00000000000..1b5df32c452 --- /dev/null +++ b/maintainers/scripts/hydra-eval-failures.py @@ -0,0 +1,89 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python -p pythonFull pythonPackages.requests pythonPackages.pyquery pythonPackages.click + +# To use, just execute this script with --help to display help. + +import subprocess +import json + +import click +import requests +from pyquery import PyQuery as pq + + +maintainers_json = subprocess.check_output([ + 'nix-instantiate', + 'lib/maintainers.nix', + '--eval', + '--json']) +maintainers = json.loads(maintainers_json) +MAINTAINERS = {v: k for k, v in maintainers.iteritems()} + + +def get_response_text(url): + return pq(requests.get(url).text) # IO + +EVAL_FILE = { + 'nixos': 'nixos/release.nix', + 'nixpkgs': 'pkgs/top-level/release.nix', +} + + +def get_maintainers(attr_name): + nixname = attr_name.split('.') + meta_json = subprocess.check_output([ + 'nix-instantiate', + '--eval', + '--strict', + '-A', + '.'.join(nixname[1:]) + '.meta', + EVAL_FILE[nixname[0]], + '--json']) + meta = json.loads(meta_json) + if meta.get('maintainers'): + return [MAINTAINERS[name] for name in meta['maintainers'] if MAINTAINERS.get(name)] + + +@click.command() +@click.option( + '--jobset', + default="nixos/release-16.09", + help='Hydra project like nixos/release-16.09') +def cli(jobset): + """ + Given a Hydra project, inspect latest evaluation + and print a summary of failed builds + """ + + url = "http://hydra.nixos.org/jobset/{}".format(jobset) + + # get the last evaluation + click.echo(click.style( + 'Getting latest evaluation for {}'.format(url), fg='green')) + d = get_response_text(url) + evaluations = d('#tabs-evaluations').find('a[class="row-link"]') + latest_eval_url = evaluations[0].get('href') + + # parse last evaluation page + click.echo(click.style( + 'Parsing evaluation {}'.format(latest_eval_url), fg='green')) + d = get_response_text(latest_eval_url + '?full=1') + + # TODO: aborted evaluations + # TODO: dependency failed without propagated builds + for tr in d('img[alt="Failed"]').parents('tr'): + a = pq(tr)('a')[1] + print "- [ ] [{}]({})".format(a.text, a.get('href')) + + maintainers = get_maintainers(a.text) + if maintainers: + print " - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers))) + # TODO: print last three persons that touched this file + # TODO: pinpoint the diff that broke this build, or maybe it's transient or maybe it never worked? + + +if __name__ == "__main__": + try: + cli() + except: + import pdb;pdb.post_mortem() diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 448e2a932e9..8677c13db40 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -21,6 +21,7 @@ effect after you run nixos-rebuild. + diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml index bf86926f9bf..6d9e0a164e9 100644 --- a/nixos/doc/manual/configuration/ipv6-config.xml +++ b/nixos/doc/manual/configuration/ipv6-config.xml @@ -22,5 +22,25 @@ boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; +As with IPv4 networking interfaces are automatically configured via +DHCPv6. You can configure an interface manually: + + +networking.interfaces.eth0.ip6 = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; + + + +For configuring a gateway, optionally with explicitly specified interface: + + +networking.defaultGateway6 = { + address = "fe00::1"; + interface = "enp0s3"; +} + + + +See for similar examples and additional information. + diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml index 2062456703f..00c795cd089 100644 --- a/nixos/doc/manual/configuration/luks-file-systems.xml +++ b/nixos/doc/manual/configuration/luks-file-systems.xml @@ -37,6 +37,10 @@ boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde- fileSystems."/".device = "/dev/mapper/crypted"; +Should grub be used as bootloader, and /boot is located +on an encrypted partition, it is necessary to add the following grub option: +boot.loader.grub.enableCryptodisk = true; + diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml index 59a4e3b33ba..30da064ac57 100644 --- a/nixos/doc/manual/configuration/modularity.xml +++ b/nixos/doc/manual/configuration/modularity.xml @@ -36,9 +36,8 @@ latter might look like this: { config, pkgs, ... }: { services.xserver.enable = true; - services.xserver.displayManager.kdm.enable = true; - services.xserver.desktopManager.kde4.enable = true; - environment.systemPackages = [ pkgs.kde4.kscreensaver ]; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.kde5.enable = true; } diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index 829e5b9ea84..2bd9cca5622 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -36,7 +36,10 @@ to set a password, which is retained across invocations of 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 account will cease to exist. Also, imperative commands for managing users -and groups, such as useradd, are no longer available. +and groups, such as useradd, are no longer available. Passwords may still be +assigned by setting the user's hashedPassword option. A +hashed password can be generated using mkpasswd -m sha-512 +after installing the mkpasswd package. A user ID (uid) is assigned automatically. You can also specify a uid manually by adding diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 3040839861c..93d10d19b20 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -25,7 +25,7 @@ Otherwise, you can only log into a plain undecorated xterm window. Thus you should pick one or more of the following lines: -services.xserver.desktopManager.kde4.enable = true; +services.xserver.desktopManager.kde5.enable = true; services.xserver.desktopManager.xfce.enable = true; services.xserver.windowManager.xmonad.enable = true; services.xserver.windowManager.twm.enable = true; @@ -35,9 +35,9 @@ services.xserver.windowManager.icewm.enable = true; NixOS’s default display manager (the program that provides a graphical login prompt and manages the X -server) is SLiM. You can select KDE’s kdm instead: +server) is SLiM. You can select KDE’s sddm instead: -services.xserver.displayManager.kdm.enable = true; +services.xserver.displayManager.sddm.enable = true; diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml new file mode 100644 index 00000000000..af6278e9c92 --- /dev/null +++ b/nixos/doc/manual/configuration/xfce.xml @@ -0,0 +1,105 @@ + + + Xfce Desktop Environment + + + To enable the Xfce Desktop Environment, set + + services.xserver.desktopManager = { + xfce.enable = true; + default = "xfce"; + }; + + + + + Optionally, compton + can be enabled for nice graphical effects, some example settings: + + services.compton = { + enable = true; + fade = true; + inactiveOpacity = "0.9"; + shadow = true; + fadeDelta = 4; + }; + + + + + Some Xfce programs are not installed automatically. + To install them manually (system wide), put them into your + environment.systemPackages. + + + + NixOS’s default display manageris 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 + + + To enable + Thunar + volume support, put + + services.xserver.desktopManager.xfce.enable = true; + + into your configuration.nix. + + + + + + Polkit Authentication Agent + + + There is no authentication agent automatically installed alongside + Xfce. To allow mounting of local (non-removable) filesystems, you + will need to install one. + + Installing polkit_gnome, a rebuild, logout and + login did the trick. + + + + + + Troubleshooting + + + Even after enabling udisks2, volume management might not work. + Thunar and/or the desktop takes time to show up. + + Thunar will spit out this kind of message on start + (look at journalctl --user -b). + + + Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported + + + This is caused by some needed GNOME services not running. + This is all fixed by enabling "Launch GNOME services on startup" in + the Advanced tab of the Session and Startup settings panel. + Alternatively, you can run this command to do the same thing. + + $ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true + + A log-out and re-log will be needed for this to take effect. + + + + + diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index ce432a7fa6c..d62d0896bb7 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -65,22 +65,22 @@ options = { -
Extensible Option +<section xml:id="sec-option-declarations-eot"><title>Extensible Option Types - Extensible option types is a feature that allow to extend certain types + Extensible option types is a feature that allow to extend certain types declaration through multiple module files. - This feature only work with a restricted set of types, namely + This feature only work with a restricted set of types, namely enum and submodules and any composed forms of them. - Extensible option types can be used for enum options - that affects multiple modules, or as an alternative to related + Extensible option types can be used for enum options + that affects multiple modules, or as an alternative to related enable options. As an example, we will take the case of display managers. There is a central display manager module for generic display manager options and a - module file per display manager backend (slim, kdm, gdm ...). + module file per display manager backend (slim, sddm, gdm ...). There are two approach to this module structure: @@ -96,7 +96,7 @@ options = { Both approachs have problems. - + Making backends independent can quickly become hard to manage. For display managers, there can be only one enabled at a time, but the type system can not enforce this restriction as there is no relation between @@ -108,18 +108,18 @@ options = { central module will require to change the central module option every time a new backend is added or removed. - By using extensible option types, it is possible to create a placeholder - option in the central module (), and to extend it in each backend module (, ). - + By using extensible option types, it is possible to create a placeholder + option in the central module (), and to extend it in each backend module (, ). + As a result, displayManager.enable option values can be added without changing the main service module file and the type system automatically enforce that there can only be a single display manager enabled. -Extensible type +<example xml:id='ex-option-declaration-eot-service'><title>Extensible type placeholder in the service module services.xserver.displayManager.enable = mkOption { @@ -127,29 +127,29 @@ services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ ]); }; -Extending - <literal>services.xserver.displayManager.enable</literal> in the +<example xml:id='ex-option-declaration-eot-backend-slim'><title>Extending + <literal>services.xserver.displayManager.enable</literal> in the <literal>slim</literal> module services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "slim" ]); }; -Extending - <literal>services.foo.backend</literal> in the <literal>kdm</literal> +<example xml:id='ex-option-declaration-eot-backend-sddm'><title>Extending + <literal>services.foo.backend</literal> in the <literal>sddm</literal> module services.xserver.displayManager.enable = mkOption { - type = with types; nullOr (enum [ "kdm" ]); + type = with types; nullOr (enum [ "sddm" ]); }; -The placeholder declaration is a standard mkOption - declaration, but it is important that extensible option declarations only use +The placeholder declaration is a standard mkOption + declaration, but it is important that extensible option declarations only use the type argument. -Extensible option types work with any of the composed variants of - enum such as - with types; nullOr (enum [ "foo" "bar" ]) +Extensible option types work with any of the composed variants of + enum such as + with types; nullOr (enum [ "foo" "bar" ]) or with types; listOf (enum [ "foo" "bar" ]).
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 04a186a1bca..8c37643c08f 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -37,6 +37,11 @@ first disable network-manager with systemctl stop network-manager. + If you would like to continue the installation from a different + machine you need to activate the SSH daemon via systemctl start sshd. + In order to be able to login you also need to set a password for + root using passwd. + The NixOS installer doesn’t do any partitioning or formatting yet, so you need to do that yourself. Use the following commands: diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 6be2cd3af7f..8f9694bad8b 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -15,6 +15,21 @@ has the following highlights: xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs manual for more information. + + + The setuid wrapper functionality now supports setting + capabilities. + + + + X.org server uses branch 1.19. Due to ABI incompatibilities, + ati_unfree keeps forcing 1.17 + and amdgpu-pro starts forcing 1.18. + + + + PHP now defaults to PHP 7.1 + The following new services were added since the last release: @@ -30,6 +45,15 @@ has the following highlights: following incompatible changes: + + + Cross compilation has been rewritten. See the nixpkgs manual for + details. The most obvious breaking change is that derivations absent a + .nativeDrv or .crossDrv are now + cross by default, not native. + + + stdenv.overrides is now expected to take self @@ -38,6 +62,15 @@ following incompatible changes: + + + ansible now defaults to ansible version 2 as version 1 + has been removed due to a serious + vulnerability unpatched by upstream. + + + gnome alias has been removed along with @@ -79,6 +112,15 @@ following incompatible changes: + + + Two lone top-level dict dbs moved into dictdDBs. This + affects: dictdWordnet which is now at + dictdDBs.wordnet and dictdWiktionary + which is now at dictdDBs.wiktionary + + + Parsoid service now uses YAML configuration format. @@ -100,7 +142,36 @@ following incompatible changes: + + service.nylon is now declared using named instances. + As an example: + + services.nylon = { + enable = true; + acceptInterface = "br0"; + bindInterface = "tun1"; + port = 5912; + }; + + + should be replaced with: + + + services.nylon.myvpn = { + enable = true; + acceptInterface = "br0"; + bindInterface = "tun1"; + port = 5912; + }; + + + this enables you to declare a SOCKS proxy for each uplink. + + + + + overridePackages function no longer exists. It is replaced by @@ -124,18 +195,52 @@ following incompatible changes: + + + + Autoloading connection tracking helpers is now disabled by default. + This default was also changed in the Linux kernel and is considered + insecure if not configured properly in your firewall. If you need + connection tracking helpers (i.e. for active FTP) please enable + networking.firewall.autoLoadConntrackHelpers and + tune networking.firewall.connectionTrackingModules + to suit your needs. + + + + + + local_recipient_maps is not set to empty value by + Postfix service. It's an insecure default as stated by Postfix + documentation. Those who want to retain this setting need to set it via + services.postfix.extraConfig. + + + Other notable improvements: + Module type system have a new extensible option types feature that allow to extend certain types, such as enum, through multiple option declarations of the same option across multiple modules. + + + + jre now defaults to GTK+ UI by default. This + improves visual consistency and makes Java follow system font style, + improving the situation on HighDPI displays. This has a cost of increased + closure size; for server and other headless workloads it's recommended to + use jre_headless. + + + diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 14c39e859bc..30664406b26 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -508,7 +508,7 @@ sub screenshot { sub getTTYText { my ($self, $tty) = @_; - my ($status, $out) = $self->execute("fold -w 80 /dev/vcs${tty}"); + my ($status, $out) = $self->execute("fold -w\$(stty -F /dev/tty${tty} size | awk '{print \$2}') /dev/vcs${tty}"); return $out; } @@ -607,7 +607,8 @@ sub waitForWindow { sub copyFileFromHost { my ($self, $from, $to) = @_; my $s = `cat $from` or die; - $self->mustSucceed("echo '$s' > $to"); # !!! escaping + $s =~ s/'/'\\''/g; + $self->mustSucceed("echo '$s' > $to"); } diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index d5cb4fce0f9..eee8db376c8 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -108,7 +108,7 @@ in { type = types.bool; default = false; description = '' - Whether to include the 32-bit pulseaudio libraries in the systemn or not. + Whether to include the 32-bit pulseaudio libraries in the system or not. This is only useful on 64-bit systems and currently limited to x86_64-linux. ''; }; diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 8147fed39d0..8a7b3ea0bfd 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -168,7 +168,7 @@ in ${cfg.extraInit} - # The setuid wrappers override other bin directories. + # The setuid/setcap wrappers override other bin directories. export PATH="${config.security.wrapperDir}:$PATH" # ~/bin if it exists overrides other bin directories. diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 5e38a988096..486fe7c1cd8 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -133,13 +133,10 @@ in ''; environment.sessionVariables.LD_LIBRARY_PATH = - [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ]; + [ "/run/opengl-driver/lib" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/lib"; - environment.extraInit = '' - export XDG_DATA_DIRS=$XDG_DATA_DIRS:/run/opengl-driver/share - '' + optionalString cfg.driSupport32Bit '' - export XDG_DATA_DIRS=$XDG_DATA_DIRS:/run/opengl-driver-32/share - ''; + environment.variables.XDG_DATA_DIRS = + [ "/run/opengl-driver/share" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/share"; hardware.opengl.package = mkDefault (makePackage pkgs); hardware.opengl.package32 = mkDefault (makePackage pkgs_i686); diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix index 979810abf90..5cc96d8bd07 100644 --- a/nixos/modules/hardware/video/amdgpu-pro.nix +++ b/nixos/modules/hardware/video/amdgpu-pro.nix @@ -21,6 +21,8 @@ in config = mkIf enabled { + nixpkgs.config.xorg.abiCompat = "1.18"; + services.xserver.drivers = singleton { name = "amdgpu"; modules = [ package ]; libPath = [ package ]; }; @@ -44,9 +46,6 @@ in "amd/amdrc".source = package + "/etc/amd/amdrc"; "amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb"; "gbm/gbm.conf".source = package + "/etc/gbm/gbm.conf"; - "OpenCL/vendors/amdocl64.icd".source = package + "/etc/OpenCL/vendors/amdocl64.icd"; - } // optionalAttrs opengl.driSupport32Bit { - "OpenCL/vendors/amdocl32.icd".source = package32 + "/etc/OpenCL/vendors/amdocl32.icd"; }; }; diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix index bf91bcf0776..022fdea0a0a 100644 --- a/nixos/modules/hardware/video/ati.nix +++ b/nixos/modules/hardware/video/ati.nix @@ -18,7 +18,7 @@ in config = mkIf enabled { - nixpkgs.config.xorg.fglrxCompat = true; + nixpkgs.config.xorg.abiCompat = "1.17"; services.xserver.drivers = singleton { name = "fglrx"; modules = [ ati_x11 ]; libPath = [ "${ati_x11}/lib" ]; }; diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index 3ce97ad31c2..3967137fcf8 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -76,8 +76,8 @@ in config = mkIf cfg.enable { boot.blacklistedKernelModules = [ "nvidia-drm" "nvidia" "nouveau" ]; - boot.kernelModules = optional useBbswitch [ "bbswitch" ]; - boot.extraModulePackages = optional useBbswitch kernel.bbswitch ++ optional useNvidia kernel.nvidia_x11; + boot.kernelModules = optional useBbswitch "bbswitch"; + boot.extraModulePackages = optional useBbswitch kernel.bbswitch ++ optional useNvidia kernel.nvidia_x11.bin; environment.systemPackages = [ bumblebee primus ]; diff --git a/nixos/modules/hardware/video/capture/mwprocapture.nix b/nixos/modules/hardware/video/capture/mwprocapture.nix new file mode 100644 index 00000000000..aee15dcec6e --- /dev/null +++ b/nixos/modules/hardware/video/capture/mwprocapture.nix @@ -0,0 +1,61 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.hardware.mwProCapture; + + kernelPackages = config.boot.kernelPackages; + +in + +{ + + options.hardware.mwProCapture.enable = mkEnableOption "Magewell Pro Capture family kernel module"; + + config = mkIf cfg.enable { + + assertions = singleton { + assertion = versionAtLeast kernelPackages.kernel.version "3.2"; + message = "Magewell Pro Capture family module is not supported for kernels older than 3.2"; + }; + + boot.kernelModules = [ "ProCapture" ]; + + environment.systemPackages = [ kernelPackages.mwprocapture ]; + + boot.extraModulePackages = [ kernelPackages.mwprocapture ]; + + boot.extraModprobeConfig = '' + # Set the png picture to be displayed when no input signal is detected. + options ProCapture nosignal_file=${kernelPackages.mwprocapture}/res/NoSignal.png + + # Set the png picture to be displayed when an unsupported input signal is detected. + options ProCapture unsupported_file=${kernelPackages.mwprocapture}/res/Unsupported.png + + # Set the png picture to be displayed when an loking input signal is detected. + options ProCapture locking_file=${kernelPackages.mwprocapture}/res/Locking.png + + # Message signaled interrupts switch + #options ProCapture disable_msi=0 + + # Set the debug level + #options ProCapture debug_level=0 + + # Force init switch eeprom + #options ProCapture init_switch_eeprom=0 + + # Min frame interval for VIDIOC_ENUM_FRAMEINTERVALS (default: 166666(100ns)) + #options ProCapture enum_frameinterval_min=166666 + + # VIDIOC_ENUM_FRAMESIZES type (1: DISCRETE; 2: STEPWISE; otherwise: CONTINUOUS ) + #options ProCapture enum_framesizes_type=0 + + # Parameters for internal usage + #options ProCapture internal_params="" + ''; + + }; + +} diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 8514f765e61..161ed9457af 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -27,6 +27,13 @@ let nvidia_x11 = nvidiaForKernel config.boot.kernelPackages; nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; }; + nvidiaPackage = nvidia: pkgs: + if !nvidia.useGLVND then nvidia + else pkgs.buildEnv { + name = "nvidia-libs"; + paths = [ pkgs.libglvnd nvidia.out ]; + }; + enabled = nvidia_x11 != null; in @@ -35,19 +42,23 @@ in config = mkIf enabled { services.xserver.drivers = singleton - { name = "nvidia"; modules = [ nvidia_x11 ]; libPath = [ nvidia_x11 ]; }; + { name = "nvidia"; modules = [ nvidia_x11.bin ]; libPath = [ nvidia_x11 ]; }; services.xserver.screenSection = '' Option "RandRRotation" "on" ''; - hardware.opengl.package = nvidia_x11; - hardware.opengl.package32 = nvidia_libs32; + environment.etc."nvidia/nvidia-application-profiles-rc" = mkIf nvidia_x11.useProfiles { + source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc"; + }; - environment.systemPackages = [ nvidia_x11 ]; + hardware.opengl.package = nvidiaPackage nvidia_x11 pkgs; + hardware.opengl.package32 = nvidiaPackage nvidia_libs32 pkgs_i686; - boot.extraModulePackages = [ nvidia_x11 ]; + environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings nvidia_x11.persistenced ]; + + boot.extraModulePackages = [ nvidia_x11.bin ]; # nvidia-uvm is required by CUDA applications. boot.kernelModules = [ "nvidia-uvm" ]; @@ -62,8 +73,6 @@ in services.acpid.enable = true; - environment.etc."OpenCL/vendors/nvidia.icd".source = "${nvidia_x11}/lib/vendors/nvidia.icd"; - }; } diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index 3eaf9e2ab37..a5bbe6bcb55 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -44,7 +44,7 @@ in panel = mkOption { type = with types; nullOr path; default = null; - example = literalExample "${pkgs.kde5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel"; + example = literalExample "''${pkgs.kde5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel"; description = "Replace the IBus panel with another panel."; }; }; diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix new file mode 100644 index 00000000000..c769bc80a48 --- /dev/null +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -0,0 +1,61 @@ +# To build, use: +# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-aarch64.nix -A config.system.build.sdImage +{ config, lib, pkgs, ... }: + +let + extlinux-conf-builder = + import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { + inherit pkgs; + }; +in +{ + imports = [ + ../../profiles/minimal.nix + ../../profiles/installation-device.nix + ./sd-image.nix + ]; + + assertions = lib.singleton { + assertion = pkgs.stdenv.system == "aarch64-linux"; + message = "sd-image-aarch64.nix can be only built natively on Aarch64 / ARM64; " + + "it cannot be cross compiled"; + }; + + # Needed by RPi firmware + nixpkgs.config.allowUnfree = true; + + boot.loader.grub.enable = false; + boot.loader.generic-extlinux-compatible.enable = true; + + boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelParams = ["console=ttyS0,115200n8" "console=tty0"]; + boot.consoleLogLevel = 7; + + # FIXME: this probably should be in installation-device.nix + users.extraUsers.root.initialHashedPassword = ""; + + sdImage = { + populateBootCommands = let + # Contains a couple of fixes for booting a Linux kernel, will hopefully appear upstream soon. + patchedUboot = pkgs.ubootRaspberryPi3_64bit.overrideAttrs (oldAttrs: { + src = pkgs.fetchFromGitHub { + owner = "dezgeg"; + repo = "u-boot"; + rev = "baab53ec244fe44def01948a0f10e67342d401e6"; + sha256 = "0r5j2pc42ws3w3im0a9c6bh01czz5kapqrqp0ik9ra823cw73lxr"; + }; + }); + + configTxt = pkgs.writeText "config.txt" '' + kernel=u-boot-rpi3.bin + arm_control=0x200 + enable_uart=1 + ''; + in '' + (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/) + cp ${patchedUboot}/u-boot.bin boot/u-boot-rpi3.bin + cp ${configTxt} boot/config.txt + ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./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 456ef7c9f54..0b858746ff0 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -1,3 +1,5 @@ +# To build, use: +# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix -A config.system.build.sdImage { config, lib, pkgs, ... }: let @@ -42,11 +44,9 @@ in enable_uart=1 ''; in '' - for f in bootcode.bin fixup.dat start.elf; do - cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/ - done + (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/) cp ${pkgs.ubootRaspberryPi2}/u-boot.bin boot/u-boot-rpi2.bin - cp ${pkgs.ubootRaspberryPi3}/u-boot.bin boot/u-boot-rpi3.bin + cp ${pkgs.ubootRaspberryPi3_32bit}/u-boot.bin boot/u-boot-rpi3.bin cp ${configTxt} boot/config.txt ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot ''; diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index e7163f10a3c..886ffd9a092 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -1,3 +1,5 @@ +# To build, use: +# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix -A config.system.build.sdImage { config, lib, pkgs, ... }: let @@ -32,9 +34,7 @@ in sdImage = { populateBootCommands = '' - for f in bootcode.bin fixup.dat start.elf; do - cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/ - done + (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/) cp ${pkgs.ubootRaspberryPi}/u-boot.bin boot/u-boot-rpi.bin echo 'kernel u-boot-rpi.bin' > boot/config.txt ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot diff --git a/nixos/modules/installer/scan/detected.nix b/nixos/modules/installer/scan/detected.nix index f350cd986af..e72c7853294 100644 --- a/nixos/modules/installer/scan/detected.nix +++ b/nixos/modules/installer/scan/detected.nix @@ -1,4 +1,4 @@ -# List all devices which are detected by nixos-hardware-scan. +# List all devices which are detected by nixos-generate-config. # Common devices are enabled by default. { config, lib, pkgs, ... }: diff --git a/nixos/modules/installer/scan/not-detected.nix b/nixos/modules/installer/scan/not-detected.nix index b30c569ed2a..e1a3052ba95 100644 --- a/nixos/modules/installer/scan/not-detected.nix +++ b/nixos/modules/installer/scan/not-detected.nix @@ -1,4 +1,4 @@ -# List all devices which are _not_ detected by nixos-hardware-scan. +# List all devices which are _not_ detected by nixos-generate-config. # Common devices are enabled by default. { config, lib, pkgs, ... }: diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index e17c02d1374..b72db1f6f50 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -208,9 +208,6 @@ foreach my $path (glob "/sys/bus/pci/devices/*") { pciCheck $path; } -push @attrs, "services.xserver.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver; - - # Idem for USB devices. sub usbCheck { @@ -277,6 +274,12 @@ if ($virt eq "qemu" || $virt eq "kvm" || $virt eq "bochs") { push @imports, ""; } +# Also for Hyper-V. +if ($virt eq "microsoft") { + push @initrdAvailableKernelModules, "hv_storvsc"; + $videoDriver = "fbdev"; +} + # Pull in NixOS configuration for containers. if ($virt eq "systemd-nspawn") { @@ -307,6 +310,7 @@ sub findStableDevPath { return $dev; } +push @attrs, "services.xserver.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver; # Generate the swapDevices option from the currently activated swap # devices. @@ -343,7 +347,6 @@ foreach my $fs (read_file("/proc/self/mountinfo")) { # Skip special filesystems. next if in($mountPoint, "/proc") || in($mountPoint, "/dev") || in($mountPoint, "/sys") || in($mountPoint, "/run") || $mountPoint eq "/var/lib/nfs/rpc_pipefs"; - next if $mountPoint eq "/var/setuid-wrappers"; # Skip the optional fields. my $n = 6; $n++ while $fields[$n] ne "-"; $n++; @@ -588,6 +591,12 @@ $bootLoaderConfig # Enable the OpenSSH daemon. # services.openssh.enable = true; + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + # Enable CUPS to print documents. # services.printing.enable = true; @@ -597,8 +606,8 @@ $bootLoaderConfig # services.xserver.xkbOptions = "eurosign:e"; # Enable the KDE Desktop Environment. - # services.xserver.displayManager.kdm.enable = true; - # services.xserver.desktopManager.kde4.enable = true; + # services.xserver.displayManager.sddm.enable = true; + # services.xserver.desktopManager.kde5.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. # users.extraUsers.guest = { diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index da28c027c56..57bc249360e 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -259,9 +259,9 @@ chroot $mountPoint /nix/var/nix/profiles/system/activate # Ask the user to set a root password. -if [ -z "$noRootPasswd" ] && chroot $mountPoint [ -x /var/setuid-wrappers/passwd ] && [ -t 0 ]; then +if [ -z "$noRootPasswd" ] && chroot $mountPoint [ -x /run/wrappers/bin/passwd ] && [ -t 0 ]; then echo "setting root password..." - chroot $mountPoint /var/setuid-wrappers/passwd + chroot $mountPoint /run/wrappers/bin/passwd fi diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 8e55a4f525f..4f73865dad6 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -15,6 +15,7 @@ origArgs=("$@") extraBuildFlags=() action= buildNix=1 +fast= rollback= upgrade= repair= @@ -52,13 +53,13 @@ while [ "$#" -gt 0 ]; do repair=1 extraBuildFlags+=("$i") ;; - --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q) - extraBuildFlags+=("$i") - ;; --max-jobs|-j|--cores|-I) j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; + --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*) + extraBuildFlags+=("$i") + ;; --option) j="$1"; shift 1 k="$1"; shift 1 @@ -66,6 +67,7 @@ while [ "$#" -gt 0 ]; do ;; --fast) buildNix= + fast=1 extraBuildFlags+=(--show-trace) ;; --profile-name|-p) @@ -217,7 +219,7 @@ if [ -z "$_NIXOS_REBUILD_REEXEC" ]; then fi # Re-execute nixos-rebuild from the Nixpkgs tree. -if [ -z "$_NIXOS_REBUILD_REEXEC" -a -n "$canRun" ]; then +if [ -z "$_NIXOS_REBUILD_REEXEC" -a -n "$canRun" -a -z "$fast" ]; then if p=$(nix-build --no-out-link --expr 'with import {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then export _NIXOS_REBUILD_REEXEC=1 exec $p/bin/nixos-rebuild "${origArgs[@]}" diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 5058d41bf75..d51b29b99da 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -64,7 +64,7 @@ cups = 36; foldingathome = 37; sabnzbd = 38; - kdm = 39; + #kdm = 39; # dropped in 17.03 ghostone = 40; git = 41; fourstore = 42; @@ -206,7 +206,7 @@ ripple-data-api = 186; mediatomb = 187; rdnssd = 188; - ihaskell = 189; + # ihaskell = 189; # unused i2p = 190; lambdabot = 191; asterisk = 192; @@ -284,6 +284,10 @@ glance = 266; couchpotato = 267; gogs = 268; + pdns-recursor = 269; + kresd = 270; + rpc = 271; + geoip = 272; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -330,7 +334,7 @@ #cups = 36; # unused #foldingathome = 37; # unused #sabnzd = 38; # unused - #kdm = 39; # unused + #kdm = 39; # unused, even before 17.03 ghostone = 40; git = 41; fourstore = 42; @@ -467,7 +471,7 @@ #ripple-data-api = 186; #unused mediatomb = 187; #rdnssd = 188; # unused - ihaskell = 189; + # ihaskell = 189; # unused i2p = 190; lambdabot = 191; asterisk = 192; @@ -538,6 +542,9 @@ glance = 266; couchpotato = 267; gogs = 268; + kresd = 270; + #rpc = 271; # unused + #geoip = 272; # unused # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 3cb5bb1a351..089f354f611 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -4,10 +4,12 @@ with lib; let cfg = config.services.locate; + isMLocate = hasPrefix "mlocate" cfg.locate.name; + isFindutils = hasPrefix "findutils" cfg.locate.name; in { - options.services.locate = { + options.services.locate = with types; { enable = mkOption { - type = types.bool; + type = bool; default = false; description = '' If enabled, NixOS will periodically update the database of @@ -16,8 +18,9 @@ in { }; locate = mkOption { - type = types.package; + type = package; default = pkgs.findutils; + defaultText = "pkgs.findutils"; example = "pkgs.mlocate"; description = '' The locate implementation to use @@ -25,7 +28,7 @@ in { }; interval = mkOption { - type = types.str; + type = str; default = "02:15"; example = "hourly"; description = '' @@ -38,11 +41,8 @@ in { ''; }; - # This is no longer supported, but we keep it to give a better warning below - period = mkOption { visible = false; }; - extraFlags = mkOption { - type = types.listOf types.str; + type = listOf str; default = [ ]; description = '' Extra flags to pass to updatedb. @@ -50,7 +50,7 @@ in { }; output = mkOption { - type = types.path; + type = path; default = "/var/cache/locatedb"; description = '' The database file to build. @@ -58,7 +58,7 @@ in { }; localuser = mkOption { - type = types.str; + type = nullOr str; default = "nobody"; description = '' The user to search non-network directories as, using @@ -66,31 +66,82 @@ in { ''; }; - includeStore = mkOption { - type = types.bool; - default = false; + pruneFS = mkOption { + type = listOf str; + default = ["afs" "anon_inodefs" "auto" "autofs" "bdev" "binfmt" "binfmt_misc" "cgroup" "cifs" "coda" "configfs" "cramfs" "cpuset" "debugfs" "devfs" "devpts" "devtmpfs" "ecryptfs" "eventpollfs" "exofs" "futexfs" "ftpfs" "fuse" "fusectl" "gfs" "gfs2" "hostfs" "hugetlbfs" "inotifyfs" "iso9660" "jffs2" "lustre" "misc" "mqueue" "ncpfs" "nnpfs" "ocfs" "ocfs2" "pipefs" "proc" "ramfs" "rpc_pipefs" "securityfs" "selinuxfs" "sfs" "shfs" "smbfs" "sockfs" "spufs" "nfs" "NFS" "nfs4" "nfsd" "sshfs" "subfs" "supermount" "sysfs" "tmpfs" "ubifs" "udf" "usbfs" "vboxsf" "vperfctrfs" ]; description = '' - Whether to include /nix/store in the locate database. + Which filesystem types to exclude from indexing ''; }; + + prunePaths = mkOption { + type = listOf path; + default = ["/tmp" "/var/tmp" "/var/cache" "/var/lock" "/var/run" "/var/spool" "/nix/store"]; + description = '' + Which paths to exclude from indexing + ''; + }; + + pruneNames = mkOption { + type = listOf str; + default = []; + description = '' + Directory components which should exclude paths containing them from indexing + ''; + }; + + pruneBindMounts = mkOption { + type = bool; + default = false; + description = '' + Whether not to index bind mounts + ''; + }; + }; - config = { - warnings = - let opt = options.services.locate.period; in - optional opt.isDefined "The ‘services.locate.period’ option in ${showFiles opt.files} has been removed; please replace it with ‘services.locate.interval’, using the systemd.time(7) calendar event format."; + config = mkIf cfg.enable { + users.extraGroups = mkIf isMLocate { mlocate = {}; }; + security.wrappers = mkIf isMLocate { + mlocate = { + group = "mlocate"; + owner = "root"; + permissions = "u+rx,g+x,o+x"; + setgid = true; + setuid = false; + program = "locate"; + }; + }; + + nixpkgs.config = { locate.dbfile = cfg.output; }; + + environment.systemPackages = [ cfg.locate ]; + + environment.variables = mkIf (!isMLocate) + { LOCATE_PATH = cfg.output; + }; + + warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support searching as user other than root" + ++ optional (isFindutils && cfg.pruneNames != []) "findutils locate does not support pruning by directory component" + ++ optional (isFindutils && cfg.pruneBindMounts) "findutils locate does not support skipping bind mounts"; + systemd.services.update-locatedb = { description = "Update Locate Database"; - path = [ pkgs.su ]; + path = mkIf (!isMLocate) [ pkgs.su ]; script = '' - mkdir -m 0755 -p $(dirname ${toString cfg.output}) + install -m ${if isMLocate then "0750" else "0755"} -o root -g ${if isMLocate then "mlocate" else "root"} -d $(dirname ${cfg.output}) exec ${cfg.locate}/bin/updatedb \ - --localuser=${cfg.localuser} \ - ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \ + ${optionalString (cfg.localuser != null) ''--localuser=${cfg.localuser}''} \ --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} ''; + environment = { + PRUNEFS = concatStringsSep " " cfg.pruneFS; + PRUNEPATHS = concatStringsSep " " cfg.prunePaths; + PRUNENAMES = concatStringsSep " " cfg.pruneNames; + PRUNE_BIND_MOUNTS = if cfg.pruneBindMounts then "yes" else "no"; + }; serviceConfig.Nice = 19; serviceConfig.IOSchedulingClass = "idle"; serviceConfig.PrivateTmp = "yes"; @@ -100,7 +151,7 @@ in { serviceConfig.ReadWriteDirectories = dirOf cfg.output; }; - systemd.timers.update-locatedb = mkIf cfg.enable + systemd.timers.update-locatedb = { description = "Update timer for locate database"; partOf = [ "update-locatedb.service" ]; wantedBy = [ "timers.target" ]; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 7451888484f..b8824e6374b 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -45,9 +45,8 @@ let in { - options = { - - nixpkgs.config = mkOption { + options.nixpkgs = { + config = mkOption { default = {}; example = literalExample '' @@ -61,7 +60,7 @@ in ''; }; - nixpkgs.overlays = mkOption { + overlays = mkOption { default = []; example = literalExample '' @@ -85,7 +84,7 @@ in ''; }; - nixpkgs.system = mkOption { + system = mkOption { type = types.str; example = "i686-linux"; description = '' @@ -95,14 +94,9 @@ in multi-platform deployment, or when building virtual machines. ''; }; - }; config = { - _module.args.pkgs = import ../../.. { - system = config.nixpkgs.system; - - inherit (config.nixpkgs) config; - }; + _module.args.pkgs = import ../../.. config.nixpkgs; }; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e99e344b932..5cd60e1b9d7 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -41,6 +41,7 @@ ./hardware/video/amdgpu.nix ./hardware/video/amdgpu-pro.nix ./hardware/video/ati.nix + ./hardware/video/capture/mwprocapture.nix ./hardware/video/bumblebee.nix ./hardware/video/displaylink.nix ./hardware/video/nvidia.nix @@ -80,6 +81,7 @@ ./programs/light.nix ./programs/man.nix ./programs/mosh.nix + ./programs/mtr.nix ./programs/nano.nix ./programs/oblogout.nix ./programs/screen.nix @@ -113,7 +115,7 @@ ./security/prey.nix ./security/rngd.nix ./security/rtkit.nix - ./security/setuid-wrappers.nix + ./security/wrappers/default.nix ./security/sudo.nix ./services/amqp/activemq/default.nix ./services/amqp/rabbitmq.nix @@ -141,6 +143,7 @@ ./services/computing/torque/mom.nix ./services/computing/slurm/slurm.nix ./services/continuous-integration/buildbot/master.nix + ./services/continuous-integration/buildbot/worker.nix ./services/continuous-integration/buildkite-agent.nix ./services/continuous-integration/hydra/default.nix ./services/continuous-integration/gitlab-runner.nix @@ -197,6 +200,7 @@ ./services/hardware/bluetooth.nix ./services/hardware/brltty.nix ./services/hardware/freefall.nix + ./services/hardware/illum.nix ./services/hardware/irqbalance.nix ./services/hardware/nvidia-optimus.nix ./services/hardware/pcscd.nix @@ -205,6 +209,7 @@ ./services/hardware/tcsd.nix ./services/hardware/tlp.nix ./services/hardware/thinkfan.nix + ./services/hardware/trezord.nix ./services/hardware/udev.nix ./services/hardware/udisks2.nix ./services/hardware/upower.nix @@ -212,6 +217,7 @@ ./services/logging/awstats.nix ./services/logging/fluentd.nix ./services/logging/graylog.nix + ./services/logging/journalbeat.nix ./services/logging/klogd.nix ./services/logging/logcheck.nix ./services/logging/logrotate.nix @@ -255,12 +261,13 @@ ./services/misc/felix.nix ./services/misc/folding-at-home.nix ./services/misc/gammu-smsd.nix + ./services/misc/geoip-updater.nix #./services/misc/gitit.nix ./services/misc/gitlab.nix ./services/misc/gitolite.nix ./services/misc/gogs.nix ./services/misc/gpsd.nix - ./services/misc/ihaskell.nix + #./services/misc/ihaskell.nix ./services/misc/leaps.nix ./services/misc/mantisbt.nix ./services/misc/mathics.nix @@ -289,6 +296,7 @@ ./services/misc/siproxd.nix ./services/misc/sonarr.nix ./services/misc/spice-vdagentd.nix + ./services/misc/ssm-agent.nix ./services/misc/sssd.nix ./services/misc/subsonic.nix ./services/misc/sundtek.nix @@ -327,15 +335,18 @@ ./services/monitoring/scollector.nix ./services/monitoring/smartd.nix ./services/monitoring/statsd.nix + ./services/monitoring/sysstat.nix ./services/monitoring/systemhealth.nix ./services/monitoring/teamviewer.nix ./services/monitoring/telegraf.nix ./services/monitoring/ups.nix ./services/monitoring/uptime.nix + ./services/monitoring/vnstat.nix ./services/monitoring/zabbix-agent.nix ./services/monitoring/zabbix-server.nix ./services/network-filesystems/cachefilesd.nix ./services/network-filesystems/drbd.nix + ./services/network-filesystems/glusterfs.nix ./services/network-filesystems/ipfs.nix ./services/network-filesystems/netatalk.nix ./services/network-filesystems/nfsd.nix @@ -370,6 +381,7 @@ ./services/networking/dhcpd.nix ./services/networking/dnschain.nix ./services/networking/dnscrypt-proxy.nix + ./services/networking/dnscrypt-wrapper.nix ./services/networking/dnsmasq.nix ./services/networking/ejabberd.nix ./services/networking/fan.nix @@ -396,6 +408,7 @@ ./services/networking/iodine.nix ./services/networking/ircd-hybrid/default.nix ./services/networking/kippo.nix + ./services/networking/kresd.nix ./services/networking/lambdabot.nix ./services/networking/libreswan.nix ./services/networking/logmein-hamachi.nix @@ -426,6 +439,7 @@ ./services/networking/pdnsd.nix ./services/networking/polipo.nix ./services/networking/powerdns.nix + ./services/networking/pdns-recursor.nix ./services/networking/pptpd.nix ./services/networking/prayer.nix ./services/networking/privoxy.nix @@ -436,6 +450,7 @@ ./services/networking/radicale.nix ./services/networking/radvd.nix ./services/networking/rdnssd.nix + ./services/networking/redsocks.nix ./services/networking/rpcbind.nix ./services/networking/sabnzbd.nix ./services/networking/searx.nix @@ -492,7 +507,8 @@ ./services/security/frandom.nix ./services/security/haka.nix ./services/security/haveged.nix - ./services/security/hologram.nix + ./services/security/hologram-server.nix + ./services/security/hologram-agent.nix ./services/security/munge.nix ./services/security/oauth2_proxy.nix ./services/security/physlock.nix @@ -516,6 +532,7 @@ ./services/web-apps/atlassian/confluence.nix ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix + ./services/web-apps/frab.nix ./services/web-apps/mattermost.nix ./services/web-apps/nixbot.nix ./services/web-apps/pump.io.nix @@ -546,7 +563,6 @@ ./services/x11/display-managers/auto.nix ./services/x11/display-managers/default.nix ./services/x11/display-managers/gdm.nix - ./services/x11/display-managers/kdm.nix ./services/x11/display-managers/lightdm.nix ./services/x11/display-managers/sddm.nix ./services/x11/display-managers/slim.nix @@ -632,6 +648,7 @@ ./virtualisation/container-config.nix ./virtualisation/containers.nix ./virtualisation/docker.nix + ./virtualisation/ecs-agent.nix ./virtualisation/libvirtd.nix ./virtualisation/lxc.nix ./virtualisation/lxcfs.nix diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 99b45228ce4..6b4d8c737eb 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -42,6 +42,9 @@ # Virtio (QEMU, KVM etc.) support. "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console" + # Hyper-V support. + "hv_storvsc" + # Keyboards "usbhid" "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat" ]; diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix index 8ee1628f876..73dd2d4bc9f 100644 --- a/nixos/modules/profiles/graphical.nix +++ b/nixos/modules/profiles/graphical.nix @@ -6,8 +6,8 @@ { services.xserver = { enable = true; - displayManager.kdm.enable = true; - desktopManager.kde4.enable = true; + displayManager.sddm.enable = true; + desktopManager.kde5.enable = true; synaptics.enable = true; # for touchpad support on many laptops }; diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index b2973d88b15..a24fa75e01d 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -45,8 +45,13 @@ with lib; "Type `systemctl start display-manager' to\nstart the graphical user interface."} ''; - # Allow sshd to be started manually through "start sshd". - services.openssh.enable = true; + # Allow sshd to be started manually through "systemctl start sshd". + services.openssh = { + enable = true; + # Allow password login to the installation, if the user sets a password via "passwd" + # It is safe as root doesn't have a password by default and SSH is disabled by default + permitRootLogin = "yes"; + }; systemd.services.sshd.wantedBy = mkOverride 50 []; # Enable wpa_supplicant, but don't start it by default. @@ -66,9 +71,8 @@ with lib; boot.kernel.sysctl."vm.overcommit_memory" = "1"; # To speed up installation a little bit, include the complete - # stdenv in the Nix store on the CD. Archive::Cpio is needed for - # the initrd builder. - system.extraDependencies = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio ]; + # stdenv in the Nix store on the CD. + system.extraDependencies = with pkgs; [ stdenv stdenvNoCC busybox ]; # 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/programs/environment.nix b/nixos/modules/programs/environment.nix index a35b5cc9513..a1615c920c0 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -17,8 +17,7 @@ in config = { environment.variables = - { LOCATE_PATH = "/var/cache/locatedb"; - NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix"; + { NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix"; PAGER = mkDefault "less -R"; EDITOR = mkDefault "nano"; }; diff --git a/nixos/modules/programs/kbdlight.nix b/nixos/modules/programs/kbdlight.nix index 0172368e968..58e45872fac 100644 --- a/nixos/modules/programs/kbdlight.nix +++ b/nixos/modules/programs/kbdlight.nix @@ -11,6 +11,6 @@ in config = mkIf cfg.enable { environment.systemPackages = [ pkgs.kbdlight ]; - security.setuidPrograms = [ "kbdlight" ]; + security.wrappers.kbdlight.source = "${pkgs.kbdlight.out}/bin/kbdlight"; }; } diff --git a/nixos/modules/programs/light.nix b/nixos/modules/programs/light.nix index 09cd1113d9c..6f8c389acc9 100644 --- a/nixos/modules/programs/light.nix +++ b/nixos/modules/programs/light.nix @@ -21,6 +21,6 @@ in config = mkIf cfg.enable { environment.systemPackages = [ pkgs.light ]; - security.setuidPrograms = [ "light" ]; + security.wrappers.light.source = "${pkgs.light.out}/bin/light"; }; } diff --git a/nixos/modules/programs/man.nix b/nixos/modules/programs/man.nix index e59ffd6f936..5b20a38d885 100644 --- a/nixos/modules/programs/man.nix +++ b/nixos/modules/programs/man.nix @@ -11,6 +11,7 @@ with lib; default = true; description = '' Whether to enable manual pages and the man command. + This also includes "man" outputs of all systemPackages. ''; }; diff --git a/nixos/modules/programs/mtr.nix b/nixos/modules/programs/mtr.nix new file mode 100644 index 00000000000..927fe68be87 --- /dev/null +++ b/nixos/modules/programs/mtr.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.mtr; +in { + options = { + programs.mtr = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to add mtr to the global environment and configure a + setcap wrapper for it. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + security.wrappers.mtr = { + source = "${pkgs.mtr}/bin/mtr"; + capabilities = "cap_net_raw+p"; + }; + }; +} diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index ce4d46e19bf..0f3f42901ba 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -101,11 +101,15 @@ in chpasswd = { rootOK = true; }; }; - security.setuidPrograms = [ "su" "chfn" ] - ++ [ "newuidmap" "newgidmap" ] # new in shadow 4.2.x - ++ lib.optionals config.users.mutableUsers - [ "passwd" "sg" "newgrp" ]; - + security.wrappers = { + su.source = "${pkgs.shadow.su}/bin/su"; + chfn.source = "${pkgs.shadow.out}/bin/chfn"; + 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/rename.nix b/nixos/modules/rename.nix index ad1ba86980d..ee68f8bff81 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -10,7 +10,6 @@ with lib; (mkRenamedOptionModule [ "fonts" "enableFontConfig" ] [ "fonts" "fontconfig" "enable" ]) (mkRenamedOptionModule [ "fonts" "extraFonts" ] [ "fonts" "fonts" ]) - (mkRenamedOptionModule [ "security" "extraSetuidPrograms" ] [ "security" "setuidPrograms" ]) (mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ]) (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ]) @@ -18,6 +17,7 @@ with lib; (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ]) + (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ]) (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ]) (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ]) (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ]) @@ -32,6 +32,9 @@ with lib; (mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ]) + (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead") + (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead") + # Old Grub-related options. (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ]) (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ]) @@ -167,6 +170,14 @@ with lib; # dhcpd (mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ]) + # locate + (mkRenamedOptionModule [ "services" "locate" "period" ] [ "services" "locate" "interval" ]) + (mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths" ) + + # nfs + (mkRenamedOptionModule [ "services" "nfs" "lockdPort" ] [ "services" "nfs" "server" "lockdPort" ]) + (mkRenamedOptionModule [ "services" "nfs" "statdPort" ] [ "services" "nfs" "server" "statdPort" ]) + # Options that are obsolete and have no replacement. (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") (mkRemovedOptionModule [ "programs" "bash" "enable" ] "") diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 726e5471141..78bd09441f8 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -129,7 +129,7 @@ in certs = mkOption { default = { }; - type = with types; loaOf (submodule certOpts); + type = with types; attrsOf (submodule certOpts); description = '' Attribute set of certificates to get signed and renewed. ''; @@ -284,6 +284,8 @@ in OnCalendar = cfg.renewInterval; Unit = "acme-${cert}.service"; Persistent = "yes"; + AccuracySec = "5m"; + RandomizedDelaySec = "1h"; }; }) ); diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix index 4a6d61d2676..dfbf5d859ba 100644 --- a/nixos/modules/security/apparmor-suid.nix +++ b/nixos/modules/security/apparmor-suid.nix @@ -19,7 +19,7 @@ with lib; config = mkIf (cfg.confineSUIDApplications) { security.apparmor.profiles = [ (pkgs.writeText "ping" '' #include - /var/setuid-wrappers/ping { + /run/wrappers/bin/ping { #include #include #include @@ -33,7 +33,6 @@ with lib; ${pkgs.attr.out}/lib/libattr.so* mr, ${pkgs.iputils}/bin/ping mixr, - /var/setuid-wrappers/ping.real r, #/etc/modules.conf r, diff --git a/nixos/modules/security/chromium-suid-sandbox.nix b/nixos/modules/security/chromium-suid-sandbox.nix index 88fbe518c2d..0458ffb6c46 100644 --- a/nixos/modules/security/chromium-suid-sandbox.nix +++ b/nixos/modules/security/chromium-suid-sandbox.nix @@ -27,6 +27,6 @@ in config = mkIf cfg.enable { environment.systemPackages = [ sandbox ]; - security.setuidPrograms = [ sandbox.passthru.sandboxExecutableName ]; + security.wrappers."${sandbox.passthru.sandboxExecutableName}".source = "${sandbox}/bin/${sandbox.passthru.sandboxExecutableName}"; }; } diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix index 97e2d39dc07..9ca818e86ff 100644 --- a/nixos/modules/security/duosec.nix +++ b/nixos/modules/security/duosec.nix @@ -187,7 +187,8 @@ in ]; environment.systemPackages = [ pkgs.duo-unix ]; - security.setuidPrograms = [ "login_duo" ]; + + security.wrappers.login_duo.source = "${pkgs.duo-unix.out}/bin/login_duo"; environment.etc = loginCfgFile ++ pamCfgFile; /* If PAM *and* SSH are enabled, then don't do anything special. diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml index a7bcf4924f0..ef0aab4a3f1 100644 --- a/nixos/modules/security/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml @@ -7,21 +7,20 @@ Grsecurity/PaX - Grsecurity/PaX is a set of patches against the Linux kernel that make it - harder to exploit bugs. The patchset includes protections such as - enforcement of non-executable memory, address space layout randomization, - and chroot jail hardening. These and other + Grsecurity/PaX is a set of patches against the Linux kernel that + implements an extensive suite of features - render entire classes of exploits inert without additional efforts on the - part of the adversary. + designed to increase the difficulty of exploiting kernel and + application bugs. The NixOS grsecurity/PaX module is designed with casual users in mind and is - intended to be compatible with normal desktop usage, without unnecessarily - compromising security. The following sections describe the configuration - and administration of a grsecurity/PaX enabled NixOS system. For - more comprehensive coverage, please refer to the + intended to be compatible with normal desktop usage, without + unnecessarily compromising security. The + following sections describe the configuration and administration of + a grsecurity/PaX enabled NixOS system. For more comprehensive + coverage, please refer to the grsecurity wikibook and the Arch @@ -35,7 +34,7 @@ and each configuration requires quite a bit of testing to ensure that the resulting packages work as advertised. Defining additional package sets would likely result in a large number of functionally broken packages, to - nobody's benefit.. + nobody's benefit. Enabling grsecurity/PaX @@ -126,10 +125,10 @@ The NixOS kernel is built using upstream's recommended settings for a desktop deployment that generally favours security over performance. This section details deviations from upstream's recommendations that may - compromise operational security. + compromise security. There may be additional problems not covered here! - . + @@ -159,8 +158,8 @@ The NixOS module conditionally weakens chroot restrictions to accommodate NixOS lightweight containers and sandboxed Nix - builds. This is problematic if the deployment also runs a privileged - network facing process that relies on + builds. This can be problematic if the deployment also runs privileged + network facing processes that rely on chroot for isolation. @@ -221,15 +220,18 @@ - The wikibook provides an exhaustive listing of + The grsecurity/PaX wikibook provides an exhaustive listing of kernel configuration options. The NixOS module makes several assumptions about the kernel and so may be incompatible with your customised kernel. Currently, the only way - to work around incompatibilities is to eschew the NixOS module. + to work around these incompatibilities is to eschew the NixOS + module. + + If not using the NixOS module, a custom grsecurity package set can be specified inline instead, as in @@ -290,7 +292,7 @@ User initiated autoloading of modules (e.g., when using fuse or loop devices) is disallowed; either load requisite modules - as root or add them to. + as root or add them to . Virtualization: KVM is the preferred virtualization solution. Xen, Virtualbox, and VMWare are diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 96e7c45d496..b51c8b4996b 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -212,6 +212,17 @@ let ''; }; + enableKwallet = mkOption { + default = false; + type = types.bool; + description = '' + If enabled, pam_wallet will attempt to automatically unlock the + user's default KDE wallet upon login. If the user has no wallet named + "kdewallet", or the login password does not match their wallet + password, KDE will prompt separately after login. + ''; + }; + text = mkOption { type = types.nullOr types.lines; description = "Contents of the PAM service file."; @@ -253,6 +264,8 @@ let "auth sufficient ${pkgs.pam_u2f}/lib/security/pam_u2f.so"} ${optionalString cfg.usbAuth "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"} + ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth + "auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"} '' + # Modules in this block require having the password set in PAM_AUTHTOK. # pam_unix is marked as 'sufficient' on NixOS which means nothing will run @@ -260,19 +273,20 @@ 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)) '' + (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount || cfg.enableKwallet)) '' 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"} ${optionalString cfg.pamMount "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} + ${optionalString cfg.enableKwallet + ("auth optional ${pkgs.kde5.kwallet-pam}/lib/security/pam_kwallet5.so" + + " kwalletd=${pkgs.kde5.kwallet}/bin/kwalletd5")} '') + '' ${optionalString cfg.unixAuth "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"} ${optionalString cfg.otpwAuth "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"} - ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth - "auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"} ${optionalString use_ldap "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"} ${optionalString config.services.sssd.enable @@ -334,6 +348,9 @@ let "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} ${optionalString (cfg.enableAppArmor && config.security.apparmor.enable) "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"} + ${optionalString (cfg.enableKwallet) + ("session optional ${pkgs.kde5.kwallet-pam}/lib/security/pam_kwallet5.so" + + " kwalletd=${pkgs.kde5.kwallet}/bin/kwalletd5")} ''); }; @@ -472,19 +489,20 @@ in ++ optionals config.security.pam.enableU2F [ pkgs.pam_u2f ] ++ optionals config.security.pam.enableEcryptfs [ pkgs.ecryptfs ]; - security.setuidPrograms = - optionals config.security.pam.enableEcryptfs [ "mount.ecryptfs_private" "umount.ecryptfs_private" ]; + security.wrappers = { + unix_chkpwd = { + source = "${pkgs.pam}/sbin/unix_chkpwd.orig"; + owner = "root"; + setuid = true; + }; + } // (if config.security.pam.enableEcryptfs then { + "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private"; + "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private"; + } else {}); environment.etc = mapAttrsToList (n: v: makePAMService v) config.security.pam.services; - security.setuidOwners = [ { - program = "unix_chkpwd"; - source = "${pkgs.pam}/sbin/unix_chkpwd.orig"; - owner = "root"; - setuid = true; - } ]; - security.pam.services = { other.text = '' diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix index 11708a1f016..6f811dab8d7 100644 --- a/nixos/modules/security/pam_usb.nix +++ b/nixos/modules/security/pam_usb.nix @@ -32,10 +32,12 @@ in config = mkIf (cfg.enable || anyUsbAuth) { - # pmount need to have a set-uid bit to make pam_usb works in user - # environment. (like su, sudo) + # Make sure pmount and pumount are setuid wrapped. + security.wrappers = { + pmount.source = "${pkgs.pmount.out}/bin/pmount"; + pumount.source = "${pkgs.pmount.out}/bin/pumount"; + }; - security.setuidPrograms = [ "pmount" "pumount" ]; environment.systemPackages = [ pkgs.pmount ]; }; diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index 507f81bbf07..419abb8b086 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -83,16 +83,10 @@ in security.pam.services.polkit-1 = {}; - security.setuidPrograms = [ "pkexec" ]; - - security.setuidOwners = [ - { program = "polkit-agent-helper-1"; - owner = "root"; - group = "root"; - setuid = true; - source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1"; - } - ]; + security.wrappers = { + pkexec.source = "${pkgs.polkit.out}/bin/pkexec"; + "polkit-agent-helper-1".source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1"; + }; system.activationScripts.polkit = '' diff --git a/nixos/modules/security/setuid-wrapper.c b/nixos/modules/security/setuid-wrapper.c deleted file mode 100644 index ffd0b65b762..00000000000 --- a/nixos/modules/security/setuid-wrapper.c +++ /dev/null @@ -1,81 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* Make sure assertions are not compiled out. */ -#undef NDEBUG - -extern char **environ; - -static char * wrapperDir = WRAPPER_DIR; - -int main(int argc, char * * argv) -{ - char self[PATH_MAX]; - - int len = readlink("/proc/self/exe", self, sizeof(self) - 1); - assert (len > 0); - self[len] = 0; - - /* Make sure that we are being executed from the right location, - i.e., `wrapperDir'. This is to prevent someone from - creating hard link `X' from some other location, along with a - false `X.real' file, to allow arbitrary programs from being - executed setuid. */ - assert ((strncmp(self, wrapperDir, strlen(wrapperDir)) == 0) && - (self[strlen(wrapperDir)] == '/')); - - /* Make *really* *really* sure that we were executed as `self', - and not, say, as some other setuid program. That is, our - effective uid/gid should match the uid/gid of `self'. */ - //printf("%d %d\n", geteuid(), getegid()); - - struct stat st; - assert (lstat(self, &st) != -1); - - //printf("%d %d\n", st.st_uid, st.st_gid); - - assert ((st.st_mode & S_ISUID) == 0 || - (st.st_uid == geteuid())); - - assert ((st.st_mode & S_ISGID) == 0 || - st.st_gid == getegid()); - - /* And, of course, we shouldn't be writable. */ - assert (!(st.st_mode & (S_IWGRP | S_IWOTH))); - - - /* Read the path of the real (wrapped) program from .real. */ - char realFN[PATH_MAX + 10]; - int realFNSize = snprintf (realFN, sizeof(realFN), "%s.real", self); - assert (realFNSize < sizeof(realFN)); - - int fdSelf = open(realFN, O_RDONLY); - assert (fdSelf != -1); - - char real[PATH_MAX]; - len = read(fdSelf, real, PATH_MAX); - assert (len != -1); - assert (len < sizeof (real)); - assert (len > 0); - real[len] = 0; - - close(fdSelf); - - //printf("real = %s, len = %d\n", real, len); - - execve(real, argv, environ); - - fprintf(stderr, "%s: cannot run `%s': %s\n", - argv[0], real, strerror(errno)); - - exit(1); -} diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix deleted file mode 100644 index fe220c94313..00000000000 --- a/nixos/modules/security/setuid-wrappers.nix +++ /dev/null @@ -1,146 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - inherit (config.security) wrapperDir; - - setuidWrapper = pkgs.stdenv.mkDerivation { - name = "setuid-wrapper"; - unpackPhase = "true"; - installPhase = '' - mkdir -p $out/bin - cp ${./setuid-wrapper.c} setuid-wrapper.c - gcc -Wall -O2 -DWRAPPER_DIR=\"/run/setuid-wrapper-dirs\" \ - setuid-wrapper.c -o $out/bin/setuid-wrapper - ''; - }; - -in - -{ - - ###### interface - - options = { - - security.setuidPrograms = mkOption { - type = types.listOf types.str; - default = []; - example = ["passwd"]; - description = '' - The Nix store cannot contain setuid/setgid programs directly. - For this reason, NixOS can automatically generate wrapper - programs that have the necessary privileges. This option - lists the names of programs in the system environment for - which setuid root wrappers should be created. - ''; - }; - - security.setuidOwners = mkOption { - type = types.listOf types.attrs; - default = []; - example = - [ { program = "sendmail"; - owner = "nobody"; - group = "postdrop"; - setuid = false; - setgid = true; - permissions = "u+rx,g+x,o+x"; - } - ]; - description = '' - This option allows the ownership and permissions on the setuid - wrappers for specific programs to be overridden from the - default (setuid root, but not setgid root). - ''; - }; - - security.wrapperDir = mkOption { - internal = true; - type = types.path; - default = "/var/setuid-wrappers"; - description = '' - This option defines the path to the setuid wrappers. It - should generally not be overriden. Some packages in Nixpkgs - expect that is - /var/setuid-wrappers. - ''; - }; - - }; - - - ###### implementation - - config = { - - security.setuidPrograms = [ "fusermount" ]; - - system.activationScripts.setuid = - let - setuidPrograms = - (map (x: { program = x; owner = "root"; group = "root"; setuid = true; }) - config.security.setuidPrograms) - ++ config.security.setuidOwners; - - makeSetuidWrapper = - { program - , source ? "" - , owner ? "nobody" - , group ? "nogroup" - , setuid ? false - , setgid ? false - , permissions ? "u+rx,g+x,o+x" - }: - - '' - if ! source=${if source != "" then source else "$(readlink -f $(PATH=$SETUID_PATH type -tP ${program}))"}; then - # If we can't find the program, fall back to the - # system profile. - source=/nix/var/nix/profiles/default/bin/${program} - fi - - cp ${setuidWrapper}/bin/setuid-wrapper $wrapperDir/${program} - echo -n "$source" > $wrapperDir/${program}.real - chmod 0000 $wrapperDir/${program} # to prevent races - chown ${owner}.${group} $wrapperDir/${program} - chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" $wrapperDir/${program} - ''; - - in stringAfter [ "users" ] - '' - # Look in the system path and in the default profile for - # programs to be wrapped. - SETUID_PATH=${config.system.path}/bin:${config.system.path}/sbin - - mkdir -p /run/setuid-wrapper-dirs - wrapperDir=$(mktemp --directory --tmpdir=/run/setuid-wrapper-dirs setuid-wrappers.XXXXXXXXXX) - chmod a+rx $wrapperDir - - ${concatMapStrings makeSetuidWrapper setuidPrograms} - - if [ -L ${wrapperDir} ]; then - # Atomically replace the symlink - # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/ - old=$(readlink ${wrapperDir}) - ln --symbolic --force --no-dereference $wrapperDir ${wrapperDir}-tmp - mv --no-target-directory ${wrapperDir}-tmp ${wrapperDir} - rm --force --recursive $old - elif [ -d ${wrapperDir} ]; then - # Compatibility with old state, just remove the folder and symlink - rm -f ${wrapperDir}/* - # if it happens to be a tmpfs - ${pkgs.utillinux}/bin/umount ${wrapperDir} || true - rm -d ${wrapperDir} - ln -d --symbolic $wrapperDir ${wrapperDir} - else - # For initial setup - ln --symbolic $wrapperDir ${wrapperDir} - fi - ''; - - }; - -} diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index f5612e1b0c5..67a9b9a45ee 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -81,7 +81,10 @@ in ${cfg.extraConfig} ''; - security.setuidPrograms = [ "sudo" "sudoedit" ]; + security.wrappers = { + sudo.source = "${pkgs.sudo.out}/bin/sudo"; + sudoedit.source = "${pkgs.sudo.out}/bin/sudoedit"; + }; environment.systemPackages = [ sudo ]; diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix new file mode 100644 index 00000000000..861ce225257 --- /dev/null +++ b/nixos/modules/security/wrappers/default.nix @@ -0,0 +1,222 @@ +{ config, lib, pkgs, ... }: +let + + inherit (config.security) wrapperDir wrappers; + + programs = + (lib.mapAttrsToList + (n: v: (if v ? "program" then v else v // {program=n;})) + wrappers); + + securityWrapper = pkgs.stdenv.mkDerivation { + name = "security-wrapper"; + phases = [ "installPhase" "fixupPhase" ]; + buildInputs = [ pkgs.libcap pkgs.libcap_ng pkgs.linuxHeaders ]; + hardeningEnable = [ "pie" ]; + installPhase = '' + mkdir -p $out/bin + parentWrapperDir=$(dirname ${wrapperDir}) + gcc -Wall -O2 -DWRAPPER_DIR=\"$parentWrapperDir\" \ + -lcap-ng -lcap ${./wrapper.c} -o $out/bin/security-wrapper + ''; + }; + + ###### Activation script for the setcap wrappers + mkSetcapProgram = + { program + , capabilities + , source + , owner ? "nobody" + , group ? "nogroup" + , ... + }: + assert (lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3"); + '' + cp ${securityWrapper}/bin/security-wrapper $wrapperDir/${program} + echo -n "${source}" > $wrapperDir/${program}.real + + # Prevent races + chmod 0000 $wrapperDir/${program} + chown ${owner}.${group} $wrapperDir/${program} + + # Set desired capabilities on the file plus cap_setpcap so + # the wrapper program can elevate the capabilities set on + # its file into the Ambient set. + ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" $wrapperDir/${program} + + # Set the executable bit + chmod u+rx,g+x,o+x $wrapperDir/${program} + ''; + + ###### Activation script for the setuid wrappers + mkSetuidProgram = + { program + , source + , owner ? "nobody" + , group ? "nogroup" + , setuid ? false + , setgid ? false + , permissions ? "u+rx,g+x,o+x" + , ... + }: + '' + cp ${securityWrapper}/bin/security-wrapper $wrapperDir/${program} + echo -n "${source}" > $wrapperDir/${program}.real + + # Prevent races + chmod 0000 $wrapperDir/${program} + chown ${owner}.${group} $wrapperDir/${program} + + chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" $wrapperDir/${program} + ''; + + mkWrappedPrograms = + builtins.map + (s: if (s ? "capabilities") + then mkSetcapProgram + ({ owner = "root"; + group = "root"; + } // s) + else if + (s ? "setuid" && s.setuid == true) || + (s ? "setguid" && s.setguid == true) || + (s ? "permissions") + then mkSetuidProgram s + else mkSetuidProgram + ({ owner = "root"; + group = "root"; + setuid = true; + setgid = false; + permissions = "u+rx,g+x,o+x"; + } // s) + ) programs; +in +{ + + ###### interface + + options = { + security.wrappers = lib.mkOption { + type = lib.types.attrs; + default = {}; + example = lib.literalExample + '' + { sendmail.source = "/nix/store/.../bin/sendmail"; + ping = { + source = "${pkgs.iputils.out}/bin/ping"; + owner = "nobody"; + group = "nogroup"; + capabilities = "cap_net_raw+ep"; + }; + } + ''; + description = '' + This option allows the ownership and permissions on the setuid + wrappers for specific programs to be overridden from the + default (setuid root, but not setgid root). + + + The sub-attribute source is mandatory, + it must be the absolute path to the program to be wrapped. + + + The sub-attribute program is optional and + can give the wrapper program a new name. The default name is the same + as the attribute name itself. + + Additionally, this option can set capabilities on a + wrapper program that propagates those capabilities down to the + wrapped, real program. + + NOTE: cap_setpcap, which is required for the wrapper + program to be able to raise caps into the Ambient set is NOT + raised to the Ambient set so that the real program cannot + modify its own capabilities!! This may be too restrictive for + cases in which the real program needs cap_setpcap but it at + least leans on the side security paranoid vs. too + relaxed. + + ''; + }; + + security.wrapperDir = lib.mkOption { + type = lib.types.path; + default = "/run/wrappers/bin"; + internal = true; + description = '' + This option defines the path to the wrapper programs. It + should not be overriden. + ''; + }; + }; + + ###### implementation + config = { + + security.wrappers.fusermount.source = "${pkgs.fuse}/bin/fusermount"; + + # Make sure our wrapperDir exports to the PATH env variable when + # initializing the shell + environment.extraInit = '' + # Wrappers override other bin directories. + export PATH="${wrapperDir}:$PATH" + ''; + + ###### setcap activation script + system.activationScripts.wrappers = + lib.stringAfter [ "users" ] + '' + # Look in the system path and in the default profile for + # programs to be wrapped. + WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin + + # Remove the old /var/setuid-wrappers path from the system... + # + # TODO: this is only necessary for ugprades 16.09 => 17.x; + # this conditional removal block needs to be removed after + # the release. + if [ -d /var/setuid-wrappers ]; then + rm -rf /var/setuid-wrappers + fi + + # Remove the old /run/setuid-wrappers-dir path from the + # system as well... + # + # TDOO: this is only necessary for ugprades 16.09 => 17.x; + # this conditional removal block needs to be removed after + # the release. + if [ -d /run/setuid-wrapper-dirs ]; then + rm -rf /run/setuid-wrapper-dirs + fi + + # Get the "/run/wrappers" path, we want to place the tmpdirs + # for the wrappers there + parentWrapperDir="$(dirname ${wrapperDir})" + + mkdir -p "$parentWrapperDir" + wrapperDir=$(mktemp --directory --tmpdir="$parentWrapperDir" wrappers.XXXXXXXXXX) + chmod a+rx $wrapperDir + + ${lib.concatStringsSep "\n" mkWrappedPrograms} + + if [ -L ${wrapperDir} ]; then + # Atomically replace the symlink + # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/ + old=$(readlink -f ${wrapperDir}) + ln --symbolic --force --no-dereference $wrapperDir ${wrapperDir}-tmp + mv --no-target-directory ${wrapperDir}-tmp ${wrapperDir} + rm --force --recursive $old + elif [ -d ${wrapperDir} ]; then + # Compatibility with old state, just remove the folder and symlink + rm -f ${wrapperDir}/* + # if it happens to be a tmpfs + ${pkgs.utillinux}/bin/umount ${wrapperDir} || true + rm -d ${wrapperDir} + ln -d --symbolic $wrapperDir ${wrapperDir} + else + # For initial setup + ln --symbolic $wrapperDir ${wrapperDir} + fi + ''; + }; +} diff --git a/nixos/modules/security/wrappers/wrapper.c b/nixos/modules/security/wrappers/wrapper.c new file mode 100644 index 00000000000..7091e314bb2 --- /dev/null +++ b/nixos/modules/security/wrappers/wrapper.c @@ -0,0 +1,239 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// Make sure assertions are not compiled out, we use them to codify +// invariants about this program and we want it to fail fast and +// loudly if they are violated. +#undef NDEBUG + +extern char **environ; + +// The WRAPPER_DIR macro is supplied at compile time so that it cannot +// be changed at runtime +static char * wrapperDir = WRAPPER_DIR; + +// Wrapper debug variable name +static char * wrapperDebug = "WRAPPER_DEBUG"; + +// Update the capabilities of the running process to include the given +// capability in the Ambient set. +static void set_ambient_cap(cap_value_t cap) +{ + capng_get_caps_process(); + + if (capng_update(CAPNG_ADD, CAPNG_INHERITABLE, (unsigned long) cap)) + { + perror("cannot raise the capability into the Inheritable set\n"); + exit(1); + } + + capng_apply(CAPNG_SELECT_CAPS); + + if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, (unsigned long) cap, 0, 0)) + { + perror("cannot raise the capability into the Ambient set\n"); + exit(1); + } +} + +// Given the path to this program, fetch its configured capability set +// (as set by `setcap ... /path/to/file`) and raise those capabilities +// into the Ambient set. +static int make_caps_ambient(const char *selfPath) +{ + cap_t caps = cap_get_file(selfPath); + + if(!caps) + { + if(getenv(wrapperDebug)) + fprintf(stderr, "no caps set or could not retrieve the caps for this file, not doing anything..."); + + return 1; + } + + // We use `cap_to_text` and iteration over the tokenized result + // string because, as of libcap's current release, there is no + // facility for retrieving an array of `cap_value_t`'s that can be + // given to `prctl` in order to lift that capability into the + // Ambient set. + // + // Some discussion was had around shot-gunning all of the + // capabilities we know about into the Ambient set but that has a + // security smell and I deemed the risk of the current + // implementation crashing the program to be lower than the risk + // of a privilege escalation security hole being introduced by + // raising all capabilities, even ones we didn't intend for the + // program, into the Ambient set. + // + // `cap_t` which is returned by `cap_get_*` is an opaque type and + // even if we could retrieve the bitmasks (which, as far as I can + // tell we cannot) in order to get the `cap_value_t` + // representation for each capability we would have to take the + // total number of capabilities supported and iterate over the + // sequence of integers up-to that maximum total, testing each one + // against the bitmask ((bitmask >> n) & 1) to see if it's set and + // aggregating each "capability integer n" that is set in the + // bitmask. + // + // That, combined with the fact that we can't easily get the + // bitmask anyway seemed much more brittle than fetching the + // `cap_t`, transforming it into a textual representation, + // tokenizing the string, and using `cap_from_name` on the token + // to get the `cap_value_t` that we need for `prctl`. There is + // indeed risk involved if the output string format of + // `cap_to_text` ever changes but at this time the combination of + // factors involving the below list have led me to the conclusion + // that the best implementation at this time is reading then + // parsing with *lots of documentation* about why we're doing it + // this way. + // + // 1. No explicit API for fetching an array of `cap_value_t`'s or + // for transforming a `cap_t` into such a representation + // 2. The risk of a crash is lower than lifting all capabilities + // into the Ambient set + // 3. libcap is depended on heavily in the Linux ecosystem so + // there is a high chance that the output representation of + // `cap_to_text` will not change which reduces our risk that + // this parsing step will cause a crash + // + // The preferred method, should it ever be available in the + // future, would be to use libcap API's to transform the result + // from a `cap_get_*` into an array of `cap_value_t`'s that can + // then be given to prctl. + // + // - Parnell + ssize_t capLen; + char* capstr = cap_to_text(caps, &capLen); + cap_free(caps); + + // TODO: For now, we assume that cap_to_text always starts its + // result string with " =" and that the first capability is listed + // immediately after that. We should verify this. + assert(capLen >= 2); + capstr += 2; + + char* saveptr = NULL; + for(char* tok = strtok_r(capstr, ",", &saveptr); tok; tok = strtok_r(NULL, ",", &saveptr)) + { + cap_value_t capnum; + if (cap_from_name(tok, &capnum)) + { + if(getenv(wrapperDebug)) + fprintf(stderr, "cap_from_name failed, skipping: %s", tok); + } + else if (capnum == CAP_SETPCAP) + { + // Check for the cap_setpcap capability, we set this on the + // wrapper so it can elevate the capabilities to the Ambient + // set but we do not want to propagate it down into the + // wrapped program. + // + // TODO: what happens if that's the behavior you want + // though???? I'm preferring a strict vs. loose policy here. + if(getenv(wrapperDebug)) + fprintf(stderr, "cap_setpcap in set, skipping it\n"); + } + else + { + set_ambient_cap(capnum); + + if(getenv(wrapperDebug)) + fprintf(stderr, "raised %s into the Ambient capability set\n", tok); + } + } + cap_free(capstr); + + return 0; +} + +int main(int argc, char * * argv) +{ + // I *think* it's safe to assume that a path from a symbolic link + // should safely fit within the PATH_MAX system limit. Though I'm + // not positive it's safe... + char selfPath[PATH_MAX]; + int selfPathSize = readlink("/proc/self/exe", selfPath, sizeof(selfPath)); + + assert(selfPathSize > 0); + + // Assert we have room for the zero byte, this ensures the path + // isn't being truncated because it's too big for the buffer. + // + // A better way to handle this might be to use something like the + // whereami library (https://github.com/gpakosz/whereami) or a + // loop that resizes the buffer and re-reads the link if the + // contents are being truncated. + assert(selfPathSize < sizeof(selfPath)); + + // Set the zero byte since readlink doesn't do that for us. + selfPath[selfPathSize] = '\0'; + + // Make sure that we are being executed from the right location, + // i.e., `safeWrapperDir'. This is to prevent someone from creating + // hard link `X' from some other location, along with a false + // `X.real' file, to allow arbitrary programs from being executed + // with elevated capabilities. + int len = strlen(wrapperDir); + if (len > 0 && '/' == wrapperDir[len - 1]) + --len; + assert(!strncmp(selfPath, wrapperDir, len)); + assert('/' == wrapperDir[0]); + assert('/' == selfPath[len]); + + // Make *really* *really* sure that we were executed as + // `selfPath', and not, say, as some other setuid program. That + // is, our effective uid/gid should match the uid/gid of + // `selfPath'. + struct stat st; + assert(lstat(selfPath, &st) != -1); + + assert(!(st.st_mode & S_ISUID) || (st.st_uid == geteuid())); + assert(!(st.st_mode & S_ISGID) || (st.st_gid == getegid())); + + // And, of course, we shouldn't be writable. + assert(!(st.st_mode & (S_IWGRP | S_IWOTH))); + + // Read the path of the real (wrapped) program from .real. + char realFN[PATH_MAX + 10]; + int realFNSize = snprintf (realFN, sizeof(realFN), "%s.real", selfPath); + assert (realFNSize < sizeof(realFN)); + + int fdSelf = open(realFN, O_RDONLY); + assert (fdSelf != -1); + + char sourceProg[PATH_MAX]; + len = read(fdSelf, sourceProg, PATH_MAX); + assert (len != -1); + assert (len < sizeof(sourceProg)); + assert (len > 0); + sourceProg[len] = 0; + + close(fdSelf); + + // Read the capabilities set on the wrapper and raise them in to + // the Ambient set so the program we're wrapping receives the + // capabilities too! + make_caps_ambient(selfPath); + + execve(sourceProg, argv, environ); + + fprintf(stderr, "%s: cannot run `%s': %s\n", + argv[0], sourceProg, strerror(errno)); + + exit(1); +} + + diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index a89215d7382..56af8fe152e 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -4,6 +4,8 @@ with lib; let + name = "mpd"; + uid = config.ids.uids.mpd; gid = config.ids.gids.mpd; cfg = config.services.mpd; @@ -54,13 +56,14 @@ in { description = '' Extra directives added to to the end of MPD's configuration file, mpd.conf. Basic configuration like file location and uid/gid - is added automatically to the beginning of the file. + is added automatically to the beginning of the file. For available + options see man 5 mpd.conf'. ''; }; dataDir = mkOption { type = types.path; - default = "/var/lib/mpd"; + default = "/var/lib/${name}"; description = '' The directory where MPD stores its state, tag cache, playlists etc. @@ -69,13 +72,13 @@ in { user = mkOption { type = types.str; - default = "mpd"; + default = name; description = "User account under which MPD runs."; }; group = mkOption { type = types.str; - default = "mpd"; + default = name; description = "Group account under which MPD runs."; }; @@ -131,17 +134,17 @@ in { }; }; - users.extraUsers = optionalAttrs (cfg.user == "mpd") (singleton { + users.extraUsers = optionalAttrs (cfg.user == name) (singleton { inherit uid; - name = "mpd"; + inherit name; group = cfg.group; extraGroups = [ "audio" ]; description = "Music Player Daemon user"; home = "${cfg.dataDir}"; }); - users.extraGroups = optionalAttrs (cfg.group == "mpd") (singleton { - name = "mpd"; + users.extraGroups = optionalAttrs (cfg.group == name) (singleton { + inherit name; gid = gid; }); }; diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 029b11ad98b..a82802c3266 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -775,7 +775,7 @@ in { --bind-address=${cfg.proxy.address} \ ${optionalString cfg.verbose "--v=6"} \ ${optionalString cfg.verbose "--log-flush-frequency=1s"} \ - ${cfg.controllerManager.extraOpts} + ${cfg.proxy.extraOpts} ''; WorkingDirectory = cfg.dataDir; }; diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index a40be4f546e..512e09eb804 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -7,7 +7,7 @@ with lib; let cfg = config.services.buildbot-master; escapeStr = s: escape ["'"] s; - masterCfg = pkgs.writeText "master.cfg" '' + masterCfg = if cfg.masterCfg == null then pkgs.writeText "master.cfg" '' from buildbot.plugins import * factory = util.BuildFactory() c = BuildmasterConfig = dict( @@ -27,9 +27,8 @@ let factory.addStep(step) ${cfg.extraConfig} - ''; - - configFile = if cfg.masterCfg == null then masterCfg else cfg.masterCfg; + '' + else pkgs.writeText "master.cfg" cfg.masterCfg; in { options = { @@ -67,15 +66,13 @@ in { }; masterCfg = mkOption { - type = with types; nullOr path; + type = types.str; description = '' - Optionally pass path to raw master.cfg file. + Optionally pass raw master.cfg file as string. Other options in this configuration will be ignored. ''; default = null; - example = literalExample '' - pkgs.writeText "master.cfg" "BuildmasterConfig = c = {}" - ''; + example = "BuildmasterConfig = c = {}"; }; schedulers = mkOption { @@ -99,9 +96,9 @@ in { type = types.listOf types.str; description = "List of Workers."; default = [ - "worker.Worker('default-worker', 'password')" + "worker.Worker('example-worker', 'pass')" ]; - example = [ "worker.LocalWorker('default-worker')" ]; + example = [ "worker.LocalWorker('example-worker')" ]; }; status = mkOption { @@ -209,7 +206,7 @@ in { users.extraUsers = optional (cfg.user == "buildbot") { name = "buildbot"; - description = "buildbot user"; + description = "Buildbot User."; isNormalUser = true; createHome = true; home = cfg.home; @@ -219,7 +216,7 @@ in { }; systemd.services.buildbot-master = { - description = "Buildbot Continuous Integration Server"; + description = "Buildbot Continuous Integration Server."; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = cfg.packages; @@ -233,9 +230,8 @@ in { }; preStart = '' - mkdir -vp ${cfg.buildbotDir} - chown -c ${cfg.user}:${cfg.group} ${cfg.buildbotDir} - ln -sf ${configFile} ${cfg.buildbotDir}/master.cfg + ${pkgs.coreutils}/bin/mkdir -vp ${cfg.buildbotDir} + ${pkgs.coreutils}/bin/ln -sfv ${masterCfg} ${cfg.buildbotDir}/master.cfg ${cfg.package}/bin/buildbot create-master ${cfg.buildbotDir} ''; @@ -247,4 +243,6 @@ in { }; }; + meta.maintainers = with lib.maintainers; [ nand0p Mic92 ]; + } diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix new file mode 100644 index 00000000000..430fd4e53f1 --- /dev/null +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -0,0 +1,128 @@ +# NixOS module for Buildbot Worker. + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.buildbot-worker; + +in { + options = { + services.buildbot-worker = { + + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the Buildbot Worker."; + }; + + user = mkOption { + default = "bbworker"; + type = types.str; + description = "User the buildbot Worker should execute under."; + }; + + group = mkOption { + default = "bbworker"; + type = types.str; + description = "Primary group of buildbot Worker user."; + }; + + extraGroups = mkOption { + type = types.listOf types.str; + default = [ "nixbld" ]; + description = "List of extra groups that the Buildbot Worker user should be a part of."; + }; + + home = mkOption { + default = "/home/bbworker"; + type = types.path; + description = "Buildbot home directory."; + }; + + buildbotDir = mkOption { + default = "${cfg.home}/worker"; + type = types.path; + description = "Specifies the Buildbot directory."; + }; + + workerUser = mkOption { + default = "example-worker"; + type = types.str; + description = "Specifies the Buildbot Worker user."; + }; + + workerPass = mkOption { + default = "pass"; + type = types.str; + description = "Specifies the Buildbot Worker password."; + }; + + masterUrl = mkOption { + default = "localhost:9989"; + type = types.str; + description = "Specifies the Buildbot Worker connection string."; + }; + + package = mkOption { + type = types.package; + default = pkgs.buildbot-worker; + description = "Package to use for buildbot worker."; + example = pkgs.buildbot-worker; + }; + + packages = mkOption { + default = [ ]; + example = [ pkgs.git ]; + type = types.listOf types.package; + description = "Packages to add to PATH for the buildbot process."; + }; + + }; + }; + + config = mkIf cfg.enable { + users.extraGroups = optional (cfg.group == "bbworker") { + name = "bbworker"; + }; + + users.extraUsers = optional (cfg.user == "bbworker") { + name = "bbworker"; + description = "Buildbot Worker User."; + isNormalUser = true; + createHome = true; + home = cfg.home; + group = cfg.group; + extraGroups = cfg.extraGroups; + useDefaultShell = true; + }; + + systemd.services.buildbot-worker = { + description = "Buildbot Worker."; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + wants = [ "buildbot-master.service" ]; + path = cfg.packages; + + preStart = '' + # NOTE: ensure master has time to start in case running on localhost + ${pkgs.coreutils}/bin/sleep 4 + ${pkgs.coreutils}/bin/mkdir -vp ${cfg.buildbotDir} + ${cfg.package}/bin/buildbot-worker create-worker ${cfg.buildbotDir} ${cfg.masterUrl} ${cfg.workerUser} ${cfg.workerPass} + ''; + + serviceConfig = { + Type = "forking"; + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.home; + ExecStart = "${cfg.package}/bin/buildbot-worker start ${cfg.buildbotDir}"; + }; + + }; + }; + + meta.maintainers = with lib.maintainers; [ nand0p ]; + +} diff --git a/nixos/modules/services/databases/stanchion.nix b/nixos/modules/services/databases/stanchion.nix index f2dbb78b5c4..a4597cac3cd 100644 --- a/nixos/modules/services/databases/stanchion.nix +++ b/nixos/modules/services/databases/stanchion.nix @@ -76,14 +76,6 @@ in ''; }; - stanchionSsl = mkOption { - type = types.bool; - default = true; - description = '' - Tell stanchion to use SSL. - ''; - }; - distributedCookie = mkOption { type = types.str; default = "riak"; @@ -148,8 +140,6 @@ in distributed_cookie = ${cfg.distributedCookie} - stanchion_ssl=${if cfg.stanchionSsl then "on" else "off"} - ${cfg.extraConfig} ''; diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index e03f6046de8..89f09ed0844 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -316,10 +316,10 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides If you are not on NixOS or want to install this particular Emacs only for yourself, you can do so by adding it to your - ~/.nixpkgs/config.nix + ~/.config/nixpkgs/config.nix (see Nixpkgs manual): - Custom Emacs in <filename>~/.nixpkgs/system.nix</filename> + Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename> - Users in the "scanner" group will gain access to the scanner. + Users in the "scanner" group will gain access to the scanner, or the "lp" group if it's also a printer. ''; }; diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix new file mode 100644 index 00000000000..38d0a3a1d75 --- /dev/null +++ b/nixos/modules/services/hardware/trezord.nix @@ -0,0 +1,54 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.trezord; +in { + + ### interface + + options = { + services.trezord = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable Trezor bridge daemon, for use with Trezor hardware bitcoin wallets. + ''; + }; + }; + }; + + ### implementation + + config = mkIf cfg.enable { + services.udev.packages = lib.singleton (pkgs.writeTextFile { + name = "trezord-udev-rules"; + destination = "/etc/udev/rules.d/51-trezor.rules"; + text = '' + SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", SYMLINK+="trezor%n" + KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout" + ''; + }); + + systemd.services.trezord = { + description = "TREZOR Bridge"; + after = [ "systemd-udev-settle.service" "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = []; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.trezord}/bin/trezord -f"; + User = "trezord"; + }; + }; + + users.users.trezord = { + group = "trezord"; + description = "Trezor bridge daemon user"; + }; + + users.groups.trezord = {}; + }; +} + diff --git a/nixos/modules/services/logging/fluentd.nix b/nixos/modules/services/logging/fluentd.nix index 3aa27a15266..e56a9a4e9af 100644 --- a/nixos/modules/services/logging/fluentd.nix +++ b/nixos/modules/services/logging/fluentd.nix @@ -21,6 +21,12 @@ in { default = ""; description = "Fluentd config."; }; + + package = mkOption { + type = types.path; + default = pkgs.fluentd; + description = "The fluentd package to use."; + }; }; }; @@ -32,7 +38,7 @@ in { description = "Fluentd Daemon"; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.fluentd}/bin/fluentd -c ${pkgs.writeText "fluentd.conf" cfg.config}"; + ExecStart = "${cfg.package}/bin/fluentd -c ${pkgs.writeText "fluentd.conf" cfg.config}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; diff --git a/nixos/modules/services/logging/journalbeat.nix b/nixos/modules/services/logging/journalbeat.nix new file mode 100644 index 00000000000..8186a3b02c3 --- /dev/null +++ b/nixos/modules/services/logging/journalbeat.nix @@ -0,0 +1,76 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.journalbeat; + + journalbeatYml = pkgs.writeText "journalbeat.yml" '' + name: ${cfg.name} + tags: ${builtins.toJSON cfg.tags} + + journalbeat.cursor_state_file: ${cfg.stateDir}/cursor-state + + ${cfg.extraConfig} + ''; + +in +{ + options = { + + services.journalbeat = { + + enable = mkEnableOption "journalbeat"; + + name = mkOption { + type = types.str; + default = "journalbeat"; + description = "Name of the beat"; + }; + + tags = mkOption { + type = types.listOf types.str; + default = []; + description = "Tags to place on the shipped log messages"; + }; + + stateDir = mkOption { + type = types.str; + default = "/var/lib/journalbeat"; + description = "The state directory. Journalbeat's own logs and other data are stored here."; + }; + + extraConfig = mkOption { + type = types.lines; + default = '' + journalbeat: + seek_position: cursor + cursor_seek_fallback: tail + write_cursor_state: true + cursor_flush_period: 5s + clean_field_names: true + convert_to_numbers: false + move_metadata_to_field: journal + default_type: journal + ''; + description = "Any other configuration options you want to add"; + }; + + }; + }; + + config = mkIf cfg.enable { + + systemd.services.journalbeat = with pkgs; { + description = "Journalbeat log shipper"; + wantedBy = [ "multi-user.target" ]; + preStart = '' + mkdir -p ${cfg.stateDir}/data + mkdir -p ${cfg.stateDir}/logs + ''; + serviceConfig = { + ExecStart = "${pkgs.journalbeat}/bin/journalbeat -c ${journalbeatYml} -path.data ${cfg.stateDir}/data -path.logs ${cfg.stateDir}/logs"; + }; + }; + }; +} diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 27ed5374f56..2a8ac414720 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -29,8 +29,8 @@ let }; cronJob = '' - @reboot logcheck env PATH=/var/setuid-wrappers:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck -R ${flags} - 2 ${cfg.timeOfDay} * * * logcheck env PATH=/var/setuid-wrappers:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck ${flags} + @reboot logcheck env PATH=/run/wrappers/bin:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck -R ${flags} + 2 ${cfg.timeOfDay} * * * logcheck env PATH=/run/wrappers/bin:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck ${flags} ''; writeIgnoreRule = name: {level, regex, ...}: @@ -184,7 +184,7 @@ in description = '' This option defines extra ignore rules. ''; - type = with types; loaOf (submodule ignoreOptions); + type = with types; attrsOf (submodule ignoreOptions); }; ignoreCron = mkOption { @@ -192,7 +192,7 @@ in description = '' This option defines extra ignore rules for cronjobs. ''; - type = with types; loaOf (submodule ignoreCronOptions); + type = with types; attrsOf (submodule ignoreCronOptions); }; extraGroups = mkOption { diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index 62f6e187ea0..c9477b9e3ab 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -63,7 +63,7 @@ in description = "Enable the logstash web interface."; }; - address = mkOption { + listenAddress = mkOption { type = types.str; default = "0.0.0.0"; description = "Address on which to start webserver."; @@ -77,7 +77,7 @@ in inputConfig = mkOption { type = types.lines; - default = ''stdin { type => "example" }''; + default = ''generator { }''; description = "Logstash input configuration."; example = '' # Read from journal @@ -90,7 +90,7 @@ in filterConfig = mkOption { type = types.lines; - default = ''noop {}''; + default = ""; description = "logstash filter configuration."; example = '' if [type] == "syslog" { @@ -108,11 +108,11 @@ in outputConfig = mkOption { type = types.lines; - default = ''stdout { debug => true debug_format => "json"}''; + default = ''stdout { codec => rubydebug }''; description = "Logstash output configuration."; example = '' - redis { host => "localhost" data_type => "list" key => "logstash" codec => json } - elasticsearch { embedded => true } + redis { host => ["localhost"] data_type => "list" key => "logstash" codec => json } + elasticsearch { } ''; }; @@ -147,7 +147,7 @@ in ${cfg.outputConfig} } ''} " + - ops cfg.enableWeb "-- web -a ${cfg.address} -p ${cfg.port}"; + ops cfg.enableWeb "-- web -a ${cfg.listenAddress} -p ${cfg.port}"; }; }; }; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index f2097638c63..3b25e41edb1 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -13,7 +13,7 @@ let '' base_dir = ${baseDir} protocols = ${concatStringsSep " " cfg.protocols} - sendmail_path = /var/setuid-wrappers/sendmail + sendmail_path = /run/wrappers/bin/sendmail '' (if isNull cfg.sslServerCert then '' diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix index e0890d96a88..440eae281f4 100644 --- a/nixos/modules/services/mail/exim.nix +++ b/nixos/modules/services/mail/exim.nix @@ -70,7 +70,7 @@ in etc."exim.conf".text = '' exim_user = ${cfg.user} exim_group = ${cfg.group} - exim_path = /var/setuid-wrappers/exim + exim_path = /run/wrappers/bin/exim spool_directory = ${cfg.spoolDir} ${cfg.config} ''; @@ -89,7 +89,7 @@ in gid = config.ids.gids.exim; }; - security.setuidPrograms = [ "exim" ]; + security.wrappers.exim.source = "${exim}/bin/exim"; systemd.services.exim = { description = "Exim Mail Daemon"; diff --git a/nixos/modules/services/mail/mail.nix b/nixos/modules/services/mail/mail.nix index 63e8d78b5b0..cfe1b5496a4 100644 --- a/nixos/modules/services/mail/mail.nix +++ b/nixos/modules/services/mail/mail.nix @@ -26,7 +26,7 @@ with lib; config = mkIf (config.services.mail.sendmailSetuidWrapper != null) { - security.setuidOwners = [ config.services.mail.sendmailSetuidWrapper ]; + security.wrappers.sendmail = config.services.mail.sendmailSetuidWrapper; }; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index cdde4144622..caaa87b94d6 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -79,8 +79,6 @@ let relay_domains = ${concatStringsSep ", " cfg.relayDomains} '' + '' - local_recipient_maps = - relayhost = ${if cfg.lookupMX || cfg.relayHost == "" then cfg.relayHost else diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index c856d3294c0..cff05339688 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -38,7 +38,7 @@ in { brokerId = mkOption { description = "Broker ID."; - default = 0; + default = -1; type = types.int; }; diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix new file mode 100644 index 00000000000..5135fac8f7d --- /dev/null +++ b/nixos/modules/services/misc/geoip-updater.nix @@ -0,0 +1,306 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.geoip-updater; + + dbBaseUrl = "https://geolite.maxmind.com/download/geoip/database"; + + randomizedTimerDelaySec = "3600"; + + # Use writeScriptBin instead of writeScript, so that argv[0] (logged to the + # journal) doesn't include the long nix store path hash. (Prefixing the + # 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} + skipExisting=0 + debug() + { + echo "<7>$@" + } + info() + { + echo "<6>$@" + } + error() + { + echo "<3>$@" + } + die() + { + error "$@" + exit 1 + } + waitNetworkOnline() + { + ret=1 + for i in $(seq 6); do + curl_out=$("${pkgs.curl.bin}/bin/curl" \ + --silent --fail --show-error --max-time 60 "${dbBaseUrl}" 2>&1) + if [ $? -eq 0 ]; then + debug "Server is reachable (try $i)" + ret=0 + break + else + debug "Server is unreachable (try $i): $curl_out" + sleep 10 + fi + done + return $ret + } + dbFnameTmp() + { + dburl=$1 + echo "${cfg.databaseDir}/.$(basename "$dburl")" + } + dbFnameTmpDecompressed() + { + dburl=$1 + echo "${cfg.databaseDir}/.$(basename "$dburl")" | sed 's/\.\(gz\|xz\)$//' + } + dbFname() + { + dburl=$1 + echo "${cfg.databaseDir}/$(basename "$dburl")" | sed 's/\.\(gz\|xz\)$//' + } + downloadDb() + { + dburl=$1 + curl_out=$("${pkgs.curl.bin}/bin/curl" \ + --silent --fail --show-error --max-time 900 -L -o "$(dbFnameTmp "$dburl")" "$dburl" 2>&1) + if [ $? -ne 0 ]; then + error "Failed to download $dburl: $curl_out" + return 1 + fi + } + decompressDb() + { + fn=$(dbFnameTmp "$1") + ret=0 + case "$fn" in + *.gz) + cmd_out=$("${pkgs.gzip}/bin/gzip" --decompress --force "$fn" 2>&1) + ;; + *.xz) + cmd_out=$("${pkgs.xz.bin}/bin/xz" --decompress --force "$fn" 2>&1) + ;; + *) + cmd_out=$(echo "File \"$fn\" is neither a .gz nor .xz file") + false + ;; + esac + if [ $? -ne 0 ]; then + error "$cmd_out" + ret=1 + fi + } + atomicRename() + { + dburl=$1 + mv "$(dbFnameTmpDecompressed "$dburl")" "$(dbFname "$dburl")" + } + removeIfNotInConfig() + { + # Arg 1 is the full path of an installed DB. + # If the corresponding database is not specified in the NixOS config we + # remove it. + db=$1 + for cdb in ${lib.concatStringsSep " " cfg.databases}; do + confDb=$(echo "$cdb" | sed 's/\.\(gz\|xz\)$//') + if [ "$(basename "$db")" = "$(basename "$confDb")" ]; then + return 0 + fi + done + rm "$db" + if [ $? -eq 0 ]; then + debug "Removed $(basename "$db") (not listed in services.geoip-updater.databases)" + else + error "Failed to remove $db" + fi + } + removeUnspecifiedDbs() + { + for f in "${cfg.databaseDir}/"*; do + test -f "$f" || continue + case "$f" in + *.dat|*.mmdb|*.csv) + removeIfNotInConfig "$f" + ;; + *) + debug "Not removing \"$f\" (unknown file extension)" + ;; + esac + done + } + downloadAndInstall() + { + dburl=$1 + if [ "$skipExisting" -eq 1 -a -f "$(dbFname "$dburl")" ]; then + debug "Skipping existing file: $(dbFname "$dburl")" + return 0 + fi + downloadDb "$dburl" || return 1 + decompressDb "$dburl" || return 1 + atomicRename "$dburl" || return 1 + info "Updated $(basename "$(dbFname "$dburl")")" + } + for arg in "$@"; do + case "$arg" in + --skip-existing) + skipExisting=1 + info "Option --skip-existing is set: not updating existing databases" + ;; + *) + error "Unknown argument: $arg";; + esac + done + waitNetworkOnline || die "Network is down (${dbBaseUrl} is unreachable)" + test -d "${cfg.databaseDir}" || die "Database directory (${cfg.databaseDir}) doesn't exist" + debug "Starting update of GeoIP databases in ${cfg.databaseDir}" + all_ret=0 + for db in ${lib.concatStringsSep " \\\n " cfg.databases}; do + downloadAndInstall "${dbBaseUrl}/$db" || all_ret=1 + done + removeUnspecifiedDbs || all_ret=1 + if [ $all_ret -eq 0 ]; then + info "Completed GeoIP database update in ${cfg.databaseDir}" + else + error "Completed GeoIP database update in ${cfg.databaseDir}, with error(s)" + fi + # Hack to work around systemd journal race: + # https://github.com/systemd/systemd/issues/2913 + sleep 2 + exit $all_ret + ''; + +in + +{ + options = { + services.geoip-updater = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable periodic downloading of GeoIP databases from + maxmind.com. You might want to enable this if you, for instance, use + ntopng or Wireshark. + ''; + }; + + interval = mkOption { + type = types.str; + default = "weekly"; + description = '' + Update the GeoIP databases at this time / interval. + The format is described in + systemd.time + 7. + To prevent load spikes on maxmind.com, the timer interval is + randomized by an additional delay of ${randomizedTimerDelaySec} + seconds. Setting a shorter interval than this is not recommended. + ''; + }; + + databaseDir = mkOption { + type = types.path; + default = "/var/lib/geoip-databases"; + description = '' + Directory that will contain GeoIP databases. + ''; + }; + + databases = mkOption { + type = types.listOf types.str; + default = [ + "GeoLiteCountry/GeoIP.dat.gz" + "GeoIPv6.dat.gz" + "GeoLiteCity.dat.xz" + "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" + "asnum/GeoIPASNum.dat.gz" + "asnum/GeoIPASNumv6.dat.gz" + "GeoLite2-Country.mmdb.gz" + "GeoLite2-City.mmdb.gz" + ]; + description = '' + Which GeoIP databases to update. The full URL is ${dbBaseUrl}/ + + the_database. + ''; + }; + + }; + + }; + + config = mkIf cfg.enable { + + assertions = [ + { assertion = (builtins.filter + (x: builtins.match ".*\.(gz|xz)$" x == null) cfg.databases) == []; + message = '' + services.geoip-updater.databases supports only .gz and .xz databases. + + Current value: + ${toString cfg.databases} + + Offending element(s): + ${toString (builtins.filter (x: builtins.match ".*\.(gz|xz)$" x == null) cfg.databases)}; + ''; + } + ]; + + users.extraUsers.geoip = { + group = "root"; + description = "GeoIP database updater"; + uid = config.ids.uids.geoip; + }; + + systemd.timers.geoip-updater = + { description = "GeoIP Updater Timer"; + partOf = [ "geoip-updater.service" ]; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = cfg.interval; + timerConfig.Persistent = "true"; + timerConfig.RandomizedDelaySec = randomizedTimerDelaySec; + }; + + systemd.services.geoip-updater = { + description = "GeoIP Updater"; + after = [ "network-online.target" "nss-lookup.target" ]; + wants = [ "network-online.target" ]; + preStart = '' + mkdir -p "${cfg.databaseDir}" + chmod 755 "${cfg.databaseDir}" + chown geoip:root "${cfg.databaseDir}" + ''; + serviceConfig = { + ExecStart = "${geoip-updater}/bin/geoip-updater"; + User = "geoip"; + PermissionsStartOnly = true; + }; + }; + + systemd.services.geoip-updater-setup = { + description = "GeoIP Updater Setup"; + after = [ "network-online.target" "nss-lookup.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + conflicts = [ "geoip-updater.service" ]; + preStart = '' + mkdir -p "${cfg.databaseDir}" + chmod 755 "${cfg.databaseDir}" + chown geoip:root "${cfg.databaseDir}" + ''; + serviceConfig = { + ExecStart = "${geoip-updater}/bin/geoip-updater --skip-existing"; + User = "geoip"; + PermissionsStartOnly = true; + # So it won't be (needlessly) restarted: + RemainAfterExit = true; + }; + }; + + }; +} diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 1fc3a5cc869..36db4fb9660 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -528,8 +528,8 @@ in { if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then if ! test -e "${cfg.statePath}/db-created"; then - psql postgres -c "CREATE ROLE gitlab WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'" - ${config.services.postgresql.package}/bin/createdb --owner gitlab gitlab || true + psql postgres -c "CREATE ROLE ${cfg.databaseUsername} WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'" + ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName} || true touch "${cfg.statePath}/db-created" fi fi diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix index 09e5c4fe1ff..ca8fc06e483 100644 --- a/nixos/modules/services/misc/gogs.nix +++ b/nixos/modules/services/misc/gogs.nix @@ -208,6 +208,7 @@ in group = "gogs"; home = cfg.stateDir; createHome = true; + shell = pkgs.bash; }; extraGroups.gogs.gid = config.ids.gids.gogs; }; diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix index d0e9b839e75..df7b9be0db5 100644 --- a/nixos/modules/services/misc/ihaskell.nix +++ b/nixos/modules/services/misc/ihaskell.nix @@ -20,18 +20,6 @@ in description = "Autostart an IHaskell notebook service."; }; - haskellPackages = mkOption { - default = pkgs.haskellPackages; - defaultText = "pkgs.haskellPackages"; - example = literalExample "pkgs.haskell.packages.ghc784"; - description = '' - haskellPackages used to build IHaskell and other packages. - This can be used to change the GHC version used to build - IHaskell and the packages listed in - extraPackages. - ''; - }; - extraPackages = mkOption { default = self: []; example = literalExample '' diff --git a/nixos/modules/services/misc/ssm-agent.nix b/nixos/modules/services/misc/ssm-agent.nix new file mode 100644 index 00000000000..b04959a9686 --- /dev/null +++ b/nixos/modules/services/misc/ssm-agent.nix @@ -0,0 +1,45 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + cfg = config.services.ssm-agent; + + # The SSM agent doesn't pay attention to our /etc/os-release yet, and the lsb-release tool + # in nixpkgs doesn't seem to work properly on NixOS, so let's just fake the two fields SSM + # looks for. See https://github.com/aws/amazon-ssm-agent/issues/38 for upstream fix. + fake-lsb-release = pkgs.writeScriptBin "lsb_release" '' + #!${pkgs.stdenv.shell} + + case "$1" in + -i) echo "nixos";; + -r) echo "${config.system.nixosVersion}";; + esac + ''; +in { + options.services.ssm-agent = { + enable = mkEnableOption "AWS SSM agent"; + + package = mkOption { + type = types.path; + description = "The SSM agent package to use"; + default = pkgs.ssm-agent; + }; + }; + + config = mkIf cfg.enable { + systemd.services.ssm-agent = { + inherit (cfg.package.meta) description; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + path = [ fake-lsb-release ]; + serviceConfig = { + ExecStart = "${cfg.package.bin}/bin/agent"; + KillMode = "process"; + Restart = "on-failure"; + RestartSec = "15min"; + }; + }; + }; +} + diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index ca82a733f6f..826f463bbd7 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -94,44 +94,6 @@ let in flatten (mapAttrsToList mkSublist attrs); in all isNull (findPkiDefinitions [] manualPkiOptions); - configFile = pkgs.writeText "taskdrc" ('' - # systemd related - daemon = false - log = - - - # logging - ${mkConfLine "debug" cfg.debug} - ${mkConfLine "ip.log" cfg.ipLog} - - # general - ${mkConfLine "ciphers" cfg.ciphers} - ${mkConfLine "confirmation" cfg.confirmation} - ${mkConfLine "extensions" cfg.extensions} - ${mkConfLine "queue.size" cfg.queueSize} - ${mkConfLine "request.limit" cfg.requestLimit} - - # client - ${mkConfLine "client.allow" cfg.allowedClientIDs} - ${mkConfLine "client.deny" cfg.disallowedClientIDs} - - # server - server = ${cfg.listenHost}:${toString cfg.listenPort} - ${mkConfLine "trust" cfg.trust} - - # PKI options - ${if needToCreateCA then '' - ca.cert = ${cfg.dataDir}/keys/ca.cert - server.cert = ${cfg.dataDir}/keys/server.cert - server.key = ${cfg.dataDir}/keys/server.key - server.crl = ${cfg.dataDir}/keys/server.crl - '' else '' - ca.cert = ${cfg.pki.ca.cert} - server.cert = ${cfg.pki.server.cert} - server.key = ${cfg.pki.server.key} - server.crl = ${cfg.pki.server.crl} - ''} - '' + cfg.extraConfig); - orgOptions = { name, ... }: { options.users = mkOption { type = types.uniq (types.listOf types.str); @@ -154,9 +116,8 @@ let certtool = "${pkgs.gnutls.bin}/bin/certtool"; - nixos-taskserver = pkgs.pythonPackages.buildPythonPackage { + nixos-taskserver = pkgs.pythonPackages.buildPythonApplication { name = "nixos-taskserver"; - namePrefix = ""; src = pkgs.runCommand "nixos-taskserver-src" {} '' mkdir -p "$out" @@ -167,6 +128,7 @@ let certBits = cfg.pki.auto.bits; clientExpiration = cfg.pki.auto.expiration.client; crlExpiration = cfg.pki.auto.expiration.crl; + isAutoConfig = if needToCreateCA then "True" else "False"; }}" > "$out/main.py" cat > "$out/setup.py" < + taskdrc + 5 + , but with one difference: + + The server option is + server.listen here, because the + server option would collide with other options + like server.cert and we would run in a type error + (attribute set versus string). + + Nix types like integers or booleans are automatically converted to + the right values Taskserver would expect. ''; + apply = let + mkKey = path: if path == ["server" "listen"] then "server" + else concatStringsSep "." path; + recurse = path: attrs: let + mapper = name: val: let + newPath = path ++ [ name ]; + scalar = if val == true then "true" + else if val == false then "false" + else toString val; + in if isAttrs val then recurse newPath val + else [ "${mkKey newPath}=${scalar}" ]; + in concatLists (mapAttrsToList mapper attrs); + in recurse []; }; }; }; + imports = [ + (mkRemovedOptionModule ["services" "taskserver" "extraConfig"] '' + This option was removed in favor of `services.taskserver.config` with + different semantics (it's now a list of attributes instead of lines). + + Please look up the documentation of `services.taskserver.config' to get + more information about the new way to pass additional configuration + options. + '') + ]; + config = mkMerge [ (mkIf cfg.enable { - environment.systemPackages = [ pkgs.taskserver nixos-taskserver ]; + environment.systemPackages = [ nixos-taskserver ]; users.users = optional (cfg.user == "taskd") { name = "taskd"; @@ -392,6 +391,44 @@ in { gid = config.ids.gids.taskd; }; + services.taskserver.config = { + # systemd related + daemon = false; + log = "-"; + + # logging + debug = cfg.debug; + ip.log = cfg.ipLog; + + # general + ciphers = cfg.ciphers; + confirmation = cfg.confirmation; + extensions = cfg.extensions; + queue.size = cfg.queueSize; + request.limit = cfg.requestLimit; + + # client + client.allow = cfg.allowedClientIDs; + client.deny = cfg.disallowedClientIDs; + + # server + trust = cfg.trust; + server = { + listen = "${cfg.listenHost}:${toString cfg.listenPort}"; + } // (if needToCreateCA then { + cert = "${cfg.dataDir}/keys/server.cert"; + key = "${cfg.dataDir}/keys/server.key"; + crl = "${cfg.dataDir}/keys/server.crl"; + } else { + cert = "${cfg.pki.manual.server.cert}"; + key = "${cfg.pki.manual.server.key}"; + crl = "${cfg.pki.manual.server.crl}"; + }); + + ca.cert = if needToCreateCA then "${cfg.dataDir}/keys/ca.cert" + else "${cfg.pki.manual.ca.cert}"; + }; + systemd.services.taskserver-init = { wantedBy = [ "taskserver.service" ]; before = [ "taskserver.service" ]; @@ -404,7 +441,6 @@ in { script = '' ${taskd} init - echo "include ${configFile}" > "${cfg.dataDir}/config" touch "${cfg.dataDir}/.is_initialized" ''; @@ -436,7 +472,10 @@ in { in "${helperTool} process-json '${jsonFile}'"; serviceConfig = { - ExecStart = "@${taskd} taskd server"; + ExecStart = let + mkCfgFlag = flag: escapeShellArg "--${flag}"; + cfgFlags = concatMapStringsSep " " mkCfgFlag cfg.config; + in "@${taskd} taskd server ${cfgFlags}"; ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; Restart = "on-failure"; PermissionsStartOnly = true; diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixos/modules/services/misc/taskserver/doc.xml index 48591129264..6d4d2a9b488 100644 --- a/nixos/modules/services/misc/taskserver/doc.xml +++ b/nixos/modules/services/misc/taskserver/doc.xml @@ -136,9 +136,9 @@ $ ssh server nixos-taskserver user export my-company alice | sh If you set any options within - , the automatic user and - CA management by the nixos-taskserver is disabled and - you need to create certificates and keys by yourself. + , + nixos-taskserver won't issue certificates, but you can + still use it for adding or removing user accounts. diff --git a/nixos/modules/services/misc/taskserver/helper-tool.py b/nixos/modules/services/misc/taskserver/helper-tool.py index 03e7cdf8987..b97bc1df74f 100644 --- a/nixos/modules/services/misc/taskserver/helper-tool.py +++ b/nixos/modules/services/misc/taskserver/helper-tool.py @@ -13,6 +13,7 @@ from tempfile import NamedTemporaryFile import click +IS_AUTO_CONFIG = @isAutoConfig@ # NOQA CERTTOOL_COMMAND = "@certtool@" CERT_BITS = "@certBits@" CLIENT_EXPIRATION = "@clientExpiration@" @@ -149,6 +150,12 @@ def create_template(contents): def generate_key(org, user): + if not IS_AUTO_CONFIG: + msg = "Automatic PKI handling is disabled, you need to " \ + "manually issue a client certificate for user {}.\n" + sys.stderr.write(msg.format(user)) + return + basedir = os.path.join(TASKD_DATA_DIR, "keys", org, user) if os.path.exists(basedir): raise OSError("Keyfile directory for {} already exists.".format(user)) @@ -243,26 +250,32 @@ class User(object): self.key = key def export(self): - pubcert = getkey(self.__org, self.name, "public.cert") - privkey = getkey(self.__org, self.name, "private.key") - cacert = getkey("ca.cert") - - keydir = "${TASKDATA:-$HOME/.task}/keys" - credentials = '/'.join([self.__org, self.name, self.key]) allow_unquoted = string.ascii_letters + string.digits + "/-_." if not all((c in allow_unquoted) for c in credentials): credentials = "'" + credentials.replace("'", r"'\''") + "'" - script = [ - "umask 0077", - 'mkdir -p "{}"'.format(keydir), - mktaskkey("certificate", os.path.join(keydir, "public.cert"), - pubcert), - mktaskkey("key", os.path.join(keydir, "private.key"), privkey), - mktaskkey("ca", os.path.join(keydir, "ca.cert"), cacert), + script = [] + + if IS_AUTO_CONFIG: + pubcert = getkey(self.__org, self.name, "public.cert") + privkey = getkey(self.__org, self.name, "private.key") + cacert = getkey("ca.cert") + + keydir = "${TASKDATA:-$HOME/.task}/keys" + + script += [ + "umask 0077", + 'mkdir -p "{}"'.format(keydir), + mktaskkey("certificate", os.path.join(keydir, "public.cert"), + pubcert), + mktaskkey("key", os.path.join(keydir, "private.key"), privkey), + mktaskkey("ca", os.path.join(keydir, "ca.cert"), cacert) + ] + + script.append( "task config taskd.credentials -- {}".format(credentials) - ] + ) return "\n".join(script) + "\n" @@ -526,7 +539,7 @@ def export_user(organisation, user): userobj = organisation.get_user(user) if userobj is None: msg = "User {} doesn't exist in organisation {}." - sys.exit(msg.format(userobj.name, organisation.name)) + sys.exit(msg.format(user, organisation.name)) sys.stdout.write(userobj.export()) diff --git a/nixos/modules/services/monitoring/arbtt.nix b/nixos/modules/services/monitoring/arbtt.nix index 27d59e367d5..1135c2c441c 100644 --- a/nixos/modules/services/monitoring/arbtt.nix +++ b/nixos/modules/services/monitoring/arbtt.nix @@ -49,7 +49,7 @@ in { config = mkIf cfg.enable { systemd.user.services.arbtt = { description = "arbtt statistics capture service"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "default.target" ]; serviceConfig = { Type = "simple"; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index b9e4015c238..97806d5d83e 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ options, config, lib, pkgs, ... }: with lib; @@ -232,9 +232,10 @@ in { }; config = mkIf cfg.enable { - warnings = [ - "Grafana passwords will be stored as plaintext in the Nix store!" - ]; + warnings = optional ( + cfg.database.password != options.services.grafana.database.password.default || + cfg.security.adminPassword != options.services.grafana.security.adminPassword.default + ) "Grafana passwords will be stored as plaintext in the Nix store!"; environment.systemPackages = [ cfg.package ]; diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 57df16b58d9..6d2ce538368 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -34,7 +34,7 @@ let cap=$(sed -nr 's/.*#%#\s+capabilities\s*=\s*(.+)/\1/p' $file) wrapProgram $file \ - --set PATH "/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/bin" \ + --set PATH "/run/wrappers/bin:/run/current-system/sw/bin:/run/current-system/sw/bin" \ --set MUNIN_LIBDIR "${pkgs.munin}/lib" \ --set MUNIN_PLUGSTATE "/var/run/munin" @@ -183,7 +183,7 @@ in mkdir -p /etc/munin/plugins rm -rf /etc/munin/plugins/* - PATH="/var/setuid-wrappers:/run/current-system/sw/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 + PATH="/run/wrappers/bin:/run/current-system/sw/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 ''; serviceConfig = { ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/"; diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix index 7a343299c31..388e4d4ac01 100644 --- a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix @@ -54,6 +54,7 @@ in { 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} \ diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index f2834f288f9..4d10299a987 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -124,7 +124,7 @@ in }; mailer = mkOption { - default = "/var/setuid-wrappers/sendmail"; + default = "/run/wrappers/bin/sendmail"; type = types.path; description = '' Sendmail-compatible binary to be used to send the messages. diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix new file mode 100644 index 00000000000..f6be7c7fd34 --- /dev/null +++ b/nixos/modules/services/monitoring/vnstat.nix @@ -0,0 +1,43 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.vnstat; +in { + options.services.vnstat = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable update of network usage statistics via vnstatd. + ''; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers.vnstatd = { + isSystemUser = true; + description = "vnstat daemon user"; + home = "/var/lib/vnstat"; + createHome = true; + }; + + systemd.services.vnstat = { + description = "vnStat network traffic monitor"; + path = [ pkgs.coreutils ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig.documentation = "man:vnstatd(1) man:vnstat(1) man:vnstat.conf(5)"; + preStart = "chmod 755 /var/lib/vnstat"; + serviceConfig = { + ExecStart = "${pkgs.vnstat}/bin/vnstatd -n"; + ExecReload = "kill -HUP $MAINPID"; + ProtectHome = true; + PrivateDevices = true; + PrivateTmp = true; + User = "vnstatd"; + }; + }; + }; +} diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix new file mode 100644 index 00000000000..a2f2c033951 --- /dev/null +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -0,0 +1,84 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + inherit (pkgs) glusterfs; + + cfg = config.services.glusterfs; + +in + +{ + + ###### interface + + options = { + + services.glusterfs = { + + enable = mkEnableOption "GlusterFS Daemon"; + + logLevel = mkOption { + type = types.enum ["DEBUG" "INFO" "WARNING" "ERROR" "CRITICAL" "TRACE" "NONE"]; + description = "Log level used by the GlusterFS daemon"; + default = "INFO"; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + description = "Extra flags passed to the GlusterFS daemon"; + default = []; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.glusterfs ]; + + services.rpcbind.enable = true; + + systemd.services.glusterd = { + + description = "GlusterFS, a clustered file-system server"; + + wantedBy = [ "multi-user.target" ]; + + requires = [ "rpcbind.service" ]; + after = [ "rpcbind.service" "network.target" "local-fs.target" ]; + before = [ "network-online.target" ]; + + preStart = '' + install -m 0755 -d /var/log/glusterfs + ''; + + serviceConfig = { + Type="forking"; + PIDFile="/run/glusterd.pid"; + LimitNOFILE=65536; + ExecStart="${glusterfs}/sbin/glusterd -p /run/glusterd.pid --log-level=${cfg.logLevel} ${toString cfg.extraFlags}"; + KillMode="process"; + }; + }; + + systemd.services.glustereventsd = { + + description = "Gluster Events Notifier"; + + wantedBy = [ "multi-user.target" ]; + + after = [ "syslog.target" "network.target" ]; + + serviceConfig = { + Type="simple"; + Environment="PYTHONPATH=${glusterfs}/usr/lib/python2.7/site-packages"; + PIDFile="/run/glustereventsd.pid"; + ExecStart="${glusterfs}/sbin/glustereventsd --pid-file /run/glustereventsd.pid"; + ExecReload="/bin/kill -SIGUSR2 $MAINPID"; + KillMode="control-group"; + }; + }; + }; +} diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index d43147a16f3..e6e04248854 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -104,30 +104,72 @@ in }; }; - systemd.services.ipfs = { - description = "IPFS Daemon"; + systemd.services.ipfs-init = { + description = "IPFS Initializer"; + + after = [ "local-fs.target" ]; + before = [ "ipfs.service" "ipfs-offline.service" ]; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "local-fs.target" ]; path = [ pkgs.ipfs pkgs.su pkgs.bash ]; preStart = '' install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir} + ''; + + script = '' if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then cd ${cfg.dataDir} - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c \ - "${ipfs}/bin/ipfs init ${if cfg.emptyRepo then "-e" else ""}" + ${ipfs}/bin/ipfs init ${optionalString cfg.emptyRepo "-e"} fi - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c \ - "${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress} && \ - ${ipfs}/bin/ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}" + ${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress} + ${ipfs}/bin/ipfs --local config Addresses.Gateway ${cfg.gatewayAddress} ''; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + Type = "oneshot"; + RemainAfterExit = true; + PermissionsStartOnly = true; + }; + }; + + systemd.services.ipfs = { + description = "IPFS Daemon"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "local-fs.target" "ipfs-init.service" ]; + + conflicts = [ "ipfs-offline.service" ]; + wants = [ "ipfs-init.service" ]; + + path = [ pkgs.ipfs ]; + serviceConfig = { ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags}"; User = cfg.user; Group = cfg.group; - PermissionsStartOnly = true; + Restart = "on-failure"; + RestartSec = 1; + }; + }; + + systemd.services.ipfs-offline = { + description = "IPFS Daemon (offline mode)"; + + after = [ "local-fs.target" "ipfs-init.service" ]; + + conflicts = [ "ipfs.service" ]; + wants = [ "ipfs-init.service" ]; + + path = [ pkgs.ipfs ]; + + serviceConfig = { + ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags} --offline"; + User = cfg.user; + Group = cfg.group; + Restart = "on-failure"; + RestartSec = 1; }; }; }; diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix index ddc7258ce0b..7d127145101 100644 --- a/nixos/modules/services/network-filesystems/nfsd.nix +++ b/nixos/modules/services/network-filesystems/nfsd.nix @@ -20,6 +20,7 @@ in server = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable the kernel's NFS server. @@ -27,6 +28,7 @@ in }; exports = mkOption { + type = types.lines; default = ""; description = '' Contents of the /etc/exports file. See @@ -36,6 +38,7 @@ in }; hostName = mkOption { + type = types.nullOr types.str; default = null; description = '' Hostname or address on which NFS requests will be accepted. @@ -46,6 +49,7 @@ in }; nproc = mkOption { + type = types.int; default = 8; description = '' Number of NFS server threads. Defaults to the recommended value of 8. @@ -53,11 +57,13 @@ in }; createMountPoints = mkOption { + type = types.bool; default = false; description = "Whether to create the mount points in the exports file at startup time."; }; mountdPort = mkOption { + type = types.nullOr types.int; default = null; example = 4002; description = '' @@ -66,11 +72,26 @@ in }; lockdPort = mkOption { - default = 0; + type = types.nullOr types.int; + default = null; + example = 4001; description = '' - Fix the lockd port number. This can help setting firewall rules for NFS. + Use a fixed port for the NFS lock manager kernel module + (lockd/nlockmgr). This is useful if the + NFS server is behind a firewall. ''; }; + + statdPort = mkOption { + type = types.nullOr types.int; + default = null; + example = 4000; + description = '' + Use a fixed port for rpc.statd. This is + useful if the NFS server is behind a firewall. + ''; + }; + }; }; @@ -82,60 +103,47 @@ in config = mkIf cfg.enable { + services.nfs.extraConfig = '' + [nfsd] + threads=${toString cfg.nproc} + ${optionalString (cfg.hostName != null) "host=${cfg.hostName}"} + + [mountd] + ${optionalString (cfg.mountdPort != null) "port=${toString cfg.mountdPort}"} + + [statd] + ${optionalString (cfg.statdPort != null) "port=${toString cfg.statdPort}"} + + [lockd] + ${optionalString (cfg.lockdPort != null) '' + port=${toString cfg.lockdPort} + udp-port=${toString cfg.lockdPort} + ''} + ''; + services.rpcbind.enable = true; boot.supportedFilesystems = [ "nfs" ]; # needed for statd and idmapd - environment.systemPackages = [ pkgs.nfs-utils ]; - environment.etc.exports.source = exports; - boot.kernelModules = [ "nfsd" ]; - - systemd.services.nfsd = - { description = "NFS Server"; - + systemd.services.nfs-server = + { enable = true; wantedBy = [ "multi-user.target" ]; - requires = [ "rpcbind.service" "mountd.service" ]; - after = [ "rpcbind.service" "mountd.service" "idmapd.service" ]; - before = [ "statd.service" ]; - - path = [ pkgs.nfs-utils ]; - - script = + preStart = '' - # Create a state directory required by NFSv4. mkdir -p /var/lib/nfs/v4recovery - - ${pkgs.procps}/sbin/sysctl -w fs.nfs.nlm_tcpport=${builtins.toString cfg.lockdPort} - ${pkgs.procps}/sbin/sysctl -w fs.nfs.nlm_udpport=${builtins.toString cfg.lockdPort} - - rpc.nfsd \ - ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} \ - ${builtins.toString cfg.nproc} ''; - - postStop = "rpc.nfsd 0"; - - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; }; - systemd.services.mountd = - { description = "NFSv3 Mount Daemon"; - - requires = [ "rpcbind.service" ]; - after = [ "rpcbind.service" "local-fs.target" ]; - - path = [ pkgs.nfs-utils pkgs.sysvtools pkgs.utillinux ]; + systemd.services.nfs-mountd = + { enable = true; + restartTriggers = [ exports ]; preStart = '' mkdir -p /var/lib/nfs - touch /var/lib/nfs/rmtab - - mountpoint -q /proc/fs/nfsd || mount -t nfsd none /proc/fs/nfsd ${optionalString cfg.createMountPoints '' @@ -146,18 +154,7 @@ in | xargs -d '\n' mkdir -p '' } - - exportfs -rav ''; - - restartTriggers = [ exports ]; - - serviceConfig.Type = "forking"; - serviceConfig.ExecStart = '' - @${pkgs.nfs-utils}/sbin/rpc.mountd rpc.mountd \ - ${if cfg.mountdPort != null then "-p ${toString cfg.mountdPort}" else ""} - ''; - serviceConfig.Restart = "always"; }; }; diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 7de85b59e2a..6ae5292fc30 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -30,7 +30,7 @@ let '' [ global ] security = ${cfg.securityType} - passwd program = /var/setuid-wrappers/passwd %u + passwd program = /run/wrappers/bin/passwd %u pam password change = ${smbToString cfg.syncPasswordsByPam} invalid users = ${smbToString cfg.invalidUsers} @@ -91,6 +91,26 @@ in ''; }; + enableNmbd = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable Samba's nmbd, which replies to NetBIOS over IP name + service requests. It also participates in the browsing protocols + which make up the Windows "Network Neighborhood" view. + ''; + }; + + enableWinbindd = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable Samba's winbindd, which provides a number of services + to the Name Service Switch capability found in most modern C libraries, + to arbitrary applications via PAM and ntlm_auth and to Samba itself. + ''; + }; + package = mkOption { type = types.package; default = pkgs.samba; @@ -185,7 +205,12 @@ in ###### implementation config = mkMerge - [ { # Always provide a smb.conf to shut up programs like smbclient and smbspool. + [ { assertions = + [ { assertion = cfg.nsswins -> cfg.enableWinbindd; + message = "If samba.nsswins is enabled, then samba.enableWinbindd must also be enabled"; + } + ]; + # Always provide a smb.conf to shut up programs like smbclient and smbspool. environment.etc = singleton { source = if cfg.enable then configFile @@ -194,7 +219,7 @@ in }; } - (mkIf config.services.samba.enable { + (mkIf cfg.enable { system.nssModules = optional cfg.nsswins samba; @@ -207,9 +232,9 @@ in }; services = { - "samba-nmbd" = daemonService "nmbd" "-F"; "samba-smbd" = daemonService "smbd" "-F"; - "samba-winbindd" = daemonService "winbindd" "-F"; + "samba-nmbd" = mkIf cfg.enableNmbd (daemonService "nmbd" "-F"); + "samba-winbindd" = mkIf cfg.enableWinbindd (daemonService "winbindd" "-F"); "samba-setup" = { description = "Samba Setup Task"; script = setupScript; diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index ab9eac3829f..3d78ac096a2 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -8,7 +8,7 @@ in options.services.tahoe = { introducers = mkOption { default = {}; - type = with types; loaOf (submodule { + type = with types; attrsOf (submodule { options = { nickname = mkOption { type = types.str; @@ -49,7 +49,7 @@ in }; nodes = mkOption { default = {}; - type = with types; loaOf (submodule { + type = with types; attrsOf (submodule { options = { nickname = mkOption { type = types.str; @@ -343,7 +343,7 @@ in preStart = '' if [ \! -d ${nodedir} ]; then mkdir -p /var/db/tahoe-lafs - tahoe create-node ${nodedir} + tahoe create-node --hostname=localhost ${nodedir} fi # Tahoe has created a predefined tahoe.cfg which we must now diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix index 5c71a1d8dda..514204db33f 100644 --- a/nixos/modules/services/networking/asterisk.nix +++ b/nixos/modules/services/networking/asterisk.nix @@ -17,7 +17,7 @@ let allConfFiles = cfg.confFiles // builtins.listToAttrs (map (x: { name = x; - value = builtins.readFile (pkgs.asterisk + "/etc/asterisk/" + x); }) + value = builtins.readFile (cfg.package + "/etc/asterisk/" + x); }) defaultConfFiles); asteriskEtc = pkgs.stdenv.mkDerivation @@ -38,7 +38,7 @@ let asteriskConf = '' [directories] astetcdir => /etc/asterisk - astmoddir => ${pkgs.asterisk}/lib/asterisk/modules + astmoddir => ${cfg.package}/lib/asterisk/modules astvarlibdir => /var/lib/asterisk astdbdir => /var/lib/asterisk astkeydir => /var/lib/asterisk @@ -47,7 +47,7 @@ let astspooldir => /var/spool/asterisk astrundir => /var/run/asterisk astlogdir => /var/log/asterisk - astsbindir => ${pkgs.asterisk}/sbin + astsbindir => ${cfg.package}/sbin ''; extraConf = cfg.extraConfig; @@ -197,11 +197,17 @@ in Additional command line arguments to pass to Asterisk. ''; }; + package = mkOption { + type = types.package; + default = pkgs.asterisk; + defaultText = "pkgs.asterisk"; + description = "The Asterisk package to use."; + }; }; }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.asterisk ]; + environment.systemPackages = [ cfg.package ]; environment.etc.asterisk.source = asteriskEtc; @@ -234,7 +240,7 @@ in # TODO: Make exceptions for /var directories that likely should be updated if [ ! -e "$d" ]; then mkdir -p "$d" - cp --recursive ${pkgs.asterisk}/"$d"/* "$d"/ + cp --recursive ${cfg.package}/"$d"/* "$d"/ chown --recursive ${asteriskUser}:${asteriskGroup} "$d" find "$d" -type d | xargs chmod 0755 fi @@ -247,8 +253,8 @@ in # FIXME: This doesn't account for arguments with spaces argString = concatStringsSep " " cfg.extraArguments; in - "${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C /etc/asterisk/asterisk.conf ${argString} -F"; - ExecReload = ''${pkgs.asterisk}/bin/asterisk -x "core reload" + "${cfg.package}/bin/asterisk -U ${asteriskUser} -C /etc/asterisk/asterisk.conf ${argString} -F"; + ExecReload = ''${cfg.package}/bin/asterisk -x "core reload" ''; Type = "forking"; PIDFile = "/var/run/asterisk/asterisk.pid"; diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix index f2ff11633b1..9bf266b3805 100644 --- a/nixos/modules/services/networking/chrony.nix +++ b/nixos/modules/services/networking/chrony.nix @@ -12,6 +12,25 @@ let cfg = config.services.chrony; + configFile = pkgs.writeText "chrony.conf" '' + ${concatMapStringsSep "\n" (server: "server " + server) cfg.servers} + + ${optionalString + cfg.initstepslew.enabled + "initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.initstepslew.servers}" + } + + driftfile ${stateDir}/chrony.drift + + keyfile ${keyFile} + + ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"} + + ${cfg.extraConfig} + ''; + + chronyFlags = "-n -m -u chrony -f ${configFile} ${toString cfg.extraFlags}"; + in { @@ -58,6 +77,13 @@ in chrony.conf ''; }; + + extraFlags = mkOption { + default = []; + example = [ "-s" ]; + type = types.listOf types.str; + description = "Extra flags passed to the chronyd command."; + }; }; }; @@ -70,25 +96,6 @@ in # Make chronyc available in the system path environment.systemPackages = [ pkgs.chrony ]; - environment.etc."chrony.conf".text = - '' - ${concatMapStringsSep "\n" (server: "server " + server) cfg.servers} - - ${optionalString - cfg.initstepslew.enabled - "initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.initstepslew.servers}" - } - - driftfile ${stateDir}/chrony.drift - - keyfile ${keyFile} - generatecommandkey - - ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"} - - ${cfg.extraConfig} - ''; - users.extraGroups = singleton { name = "chrony"; gid = config.ids.gids.chrony; @@ -124,7 +131,7 @@ in ''; serviceConfig = - { ExecStart = "${pkgs.chrony}/bin/chronyd -n -m -u chrony"; + { ExecStart = "${pkgs.chrony}/bin/chronyd ${chronyFlags}"; }; }; diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index a10851c1652..12c2677c336 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -258,9 +258,8 @@ in Restart = "always"; StartLimitInterval = 0; RestartSec = 1; - CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW"; - AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_RAW"; - ProtectSystem = "full"; + CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW CAP_SETUID"; + ProtectSystem = true; MemoryDenyWriteExecute = true; ProtectHome = true; PrivateTmp = true; diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix index f17f8c832ee..b6492996057 100644 --- a/nixos/modules/services/networking/dnschain.nix +++ b/nixos/modules/services/networking/dnschain.nix @@ -3,23 +3,28 @@ with lib; let - cfg = config.services; + cfgs = config.services; + cfg = cfgs.dnschain; - dnschainConf = pkgs.writeText "dnschain.conf" '' + dataDir = "/var/lib/dnschain"; + username = "dnschain"; + + configFile = pkgs.writeText "dnschain.conf" '' [log] - level=info + level = info [dns] - host = 127.0.0.1 - port = 5333 + host = ${cfg.dns.address} + port = ${toString cfg.dns.port} oldDNSMethod = NO_OLD_DNS - # TODO: check what that address is acutally used for - externalIP = 127.0.0.1 + externalIP = ${cfg.dns.address} [http] - host = 127.0.0.1 - port=8088 - tlsPort=4443 + host = ${cfg.api.hostname} + port = ${toString cfg.api.port} + tlsPort = ${toString cfg.api.tlsPort} + + ${cfg.extraConfig} ''; in @@ -32,28 +37,81 @@ in services.dnschain = { - enable = mkOption { - type = types.bool; - default = false; + enable = mkEnableOption '' + DNSChain, a blockchain based DNS + HTTP server. + To resolve .bit domains set services.namecoind.enable = true; + and an RPC username/password. + ''; + + dns.address = mkOption { + type = types.str; + default = "127.0.0.1"; description = '' - Whether to run dnschain. That implies running - namecoind as well, so make sure to configure - it appropriately. + The IP address that will be used to reach this machine. + Leave this unchanged if you do not wish to directly expose the DNSChain resolver. + ''; + }; + + dns.port = mkOption { + type = types.int; + default = 5333; + description = '' + The port the DNSChain resolver will bind to. + ''; + }; + + api.hostname = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + The hostname (or IP address) the DNSChain API server will bind to. + ''; + }; + + api.port = mkOption { + type = types.int; + default = 8080; + description = '' + The port the DNSChain API server (HTTP) will bind to. + ''; + }; + + api.tlsPort = mkOption { + type = types.int; + default = 4433; + description = '' + The port the DNSChain API server (HTTPS) will bind to. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + [log] + level = debug + ''; + description = '' + Additional options that will be appended to the configuration file. ''; }; }; - services.dnsmasq = { - resolveDnschainQueries = mkOption { - type = types.bool; - default = false; - description = '' - Resolve .bit top-level domains - with dnschain and namecoind. - ''; - }; + services.dnsmasq.resolveDNSChainQueries = mkOption { + type = types.bool; + default = false; + description = '' + Resolve .bit top-level domains using DNSChain and namecoin. + ''; + }; + services.pdns-recursor.resolveDNSChainQueries = mkOption { + type = types.bool; + default = false; + description = '' + Resolve .bit top-level domains using DNSChain and namecoin. + ''; }; }; @@ -61,48 +119,47 @@ in ###### implementation - config = mkIf cfg.dnschain.enable { + config = mkIf cfg.enable { - services.namecoind.enable = true; + services.dnsmasq.servers = optionals cfgs.dnsmasq.resolveDNSChainQueries + [ "/.bit/127.0.0.1#${toString cfg.dns.port}" + "/.dns/127.0.0.1#${toString cfg.dns.port}" + ]; - services.dnsmasq.servers = optionals cfg.dnsmasq.resolveDnschainQueries [ "/.bit/127.0.0.1#5333" ]; - - users.extraUsers = singleton - { name = "dnschain"; - uid = config.ids.uids.dnschain; - extraGroups = [ "namecoin" ]; - description = "Dnschain daemon user"; - home = "/var/lib/dnschain"; - createHome = true; + services.pdns-recursor.forwardZones = mkIf cfgs.pdns-recursor.resolveDNSChainQueries + { bit = "127.0.0.1:${toString cfg.dns.port}"; + dns = "127.0.0.1:${toString cfg.dns.port}"; }; - systemd.services.dnschain = { - description = "Dnschain Daemon"; - after = [ "namecoind.target" ]; - wantedBy = [ "multi-user.target" ]; - path = [ pkgs.openssl ]; - preStart = '' - # Link configuration file into dnschain HOME directory - if [ "$(${pkgs.coreutils}/bin/realpath /var/lib/dnschain/.dnschain.conf)" != "${dnschainConf}" ]; then - rm -rf /var/lib/dnschain/.dnschain.conf - ln -s ${dnschainConf} /var/lib/dnschain/.dnschain.conf - fi + users.extraUsers = singleton { + name = username; + description = "DNSChain daemon user"; + home = dataDir; + createHome = true; + uid = config.ids.uids.dnschain; + extraGroups = optional cfgs.namecoind.enable "namecoin"; + }; - # Create empty namecoin.conf so that dnschain is not - # searching for /etc/namecoin/namecoin.conf - if [ ! -e /var/lib/dnschain/.namecoin/namecoin.conf ]; then - mkdir -p /var/lib/dnschain/.namecoin - touch /var/lib/dnschain/.namecoin/namecoin.conf - fi - ''; - serviceConfig = { - Type = "simple"; - User = "dnschain"; - EnvironmentFile = config.services.namecoind.userFile; - ExecStart = "${pkgs.dnschain}/bin/dnschain --rpcuser=\${USER} --rpcpassword=\${PASSWORD} --rpcport=8336"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - ExecStop = "${pkgs.coreutils}/bin/kill -KILL $MAINPID"; - }; + systemd.services.dnschain = { + description = "DNSChain daemon"; + after = optional cfgs.namecoind.enable "namecoind.target"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = "dnschain"; + Restart = "on-failure"; + ExecStart = "${pkgs.dnschain}/bin/dnschain"; + }; + + preStart = '' + # Link configuration file into dnschain home directory + configPath=${dataDir}/.dnschain/dnschain.conf + mkdir -p ${dataDir}/.dnschain + if [ "$(realpath $configPath)" != "${configFile}" ]; then + rm -f $configPath + ln -s ${configFile} $configPath + fi + ''; }; }; diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix new file mode 100644 index 00000000000..85fac660d52 --- /dev/null +++ b/nixos/modules/services/networking/dnscrypt-wrapper.nix @@ -0,0 +1,187 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + cfg = config.services.dnscrypt-wrapper; + dataDir = "/var/lib/dnscrypt-wrapper"; + + daemonArgs = with cfg; [ + "--listen-address=${address}:${toString port}" + "--resolver-address=${upstream.address}:${toString upstream.port}" + "--provider-name=${providerName}" + "--provider-publickey-file=public.key" + "--provider-secretkey-file=secret.key" + "--provider-cert-file=${providerName}.crt" + "--crypt-secretkey-file=${providerName}.key" + ]; + + genKeys = '' + # generates time-limited keypairs + keyGen() { + dnscrypt-wrapper --gen-crypt-keypair \ + --crypt-secretkey-file=${cfg.providerName}.key + + dnscrypt-wrapper --gen-cert-file \ + --crypt-secretkey-file=${cfg.providerName}.key \ + --provider-cert-file=${cfg.providerName}.crt \ + --provider-publickey-file=public.key \ + --provider-secretkey-file=secret.key \ + --cert-file-expire-days=${toString cfg.keys.expiration} + } + + cd ${dataDir} + + # generate provider keypair (first run only) + if [ ! -f public.key ] || [ ! -f secret.key ]; then + dnscrypt-wrapper --gen-provider-keypair + fi + + # generate new keys for rotation + if [ ! -f ${cfg.providerName}.key ] || [ ! -f ${cfg.providerName}.crt ]; then + keyGen + fi + ''; + + rotateKeys = '' + # check if keys are not expired + keyValid() { + fingerprint=$(dnscrypt-wrapper --show-provider-publickey-fingerprint | awk '{print $(NF)}') + dnscrypt-proxy --test=${toString (cfg.keys.checkInterval + 1)} \ + --resolver-address=127.0.0.1:${toString cfg.port} \ + --provider-name=${cfg.providerName} \ + --provider-key=$fingerprint + } + + cd ${dataDir} + + # archive old keys and restart the service + if ! keyValid; then + mkdir -p oldkeys + mv ${cfg.providerName}.key oldkeys/${cfg.providerName}-$(date +%F-%T).key + mv ${cfg.providerName}.crt oldkeys/${cfg.providerName}-$(date +%F-%T).crt + systemctl restart dnscrypt-wrapper + fi + ''; + +in { + + + ###### interface + + options.services.dnscrypt-wrapper = { + enable = mkEnableOption "DNSCrypt wrapper"; + + address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + The DNSCrypt wrapper will bind to this IP address. + ''; + }; + + port = mkOption { + type = types.int; + default = 5353; + description = '' + The DNSCrypt wrapper will listen for DNS queries on this port. + ''; + }; + + providerName = mkOption { + type = types.str; + default = "2.dnscrypt-cert.${config.networking.hostName}"; + example = "2.dnscrypt-cert.myresolver"; + description = '' + The name that will be given to this DNSCrypt resolver. + Note: the resolver name must start with 2.dnscrypt-cert.. + ''; + }; + + upstream.address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + The IP address of the upstream DNS server DNSCrypt will "wrap". + ''; + }; + + upstream.port = mkOption { + type = types.int; + default = 53; + description = '' + The port of the upstream DNS server DNSCrypt will "wrap". + ''; + }; + + keys.expiration = mkOption { + type = types.int; + default = 30; + description = '' + The duration (in days) of the time-limited secret key. + This will be automatically rotated before expiration. + ''; + }; + + keys.checkInterval = mkOption { + type = types.int; + default = 1440; + description = '' + The time interval (in minutes) between key expiration checks. + ''; + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + users.users.dnscrypt-wrapper = { + description = "dnscrypt-wrapper daemon user"; + home = "${dataDir}"; + createHome = true; + }; + users.groups.dnscrypt-wrapper = { }; + + + systemd.services.dnscrypt-wrapper = { + description = "dnscrypt-wrapper daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.dnscrypt-wrapper ]; + + serviceConfig = { + User = "dnscrypt-wrapper"; + WorkingDirectory = dataDir; + Restart = "on-failure"; + ExecStart = "${pkgs.dnscrypt-wrapper}/bin/dnscrypt-wrapper ${toString daemonArgs}"; + }; + + preStart = genKeys; + }; + + + systemd.services.dnscrypt-wrapper-rotate = { + after = [ "network.target" ]; + requires = [ "dnscrypt-wrapper.service" ]; + description = "Rotates DNSCrypt wrapper keys if soon to expire"; + + path = with pkgs; [ dnscrypt-wrapper dnscrypt-proxy gawk ]; + script = rotateKeys; + }; + + + systemd.timers.dnscrypt-wrapper-rotate = { + description = "Periodically check DNSCrypt wrapper keys for expiration"; + wantedBy = [ "multi-user.target" ]; + + timerConfig = { + Unit = "dnscrypt-wrapper-rotate.service"; + OnBootSec = "1min"; + OnUnitActiveSec = cfg.keys.checkInterval * 60; + }; + }; + + }; +} diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index c251b52e03f..243cd04c96c 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -38,10 +38,9 @@ let cfg = config.networking.firewall; - kernelPackages = config.boot.kernelPackages; + inherit (config.boot.kernelPackages) kernel; - kernelHasRPFilter = kernelPackages.kernel.features.netfilterRPFilter or false; - kernelCanDisableHelpers = kernelPackages.kernel.features.canDisableNetfilterConntrackHelpers or false; + kernelHasRPFilter = ((kernel.config.isEnabled or (x: false)) "IP_NF_MATCH_RPFILTER") || (kernel.features.netfilterRPFilter or false); helpers = '' @@ -426,7 +425,7 @@ in networking.firewall.connectionTrackingModules = mkOption { type = types.listOf types.str; - default = [ "ftp" ]; + default = [ ]; example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ]; description = '' @@ -435,9 +434,11 @@ in As helpers can pose as a security risk, it is advised to set this to an empty list and disable the setting - networking.firewall.autoLoadConntrackHelpers + networking.firewall.autoLoadConntrackHelpers unless you + know what you are doing. Connection tracking is disabled + by default. - Loading of helpers is recommended to be done through the new + Loading of helpers is recommended to be done through the CT target. More info: https://home.regit.org/netfilter-en/secure-use-of-helpers/ ''; @@ -445,7 +446,7 @@ in networking.firewall.autoLoadConntrackHelpers = mkOption { type = types.bool; - default = true; + default = false; description = '' Whether to auto-load connection-tracking helpers. @@ -505,15 +506,14 @@ in environment.systemPackages = [ pkgs.iptables ] ++ cfg.extraPackages; - boot.kernelModules = map (x: "nf_conntrack_${x}") cfg.connectionTrackingModules; - boot.extraModprobeConfig = optionalString (!cfg.autoLoadConntrackHelpers) '' - options nf_conntrack nf_conntrack_helper=0 + boot.kernelModules = (optional cfg.autoLoadConntrackHelpers "nf_conntrack") + ++ map (x: "nf_conntrack_${x}") cfg.connectionTrackingModules; + boot.extraModprobeConfig = optionalString cfg.autoLoadConntrackHelpers '' + options nf_conntrack nf_conntrack_helper=1 ''; assertions = [ { assertion = (cfg.checkReversePath != false) || kernelHasRPFilter; message = "This kernel does not support rpfilter"; } - { assertion = cfg.autoLoadConntrackHelpers || kernelCanDisableHelpers; - message = "This kernel does not support disabling conntrack helpers"; } ]; systemd.services.firewall = { diff --git a/nixos/modules/services/networking/gale.nix b/nixos/modules/services/networking/gale.nix index bc975159cdf..fd83f9e3c1b 100644 --- a/nixos/modules/services/networking/gale.nix +++ b/nixos/modules/services/networking/gale.nix @@ -141,7 +141,7 @@ in setgid = false; }; - security.setuidOwners = [ cfg.setuidWrapper ]; + security.wrappers.gksign = cfg.setuidWrapper; systemd.services.gale-galed = { description = "Gale messaging daemon"; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index abb7a4e9137..c5b27350b3c 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -8,7 +8,7 @@ let homeDir = "/var/lib/i2pd"; - extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')"; + extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sLf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')"; toYesNo = b: if b then "true" else "false"; diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix new file mode 100644 index 00000000000..18e2ab9aebf --- /dev/null +++ b/nixos/modules/services/networking/kresd.nix @@ -0,0 +1,119 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.kresd; + package = pkgs.knot-resolver; + + configFile = pkgs.writeText "kresd.conf" cfg.extraConfig; +in + +{ + meta.maintainers = [ maintainers.vcunat /* upstream developer */ ]; + + ###### interface + options.services.kresd = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable knot-resolver domain name server. + DNSSEC validation is turned on by default. + You can run sudo nc -U /run/kresd/control + and give commands interactively to kresd. + ''; + }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra lines to be added verbatim to the generated configuration file. + ''; + }; + cacheDir = mkOption { + type = types.path; + default = "/var/cache/kresd"; + description = '' + Directory for caches. They are intended to survive reboots. + ''; + }; + interfaces = mkOption { + type = with types; listOf str; + default = [ "::1" "127.0.0.1" ]; + description = '' + What addresses the server should listen on. + ''; + }; + # TODO: perhaps options for more common stuff like cache size or forwarding + }; + + ###### implementation + config = mkIf cfg.enable { + environment.etc."kresd.conf".source = configFile; # not required + + users.extraUsers = singleton + { name = "kresd"; + uid = config.ids.uids.kresd; + group = "kresd"; + description = "Knot-resolver daemon user"; + }; + users.extraGroups = singleton + { name = "kresd"; + gid = config.ids.gids.kresd; + }; + + systemd.sockets.kresd = rec { + wantedBy = [ "sockets.target" ]; + before = wantedBy; + listenStreams = map + # Syntax depends on being IPv6 or IPv4. + (iface: if elem ":" (stringToCharacters iface) then "[${iface}]:53" else "${iface}:53") + cfg.interfaces; + socketConfig.ListenDatagram = listenStreams; + }; + + systemd.sockets.kresd-control = rec { + wantedBy = [ "sockets.target" ]; + before = wantedBy; + partOf = [ "kresd.socket" ]; + listenStreams = [ "/run/kresd/control" ]; + socketConfig = { + FileDescriptorName = "control"; + Service = "kresd.service"; + SocketMode = "0660"; # only root user/group may connect + }; + }; + + # 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.services.kresd = { + description = "Knot-resolver daemon"; + + serviceConfig = { + User = "kresd"; + Type = "notify"; + WorkingDirectory = cfg.cacheDir; + }; + + script = '' + exec '${package}/bin/kresd' --config '${configFile}' \ + -k '${cfg.cacheDir}/root.key' + ''; + + after = [ "kresd-cachedir.service" ]; + requires = [ "kresd.socket" "kresd-cachedir.service" ]; + wantedBy = [ "sockets.target" ]; + }; + }; +} diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix index 3866b216f8e..c87e738d2a2 100644 --- a/nixos/modules/services/networking/libreswan.nix +++ b/nixos/modules/services/networking/libreswan.nix @@ -102,7 +102,7 @@ in serviceConfig = { Type = "simple"; Restart = "always"; - EnvironmentFile = "${pkgs.libreswan}/etc/sysconfig/pluto"; + EnvironmentFile = "-${pkgs.libreswan}/etc/sysconfig/pluto"; ExecStartPre = [ "${libexec}/addconn --config ${configFile} --checkconfig" "${libexec}/_stackmanager start" diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix index 83fc1ec6667..9df9f67cde8 100644 --- a/nixos/modules/services/networking/namecoind.nix +++ b/nixos/modules/services/networking/namecoind.nix @@ -3,25 +3,35 @@ with lib; let - cfg = config.services.namecoind; + cfg = config.services.namecoind; + dataDir = "/var/lib/namecoind"; + useSSL = (cfg.rpc.certificate != null) && (cfg.rpc.key != null); + useRPC = (cfg.rpc.user != null) && (cfg.rpc.password != null); - namecoinConf = - let - useSSL = (cfg.rpcCertificate != null) && (cfg.rpcKey != null); - in - pkgs.writeText "namecoin.conf" '' + listToConf = option: list: + concatMapStrings (value :"${option}=${value}\n") list; + + configFile = pkgs.writeText "namecoin.conf" ('' server=1 daemon=0 - rpcallowip=127.0.0.1 - walletpath=${cfg.wallet} - gen=${if cfg.generate then "1" else "0"} - rpcssl=${if useSSL then "1" else "0"} - ${optionalString useSSL "rpcsslcertificatechainfile=${cfg.rpcCertificate}"} - ${optionalString useSSL "rpcsslprivatekeyfile=${cfg.rpcKey}"} - ${optionalString useSSL "rpcsslciphers=TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH"} txindex=1 txprevcache=1 - ''; + walletpath=${cfg.wallet} + gen=${if cfg.generate then "1" else "0"} + ${listToConf "addnode" cfg.extraNodes} + ${listToConf "connect" cfg.trustedNodes} + '' + optionalString useRPC '' + rpcbind=${cfg.rpc.address} + rpcport=${toString cfg.rpc.port} + rpcuser=${cfg.rpc.user} + rpcpassword=${cfg.rpc.password} + ${listToConf "rpcallowip" cfg.rpc.allowFrom} + '' + optionalString useSSL '' + rpcssl=1 + rpcsslcertificatechainfile=${cfg.rpc.certificate} + rpcsslprivatekeyfile=${cfg.rpc.key} + rpcsslciphers=TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH + ''); in @@ -33,40 +43,17 @@ in services.namecoind = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to run namecoind. - ''; - }; + enable = mkEnableOption "namecoind, Namecoin client."; wallet = mkOption { type = types.path; - example = "/etc/namecoin/wallet.dat"; + default = "${dataDir}/wallet.dat"; description = '' Wallet file. The ownership of the file has to be namecoin:namecoin, and the permissions must be 0640. ''; }; - userFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/etc/namecoin/user"; - description = '' - File containing the user name and user password to - authenticate RPC connections to namecoind. - The content of the file is of the form: - - USER=namecoin - PASSWORD=secret - - The ownership of the file has to be namecoin:namecoin, - and the permissions must be 0640. - ''; - }; - generate = mkOption { type = types.bool; default = false; @@ -75,24 +62,83 @@ in ''; }; - rpcCertificate = mkOption { + extraNodes = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + List of additional peer IP addresses to connect to. + ''; + }; + + trustedNodes = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + List of the only peer IP addresses to connect to. If specified + no other connection will be made. + ''; + }; + + 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 = "0.0.0.0"; + description = '' + IP address the RPC server will bind to. + ''; + }; + + rpc.port = mkOption { + type = types.int; + default = 8332; + description = '' + Port the RPC server will bind to. + ''; + }; + + rpc.certificate = mkOption { type = types.nullOr types.path; default = null; - example = "/etc/namecoin/server.cert"; + example = "/var/lib/namecoind/server.cert"; description = '' Certificate file for securing RPC connections. ''; }; - rpcKey = mkOption { + rpc.key = mkOption { type = types.nullOr types.path; default = null; - example = "/etc/namecoin/server.pem"; + example = "/var/lib/namecoind/server.pem"; description = '' Key file for securing RPC connections. ''; }; + + rpc.allowFrom = mkOption { + type = types.listOf types.str; + default = [ "127.0.0.1" ]; + description = '' + List of IP address ranges allowed to use the RPC API. + Wiledcards (*) can be user to specify a range. + ''; + }; + }; }; @@ -102,47 +148,54 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton - { name = "namecoin"; - uid = config.ids.uids.namecoin; - description = "Namecoin daemon user"; - home = "/var/lib/namecoin"; - createHome = true; - }; + services.dnschain.extraConfig = '' + [namecoin] + config = ${configFile} + ''; - users.extraGroups = singleton - { name = "namecoin"; - gid = config.ids.gids.namecoin; - }; + users.extraUsers = singleton { + name = "namecoin"; + uid = config.ids.uids.namecoin; + description = "Namecoin daemon user"; + home = dataDir; + createHome = true; + }; + + users.extraGroups = singleton { + name = "namecoin"; + gid = config.ids.gids.namecoin; + }; systemd.services.namecoind = { - description = "Namecoind Daemon"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - preStart = '' - if [ "$(stat --printf '%u' ${cfg.userFile})" != "${toString config.ids.uids.namecoin}" \ - -o "$(stat --printf '%g' ${cfg.userFile})" != "${toString config.ids.gids.namecoin}" \ - -o "$(stat --printf '%a' ${cfg.userFile})" != "640" ]; then - echo "ERROR: bad ownership or rights on ${cfg.userFile}" >&2 - exit 1 - fi - if [ "$(stat --printf '%u' ${cfg.wallet})" != "${toString config.ids.uids.namecoin}" \ - -o "$(stat --printf '%g' ${cfg.wallet})" != "${toString config.ids.gids.namecoin}" \ - -o "$(stat --printf '%a' ${cfg.wallet})" != "640" ]; then - echo "ERROR: bad ownership or rights on ${cfg.wallet}" >&2 - exit 1 - fi - ''; - serviceConfig = { - Type = "simple"; - User = "namecoin"; - EnvironmentFile = cfg.userFile; - ExecStart = "${pkgs.altcoins.namecoind}/bin/namecoind -conf=${namecoinConf} -rpcuser=\${USER} -rpcpassword=\${PASSWORD} -printtoconsole"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - ExecStop = "${pkgs.coreutils}/bin/kill -KILL $MAINPID"; - StandardOutput = "null"; - Nice = "10"; - }; + description = "Namecoind daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = "namecoin"; + Griup = "namecoin"; + ExecStart = "${pkgs.altcoins.namecoind}/bin/namecoind -conf=${configFile} -datadir=${dataDir} -printtoconsole"; + ExecStop = "${pkgs.coreutils}/bin/kill -KILL $MAINPID"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + Nice = "10"; + PrivateTmp = true; + TimeoutStopSec = "60s"; + TimeoutStartSec = "2s"; + Restart = "always"; + StartLimitInterval = "120s"; + StartLimitBurst = "5"; + }; + + preStart = optionalString (cfg.wallet != "${dataDir}/wallet.dat") '' + # check wallet file permissions + if [ "$(stat --printf '%u' ${cfg.wallet})" != "${toString config.ids.uids.namecoin}" \ + -o "$(stat --printf '%g' ${cfg.wallet})" != "${toString config.ids.gids.namecoin}" \ + -o "$(stat --printf '%a' ${cfg.wallet})" != "640" ]; then + echo "ERROR: bad ownership or rights on ${cfg.wallet}" >&2 + exit 1 + fi + ''; + }; }; diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix index da6487dbd49..4864ecf3f92 100644 --- a/nixos/modules/services/networking/nylon.nix +++ b/nixos/modules/services/networking/nylon.nix @@ -8,7 +8,7 @@ let homeDir = "/var/lib/nylon"; - configFile = pkgs.writeText "nylon.conf" '' + configFile = cfg: pkgs.writeText "nylon-${cfg.name}.conf" '' [General] No-Simultaneous-Conn=${toString cfg.nrConnections} Log=${if cfg.logging then "1" else "0"} @@ -22,15 +22,9 @@ let Deny-IP=${concatStringsSep " " cfg.deniedIPRanges} ''; -in + nylonOpts = { name, config, ... }: { -{ - - ###### interface - - options = { - - services.nylon = { + options = { enable = mkOption { type = types.bool; @@ -40,6 +34,12 @@ in ''; }; + name = mkOption { + type = types.str; + default = ""; + description = "The name of this nylon instance."; + }; + nrConnections = mkOption { type = types.int; default = 10; @@ -107,13 +107,51 @@ in ''; }; }; + config = { name = mkDefault name; }; + }; + + mkNamedNylon = cfg: { + "nylon-${cfg.name}" = { + description = "Nylon, a lightweight SOCKS proxy server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = + { + User = "nylon"; + Group = "nylon"; + WorkingDirectory = homeDir; + ExecStart = "${pkgs.nylon}/bin/nylon -f -c ${configFile cfg}"; + }; + }; + }; + + anyNylons = collect (p: p ? enable) cfg; + enabledNylons = filter (p: p.enable == true) anyNylons; + nylonUnits = map (nylon: mkNamedNylon nylon) enabledNylons; + +in + +{ + + ###### interface + + options = { + + services.nylon = mkOption { + default = {}; + description = "Collection of named nylon instances"; + type = with types; loaOf (submodule nylonOpts); + internal = true; + options = [ nylonOpts ]; + }; + }; ###### implementation - config = mkIf cfg.enable { + config = mkIf (length(enabledNylons) > 0) { - users.extraUsers.nylon= { + users.extraUsers.nylon = { group = "nylon"; description = "Nylon SOCKS Proxy"; home = homeDir; @@ -123,17 +161,7 @@ in users.extraGroups.nylon.gid = config.ids.gids.nylon; - systemd.services.nylon = { - description = "Nylon, a lightweight SOCKS proxy server"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = - { - User = "nylon"; - Group = "nylon"; - WorkingDirectory = homeDir; - ExecStart = "${pkgs.nylon}/bin/nylon -f -c ${configFile}"; - }; - }; + systemd.services = fold (a: b: a // b) {} nylonUnits; + }; } diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix new file mode 100644 index 00000000000..26be72d2a61 --- /dev/null +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -0,0 +1,168 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + dataDir = "/var/lib/pdns-recursor"; + username = "pdns-recursor"; + + cfg = config.services.pdns-recursor; + zones = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones; + + configFile = pkgs.writeText "recursor.conf" '' + local-address=${cfg.dns.address} + local-port=${toString cfg.dns.port} + allow-from=${concatStringsSep "," cfg.dns.allowFrom} + + webserver-address=${cfg.api.address} + webserver-port=${toString cfg.api.port} + webserver-allow-from=${concatStringsSep "," cfg.api.allowFrom} + + forward-zones=${concatStringsSep "," zones} + export-etc-hosts=${if cfg.exportHosts then "yes" else "no"} + dnssec=${cfg.dnssecValidation} + serve-rfc1918=${if cfg.serveRFC1918 then "yes" else "no"} + + ${cfg.extraConfig} + ''; + +in { + options.services.pdns-recursor = { + enable = mkEnableOption "PowerDNS Recursor, a recursive DNS server"; + + dns.address = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + IP address Recursor DNS server will bind to. + ''; + }; + + dns.port = mkOption { + type = types.int; + default = 53; + description = '' + Port number Recursor DNS server will bind to. + ''; + }; + + dns.allowFrom = mkOption { + type = types.listOf types.str; + default = [ "10.0.0.0/8" "172.16.0.0/12" "192.168.0.0/16" ]; + example = [ "0.0.0.0/0" ]; + description = '' + IP address ranges of clients allowed to make DNS queries. + ''; + }; + + api.address = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + IP address Recursor REST API server will bind to. + ''; + }; + + api.port = mkOption { + type = types.int; + default = 8082; + description = '' + Port number Recursor REST API server will bind to. + ''; + }; + + api.allowFrom = mkOption { + type = types.listOf types.str; + default = [ "0.0.0.0/0" ]; + description = '' + IP address ranges of clients allowed to make API requests. + ''; + }; + + exportHosts = mkOption { + type = types.bool; + default = false; + description = '' + Whether to export names and IP addresses defined in /etc/hosts. + ''; + }; + + forwardZones = mkOption { + type = types.attrs; + example = { eth = "127.0.0.1:5353"; }; + default = {}; + description = '' + DNS zones to be forwarded to other servers. + ''; + }; + + dnssecValidation = mkOption { + type = types.enum ["off" "process-no-validate" "process" "log-fail" "validate"]; + default = "validate"; + description = '' + Controls the level of DNSSEC processing done by the PowerDNS Recursor. + See https://doc.powerdns.com/md/recursor/dnssec/ for a detailed explanation. + ''; + }; + + serveRFC1918 = mkOption { + type = types.bool; + default = true; + description = '' + Whether to directly resolve the RFC1918 reverse-mapping domains: + 10.in-addr.arpa, + 168.192.in-addr.arpa, + 16-31.172.in-addr.arpa + This saves load on the AS112 servers. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra options to be appended to the configuration file. + ''; + }; + }; + + config = mkIf cfg.enable { + + users.extraUsers."${username}" = { + home = dataDir; + createHome = true; + uid = config.ids.uids.pdns-recursor; + description = "PowerDNS Recursor daemon user"; + }; + + systemd.services.pdns-recursor = { + unitConfig.Documentation = "man:pdns_recursor(1) man:rec_control(1)"; + description = "PowerDNS recursive server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + User = username; + Restart ="on-failure"; + RestartSec = "5"; + PrivateTmp = true; + PrivateDevices = true; + AmbientCapabilities = "cap_net_bind_service"; + ExecStart = ''${pkgs.pdns-recursor}/bin/pdns_recursor \ + --config-dir=${dataDir} \ + --socket-dir=${dataDir} \ + --disable-syslog + ''; + }; + + preStart = '' + # Link configuration file into recursor home directory + configPath=${dataDir}/recursor.conf + if [ "$(realpath $configPath)" != "${configFile}" ]; then + rm -f $configPath + ln -s ${configFile} $configPath + fi + ''; + }; + }; +} diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix index 9d63f549b23..8cd4a082353 100644 --- a/nixos/modules/services/networking/prayer.nix +++ b/nixos/modules/services/networking/prayer.nix @@ -18,7 +18,7 @@ let var_prefix = "${stateDir}" prayer_user = "${prayerUser}" prayer_group = "${prayerGroup}" - sendmail_path = "/var/setuid-wrappers/sendmail" + sendmail_path = "/run/wrappers/bin/sendmail" use_http_port ${cfg.port} diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index edcc12170b2..bc7d6912b5c 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -25,8 +25,8 @@ in package = mkOption { type = types.package; - default = pkgs.kde4.quasselDaemon; - defaultText = "pkgs.kde4.quasselDaemon"; + default = pkgs.quasselDaemon; + defaultText = "pkgs.quasselDaemon"; description = '' The package of the quassel daemon. ''; diff --git a/nixos/modules/services/networking/redsocks.nix b/nixos/modules/services/networking/redsocks.nix new file mode 100644 index 00000000000..a47a78f1005 --- /dev/null +++ b/nixos/modules/services/networking/redsocks.nix @@ -0,0 +1,270 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.redsocks; +in +{ + ##### interface + options = { + services.redsocks = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable redsocks."; + }; + + log_debug = mkOption { + type = types.bool; + default = false; + description = "Log connection progress."; + }; + + log_info = mkOption { + type = types.bool; + default = false; + description = "Log start and end of client sessions."; + }; + + log = mkOption { + type = types.str; + default = "stderr"; + description = + '' + Where to send logs. + + Possible values are: + - stderr + - file:/path/to/file + - syslog:FACILITY where FACILITY is any of "daemon", "local0", + etc. + ''; + }; + + chroot = mkOption { + type = with types; nullOr str; + default = null; + description = + '' + Chroot under which to run redsocks. Log file is opened before + chroot, but if logging to syslog /etc/localtime may be required. + ''; + }; + + redsocks = mkOption { + description = + '' + Local port to proxy associations to be performed. + + The example shows how to configure a proxy to handle port 80 as HTTP + relay, and all other ports as HTTP connect. + ''; + example = [ + { port = 23456; proxy = "1.2.3.4:8080"; type = "http-relay"; + redirectCondition = "--dport 80"; + doNotRedirect = [ "-d 1.2.0.0/16" ]; + } + { port = 23457; proxy = "1.2.3.4:8080"; type = "http-connect"; + redirectCondition = true; + doNotRedirect = [ "-d 1.2.0.0/16" ]; + } + ]; + type = types.listOf (types.submodule { options = { + ip = mkOption { + type = types.str; + default = "127.0.0.1"; + description = + '' + IP on which redsocks should listen. Defaults to 127.0.0.1 for + security reasons. + ''; + }; + + port = mkOption { + type = types.int; + default = 12345; + description = "Port on which redsocks should listen."; + }; + + proxy = mkOption { + type = types.str; + description = + '' + Proxy through which redsocks should forward incoming traffic. + Example: "example.org:8080" + ''; + }; + + type = mkOption { + type = types.enum [ "socks4" "socks5" "http-connect" "http-relay" ]; + description = "Type of proxy."; + }; + + login = mkOption { + type = with types; nullOr str; + default = null; + description = "Login to send to proxy."; + }; + + password = mkOption { + type = with types; nullOr str; + default = null; + description = + '' + Password to send to proxy. WARNING, this will end up + world-readable in the store! Awaiting + https://github.com/NixOS/nix/issues/8 to be able to fix. + ''; + }; + + disclose_src = mkOption { + type = types.enum [ "false" "X-Forwarded-For" "Forwarded_ip" + "Forwarded_ipport" ]; + default = "false"; + description = + '' + Way to disclose client IP to the proxy. + - "false": do not disclose + http-connect supports the following ways: + - "X-Forwarded-For": add header "X-Forwarded-For: IP" + - "Forwarded_ip": add header "Forwarded: for=IP" (see RFC7239) + - "Forwarded_ipport": add header 'Forwarded: for="IP:port"' + ''; + }; + + redirectInternetOnly = mkOption { + type = types.bool; + default = true; + description = "Exclude all non-globally-routable IPs from redsocks"; + }; + + doNotRedirect = mkOption { + type = with types; listOf str; + default = []; + description = + '' + Iptables filters that if matched will get the packet off of + redsocks. + ''; + example = [ "-d 1.2.3.4" ]; + }; + + redirectCondition = mkOption { + type = with types; either bool str; + default = false; + description = + '' + Conditions to make outbound packets go through this redsocks + instance. + + If set to false, no packet will be forwarded. If set to true, + all packets will be forwarded (except packets excluded by + redirectInternetOnly). + + If set to a string, this is an iptables filter that will be + matched against packets before getting them into redsocks. For + example, setting it to "--dport 80" will only send + packets to port 80 to redsocks. Note "-p tcp" is always + implicitly added, as udp can only be proxied through redudp or + the like. + ''; + }; + };}); + }; + + # TODO: Add support for redudp and dnstc + }; + }; + + ##### implementation + config = let + redsocks_blocks = concatMapStrings (block: + let proxy = splitString ":" block.proxy; in + '' + redsocks { + local_ip = ${block.ip}; + local_port = ${toString block.port}; + + ip = ${elemAt proxy 0}; + port = ${elemAt proxy 1}; + type = ${block.type}; + + ${optionalString (block.login != null) "login = \"${block.login}\";"} + ${optionalString (block.password != null) "password = \"${block.password}\";"} + + disclose_src = ${block.disclose_src}; + } + '') cfg.redsocks; + configfile = pkgs.writeText "redsocks.conf" + '' + base { + log_debug = ${if cfg.log_debug then "on" else "off" }; + log_info = ${if cfg.log_info then "on" else "off" }; + log = ${cfg.log}; + + daemon = off; + redirector = iptables; + + user = redsocks; + group = redsocks; + ${optionalString (cfg.chroot != null) "chroot = ${cfg.chroot};"} + } + + ${redsocks_blocks} + ''; + internetOnly = [ # TODO: add ipv6-equivalent + "-d 0.0.0.0/8" + "-d 10.0.0.0/8" + "-d 127.0.0.0/8" + "-d 169.254.0.0/16" + "-d 172.16.0.0/12" + "-d 192.168.0.0/16" + "-d 224.168.0.0/4" + "-d 240.168.0.0/4" + ]; + redCond = block: + optionalString (isString block.redirectCondition) block.redirectCondition; + iptables = concatImapStrings (idx: block: + let chain = "REDSOCKS${toString idx}"; doNotRedirect = + concatMapStringsSep "\n" + (f: "ip46tables -t nat -A ${chain} ${f} -j RETURN 2>/dev/null || true") + (block.doNotRedirect ++ (optionals block.redirectInternetOnly internetOnly)); + in + optionalString (block.redirectCondition != false) + '' + ip46tables -t nat -F ${chain} 2>/dev/null || true + ip46tables -t nat -N ${chain} 2>/dev/null || true + ${doNotRedirect} + ip46tables -t nat -A ${chain} -p tcp -j REDIRECT --to-ports ${toString block.port} + + # TODO: show errors, when it will be easily possible by a switch to + # iptables-restore + ip46tables -t nat -A OUTPUT -p tcp ${redCond block} -j ${chain} 2>/dev/null || true + '' + ) cfg.redsocks; + in + mkIf cfg.enable { + users.groups.redsocks = {}; + users.users.redsocks = { + description = "Redsocks daemon"; + group = "redsocks"; + isSystemUser = true; + }; + + systemd.services.redsocks = { + description = "Redsocks"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + script = "${pkgs.redsocks}/bin/redsocks -c ${configfile}"; + }; + + networking.firewall.extraCommands = iptables; + + networking.firewall.extraStopCommands = + concatImapStringsSep "\n" (idx: block: + let chain = "REDSOCKS${toString idx}"; in + optionalString (block.redirectCondition != false) + "ip46tables -t nat -D OUTPUT -p tcp ${redCond block} -j ${chain} 2>/dev/null || true" + ) cfg.redsocks; + }; +} diff --git a/nixos/modules/services/networking/rpcbind.nix b/nixos/modules/services/networking/rpcbind.nix index eef1e8e8cd8..cddcb09054e 100644 --- a/nixos/modules/services/networking/rpcbind.nix +++ b/nixos/modules/services/networking/rpcbind.nix @@ -2,35 +2,6 @@ with lib; -let - - netconfigFile = { - target = "netconfig"; - source = pkgs.writeText "netconfig" '' - # - # The network configuration file. This file is currently only used in - # conjunction with the TI-RPC code in the libtirpc library. - # - # Entries consist of: - # - # \ - # - # - # The and fields are always empty in this - # implementation. - # - udp tpi_clts v inet udp - - - tcp tpi_cots_ord v inet tcp - - - udp6 tpi_clts v inet6 udp - - - tcp6 tpi_cots_ord v inet6 tcp - - - rawip tpi_raw - inet - - - - local tpi_cots_ord - loopback - - - - unix tpi_cots_ord - loopback - - - - ''; - }; - -in - { ###### interface @@ -58,25 +29,18 @@ in ###### implementation config = mkIf config.services.rpcbind.enable { - environment.systemPackages = [ pkgs.rpcbind ]; - environment.etc = [ netconfigFile ]; + systemd.packages = [ pkgs.rpcbind ]; - systemd.services.rpcbind = - { description = "ONC RPC Directory Service"; - - wantedBy = [ "multi-user.target" ]; - - requires = [ "basic.target" ]; - after = [ "basic.target" ]; - - unitConfig.DefaultDependencies = false; # don't stop during shutdown - - serviceConfig.Type = "forking"; - serviceConfig.ExecStart = "@${pkgs.rpcbind}/bin/rpcbind rpcbind"; - }; + systemd.services.rpcbind = { + wantedBy = [ "multi-user.target" ]; + }; + users.extraUsers.rpc = { + group = "nogroup"; + uid = config.ids.uids.rpc; + }; }; } diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index b29db58af99..b852e4e6dc8 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -34,6 +34,11 @@ in "; }; + package = mkOption { + default = pkgs.pythonPackages.searx; + description = "searx package to use."; + }; + }; }; @@ -61,14 +66,13 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { User = "searx"; - ExecStart = "${pkgs.pythonPackages.searx}/bin/searx-run"; + ExecStart = "${cfg.package}/bin/searx-run"; }; } // (optionalAttrs (configFile != "") { environment.SEARX_SETTINGS_PATH = configFile; }); - - environment.systemPackages = [ pkgs.pythonPackages.searx ]; + environment.systemPackages = [ cfg.package ]; }; diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index 04312c39062..bac79474527 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -226,7 +226,7 @@ in sendmail = mkOption { type = types.nullOr types.path; default = null; - example = "/var/setuid-wrappers/sendmail"; + example = "/run/wrappers/bin/sendmail"; description = "Use this sendmail compatible script to deliver alerts"; }; smokeMailTemplate = mkOption { @@ -273,7 +273,10 @@ in message = "services.smokeping: sendmail and Mailhost cannot both be enabled."; } ]; - security.setuidPrograms = [ "fping" ]; + security.wrappers = { + fping.source = "${pkgs.fping}/bin/fping"; + "fping6".source = "${pkgs.fping}/bin/fping6"; + }; environment.systemPackages = [ pkgs.fping ]; users.extraUsers = singleton { name = cfg.user; diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix index 0c459fb1dd0..31d11548f19 100644 --- a/nixos/modules/services/networking/supplicant.nix +++ b/nixos/modules/services/networking/supplicant.nix @@ -82,7 +82,8 @@ in configFile = { path = mkOption { - type = types.path; + type = types.nullOr types.path; + default = null; example = literalExample "/etc/wpa_supplicant.conf"; description = '' External wpa_supplicant.conf configuration file. diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index f8e68fda7fc..6cb40185274 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -18,7 +18,7 @@ in networks = mkOption { default = { }; - type = with types; loaOf (submodule { + type = with types; attrsOf (submodule { options = { extraConfig = mkOption { @@ -59,7 +59,7 @@ in hosts = mkOption { default = { }; - type = types.loaOf types.lines; + type = types.attrsOf types.lines; description = '' The name of the host in the network as well as the configuration for that host. This name should only contain alphanumerics and underscores. diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 76ba78ff366..0d41e3ea92c 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -208,7 +208,7 @@ in networks = mkOption { default = { }; - type = with types; loaOf (submodule networkOpts); + type = with types; attrsOf (submodule networkOpts); description = '' IRC networks to connect the user to. ''; diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix index 2070b2ffa01..0216c9771c9 100644 --- a/nixos/modules/services/scheduling/atd.nix +++ b/nixos/modules/services/scheduling/atd.nix @@ -42,13 +42,14 @@ in config = mkIf cfg.enable { - security.setuidOwners = map (program: { - inherit program; + security.wrappers = builtins.listToAttrs ( + map (program: { name = "${program}"; value = { + source = "${at}/bin/${program}"; owner = "atd"; group = "atd"; setuid = true; setgid = true; - }) [ "at" "atq" "atrm" "batch" ]; + };}) [ "at" "atq" "atrm" "batch" ]); environment.systemPackages = [ at ]; diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix index f5e132fd77d..6eb277d0a2f 100644 --- a/nixos/modules/services/scheduling/cron.nix +++ b/nixos/modules/services/scheduling/cron.nix @@ -20,7 +20,7 @@ let cronNixosPkg = pkgs.cron.override { # The mail.nix nixos module, if there is any local mail system enabled, # should have sendmail in this path. - sendmailPath = "/var/setuid-wrappers/sendmail"; + sendmailPath = "/run/wrappers/bin/sendmail"; }; allFiles = @@ -61,7 +61,7 @@ in A list of Cron jobs to be appended to the system-wide crontab. See the manual page for crontab for the expected format. If you want to get the results mailed you must setuid - sendmail. See + sendmail. See If neither /var/cron/cron.deny nor /var/cron/cron.allow exist only root will is allowed to have its own crontab file. The /var/cron/cron.deny file @@ -92,13 +92,9 @@ in config = mkMerge [ { services.cron.enable = mkDefault (allFiles != []); } - (mkIf (config.services.cron.enable) { - - security.setuidPrograms = [ "crontab" ]; - + security.wrappers.crontab.source = "${cronNixosPkg}/bin/crontab"; environment.systemPackages = [ cronNixosPkg ]; - environment.etc.crontab = { source = pkgs.runCommand "crontabs" { inherit allFiles; preferLocalBuild = true; } '' diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index 7b4665a8204..e4ada276871 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -96,7 +96,7 @@ in fcronallow = /etc/fcron.allow fcrondeny = /etc/fcron.deny shell = /bin/sh - sendmail = /var/setuid-wrappers/sendmail + sendmail = /run/wrappers/bin/sendmail editor = /run/current-system/sw/bin/vi ''; target = "fcron.conf"; @@ -106,8 +106,7 @@ in environment.systemPackages = [ pkgs.fcron ]; - security.setuidPrograms = [ "fcrontab" ]; - + security.wrappers.fcrontab.source = "${pkgs.fcron.out}/bin/fcrontab"; systemd.services.fcron = { description = "fcron daemon"; after = [ "local-fs.target" ]; diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix new file mode 100644 index 00000000000..49b5c935267 --- /dev/null +++ b/nixos/modules/services/security/hologram-agent.nix @@ -0,0 +1,57 @@ +{pkgs, config, lib, ...}: + +with lib; + +let + cfg = config.services.hologram-agent; + + cfgFile = pkgs.writeText "hologram-agent.json" (builtins.toJSON { + host = cfg.dialAddress; + }); +in { + options = { + services.hologram-agent = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the Hologram agent for AWS instance credentials"; + }; + + dialAddress = mkOption { + type = types.str; + default = "localhost:3100"; + description = "Hologram server and port."; + }; + + httpPort = mkOption { + type = types.str; + default = "80"; + description = "Port for metadata service to listen on."; + }; + + }; + }; + + config = mkIf cfg.enable { + networking.interfaces.dummy0 = { + ipAddress = "169.254.169.254"; + prefixLength = 32; + }; + + systemd.services.hologram-agent = { + description = "Provide EC2 instance credentials to machines outside of EC2"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + requires = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ]; + preStart = '' + /run/current-system/sw/bin/rm -fv /var/run/hologram.sock + ''; + serviceConfig = { + ExecStart = "${pkgs.hologram.bin}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}"; + }; + }; + + }; + + meta.maintainers = with lib.maintainers; [ nand0p ]; +} diff --git a/nixos/modules/services/security/hologram.nix b/nixos/modules/services/security/hologram-server.nix similarity index 100% rename from nixos/modules/services/security/hologram.nix rename to nixos/modules/services/security/hologram-server.nix diff --git a/nixos/modules/services/system/dbus-session-local.conf.in b/nixos/modules/services/system/dbus-session-local.conf.in deleted file mode 100644 index 5fd6f80a353..00000000000 --- a/nixos/modules/services/system/dbus-session-local.conf.in +++ /dev/null @@ -1,5 +0,0 @@ - - - @extra@ - diff --git a/nixos/modules/services/system/dbus-system-local.conf.in b/nixos/modules/services/system/dbus-system-local.conf.in deleted file mode 100644 index edbb476f585..00000000000 --- a/nixos/modules/services/system/dbus-system-local.conf.in +++ /dev/null @@ -1,6 +0,0 @@ - - - @servicehelper@ - @extra@ - diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index a7cf74c15cc..643bec18814 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -10,42 +10,10 @@ let homeDir = "/run/dbus"; - systemExtraxml = concatStrings (flip concatMap cfg.packages (d: [ - "${d}/share/dbus-1/system-services" - "${d}/etc/dbus-1/system.d" - ])); - - sessionExtraxml = concatStrings (flip concatMap cfg.packages (d: [ - "${d}/share/dbus-1/services" - "${d}/etc/dbus-1/session.d" - ])); - - daemonArgs = "--address=systemd: --nofork --nopidfile --systemd-activation"; - - configDir = pkgs.runCommand "dbus-conf" - { preferLocalBuild = true; - allowSubstitutes = false; - } - '' - mkdir -p $out - - cp ${pkgs.dbus.out}/share/dbus-1/{system,session}.conf $out - - # avoid circular includes - sed -ri 's@(/etc/dbus-1/(system|session)\.conf)@@g' $out/{system,session}.conf - - # include by full path - sed -ri "s@/etc/dbus-1/(system|session)-@$out/\1-@" $out/{system,session}.conf - - sed '${./dbus-system-local.conf.in}' \ - -e 's,@servicehelper@,${config.security.wrapperDir}/dbus-daemon-launch-helper,g' \ - -e 's,@extra@,${systemExtraxml},' \ - > "$out/system-local.conf" - - sed '${./dbus-session-local.conf.in}' \ - -e 's,@extra@,${sessionExtraxml},' \ - > "$out/session-local.conf" - ''; + configDir = pkgs.makeDBusConf { + suidHelper = "${config.security.wrapperDir}/dbus-daemon-launch-helper"; + serviceDirectories = cfg.packages; + }; in @@ -114,15 +82,14 @@ in systemd.packages = [ pkgs.dbus.daemon ]; - security.setuidOwners = singleton - { program = "dbus-daemon-launch-helper"; - source = "${pkgs.dbus.daemon}/libexec/dbus-daemon-launch-helper"; - owner = "root"; - group = "messagebus"; - setuid = true; - setgid = false; - permissions = "u+rx,g+rx,o-rx"; - }; + security.wrappers.dbus-daemon-launch-helper = { + source = "${pkgs.dbus.daemon}/libexec/dbus-daemon-launch-helper"; + owner = "root"; + group = "messagebus"; + setuid = true; + setgid = false; + permissions = "u+rx,g+rx,o-rx"; + }; services.dbus.packages = [ pkgs.dbus.out @@ -133,10 +100,6 @@ in # Don't restart dbus-daemon. Bad things tend to happen if we do. reloadIfChanged = true; restartTriggers = [ configDir ]; - serviceConfig.ExecStart = [ - "" - "${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=${configDir}/system.conf ${daemonArgs}" - ]; }; systemd.user = { @@ -144,10 +107,6 @@ in # Don't restart dbus-daemon. Bad things tend to happen if we do. reloadIfChanged = true; restartTriggers = [ configDir ]; - serviceConfig.ExecStart = [ - "" - "${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=${configDir}/session.conf ${daemonArgs}" - ]; }; sockets.dbus.wantedBy = mkIf cfg.socketActivated [ "sockets.target" ]; }; diff --git a/nixos/modules/services/web-apps/frab.nix b/nixos/modules/services/web-apps/frab.nix new file mode 100644 index 00000000000..d5329ef03c8 --- /dev/null +++ b/nixos/modules/services/web-apps/frab.nix @@ -0,0 +1,224 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.frab; + + package = pkgs.frab; + ruby = package.ruby; + + databaseConfig = builtins.toJSON { production = cfg.database; }; + + frabEnv = { + RAILS_ENV = "production"; + RACK_ENV = "production"; + SECRET_KEY_BASE = cfg.secretKeyBase; + FRAB_HOST = cfg.host; + FRAB_PROTOCOL = cfg.protocol; + FROM_EMAIL = cfg.fromEmail; + RAILS_SERVE_STATIC_FILES = "1"; + } // cfg.extraEnvironment; + + frab-rake = pkgs.stdenv.mkDerivation rec { + name = "frab-rake"; + buildInputs = [ package.env pkgs.makeWrapper ]; + phases = "installPhase fixupPhase"; + installPhase = '' + mkdir -p $out/bin + makeWrapper ${package.env}/bin/bundle $out/bin/frab-bundle \ + ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") frabEnv)} \ + --set PATH '${lib.makeBinPath (with pkgs; [ nodejs file imagemagick ])}:$PATH' \ + --set RAKEOPT '-f ${package}/share/frab/Rakefile' \ + --run 'cd ${package}/share/frab' + makeWrapper $out/bin/frab-bundle $out/bin/frab-rake \ + --add-flags "exec rake" + ''; + }; + +in + +{ + options = { + services.frab = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the frab service. + ''; + }; + + host = mkOption { + type = types.str; + example = "frab.example.com"; + description = '' + Hostname under which this frab instance can be reached. + ''; + }; + + protocol = mkOption { + type = types.str; + default = "https"; + example = "http"; + description = '' + Either http or https, depending on how your Frab instance + will be exposed to the public. + ''; + }; + + fromEmail = mkOption { + type = types.str; + default = "frab@localhost"; + description = '' + Email address used by frab. + ''; + }; + + listenAddress = mkOption { + type = types.str; + default = "localhost"; + description = '' + Address or hostname frab should listen on. + ''; + }; + + listenPort = mkOption { + type = types.int; + default = 3000; + description = '' + Port frab should listen on. + ''; + }; + + statePath = mkOption { + type = types.str; + default = "/var/lib/frab"; + description = '' + Directory where frab keeps its state. + ''; + }; + + user = mkOption { + type = types.str; + default = "frab"; + description = '' + User to run frab. + ''; + }; + + group = mkOption { + type = types.str; + default = "frab"; + description = '' + Group to run frab. + ''; + }; + + secretKeyBase = mkOption { + type = types.str; + description = '' + Your secret key is used for verifying the integrity of signed cookies. + If you change this key, all old signed cookies will become invalid! + + Make sure the secret is at least 30 characters and all random, + no regular words or you'll be exposed to dictionary attacks. + ''; + }; + + database = mkOption { + type = types.attrs; + default = { + adapter = "sqlite3"; + database = "/var/lib/frab/db.sqlite3"; + pool = 5; + timeout = 5000; + }; + example = { + adapter = "postgresql"; + database = "frab"; + host = "localhost"; + username = "frabuser"; + password = "supersecret"; + encoding = "utf8"; + pool = 5; + }; + description = '' + Rails database configuration for Frab as Nix attribute set. + ''; + }; + + extraEnvironment = mkOption { + type = types.attrs; + default = {}; + example = { + FRAB_CURRENCY_UNIT = "€"; + FRAB_CURRENCY_FORMAT = "%n%u"; + EXCEPTION_EMAIL = "frab-owner@example.com"; + SMTP_ADDRESS = "localhost"; + SMTP_PORT = "587"; + SMTP_DOMAIN = "localdomain"; + SMTP_USER_NAME = "root"; + SMTP_PASSWORD = "toor"; + SMTP_AUTHENTICATION = "1"; + SMTP_NOTLS = "1"; + }; + description = '' + Additional environment variables to set for frab for further + configuration. See the frab documentation for more information. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ frab-rake ]; + + users.extraUsers = [ + { name = cfg.user; + group = cfg.group; + home = "${cfg.statePath}"; + } + ]; + + users.extraGroups = [ { name = cfg.group; } ]; + + systemd.services.frab = { + after = [ "network.target" "gitlab.service" ]; + wantedBy = [ "multi-user.target" ]; + environment = frabEnv; + + preStart = '' + mkdir -p ${cfg.statePath}/system/attachments + chown ${cfg.user}:${cfg.group} -R ${cfg.statePath} + + mkdir /run/frab -p + ln -sf ${pkgs.writeText "frab-database.yml" databaseConfig} /run/frab/database.yml + ln -sf ${cfg.statePath}/system /run/frab/system + + if ! test -e "${cfg.statePath}/db-setup-done"; then + ${frab-rake}/bin/frab-rake db:setup + touch ${cfg.statePath}/db-setup-done + else + ${frab-rake}/bin/frab-rake db:migrate + fi + ''; + + serviceConfig = { + PermissionsStartOnly = true; + PrivateTmp = true; + PrivateDevices = true; + Type = "simple"; + User = cfg.user; + Group = cfg.group; + TimeoutSec = "300s"; + Restart = "on-failure"; + RestartSec = "10s"; + WorkingDirectory = "${package}/share/frab"; + ExecStart = "${frab-rake}/bin/frab-bundle exec rails server " + + "--binding=${cfg.listenAddress} --port=${toString cfg.listenPort}"; + }; + }; + + }; +} diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index dc0ca501a48..ed77e084476 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -63,6 +63,8 @@ let let svcFunction = if svc ? function then svc.function + # instead of using serviceType="mediawiki"; you can copy mediawiki.nix to any location outside nixpkgs, modify it at will, and use serviceExpression=./mediawiki.nix; + else if svc ? serviceExpression then import (toString svc.serviceExpression) else import (toString "${toString ./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix"); config = (evalModules { modules = [ { options = res.options; config = svc.config or svc; } ]; diff --git a/nixos/modules/services/web-servers/apache-httpd/moodle.nix b/nixos/modules/services/web-servers/apache-httpd/moodle.nix deleted file mode 100644 index d525348d5c7..00000000000 --- a/nixos/modules/services/web-servers/apache-httpd/moodle.nix +++ /dev/null @@ -1,198 +0,0 @@ -{ config, lib, pkgs, serverInfo, php, ... }: - -with lib; - -let - - httpd = serverInfo.serverConfig.package; - - version24 = !versionOlder httpd.version "2.4"; - - allGranted = if version24 then '' - Require all granted - '' else '' - Order allow,deny - Allow from all - ''; - - moodleConfig = pkgs.writeText "config.php" - '' - dbtype = '${config.dbType}'; - $CFG->dblibrary = 'native'; - $CFG->dbhost = '${config.dbHost}'; - $CFG->dbname = '${config.dbName}'; - $CFG->dbuser = '${config.dbUser}'; - $CFG->dbpass = '${config.dbPassword}'; - $CFG->prefix = '${config.dbPrefix}'; - $CFG->dboptions = array( - 'dbpersist' => false, - 'dbsocket' => false, - 'dbport' => "${config.dbPort}", - ); - $CFG->wwwroot = '${config.wwwRoot}'; - $CFG->dataroot = '${config.dataRoot}'; - $CFG->directorypermissions = 02777; - $CFG->admin = 'admin'; - ${optionalString (config.debug.noEmailEver == true) '' - $CFG->noemailever = true; - ''} - - ${config.extraConfig} - require_once(dirname(__FILE__) . '/lib/setup.php'); // Do not edit - ''; - # Unpack Moodle and put the config file in its root directory. - moodleRoot = pkgs.stdenv.mkDerivation rec { - name= "moodle-2.8.10"; - - src = pkgs.fetchurl { - url = "https://download.moodle.org/stable28/${name}.tgz"; - sha256 = "0c3r5081ipcwc9s6shakllnrkd589y2ln5z5m1q09l4h6a7cy4z2"; - }; - - buildPhase = - '' - ''; - - installPhase = - '' - mkdir -p $out - cp -r * $out - cp ${moodleConfig} $out/config.php - ''; - # Marked as broken due to needing an update for security issues. - # See: https://github.com/NixOS/nixpkgs/issues/18856 - meta.broken = true; - - }; - -in - -{ - - extraConfig = - '' - # this should be config.urlPrefix instead of / - Alias / ${moodleRoot}/ - - DirectoryIndex index.php - - ''; - - documentRoot = moodleRoot; # TODO: fix this, should be config.urlPrefix - - enablePHP = true; - - options = { - - id = mkOption { - default = "main"; - description = '' - A unique identifier necessary to keep multiple Moodle server - instances on the same machine apart. - ''; - }; - - dbType = mkOption { - default = "postgres"; - example = "mysql"; - description = "Database type."; - }; - - dbName = mkOption { - default = "moodle"; - description = "Name of the database that holds the Moodle data."; - }; - - dbHost = mkOption { - default = "localhost"; - example = "10.0.2.2"; - description = '' - The location of the database server. - ''; - }; - - dbPort = mkOption { - default = ""; # use the default port - example = "12345"; - description = '' - The port that is used to connect to the database server. - ''; - }; - - dbUser = mkOption { - default = "moodle"; - description = "The user name for accessing the database."; - }; - - dbPassword = mkOption { - default = ""; - example = "password"; - description = '' - The password of the database user. Warning: this is stored in - cleartext in the Nix store! - ''; - }; - - dbPrefix = mkOption { - default = "mdl_"; - example = "my_other_mdl_"; - description = '' - A prefix for each table, if multiple moodles should run in a single database. - ''; - }; - - wwwRoot = mkOption { - type = types.string; - example = "http://my.machine.com/my-moodle"; - description = '' - The full web address where moodle has been installed. - ''; - }; - - dataRoot = mkOption { - default = "/var/lib/moodledata"; - example = "/var/lib/moodledata"; - description = '' - The data directory for moodle. Needs to be writable! - ''; - type = types.path; - }; - - - extraConfig = mkOption { - type = types.lines; - default = ""; - example = - '' - ''; - description = '' - Any additional text to be appended to Moodle's - configuration file. This is a PHP script. - ''; - }; - - debug = { - noEmailEver = mkOption { - default = false; - example = "true"; - description = '' - Set this to true to prevent Moodle from ever sending any email. - ''; - }; - }; - }; - - startupScript = pkgs.writeScript "moodle_startup.sh" '' - echo "Checking for existence of ${config.dataRoot}" - if [ ! -e "${config.dataRoot}" ] - then - mkdir -p "${config.dataRoot}" - chown ${serverInfo.serverConfig.user}.${serverInfo.serverConfig.group} "${config.dataRoot}" - fi - ''; - -} diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix index 26f0bdec655..a5b6548d3c5 100644 --- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix +++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix @@ -6,7 +6,7 @@ with lib; let # Upgrading? We have a test! nix-build ./nixos/tests/wordpress.nix - version = "4.7.1"; + version = "4.7.2"; fullversion = "${version}"; # Our bare-bones wp-config.php file using the above settings @@ -75,7 +75,7 @@ let owner = "WordPress"; repo = "WordPress"; rev = "${fullversion}"; - sha256 = "1wb4f4zn55d23qi0whsfpbpcd4sjvzswgmni6f5rzrmlawq9ssgr"; + sha256 = "0vph12708drf8ww0xd05hpdvbyy7n5gj9ca598lhdhy2i1j6wy32"; }; installPhase = '' mkdir -p $out diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index 619e0f90b12..a49838c876f 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -61,6 +61,7 @@ in User = "caddy"; Group = "caddy"; AmbientCapabilities = "cap_net_bind_service"; + LimitNOFILE = 8192; }; }; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 68a672c42c9..9e93e56b9c2 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -5,7 +5,11 @@ with lib; let cfg = config.services.nginx; virtualHosts = mapAttrs (vhostName: vhostConfig: - vhostConfig // (optionalAttrs vhostConfig.enableACME { + vhostConfig // { + serverName = if vhostConfig.serverName != null + then vhostConfig.serverName + else vhostName; + } // (optionalAttrs vhostConfig.enableACME { sslCertificate = "/var/lib/acme/${vhostName}/fullchain.pem"; sslCertificateKey = "/var/lib/acme/${vhostName}/key.pem"; }) @@ -112,8 +116,9 @@ let ${cfg.appendConfig} ''; - vhosts = concatStringsSep "\n" (mapAttrsToList (serverName: vhost: + vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost: let + serverName = vhost.serverName; ssl = vhost.enableSSL || vhost.forceSSL; port = if vhost.port != null then vhost.port else (if ssl then 443 else 80); listenString = toString port + optionalString ssl " ssl http2" @@ -161,7 +166,7 @@ let ssl_certificate_key ${vhost.sslCertificateKey}; ''} - ${optionalString (vhost.basicAuth != {}) (mkBasicAuth serverName vhost.basicAuth)} + ${optionalString (vhost.basicAuth != {}) (mkBasicAuth vhostName vhost.basicAuth)} ${mkLocations vhost.locations} @@ -178,8 +183,8 @@ let ${config.extraConfig} } '') locations); - mkBasicAuth = serverName: authDef: let - htpasswdFile = pkgs.writeText "${serverName}.htpasswd" ( + mkBasicAuth = vhostName: authDef: let + htpasswdFile = pkgs.writeText "${vhostName}.htpasswd" ( concatStringsSep "\n" (mapAttrsToList (user: password: '' ${user}:{PLAIN}${password} '') authDef) @@ -393,17 +398,20 @@ in }; security.acme.certs = filterAttrs (n: v: v != {}) ( - mapAttrs (vhostName: vhostConfig: - optionalAttrs vhostConfig.enableACME { - user = cfg.user; - group = cfg.group; - webroot = vhostConfig.acmeRoot; - extraDomains = genAttrs vhostConfig.serverAliases (alias: null); - postRun = '' - systemctl reload nginx - ''; - } - ) virtualHosts + let + vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts; + acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME) vhostsConfigs; + acmePairs = map (vhostConfig: { name = vhostConfig.serverName; value = { + user = cfg.user; + group = lib.mkDefault cfg.group; + webroot = vhostConfig.acmeRoot; + extraDomains = genAttrs vhostConfig.serverAliases (alias: null); + postRun = '' + systemctl reload nginx + ''; + }; }) acmeEnabledVhosts; + in + listToAttrs acmePairs ); users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index dcebbc9229f..c0ea645b3df 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -8,6 +8,15 @@ with lib; { options = { + serverName = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Name of this virtual host. Defaults to attribute name in virtualHosts. + ''; + example = "example.org"; + }; + serverAliases = mkOption { type = types.listOf types.str; default = []; diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix index 8a453e01557..496e34db4a9 100644 --- a/nixos/modules/services/web-servers/zope2.nix +++ b/nixos/modules/services/web-servers/zope2.nix @@ -74,7 +74,7 @@ in services.zope2.instances = mkOption { default = {}; - type = with types; loaOf (submodule zope2Opts); + type = with types; attrsOf (submodule zope2Opts); example = literalExample '' { plone01 = { diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 144e4aada27..1f7a925ed05 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -18,9 +18,8 @@ in # determines the default: later modules (if enabled) are preferred. # E.g., if KDE is enabled, it supersedes xterm. imports = [ - ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix - ./lumina.nix ./lxqt.nix ./enlightenment.nix ./gnome3.nix - ./kodi.nix + ./none.nix ./xterm.nix ./xfce.nix ./kde5.nix ./lumina.nix + ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 7ea8b30d23d..d908553ccdf 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -62,7 +62,7 @@ in ''; }]; - security.setuidPrograms = [ "e_freqset" ]; + security.wrappers.e_freqset.source = "${e.enlightenment.out}/bin/e_freqset"; environment.etc = singleton { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 17e84b1d9a1..21453d1917e 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -78,7 +78,7 @@ in { }; debug = mkEnableOption "gnome-session debug messages"; - }; + }; environment.gnome3.packageSet = mkOption { default = null; @@ -86,7 +86,7 @@ in { description = "Which GNOME 3 package set to use."; apply = p: if p == null then pkgs.gnome3 else p; }; - + environment.gnome3.excludePackages = mkOption { default = []; example = literalExample "[ pkgs.gnome3.totem ]"; @@ -125,6 +125,9 @@ in { services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ]; + # If gnome3 is installed, build vim for gtk3 too. + nixpkgs.config.vim.gui = "gtk3"; + fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ]; services.xserver.desktopManager.session = singleton diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix deleted file mode 100644 index 3aa4821a052..00000000000 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ /dev/null @@ -1,199 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - xcfg = config.services.xserver; - cfg = xcfg.desktopManager.kde4; - xorg = pkgs.xorg; - kde_workspace = config.services.xserver.desktopManager.kde4.kdeWorkspacePackage; - - # Disable Nepomuk and Strigi by default. As of KDE 4.7, they don't - # really work very well (e.g. searching files often fails to find - # files), segfault sometimes and consume significant resources. - # They can be re-enabled in the KDE System Settings under "Desktop - # Search". - disableNepomuk = pkgs.writeTextFile - { name = "nepomuk-config"; - destination = "/share/config/nepomukserverrc"; - text = - '' - [Basic Settings] - Start Nepomuk=false - - [Service-nepomukstrigiservice] - autostart=false - ''; - }; - - phononBackends = { - gstreamer = [ - pkgs.phonon-backend-gstreamer - pkgs.gst_all.gstPluginsBase - pkgs.gst_all.gstPluginsGood - pkgs.gst_all.gstPluginsUgly - pkgs.gst_all.gstPluginsBad - pkgs.gst_all.gstFfmpeg # for mp3 playback - pkgs.gst_all.gstreamer # needed? - ]; - - vlc = [pkgs.phonon-backend-vlc]; - }; - - phononBackendPackages = flip concatMap cfg.phononBackends - (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends); - -in - -{ - options = { - - services.xserver.desktopManager.kde4 = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the KDE 4 desktop environment."; - }; - - phononBackends = mkOption { - type = types.listOf types.str; - default = ["gstreamer"]; - example = ["gstreamer" "vlc"]; - description = "Which phonon multimedia backend kde should use"; - }; - - kdeWorkspacePackage = mkOption { - internal = true; - default = pkgs.kde4.kde_workspace; - defaultText = "pkgs.kde4.kde_workspace"; - type = types.package; - description = "Custom kde-workspace, used for NixOS rebranding."; - }; - - enablePIM = mkOption { - type = types.bool; - default = true; - description = "Whether to enable PIM support. Note that enabling this pulls in Akonadi and MariaDB as dependencies."; - }; - - enableNepomuk = mkOption { - type = types.bool; - default = false; - description = "Whether to enable Nepomuk (deprecated)."; - }; - }; - }; - - - config = mkIf (xcfg.enable && cfg.enable) { - - # If KDE 4 is enabled, make it the default desktop manager (unless - # overridden by the user's configuration). - # !!! doesn't work yet ("Multiple definitions. Only one is allowed - # for this option.") - # services.xserver.desktopManager.default = mkOverride 900 "kde4"; - - services.xserver.desktopManager.session = singleton - { name = "kde4"; - bgSupport = true; - start = - '' - # The KDE icon cache is supposed to update itself - # automatically, but it uses the timestamp on the icon - # theme directory as a trigger. Since in Nix the - # timestamp is always the same, this doesn't work. So as - # a workaround, nuke the icon cache on login. This isn't - # perfect, since it may require logging out after - # installing new applications to update the cache. - # See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html - rm -fv $HOME/.kde/cache-*/icon-cache.kcache - - # Qt writes a weird ‘libraryPath’ line to - # ~/.config/Trolltech.conf that causes the KDE plugin - # paths of previous KDE invocations to be searched. - # Obviously using mismatching KDE libraries is potentially - # disastrous, so here we nuke references to the Nix store - # in Trolltech.conf. A better solution would be to stop - # Qt from doing this wackiness in the first place. - if [ -e $HOME/.config/Trolltech.conf ]; then - sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf - fi - - # Load PulseAudio module for routing support. - # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ - ${optionalString config.hardware.pulseaudio.enable '' - ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" - ''} - - # Start KDE. - exec ${kde_workspace}/bin/startkde - ''; - }; - - security.setuidOwners = singleton - { program = "kcheckpass"; - source = "${kde_workspace}/lib/kde4/libexec/kcheckpass"; - owner = "root"; - group = "root"; - setuid = true; - }; - - environment.systemPackages = - [ pkgs.kde4.kdelibs - - pkgs.kde4.kde_baseapps # Splitted kdebase - kde_workspace - pkgs.kde4.kde_runtime - pkgs.kde4.konsole - pkgs.kde4.kate - - pkgs.kde4.kde_wallpapers # contains kdm's default background - pkgs.kde4.oxygen_icons - - # Starts KDE's Polkit authentication agent. - pkgs.kde4.polkit_kde_agent - - # Miscellaneous runtime dependencies. - pkgs.kde4.qt4 # needed for qdbus - pkgs.shared_mime_info - xorg.xmessage # so that startkde can show error messages - xorg.xset # used by startkde, non-essential - xorg.xauth # used by kdesu - ] - ++ optionals cfg.enablePIM - [ pkgs.kde4.kdepim_runtime - pkgs.kde4.akonadi - pkgs.mysql # used by akonadi - ] - ++ (if cfg.enableNepomuk then - [ pkgs.shared_desktop_ontologies # used by nepomuk - pkgs.strigi # used by nepomuk - pkgs.virtuoso # to enable Nepomuk to find Virtuoso - ] else - [ disableNepomuk ]) - ++ optional config.hardware.pulseaudio.enable pkgs.kde4.kmix # Perhaps this should always be enabled - ++ optional config.hardware.bluetooth.enable pkgs.kde4.bluedevil - ++ optional config.networking.networkmanager.enable pkgs.kde4.plasma-nm - ++ phononBackendPackages; - - environment.pathsToLink = [ "/share" ]; - - environment.profileRelativeEnvVars = mkIf (elem "gstreamer" cfg.phononBackends) { - GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ]; - }; - - environment.etc = singleton - { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; - target = "X11/xkb"; - }; - - # Enable helpful DBus services. - services.udisks2.enable = true; - services.upower.enable = config.powerManagement.enable; - - security.pam.services.kde = { allowNullPassword = true; }; - - }; - -} diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index ee4ec0fc819..1b44b9e42c8 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -50,10 +50,6 @@ in }) (mkIf (xcfg.enable && cfg.enable) { - - warnings = optional config.services.xserver.desktopManager.kde4.enable - "KDE 4 should not be enabled at the same time as KDE 5"; - services.xserver.desktopManager.session = singleton { name = "kde5"; bgSupport = true; @@ -65,24 +61,13 @@ in ''} exec "${kde5.startkde}" - ''; }; - security.setuidOwners = [ - { - program = "kcheckpass"; - source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass"; - owner = "root"; - setuid = true; - } - { - program = "start_kdeinit"; - source = "${kde5.kinit.out}/lib/libexec/kf5/start_kdeinit"; - owner = "root"; - setuid = true; - } - ]; + security.wrappers = { + kcheckpass.source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass"; + "start_kdeinit".source = "${kde5.kinit.out}/lib/libexec/kf5/start_kdeinit"; + }; environment.systemPackages = [ @@ -118,6 +103,8 @@ in kde5.kservice kde5.ktextwidgets kde5.kwallet + kde5.kwallet-pam + kde5.kwalletmanager kde5.kwayland kde5.kwidgetsaddons kde5.kxmlgui @@ -249,6 +236,19 @@ in security.pam.services.kde = { allowNullPassword = true; }; + # Doing these one by one seems silly, but we currently lack a better + # construct for handling common pam configs. + security.pam.services.gdm.enableKwallet = true; + security.pam.services.kdm.enableKwallet = true; + security.pam.services.lightdm.enableKwallet = true; + security.pam.services.sddm.enableKwallet = true; + security.pam.services.slim.enableKwallet = true; + + # use kimpanel as the default IBus panel + i18n.inputMethod.ibus.panel = + lib.mkDefault + "${pkgs.kde5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel"; + }) ]; diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 530468be5f9..37523feb414 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -41,6 +41,12 @@ in Shell commands executed just before XFCE is started. ''; }; + + enableXfwm = mkOption { + type = types.bool; + default = true; + description = "Enable the XFWM (default) window manager."; + }; }; }; @@ -87,7 +93,6 @@ in pkgs.xfce.xfce4volumed pkgs.xfce.xfce4-screenshooter pkgs.xfce.xfconf - pkgs.xfce.xfwm4 # This supplies some "abstract" icons such as # "utilities-terminal" and "accessories-text-editor". pkgs.gnome3.defaultIconTheme @@ -99,6 +104,7 @@ in 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) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index c0daf30d04e..e8b897fb605 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -1,5 +1,5 @@ # This module declares the options to define a *display manager*, the -# program responsible for handling X logins (such as xdm, kdm, gdb, or +# program responsible for handling X logins (such as xdm, gdb, or # SLiM). The display manager allows the user to select a *session # type*. When the user logs in, the display manager starts the # *session script* ("xsession" below) to launch the selected session @@ -32,6 +32,9 @@ let '' #! ${pkgs.bash}/bin/bash + # Handle being called by SDDM. + if test "''${1:0:1}" = / ; then eval exec $1 $2 ; fi + ${optionalString cfg.displayManager.logToJournal '' if [ -z "$_DID_SYSTEMD_CAT" ]; then _DID_SYSTEMD_CAT=1 exec ${config.systemd.package}/bin/systemd-cat -t xsession -- "$0" "$@" @@ -55,9 +58,6 @@ let fi ''} - # Handle being called by kdm. - if test "''${1:0:1}" = /; then eval exec "$1"; fi - # Start PulseAudio if enabled. ${optionalString (config.hardware.pulseaudio.enable) '' ${optionalString (!config.hardware.pulseaudio.systemWide) diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix deleted file mode 100644 index 04701a1640c..00000000000 --- a/nixos/modules/services/x11/display-managers/kdm.nix +++ /dev/null @@ -1,158 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - dmcfg = config.services.xserver.displayManager; - cfg = dmcfg.kdm; - - inherit (pkgs.kde4) kdebase_workspace; - - defaultConfig = - '' - [Shutdown] - HaltCmd=${config.systemd.package}/sbin/shutdown -h now - RebootCmd=${config.systemd.package}/sbin/shutdown -r now - ${optionalString (config.system.boot.loader.id == "grub") '' - BootManager=${if config.boot.loader.grub.version == 2 then "Grub2" else "Grub"} - ''} - - [X-*-Core] - Xrdb=${pkgs.xorg.xrdb}/bin/xrdb - SessionsDirs=${dmcfg.session.desktops} - Session=${dmcfg.session.script} - FailsafeClient=${pkgs.xterm}/bin/xterm - - [X-:*-Core] - ServerCmd=${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} - # KDM calls `rm' somewhere to clean up some temporary directory. - SystemPath=${pkgs.coreutils}/bin - # The default timeout (15) is too short in a heavily loaded boot process. - ServerTimeout=60 - # Needed to prevent the X server from dying on logout and not coming back: - TerminateServer=true - ${optionalString (cfg.setupScript != "") - '' - Setup=${cfg.setupScript} - ''} - - [X-*-Greeter] - HiddenUsers=root,${concatStringsSep "," dmcfg.hiddenUsers} - PluginsLogin=${kdebase_workspace}/lib/kde4/kgreet_classic.so - ${optionalString (cfg.themeDirectory != null) - '' - UseTheme=true - Theme=${cfg.themeDirectory} - '' - } - - ${optionalString (cfg.enableXDMCP) - '' - [Xdmcp] - Enable=true - ''} - ''; - - kdmrc = pkgs.runCommand "kdmrc" - { config = defaultConfig + cfg.extraConfig; - preferLocalBuild = true; - } - '' - echo "$config" > $out - - # The default kdmrc would add "-nolisten tcp", and we already - # have that managed by nixos. Hence the grep. - cat ${kdebase_workspace}/share/config/kdm/kdmrc | grep -v nolisten >> $out - ''; - -in - -{ - - ###### interface - - options = { - - services.xserver.displayManager.kdm = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the KDE display manager. - ''; - }; - - enableXDMCP = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable XDMCP, which allows remote logins. - ''; - }; - - themeDirectory = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - The path to a KDM theme directory. This theme - will be used by the KDM greeter. - ''; - }; - - setupScript = mkOption { - type = types.lines; - default = ""; - description = '' - The path to a KDM setup script. This script is run as root just - before KDM starts. Can be used for setting up - monitors with xrandr, for example. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Options appended to kdmrc, the - configuration file of KDM. - ''; - }; - - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - services.xserver.displayManager.slim.enable = false; - - services.xserver.displayManager.job = - { execCmd = - '' - mkdir -m 0755 -p /var/lib/kdm - chown kdm /var/lib/kdm - ${(optionalString (config.system.boot.loader.id == "grub" && config.system.build.grub != null) "PATH=${config.system.build.grub}/sbin:$PATH ") + - "KDEDIRS=/run/current-system/sw exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon -logfile /dev/stderr"} - ''; - logsXsession = true; - }; - - security.pam.services.kde = { allowNullPassword = true; startSession = true; }; - - users.extraUsers = singleton - { name = "kdm"; - uid = config.ids.uids.kdm; - description = "KDM user"; - }; - - environment.systemPackages = - [ pkgs.kde4.kde_wallpapers ]; # contains kdm's default background - - }; - -} diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index 785394d9648..09a7f386876 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/nixos/modules/services/x11/terminal-server.nix @@ -16,18 +16,8 @@ with lib; services.xserver.enable = true; services.xserver.videoDrivers = []; - # Enable KDM. Any display manager will do as long as it supports XDMCP. - services.xserver.displayManager.kdm.enable = true; - services.xserver.displayManager.kdm.enableXDMCP = true; - services.xserver.displayManager.kdm.extraConfig = - '' - [General] - # We're headless, so don't bother starting an X server. - StaticServers= - - [Xdmcp] - Xaccess=${pkgs.writeText "Xaccess" "localhost"} - ''; + # Enable GDM. Any display manager will do as long as it supports XDMCP. + services.xserver.displayManager.gdm.enable = true; systemd.sockets.terminal-server = { description = "Terminal Server Socket"; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index f5ed5233818..7ac776571a0 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -459,6 +459,8 @@ in knownVideoDrivers; in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver)); + nixpkgs.config.xorg = optionalAttrs (elem "vboxvideo" cfg.videoDrivers) { abiCompat = "1.18"; }; + assertions = [ { assertion = config.security.polkit.enable; message = "X11 requires Polkit to be enabled (‘security.polkit.enable = true’)."; diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index dcf105eb784..c2ac731d433 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -19,6 +19,7 @@ let glibc # needed for getent shadow nettools # needed for hostname + utillinux # needed for mount and mountpoint ]; in @@ -168,12 +169,12 @@ in local options="$3" local fsType="$4" - if ${pkgs.utillinux}/bin/mountpoint -q "$mountPoint"; then + if mountpoint -q "$mountPoint"; then local options="remount,$options" else mkdir -m 0755 -p "$mountPoint" fi - ${pkgs.utillinux}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint" + mount -t "$fsType" -o "$options" "$device" "$mountPoint" } source ${config.system.build.earlyMountScript} ''; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 0c08375da64..84c23bed3e3 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -45,6 +45,9 @@ let ln -s ${kernelPath} $out/kernel ln -s ${config.system.modulesTree} $out/kernel-modules + ${optionalString (pkgs.stdenv.platform.kernelDTB or false) '' + ln -s ${config.boot.kernelPackages.kernel}/dtbs $out/dtbs + ''} echo -n "$kernelParams" > $out/kernel-params diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index e751ff141f7..cf70a891c0c 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -176,7 +176,7 @@ in boot.initrd.availableKernelModules = [ # Note: most of these (especially the SATA/PATA modules) - # shouldn't be included by default since nixos-hardware-scan + # shouldn't be included by default since nixos-generate-config # detects them, but I'm keeping them for now for backwards # compatibility. diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 294fc1988e9..23b970186a3 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -53,12 +53,14 @@ let inherit (args) devices; inherit (efi) canTouchEfiVariables; inherit (cfg) - version extraConfig extraPerEntryConfig extraEntries forceInstall + version extraConfig extraPerEntryConfig extraEntries forceInstall useOSProber extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios; path = (makeBinPath ([ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs - pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else []) + pkgs.utillinux ] + ++ (optional (cfg.efiSupport && (cfg.version == 2)) pkgs.efibootmgr) + ++ (optionals cfg.useOSProber [pkgs.busybox pkgs.os-prober]) )) + ":" + (makeSearchPathOutput "bin" "sbin" [ pkgs.mdadm pkgs.utillinux ]); @@ -265,6 +267,14 @@ in ''; }; + useOSProber = mkOption { + default = false; + type = types.bool; + description = '' + If set to true, append entries for other OSs detected by os-prober. + ''; + }; + splashImage = mkOption { type = types.nullOr types.path; example = literalExample "./my-background.png"; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 24442ca12a3..c9a51288747 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -256,8 +256,6 @@ else { # ‘grub-reboot’ sets a one-time saved entry, which we process here and # then delete. if [ \"\${next_entry}\" ]; then - # FIXME: KDM expects the next line to be present. - set default=\"\${saved_entry}\" set default=\"\${next_entry}\" set next_entry= save_env next_entry @@ -426,10 +424,17 @@ if ($extraPrepareConfig ne "") { system((get("shell"), "-c", $extraPrepareConfig)); } -# Atomically update the GRUB config. +# write the GRUB config. my $confFile = $grubVersion == 1 ? "$bootPath/grub/menu.lst" : "$bootPath/grub/grub.cfg"; my $tmpFile = $confFile . ".tmp"; writeFile($tmpFile, $conf); + +# Append entries detected by os-prober +if (get("useOSProber") eq "true") { + system(get("shell"), "-c", "pkgdatadir=$grub/share/grub $grub/etc/grub.d/30_os-prober >> $tmpFile"); +} + +# Atomically switch to the new config rename $tmpFile, $confFile or die "cannot rename $tmpFile to $confFile\n"; diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/builder.sh index ccb88ca1c52..f627d093eaf 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/builder.sh +++ b/nixos/modules/system/boot/loader/raspberrypi/builder.sh @@ -61,12 +61,13 @@ addEntry() { local kernel=$(readlink -f $path/kernel) local initrd=$(readlink -f $path/initrd) + local dtb_path=$(readlink -f $path/kernel-modules/dtbs) if test -n "@copyKernels@"; then copyToKernelsDir $kernel; kernel=$result copyToKernelsDir $initrd; initrd=$result fi - + echo $(readlink -f $path) > $outdir/$generation-system echo $(readlink -f $path/init) > $outdir/$generation-init cp $path/kernel-params $outdir/$generation-cmdline.txt @@ -80,6 +81,11 @@ addEntry() { copyForced $kernel /boot/kernel7.img fi copyForced $initrd /boot/initrd + for dtb in $dtb_path/bcm*.dtb; do + dst="/boot/$(basename $dtb)" + copyForced $dtb "$dst" + filesCopied[$dst]=1 + done cp "$(readlink -f "$path/init")" /boot/nixos-init echo "`cat $path/kernel-params` init=$path/init" >/boot/cmdline.txt @@ -108,8 +114,8 @@ copyForced $fwdir/start_cd.elf /boot/start_cd.elf copyForced $fwdir/start_db.elf /boot/start_db.elf copyForced $fwdir/start_x.elf /boot/start_x.elf -# Remove obsolete files from /boot/old. -for fn in /boot/old/*linux* /boot/old/*initrd*; do +# Remove obsolete files from /boot and /boot/old. +for fn in /boot/old/*linux* /boot/old/*initrd-initrd* /boot/bcm*.dtb; do if ! test "${filesCopied[$fn]}" = 1; then rm -vf -- "$fn" fi diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index eb8ea613097..f246d04284c 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -33,7 +33,7 @@ in boot.loader.raspberryPi.version = mkOption { default = 2; - type = types.enum [ 1 2 ]; + type = types.enum [ 1 2 3 ]; description = '' ''; }; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index b828ad53dc5..f96dde15361 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -79,7 +79,7 @@ let checkBond = checkUnitConfig "Bond" [ (assertOnlyFields [ "Mode" "TransmitHashPolicy" "LACPTransmitRate" "MIIMonitorSec" - "UpDelaySec" "DownDelaySec" + "UpDelaySec" "DownDelaySec" "GratuitousARP" ]) (assertValueOneOf "Mode" [ "balance-rr" "active-backup" "balance-xor" @@ -667,8 +667,10 @@ in config = mkIf config.systemd.network.enable { - systemd.additionalUpstreamSystemUnits = - [ "systemd-networkd.service" "systemd-networkd-wait-online.service" ]; + 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 // mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 4b7c545dcc0..a3fb733c289 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -71,7 +71,9 @@ in config = mkIf cfg.enable { - systemd.additionalUpstreamSystemUnits = [ "systemd-resolved.service" ]; + systemd.additionalUpstreamSystemUnits = [ + "systemd-resolved.service" "org.freedesktop.resolve1.busname" + ]; systemd.services.systemd-resolved = { wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix index 997770b8bec..7dbf3b25cdb 100644 --- a/nixos/modules/system/boot/systemd-lib.nix +++ b/nixos/modules/system/boot/systemd-lib.nix @@ -159,7 +159,13 @@ rec { fi done - # Created .wants and .requires symlinks from the wantedBy and + # Create service aliases from aliases option. + ${concatStrings (mapAttrsToList (name: unit: + concatMapStrings (name2: '' + ln -sfn '${name}' $out/'${name2}' + '') unit.aliases) units)} + + # Create .wants and .requires symlinks from the wantedBy and # requiredBy options. ${concatStrings (mapAttrsToList (name: unit: concatMapStrings (name2: '' diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 69af2398148..904e41b019f 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -52,6 +52,12 @@ in rec { description = "Units that want (i.e. depend on) this unit."; }; + aliases = mkOption { + default = []; + type = types.listOf types.str; + description = "Aliases of that unit."; + }; + }; concreteUnitOptions = sharedOptions // { diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index a2ee5166971..904404e1e47 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -17,6 +17,7 @@ let "busnames.target" "sysinit.target" "sockets.target" + "exit.target" "graphical.target" "multi-user.target" "network.target" @@ -41,11 +42,14 @@ let "systemd-udevd.service" "systemd-udev-settle.service" "systemd-udev-trigger.service" + # hwdb.bin is managed by NixOS + # "systemd-hwdb-update.service" # Consoles. "getty.target" "getty@.service" "serial-getty@.service" + "console-getty.service" "container-getty@.service" "systemd-vconsole-setup.service" @@ -58,7 +62,6 @@ let # Login stuff. "systemd-logind.service" "autovt@.service" - #"systemd-vconsole-setup.service" "systemd-user-sessions.service" "dbus-org.freedesktop.login1.service" "dbus-org.freedesktop.machine1.service" @@ -72,6 +75,7 @@ let "systemd-journal-flush.service" "systemd-journal-gatewayd.socket" "systemd-journal-gatewayd.service" + "systemd-journal-catalog-update.service" "systemd-journald-audit.socket" "systemd-journald-dev-log.socket" "syslog.socket" @@ -104,6 +108,7 @@ let "systemd-random-seed.service" "systemd-backlight@.service" "systemd-rfkill.service" + "systemd-rfkill.socket" # Hibernate / suspend. "hibernate.target" @@ -111,8 +116,8 @@ let "sleep.target" "hybrid-sleep.target" "systemd-hibernate.service" - "systemd-suspend.service" "systemd-hybrid-sleep.service" + "systemd-suspend.service" # Reboot stuff. "reboot.target" @@ -136,10 +141,10 @@ let # Slices / containers. "slices.target" - "-.slice" "system.slice" "user.slice" "machine.slice" + "machines.target" "systemd-machined.service" "systemd-nspawn@.service" @@ -162,12 +167,12 @@ let "systemd-localed.service" "systemd-hostnamed.service" "systemd-binfmt.service" + "systemd-exit.service" ] ++ cfg.additionalUpstreamSystemUnits; upstreamSystemWants = - [ #"basic.target.wants" - "sysinit.target.wants" + [ "sysinit.target.wants" "sockets.target.wants" "local-fs.target.wants" "multi-user.target.wants" @@ -176,11 +181,18 @@ let upstreamUserUnits = [ "basic.target" + "bluetooth.target" + "busnames.target" "default.target" "exit.target" + "graphical-session-pre.target" + "graphical-session.target" "paths.target" + "printer.target" "shutdown.target" + "smartcard.target" "sockets.target" + "sound.target" "systemd-exit.service" "timers.target" ]; @@ -301,7 +313,7 @@ let ''; targetToUnit = name: def: - { inherit (def) wantedBy requiredBy enable; + { inherit (def) aliases wantedBy requiredBy enable; text = '' [Unit] @@ -310,7 +322,7 @@ let }; serviceToUnit = name: def: - { inherit (def) wantedBy requiredBy enable; + { inherit (def) aliases wantedBy requiredBy enable; text = commonUnitText def + '' [Service] @@ -330,7 +342,7 @@ let }; socketToUnit = name: def: - { inherit (def) wantedBy requiredBy enable; + { inherit (def) aliases wantedBy requiredBy enable; text = commonUnitText def + '' [Socket] @@ -340,7 +352,7 @@ let }; timerToUnit = name: def: - { inherit (def) wantedBy requiredBy enable; + { inherit (def) aliases wantedBy requiredBy enable; text = commonUnitText def + '' [Timer] @@ -349,7 +361,7 @@ let }; pathToUnit = name: def: - { inherit (def) wantedBy requiredBy enable; + { inherit (def) aliases wantedBy requiredBy enable; text = commonUnitText def + '' [Path] @@ -358,7 +370,7 @@ let }; mountToUnit = name: def: - { inherit (def) wantedBy requiredBy enable; + { inherit (def) aliases wantedBy requiredBy enable; text = commonUnitText def + '' [Mount] @@ -367,7 +379,7 @@ let }; automountToUnit = name: def: - { inherit (def) wantedBy requiredBy enable; + { inherit (def) aliases wantedBy requiredBy enable; text = commonUnitText def + '' [Automount] @@ -376,7 +388,7 @@ let }; sliceToUnit = name: def: - { inherit (def) wantedBy requiredBy enable; + { inherit (def) aliases wantedBy requiredBy enable; text = commonUnitText def + '' [Slice] @@ -741,7 +753,8 @@ in # Keep a persistent journal. Note that systemd-tmpfiles will # set proper ownership/permissions. - mkdir -m 0700 -p /var/log/journal + # FIXME: revert to 0700 with systemd v233. + mkdir -m 0750 -p /var/log/journal ''; users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 49ba66ad50a..8a4299113f2 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -5,6 +5,11 @@ with utils; let + addCheckDesc = desc: elemType: check: types.addCheck elemType check + // { description = "${elemType.description} (with check: ${desc})"; }; + nonEmptyStr = addCheckDesc "non-empty" types.str + (x: x != "" && ! (all (c: c == " " || c == "\t") (stringToCharacters x))); + fileSystems' = toposort fsBefore (attrValues config.fileSystems); fileSystems = if fileSystems' ? "result" @@ -26,21 +31,21 @@ let mountPoint = mkOption { example = "/mnt/usb"; - type = types.str; + type = nonEmptyStr; description = "Location of the mounted the file system."; }; device = mkOption { default = null; example = "/dev/sda"; - type = types.nullOr types.str; + type = types.nullOr nonEmptyStr; description = "Location of the device."; }; fsType = mkOption { default = "auto"; example = "ext3"; - type = types.str; + type = nonEmptyStr; description = "Type of the file system."; }; @@ -48,7 +53,7 @@ let default = [ "defaults" ]; example = [ "data=journal" ]; description = "Options used to mount the file system."; - type = types.listOf types.str; + type = types.listOf nonEmptyStr; }; }; @@ -67,7 +72,7 @@ let label = mkOption { default = null; example = "root-partition"; - type = types.nullOr types.str; + type = types.nullOr nonEmptyStr; description = "Label of the device (if any)."; }; @@ -216,7 +221,7 @@ in environment.etc.fstab.text = let - fsToSkipCheck = [ "none" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" ]; + fsToSkipCheck = [ "none" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ]; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck; in '' # This is a generated file. Do not edit! diff --git a/nixos/modules/tasks/filesystems/glusterfs.nix b/nixos/modules/tasks/filesystems/glusterfs.nix new file mode 100644 index 00000000000..e8c7fa8efba --- /dev/null +++ b/nixos/modules/tasks/filesystems/glusterfs.nix @@ -0,0 +1,11 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + config = mkIf (any (fs: fs == "glusterfs") config.boot.supportedFilesystems) { + + system.fsPackages = [ pkgs.glusterfs ]; + + }; +} diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix index e9a7ccc721a..73cf18384bd 100644 --- a/nixos/modules/tasks/filesystems/nfs.nix +++ b/nixos/modules/tasks/filesystems/nfs.nix @@ -24,6 +24,8 @@ let Method = nsswitch ''; + nfsConfFile = pkgs.writeText "nfs.conf" cfg.extraConfig; + cfg = config.services.nfs; in @@ -32,23 +34,12 @@ in ###### interface options = { - services.nfs = { - statdPort = mkOption { - default = null; - example = 4000; + extraConfig = mkOption { + type = types.lines; + default = ""; description = '' - Use a fixed port for rpc.statd. This is - useful if the NFS server is behind a firewall. - ''; - }; - lockdPort = mkOption { - default = null; - example = 4001; - description = '' - Use a fixed port for the NFS lock manager kernel module - (lockd/nlockmgr). This is useful if the - NFS server is behind a firewall. + Extra nfs-utils configuration. ''; }; }; @@ -62,69 +53,49 @@ in system.fsPackages = [ pkgs.nfs-utils ]; - boot.extraModprobeConfig = mkIf (cfg.lockdPort != null) '' - options lockd nlm_udpport=${toString cfg.lockdPort} nlm_tcpport=${toString cfg.lockdPort} - ''; - - boot.kernelModules = [ "sunrpc" ]; - boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ]; - # FIXME: should use upstream units from nfs-utils. + systemd.packages = [ pkgs.nfs-utils ]; + systemd.generator-packages = [ pkgs.nfs-utils ]; - systemd.services.statd = - { description = "NFSv3 Network Status Monitor"; + environment.etc = { + "idmapd.conf".source = idmapdConfFile; + "nfs.conf".source = nfsConfFile; + }; - path = [ pkgs.nfs-utils pkgs.sysvtools pkgs.utillinux ]; - - wants = [ "remote-fs-pre.target" ]; - before = [ "remote-fs-pre.target" ]; - wantedBy = [ "remote-fs.target" ]; - requires = [ "basic.target" "rpcbind.service" ]; - after = [ "basic.target" "rpcbind.service" ]; - - unitConfig.DefaultDependencies = false; # don't stop during shutdown - - preStart = - '' - mkdir -p ${nfsStateDir}/sm - mkdir -p ${nfsStateDir}/sm.bak - sm-notify -d - ''; - - serviceConfig.Type = "forking"; - serviceConfig.ExecStart = '' - @${pkgs.nfs-utils}/sbin/rpc.statd rpc.statd --no-notify \ - ${if cfg.statdPort != null then "-p ${toString cfg.statdPort}" else ""} - ''; - serviceConfig.Restart = "always"; + systemd.services.nfs-blkmap = + { restartTriggers = [ nfsConfFile ]; }; - systemd.services.idmapd = - { description = "NFSv4 ID Mapping Daemon"; + systemd.targets.nfs-client = + { wantedBy = [ "multi-user.target" "remote-fs.target" ]; + }; - path = [ pkgs.sysvtools pkgs.utillinux ]; + systemd.services.nfs-idmapd = + { restartTriggers = [ idmapdConfFile ]; + }; - wants = [ "remote-fs-pre.target" ]; - before = [ "remote-fs-pre.target" ]; - wantedBy = [ "remote-fs.target" ]; - requires = [ "rpcbind.service" ]; - after = [ "rpcbind.service" ]; + systemd.services.nfs-mountd = + { restartTriggers = [ nfsConfFile ]; + enable = mkDefault false; + }; + + systemd.services.nfs-server = + { restartTriggers = [ nfsConfFile ]; + enable = mkDefault false; + }; + + systemd.services.rpc-gssd = + { restartTriggers = [ nfsConfFile ]; + }; + + systemd.services.rpc-statd = + { restartTriggers = [ nfsConfFile ]; preStart = '' - mkdir -p ${rpcMountpoint} - mount -t rpc_pipefs rpc_pipefs ${rpcMountpoint} + mkdir -p /var/lib/nfs/{sm,sm.bak} ''; - - postStop = - '' - umount ${rpcMountpoint} - ''; - - serviceConfig.Type = "forking"; - serviceConfig.ExecStart = "@${pkgs.nfs-utils}/sbin/rpc.idmapd rpc.idmapd -c ${idmapdConfFile}"; - serviceConfig.Restart = "always"; }; }; diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index e001832ec2e..3975dd5b0ff 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -71,7 +71,7 @@ in ###### implementation config = mkMerge [ - (mkIf (!setVconsole || (setVconsole && config.boot.earlyVconsoleSetup)) { + (mkIf (!setVconsole) { systemd.services."systemd-vconsole-setup".enable = false; }) @@ -97,20 +97,25 @@ in printf "${makeColorCS n color}" >> /dev/console '') config.i18n.consoleColors} ''; - } - (mkIf (!config.boot.earlyVconsoleSetup) { - # This is identical to the systemd-vconsole-setup.service unit - # shipped with systemd, except that it uses /dev/tty1 instead of - # /dev/tty0 to prevent putting the X server in non-raw mode, and - # it has a restart trigger. + /* XXX: systemd-vconsole-setup needs a "main" terminal. By default + * /dev/tty0 is used which wouldn't work when the service is restarted + * from X11. We set this to /dev/tty1; not ideal because it may also be + * owned by X11 or something else. + * + * See #22470. + */ systemd.services."systemd-vconsole-setup" = { wantedBy = [ "sysinit.target" ]; before = [ "display-manager.service" ]; after = [ "systemd-udev-settle.service" ]; restartTriggers = [ vconsoleConf kbdEnv ]; + serviceConfig.ExecStart = [ + "" + "${pkgs.systemd}/lib/systemd/systemd-vconsole-setup /dev/tty1" + ]; }; - }) + } (mkIf config.boot.earlyVconsoleSetup { boot.initrd.extraUtilsCommands = '' diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index c50ea5c7964..179300ef166 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -37,31 +37,41 @@ let ip link del "${i}" 2>/dev/null || true ''; -in + # warn that these attributes are deprecated (2017-2-2) + # Should be removed in the release after next + bondDeprecation = rec { + deprecated = [ "lacp_rate" "miimon" "mode" "xmit_hash_policy" ]; + filterDeprecated = bond: (filterAttrs (attrName: attr: + elem attrName deprecated && attr != null) bond); + }; -{ + bondWarnings = + let oneBondWarnings = bondName: bond: + mapAttrsToList (bondText bondName) (bondDeprecation.filterDeprecated bond); + bondText = bondName: optName: _: + "${bondName}.${optName} is deprecated, use ${bondName}.driverOptions"; + in { + warnings = flatten (mapAttrsToList oneBondWarnings cfg.bonds); + }; - config = mkIf (!cfg.useNetworkd) { + normalConfig = { systemd.services = let deviceDependency = dev: - if (config.boot.isContainer == false) - then - # Trust udev when not in the container - optional (dev != null) (subsystemDevice dev) - else - # When in the container, check whether the interface is built from other definitions - if (hasAttr dev cfg.bridges) || - (hasAttr dev cfg.bonds) || - (hasAttr dev cfg.macvlans) || - (hasAttr dev cfg.sits) || - (hasAttr dev cfg.vlans) || - (hasAttr dev cfg.vswitches) || - (hasAttr dev cfg.wlanInterfaces) - then [ "${dev}-netdev.service" ] - else []; + # Use systemd service if we manage device creation, else + # trust udev when not in a container + if (hasAttr dev (filterAttrs (k: v: v.virtual) cfg.interfaces)) || + (hasAttr dev cfg.bridges) || + (hasAttr dev cfg.bonds) || + (hasAttr dev cfg.macvlans) || + (hasAttr dev cfg.sits) || + (hasAttr dev cfg.vlans) || + (hasAttr dev cfg.vswitches) || + (hasAttr dev cfg.wlanInterfaces) + then [ "${dev}-netdev.service" ] + else optional (dev != null && !config.boot.isContainer) (subsystemDevice dev); networkLocalCommands = { after = [ "network-setup.service" ]; @@ -102,17 +112,25 @@ in EOF # Set the default gateway. - ${optionalString (cfg.defaultGateway != null && cfg.defaultGateway != "") '' + ${optionalString (cfg.defaultGateway != null && cfg.defaultGateway.address != "") '' # FIXME: get rid of "|| true" (necessary to make it idempotent). - ip route add default via "${cfg.defaultGateway}" ${ + ip route add default ${optionalString (cfg.defaultGateway.metric != null) + "metric ${toString cfg.defaultGateway.metric}" + } via "${cfg.defaultGateway.address}" ${ optionalString (cfg.defaultGatewayWindowSize != null) - "window ${toString cfg.defaultGatewayWindowSize}"} || true + "window ${toString cfg.defaultGatewayWindowSize}"} ${ + optionalString (cfg.defaultGateway.interface != null) + "dev ${cfg.defaultGateway.interface}"} || true ''} - ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6 != "") '' + ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "") '' # FIXME: get rid of "|| true" (necessary to make it idempotent). - ip -6 route add ::/0 via "${cfg.defaultGateway6}" ${ + ip -6 route add ::/0 ${optionalString (cfg.defaultGateway6.metric != null) + "metric ${toString cfg.defaultGateway6.metric}" + } via "${cfg.defaultGateway6.address}" ${ optionalString (cfg.defaultGatewayWindowSize != null) - "window ${toString cfg.defaultGatewayWindowSize}"} || true + "window ${toString cfg.defaultGatewayWindowSize}"} ${ + optionalString (cfg.defaultGateway6.interface != null) + "dev ${cfg.defaultGateway6.interface}"} || true ''} ''; }; @@ -190,7 +208,7 @@ in user "${i.virtualOwner}" ''; postStop = '' - ip link del ${i.name} + ip link del ${i.name} || true ''; }; @@ -288,10 +306,11 @@ in echo "Creating new bond ${n}..." ip link add name "${n}" type bond \ - ${optionalString (v.mode != null) "mode ${toString v.mode}"} \ - ${optionalString (v.miimon != null) "miimon ${toString v.miimon}"} \ - ${optionalString (v.xmit_hash_policy != null) "xmit_hash_policy ${toString v.xmit_hash_policy}"} \ - ${optionalString (v.lacp_rate != null) "lacp_rate ${toString v.lacp_rate}"} + ${let opts = (mapAttrs (const toString) + (bondDeprecation.filterDeprecated v)) + // v.driverOptions; + in concatStringsSep "\n" + (mapAttrsToList (set: val: " ${set} ${val} \\") opts)} # !!! There must be a better way to wait for the interface while [ ! -d "/sys/class/net/${n}" ]; do sleep 0.1; done; @@ -327,7 +346,7 @@ in ip link set "${n}" up ''; postStop = '' - ip link delete "${n}" + ip link delete "${n}" || true ''; }); @@ -355,7 +374,7 @@ in ip link set "${n}" up ''; postStop = '' - ip link delete "${n}" + ip link delete "${n}" || true ''; }); @@ -379,7 +398,7 @@ in ip link set "${n}" up ''; postStop = '' - ip link delete "${n}" + ip link delete "${n}" || true ''; }); @@ -402,6 +421,14 @@ in KERNEL=="tun", TAG+="systemd" ''; + }; +in + +{ + config = mkMerge [ + bondWarnings + (mkIf (!cfg.useNetworkd) normalConfig) + ]; } diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 974041d7e1a..8b85ff0057f 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -38,6 +38,12 @@ in } { assertion = cfg.vswitches == {}; message = "networking.vswichtes are not supported by networkd."; + } { + assertion = cfg.defaultGateway == null || cfg.defaultGateway.interface == null; + message = "networking.defaultGateway.interface is not supported by networkd."; + } { + assertion = cfg.defaultGateway6 == null || cfg.defaultGateway6.interface == null; + message = "networking.defaultGateway6.interface is not supported by networkd."; } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: { assertion = !rstp; message = "networking.bridges.${n}.rstp is not supported by networkd."; @@ -56,9 +62,9 @@ in genericNetwork = override: { DHCP = override (dhcpStr cfg.useDHCP); } // optionalAttrs (cfg.defaultGateway != null) { - gateway = override [ cfg.defaultGateway ]; + gateway = override [ cfg.defaultGateway.address ]; } // optionalAttrs (cfg.defaultGateway6 != null) { - gateway = override [ cfg.defaultGateway6 ]; + gateway = override [ cfg.defaultGateway6.address ]; } // optionalAttrs (domains != [ ]) { domains = override domains; }; @@ -109,17 +115,65 @@ in Name = name; Kind = "bond"; }; - bondConfig = - (optionalAttrs (bond.lacp_rate != null) { - LACPTransmitRate = bond.lacp_rate; - }) // (optionalAttrs (bond.miimon != null) { - MIIMonitorSec = bond.miimon; - }) // (optionalAttrs (bond.mode != null) { - Mode = bond.mode; - }) // (optionalAttrs (bond.xmit_hash_policy != null) { - TransmitHashPolicy = bond.xmit_hash_policy; - }); + bondConfig = let + # manual mapping as of 2017-02-03 + # man 5 systemd.netdev [BOND] + # to https://www.kernel.org/doc/Documentation/networking/bonding.txt + # driver options. + driverOptionMapping = let + trans = f: optName: { valTransform = f; optNames = [optName]; }; + simp = trans id; + ms = trans (v: v + "ms"); + in { + Mode = simp "mode"; + TransmitHashPolicy = simp "xmit_hash_policy"; + LACPTransmitRate = simp "lacp_rate"; + MIIMonitorSec = ms "miimon"; + UpDelaySec = ms "updelay"; + DownDelaySec = ms "downdelay"; + LearnPacketIntervalSec = simp "lp_interval"; + AdSelect = simp "ad_select"; + FailOverMACPolicy = simp "fail_over_mac"; + ARPValidate = simp "arp_validate"; + # apparently in ms for this value?! Upstream bug? + ARPIntervalSec = simp "arp_interval"; + ARPIPTargets = simp "arp_ip_target"; + ARPAllTargets = simp "arp_all_targets"; + PrimaryReselectPolicy = simp "primary_reselect"; + ResendIGMP = simp "resend_igmp"; + PacketsPerSlave = simp "packets_per_slave"; + GratuitousARP = { valTransform = id; + optNames = [ "num_grat_arp" "num_unsol_na" ]; }; + AllSlavesActive = simp "all_slaves_active"; + MinLinks = simp "min_links"; + }; + + do = bond.driverOptions; + assertNoUnknownOption = let + knownOptions = flatten (mapAttrsToList (_: kOpts: kOpts.optNames) + driverOptionMapping); + # options that apparently don’t exist in the networkd config + unknownOptions = [ "primary" ]; + assertTrace = bool: msg: if bool then true else builtins.trace msg false; + in assert all (driverOpt: assertTrace + (elem driverOpt (knownOptions ++ unknownOptions)) + "The bond.driverOption `${driverOpt}` cannot be mapped to the list of known networkd bond options. Please add it to the mapping above the assert or to `unknownOptions` should it not exist in networkd.") + (mapAttrsToList (k: _: k) do); ""; + # get those driverOptions that have been set + filterSystemdOptions = filterAttrs (sysDOpt: kOpts: + any (kOpt: do ? "${kOpt}") kOpts.optNames); + # build final set of systemd options to bond values + buildOptionSet = mapAttrs (_: kOpts: with kOpts; + # we simply take the first set kernel bond option + # (one option has multiple names, which is silly) + head (map (optN: valTransform (do."${optN}")) + # only map those that exist + (filter (o: do ? "${o}") optNames))); + in seq assertNoUnknownOption + (buildOptionSet (filterSystemdOptions driverOptionMapping)); + }; + networks = listToAttrs (flip map bond.interfaces (bi: nameValuePair "40-${bi}" (mkMerge [ (genericNetwork (mkOverride 999)) { DHCP = mkOverride 0 (dhcpStr false); diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 83d9854d351..898207ef7a3 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, utils, ... }: +{ config, lib, pkgs, utils, stdenv, ... }: with lib; with utils; @@ -116,6 +116,35 @@ let }; }; + gatewayCoerce = address: { inherit address; }; + + gatewayOpts = { ... }: { + + options = { + + address = mkOption { + type = types.str; + description = "The default gateway address."; + }; + + interface = mkOption { + type = types.nullOr types.str; + default = null; + example = "enp0s3"; + description = "The default gateway interface."; + }; + + metric = mkOption { + type = types.nullOr types.int; + default = null; + example = 42; + description = "The default gateway metric/preference."; + }; + + }; + + }; + interfaceOpts = { name, ... }: { options = { @@ -327,19 +356,27 @@ in networking.defaultGateway = mkOption { default = null; - example = "131.211.84.1"; - type = types.nullOr types.str; + example = { + address = "131.211.84.1"; + device = "enp3s0"; + }; + type = types.nullOr (types.coercedTo types.str gatewayCoerce (types.submodule gatewayOpts)); description = '' - The default gateway. It can be left empty if it is auto-detected through DHCP. + The default gateway. It can be left empty if it is auto-detected through DHCP. + It can be specified as a string or an option set along with a network interface. ''; }; networking.defaultGateway6 = mkOption { default = null; - example = "2001:4d0:1e04:895::1"; - type = types.nullOr types.str; + example = { + address = "2001:4d0:1e04:895::1"; + device = "enp3s0"; + }; + type = types.nullOr (types.coercedTo types.str gatewayCoerce (types.submodule gatewayOpts)); description = '' - The default ipv6 gateway. It can be left empty if it is auto-detected through DHCP. + The default ipv6 gateway. It can be left empty if it is auto-detected through DHCP. + It can be specified as a string or an option set along with a network interface. ''; }; @@ -550,11 +587,28 @@ in description = "The interfaces to bond together"; }; + driverOptions = mkOption { + type = types.attrsOf types.str; + default = {}; + example = literalExample { + interfaces = [ "eth0" "wlan0" ]; + miimon = 100; + mode = "active-backup"; + }; + description = '' + Options for the bonding driver. + Documentation can be found in + + ''; + + }; + lacp_rate = mkOption { default = null; example = "fast"; type = types.nullOr types.str; description = '' + DEPRECATED, use `driverOptions`. Option specifying the rate in which we'll ask our link partner to transmit LACPDU packets in 802.3ad mode. ''; @@ -565,6 +619,7 @@ in example = 100; type = types.nullOr types.int; description = '' + DEPRECATED, use `driverOptions`. Miimon is the number of millisecond in between each round of polling by the device driver for failed links. By default polling is not enabled and the driver is trusted to properly detect and handle @@ -577,6 +632,7 @@ in example = "active-backup"; type = types.nullOr types.str; description = '' + DEPRECATED, use `driverOptions`. The mode which the bond will be running. The default mode for the bonding driver is balance-rr, optimizing for throughput. More information about valid modes can be found at @@ -589,6 +645,7 @@ in example = "layer2+3"; type = types.nullOr types.str; description = '' + DEPRECATED, use `driverOptions`. Selects the transmit hash policy to use for slave selection in balance-xor, 802.3ad, and tlb modes. ''; @@ -896,7 +953,22 @@ in (i: flip map [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${i.name}.proxy_arp" true)) )); - security.setuidPrograms = [ "ping" "ping6" ]; + # Capabilities won't work unless we have at-least a 4.3 Linux + # kernel because we need the ambient capability + security.wrappers = if (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") then { + ping = { + source = "${pkgs.iputils.out}/bin/ping"; + capabilities = "cap_net_raw+p"; + }; + + ping6 = { + source = "${pkgs.iputils.out}/bin/ping6"; + capabilities = "cap_net_raw+p"; + }; + } else { + ping.source = "${pkgs.iputils.out}/bin/ping"; + "ping6".source = "${pkgs.iputils.out}/bin/ping6"; + }; # Set the host and domain names in the activation script. Don't # clear it if it's not configured in the NixOS configuration, diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 099ead3d846..7f5b55d5cca 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -123,15 +123,6 @@ let kernel = config.boot.kernelPackages.kernel; in users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; services.xserver.displayManager.logToJournal = true; - - # Bump kdm's X server start timeout to account for heavily loaded - # VM host systems. - services.xserver.displayManager.kdm.extraConfig = - '' - [X-:*-Core] - ServerTimeout=240 - ''; - }; } diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix index c9356c9b4ea..5797d9db436 100644 --- a/nixos/modules/virtualisation/amazon-init.nix +++ b/nixos/modules/virtualisation/amazon-init.nix @@ -1,20 +1,18 @@ -{ config, pkgs, modulesPath, ... }: - -# This attempts to pull a nix expression from this EC2 instance's user-data. +{ config, pkgs, ... }: let - bootScript = pkgs.writeScript "bootscript.sh" '' + script = '' #!${pkgs.stdenv.shell} -eu echo "attempting to fetch configuration from EC2 user data..." + export HOME=/root export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.gnused config.system.build.nixos-rebuild]}:$PATH export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels userData=/etc/ec2-metadata/user-data if [ -s "$userData" ]; then - # If the user-data looks like it could be a nix expression, # copy it over. Also, look for a magic three-hash comment and set # that as the channel. @@ -43,7 +41,22 @@ let nixos-rebuild switch ''; in { - boot.postBootCommands = '' - ${bootScript} & - ''; + systemd.services.amazon-init = { + inherit script; + description = "Reconfigure the system from EC2 userdata on startup"; + + wantedBy = [ "sshd.service" ]; + before = [ "sshd.service" ]; + after = [ "network-online.target" ]; + requires = [ "network-online.target" ]; + + restartIfChanged = false; + unitConfig.X-StopOnRemoval = false; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + }; } + diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 9fac543b03d..33f84986cac 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -23,7 +23,7 @@ in postVM = '' mkdir -p $out - ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd + ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd rm $diskImage ''; diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw"; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 7d445fa0951..f79854967f1 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -89,6 +89,15 @@ let if [ -n "$HOST_BRIDGE" ]; then extraFlags+=" --network-bridge=$HOST_BRIDGE" fi + if [ -n "$HOST_PORT" ]; then + OIFS=$IFS + IFS="," + for i in $HOST_PORT + do + extraFlags+=" --port=$i" + done + IFS=$OIFS + fi fi extraFlags+=" ${concatStringsSep " " (mapAttrsToList nspawnExtraVethArgs cfg.extraVeths)}" @@ -128,6 +137,7 @@ let --setenv LOCAL_ADDRESS="$LOCAL_ADDRESS" \ --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \ --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \ + --setenv HOST_PORT="$HOST_PORT" \ --setenv PATH="$PATH" \ ${if cfg.additionalCapabilities != null && cfg.additionalCapabilities != [] then ''--capability="${concatStringsSep " " cfg.additionalCapabilities}"'' else "" @@ -315,6 +325,36 @@ let ''; }; + forwardPorts = mkOption { + type = types.listOf (types.submodule { + options = { + protocol = mkOption { + type = types.str; + default = "tcp"; + description = "The protocol specifier for port forwarding between host and container"; + }; + hostPort = mkOption { + type = types.int; + description = "Source port of the external interface on host"; + }; + containerPort = mkOption { + type = types.nullOr types.int; + default = null; + description = "Target port of container"; + }; + }; + }); + default = []; + example = [ { protocol = "tcp"; hostPort = 8080; containerPort = 80; } ]; + description = '' + List of forwarded ports from host to container. Each forwarded port + is specified by protocol, hostPort and containerPort. By default, + protocol is tcp and hostPort and containerPort are assumed to be + the same if containerPort is not explicitly given. + ''; + }; + + hostAddress = mkOption { type = types.nullOr types.str; default = null; @@ -642,7 +682,9 @@ in # Generate a configuration file in /etc/containers for each # container so that container@.target can get the container # configuration. - environment.etc = mapAttrs' (name: cfg: nameValuePair "containers/${name}.conf" + environment.etc = + let mkPortStr = p: p.protocol + ":" + (toString p.hostPort) + ":" + (if p.containerPort == null then toString p.hostPort else toString p.containerPort); + in mapAttrs' (name: cfg: nameValuePair "containers/${name}.conf" { text = '' SYSTEM_PATH=${cfg.path} @@ -651,6 +693,9 @@ in ${optionalString (cfg.hostBridge != null) '' HOST_BRIDGE=${cfg.hostBridge} ''} + ${optionalString (length cfg.forwardPorts > 0) '' + HOST_PORT=${concatStringsSep "," (map mkPortStr cfg.forwardPorts)} + ''} ${optionalString (cfg.hostAddress != null) '' HOST_ADDRESS=${cfg.hostAddress} ''} diff --git a/nixos/modules/virtualisation/ecs-agent.nix b/nixos/modules/virtualisation/ecs-agent.nix new file mode 100644 index 00000000000..18e45e0b845 --- /dev/null +++ b/nixos/modules/virtualisation/ecs-agent.nix @@ -0,0 +1,45 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.ecs-agent; +in { + options.services.ecs-agent = { + enable = mkEnableOption "Amazon ECS agent"; + + package = mkOption { + type = types.path; + description = "The ECS agent package to use"; + default = pkgs.ecs-agent; + }; + + extra-environment = mkOption { + type = types.attrsOf types.str; + description = "The environment the ECS agent should run with. See the ECS agent documentation for keys that work here."; + default = {}; + }; + }; + + config = lib.mkIf cfg.enable { + # This service doesn't run if docker isn't running, and unlike potentially remote services like e.g., postgresql, docker has + # to be running locally so `docker.enable` will always be set if the ECS agent is enabled. + virtualisation.docker.enable = true; + + systemd.services.ecs-agent = { + inherit (cfg.package.meta) description; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment = cfg.extra-environment; + + script = '' + if [ ! -z "$ECS_DATADIR" ]; then + mkdir -p "$ECS_DATADIR" + fi + ${cfg.package.bin}/bin/agent + ''; + }; + }; +} + diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 586f5d9c0a3..56a05028b1d 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -440,13 +440,20 @@ in ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} = { device = "store"; fsType = "9p"; - options = [ "trans=virtio" "version=9p2000.L" "veryloose" ]; + options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ]; neededForBoot = true; }; + "/tmp" = mkIf config.boot.tmpOnTmpfs + { device = "tmpfs"; + fsType = "tmpfs"; + neededForBoot = true; + # Sync with systemd's tmp.mount; + options = [ "mode=1777" "strictatime" "nosuid" "nodev" ]; + }; "/tmp/xchg" = { device = "xchg"; fsType = "9p"; - options = [ "trans=virtio" "version=9p2000.L" "veryloose" ]; + options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ]; neededForBoot = true; }; "/tmp/shared" = diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index 7214543871d..bb0c38bd4eb 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -68,15 +68,15 @@ in boot.extraModulePackages = [ kernelModules ]; environment.systemPackages = [ virtualbox ]; - security.setuidOwners = let + security.wrappers = let mkSuid = program: { - inherit program; source = "${virtualbox}/libexec/virtualbox/${program}"; owner = "root"; group = "vboxusers"; setuid = true; }; - in mkIf cfg.enableHardening (map mkSuid [ + in mkIf cfg.enableHardening + (builtins.listToAttrs (map (x: { name = x; value = mkSuid x; }) [ "VBoxHeadless" "VBoxNetAdpCtl" "VBoxNetDHCP" @@ -84,7 +84,7 @@ in "VBoxSDL" "VBoxVolInfo" "VirtualBox" - ]); + ])); users.extraGroups.vboxusers.gid = config.ids.gids.vboxusers; @@ -99,7 +99,7 @@ in SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" ''; - # Since we lack the right setuid binaries, set up a host-only network by default. + # Since we lack the right setuid/setcap binaries, set up a host-only network by default. } (mkIf cfg.addNetworkInterface { systemd.services."vboxnet0" = { description = "VirtualBox vboxnet0 Interface"; diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index ac5f87817fe..ce1224a8f13 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -4,12 +4,19 @@ with lib; let cfg = config.services.vmwareGuest; - open-vm-tools = pkgs.open-vm-tools; + open-vm-tools = if cfg.headless then pkgs.open-vm-tools-headless else pkgs.open-vm-tools; xf86inputvmmouse = pkgs.xorg.xf86inputvmmouse; in { options = { - services.vmwareGuest.enable = mkEnableOption "VMWare Guest Support"; + services.vmwareGuest = { + enable = mkEnableOption "VMWare Guest Support"; + headless = mkOption { + type = types.bool; + default = false; + description = "Whether to disable X11-related features."; + }; + }; }; config = mkIf cfg.enable { @@ -28,7 +35,7 @@ in environment.etc."vmware-tools".source = "${pkgs.open-vm-tools}/etc/vmware-tools/*"; - services.xserver = { + services.xserver = mkIf (!cfg.headless) { videoDrivers = mkOverride 50 [ "vmware" ]; modules = [ xf86inputvmmouse ]; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 70b29aa23a5..6c048e8a0ac 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -72,7 +72,6 @@ in rec { (all nixos.tests.ecryptfs) (all nixos.tests.ipv6) (all nixos.tests.i3wm) - (all nixos.tests.kde4) (all nixos.tests.kde5) #(all nixos.tests.lightdm) (all nixos.tests.login) diff --git a/nixos/release-small.nix b/nixos/release-small.nix index f6e7a65fbde..28f1340caf8 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -53,8 +53,7 @@ in rec { nixpkgs = { inherit (nixpkgs') - apacheHttpd_2_2 - apacheHttpd_2_4 + apacheHttpd cmake cryptsetup emacs @@ -63,13 +62,12 @@ in rec { imagemagick jdk linux - mysql55 + mysql nginx nodejs openssh php - postgresql92 - postgresql93 + postgresql python rsyslog stdenv diff --git a/nixos/release.nix b/nixos/release.nix index dfa9b67654f..0f93deddf26 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -255,7 +255,6 @@ in rec { tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; - tests.kde4 = callTest tests/kde4.nix {}; tests.kde5 = callTest tests/kde5.nix {}; tests.keymap = callSubTests tests/keymap.nix {}; tests.initrdNetwork = callTest tests/initrd-network.nix {}; @@ -273,6 +272,7 @@ in rec { tests.mysql = callTest tests/mysql.nix {}; tests.mysqlReplication = callTest tests/mysql-replication.nix {}; 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.networking.networkd = callSubTests tests/networking.nix { networkd = true; }; tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; }; @@ -283,6 +283,7 @@ in rec { tests.leaps = callTest tests/leaps.nix { }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; + tests.pam-oath-login = callTest tests/pam-oath-login.nix {}; #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; tests.postgresql = callTest tests/postgresql.nix {}; @@ -324,8 +325,8 @@ in rec { kde = makeClosure ({ pkgs, ... }: { services.xserver.enable = true; - services.xserver.displayManager.kdm.enable = true; - services.xserver.desktopManager.kde4.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.kde5.enable = true; }); xfce = makeClosure ({ pkgs, ... }: diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 5aded554f4e..3a718a79831 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -11,7 +11,7 @@ import ./make-test.nix ({ pkgs, ... }: let # Some random file to serve. - file = pkgs.nixUnstable.src; + file = pkgs.hello.src; miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf" '' diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 55b1fb5a722..3a2c6516476 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -18,8 +18,9 @@ mapAttrs (channel: chromiumPkg: makeTest rec { enableOCR = true; - machine.imports = [ ./common/x11.nix ]; + machine.imports = [ ./common/user-account.nix ./common/x11.nix ]; machine.virtualisation.memorySize = 2047; + machine.services.xserver.displayManager.auto.user = "alice"; machine.environment.systemPackages = [ chromiumPkg ]; startupHTML = pkgs.writeText "chromium-startup.html" '' @@ -43,14 +44,20 @@ mapAttrs (channel: chromiumPkg: makeTest rec { xdoScript = pkgs.writeText "${name}.xdo" text; in "${pkgs.xdotool}/bin/xdotool '${xdoScript}'"; in '' + # Run as user alice + sub ru ($) { + my $esc = $_[0] =~ s/'/'\\${"'"}'/gr; + return "su - alice -c '$esc'"; + } + sub createNewWin { $machine->nest("creating a new Chromium window", sub { - $machine->execute("${xdo "new-window" '' + $machine->execute(ru "${xdo "new-window" '' search --onlyvisible --name "startup done" windowfocus --sync windowactivate --sync ''}"); - $machine->execute("${xdo "new-window" '' + $machine->execute(ru "${xdo "new-window" '' key Ctrl+n ''}"); }); @@ -58,16 +65,16 @@ mapAttrs (channel: chromiumPkg: makeTest rec { sub closeWin { Machine::retry sub { - $machine->execute("${xdo "close-window" '' + $machine->execute(ru "${xdo "close-window" '' search --onlyvisible --name "new tab" windowfocus --sync windowactivate --sync ''}"); - $machine->execute("${xdo "close-window" '' + $machine->execute(ru "${xdo "close-window" '' key Ctrl+w ''}"); for (1..20) { - my ($status, $out) = $machine->execute("${xdo "wait-for-close" '' + my ($status, $out) = $machine->execute(ru "${xdo "wait-for-close" '' search --onlyvisible --name "new tab" ''}"); return 1 if $status != 0; @@ -80,7 +87,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { my $ret = 0; $machine->nest("waiting for new Chromium window to appear", sub { for (1..20) { - my ($status, $out) = $machine->execute("${xdo "wait-for-window" '' + my ($status, $out) = $machine->execute(ru "${xdo "wait-for-window" '' search --onlyvisible --name "new tab" windowfocus --sync windowactivate --sync @@ -113,13 +120,9 @@ mapAttrs (channel: chromiumPkg: makeTest rec { $machine->waitForX; my $url = "file://${startupHTML}"; - my $args = "--user-data-dir=/tmp/chromium-${channel}"; - $machine->execute( - "ulimit -c unlimited; ". - "chromium $args \"$url\" & disown" - ); + $machine->execute(ru "ulimit -c unlimited; chromium \"$url\" & disown"); $machine->waitForText(qr/startup done/); - $machine->waitUntilSucceeds("${xdo "check-startup" '' + $machine->waitUntilSucceeds(ru "${xdo "check-startup" '' search --sync --onlyvisible --name "startup done" # close first start help popup key -delay 1000 Escape @@ -134,13 +137,13 @@ mapAttrs (channel: chromiumPkg: makeTest rec { $machine->screenshot("startup_done"); testNewWin "check sandbox", sub { - $machine->succeed("${xdo "type-url" '' + $machine->succeed(ru "${xdo "type-url" '' search --sync --onlyvisible --name "new tab" windowfocus --sync type --delay 1000 "chrome://sandbox" ''}"); - $machine->succeed("${xdo "submit-url" '' + $machine->succeed(ru "${xdo "submit-url" '' search --sync --onlyvisible --name "new tab" windowfocus --sync key --delay 1000 Return @@ -148,15 +151,15 @@ mapAttrs (channel: chromiumPkg: makeTest rec { $machine->screenshot("sandbox_info"); - $machine->succeed("${xdo "submit-url" '' + $machine->succeed(ru "${xdo "submit-url" '' search --sync --onlyvisible --name "sandbox status" windowfocus --sync ''}"); - $machine->succeed("${xdo "submit-url" '' + $machine->succeed(ru "${xdo "submit-url" '' key --delay 1000 Ctrl+a Ctrl+c ''}"); - my $clipboard = $machine->succeed("${pkgs.xclip}/bin/xclip -o"); + my $clipboard = $machine->succeed(ru "${pkgs.xclip}/bin/xclip -o"); die "sandbox not working properly: $clipboard" unless $clipboard =~ /namespace sandbox.*yes/mi && $clipboard =~ /pid namespaces.*yes/mi diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix new file mode 100644 index 00000000000..78cc445c2dd --- /dev/null +++ b/nixos/tests/containers-portforward.nix @@ -0,0 +1,63 @@ +# Test for NixOS' container support. + +let + hostIp = "192.168.0.1"; + hostPort = 10080; + containerIp = "192.168.0.100"; + containerPort = 80; +in + +import ./make-test.nix ({ pkgs, ...} : { + name = "containers-portforward"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ianwookim ]; + }; + + machine = + { config, pkgs, ... }: + { imports = [ ../modules/installer/cd-dvd/channel.nix ]; + virtualisation.writableStore = true; + virtualisation.memorySize = 768; + + containers.webserver = + { privateNetwork = true; + hostAddress = hostIp; + localAddress = containerIp; + forwardPorts = [ { protocol = "tcp"; hostPort = hostPort; containerPort = containerPort; } ]; + config = + { services.httpd.enable = true; + services.httpd.adminAddr = "foo@example.org"; + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.firewall.allowPing = true; + }; + }; + + virtualisation.pathsInNixDB = [ pkgs.stdenv ]; + }; + + testScript = + '' + $machine->succeed("nixos-container list") =~ /webserver/ or die; + + # Start the webserver container. + $machine->succeed("nixos-container start webserver"); + + # wait two seconds for the container to start and the network to be up + sleep 2; + + # Since "start" returns after the container has reached + # multi-user.target, we should now be able to access it. + #my $ip = $machine->succeed("nixos-container show-ip webserver"); + #chomp $ip; + $machine->succeed("ping -n -c1 ${hostIp}"); + $machine->succeed("curl --fail http://${hostIp}:${toString hostPort}/ > /dev/null"); + + # Stop the container. + $machine->succeed("nixos-container stop webserver"); + $machine->fail("curl --fail --connect-timeout 2 http://${hostIp}:${toString hostPort}/ > /dev/null"); + + # Destroying a declarative container should fail. + $machine->fail("nixos-container destroy webserver"); + ''; + +}) diff --git a/nixos/tests/emacs-daemon.nix b/nixos/tests/emacs-daemon.nix index a4d63bdb7e4..466e772a881 100644 --- a/nixos/tests/emacs-daemon.nix +++ b/nixos/tests/emacs-daemon.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "emacs-daemon"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ DamienCassou ]; + maintainers = [ ]; }; enableOCR = true; diff --git a/nixos/tests/grsecurity.nix b/nixos/tests/grsecurity.nix index ee9e0709e5e..d4a419fd0e3 100644 --- a/nixos/tests/grsecurity.nix +++ b/nixos/tests/grsecurity.nix @@ -36,7 +36,7 @@ import ./make-test.nix ({ pkgs, ...} : { # paxmark actually works (otherwise, the process should be terminated) subtest "tcc", sub { $machine->execute("echo -e '#include \nint main(void) { puts(\"hello\"); return 0; }' >main.c"); - $machine->succeed("${pkgs.tinycc.bin}/bin/tcc -run main.c"); + $machine->succeed("${pkgs.tinycc}/bin/tcc -run main.c"); }; subtest "RBAC", sub { diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 1df2c651f9b..35dd00fe630 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -115,8 +115,8 @@ let # Did the swap device get activated? # uncomment once https://bugs.freedesktop.org/show_bug.cgi?id=86930 is resolved - #$machine->waitForUnit("swap.target"); - $machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev"); + $machine->waitForUnit("swap.target"); + $machine->succeed("cat /proc/swaps | grep -q /dev"); # Check whether the channel works. $machine->succeed("nix-env -iA nixos.procps >&2"); diff --git a/nixos/tests/kde4.nix b/nixos/tests/kde4.nix deleted file mode 100644 index 9ecfe687056..00000000000 --- a/nixos/tests/kde4.nix +++ /dev/null @@ -1,70 +0,0 @@ -import ./make-test.nix ({ pkgs, ... }: { - name = "kde4"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco chaoflow ]; - }; - - machine = - { config, pkgs, ... }: - - { imports = [ ./common/user-account.nix ]; - - virtualisation.memorySize = 1024; - - services.xserver.enable = true; - - services.httpd.enable = true; - services.httpd.adminAddr = "foo@example.org"; - services.httpd.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html"; - - services.xserver.displayManager.kdm.enable = true; - services.xserver.displayManager.kdm.extraConfig = - '' - [X-:0-Core] - AutoLoginEnable=true - AutoLoginUser=alice - AutoLoginPass=foobar - ''; - - services.xserver.desktopManager.kde4.enable = true; - - # Include most of KDE. We don't really test these here, but at - # least they should build. - environment.systemPackages = - [ pkgs.kde4.kdemultimedia - pkgs.kde4.kdegraphics - pkgs.kde4.kdeutils - pkgs.kde4.kdegames - #pkgs.kde4.kdeedu - pkgs.kde4.kdeaccessibility - pkgs.kde4.kdeadmin - pkgs.kde4.kdenetwork - pkgs.kde4.kdetoys - pkgs.kde4.kdewebdev - pkgs.xorg.xmessage - ]; - }; - - testScript = '' - $machine->waitUntilSucceeds("pgrep plasma-desktop"); - $machine->succeed("xauth merge ~alice/.Xauthority"); - $machine->waitForWindow(qr/plasma-desktop/); - - # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); - - $machine->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'"); - $machine->waitForWindow(qr/messages.*KWrite/); - - $machine->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'"); - $machine->waitForWindow(qr/Valgrind.*Konqueror/); - - $machine->execute("su - alice -c 'DISPLAY=:0.0 gwenview ${pkgs.kde4.kde_wallpapers}/share/wallpapers/Hanami/contents/images/1280x1024.jpg &'"); - $machine->waitForWindow(qr/Gwenview/); - - $machine->sleep(10); - - $machine->screenshot("screen"); - ''; - -}) diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 4fbf6446268..74e20bff8d8 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -3,34 +3,47 @@ # client on the inside network, a server on the outside network, and a # router connected to both that performs Network Address Translation # for the client. -import ./make-test.nix ({ pkgs, withFirewall, ... }: +import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, ... }: let unit = if withFirewall then "firewall" else "nat"; in { - name = "nat${if withFirewall then "WithFirewall" else "Standalone"}"; - meta = with pkgs.stdenv.lib.maintainers; { + name = "nat" + (if withFirewall then "WithFirewall" else "Standalone") + + (lib.optionalString withConntrackHelpers "withConntrackHelpers"); + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ eelco chaoflow rob wkennington ]; }; nodes = { client = { config, pkgs, nodes, ... }: - { virtualisation.vlans = [ 1 ]; - networking.firewall.allowPing = true; - networking.defaultGateway = - (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address; - }; + lib.mkMerge [ + { virtualisation.vlans = [ 1 ]; + networking.firewall.allowPing = true; + networking.defaultGateway = + (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address; + } + (lib.optionalAttrs withConntrackHelpers { + networking.firewall.connectionTrackingModules = [ "ftp" ]; + networking.firewall.autoLoadConntrackHelpers = true; + }) + ]; router = { config, pkgs, ... }: - { virtualisation.vlans = [ 2 1 ]; - networking.firewall.enable = withFirewall; - networking.firewall.allowPing = true; - networking.nat.enable = true; - networking.nat.internalIPs = [ "192.168.1.0/24" ]; - networking.nat.externalInterface = "eth1"; - }; + lib.mkMerge [ + { virtualisation.vlans = [ 2 1 ]; + networking.firewall.enable = withFirewall; + networking.firewall.allowPing = true; + networking.nat.enable = true; + networking.nat.internalIPs = [ "192.168.1.0/24" ]; + networking.nat.externalInterface = "eth1"; + } + (lib.optionalAttrs withConntrackHelpers { + networking.firewall.connectionTrackingModules = [ "ftp" ]; + networking.firewall.autoLoadConntrackHelpers = true; + }) + ]; server = { config, pkgs, ... }: @@ -66,7 +79,8 @@ import ./make-test.nix ({ pkgs, withFirewall, ... }: $client->succeed("curl -v ftp://server/foo.txt >&2"); # Test whether active FTP works. - $client->succeed("curl -v -P - ftp://server/foo.txt >&2"); + $client->${if withConntrackHelpers then "succeed" else "fail"}( + "curl -v -P - ftp://server/foo.txt >&2"); # Test ICMP. $client->succeed("ping -c 1 router >&2"); diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 83103f35d48..8b573869c15 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -236,8 +236,8 @@ let firewall.allowPing = true; useDHCP = false; bonds.bond = { - mode = "balance-rr"; interfaces = [ "eth1" "eth2" ]; + driverOptions.mode = "balance-rr"; }; interfaces.eth1.ip4 = mkOverride 0 [ ]; interfaces.eth2.ip4 = mkOverride 0 [ ]; diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix index 36cd6a39577..6ed1995f262 100644 --- a/nixos/tests/nfs.nix +++ b/nixos/tests/nfs.nix @@ -40,7 +40,7 @@ in testScript = '' - $server->waitForUnit("nfsd"); + $server->waitForUnit("nfs-server"); $server->succeed("systemctl start network-online.target"); $server->waitForUnit("network-online.target"); @@ -54,8 +54,8 @@ in $client2->succeed("echo bla > /data/bar"); $server->succeed("test -e /data/bar"); - # Test whether restarting ‘nfsd’ works correctly. - $server->succeed("systemctl restart nfsd"); + # Test whether restarting ‘nfs-server’ works correctly. + $server->succeed("systemctl restart nfs-server"); $client2->succeed("echo bla >> /data/bar"); # will take 90 seconds due to the NFS grace period # Test whether we can get a lock. diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix new file mode 100644 index 00000000000..4364d6e354a --- /dev/null +++ b/nixos/tests/pam-oath-login.nix @@ -0,0 +1,126 @@ +import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: + +let + oathSnakeoilSecret = "cdd4083ef8ff1fa9178c6d46bfb1a3"; + + # With HOTP mode the password is calculated based on a counter of + # how many passwords have been made. In this env, we'll always be on + # the 0th counter, so the password is static. + # + # Generated in nix-shell -p oathToolkit + # via: oathtool -v -d6 -w10 cdd4083ef8ff1fa9178c6d46bfb1a3 + # and picking a the first 4: + oathSnakeOilPassword1 = "143349"; + oathSnakeOilPassword2 = "801753"; + oathSnakeOilPassword3 = "019933"; + oathSnakeOilPassword4 = "403895"; + + alicePassword = "foobar"; + # Generated via: mkpasswd -m sha-512 and passing in "foobar" + hashedAlicePassword = "$6$MsMrE1q.1HrCgTS$Vq2e/uILzYjSN836TobAyN9xh9oi7EmCmucnZID25qgPoibkw8qTCugiAPnn4eCGvn1A.7oEBFJaaGUaJsQQY."; + +in +{ + name = "pam-oath-login"; + + machine = + { config, pkgs, lib, ... }: + { + security.pam.oath = { + enable = true; + }; + + users.extraUsers.alice = { + isNormalUser = true; + name = "alice"; + uid = 1000; + hashedPassword = hashedAlicePassword; + extraGroups = [ "wheel" ]; + createHome = true; + home = "/home/alice"; + }; + + + systemd.services.setupOathSnakeoilFile = { + wantedBy = [ "default.target" ]; + before = [ "default.target" ]; + unitConfig = { + type = "oneshot"; + RemainAfterExit = true; + }; + script = '' + touch /etc/users.oath + chmod 600 /etc/users.oath + chown root /etc/users.oath + echo "HOTP/E/6 alice - ${oathSnakeoilSecret}" > /etc/users.oath + ''; + }; + }; + + testScript = + '' + $machine->waitForUnit('multi-user.target'); + $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty1'"); + $machine->screenshot("postboot"); + + + subtest "Invalid password", sub { + $machine->fail("pgrep -f 'agetty.*tty2'"); + $machine->sendKeys("alt-f2"); + $machine->waitUntilSucceeds("[ \$(fgconsole) = 2 ]"); + $machine->waitForUnit('getty@tty2.service'); + $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty2'"); + + $machine->waitUntilTTYMatches(2, "login: "); + $machine->sendChars("alice\n"); + $machine->waitUntilTTYMatches(2, "login: alice"); + $machine->waitUntilSucceeds("pgrep login"); + + $machine->waitUntilTTYMatches(2, "One-time password"); + $machine->sendChars("${oathSnakeOilPassword1}\n"); + $machine->waitUntilTTYMatches(2, "Password: "); + $machine->sendChars("blorg\n"); + $machine->waitUntilTTYMatches(2, "Login incorrect"); + }; + + subtest "Invalid oath token", sub { + $machine->fail("pgrep -f 'agetty.*tty3'"); + $machine->sendKeys("alt-f3"); + $machine->waitUntilSucceeds("[ \$(fgconsole) = 3 ]"); + $machine->waitForUnit('getty@tty3.service'); + $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty3'"); + + $machine->waitUntilTTYMatches(3, "login: "); + $machine->sendChars("alice\n"); + $machine->waitUntilTTYMatches(3, "login: alice"); + $machine->waitUntilSucceeds("pgrep login"); + $machine->waitUntilTTYMatches(3, "One-time password"); + $machine->sendChars("000000\n"); + $machine->waitUntilTTYMatches(3, "Login incorrect"); + $machine->waitUntilTTYMatches(3, "login:"); + }; + + subtest "Happy path (both passwords are mandatory to get us in)", sub { + $machine->fail("pgrep -f 'agetty.*tty4'"); + $machine->sendKeys("alt-f4"); + $machine->waitUntilSucceeds("[ \$(fgconsole) = 4 ]"); + $machine->waitForUnit('getty@tty4.service'); + $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty4'"); + + $machine->waitUntilTTYMatches(4, "login: "); + $machine->sendChars("alice\n"); + $machine->waitUntilTTYMatches(4, "login: alice"); + $machine->waitUntilSucceeds("pgrep login"); + $machine->waitUntilTTYMatches(4, "One-time password"); + $machine->sendChars("${oathSnakeOilPassword2}\n"); + $machine->waitUntilTTYMatches(4, "Password: "); + $machine->sendChars("${alicePassword}\n"); + + $machine->waitUntilSucceeds("pgrep -u alice bash"); + $machine->sendChars("touch done4\n"); + $machine->waitForFile("/home/alice/done4"); + }; + + ''; + +}) diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix index 3bf83ab6665..85faafd5689 100644 --- a/nixos/tests/phabricator.nix +++ b/nixos/tests/phabricator.nix @@ -54,7 +54,7 @@ import ./make-test.nix ({ pkgs, ... }: { client = { config, pkgs, ... }: { imports = [ ./common/x11.nix ]; - services.xserver.desktopManager.kde4.enable = true; + services.xserver.desktopManager.kde5.enable = true; }; }; diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix index 9de3030417f..4c77e4b7861 100644 --- a/nixos/tests/smokeping.nix +++ b/nixos/tests/smokeping.nix @@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : { mailHost = "127.0.0.2"; probeConfig = '' + FPing - binary = /var/setuid-wrappers/fping + binary = /run/wrappers/bin/fping offset = 0% ''; }; diff --git a/nixos/tests/taskserver.nix b/nixos/tests/taskserver.nix index d770b20a775..cdccb11d888 100644 --- a/nixos/tests/taskserver.nix +++ b/nixos/tests/taskserver.nix @@ -1,4 +1,62 @@ -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ... }: let + snakeOil = pkgs.runCommand "snakeoil-certs" { + outputs = [ "out" "cacert" "cert" "key" "crl" ]; + buildInputs = [ pkgs.gnutls.bin ]; + caTemplate = pkgs.writeText "snakeoil-ca.template" '' + cn = server + expiration_days = -1 + cert_signing_key + ca + ''; + certTemplate = pkgs.writeText "snakeoil-cert.template" '' + cn = server + expiration_days = -1 + tls_www_server + encryption_key + signing_key + ''; + crlTemplate = pkgs.writeText "snakeoil-crl.template" '' + expiration_days = -1 + ''; + userCertTemplace = pkgs.writeText "snakoil-user-cert.template" '' + organization = snakeoil + cn = server + expiration_days = -1 + tls_www_client + encryption_key + signing_key + ''; + } '' + certtool -p --bits 4096 --outfile ca.key + certtool -s --template "$caTemplate" --load-privkey ca.key \ + --outfile "$cacert" + certtool -p --bits 4096 --outfile "$key" + certtool -c --template "$certTemplate" \ + --load-ca-privkey ca.key \ + --load-ca-certificate "$cacert" \ + --load-privkey "$key" \ + --outfile "$cert" + certtool --generate-crl --template "$crlTemplate" \ + --load-ca-privkey ca.key \ + --load-ca-certificate "$cacert" \ + --outfile "$crl" + + mkdir "$out" + + # Stripping key information before the actual PEM-encoded values is solely + # to make test output a bit less verbose when copying the client key to the + # actual client. + certtool -p --bits 4096 | sed -n \ + -e '/^----* *BEGIN/,/^----* *END/p' > "$out/alice.key" + + certtool -c --template "$userCertTemplace" \ + --load-privkey "$out/alice.key" \ + --load-ca-privkey ca.key \ + --load-ca-certificate "$cacert" \ + --outfile "$out/alice.cert" + ''; + +in { name = "taskserver"; nodes = rec { @@ -12,6 +70,23 @@ import ./make-test.nix { }; }; + # New generation of the server with manual config + newServer = { lib, nodes, ... }: { + imports = [ server ]; + services.taskserver.pki.manual = { + ca.cert = snakeOil.cacert; + server.cert = snakeOil.cert; + server.key = snakeOil.key; + server.crl = snakeOil.crl; + }; + # This is to avoid assigning a different network address to the new + # generation. + networking = lib.mapAttrs (lib.const lib.mkForce) { + inherit (nodes.server.config.networking) + hostName interfaces primaryIPAddress extraHosts; + }; + }; + client1 = { pkgs, ... }: { environment.systemPackages = [ pkgs.taskwarrior pkgs.gnutls ]; users.users.alice.isNormalUser = true; @@ -26,6 +101,8 @@ import ./make-test.nix { testScript = { nodes, ... }: let cfg = nodes.server.config.services.taskserver; portStr = toString cfg.listenPort; + newServerSystem = nodes.newServer.config.system.build.toplevel; + switchToNewServer = "${newServerSystem}/bin/switch-to-configuration test"; in '' sub su ($$) { my ($user, $cmd) = @_; @@ -33,8 +110,8 @@ import ./make-test.nix { return "su - $user -c '$esc'"; } - sub setupClientsFor ($$) { - my ($org, $user) = @_; + sub setupClientsFor ($$;$) { + my ($org, $user, $extraInit) = @_; for my $client ($client1, $client2) { $client->nest("initialize client for user $user", sub { @@ -58,6 +135,8 @@ import ./make-test.nix { } }); + eval { &$extraInit($client, $org, $user) }; + $client->succeed(su $user, "task config taskd.server server:${portStr} >&2" ); @@ -104,7 +183,10 @@ import ./make-test.nix { return su $user, $cmd; } - startAll; + # Explicitly start the VMs so that we don't accidentally start newServer + $server->start; + $client1->start; + $client2->start; $server->waitForUnit("taskserver.service"); @@ -162,5 +244,42 @@ import ./make-test.nix { restartServer; testSync "bar"; }; + + subtest "check manual configuration", sub { + $server->succeed('${switchToNewServer} >&2'); + $server->waitForUnit("taskserver.service"); + $server->waitForOpenPort(${portStr}); + + $server->succeed( + "nixos-taskserver org add manualOrg", + "nixos-taskserver user add manualOrg alice" + ); + + setupClientsFor "manualOrg", "alice", sub { + my ($client, $org, $user) = @_; + my $cfgpath = "/home/$user/.task"; + + $client->copyFileFromHost("${snakeOil.cacert}", "$cfgpath/ca.cert"); + for my $file ('alice.key', 'alice.cert') { + $client->copyFileFromHost("${snakeOil}/$file", "$cfgpath/$file"); + } + + for my $file ("$user.key", "$user.cert") { + $client->copyFileFromHost( + "${snakeOil}/$file", "$cfgpath/$file" + ); + } + $client->copyFileFromHost( + "${snakeOil.cacert}", "$cfgpath/ca.cert" + ); + $client->succeed( + (su "alice", "task config taskd.ca $cfgpath/ca.cert"), + (su "alice", "task config taskd.key $cfgpath/$user.key"), + (su $user, "task config taskd.certificate $cfgpath/$user.cert") + ); + }; + + testSync "alice"; + }; ''; -} +}) diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix index e7d9759ae0c..0d56c564e18 100644 --- a/nixos/tests/trac.nix +++ b/nixos/tests/trac.nix @@ -45,7 +45,7 @@ import ./make-test.nix ({ pkgs, ... }: { client = { config, pkgs, ... }: { imports = [ ./common/x11.nix ]; - services.xserver.desktopManager.kde4.enable = true; + services.xserver.desktopManager.kde5.enable = true; }; }; diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 9d62696a3f8..fbbb9f90f8a 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python }: +{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python }: stdenv.mkDerivation rec { name = "ams-lv2-${version}"; - version = "1.1.0"; + version = "1.2.1"; - src = fetchurl { - url = "https://github.com/blablack/ams-lv2/archive/v${version}.tar.gz"; - sha256 = "1kqbl7rc3zrs27c5ga0frw3mlpx15sbxzhf04sfbrd9l60535fd5"; + src = fetchFromGitHub { + owner = "blablack"; + repo = "ams-lv2"; + rev = version; + sha256 = "1n1dnqnj24xhiy9323lj52nswr5120cj56fpckg802miss05sr6x"; }; buildInputs = [ cairo fftw gtkmm2 lv2 lvtk pkgconfig python ]; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index e9d7b5da79a..6d4b18e29b0 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { name = "audacious-${version}"; - version = "3.8"; + version = "3.8.2"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2"; - sha256 = "0rpdzf9pb52lcswxypwh4nq3qkjzliw42v39nm5rlwwxdq6bm99q"; + sha256 = "1g08xprc9q0lyw3knq723j7xr7i15f8v1x1j3k5wvi8jv21bvijf"; }; pluginsSrc = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2"; - sha256 = "0j9svdqdjvj5spx1vfp0m63xh8xwk8naqsikdxfxbb68xk33rxb9"; + sha256 = "1vqcxwqinlwb2l0kkrarg33sw1brjzrnq5jbhzrql6z6x95h4jbq"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index b86efe7eb97..663e0eb0cc8 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -10,23 +10,23 @@ }: let - version = "3.8.1"; + version = "3.8.2"; sources = { "audacious-${version}" = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "1k9blmgqia0df18l39bd2bbcwmjfxak6bd286vcd9zzmjhqs4qdc"; + sha256 = "14xyvmxdax0aj1gqcz8z23cjcavsysyh6b3lkiczkv4vrqf4gwdx"; }; "audacious-plugins-${version}" = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "0f16ivcp8nd83r781hnw1qgbs9hi2b2v22zwv7c3sw3jq1chb70h"; + sha256 = "1m7xln93zc4qvb1fi83icyd5x2r6azqlvs5nigjz8az3l2kzrknp"; }; }; in stdenv.mkDerivation { inherit version; - name = "audacious-${version}"; + name = "audacious-qt5-${version}"; sourceFiles = lib.attrValues sources; sourceRoots = lib.attrNames sources; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index f91fc03ec01..92e6adbaa96 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -13,12 +13,20 @@ stdenv.mkDerivation rec { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; sha256 = "1ggr6g0mk36rqj7ahsg8b0b1r9kphwajzvxgn43md263rm87n04h"; }; - patches = [(fetchpatch { - name = "new-ffmpeg.patch"; - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk" - + "/audacity-ffmpeg.patch?h=packages/audacity&id=0c1e35798d4d70692"; - sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf"; - })]; + patches = [ + (fetchpatch { + name = "new-ffmpeg.patch"; + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk" + + "/audacity-ffmpeg.patch?h=packages/audacity&id=0c1e35798d4d70692"; + sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf"; + }) + ] + ++ optional (hasPrefix "gcc-6" stdenv.cc.cc.name) + (fetchpatch { + name = "gcc6.patch"; + url = "https://github.com/audacity/audacity/commit/60f2322055756e8cacfe96530a12c63e9694482c.patch"; + sha256 = "07jlxr8y7ap3nsblx3zh8v9rcx7ajbcfnvwzhwykmbwbsyirgqf2"; + }); preConfigure = /* we prefer system-wide libs */ '' mv lib-src lib-src-rm @@ -57,6 +65,8 @@ stdenv.mkDerivation rec { ffmpeg libmad lame libvorbis flac soundtouch ]; #ToDo: detach sbsms + enableParallelBuilding = true; + dontDisableStatic = true; doCheck = false; # Test fails diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index 2a611da45f8..e6addd6c4fd 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -1,24 +1,27 @@ { stdenv, fetchurl, lib -, pkgconfig, intltool, autoconf, makeWrapper +, pkgconfig, intltool, autoconf, gnome3 , glib, dbus, gtk3, libdbusmenu-gtk3, libappindicator-gtk3, gst_all_1 +, librsvg, wrapGAppsHook , pulseaudioSupport ? true, libpulseaudio ? null }: with lib; stdenv.mkDerivation rec { name = "audio-recorder-${version}"; - version = "1.7-5"; + version = "1.9.4"; src = fetchurl { - name = "${name}-wily.tar.gz"; - url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ewily.tar.gz"; - sha256 = "1cdlqhfqw2mg51f068j2lhn8mzxggzsbl560l4pl4fxgmpjywpkj"; + name = "${name}-zesty.tar.gz"; + url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ezesty.tar.gz"; + sha256 = "062bad38cz4fqzv418wza0x8sa4m5mqr3xsisrr1qgkqj9hg1f6x"; }; - nativeBuildInputs = [ pkgconfig intltool autoconf makeWrapper ]; + nativeBuildInputs = [ pkgconfig intltool autoconf wrapGAppsHook ]; + + patches = [ ./icon-names.diff ]; buildInputs = with gst_all_1; [ - glib dbus gtk3 libdbusmenu-gtk3 libappindicator-gtk3 + glib dbus gtk3 librsvg libdbusmenu-gtk3 libappindicator-gtk3 gnome3.dconf gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ] ++ optional pulseaudioSupport libpulseaudio; @@ -30,10 +33,10 @@ stdenv.mkDerivation rec { intltoolize ''; - postFixup = '' - wrapProgram $out/bin/audio-recorder \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" + preFixup = '' + gappsWrapperArgs+=('--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"' + '--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"' + '--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"') ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/audio-recorder/icon-names.diff b/pkgs/applications/audio/audio-recorder/icon-names.diff new file mode 100644 index 00000000000..28f21799166 --- /dev/null +++ b/pkgs/applications/audio/audio-recorder/icon-names.diff @@ -0,0 +1,51 @@ +diff -ru audio-recorder/src/main.c audio-recorder.new/src/main.c +--- audio-recorder/src/main.c 2017-01-03 20:27:36.000000000 +0100 ++++ audio-recorder.new/src/main.c 2017-01-30 20:19:44.019255096 +0100 +@@ -1099,7 +1099,7 @@ + gtk_container_add(GTK_CONTAINER(frame2), g_win.timer_text); + + // Timer [Save] button +- g_win.timer_save_button = gtk_button_new_from_icon_name("gtk-save", GTK_ICON_SIZE_BUTTON); ++ g_win.timer_save_button = gtk_button_new_from_icon_name("document-save", GTK_ICON_SIZE_BUTTON); + // Hide it + gtk_widget_hide(g_win.timer_save_button); + g_signal_connect(g_win.timer_save_button, "clicked", G_CALLBACK(win_timer_save_text_cb), NULL); +@@ -1129,7 +1129,7 @@ + // The [Info] button + GtkWidget *button0 = gtk_button_new(); + gtk_widget_show(button0); +- GtkWidget *image = gtk_image_new_from_icon_name("gtk-info", GTK_ICON_SIZE_BUTTON); ++ GtkWidget *image = gtk_image_new_from_icon_name("dialog-information", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image); + gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE); + gtk_button_set_image(GTK_BUTTON(button0), image); +@@ -1220,7 +1220,7 @@ + // Add [Reload] button + button0 = gtk_button_new(); + gtk_widget_show(button0); +- image = gtk_image_new_from_icon_name("gtk-refresh", GTK_ICON_SIZE_BUTTON); ++ image = gtk_image_new_from_icon_name("view-refresh", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image); + gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE); + +@@ -1297,7 +1297,7 @@ + gtk_widget_show(hbox4); + gtk_box_pack_start(GTK_BOX(vbox0), hbox4, FALSE, TRUE, 0); + +- button0 = gtk_button_new_from_icon_name("gtk-close", GTK_ICON_SIZE_BUTTON); ++ button0 = gtk_button_new_from_icon_name("window-close", GTK_ICON_SIZE_BUTTON); + gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE); + gtk_widget_show(button0); + gtk_box_pack_end(GTK_BOX(hbox4), button0, FALSE, FALSE, 0); +diff -ru audio-recorder/src/settings.c audio-recorder.new/src/settings.c +--- audio-recorder/src/settings.c 2017-01-02 10:47:27.000000000 +0100 ++++ audio-recorder.new/src/settings.c 2017-01-30 20:23:04.621314105 +0100 +@@ -659,7 +659,7 @@ + gtk_entry_set_invisible_char(GTK_ENTRY(file_name_pattern), 9679); + + button0 = gtk_button_new(); +- GtkWidget *image = gtk_image_new_from_icon_name("gtk-info", GTK_ICON_SIZE_BUTTON); ++ GtkWidget *image = gtk_image_new_from_icon_name("dialog-information", GTK_ICON_SIZE_BUTTON); + gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE); + gtk_button_set_image(GTK_BUTTON(button0), image); + g_signal_connect(button0, "clicked", G_CALLBACK(win_settings_show_filename_help), NULL); diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index ecb9d0f85d0..6b4913d30dc 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -1,22 +1,26 @@ -{ stdenv, fetchsvn, pkgconfig, autoreconfHook, gnutls33, freetype +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, gnutls, freetype , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis , libSM, libsndfile, libogg }: stdenv.mkDerivation rec { name = "freewheeling-${version}"; - version = "100"; + version = "2016-11-15"; - src = fetchsvn { - url = svn://svn.code.sf.net/p/freewheeling/code; - rev = version; - sha256 = "1m6z7p93xyha25qma9bazpzbp04pqdv5h3yrv6851775xsyvzksv"; + src = fetchFromGitHub { + owner = "free-wheeling"; + repo = "freewheeling"; + rev = "05ef3bf150fa6ba1b1d437b1fd70ef363289742f"; + sha256 = "19plf7r0sq4271ln5bya95mp4i1j30x8hsxxga2kla27z953n9ih"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - gnutls33 freetype SDL SDL_gfx SDL_ttf + freetype SDL SDL_gfx SDL_ttf liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM + (gnutls.overrideAttrs (oldAttrs: { + configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ]; + })) ]; patches = [ ./am_path_sdl.patch ./xml.patch ]; diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix new file mode 100644 index 00000000000..9ff9b8dc114 --- /dev/null +++ b/pkgs/applications/audio/gbsplay/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, libpulseaudio }: + +stdenv.mkDerivation { + name = "gbsplay-2016-12-17"; + + src = fetchFromGitHub { + owner = "mmitch"; + repo = "gbsplay"; + rev = "2c4486e17fd4f4cdea8c3fd79ae898c892616b70"; + sha256 = "1214j67sr87zfhvym41cw2g823fmqh4hr451r7y1s9ql3jpjqhpz"; + }; + + buildInputs = [ libpulseaudio ]; + + configureFlagsArray = + [ "--without-test" "--without-contrib" "--disable-devdsp" + "--enable-pulse" "--disable-alsa" "--disable-midi" + "--disable-nas" "--disable-dsound" "--disable-i18n" ]; + + makeFlagsArray = [ "tests=" ]; + + meta = with stdenv.lib; { + description = "gameboy sound player"; + license = licenses.gpl1; + platforms = ["i686-linux" "x86_64-linux"]; + maintainers = with maintainers; [ dasuxullebt ]; + }; +} diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index e0bca0fa1c8..a5e29a5e174 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, intltool, pkgconfig, python +{ stdenv, fetchurl, gettext, intltool, pkgconfig, python2 , avahi, bluez, boost, eigen, fftw, glib, glib_networking , glibmm, gsettings_desktop_schemas, gtkmm2, libjack2 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1qj3adjhg511jygbjkl9k5v0gcjmg6ifc479rspfyf45m383pp3p"; }; - nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python ]; + nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; buildInputs = [ avahi bluez boost eigen fftw glib glibmm glib_networking.out @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { "--no-faust" # todo: find out why --faust doesn't work ] ++ optional optimizationSupport "--optimization"; - configurePhase = ''python waf configure --prefix=$out $configureFlags''; + configurePhase = ''python2 waf configure --prefix=$out $configureFlags''; - buildPhase = ''python waf build''; + buildPhase = ''python2 waf build''; - installPhase = ''python waf install''; + installPhase = ''python2 waf install''; meta = with stdenv.lib; { description = "A virtual guitar amplifier for Linux running with JACK"; diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 7f4bc0b3e9e..0b0df0b55e4 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { name = "ingen-unstable-${rev}"; - rev = "2016-10-29"; + rev = "2017-01-18"; src = fetchgit { url = "http://git.drobilla.net/cgit.cgi/ingen.git"; - rev = "fd147d0b888090bfb897505852c1f25dbdf77e18"; - sha256 = "1qmg79962my82c43vyrv5sxbqci9c7gc2s9bwaaqd0fcf08xcz1z"; + rev = "02ae3e9d8bf3f6a5e844706721aad8c0ac9f4340"; + sha256 = "15s8nrzn68hc2s6iw0zshbz3lfnsq0mr6gflq05xm911b7xbp74k"; }; buildInputs = [ diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index bbd59f56f70..886a77bb714 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.3.2"; + version = "1.4"; 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 = "0821xb7gyg0rhch8s3qkzmak90wjpcxkv9a364yv6bmqc12j6a77"; + sha256 = "0gi7f1h7jcg7n18cx8iw38sd868viv3w377xmi7cq98f1g76d4h6"; }; buildInputs = [ gettext ]; diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index c84e5cdfb49..52b94ca07d9 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libjack2, dbus, qt5 }: +{ stdenv, fetchurl, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { version = "0.4.3"; @@ -12,14 +12,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ - qt5.full - qt5.qtx11extras + qtbase + qtx11extras + qttools alsaLib libjack2 dbus ]; - configureFlags = "--enable-jack-version"; + configureFlags = [ "--enable-jack-version" ]; meta = with stdenv.lib; { description = "A Qt application to control the JACK sound server daemon"; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index dd3a0b4a1c6..0546f9a0ad2 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -12,7 +12,7 @@ let inherit (python2Packages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python; in buildPythonApplication { # call the package quodlibet and just quodlibet - name = "quodlibet${stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"}-${version}"; + name = "quodlibet${stdenv.lib.optionalString (!withGstPlugins) "-without-gst-plugins"}-${version}"; # XXX, tests fail doCheck = false; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 9e310d6e4e4..72514d7b67b 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -6,7 +6,9 @@ assert stdenv.system == "x86_64-linux"; let # Please update the stable branch! - version = "1.0.47.13.gd8e05b1f-47"; + # Latest version number can be found at: + # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ + version = "1.0.49.125.g72ee7853-83"; deps = [ alsaLib @@ -51,7 +53,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0079vq2nw07795jyqrjv68sc0vqjy6abjh6jjd5cg3hqlxdf4ckz"; + sha256 = "1sqi79yj503y4b7pfvr6xi0i8g7hj01hkhn0vpkc3y3jz5c0ih9g"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 8a0a5d0e0b2..27ba155ad74 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.13.0"; + version = "1.14.3"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "17k4v5hibaq4zi86y1sjx09hqng4sm3lr024v2mjnhj65m2nhjb8"; + sha256 = "16zc1bbvxs9fpd9y3mzgbl789djp3p1664a8b2nn9ann1mbkdgsk"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index e9f36b19195..bba66366e6b 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "brackets-${version}"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb"; - sha256 = "0nsiy3gvp8rd71a0misf6v1kz067kxnszr5mpch9fj4jqmg6nj8m"; + sha256 = "0b2k0vv1qwmsg1wckp71yrb86zp8zisskmzzvx9ir19bma9jzr42"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 68859a7ac41..fddd9e4920b 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -341,12 +341,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.6"; + version = "4.6.2"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/org.eclipse.jdt-4.6.zip"; - sha256 = "0raz8d09fnnx19l012l5frca97qavfivvygn3mvsllcyskhqc5hg"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/org.eclipse.jdt-4.6.2.zip"; + sha256 = "1nnlrl05lh1hcsh14dlisnx0vwmj21agm4wia98rv0gl2gkp19n1"; }; meta = with stdenv.lib; { @@ -388,7 +388,7 @@ rec { version = "4.4.1.201605041056"; src = fetchzip { - url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip"; + url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/base-20160504-1321.zip"; sha256 = "13xgx2rwlll0l4bs0g6gyvrx5gcc0125vzn501fdj0wv2fqxn5lw"; }; @@ -424,6 +424,29 @@ rec { }; }; + yedit = buildEclipsePlugin rec { + name = "yedit-${version}"; + version = "1.0.20.201509041456"; + + srcFeature = fetchurl { + url = "http://dadacoalition.org/yedit/features/org.dadacoalition.yedit.feature_${version}-RELEASE.jar"; + sha256 = "0rps73y19gwlrdr8jjrg3rhcaaagghnmri8297inxc5q2dvg0mlk"; + }; + + srcPlugin = fetchurl { + url = "http://dadacoalition.org/yedit/plugins/org.dadacoalition.yedit_${version}-RELEASE.jar"; + sha256 = "1wpyw4z28ka60z36f8m71kz1giajcm26wb9bpv18sjiqwdgx9v0z"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/oyse/yedit; + description = "A YAML editor plugin for Eclipse"; + license = licenses.epl10; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + zest = buildEclipseUpdateSite rec { name = "zest-${version}"; version = "3.9.101"; diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index e6f942dbfdd..e5e64a32e97 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, spidermonkey_24, unzip, curl, pcre, readline, openssl, perl, html-tidy }: +{ stdenv, fetchurl, spidermonkey, unzip, curl, pcre, readline, openssl, perl, html-tidy }: + stdenv.mkDerivation rec { name = "edbrowse-${version}"; version = "3.6.1"; nativeBuildInputs = [ unzip ]; - buildInputs = [ curl pcre readline openssl spidermonkey_24 perl html-tidy ]; + buildInputs = [ curl pcre readline openssl spidermonkey perl html-tidy ]; patchPhase = '' substituteInPlace src/ebjs.c --replace \"edbrowse-js\" \"$out/bin/edbrowse-js\" @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { done ''; - NIX_CFLAGS_COMPILE = "-I${spidermonkey_24.dev}/include/mozjs-24"; + NIX_CFLAGS_COMPILE = "-I${spidermonkey}/include/mozjs-31"; makeFlags = "-C src prefix=$(out)"; src = fetchurl { @@ -34,5 +35,6 @@ 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 9aa66d12fdc..a11518735d7 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -725,10 +725,10 @@ }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.12.tar"; - sha256 = "1h964w9ir8plam45c194af74g5q1wdvgwrldlmlcplcswlsn3n4z"; + url = "https://elpa.gnu.org/packages/exwm-0.13.tar"; + sha256 = "0n1wzy6chh024r0yaywjbf7mdsrxs6hrfycv5v0ps0drf6q3zldc"; }; packageRequires = [ xelb ]; meta = { @@ -822,10 +822,10 @@ gnugo = callPackage ({ ascii-art-to-unicode, cl-lib ? null, elpaBuild, fetchurl, lib, xpm }: elpaBuild { pname = "gnugo"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnugo-3.0.1.tar"; - sha256 = "08z2hg9mvsxdznq027cmwhkb5i7n7s9r2kvd4jha9xskrcnzj3pp"; + url = "https://elpa.gnu.org/packages/gnugo-3.0.2.tar"; + sha256 = "12xm960awsn2k8ph1yibhrxdg8iz1icifdqimysg3qxljmhmnb3k"; }; packageRequires = [ ascii-art-to-unicode cl-lib xpm ]; meta = { @@ -1021,10 +1021,10 @@ }) {}; let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "let-alist"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/let-alist-1.0.4.el"; - sha256 = "07312bvvyz86lf64vdkxg2l1wgfjl25ljdjwlf1bdzj01c4hm88x"; + url = "https://elpa.gnu.org/packages/let-alist-1.0.5.el"; + sha256 = "0r7b9jni50la1m79kklml11syg8d2fmdlr83pv005sv1wh02jszw"; }; packageRequires = [ emacs ]; meta = { @@ -1377,10 +1377,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20161224"; + version = "20170210"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20161224.tar"; - sha256 = "0b10bjypn0w5ja776f8sxl1qpvb61iyz1n3c74jx6fqwypv7dmgi"; + url = "https://elpa.gnu.org/packages/org-20170210.tar"; + sha256 = "15415wh3w8d4c8hd7qfrfdjnjb1zppmrkg8cdp7hw2ilyr90c0bn"; }; packageRequires = []; meta = { @@ -1468,6 +1468,19 @@ license = lib.licenses.free; }; }) {}; + psgml = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "psgml"; + version = "1.3.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/psgml-1.3.4.tar"; + sha256 = "1pgg9g040zsnvilvmwa73wyrvv9xh7gf6w1rkcx57qzg7yq4yaaj"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/psgml.html"; + license = lib.licenses.free; + }; + }) {}; python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "python"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 4920dfa3f53..f47cdb989b5 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -23,12 +23,12 @@ _0xc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "_0xc"; - version = "20161027.2140"; + version = "20170125.1953"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "0xc"; - rev = "1f449d3c08bc87fd82d23a3cab71abfe6debb401"; - sha256 = "0nh06xvngckr6didb1br2c8v15v1a0rrraqhal1xmpl6xg76fxc6"; + rev = "31890af88234e4e098f1c340a5990515b934c7f7"; + sha256 = "1yp3wm0h6rkzxw950fnhw310npn56s9vl294sw8nyij85s2hw5qk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fbb2c86a50a8df9a3967787fc10f33beab2c933/recipes/0xc"; @@ -85,12 +85,12 @@ aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }: melpaBuild { pname = "aa-edit-mode"; - version = "20160227.2217"; + version = "20170118.1920"; src = fetchFromGitHub { owner = "zonuexe"; repo = "aa-edit-mode"; - rev = "573cbd75fc8f866088bf4780d9d7132c0689cef5"; - sha256 = "0d7q0fhcw4cvy9140hwxp8zdh0g37zhfsq6kmsdngxdx7lw3wryi"; + rev = "1dd801225b7ad3c23ad09698f5e77f0df7012a65"; + sha256 = "17kxpyfprdyj96c4ivv8bxwyls69cgh2r3gwrgj6bwinbiszh9rr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/20d00f782f2db87264c7fb1aac7455e44b8b24e7/recipes/aa-edit-mode"; @@ -127,12 +127,12 @@ abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abl-mode"; - version = "20160823.314"; + version = "20170211.1328"; src = fetchFromGitHub { owner = "afroisalreadyinu"; repo = "abl-mode"; - rev = "b6d32f5e711929e8a1a2249498a3156d86dcbff6"; - sha256 = "06lbpy75gli15gfabh38hhzr8c761j70igq2rvdvw78gacanblfi"; + rev = "54777551c1760f02b35043a51e1cadad1468aa44"; + sha256 = "0p5jhp71n4021p173c9agmm26xqqx7z864ygaskf9dh810mxs1yh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a52edb381daa9c4dcc9f7e511175b38fc141be/recipes/abl-mode"; @@ -380,8 +380,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "5b7d58c783f6453442570ae8cedd489a0659a58e"; - sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh"; + rev = "3b5ce79b5ed80f9ce7ca1fa10f0c314516300d6b"; + sha256 = "1gxsixg2rp09myqrcq7plk84bhhd8aaz68a09xfsbdia41q3vaa7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -737,8 +737,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "cb15be9d7a7c6aa2aa20188069b07521bfe3cb5f"; - sha256 = "02fvdkz7a3ql4r1vap2yl3m3cb29f9psk4qy4qp1kqrxbcmcrafm"; + rev = "436567c1e28cce979aab7820a8fc74b5b5294218"; + sha256 = "07w8fpnglany530jksjsl5qs9mfbc52gh6pfnqlqx6ppp01k8lw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -754,12 +754,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20170110.2036"; + version = "20170209.2128"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "cb15be9d7a7c6aa2aa20188069b07521bfe3cb5f"; - sha256 = "02fvdkz7a3ql4r1vap2yl3m3cb29f9psk4qy4qp1kqrxbcmcrafm"; + rev = "436567c1e28cce979aab7820a8fc74b5b5294218"; + sha256 = "07w8fpnglany530jksjsl5qs9mfbc52gh6pfnqlqx6ppp01k8lw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -856,22 +856,22 @@ license = lib.licenses.free; }; }) {}; - ace-flyspell = callPackage ({ ace-jump-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: + ace-flyspell = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-flyspell"; - version = "20150523.1115"; + version = "20170124.1245"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "ace-flyspell"; - rev = "76c255d91c86b57a07cc7660450e37107d73505f"; - sha256 = "1msj0dbzfan0jax5wh5rmv4l7cp5zhrp5wy5k1n9s7xdgz2dprzj"; + rev = "044d38fb8eb390ef1f51cf92cfe5c4ffd103044c"; + sha256 = "0yy7g2903v78a8pavhxi8c7vqbmifn2sjk84zhw5aygihp3d6vf0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ea85eca9cf2df3f8c06709dfb44b339b8bdbc6c/recipes/ace-flyspell"; sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd"; name = "ace-flyspell"; }; - packageRequires = [ ace-jump-mode ]; + packageRequires = [ avy ]; meta = { homepage = "https://melpa.org/#/ace-flyspell"; license = lib.licenses.free; @@ -1423,12 +1423,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "alchemist"; - version = "20170104.2226"; + version = "20170118.142"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "b23c0c3578869b3b242a948e8a0d453fd6c437bf"; - sha256 = "02hakng87j9bcrvd310byrr8y01pa5yq5dgxjrwa9mlyb32l5rag"; + rev = "20a0c043b5df66ee1f731e1ffe53d5697915b626"; + sha256 = "1szmjcim9mmzm45f7pb39gr0kf3y7x0kdhgvvbl9fbdzrphn02mx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1444,12 +1444,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "20161213.1359"; + version = "20170125.1720"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "86729cd7cac5f86766ebdc76a43e35f261a9e078"; - sha256 = "0cyvq7asv08bp8kjr641m50dwi326kwb6p67vd4h302liac64br6"; + rev = "deeb659b1b1c6ec57a38875e9daf1f76f9b5c013"; + sha256 = "1z462b2cvfqz1pdrba89ag4v9mvw1dzsrzc219fz06f2xcpyz2v2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1465,12 +1465,12 @@ alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; - version = "20170117.217"; + version = "20170202.6"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "714516d3f3695d0673f07721d4cff0043a287495"; - sha256 = "1cxc27579ik7yrjvahdk5ciji1gfwzlzbjrwzx55v67v13y9kz6r"; + rev = "1812abbe0079d1075525d9fb2da6fcfec7db3766"; + sha256 = "0sl2njnhm37cya06y39ls8p3zwpjwyv1pd7w3yfk5frz24vaxlcq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; @@ -1549,12 +1549,12 @@ all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: melpaBuild { pname = "all-the-icons"; - version = "20161219.329"; + version = "20170208.433"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "1e4a1a0b53ffcb427fdbc6d13ee6e9c8d23e6216"; - sha256 = "0nrihr280aqq58x65fjyrpci4bsam9ddhsnid2cf8jmsngpvhcdc"; + rev = "51079bb7f25d5c3d30517023e2bf13b28aa6d2c0"; + sha256 = "0jpnv9j1f6q459kzgvn2k0qh2li9qb9116c39qaxid8j1r1jp6lg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1570,12 +1570,12 @@ all-the-icons-dired = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "all-the-icons-dired"; - version = "20161203.605"; + version = "20170210.811"; src = fetchFromGitHub { owner = "jtbm37"; repo = "all-the-icons-dired"; - rev = "3ccab8ae4113e03ff2c7b103d388fa6ec1447d9c"; - sha256 = "0rbcbhsw5js9wx29pp65s7q6mxhbz1jskhvzl0k4gqlk4m6gqcxq"; + rev = "6e5152dfeb0f8be01a61d6fb0c0cb248ecdf1718"; + sha256 = "1siwrcfpj9wnrq5q0y5yhbqnh081db0v4kzvxiiqs3idppdnddxg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8e432e3cd316ffeb7e0b68b855e23bcc3b9491/recipes/all-the-icons-dired"; @@ -1688,8 +1688,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "fe7a4ece906c5aec242b94e95befa50080414d3c"; - sha256 = "0lisa1j4x13yk5cgdakdk2xly3ds3hw2s2vq0am375a57p65vpq0"; + rev = "a6b80a4fbb4e6ce3bc6a51a6e9f0982ea219b16b"; + sha256 = "06rgwx03x84r4i5z07sia09nsb76a3cb7zxkravx78h7anlw16xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1745,12 +1745,12 @@ android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "android-mode"; - version = "20160408.523"; + version = "20170131.2347"; src = fetchFromGitHub { owner = "remvee"; repo = "android-mode"; - rev = "da93ff7d92bb5b9fcf52c755eb2389ef4c262829"; - sha256 = "1cg35nb4hhibsk9d6daszs2khadqb3gzyzaxjsykxsgmpfh27ikv"; + rev = "76711e73b459de1ee639a49733e4f3f245b8fb41"; + sha256 = "1z0pw5h5yqpszr07jg7hqlfphhy0g6p2hqjyd9ds68p987v35vz0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77633aa340803a433570327943fbe31b396f4355/recipes/android-mode"; @@ -2081,11 +2081,11 @@ anything = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything"; - version = "20161207.238"; + version = "20170125.1710"; src = fetchgit { url = "http://repo.or.cz/r/anything-config.git"; - rev = "43e88980a29618dc03f96ce38b67b2a7caadd9d9"; - sha256 = "0dcaqss1b3myn8b4xfpyhnp9h2xniainayflhhgdk88y7vbfx0j7"; + rev = "9e2259fc779eef1a3e947e74cc7d301d1cea0ca6"; + sha256 = "1rl60k9imk5wma2xnx1s0av7rzgjjbaw7nkb539vwk4pwj1kmqqq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1700e86cb35617178f5d7c61c88718ac7849f9b/recipes/anything"; @@ -2266,6 +2266,27 @@ license = lib.licenses.free; }; }) {}; + anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "anything-tramp"; + version = "20170208.539"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-anything-tramp"; + rev = "52b8c8dac2f56979a14504e3c97f00ad275f9345"; + sha256 = "1z0ylrl4scm0faapq9xhl4r20ljr4bl489ggyxi1v3rbksw1lp0q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp"; + sha256 = "1dpah5c35j552ixbd9mw2400vnfbibwhk1ihyz2n8b1c06syfny1"; + name = "anything-tramp"; + }; + packageRequires = [ anything emacs ]; + meta = { + homepage = "https://melpa.org/#/anything-tramp"; + license = lib.licenses.free; + }; + }) {}; anzu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anzu"; @@ -2347,12 +2368,12 @@ apel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apel"; - version = "20160427.152"; + version = "20170122.1458"; src = fetchFromGitHub { owner = "wanderlust"; repo = "apel"; - rev = "74e1e49626a4bc7b1e9b87d844d3852e976d1df2"; - sha256 = "1aywxk77vfgr1mk7j4pygy9hl4q7lbbx4iik1rs9frkmw6sb8qni"; + rev = "339eb28ffae3165255a79de9b1fd362f43cd37c3"; + sha256 = "1f0zxydh2pkwbjx5bh1bzl3r5g50vqg18azvqkvv9r0nn42hkhmi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/apel"; @@ -2471,12 +2492,12 @@ apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; - version = "20170106.1329"; + version = "20170212.1229"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "c1088e51a0e678930bf147c46faa9c9ec59a6035"; - sha256 = "0l2wdvipwf4m1834zbsnlldjlign9m93hh9lkkkbg99jfkppnzkl"; + rev = "f5ffcabf7f079bd899d95ffa11a78ccca7eb8c8e"; + sha256 = "1vrpg0fjshqcfhj4iwkgrqw052rvx9kf2l217mg2z94rjm1y9g55"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -2756,6 +2777,27 @@ license = lib.licenses.free; }; }) {}; + async-await = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, promise }: + melpaBuild { + pname = "async-await"; + version = "20170208.350"; + src = fetchFromGitHub { + owner = "chuntaro"; + repo = "emacs-async-await"; + rev = "56ab90e4019ed1f81fd4ad9e8701b5cec7ffa795"; + sha256 = "1k6wisls6dqn63r4f4brnhrjbvzqpigw2zxdl9v8g1qcw49spk5s"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74ecf94e5dbb46a939d26833b7cd0efd159ca1/recipes/async-await"; + sha256 = "1534rhr4j74qbndafdj9q2wggcn8gphhjn3id8p27wyxr5sh93ms"; + name = "async-await"; + }; + packageRequires = [ emacs promise ]; + meta = { + homepage = "https://melpa.org/#/async-await"; + license = lib.licenses.free; + }; + }) {}; at = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, queue }: melpaBuild { pname = "at"; @@ -2801,12 +2843,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20170113.743"; + version = "20170117.1905"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "ab59b076afe892a0dafe56f943533dafb4594369"; - sha256 = "05k4x5gg0gga2nks0jnk0c4vwv383irm60q1b2z45yqykj9cn1f9"; + rev = "44903ab7c349ef225499d642f249b6dfef5c5161"; + sha256 = "0cjp2p018xsj3sx46adrlsc3zksph4hgkn2gdqb3w8illgzp9nyp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -2948,12 +2990,12 @@ auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; - version = "20161021.2302"; + version = "20170123.107"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "5ca6a838489c1175de3df7af025751559eb13cb3"; - sha256 = "10y6grxwp8sw24fv8i9f50lc83qcdxnkw2bm1v983fw6di4i3a8w"; + rev = "cfd9cecb319c8fb547a62c732a5c1a106049c200"; + sha256 = "14cxchnp3sxnps03iycifvjx0w5lsxfnz6qsxgkxnis300lmnkym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -3029,12 +3071,12 @@ auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "20160711.1012"; + version = "20170130.1017"; src = fetchFromGitHub { owner = "tarsius"; repo = "auto-compile"; - rev = "1526e59ea8aaa1738c53b24673d62605dbbb5c96"; - sha256 = "05bzknh0fhl22r2klqqrgs7wpx18p5kzwxmg916smbvyk1fzfgva"; + rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c"; + sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile"; @@ -3050,12 +3092,12 @@ auto-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "auto-complete"; - version = "20161029.643"; + version = "20170124.1845"; src = fetchFromGitHub { owner = "auto-complete"; repo = "auto-complete"; - rev = "297e2f77a35dba222c24dd2e3eb0a5d8d0d1ee09"; - sha256 = "0185d1dc0fld06fk5n77q06wrmrphffs9xz3a6c2clyxf8mfx2vy"; + rev = "2e83566ddfa758c69afe50b8a1c62a66f47471e3"; + sha256 = "1rkqjq7wr4aavg08i8mq13w85z14xdhfmpbipj5mhwlpyrrci4bk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/auto-complete"; @@ -3509,12 +3551,12 @@ auto-virtualenv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyvenv, s }: melpaBuild { pname = "auto-virtualenv"; - version = "20161107.1001"; + version = "20170125.1117"; src = fetchFromGitHub { owner = "marcwebbie"; repo = "auto-virtualenv"; - rev = "d352bc4c9d76cb2e1680846f13bae940931d8380"; - sha256 = "1yb1g8xmh5mgkszcch2z7rzmrywl8zyyy7j8ff1agvz0ic4b9893"; + rev = "3826db66b417788e2b2eb138717255b1f52a55c3"; + sha256 = "12691m4z0zr3prmdhmjlpcx0ajj1ddrbj9gy827xmgr0vaqbr7b2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ccb91515d9a8195061429ed8df3471867d211f9a/recipes/auto-virtualenv"; @@ -3801,12 +3843,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20160814.250"; + version = "20170208.148"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "0f5e99b5e9a0fe709e5bce8ea4462dc732b2a281"; - sha256 = "1p2x7k5106dlz4l1p5avkkvfxls7g35zbsbiranxsgmd1x2dyl7a"; + rev = "b8d71639158b44a2a700b84cb02fc8518ad7d542"; + sha256 = "1yddpl78krl2y5l3w6f1h53f5qsc09ad4qcwv31k549ziwiz1vd4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -4179,12 +4221,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20161227.1040"; + version = "20170213.1604"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "82e8fff5c22acbfeb1c77ea9442aada938b41d19"; - sha256 = "1k1lm0hlp771vayv0laah2q67751ykc3gkv94s6axj02n8rs2zdv"; + rev = "f7cbf7734d99733ed99eb8a7b95d2dc808a73927"; + sha256 = "16i617i3pflwdmdijiklwwh9ywiin6ln7mar0k7yybmlr6xbvlkf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4322,11 +4364,11 @@ }) {}; bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb"; - version = "20161001.2212"; + version = "20170129.2224"; src = fetchgit { url = "git://git.savannah.nongnu.org/bbdb.git"; - rev = "2ee0d69610808f84b958f868c3268b75a24aced0"; - sha256 = "0azkjnspn97y0fx4k37spvmxxy7p3g106prcbkmsaqm8jkkxc0qj"; + rev = "8998b3416b36873f4e49454879f2eed20c31b384"; + sha256 = "086ivc9j7vninb46kzparg7zjmdsv346gqig6ki73889wym1m7xn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b6801fe29cb6fb6183f0babf528375d14f966b3/recipes/bbdb"; @@ -4510,12 +4552,12 @@ bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbyac"; - version = "20150316.301"; + version = "20170127.516"; src = fetchFromGitHub { owner = "baohaojun"; repo = "bbyac"; - rev = "8dc5a7c0ada7ac729a87343149970ced139bb659"; - sha256 = "1cdm4d6fjf3m495phynq0dzvv0wc0gfsw6fdq4d47iyxs0p4q2dl"; + rev = "4dfb1f7c7f0402a0abf45e00007edc2c7f98a25a"; + sha256 = "0vm83ccr9q93z4cvnrzz0al5rpxm8zh9yysn5lja6g2474nm01wy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4409df77dca17b3f9556666a62ee924cb8794364/recipes/bbyac"; @@ -4693,22 +4735,22 @@ license = lib.licenses.free; }; }) {}; - better-shell = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "better-shell"; - version = "20160830.1451"; + version = "20170205.2308"; src = fetchFromGitHub { owner = "killdash9"; repo = "better-shell"; - rev = "1c0ddbba888b47fb5f66f5f39f5faee230bf207a"; - sha256 = "1q4dgrqsia3pbggl0yfjx013w2rm7wb4ddclybxqw5v56bvb8ldc"; + rev = "6ae157da700a4473734dca75925f6bf60e6b3ba7"; + sha256 = "14ym7gp57yflf86hxpsjnagxnc0z1jrdc4mbq7wcbh5z8kjkbfpd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc553c9fb6de69dafe9fbe44a955b307f4d9507f/recipes/better-shell"; sha256 = "1mr39xz8chnc28zw1rrw5yqf44v44pby7ki22yyz6rp1j5ishp4v"; name = "better-shell"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/better-shell"; license = lib.licenses.free; @@ -4868,8 +4910,8 @@ src = fetchFromGitHub { owner = "waymondo"; repo = "use-package-chords"; - rev = "8dedc76617cbabd605f4c0d486018e3c4d3c8a9b"; - sha256 = "0d69hckz6xbll1x2mll385kcw7mwx8cwxg1wdhphnww0s810isgp"; + rev = "e8551ce8a514d865831d3a889acece79103fc627"; + sha256 = "0500pqsszg7h7923i0kyjirdyhj8aza3a2h5wbqzdpli2aqra5a5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/bind-chord"; @@ -4889,8 +4931,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "38034854ac21bd5ddc1a1129fd6c8ff86d939f8a"; - sha256 = "0s20z5njwmk591674mb2lyv50agg6496hkr5b11904jq5ca3xagz"; + rev = "6c2d81cfadb12c10af0dabe148ede355737ed1a8"; + sha256 = "18aqyphq1cwandfarql773d0h3ki6c9ip1wji1ni86fm29f99ikq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -4927,12 +4969,12 @@ bing-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bing-dict"; - version = "20160616.1820"; + version = "20170209.1459"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "bing-dict.el"; - rev = "bcad59c4f3a35d83aeaa4a88f0935e89cc2da764"; - sha256 = "04zfq3d1h9givycp182a9lb19dbny98qgvc43s08kb0gdjj0f6xx"; + rev = "7c067b7a3a1a4797476f03a65f4a0b4a269a70c7"; + sha256 = "1cw8zxcj7ygj73dc8xf6b4sdjrwxfl6h07mrwym8anllqs2v0fa6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5653d2b6c2a9b33cfed867e7f6e552d4ed90b181/recipes/bing-dict"; @@ -4994,8 +5036,8 @@ src = fetchFromGitHub { owner = "canatella"; repo = "bitbake-el"; - rev = "4ab424d970bee0f6b91a1fc545b14ded173e3476"; - sha256 = "0xqi5s8536hajjl3g1a2i8p9ll4vq9gdx2jjbjzlid65h669bny8"; + rev = "4d9f0a4ffb7b9c6cd4d8271f1b429ca1bb7e9130"; + sha256 = "0c8f6w8pgbr63g1zhgppfyh5g3sb0iv31ywqmvp6467766di4qh9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da099b66180ed537f8962ab4ca727d2441f9691d/recipes/bitbake"; @@ -5176,12 +5218,12 @@ blog-admin = callPackage ({ cl-lib ? null, ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }: melpaBuild { pname = "blog-admin"; - version = "20170110.751"; + version = "20170126.458"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "blog-admin"; - rev = "f01c9ed030a85800b4ebdce8ec71b195db446ee9"; - sha256 = "1jlbxa9qw56rhqm72sqmz5isjmaidmh7p08vlbr8qsxi0kjaipv9"; + rev = "bcf4302dd158e6a7b9e4a57d739818987e039e76"; + sha256 = "0dc27df1cph67ygvsvjjskc21flsa055hzxc2j00sk5078gp7a9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin"; @@ -5322,7 +5364,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20170113.1310"; + version = "20170129.1207"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "02akakw7zfjx8bjb3sjlf8rhbh1xzx00h3dz7cp84f7jy9xak5v1"; @@ -5648,6 +5690,27 @@ license = lib.licenses.free; }; }) {}; + bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bshell"; + version = "20170116.1117"; + src = fetchFromGitHub { + owner = "plandes"; + repo = "bshell"; + rev = "0abd93439895851c1ad3037b0df7443e577ed1ba"; + sha256 = "1frs3m44m4jjl3rxkahkyss2gnijpdpsbqvx0vwbl637gcap1slw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell"; + sha256 = "1ds8xvh74i6wqswjp8i30knr74l4gbalkb2jil8qjb9wp9l1gw9z"; + name = "bshell"; + }; + packageRequires = [ buffer-manage emacs ]; + meta = { + homepage = "https://melpa.org/#/bshell"; + license = lib.licenses.free; + }; + }) {}; btc-ticker = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }: melpaBuild { pname = "btc-ticker"; @@ -5920,12 +5983,12 @@ bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bui"; - version = "20170113.124"; + version = "20170125.14"; src = fetchFromGitHub { owner = "alezost"; repo = "bui.el"; - rev = "8d0c5e3dd6bcd11943dd23615be9b89367eabade"; - sha256 = "1h1jzpq1rq9jvvihq9n7agsdr86ppwgs38wmmi8qn6w2p99r6k5p"; + rev = "2742bd1cd9e232cac68d5843e05c043827a2669f"; + sha256 = "00v0v00izzy749h0l22z0g0df96g3s4rbn06dvdara7h01599v00"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui"; @@ -5987,8 +6050,8 @@ src = fetchFromGitHub { owner = "EricCrosson"; repo = "bury-successful-compilation"; - rev = "565a6f9cad7f7d5ef161eb9c7f2305bae9971c02"; - sha256 = "0mirb3yvs4aq6n53lx690k06zllyzr29ms0888v5svjirxjazvh8"; + rev = "52da2c07419beceab9b4d426d76adb3dcf2548d1"; + sha256 = "1qdkx14rwabrfm9kzp4w9gvk9h4qg8f5b3qdwlyn863d2y7q468g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f66e2e23c7a1fa0ce6fa8a0e814242b7c46c299c/recipes/bury-successful-compilation"; @@ -6319,12 +6382,12 @@ cal-china-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cal-china-x"; - version = "20160102.124"; + version = "20170122.1100"; src = fetchFromGitHub { owner = "xwl"; repo = "cal-china-x"; - rev = "5014bc0bf086c1326feedf9a3717c748f51264b0"; - sha256 = "03hi0ggq81nm1kd0mcf8fwnya4axzd80vfdjdbhgpxbkvnxldzpv"; + rev = "2e9f8e17969a32268fa1c69b500d28590338a98e"; + sha256 = "1qqy0phjxqc8nw7aijlnfqybqicnl559skgiag5syvgnfh4965f0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1098d34012fa72f8c8c30d5f0f495fdbe1d3d65/recipes/cal-china-x"; @@ -6485,12 +6548,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20170107.651"; + version = "20170203.35"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "670b34d9bf4207680b0783c2a0ea8b1c8f914e58"; - sha256 = "1slj9gkxknm56k16x827021b1q6384px8pja5xia524b0809hyqg"; + rev = "25ca2fcbd6b664cc7a20b0cccca3adc19e79917a"; + sha256 = "1fzrczx1aq0q130qrvzq8dssc1qm5qc9pclsyd3zn27xbn5lsag3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6657,8 +6720,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "df9d8a8332c9f75498bfecd870d7296c6ba0b42e"; - sha256 = "05ay6qkx77yl581jvikkf11dzny0v9h70iahss4bz5a37hawp4dd"; + rev = "4681d150d80da779bc8f95ec912c7de13cecd0f1"; + sha256 = "0hsz5gpj2lq7f8grb9wmjv5sqm8ky2c98di0m8n27y4ikcqv7dz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -6699,8 +6762,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "df9d8a8332c9f75498bfecd870d7296c6ba0b42e"; - sha256 = "05ay6qkx77yl581jvikkf11dzny0v9h70iahss4bz5a37hawp4dd"; + rev = "4681d150d80da779bc8f95ec912c7de13cecd0f1"; + sha256 = "0hsz5gpj2lq7f8grb9wmjv5sqm8ky2c98di0m8n27y4ikcqv7dz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -6720,8 +6783,8 @@ src = fetchFromGitHub { owner = "cdominik"; repo = "cdlatex"; - rev = "b7183c2200392b6d85fca69390f4a65fac7a7b19"; - sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d"; + rev = "ff534912b93fc2c7a6b191b1c8d6d699a46bbb01"; + sha256 = "1pvlq98qll44g1ag8w5rkbppk1b8l8inkwn5qzrlsjr8pngyhljz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/193956c26050e15ddd7fb6579a053262d1de1e30/recipes/cdlatex"; @@ -6886,8 +6949,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "d31c2ffc3171030c04eddbf50bcac7be27db9c77"; - sha256 = "1skhqpyx3qgrlby92qb1p2qarzagj6hc91ph818wb8id2z26k71i"; + rev = "6fc41c74644a457f1f426e2ac62ac2ac88b1fa30"; + sha256 = "1lx3qcj9khalasx3xd1b8za41zmjylypx7cp0sn0flbhmw1irybk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -6923,11 +6986,11 @@ }) {}; cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cg"; - version = "20160801.615"; + version = "20170201.347"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11945"; - sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; + rev = "12000"; + sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a275ee794b0aa30b1348bb3a984114eef8dfc808/recipes/cg"; @@ -7048,12 +7111,12 @@ cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheatsheet"; - version = "20170114.2251"; + version = "20170126.1350"; src = fetchFromGitHub { owner = "darksmile"; repo = "cheatsheet"; - rev = "00f8f3cdf6131d1eafe1107e5c82ef69661e1318"; - sha256 = "0ba2j3g12mf1rckbpfcpb0j0fv7wwxln8jcw7mn8a05c5pcikjp6"; + rev = "e4f8e0110167ea16a17a74517d1f10cb7ff805b8"; + sha256 = "1vy2qmx9872hfrfcycpsmy0si481rwv4q4gwiy8f2w04zb92szbn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d2cd657fcadb2dd3fd12864fe94a3465f8c9bd7/recipes/cheatsheet"; @@ -7258,12 +7321,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20170111.1209"; + version = "20170208.501"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "577a3438d14e1a1f08baf0399ec8138c9d1dcba4"; - sha256 = "0i9nqhqbj12ilr5fsa4cwai9kf2ydv84m606zqca2xyvvdzw22as"; + rev = "113d93e02ae41767342fe9b24b3758e75fd3af23"; + sha256 = "06xryf0wmlsyr2g9m0vxqdnsaicf6jb8nxc20n3jg89b96688wnq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7283,8 +7346,8 @@ src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim-basedict"; - rev = "59ea301585ef832022f92e2d75dec7e000611301"; - sha256 = "0zbdb8snwxwyhm7inynsnx0rrr6dm9mh5lslzy29c6837jzgg2f6"; + rev = "3bca2760d78fd1195dbd4c2d570db955023a5623"; + sha256 = "07dd90bhmayacgvv5k6j079wk3zhlh83zw471rd37n2hmw8557mv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2315ffe7d13928eddaf217a5f67a3e0dd5e62a1/recipes/chinese-pyim-basedict"; @@ -7507,12 +7570,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170112.26"; + version = "20170129.1941"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "460a1dc948ea8994eb8b379d132448d26cf7572c"; - sha256 = "0j9f6gi8zhws12vcwzng2a4bg4hdyvqsb08ha70as7xm9ym8vv6p"; + rev = "eb1bc430288af6e666e385c634c434a863a4ef8b"; + sha256 = "137rkssq1gkf9djg0x5vwnsf8z64yvjigp05zkkxrdfwcgs2gria"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7696,12 +7759,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20170107.632"; + version = "20170212.240"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "5444a8dd90691de941509f7cc9ac8329c442dbdd"; - sha256 = "00dcdszskzqggg4gjp5f2k2v1a03jad52q2pqf04jqjycapkx227"; + rev = "a9df12a6e2f2c8e940722e151829d5dcf980c902"; + sha256 = "00rdv0dij1d21jddw73iikc4vcx7hi1bi85b25hj1jx36nx4m16c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -7780,11 +7843,11 @@ clang-format = callPackage ({ cl-lib ? null, fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clang-format"; - version = "20161004.253"; + version = "20170120.137"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "292208"; - sha256 = "0li360592lv9hw3a73lva1bjj5qx518ky0yy1sqsb0mw1y7l5rip"; + rev = "295019"; + sha256 = "13516xv7ypswhlarh4sd97sc17zar10snbmrcn14wd53jgxx440y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -7905,12 +7968,12 @@ cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "cliphist"; - version = "20170116.1431"; + version = "20170208.514"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cliphist"; - rev = "72a8a92f69b280c347afe2f8b5f5eb57606a9aec"; - sha256 = "0arilk9msbrx4kwg6nk0faw1yi2ss225wdlz6ycdgqc1531h6jkm"; + rev = "acbd9782d82d7ae6bfb22fb0955597b9c5fcbb6c"; + sha256 = "1gj5fqjyr4m4qim9qjsvzzk42rm3vw3yycvq3nj0wpj90zb1yh14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist"; @@ -7986,15 +8049,15 @@ license = lib.licenses.free; }; }) {}; - clj-refactor = callPackage ({ cider, clojure-mode, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }: + 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 = "20170114.1148"; + version = "20170126.118"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "7941d906d603a650d836e3a2ba25554772adb236"; - sha256 = "0gjmhwx4ibyr7fm2lssah9xbqfwm0174w5zv2hm27v37a8ncvzhv"; + rev = "0fb72efc1cb9a2a688e324e7fdc51f258a86e36d"; + sha256 = "0sibcrsygaxk60f2rrjbmsp7cjfgqkj7a40psal19nf1ygcy634y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -8004,7 +8067,6 @@ packageRequires = [ cider clojure-mode - dash edn emacs hydra @@ -8012,6 +8074,7 @@ multiple-cursors paredit s + seq yasnippet ]; meta = { @@ -8169,12 +8232,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20161221.523"; + version = "20170120.2239"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "423c9e4ee43212c42e22b15fff4aa52c050ca90d"; - sha256 = "09ik49nb40p082ykf2giszbxzlsc5m1zgsmfkq1j571qkn0cdzc9"; + rev = "0113aa969e09e31d65717d4a9c16c934c77dcb9b"; + sha256 = "1dcj6brfw7fcjn86ibl5sk1q5qij8zmrfr7776nczwh9i7986l4a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8194,8 +8257,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "423c9e4ee43212c42e22b15fff4aa52c050ca90d"; - sha256 = "09ik49nb40p082ykf2giszbxzlsc5m1zgsmfkq1j571qkn0cdzc9"; + rev = "0113aa969e09e31d65717d4a9c16c934c77dcb9b"; + sha256 = "1dcj6brfw7fcjn86ibl5sk1q5qij8zmrfr7776nczwh9i7986l4a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8253,12 +8316,12 @@ clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "clomacs"; - version = "20161227.131"; + version = "20170128.850"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "6d8a3eb84f1c65724680f4a0dcef3d1d0a29f4e6"; - sha256 = "082y5acfxbbihfxvzbps9f6k5p08nnrk604yvpi2m8hkyspyy4cb"; + rev = "d35f139dfff1f0a7aafbc8ade36a97f894c29922"; + sha256 = "19zsz8yabs77zk0b2509g7rkgv3a1lkzgqyc7b80rqlpsrlki3d0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -8358,12 +8421,12 @@ cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; - version = "20170112.614"; + version = "20170203.1307"; src = fetchFromGitHub { owner = "joostkremers"; repo = "criticmarkup-emacs"; - rev = "64913b0107a5ccf3ba4a3569ee03c020c45a3566"; - sha256 = "1smj4iig5x3va3jl91aassk0smcg67naknk81fshigshif1vs273"; + rev = "276d49c859822265070ae5dfbb403fd7d8d06436"; + sha256 = "0mqbjw9wiaq735v307hd7g0g6i3a4k7h71bi4g9rr2jbgiljmql4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode"; @@ -8379,12 +8442,12 @@ cmake-font-lock = callPackage ({ cmake-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-font-lock"; - version = "20150828.1327"; + version = "20170117.1225"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "cmake-font-lock"; - rev = "982b753e0228bb5189e3bf2283afad9197d93c37"; - sha256 = "030kg3m546gcm6cf1k928ld51znsfrzhlpm005dvqap3gkcrg4sf"; + rev = "8be491b4b13338078e524e2fe6213c93e18a101e"; + sha256 = "0h96c670gki6csqfrhlnjxkpzx0m92l6pcsdhx93l3qbh23imcmm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/383a7f191c10916ad40284fba94f967765ffeb7e/recipes/cmake-font-lock"; @@ -8400,12 +8463,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }: melpaBuild { pname = "cmake-ide"; - version = "20161229.138"; + version = "20170202.1402"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "393d6e9affa6f9978600b6c0ef8a4fe8bf73d813"; - sha256 = "0lg6ky9h4a96w8mma668kxfv9dffw97h1swjq33cvhv5pp3p9rrr"; + rev = "916f35e775c721a97fca8e11565c12207448c2f1"; + sha256 = "1c7y2zyk8ihzn2za9mlpvjv5fp559rd2a5b42jz7lm2zkyn5a8b8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8425,8 +8488,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "020cba316bb3a4d33da5108ab10d2c06b4712427"; - sha256 = "1c2hsy6b6b7vwg7fdjliz3f0yy7j7f8cj3627w5alhp5k6r6mnv1"; + rev = "38bfe65eba21c697d05e8bed79635fc125cdac17"; + sha256 = "1dqh7rd2hnn68dfj271sbm1j5dgpkd3phhjrcxnkg0wxyhpcpp7w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8483,10 +8546,10 @@ }) {}; cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmds-menu"; - version = "20170102.917"; + version = "20170124.1824"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/cmds-menu.el"; - sha256 = "0zkqpv7n4idzqkayildxkgaqsy1rjkmsf5ppkjld3jk1j53kacfc"; + sha256 = "1mcrgfwpckrx0k82waqyd80x72mxzv42jg878rkycf4qpa0wxjh4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de6366e4b3e72a5e68b960d6bf4bab2683ad6800/recipes/cmds-menu"; @@ -8695,8 +8758,8 @@ src = fetchFromGitHub { owner = "defunkt"; repo = "coffee-mode"; - rev = "d7d554cbf435aa875fbf56e67c4374375a164a93"; - sha256 = "1glif3jxh31cmy2rgz39bc2bbrlgh87v5wd5c93f7slb45gkinqi"; + rev = "231eccd8cf662516159359ed24d1b27d068ec7f8"; + sha256 = "1anidih1kbwqifrb7v90ga172alqhxizwz1vrf87cnj5ns1h1hx8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/coffee-mode"; @@ -8856,12 +8919,12 @@ color-theme-buffer-local = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-buffer-local"; - version = "20151012.1628"; + version = "20170125.2201"; src = fetchFromGitHub { owner = "vic"; repo = "color-theme-buffer-local"; - rev = "ca8470bc34c65a026a6bca1707d95240bfd019af"; - sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx"; + rev = "faf7415c99e132094f1f09c6b6974ec118a18d87"; + sha256 = "1zk5clvkrq2grmm1bws2l5vbv1ycp41978bb902c563aws2rb8c0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e43060d80b3345ef4e8df9f5a9d66af8a44a9c41/recipes/color-theme-buffer-local"; @@ -9235,8 +9298,8 @@ src = fetchFromGitHub { owner = "yuutayamada"; repo = "company-arduino"; - rev = "5958b917cc5cc729dc64d74d947da5ee91c48980"; - sha256 = "08766m35s0r2fyv32y0h3sns9d5jykbgg24d2z8czklnc8hay7jc"; + rev = "d7e369702b8eee63e6dfdeba645ce28b6dc66fb1"; + sha256 = "06v7y7gxlxrxdaqy8c93niy1di80r738cq7rkghnhqi174pwl1wv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45350f816c4f5249792d29f97ef91f8c0685b983/recipes/company-arduino"; @@ -9278,22 +9341,22 @@ license = lib.licenses.free; }; }) {}; - company-bibtex = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, regexp-opt }: + company-bibtex = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: melpaBuild { pname = "company-bibtex"; - version = "20161210.1223"; + version = "20170125.2135"; src = fetchFromGitHub { owner = "gbgar"; repo = "company-bibtex"; - rev = "9b236cb9527ec69d73101193e6b53ad6080ea333"; - sha256 = "19f6npkd4im9dp48h2kp2kw6d6pvw4i4qn404ca949z77v87ibjj"; + rev = "2cea36c24c35c1e9fafce7526781f119a48b5e82"; + sha256 = "0l4xnqhk3a4szwcfyw90naxasbca8nrnjhnaqiw8zyixhakdbhxz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c366ac2949eae48766fce70a7b01bbada6fcc27/recipes/company-bibtex"; sha256 = "14s3hxm7avpw59v4sz0d3drjzin745rczp93rcv4s7i3a7kdmn30"; name = "company-bibtex"; }; - packageRequires = [ cl-lib company parsebib regexp-opt ]; + packageRequires = [ cl-lib company parsebib ]; meta = { homepage = "https://melpa.org/#/company-bibtex"; license = lib.licenses.free; @@ -9344,12 +9407,12 @@ company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-coq"; - version = "20161201.631"; + version = "20170206.2151"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "20f3ede0ca3a90a68b700704bff830ca18598f73"; - sha256 = "0fdpxd2lh3y5iyhwphpcdv29bm5v8pcwhbj4xhbky7dn28kbl9c4"; + rev = "f77e4b12a7deebc83125d69ac1e2288d8aecf521"; + sha256 = "04a8vlw3999yhmn3jg9d3jvvmfwmc88xnpfw1qm820s97cinzsgf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -9460,8 +9523,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "5b7d58c783f6453442570ae8cedd489a0659a58e"; - sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh"; + rev = "3b5ce79b5ed80f9ce7ca1fa10f0c314516300d6b"; + sha256 = "1gxsixg2rp09myqrcq7plk84bhhd8aaz68a09xfsbdia41q3vaa7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9498,12 +9561,12 @@ company-erlang = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, ivy-erlang-complete, lib, melpaBuild }: melpaBuild { pname = "company-erlang"; - version = "20170107.115"; + version = "20170122.2138"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "company-erlang"; - rev = "70f65acb5912b27284ae2ff55d72e4687b862432"; - sha256 = "0dpkm6fh1qw8nz75n3na4hbvw9ggxn9dq9p9qmb7pdbcc78nsi44"; + rev = "bc0524a16f17b66c7397690e4ca0e004f09ea6c5"; + sha256 = "04wm3i65fpzln7sdcny88hfjfm0n7wy44ffsr3697x4l95d0bnyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca96ed0b5d6f8aea4de56ddeaa003b9c81d96219/recipes/company-erlang"; @@ -9519,12 +9582,12 @@ company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-flow"; - version = "20161111.2147"; + version = "20170208.756"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "company-flow"; - rev = "1f10d38135679f705494f23cd866ded0130e2993"; - sha256 = "0alkxdd171dwk6rnq2yc6gpljdazz7yz7q3mzs3q4rcmrvlr8h84"; + rev = "b86eaff31a66e311c210da93b83fa218f8def24b"; + sha256 = "1lpihk96pz3v7qd62icm950wds1xc02mx08ygfv7ia1zv1m4m6w5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow"; @@ -9771,12 +9834,12 @@ company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ngram"; - version = "20161013.805"; + version = "20170129.1113"; src = fetchFromGitHub { owner = "kshramt"; repo = "company-ngram"; - rev = "98491c830d0867c211b773818610ace51f243640"; - sha256 = "196c870n7d46n4yhppq5np8mn9i0i74aykkbfk33kr4mgilss4cw"; + rev = "d15182df3eac72b29772802759b77c9eafef5066"; + sha256 = "05108s2a3c857n9j3c34hdni3fyq149pva4m3f51lis4wqrm4zv7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram"; @@ -9796,8 +9859,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de"; - sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5"; + rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29"; + sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/company-nixos-options"; @@ -9813,12 +9876,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "20170111.2112"; + version = "20170209.2128"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "cb15be9d7a7c6aa2aa20188069b07521bfe3cb5f"; - sha256 = "02fvdkz7a3ql4r1vap2yl3m3cb29f9psk4qy4qp1kqrxbcmcrafm"; + rev = "436567c1e28cce979aab7820a8fc74b5b5294218"; + sha256 = "07w8fpnglany530jksjsl5qs9mfbc52gh6pfnqlqx6ppp01k8lw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -9876,12 +9939,12 @@ company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: melpaBuild { pname = "company-quickhelp"; - version = "20161113.1226"; + version = "20170119.2217"; src = fetchFromGitHub { owner = "expez"; repo = "company-quickhelp"; - rev = "41014e9018cc6f42741ce85383852930e6411f2e"; - sha256 = "00svfw08g44byzx23zb0kla6y6z05m6qlxzl0q32kkgkqvdhzb17"; + rev = "639baefc78ee9346229969cf794fba596e15a7d3"; + sha256 = "0ql5a34cgkdbz1bxml5sam5kwd78zllkf8hm0r6zcnjykh4b5wv4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp"; @@ -9945,12 +10008,12 @@ company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-shell"; - version = "20161002.505"; + version = "20161128.953"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "company-shell"; - rev = "63d3cbdf8b2f88cfb2607bc064ef8059b93a75a1"; - sha256 = "11d49spfvx9y1skksjhgirhjxp7i17xcd5xp3a0k59jzb0zhyyqh"; + rev = "a4a7b9ed6b81e4c9f9cb04f63b386fd76d952f11"; + sha256 = "00bgxd66pwchpy1lnv43izgr6gk4c9nh02jab6laf5jk8s9xs2h7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell"; @@ -9966,12 +10029,12 @@ company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }: melpaBuild { pname = "company-sourcekit"; - version = "20170115.1551"; + version = "20170126.353"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "a28ac4811fac929686aca6aa6976845c02d6efd3"; - sha256 = "09vv6bhiahazjwzg5083b23z3xz5f4b3d4jra61m5xffkmjnbs9s"; + rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; + sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit"; @@ -9987,12 +10050,12 @@ company-statistics = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-statistics"; - version = "20161213.159"; + version = "20170210.1133"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-statistics"; - rev = "36d9692da9172c3ad1e1a46d66ffa9346a44b212"; - sha256 = "05br3ikxad7gm7h6327yfwdfap6bbg68fbybsx967a31yv4rxhvm"; + rev = "e62157d43b2c874d2edbd547c3bdfb05d0a7ae5c"; + sha256 = "12mwviz1mwx4ywks2lkmybbgh1wny67wkzlq5y3ml8gvyc288n3i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89d05b43f31ec157ce8e7bfba4b7c9119bda6dd2/recipes/company-statistics"; @@ -10134,12 +10197,12 @@ composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }: melpaBuild { pname = "composer"; - version = "20161115.1102"; + version = "20170127.1745"; src = fetchFromGitHub { owner = "zonuexe"; repo = "composer.el"; - rev = "2ea50be23557ce50de2c5a517fcd4abc980969b1"; - sha256 = "0ir0a3i7bvnf80als7bwjvr604jvhpk0gwln88kqgksvy1bh1nky"; + rev = "00b00cc48dec28ef4f993ad7044cd79f44b4cbd6"; + sha256 = "16vv7s3g4in3zl5yl2iqgcmfmay64gk6z8mc7pb199alk7m0dlyq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer"; @@ -10343,12 +10406,12 @@ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; - version = "20161231.1628"; + version = "20170208.1921"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "f10105bb5a6a9ccc557649a56f46546b25a5460b"; - sha256 = "0p27jdwp580x6namdklk7472ajj72h2zka4q70yccszh52c44iyq"; + rev = "22239b22b63393222143857825098b03c53a1044"; + sha256 = "1r4f04ca4w60qqrc5s7ic69ah3z63ygc1xagxqbp85wavq7vk8rc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -10448,12 +10511,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170104.737"; + version = "20170208.107"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "ee91a2511797c9293d3b0efa444bb98414d5aca5"; - sha256 = "0mrv0z62k0pk8k0ik9kazl86bn8x4568ny5m8skimvi2gwxb08w6"; + rev = "5f732cdce5ac2529f36b5c8cc9f053789783de45"; + sha256 = "1ha7filrnkdya4905yy002n1hjdl23k9hbb2w2id3wfj0cbw930f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10571,6 +10634,27 @@ license = lib.licenses.free; }; }) {}; + cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "cov"; + version = "20170130.1727"; + src = fetchFromGitHub { + owner = "AdamNiederer"; + repo = "cov"; + rev = "d73b3aa7f3f285f046e448ffabd3525ccfcc08a1"; + sha256 = "0l21422mjhknabm1l4d9f5radq153vr6qc6ihsm0hxhy1i713mqn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov"; + sha256 = "02wk8ikanl5lcwqb9wqc8xx5vwzhn2hpqpxdchg5mdi7fifa1rni"; + name = "cov"; + }; + packageRequires = [ emacs f s ]; + meta = { + homepage = "https://melpa.org/#/cov"; + license = lib.licenses.free; + }; + }) {}; coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }: melpaBuild { pname = "coverage"; @@ -10658,12 +10742,12 @@ cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cpputils-cmake"; - version = "20161201.1441"; + version = "20170203.155"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cpputils-cmake"; - rev = "2c48c1bacee286d927038bf0c893678931f0f956"; - sha256 = "03a0y508znl91c6893wf5l9d98nc4dbfgg9c594c542mdbrk54z0"; + rev = "5bad6a1f1042e45fa6d2c20fd901100d14d455ff"; + sha256 = "0ag0wkyf1y4q0cnv8gixrbhhaf871x3r97izb82v42i47cnwk228"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake"; @@ -10992,12 +11076,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20170111.1133"; + version = "20170203.1122"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "bc6a4190194f27cba46aa019d62d5e602b6d891e"; - sha256 = "1xx9nls695gf6fd4dxqxgvcwvwvkwzw3gm5vnc74h3hcfk05msij"; + rev = "571c4c70fe2de790e093cff23050827c5f6e96aa"; + sha256 = "14wr98hq1banf0dbyi83rar0apj9gvwdqfvmnmhzxfr6dnzxsybf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -11136,12 +11220,12 @@ ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ctags-update"; - version = "20170111.2150"; + version = "20170120.2313"; src = fetchFromGitHub { owner = "jixiuf"; repo = "ctags-update"; - rev = "b0b5f88bb8a617871692429cf099c4203eff610c"; - sha256 = "0wdxqkhflwnaic3ydr8an23z2cwsm1sj3di2qj5svs84y0nvyw7s"; + rev = "9c58084395bd5c62c3fe500cd56d62bfc1dcee51"; + sha256 = "0cgq31ivhhr32pz17yfy7sja81bhxjh7fn502fa8mc9c3msgflwn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update"; @@ -11203,8 +11287,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "87c067150e955e3f2b0864e2ec9929fa3289ff28"; - sha256 = "13xrln4fqdq3siz8p2vilwwma1p0fnk7rxxd89v0pc7zw1nl8yrr"; + rev = "9ae218e0beefd3cc2c617cf6b66ac9faba1a8af7"; + sha256 = "08d09wgi7j8qihqsxyl2lgvwcsi7gwl8kbz3c36yc0gb656m7blr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11300,10 +11384,10 @@ }) {}; cus-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cus-edit-plus"; - version = "20170102.923"; + version = "20170206.1603"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/cus-edit+.el"; - sha256 = "1mmcnx0i9jz1xzxgl9wqlfk4yl8y3bz88jf8078b80y34489lky9"; + sha256 = "02mcvr8fnaflqwxzafr6i745wcw8akhjjq8ami312aibf5yjadik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57370fc617f4f10cc67e9d3c6dc113ff0a18cace/recipes/cus-edit+"; @@ -11467,8 +11551,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "d02cc4c5d831da27cd871cbb3feaf8bea72ec0c0"; - sha256 = "055wjr2kgvqji9ifwjchi8m4f095sq8df3vfxcv2n6ifgdwlmzkf"; + rev = "4924bd9cb7fc9350646f347e99292d115c39852c"; + sha256 = "0yrq1hi79kyca774ab5kg0ran9nyjyh0h504rs17f8w05ly48n3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11568,12 +11652,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20161214.703"; + version = "20170210.708"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "af41b9146b8c374477aeb8e739686a2006ce7479"; - sha256 = "0k60jr11jnvn4fpx7jr7jlcnfsrdv4kp26fd71jv0j4gvin2ljxj"; + rev = "95805f95aa780ecdb6ff35aaa6a56f3acc4c8be3"; + sha256 = "1bpyzx6i2z73y70na9a450bpv9gw4av5jx6njbwzjbapdcl7dxz6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -11589,12 +11673,12 @@ dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dante"; - version = "20170103.420"; + version = "20170207.234"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "04da558e4d693ab320c1aea62160c2a4e2152326"; - sha256 = "1rmai7ysacaaqw7s56s18zg2aqiv0iys9m0z584ymczvszgvjl6v"; + rev = "7acaefbf36fe53e9af9f812957eea404e11f8a61"; + sha256 = "0ascjab014sbv9fvkswyxwhg50f0siwa9v6s67k5g58n9f7r7bls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -11799,12 +11883,12 @@ dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dart-mode"; - version = "20161218.1548"; + version = "20170127.1652"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "e6635b390235cf16a8081763768cf925ca2d9133"; - sha256 = "1cwwwxmv7d1blv88c6nlm0z94gjfdgw2ri1libzyfzirincyicdx"; + rev = "b3808189cf6c5165499d3f67540f550e49b26aa2"; + sha256 = "1bs3p72gxlcviz0l2dl1h92708j0c3ly0kwpdbr370i2hdv0l8ys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9cb763cb8e929d9442be8d06e9af02de90714a/recipes/dart-mode"; @@ -11820,12 +11904,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20161121.55"; + version = "20170207.2056"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "958e3fb62fd326d3743c0603b80d24ab85712c03"; - sha256 = "1a1zca0lh01wayd4qdjihimhd1bn00qpwfiybgdcb7yn5xfwv9a1"; + rev = "98e819e407bbc35478cde30a74be15f077bd6d4b"; + sha256 = "1ws57p9y9fjpzk63x5qfibqc4xz6q4iczrxdmrgvm0p3mj3gmvwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -11866,8 +11950,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "958e3fb62fd326d3743c0603b80d24ab85712c03"; - sha256 = "1a1zca0lh01wayd4qdjihimhd1bn00qpwfiybgdcb7yn5xfwv9a1"; + rev = "98e819e407bbc35478cde30a74be15f077bd6d4b"; + sha256 = "1ws57p9y9fjpzk63x5qfibqc4xz6q4iczrxdmrgvm0p3mj3gmvwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12072,12 +12156,12 @@ ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ddskk"; - version = "20161127.118"; + version = "20170213.315"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "df9d8a8332c9f75498bfecd870d7296c6ba0b42e"; - sha256 = "05ay6qkx77yl581jvikkf11dzny0v9h70iahss4bz5a37hawp4dd"; + rev = "4681d150d80da779bc8f95ec912c7de13cecd0f1"; + sha256 = "0hsz5gpj2lq7f8grb9wmjv5sqm8ky2c98di0m8n27y4ikcqv7dz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -12198,12 +12282,12 @@ dedukti-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dedukti-mode"; - version = "20160329.1002"; + version = "20170206.514"; src = fetchFromGitHub { owner = "rafoo"; repo = "dedukti-mode"; - rev = "dab509952b6c64d0bb12b5f60dd93e3b38b01d62"; - sha256 = "1lnvr1rxgf1i0dh1gqlkghz6r4lm1llpv3vhky313220ibxrpsvm"; + rev = "6f5513a1dd7ff5d76da2402287a58f55f8891efa"; + sha256 = "1vxbringd99w6mraq4d3b2k4rh5ldc4wvxjvg1z95xawhznv3v0r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/767a685fbe8ae86177e90a17dac3815d41d74df4/recipes/dedukti-mode"; @@ -12364,12 +12448,12 @@ demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demo-it"; - version = "20161103.1337"; + version = "20170126.739"; src = fetchFromGitHub { owner = "howardabrams"; repo = "demo-it"; - rev = "830a1f10982abe586c9d13685007d191eda6fbdc"; - sha256 = "0fkwzx681df0p4a8f2z6lh5j94vln0i6cvrfzym5v8cdhyhd0p80"; + rev = "f61f336c8c291208d9feef2ce495e8c659052f77"; + sha256 = "1wb7n4k2qwl3m7y22zag6rdzi1gqb8a5lj7crpkkn5ryycbxbbpi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it"; @@ -12510,12 +12594,12 @@ dictcc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "dictcc"; - version = "20151221.357"; + version = "20170207.835"; src = fetchFromGitHub { owner = "cqql"; repo = "dictcc.el"; - rev = "1fd76499cf5d2045e8594aec3c0b62168802f887"; - sha256 = "0b8yg03h5arfl5rlzlg2a6q7nhx452mdyngizjzxlvkmrqnlra4v"; + rev = "a1e87dad68faee956e4614c4f0f0bb98ba81ab6a"; + sha256 = "086nq9ngn06n605s21733456knna2py5dfymm8824zslzz39i8fy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e867df96915a0c4f22fdccd4e2096878895bda6/recipes/dictcc"; @@ -13050,12 +13134,12 @@ dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-launch"; - version = "20160914.756"; + version = "20170131.1740"; src = fetchFromGitHub { owner = "thomp"; repo = "dired-launch"; - rev = "8766ab5ed59b7b5105ca5818fa85004447ced1cb"; - sha256 = "13q1xd2ycs1c6ybizykzhb42x3j3mx2g9dxy8h1nr7bb7393hs64"; + rev = "acf8a3dec14e68934d7d7ef0b867e347ce5d81e9"; + sha256 = "0wsas576mk5n13wmb2rpazgys3sxgl3ds936gr8yy1sb43mv21r4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch"; @@ -13726,12 +13810,12 @@ dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; - version = "20170109.331"; + version = "20170209.538"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "f9dd686922cf89dc7859c793be84969a2529a14b"; - sha256 = "02cayawahsa59mkr0f4rhsm9lnpyv8qpx59w3040xmhf8dx95378"; + rev = "fc19b2e0c387a545901365a01c4a355bf0504405"; + sha256 = "0qavf6q8gk4sli28rm4wgvwwj28qxd3qkvj921l8sqr49paah0vy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; @@ -13751,8 +13835,8 @@ src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "f9dd686922cf89dc7859c793be84969a2529a14b"; - sha256 = "02cayawahsa59mkr0f4rhsm9lnpyv8qpx59w3040xmhf8dx95378"; + rev = "fc19b2e0c387a545901365a01c4a355bf0504405"; + sha256 = "0qavf6q8gk4sli28rm4wgvwwj28qxd3qkvj921l8sqr49paah0vy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; @@ -14091,12 +14175,12 @@ docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "docker-tramp"; - version = "20161020.2220"; + version = "20170206.1925"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "docker-tramp.el"; - rev = "d8b510365d8e65551f4f792f251e7212411708c3"; - sha256 = "0lxvzmfg52fhxrhbvp92zwp7cv4i1rlxnkyyzgngj3sjm7y60yvg"; + rev = "8e2b671eff7a81af43b76d9dfcf94ddaa8333a23"; + sha256 = "1lgjvrss25d4hwgygr1amsbkh1l4kgpsdjpxxpyfgil1542haan1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker-tramp"; @@ -14130,6 +14214,27 @@ license = lib.licenses.free; }; }) {}; + dokuwiki = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: + melpaBuild { + pname = "dokuwiki"; + version = "20170213.122"; + src = fetchFromGitHub { + owner = "accidentalrebel"; + repo = "emacs-dokuwiki"; + rev = "4f23638ab6f795fe70508576fa73583d447aecae"; + sha256 = "18vfbvx2mck48pd1s3h2a8zx8axa808krailvfjm3ypa86ia95w6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e46cf6a57b93ddfda8e2d6e74cee8d0df2cb1ec7/recipes/dokuwiki"; + sha256 = "1vi6crl5y3g1p6xcpqzybmidn09cdf4gplmrvb2nkc94pyd9qxnw"; + name = "dokuwiki"; + }; + packageRequires = [ emacs xml-rpc ]; + meta = { + homepage = "https://melpa.org/#/dokuwiki"; + license = lib.licenses.free; + }; + }) {}; dokuwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dokuwiki-mode"; @@ -14196,12 +14301,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170111.2138"; + version = "20170131.2109"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-theme"; - rev = "bb1e7d7ad7bb8cfe3dccf6499076941a08169e9d"; - sha256 = "024am5z7ihibkr5pbavdybxdq9q1pnsxhnfppwlzl8kaijqmmzs4"; + rev = "2c843fd80d91bb7bd9de9a6bd820998689854fac"; + sha256 = "0dcln2z63j7wpz6yczpsfmhb68gvak7y66g56373fsv2i3n4ydz0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; @@ -14435,12 +14540,12 @@ dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dracula-theme"; - version = "20161119.1345"; + version = "20170210.830"; src = fetchFromGitHub { owner = "dracula"; repo = "emacs"; - rev = "c9f8a97eba74a82a65554c9b282e86125a22ecb2"; - sha256 = "12918nidcmqnhkqhhrnhhd2sihqld5dy1v06q4j9fkrcbp4j4l4l"; + rev = "0b865af179768c24a1f7135c2866eca0f65b9295"; + sha256 = "114kxmki4hmrckxflkzgrl8i6n9qc1jdvma5assbvmhnfqmy4hvm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme"; @@ -14604,8 +14709,8 @@ src = fetchFromGitHub { owner = "arnested"; repo = "drupal-mode"; - rev = "6f40ad04b760d2266b8c07283df266471d85a9b2"; - sha256 = "13wlgy1g1nl3xxkibh0cj983lq3snw4xxmq4nsphq92pjd2lggs7"; + rev = "9d5808972f344a09dcf665d5113ae81e39ac1051"; + sha256 = "0vz41jfkfir7ymyl5y0v836zclqfihrjdiyz3vnb081x0gara8l0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode"; @@ -14644,7 +14749,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1779173"; + rev = "1782905"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -14808,11 +14913,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20161231.1437"; + version = "20170117.550"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "4004050a9771"; - sha256 = "0p7g7sfkdr473gpj2xdgg5fb5d336w2ddvx44i1d6575p6rcs5w6"; + rev = "9ae0c786e1e7"; + sha256 = "1a498jkj15vhf2x4an6raghjf9fszrkw0zl617m8pibcn3yrnv62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -15248,12 +15353,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20170112.443"; + version = "20170208.1223"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "4c2581ad17a636909e7ed0f46bd813cd6d9c45d3"; - sha256 = "1ic55fml4ll7pvakcf32ahps4za8mf4q10jgdyi8xj5bccvi3n3r"; + rev = "1ae554d1b67cb81b96c828e9710a4658db35b9fd"; + sha256 = "0ch8ws46r55rdap67xa40gb9h4llad6wx75iga4fyjzh6fxv9q9d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15266,27 +15371,6 @@ license = lib.licenses.free; }; }) {}; - ebib-handy = callPackage ({ chinese-pyim, ebib, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ebib-handy"; - version = "20161126.140"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "ebib-handy"; - rev = "e4815b2d127300361b8528681d2d36ad5465e574"; - sha256 = "03pnapalpdyfcy4irmxwljpwxmbcgz3dzbxd8b0058gkhzan9vrz"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8843caa0d80000c70d3b264854f50daac94e6962/recipes/ebib-handy"; - sha256 = "069dq4sfw4jz4cd8mw611qzcz7jyj271qwv2l54fyi3pfvd68h17"; - name = "ebib-handy"; - }; - packageRequires = [ chinese-pyim ebib emacs ]; - meta = { - homepage = "https://melpa.org/#/ebib-handy"; - license = lib.licenses.free; - }; - }) {}; ecb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ecb"; @@ -15333,8 +15417,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "5b7d58c783f6453442570ae8cedd489a0659a58e"; - sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh"; + rev = "3b5ce79b5ed80f9ce7ca1fa10f0c314516300d6b"; + sha256 = "1gxsixg2rp09myqrcq7plk84bhhd8aaz68a09xfsbdia41q3vaa7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -15518,12 +15602,12 @@ ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ede-php-autoload"; - version = "20161119.419"; + version = "20170212.450"; src = fetchFromGitHub { owner = "stevenremot"; repo = "ede-php-autoload"; - rev = "c6896c648fbc90f4d083f511353d6b165836d0e8"; - sha256 = "0dfx0qiyd23jhxi0y1n4s1pk9906b91qnp25xbyiqdacs54l6d8a"; + rev = "c25e7dd7ade0e514b1dc94e69b73415fd3eb57c3"; + sha256 = "1v7jpm81r3c4iqrbslrlnczxfs35s7lky7v75x9ahm5vbnrd9iig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload"; @@ -15904,11 +15988,11 @@ }) {}; eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eide"; - version = "20160926.1332"; + version = "20170213.1254"; src = fetchgit { url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git"; - rev = "72c07fdbe6c8507147e997a22abcc2b42e45fce8"; - sha256 = "1v64b6ii4xl3cyr6cvyq25i2xzyk6czr4m1z82pknb3qmxx3m26w"; + rev = "66d4490ec38dd992ba90b3801879d3f0ff312635"; + sha256 = "1y8imvgms7nb8fcpm1v6zkx3hqsf6zygc38gbj87c8s85f2qmfrq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d384f185f76039b06a1b5b12c792b346c6d47a22/recipes/eide"; @@ -15945,12 +16029,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20170111.542"; + version = "20170212.2016"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "e226b30139e283bf5c3bbf7419b9383c72237c88"; - sha256 = "04szmzri65qagy7af4rrq43idmy5qpl9lqvwq708rzsv8mkqpkqr"; + rev = "f1d3fbe96713e85aaea2f1027c2cc1782e0e5a70"; + sha256 = "0kf8glywsdscviml8gwdj659zm28npkz0w6ybcx2k1wv9gkg3shs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16008,12 +16092,12 @@ ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20170103.1427"; + version = "20170211.259"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "dffc4f16a0bbaf2a767961297df4570423479117"; - sha256 = "198cii3nk0cmqciyhs0gjlhn6gnsslbry36hm9zp7r3kzk8hsc6g"; + rev = "94617344a74336ecaebc17a414f4d05162a79303"; + sha256 = "1lcc8y6lhqv0fgdik0qifbb1dzj077s86skrnvy92x373wv565kr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -16054,8 +16138,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "a6510f13c15d9811b51ccb1a96293bbe05162dbb"; - sha256 = "03i8ma0npxfixlbn4g5ffycpk1fagfjgsl4qg4hkrj9l0dmnm7qq"; + rev = "6b707565b7328d8bcb8898db1a5b9dffaa06cdf8"; + sha256 = "02qvxpg3pnw6crr13isimbhxyk6lf0x216418bhilgvgzmp1jwmj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16131,6 +16215,27 @@ license = lib.licenses.free; }; }) {}; + el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "el-patch"; + version = "20170211.1725"; + src = fetchFromGitHub { + owner = "raxod502"; + repo = "el-patch"; + rev = "5fe9ff42e2651013ae8ff6bb8a1691d3f7b7225c"; + sha256 = "1d6n1w049wziphkx9vc2ijg70qj8zflwmn4xgzf3k09hzbgk4n46"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; + sha256 = "1imijmsni8c8fxjrzprnanf94c1pma3h5w9p75c4y99l8l3xmj7g"; + name = "el-patch"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/el-patch"; + license = lib.licenses.free; + }; + }) {}; el-pocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web }: melpaBuild { pname = "el-pocket"; @@ -16335,22 +16440,22 @@ license = lib.licenses.free; }; }) {}; - eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild }: melpaBuild { pname = "eldoc-overlay-mode"; - version = "20170114.2125"; + version = "20170123.6"; src = fetchFromGitHub { owner = "stardiviner"; repo = "eldoc-overlay-mode"; - rev = "794c2b959611d1352cdda9e930f2ddd866b4118a"; - sha256 = "04lndhm1jb0kvv0npr5wmgj8v18537fgp62c6m4gzgcjyfxihmr7"; + rev = "a0f25710b6a1614ce93c71c7947108c09b587c48"; + sha256 = "065sihf0dvi7g37zvf5drigkakydapyvpxdibcdzhcxx2p9bqszi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de4d7c143f24d34eed093cfcdf481e98a6d2f839/recipes/eldoc-overlay-mode"; sha256 = "158w2ffayqlcbgka3894p3zbq45kw9mijf421yzf55y1f1ipzqqs"; name = "eldoc-overlay-mode"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs inline-docs ]; meta = { homepage = "https://melpa.org/#/eldoc-overlay-mode"; license = lib.licenses.free; @@ -16464,12 +16569,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20170116.1128"; + version = "20170125.1905"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "3be3ff04438eec593f058d0f948dfc9f85a0ad47"; - sha256 = "1siviasw7863prsyxw7ggb0n71b32kzq647f60jnx75y69s05zds"; + rev = "caa3679a4af386c73d01cabf7c114a5abb40ea3d"; + sha256 = "0af65imbh2lp4i7n4k44pr5sl4035rh61zngn4fznwcgs6kjk7d4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -16534,12 +16639,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "20161030.1731"; + version = "20170125.1846"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "3be3ff04438eec593f058d0f948dfc9f85a0ad47"; - sha256 = "1siviasw7863prsyxw7ggb0n71b32kzq647f60jnx75y69s05zds"; + rev = "caa3679a4af386c73d01cabf7c114a5abb40ea3d"; + sha256 = "0af65imbh2lp4i7n4k44pr5sl4035rh61zngn4fznwcgs6kjk7d4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -16975,12 +17080,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20161229.1103"; + version = "20170212.420"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "d93ad53fb55c1ff2cbbafcc8c85bddc30484bc80"; - sha256 = "1ii3p81hn84f155mywz906pnjkp5qca501qrplh96c5d0xkzz14l"; + rev = "7e005dc48530007aeac871dbe214512289ec5dea"; + sha256 = "0pjdsh53f8d2fva55kvm726x5830r78fyigcd4ni4sifl83szrpf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -18042,12 +18147,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20161227.301"; + version = "20170128.359"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "42598cab15985e6fc5e95989b0c73e2259cdadf5"; - sha256 = "1k8nfxfd4y3r1y293r6sqlk4wq59rdvpbhsdvr3j0mx0a9yzdxdm"; + rev = "ee16c7a91b9ac1585be287ecf94e4b20aaaea3f5"; + sha256 = "15ldbviaxd9nlb11c3aw7dnp8xxyldm67dmbnsv6f3rpafy1gmzv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -18134,12 +18239,12 @@ epic = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }: melpaBuild { pname = "epic"; - version = "20150503.37"; + version = "20170209.1623"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "epic"; - rev = "02f6472bb490a39d42ed49c0364972173202f6e1"; - sha256 = "18gfi1287skv5xvh12arkvxy2c4fism8bdk42wc5q3y21h8nsiim"; + rev = "a41826c330eb0ea061d58a08cc861b0c4ac8ec4e"; + sha256 = "0mvg52f2y3725hlzqcn2mh8jihnbg68wlqmq951sa3qfma7m40pp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c7162791d560846fe386746c00a9fe88c8007bb/recipes/epic"; @@ -18155,12 +18260,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20161231.850"; + version = "20170205.616"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "6e1d989fbfa357a7c268ea30fe8b3e3cefafc36d"; - sha256 = "0avlmqcbm07692ir5z04gy4klhyan3h25ni4l4k4p0dszjsqmdi0"; + rev = "521026f777543b73bee6107aab089f44fb809c91"; + sha256 = "0k2vxhr9rjkya95wca4v2qihbs72yx9zv1z7snm0wgfy39y385fh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -18676,22 +18781,22 @@ license = lib.licenses.free; }; }) {}; - erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20161129.304"; + version = "20170209.52"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "eadc98327e3fb173d80a92e6ae2e7d7e85f92d67"; - sha256 = "1bn43p122ld3269klzcpfwacswnlpj2hdz9kx6n5691zv0w3qi5b"; + rev = "6282023d28588e4838f37ea45a060ec48ef5ba3f"; + sha256 = "01bbx82746abfqlr6hqja9jkvwalqyvxhdmzk6qarngyr2fpq1sa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; sha256 = "1cs768xxbyrr78ln50k4yknmpbcc1iplws3k07r0gx5f3ca73iaq"; name = "erlang"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/erlang"; license = lib.licenses.free; @@ -18840,22 +18945,22 @@ license = lib.licenses.free; }; }) {}; - es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, spark }: + es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, spark }: melpaBuild { pname = "es-mode"; - version = "20161103.1024"; + version = "20170213.1137"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "673506ec3d9eedc06f1e9f2953ac2720bf66f992"; - sha256 = "07r7zr38hqv0njc8zwdqmslh422kwahri2s7gp56abfk6wc0ndkm"; + rev = "9fb395996316c140f3a6c77afb10dcd37cb49126"; + sha256 = "0g2x3jwy3v45p6nqjfskj0w0c94gyvxm1xzi5yypnyhsj188fsyp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp"; name = "es-mode"; }; - packageRequires = [ cl-lib dash spark ]; + packageRequires = [ cl-lib dash s spark ]; meta = { homepage = "https://melpa.org/#/es-mode"; license = lib.licenses.free; @@ -19032,12 +19137,12 @@ eshell-fringe-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-fringe-status"; - version = "20160224.416"; + version = "20170117.1516"; src = fetchFromGitHub { owner = "ryuslash"; repo = "eshell-fringe-status"; - rev = "573bc2d48b7d24bb4bf7575e3d438525a6f3cd46"; - sha256 = "10c31a1ypa6yd957r1jiasx0ql2z9ykbn31l51y1xwrp00mq3yls"; + rev = "adc6997c68e39c0d52a2af1b2fd5cf2057783797"; + sha256 = "1cwn4cvjjd4l5kk7s6cxzafjmdv3s7k78i73fvscmsnpwx9p2wj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9efd9fefab5d449b9f70d9f548aadfea52d66bc0/recipes/eshell-fringe-status"; @@ -19242,12 +19347,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20170116.214"; + version = "20170211.805"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "8ba2d5c5a5d9abb5fa907e2e27e6ccb9a130158e"; - sha256 = "12kx8wbr4wzvrlcbk48qbpfp4pdfsxxgx19qvl127c91ajbxksxa"; + rev = "59233439aaa73ae34d548ab126fd3a79e8363c92"; + sha256 = "0p1hs4fy8aig504qck4j7c5jc9nw5fny42az1k56gifw6c243wfr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -19368,12 +19473,12 @@ esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esup"; - version = "20160818.2130"; + version = "20170125.43"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "7ab0f4cb39398528e7dee5200a7ccf7eb8f0a3db"; - sha256 = "1lcmim8vv04dgmmq8fznb9brvqsk78a4dclk5gkrxk63nli68d9m"; + rev = "a63ab0cd57a37317256b15a3f5f30c2b11d92c25"; + sha256 = "07bpcihmzaf7av2sbzs0pr0cw21xqr3nnalj3cwxv7d6yhc8g4qf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; @@ -19611,18 +19716,19 @@ license = lib.licenses.free; }; }) {}; - evil = callPackage ({ fetchhg, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: + evil = callPackage ({ fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20160825.1343"; - src = fetchhg { - url = "https://bitbucket.com/lyro/evil"; - rev = "f2648b841f9b"; - sha256 = "0gv8b6adaypw3d2brx0lh41yyi3kdf1klahx7kap36a7m652nan6"; + version = "20170209.1259"; + src = fetchFromGitHub { + owner = "emacs-evil"; + repo = "evil"; + rev = "c29c32be3327294036a8a56513836ee515091f16"; + sha256 = "05g7wp9aaf767d4277q86nrz1azhbhlxxc1pncf2f5dmid9pbgbq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/evil"; - sha256 = "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil"; + sha256 = "044k9p32y4cys3zwdfanr1zddgkxz16ahqspfz7vfszyw8yml1jb"; name = "evil"; }; packageRequires = [ goto-chg undo-tree ]; @@ -19634,12 +19740,12 @@ evil-anzu = callPackage ({ anzu, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-anzu"; - version = "20150124.1609"; + version = "20170123.2318"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-evil-anzu"; - rev = "183e42a7e4a47b1aa4dcc69e1cca87b48ffc6c5c"; - sha256 = "0fqz1545hyz6p76vgjlg09mqhfwhi8swrlkwx8q8i5vl2r14s9px"; + rev = "9bca6ca14d865e7e005bc02a28a09b4ae74facc9"; + sha256 = "1y0jiglcazxnvggs5ljys2iizljsihlgr46svbbwgf45ibdrw392"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06b0609b56016d938b28d56d9eeb6305116b38af/recipes/evil-anzu"; @@ -19823,12 +19929,12 @@ evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-ediff"; - version = "20160821.1950"; + version = "20170213.539"; src = fetchFromGitHub { owner = "justbur"; repo = "evil-ediff"; - rev = "81be356eaf5dc9ee1cc624c237007892d7c191f9"; - sha256 = "1x831myijdnzxjfpm1gb8fqfvfwv5ixsaqkax37cim2yf2fbvln1"; + rev = "4f3b9652e5df58ccc454d970df558f921958894d"; + sha256 = "1nc7xq86v5ns3d47ifwnfm7x7x3qxb18rjqx37mqvga91nz2i1k3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45eb1339792849b80a3ec94b96a88dd36262df2b/recipes/evil-ediff"; @@ -20138,12 +20244,12 @@ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "20161130.454"; + version = "20170119.125"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "e9f77f7d6a14434a8ca3280d721b96c0984fa7eb"; - sha256 = "11mhgw0xa8kn73svgvzpmvvnkj2ja4mxs030vlzkh4scvlfa98dl"; + rev = "277623d8be7bd6ade8f301b9397b88575a0d01b9"; + sha256 = "0bkc90ix8nivqkjkgb6iaq1a0g8dcp91im119dx98l6lxga57qli"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -20159,12 +20265,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20170113.19"; + version = "20170205.1355"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "d5b50be73b4288400d418abe86f92504081ea32d"; - sha256 = "13wvjif6479c1l6hvyhm7jhf41kdh4c56n4rmnncc9cw5z9z7fcb"; + rev = "17a469799a5fe0df8d9b3589c6719634acd065eb"; + sha256 = "0rwz0xg76kvyz959r8bywdbddxaxn69z9lqq95z71qq980w3d4g7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -20180,12 +20286,12 @@ evil-mc-extras = callPackage ({ cl-lib ? null, emacs, evil, evil-mc, evil-numbers, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc-extras"; - version = "20160731.1641"; + version = "20170202.849"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc-extras"; - rev = "22f9b4cdb66cd6dffc89a66ee3a70593946a7d16"; - sha256 = "0cbpx6ynang74g7w3hv43vp57nf00axfsprc9zyl6q10mpzdpkhn"; + rev = "ba3252ae129c3b79aeb70ec3d276cbda32b00421"; + sha256 = "0a7mn1z0db4xi8wclqp41hcbzh017q6pndxr9mrfxb67sqs601id"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd7c9aa0f4c17e7f27836e75a0b83c44a68ad744/recipes/evil-mc-extras"; @@ -20243,12 +20349,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "20161031.409"; + version = "20170208.1712"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "54c618aada776bfda0742819ff9e91845a91e095"; - sha256 = "04iyr6ys453pyfvif91qnhn6xyhl4z4cz2apj6vga61pa8lc70da"; + rev = "01a98a20c536a575ee5bc897f38116155154d5fe"; + sha256 = "160h4qasqr04fnv9w5dar327i074dsyac2md5y7p3hnz1c05skhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -20516,12 +20622,12 @@ evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-surround"; - version = "20170115.1604"; + version = "20170124.1110"; src = fetchFromGitHub { owner = "timcharper"; repo = "evil-surround"; - rev = "27dc66d5d8ee64917bf5077a4d408f41099622ed"; - sha256 = "1s0ffrk1avn008ns6qvj4mnjb476bvgsg74b22piq3s3fl8yycr4"; + rev = "7a0358ce3eb9ed01744170fa8a1e12d98f8b8839"; + sha256 = "1smv7sqhm1l2bi9fmispnlmjssidblwkmiiycj1n3ag54q27z031"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround"; @@ -20537,12 +20643,12 @@ evil-swap-keys = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-swap-keys"; - version = "20160909.1407"; + version = "20170125.452"; src = fetchFromGitHub { owner = "wbolster"; repo = "evil-swap-keys"; - rev = "54aed57b464905d18bfcf52e3d0e7e5f939aa133"; - sha256 = "03ii6hj226aq6qbhias41miyv59aij24byw8637dbhb68gpff8v1"; + rev = "1f137e85fc092cf5a1bd8abbd8e8fda0f4cd024b"; + sha256 = "0vx4gsyhcb050q8bh6d016ybjkji1mfpp9m000s4kq1k04nm4cwb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys"; @@ -20747,12 +20853,12 @@ evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-visual-replace"; - version = "20161122.1641"; + version = "20170201.1920"; src = fetchFromGitHub { owner = "troyp"; repo = "evil-visual-replace"; - rev = "f88c8aa9e3a0d7e415bec50dcdf4bc5bb8feee45"; - sha256 = "1rmdjlbh3ah1pcdsd6yzb15g15b10x0py1alfywvyc1p227lv4v8"; + rev = "9bfbaf71898294e25d588a887fb4753641edfbe9"; + sha256 = "00mhqb9rn4hq90x5i44jyq51lg351bv8hdj4c443nxrbldi73k9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/165aea6697a6041bb83303f3ec8068a537accd4a/recipes/evil-visual-replace"; @@ -20852,12 +20958,12 @@ exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exec-path-from-shell"; - version = "20161229.1338"; + version = "20170212.2116"; src = fetchFromGitHub { owner = "purcell"; repo = "exec-path-from-shell"; - rev = "0f53502d463eeeaefe48dfeb0c2fbaac1e6302e3"; - sha256 = "12mkh5sna8j0ijxc6fd8sr2zlk3p6w9q3fv5l3n16sjmnlj3cf0r"; + rev = "9def990ba4c30409a316d5cbf7b02296a394dece"; + sha256 = "1ghivxwslvsbcimhhacbl07kxc1kfv7gn95fwsdx687p9qyffyfb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d8545191031bece15cf1706d81ad1d064f2a4bd/recipes/exec-path-from-shell"; @@ -20894,12 +21000,12 @@ expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "expand-region"; - version = "20161122.50"; + version = "20170213.616"; src = fetchFromGitHub { owner = "magnars"; repo = "expand-region.el"; - rev = "6dd45d90a59178191e71c10c438f89b495a6c4aa"; - sha256 = "1ac62z6a7xpj0ayc9v1is7avil6r5s8rlwx39ys922qw5y281q2w"; + rev = "d9435e3d0954e9b791001a36d628124cc520445e"; + sha256 = "0i4463821lhi3cid6y3v3milq0ckagbdc513xs5vv3ri44h91n57"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region"; @@ -21078,6 +21184,27 @@ license = lib.licenses.free; }; }) {}; + eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eziam-theme"; + version = "20170209.613"; + src = fetchFromGitHub { + owner = "thblt"; + repo = "eziam-theme-emacs"; + rev = "5580dad950d866ff0110c01480b02b792167b83d"; + sha256 = "06ww18igmy7v07gqgw6yn9qb8h76a8mwd43pyi25y615k48ilrg6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; + sha256 = "0iz3r4r54ai8y4qhnix291ra7qfmk8dbr06f52pgmz3gzin1cqpb"; + name = "eziam-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/eziam-theme"; + license = lib.licenses.free; + }; + }) {}; f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "f"; @@ -21198,12 +21325,12 @@ faceup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faceup"; - version = "20150215.1348"; + version = "20170126.1305"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "faceup"; - rev = "70fa6be83768adf78f20425d0d76fe809dc44d79"; - sha256 = "0sjmjydapfnv979dx8dwiz67wffamiaf41s4skkwa0wn2h4p6wja"; + rev = "688b487ad0a78c8707c5aded50e1d85551270034"; + sha256 = "1wmmj69wgzgac5y7gnrz84dvwjzd45h3rr434vv4dxnam0j0lj40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a10bf2928b93c3908e89ca8ad9649bb468ebca05/recipes/faceup"; @@ -21450,12 +21577,12 @@ fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; - version = "20161118.1128"; + version = "20170208.1012"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "fcitx.el"; - rev = "830fa2e665d7bcba8f7e7de754937c1ae6e9b60b"; - sha256 = "0qds4sqj9hppi5dfsfbpvba86fwigjprr75900rb50bb06ql4dqh"; + rev = "ec1d202c11a1c81f7ab0b9cf235d64c68d8e3134"; + sha256 = "1p32lqmnp7k0gck6my1cy4hd5sck28zkfvlg8q23lpkcg1vcsqlx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx"; @@ -21691,22 +21818,22 @@ license = lib.licenses.free; }; }) {}; - find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: melpaBuild { pname = "find-by-pinyin-dired"; - version = "20150202.216"; + version = "20170206.208"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "find-by-pinyin-dired"; - rev = "d049cc7f507a6f801c497a3d401b260300874f58"; - sha256 = "18a4ydp30ycx5w80j3xgghclzmzbvrkl2awxixy4aj68nmljk480"; + rev = "2c48434637bd63840fca4d2c6cf9ebd5dd44658f"; + sha256 = "0ial0lbvg0xbrwn8cm68xc5wxj3xgp110y2zgypkdpak8gkv8b5h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0aa68b4603bf4071d7d12b40de0138ecab1989d7/recipes/find-by-pinyin-dired"; sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq"; name = "find-by-pinyin-dired"; }; - packageRequires = []; + packageRequires = [ pinyinlib ]; meta = { homepage = "https://melpa.org/#/find-by-pinyin-dired"; license = lib.licenses.free; @@ -21714,10 +21841,10 @@ }) {}; find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "find-dired-plus"; - version = "20170101.938"; + version = "20170127.943"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/find-dired+.el"; - sha256 = "1ll1qr9kkx3fy0j7s5zz95gwsfj0j925cgkcs5ic5rds474881q0"; + sha256 = "1d0h5bcvk6x20apkvi8ywq961y9zvs4qj8p4n9n8yhm5sznrksyc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8f884334b7eb83647146e7e8be028935ba12ce/recipes/find-dired+"; @@ -21737,8 +21864,8 @@ src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "1c50ca72acd816c5d5b3fbdb605bbd85a0172b11"; - sha256 = "0nzn5bccxr8nsxqbc2gx17hrydbx511h4ba6bz3gaf78qfppn2ff"; + rev = "08ab38b89d21f528fa7dc18f860191365852959a"; + sha256 = "1ybv1scpf7578zfjpl71nynzydq8g5607ai6l0vavprdhri70xdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -22336,12 +22463,12 @@ floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; - version = "20160804.1135"; + version = "20170204.226"; src = fetchFromGitHub { owner = "Floobits"; repo = "floobits-emacs"; - rev = "da342a7389f2490cd51a057aff1b9272e023771f"; - sha256 = "04nciqgyjkg8ky8y60mcbdxmad6ygqr7q992azc7jh6iq0wyidfm"; + rev = "643dbefca9754765e6d0f88a8953dc3689f5f93f"; + sha256 = "1wh4y53vqi2zb03gxa2g2s14i280yqv0i7432ifi10v2qdwkilna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits"; @@ -22357,12 +22484,12 @@ fluxus-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }: melpaBuild { pname = "fluxus-mode"; - version = "20161124.1145"; + version = "20170210.1141"; src = fetchFromGitHub { owner = "defaultxr"; repo = "fluxus-mode"; - rev = "6670eeda008e2f0180e549624da708d5aa3599f6"; - sha256 = "1r2i88qv7zxcgccvyxpgq36ilsv3rdplx52pvd6kvfcw7whym205"; + rev = "3661d4dfdaf249138e7f215f15f291c9391ede8d"; + sha256 = "1dp974qs80agx9qcq5k5awdsr8p8smv8cdwkjz2d8xfd5wq2vhh9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3396e0da67153ad051b8551bf34630d32f974f4/recipes/fluxus-mode"; @@ -22441,12 +22568,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170112.1646"; + version = "20170212.1015"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "d0b058ecbfbf7f1d130aa46580cb77ac67a1fc9d"; - sha256 = "17x8na9wbclznr4rvvznpljizx6vaw4a8cvpk45c2mijwbh1bz2d"; + rev = "3943b4cc991eba2d6aff6ef085ab34915dc274ee"; + sha256 = "1n2rl1b7xca5vyk6x60q7v3xn55n7a971xcmzz10yqh28qxn6qlg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -22774,6 +22901,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-dialyxir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-dialyxir"; + version = "20170124.2319"; + src = fetchFromGitHub { + owner = "aaronjensen"; + repo = "flycheck-dialyxir"; + rev = "7e79dc33a12b8aded7a86d64d302072eed522cb4"; + sha256 = "1ylg8v1khh2bph6hscib7diw039z0nxfh28b9mhgyi6s33jyq618"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fa49551b8f726c235e03ea377bb09a8be37b9f32/recipes/flycheck-dialyxir"; + sha256 = "0pacxidpgwp7wij17c5r0fm5w3nga3lp4mcim365k3y5r4ralc0c"; + name = "flycheck-dialyxir"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-dialyxir"; + license = lib.licenses.free; + }; + }) {}; flycheck-dialyzer = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dialyzer"; @@ -22816,6 +22964,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-dogma = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-dogma"; + version = "20170124.2321"; + src = fetchFromGitHub { + owner = "aaronjensen"; + repo = "flycheck-dogma"; + rev = "7e14207a7da67dc5524a8949cb37a3d11de1db6e"; + sha256 = "1f3wn48am7920s6pm7ds1npfbj1w2pb8k790rl79rvc398g1pyyr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd7601c55206fd0b9b59f98e861c52b9d640278/recipes/flycheck-dogma"; + sha256 = "0mpmmz0ssdd3a4fnqzy5kf9r3ddcs9kcl0chhilkw5k8480j3dcy"; + name = "flycheck-dogma"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-dogma"; + license = lib.licenses.free; + }; + }) {}; flycheck-elixir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-elixir"; @@ -22879,22 +23048,22 @@ license = lib.licenses.free; }; }) {}; - flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; - version = "20161123.136"; + version = "20170207.605"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-flow"; - rev = "0748aa26a03437d36bf7083e6fc1af8f382dd1a3"; - sha256 = "1mmgahrq0v77i9w95jcg2n3aqqrvzd2s4w3b2mr70i23wq5y5wqy"; + rev = "090e89455b1f1dcb2de7a2f40c36d2a002417795"; + sha256 = "1vp2mswzxfd88i253l7mx5qj8x1h47fgvgy7dwi31xvp7vr40n6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow"; sha256 = "0p4vvk09vjgk98dwzr2qzldvij3v6af56pradssi6sm3shbqhkk3"; name = "flycheck-flow"; }; - packageRequires = [ flycheck ]; + packageRequires = [ flycheck json ]; meta = { homepage = "https://melpa.org/#/flycheck-flow"; license = lib.licenses.free; @@ -22942,27 +23111,6 @@ license = lib.licenses.free; }; }) {}; - flycheck-google-cpplint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: - melpaBuild { - pname = "flycheck-google-cpplint"; - version = "20140806.925"; - src = fetchFromGitHub { - owner = "flycheck"; - repo = "flycheck-google-cpplint"; - rev = "1d8a090861572258ab704915263feeb3a436c3d2"; - sha256 = "0l6sg83f6z8x2alnblpv03rj442sbnkkkcbf8i0agjmx3713a5yx"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b12055ef47479de776e9a1d59a0c4d2422e824cf/recipes/flycheck-google-cpplint"; - sha256 = "0llrvg6mhcsj5aascsndhbv99122zj32agxk1w6s8xn8ksk2i90b"; - name = "flycheck-google-cpplint"; - }; - packageRequires = [ flycheck ]; - meta = { - homepage = "https://melpa.org/#/flycheck-google-cpplint"; - license = lib.licenses.free; - }; - }) {}; flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-haskell"; @@ -23026,6 +23174,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-kotlin = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-kotlin"; + version = "20170122.337"; + src = fetchFromGitHub { + owner = "whirm"; + repo = "flycheck-kotlin"; + rev = "cbb9fbf70dbe8efcc3971b3606ee95c97469b1fe"; + sha256 = "0bxjx7xcpscv6vv4yxll8hh43aabv2dnrvkymb47jm3yvjr9cs1c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f158727cc8892aadba0a613dd08e65e2fc791b48/recipes/flycheck-kotlin"; + sha256 = "0vh4f3ap1ciddf2fvfnjz668d6spyx49xs2wfp1hrzxn5yqpnra5"; + name = "flycheck-kotlin"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-kotlin"; + license = lib.licenses.free; + }; + }) {}; flycheck-ledger = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-ledger"; @@ -23092,12 +23261,12 @@ flycheck-mix = callPackage ({ elixir-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-mix"; - version = "20160803.140"; + version = "20170118.630"; src = fetchFromGitHub { owner = "tomekowal"; repo = "flycheck-mix"; - rev = "c4e018c5a24e45c0ddc678547e73d5448dbde18b"; - sha256 = "0yz053xzs2vq0d2cxmizwsqx8l3mf4g6afg11qb297m3b081s6a7"; + rev = "76684d4b5987925b98b254aab656f8bf8198ab88"; + sha256 = "130ddx83h88krd64kss4z59lfrmdi3433r95939kqsqfmhzvgx0k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd2a4d71b7f4c0082b687a23fd367d55186625a9/recipes/flycheck-mix"; @@ -23236,22 +23405,22 @@ license = lib.licenses.free; }; }) {}; - flycheck-pkg-config = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + flycheck-pkg-config = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "flycheck-pkg-config"; - version = "20160610.1335"; + version = "20170209.1545"; src = fetchFromGitHub { owner = "Wilfred"; repo = "flycheck-pkg-config"; - rev = "6884b0636f4bfe5648d5f4e3db288b7643d91111"; - sha256 = "1b3b240hlr5jkfzbj814hiblp32r6bahqs1zjcj045pb7cg2cxxm"; + rev = "f615b9da412425f65f2818e26970412a7736b178"; + sha256 = "02if6mjxjlbgdsfzgmbn7j65c3zrszr92mnpydbbksg1abqr7146"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b2e88f2f126c9ff8b4261d6adb4c0d8d3049f33/recipes/flycheck-pkg-config"; sha256 = "0w7h4fa4mv8377sdbkilqcw4b9qda98c1k01nxic7a8i3iyq02d6"; name = "flycheck-pkg-config"; }; - packageRequires = [ cl-lib dash s ]; + packageRequires = [ dash s ]; meta = { homepage = "https://melpa.org/#/flycheck-pkg-config"; license = lib.licenses.free; @@ -23470,12 +23639,12 @@ flycheck-swift = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift"; - version = "20160921.1921"; + version = "20170128.2149"; src = fetchFromGitHub { owner = "swift-emacs"; repo = "flycheck-swift"; - rev = "822d1415eabfd464adc52063f9c44da1c87f0ff9"; - sha256 = "0gf7cxrsrf62kamm4xy1fi4v264szm6qk607ifg4bi5dmdc10b0k"; + rev = "c6c416a1b7a7d346e5c040e4e4065abc68d3a844"; + sha256 = "0wa60i99jh0dsks30jssg7l17bcmr6jzkwmkjg8brl756p593zp5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd99bea06079c4231363c37e3361bd9e5b1ba490/recipes/flycheck-swift"; @@ -23911,16 +24080,16 @@ flymake-lua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flymake-lua"; - version = "20140310.230"; + version = "20170128.1754"; src = fetchFromGitHub { owner = "sroccaserra"; - repo = "emacs"; - rev = "ee23c427a8eb01773c87e215d0e61cd8b5b5fe76"; - sha256 = "1fz7kywp1y2nhp50b2v961wz604sw1gzqcid4k8igz9aii3ygxcv"; + repo = "flymake-lua"; + rev = "84589f20066921a5b79cf3a1f914a223a2552d2a"; + sha256 = "1f4nigl65g1g5w15ddf33ypk2b07xph964pkdq1bw81451vmvzhn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/eece02633c870db4aacd7b0cd2b7f2424fa3f192/recipes/flymake-lua"; - sha256 = "0pa66ymhazcfgd9jmxizq5w2sgj008hph42wsa9ljr2rina1gai6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/63889df90a8cd4a39871cc43ccc559eff7b8dd5f/recipes/flymake-lua"; + sha256 = "05q6bifr1ywirk6sdn0pr812nlrzsi79bpbgn6ay4jyzmhhfi9z0"; name = "flymake-lua"; }; packageRequires = []; @@ -24226,12 +24395,12 @@ flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct"; - version = "20161031.1134"; + version = "20170213.700"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; - sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; + rev = "1e19a2b506470e8d741b521da0bd9b66214256f3"; + sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct"; @@ -24251,8 +24420,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; - sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; + rev = "1e19a2b506470e8d741b521da0bd9b66214256f3"; + sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm"; @@ -24272,8 +24441,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; - sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; + rev = "1e19a2b506470e8d741b521da0bd9b66214256f3"; + sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy"; @@ -24293,8 +24462,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; - sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; + rev = "1e19a2b506470e8d741b521da0bd9b66214256f3"; + sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup"; @@ -24391,6 +24560,27 @@ license = lib.licenses.free; }; }) {}; + fn = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fn"; + version = "20170209.1804"; + src = fetchFromGitHub { + owner = "troyp"; + repo = "fn.el"; + rev = "2842e3c6d1b5c96184fa638c37b25ce5b347a1a6"; + sha256 = "0kxpy87f44gkfzrnhcrprca0irkpddpbw7wbrm4aidw0synpab91"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6d2929604b6dd21d6cf425643927a9c216801dc1/recipes/fn"; + sha256 = "0cb98rxdb6sd0kws6bc4pa536kiyw3yk0hlfqcm3ps81hcgqjhhn"; + name = "fn"; + }; + packageRequires = [ cl-lib dash dash-functional emacs ]; + meta = { + homepage = "https://melpa.org/#/fn"; + license = lib.licenses.free; + }; + }) {}; focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "focus"; @@ -24556,15 +24746,36 @@ license = lib.licenses.free; }; }) {}; + font-lock-profiler = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "font-lock-profiler"; + version = "20170208.1208"; + src = fetchFromGitHub { + owner = "Lindydancer"; + repo = "font-lock-profiler"; + rev = "6e096458416888a4f63cca0d6bc5965a052753c8"; + sha256 = "186fvyfbakz54fr8j1l7cijvaklw96m1hfbjyw7nha08zc2m1hw5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b372892a29376bc3f0101ea5865efead41e1df26/recipes/font-lock-profiler"; + sha256 = "089r74jgi5gwjk9w1bc600vkj0p5ac84rgcl7aqcpqfbh9ylwcp9"; + name = "font-lock-profiler"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/font-lock-profiler"; + license = lib.licenses.free; + }; + }) {}; font-lock-studio = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "font-lock-studio"; - version = "20141201.1658"; + version = "20170127.1251"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "font-lock-studio"; - rev = "35d510e4b16939621d7200bf67021f773cdb4ae5"; - sha256 = "04n32rgdz7m24jji8p0j42zmf2r60sdbbr4mkr6435fqyvmdd20k"; + rev = "12c35967b31233e06946c70627aa3152dacfe261"; + sha256 = "0q0s6f5vi3sfifj7vq2nnsmgyyivp1sd3idk32858md5ri71qif0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8046fef1ac09cac1113dd5d0a6e1bf8e0c77bb1/recipes/font-lock-studio"; @@ -24622,12 +24833,12 @@ forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forecast"; - version = "20170109.859"; + version = "20170202.1427"; src = fetchFromGitHub { owner = "cadadr"; repo = "forecast.el"; - rev = "1bae400e5154d7494fd989b1be47450565810e23"; - sha256 = "0kcyn2m122wbbsp7mwji5acsrdfdkfpf427zj6dn88rfx90q82w2"; + rev = "975bf79f16f2c653466315669f4a26f85be0eaa3"; + sha256 = "0vq0fafll0j2k0f9b0rbzbyg6jxp3sba0nq5bqx0l3mjfvlg0x4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast"; @@ -24748,12 +24959,12 @@ forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forth-mode"; - version = "20170101.1245"; + version = "20170208.2305"; src = fetchFromGitHub { owner = "larsbrinkhoff"; repo = "forth-mode"; - rev = "05e8a027960c77ac5a09bda959889de57ecbb486"; - sha256 = "1s0543dc69ciz6ll7m62kaac92jmpk9yqaa37jrv5lscrp6sgamz"; + rev = "45650c28a2cdc149a4480d5ea754758c75f8eb01"; + sha256 = "14p0qygs2ng0jq7hqnhq3za52pzs8gv8qr75a6ic0irh21mvspzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode"; @@ -24853,10 +25064,10 @@ frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }: melpaBuild { pname = "frame-cmds"; - version = "20170101.950"; + version = "20170207.1045"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/frame-cmds.el"; - sha256 = "0yscijwwm31551ysagysdrryr1w33kg34j3bnrq92mxsmb6i19ad"; + sha256 = "05mdds242vcav9gy15phvlk9q8iy29wnc8bp0c7i6z6bblairfzj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-cmds"; @@ -24926,6 +25137,27 @@ license = lib.licenses.free; }; }) {}; + frames-only-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "frames-only-mode"; + version = "20170129.120"; + src = fetchFromGitHub { + owner = "davidshepherd7"; + repo = "frames-only-mode"; + rev = "5a2947d797a5d6f74d3a9c97f8c0ab6cff115b28"; + sha256 = "0y0sdjixaxvywrlp2sw51wnczhk51q1svl5aghbk9rkxpwv9ys9v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; + sha256 = "17p04l16ghz9kk096xk37yjpi4rmla86gp7c8ysjf6q6nyh0608h"; + name = "frames-only-mode"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://melpa.org/#/frames-only-mode"; + license = lib.licenses.free; + }; + }) {}; framesize = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: melpaBuild { pname = "framesize"; @@ -25063,12 +25295,12 @@ fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fstar-mode"; - version = "20170112.1727"; + version = "20170210.1336"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "3a9be64827bbed8e34d38803b5c44d8d4f6cd688"; - sha256 = "0manmkd66355g1fw2q1q96ispd0vxf842i8dcr6g592abrz5lhi7"; + rev = "26ac5bb8fe1cafbf2bd09ef8a528af506c2caf8a"; + sha256 = "0gbcwj36ns34xqgjp6pxml6zn8kza080gyyf383vhqqfqp640vqj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode"; @@ -25087,8 +25319,8 @@ version = "20170107.626"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "0701902122308f376dab4f2a4371600ddc05ae3e"; - sha256 = "0ahjhr7bmmpkvqxmr0m8c3agaiffqg8p6h5xnbjv93ar6ajk2pz9"; + rev = "e826546c6d33ff02048b3652cc64058dde819f1c"; + sha256 = "1pgpmsyxilsqwjr57zd1afzr33fq0nnahx8ppih6pqnfza97008s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -25101,6 +25333,27 @@ license = lib.licenses.free; }; }) {}; + fuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "fuff"; + version = "20170202.703"; + src = fetchFromGitHub { + owner = "joelmo"; + repo = "fuff"; + rev = "278e849913df87bd8756c59382282d87474802c3"; + sha256 = "12s25c0abvghkhfbxcf77d2dc20y3xn9df7mfk8mkfwnlwdss2ga"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4d0fc6d19559a9ea1bb7fce0c26a2dd65fc71603/recipes/fuff"; + sha256 = "080a2lz6mv629c68z44qrrww080gy2iggfzajdq54rr8i23y14vf"; + name = "fuff"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://melpa.org/#/fuff"; + license = lib.licenses.free; + }; + }) {}; full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "full-ack"; @@ -25287,12 +25540,12 @@ fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "fxrd-mode"; - version = "20160503.1345"; + version = "20170125.228"; src = fetchFromGitHub { owner = "msherry"; repo = "fxrd-mode"; - rev = "a7f31eed83e889279681ba9d872f88bf86969011"; - sha256 = "1m8zgwcfl0i3yizx01ikxjhhqm1nj74q35fs3d32z9fkk5h21m2d"; + rev = "8a1a0d5a08527ec8dee9bbe135803ed7ad297d9d"; + sha256 = "1yzw0fnlqilpx4xl84hpr75l86y9iiqyh13r1hskmwb79s2niw1m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode"; @@ -25350,12 +25603,12 @@ gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "20170108.35"; + version = "20170121.203"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "ce7014cb298f01ff96f52cba38fc7714daa7d5a6"; - sha256 = "1cz4sn325fy87xs6zs5xg6l9vsq06hsf4aksn87vg4mdnkj53xym"; + rev = "e8100f9694c1b85c12ed57d89f7efe408b9f933f"; + sha256 = "14d6iiy2dk93ani1d3vm57nsd3pn170fk8brs5v7jpf1sqszjihw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; @@ -25432,12 +25685,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "20170103.448"; + version = "20170125.1937"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "b6379dd479f28b2ace418e2cc57d30559f634036"; - sha256 = "0x97xqk9xs6h1h3jqwkwi7q32j4pzw0rygsqmgb3n80l7zja6114"; + rev = "cf0a28c1f43c2d01f4b4a408de4f7a915b11076e"; + sha256 = "1hkdch2pj6vbj3j4hfazn2dvfhsgilqqn5r8m7ipj8sw1598rv0r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -25495,12 +25748,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20170116.1834"; + version = "20170201.1455"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "46b4c82278029d7193176b72ed3f0d3b1fa8899a"; - sha256 = "16hvw10xg3nd8scybn95szppa1p5v30hdawxl1wzvafnfz83yf2r"; + rev = "166593c68b66276e36c7d91a9653bb1c44650afc"; + sha256 = "0r7m1blswgkm8zkb703ksa74jy296i1vj4rfq5lw2f4ixdvkyq2h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -25516,12 +25769,12 @@ general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20161203.1641"; + version = "20170202.1509"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "11f21c9c53091bc538652f1448e75557ad526b9c"; - sha256 = "0pyyvab0l5xbkm4w9sc34g68vz56qsy8fkhj5nh00rigwi9pcsla"; + rev = "b626fae4f0fbf2ec2bf7df850dd1c8ad15e70b65"; + sha256 = "1p9kwh9yadai0ijn98rag0sln18fj9ciy51p88967bgvbx1rx8x3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -25688,8 +25941,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "e20bb704f61776926ce1d7d3852b54b76dd43644"; - sha256 = "085ym61ll1ixk7lp3kxcp7aryf6ih9nqkx1nbm93i5asb4h8v996"; + rev = "084688bb357d42e2459fdd381da2fea17ffc96ea"; + sha256 = "1n3rcmrv7mbi5h0s0b527kx358k7wl2s0rgnrvavbv392jf08890"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -25772,8 +26025,8 @@ src = fetchFromGitHub { owner = "javaguirre"; repo = "ghost-blog-emacs"; - rev = "19c2f62da87c756ff080a235bf1b115c88d499ba"; - sha256 = "1br27p8kqnj6gfii6xp37yd3rja876vhpcf784n98qhnkd7a63q1"; + rev = "d4e66d114ff7b846b967af4cff64dcafa381ead3"; + sha256 = "174swf066vcf99g38c9x5lxp14fyh59cy9lriywhm6hk7mcaakng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b589edfacb807fb17936e139499bdd9673dad94/recipes/ghost-blog"; @@ -25894,12 +26147,12 @@ git-annex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-annex"; - version = "20160215.1111"; + version = "20170120.931"; src = fetchFromGitHub { owner = "jwiegley"; repo = "git-annex-el"; - rev = "e61ef24f22c74dff4b64235191414c98d60aa11a"; - sha256 = "0d2blcnyqd1br7zhwprdxpx2jphjhsb4jgaw9dr4gvv0xdb2sr87"; + rev = "d574b9d9e264167245e49bb96b000988a83af259"; + sha256 = "0c1hqff1g1ahaqalfdp09g7qk852bj83dcwd94q3wwmnsy1mf493"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c91e16bb9e92db9dc9be6a7af3944c3290d2f14/recipes/git-annex"; @@ -25961,8 +26214,8 @@ src = fetchFromGitHub { owner = "10sr"; repo = "git-command-el"; - rev = "a2c192aa779f81a99a10f0eb6dd018f13b2ff949"; - sha256 = "1irqmypgc4l1jlzj4g65ihpic3ffnnkcg1hlysj7qpip5nbflqgl"; + rev = "dce465ca1cd80e16df0f8dce8e427a76e9edc3b7"; + sha256 = "0nnh5y0px7aa9yai9f149v7pjcjp7i3f35cfihs9n3r6bnrmgp4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55d697bc95a7026c7788c13e4765e1b71075e3/recipes/git-command"; @@ -25978,12 +26231,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20170112.334"; + version = "20170128.745"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "875f913b8edfdd85dfdaba9403a9d5ae2b952afc"; - sha256 = "04cdbv8xqhbzqx1lzcm0n2s80b25mp9s6izzflv88qzpcc0z6wv2"; + rev = "1643dc626ab28fd28eff8a94272f0f4fba8e2737"; + sha256 = "0fank75arc9bwndpv87jli7cadbh2dgka42m0nc5lqldykflnfd7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -26020,12 +26273,12 @@ git-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-dwim"; - version = "20100718.1436"; + version = "20170126.414"; src = fetchFromGitHub { owner = "rubikitch"; repo = "emacs-git-dwim"; - rev = "ad488a48551f57fd2b36fdf59fe2c27c73aca2d9"; - sha256 = "12k0bh0mrwlkrsfhc0pm9b1xvdks20smarsmvzg4zi5060ds1pzg"; + rev = "485c732130686c2f28a026e385366006435394b9"; + sha256 = "0rcrsjx4ifa9y3rd5l4498kvqkh58zx21gl7mqp053jdsqqq1yrx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/git-dwim"; @@ -26251,12 +26504,12 @@ gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitattributes-mode"; - version = "20160319.302"; + version = "20170118.1613"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9da8cac8ea6cc07626565b5ede9aedae133b4d6a"; - sha256 = "0jzl1bpnf8rsjwcp8aiwsi8bbs1fd2sp5mzzydvi7hzjvyahvyd0"; + rev = "0be857ef001adb9b58770bd4e70d3103d2557277"; + sha256 = "0b7c0dkrm7szvk83945ribdj5k9mxs7pmbillgh2b51rsrkk16rz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode"; @@ -26297,8 +26550,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9da8cac8ea6cc07626565b5ede9aedae133b4d6a"; - sha256 = "0jzl1bpnf8rsjwcp8aiwsi8bbs1fd2sp5mzzydvi7hzjvyahvyd0"; + rev = "0be857ef001adb9b58770bd4e70d3103d2557277"; + sha256 = "0b7c0dkrm7szvk83945ribdj5k9mxs7pmbillgh2b51rsrkk16rz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode"; @@ -26423,8 +26676,8 @@ src = fetchFromGitHub { owner = "jakoblind"; repo = "github-pullrequest"; - rev = "9ccdeea36b2cb78f0bd2907cb45d1ab287a6af90"; - sha256 = "12j81h095rsfqbways4hm9wdr91wwc31b8hr1my55m91r204b9r4"; + rev = "6ae5c38b0fc15b638b5ba4490112d9822ce5e267"; + sha256 = "1yr7v2wdrvwb1slks83bbh857qq1n207rdk48y8qwlcxbk4ygdr6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dca88ef598d676661abea79cdbc41bad6dd28be/recipes/github-pullrequest"; @@ -26486,8 +26739,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9da8cac8ea6cc07626565b5ede9aedae133b4d6a"; - sha256 = "0jzl1bpnf8rsjwcp8aiwsi8bbs1fd2sp5mzzydvi7hzjvyahvyd0"; + rev = "0be857ef001adb9b58770bd4e70d3103d2557277"; + sha256 = "0b7c0dkrm7szvk83945ribdj5k9mxs7pmbillgh2b51rsrkk16rz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode"; @@ -26503,12 +26756,12 @@ gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: melpaBuild { pname = "gitlab"; - version = "20161013.604"; + version = "20170120.22"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "2efdc9bc2f572fceb11199cecdd04aae03df3cb0"; - sha256 = "0pxmmgsrn5d2jmak3plwb6h15h2d4sbwk49q6gdniglcf9nagckq"; + rev = "9b14a972093b12e3a5d210370592e71df7f0d1e1"; + sha256 = "03bb6jw0f6l1wi1bl8ynb0k5rnk2rfnrhzc2qp5anmlxzy3qglc8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab"; @@ -26549,8 +26802,8 @@ src = fetchFromGitHub { owner = "xuchunyang"; repo = "gitter.el"; - rev = "6e92491ddb7079f868ffcc07d69bc82ef35d7d2b"; - sha256 = "16hnw8bcbbnwzw9mbb98icri7q7zl39b60r9gn5gr3bxaarbh9dl"; + rev = "3ff1c72ee85be4e3b648b4c52b0638129f3cf7a6"; + sha256 = "19vd81pdjjbmiq3md1052x1lf43c8q9pfpq2b8lrdpz6qaphk6f6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8076c3b4d60e4c505bb6f4e426ecc4f69d74684/recipes/gitter"; @@ -26734,12 +26987,12 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20170111.804"; + version = "20170123.248"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "40c591698f04a9f1563a6ff969d3ea3acea43abb"; - sha256 = "0ns8vp4vi225q9vd2alvw9yihdvbnmcm5rr5w31hi9d0b6figqfs"; + rev = "ffa5fec15971ccec0b19f759c9191cac9ee851eb"; + sha256 = "0hlzdvm7d0r9jh4cv9ff1wdjyfffr2417kkq0mlbv0bvqczwdd8b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -26818,12 +27071,12 @@ gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }: melpaBuild { pname = "gnus-desktop-notify"; - version = "20170104.1240"; + version = "20170208.546"; src = fetchFromGitHub { owner = "wavexx"; repo = "gnus-desktop-notify.el"; - rev = "6eea368514eb38bc36aee0bc5d948a214784a90c"; - sha256 = "1bakg8maf626r9q8b8j022s63gip90qpz97iz4x7h3s9055i1dxr"; + rev = "8fd980c4a4ba18085ec87a2f0c71875c5d01087f"; + sha256 = "00zh5v24pxkfg240z6c5y9ngsn6rnvmxphiilf84bxxpwn030brk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify"; @@ -27022,22 +27275,22 @@ license = lib.licenses.free; }; }) {}; - go-eldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: + go-eldoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-eldoc"; - version = "20161012.616"; + version = "20170211.721"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-eldoc"; - rev = "ecf71a75ccfac7f9bc6fac64ef536f2ffb56b3bf"; - sha256 = "1q3l8x7qlcblxy0h4j48hzqjx90c14qh7nzbk8gds3ff2yrxy2kl"; + rev = "f9c6e25419c2d13f3841050ba66610a7ac728f49"; + sha256 = "033md85r3y5gxvw458l125d0jxc3k8yfn5im22zi64rrbwlwkifx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ce1190db06cc214746215dd27648eded5fe5140/recipes/go-eldoc"; sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk"; name = "go-eldoc"; }; - packageRequires = [ cl-lib go-mode ]; + packageRequires = [ emacs go-mode ]; meta = { homepage = "https://melpa.org/#/go-eldoc"; license = lib.licenses.free; @@ -27092,8 +27345,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "d9647672717bb5d507de42975a337c738a0461a3"; - sha256 = "18x01y9qlqmpvyl638ymc1ml6j33xgc0xhig6qfx0y7s484zblm8"; + rev = "5737e59cbac9bc480546766c9502c527fa2be26f"; + sha256 = "089w4qibcxj6x1ssq9c6pwsibrr3dih9k343ncxavhyqvyf9irxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; @@ -27109,12 +27362,12 @@ go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-impl"; - version = "20161225.1819"; + version = "20170125.752"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-impl"; - rev = "5d2037e16cf354abffba68fb9ea86790e0be5eb3"; - sha256 = "1b1628z1rlb2varxk3svwm13s5x6db0503q4d0yb3kk7hk38wpm8"; + rev = "69f0d0ef05771487e15abec500cd06befd171abf"; + sha256 = "1rmik6g3l9q1bqavmqx1fhcadz4pwswgfnkbaxl6c5b6g2sl26iq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl"; @@ -27130,12 +27383,12 @@ go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; - version = "20161231.1134"; + version = "20170206.1507"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "d9647672717bb5d507de42975a337c738a0461a3"; - sha256 = "18x01y9qlqmpvyl638ymc1ml6j33xgc0xhig6qfx0y7s484zblm8"; + rev = "5737e59cbac9bc480546766c9502c527fa2be26f"; + sha256 = "089w4qibcxj6x1ssq9c6pwsibrr3dih9k343ncxavhyqvyf9irxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -27151,12 +27404,12 @@ go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }: melpaBuild { pname = "go-playground"; - version = "20161227.1105"; + version = "20170211.2"; src = fetchFromGitHub { owner = "grafov"; repo = "go-playground"; - rev = "8365cac2f5bc2a71c454fe60856da0f97745ef65"; - sha256 = "1pb5k05x02ccfk52rj97wbf5q2wrcrs60h7ds9j5ri4r1v6baflq"; + rev = "70437bc4348ef252e4788f867c86622aff670f91"; + sha256 = "1mvldim8igbrnff80h0x7570bhhxa0pli84888wfylks30r9kg5x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground"; @@ -27218,8 +27471,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "d9647672717bb5d507de42975a337c738a0461a3"; - sha256 = "18x01y9qlqmpvyl638ymc1ml6j33xgc0xhig6qfx0y7s484zblm8"; + rev = "5737e59cbac9bc480546766c9502c527fa2be26f"; + sha256 = "089w4qibcxj6x1ssq9c6pwsibrr3dih9k343ncxavhyqvyf9irxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; @@ -27428,8 +27681,8 @@ src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "206c0f020eba0f7fbcfbc467a5eb808037df2ed6"; - sha256 = "11ygf8hswvc9rj6jp7zn8wyjlraw9qrl072grn2h4s1flblpxp53"; + rev = "b8599f7d71e7fead76b25aeb919c0e2558672f4a"; + sha256 = "0dlai5893607dirgwiw39zfmmp3iaswayym4gc1m4p7v9pvl7hx9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; @@ -27655,12 +27908,12 @@ gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gotham-theme"; - version = "20161022.848"; + version = "20170210.151"; src = fetchFromGitHub { owner = "wasamasa"; repo = "gotham-theme"; - rev = "223f3771d84f2d5a9f20390e496cecc529f769d6"; - sha256 = "0y28gqmnvbagnv9qp7173bylkbl4sgpy8szzn1s9q46fjysdj8b8"; + rev = "a5bfe13e7bba81d25b32d836c0b870e8f3f6c463"; + sha256 = "02hb0znxwbxlkchlkya4j6hm6p1djza6ajij6d94a7p13dnpmygb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme"; @@ -27736,12 +27989,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20170107.2101"; + version = "20170213.1516"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "733acc9e4cb9ce9e867734f298fdfc89ab05f771"; - sha256 = "0jna5a3w8nr819q3rwcagbin75dk9drgyy04z5b3m8k2rpxyikwm"; + rev = "9bda6c3e3d4e1a477092cf2967ddbe5195cb7833"; + sha256 = "1shdh2hx6vildj8daqivy7227ywf7arz1wy2hzk46dck6q58w9ls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -27778,12 +28031,12 @@ grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grab-mac-link"; - version = "20160625.2258"; + version = "20170211.619"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "grab-mac-link.el"; - rev = "e5a720d6aa173939c35cab836a31651b184c11e6"; - sha256 = "0pas60sib23vv1gkprp10jzksgchl5caqj565akg358a0iay7ax4"; + rev = "e47faf9c190d694b8b19b99bc919db98e51e67d8"; + sha256 = "1hkyd8mr2rrvkrm2rqmi2yb2way05jkxj3l6z3d8026l88rwiddy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link"; @@ -27904,12 +28157,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "20160922.640"; + version = "20170118.2148"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "14ec10937720bc91bb2f5e1c1e2c124d8a43a9d6"; - sha256 = "03990wbrc56sm4qzc2nsjj3q96vx1ipjivdhqfy8s6sy9r1msa86"; + rev = "c0884bfe0b2df8d6279cabd5ef6c521aaf7c0897"; + sha256 = "1cn3i4kp5pjiaq96svam3xn1s33lpysnzk77vq25wp65vz9jpbcg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -28080,6 +28333,27 @@ license = lib.licenses.free; }; }) {}; + green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "green-screen-theme"; + version = "20170209.1208"; + src = fetchFromGitHub { + owner = "rbanffy"; + repo = "green-screen-emacs"; + rev = "e47e3eb903b4d9dbcc66342d91915947b35e5e1e"; + sha256 = "0gv434aab9ar624l4r7ky4ksvkchzlgj8pyvkc73kfqcxg084pdn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme"; + sha256 = "0a45xcl74kp3v39bl169sq46mqxiwvvis6jzwcy6yrl2vqqi4mab"; + name = "green-screen-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/green-screen-theme"; + license = lib.licenses.free; + }; + }) {}; gregorio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gregorio-mode"; @@ -28348,6 +28622,27 @@ license = lib.licenses.free; }; }) {}; + guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, typo }: + melpaBuild { + pname = "guess-language"; + version = "20170213.330"; + src = fetchFromGitHub { + owner = "tmalsburg"; + repo = "guess-language.el"; + rev = "c0a9cd33d8233e2e0cd62b28fdb7128945b3de99"; + sha256 = "0jlhk8vqxhsjvrf5iln9rii8vcvcaz247cpk51fymy5sh4dbc5sw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language"; + sha256 = "1p8j18hskvsv4pn3cal5s91l19hgshq8hpclmp84z9hlnj9g9fpm"; + name = "guess-language"; + }; + packageRequires = [ cl-lib emacs typo ]; + meta = { + homepage = "https://melpa.org/#/guess-language"; + license = lib.licenses.free; + }; + }) {}; guide-key = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin, s }: melpaBuild { pname = "guide-key"; @@ -28393,12 +28688,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170114.133"; + version = "20170131.1037"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "2794ab96de95fae8aad12c33ff1726d5348cae7b"; - sha256 = "0cj5mlshh76m3fmnzxjyrq8kw0y22qvcd9wjqwkg392jw9s5kaqc"; + rev = "fbb16f39951dbcb1f185cd24b07063e166a1cc2d"; + sha256 = "1pwq9yipycgn3v32yiz8r59g02z5l9hsab8ng3zbgrv42ivddd2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -28498,12 +28793,12 @@ habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "habitica"; - version = "20161001.1122"; + version = "20170203.2122"; src = fetchFromGitHub { owner = "abrochard"; repo = "emacs-habitica"; - rev = "e0fba32899da6bd0484b1b820578184d5764ec5b"; - sha256 = "1vch1m605m5nxga08i49fga6ik2xxf3n6pibhr6q9wj59zv515hi"; + rev = "9b42651888c4b75e1d6f9df41d138ce6e77acbcc"; + sha256 = "1jrvjk8ccf47945liwz24xqvdaqm6zch1kb4cahgm4pp8m9hdcgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica"; @@ -28516,6 +28811,27 @@ license = lib.licenses.free; }; }) {}; + hacker-typer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hacker-typer"; + version = "20170206.720"; + src = fetchFromGitHub { + owner = "therockmandolinist"; + repo = "emacs-hacker-typer"; + rev = "d5a23714a4ccc5071580622f278597d5973f40bd"; + sha256 = "13wp7cg9d9ij44inxxyk1knczglxrbfaq50wyhc4x5zfhz5yw7wx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8e04a3a1606ea23865c04d93e3dc77cb55b9931f/recipes/hacker-typer"; + sha256 = "128y562cxi8rblnqjdzhqc6b58bxi67f6hz569gqw4jywz0xcd0g"; + name = "hacker-typer"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/hacker-typer"; + license = lib.licenses.free; + }; + }) {}; hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; @@ -28624,12 +28940,12 @@ haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "haml-mode"; - version = "20170104.2224"; + version = "20170208.28"; src = fetchFromGitHub { owner = "nex3"; repo = "haml-mode"; - rev = "813530d171b233a42f52b97958f1245e1a09c16a"; - sha256 = "0ylpw01g0mwk61rjlv8wc8bqh5y2xh2s7s8avfvcc689hafp7c2j"; + rev = "e232abdb908d92a1a346ee1a7671d4a3121310c5"; + sha256 = "1qqwh28rf94pfcvazs0fl4yjz430aw6sadf07i4r408lq6r089dx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode"; @@ -28855,12 +29171,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170116.407"; + version = "20170210.1038"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "6f729159ea21997f629473652266dcd32dcba523"; - sha256 = "0hmynqg4qv10w2s4wlh3k1ignzxspqfr67860xy9g7vyyifyrhqj"; + rev = "0f8eabf8c633df2539a158108a7c9083f894970f"; + sha256 = "0a3iqsq6pdsifylydk1wqrf45y5j9r86imh5pac15r2p0xqg6p46"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -29123,12 +29439,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170116.2331"; + version = "20170211.2302"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "bc2bfb3017f327a5307e7c46be27d1b614b3e90d"; - sha256 = "1jfdbbzv6prxkiz9hxvyjfgdbzb9yzf8g71nny0xcfm76r18vrwi"; + rev = "fdc277116bcc57917a17838a388d880f7c7ea83b"; + sha256 = "0s0qnwx8sm4dm0hgn70433rvkqw7144a3pvsk3yli56crvdpxvi4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -29207,12 +29523,12 @@ helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag"; - version = "20161203.523"; + version = "20170209.745"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "997107a53abd3bda06d52e7021c87527c5747389"; - sha256 = "1fj2s5jfbaw948kww64k8ksxa6pxfpb30fx93x182bq6sl8fqlwg"; + rev = "39ed137823665fca2fa5b215f7c3e8701173f7b7"; + sha256 = "0a6yls52pkqsaj6s5nsi70kzpvssdvb87bfnp8gp26q2y3syx4ni"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -29333,12 +29649,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20170103.1125"; + version = "20170124.940"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "8735714d6be62187538ffd9187e8aee87b49b969"; - sha256 = "19sqp3789a9w0nm48rb2yjj5bhllpilrvbljp8h8nsv3nlf5dz84"; + rev = "6a6cef0668b86c88e629a817e1d13c4be45ad62a"; + sha256 = "0wsh8b0m094di1bxm2vdnrdqhix1a1wcd5nj2crra678d70ad9g9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -29459,12 +29775,12 @@ helm-c-yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, yasnippet }: melpaBuild { pname = "helm-c-yasnippet"; - version = "20160823.611"; + version = "20170128.742"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "helm-c-yasnippet"; - rev = "5bf2c2adc0afe38c17c7cbf8c5d8a0604c4ee51f"; - sha256 = "1yb4swbx1i90fbfhkcvbvqvnbbfing7cgxz1dcyfbnazkdlfryhh"; + rev = "65ca732b510bfc31636708aebcfe4d2d845b59b0"; + sha256 = "1cbafjqlzxbg19xfdqsinsh7afq58gkf44rsg1qxfgm8g6zhr7f8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2fc20598a2cd22efb212ba43159c6728f0249e5e/recipes/helm-c-yasnippet"; @@ -29522,12 +29838,12 @@ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }: melpaBuild { pname = "helm-cider"; - version = "20170115.1740"; + version = "20170209.2316"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "d678f1346331f12bdb6fe95536608fb3e94b2f70"; - sha256 = "0gmi23yx8l85923y0arm7v0v9zgspbp6gkb8a8jmnl5z2akqpzgh"; + rev = "8e092d0d2e9cf27195296c684b4fab831208b98a"; + sha256 = "081wkmp4mcdszyirgifdn4qzpvc9bz3qkvwnlp0c9jzimkizpgsl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider"; @@ -29606,12 +29922,12 @@ helm-cmd-t = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-cmd-t"; - version = "20150823.1157"; + version = "20170125.659"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-cmd-t"; - rev = "684dfb764e0e3660c053cb465f115e21c5ee4f80"; - sha256 = "18d2fgxyij31rffh9qbgbaf42par9nami4pi1yfvbw9a5z5w2yxi"; + rev = "7fa3d4a9f7271512e54c5de999079b27c9eec6bf"; + sha256 = "06jdvkgnmwrgsdh9y2bwzdng7hy4331v3lh11jvdy4704w4khmak"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/helm-cmd-t"; @@ -29690,12 +30006,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170116.2331"; + version = "20170210.5"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "bc2bfb3017f327a5307e7c46be27d1b614b3e90d"; - sha256 = "1jfdbbzv6prxkiz9hxvyjfgdbzb9yzf8g71nny0xcfm76r18vrwi"; + rev = "fdc277116bcc57917a17838a388d880f7c7ea83b"; + sha256 = "0s0qnwx8sm4dm0hgn70433rvkqw7144a3pvsk3yli56crvdpxvi4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -29820,8 +30136,8 @@ src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-describe-modes"; - rev = "74e086a2462fc64234dd0222cde3c5c060a60068"; - sha256 = "01kwh3f8hxacvjk5vva084jd4f55jlg8f8aa9hmcirif7r7pdidi"; + rev = "11fb36af119b784539d31c6160002de1957408aa"; + sha256 = "1d5b85m33hsdb4wswh9wpid0ghsr2zrj3f6ky587lc32s4bs0w0z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23f0b2025073850c477ba4646c3821b3c7de6c42/recipes/helm-describe-modes"; @@ -30089,12 +30405,12 @@ helm-flyspell = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-flyspell"; - version = "20160927.1648"; + version = "20170210.1101"; src = fetchFromGitHub { owner = "pronobis"; repo = "helm-flyspell"; - rev = "5aeace7004cbb689276fb5056a9935d27593ce8c"; - sha256 = "1jnphdmh6j252bgyxw5jl01wkfwnjrv2j7isnq40xnqs4azjwz80"; + rev = "8d4d947c687cb650cb149aa2271ad5201ea92594"; + sha256 = "0q0xcgg8w9rrlsrrnk0l7qd8q7jc6x1agm2i769j21wpyfv1nbns"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c5b91762d47a4d3024f1ed7f19666c6f2d5ce5/recipes/helm-flyspell"; @@ -30278,12 +30594,12 @@ helm-gitignore = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, gitignore-mode, helm, lib, melpaBuild, request }: melpaBuild { pname = "helm-gitignore"; - version = "20150517.2056"; + version = "20170210.1608"; src = fetchFromGitHub { owner = "jupl"; repo = "helm-gitignore"; - rev = "03aad6edb0ed4471c093230856f26719754e570b"; - sha256 = "0pd755s5zcg8y1svxj3g8m0znkp6cyx5y6lsj4lxczrk7lynzc3g"; + rev = "2a2e7da7855a6db0ab3bb6a6a087863d7abd4391"; + sha256 = "07770qhy56cf5l69mk6aq882sryjbfjd05kdk78v65mgmlwv806a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3146b9309e8cbe464330dcd1f5b8a9fd8788ad6f/recipes/helm-gitignore"; @@ -30303,8 +30619,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "2efdc9bc2f572fceb11199cecdd04aae03df3cb0"; - sha256 = "0pxmmgsrn5d2jmak3plwb6h15h2d4sbwk49q6gdniglcf9nagckq"; + rev = "9b14a972093b12e3a5d210370592e71df7f0d1e1"; + sha256 = "03bb6jw0f6l1wi1bl8ynb0k5rnk2rfnrhzc2qp5anmlxzy3qglc8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab"; @@ -30760,12 +31076,12 @@ helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-make"; - version = "20161109.1107"; + version = "20170206.1323"; src = fetchFromGitHub { owner = "abo-abo"; repo = "helm-make"; - rev = "11744341b10b35200ebb6789de52ce1a79336ef4"; - sha256 = "1kzv11admqzdbswhahh28imkvjhwmp3pggpf5igpi019p8v3y91c"; + rev = "ed406557c814bb2521cf826370e57ffe9d40d33e"; + sha256 = "02dfrr474yza18xvshjx41h1fsk81g950k6p3h4j1hpdqgjkv96k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make"; @@ -30869,8 +31185,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de"; - sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5"; + rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29"; + sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/helm-nixos-options"; @@ -31051,6 +31367,27 @@ license = lib.licenses.free; }; }) {}; + helm-perspeen = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, perspeen }: + melpaBuild { + pname = "helm-perspeen"; + version = "20170205.742"; + src = fetchFromGitHub { + owner = "jimo1001"; + repo = "helm-perspeen"; + rev = "9f1cfd4b9a4881e089486a02eeba07c551d5d706"; + sha256 = "1jdcvli9j5q5n4qp4qa5ylyb47mrh3crhbq316qkxk473r8hprlc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee26a57aacbd571da0cfaca2c31eec6ea86a543/recipes/helm-perspeen"; + sha256 = "07cnsfhph807fqyai3by2c5ml9a40gxkq280f27disf8sc45rg1y"; + name = "helm-perspeen"; + }; + packageRequires = [ helm perspeen ]; + meta = { + homepage = "https://melpa.org/#/helm-perspeen"; + license = lib.licenses.free; + }; + }) {}; helm-phpunit = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, phpunit }: melpaBuild { pname = "helm-phpunit"; @@ -31117,12 +31454,12 @@ helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20170113.209"; + version = "20170202.1000"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "6d750dee69befb97bda1e8b6045973e5a5eca233"; - sha256 = "0dsc8k7qk24qvk8msxla9z3r4299rrcwmm4k5fslplh66h0b8z85"; + rev = "e16da3ec6d6c495ee8355e3c3729294bdee0a57b"; + sha256 = "0wmzkqy7pr2nflfpbzq7gljk3jxxq3pbq76di1zl2rlj67whs1xk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -31268,8 +31605,8 @@ src = fetchFromGitHub { owner = "asok"; repo = "helm-rails"; - rev = "31d79cd0feca11cbb1aa532a8d2112ec794de4f0"; - sha256 = "1a26r21jvgzk21vh3mf29s1dhvvv70jh860zaq9ihrpfrrl91158"; + rev = "506d9948d45dfbc575c9c4c0d102c1ad2f511e82"; + sha256 = "0i5ps5yds21bsrx86piy9bdgca95l1farsrbjpqz88ad8pq6xa9c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3af52fd266364a81ff42eb6d08389fa549bd6c2c/recipes/helm-rails"; @@ -31639,6 +31976,27 @@ license = lib.licenses.free; }; }) {}; + helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-tramp"; + version = "20170208.546"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-helm-tramp"; + rev = "18bb091ed100895a1dfbc3ee1f85c08de541f742"; + sha256 = "12fbpsn7wywgbr1npxv3smb0z5s7j8zpg4s60zs28hz49j8v4058"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp"; + sha256 = "1113qxl34sf27a88vpvckrfrigp8vnm42nmfrcxz156maa1g9cbv"; + name = "helm-tramp"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-tramp"; + license = lib.licenses.free; + }; + }) {}; helm-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-unicode"; @@ -32363,11 +32721,11 @@ highlight-operators = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-operators"; - version = "20160517.1349"; + version = "20170213.1420"; src = fetchhg { url = "https://bitbucket.com/jpkotta/highlight-operators"; - rev = "c06a29726f3e"; - sha256 = "0fqfxwdz1xbc6dwxbjdhryvnvrb5vc38cq7c2yiz294mfzyn3l5s"; + rev = "3938e88e78c5"; + sha256 = "1h5whrc1iphzq0g8x9mmkhjkbmbdg9i9bvr1y8zrwrs8za8k127y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e7bd74b7a3484e437c6db4f18613744ebae030f5/recipes/highlight-operators"; @@ -32422,6 +32780,27 @@ license = lib.licenses.free; }; }) {}; + highlight-refontification = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "highlight-refontification"; + version = "20170211.1224"; + src = fetchFromGitHub { + owner = "Lindydancer"; + repo = "highlight-refontification"; + rev = "32632897d88c4611fadb08517ca00ef5cbc989b6"; + sha256 = "1k6af947h70ivkj31mk3nv2vkxlfpqvpwq8za53n2l7adsjdlf73"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c59f2b5cf1594248e8365b6ce3324f493c5647/recipes/highlight-refontification"; + sha256 = "0cm9p4d7yhkz5a88m0y4646a6b9lb2ha7q12fcrdikyckpmbkqss"; + name = "highlight-refontification"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/highlight-refontification"; + license = lib.licenses.free; + }; + }) {}; highlight-stages = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-stages"; @@ -32485,12 +32864,12 @@ highlight-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-thing"; - version = "20160817.126"; + version = "20170207.2239"; src = fetchFromGitHub { owner = "fgeller"; repo = "highlight-thing.el"; - rev = "f9eaebdd80815d1cc30dbf56d8b171da3135ee7c"; - sha256 = "00nvmp8fcc55hmy37wxnwhvg3m85a5fyrqpli9zjgbblckfz1v55"; + rev = "c998172704ac4b96147d862a0eb4a0f97deb5e0a"; + sha256 = "0s441ya0fcw7sv1ah13dh0b0m2rcvf68a442knvnf06a07hpr5sr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84b6cb403ff9a588771d051e472596f4e3cc974d/recipes/highlight-thing"; @@ -32552,8 +32931,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "19e73ed76974f7c6a75c277e7e99e09f26d3ad66"; - sha256 = "0q22iay0n4asqm378s4fcb7vdsyfhddls1ij6v1m4mhsjq7a6inw"; + rev = "cd3d3241c7dbd88a0505fb005d4072965c1bfe1f"; + sha256 = "144arwryhp464v8k1w12v87mf70bq372dc4pxvl2giqssmaq7jms"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -32875,12 +33254,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170101.650"; + version = "20170209.938"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "a9d6377b15999718462e96c079503594940507ef"; - sha256 = "163k8crlyvgzag9mwb8q5cx40jlislxz533yr7nkh3ks6ricsj31"; + rev = "76d60bd3f740aabc8c9d3e25240aa71bb20f7d2b"; + sha256 = "1wwj9sqjhkjdwn69nd5h9mmrqb42d7c066bl3f7szmg6mhwgffw3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode"; @@ -33378,8 +33757,8 @@ src = fetchFromGitHub { owner = "nflath"; repo = "hungry-delete"; - rev = "78a787a87aceb821818bbe2a322fbf2e5cbf80c3"; - sha256 = "171s7akqcpj0jcbm8w19b4n9kdzw0acf7cv0ymwdz5mmgmfiy292"; + rev = "2cedcdd113032414ea6d3bfa2504c8820b1a841a"; + sha256 = "1fg2his564qiqk7b47nswxcq4pd17ip164v4zva9715cjzgyzn66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e33960d9b7e24f830ebe4e5a26a562422d52fe97/recipes/hungry-delete"; @@ -33665,7 +34044,7 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20170115.1431"; + version = "20170201.1015"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icicles.el"; sha256 = "072pxihvwpj6zkzrgw8bq9z71mcx5f6xsjr95bm42xqh4ag2qq0x"; @@ -33874,8 +34253,8 @@ src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "a1c2965e31ebc6bf6f86fba0184415da32a8214d"; - sha256 = "0fvsi6hll1x0nvx1axsmsfv93pydkpmzq36hjw4kkp07nrf2byrz"; + rev = "2d6d38edc0798d9552fc3430bc2dd7ff5025ced1"; + sha256 = "0cks67cgbcv19hjim2jbvpqcgfwg61bssvm5d864bb32ygdg51af"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; @@ -34164,12 +34543,12 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "20160623.815"; + version = "20170211.1432"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "a1c2965e31ebc6bf6f86fba0184415da32a8214d"; - sha256 = "0fvsi6hll1x0nvx1axsmsfv93pydkpmzq36hjw4kkp07nrf2byrz"; + rev = "2d6d38edc0798d9552fc3430bc2dd7ff5025ced1"; + sha256 = "0cks67cgbcv19hjim2jbvpqcgfwg61bssvm5d864bb32ygdg51af"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; @@ -34332,12 +34711,12 @@ iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iflipb"; - version = "20141123.1316"; + version = "20170205.200"; src = fetchFromGitHub { owner = "jrosdahl"; repo = "iflipb"; - rev = "2e0d1719abeec7982341761ee5dabb01574e6862"; - sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki"; + rev = "8eb478535aa4847b94ea4ce29d9476a6b652be2b"; + sha256 = "0plvjg1nkq37mpdbli2fyqhvabzi18mq5kjrgxk9d6s6ki2m26kq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb"; @@ -34537,12 +34916,12 @@ imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-list"; - version = "20160211.341"; + version = "20170212.518"; src = fetchFromGitHub { owner = "bmag"; repo = "imenu-list"; - rev = "a68d596b437ce1c125d8bd5414467ca1ff55bdcc"; - sha256 = "1j0p0zkk89lg5xk5qzdnj9nxxiaxhff2y9iv9lw456kvb3lsyvjk"; + rev = "415a8db6598e949e4389f2e06dc2c28f96892214"; + sha256 = "0w1x3psbzwqmbjm2dcqx4x72p43pdsliz0z40g2zjqkbqjs2al2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list"; @@ -34911,12 +35290,12 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "20170115.1602"; + version = "20170212.1444"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "bf380c13e50c18b6bac6651b22b6fc6ba349062f"; - sha256 = "1in57d8q33x68ccxng13yp8l4frdgab3nx74p4n4lxa183qcs2n5"; + rev = "af4f238ef4555521d13c5eb2fb8e818acf59d70a"; + sha256 = "1668dr6y0nph739x947kjz435qikg77m8ja7h6laf3f9wzcxcg9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -35139,12 +35518,12 @@ inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inkpot-theme"; - version = "20161220.2134"; + version = "20170203.2120"; src = fetchFromGitHub { owner = "ideasman42"; repo = "emacs-inkpot-theme"; - rev = "e175dbd7d0484ae905525ff157cda4e190977ba6"; - sha256 = "0cpmc92234xhddb14np8v9fq3cq06ci3qcc25a72dnmjf19kkjcm"; + rev = "a7bbc67de279cbd1646d5f6733900fb4f4402280"; + sha256 = "1r0b7bnjg161km86pif4rsbwix81kr9n9w5bcp4p7ngrvxhfndgs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme"; @@ -35178,6 +35557,27 @@ license = lib.licenses.free; }; }) {}; + inline-docs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "inline-docs"; + version = "20170130.1434"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "inline-docs.el"; + rev = "4e94a62f6b02c37c1497f34b36fe36f04cc23405"; + sha256 = "0851jgh5v36d7lq9pwlmigqpqrfbrqqssib4id7s4c8j4sh4c03g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/48f0262ec568a3dd53dcc48f11e473b30c7e6ab1/recipes/inline-docs"; + sha256 = "1a45a5bxm719fr4xvn26mraph3a19d53c2l74y1jrxhaksgl3n1j"; + name = "inline-docs"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/inline-docs"; + license = lib.licenses.free; + }; + }) {}; inlineR = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inlineR"; @@ -35306,12 +35706,12 @@ interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interleave"; - version = "20170110.234"; + version = "20170211.807"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "interleave"; - rev = "0993383bf4a36f8e4480e5ea50226e1f8fa549c8"; - sha256 = "1f4syyfga5f49nvlcw4ajxabxki9hglf89mslxkh15zib3mpakf9"; + rev = "822ae2d29aaf92bcf96324442126b551e4477d6a"; + sha256 = "0nq2f6pgq4vszy3hx84qdml4i9lbqlrh9knqgwgrl819vr15srqg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave"; @@ -35327,12 +35727,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170110.430"; + version = "20170206.1238"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "5b727f41e70aaf1d9d4dad7d4e7c4bafe122bec1"; - sha256 = "1z712b1kgmkhwcchagb8sdlcxv3ji7f8jfkig09z49af7hvg4g7v"; + rev = "9cd5e5047cb0147f50bc722bb748e9b55ae89fa2"; + sha256 = "1j6r8nswgnjd343dlvf4b43sym7cypw6m54gzdg9sbgqgr51avbc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -35659,10 +36059,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20170101.2341"; + version = "20170207.2149"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "0iagsqqsxjxz0j30ljynwjpjn6i5klaxka4ygrsbxh0ys6cv5yfh"; + sha256 = "1h2pn8qvxpnn2y0h54fijgqb47l047hq5g2n42x0nmiky2hjqras"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+"; @@ -35717,12 +36117,12 @@ isend-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "isend-mode"; - version = "20130419.258"; + version = "20170208.110"; src = fetchFromGitHub { owner = "ffevotte"; repo = "isend-mode.el"; - rev = "274163f5c42834ce0391fcc8800e169104ad518f"; - sha256 = "022j39r2vvppnh3p5rp9i4cgc3lg24ksjcmcjmbmna1vf624izn0"; + rev = "95ba9e71390858bf706b148276f37428dd2774d2"; + sha256 = "0njfglyspdl7jzybvi67wlqrdfbqhfv36fx48yz5v16018pd856h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ef6e4dab78a4c333647a85ed07a81da8083ec0c/recipes/isend-mode"; @@ -35822,12 +36222,12 @@ iterator = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iterator"; - version = "20160406.1206"; + version = "20170207.38"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "iterator"; - rev = "1523f1dcbf4086e91561ec5dec4c2f6fcba778bd"; - sha256 = "006lw8zjxz0702wlrs0nb0ijwh5air3yc3cam7dbkyy7mh632vhi"; + rev = "9da54f9aed945b46866782cdf962c9e530419297"; + sha256 = "0r50hdyr9s18p7ggiyv36g011jgg47bgszvjgcmpp23rz131mxyw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66aa4c3b43083a0098ee3163005dcc36d7251146/recipes/iterator"; @@ -35885,12 +36285,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170109.626"; + version = "20170208.956"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "ee91a2511797c9293d3b0efa444bb98414d5aca5"; - sha256 = "0mrv0z62k0pk8k0ik9kazl86bn8x4568ny5m8skimvi2gwxb08w6"; + rev = "5f732cdce5ac2529f36b5c8cc9f053789783de45"; + sha256 = "1ha7filrnkdya4905yy002n1hjdl23k9hbb2w2id3wfj0cbw930f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -35906,12 +36306,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20170103.1125"; + version = "20170124.940"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "8735714d6be62187538ffd9187e8aee87b49b969"; - sha256 = "19sqp3789a9w0nm48rb2yjj5bhllpilrvbljp8h8nsv3nlf5dz84"; + rev = "6a6cef0668b86c88e629a817e1d13c4be45ad62a"; + sha256 = "0wsh8b0m094di1bxm2vdnrdqhix1a1wcd5nj2crra678d70ad9g9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -35927,12 +36327,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20170113.247"; + version = "20170203.244"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "65d80ff0052be9aa65e9a1cd8f6b1f5fb112ee36"; - sha256 = "05qjpv95xrhwpg1g0znsp33a8827w4p7vl6iflrrmi15kij5imb4"; + rev = "f5bee7c5368d55be4ebca30610b73c33978830cf"; + sha256 = "0lcydjg8kyxdv5bbly0jf4d5wl4z7s63i536gvnlz0wfgj5swp5v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -35952,8 +36352,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "2efdc9bc2f572fceb11199cecdd04aae03df3cb0"; - sha256 = "0pxmmgsrn5d2jmak3plwb6h15h2d4sbwk49q6gdniglcf9nagckq"; + rev = "9b14a972093b12e3a5d210370592e71df7f0d1e1"; + sha256 = "03bb6jw0f6l1wi1bl8ynb0k5rnk2rfnrhzc2qp5anmlxzy3qglc8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab"; @@ -35973,8 +36373,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "ee91a2511797c9293d3b0efa444bb98414d5aca5"; - sha256 = "0mrv0z62k0pk8k0ik9kazl86bn8x4568ny5m8skimvi2gwxb08w6"; + rev = "5f732cdce5ac2529f36b5c8cc9f053789783de45"; + sha256 = "1ha7filrnkdya4905yy002n1hjdl23k9hbb2w2id3wfj0cbw930f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -36573,15 +36973,36 @@ license = lib.licenses.free; }; }) {}; + jdecomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jdecomp"; + version = "20170212.2147"; + src = fetchFromGitHub { + owner = "xiongtx"; + repo = "jdecomp"; + rev = "1590b06f139f036c1041e1ce5c0acccaa24b31a7"; + sha256 = "0sb9vzn6cycys31r98kxwgpn7v9aw5ck86nkskmn9hhhkrfsabii"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7725a5b3e2aa065cc6f9bac55575151cfdc7791/recipes/jdecomp"; + sha256 = "1s8y7q361300i7f6pany1phxzr42j8gcdv9vpin05xx15p2nr3qz"; + name = "jdecomp"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/jdecomp"; + license = lib.licenses.free; + }; + }) {}; jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }: melpaBuild { pname = "jdee"; - version = "20170109.1138"; + version = "20170211.609"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "5ac4f497f8226acc23dd9c266c958fb82f6816b4"; - sha256 = "17l07r0wf5gj77lln6bmi1c4fg4igf2qnrla2s9piyrqffa4jgrv"; + rev = "0ac750cb6c3b9b9f0c4c8d440a88bc9d7377d9f7"; + sha256 = "094sip7s0vqvn7xv6w66gd3pxhsdb3a1psvcv4dyliqj2zkfa3q4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -36601,8 +37022,8 @@ src = fetchFromGitHub { owner = "tkf"; repo = "emacs-jedi"; - rev = "b6972af030416c57de6d045761d0ad6bccfdf07b"; - sha256 = "07011v1qx70saqffj0698sdi3v996v105jvf7h7lc0ddlddgk05w"; + rev = "de1f5597b600c0cb7661b5f451da2af4cb722571"; + sha256 = "120l9zfh432ffj5n6q4x16msvnqwcazkaxib2n19k4pdyvpd1gbp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi"; @@ -36618,12 +37039,12 @@ jedi-core = callPackage ({ cl-lib ? null, emacs, epc, fetchFromGitHub, fetchurl, lib, melpaBuild, python-environment }: melpaBuild { pname = "jedi-core"; - version = "20160709.722"; + version = "20170121.610"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-jedi"; - rev = "b6972af030416c57de6d045761d0ad6bccfdf07b"; - sha256 = "07011v1qx70saqffj0698sdi3v996v105jvf7h7lc0ddlddgk05w"; + rev = "de1f5597b600c0cb7661b5f451da2af4cb722571"; + sha256 = "120l9zfh432ffj5n6q4x16msvnqwcazkaxib2n19k4pdyvpd1gbp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi-core"; @@ -36993,12 +37414,12 @@ js-format = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "js-format"; - version = "20161220.1427"; + version = "20170118.1702"; src = fetchFromGitHub { owner = "futurist"; repo = "js-format.el"; - rev = "1fb87a5b21cdc2dc4e29245d14d82e81a5983393"; - sha256 = "0cwxyfqiwl19gvx0smcdy8immvyj0rnsrxsqy2pch1s6m5sz4wxd"; + rev = "544bda9be72b74ec2d442543ba60cff727d96669"; + sha256 = "18wr2z2w2fqgy51f5m5izrnywarxn6w4qs04lsgbwlsc6ahpwwpf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6deaa93f7deaba9f5f36f1963522b6dc5c673a/recipes/js-format"; @@ -37077,12 +37498,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20170116.733"; + version = "20170202.1422"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "03c679eb9914d58d7d9b7afc2036c482a9a01236"; - sha256 = "1kgmljgh71f2sljdsr134jrj1i6kgj9bwyh4pl1lrz0v4ahwgd6g"; + rev = "faf73e8b6cfa9b896abde60cedd4cc69c9dfae19"; + sha256 = "12las04bxp74w0pp1w8ri4mqv7kl48sz6dzqvq9xb50nz8y9bijy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -37348,12 +37769,12 @@ julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-mode"; - version = "20161027.625"; + version = "20170210.1504"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "julia-emacs"; - rev = "feb6e79dddc8f992f85ae8c955ce024d57ec5e26"; - sha256 = "015y0y5xx7b3iky3r9gdnkh4kq1nxvdshvmlb0yy3mg71s62xi76"; + rev = "9c36479c83039c4fc26e583bb1c4dc27de058a4e"; + sha256 = "1w9fhc8k8zxxiscpyip39rrwd2yr1xpxias16scj470mviwh7j26"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode"; @@ -37599,11 +38020,11 @@ }) {}; kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kanban"; - version = "20170117.316"; + version = "20170203.1701"; src = fetchhg { url = "https://bitbucket.com/ArneBab/kanban.el"; - rev = "713e6c7d8e07"; - sha256 = "1m1rgkdwb9zm3k131l6xh2pz4750arvflly7fbmsik3y1pr5f60r"; + rev = "4481f57aee47"; + sha256 = "1crghlq0d87kc9mwy7prifxqla4q59c2447hhhl0pxbkf3ag9si1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/kanban"; @@ -37826,12 +38247,12 @@ keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keychain-environment"; - version = "20160424.446"; + version = "20170118.626"; src = fetchFromGitHub { owner = "tarsius"; repo = "keychain-environment"; - rev = "1ca091f72ad1d1a7620552289ae43484d853e968"; - sha256 = "0xgm80dbg45bs3k8psd3pv49z1xbvzm156xs55gmxdzbgxbzpazr"; + rev = "7c08e8c4c3ea4d6eaee12d710a56793771f837c5"; + sha256 = "1mnqa69f584qzb62nn01bb4nz08gi7ra8b6xr0x7aphfqzk86kzy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4382c9e7e8dee2cafea9ee49965d0952ca359dd5/recipes/keychain-environment"; @@ -38124,8 +38545,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "80f1f82759d5e4f2537da7620e2c0d3ea88aa7da"; - sha256 = "0bk7ixm4dvblmal8xi0n061xqb13ipdgxpl9gx7aihzi18429i8n"; + rev = "ec7f2477ac417e4ccad245b3ce69472c3766d008"; + sha256 = "063wp6fv6wi5qc7ybam6swmhmakavg3lh7n8v4lms7zjiq47c90c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -38204,12 +38625,12 @@ kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20161126.1914"; + version = "20170206.1833"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "ddb4e59bcbac9d198f0ba6c5e8acebb4c5005946"; - sha256 = "0gkg0n71fg74a95ckpblizwlp3a59iqqlcq7ix0q6055q6gcvixc"; + rev = "f028d330e0220d7719f1504ad3b25bab9c1b8e4a"; + sha256 = "0pmchrsw59ng8vilgml7ba5b17bwh0ac4b31s55nhy3f59l7y0d1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; @@ -38562,8 +38983,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "latex-extra"; - rev = "d5b759fa61da968c3ca998ba0d2ef4a73647e5fd"; - sha256 = "07aavdr1dlw8hca27l8a0i8cs5ga1wqqdf1v1iyvjz61vygld77a"; + rev = "9e89c5548298394aa47a5087a8e79655105a6f3d"; + sha256 = "1gz2zay2wah56s0gkkfnhfmm0wr1w4gjz51pb1q72br0n4r01xq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/latex-extra"; @@ -38641,12 +39062,12 @@ latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-unicode-math-mode"; - version = "20161201.835"; + version = "20170123.1016"; src = fetchFromGitHub { owner = "Christoph-D"; repo = "latex-unicode-math-mode"; - rev = "3b82347291edcb32e4062b0048c367a3079b3e8c"; - sha256 = "1xylfg8xpyb2m0qnysf58cl05ibbg4drhgq7msiiql2qrdzvpx9f"; + rev = "e8931e68214ca94e6a04080ebc629693d5881884"; + sha256 = "049lpqnyjz0x2dp7rzk9gwbf5s28s33vxxk5lfhax6kaizlxkaq8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c021dfad8928c1a352e0ef5526eefa6c0a9cb37/recipes/latex-unicode-math-mode"; @@ -38809,12 +39230,12 @@ ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20161231.914"; + version = "20170208.425"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "a2ce924c4447daa92228d5904e5c31555d27fbf7"; - sha256 = "0j9ppsxn9q3h4lh9ak3r1n8jpg5x0zs2az016jiw2q3h6n6sw564"; + rev = "574093b4bdbf4854f7a661556ec9ebfe5a9a9611"; + sha256 = "0irxj5w6yrqbyr9js1mp3fh19cfwijd7brpvzas6j7v3fb0mf7zx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode"; @@ -38998,12 +39419,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20170114.617"; + version = "20170211.1157"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "fa5f6105a18d08727172e6b9200cd0dec737d4ba"; - sha256 = "0pmhg22rx6yd431lfcvyai1cahiljs1dr670i9i6m5ckdakcl1f4"; + rev = "4d32174f5930bd4de81117d83a232768cf96ce4c"; + sha256 = "1w64pa0rl2fr8z3l0bq4sw4543rfp53zdgjm5gm5f84py3fjkwmc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -39058,12 +39479,12 @@ lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lfe-mode"; - version = "20170111.1330"; + version = "20170121.454"; src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "0d412fc713efb893c7f44f1bd8dd66eb01693f30"; - sha256 = "1hsr21fzd3kkavznjcgd9jv6galkx3aky73fs91plr5l7gdvqz38"; + rev = "640ef0f7251ae23b43f6824bd4f116fa2ee16b9b"; + sha256 = "067n6i4vvjldwrm2xif7qskbxy59aqz8jrkjniq4kv8jgpab9iwc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -39118,12 +39539,12 @@ lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lice"; - version = "20151225.1022"; + version = "20170131.1601"; src = fetchFromGitHub { owner = "buzztaiki"; repo = "lice-el"; - rev = "d8572d997f54f4022f245dcf7c38fef6919a474a"; - sha256 = "11c3vmxyddx7zm8fpxmzhq2xygyijbszinfiwllgb4l738bxwljb"; + rev = "e6f7f827bcf5246aff25f52d6185c9bed91beeba"; + sha256 = "1kjai3kvzn0flakjzrarh676ja6x6v0wbjxr69wqw9nvicvww7zx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2508699ebfc846742940c5e4356b095b540e2405/recipes/lice"; @@ -39375,12 +39796,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20170112.236"; + version = "20170212.1136"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "f66433837a4ccabcfc7f05d74d7ee8217691d943"; - sha256 = "154kwk1h1grcjbimaglsir5i5j72bak1lxw69bjm5d5yf3qg60p5"; + rev = "3dcacc88a0964550b7f4f37290e46cecee8843d8"; + sha256 = "0vhysxh264bdh4rmfnk0hczb80fi8gbhvbnc9ah1nip9l53m1gdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -39417,12 +39838,12 @@ lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: melpaBuild { pname = "lispyville"; - version = "20170116.1335"; + version = "20170205.1833"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; - rev = "c951f65a2300d884eff7afdd941fea275550c9fe"; - sha256 = "0hhllm6b0gkllpbfkc6ifcax1vmfplll9vbrfa8wqi0lghmy4npm"; + rev = "3ba91c5908484188971e952d98256139123c4cbe"; + sha256 = "15zfpa2bd80537vcmlp4i39rpxvn6396wynh7sa9yiwrnq246sj6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville"; @@ -39625,12 +40046,12 @@ literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "literate-coffee-mode"; - version = "20160114.434"; + version = "20170211.715"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-literate-coffee-mode"; - rev = "996bffe70499fb807b824a4a03d7fa0e5b675c82"; - sha256 = "1wxysnsigjw40ykdwngg0gqfaag0dx6zg029i2zx25kl3gr1lflc"; + rev = "55ce0305495f4a38c8063c4bd63deb1e1252373d"; + sha256 = "1gm89azjgsdg0c7z9yprpjbph211c5jnqv11pkf1i1r1wzx0wanj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a20410e916d45e5b243e7eb3bb2226c7e1e67b00/recipes/literate-coffee-mode"; @@ -39688,12 +40109,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20170116.1607"; + version = "20170212.2013"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "f702dd8475b48526d1701b11776800388f6d8c70"; - sha256 = "0zdxz5zyy8xgrsbl3kpnzxifgbr670qnrq02sbc208al9jn8blk9"; + rev = "c4e28fdf6c409c870ecbb7b4d3c19d0dda76e79c"; + sha256 = "19m2k9srlc8v5nrb4a44v8pdcfg9zbx28b5s7qa7m676b3yav58b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -39775,8 +40196,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "fca725c1928670ccc48510f431d96f19751dbc1b"; - sha256 = "1ag3h8jcrfdbhs1zil6xra5abngkl35yw6av769x0vp6wldxklrv"; + rev = "9053d357baecccf1399f934c5faea2b2e6c0a742"; + sha256 = "09p441mrp4bfg5imh2dghz0zr95qibh0hwv278lbdbq33svl8qmg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -39817,8 +40238,8 @@ src = fetchFromGitHub { owner = "vic"; repo = "color-theme-buffer-local"; - rev = "ca8470bc34c65a026a6bca1707d95240bfd019af"; - sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx"; + rev = "faf7415c99e132094f1f09c6b6974ec118a18d87"; + sha256 = "1zk5clvkrq2grmm1bws2l5vbv1ycp41978bb902c563aws2rb8c0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/load-theme-buffer-local"; @@ -40001,12 +40422,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20170114.1515"; + version = "20170127.1107"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "c22ac44d14de8aaad532e47ea60c21c24d661a50"; - sha256 = "02842gbxlq6crvd3817aqvj5irshls5km675vmhk0qd4cqg38abv"; + rev = "bbed5a7651042594340de7e15ac96150097f1555"; + sha256 = "0iks3451x6nf2hhhw6nvnh4y9gigjp3rd38sp7m60vsz9ggmninh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -40145,12 +40566,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20170106.1709"; + version = "20170118.2007"; src = fetchFromGitHub { owner = "vibhavp"; repo = "emacs-lsp"; - rev = "d117f2d8d5b23688e0d32372a2c2d03e7bcd44c5"; - sha256 = "0g13hslwl9303k69mg4l5yrga4fsjbm0phvqr0kjycsq2zfipa2r"; + rev = "7f43aa9c669832f1c2f22a3f785f3cd05aacfe02"; + sha256 = "0dfyyjvzh55cnm33w6gq841cbldki8yfzqpz37gs98zxy0wkc6kw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode"; @@ -40166,12 +40587,12 @@ lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lua-mode"; - version = "20161101.1340"; + version = "20170130.435"; src = fetchFromGitHub { owner = "immerrr"; repo = "lua-mode"; - rev = "d7596990cdd197d3db682c4b2ca5410a4b522574"; - sha256 = "1sid1k2vv3bawsirz11apslhx7f5dfva4gwcv7q7p3b0zxlyw1f1"; + rev = "652e299cb967fccca827dda381d61a9c144d97de"; + sha256 = "1had9sj3pbbmdb66mw1dxs7i866ck0af7pak3wi6213v5vip7w6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -40349,6 +40770,27 @@ license = lib.licenses.free; }; }) {}; + madhat2r-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "madhat2r-theme"; + version = "20170202.1630"; + src = fetchFromGitHub { + owner = "madhat2r"; + repo = "madhat2r-theme"; + rev = "6b387f09de055cfcc15d74981cd4f32f8f9a7323"; + sha256 = "1nnjdqqbarzv62ic3ddc2z9wmh93zjia4nvfjmji8213dngrrf88"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/44a382a388821908306c0b8350fba91218515e1b/recipes/madhat2r-theme"; + sha256 = "0y588skd6c2ykyp54d38ibwrqglnaanr15d45d51cvcvp9k7x508"; + name = "madhat2r-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/madhat2r-theme"; + license = lib.licenses.free; + }; + }) {}; mag-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, splitter }: melpaBuild { pname = "mag-menu"; @@ -40415,12 +40857,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170114.1211"; + version = "20170213.927"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "875f913b8edfdd85dfdaba9403a9d5ae2b952afc"; - sha256 = "04cdbv8xqhbzqx1lzcm0n2s80b25mp9s6izzflv88qzpcc0z6wv2"; + rev = "1643dc626ab28fd28eff8a94272f0f4fba8e2737"; + sha256 = "0fank75arc9bwndpv87jli7cadbh2dgka42m0nc5lqldykflnfd7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -40443,12 +40885,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "20161115.1528"; + version = "20170211.1601"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "74e0343b4152ad5c0d4f77f9f15dd6f1b02de432"; - sha256 = "08mpnj9c43p528iy3hj8yljhzpkpjxkjiaiiss5n2jgyyc64hw9z"; + rev = "2437efb93767b352eecf27f5d5e3513e34a395ca"; + sha256 = "1pmsbl8jh3dgs42k7b0a9ya1ywwy5435pshplc23z33i7qplva9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -40466,14 +40908,14 @@ pname = "magit-filenotify"; version = "20151116.1540"; src = fetchFromGitHub { - owner = "magit"; + owner = "ruediger"; repo = "magit-filenotify"; rev = "c0865b3c41af20b6cd89de23d3b0beb54c8401a4"; sha256 = "0nkxxhxkhy314jv1l3hza84vigl8q7fc8hjjvrx58gfgsfgifx6r"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c6c87a11492f6b6e5159a2a3dc1fe7d9efcc0cde/recipes/magit-filenotify"; - sha256 = "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca5541d2ce3553e9ade2c1ec1c0d78103dfd0c4d/recipes/magit-filenotify"; + sha256 = "1ihk5yi6psqkccpi2bq2h70kn7k874zl7wcinjaq21lirk4z7bvn"; name = "magit-filenotify"; }; packageRequires = [ emacs magit ]; @@ -40590,12 +41032,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20170104.924"; + version = "20170209.1031"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "875f913b8edfdd85dfdaba9403a9d5ae2b952afc"; - sha256 = "04cdbv8xqhbzqx1lzcm0n2s80b25mp9s6izzflv88qzpcc0z6wv2"; + rev = "1643dc626ab28fd28eff8a94272f0f4fba8e2737"; + sha256 = "0fank75arc9bwndpv87jli7cadbh2dgka42m0nc5lqldykflnfd7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -40653,12 +41095,12 @@ magit-svn = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-svn"; - version = "20151219.547"; + version = "20170213.433"; src = fetchFromGitHub { owner = "magit"; repo = "magit-svn"; - rev = "63a47732cc112d24db26052ffad93895319b60cf"; - sha256 = "1g2isa8n2j8kk0c5iwx8qai8k14sazwkc3dwhcpchm3zs0bfpdm3"; + rev = "c833903732a14478f5c4cfc561bae7c50671b36c"; + sha256 = "01kcsc53q3mbhgjssjpby7ypnhqsr48rkl1xz3ahaypmlp929gl9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-svn"; @@ -40695,12 +41137,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }: melpaBuild { pname = "magithub"; - version = "20170115.1723"; + version = "20170213.1926"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "dc03f31edb5f45a1c9ada8ae00c1c9baf0126213"; - sha256 = "1sv7h3gnqxm6vw4ygqm28grckxzvcfr39fgd4qhrzj0d6sss9gr5"; + rev = "a94502461ada9098ccb031ec6241414dcbfce989"; + sha256 = "0wsk7qhvz1k41lfajx0hrrdj5pwvqr2m10a9lil1f124pkc883w0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; @@ -40797,6 +41239,27 @@ license = lib.licenses.free; }; }) {}; + major-mode-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: + melpaBuild { + pname = "major-mode-icons"; + version = "20170208.40"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "major-mode-icons"; + rev = "8773a4d01a77f0562373633692c8ded0305aa374"; + sha256 = "1pqbqybv21j4a9h5spyv780khky80n5bwvh1dg9sqia47kf3z5ak"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f551bec8bdc5dee4b31edea0c2f92b3c77ec56/recipes/major-mode-icons"; + sha256 = "02p5h9q2j7z3wcmvkbqbbzzk3lyfdq43psppy9x9ypic9fij8j95"; + name = "major-mode-icons"; + }; + packageRequires = [ emacs powerline ]; + meta = { + homepage = "https://melpa.org/#/major-mode-icons"; + license = lib.licenses.free; + }; + }) {}; make-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "make-color"; @@ -40821,12 +41284,12 @@ make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "make-it-so"; - version = "20161009.43"; + version = "20170206.741"; src = fetchFromGitHub { owner = "abo-abo"; repo = "make-it-so"; - rev = "9e10518a2fed8a4a5961b6abad50ef92b4747600"; - sha256 = "0ilqa7jdfzyhjjnxn69cx93nj3py429jwyg8rgzas87kjk9qiv7m"; + rev = "c674b25e6b3eb7c848a62727e69bdafdc92a37be"; + sha256 = "1qjcwvqbxl0iqlbwcisqmq2m3giwkm2sq5i2a5crrwhzxjasbbsj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so"; @@ -41031,12 +41494,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20170115.2357"; + version = "20170210.2253"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "c58481b5dacc62dcc53a9886e032ccaf4a41a627"; - sha256 = "023kpmj01ixpb2yfsfxym7zvbldhj8486ndanma0srzf1p9lmqq6"; + rev = "578d87183d2a759811a5d1eab4dc9c74513e557c"; + sha256 = "02zgc56s1wl7a27vrgycfgsy0fd6xbsbhgnpy6rrq5iyrb6a6wnc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -41098,8 +41561,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "marcopolo"; - rev = "85db828f2bb4346a811b3326349b1c6d0aae4601"; - sha256 = "1qf724y1zq3z6fzm23qhwjl2knhs49nbz0vizwf8g9s51bk6bny2"; + rev = "e53ee8a0822d092d8669d75138f6d73f46d076f9"; + sha256 = "1hhqgwx65489rdq9qd8v0dpcnwicfr772j3i4k8cmnn2lkr3fmm8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/936a1cff601594575c5b550c5eb16e7dafc8a5ab/recipes/marcopolo"; @@ -41154,6 +41617,27 @@ license = lib.licenses.free; }; }) {}; + markdown-edit-indirect = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: + melpaBuild { + pname = "markdown-edit-indirect"; + version = "20170210.1504"; + src = fetchFromGitHub { + owner = "emacs-pe"; + repo = "markdown-edit-indirect.el"; + rev = "980d8bf3a123a72aef18f608e99be3472be100c3"; + sha256 = "1idsh6gsm7kaz7i8kv3s326qxnd2j3nmwn8ykbnfwracm6him3qf"; + }; + 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"; @@ -41540,12 +42024,12 @@ maxframe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "maxframe"; - version = "20161213.1734"; + version = "20170120.905"; src = fetchFromGitHub { owner = "rmm5t"; repo = "maxframe.el"; - rev = "50dc78c7b33959c10d5f6da00c338d4611467c36"; - sha256 = "1qz3q63g0zh5xhsxcqm37swcdpliii15cqfbbvm0jjyd9kfysblw"; + rev = "13bda6dd9f1d96aa4b9dd9957a26cefd399a7772"; + sha256 = "0kh8yk1py9zg62zfl289hszhq3kl3mqmjk6z5vqkw3mcik4lm69g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7944652cb7a7bf45f16e86ea379a104d31861e76/recipes/maxframe"; @@ -41639,6 +42123,27 @@ license = lib.licenses.free; }; }) {}; + mbsync = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mbsync"; + version = "20170213.357"; + src = fetchFromGitHub { + owner = "dimitri"; + repo = "mbsync-el"; + rev = "a1fbd1a350e7da5cf4da09ded0443bfee826a45a"; + sha256 = "0a52s9pvh83hdj05rg04na6pnr4dra256h64bgdvf65703yfbs8k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3ef6ffa53bb0ce2ba796555e39f59534fc134aa5/recipes/mbsync"; + sha256 = "1q5g76mspi24zwbs7h4m8bmkhab4drskha4d9b516w1f1cyg6hb6"; + name = "mbsync"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/mbsync"; + license = lib.licenses.free; + }; + }) {}; mc-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "mc-extras"; @@ -41681,27 +42186,6 @@ license = lib.licenses.free; }; }) {}; - meacupla-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "meacupla-theme"; - version = "20151027.1517"; - src = fetchFromGitLab { - owner = "jtecca"; - repo = "meacupla-theme"; - rev = "f57542222a3a43af9aae665e05a84a61637ab22a"; - sha256 = "136lh39hakwx46rd1gsmsfhsj78mrpamid766v2vjx9rkkprk0zv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/397ea693de4bdc7499e86af273cbc4152c04035e/recipes/meacupla-theme"; - sha256 = "09q88q2xghj5vn5y3mjrcparfwdzavkgjyg2ay55h7wf5f2zpw2d"; - name = "meacupla-theme"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/meacupla-theme"; - license = lib.licenses.free; - }; - }) {}; mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mediawiki"; @@ -41723,22 +42207,22 @@ license = lib.licenses.free; }; }) {}; - meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: + meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20170104.2224"; + version = "20170212.2226"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "fe384624b5e382b331ff80bc74a17becb5b01c7c"; - sha256 = "1l2wqjdmsh77vcxfmm8437z7rlx1avdk2bvq8w1wmps32gi52lhg"; + rev = "9f73f1b0656a6a2ea55bbacf7659ffd3b35cdd9d"; + sha256 = "0hnhzkkggv035x0qkxmw64migq6v6jpg8m6ayfc95avimyf1j67r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4"; name = "meghanada"; }; - packageRequires = [ cl-lib company emacs flycheck yasnippet ]; + packageRequires = [ company emacs flycheck yasnippet ]; meta = { homepage = "https://melpa.org/#/meghanada"; license = lib.licenses.free; @@ -42568,6 +43052,27 @@ license = lib.licenses.free; }; }) {}; + mmm-jinja2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: + melpaBuild { + pname = "mmm-jinja2"; + version = "20170128.416"; + src = fetchFromGitHub { + owner = "glynnforrest"; + repo = "mmm-jinja2"; + rev = "f39a9bfe9e3001b0141ed3d6a156fbb60a76e25c"; + sha256 = "0p83i4ikd1bj4r0hahwnlj2gliwcgfql5rzvv7phl3nhjinclj55"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/721b9a6f16fb8efd4d339ac7953cc07d7a234b53/recipes/mmm-jinja2"; + sha256 = "0zg4psrgikb8644x3vmsns0id71ni9fcpm591zn16b4j64llvgsi"; + name = "mmm-jinja2"; + }; + packageRequires = [ mmm-mode ]; + meta = { + homepage = "https://melpa.org/#/mmm-jinja2"; + license = lib.licenses.free; + }; + }) {}; mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }: melpaBuild { pname = "mmm-mako"; @@ -42780,12 +43285,12 @@ mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mode-icons"; - version = "20170116.1230"; + version = "20170131.1751"; src = fetchFromGitHub { owner = "ryuslash"; repo = "mode-icons"; - rev = "60d5b4dbbb07d2515f195f8ffe75f12f0913a3d7"; - sha256 = "0ck7v4pzhzymq0cjwyl0iv721k9m0cx36m8ff7lw0bmgbzdi8izn"; + rev = "da41bb7ba35a4ce0a4e02e1ce2fa7fe4190b1bf9"; + sha256 = "0p4jm7klfh27g1wbsa8qm7vlmpqs57pdk2phxq2qwbim095fsp0l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons"; @@ -42839,10 +43344,10 @@ }) {}; modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "modeline-posn"; - version = "20170114.1554"; + version = "20170205.926"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/modeline-posn.el"; - sha256 = "068kdgzzv76ls5hyxs77vzm5ai7x8zcsmhjk78pmfirfrjrxcjgf"; + sha256 = "085q998d7b4i3ay5cg4dcny7jw8a3hbvx2hifshwx4cck10p8f8b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn"; @@ -43047,12 +43552,12 @@ monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monroe"; - version = "20170103.1555"; + version = "20170126.1821"; src = fetchFromGitHub { owner = "sanel"; repo = "monroe"; - rev = "7a72255d1b271ff11ad8e66c26a476aa4542c8f7"; - sha256 = "16laq4q8mc85kc658ni6kflcfinyxl446fdih2llmg7dji0xarpl"; + rev = "03e09ff0c4ae9fb4b0d1d436ca56f36b63e21b7c"; + sha256 = "1cxng7gi2ik57w11li9fl12cp9hiv98ynpm6nr0mw80rvb9qxhak"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; @@ -43086,6 +43591,27 @@ license = lib.licenses.free; }; }) {}; + morganey-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "morganey-mode"; + version = "20170118.134"; + src = fetchFromGitHub { + owner = "morganey-lang"; + repo = "morganey-mode"; + rev = "5cf3870432a2aeb69d373abe63b3be1f325f6d21"; + sha256 = "04xv4v2n03axjlpm9pg3j4zjapqjb7is3anx6laa90zbw3z2iv9z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6d6e3fdf5ab0b51605bbeb203b9fccb6db6ef6e9/recipes/morganey-mode"; + sha256 = "10lmbf21kh0jy567jzx1lam2hqyqygdvnngvxd97nk6pd32hy8s8"; + name = "morganey-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/morganey-mode"; + license = lib.licenses.free; + }; + }) {}; morlock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "morlock"; @@ -43276,8 +43802,8 @@ src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "ad7622969366e40401af877db75940ae23b5e4fc"; - sha256 = "0d2xabp9dkzixn7kqsxpapjcy846wgsh27l468pl2ar6pxnwwc86"; + rev = "67ca629b4bc3063ea19a7fccc693432a4eb10021"; + sha256 = "0i06ms5m7qhv2m1mmgzqh73j9wz3nxygz65p6vsnicxas09w70rd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -43503,12 +44029,12 @@ mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mtg-deck-mode"; - version = "20161113.1359"; + version = "20170121.1322"; src = fetchFromGitHub { owner = "mattiasb"; repo = "mtg-deck-mode"; - rev = "14d117dce8e082eb26007abd01f0e4af3ce3b698"; - sha256 = "03lff20d10s5nzh6jddf8q31lm3c20zflwbklnbsrydm2w5j6d16"; + rev = "80c2a0b61c4fc2d7a5f7e6d1ecbe882b2033a879"; + sha256 = "02x6pmzsg4rczc146d2lvh6jwr857hqq0m44f7017h2wmvhhb9xr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode"; @@ -43566,12 +44092,12 @@ mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mu4e-maildirs-extension"; - version = "20170110.519"; + version = "20170118.150"; src = fetchFromGitHub { owner = "agpchil"; repo = "mu4e-maildirs-extension"; - rev = "c8c22773d13450ed1a49ca05d02a285d479a9e45"; - sha256 = "1jc16dvvgg9x17gckljd013d8rjjbr5992mrrhcnpdn5qvj145i8"; + rev = "5a929e2e37cc48a81f61997ec74abbe6e5f8660c"; + sha256 = "051a5ba04ajyl6vvaysshvvdjmrh3rsm2vb0gcy9jm8rf6rcxbv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension"; @@ -43668,11 +44194,11 @@ multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-project"; - version = "20161204.223"; + version = "20170212.1130"; src = fetchhg { url = "https://bitbucket.com/ellisvelo/multi-project"; - rev = "a6fd748acd9b"; - sha256 = "0j6lq5sxrn5yvxja5ag0q01bic6r6hbnfr7010ahc3bwl78yslc3"; + rev = "7465189ae9ac"; + sha256 = "1zgvg3gx283jgclqyl141p2nbrc21x775d4nnz9fp8bxz3gci7nk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project"; @@ -44292,8 +44818,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "names"; - rev = "00862c57ae6363ba86d1e5ce138929a1b6d5c7e6"; - sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh"; + rev = "65b577b1215c4cfaee1ed5e98b0545e9ef7b9964"; + sha256 = "13r1qmibjikx6hz36m6xf79wap6fci2x7jz7rac5s52hq2hdj2wk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/names"; @@ -44620,16 +45146,16 @@ ncl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ncl-mode"; - version = "20160925.2200"; + version = "20170121.231"; src = fetchFromGitHub { owner = "yyr"; repo = "ncl-mode"; - rev = "8841c2234a6425c4aaccddbf7567828681627dd0"; - sha256 = "1nngh564ggyb2qg8lgblls22ygfpj9dn7l6v50s7df3hy7zhkqhz"; + rev = "cfabbbf5e49a856c9b4cb32408f28ef4378731b5"; + sha256 = "1rq0snv7qxkh1l09ail3mjs2jjrxixryxy6z91maabj7qfp1yrqi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/00cc4705650157621bb0135cc512d57178496100/recipes/ncl-mode"; - sha256 = "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2eea3936b8a3a7546450d1d7399e0f86d855fefd/recipes/ncl-mode"; + sha256 = "1niy0w24q6q6j7s0l9fcaqai7zz2gg1qlk2s9sxb8j79jc41y47k"; name = "ncl-mode"; }; packageRequires = [ emacs ]; @@ -44666,8 +45192,8 @@ src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "95a09d97fdc86a570a9276a05fe42dc3c90dcbc5"; - sha256 = "1lydpljxf0air78qrc04x9g71ixmh5g5q6ln77acnivq9gn3xha5"; + rev = "2f76c26353062ba6578914113ca26c53f5abcdb7"; + sha256 = "1nn6kfg84g5aplis76q7r6wx74rj6r3n6kcdghvsyih77r4r32jl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; @@ -44701,22 +45227,22 @@ license = lib.licenses.free; }; }) {}; - neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20170110.321"; + version = "20170206.804"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "d2ae6ac8a919f164f34c589f2f46ddd140a79f81"; - sha256 = "0xqcrxmpk2z4pd9scqn2nannqy0a76mkkqv9bz037a36w8v481nd"; + rev = "ab9a1559d01857252b85d787666ea24a103003b4"; + sha256 = "04473ay2hcpw696x9k2gh1dvj2h4nb898q4g3nf3b0rdg2cpb250"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06"; name = "neotree"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/neotree"; license = lib.licenses.free; @@ -44851,12 +45377,12 @@ nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nginx-mode"; - version = "20161023.223"; + version = "20170213.1326"; src = fetchFromGitHub { owner = "ajc"; repo = "nginx-mode"; - rev = "a04cef3a07d235eb03bd944fe6923664493896ee"; - sha256 = "0bk5jjh0rz81q27k105f5azvgy1zcn4w33xygzzpblks760dkgar"; + rev = "b58708d15a6659577945c0aa3a63983eebff2e67"; + sha256 = "0y2wwgvm3495h6hms425gzgi3qx2wn33xq6b7clrvj4amfy29qix"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode"; @@ -44960,8 +45486,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "9e71431e6f8323be8ced8997409cfe7a389c6583"; - sha256 = "0lnahkq47x9w8gi89bm91mjvap4dvwpn88pjysmp4ciw04v2h8s2"; + rev = "fb3c70049b82d53101fc6086a1699ecf16966792"; + sha256 = "0amylb876720959hhsd31k025l1d3rv1i9i8qhf2k1skd8xfrvpj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -45002,8 +45528,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "c0d55f918379f46b87e43457745895439a85555c"; - sha256 = "05kmk92f7zzincs84z6zphmwsli6jhb81hha1ili9xibqpg5983w"; + rev = "62ff5ad424547630e70f35406da85fbb5ec3445a"; + sha256 = "1xcx70km6zb8qmnjb2fsk66qmx2lpqv94rfp34a0bpn98an7akwc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -45019,12 +45545,12 @@ nix-sandbox = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "nix-sandbox"; - version = "20160914.1324"; + version = "20170131.241"; src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de"; - sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5"; + rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29"; + sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66be755a6566e8c0cfb5aafa50de29b434023c7a/recipes/nix-sandbox"; @@ -45044,8 +45570,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de"; - sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5"; + rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29"; + sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/nixos-options"; @@ -45124,12 +45650,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20161223.607"; + version = "20170206.33"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "e7d3ebbd12f176707e63766a7a19bcaa08e01331"; - sha256 = "0y8wvagn4yf7fwvwzqcrx46wigmvyl25fa94kzvkanjl04zid3i1"; + rev = "1a6ca91e4a2cb48cccc989b6473191f42b606ab6"; + sha256 = "1kd65x4bg9xrqp7241yxs352p2hiwa5hnggi2sw4718wcfbim1zw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -45268,11 +45794,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20161215.457"; + version = "20170127.1808"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "4a2ce7b5706b53cdd30c474d556f18d731c21bb5"; - sha256 = "1hhdaapyj6kg9zys7fw5rh7rqc4540wyh3c5dkhb4b9jlbzslj40"; + rev = "08343d3da03a11e7a575981fac20ab10426f19be"; + sha256 = "0bbfp7mgcp48qvcxwznncaskihxxf99j8mhsiqww4ll1pfpi1w3q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -45939,8 +46465,8 @@ src = fetchFromGitHub { owner = "lompik"; repo = "ob-nim"; - rev = "71131f184994e0a81ed291fc3faf1a29dae8c5f3"; - sha256 = "011z8scb6pmhkm6qzpdqich4h4pxpac58zirddbrnal3nf37kmqh"; + rev = "050b165817e62067b0d686d96e25bc12fb9c7d84"; + sha256 = "18v4f23rxbl76ldzxmga1dlkammdy87aslk2p6x9l5gjr9w1xz3a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7263ebadeabe36359c14ffb36deda2bc75f2ca61/recipes/ob-nim"; @@ -45977,12 +46503,12 @@ ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-prolog"; - version = "20170102.953"; + version = "20170126.921"; src = fetchFromGitHub { owner = "ljos"; repo = "ob-prolog"; - rev = "7e94309d3a21d7e265f3a85b41801397f286af00"; - sha256 = "0qxpgnjrx04dl43i949vcwv70sc7i23ivyvfk82hdvl8c2lwfd7w"; + rev = "e70a9f9b96fd0fedcc30de7768c870f4b0ee1ae9"; + sha256 = "0vpxnvvmfxqwq1i6wl1gv76dgavcl4sg3f1ma42sq2bldpdn8am7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog"; @@ -46040,12 +46566,12 @@ ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }: melpaBuild { pname = "ob-sagemath"; - version = "20170105.516"; + version = "20170130.1833"; src = fetchFromGitHub { owner = "stakemori"; repo = "ob-sagemath"; - rev = "dfa6cf72a0e38d7d4f0f130c6f2f0f367f05a8ea"; - sha256 = "1scyjca5niiv1ccr18ninpb0fmgyqklbn6z9pja84a2wb1w9r6mm"; + rev = "1d99614509624d7bfd457325ca52f3bf1059f4d5"; + sha256 = "11qsh0lfb1kqiz0cfx7acfpyw0a90bh7r86a4h31d4xl1xfq94sx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath"; @@ -46355,12 +46881,12 @@ ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ocp-indent"; - version = "20170105.122"; + version = "20160613.938"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "4bd1a2a4df1757dfc13e19b29b74e21a9b074f99"; - sha256 = "07ng57g25nik345p9cnjrxf7mpcfi3wqqbmk2i4yxyd4cai8hp1f"; + rev = "5dc0ab3bee633aad64967e79539cdd007bbcacac"; + sha256 = "1d7q3gd6clyhpzy4phi6g5435iz50kba2mbn0jd403x3270gdk9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -46802,12 +47328,12 @@ open-in-msvs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "open-in-msvs"; - version = "20160928.1103"; + version = "20170123.1428"; src = fetchFromGitHub { owner = "evgeny-panasyuk"; repo = "open-in-msvs.el"; - rev = "488c4adb3ad89676472507dae89b1687e43a07df"; - sha256 = "0s6qc7hn6q89nqyra633hvpx4gfas5dwrcjg7ykc306xh72ywnm3"; + rev = "e0d071c83188ad5db8f3297d6ce784b4ed554a04"; + sha256 = "0aiccdcll5zjy11fandd9bvld8p8srmhrh3waqc33yp4x8pjkjpd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09a462fac31a7ceda4ee84a8550ff1db6d11140f/recipes/open-in-msvs"; @@ -47115,12 +47641,12 @@ org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-board"; - version = "20170103.239"; + version = "20170207.634"; src = fetchFromGitHub { owner = "scallywag"; repo = "org-board"; - rev = "55c52745f6f156062a7187795b6b0c6aaa1f1e2b"; - sha256 = "0ca8lbm5gzcmpzwnghs0f8klxrz5sy1brw78h7rhpv4rdwfw1ji5"; + rev = "7f07d1bb5758a28f7e1618a14281ad4da71c26e2"; + sha256 = "18ngnd4fkh59az0mj4lgvp5zil56qxn01d9aif6n6xszfcbgsnj1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; @@ -47159,14 +47685,14 @@ pname = "org-bullets"; version = "20140918.1137"; src = fetchFromGitHub { - owner = "sabof"; + owner = "emacsorphanage"; repo = "org-bullets"; rev = "b70ac2ec805bcb626a6e39ea696354577c681b36"; sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3ab2169c45aae7fb3373bf5df087d9b626167ce8/recipes/org-bullets"; - sha256 = "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/fe60fc3c60d87b5fd7aa24e858c79753d5f7d2f6/recipes/org-bullets"; + sha256 = "0yrfgd6r71rng3qipp3y9i5mpm6510k4xsfgyidcn25v27fysk3v"; name = "org-bullets"; }; packageRequires = []; @@ -47266,8 +47792,8 @@ src = fetchFromGitHub { owner = "dfeich"; repo = "org-clock-convenience"; - rev = "d4f98e95d75d78822ddfab6b67bc971516f9773c"; - sha256 = "0s69jqadrgsmlv74386i900gr6xr3kgr5x1n75gqf4rsdmhx4s5d"; + rev = "2d3fab0991ef7fa8d94c46a63a66abd289c79d9e"; + sha256 = "0dm8mzjy2hldn9lqblrfcq5w4d2byrgggg6wcs9rhdnpx96cvz74"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a80ed929181cdd28886ca598a0c387a31d239b2e/recipes/org-clock-convenience"; @@ -47280,22 +47806,22 @@ license = lib.licenses.free; }; }) {}; - org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-clock-csv"; - version = "20160906.1047"; + version = "20170130.2213"; src = fetchFromGitHub { owner = "atheriel"; repo = "org-clock-csv"; - rev = "62acbb8673cafc9db00fde7ea1804cde6a781cd0"; - sha256 = "16gq2yyjzfyra0gzabcd9pclickqy4hal0kgx2xmdfxpxchfk0gs"; + rev = "59482e800700e66db5381661c1e6b3edb2c03a34"; + sha256 = "099mjbd0n7azv4v3i4a7fw3f85c16ck334sqv2l92k0dpsjdmnrx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv"; sha256 = "02spjrzdf1kmvyvqkzg7nnmq9kqv75zwxn5ifqmg0f7a1gw28f0l"; name = "org-clock-csv"; }; - packageRequires = []; + packageRequires = [ org s ]; meta = { homepage = "https://melpa.org/#/org-clock-csv"; license = lib.licenses.free; @@ -47451,12 +47977,12 @@ org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-download"; - version = "20170105.1740"; + version = "20170213.1151"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; - rev = "bbfca2fe4149f21105c70d3df76bb789b3868643"; - sha256 = "19729mfbvsi2gpikv7c6c5a3ah7vrxkjc3s863783kginq28n8yl"; + rev = "137c3d2aa083283a3fc853f9ecbbc03039bf397b"; + sha256 = "0c4vvpccmc60bavywsd0lijzyzchs6cdmp8y36d70lmp4s66863v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; @@ -47765,12 +48291,12 @@ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "20170111.2044"; + version = "20170207.2145"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "af4115f4e8b4e77de5642fb28ce6d5e0d7cb0b70"; - sha256 = "1g775f9gpl0nqq3vn6h9cnjazimn9bjwk31dc7fdylz3nf7f3h03"; + rev = "e665315fc041851e19c759e51173f9ddc0445512"; + sha256 = "0fgir67cm6gmwj80gmhblg9j7pp6qvkksm9qnsdj2r5q1c9s33kc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -47786,12 +48312,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20170104.648"; + version = "20170126.234"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "008ef4549135a5daa2382e57a4d04a439d22cdc6"; - sha256 = "1m0fmyj4rzc8hdxjmfzianzna6929p5xfrwj0azybv9cmcwfyw8w"; + rev = "3f29a64655cd03c662fa24ff687e5ed29d6bdd9e"; + sha256 = "1a5z726hfaimjhidxskw7fr89hc3i0wl5hmpk8x64q87an0mkcmi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -47852,8 +48378,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "4d0609f8af0db7248fa5f8eb2b69ee02665e8cbd"; - sha256 = "1kv13imxw6k4mv8hi2ns80p78zc0r8y91mcv01nvpzvh28qnkwa2"; + rev = "2e3270984332013b8df22d2995bdeba256534a63"; + sha256 = "1ixr16v2gfg5gyj42gic6kipqa3c8vv6iq1qdj9gj0ky6zlyy9wg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -47872,8 +48398,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "4d0609f8af0db7248fa5f8eb2b69ee02665e8cbd"; - sha256 = "1kv13imxw6k4mv8hi2ns80p78zc0r8y91mcv01nvpzvh28qnkwa2"; + rev = "2e3270984332013b8df22d2995bdeba256534a63"; + sha256 = "1ixr16v2gfg5gyj42gic6kipqa3c8vv6iq1qdj9gj0ky6zlyy9wg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -47889,12 +48415,12 @@ org-mime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "20170110.2011"; + version = "20170205.149"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "e554d8821d8513d4e8c33ca6efb147e3dfce2a5b"; - sha256 = "000zgp2palvn12rahbjg8vrl4r3x2gjzbxxw2fkaqc2bx4rkjiv7"; + rev = "a0b82a6c1a0dbcf5b7bebfe2e5817d54a1cd3cc8"; + sha256 = "11wldx6c53ncw3pmdwxn31q82vkcffqvr2cfphl5bhb4q8r5lrjn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -47994,12 +48520,12 @@ org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-page"; - version = "20161121.2129"; + version = "20170206.1845"; src = fetchFromGitHub { owner = "kelvinh"; repo = "org-page"; - rev = "bef1e2fbcb60e85b3d27887fb0c6c988a18a0b59"; - sha256 = "1yhy98rg7zqj91hkabkf00mzgzk9cb5mvp5mad09gfy9ijkkm6sg"; + rev = "c2f54f310e0f50b5ca291a45356717e932505bb5"; + sha256 = "1q76daimscr2mp0wi6cp0mbph7cp4gdm818cdi76rsz48xa83gxi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page"; @@ -48021,14 +48547,34 @@ license = lib.licenses.free; }; }) {}; + org-parser = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-parser"; + version = "20170129.1041"; + src = fetchhg { + url = "https://bitbucket.com/zck/org-parser.el"; + rev = "02aab579be3f"; + sha256 = "0yb8zkq6iizpkp331wg6l9ksvy1z88pq3g12ya7ral992yn5yb8z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser"; + sha256 = "06yb78mf486b986dhvqg3avflfyi271vykyars465qpk0v8ahq8h"; + name = "org-parser"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-parser"; + license = lib.licenses.free; + }; + }) {}; org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-password-manager"; - version = "20161226.1624"; + version = "20170124.549"; src = fetchgit { url = "https://git.leafac.com/org-password-manager"; - rev = "b4c8de24950d9c13e90277359d078d2dc2b01063"; - sha256 = "0azk28ib6ch3anav7xlw41lqx5lfcqwg85sai4jk6gb9qgnibv5v"; + rev = "a982506652a2f5f4afeb338238e724d361cbc74d"; + sha256 = "0x9f0vlgawbvga56yj95pdcx1j9r51ax76xsbbyrir0iyawgh258"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager"; @@ -48239,12 +48785,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20170107.1308"; + version = "20170209.623"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "31e2e9cd247a4613bcdf45703473a6345b281ee5"; - sha256 = "15lr7v5p1n46m3lfh84fwydkbxj9x11vd81x6i5adgj68msh0pcg"; + rev = "2d9c53509e6930d8857ac74ef710637b7c34d77c"; + sha256 = "1ja8b60w5snnkks94qb63fy6rscwcpkx3anaq6z9fdv78yjbx1x1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -48739,12 +49285,12 @@ organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "organic-green-theme"; - version = "20161222.232"; + version = "20170125.606"; src = fetchFromGitHub { owner = "kostafey"; repo = "organic-green-theme"; - rev = "dc66586b8581b35a723f68211fb1efeb7f00ffef"; - sha256 = "012s9m3cysnfbr0s2l53inm3k06k7ra8jlp68cdnslhb41az2kp7"; + rev = "5f8ce452d16f1acbd18a6963f2c042851968dd8d"; + sha256 = "0irkcjb6vxb7kf9fr4s4ap6lighhh7h6mwfamcwcacgwfvs4zs7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9383ef5f0372724b34f4bb9173ef8ccbb773e19e/recipes/organic-green-theme"; @@ -48781,12 +49327,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "20161105.857"; + version = "20170118.1647"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "adcfef22dc9bfa6503513d0a937bf4b32ad7ab94"; - sha256 = "0f3lqw2b9xr0278s7502sa2hkyhml45j8jpssaicyliz2k1kiyzv"; + rev = "cbce5871fe267fef725631b0b7365952c35ae401"; + sha256 = "00iwp3bajr9hxs55rj3ka5bymhp5icsq8m44z514sb8h54fwapb7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -48928,12 +49474,12 @@ origami = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "origami"; - version = "20160924.218"; + version = "20170129.805"; src = fetchFromGitHub { owner = "gregsexton"; repo = "origami.el"; - rev = "a77d7f16345296bbbccc4f3d0fe45587c3907493"; - sha256 = "13w5mcdxvjzbixbg5kszlqrzrd5l51ddx1z65ir8zjp4xnbf9ysn"; + rev = "5630536d04613476e13b413fe05fd0bbff4107ca"; + sha256 = "1w6cyyvjw6x4x0a7mbybw37f70cdnwajv8snvmnrqd73vggm70fd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b816be227dfc7330292a50346c4bb37394d3e998/recipes/origami"; @@ -48991,12 +49537,12 @@ osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-dictionary"; - version = "20161207.810"; + version = "20170208.505"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "osx-dictionary.el"; - rev = "0e5e5f1b0077a62673855889d529dd4f0cc8f665"; - sha256 = "1zpr50q7i4wg1x7vsj69rh1b8xvk9r0591y4fvvs3a2l1llca2mq"; + rev = "ec16c40cc4db0140db1cf6ad1fb1198c7c344b2b"; + sha256 = "0n09s09qaqwdrpd4dgxj16bh3lgc8nzdld49z8zkipf3cfh5v040"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary"; @@ -49264,12 +49810,12 @@ overseer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "overseer"; - version = "20160517.2343"; + version = "20170207.2241"; src = fetchFromGitHub { owner = "tonini"; repo = "overseer.el"; - rev = "817c2d4c40071f1cd11fc91c60a1eb44c9f1543f"; - sha256 = "0pzrsag2hxg4kys57w2ragk6kfrpilaamwrzw0czi53r6vmddfdp"; + rev = "3269801dc5145d41c11599430229340e6dfa6cc6"; + sha256 = "1zjp1bw7ipg4ibabrc0wzzsvd4jydjq571768v2hdpzcdw36d8f7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82e6b86f20a2d2d687b13091da31150c467bf271/recipes/overseer"; @@ -49352,8 +49898,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "0e9fa4ba5fc454e2312f8b3a6eb86cb63d3ff7ec"; - sha256 = "12qp9s9h56230882dfqz5006f5mjkxxvsp87y8n1jyx4vs10rk4i"; + rev = "b3d9d6310a411ada0212c702a75f32dc2f7743a1"; + sha256 = "1hllqlh89y4cn7jx72bxljvvys6avgnq2qb2543q8iabh1jj4q2m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -49852,12 +50398,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20161124.1615"; + version = "20170203.429"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "633fbff47fd4872d55d672029300c043e13e966e"; - sha256 = "0mr0yry397777gmvqj3z7b9zy47k3k3ghr03jyjafra4kjm85x00"; + rev = "77bb3161c99949949426a544444b27eeb8b3ea2f"; + sha256 = "0kvb46n9578xs1nx1y5p21akia9i1jycj58zyy0zq9iqj82lbb8d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -49936,12 +50482,12 @@ packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "20160523.600"; + version = "20170130.1015"; src = fetchFromGitHub { owner = "tarsius"; repo = "packed"; - rev = "765cd52712f0daf40c45d169cc062b6bc94aa807"; - sha256 = "1kjcb6z08bj5ysxrykgz3x6bz2122yycpjhbv875ppc5ihls88xl"; + rev = "d2f01bffc987b226f618dda0663a1e233161518d"; + sha256 = "16xwgi0zkbbvkbxf0ld6g4xlfd95j45sca57h162wld6l27jrv4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed"; @@ -50080,12 +50626,12 @@ palimpsest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "palimpsest"; - version = "20161029.400"; + version = "20170119.1232"; src = fetchFromGitHub { owner = "danielsz"; repo = "Palimpsest"; - rev = "7f5f43080155c53099f3174cb09684d77924d771"; - sha256 = "1z2acbmxsxfcw5d39zdzhg6l3r24m22nrfrp18j52d4i2jqawjfa"; + rev = "e6d5944393c260ceb724462c84046cc62c9ae916"; + sha256 = "0vw3lv02rf8f9vm379zff4l85psjwxsrvba4xcpdkqi1w4rbsnxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14f6d011a0314637a2f4c1b00efa4912e67b7fa4/recipes/palimpsest"; @@ -50203,6 +50749,27 @@ license = lib.licenses.free; }; }) {}; + paperless = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "paperless"; + version = "20170213.503"; + src = fetchFromGitHub { + owner = "atgreen"; + repo = "paperless"; + rev = "abf43ed368c909dfeeab1faa5b91763976945b81"; + sha256 = "0qlwbwym4575kxxssi9y2g60ai9k5pccbjp963rkwsnabczg0lxg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/921ba9059183a57e08f9c79af2b28bb77a210508/recipes/paperless"; + sha256 = "02jbqdhbq4b3yb9lrqkwaxmyymvcqrjswhzp4sbccw6arla4q7wg"; + name = "paperless"; + }; + packageRequires = [ cl-lib emacs f s ]; + meta = { + homepage = "https://melpa.org/#/paperless"; + license = lib.licenses.free; + }; + }) {}; paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; @@ -50351,12 +50918,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20170113.956"; + version = "20170126.2111"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "a91b1ee5392c6a98c102ddba2f0c15ab67f8ad1b"; - sha256 = "09337fpv492rzd2ah7d8kxyv5spcgwf58xr943ya09sgi2invkbx"; + rev = "12f54f661180f894be9bc0fd956b30a69b3f39e0"; + sha256 = "0w44w2qgvbv1m5dwyqa7863r1r32fva5rgc0w14srpak41nn3bj2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -50640,6 +51207,27 @@ license = lib.licenses.free; }; }) {}; + pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "pastery"; + version = "20170206.1934"; + src = fetchFromGitHub { + owner = "diasbruno"; + repo = "pastery.el"; + rev = "3f60a2660613c09be5a0b6e299828b44ee3c8732"; + sha256 = "1dzbkiy2qjdq4isrpiwj25qj069nhydzngg6avyh2c2qmxkibjsr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6058218450071db0af9a5b8ce8ec09a735c4ab66/recipes/pastery"; + sha256 = "006qawjc86spbbs2pxvhg9w94rcsxap577cndqwaiw1k0cc8vkhp"; + name = "pastery"; + }; + packageRequires = [ emacs request ]; + meta = { + homepage = "https://melpa.org/#/pastery"; + license = lib.licenses.free; + }; + }) {}; path-headerline-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "path-headerline-mode"; @@ -50689,8 +51277,8 @@ src = fetchFromGitHub { owner = "promethial"; repo = "paxedit"; - rev = "48df0a26285f68cd20ea64368e7bf2a5fbf13135"; - sha256 = "0z32lb2s943vk9fincsifdrjqmk7ks2skpzr6g4s3gd40sz5imfz"; + rev = "09f3d5aeb108937a801e77ef413e29eaa4ecc4be"; + sha256 = "1yd5wh8fsxh3v2fgpxm2cd7h9xz9zfj2d8g4bh4gzqjwrmn5rlgl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/106b272c2f0741d21d31a0ddfa4f521c575559c1/recipes/paxedit"; @@ -50811,12 +51399,12 @@ pcmpl-git = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcmpl-git"; - version = "20160110.2255"; + version = "20170120.1659"; src = fetchFromGitHub { owner = "leoliu"; repo = "pcmpl-git-el"; - rev = "1f866246e14756792e66643d89e2e2e0ec8e2635"; - sha256 = "0pspxgicc0mkypp94r0jydmkjr3ngv8y4w1xpj93kp79hnvyls0a"; + rev = "9472ac70baeda025ef7becd1cf141d72aec93f32"; + sha256 = "17y3rdp7fgyg4i9hwyzgpv1d19i5c6rqdf1gm5bdm2csk12vfg9n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a51c16bed8d0a2fecad0ae9580d58cd44cc8930/recipes/pcmpl-git"; @@ -50958,12 +51546,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20161207.521"; + version = "20170130.300"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "3ecbbaf1606d23fb1abbefb6d359f47aaf153f84"; - sha256 = "1jn118f3mdz7wb1a58myahj4ir29rwxbfx1595gjcxkkpw0cyw11"; + rev = "3a32d2420cc40ed864215f75aae4f6d868dc1cd2"; + sha256 = "15j8ll2rna5f0a4zq2bflbn888c6yp852i405qlcxcjvs3jalxcy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -51230,12 +51818,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20170115.651"; + version = "20170123.1056"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "06d56333d738c57fa543e47e7eb1c4962bd14344"; - sha256 = "0khzfh7qqfqpmjqb0kaz3s5kpf1a8inxln5awap5xh2z6fv6wysy"; + rev = "70290b60fd20850c728a63d763037fac69fd1874"; + sha256 = "1dw17m0dczry3chyw3yks33jqzr7zgccx3xdjv0lziwfxdnwkaji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -51293,12 +51881,12 @@ perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "perspeen"; - version = "20170117.417"; + version = "20170205.300"; src = fetchFromGitHub { owner = "seudut"; repo = "perspeen"; - rev = "057f145f88fdfc021c574b7c263269e381494f4b"; - sha256 = "1a5cjvc21ga2j2y7rxcfxwkc0x9v5mrwla9prm021q4sg07gvld7"; + rev = "8fc32cf57fe8f38bf47e8bce99058ba3cc2561ad"; + sha256 = "1n69jshs35cafx6p7ibdr1mqzbp2k1gdknb1k9f9nfzasr0nma56"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen"; @@ -51395,6 +51983,27 @@ license = lib.licenses.free; }; }) {}; + phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "phan"; + version = "20170205.604"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "phan.el"; + rev = "6442663bf7618bc614b6c47b0ad7bc591c68f947"; + sha256 = "0s38vbnsbpazca0jsahjmms7qgq74gsvfn2zkrfkhx9y8cpfxrrb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d591d9ba70b1e32f25204ad9409aad78fd68a93c/recipes/phan"; + sha256 = "16r1d2bgbb2y7l141sw7nzhx0s50gzwq5ang00y7f4sfldqvshzf"; + name = "phan"; + }; + packageRequires = [ composer emacs f ]; + meta = { + homepage = "https://melpa.org/#/phan"; + license = lib.licenses.free; + }; + }) {}; phi-autopair = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "phi-autopair"; @@ -51419,12 +52028,12 @@ phi-grep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phi-grep"; - version = "20150212.724"; + version = "20170206.2055"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-grep"; - rev = "9f1eb3548311816920864a171de303245a001301"; - sha256 = "1rchxhp4kji5kbg8kzkzdbfy8sdbgbqd5g59cch7ia9agh5jvwyx"; + rev = "efccc26f3beb6a3d8c1b655c31aa3c457115cfa4"; + sha256 = "0r67zzc6b2f330zixywxcy4xxd9hxww7x77brrs242bcgi2d7ryc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/992655fa4bd209abdf1149572e95f853e595125e/recipes/phi-grep"; @@ -51671,12 +52280,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20161217.537"; + version = "20170201.1842"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "a6c998937341f49138f07c15050efe7e5809be23"; - sha256 = "1g0m9vsx0n2rzph4ipyab8fl6bv26y2dmyrgkici545k2mhhhiqp"; + rev = "2a335398928a4fdab24335ed7aceed95c1bd0871"; + sha256 = "0i8ns9jncih3s33wv66gkd45brixlc4smbssb3j47dqp3drpn0nw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -51696,8 +52305,8 @@ src = fetchFromGitHub { owner = "echosa"; repo = "phpplus-mode"; - rev = "e66950502e7c9a9cd39c9a619ad66fc54c12aafa"; - sha256 = "0f1n0jcla157ngqshq5n8iws216ar63ynjd6743cbdrzj0v030wg"; + rev = "36efff84dd1303eeef5fc116eff0ac89a0248c74"; + sha256 = "1aw3sp3wa58m7csml2cfys8s8d0x1m9bkqvxqqxz52iyf8ji0cz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f10631b740eea56e7209d7e84f0da8613274ef1d/recipes/php+-mode"; @@ -51776,12 +52385,12 @@ phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "phpunit"; - version = "20161219.319"; + version = "20161219.320"; src = fetchFromGitHub { owner = "nlamirault"; repo = "phpunit.el"; - rev = "791d1b33b63887cdeaf287fa657b8109f9d1dd18"; - sha256 = "0j9ym19pz17wsjh1ky65x9mz8aiiryxbw1nsygvy9isbdzjx591k"; + rev = "5ca5ee53e16b2cf0939dbeacbf1dffa13b41b48f"; + sha256 = "0gmb5fxnllkjg45cmqpr2gy2k6qhg1r6j2w67qbpir0x4h3q2x6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit"; @@ -52133,12 +52742,12 @@ plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plan9-theme"; - version = "20161102.1954"; + version = "20170129.553"; src = fetchFromGitHub { owner = "john2x"; repo = "plan9-theme.el"; - rev = "6f1aaa35f57fc451e4c06164e74f61e17ce1cacf"; - sha256 = "0cfs7qxz16aiz43pk4dcg3nvhs5r64fgy3476wpy0fac0fm275rl"; + rev = "db36861907144674a2526fed3ff733c53489b7f5"; + sha256 = "1sxx749xwxxab3k98wb4gpvy723kw5lcm7zhvvbjbgxr43lk6d05"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme"; @@ -53560,12 +54169,12 @@ projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, ripgrep }: melpaBuild { pname = "projectile-ripgrep"; - version = "20161119.59"; + version = "20170211.857"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "876d9b410f9a183ab6bbba8fa2b9e1eb79f3f7d2"; - sha256 = "0s2vg3c2hvlbsgbs83hvgcbg63salj7scizc52ry5m0abx6dl298"; + rev = "73595f1364f2117db49e1e4a49290bd6d430e345"; + sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep"; @@ -53602,12 +54211,12 @@ projectile-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sr-speedbar }: melpaBuild { pname = "projectile-speedbar"; - version = "20160630.947"; + version = "20170127.810"; src = fetchFromGitHub { owner = "anshulverma"; repo = "projectile-speedbar"; - rev = "a00c6c0e52acd2223997b1a7a996cd786e68f6f2"; - sha256 = "0bsk1336ak5bq9v26m2ql61yvhv15gyh8wrc6j4c655lxysbq9gs"; + rev = "1b9b3ae7624ca58a41ca7e0d0eb37556d3105c44"; + sha256 = "0src453yf63j5dhndrqjx6gh6nfm5c83y2xj2ibk3sj61x9daxj2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8cb5a175258404c347ffa30fca002504467a0/recipes/projectile-speedbar"; @@ -53620,22 +54229,22 @@ license = lib.licenses.free; }; }) {}; - projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "projectile-variable"; - version = "20161109.625"; + version = "20170208.918"; src = fetchFromGitHub { owner = "zonuexe"; repo = "projectile-variable"; - rev = "dedd0f1669d9498d59231912c4ee80a1080ac93b"; - sha256 = "1wmwy5iamc2g5grhshss0cmxjspz83kl8iclkv42c4vc1l1nsgfw"; + rev = "8d348ac70bdd6dc320c13a12941b32b38140e264"; + sha256 = "0l38nldx6lwjb7mxixykiyj10xwb35249dxfg0k2wkmb2vy1fkxs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable"; sha256 = "1cj8nwxf1jp5q5zzxp92fxla6jhwzd21gw649ar6mygi4hgymsji"; name = "projectile-variable"; }; - packageRequires = [ cl-lib emacs projectile ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/projectile-variable"; license = lib.licenses.free; @@ -53704,6 +54313,27 @@ license = lib.licenses.free; }; }) {}; + promise = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "promise"; + version = "20170213.426"; + src = fetchFromGitHub { + owner = "chuntaro"; + repo = "emacs-promise"; + rev = "f109b089a387af081c1dfceb29aea14864f31bbf"; + sha256 = "1g9f7vbbxk1qrbr8bcza1f93a9h4inh7qlqmizpygil0s17ng1kk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise"; + sha256 = "1y1v3ikcmh9yp5fdwagcjg755bgkyqk714lb6s1hb2606m3ia03s"; + name = "promise"; + }; + packageRequires = [ async emacs ]; + meta = { + homepage = "https://melpa.org/#/promise"; + license = lib.licenses.free; + }; + }) {}; prompt-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prompt-text"; @@ -53816,8 +54446,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "c9cd6acd71e928164db10602b9d0837216ee367e"; - sha256 = "0rm2476gvsqsyhblw0bwa4qacpdckp6r44d2qrznysdq9086lyjj"; + rev = "d2dfe46b2789dfe155559508c3f567a746a50616"; + sha256 = "0sywn6b6m2vbdkv4vycrhlg1l3hjmcpvbps0v35wqk1ll1l66rqh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -53830,22 +54460,32 @@ license = lib.licenses.free; }; }) {}; - psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + 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 = "20161220.553"; + version = "20170131.23"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "5a1cce36241cd0ec3781d748d6ef151e685079a3"; - sha256 = "191gvvliarvvkcjw54ajjfshv6n29sk5m0dj3h8j5zw5ndnlw6cj"; + rev = "4a78aac90d84ea7aef6219497bd75c3ead988806"; + sha256 = "04qckg29wgzcr4z696s5wm4w8lrq3m799p447l87z5i23gk4hw7j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide"; sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9"; name = "psc-ide"; }; - packageRequires = [ cl-lib company dash dash-functional emacs s ]; + packageRequires = [ + cl-lib + company + dash + dash-functional + emacs + flycheck + let-alist + s + seq + ]; meta = { homepage = "https://melpa.org/#/psc-ide"; license = lib.licenses.free; @@ -53914,22 +54554,22 @@ license = lib.licenses.free; }; }) {}; - psysh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + psysh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psysh"; - version = "20160711.1048"; + version = "20170205.1142"; src = fetchFromGitHub { owner = "zonuexe"; repo = "psysh.el"; - rev = "6932f03447c3d821e4c03e99f1630928f0979452"; - sha256 = "00dssrdsdvwdg6a6fwl3wv0y94axcd4jb3b3ndd1p3bcr56fxq49"; + rev = "429b59ba8fd5ac7b6d3c6c4e3ad72867062c96db"; + sha256 = "0ldv1lyra05g91hdsif131x7yqdmwld8hdpg4h3qi040kls9bix1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3131d9a0ad359f15bc3550868a12f02476449a/recipes/psysh"; sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5"; name = "psysh"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/psysh"; license = lib.licenses.free; @@ -53959,12 +54599,12 @@ pug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20161221.1154"; + version = "20170127.1949"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "8967d57715ad303b9c987f4390a18c51c2f30cb3"; - sha256 = "0kk5i7dynxg53g7wx5k6lkk1015pqphxzanqw0m6nhvv1p56w84x"; + rev = "83599129c0de6f9f5082d019373c3d9347150191"; + sha256 = "17fwl967kw0kykakvga9vk7i294y5iysff263ir4y6vsnca3syn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -54043,12 +54683,12 @@ puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "puppet-mode"; - version = "20161204.713"; + version = "20170213.207"; src = fetchFromGitHub { owner = "voxpupuli"; repo = "puppet-mode"; - rev = "bfa9512bcaa91cc2068d280d646d7a794da82905"; - sha256 = "09jfb9xldpcg7z9hh7yka1pcrm008h6sx209lhnwmg2qn5dj4rsb"; + rev = "03f608234ed0cf403966454de6758ec7fc9c784d"; + sha256 = "11kqbi4bjwn9cb48wn1nfy4d8rln07wmpj263cpb3npm1y6hfvpp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode"; @@ -54151,8 +54791,8 @@ version = "20160718.857"; src = fetchgit { url = "https://git.flintfam.org/swf-projects/emacs-pushover.git"; - rev = "0d821fc23818918bf136e47449bce53d4e51e404"; - sha256 = "0v0dkhymh81z1wcd3nm5vrs5scz9466brr8xng0254bi3yn0yi57"; + rev = "c43f149eaef832f6af399723a5a59424aa093aaa"; + sha256 = "0vrx8m7jcxavbfsyh35mf289vfyal0yrfl6h2m2yfx81whbinb5j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/pushover"; @@ -54168,12 +54808,12 @@ px = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "px"; - version = "20141006.548"; + version = "20170123.851"; src = fetchFromGitHub { owner = "aaptel"; repo = "preview-latex"; - rev = "c698a650997a1d5b06b92acc8f30d620342e1f37"; - sha256 = "10g4imxgpv7a0j40qkx7xf2qnyz80ypd0mv0lf47n9dwln5byln3"; + rev = "446f2c4670ae5a0e62393871190423333c531660"; + sha256 = "02rr4akm93c42zvlm5l1q8q7wipa051bcfv6h52p6fksw18ablha"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/326fc9b057a5016248ac36ca166e9a38f13babf6/recipes/px"; @@ -54486,8 +55126,8 @@ src = fetchFromGitHub { owner = "JackCrawley"; repo = "pygen"; - rev = "3a5d1d1a0640865b15be05cd1eeb33bb4793b622"; - sha256 = "0fzpvdwb7hhmfmjxzvap8413bc81lrx8r3ij3yasqaxyqw3a6vy1"; + rev = "430e2a059b6e2b0d76700cf79a3de55d9deefd9b"; + sha256 = "1blb9j3y1vfph0gxsslr4gw2diyqqb6xbkrkkcp8vzmx4jr06ki3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e761724e52de6fa4d92950751953645dd439d340/recipes/pygen"; @@ -54500,22 +55140,22 @@ license = lib.licenses.free; }; }) {}; - pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "pyimport"; - version = "20170117.402"; + version = "20170120.307"; src = fetchFromGitHub { owner = "Wilfred"; repo = "pyimport"; - rev = "e2f6d2cf5a6772a8de698e67768ae2f82a43419e"; - sha256 = "0lkkycflmkzziwr90njx8d68903m1bpb71awlb23dslw92qvl3fj"; + rev = "60725d1632562789374808f6c1496e76ae751fcd"; + sha256 = "1ldj79sg8ps1n7wzymyhsdh3gfrrm48dhpb08ihi3ng126qdikxs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport"; sha256 = "1qwigplawknykw1kbm5babyyknzn43ddhbdpahvzh4wy3kycn6n8"; name = "pyimport"; }; - packageRequires = [ dash s ]; + packageRequires = [ dash s shut-up ]; meta = { homepage = "https://melpa.org/#/pyimport"; license = lib.licenses.free; @@ -54549,8 +55189,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "da1da56853380a5a387ad287f4398402b14ef123"; - sha256 = "1rvflbiz6ick1v2v6fw3f227rgs5fvhxaxyhvri0lv5n6ixljk8l"; + rev = "62361d10f5dc5fa751038745d23e06b5a9c5bc56"; + sha256 = "1sa4vqpqmgf0pagn2y72vvfki7jgqrnaigwfxnhjwfi6x3diz2fh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -54692,12 +55332,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20170117.130"; + version = "20170211.1101"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "d20b482c2c10f086174c6bf7d5aa86867d9a9b8a"; - sha256 = "01jhzrm4w4lpslivkc1d9f00qmnnrfai5agl7pv6fjfhd7njwzg1"; + rev = "eb03f0172efe5c368a830a8b9ca15366feaf083d"; + sha256 = "0pjq4a7gkzysmhwr1i3bzfnqi33899j1l13n1ij6a4bdy8km0hm4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -54797,12 +55437,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "20160527.442"; + version = "20170211.456"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "726940c59d584a7e3a6647e149c20e426c3d883d"; - sha256 = "1fqp3khz8rl0frg6kaqj53p0w07ricbnl2xw57c4w776jnmc0npa"; + rev = "3fd0fad48cfdc978b3cbc2da56b26af0e33dd94c"; + sha256 = "09mqkqdp615c689qz71q94ynyysiz4qc280cvznp6k4w28nskbwf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -54881,12 +55521,12 @@ quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quasi-monochrome-theme"; - version = "20160913.638"; + version = "20170124.136"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-quasi-monochrome"; - rev = "75c515a30a77aa4661e41d67e5bba13f422bdf60"; - sha256 = "1932vjindz0mkfizbs1d19af9p78kl9cd05isjbd5sjwzs420bd9"; + rev = "7d3afe41c2696ee25e3e4bcce987af1f589208d6"; + sha256 = "0bn1yzxzj6r1k3xcp45l04flq4avzlh0sbjfyiw4nglfhliyvwcf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9c8498e4bcca19c4c24b2fd0db035c3da477e2a/recipes/quasi-monochrome-theme"; @@ -54902,12 +55542,12 @@ quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }: melpaBuild { pname = "quelpa"; - version = "20160818.2249"; + version = "20170205.2155"; src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa"; - rev = "e49a855cf699931cad7ef339a32812498f94e048"; - sha256 = "1iwrcm1pw8pjif1jbh522zivlpw7cpdrd91n99pcj4a8sv7wsc6j"; + rev = "c1fe1dce4740ca1fcc3ac4c72db6999579d867a1"; + sha256 = "1m0mx8marrhc3wb925x66rpr15ynax2vx0crljqqsxk04bralj27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; @@ -55007,12 +55647,12 @@ quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quickrun"; - version = "20170114.645"; + version = "20170129.650"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-quickrun"; - rev = "70e93e06778f44113f405aedec6187b925311d57"; - sha256 = "0swbgsidq11w7vyjhf06dn8vsj06j9scj8n2dm9m7fasj0yh3ghw"; + rev = "572869b70f8987306f4d938badf37bbf5c08b518"; + sha256 = "0zw3hyydqs616r96snns5mwxcn2il5hldiy8jpbyqh32mlam8w8f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun"; @@ -55091,12 +55731,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20170104.754"; + version = "20170203.1014"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "351aa58d75491c789280a3703786f35c8be28bec"; - sha256 = "1dfmjfw0sz0mfqry65nq7811fv4lydqvl8v47k9jw7prw4g29hhr"; + rev = "d010a865355e9014f1a897de587cacbb6cf23aa4"; + sha256 = "1n15vnq21kym4ani61pf35a80kmp3i17hfn1dj7ayx5q2ifi0qi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -55175,12 +55815,12 @@ railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-reloaded-theme"; - version = "20161115.2210"; + version = "20170124.1912"; src = fetchFromGitHub { owner = "thegeorgeous"; repo = "railscasts-reloaded-theme"; - rev = "cce0e4ae6527e84e2ae3deb8b3c7770dda225853"; - sha256 = "1li86qpbjg8sm9q4sl8cffc0fni6mwx8180x8zlmsxdnhqic5nvd"; + rev = "318c9a812d53884da1a9d67206fcfd9ded4d320f"; + sha256 = "1al62r2fys6z1ja8zbh6yskprp1iq03l2jbnwbx8i3gd2w0ib7qk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; @@ -55364,12 +56004,12 @@ ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ranger"; - version = "20161002.2336"; + version = "20170207.2133"; src = fetchFromGitHub { owner = "ralesi"; repo = "ranger.el"; - rev = "584e4ae8cce1c54a44b40dd4c77fbb2f06d73ecb"; - sha256 = "01rphv92g1r0cw5bwkbrh02s0na7fjrddxx1dckk2y7qr97s7l8j"; + rev = "efd54e6090114138f6b3acaf21168eca29363cd4"; + sha256 = "02hi45xd6vgaj98v772nmwhwqzlz68d9h5ywndp3i18zddnpr9y7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger"; @@ -55448,12 +56088,12 @@ rbt = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild, popup }: melpaBuild { pname = "rbt"; - version = "20161220.1352"; + version = "20170202.1502"; src = fetchFromGitHub { owner = "joeheyming"; repo = "rbt.el"; - rev = "25ed055ffa444cb077042f95622ef253759f3ee2"; - sha256 = "1gv0bm25c5v6sygpcxg1h7cnn8md8q7njh8jz1was5cmgkq3i3kg"; + rev = "32bfba9062a014e375451cf4203c29535b5efc1e"; + sha256 = "0jzhyf42m9gqcnsz9gxc9wk8bbb9a7fj78swwyj0wqn9jm8jxbra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7241985be1e8a26a454b8136a537040b7ae801/recipes/rbt"; @@ -55763,12 +56403,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20170117.415"; + version = "20170128.727"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "20b8d5dd7bd96f4e8d143596a6435d84fb8d4125"; - sha256 = "0ckd7jya4368qin90x20dqf5kh3300n03f9g2qb54s93d430n0yi"; + rev = "df6921b587f2e14876ee7bf106b5c1fad81da2dc"; + sha256 = "1sssq5q89qn4jcsl6hmmbq008b23hpaa7jga88wlc867dd5f66d8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -56140,12 +56780,12 @@ redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redtick"; - version = "20161103.1157"; + version = "20170129.1428"; src = fetchFromGitHub { owner = "ferfebles"; repo = "redtick"; - rev = "ac8b213cf3dbd43a86910a152426b14576fbece0"; - sha256 = "1c1hllznnrypbh0cp162kbdcm0vrcsws5nx5l32c6h89n9dm397g"; + rev = "618255aa1100948af29d76d54aca7554fd66aede"; + sha256 = "0zbx9g91xrh7ppaa8lq9mh1ax6k9yv3xsyjiyan9zsji3qzh59qv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3187bd436541e2a5c2b28de67c62f5d5165af737/recipes/redtick"; @@ -56556,12 +57196,12 @@ repo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "repo"; - version = "20160114.1114"; + version = "20170213.139"; src = fetchFromGitHub { owner = "canatella"; repo = "repo-el"; - rev = "98bde6fdc840d42a24c5784ee440cad39e8264d9"; - sha256 = "0hs80g3npgb6qfcaivdfkpsc9mss1kdmyp5j7s922qcy2k4yxmgl"; + rev = "d7b87cd515bad8a67d3a892a46a23f5fe81e08de"; + sha256 = "0rbvcvm7bfr6ncji7cllfxyyr6x7n9fx863byp243phsj3n93adz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1729d4ea9498549fff3594b971fcde5f81592f84/recipes/repo"; @@ -56595,22 +57235,22 @@ license = lib.licenses.free; }; }) {}; - request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + request = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "request"; - version = "20170113.423"; + version = "20170131.1747"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "e2b031a4e7655ce7513b8e7d7f83c024cb2a9f35"; - sha256 = "0r6wf3h7rwjid818aqrvf2r6dwq02mwn3y4lj7lrkl7vyf5g3va5"; + rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8"; + sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request"; sha256 = "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji"; name = "request"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/request"; license = lib.licenses.free; @@ -56623,8 +57263,8 @@ src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "e2b031a4e7655ce7513b8e7d7f83c024cb2a9f35"; - sha256 = "0r6wf3h7rwjid818aqrvf2r6dwq02mwn3y4lj7lrkl7vyf5g3va5"; + rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8"; + sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred"; @@ -56679,22 +57319,22 @@ license = lib.licenses.free; }; }) {}; - resize-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "resize-window"; - version = "20160511.2005"; + version = "20170130.1926"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; - rev = "dec035ff44fdb743bb2dc82274114dc6ea1851f9"; - sha256 = "1ps9l6q6hgzzaywkig0gjjdlsir9avxghynzx9a3q6h0fpdkpgrj"; + rev = "27364959798de0f019da799975027842c07e7829"; + sha256 = "0x92s4cv9k566rc248zrcmh507df7d19p7b3vcfd0dlfpbqc0qnv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window"; sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l"; name = "resize-window"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/resize-window"; license = lib.licenses.free; @@ -56826,12 +57466,12 @@ reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reverse-im"; - version = "20160813.208"; + version = "20170209.556"; src = fetchFromGitHub { owner = "a13"; repo = "reverse-im.el"; - rev = "76a391a26957eaf5030f85cb0f302a45ea771df1"; - sha256 = "0vjw7l0zgvailxvn1jqfn66hp7bzfixkd0qz75q7dg1b61fzz067"; + rev = "47033e0597675a45d2b6852682e392e848a51af8"; + sha256 = "0kd55p8hl7mhcbsqxhqqyfkzq31cnk4aaqzrka681dk6d1xzk8z5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im"; @@ -56946,22 +57586,22 @@ license = lib.licenses.free; }; }) {}; - rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "20170115.45"; + version = "20170212.938"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "96114ceeea83db703f41bed18f03d87e217c1c67"; - sha256 = "00k9lyzy11igk0j1raq3qgymfc872rf85fj42244lpmbnij4hgjd"; + rev = "fd0f056a5912caeeb2d4f668969d9df81c9e22db"; + sha256 = "1lig93lj5mnm2fjvwac42kfw8bhq8ggs4jfc73fmclm6s5dg8661"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; name = "rg"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib s ]; meta = { homepage = "https://melpa.org/#/rg"; license = lib.licenses.free; @@ -57075,12 +57715,12 @@ ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ripgrep"; - version = "20170116.47"; + version = "20170211.857"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "876d9b410f9a183ab6bbba8fa2b9e1eb79f3f7d2"; - sha256 = "0s2vg3c2hvlbsgbs83hvgcbg63salj7scizc52ry5m0abx6dl298"; + rev = "73595f1364f2117db49e1e4a49290bd6d430e345"; + sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; @@ -57201,12 +57841,12 @@ rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rope-read-mode"; - version = "20161003.610"; + version = "20170131.217"; src = fetchFromGitHub { owner = "marcowahl"; repo = "rope-read-mode"; - rev = "442886655166e9c9472d6aebad27aaf2fed3f3e0"; - sha256 = "1f4wp85j691sgc1yx3l73bdm5lvqgvgms2ic9yg3g0v5n8drgn1k"; + rev = "a3810cf223c92353338418058153a466657a2dca"; + sha256 = "1i6dk80h6f4crw55iwbi5qxj15pr46j8cbd3b5nxcsvhl32900by"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode"; @@ -57327,12 +57967,12 @@ rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "rspec-mode"; - version = "20161129.1525"; + version = "20170125.732"; src = fetchFromGitHub { owner = "pezra"; repo = "rspec-mode"; - rev = "8e05e95548da58c63d8b805d4516eb892621f8e3"; - sha256 = "1n93vjzjmbs7yna74rpn57ckps903fdam2ljh6jm5a9ivsxnc2mn"; + rev = "2096d8c7c98aeb19eeb028082d4c9374168971d1"; + sha256 = "1xlxpnhs9k2pch6abkgblr18j8k41wbzyn1k86jl3ka72vmv4wlm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode"; @@ -57348,12 +57988,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20170111.2258"; + version = "20170121.2345"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "6e60bce8ae998e61c9cea6ceff3564a73a9efe73"; - sha256 = "1y9m1dh946qzpad2fp2dlyjsaj9hqhwf8gvg8zffxvchd5clhnls"; + rev = "4e4f6c01cda75dde0cba313751897c3b8c67b014"; + sha256 = "097niszwri76g5sbwh4hnsv27wk1nfqd7gpx974rh1bwfk735jxg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -57387,22 +58027,22 @@ license = lib.licenses.free; }; }) {}; - rubocop = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rubocop"; - version = "20161015.1200"; + version = "20170123.906"; src = fetchFromGitHub { owner = "bbatsov"; repo = "rubocop-emacs"; - rev = "42198901d3bc0a3170b403dc194203f7c07bdb13"; - sha256 = "0vwnn087h0fgr5wr2c4qa3lwzprd2hyip5vkix7hr79linp2qnzl"; + rev = "d4dad3209f05288bdbe3a31f47794047b87fa424"; + sha256 = "1w1mbp04sqsa4jl8ix05i8af9095zbblcjxkhgmj4x57s8yfsiap"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00f2cf3e8e28bce5c26c86aba54390ffff48d7da/recipes/rubocop"; sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q"; name = "rubocop"; }; - packageRequires = [ dash emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/rubocop"; license = lib.licenses.free; @@ -57414,7 +58054,7 @@ version = "20161115.2259"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57357"; + rev = "57624"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -57494,7 +58134,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57357"; + rev = "57624"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -57742,12 +58382,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20170107.451"; + version = "20170117.824"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "c091852fbda25c62095513753b44d3fcaf8eb340"; - sha256 = "09m20csdn5f33cixq1wzi0682d85ld9rvi408s64h4bzkrgfn6h8"; + rev = "0de149a9ad04f652cd7a59a9ef67be8a7d86ba76"; + sha256 = "0cj12mz47k20d2lrnwr81ijbs42wjpdzmw646yghvazdrq23b12h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -57763,12 +58403,12 @@ rust-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "rust-playground"; - version = "20170106.1734"; + version = "20170211.5"; src = fetchFromGitHub { owner = "grafov"; repo = "rust-playground"; - rev = "29075a3753cc0b48b4fcc0a99340306a856a8bc1"; - sha256 = "1g0b0jg45pf7xivk8xjsm77vd8fvpp2vwdwvgzr810hj8npnqhs7"; + rev = "ff4149489c30a65817750428847217368bd995ba"; + sha256 = "04d5z33pv1xqsn539nfkyjh7dvf0kc0rwili1zr6817z0406k1qn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ebbcca659bb6d79ca37dc347894fac7bafd9dd/recipes/rust-playground"; @@ -57781,27 +58421,6 @@ license = lib.licenses.free; }; }) {}; - rustfmt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "rustfmt"; - version = "20160217.542"; - src = fetchFromGitHub { - owner = "fbergroth"; - repo = "emacs-rustfmt"; - rev = "45efd68ee602d9ed7a07ff0ef045d78cacd57e89"; - sha256 = "0c22cxa4f6plz67vxmp1zgaylkfrky313cj0zybn9akrbcxpbc34"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9fffa9bf34c161f28187b1296dfc98287817abcc/recipes/rustfmt"; - sha256 = "1znav2pbax0rsvdl85mmbgbmxy7gnrm4nx54ij1ff6yd831r5jyl"; - name = "rustfmt"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/rustfmt"; - license = lib.licenses.free; - }; - }) {}; rvm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rvm"; @@ -57949,6 +58568,27 @@ license = lib.licenses.free; }; }) {}; + salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: + melpaBuild { + pname = "salt-mode"; + version = "20170128.424"; + src = fetchFromGitHub { + owner = "glynnforrest"; + repo = "salt-mode"; + rev = "28e72f05f2159f94d7fa3270eb35bfc1f06965df"; + sha256 = "1dksmfvvza277dm245s9l8ydnbdqvl054hxsybynx05yb5c3sfgh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode"; + sha256 = "1n7i9d6qpjsdcgbzmbf63y4c7ggxh5wsim8fd0casnrq9bl7ssym"; + name = "salt-mode"; + }; + packageRequires = [ mmm-jinja2 mmm-mode yaml-mode ]; + meta = { + homepage = "https://melpa.org/#/salt-mode"; + license = lib.licenses.free; + }; + }) {}; sane-term = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sane-term"; @@ -58099,12 +58739,12 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20161202.227"; + version = "20170201.246"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "6caabd4e68fb878e743a29d16356a2c2c3bd7637"; - sha256 = "0fq70lwwv5q0mzxli9x1m244i30nkc457mib07qypax9n51vfqyv"; + rev = "c8fb801958e7c628ae618e8e1e4e04434ca41110"; + sha256 = "0acbsf5srdpk7gl27wyqkqg56akbg0xff3wzi07yw4hwaspcbm0s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -58124,8 +58764,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "acb5331a94091b13ee9f9caec926d57386eded65"; - sha256 = "1jbcxd5ws9prlzglpxdfv3f22ncmb2b596l3zxym5z645521bcar"; + rev = "e990ac49eb449bb8b1befcf0fd021c901f687ac5"; + sha256 = "068m6lny2xf2i7bm2hxqn1dcjxgs4g8pkd730x0shvvn3yc5jqql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -58162,12 +58802,12 @@ scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scala-mode"; - version = "20161222.900"; + version = "20170131.2121"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "9b8db623b13fcb0aad9271d1fae73e1257dda13c"; - sha256 = "0q41dqlhp0cds16inmh7jrvhqrnjsdiv2in6pq3f0srhwms81ff3"; + rev = "730e16d254478d6f63f62cb04d47c137c9002f2d"; + sha256 = "1aq1bfv8jz53zp365awqk43ysjwkpj51pcy6fyp87j8bbb02mgq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -58826,12 +59466,12 @@ selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "selectric-mode"; - version = "20161125.429"; + version = "20170211.1108"; src = fetchFromGitHub { owner = "rbanffy"; repo = "selectric-mode"; - rev = "a8e8c8899c749bd36bdd161e161cdc51301defc6"; - sha256 = "1dj8vccdk1s0ynl5znpg02xp182srn3s8cqcxqrxjllp7wbgab31"; + rev = "e60703d9a6c9944270d77bc829dae3a8b092346f"; + sha256 = "04i5rrn93hzcf8zzfli2ams927lm83hl4q6w2azcg24lhldaqf8p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode"; @@ -59137,12 +59777,12 @@ shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; - version = "20160830.2343"; + version = "20170213.1534"; src = fetchFromGitHub { owner = "wasamasa"; repo = "shackle"; - rev = "fcd9f53cd044ad169a240e3d12a2cf2d65485db6"; - sha256 = "10lgafsck2r9x7997gdl3v1wn4sig0pm6jarip9496ka58z95mjb"; + rev = "979b021077655ca38749a60c9752c0817e8fd93e"; + sha256 = "11qp4gqxfi5d6krvxlqxfn58b1kcgsnldpi54r8lx6mis8l0f4wl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; @@ -59179,12 +59819,12 @@ shader-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shader-mode"; - version = "20151030.704"; + version = "20170130.623"; src = fetchFromGitHub { owner = "midnightSuyama"; repo = "shader-mode"; - rev = "5d5fcbc614f8d7e9226730dd587faf14115b0e6f"; - sha256 = "0l094nrrvan8v6j1xdgb51cbjvwicvxih29b7iyga13adb9dy9j4"; + rev = "76539359418d3d3cd4d2714a189b1bb777c2c15c"; + sha256 = "0mq2073cwmxlvn222dzjpi3hhskfm5f39g60zf6xx1q3l0n4hhwd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4396f3c10a38f91d5f98684efbeb02812e479209/recipes/shader-mode"; @@ -59446,12 +60086,12 @@ shen-elisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shen-elisp"; - version = "20161113.1611"; + version = "20170213.1303"; src = fetchFromGitHub { owner = "deech"; repo = "shen-elisp"; - rev = "1828dbd81ced737a7b0bc6e3c8caf9380d5f8fdd"; - sha256 = "1paf9lyk552kl3lmfsfw9r45ab9s8iypvg20jwdw6y6p1fjcykmk"; + rev = "8248cd96a0931cb3215dc13e0905ac4be1701981"; + sha256 = "1acml0p04wxnm0di9iy5kwml6myr7gcj09ky6dw35f0k0m1w51ba"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed9f0577c6828236582df1781e751b8b81746492/recipes/shen-elisp"; @@ -59506,15 +60146,34 @@ license = lib.licenses.free; }; }) {}; + shimbun = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "shimbun"; + version = "20170203.647"; + src = fetchcvs { + cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; + module = "emacs-w3m"; + sha256 = "ac08d29a884ac5e692a18fd47a7d3a43f1fe7464c3acb923e63da39201bf6453"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/shimbun"; + sha256 = "05dxdyh8xvbpjmc19q733jmjd6kgv8rdahjd3bw5wwsb3smqig4x"; + name = "shimbun"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/shimbun"; + license = lib.licenses.free; + }; + }) {}; shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shm"; - version = "20170102.531"; + version = "20170126.420"; src = fetchFromGitHub { owner = "chrisdone"; repo = "structured-haskell-mode"; - rev = "993ff90454389401e606ee3d4ad1548c5e6508f1"; - sha256 = "1bvzi12z2rlc7p4n731dbmw68719yfy585f8g6xr0dsj5x20gh11"; + rev = "074c8696f52253af24a74e4b3a99edf9c0993aa9"; + sha256 = "1cn2kh5ccp09mg6y743vh2y9m96m0zbnh9w5infl9nj9xbidza72"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm"; @@ -59713,12 +60372,12 @@ sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sicp"; - version = "20161219.542"; + version = "20170124.1650"; src = fetchFromGitHub { owner = "webframp"; repo = "sicp-info"; - rev = "d2abe9ef3c4630511bca320161752d1d4babdbef"; - sha256 = "089mnsaqdr2bcmnrwkrvd0hyq2j0fdnh4ap393m5xnj2riyszdjf"; + rev = "935da01b7aa782a1a7f9fd17b5512132b197da8c"; + sha256 = "0mgbhf5cp7z6yd5kl5x4whlc6nfm2lqq6khxcmilrbgv4was55sj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/sicp"; @@ -59801,8 +60460,8 @@ src = fetchFromGitHub { owner = "mswift42"; repo = "silkworm-theme"; - rev = "53e0614660d653d146a4d36ceab169f6e4bb3554"; - sha256 = "0vzkgrc54j4a3g90jxc7vxkqwqi3047gnn7gng65pfar0i76lzlb"; + rev = "7951b53e5caf9daf6a5a15a57ae3a668cb78bd7b"; + sha256 = "1q21886qsam8y3s60zlfh48w0jl67q14qg9pzda7j2jcbj1q6r91"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9451d247693c3e991f79315868c73808c0a664d4/recipes/silkworm-theme"; @@ -59881,12 +60540,12 @@ simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-httpd"; - version = "20160902.1800"; + version = "20170125.1910"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-web-server"; - rev = "ff1c0b661d1b5b8abdb4bea2efec5efe8485dd1f"; - sha256 = "054mi7plsyk79kc2iqmgp1w8frvlyg1pywm3fzcyg8qa461d35dw"; + rev = "348483efea6ec2752bc5aa4028a16087d19b2809"; + sha256 = "191aq4zhg5a8g6ypkbh20rnqyk76lhxfhnq5ww0g5hzpig8srxaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd"; @@ -60110,12 +60769,12 @@ skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "skewer-mode"; - version = "20161205.419"; + version = "20170122.938"; src = fetchFromGitHub { owner = "skeeto"; repo = "skewer-mode"; - rev = "3417b6f306dfcddde17b86f29a336b76420cce89"; - sha256 = "05bz5bsj3vkfjp1wh477fzjlkv5hbhr4anfxlx2a1r7wimmlrmbd"; + rev = "18a90f401451f8ca0486bdaf45647ac3ccebc0ac"; + sha256 = "1y25c3mq5fzlsjjj98p75jxynk1aaj72vp1zi6jrr2g8hay1yi31"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode"; @@ -60194,12 +60853,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170111.732"; + version = "20170209.1932"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "1b5c7e82e3ee9c1cd4b23498d7516503cdb7d18a"; - sha256 = "0x7lc5l2mmr3c8jj37hb9gyyd0r682fx8rmyqi73yaq01bpqswnk"; + rev = "97ed24213df302b5848b57b0e9a17a3af40cee32"; + sha256 = "1pj8zl7nk31mr94izpqhhan7fav0n7k37yipwphs6f1sbxdi8h3l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -60257,12 +60916,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20161109.640"; + version = "20170209.1240"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "786c032a95cc78d3e294abe1b12e09880381efe2"; - sha256 = "1sv3x7q5b8ablzv0wf7g8sg4vk4gjggylfh0zigx9bpxk0dvj5jj"; + rev = "9eeb7163f07a88450871fff2be78446ee7a4fd52"; + sha256 = "0pxc5ygjc3jz42nxim5l0yc0wns4rfzs2rxwpxy027rqwkk0ap6j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -60446,12 +61105,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20170110.629"; + version = "20170205.1642"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "98962b4eacf1621699a2f6183fdc3ff9d7e0a07d"; - sha256 = "0x5lwi0lcy2hnhnygcff2zrchjj5307086pqkiaisl940yhi0g5k"; + rev = "8b676ee14a3bdfef503472e31d1a5e89fcee63ff"; + sha256 = "1kyryixfmqzjyh6f2bcsrsqvklcvmf9saqm6f0cnxa86rvcdkln0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -60803,8 +61462,8 @@ src = fetchFromGitHub { owner = "ainame"; repo = "smart-newline.el"; - rev = "f5f5ff033645aea0652aa375b034746754a38b1e"; - sha256 = "1q74b0mbhly84g252a0arbyxc720rgs9a3yqf8b8s2fpfkzb95sg"; + rev = "0553a9e4be7188352de1a28f2eddfd28e7436f94"; + sha256 = "0w0v3gzfg3cphz701g30sf7l92v3npsd7028pjp5g7rgv3pwkgsd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f729926f82d6b61f07f5c8a5e19d46afdcad568/recipes/smart-newline"; @@ -60887,8 +61546,8 @@ src = fetchFromGitHub { owner = "jcsalomon"; repo = "smarttabs"; - rev = "1b2f34cc33335486f2b08b864a8037092c1a2956"; - sha256 = "07zc2iw5ijyn822z29g5xb6hhhdmg9b98pfrdwrm0kw86pypxyxk"; + rev = "9cc2594b82b03e7d68645a4878f9359f8b8c34c5"; + sha256 = "0bjl3j047jh674vyfmh9izwak2yic8f7aqv832hn1inhnavsl3xx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d712f0fb9538945713faf773772bb359fe6f509f/recipes/smart-tabs-mode"; @@ -60925,12 +61584,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170104.410"; + version = "20170209.246"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "199006a0a8ae23ee6a8ee9948bf2512f2bcf1151"; - sha256 = "0m4n5nhr8dqa14syy5907fyjsc3lnrpchdg2ai26jz4cw97v67ig"; + rev = "7647f790e005b0e3e18edcf54e425d01a30ae3b4"; + sha256 = "1s0kz75m3hazgdhqi7a28v6qzxy2sbmlxlpqyix6874gvkfcwchz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -60967,12 +61626,12 @@ smartscan = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartscan"; - version = "20160705.138"; + version = "20170211.1233"; src = fetchFromGitHub { owner = "mickeynp"; repo = "smart-scan"; - rev = "2aea1a1ac3c4b12032e5599c4eb6df5b8f68a01b"; - sha256 = "0szx1w2zkxi74xfzcfw7sgdyd34fbv3pcgl7vhjcl0zp0ch473rl"; + rev = "234e077145710a174c20742de792b97ed2f965f6"; + sha256 = "1nzkgfr1w30yi88h4kwgiwq4lcd0fpm1cd50gy0csjcpbnyq6ykf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/26c73e1d15186ebf300c6397fda61a8a885a130f/recipes/smartscan"; @@ -61362,6 +62021,27 @@ license = lib.licenses.free; }; }) {}; + socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: + melpaBuild { + pname = "socyl"; + version = "20170211.2242"; + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "socyl"; + rev = "1ef2da42f66f3ab31a34131e51648f352416f0ba"; + sha256 = "0jks5dkxhhgh4gbli90p71s8354iywlwj2lq6n5fyqxbdxzk412d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/774b3006f5b6b781594257f1d9819068becbbcc1/recipes/socyl"; + sha256 = "00b7x247cyjh4gci101fq1j6708vbcz1g9ls3845w863wjf6m5sz"; + name = "socyl"; + }; + packageRequires = [ cl-lib dash pkg-info s ]; + meta = { + homepage = "https://melpa.org/#/socyl"; + license = lib.licenses.free; + }; + }) {}; soft-charcoal-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "soft-charcoal-theme"; @@ -61663,22 +62343,22 @@ license = lib.licenses.free; }; }) {}; - sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "sourcekit"; - version = "20160510.2017"; + version = "20170126.353"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "a28ac4811fac929686aca6aa6976845c02d6efd3"; - sha256 = "09vv6bhiahazjwzg5083b23z3xz5f4b3d4jra61m5xffkmjnbs9s"; + rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; + sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit"; sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks"; name = "sourcekit"; }; - packageRequires = [ dash dash-functional emacs ]; + packageRequires = [ dash dash-functional emacs request ]; meta = { homepage = "https://melpa.org/#/sourcekit"; license = lib.licenses.free; @@ -61792,12 +62472,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20170106.539"; + version = "20170127.457"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "4342800a4a12d7d67f2a58792ab6a18542e7fc3e"; - sha256 = "0bzdc8d3q5gxwfkgk31368vpw06i4y2qji0wi4c2d3vwg02b4ihl"; + rev = "863e447f1b37d40c74b836b5132033430c6e8a7b"; + sha256 = "14jcw75jvrqarg04bdk28c5bi0456d5xi4xyy53wd7knkm2zval5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -62475,12 +63155,12 @@ ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-agency"; - version = "20160101.1435"; + version = "20170205.1306"; src = fetchFromGitHub { owner = "magit"; repo = "ssh-agency"; - rev = "f8042250174fb72dd935b3e65820580e3232a6fd"; - sha256 = "0076g1yb8xvn6s8gz5jxiz8mn448fmab574yizgakbxaxd91s1dj"; + rev = "94abffa716aff963175196066526c7ee8b4efae7"; + sha256 = "1r41hgh0kaf9x56jllqjz7f9ypzgyf9pqqpm3r49xyi8fr1drbxc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency"; @@ -62973,10 +63653,10 @@ }) {}; strings = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "strings"; - version = "20170101.1137"; + version = "20170210.1925"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/strings.el"; - sha256 = "0gvj39cjc50ks31dzridskync3dnaxsr28wmyky781l87cgna4hq"; + sha256 = "0am2w3p2igh0y5mdbmjfdzyrx3bngs4c3nibjjcky3pmvj4k3r4i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/strings"; @@ -63260,12 +63940,12 @@ sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-edit"; - version = "20160908.2310"; + version = "20170201.916"; src = fetchFromGitHub { owner = "nflath"; repo = "sudo-edit"; - rev = "beb584ca418dcd061641026662d9796f66a5a5a2"; - sha256 = "1gprc192igny4vsk4d72xqf76ig79wq73fn757ghb8yrg8zzw1zc"; + rev = "615f6c073e42d433e79ae5a63210e2e04357a4c8"; + sha256 = "0k3ldywy1g6672hhasqmj1rvzrs0cmd3nzxkb688vw6mhzxfzld4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit"; @@ -63281,12 +63961,12 @@ sudo-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-ext"; - version = "20110116.2310"; + version = "20170126.414"; src = fetchFromGitHub { owner = "rubikitch"; repo = "sudo-ext"; - rev = "a1f742f90d1187834e24790b620f100e83e8aa74"; - sha256 = "1ym3j9mxc8k9akk9z1m6i0gqsfcgr8k8xzz5gniw8jfarf7f4isq"; + rev = "9d4580f304121ce7b8104bd4bd3b64e4dfa3c9b3"; + sha256 = "1m9srlxavqg6yxmz6rz61saz1lj5hh029314dic8kh6g3bqdnh2w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/sudo-ext"; @@ -63653,12 +64333,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "20170114.521"; + version = "20170205.348"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "6cd2948589771d926e545d8cbe054705eebce18f"; - sha256 = "1zz5jv2qgcnhidyhnw3wbcpqb80jqqbs74kpa66assfigyvivyj6"; + rev = "75cbae223fbf84d19e14a7f7734ded4f46078654"; + sha256 = "1ilawg15l6j3w2mlybz01h1dk9mym37wq4illz1llc3q3v9n7nny"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -63695,12 +64375,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20161213.719"; + version = "20170213.1002"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "ee91a2511797c9293d3b0efa444bb98414d5aca5"; - sha256 = "0mrv0z62k0pk8k0ik9kazl86bn8x4568ny5m8skimvi2gwxb08w6"; + rev = "5f732cdce5ac2529f36b5c8cc9f053789783de45"; + sha256 = "1ha7filrnkdya4905yy002n1hjdl23k9hbb2w2id3wfj0cbw930f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -64090,12 +64770,12 @@ system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "20160726.1344"; + version = "20170205.1305"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "19ab3e959c04dc084f0c679228ab675e5a559c30"; - sha256 = "1slycdacara1y4zqw0vvn3rixx3r33lk9y7ls99bb87a8k2zxlll"; + rev = "5b3f7f5ae08d306604423f48e9a2ab5daaf58584"; + sha256 = "0b7hjgxr6pv6dj3q233mxlm8ssxpvkhckibn0cfr5xb7ycfkd6rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; @@ -64132,12 +64812,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20161231.2103"; + version = "20170202.1844"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "b561c6bce9828e67c986903c24fb524451a02e64"; - sha256 = "19jkiiyaxqyxqzmgg2n0hcp7az23jhkajsr5n7ha48mh690n2ga1"; + rev = "4c1b2befd0c853dcc7bca52d9b084933c3a08254"; + sha256 = "1sdrga3mmajai2jcf4zpcii0l2b9wch8rhdsbjlzx76ia5snp23l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -64425,12 +65105,12 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20170116.2155"; + version = "20170209.950"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "69b816277c334c8f4ec7da8f283d52df951d5584"; - sha256 = "0fz59291wwrm5jdrq3qzkbihh2wvypp23hxcy24d0pp3nmav5g0a"; + rev = "a3bcc27b53b08f2114261795d4b4422bd75c94a8"; + sha256 = "1l439z9wa9jwb1ascfvjzm8699cjr8hxip20536ph8dql8hk7rsz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -64450,8 +65130,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "d5b75f52d9ffdbc5cc391fedc3f81d86091839b3"; - sha256 = "12nnyqg1lqa858c35b8z44wrbrznga8bwsnhm0hqcazy9bjin84v"; + rev = "1cb37c49e97aff263ecb5f20746256126b048628"; + sha256 = "1310pw200l6jdlpdyscnhf9cwll5wc1vyayi55x7jyvm02nngbq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -64870,8 +65550,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "2489fd3177a670ad6fdb864d0abf6e79355b2b7a"; - sha256 = "0m4bj93i42705hqnjzd6b1ahh2ibbg05wxggnxanmqssfv7hmq18"; + rev = "db13aac6c89c48410d674bcddaf23716b77d0c16"; + sha256 = "0d3grla09br7vxk91ncv2wzfwh5jfaniw62ydmccrnvm5sy32zgk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -64891,8 +65571,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "2489fd3177a670ad6fdb864d0abf6e79355b2b7a"; - sha256 = "0m4bj93i42705hqnjzd6b1ahh2ibbg05wxggnxanmqssfv7hmq18"; + rev = "db13aac6c89c48410d674bcddaf23716b77d0c16"; + sha256 = "0d3grla09br7vxk91ncv2wzfwh5jfaniw62ydmccrnvm5sy32zgk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -64968,6 +65648,27 @@ license = lib.licenses.free; }; }) {}; + test-c = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "test-c"; + version = "20170123.950"; + src = fetchFromGitHub { + owner = "aaptel"; + repo = "test-c"; + rev = "94e9f76659c45100a9b0e2a9fecf6482427cbbac"; + sha256 = "0lnx9fidpfpmwi7xa2ik5mc72lcfc9g8cm9r25s5x7sfy9vr3q8c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ef915dc2d3bc09ef79eb8edde02101c89733c0b2/recipes/test-c"; + sha256 = "1gy5dxkd4fpzzm2sq9g7bmi1ylwvsgh6hlvjmc1c064wjkha9j9z"; + name = "test-c"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/test-c"; + license = lib.licenses.free; + }; + }) {}; test-case-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, lib, melpaBuild }: melpaBuild { pname = "test-case-mode"; @@ -65342,8 +66043,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "5f723cd53980f395a92c438790a127cbd5699d90"; - sha256 = "1zf3ddyz8579kcwrbhb09nn5r0wxjwmafmrnrwljlch0kxwp79nl"; + rev = "0a660ee285e4a4cbac8f702168c40fd4ef5495d1"; + sha256 = "19cn5kkj9jmjghb54l64wpvbcn355ixfzdp7rqrxcy2gcxwcc95a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -65399,12 +66100,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170107.1619"; + version = "20170210.1932"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "026af0842856bcc6dba26272feb1c9bec557de9d"; - sha256 = "0315lr5xs2ncw6k8d24ms0jk4k83x9jrzvn7534ciny7jjkll6fq"; + rev = "8e2c78de6e7a0eb42853ba2dee3ffe5c81cff336"; + sha256 = "0imdjxvvz9b1b1mlzdp5mildjz1s2m7zz3y383p1x6m8w4vzxln7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -65459,12 +66160,12 @@ time-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "time-ext"; - version = "20100515.1740"; + version = "20170126.415"; src = fetchFromGitHub { owner = "rubikitch"; repo = "time-ext"; - rev = "1e886eed26fb3049b0abc5c1241f823d44cab22f"; - sha256 = "1iz3723sirazlrr9d5rpk4v0s1s9ajbx5j4i8jf1p54z8h7asjw5"; + rev = "d128becf660fe3f30178eb1b05cd266741f4784a"; + sha256 = "0ynxmik33hh0znmznrf7lkmsh5xggbrvbdhiqa61r0b7gs3jk5fd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/time-ext"; @@ -65711,12 +66412,12 @@ toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toc-org"; - version = "20161004.320"; + version = "20170131.558"; src = fetchFromGitHub { owner = "snosov1"; repo = "toc-org"; - rev = "a0e8ca05e806e5074b8603985da7f18b92c15856"; - sha256 = "1sv9y5dln4ai9w3mgg8p4a3s05hflfqh0k7k8isjqikydbv85m2k"; + rev = "cda8f73640ae26c476990eae421e42627445f9d0"; + sha256 = "1qkm70ay10blhji8z6c64f18288r1gswzmmkvg7b2z2rz9w475fm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org"; @@ -66131,8 +66832,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "5444a8dd90691de941509f7cc9ac8329c442dbdd"; - sha256 = "00dcdszskzqggg4gjp5f2k2v1a03jad52q2pqf04jqjycapkx227"; + rev = "a9df12a6e2f2c8e940722e151829d5dcf980c902"; + sha256 = "00rdv0dij1d21jddw73iikc4vcx7hi1bi85b25hj1jx36nx4m16c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -66232,12 +66933,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20161231.2101"; + version = "20170201.426"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "39b1fdb924727698e5b85c588bc6fd83200e4b90"; - sha256 = "08wgqx48b3kbggxmkjjxwyinfl1j6b8wi4xvg0hwbkyw0zka0cii"; + rev = "462584da4677af833054e023bd630a2d9f10c692"; + sha256 = "1i8k6jiwzrsamc887mdmzipbr7vshv4mfa9sgzzsmq521diaigk7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -66515,36 +67216,15 @@ license = lib.licenses.free; }; }) {}; - ttrss = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ttrss"; - version = "20130409.1049"; - src = fetchFromGitHub { - owner = "pedros"; - repo = "ttrss.el"; - rev = "e90d8f7ccaf235053057bd91d3a2113582604e24"; - sha256 = "0a8f9p1im6k7mnp2bq733rfx2x246gfwpvi5ccym1y5lakx37fil"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d918a5aa26c890fd138323ac6a446c0722e8b4c6/recipes/ttrss"; - sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z"; - name = "ttrss"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/ttrss"; - license = lib.licenses.free; - }; - }) {}; tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20170109.1459"; + version = "20170212.139"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "5d53d1cc0478356602dc3d8a838445de9aa2a84a"; - sha256 = "0qj4racbh4fwsbgm08phbgcam2m348rcli950nd27sn7vza8vcy4"; + rev = "662f6af94c3273f2dab04b9c7485dfe627812c95"; + sha256 = "06iigh6kia60r4i3d414z594s3xab20z73q1l0z2fkb0613wznbg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -66893,12 +67573,12 @@ typoscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: melpaBuild { pname = "typoscript-mode"; - version = "20160719.212"; + version = "20170126.112"; src = fetchFromGitHub { owner = "ksjogo"; repo = "typoscript-mode"; - rev = "478070b6946cbc6b73249bb6e5f35366aabe9f99"; - sha256 = "13lawwhn2asr20213h1ijy827kfxs9qzhizkwzsa2sm2s0262rja"; + rev = "44e7567e921573c4f33c537b827f71fb1f565c32"; + sha256 = "0i7l9s3lhxnld32mqyrvasiv1hilhwnp2fwvpdv2cx9r902q6kc8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/701de09cb97cbfa49a3a81aaeb9577817566efa2/recipes/typoscript-mode"; @@ -66995,12 +67675,12 @@ ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ujelly-theme"; - version = "20170116.1121"; + version = "20170209.24"; src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "1837cfbf3d0b09d7e1da678e5dfb3b560a759734"; - sha256 = "0jjr5798nqm5lwjv1j4r21vhbqy10qy3gn977g0ysb31wp2209r4"; + rev = "2b54793859c0569b0e201f5c32cb796097250393"; + sha256 = "07c25f129948j52vfy42fzfhpd9dvq2568iclnbhzn9jpiz8m9d8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -67468,8 +68148,8 @@ src = fetchFromGitHub { owner = "EricCrosson"; repo = "unkillable-scratch"; - rev = "0e1d9e1574e497171a7ccfbcb8c994cb9c5880da"; - sha256 = "0bhdqpxq6cly4b6v4ya1ksw0yfdb9g2f2ifbjn4gfcq6j4zszbdm"; + rev = "676a5a97658830caece18fa65a23e3d113933151"; + sha256 = "14k9ad542y0haz1yid9jy8f9zvpvac6cirnf0751g8rwjbdnvr85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/822ac5610f333e41b676a29ef45a6f8bfea3162e/recipes/unkillable-scratch"; @@ -67566,12 +68246,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20170116.1309"; + version = "20170213.1353"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "38034854ac21bd5ddc1a1129fd6c8ff86d939f8a"; - sha256 = "0s20z5njwmk591674mb2lyv50agg6496hkr5b11904jq5ca3xagz"; + rev = "6c2d81cfadb12c10af0dabe148ede355737ed1a8"; + sha256 = "18aqyphq1cwandfarql773d0h3ki6c9ip1wji1ni86fm29f99ikq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -67584,22 +68264,22 @@ license = lib.licenses.free; }; }) {}; - use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: + use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild, use-package }: melpaBuild { pname = "use-package-chords"; - version = "20160530.1042"; + version = "20170208.1035"; src = fetchFromGitHub { owner = "waymondo"; repo = "use-package-chords"; - rev = "8dedc76617cbabd605f4c0d486018e3c4d3c8a9b"; - sha256 = "0d69hckz6xbll1x2mll385kcw7mwx8cwxg1wdhphnww0s810isgp"; + rev = "e8551ce8a514d865831d3a889acece79103fc627"; + sha256 = "0500pqsszg7h7923i0kyjirdyhj8aza3a2h5wbqzdpli2aqra5a5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/use-package-chords"; sha256 = "18av8gkz3nzyqigyd88ajvylsz2nswsfywxrk2w8d0ykc3p37ass"; name = "use-package-chords"; }; - packageRequires = [ bind-chord bind-key use-package ]; + packageRequires = [ bind-chord bind-key key-chord use-package ]; meta = { homepage = "https://melpa.org/#/use-package-chords"; license = lib.licenses.free; @@ -67923,12 +68603,12 @@ vcl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vcl-mode"; - version = "20160613.746"; + version = "20170119.1251"; src = fetchFromGitHub { owner = "ssm"; repo = "vcl-mode"; - rev = "5c3d4bff510c3eaf08fe30e9bac99be9ec0a97bf"; - sha256 = "1478marxzl3kq79ssnfzjv5yxcqipkmckls1h65vm8mf5f86svgf"; + rev = "3d86c1352a7370d558d25f4c8f7be744e7d27332"; + sha256 = "1zp59p8pw65qy7s9y17a52y1pm35hajdfn3p1kfm1y3vmfxf9x3a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bcbe3892fd20e624117de534ca92ba3fba1669a1/recipes/vcl-mode"; @@ -67965,12 +68645,12 @@ vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "vdiff"; - version = "20170116.1154"; + version = "20170204.1636"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-vdiff"; - rev = "f4332f26f7a88c6339e357d19f56354d2a2489fa"; - sha256 = "1jbhv430g2vsq0jhjypg9wdyax57m0r6hppqm2rqf0hlgn38v8d5"; + rev = "c32fe46ad8362b4d918e194cca5ef84dd09981bf"; + sha256 = "16xw159pydkqiki21axv3vhf56yqn8jgg9n97xws2swfkh4drafm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff"; @@ -68347,8 +69027,8 @@ src = fetchFromGitLab { owner = "iankelling"; repo = "visible-mark"; - rev = "c1852e13b6b61982738b56977a452ec9026faf1b"; - sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv"; + rev = "a584db9bc88953b23a9648b3e14ade90767207f8"; + sha256 = "1rsi9irv9i03627cmfaqz03f9cvpm7555ga8n2gs622lzp6bb3jf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/visible-mark"; @@ -68592,12 +69272,12 @@ vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: melpaBuild { pname = "vue-mode"; - version = "20161227.133"; + version = "20170206.120"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "1561da428a1a30170b71cab71c576a508e4f4367"; - sha256 = "1081kypg9lhc0d3kjw4vkk9s3g9dbb5rr2rh4d2s1zicy7rxhadn"; + rev = "0b159770abc865796a1fa02be2f5959138b2f8a6"; + sha256 = "1i6a6g4l9xy45kllgr6kgai3mfg8b060dpspn6vv69kpwjcqiza7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -68647,6 +69327,25 @@ license = lib.licenses.free; }; }) {}; + w3m = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "w3m"; + version = "20170203.647"; + src = fetchcvs { + cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; + module = "emacs-w3m"; + sha256 = "ac08d29a884ac5e692a18fd47a7d3a43f1fe7464c3acb923e63da39201bf6453"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/w3m"; + sha256 = "17mzs126fvlnsvxgfpbil9wmka0i87psblq49phky7dywcwz27lc"; + name = "w3m"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/w3m"; + license = lib.licenses.free; + }; + }) {}; wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wacspace"; @@ -68755,12 +69454,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20161227.2220"; + version = "20170204.530"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "59a4d97286251a0c0871c085aea01fa1abc1e192"; - sha256 = "1k7kkdr2kr7qivvbifqgw9hx111bscbh376q1f44p825flxnzyn8"; + rev = "1a49ac05e9558edd4993d345c25cf2d166bfc17e"; + sha256 = "1bvq0wwc013f6aapwql1rwv9r5nifgff2iwc17kaiwlwwqd6j70z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -68860,12 +69559,12 @@ wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wc-mode"; - version = "20161031.648"; + version = "20170126.2029"; src = fetchFromGitHub { owner = "bnbeckwith"; repo = "wc-mode"; - rev = "122f90bd1d422a84cc50acabd350d44d39ddeb69"; - sha256 = "0pjlxv46zzqdq6q131jb306vqlg4sfqls1x8vag7mmfw462hafqp"; + rev = "f218f42709a651b34d6c1ddd98856f44648ef707"; + sha256 = "0h79kf37pns92w4zsgazwhg087vkjvnhk9p1npll5ka87zbknndm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/wc-mode"; @@ -68986,12 +69685,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20170114.906"; + version = "20170211.1516"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "3e74b741abf8d3113a67ab6b48fba7fdd404e712"; - sha256 = "0lagq9gzm8wrypks2zc5qjz1pqjhhlg4dxji9c1zdji5kq3bhqz5"; + rev = "c6d73fb48ee3c0911b7361cd556765c94742dee2"; + sha256 = "0b9gcm0dlbp9v57pv9dkh08a8f5bacmjkyqkh0pr285gvsfi776i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -69322,12 +70021,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20161222.1221"; + version = "20170209.729"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "49ab7afd93ef36e5f0261eff7151360edeeea4e6"; - sha256 = "0cqq1w9cjrp61mjzi7y49yrbhclpf0cab9fcylq14v1ilhipfdxa"; + rev = "0d56e4369b53af2c5960af4827b56b06d9162d62"; + sha256 = "08dw13hn1w9m37gd2cch3z9af504x55w0hlinn05j1jgvja50c7f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -69533,8 +70232,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "5e9b37cfbec400b51a8d9d1bc6603595e1a0aefd"; - sha256 = "1w4drcqix3wwk15m1kkfss2mmip1q8j4hglyz4spaffkkqmmz438"; + rev = "0afc3a524ec4c900f7ac1291e37b4f7da19e9ae6"; + sha256 = "15rjaxzwq7wh6zmyh8nzkbr4c75z8qjlbhpi8yjmf9bik3srr14d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -69901,8 +70600,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "280ab84bf8ad"; - sha256 = "088khr4ha37nvxzg620a6gyq7pc40rb13bbi9vgqhgjgggpq61d9"; + rev = "3a654cfe6632"; + sha256 = "1ahmpk0302g375w9ikkzagjvx8qblkzx40w960ka0cqf7nzyk75d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -69939,12 +70638,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20161231.826"; + version = "20170111.609"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "2248a63f6eb6e7720881b508639d9a00d2db9ea0"; - sha256 = "0g5ch1a5myrmazxcbbak01q4k3x8yp3kbn73d2h26j2jmsqvdy1n"; + rev = "8ae3c7aed92842f5988671c1b3350c65c58857e0"; + sha256 = "1jy5jxkr99a9qp7abmncaphp0xd3y6m3fflvj3fq1wp33i3f7cfn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -70002,12 +70701,12 @@ wolfram = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wolfram"; - version = "20161017.127"; + version = "20170122.2356"; src = fetchFromGitHub { owner = "hsjunnesson"; repo = "wolfram.el"; - rev = "c66e9daa644856e02990f6a775e7b54f4e969e18"; - sha256 = "1iswap3aqj0ykd2d62xfb4fgp5r1arkgln6fzl2b4dji399b2xyy"; + rev = "6b5dceae3fd6cdb4d7562510deeafa02c93c010b"; + sha256 = "1ijyjw2793i7n00i30ma8lw4fzi9w63m6k0xgjx6j78r5y7pfj2g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/785b5b1ec73e6376f2f2bb405707a1078398fa3a/recipes/wolfram"; @@ -70128,12 +70827,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20161231.217"; + version = "20170211.402"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "ca9a42b64938f43d757c6e0c41f21610bea87dba"; - sha256 = "0nwsryj7xiizvrcnwb1an8siihqjbdvcwg6mjc36cyr6cv3icqmw"; + rev = "cba75ae94e6c233f92fcdde005d023107495df7b"; + sha256 = "1sxs89mqns9n847m0gqpv43b9gr15zicjhcnavk5n8g7gnssjmj4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -70359,12 +71058,12 @@ www-synonyms = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "www-synonyms"; - version = "20160812.1329"; + version = "20170128.1451"; src = fetchFromGitHub { owner = "spebern"; repo = "www-synonyms"; - rev = "e0ee69f98309a5f3f540683ddc35af46502343b2"; - sha256 = "11iwwybanlwm4qkigk4w6zjh9rk7q7pf79hbcbyz9lll69hlmyj0"; + rev = "7e37ea35064ff31c9945f0198a653647d408c936"; + sha256 = "0l4fvq5zdzqvlwxqgqbfx9x0aimvk4x3la9yz9gw3vvj1rwf340i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2fe69ac09c3e24af9c4e24308e57d7c3c3425096/recipes/www-synonyms"; @@ -70464,12 +71163,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20170116.1037"; + version = "20170127.1616"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "d49a743fede497d102d4dc2b739dbe35b41163ca"; - sha256 = "00v20p99njhh2wgk8jfccpigss2y6vd40wl1cs0ra67a4bjwn8di"; + rev = "c32bae59a8d8daf97769b1c57b70ef9fb8b2570c"; + sha256 = "1gs6h8csy8yz3f6gvqn3lx3i6xdqrddfhg54m4g8c5yxz0202yyg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -70485,12 +71184,12 @@ xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-find"; - version = "20161221.1705"; + version = "20170124.1342"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-find"; - rev = "27fabf6ef557007ba93b667d0a79823420a0144f"; - sha256 = "0pli4p1q43hk2zy9lgm324njm82jwmpldhbvdiv4f6zbkv44xrhr"; + rev = "0bd47dc9b570a1526cd3e387280280f20f6a5602"; + sha256 = "1nl8xgkcvnpp4iwcxvvdr3fb6kz5zjxdvkk6ldnybrcypg0xndsg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find"; @@ -70506,12 +71205,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170116.2003"; + version = "20170213.321"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "9c8d51eb4441351c71854612eb990246ff23b8b5"; - sha256 = "11l2jhn82r6aavc4wkcn0w5f2g2hilaz3a3v2fv70gd1x7spw0w7"; + rev = "073190840e6a07566f75a6dcabd1d3c120b0639e"; + sha256 = "19b8d4a5g43n9y2y0r8l12ds5badns9zlky0j201bzz3yrcid7xb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -70548,12 +71247,12 @@ xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-lookup"; - version = "20161218.2303"; + version = "20170209.342"; src = fetchFromGitHub { owner = "xahlee"; repo = "lookup-word-on-internet"; - rev = "219b0d58760bad26b2e07c55c229d989b983c089"; - sha256 = "1n1w9jcq1bz4qqps33p3dmmjv9hyvpa0zrxhxcp2q3vh7j0714qj"; + rev = "55e4e539f65e260418ead77c138bc2af2bdfa638"; + sha256 = "0b9q2y42v73c49l4s7z8qgsj02g2yvn2vbf4kv5m26k8x7547cja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup"; @@ -70569,12 +71268,12 @@ xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-math-input"; - version = "20161222.327"; + version = "20170210.2128"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-math-input"; - rev = "4ab83f7d9bcd6f2697a77507930542bc2a00a1a3"; - sha256 = "13h7gkdy47mnks1r80j94j3h825s93fwi43l9r7wp9jbngdx057f"; + rev = "a4b8aa833f65c028f7f94b9c3b5b8993b8961736"; + sha256 = "02xin68nrzlg6qaniincj5dk1aw5fbqfb8cj00yjyyjnv55jrbpn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input"; @@ -70863,16 +71562,16 @@ xquery-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xquery-mode"; - version = "20140121.943"; + version = "20161218.1617"; src = fetchFromGitHub { - owner = "mblakele"; + owner = "xquery-mode"; repo = "xquery-mode"; - rev = "ac0ca72ccd575952393804330c3efe3b2271c4e2"; - sha256 = "09fpxr55b2adqmca8xhpy8z5cify5091fjdjyxjd1jh5wdp1658v"; + rev = "58e947e2630223b89822c2c3e5883be4950ea2f5"; + sha256 = "0zasfq8cgp42ac7ad041f7bn785y10359ayrd9h2wwyb34bw9wjd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c145039be872cd5a19383232180ba481e4e144/recipes/xquery-mode"; - sha256 = "0b5k2ihbjm5drv4lf64ap31yj873x1fcq85y6yq1ayahn6s52rql"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ea1c9e26963f290d912df21b81afd689543658/recipes/xquery-mode"; + sha256 = "13xrvygk7wdby6599q6yxw8cm45qqki8szrm49fc3b6pr6vzpidg"; name = "xquery-mode"; }; packageRequires = []; @@ -71178,12 +71877,12 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20161105.814"; + version = "20170213.1023"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "f378589912af8731428198ef57546c616d941df0"; - sha256 = "0ag1psjrn4b1idz096jwdsygax7ydirhlky7zpj6awqzx4gh43yg"; + rev = "1c3ade410fb0bf5b6f2140b099f0ef96836ee74e"; + sha256 = "1p0m702lyjx5xcqvifc8lkrj430nvjiwswpf3ghcvl5sls8bf5af"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; @@ -71241,12 +71940,12 @@ yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yang-mode"; - version = "20161220.157"; + version = "20170213.154"; src = fetchFromGitHub { owner = "mbj4668"; repo = "yang-mode"; - rev = "bcf698acbdb4df91f587942348739b407a8b0807"; - sha256 = "1rrmailvhxvivmdjamm2vvciym484cw0lqn1hgdw1lz999g5a5vs"; + rev = "46c201b1d5195842fdf540d4c153127f91b1a125"; + sha256 = "0bfx6wsj8g6ryawxly17x2nppzcgg3bxpkx00ar1hgcrs11988kk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; @@ -71262,12 +71961,12 @@ yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20170116.1451"; + version = "20170124.1014"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "ff1064bbc4189f93433c3eebb9d0dde72a27e6c6"; - sha256 = "1spriw8c4qv7c349p8m29j5x6b72ysbpffcc444rdd9s1yypizzf"; + rev = "d2ea6920a2444f1ce6f53947640446b8e16f84b7"; + sha256 = "1lw2d25rwszk35bi3gm3bg0cb30b8c2bf3p32b89shnsmwylw52m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -71406,12 +72105,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20161221.1953"; + version = "20170212.832"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "48cd7163b2475bbbea166cd0d02b4bf588f1435f"; - sha256 = "1y5bip792p76lx2hx0z459jyvx7f7y8sncd7q8rcfd581vlsyc04"; + rev = "c87afe0901735d4421c712b25dfa69b2ac59c8e9"; + sha256 = "0ssk3pgkq4bv74g8h0zbi38z3lb11cn4ylnfsa0gnn5jlyg0bccc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -71447,11 +72146,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20170105.615"; + version = "20170117.1449"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "59459111e042"; - sha256 = "072aminyiw7pwm74sq3xqqyd1f2l2ilcwg98r094xjvw4fz3yjq5"; + rev = "8871fe9f563b"; + sha256 = "0bfhf0fhx8znq7xsqwms3n178qpxds93wcznj26k3ypqgwkkcx5x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -72139,15 +72838,35 @@ license = lib.licenses.free; }; }) {}; + zpresent = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }: + melpaBuild { + pname = "zpresent"; + version = "20170205.2239"; + src = fetchhg { + url = "https://bitbucket.com/zck/zpresent.el"; + rev = "b02b168a98c7"; + sha256 = "0vkywpzlrpwasjnjksmsy7ab5vn1l3frb3ygvy0c98wds0g8dxgc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; + sha256 = "0316qyspmdbg94aw620133ilh8kfpr3db1p2cifgccgcacjv3v5j"; + name = "zpresent"; + }; + packageRequires = [ emacs org-parser ]; + meta = { + homepage = "https://melpa.org/#/zpresent"; + license = lib.licenses.free; + }; + }) {}; ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; - version = "20170105.208"; + version = "20170208.4"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; - rev = "3a4df17edddef84160194802acc034cfa2dbd678"; - sha256 = "1a5sk4b00sgkgq23xmv0rlx89686dx3p8cmscrcf2lcddx8cq9pl"; + rev = "bf343665c9d97a5cb370572364865e42074af95c"; + sha256 = "1hpyymmg5mxrcmj0pngnj8fxyalfxzdqgpghk7lba2r35da05ph5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 6081c96006a..60cbf486777 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -13,7 +13,7 @@ To update the list of packages from MELPA, */ -{ lib }: +{ lib, external }: self: @@ -174,6 +174,17 @@ self: # upstream issue: missing file header zeitgeist = markBroken super.zeitgeist; + + w3m = super.w3m.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + prePatch = + let w3m = "${lib.getBin external.w3m}/bin/w3m"; in '' + substituteInPlace w3m.el \ + --replace 'defcustom w3m-command nil' \ + 'defcustom w3m-command "${w3m}"' + ''; + }); + }); }; melpaPackages = super // overrides; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 9d945859ffe..88b3f04cb5a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -20,6 +20,27 @@ license = lib.licenses.free; }; }) {}; + aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }: + melpaBuild { + pname = "aa-edit-mode"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "aa-edit-mode"; + rev = "2e56f3b627f0f19fbfce4968180b4d736f7afb5d"; + sha256 = "1rh9n97z1vi7w60qzam5vc025wwm346fgzym2zs1cm7ykyfh3mgd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/20d00f782f2db87264c7fb1aac7455e44b8b24e7/recipes/aa-edit-mode"; + sha256 = "00b99ik04xx4b2a1cm1z8dl42hjnb5r32qypjyyx8924n1dhxzgn"; + name = "aa-edit-mode"; + }; + packageRequires = [ emacs navi2ch ]; + meta = { + homepage = "https://melpa.org/#/aa-edit-mode"; + license = lib.licenses.free; + }; + }) {}; abc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abc-mode"; @@ -587,22 +608,22 @@ license = lib.licenses.free; }; }) {}; - ace-flyspell = callPackage ({ ace-jump-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: + ace-flyspell = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-flyspell"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "ace-flyspell"; - rev = "a850fa913b3d1bab4c00bacee41da934929cef52"; - sha256 = "1pzh5l8dybrrmglj55nbff6065pxlbx14501p3a1qx1wvf24g1sv"; + rev = "044d38fb8eb390ef1f51cf92cfe5c4ffd103044c"; + sha256 = "0yy7g2903v78a8pavhxi8c7vqbmifn2sjk84zhw5aygihp3d6vf0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ea85eca9cf2df3f8c06709dfb44b339b8bdbc6c/recipes/ace-flyspell"; sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd"; name = "ace-flyspell"; }; - packageRequires = [ ace-jump-mode ]; + packageRequires = [ avy ]; meta = { homepage = "https://melpa.org/#/ace-flyspell"; license = lib.licenses.free; @@ -1010,12 +1031,12 @@ alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "db7cc6ebf695a71881d803966d672f80fe967da6"; - sha256 = "1pk5dgjqrynap85700wdivq41bdqvwd5hkfimgmcd48l5lhj9pbj"; + rev = "1812abbe0079d1075525d9fb2da6fcfec7db3766"; + sha256 = "0sl2njnhm37cya06y39ls8p3zwpjwyv1pd7w3yfk5frz24vaxlcq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; @@ -1774,12 +1795,12 @@ auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "auto-compile"; - rev = "1526e59ea8aaa1738c53b24673d62605dbbb5c96"; - sha256 = "05bzknh0fhl22r2klqqrgs7wpx18p5kzwxmg916smbvyk1fzfgva"; + rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c"; + sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile"; @@ -2263,12 +2284,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "1.2"; + version = "2.0"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "97359d48a00b30776c5416ea90735d8302687677"; - sha256 = "0f0gg5kfzgii0rf75gh48wnwimkc88xzwbifkwdf745jhzkyqn6s"; + rev = "b50e90a39344402d169b8fdd5d18cc43fb16a256"; + sha256 = "13b9ccm7yw95zc8v8sri762fgqdp2hp107nj5b40yv90g3y4fwby"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -2449,6 +2470,27 @@ license = lib.licenses.free; }; }) {}; + better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "better-shell"; + version = "1.1"; + src = fetchFromGitHub { + owner = "killdash9"; + repo = "better-shell"; + rev = "6ae157da700a4473734dca75925f6bf60e6b3ba7"; + sha256 = "14ym7gp57yflf86hxpsjnagxnc0z1jrdc4mbq7wcbh5z8kjkbfpd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fc553c9fb6de69dafe9fbe44a955b307f4d9507f/recipes/better-shell"; + sha256 = "1mr39xz8chnc28zw1rrw5yqf44v44pby7ki22yyz6rp1j5ishp4v"; + name = "better-shell"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/better-shell"; + license = lib.licenses.free; + }; + }) {}; biblio = callPackage ({ biblio-core, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "biblio"; @@ -2536,12 +2578,12 @@ bing-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bing-dict"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "bing-dict.el"; - rev = "e94975ac63ba87225b56eec13a153ce169e4ec94"; - sha256 = "0pmpg54faq0l886f2cmnmwm28d2yfg8adk7gp7623gx0ifggn332"; + rev = "7c067b7a3a1a4797476f03a65f4a0b4a269a70c7"; + sha256 = "1cw8zxcj7ygj73dc8xf6b4sdjrwxfl6h07mrwym8anllqs2v0fa6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5653d2b6c2a9b33cfed867e7f6e552d4ed90b181/recipes/bing-dict"; @@ -2764,6 +2806,27 @@ license = lib.licenses.free; }; }) {}; + bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bshell"; + version = "0.1"; + src = fetchFromGitHub { + owner = "plandes"; + repo = "bshell"; + rev = "0abd93439895851c1ad3037b0df7443e577ed1ba"; + sha256 = "1frs3m44m4jjl3rxkahkyss2gnijpdpsbqvx0vwbl637gcap1slw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell"; + sha256 = "1ds8xvh74i6wqswjp8i30knr74l4gbalkb2jil8qjb9wp9l1gw9z"; + name = "bshell"; + }; + packageRequires = [ buffer-manage emacs ]; + meta = { + homepage = "https://melpa.org/#/bshell"; + license = lib.licenses.free; + }; + }) {}; buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: melpaBuild { pname = "buffer-flip"; @@ -3166,12 +3229,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "0.2.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "9db98208c1086dffdb351c85a74a096b48e6141f"; - sha256 = "0xgnq21fb37y05535ipy0z584pnaglxy5bfqzdppyzsy7lpbb4k3"; + rev = "25ca2fcbd6b664cc7a20b0cccca3adc19e79917a"; + sha256 = "1fzrczx1aq0q130qrvzq8dssc1qm5qc9pclsyd3zn27xbn5lsag3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -3523,12 +3586,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "b210c0d5275e1e8c0b78bed186cc18fc27061dd4"; - sha256 = "1jixkb7jw07lykbfv022ccnys4xypcbv03f9bxl2r16wizzymvvd"; + rev = "577a3438d14e1a1f08baf0399ec8138c9d1dcba4"; + sha256 = "0i9nqhqbj12ilr5fsa4cwai9kf2ydv84m606zqca2xyvvdzw22as"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -3796,12 +3859,12 @@ cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "cliphist"; - version = "0.5.1"; + version = "0.5.3"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cliphist"; - rev = "72a8a92f69b280c347afe2f8b5f5eb57606a9aec"; - sha256 = "0arilk9msbrx4kwg6nk0faw1yi2ss225wdlz6ycdgqc1531h6jkm"; + rev = "acbd9782d82d7ae6bfb22fb0955597b9c5fcbb6c"; + sha256 = "1gj5fqjyr4m4qim9qjsvzzk42rm3vw3yycvq3nj0wpj90zb1yh14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist"; @@ -4059,12 +4122,12 @@ cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "joostkremers"; repo = "criticmarkup-emacs"; - rev = "12b7460691dc502d27329d6ac11c51cc83cd098e"; - sha256 = "018limfwcb396yr2kn6jixxdmpmiif3l7gp0p1pmwbg07fldllha"; + rev = "276d49c859822265070ae5dfbb403fd7d8d06436"; + sha256 = "0mqbjw9wiaq735v307hd7g0g6i3a4k7h71bi4g9rr2jbgiljmql4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode"; @@ -4101,12 +4164,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.7.2"; + version = "3.8.0pre1"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "35413bf2c1b33980afd418030af27f184872af6b"; - sha256 = "1kk0xri88h4lla8r8y5gksiwpyxb468h8qn0f61sfa1kni73z09s"; + rev = "84df4a49500e51ac6e2a19a77e385e66234386f7"; + sha256 = "1kkycphqbz8j3jp70n9vh3lgpb2fxy2461q6x365h8mg5ab4w7x3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4542,12 +4605,12 @@ company-erlang = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, ivy-erlang-complete, lib, melpaBuild }: melpaBuild { pname = "company-erlang"; - version = "0.1"; + version = "0.1.1"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "company-erlang"; - rev = "3296baf45e354171acfddf33071b0f5af64371b5"; - sha256 = "00r0rr2c11b8mpis7a64dj6bzpm2jm17lpqmrhjjnc66zpq1vq8y"; + rev = "bc0524a16f17b66c7397690e4ca0e004f09ea6c5"; + sha256 = "04wm3i65fpzln7sdcny88hfjfm0n7wy44ffsr3697x4l95d0bnyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca96ed0b5d6f8aea4de56ddeaa003b9c81d96219/recipes/company-erlang"; @@ -4689,12 +4752,12 @@ company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ngram"; - version = "0.7.9"; + version = "0.8.0"; src = fetchFromGitHub { owner = "kshramt"; repo = "company-ngram"; - rev = "98491c830d0867c211b773818610ace51f243640"; - sha256 = "196c870n7d46n4yhppq5np8mn9i0i74aykkbfk33kr4mgilss4cw"; + rev = "d15182df3eac72b29772802759b77c9eafef5066"; + sha256 = "05108s2a3c857n9j3c34hdni3fyq149pva4m3f51lis4wqrm4zv7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram"; @@ -4800,12 +4863,12 @@ company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }: melpaBuild { pname = "company-sourcekit"; - version = "0.1.7"; + version = "0.2.0"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "14d503d96fe595a688a3f162ae5739e4b08da24b"; - sha256 = "1ynyxrpl9qd2l60dpn9kb04zxgq748fffb0yj8pxvm9q3abblf3m"; + rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; + sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit"; @@ -4923,22 +4986,22 @@ license = lib.licenses.free; }; }) {}; - composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: + composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }: melpaBuild { pname = "composer"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "zonuexe"; repo = "composer.el"; - rev = "47d840e03412da5db13ae2b962576f0166517581"; - sha256 = "1vw1im39c4jvsaw3ghvwvya9l5h7jiysfhry3p22gdng0l2n4008"; + rev = "2d16d3bb65c53e9e26f4b7b22ad38590a4a48ee1"; + sha256 = "1zxqqd12p1db75icbwbdj51fvp8zzhivi8ssnxda1r5y5crbiqdv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer"; sha256 = "1gwgfbb0fqn87s7jscr9xy47h239wy74n3hgpk4i16p2g6qinpza"; name = "composer"; }; - packageRequires = [ emacs f request s ]; + packageRequires = [ emacs f request s seq ]; meta = { homepage = "https://melpa.org/#/composer"; license = lib.licenses.free; @@ -5052,12 +5115,12 @@ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "6c47295597c69b3b08dd8f137f6a5973a5588674"; - sha256 = "1d4x8rvmzqi3cby01ahgr3fqcsq4kpd6sglr9slxcw7hp7rlih0i"; + rev = "edc6d2313b321988fdf780fac229d395e4752702"; + sha256 = "1gnm9r42nkp349d5ry2bv9in83ikmh5pnrfcw96yigxrzkbajb2s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -5616,6 +5679,27 @@ license = lib.licenses.free; }; }) {}; + dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "dante"; + version = "1.2"; + src = fetchFromGitHub { + owner = "jyp"; + repo = "dante"; + rev = "385dd8114bb9eaba44943f00f9f7aea71af7bf34"; + sha256 = "1jkdq9li3vqzdmmznpaxak7mf9y9vlk0abdb7ffzvvlry19dvgs8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; + sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs"; + name = "dante"; + }; + packageRequires = [ dash emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/dante"; + license = lib.licenses.free; + }; + }) {}; darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darcula-theme"; @@ -6561,12 +6645,12 @@ dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "f9dd686922cf89dc7859c793be84969a2529a14b"; - sha256 = "02cayawahsa59mkr0f4rhsm9lnpyv8qpx59w3040xmhf8dx95378"; + rev = "86880826a0cc878e2e5d50bc835eed5c8e2f001a"; + sha256 = "00qyzpqdw4im7c4bqqpiayv4kr9iqlm6mhsziazjvrjsvvi0p9ij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; @@ -6582,12 +6666,12 @@ dix-evil = callPackage ({ dix, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix-evil"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "f9dd686922cf89dc7859c793be84969a2529a14b"; - sha256 = "02cayawahsa59mkr0f4rhsm9lnpyv8qpx59w3040xmhf8dx95378"; + rev = "86880826a0cc878e2e5d50bc835eed5c8e2f001a"; + sha256 = "00qyzpqdw4im7c4bqqpiayv4kr9iqlm6mhsziazjvrjsvvi0p9ij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; @@ -6908,8 +6992,8 @@ version = "0.7"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "4004050a9771"; - sha256 = "0p7g7sfkdr473gpj2xdgg5fb5d336w2ddvx44i1d6575p6rcs5w6"; + rev = "9ae0c786e1e7"; + sha256 = "1a498jkj15vhf2x4an6raghjf9fszrkw0zl617m8pibcn3yrnv62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -7198,12 +7282,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "2.10"; + version = "2.10.1"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "4c2581ad17a636909e7ed0f46bd813cd6d9c45d3"; - sha256 = "1ic55fml4ll7pvakcf32ahps4za8mf4q10jgdyi8xj5bccvi3n3r"; + rev = "d415b91c91581ff39364384fec35c219cb89d43a"; + sha256 = "13283ymm4av2gk7zj2rsppg6sk0lixy9g4lic4arrm8b5yb0vcsd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -7532,12 +7616,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "8e3764044c9bd44fbdab4e870c2fc9a36ce02449"; - sha256 = "0f5k9bx632xjwj3l03vs0k48xvxq4nbi71039fcjqs0bchg814nj"; + rev = "b52ccbd46dee2a1ece1dd6bd9be1224c323262ca"; + sha256 = "1qdznl8z0s2hy3hhls9ccr516wai11qh663630hc0zwv4gwlwp64"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -7676,6 +7760,27 @@ license = lib.licenses.free; }; }) {}; + el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "el-patch"; + version = "1.1"; + src = fetchFromGitHub { + owner = "raxod502"; + repo = "el-patch"; + rev = "5fe9ff42e2651013ae8ff6bb8a1691d3f7b7225c"; + sha256 = "1d6n1w049wziphkx9vc2ijg70qj8zflwmn4xgzf3k09hzbgk4n46"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; + sha256 = "1imijmsni8c8fxjrzprnanf94c1pma3h5w9p75c4y99l8l3xmj7g"; + name = "el-patch"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/el-patch"; + license = lib.licenses.free; + }; + }) {}; el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }: melpaBuild { pname = "el-spice"; @@ -7784,12 +7889,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef"; - sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i"; + rev = "ac258aa1956a5ce29c1a50d7ce8b1da55cd23192"; + sha256 = "04y0l4rjsn21a5li43ixw4y9v9cxh26q1ix4zsy41l8wjzbn1hlz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -7805,12 +7910,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef"; - sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i"; + rev = "ac258aa1956a5ce29c1a50d7ce8b1da55cd23192"; + sha256 = "04y0l4rjsn21a5li43ixw4y9v9cxh26q1ix4zsy41l8wjzbn1hlz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -8033,15 +8138,15 @@ license = lib.licenses.free; }; }) {}; - elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }: + elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "1.13.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "5c900ff6b5524e216247f52ed4085734d815dacb"; - sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik"; + rev = "9afc370f7044d4e5c5a47e7080b43468ff2a4e28"; + sha256 = "1ynranqi0lv9nhap4ydqns3znpqpc0q69qyb22i93pkd505ryyf8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -8053,6 +8158,7 @@ find-file-in-project highlight-indentation pyvenv + s yasnippet ]; meta = { @@ -8709,12 +8815,12 @@ eopengrok = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, s }: melpaBuild { pname = "eopengrok"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "youngker"; repo = "eopengrok.el"; - rev = "0bf07c636f8d29a98e9776243ec9496875ddff51"; - sha256 = "0pmawjfyihqygqz7y0nvyrs6jcvckqzkq9k6z6yanpvkd2x5g13x"; + rev = "11c99f7e1e2c1c7d70cbda496cb5b6c7f6e4082a"; + sha256 = "1c5kzq3h7gr0459z364dyq5m8vq0ydclw5wphqj9fyg28mxjj6ns"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545/recipes/eopengrok"; @@ -8751,12 +8857,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "6e1d989fbfa357a7c268ea30fe8b3e3cefafc36d"; - sha256 = "0avlmqcbm07692ir5z04gy4klhyan3h25ni4l4k4p0dszjsqmdi0"; + rev = "f2daeceb98766914548bf9a3c8206ae64850e395"; + sha256 = "06j07j0gfg4ahjklxlk7m7w53arpl42ynf1diphqn02jy7ycdlh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -8981,12 +9087,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "19.2.1"; + version = "19.2.3"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "bca5bf5a2d68a0e9ca681363a8943809c4751950"; - sha256 = "1bxksxp2ggzskmrzh4k66w27ckh77jjjriq85xfz52n963al9crr"; + rev = "aa315e1cf1b79ab782e5b4c944595495ebf4e2f4"; + sha256 = "1lsmjpz2g4hj44fz95w7sswzj40iv7jq5jk64x0095lhvxmlf57c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -9085,12 +9191,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, spark }: melpaBuild { pname = "es-mode"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "f5e6054a1d25d5eb8e21ddb931b7f65b0735c5f8"; - sha256 = "04lll5sscbpqcq3sv5gsfky5qcj6asqql7fw1bp6g12qqf9r02nd"; + rev = "996730ebce57d810d2c275c7fadb11c2b1134dea"; + sha256 = "1qhfnd5anp5qrmravv7ks5ix763xnki2f5jwcyj70qyxwr0l60cg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; @@ -9481,18 +9587,19 @@ license = lib.licenses.free; }; }) {}; - evil = callPackage ({ fetchhg, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: + evil = callPackage ({ fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; version = "1.2.12"; - src = fetchhg { - url = "https://bitbucket.com/lyro/evil"; - rev = "f2648b841f9b"; - sha256 = "0gv8b6adaypw3d2brx0lh41yyi3kdf1klahx7kap36a7m652nan6"; + src = fetchFromGitHub { + owner = "emacs-evil"; + repo = "evil"; + rev = "0ad4c2dae1249558f7b59a78a685e4f8092009c9"; + sha256 = "1z7ysn0h62i674pw47k905713m4ch7hrisk4834rf53zq3c9sabn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/evil"; - sha256 = "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil"; + sha256 = "044k9p32y4cys3zwdfanr1zddgkxz16ahqspfz7vfszyw8yml1jb"; name = "evil"; }; packageRequires = [ goto-chg undo-tree ]; @@ -9777,12 +9884,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "2.3.1"; + version = "2.3.3"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "54c618aada776bfda0742819ff9e91845a91e095"; - sha256 = "04iyr6ys453pyfvif91qnhn6xyhl4z4cz2apj6vga61pa8lc70da"; + rev = "01a98a20c536a575ee5bc897f38116155154d5fe"; + sha256 = "160h4qasqr04fnv9w5dar327i074dsyac2md5y7p3hnz1c05skhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -9984,6 +10091,27 @@ license = lib.licenses.free; }; }) {}; + evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-surround"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "timcharper"; + repo = "evil-surround"; + rev = "7a0358ce3eb9ed01744170fa8a1e12d98f8b8839"; + sha256 = "1smv7sqhm1l2bi9fmispnlmjssidblwkmiiycj1n3ag54q27z031"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround"; + sha256 = "1bcjxw0yrk2bqj5ihl5r2c4id0m9wbnj7fpd0wwmw9444xvwp8ag"; + name = "evil-surround"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://melpa.org/#/evil-surround"; + license = lib.licenses.free; + }; + }) {}; evil-text-object-python = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-text-object-python"; @@ -10236,6 +10364,27 @@ license = lib.licenses.free; }; }) {}; + eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eziam-theme"; + version = "0.3"; + src = fetchFromGitHub { + owner = "thblt"; + repo = "eziam-theme-emacs"; + rev = "e0ca54afdec6eeaf275fa5130a90ed77b0b72277"; + sha256 = "1m64clhwcwwry76imqcwbsz1bm8blpqynzmpqwcsmhsjqp0yb620"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; + sha256 = "0iz3r4r54ai8y4qhnix291ra7qfmk8dbr06f52pgmz3gzin1cqpb"; + name = "eziam-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/eziam-theme"; + license = lib.licenses.free; + }; + }) {}; f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "f"; @@ -10467,22 +10616,22 @@ license = lib.licenses.free; }; }) {}; - find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: melpaBuild { pname = "find-by-pinyin-dired"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "find-by-pinyin-dired"; - rev = "3137c367d58958858daa6d3dee1993b2eb9dd9b4"; - sha256 = "1xjb66pydm3yf0jxnm2mri98pxq3b26xvwjkaj1488qgj27i05jr"; + rev = "2c48434637bd63840fca4d2c6cf9ebd5dd44658f"; + sha256 = "0ial0lbvg0xbrwn8cm68xc5wxj3xgp110y2zgypkdpak8gkv8b5h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0aa68b4603bf4071d7d12b40de0138ecab1989d7/recipes/find-by-pinyin-dired"; sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq"; name = "find-by-pinyin-dired"; }; - packageRequires = []; + packageRequires = [ pinyinlib ]; meta = { homepage = "https://melpa.org/#/find-by-pinyin-dired"; license = lib.licenses.free; @@ -10729,12 +10878,12 @@ floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; - version = "1.7.2"; + version = "1.8.1"; src = fetchFromGitHub { owner = "Floobits"; repo = "floobits-emacs"; - rev = "6fea6eb2a1841d163acdeb5d9d59e51a5d7f61c4"; - sha256 = "1n6x8n3fzxfwgpkvvnbxv6w3b08zzmx95pwv9yhqxl5b4pwyl31i"; + rev = "643dbefca9754765e6d0f88a8953dc3689f5f93f"; + sha256 = "1wh4y53vqi2zb03gxa2g2s14i280yqv0i7432ifi10v2qdwkilna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits"; @@ -11020,6 +11169,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-kotlin = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-kotlin"; + version = "0.3"; + src = fetchFromGitHub { + owner = "whirm"; + repo = "flycheck-kotlin"; + rev = "cbb9fbf70dbe8efcc3971b3606ee95c97469b1fe"; + sha256 = "0bxjx7xcpscv6vv4yxll8hh43aabv2dnrvkymb47jm3yvjr9cs1c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f158727cc8892aadba0a613dd08e65e2fc791b48/recipes/flycheck-kotlin"; + sha256 = "0vh4f3ap1ciddf2fvfnjz668d6spyx49xs2wfp1hrzxn5yqpnra5"; + name = "flycheck-kotlin"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-kotlin"; + license = lib.licenses.free; + }; + }) {}; flycheck-ledger = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-ledger"; @@ -12099,6 +12269,27 @@ license = lib.licenses.free; }; }) {}; + fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fstar-mode"; + version = "0.9.4.0"; + src = fetchFromGitHub { + owner = "FStarLang"; + repo = "fstar-mode.el"; + rev = "3a9be64827bbed8e34d38803b5c44d8d4f6cd688"; + sha256 = "0manmkd66355g1fw2q1q96ispd0vxf842i8dcr6g592abrz5lhi7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode"; + sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy"; + name = "fstar-mode"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/fstar-mode"; + license = lib.licenses.free; + }; + }) {}; fuel = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; version = "0.96"; @@ -12247,12 +12438,12 @@ fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "fxrd-mode"; - version = "0.6"; + version = "0.8"; src = fetchFromGitHub { owner = "msherry"; repo = "fxrd-mode"; - rev = "eac0b26a2c16197f6b03f7301e6e7858aca9f91e"; - sha256 = "0vfh4azibv71mj86bgl4rfbm96pw9l95r87mwhzx42j36rxffl73"; + rev = "8a1a0d5a08527ec8dee9bbe135803ed7ad297d9d"; + sha256 = "1yzw0fnlqilpx4xl84hpr75l86y9iiqyh13r1hskmwb79s2niw1m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode"; @@ -12499,12 +12690,12 @@ ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "ghc"; - version = "5.6.0.0"; + version = "5.7.0.0"; src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "deef7036d06072fbccb6c17369ac7e28ad341482"; - sha256 = "1kq3ynnjs57pgs99a2m4hh6nc692lf8j9ydmn5wync75r2pyh0jc"; + rev = "c3d0a681a19261817cf928685f7b96878fe51e91"; + sha256 = "1d2hsfmshh29g5bvd701py9n421hmz49hk0zjx5m09s8znjkvgx3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -12622,6 +12813,27 @@ license = lib.licenses.free; }; }) {}; + git-annex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "git-annex"; + version = "1.1"; + src = fetchFromGitHub { + owner = "jwiegley"; + repo = "git-annex-el"; + rev = "7d41775a1709b5754a7779e9f64f15d336ea5c8c"; + sha256 = "0fm62lm29wp1ljgyi6pqqkzwzps53cjjbj5j3y0c2013ry7va6c5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9c91e16bb9e92db9dc9be6a7af3944c3290d2f14/recipes/git-annex"; + sha256 = "0194y24vq1w6m2cjgqgx9dqp99cq8y9licyry2zxa5brbrsxi94l"; + name = "git-annex"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/git-annex"; + license = lib.licenses.free; + }; + }) {}; git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-auto-commit-mode"; @@ -12667,12 +12879,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59"; - sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn"; + rev = "acba806a823977108bae60438466da71f773a7c8"; + sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -12898,12 +13110,12 @@ gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitattributes-mode"; - version = "1.2.2"; + version = "1.2.4"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "7ccc5de55fc370c328d7ec08de559e351b1ac94c"; - sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc"; + rev = "af4ff3222f38daa0d352afdf3d20741b4fab2e79"; + sha256 = "0nn5mj29airjacckzxkh4q12wnk2pq6mp1wlzxzxdwijmkk52dbr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode"; @@ -12940,12 +13152,12 @@ gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitconfig-mode"; - version = "1.2.2"; + version = "1.2.4"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "7ccc5de55fc370c328d7ec08de559e351b1ac94c"; - sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc"; + rev = "af4ff3222f38daa0d352afdf3d20741b4fab2e79"; + sha256 = "0nn5mj29airjacckzxkh4q12wnk2pq6mp1wlzxzxdwijmkk52dbr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode"; @@ -13045,12 +13257,12 @@ gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitignore-mode"; - version = "1.2.2"; + version = "1.2.4"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "7ccc5de55fc370c328d7ec08de559e351b1ac94c"; - sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc"; + rev = "af4ff3222f38daa0d352afdf3d20741b4fab2e79"; + sha256 = "0nn5mj29airjacckzxkh4q12wnk2pq6mp1wlzxzxdwijmkk52dbr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode"; @@ -13336,22 +13548,22 @@ license = lib.licenses.free; }; }) {}; - go-eldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: + go-eldoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-eldoc"; - version = "0.27"; + version = "0.30"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-eldoc"; - rev = "ebf17e486bb64af494278f851f674303c954432c"; - sha256 = "1n5fnlfq9cy9rbn2hizqqsy0iryw5g2blaa7nd75ya03gxm10p8j"; + rev = "f1ad302ec4073354801e613293be2f55ba770618"; + sha256 = "0hkwhmgjyn5jxrd0k1nakrvy4d7cz7sxb1nw4hb1rqmz4yd14c8i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ce1190db06cc214746215dd27648eded5fe5140/recipes/go-eldoc"; sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk"; name = "go-eldoc"; }; - packageRequires = [ cl-lib go-mode ]; + packageRequires = [ emacs go-mode ]; meta = { homepage = "https://melpa.org/#/go-eldoc"; license = lib.licenses.free; @@ -13381,12 +13593,12 @@ go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-impl"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-impl"; - rev = "1827d2efe1f6023cf3954c0056aaa531124c41c1"; - sha256 = "1rcqrsvw74lrzs03bg9zslmkf5ka4a3h06b5hhdgiv4iimapz5sq"; + rev = "69f0d0ef05771487e15abec500cd06befd171abf"; + sha256 = "1rmik6g3l9q1bqavmqx1fhcadz4pwswgfnkbaxl6c5b6g2sl26iq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl"; @@ -13423,12 +13635,12 @@ go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }: melpaBuild { pname = "go-playground"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "grafov"; repo = "go-playground"; - rev = "97be0b3a19d7b8476663c9b16148c4dfd9783cfe"; - sha256 = "0wz79iwcfql8kfq5q9b0fccj9590giqlzd2kzjaj0fl89n0sx9gq"; + rev = "eebb1fec2177bc85b746b948beac873a77bea4a2"; + sha256 = "0ixpcms4f0q8327jyp2k48x03vjxwmzdsq76vg4j0kmjs9dfad1v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground"; @@ -13935,6 +14147,27 @@ license = lib.licenses.free; }; }) {}; + green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "green-screen-theme"; + version = "1.0.0.1"; + src = fetchFromGitHub { + owner = "rbanffy"; + repo = "green-screen-emacs"; + rev = "e47e3eb903b4d9dbcc66342d91915947b35e5e1e"; + sha256 = "0gv434aab9ar624l4r7ky4ksvkchzlgj8pyvkc73kfqcxg084pdn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme"; + sha256 = "0a45xcl74kp3v39bl169sq46mqxiwvvis6jzwcy6yrl2vqqi4mab"; + name = "green-screen-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/green-screen-theme"; + license = lib.licenses.free; + }; + }) {}; grin = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grin"; version = "1.0"; @@ -14206,6 +14439,27 @@ license = lib.licenses.free; }; }) {}; + hacker-typer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hacker-typer"; + version = "1.0.6"; + src = fetchFromGitHub { + owner = "therockmandolinist"; + repo = "emacs-hacker-typer"; + rev = "d5a23714a4ccc5071580622f278597d5973f40bd"; + sha256 = "13wp7cg9d9ij44inxxyk1knczglxrbfaq50wyhc4x5zfhz5yw7wx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8e04a3a1606ea23865c04d93e3dc77cb55b9931f/recipes/hacker-typer"; + sha256 = "128y562cxi8rblnqjdzhqc6b58bxi67f6hz569gqw4jywz0xcd0g"; + name = "hacker-typer"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/hacker-typer"; + license = lib.licenses.free; + }; + }) {}; hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; @@ -14544,12 +14798,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.4.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "a1bc339cbdaad200cb947e1e6264e9013322b434"; - sha256 = "1pjp629xwya55ld6hkys4gmgn0mvnd7qzpzz1qraaympsnymrh3w"; + rev = "7d7c16f10103aeee591daf46b143d23efdf3a825"; + sha256 = "0mn36dxd70nsk1dwn0mzz94sy28hk41af8chdpl2cd09bkpw113l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -14586,12 +14840,12 @@ helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag"; - version = "0.57"; + version = "0.58"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "49e1f66fa80674513ca898e32d62d6dad875cb90"; - sha256 = "0vzgiix2c8jwpk2hhxvz9gqb78glmd4dk1myrgvxs9fhsj54dkk3"; + rev = "39ed137823665fca2fa5b215f7c3e8701173f7b7"; + sha256 = "0a6yls52pkqsaj6s5nsi70kzpvssdvb87bfnp8gp26q2y3syx4ni"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -14751,6 +15005,27 @@ license = lib.licenses.free; }; }) {}; + helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }: + melpaBuild { + pname = "helm-cider"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "clojure-emacs"; + repo = "helm-cider"; + rev = "a24ef274e382c1a158a76eae2570f1f007031cb8"; + sha256 = "062abfb4sfpcc6fx3nrf3j0bisglrhyrg7rxwhhcqm9jhalksmdl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider"; + sha256 = "1fvpq1xi3xhd8w1yasac87incv1w4av5a8vn0birw8pc7a6bxv4w"; + name = "helm-cider"; + }; + packageRequires = [ cider emacs helm-core seq ]; + meta = { + homepage = "https://melpa.org/#/helm-cider"; + license = lib.licenses.free; + }; + }) {}; helm-circe = callPackage ({ circe, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-circe"; @@ -14772,6 +15047,27 @@ license = lib.licenses.free; }; }) {}; + helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: + melpaBuild { + pname = "helm-codesearch"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "youngker"; + repo = "helm-codesearch.el"; + rev = "e80e76e492f626659b88dbe362b11aa0a3b0a116"; + sha256 = "16njr3xcvpzg4x6qq2pwk80pca9pxhc6vjvfy3dzy4hi9nxryrs6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch"; + sha256 = "1v21zwcyx73bc1lcfk60v8xim31bwdk4p06g9i4qag3cijdlli9q"; + name = "helm-codesearch"; + }; + packageRequires = [ cl-lib dash helm s ]; + meta = { + homepage = "https://melpa.org/#/helm-codesearch"; + license = lib.licenses.free; + }; + }) {}; helm-commandlinefu = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, json ? null, let-alist, lib, melpaBuild }: melpaBuild { pname = "helm-commandlinefu"; @@ -14796,12 +15092,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.4.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "a1bc339cbdaad200cb947e1e6264e9013322b434"; - sha256 = "1pjp629xwya55ld6hkys4gmgn0mvnd7qzpzz1qraaympsnymrh3w"; + rev = "7d7c16f10103aeee591daf46b143d23efdf3a825"; + sha256 = "0mn36dxd70nsk1dwn0mzz94sy28hk41af8chdpl2cd09bkpw113l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -15486,6 +15782,27 @@ license = lib.licenses.free; }; }) {}; + helm-perspeen = callPackage ({ fetchFromGitHub, fetchurl, helm-projectile, lib, melpaBuild, perspeen }: + melpaBuild { + pname = "helm-perspeen"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "jimo1001"; + repo = "helm-perspeen"; + rev = "28c91e4e8a43921457f047a548366dd799c07f69"; + sha256 = "1zn7k0v734d9qcp79p3ajz6kr4hdxqiwi82i2rplg7y4ylikq0jq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee26a57aacbd571da0cfaca2c31eec6ea86a543/recipes/helm-perspeen"; + sha256 = "07cnsfhph807fqyai3by2c5ml9a40gxkq280f27disf8sc45rg1y"; + name = "helm-perspeen"; + }; + packageRequires = [ helm-projectile perspeen ]; + meta = { + homepage = "https://melpa.org/#/helm-perspeen"; + license = lib.licenses.free; + }; + }) {}; helm-proc = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-proc"; @@ -17672,12 +17989,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "65d80ff0052be9aa65e9a1cd8f6b1f5fb112ee36"; - sha256 = "05qjpv95xrhwpg1g0znsp33a8827w4p7vl6iflrrmi15kij5imb4"; + rev = "f5bee7c5368d55be4ebca30610b73c33978830cf"; + sha256 = "0lcydjg8kyxdv5bbly0jf4d5wl4z7s63i536gvnlz0wfgj5swp5v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -18003,6 +18320,27 @@ license = lib.licenses.free; }; }) {}; + jdecomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jdecomp"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "xiongtx"; + repo = "jdecomp"; + rev = "1590b06f139f036c1041e1ce5c0acccaa24b31a7"; + sha256 = "0sb9vzn6cycys31r98kxwgpn7v9aw5ck86nkskmn9hhhkrfsabii"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7725a5b3e2aa065cc6f9bac55575151cfdc7791/recipes/jdecomp"; + sha256 = "1s8y7q361300i7f6pany1phxzr42j8gcdv9vpin05xx15p2nr3qz"; + name = "jdecomp"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/jdecomp"; + license = lib.licenses.free; + }; + }) {}; jedi = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }: melpaBuild { pname = "jedi"; @@ -18531,12 +18869,12 @@ keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keychain-environment"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "keychain-environment"; - rev = "1ca091f72ad1d1a7620552289ae43484d853e968"; - sha256 = "0xgm80dbg45bs3k8psd3pv49z1xbvzm156xs55gmxdzbgxbzpazr"; + rev = "7c08e8c4c3ea4d6eaee12d710a56793771f837c5"; + sha256 = "1mnqa69f584qzb62nn01bb4nz08gi7ra8b6xr0x7aphfqzk86kzy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4382c9e7e8dee2cafea9ee49965d0952ca359dd5/recipes/keychain-environment"; @@ -19336,12 +19674,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "469ed0ccf146deab8c2ebbb162be7be31709da0a"; - sha256 = "1qv6v27fjfq0h3i7d2nry752r9fwqf5llilngy5l3yimqddm2k4d"; + rev = "51b1e177f115ab527cc47baf98abe09d43d9a95f"; + sha256 = "0rcxrq3r4vbr9zb844andy1zj246gs8s1ksqp1f092fiiyqpllnx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -19630,12 +19968,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59"; - sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn"; + rev = "acba806a823977108bae60438466da71f773a7c8"; + sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -19681,14 +20019,14 @@ pname = "magit-filenotify"; version = "0.1"; src = fetchFromGitHub { - owner = "magit"; + owner = "ruediger"; repo = "magit-filenotify"; rev = "575c4321f61fb8f25e4779f9ffd4514ac086ae96"; sha256 = "1vn6x53kpwv3zf2b5xjswyz6v853r8b9dg88qhwd2h480hrx6kal"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c6c87a11492f6b6e5159a2a3dc1fe7d9efcc0cde/recipes/magit-filenotify"; - sha256 = "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca5541d2ce3553e9ade2c1ec1c0d78103dfd0c4d/recipes/magit-filenotify"; + sha256 = "1ihk5yi6psqkccpi2bq2h70kn7k874zl7wcinjaq21lirk4z7bvn"; name = "magit-filenotify"; }; packageRequires = [ emacs magit ]; @@ -19784,12 +20122,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59"; - sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn"; + rev = "acba806a823977108bae60438466da71f773a7c8"; + sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -19847,12 +20185,12 @@ magit-svn = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-svn"; - version = "2.1.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "magit"; repo = "magit-svn"; - rev = "63a47732cc112d24db26052ffad93895319b60cf"; - sha256 = "1g2isa8n2j8kk0c5iwx8qai8k14sazwkc3dwhcpchm3zs0bfpdm3"; + rev = "c833903732a14478f5c4cfc561bae7c50671b36c"; + sha256 = "01kcsc53q3mbhgjssjpby7ypnhqsr48rkl1xz3ahaypmlp929gl9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-svn"; @@ -19886,22 +20224,22 @@ license = lib.licenses.free; }; }) {}; - magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }: melpaBuild { pname = "magithub"; - version = "0.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "c94ff69749dd14200956e0b59a3757618c594730"; - sha256 = "12z9gl5lrvdfvhvk213phhgddvvr3y3hpigpzzcq0jla65db367b"; + rev = "283bde94b3fe5cd8f4634887812c58eaf55aef60"; + sha256 = "0nd9q3x60pydigyrp7b00xgnw7pgb0plh6mry7pj1532z3xxz1d7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; sha256 = "1c3rbav13rw16ngjhjwnz80v653k8df63fkw0kayd80xrkxhrkxw"; name = "magithub"; }; - packageRequires = [ emacs magit ]; + packageRequires = [ emacs git-commit magit s with-editor ]; meta = { homepage = "https://melpa.org/#/magithub"; license = lib.licenses.free; @@ -20138,22 +20476,29 @@ license = lib.licenses.free; }; }) {}; - markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }: + markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }: melpaBuild { pname = "markdown-preview-mode"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "ancane"; repo = "markdown-preview-mode"; - rev = "2fc9f06fdf8489a2d5661b794941abb6f863f194"; - sha256 = "0grljxihip0xyfm47ljwz6hy4kn30vw69bv4w5dw8kr33d51y5ym"; + rev = "65f48df07c87d37275cc6a135741df4b585f1836"; + sha256 = "0gkfwm7zxwdi7x7xd6m9sl9q1p5f2q8mxryq6cd4xldbvbcki71f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode"; sha256 = "1cam5wfxca91q3i1kl0qbdvnfy62hr5ksargi4430kgaz34bcbyn"; name = "markdown-preview-mode"; }; - packageRequires = [ cl-lib markdown-mode websocket ]; + packageRequires = [ + cl-lib + emacs + markdown-mode + uuidgen + web-server + websocket + ]; meta = { homepage = "https://melpa.org/#/markdown-preview-mode"; license = lib.licenses.free; @@ -20390,22 +20735,22 @@ license = lib.licenses.free; }; }) {}; - meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: + meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.2.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "86820f22cd1ebf4c2f8cae5b64bc8ff3964ea221"; - sha256 = "0nn6p5r760hb3ffrv4lb3ny75np6ps0gscp1a20sdsfrz6fbv6dg"; + rev = "9f73f1b0656a6a2ea55bbacf7659ffd3b35cdd9d"; + sha256 = "0hnhzkkggv035x0qkxmw64migq6v6jpg8m6ayfc95avimyf1j67r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4"; name = "meghanada"; }; - packageRequires = [ cl-lib company emacs flycheck yasnippet ]; + packageRequires = [ company emacs flycheck yasnippet ]; meta = { homepage = "https://melpa.org/#/meghanada"; license = lib.licenses.free; @@ -21618,8 +21963,8 @@ sha256 = "1m3llm87qgd7sr6ci22nd835vdg0qprs5m9lqcx74k689jl89cni"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/00cc4705650157621bb0135cc512d57178496100/recipes/ncl-mode"; - sha256 = "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2eea3936b8a3a7546450d1d7399e0f86d855fefd/recipes/ncl-mode"; + sha256 = "1niy0w24q6q6j7s0l9fcaqai7zz2gg1qlk2s9sxb8j79jc41y47k"; name = "ncl-mode"; }; packageRequires = [ emacs ]; @@ -21694,12 +22039,12 @@ nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nginx-mode"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "ajc"; repo = "nginx-mode"; - rev = "304c9e2dbe884645661e3f133c11217a2b4d4274"; - sha256 = "1i9yh55zi7ml4i9nfjgvyz62y7id3c9fszs0h41skdzjfs9x5p6j"; + rev = "b58708d15a6659577945c0aa3a63983eebff2e67"; + sha256 = "0y2wwgvm3495h6hms425gzgi3qx2wn33xq6b7clrvj4amfy29qix"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode"; @@ -21820,12 +22165,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "e7d3ebbd12f176707e63766a7a19bcaa08e01331"; - sha256 = "0y8wvagn4yf7fwvwzqcrx46wigmvyl25fa94kzvkanjl04zid3i1"; + rev = "87fffa1973376bd1837fcf84277cd16db9c96957"; + sha256 = "1nfllm98d0893wk49fkijc071pg3v3qmpy4apyppj88k6m58y573"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -22620,6 +22965,27 @@ license = lib.licenses.free; }; }) {}; + org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "org-alert"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "groksteve"; + repo = "org-alert"; + rev = "685c18aa5ce994360c7f9e8bbf49590c412187ac"; + sha256 = "0gkv2sfl9nb64qqh5xhgq68r9kfmsny3vpcmnzk2mqjcb9nh657s"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert"; + sha256 = "0n5a24iv8cj395xr0gfgi0hs237dd98zm2fws05k47vy3ygni152"; + name = "org-alert"; + }; + packageRequires = [ alert dash s ]; + meta = { + homepage = "https://melpa.org/#/org-alert"; + license = lib.licenses.free; + }; + }) {}; org-autolist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-autolist"; @@ -22709,14 +23075,14 @@ pname = "org-bullets"; version = "0.2.4"; src = fetchFromGitHub { - owner = "sabof"; + owner = "emacsorphanage"; repo = "org-bullets"; rev = "b70ac2ec805bcb626a6e39ea696354577c681b36"; sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3ab2169c45aae7fb3373bf5df087d9b626167ce8/recipes/org-bullets"; - sha256 = "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/fe60fc3c60d87b5fd7aa24e858c79753d5f7d2f6/recipes/org-bullets"; + sha256 = "0yrfgd6r71rng3qipp3y9i5mpm6510k4xsfgyidcn25v27fysk3v"; name = "org-bullets"; }; packageRequires = []; @@ -22875,12 +23241,12 @@ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "2.5.2"; + version = "2.6.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "af4115f4e8b4e77de5642fb28ce6d5e0d7cb0b70"; - sha256 = "1g775f9gpl0nqq3vn6h9cnjazimn9bjwk31dc7fdylz3nf7f3h03"; + rev = "0ff62665231df2be5d5bc84c4748c272664eeff3"; + sha256 = "0qn203bw0v7g8kmpkqp9vwh7m8cjjhklvwbhgmr8szaz1i1m9d0i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -22896,12 +23262,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "1.11.2"; + version = "1.12.0"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "5f1445e9bafa252c8708b3bc223f30032f5ae82b"; - sha256 = "0aip4krrl5cyaa2agmmzipqw139zar3j6594vba93axalfdx9i9z"; + rev = "24313870fa682a53e7f3f916b0e853a731868886"; + sha256 = "0nc3jl7sgqc8swi89rdk1yapmqxp8vaxm7390iqxy7a1sng4jydh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -22976,22 +23342,22 @@ license = lib.licenses.free; }; }) {}; - org-mime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + org-mime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "3c4f24c8d43c24332c4f2f4bf763459b11ead956"; - sha256 = "04xs06sgdigi9hpciqb0d12rsgzg5b5vyf08rlvkjiddkqclp5pw"; + rev = "a0b82a6c1a0dbcf5b7bebfe2e5817d54a1cd3cc8"; + sha256 = "11wldx6c53ncw3pmdwxn31q82vkcffqvr2cfphl5bhb4q8r5lrjn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6"; name = "org-mime"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/org-mime"; license = lib.licenses.free; @@ -23562,12 +23928,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "adcfef22dc9bfa6503513d0a937bf4b32ad7ab94"; - sha256 = "0f3lqw2b9xr0278s7502sa2hkyhml45j8jpssaicyliz2k1kiyzv"; + rev = "cbce5871fe267fef725631b0b7365952c35ae401"; + sha256 = "00iwp3bajr9hxs55rj3ka5bymhp5icsq8m44z514sb8h54fwapb7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -24045,12 +24411,12 @@ packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "packed"; - rev = "765cd52712f0daf40c45d169cc062b6bc94aa807"; - sha256 = "1kjcb6z08bj5ysxrykgz3x6bz2122yycpjhbv875ppc5ihls88xl"; + rev = "d2f01bffc987b226f618dda0663a1e233161518d"; + sha256 = "16xwgi0zkbbvkbxf0ld6g4xlfd95j45sca57h162wld6l27jrv4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed"; @@ -24480,6 +24846,27 @@ license = lib.licenses.free; }; }) {}; + pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "pastery"; + version = "0.1.14"; + src = fetchFromGitHub { + owner = "diasbruno"; + repo = "pastery.el"; + rev = "3f60a2660613c09be5a0b6e299828b44ee3c8732"; + sha256 = "1dzbkiy2qjdq4isrpiwj25qj069nhydzngg6avyh2c2qmxkibjsr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6058218450071db0af9a5b8ce8ec09a735c4ab66/recipes/pastery"; + sha256 = "006qawjc86spbbs2pxvhg9w94rcsxap577cndqwaiw1k0cc8vkhp"; + name = "pastery"; + }; + packageRequires = [ emacs request ]; + meta = { + homepage = "https://melpa.org/#/pastery"; + license = lib.licenses.free; + }; + }) {}; pathify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pathify"; @@ -24815,6 +25202,27 @@ license = lib.licenses.free; }; }) {}; + phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "phan"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "phan.el"; + rev = "4e3528f490e77d3aa6d81729b30b569434ef679f"; + sha256 = "1aif1hshwpzi353k2gcpwk9s76jlmz3s5dyf357qfv14b5ddhw6l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d591d9ba70b1e32f25204ad9409aad78fd68a93c/recipes/phan"; + sha256 = "16r1d2bgbb2y7l141sw7nzhx0s50gzwq5ang00y7f4sfldqvshzf"; + name = "phan"; + }; + packageRequires = [ composer emacs f ]; + meta = { + homepage = "https://melpa.org/#/phan"; + license = lib.licenses.free; + }; + }) {}; phi-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phi-search"; @@ -24878,22 +25286,22 @@ license = lib.licenses.free; }; }) {}; - php-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "1.17.0"; + version = "1.18.2"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "f3201eebfebf1757cf6a636fe3c7a3b810ab6612"; - sha256 = "0pwhw59ki19f9rkgvvnjzhby67s0y9hpsrg6cwqxakjlm66w96q3"; + rev = "e41a44f39d5d78acc2bd59d2a614f5fc9ff80cd3"; + sha256 = "0ykdi8k6qj97r6nx9icd5idakksw1p10digfgl8r8z4qgwb00gcr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y"; name = "php-mode"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/php-mode"; license = lib.licenses.free; @@ -24923,12 +25331,12 @@ phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "phpunit"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "nlamirault"; repo = "phpunit.el"; - rev = "791d1b33b63887cdeaf287fa657b8109f9d1dd18"; - sha256 = "0j9ym19pz17wsjh1ky65x9mz8aiiryxbw1nsygvy9isbdzjx591k"; + rev = "5ca5ee53e16b2cf0939dbeacbf1dffa13b41b48f"; + sha256 = "0gmb5fxnllkjg45cmqpr2gy2k6qhg1r6j2w67qbpir0x4h3q2x6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit"; @@ -25736,22 +26144,22 @@ license = lib.licenses.free; }; }) {}; - projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, ripgrep }: melpaBuild { pname = "projectile-ripgrep"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "1d579c5dc820b9a2c58261d362ffb95a02a8a752"; - sha256 = "0ayq3h0mfqyn695r3qp31yamsyy6hcgj9fxsmlrsm615axvmki9g"; + rev = "73595f1364f2117db49e1e4a49290bd6d430e345"; + sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep"; sha256 = "1iczizyayql40wcljvpc1mvfvn9r28b1dkrkcmdxif732gd01jjg"; name = "projectile-ripgrep"; }; - packageRequires = []; + packageRequires = [ projectile ripgrep ]; meta = { homepage = "https://melpa.org/#/projectile-ripgrep"; license = lib.licenses.free; @@ -25778,22 +26186,22 @@ license = lib.licenses.free; }; }) {}; - projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "projectile-variable"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "zonuexe"; repo = "projectile-variable"; - rev = "810394eabf330325a86ec6f60c69e160eb837ac3"; - sha256 = "183azck3bi4qwpprcc07kvwm3piwqgql7ryy1czvmw3kbdmk1rpj"; + rev = "8d348ac70bdd6dc320c13a12941b32b38140e264"; + sha256 = "0l38nldx6lwjb7mxixykiyj10xwb35249dxfg0k2wkmb2vy1fkxs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable"; sha256 = "1cj8nwxf1jp5q5zzxp92fxla6jhwzd21gw649ar6mygi4hgymsji"; name = "projectile-variable"; }; - packageRequires = [ cl-lib emacs projectile ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/projectile-variable"; license = lib.licenses.free; @@ -25865,12 +26273,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "a428e42072765993ff674fda72863c9f1aa2d268"; - sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i"; + rev = "593e917c176b5bc5aafa57bf9f6030d749d91cd5"; + sha256 = "120g0bg7ichry74allgmqnh7k0z2sdnrrfklb58b7szzn4zcdz14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -26369,12 +26777,12 @@ quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quasi-monochrome-theme"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-quasi-monochrome"; - rev = "e329a8d55b22151e29df1f81552a4361f85aeafa"; - sha256 = "0lfmdlb626b3gbmlvacwn84vpqam6gk9lp29wk0hcraw69vaw1v8"; + rev = "7d3afe41c2696ee25e3e4bcce987af1f589208d6"; + sha256 = "0bn1yzxzj6r1k3xcp45l04flq4avzlh0sbjfyiw4nglfhliyvwcf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9c8498e4bcca19c4c24b2fd0db035c3da477e2a/recipes/quasi-monochrome-theme"; @@ -26453,12 +26861,12 @@ railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-reloaded-theme"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "thegeorgeous"; repo = "railscasts-reloaded-theme"; - rev = "cce0e4ae6527e84e2ae3deb8b3c7770dda225853"; - sha256 = "1li86qpbjg8sm9q4sl8cffc0fni6mwx8180x8zlmsxdnhqic5nvd"; + rev = "318c9a812d53884da1a9d67206fcfd9ded4d320f"; + sha256 = "1al62r2fys6z1ja8zbh6yskprp1iq03l2jbnwbx8i3gd2w0ib7qk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; @@ -27041,12 +27449,12 @@ repo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "repo"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "canatella"; repo = "repo-el"; - rev = "98bde6fdc840d42a24c5784ee440cad39e8264d9"; - sha256 = "0hs80g3npgb6qfcaivdfkpsc9mss1kdmyp5j7s922qcy2k4yxmgl"; + rev = "d7b87cd515bad8a67d3a892a46a23f5fe81e08de"; + sha256 = "0rbvcvm7bfr6ncji7cllfxyyr6x7n9fx863byp243phsj3n93adz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1729d4ea9498549fff3594b971fcde5f81592f84/recipes/repo"; @@ -27080,22 +27488,22 @@ license = lib.licenses.free; }; }) {}; - request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + request = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "request"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "efbe231346f368a3079bf185ce25997ac6104d9c"; - sha256 = "0rpw9is8sx2gmbc7l6mv5qdd0jrh497lyj5f0zx0lqwjl8imw401"; + rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8"; + sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request"; sha256 = "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji"; name = "request"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/request"; license = lib.licenses.free; @@ -27104,12 +27512,12 @@ request-deferred = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "request-deferred"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "efbe231346f368a3079bf185ce25997ac6104d9c"; - sha256 = "0rpw9is8sx2gmbc7l6mv5qdd0jrh497lyj5f0zx0lqwjl8imw401"; + rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8"; + sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred"; @@ -27143,22 +27551,22 @@ license = lib.licenses.free; }; }) {}; - resize-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "resize-window"; - version = "0.2.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; - rev = "dec035ff44fdb743bb2dc82274114dc6ea1851f9"; - sha256 = "1ps9l6q6hgzzaywkig0gjjdlsir9avxghynzx9a3q6h0fpdkpgrj"; + rev = "27364959798de0f019da799975027842c07e7829"; + sha256 = "0x92s4cv9k566rc248zrcmh507df7d19p7b3vcfd0dlfpbqc0qnv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window"; sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l"; name = "resize-window"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/resize-window"; license = lib.licenses.free; @@ -27248,6 +27656,27 @@ license = lib.licenses.free; }; }) {}; + rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "rg"; + version = "1.1.1"; + src = fetchFromGitHub { + owner = "dajva"; + repo = "rg.el"; + rev = "fd0f056a5912caeeb2d4f668969d9df81c9e22db"; + sha256 = "1lig93lj5mnm2fjvwac42kfw8bhq8ggs4jfc73fmclm6s5dg8661"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; + sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; + name = "rg"; + }; + packageRequires = [ cl-lib s ]; + meta = { + homepage = "https://melpa.org/#/rg"; + license = lib.licenses.free; + }; + }) {}; rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rich-minority"; @@ -27314,12 +27743,12 @@ ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ripgrep"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "1d579c5dc820b9a2c58261d362ffb95a02a8a752"; - sha256 = "0ayq3h0mfqyn695r3qp31yamsyy6hcgj9fxsmlrsm615axvmki9g"; + rev = "73595f1364f2117db49e1e4a49290bd6d430e345"; + sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; @@ -27885,8 +28314,8 @@ src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "9b8db623b13fcb0aad9271d1fae73e1257dda13c"; - sha256 = "0q41dqlhp0cds16inmh7jrvhqrnjsdiv2in6pq3f0srhwms81ff3"; + rev = "730e16d254478d6f63f62cb04d47c137c9002f2d"; + sha256 = "1aq1bfv8jz53zp365awqk43ysjwkpj51pcy6fyp87j8bbb02mgq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -28047,12 +28476,12 @@ selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "selectric-mode"; - version = "1.1"; + version = "1.4"; src = fetchFromGitHub { owner = "rbanffy"; repo = "selectric-mode"; - rev = "0dd7ef28a9d9d6fbb95fdeeab6b576ad8762ad16"; - sha256 = "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79"; + rev = "e60703d9a6c9944270d77bc829dae3a8b092346f"; + sha256 = "04i5rrn93hzcf8zzfli2ams927lm83hl4q6w2azcg24lhldaqf8p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode"; @@ -28173,12 +28602,12 @@ shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "wasamasa"; repo = "shackle"; - rev = "4069e0cbff0d172de2cd7d588de971d8b02915c6"; - sha256 = "0yy162sz7vwj0i9w687a5x1c2fq31vc3i6gqhbywspviczdp4q1y"; + rev = "979b021077655ca38749a60c9752c0817e8fd93e"; + sha256 = "11qp4gqxfi5d6krvxlqxfn58b1kcgsnldpi54r8lx6mis8l0f4wl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; @@ -28719,12 +29148,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "2.18"; + version = "2.19"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "2da9fef009f2380daf9404022ca69cb87573f509"; - sha256 = "0d1fcjv11my4sa11zim99ylzfsc5q989x4izrrxs3y9ii0nq8kax"; + rev = "6e20d01e446334848ea31ace0ce041cec25647ab"; + sha256 = "1ywlbdk9ywfkv8z6pb69r29nh03krfdg676d086i8qjaas7ly2yp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -29157,6 +29586,27 @@ license = lib.licenses.free; }; }) {}; + socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: + melpaBuild { + pname = "socyl"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "socyl"; + rev = "fcc0deda5b6c39d25e48e7da2a0ae73295193ea8"; + sha256 = "1a8qd9hcmp4xl6hyvlq116nr9cn392bmrrda8vqkvjpd8rm8i776"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/774b3006f5b6b781594257f1d9819068becbbcc1/recipes/socyl"; + sha256 = "00b7x247cyjh4gci101fq1j6708vbcz1g9ls3845w863wjf6m5sz"; + name = "socyl"; + }; + packageRequires = [ cl-lib dash pkg-info s ]; + meta = { + homepage = "https://melpa.org/#/socyl"; + license = lib.licenses.free; + }; + }) {}; solarized-theme = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; @@ -29262,22 +29712,22 @@ license = lib.licenses.free; }; }) {}; - sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "sourcekit"; - version = "0.1.7"; + version = "0.2.0"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "14d503d96fe595a688a3f162ae5739e4b08da24b"; - sha256 = "1ynyxrpl9qd2l60dpn9kb04zxgq748fffb0yj8pxvm9q3abblf3m"; + rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; + sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit"; sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks"; name = "sourcekit"; }; - packageRequires = [ dash dash-functional emacs ]; + packageRequires = [ dash dash-functional emacs request ]; meta = { homepage = "https://melpa.org/#/sourcekit"; license = lib.licenses.free; @@ -29619,6 +30069,27 @@ license = lib.licenses.free; }; }) {}; + ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ssh-agency"; + version = "0.3"; + src = fetchFromGitHub { + owner = "magit"; + repo = "ssh-agency"; + rev = "94abffa716aff963175196066526c7ee8b4efae7"; + sha256 = "1r41hgh0kaf9x56jllqjz7f9ypzgyf9pqqpm3r49xyi8fr1drbxc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency"; + sha256 = "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8"; + name = "ssh-agency"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/ssh-agency"; + license = lib.licenses.free; + }; + }) {}; ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; @@ -30123,12 +30594,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "2.2.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "6cd2948589771d926e545d8cbe054705eebce18f"; - sha256 = "1zz5jv2qgcnhidyhnw3wbcpqb80jqqbs74kpa66assfigyvivyj6"; + rev = "75cbae223fbf84d19e14a7f7734ded4f46078654"; + sha256 = "1ilawg15l6j3w2mlybz01h1dk9mym37wq4illz1llc3q3v9n7nny"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -30416,12 +30887,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "1.4.1"; + version = "1.5"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "7769000ba6b395dfaa2c6b0fce48ae5d5cd9a035"; - sha256 = "1vqcqrq8qk9n512rbwi2lcvjiy0wqmybwa2lmrkv49yshqjhm5ld"; + rev = "4c1b2befd0c853dcc7bca52d9b084933c3a08254"; + sha256 = "1sdrga3mmajai2jcf4zpcii0l2b9wch8rhdsbjlzx76ia5snp23l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -31001,22 +31472,22 @@ license = lib.licenses.free; }; }) {}; - tide = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: + tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "2.0.2"; + version = "2.1.5"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "170bce9067a6467f190418284377559a9f43c667"; - sha256 = "0b23d9bi1i00v9ffrdi5ag0q2i149ai1p88klpgl2j9kvdif0zmg"; + rev = "bd89d93d9803319ba86eff0173821deb978ae2ac"; + sha256 = "1a736r1igq66hn6ig4l7c5xaxcyk2kxvj26laphakk1xg8j5x52k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1"; name = "tide"; }; - packageRequires = [ cl-lib dash emacs flycheck typescript-mode ]; + packageRequires = [ cl-lib dash flycheck typescript-mode ]; meta = { homepage = "https://melpa.org/#/tide"; license = lib.licenses.free; @@ -31067,12 +31538,12 @@ toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toc-org"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "snosov1"; repo = "toc-org"; - rev = "114dcc9813e2d8784b8c21165c95408c1b26d86e"; - sha256 = "084nqdrpzgg1qpbqgvi893iglmz9dk3r0vwqxjkyxa3z3a0f5v17"; + rev = "a0e8ca05e806e5074b8603985da7f18b92c15856"; + sha256 = "1sv9y5dln4ai9w3mgg8p4a3s05hflfqh0k7k8isjqikydbv85m2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org"; @@ -31252,27 +31723,6 @@ license = lib.licenses.free; }; }) {}; - ttrss = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ttrss"; - version = "1.7.5"; - src = fetchFromGitHub { - owner = "pedros"; - repo = "ttrss.el"; - rev = "3b1e34518294a1fa6fa29355fd4e141f3fcaf3b6"; - sha256 = "060jksd9aamqx1n4l0bb9v4icsf7cr8jkyw0mbhgyz32nmxh3v6g"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d918a5aa26c890fd138323ac6a446c0722e8b4c6/recipes/ttrss"; - sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z"; - name = "ttrss"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/ttrss"; - license = lib.licenses.free; - }; - }) {}; tuareg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; @@ -32014,6 +32464,27 @@ license = lib.licenses.free; }; }) {}; + virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "virtualenvwrapper"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "porterjamesj"; + repo = "virtualenvwrapper.el"; + rev = "5649028ea0c049cb7dfa2105285dee9c00d189fb"; + sha256 = "1xcjjs394vlaz94xh52kqaq94gkbmmjqmxlg7wly8vfn9vh34mws"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper"; + sha256 = "0rn5vwncx8z69xp8hspr06nzkf28l9flchpb2936c2nalmhx6m8i"; + name = "virtualenvwrapper"; + }; + packageRequires = [ dash s ]; + meta = { + homepage = "https://melpa.org/#/virtualenvwrapper"; + license = lib.licenses.free; + }; + }) {}; visible-mark = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "visible-mark"; @@ -32542,12 +33013,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "1.2.1"; + version = "2.0"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "17f4b0069273f9c9877dc079e5cf49ed9cb4d278"; - sha256 = "1h673yjl0hp6p244pkk6hmazgfrj2sbz9cvd1r6rnrp1lpn8z1dl"; + rev = "ea6f1dc5aacff2f3d909e410db05af01966555aa"; + sha256 = "0pckvxk2vpwqfypz5vyk0ig6g5697ibnlk8vspvqpanahvgaj0nh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -32818,8 +33289,8 @@ version = "0.9.1"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "280ab84bf8ad"; - sha256 = "088khr4ha37nvxzg620a6gyq7pc40rb13bbi9vgqhgjgggpq61d9"; + rev = "3a654cfe6632"; + sha256 = "1ahmpk0302g375w9ikkzagjvx8qblkzx40w960ka0cqf7nzyk75d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -32856,12 +33327,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.5.9"; + version = "2.5.10"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "2248a63f6eb6e7720881b508639d9a00d2db9ea0"; - sha256 = "0g5ch1a5myrmazxcbbak01q4k3x8yp3kbn73d2h26j2jmsqvdy1n"; + rev = "8ae3c7aed92842f5988671c1b3350c65c58857e0"; + sha256 = "1jy5jxkr99a9qp7abmncaphp0xd3y6m3fflvj3fq1wp33i3f7cfn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -32895,6 +33366,27 @@ license = lib.licenses.free; }; }) {}; + wolfram = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "wolfram"; + version = "1.1.1"; + src = fetchFromGitHub { + owner = "hsjunnesson"; + repo = "wolfram.el"; + rev = "6b5dceae3fd6cdb4d7562510deeafa02c93c010b"; + sha256 = "1ijyjw2793i7n00i30ma8lw4fzi9w63m6k0xgjx6j78r5y7pfj2g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/785b5b1ec73e6376f2f2bb405707a1078398fa3a/recipes/wolfram"; + sha256 = "02xp1916v9rydh0586jkx71v256qdg63f87s3m0agc2znnrni9h4"; + name = "wolfram"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/wolfram"; + license = lib.licenses.free; + }; + }) {}; wonderland = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi }: melpaBuild { pname = "wonderland"; @@ -33446,8 +33938,8 @@ version = "1.78"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "c2c547e147c7"; - sha256 = "1khsvzg7ma98ijpj21xmdlnp18wwxf2n9jr2y1xia4a6qgkmlchb"; + rev = "8871fe9f563b"; + sha256 = "0bfhf0fhx8znq7xsqwms3n178qpxds93wcznj26k3ypqgwkkcx5x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 8de489549b8..0e3d3fea328 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 = "20161224"; + version = "20170210"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20161224.tar"; - sha256 = "15fnc65k5mn5ssl53z4f9nlkz5m8a59zkaripcapdcq87ys5imqm"; + url = "http://orgmode.org/elpa/org-20170210.tar"; + sha256 = "1v8adjz3rv429is8m7xx2v8hvc20dxl4hcdhdf2vhcx44bgbvyjb"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20161224"; + version = "20170210"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20161224.tar"; - sha256 = "1pj3h5qllhcqyqvm2kln7056m34k5flipvslnn1rvsk4iwwjlv1a"; + url = "http://orgmode.org/elpa/org-plus-contrib-20170210.tar"; + sha256 = "1h0lwf1sw7n1df865ip5mp0pdmdi2md6hz6fq53r4zhali041ifx"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix index a6ccd4f631d..fabf8ac4ce4 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://github.com/ProofGeneral/PG.git"; - rev = "64ca55b1593fff8cfffab89c51d7e92c1a68dc27"; - sha256 = "1gz13fagxf0w2zgp7qd0w328qiv97295jwq7ra8vj61pdfi8xklj"; + rev = "4bcac92df46da9e68b5e3d565bb118fb63b4feb4"; + sha256 = "143anwll7mij6iskf3jbbbfzmkp2vnp0q329zpsl2l6v3wk2vv64"; }; 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 aacc3f9e792..fbf8895f971 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -3,8 +3,8 @@ , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO , withX ? !stdenv.isDarwin -, withGTK2 ? true, gtk2 ? null -, withGTK3 ? false, gtk3 ? null +, withGTK2 ? false, gtk2 ? null +, withGTK3 ? true, gtk3 ? null , withXwidgets ? false, webkitgtk24x ? null, wrapGAppsHook ? null, glib_networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null @@ -40,19 +40,19 @@ stdenv.mkDerivation rec { ## https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24358 (fetchurl { url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=9afea93ed536fb9110ac62b413604cf4c4302199; - sha256 = "1iifyfqh7qfdfsrpqgz2l7z0l7alvma57jlklyq258qyjg0pc8n4"; }) + sha256 = "0pshhq8wlh98m9hm8xd3g7gy3ms0l44dq6vgzkg67ydlccziqz40"; }) (fetchurl { url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=71ca4f6a43bad06192cbc4bb8c7a2d69c179b7b0; - sha256 = "0vadqvcigca0j891yis1mhjn18rg4l9qj621q6vzip46ka6qig0d"; }) + sha256 = "0h76wrrqyrky441immprskx5x7200zl7ajf7hyg4da22q7sr09qa"; }) (fetchurl { url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=1047496722a58ef5b736dae64d32adeb58c5055c; - sha256 = "01lfa89qw7y0spcy57hm1ymijb57i6kvhb9z9impcxwza60lbi7b"; }) + sha256 = "0hk9pi3f2zj266qj8armzpl0z8rfjg0m9ss4k09mgg1hyz80wdvv"; }) (fetchurl { url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=96ac0c3ebce825e60595794f99e703ec8302e240; - sha256 = "0bmkrm356fbwc8wsiqh2w706mq5r9q4ic4m8vzdj099ihnf121nn"; }) + sha256 = "1q2hqkjvj9z46b5ik56lv9wiibz09mvg2q3pn8fnpa04ki3zbh4x"; }) (fetchurl { url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=43986d16fb6ad78a627250e14570ea70bdb1f23a; - sha256 = "0kp8dgs7fjgvidhm2y84jrxad78mxi0c47jhyszj5644qqxm47cr"; + sha256 = "1wlyy04qahvls7bdrcxaazh9k27gksk7if1q58h83f7h6g9xxkzj"; }) ]; diff --git a/pkgs/applications/editors/emacs/macport-25.1.nix b/pkgs/applications/editors/emacs/macport-25.1.nix index 84d1950b865..9169c12417a 100644 --- a/pkgs/applications/editors/emacs/macport-25.1.nix +++ b/pkgs/applications/editors/emacs/macport-25.1.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { sha256 = "1zwxh7zsvwcg221mpjh0dhpdas3j9mc5q92pprf8yljl7clqvg62"; }; + hiresSrc = fetchurl { + url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/emacs-hires-icons-2.0.tar.gz"; + sha256 = "1ari8n3y1d4hdl9npg3c3hk27x7cfkwfgyhgzn1vlqkrdah4z434"; + }; + enableParallelBuilding = true; buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext autoconf automake]; @@ -32,12 +37,18 @@ stdenv.mkDerivation rec { mv $sourceRoot $name tar xzf $macportSrc mv $name $sourceRoot + + # extract retina image resources + tar xzfv $hiresSrc --strip 1 -C $sourceRoot ''; postPatch = '' patch -p1 < patch-mac substituteInPlace lisp/international/mule-cmds.el \ --replace /usr/share/locale ${gettext}/share/locale + + # use newer emacs icon + cp nextstep/Cocoa/Emacs.base/Contents/Resources/Emacs.icns mac/Emacs.app/Contents/Resources/Emacs.icns ''; configureFlags = [ diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 204fd60d2bc..12ca97e12c5 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -136,12 +136,12 @@ in { clion = buildClion rec { name = "clion-${version}"; - version = "2016.3"; + version = "2016.3.2"; 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 = "16nszamr0bxg8aghyrg4wzxbp9158kjzhr957ljpbipz0rlixf31"; + sha256 = "0ygnj3yszgd1si1qgx7m4n7smm583l5pww8xhx8n86mvz7ywdhbn"; }; wmClass = "jetbrains-clion"; }; @@ -172,12 +172,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2016.3.2"; + version = "2016.3.3"; 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 = "0ngign34gq7i121ss2s9wfziy3vkv1jb79pw8nf1qp7rb15xn4vc"; + sha256 = "1v9rzfj84fyz3m3b6bh45jns8wcil9n8f8mfha0x8m8534r6w368"; }; wmClass = "jetbrains-idea-ce"; }; @@ -208,24 +208,24 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2016.3.2"; + version = "2016.3.3"; 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}.tar.gz"; - sha256 = "13pd95zad29c3i9qpwhjii601ixb4dgcld0kxk3liq4zmnv6wqxa"; + sha256 = "1bwy86rm0mifizmhkm9wxwc4nrrizk2zp4zl5ycxh6zdiad1r1wm"; }; wmClass = "jetbrains-idea"; }; ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2016.2.5"; + version = "2016.3.1"; 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 = "1rncnm5dvhpfb7l5p2k0hs4yqzp8n1c4rvz9vldlf5k7mvwggp7p"; + sha256 = "10d1ba6qpizhz4d7fz0ya565pdvkgcmsdgs7b8dv98s9hxfjsldy"; }; wmClass = "jetbrains-rubymine"; }; @@ -256,36 +256,36 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2016.3"; + version = "2016.3.2"; description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1pi822ihzy58jszdy7y2pyni6pki9ih8s9xdbwlbwg9vck1iqprs"; + sha256 = "0fag5ng9n953mnf3gmxpac1icnb1qz6dybhqwjbr13qij8v2s2g1"; }; wmClass = "jetbrains-pycharm-ce"; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2016.3"; + version = "2016.3.2"; description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1b4ib77wzg0y12si8zqrfwbhv4kvmy9nm5dsrdr3k7f89dqg3279"; + sha256 = "1nylq0fyvix68l4dp9852dak58dbiamjphx2hin087cadaji6r63"; }; wmClass = "jetbrains-pycharm"; }; phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2016.3"; + version = "2016.3.2"; 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 = "0hzjhwij2x3b5fqwyd69h24ld13bpc2bf9wdcd1jy758waf0d91y"; + sha256 = "05ylhpn1mijjphcmv6ay3123xp72yypw19430dgr8101zpsnifa5"; }; wmClass = "jetbrains-phpstorm"; }; @@ -304,12 +304,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2016.3.1"; + version = "2016.3.2"; 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 = "10za4d6w9yns7kclbviizslq2y7zas9rkmvs3xwrfw1rdw2b69af"; + sha256 = "1h3kjvd10j48n9ch2ldqjsizq5n8gkm0vrrvznayc1bz2kjvhavn"; }; wmClass = "jetbrains-webstorm"; }; diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 14b13c394f3..4590939b516 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "kakoune-nightly-${version}"; - version = "2016-12-30"; + version = "2017-02-09"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; - rev = "76c58aa022a896dc170c207ff821992ee354d934"; - sha256 = "0hgpcp6444cyg4bm0a9ypywjwfh19qpqpfr5w0wcd2y3clnsvsdz"; + rev = "9ba1665e58ee84b6596d89e6ef75f7c32e7c6c14"; + sha256 = "1l25mzq64a481qlsyh25rzp5rzajrkx4dq29677z85lnjqn30wbi"; }; buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ]; diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch b/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch new file mode 100644 index 00000000000..ba5140c77fc --- /dev/null +++ b/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch @@ -0,0 +1,55 @@ +From e84645d1694bdad7f179cd41babce723fe07aa63 Mon Sep 17 00:00:00 2001 +From: Kevin Funk +Date: Mon, 5 Dec 2016 15:20:53 +0100 +Subject: Hotfix for restoring build with newer KConfig + +https://phabricator.kde.org/D3386 is a SIC change, handle that +--- + project/projectconfigskeleton.cpp | 4 ++++ + project/projectconfigskeleton.h | 14 +++++--------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/project/projectconfigskeleton.cpp b/project/projectconfigskeleton.cpp +index 0e06149..c4c9767 100644 +--- a/project/projectconfigskeleton.cpp ++++ b/project/projectconfigskeleton.cpp +@@ -46,6 +46,10 @@ ProjectConfigSkeleton::ProjectConfigSkeleton( const QString & configname ) + ProjectConfigSkeleton::ProjectConfigSkeleton( KSharedConfigPtr config ) + : KConfigSkeleton( config ), d( new ProjectConfigSkeletonPrivate ) + { ++ // FIXME: Check if that does the right thing. ++ // https://phabricator.kde.org/D3386 broke source compat in kconfig, thus requiring us to make this ctor public ++ Q_ASSERT(config); ++ d->m_developerTempFile = config->name(); + } + + void ProjectConfigSkeleton::setDeveloperTempFile( const QString& cfg ) +diff --git a/project/projectconfigskeleton.h b/project/projectconfigskeleton.h +index ed17ed0..c8314df 100644 +--- a/project/projectconfigskeleton.h ++++ b/project/projectconfigskeleton.h +@@ -55,16 +55,12 @@ public: + + Path projectFile() const; + Path developerFile() const; ++ ++protected: ++ explicit ProjectConfigSkeleton( KSharedConfigPtr config ); ++ + private: +- /** +- * There's no way in KDE4 API to find out the file that the config object +- * was created from, so we can't apply defaults when using this +- * constructors. Thus I'm making this private, so we can find out when +- * this constructor is used and see if we need to add appropriate API to +- * kdelibs +- */ +- explicit ProjectConfigSkeleton( KSharedConfigPtr config ); +- struct ProjectConfigSkeletonPrivate * const d; ++ struct ProjectConfigSkeletonPrivate * const d; + }; + + } +-- +cgit v0.11.2 + diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix index 93c3eac9c34..c36885a9e13 100644 --- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix +++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { sha256 = "643d1145e1948af221f9ae148d0a10809f3d89af4b97ff0d6c4d571004f46bd4"; }; + patches = [ ./kdevplatform-projectconfigskeleton.patch ]; + nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ]; propagatedBuildInputs = [ ]; diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix index c7dbff366db..7feb7f22e22 100644 --- a/pkgs/applications/editors/ne/default.nix +++ b/pkgs/applications/editors/ne/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, texinfo, tetex, perl, ghostscript }: +{ stdenv, fetchFromGitHub, ncurses, texinfo, texlive, perl, ghostscript }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { rev = version; sha256 = "05inzhlqlf4ka22q78q389pr34bsb4lgp1i5qh550vjkb2cvbdfp"; }; - buildInputs = [ ncurses tetex texinfo perl ghostscript ]; + buildInputs = [ ncurses texlive.combined.scheme-medium texinfo perl ghostscript ]; dontBuild = true; installPhase = '' substituteInPlace src/makefile --replace "CC=c99" "cc=gcc" @@ -20,14 +20,15 @@ stdenv.mkDerivation rec { cd src && make && cd .. make PREFIX=$out install ''; - + meta = { description = "The nice editor"; homepage = https://github.com/vigna/ne; longDescription = '' - ne is a free (GPL'd) text editor based on the POSIX standard that runs (we hope) on almost any -UN*X machine. ne is easy to use for the beginner, but powerful and fully configurable for the wizard, -and most sparing in its resource usage. See the manual for some highlights of ne's features. + ne is a free (GPL'd) text editor based on the POSIX standard that runs + (we hope) on almost any UN*X machine. ne is easy to use for the beginner, + but powerful and fully configurable for the wizard, and most sparing in its + resource usage. See the manual for some highlights of ne's features. ''; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix new file mode 100644 index 00000000000..487d9c842b8 --- /dev/null +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +with stdenv.lib; + +pythonPackages.buildPythonPackage rec { + name = "neovim-remote-${version}"; + version = "v1.4.0"; + disabled = !pythonPackages.isPy3k; + + src = fetchFromGitHub { + owner = "mhinz"; + repo = "neovim-remote"; + rev = version; + sha256 = "0msvfh27f56xj5ki59ikzavxz863nal5scm57n43618m49qzg8iz"; + }; + + propagatedBuildInputs = [ pythonPackages.neovim ]; + + meta = { + description = "A tool that helps controlling nvim processes from a terminal"; + homepage = https://github.com/mhinz/neovim-remote/; + license = licenses.mit; + maintainers = with maintainers; [ edanaher ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 07660eaddf6..66c538a1976 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -1,46 +1,46 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, pythonPackages, libmsgpack -, makeWrapper, neovim -}: +{ stdenv, fetchFromGitHub, cmake, doxygen +, libmsgpack, makeWrapper, neovim, pythonPackages, qtbase }: -let # not very usable ATM - version = "0.2.4"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "neovim-qt-${version}"; + version = "0.2.4"; src = fetchFromGitHub { - owner = "equalsraf"; - repo = "neovim-qt"; - rev = "v${version}"; + owner = "equalsraf"; + repo = "neovim-qt"; + rev = "v${version}"; sha256 = "0yf9wwkl0lbbj3vyf8hxnlsk7jhk5ggivszyqxply69dbar9ww59"; }; - # It tries to download libmsgpack; let's use ours. - postPatch = let use-msgpack = '' - cmake_minimum_required(VERSION 2.8.11) - project(neovim-qt-deps) - - # Similar enough to FindMsgpack - set(MSGPACK_INCLUDE_DIRS ${libmsgpack}/include PARENT_SCOPE) - set(MSGPACK_LIBRARIES msgpackc PARENT_SCOPE) - ''; - in "echo '${use-msgpack}' > third-party/CMakeLists.txt"; - - buildInputs = with pythonPackages; [ - cmake qt5.qtbase - python msgpack jinja2 libmsgpack - makeWrapper + cmakeFlags = [ + "-DMSGPACK_INCLUDE_DIRS=${libmsgpack}/include" + "-DMSGPACK_LIBRARIES=${libmsgpack}/lib/libmsgpackc.so" ]; + doCheck = false; # 5 out of 7 fail + + buildInputs = with pythonPackages; [ + qtbase libmsgpack + ] ++ (with pythonPackages; [ + jinja2 msgpack python + ]); + + nativeBuildInputs = [ cmake doxygen makeWrapper ]; + enableParallelBuilding = true; + # avoid cmake trying to download libmsgpack + preConfigure = "echo \"\" > third-party/CMakeLists.txt"; + postInstall = '' wrapProgram "$out/bin/nvim-qt" --prefix PATH : "${neovim}/bin" ''; meta = with stdenv.lib; { - description = "A prototype Qt5 GUI for neovim"; + description = "Neovim client library and GUI, in Qt5"; license = licenses.isc; + maintainers = with maintainers; [ peterhoeg ]; inherit (neovim.meta) platforms; + inherit version; }; } diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 82bcc485da3..5fef166e663 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,4 +1,14 @@ -{ stdenv, fetchurl, makeDesktopItem, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper }: +{ stdenv, fetchurl, makeDesktopItem, cmake, boost155, zlib, openssl, +R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, +# If you have set up an R wrapper with other packages by following +# something like https://nixos.org/nixpkgs/manual/#r-packages, RStudio +# by default not be able to access any of those R packages. In order +# to do this, override the argument "R" here with your respective R +# wrapper, and set "useRPackages" to true. This will add the +# environment variable R_PROFILE_USER to the RStudio wrapper, pointing +# to an R script which will allow R to use these packages. +useRPackages ? false +}: let version = "0.98.110"; @@ -72,8 +82,14 @@ stdenv.mkDerivation rec { mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; }; - postInstall = '' - wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin + postInstall = let rProfile = + # RStudio seems to bypass the environment variables that the R + # wrapper already applies, and so this sets R_PROFILE_USER to + # again make those R packages accessible: + if useRPackages + then "--set R_PROFILE_USER ${R}/${R.passthru.fixLibsR}" else ""; + in '' + wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin ${rProfile} mkdir $out/share cp -r ${desktopItem}/share/applications $out/share mkdir $out/share/icons diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index c7badf6a77c..f900a4e9147 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2, - pkexecPath ? "/var/setuid-wrappers/pkexec", libredirect, + pkexecPath ? "/run/wrappers/bin/pkexec", libredirect, gksuSupport ? false, gksu}: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 39975c3dc69..0412d1d2d6c 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.0075"; + version = "8.0.0329"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1imhvrd90f797jlbzvx8sc08h53s55ns6jxy1kl5kh8lz1qq455w"; + sha256 = "0dcvj2la5g6s87mx3vm96jk904xfmqbwi0jyds9bd3qgbpnn80r1"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index d0a0c63d9d0..9c0becc4729 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,7 +1,7 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext -, composableDerivation, writeText, lib, config, glib, gtk2, python, perl, tcl, ruby +, composableDerivation, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE @@ -69,8 +69,8 @@ composableDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs - = [ ncurses gtk2 libX11 libXext libSM libXpm libXt libXaw libXau - libXmu glib libICE ]; + = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau + libXmu glib libICE ] ++ (if args.gui == "gtk3" then [gtk3] else [gtk2]); # most interpreters aren't tested yet.. (see python for example how to do it) flags = { @@ -149,7 +149,7 @@ composableDerivation { ftNixSupport = config.vim.ftNix or true; }; - #--enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon + #--enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gtk3/gnome/gnome2/motif/athena/neXtaw/photon/carbon /* // edf "gtk_check" "gtk_check" { } #If auto-select GUI, check for GTK default=yes // edf "gtk2_check" "gtk2_check" { } #If GTK GUI, check for GTK+ 2 default=yes @@ -161,6 +161,10 @@ composableDerivation { // edf "gtktest" "gtktest" { } #Do not try to compile and run a test GTK program */ + preInstall = '' + mkdir -p $out/share/applications $out/share/icons/{hicolor,locolor}/{16x16,32x32,48x48}/apps + ''; + postInstall = stdenv.lib.optionalString stdenv.isLinux '' patchelf --set-rpath \ "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \ @@ -171,4 +175,3 @@ composableDerivation { dontStrip = 1; }) - diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 97fc30c237c..816a310f758 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,21 +2,24 @@ makeWrapper, libXScrnSaver }: let - version = "1.8.1"; - rev = "ee428b0eead68bf0fb99ab5fdc4439be227b6281"; + version = "1.9.1"; + rev = "f9d0c687ff2ea7aabd85fb9a43129117c0ecf519"; channel = "stable"; - sha256 = if stdenv.system == "i686-linux" then "f48c2eb302de0742612f6c5e4ec4842fa474a85c1bcf421456526c9472d4641f" - else if stdenv.system == "x86_64-linux" then "99bd463707f3a21bc949eec3e857c80aafef8f66e06a295148c1c23875244760" - else if stdenv.system == "x86_64-darwin" then "9202c85669853b07d1cbac9e6bcb01e7c08e13fd2a2b759dd53994e0fa51e7a1" + # The revision can be obtained with the following command (see https://github.com/NixOS/nixpkgs/issues/22465): + # curl -w "%{url_effective}\n" -I -L -s -S https://vscode-update.azurewebsites.net/latest/linux-x64/stable -o /dev/null + + sha256 = if stdenv.system == "i686-linux" then "03lv792rkb1hgn1knd8kpic7q07cd194cr4fw1bimnjblrvyy586" + else if stdenv.system == "x86_64-linux" then "1vrcb4y2y83bhxx9121afwbzm8yddfin4zy3nyxfi805pjmszwjm" + else if stdenv.system == "x86_64-darwin" then "0s92ing4m2qyqdkpmkhl2zj40hcdsr5x764sb6zprwwhfv4npymr" else throw "Unsupported system: ${stdenv.system}"; urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/"; urlStr = if stdenv.system == "i686-linux" then - urlBase + "code-${channel}-code_${version}-1482159060_i386.tar.gz" + urlBase + "code-${channel}-code_${version}-1486596246_i386.tar.gz" else if stdenv.system == "x86_64-linux" then - urlBase + "code-${channel}-code_${version}-1482158209_amd64.tar.gz" + urlBase + "code-${channel}-code_${version}-1486597190_amd64.tar.gz" else if stdenv.system == "x86_64-darwin" then urlBase + "VSCode-darwin-${channel}.zip" else throw "Unsupported system: ${stdenv.system}"; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 680cf921ce2..d32aaba8468 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.16.2"; + name = "qgis-2.18.3"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "0dll8klz0qfba4c1y7mp9k4y4azlay0sypvryicggllk1hna4w0n"; + sha256 = "155kz7fizhkmgc4lsmk1cph1zar03pdd8pjpmv81yyx1z0i4ygvl"; }; cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index f5c475ef93a..2ee7f3bb160 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -12,8 +12,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.4-0"; - sha256 = "0hfkdvfl60f9ksh07c06cpq8ib05apczl767yyvc671gd90n11ds"; + version = "7.0.4-6"; + sha256 = "1nm0hjijwhcp6rzcn7zksp2820dxvj4lmblj7kzpzd3s1ds09q0y"; patches = []; }; in diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 3364a661e0c..58a88e89681 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -12,8 +12,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.7-0"; - sha256 = "0c6ff1am2mhc0dc26h50l78yx6acwqymwpwgkxgx69cb6jfpwrdx"; + version = "6.9.7-6"; + sha256 = "17pc3xz8srb9g5a5gkk6q9sjiss77fgm0wxxfmb5qya4rqivjpzn"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix index 2a2d280d6b2..2bba73fae1a 100644 --- a/pkgs/applications/graphics/ao/default.nix +++ b/pkgs/applications/graphics/ao/default.nix @@ -10,7 +10,13 @@ stdenv.mkDerivation rec { libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm libXcursor libXfixes ]; - src = fetchgit (stdenv.lib.importJSON ./src.json); + + src = fetchgit { + url = https://github.com/mkeeter/ao; + rev = "69fadb81543cc9031e4a7ec2036c7f2ab505a620"; + sha256 = "1717k72vr0i5j7bvxmd6q16fpvkljnqfa1hr3i4yq8cjdsj69my7"; + }; + cmakeFlags = "-G Ninja"; buildPhase = "ninja"; installPhase = '' diff --git a/pkgs/applications/graphics/ao/src.json b/pkgs/applications/graphics/ao/src.json deleted file mode 100644 index 0fa10dc3b0f..00000000000 --- a/pkgs/applications/graphics/ao/src.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "url": "https://github.com/mkeeter/ao", - "rev": "69fadb81543cc9031e4a7ec2036c7f2ab505a620", - "sha256": "1717k72vr0i5j7bvxmd6q16fpvkljnqfa1hr3i4yq8cjdsj69my7" -} diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 7213ddcc366..1a80c1466d4 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -11,12 +11,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "2.2.1"; + version = "2.2.3"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "da843190f08e02df19ccbc02b9d1bef6bd242b81499494c7da2cccdc520e24fc"; + sha256 = "1b33859585bf283577680c61e3c0ea4e48214371453b9c17a86664d2fbda48a0"; }; buildInputs = diff --git a/pkgs/applications/graphics/digikam/5.nix b/pkgs/applications/graphics/digikam/5.nix index 3e5d1b7b52e..ca7377c405c 100644 --- a/pkgs/applications/graphics/digikam/5.nix +++ b/pkgs/applications/graphics/digikam/5.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { name = "digikam-${version}"; - version = "5.3.0"; + version = "5.4.0"; src = fetchurl { url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; - sha256 = "0p1y5kgkz7lzzqpf7qd3mmg59zfdkkz9jg7knldd8dl94wkzlv5k"; + sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg"; }; nativeBuildInputs = [ cmake ecm makeQtWrapper ]; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index f38e402ce92..9a9c0ff1d7f 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, automoc4, boost, shared_desktop_ontologies, cmake -, eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun +{ stdenv, fetchurl, fetchpatch, automoc4, boost, shared_desktop_ontologies +, cmake, eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun , libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff , libusb1, liblqr1, marble, mysql, opencv, perl, phonon, pkgconfig , qca2, qimageblitz, qjson, qt4, soprano @@ -36,6 +36,16 @@ let sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m"; }; + patches = [ + (fetchpatch { + # Fix compilation against Lensfun 0.3.2 + url = "http://cgit.kde.org/digikam.git/patch/?id=0f159981176faa6da701f112bfe557b79804d468"; + sha256 = "1c8bg7s84vg4v620gbs16cjcbpml749018gy5dpvfacx5vl24wza"; + }) + ]; + + patchFlags = ["-p1" "-dcore"]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ] ++ [ @@ -182,6 +192,7 @@ runCommand "${pName}" { homepage = http://www.digikam.org; maintainers = with stdenv.lib.maintainers; [ /*jraygauthier*/ ]; inherit (kdelibs.meta) platforms; + broken = true; }; } '' diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 40fe178d625..5b385f2acbf 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -2,11 +2,11 @@ , curl, libexif, perlPackages }: stdenv.mkDerivation rec { - name = "feh-2.17.1"; + name = "feh-2.18.1"; src = fetchurl { url = "http://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "0lyq17kkmjxj3vxpmri56linr1bnfmx5568pgrcjgd3amnj1is59"; + sha256 = "1ck55rhh5ax1d9k9gy2crvyjwffh6028f4kxaisd8ymgbql40f2c"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 4cb67cde751..8c430435dd7 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -8,7 +8,7 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { name = "gimp-${version}"; - version = "2.8.18"; + version = "2.8.20"; # This declarations for `gimp-with-plugins` wrapper, # (used for determining $out/lib/gimp/${majorVersion}/ paths) @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - sha256 = "0halh6sl3d2j9gahyabj6h6r3yyldcy7sfb4qrfazpkqqr3j5p9r"; + sha256 = "939ca1df70be865c672ffd654f4e20f188121d01601c5c90237214101533c805"; }; buildInputs = diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index fa6db4e7f02..20a9648e839 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -125,7 +125,7 @@ rec { Filters/Enhance/Smart remove selection */ name = "resynthesizer-2.0.1"; - buildInputs = [ gimp pkgs.fftw pkgs.autoreconfHook ] + buildInputs = [ gimp pkgs.fftw pkgs.autoreconfHook ] ++ gimp.nativeBuildInputs; makeFlags = "GIMP_LIBDIR=$out/lib/gimp/2.0/"; src = fetchFromGitHub { @@ -178,31 +178,16 @@ rec { gmic = pluginDerivation rec { - name = "gmic-1.6.5.0"; + inherit (pkgs.gmic) name src meta; - buildInputs = [pkgconfig pkgs.fftw pkgs.opencv gimp] ++ gimp.nativeBuildInputs; - - src = fetchurl { - url = http://gmic.eu/files/source/gmic_1.6.5.0.tar.gz; - sha256 = "1vb6zm5zpqfnzxjvb9yfvczaqacm55rf010ib0yk9f28b17qrjgb"; - }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pkgs.fftw pkgs.opencv gimp ] ++ gimp.nativeBuildInputs; sourceRoot = "${name}/src"; buildFlags = "gimp"; installPhase = "installPlugins gmic_gimp"; - - meta = { - description = "Script language for image processing which comes with its open-source interpreter"; - homepage = http://gmic.eu/gimp.shtml; - license = stdenv.lib.licenses.cecill20; - /* - The purpose of this Free Software license agreement is to grant users - the right to modify and redistribute the software governed by this - license within the framework of an open source distribution model. - [ ... ] */ - }; }; # this is more than a gimp plugin ! diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 651bfafcead..4b75d0ccc6b 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -38,6 +38,10 @@ stdenv.mkDerivation { url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8684.patch"; sha256 = "1p36gpz904wnmbz1n64x4pdpg8lp9zs3gx0awklxqdvgl8m82vvy"; }) + (fetchpatch { + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-7/debian/patches/CVE-2016-9830.patch"; + sha256 = "0qh15sd7nx7vf9sld4453iml951bwsx2fx84hxc7plhds2k3gjpa"; + }) ]; configureFlags = [ diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index fded09545e1..dcd5c28172e 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -8,11 +8,12 @@ stdenv.mkDerivation rec { name = "krita-${version}"; - version = "3.0.1.1"; + ver_min = "3.1.2"; + version = "${ver_min}.1"; src = fetchurl { - url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "0v58p9am2gsrgn5nhynvdg1a7v8d9kcsswb1962r8ijszm3fav5k"; + url = "http://download.kde.org/stable/krita/${ver_min}/${name}.tar.gz"; + sha256 = "934ed82c3f4e55e7819b327c838ea2f307d3bf3d040722501378b01d76a3992d"; }; nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ]; diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 50eb7749031..53fdc67cf24 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -3,21 +3,19 @@ }: stdenv.mkDerivation rec { - version = "4.2.1025"; + version = "5.0-r1"; name = "rawtherapee-" + version; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; - rev = "dc4bbe906ba92ddc66f98a3c26ce19822bfb99ab"; - sha256 = "0c5za9s8533fiyl32378dq9rgd5044xi8y0wm2gkr7krbdnx74l3"; + rev = "1077c4ba2e2dbe249884e6974c6050db8eb5e9c2"; + sha256 = "1xqmkwprk3h9nhy6q562mkjdpynyg9ff7a92sdga50k56gi0aj0s"; }; - buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp - lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ]; - - patches = [ - ./fix-glibmm-output.patch + buildInputs = [ + pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp + lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ]; cmakeFlags = [ diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index 36f7545a053..ec7af882907 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -1,15 +1,17 @@ {stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }: stdenv.mkDerivation rec { - name = "scantailor-0.9.11.1"; + name = "scantailor-0.9.12.1"; src = fetchurl { - url = "https://github.com/scantailor/scantailor/archive/RELEASE_0_9_11_1.tar.gz"; - sha256 = "1z06yg228r317m8ab3mywg0wbpj0x2llqj187bh4g3k4xc2fcm8m"; + url = "https://github.com/scantailor/scantailor/archive/RELEASE_0_9_12_1.tar.gz"; + sha256 = "1pjx3a6hs16az6rki59bchy3biy7jndjx8r125q01aq7lbf5npgg"; }; buildInputs = [ qt4 cmake libjpeg libtiff boost ]; + enableParallelBuilding = true; + meta = { homepage = http://scantailor.org/; description = "Interactive post-processing tool for scanned pages"; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index ca74cd1a4aa..814127abe7d 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { version = "${major}.${minor}"; major = "0.25"; - minor = "2"; + minor = "5"; name = "shotwell-${version}"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz"; - sha256 = "1bih5hr3pvpkx3fck55bnhngn4fl92ryjizc34wb8pwigbkxnaj1"; + sha256 = "10pv3v789hky8h7ladqzzmgvkmgy3c41n4xz0nnyjmpycwl26g29"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 88e08b40914..977f5e94e5d 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -1,26 +1,37 @@ -{ stdenv, fetchurl, cmake, pkgconfig, - gtk2 , poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, pcre, libxkbcommon, epoxy +, gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence }: stdenv.mkDerivation rec { - version = "0.1.f7f7b9c"; + version = "0.1.5"; name = "apvlv-${version}"; - src = fetchurl { - url = "https://github.com/downloads/naihe2010/apvlv/${name}-Source.tar.gz"; - sha256 = "125nlcfjdhgzi9jjxh9l2yc9g39l6jahf8qh2555q20xkxf4rl0w"; + src = fetchFromGitHub { + owner = "naihe2010"; + repo = "apvlv"; + rev = "v${version}"; + sha256 = "1n4xiic8lqnv3mqi7wpdv866gyyakax71gffv3n9427rmcld465i"; }; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${poppler.dev}/include/poppler" - ''; + NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; buildInputs = [ pkgconfig cmake - poppler - freetype gtk2 - libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation - ]; + poppler pcre libxkbcommon epoxy + freetype gtk3 + libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation + ]; + + patches = [ + (fetchpatch { + url = "https://github.com/naihe2010/apvlv/commit/d432635b9c5ea6c052a2ae1fb71aedec5c4ad57a.patch"; + sha256 = "1am8dgv2kkpqmm2vaysa61czx8ppdx94zb3c59sx88np50jpy70w"; + }) + (fetchpatch { + url = "https://github.com/naihe2010/apvlv/commit/4c7a583e8431964def482e5471f02e6de8e62a7b.patch"; + sha256 = "1dszm120lwm90hcg5zmd4vr6pjyaxc84qmb7k0fr59mmb3qif62j"; + }) + ]; installPhase = '' # binary diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index e07fa1df546..76810a6f249 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -11,11 +11,11 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.78a"; + name = "blender-2.78b"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "1byf1klrvm8fdw2libx7wldz2i6lblp9nih6y58ydh00paqi8jh1"; + sha256 = "0wgrqwznih6c19y2fpvrk3k6qsaxsy3g7xja87rb4hq7r7j8x22d"; }; buildInputs = diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index a0414786ba4..85d8180983e 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -2,14 +2,14 @@ }: with pythonPackages; buildPythonApplication rec { - version = "2.7"; + version = "2.8"; name = "buku-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1hb5283xaz1ll3iv5542i6f9qshrdgg33dg7gvghz0fwdh8i0jbk"; + sha256 = "1gazvij0072lca0jh84i8mhnaxiwg56hcxmrmk2clxd2x213zyjm"; }; buildInputs = [ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 5c05d1e1787..16ac38b3263 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.76.0"; + version = "2.79.1"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1xfm586n6gm44mkyn25mbiyhj6w9ji9yl6fvmnr4zk1q6qcga3v8"; + sha256 = "0slk3cili50a8kwwsk6syqqrcz0yx8yjvhm8gyggn2k2kpqjax15"; }; patches = [ diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch index 522b2e6202c..71cc688f7da 100644 --- a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch +++ b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch @@ -1,13 +1,8 @@ -Author: Dmitry Shachnev -Description: do not build unrar extension as we strip unrar from the tarball -Forwarded: not-needed -Last-Update: 2013-04-04 - -Index: calibre/setup/extensions.json -=================================================================== ---- calibre.orig/setup/extensions.json -+++ calibre/setup/extensions.json -@@ -211,14 +211,5 @@ +diff --git a/setup/extensions.json b/setup/extensions.json +index 1f6d1fb..1273904 100644 +--- a/setup/extensions.json ++++ b/setup/extensions.json +@@ -211,16 +211,5 @@ "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c", "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h", "libraries": "mtp" @@ -18,15 +13,17 @@ Index: calibre/setup/extensions.json - "inc_dirs": "unrar", - "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE", - "windows_defines": "SILENT RARDLL UNRAR", +- "haiku_defines": "LITTLE_ENDIAN SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _BSD_SOURCE", +- "haiku_libraries": "bsd", - "optimize_level": 2, - "windows_libraries": "User32 Advapi32 kernel32 Shell32" } ] -Index: calibre/src/calibre/ebooks/metadata/archive.py -=================================================================== ---- calibre.orig/src/calibre/ebooks/metadata/archive.py 2014-02-02 10:42:14.510954007 +0100 -+++ calibre/src/calibre/ebooks/metadata/archive.py 2014-02-02 10:42:14.502954007 +0100 -@@ -42,7 +42,7 @@ +diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py +index 938ab24..1e095f8 100644 +--- a/src/calibre/ebooks/metadata/archive.py ++++ b/src/calibre/ebooks/metadata/archive.py +@@ -44,7 +44,7 @@ class ArchiveExtract(FileTypePlugin): description = _('Extract common e-book formats from archives ' '(zip/rar) files. Also try to autodetect if they are actually ' 'cbz/cbr files.') diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix new file mode 100644 index 00000000000..587a20b2704 --- /dev/null +++ b/pkgs/applications/misc/cataract/build.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchgit +, autoreconfHook +, glib +, pkgconfig +, libxml2 +, exiv2 +, imagemagick +, version +, sha256 +, rev }: + +stdenv.mkDerivation rec { + inherit version; + name = "cataract-${version}"; + + src = fetchgit { + url = "git://git.bzatek.net/cataract"; + inherit sha256 rev; + }; + + buildInputs = [ autoreconfHook glib pkgconfig libxml2 exiv2 imagemagick ]; + + installPhase = '' + mkdir $out/{bin,share} -p + cp src/cgg{,-dirgen} $out/bin/ + ''; + + meta = { + homepage = "http://cgg.bzatek.net/"; + description = "a simple static web photo gallery, designed to be clean and easily usable"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; +} + + diff --git a/pkgs/applications/misc/cataract/default.nix b/pkgs/applications/misc/cataract/default.nix new file mode 100644 index 00000000000..83292a76c5d --- /dev/null +++ b/pkgs/applications/misc/cataract/default.nix @@ -0,0 +1,17 @@ +{ callPackage +, stdenv +, fetchgit +, autoconf +, automake +, glib +, pkgconfig +, libxml2 +, exiv2 +, imagemagick }: + +callPackage ./build.nix { + version = "1.1.0"; + rev = "675e647dc8ae918d29f520a29be9201ae85a94dd"; + sha256 = "13b9rvcy9k2ay8w36j28kc7f4lnxp4jc0494ck3xsmwgqsawmzdj"; +} + diff --git a/pkgs/applications/misc/cataract/unstable.nix b/pkgs/applications/misc/cataract/unstable.nix new file mode 100644 index 00000000000..8d8b063e48b --- /dev/null +++ b/pkgs/applications/misc/cataract/unstable.nix @@ -0,0 +1,17 @@ +{ callPackage +, stdenv +, fetchgit +, autoconf +, automake +, glib +, pkgconfig +, libxml2 +, exiv2 +, imagemagick }: + +callPackage ./build.nix { + version = "unstable-2016-10-18"; + rev = "db3d992febbe703931840e9bdad95c43081694a5"; + sha256 = "04f85piy675lq36w1mw6mw66n8911mmn4ifj8h9x47z8z806h3rf"; +} + diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index d072c5d6a49..efe2b2863ac 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "cbatticon-${version}"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "valr"; repo = "cbatticon"; rev = version; - sha256 = "0m3bj408mbini97kq0cdf048lnfkdn7bd8ikbfijd7dwfdzv27i5"; + sha256 = "1j7gbmmygvbrawqn1bbaf47lb600lylslzqbvfwlhifmi7qnm6ca"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 33adacefb9d..a8d35680dbd 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patchPhase = '' - sed -e 's#/usr/share/applications#$out/share/applications#' -i src/core/CMakeLists.txt + substituteInPlace src/core/CMakeLists.txt --replace /usr/share/applications "$out"/share/applications ''; meta = { diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index e0d426e99b6..28b5f02e813 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "2.7.12"; + version = "2.7.18"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0vxdfl208if7mdsnva1jg37bnay2dsz3ww157aqwcv1j6512fi1n"; + sha256 = "1l9krc7hqhqrm5bwp999bpykkcq4958qwvx8v0l5mxcxw8k7fkab"; }; propagatedBuildInputs = with python2Packages; [ diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 6ccae9d5360..962d8f8b31f 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -18,6 +18,6 @@ buildGoPackage rec { homepage = http://exercism.io/cli; license = licenses.mit; maintainers = [ maintainers.rbasso ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix new file mode 100644 index 00000000000..7560a8bfeb4 --- /dev/null +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -0,0 +1,31 @@ +{ fetchFromGitHub, lib, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + version = "3.4.0"; + name = "gcalcli-${version}"; + + src = fetchFromGitHub { + owner = "insanum"; + repo = "gcalcli"; + rev = "v${version}"; + sha256 = "171awccgnmfv4j7m2my9387sjy60g18kzgvscl6pzdid9fn9rrm8"; + }; + + propagatedBuildInputs = with pythonPackages; [ + dateutil + gflags + google_api_python_client + httplib2 + oauth2client + parsedatetime + six + vobject + ] ++ lib.optional (!pythonPackages.isPy3k) futures; + + meta = with lib; { + homepage = https://github.com/insanum/gcalcli; + description = "CLI for Google Calendar"; + license = licenses.mit; + maintainers = [ maintainers.nocoolnametom ]; + }; +} diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 47e30175795..860068c5667 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,29 +1,33 @@ -{ stdenv, fetchurl, pkgconfig, gtk, gettext, withBuildColors ? true, ncurses ? null}: +{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses +, withBuildColors ? true +}: assert withBuildColors -> ncurses != null; -with stdenv.lib; stdenv.mkDerivation rec { name = "girara-${version}"; - version = "0.2.6"; + version = "0.2.7"; src = fetchurl { - url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "03wsxj27hvcbs3x96nah7j3paclifwlfag8kdph4kldl48srp9pb"; + url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; + sha256 = "1r9jbhf9n40zj4ddqv1q5spijpjm683nxg4hr5lnir4a551s7rlq"; }; preConfigure = '' - sed -i 's/ifdef TPUT_AVAILABLE/ifneq ($(TPUT_AVAILABLE), 0)/' colors.mk + substituteInPlace colors.mk \ + --replace 'ifdef TPUT_AVAILABLE' 'ifneq ($(TPUT_AVAILABLE), 0)' ''; buildInputs = [ pkgconfig gtk gettext ]; - makeFlags = [ "PREFIX=$(out)" ] - ++ optional withBuildColors "TPUT=${ncurses.out}/bin/tput" - ++ optional (!withBuildColors) "TPUT_AVAILABLE=0" - ; + makeFlags = [ + "PREFIX=$(out)" + (if withBuildColors + then "TPUT=${ncurses.out}/bin/tput" + else "TPUT_AVAILABLE=0") + ]; - meta = { + meta = with stdenv.lib; { homepage = http://pwmt.org/projects/girara/; description = "User interface library"; longDescription = '' diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 1e6caa93b2d..df8cb71d6f9 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -1,77 +1,79 @@ { stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv , libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4 -, zlib, fontconfig }: +, zlib, fontconfig, dpkg }: -/* I haven't found any x86_64 package from them */ -assert stdenv.system == "i686-linux"; - -stdenv.mkDerivation { - name = "googleearth-6.0.3.2197"; - - src = fetchurl { - url = http://dl.google.com/earth/client/current/GoogleEarthLinux.bin; - sha256 = "0bcpmnlk03382x577qbnbw3i6y08hr3qmg85pqj35scnl6van74c"; - }; - - nativeBuildInputs = [ +let + arch = + if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "i686-linux" then "i386" + else abort "Unsupported architecture"; + sha256 = + if arch == "amd64" + then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6" + else "0gndbxrj3kgc2dhjqwjifr3cl85hgpm695z0wi01wvwzhrjqs0l2"; + fullPath = stdenv.lib.makeLibraryPath [ glibc glib stdenv.cc.cc - libSM - libICE - libXi + libSM + libICE + libXi libXv mesa - libXrender - libXrandr - libXfixes - libXcursor - libXinerama - freetype - libXext - libX11 + libXrender + libXrandr + libXfixes + libXcursor + libXinerama + freetype + libXext + libX11 qt4 zlib fontconfig ]; +in +stdenv.mkDerivation rec { + version = "7.1.4.1529"; + name = "googleearth-${version}"; + + src = fetchurl { + url = "https://dl.google.com/earth/client/current/google-earth-stable_current_${arch}.deb"; + inherit sha256; + }; phases = "unpackPhase installPhase"; - + + buildInputs = [ dpkg ]; + unpackPhase = '' - bash $src --noexec --target unpacked - cd unpacked + dpkg-deb -x ${src} ./ ''; - + installPhase ='' - mkdir -p $out/{opt/googleearth/,bin}; - tar xf googleearth-data.tar -C $out/opt/googleearth - tar xf googleearth-linux-x86.tar -C $out/opt/googleearth - cp bin/googleearth $out/opt/googleearth - cat > $out/bin/googleearth << EOF - #!/bin/sh - export GOOGLEEARTH_DATA_PATH=$out/opt/googleearth - exec $out/opt/googleearth/googleearth - EOF - chmod +x $out/bin/googleearth + mkdir $out + mv usr/* $out/ + rmdir usr + mv * $out/ + rm $out/bin/google-earth $out/opt/google/earth/free/google-earth + ln -s $out/opt/google/earth/free/googleearth $out/bin/google-earth - fullPath= - for i in $nativeBuildInputs; do - fullPath=$fullPath:$i/lib - done - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $fullPath \ - $out/opt/googleearth/googleearth-bin + --set-rpath "${fullPath}:\$ORIGIN" \ + $out/opt/google/earth/free/googleearth-bin - for a in $out/opt/googleearth/*.so* ; do - patchelf --set-rpath $fullPath $a + for a in $out/opt/google/earth/free/*.so* ; do + patchelf --set-rpath "${fullPath}:\$ORIGIN" $a done ''; + dontPatchELF = true; + meta = { description = "A world sphere viewer"; homepage = http://earth.google.com; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 1f263a2b1dd..07fcf31ed26 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gpsprune-${version}"; - version = "18.5"; + version = "18.6"; src = fetchurl { url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "0xd97b7rs5i41hyih6zdbvls090903yfr1r9lflq93dyqhmzpdhn"; + sha256 = "1ii9pkj24jcwzs225nyi17ks07dfc5x3940hpqrsb5xzxy2vkw7q"; }; phases = [ "installPhase" ]; diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index e2290ac01e8..78f3c2f391b 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, readline, ncurses }: let - version = "1.19"; + version = "1.22"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz"; - sha256 = "0ix6550l9si29j8vz375vzjmp22i19ik5dq2nh7zsj2ra7ibaz5n"; + sha256 = "09rh510x8qc5jbpnfzazbv9wc3bqmf5asydcl2wijpqm5bi21iqp"; }; buildInputs = [ readline ncurses ]; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 30398747d43..fb60babebe2 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 = "11223"; + version = "11526"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0fv1hlp98f178jy7lxnvq2rk6rq1zj62q6dv0vn02fvm00ia53s8"; + sha256 = "1164vfqbbys0032amk85219y0paihvi8jkx0kwc5lramwsk57pld"; }; phases = [ "installPhase" ]; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 5eaad6514e1..57f6cfc4c4b 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -8,11 +8,11 @@ # plugin derivations in the Nix store and nowhere else. with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.34"; + version = "2.35"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "e3f184e4deddd1aa5ee2b52e2373c772d3f3975e5eddb2fd729eb27b437011aa"; + sha256 = "1pv3x1lr2kymjpm6z26fqx997jivzy0diqsysq4diygj38wdkajz"; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/keepassx/reboot.nix b/pkgs/applications/misc/keepassx/community.nix similarity index 53% rename from pkgs/applications/misc/keepassx/reboot.nix rename to pkgs/applications/misc/keepassx/community.nix index f6ed251601a..58b45786c40 100644 --- a/pkgs/applications/misc/keepassx/reboot.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }: +{ stdenv, fetchFromGitHub, cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools }: stdenv.mkDerivation rec { - name = "keepassx-reboot-${version}"; - version = "2.0.3"; + name = "keepassx-community-${version}"; + version = "2.1.0"; src = fetchFromGitHub { owner = "keepassxreboot"; - repo = "keepassx"; - rev = "${version}-http"; - sha256 = "0pj3mirhw87hk9nlls9hgfx08xrr8ln7d1fqi3fcm519qjr72lmv"; + repo = "keepassxc"; + rev = "${version}"; + sha256 = "0qwmi9f8ik3vkwl1kx7g3079h5ia4wl87y42nr5dal3ic1jc941p"; }; - buildInputs = [ cmake libgcrypt zlib qt5.full libXtst libmicrohttpd ]; + buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd ]; 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/keepassx; + homepage = https://github.com/keepassxreboot/keepassxc; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ s1lvester jonafato ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 0e93418255e..8d7eeffad31 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -3,13 +3,12 @@ with python3Packages; buildPythonApplication rec { - # Reenable tests for 0.9.0, they are broken at the moment: #15981 - version = "0.8.4"; + version = "0.9.2"; name = "khal-${version}"; src = fetchurl { url = "mirror://pypi/k/khal/khal-${version}.tar.gz"; - sha256 = "03vy4dp9n43w51mwqjjy08dr5nj7wxqnb085visz3j43vzm42p1f"; + sha256 = "1ryh5c7408w8gpql5s9mkxkvz1ngnds3xm43p7r96ynx8prr9swp"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 2a6329b48d7..3a87e854dc1 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, glibcLocales, python3Packages }: +{ stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.11.1"; + version = "0.11.4"; name = "khard-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "0055xx9icmsr6l7v0iqrndmygygdpdv10550w6pyrb96svzhry27"; + sha256 = "1hngg3z5cdjny7wdf2mf9wv35ffx7ivpq6mx7kgqf40fr5905l0r"; }; # setup.py reads the UTF-8 encoded readme. diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/kde4.nix similarity index 100% rename from pkgs/applications/misc/krename/default.nix rename to pkgs/applications/misc/krename/kde4.nix diff --git a/pkgs/applications/misc/krename/kde5.nix b/pkgs/applications/misc/krename/kde5.nix new file mode 100644 index 00000000000..a2137060ef6 --- /dev/null +++ b/pkgs/applications/misc/krename/kde5.nix @@ -0,0 +1,35 @@ +{ + kdeDerivation, kdeWrapper, fetchFromGitHub, lib, + ecm, kdoctools, kconfig, kinit, kjsembed, + taglib, exiv2, podofo +}: + +let + pname = "krename"; + version = "20161228"; + unwrapped = kdeDerivation rec { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "KDE"; + repo = "krename"; + rev = "4e55c2bef50898eb4a6485ce068379b166121895"; + sha256 = "09yz3sxy2l6radfybkj2f7224ggf315vnvyksk0aq8f03gan6cbp"; + }; + + meta = with lib; { + homepage = http://www.krename.net; + description = "A powerful batch renamer for KDE"; + inherit (kconfig.meta) platforms; + maintainers = with maintainers; [ urkud peterhoeg ]; + }; + + buildInputs = [ taglib exiv2 podofo ]; + nativeBuildInputs = [ ecm kdoctools ]; + propagatedBuildInputs = [ kconfig kinit kjsembed ]; + }; + +in kdeWrapper { + inherit unwrapped; + targets = [ "bin/krename" ]; +} diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index e350a9a9530..ee06ea1ad6c 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,26 +1,29 @@ -{ stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl -, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }: +{ stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf +, lablgl, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.02"; let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { name = "llpp-${version}"; - version = "21-git-2016-05-07"; + version = "25-git-2017-01-18"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "1beb003ca0f4ed90fda2823cb07c2eb674fc3ca4"; - sha256 = "1r59yfm81zmiij401d3wc3zb1zc873ss02gkplbwi4lad2l0chba"; + rev = "22740b9bca1c60ef18cf90538994ce4981539901"; + sha256 = "0yg8z2zwhg2f5il2i1clx3b7hl088ncpk686rfxlvwyjg3qs3mv4"; fetchSubmodules = false; }; - buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl - gtk3 jbig2dec openjpeg mujs openssl freetype ncurses ]; + nativeBuildInputs = [ pkgconfig makeWrapper ninja ]; + buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec # lablgl + openjpeg mujs openssl freetype ncurses ]; 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 sed -i -e 's+-L\$srcdir/mupdf/build/native ++' build.sh @@ -29,12 +32,12 @@ in stdenv.mkDerivation rec { buildPhase = '' sh ./build.sh build ''; +# --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \ installPhase = '' install -d $out/bin $out/lib install build/llpp $out/bin wrapProgram $out/bin/llpp \ - --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \ --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \ --prefix PATH ":" "${xsel}/bin" ''; diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 9da087d4969..1317c035792 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.7.2"; + version = "3.8.0"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; - sha256 = "1b24w8hfck1ylfkdz9z55vlmsb36q9iyfr0i9q9y98dfk0f0rrw8"; + sha256 = "00dzx5rqsp73shgvn2jvgk85v3lirby06wxkqjcm1i1xwigidq3b"; }; nativeBuildInputs = [ pkgconfig autoconf ]; @@ -20,17 +20,15 @@ stdenv.mkDerivation rec { harfbuzz fribidi m17n_lib openssl libssh2 ]; - patches = [ ./x_shortcut.c.patch ]; #fixes numlock in 3.7.2. should be safe to remove by 3.7.3 since it's already in the trunk: https://bitbucket.org/arakiken/mlterm/commits/4820d42c7abfe1760a5ea35492c83be469c642b3 - #bad configure.ac and Makefile.in everywhere preConfigure = '' sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \ - xwindow/libtype/Makefile.in \ main/Makefile.in \ tool/mlfc/Makefile.in \ tool/mlimgloader/Makefile.in \ tool/mlconfig/Makefile.in \ - xwindow/libotl/Makefile.in + uitoolkit/libtype/Makefile.in \ + uitoolkit/libotl/Makefile.in sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \ tool/mlconfig/po/Makefile.in.in #utmp and mlterm-fb @@ -68,14 +66,9 @@ stdenv.mkDerivation rec { ]; postInstall = '' - mkdir -p "$out/share/icons/hicolor/scalable/apps" - cp contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" - - mkdir -p "$out/share/icons/hicolor/48x48/apps" - cp contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png" - - mkdir -p "$out/share/applications" - cp $desktopItem/share/applications/* $out/share/applications + install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" + install -D contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png" + install -D -t $out/share/applications $desktopItem/share/applications/* ''; desktopItem = makeDesktopItem rec { diff --git a/pkgs/applications/misc/mlterm/x_shortcut.c.patch b/pkgs/applications/misc/mlterm/x_shortcut.c.patch deleted file mode 100644 index f0f929b7965..00000000000 --- a/pkgs/applications/misc/mlterm/x_shortcut.c.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- mlterm-3.7.2/xwindow/x_shortcut.c -+++ mlterm-3.7.2/xwindow/x_shortcut.c -@@ -292,6 +292,11 @@ - /* ingoring except these masks */ - state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ; - -+ if( state & button_mask) -+ { -+ state &= ~Mod2Mask ; /* XXX NumLock */ -+ } -+ - if( shortcut->map[func].ksym == ksym && - shortcut->map[func].state == - ( state | -@@ -318,6 +323,11 @@ - /* ingoring except these masks */ - state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ; - -+ if( state & button_mask) -+ { -+ state &= ~Mod2Mask ; /* XXX NumLock */ -+ } -+ - for( count = 0 ; count < shortcut->str_map_size ; count ++) - { - if( shortcut->str_map[count].ksym == ksym && diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 9171e012807..391440f8622 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "moonlight-embedded-${version}"; - version = "2.2.1"; + version = "2.2.3"; # fetchgit used to ensure submodules are available src = fetchgit { diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index e1926ce386f..ba2313fc7b5 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -3,31 +3,20 @@ , libX11, libXcursor, libXrandr, libXinerama, libXext, harfbuzz, mesa }: stdenv.mkDerivation rec { - version = "1.9a"; + version = "1.10a"; name = "mupdf-${version}"; src = fetchurl { url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz"; - sha256 = "1k64pdapyj8a336jw3j61fhn0rp4q6az7d0dqp9r5n3d9rgwa5c0"; + sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a"; }; patches = [ - # http://www.openwall.com/lists/oss-security/2016/08/03/2 - (fetchpatch { - name = "mupdf-fix-CVE-2016-6525.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=39b0f07dd960f34e7e6bf230ffc3d87c41ef0f2e;hp=fa1936405b6a84e5c9bb440912c23d532772f958"; - sha256 = "1g9fkd1f5rx1z043vr9dj4934qf7i4nkvbwjc61my9azjrrc3jv7"; - }) - (fetchpatch { - name = "mupdf-696941-fix-use-after-free.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=fa1936405b6a84e5c9bb440912c23d532772f958"; - sha256 = "02j9b6my1h3rb0sz9yp6gi7c4ldi3mz0z9s5i8g9cl0arxyzys5h"; - }) # 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=9083dac2a398bfe694d31a0c6a0a839c5a756e53"; - sha256 = "14ndgy3w1sl25km9bcc2zfcxrcihqjw1sdzkpcw5g1mi7gcgxp3g"; + url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=5a28ad0a8999a9234aa7848096041992cc988099"; + sha256 = "1i24qr4xagyapx4bijjfksj4g3bxz8vs5c2mn61nkm29c63knp75"; }) ]; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index aecea732a23..9e287bf6fd5 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -2,15 +2,15 @@ let - tornado_4_0_1 = pythonPackages.buildPythonPackage rec { + tornado_4_0_2 = pythonPackages.buildPythonPackage rec { name = "tornado-${version}"; - version = "4.0.1"; + version = "4.0.2"; propagatedBuildInputs = with pythonPackages; [ backports_ssl_match_hostname_3_4_0_2 certifi ]; src = fetchurl { url = "mirror://pypi/t/tornado/${name}.tar.gz"; - sha256 = "00crp5vnasxg7qyjv89qgssb69vd7qr13jfghdryrcbnn9l8c1df"; + sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h"; }; }; @@ -24,34 +24,53 @@ let }; # This is needed for compatibility with OctoPrint - propagatedBuildInputs = [ tornado_4_0_1 ]; + propagatedBuildInputs = [ tornado_4_0_2 ]; + }; - meta = with stdenv.lib; { - description = "SockJS python server implementation on top of Tornado framework"; - homepage = "http://github.com/mrjoes/sockjs-tornado/"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; + websocket_client = pythonPackages.buildPythonPackage rec { + name = "websocket_client-0.32.0"; + + src = fetchurl { + url = "mirror://pypi/w/websocket-client/${name}.tar.gz"; + sha256 = "cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040"; }; + + propagatedBuildInputs = with pythonPackages; [ six backports_ssl_match_hostname_3_4_0_2 unittest2 argparse ]; + }; + + flask_login = pythonPackages.buildPythonPackage rec { + name = "Flask-Login-${version}"; + version = "0.2.2"; + + src = fetchurl { + url = "mirror://pypi/F/Flask-Login/${name}.tar.gz"; + sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p"; + }; + + propagatedBuildInputs = with pythonPackages; [ flask ]; + + # FIXME + doCheck = false; }; in pythonPackages.buildPythonApplication rec { name = "OctoPrint-${version}"; - version = "1.2.17"; + version = "1.3.1"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "1di2f5npwsfckx5p2fl23bl5zi75i0aksd9qy4sa3zmw672337fh"; + sha256 = "1av755agyym1k5ig9av0q9ysf26ldfixz82x73v3g47a1m28pxq9"; }; # We need old Tornado propagatedBuildInputs = with pythonPackages; [ awesome-slugify flask_assets rsa requests2 pkginfo watchdog - semantic-version flask_principal werkzeug flaskbabel tornado_4_0_1 + semantic-version flask_principal werkzeug flaskbabel tornado_4_0_2 psutil pyserial flask_login netaddr markdown sockjs-tornado - pylru pyyaml sarge feedparser netifaces + pylru pyyaml sarge feedparser netifaces click websocket_client + scandir chainmap future ]; # Jailbreak dependencies. @@ -67,10 +86,12 @@ in pythonPackages.buildPythonApplication rec { -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \ -e 's,markdown>=[^"]*,markdown,g' \ -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \ - -e 's,Flask-Login>=[^"]*,Flask-Login,g' \ -e 's,rsa>=[^"]*,rsa,g' \ -e 's,PyYAML>=[^"]*,PyYAML,g' \ -e 's,flask>=[^"]*,flask,g' \ + -e 's,Click>=[^"]*,Click,g' \ + -e 's,websocket-client>=[^"]*,websocket-client,g' \ + -e 's,scandir>=[^"]*,scandir,g' \ setup.py ''; diff --git a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch index cbfb6111ec5..87b00f3ab70 100644 --- a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch +++ b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch @@ -1,4 +1,4 @@ -From c84b2130dab0d26be35294d023ed8f4be404c3c1 Mon Sep 17 00:00:00 2001 +From 0defcf6ec155899c414f66524b7df629f59327f0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 00:40:48 +0300 Subject: [PATCH] Build and use one version of preprocessor library @@ -9,10 +9,10 @@ Subject: [PATCH] Build and use one version of preprocessor library 2 files changed, 6 insertions(+), 123 deletions(-) diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py -index f9f84c4..b365024 100755 +index 4b43c59..d1259e4 100755 --- a/octoprint_m33fio/__init__.py +++ b/octoprint_m33fio/__init__.py -@@ -1061,71 +1061,8 @@ class M33FioPlugin( +@@ -1062,71 +1062,8 @@ class M33FioPlugin( # Check if using shared library or checking if it is usable if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable : @@ -23,19 +23,19 @@ index f9f84c4..b365024 100755 - if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm1176jzf-s.so") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm1176jzf-s.so") - - # Otherwise check if running on a Raspberry Pi 2 or Raspberry Pi 3 - elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm_cortex-a7.so") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm_cortex-a7.so") - - # Otherwise check if running on an ARM7 device - elif platform.uname()[4].startswith("armv7") : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm7.so") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm7.so") - - # Otherwise check if using an i386 or x86-64 device - elif platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64") : @@ -44,13 +44,13 @@ index f9f84c4..b365024 100755 - if platform.architecture()[0].startswith("32") : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.so") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.so") - - # Otherwise check if Python is running as 64-bit - elif platform.architecture()[0].startswith("64") : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.so") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.so") - - # Otherwise check if running on Windows and using an i386 or x86-64 device - elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : @@ -59,39 +59,39 @@ index f9f84c4..b365024 100755 - if platform.architecture()[0].startswith("32") : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dll") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dll") - - # Otherwise check if Python is running as 64-bit - elif platform.architecture()[0].startswith("64") : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dll") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dll") - -- # Otherwise check if running on OS X and using an i386 or x86-64 device +- # Otherwise check if running on macOS and using an i386 or x86-64 device - elif platform.uname()[0].startswith("Darwin") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : - - # Check if Python is running as 32-bit - if platform.architecture()[0].startswith("32") : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dylib") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dylib") - - # Otherwise check if Python is running as 64-bit - elif platform.architecture()[0].startswith("64") : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dylib") -+ # Set shared library -+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dylib") ++ # Set shared library ++ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") # Check if shared library was set if self.sharedLibrary : diff --git a/shared library source/Makefile b/shared library source/Makefile -index 887899b..4c74f5c 100755 +index 792b4f4..4c74f5c 100755 --- a/shared library source/Makefile +++ b/shared library source/Makefile @@ -1,68 +1,14 @@ --# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, OSX32, OSX64 +-# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, MACOS32, MACOS64 -LIBRARY_NAME = preprocessor -TARGET_PLATFORM = LINUX64 +LIBRARY_NAME = libpreprocessor @@ -139,14 +139,14 @@ index 887899b..4c74f5c 100755 - CFLAGS = -fPIC -mcpu=generic-armv7-a -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ -endif - --ifeq ($(TARGET_PLATFORM), OSX32) +-ifeq ($(TARGET_PLATFORM), MACOS32) - PROG = $(LIBRARY_NAME)_i386.dylib - CC = clang++ - CFLAGS = -fPIC -m32 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) - -endif - --ifeq ($(TARGET_PLATFORM), OSX64) +-ifeq ($(TARGET_PLATFORM), MACOS64) - PROG = $(LIBRARY_NAME)_x86-64.dylib - CC = clang++ - CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) @@ -164,5 +164,5 @@ index 887899b..4c74f5c 100755 clean: rm -f ../octoprint_m33fio/static/libraries/$(PROG) -- -2.10.2 +2.11.0 diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 8f015245763..2f894514c51 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -12,13 +12,13 @@ let m33-fio = buildPlugin rec { name = "M33-Fio-${version}"; - version = "1.11"; + version = "1.17"; src = fetchFromGitHub { owner = "donovan6000"; repo = "M33-Fio"; rev = "V${version}"; - sha256 = "11nbsi93clrqlnmaj73ak87hkqyghybccqz5jzhn2dhp0263adhl"; + sha256 = "19r860hqax09a79s9bl181ab7jsgx0pa8fvnr62lbgkwhis7m8mh"; }; patches = [ @@ -34,7 +34,7 @@ let ''; meta = with stdenv.lib; { - homepage = "https://github.com/donovan6000/M3D-Fio"; + homepage = "https://github.com/donovan6000/M33-Fio"; description = "OctoPrint plugin for the Micro 3D printer"; platforms = platforms.all; license = licenses.gpl3; diff --git a/pkgs/applications/misc/open-pdf-presenter/default.nix b/pkgs/applications/misc/open-pdf-presenter/default.nix index 1d5811226d5..0f40a236c58 100644 --- a/pkgs/applications/misc/open-pdf-presenter/default.nix +++ b/pkgs/applications/misc/open-pdf-presenter/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/olabini/open-pdf-presenter; description = "A program for presenting PDFs on multi-monitor settings (typically a laptop connected to a overhead projector)"; license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix index b04f0f26500..b1df6378f1e 100644 --- a/pkgs/applications/misc/orpie/default.nix +++ b/pkgs/applications/misc/orpie/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0v9xgpcf186ni55rkmx008msyszw0ypd6rd98hgwpih8yv3pymfy"; }; - buildInputs = [ ncurses gsl ] ++ (with ocamlPackages; [ ocaml ]); + buildInputs = [ ncurses gsl ] ++ (with ocamlPackages; [ ocaml camlp4 ]); meta = { homepage = http://pessimization.com/software/orpie/; diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index e6d96b099fa..aceeae87d08 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }: stdenv.mkDerivation rec { - name = "pcmanfm-1.2.4"; + name = "pcmanfm-1.2.5"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/${name}.tar.xz"; - sha256 = "04z3vd9si24yi4c8calqncdpb9b6mbj4cs4f3fs86i6j05gvpk9q"; + sha256 = "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc"; }; buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ]; diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix new file mode 100644 index 00000000000..aceaf43ac97 --- /dev/null +++ b/pkgs/applications/misc/polybar/default.nix @@ -0,0 +1,60 @@ +{ cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig +, python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil +, xcbutilwm, xcbutilxrm + +# optional packages-- override the variables ending in 'Support' to enable or +# disable modules +, alsaSupport ? true, alsaLib ? null +, iwSupport ? true, wirelesstools ? null +, githubSupport ? false, curl ? null +, mpdSupport ? false, mpd_clientlib ? null +, i3Support ? false, i3GapsSupport ? false, i3 ? null, i3-gaps ? null, jsoncpp ? null +}: + +assert alsaSupport -> alsaLib != null; +assert githubSupport -> curl != null; +assert iwSupport -> wirelesstools != null; +assert mpdSupport -> mpd_clientlib != null; + +assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null; +assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; + +stdenv.mkDerivation rec { + name = "polybar-${version}"; + version = "3.0.4"; + src = fetchgit { + url = "https://github.com/jaagr/polybar"; + rev = "1f31870d43f5cd87a5529a55b1d2d3e64105e0af"; + sha256 = "1nhj4npqhs6zy161931sbdi52gz6163lik0wri9wr122sjf90jas"; + }; + + meta = with stdenv.lib; { + description = "A fast and easy-to-use tool for creatin status bars."; + longDescription = '' + Polybar aims to help users build beautiful and highly customizable + status bars for their desktop environment, without the need of + having a black belt in shell scripting. + ''; + license = licenses.mit; + maintainers = [ maintainers.afldcr ]; + platforms = platforms.unix; + }; + + buildInputs = [ + cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil + xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm + + (if alsaSupport then alsaLib else null) + (if githubSupport then curl else null) + (if iwSupport then wirelesstools else null) + (if mpdSupport then mpd_clientlib else null) + + (if i3Support || i3GapsSupport then jsoncpp else null) + (if i3Support then i3 else null) + (if i3GapsSupport then i3-gaps else null) + ]; + + nativeBuildInputs = [ + cmake pkgconfig + ]; +} diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 673e4b02085..9b7aeddc2ff 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -15,8 +15,13 @@ pythonPackages.buildPythonApplication rec { sha256 = "14j067n1azk6vc6cxlhi5w5bsn2wcz4hypvgxc0vjl9xp5n4f0nf"; }; + checkInputs = with pythonPackages; [ pytest ]; propagatedBuildInputs = [ file ]; + checkPhase = '' + py.test tests + ''; + preConfigure = '' substituteInPlace ranger/ext/img_display.py \ --replace /usr/lib/w3m ${w3m}/libexec/w3m diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix new file mode 100644 index 00000000000..3cf6f7d754b --- /dev/null +++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix @@ -0,0 +1,40 @@ +{ stdenv, cmake, kde5, redshift, fetchFromGitHub, ... }: + +let version = "1.0.17"; in + +stdenv.mkDerivation { + name = "redshift-plasma-applet-${version}"; + + src = fetchFromGitHub { + owner = "kotelnik"; + repo = "plasma-applet-redshift-control"; + rev = "v${version}"; + sha256 = "1lp1rb7i6c18lrgqxsglbvyvzh71qbm591abrbhw675ii0ca9hgj"; + }; + + patchPhase = '' + substituteInPlace package/contents/ui/main.qml \ + --replace "redshiftCommand: 'redshift'" \ + "redshiftCommand: '${redshift}/bin/redshift'" \ + --replace "redshiftOneTimeCommand: 'redshift -O " \ + "redshiftOneTimeCommand: '${redshift}/bin/redshift -O " + + substituteInPlace package/contents/ui/config/ConfigAdvanced.qml \ + --replace "'redshift -V'" \ + "'${redshift}/bin/redshift -V'" + ''; + + buildInputs = [ + cmake + kde5.plasma-framework + ]; + + + meta = with stdenv.lib; { + description = "KDE Plasma 5 widget for controlling Redshift"; + homepage = https://github.com/kotelnik/plasma-applet-redshift-control; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ benley ]; + }; +} diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index e2af415e60a..20f8df8da48 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "1.13.0"; + version = "1.14.1"; name = "rtv-${version}"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "0rxncbzb4a7zlfxmnn5jm6yvwviaaj0v220vwv82hkjiwcdjj8jf"; + sha256 = "03106sdsvj4zjjaqqg7qvm3n959plvy08a6n28ir1yf67kwzsx8a"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index b50c2f18690..3bb97463e5d 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "slade-${version}"; - version = "3.1.1.4"; + version = "3.1.1.5"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; rev = version; - sha256 = "0c2yjkpcwxkid1wczmc9f16x1p40my8jv61jc93ldgjzcprmrpn8"; + sha256 = "0mdn59jm6ab4cdh99bgvadif3wdlqmk5mq635gg7krq35njgw6f6"; }; nativeBuildInputs = [ cmake pkgconfig zip ]; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 06b367fa6e7..950f8da7860 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,49 +1,97 @@ { stdenv, - cmake, + cmake, doxygen, pkgconfig, autoreconfHook, curl, fetchgit, grantlee, - libdivecomputer, libgit2, - libmarble-ssrf, + libusb, libssh2, libxml2, libxslt, libzip, - pkgconfig, - qtbase, - qtconnectivity, - qttools, - qtwebkit, + qtbase, qtconnectivity, qtquickcontrols, qtscript, qtsvg, qttools, qtwebkit, sqlite }: -stdenv.mkDerivation rec { - version = "4.5.97"; +let + version = "4.6.0"; + + libmarble = stdenv.mkDerivation rec { + name = "libmarble-ssrf-${version}"; + + src = fetchgit { + url = "git://git.subsurface-divelog.org/marble"; + rev = "refs/tags/v${version}"; + sha256 = "1dm2hdk6y36ls7pxbzkqmyc46hdy2cd5f6pkxa6nfrbhvk5f31zd"; + }; + + buildInputs = [ qtbase qtquickcontrols qtscript qtwebkit ]; + nativeBuildInputs = [ doxygen pkgconfig cmake ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DQTONLY=TRUE" + "-DQT5BUILD=ON" + "-DBUILD_MARBLE_TESTS=NO" + "-DWITH_DESIGNER_PLUGIN=NO" + "-DBUILD_MARBLE_APPS=NO" + ]; + + meta = with stdenv.lib; { + description = "Qt library for a slippy map with patches from the Subsurface project"; + homepage = http://subsurface-divelog.org; + license = licenses.lgpl21; + maintainers = with maintainers; [ mguentner ]; + platforms = platforms.all; + }; + }; + + libdc = stdenv.mkDerivation rec { + name = "libdivecomputer-ssrf-${version}"; + + src = fetchgit { + url = "git://subsurface-divelog.org/libdc"; + rev = "refs/tags/v${version}"; + sha256 = "0s82c8bvqph9c9chwzd76iwrw968w7lgjm3pj4hmad1jim67bs6n"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://www.libdivecomputer.org; + description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; + maintainers = with maintainers; [ mguentner ]; + license = licenses.lgpl21; + platforms = platforms.all; + }; + }; + +in stdenv.mkDerivation rec { name = "subsurface-${version}"; src = fetchgit { - sha256 = "035ywhicadmr9sh7zhfxsvpchwa9sywccacbspfam39n2hpyqnmm"; - url = "git://git.subsurface-divelog.org/subsurface"; - rev = "72bcb6481f3b935444d7868a74599dda133f9b43"; - branchName = "master"; + url = "git://git.subsurface-divelog.org/subsurface"; + rev = "refs/tags/v${version}"; + sha256 = "1rk5n52p6cnyjrgi7ybhmvh7y31zxrjny0mqpnc1wql69f90h94c"; }; - buildInputs = [ qtbase libdivecomputer libmarble-ssrf libxslt - libzip libxml2 grantlee qtwebkit qttools - qtconnectivity libgit2 libssh2 curl ]; - nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ + libdc libmarble + curl grantlee libgit2 libssh2 libusb libxml2 libxslt libzip + qtbase qtconnectivity qtsvg qttools qtwebkit + ]; + nativeBuildInputs = [ cmake pkgconfig ]; - #enableParallelBuilding = true; # fatal error: ui_mainwindow.h: No such file or directory + enableParallelBuilding = false; # subsurfacewebservices.h dependency on ui_webservices.h - # hack incoming... - preConfigure = '' - marble_libs=$(echo $(echo $CMAKE_LIBRARY_PATH | grep -o "/nix/store/[[:alnum:]]*-libmarble-ssrf-[a-zA-Z0-9\-]*/lib")/libssrfmarblewidget.so) - cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Debug \ - -DMARBLE_LIBRARIES=$marble_libs \ - -DNO_PRINTING=OFF" - ''; + cmakeFlags = [ + "-DMARBLE_LIBRARIES=${libmarble}/lib/libssrfmarblewidget.so" + "-DNO_PRINTING=OFF" + ]; meta = with stdenv.lib; { description = "Subsurface is an open source divelog program that runs on Windows, Mac and Linux"; @@ -55,8 +103,7 @@ stdenv.mkDerivation rec { ''; homepage = https://subsurface-divelog.org; license = licenses.gpl2; - maintainers = [ maintainers.mguentner ]; + maintainers = with maintainers; [ mguentner ]; platforms = platforms.all; }; - } diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 68dd69f385d..62e66e4ad38 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -1,14 +1,13 @@ { lib, stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings_desktop_schemas, p7zip }: +, gtk3, gsettings_desktop_schemas, p7zip, libXxf86vm }: let getDesktopFileName = drvName: (builtins.parseDrvName drvName).name; # TODO: Should we move this to `lib`? Seems like its would be useful in many cases. - extensionOf = filePath: - lib.concatStringsSep "." (lib.tail (lib.splitString "." - (builtins.baseNameOf filePath))); + extensionOf = filePath: + lib.concatStringsSep "." (lib.tail (lib.splitString "." (builtins.baseNameOf filePath))); installIcons = iconName: icons: lib.concatStringsSep "\n" (lib.mapAttrsToList (size: iconFile: '' mkdir -p "$out/share/icons/hicolor/${size}/apps" @@ -30,6 +29,13 @@ let categories = "Application;Graphics;2DGraphics;3DGraphics;"; }; + patchPhase = '' + patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_awt.so + patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_x11.so + patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_awt.so + patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so + ''; + buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ]; buildPhase = '' @@ -68,14 +74,14 @@ let in rec { application = mkSweetHome3D rec { - version = "5.2"; + version = "5.4"; module = "SweetHome3D"; name = stdenv.lib.toLower module + "-application-" + version; description = "Design and visualize your future home"; license = stdenv.lib.licenses.gpl2Plus; src = fetchcvs { cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; - sha256 = "0vws3lj5lgix5fz2hpqvz6p79py5gbfpkhmqpfb1knx1a12310bb"; + sha256 = "09sk4svmaiw8dabcya3407iq5yjwxbss8pik1rzalrlds2428vyw"; module = module; tag = "V_" + d2u version; }; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 61b47dcdd2a..7dbf1e8f2a3 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -30,6 +30,7 @@ let patchPhase = '' sed -i -e 's,../SweetHome3D,${application.src},g' build.xml + sed -i -e 's,lib/macosx/java3d-1.6/jogl-all.jar,lib/java3d-1.6/jogl-all.jar,g' build.xml ''; buildPhase = '' diff --git a/pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch b/pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch new file mode 100644 index 00000000000..8e5c0139e55 --- /dev/null +++ b/pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch @@ -0,0 +1,28 @@ +From 0d677475b710b9bb61d4b3ac5435c36b47d3a155 Mon Sep 17 00:00:00 2001 +From: Peter Simons +Date: Wed, 8 Feb 2017 11:28:42 +0100 +Subject: [PATCH] bash-completion: quote pattern argument to grep + +Without the quotes, bash might expand that pattern based on the contents of the +current working directory or -- if nullglob is set -- the argument disappears +outright if no directory entry matches. +--- + scripts/bash/task.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/bash/task.sh b/scripts/bash/task.sh +index e0c7fb03..d15ed3eb 100644 +--- a/scripts/bash/task.sh ++++ b/scripts/bash/task.sh +@@ -72,7 +72,7 @@ _task_offer_contexts() { + COMPREPLY=( $(compgen -W "$($taskcommand _context) define delete list none show" -- $cur) ) + } + +-_task_context_alias=$($taskcommand show | grep alias.*context | cut -d' ' -f1 | cut -d. -f2) ++_task_context_alias=$($taskcommand show | grep "alias.*context" | cut -d' ' -f1 | cut -d. -f2) + + _task() + { +-- +2.11.1 + diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index eea7ffdcaf2..e4938b928da 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "059a9yc58wcicc6xxsjh1ph7k2yrag0spsahp1wqmsq6h7jwwyyq"; }; + patches = [ ./0001-bash-completion-quote-pattern-argument-to-grep.patch ]; + nativeBuildInputs = [ cmake libuuid gnutls ]; postInstall = '' @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "GTD (getting things done) implementation"; + description = "Highly flexible command-line tool to manage TODO lists"; homepage = http://taskwarrior.org; license = licenses.mit; maintainers = with maintainers; [ marcweber jgeerds ]; diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 850512a837d..837d736d10d 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -35,7 +35,6 @@ let homepage = https://github.com/thestinger/termite/; maintainers = with maintainers; [ koral garbas ]; platforms = platforms.all; - broken = true; }; }; in if configFile == null then termite else symlinkJoin { diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix index b59f1a43710..9e3cf011316 100644 --- a/pkgs/applications/misc/tnef/default.nix +++ b/pkgs/applications/misc/tnef/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/verdammelt/tnef; license = licenses.gpl2; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix new file mode 100644 index 00000000000..5d03989a39e --- /dev/null +++ b/pkgs/applications/misc/tomboy/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, itstool, intltool, pkgconfig +, libxml2, gnome2, atk, gtk2, glib +, mono, mono-addins, dbus-sharp-2_0, dbus-sharp-glib-2_0, gnome-sharp, gtk-sharp-2_0 +, makeWrapper, lib}: + +let + version = "1.15.7"; +in + +stdenv.mkDerivation { + name = "tomboy-${version}"; + + src = fetchurl { + url = "https://github.com/tomboy-notes/tomboy/releases/download/${version}/tomboy-${version}.tar.xz"; + sha256 = "1i6sv6w2ms2x0nkgxq11agljiyg0yl4x2rzmcyvs2hxyf574hd1y"; + }; + + buildInputs = [ itstool intltool pkgconfig + libxml2 gnome2.GConf atk gtk2 + mono mono-addins dbus-sharp-2_0 dbus-sharp-glib-2_0 gnome-sharp gtk-sharp-2_0 + makeWrapper ]; + + postInstall = '' + makeWrapper "${mono}/bin/mono" "$out/bin/tomboy" \ + --add-flags "$out/lib/tomboy/Tomboy.exe" \ + --prefix MONO_GAC_PREFIX : ${dbus-sharp-2_0} \ + --prefix MONO_GAC_PREFIX : ${dbus-sharp-glib-2_0} \ + --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ + --prefix MONO_GAC_PREFIX : ${gnome-sharp} \ + --prefix MONO_GAC_PREFIX : ${mono-addins} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk-sharp-2_0 gtk-sharp-2_0.gtk gnome2.GConf ]} + ''; + + meta = with stdenv.lib; { + homepage = "https://wiki.gnome.org/Apps/Tomboy"; + description = "A simple note-taking application with synchronization"; + platforms = platforms.linux; + license = stdenv.lib.licenses.lgpl2; + maintainers = with maintainers; [ stesie ]; + }; +} diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix new file mode 100644 index 00000000000..713a36f1029 --- /dev/null +++ b/pkgs/applications/misc/urh/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + name = "urh-${version}"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "jopohl"; + repo = "urh"; + rev = "v${version}"; + sha256 = "137dsxs4i0lmxwp31g8fzwpwv1i8rsiir9gxvs5cmnwsrbcrdvxh"; + }; + + propagatedBuildInputs = with python3Packages; [ pyqt5 numpy psutil cython ]; + + doCheck = false; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Universal Radio Hacker: investigate wireless protocols like a boss"; + license = licenses.asl20; + platform = platforms.all; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix new file mode 100644 index 00000000000..00e42fdbba9 --- /dev/null +++ b/pkgs/applications/misc/worker/default.nix @@ -0,0 +1,20 @@ +{ stdenv, libX11, fetchurl }: + +stdenv.mkDerivation rec { + name = "worker-${version}"; + version = "3.8.5"; + + src = fetchurl { + url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; + sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw"; + }; + + buildInputs = [ libX11 ]; + + meta = with stdenv.lib; { + description = "A two-pane file manager with advanced file manipulation features"; + homepage = "http://www.boomerangsworld.de/cms/worker/index.html"; + license = licenses.gpl2; + maintainers = [ maintainers.ndowens ]; + }; +} diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix new file mode 100644 index 00000000000..d273d27944a --- /dev/null +++ b/pkgs/applications/misc/yaft/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ncurses }: + +stdenv.mkDerivation rec { + version = "0.2.9"; + name = "yaft-${version}"; + + src = fetchFromGitHub { + owner = "uobikiemukot"; + repo = "yaft"; + rev = "v${version}"; + sha256 = "0l1ig8wm545kpn4l7186rymny83jkahnjim290wsl7hsszfq1ckd"; + }; + + buildInputs = [ ncurses ]; + + installFlags = [ "PREFIX=$(out)" "MANPREFIX=$(out)/share/man" ]; + + meta = { + homepage = https://github.com/uobikiemukot/yaft; + description = "Yet another framebuffer terminal"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 4995c425699..a646cd10b6d 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,22 +1,28 @@ -{ stdenv, lib, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils -, file, makeWrapper, sqlite, glib -, synctexSupport ? true, texlive ? null }: +{ stdenv, fetchurl, makeWrapper, pkgconfig +, gtk, girara, ncurses, gettext, docutils +, file, sqlite, glib, texlive +, synctexSupport ? true +}: assert synctexSupport -> texlive != null; +with stdenv.lib; + stdenv.mkDerivation rec { - version = "0.3.6"; - name = "zathura-core-${version}"; + name = "zathura-core-${version}"; + version = "0.3.7"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "0fyb5hak0knqvg90rmdavwcmilhnrwgg1s5ykx9wd3skbpi8nsh8"; + url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; + sha256 = "1w0g74dq4z2vl3f99s2gkaqrb5pskgzig10qhbxj4gq9yj4zzbr2"; }; icon = ./icon.xpm; - buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite glib - ] ++ lib.optional synctexSupport texlive.bin.core; + buildInputs = [ + pkgconfig file gtk girara + gettext makeWrapper sqlite glib + ] ++ optional synctexSupport texlive.bin.core; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; @@ -25,11 +31,12 @@ stdenv.mkDerivation rec { "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" "TPUT=${ncurses.out}/bin/tput" - ] ++ lib.optional synctexSupport "WITH_SYNCTEX=1"; + (optionalString synctexSupport "WITH_SYNCTEX=1") + ]; postInstall = '' wrapProgram "$out/bin/zathura" \ - --prefix PATH ":" "${lib.makeBinPath [ file ]}" \ + --prefix PATH ":" "${makeBinPath [ file ]}" \ --prefix XDG_CONFIG_DIRS ":" "$out/etc" install -Dm644 $icon $out/share/pixmaps/pwmt.xpm @@ -38,11 +45,11 @@ stdenv.mkDerivation rec { echo "Icon=pwmt" >> $out/share/applications/zathura.desktop ''; - meta = with stdenv.lib; { - homepage = http://pwmt.org/projects/zathura/; + meta = { + homepage = http://pwmt.org/projects/zathura/; description = "A core component for zathura PDF viewer"; - license = licenses.zlib; - platforms = platforms.linux; + license = licenses.zlib; + platforms = platforms.linux; maintainers = with maintainers; [ garbas ]; }; } diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index a78c94173e4..23a654b4d51 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -2,24 +2,18 @@ , libjpeg, jbig2dec, openjpeg, fetchpatch }: stdenv.mkDerivation rec { - version = "0.3.0"; + version = "0.3.1"; name = "zathura-pdf-mupdf-${version}"; src = fetchurl { url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.gz"; - sha256 = "1j3j3wbp49walb19f0966qsnlqbd26wnsjpcxfbf021dav8vk327"; + sha256 = "06zqn8z6a0hfsx3s1kzqvqzb73afgcl6z5r062sxv7kv570fvffr"; }; buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ]; makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; - patches = [(fetchpatch { - name = "mupdf-1.9.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/mupdf-1.9.patch?h=packages/zathura-pdf-mupdf&id=385ad96261b7297fdebbee6f4b22ec20dda8d65e"; - sha256 = "185wgg0z4b0z5aybcnnyvbs50h43imn5xz3nqmya4rk4v5bwy49y"; - })]; - meta = with lib; { homepage = http://pwmt.org/projects/zathura/; description = "A zathura PDF plugin (mupdf)"; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index d014999a667..c59d6b00945 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -83,9 +83,9 @@ in stdenv.mkDerivation { ed -v -s "$out/bin/chromium" << EOF 2i - if [ -x "/var/setuid-wrappers/${sandboxExecutableName}" ] + if [ -x "/run/wrappers/bin/${sandboxExecutableName}" ] then - export CHROME_DEVEL_SANDBOX="/var/setuid-wrappers/${sandboxExecutableName}" + export CHROME_DEVEL_SANDBOX="/run/wrappers/bin/${sandboxExecutableName}" else export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}" fi diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index cb0309bac89..02b7ec34cfc 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "24.0.0.194"; + version = "24.0.0.221"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1l9gz81mwb4p1yj9n8s7hrkxdyw0amcpcc3295dq7zhsr35dm76z"; + sha256 = "0vqvb098wms9v2r1xm9yq4cpn1h9dr1y7izfy2rwg3y7gr8ycv80"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 2337cd51cbb..899f66cb2b0 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 = "00mq90h5kjj3x7asclp97x5mqy6pvcj0vqxcf77djlyjmsy1q10i"; - sha256bin64 = "1prmj546sp627crnjfj2sxprr6ahb59ajgqp8jwy4wiy1x5c3j88"; - version = "56.0.2924.28"; + sha256 = "0f1w9cba99s9hy6fdqkr39yhkay4kid72vdrgs4as5lwdci8xc6g"; + sha256bin64 = "13hfkkgqywjapz01q3cy0i3ick1s24qhpl40by21c38nwbqplivw"; + version = "56.0.2924.76"; }; dev = { - sha256 = "1dnqqlhdxawwy4zdk2p8zn6vg0cpi3hqpl9rf3j0xylvm3knr9a1"; - sha256bin64 = "1hnmca8jqvammsb3y847p2n9hm93129li5zfi5pacqizqlakmv3z"; - version = "57.0.2950.4"; + sha256 = "0vw9l66412b9zd8v5l0i518mvfwf313gvh1ywxkf48lpjpi03qwh"; + sha256bin64 = "1iagza9qjlr61149g6cmiak82898xrrhvk516xrssap2qkb6kyzp"; + version = "57.0.2987.19"; }; stable = { - sha256 = "0n0sp3f3cmac2lblzn3mjkkhm8p6vy34dafr0kpdz14w1lad66z8"; - sha256bin64 = "1cvp9fvdpd8qrl48lzs7f6k43bqd43gp0sbzz6h7yrpzw1c49r0m"; - version = "55.0.2883.87"; + sha256 = "1q2kg85pd6lv036w7lsss5mhiiva9rx4f0410sbn9bnazhghib4s"; + sha256bin64 = "1s64smkpjmnlw7ym14v3g3lcpagsgavmnlq6wkgci80kyvwasd3w"; + version = "56.0.2924.87"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 8e424ea80b0..587e807b168 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -1,915 +1,925 @@ { - version = "50.1.0"; + version = "51.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ach/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ach/firefox-51.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "fb941dda8a38f2e8474b4c1b235b4d3b2364a3e4b70f929cb40a6bc96a8859a830b072a0b3bb03bf7d551bec6eb0c46e41a93f7ebf4fb73a21949b824ab09084"; + sha512 = "264a80d657603925d3ac0e848e60e3593a94e20eaaad4aba1767fc35c8bdd826d7fffbf7aa7be9fc8e380bbc174d53937eb24f887db18fa69ee375f72e8ef092"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/af/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/af/firefox-51.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "9ca21be569db94f528dd74ae269e9a0929f9a73b399ad619066c45f38fdd04b511fd8126bcbdca7ad0d6aeb7ec82d597287ef168c04fe1c7a47d9dd4fec3674c"; + sha512 = "ca4498387c7786f96e3e7220b6a072cb5df0daaf00dade13a149e61ba725229e47f84622f196034caa608c9c2ef49a14450a9816fd3accb62c29063344d354ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/an/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/an/firefox-51.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "1899bd8140e847c6458b23bb0652bcfbc3cc1a6a9520ea10546d6b2f6719715f18ef5e79af07b68fe2cb5f50bb7f7c85376f17081478990a7ba907c45a31cc95"; + sha512 = "7abba14523671201798f8abb53233472f56fd961d679aee52b4ae9be1c9b5afe547cb1c10a5f6aa80cd5b41eeb0a3d04edc60a62ed00b1bc21ad8cb9dc86906e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ar/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ar/firefox-51.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "d3c5e6c263ed1a0cbd535279d03a446ed6e59471c7949d381265056e7dc6bcb7df4abbdc13601b7b681185f66219676a6662e217510a13136d89dbdd6f8460a2"; + sha512 = "429aa2cf388d1efd0e6d9658b9464d06bf6aa42cce1b9b0d4bf2d85a350fbf307d45a205d9303ff386fbbba56a637c19d6c7695a78b9947d29ccaec285053864"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/as/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/as/firefox-51.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "3b0112c8830fd9e90301efaff5d8414cc3edac9382947520ab1c283ebc4dd897ccc3102d12d35eee60fefbdd13329a02f056375fced5bf45a51895a7abeb48b6"; + sha512 = "670102d9e6b50aa44d9d035af068dfd55d5b009a8e189e0e0d1e6d3404918c0e009e3e573b3de2601801e7c792746885d32aeb48235921c4cbf7874b82f06a73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ast/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ast/firefox-51.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "b036544990cc08fc0588730780fefe9bda82fa1ffe53b0d7cc0cce60f5fbaba261fbeb6117ecc4b18985751572a5c08f8cc30e9b35291841694a180e0d5e75c5"; + sha512 = "e6e6236bc496bab83bb64c7fcd2444d4f81fa49c9b6914d2d9abd2cced829f22b75705b3755525277d0d5a1193d0766cdaf936423889c77a2773ab28d953c738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/az/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/az/firefox-51.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "4beacaf3cf371bf7226095916f3e0c8f4941e32dc2ee6b25368cee6569dd102131cff4fef53f9ce88706172e838dc0a916bc741ae22bbf3eabe293fde3350e67"; + sha512 = "16b6fed737a5d2fdeb18945cd71f8e844abfcc1402ade665260d2644612579e76111a53548dd5c645c5816fec7c8162df91d687eb6b9dc84ad520af2a9580dde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/be/firefox-50.1.0.tar.bz2"; - locale = "be"; - arch = "linux-x86_64"; - sha512 = "e249554f4ed1f1434b3c0b51736c9739817f39db8afd70cf60a7e3ce5a78dc6a23ae903b991f342bdb93b4324c5c5309bec4e84313beb5af94d887249619fa79"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bg/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/bg/firefox-51.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "cc4ecea41635b921a652684d7bf10f2e200aacb0c18e50a95f0412c049db26042c0cfbf6d40fabd3db5aedd7ffdca4633827b5f17a27b56766b372420536b593"; + sha512 = "dd311d55e182408ba16853dec80d13fabc957e9ff9e6098f040698b35fea28b4579827ca35b21188f1e6287b749fd1ac94b3bb9979b75caf5b10b90686f425ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bn-BD/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/bn-BD/firefox-51.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "75483d1f7a5bf3fe54de817222f78aecd4621cd1a53c330cda74348ca6569bfe3bac6b60d628abe4632c0e68b9a9e6f0c24b69bb3ac09e52023ee352190d1cf3"; + sha512 = "857a13768160d71dfe5dd806933c85006e63508b6dce63545a0618c20531204b672dac7b2634dbba3a453277cfc53a9395215287ea51b18642d8e8c97258c704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bn-IN/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/bn-IN/firefox-51.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "5b378bc2874cc2fd0f3c739048c894670ed7dfb6e0f37e7de324261c5ed62bc75e62a26a1b2b4392858d86bf2314534841eb8676aeb0bd0e4ce6c23432b4b4a8"; + sha512 = "602c352dd5de9a90128318c72496b2439531a5f4c4d16b28060686396db0b84c1300255eb8cb5dc6e6560971e6283d3c4bbe4376939177e4fbc0192898922a7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/br/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/br/firefox-51.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "eb33bf820530e267a5b5c322951563cf66c886bd71f30d6aa8cc43a2a9b16b6e58d207648b68fb1f2c0d1fd645aba6292c6d8674a3fef7c23f3d2ef706973ab9"; + sha512 = "fa8ba39abf6691c4127b5d4f6002405eff04fee2522ac274ce57c349ae042f5f47ee7cdb3519608d6415629aadf6a5894f575dab79ae3055fba383cf2680cc54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bs/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/bs/firefox-51.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "aaa4221204b3f736e31fee50c30e73a919066f8cd1f25bf4fc42532edd0a87c557a10f11e275e8b8d2396fe876b8859760d952a311caf0bdfd967e813144b86b"; + sha512 = "c8960b8cf4055c7a9032a3d5c10bbc59bf1b828909bfcb57f45a8d05dff07111d18da1644a18cdccb653630d77ebc17d435109d289f1d378335db043ae2c142f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ca/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ca/firefox-51.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "e98b08fb0cd937375fd7473617fd234659fdd08d1299f0792efb9757b356447c479335bea765b0fad902d3b055569fe491a30b73d3f1c3d32c76c3cd1e621ab8"; + sha512 = "3b8cbbb0b8a14640f2b919fcfb67d4274e6ac9c6f612bb4baf5c368752d76fcdbea7c795cdf23b00f3bd64ddb2ae4af950cdb7a0637f621ab0ef382c1f6933cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/cak/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/cak/firefox-51.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "e8a5ec70d52574929edfe93064f03d254e894a790093b2ae86d3f34376db646366a6970d06eaf3f3fe5cfdc89a8f11d0c289061f41d66d7602c0a841cf589428"; + sha512 = "e7a325d7ffed7db337c5fa4c3bfd31bf8b7703041de16f8024821f1d89487f36131616d460db8518d71d20af4285d43a040331d304c5b828fabdce181f736965"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/cs/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/cs/firefox-51.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "3b5e7ea9571eb8ec0f66ca9d062405e3efa874cfa6d39bc455a14f1f25ce1923b276272deda191ddec085d52042ca8cb633e89a8e908ecc428b0d8c3877b08cc"; + sha512 = "32a4b758b2cfac67f19a7fe7ad7d04b49122921e2b3c1c8236d8be3452b665aa54c13dcd9e2d2b298dc017b864f56aa9b6f06d174be46ca41a722226a15eaf01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/cy/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/cy/firefox-51.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "78b0e26cdff7f123c6ed3721066ad7f5e9f55d0aee5d1c87c12927ae87fadb8f3e1021193134a83fe5c23c62c68cd9536151999c1ed66a885e12a4dcb4b12fb0"; + sha512 = "908bc9d3d9ada201a2fa81a83f6773c635c3dbec0e08b464c6dab5a311d667291fe7f5ee403ff13e5cd923d01cbfc0d9e2a0de3a2a7469af4bbf4afc8368ef4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/da/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/da/firefox-51.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "de0f78b0d69c292c482edde52f728df7c3d865f31b8b9633d4ca5a66b4fc5f272402a0715baf5efcf14eba683f8ff633c172a5a198906991ff1735db128816b3"; + sha512 = "e10fd9c7ee4496a674cb18414f0bfbd1671d21aad4bf41a63432540555a6f4059faf50e488bb76241a1e15884fdf7c43ec289e2641d9ee13f63985062526cd07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/de/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/de/firefox-51.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "f95e36a8393d233409b1c3ae6b56b08fbc44d4603bc932cbdd1897650d1528f57cade92b1b1cf3717191c95db54380ba3c11fbb46b25c14a514e0a00fa5b2a3a"; + sha512 = "07221eea748fbad6ffca0b7f77e4995039e28e506a790d5e858d4d88cd80737f1a366735a4a826358a9aa76ee1b454d99f8fc8732f4082e91c9a9e5ce40a9b81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/dsb/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/dsb/firefox-51.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "a06f9172490ac731f06701fb7f8414438c1e520bbe5669e8dae54697dc9cc3aa03837ee8f84dd1b69751a4e8d82b34f88ef3c43a37ad9fe6e0c8b1afd18956d1"; + sha512 = "9e2f1eee45e5dc1b8f7ab5c72c734c85bdd21544500c45ba1b85580cc110c02499cc69b596d979633e64b3aee7b1408e27862c761d4451b749399815199d3694"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/el/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/el/firefox-51.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "78e4a2fc29487347eea47069e022f13482925ce15f37918455a96eb68fed50152ef6a9a93773c4acb680957eded79c0b20883d86f87ac28895d61d777dc07cdd"; + sha512 = "270b1fd5fcf6958929e81c38a5ae2d8b5ee3de62e64eb6e7e7b80a8520759f1bddf03eec408165853ae624918194c57c2b7b496b4146a78ef42bc4b5b77a1d55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/en-GB/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/en-GB/firefox-51.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "53deaf16fefcb954b34ce8577d0ff40d2d497c591765a16c7befa6ded348eb997e1523e873775a52a74e47c41ff06cbad3c612722036b6dce538d768d1659886"; + sha512 = "79bc0e031f3ad065e5309dc20ff509d9d6fa85c2669548b24be9e2b8fd9347ce354b51faea65943b421941ba20d8d0fb22c79b89ad380a37ff52ccf330343f33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/en-US/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/en-US/firefox-51.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "f81b63d9737c672958674096a69c941351caa335d481dbe39ebbe051153f0680f2d3ab4832267eb27ede36b8ce8242e43374ebb49d5cd3a0c44a813efa8c7a22"; + sha512 = "724a778bf54c6778838378c07481c5eed2cc7984c1a9809e352b6bcbd2562c060f6f39b6308caec2e62c05f8631753796a7b2714afda0606bab70b3ef3acc15c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/en-ZA/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/en-ZA/firefox-51.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "6e1247ccce230fd044f0fbc64deb345b7d82cd347595fee084b8ccedaf31071b992b988346a8bfc5e5af8a2706a47b7e4ce2681e67a11098eefb7895a73bcdd0"; + sha512 = "ffb4d4554ffdab057507fe29c0fb56a74e683b3bfbf19b26a52f23336918c788a476b549df3b4f57dc79c555bc36af620f46bcbb7c6467855952a024c75f7213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/eo/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/eo/firefox-51.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "c27c51252c8312f4280dcedb94906296c52c96c26dcfa21fa392c80b0d1277b8d7507daca312c69192cfd6fa70273f66a3319788bc3ae8b8e835af365f3e8fbc"; + sha512 = "42768a6de7144ccd63c6a58c6fa2913004cdc3d7f35bfbb3d47ecc8a705672d2b95e8e8389fdc6715bcaff48b2c1a335c23f39a2c07d03b4cb660146fa811a7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-AR/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/es-AR/firefox-51.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ece5c060bbc1809a5609dffbc477ad215245eef1e341232d2516859f1f15959d117e2728605ac57bc94fd6ff6a5b85a892275552ac0b006783d4a1d0f02fa26b"; + sha512 = "36da6cd0f8aea2419ba618b11f47764510c109c18bfbac380234b10c864a991a211742be3c058b4a8a59944324c7b32f65b4b3b8a9bc25460e6b4ef99e5d12e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-CL/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/es-CL/firefox-51.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "2df20afb64fa6d25678bb6dd91f7c042c754aa241af4e3f728d54526edc342b4e6e591d8586e9cfbcde5baeb932e092c00feabe5e3eff1f00e5065a80f0fd097"; + sha512 = "e3dbcdad48741a73aeebc46ab4771b4ea2324e6b0a9e6af020e0c5929528458cc3d66931dc67de4bf93b90afbb7f79078436c3da1ddc35779fbf40b8aad0ef1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-ES/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/es-ES/firefox-51.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "5b9af2b2664caeaa574ca92d4a63cd0a86a70278f63596e6a7fef0cab3fa4dd22d1c00408e067080979d9b9017f2edd9a3e1e22b3a75710017ef94bb1ba82bb4"; + sha512 = "1353c9d7fbe55d579486488d94d34b5acc0a87f6155ec2aa106ad6b2df53ee6813e19346bbfd920d5d0582bdb9c16dee667ebc384d48e06026fcf79590dc30fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-MX/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/es-MX/firefox-51.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "610462c6841615e2241a3edde60333fe3ada9897dc7ec8bfeb1771025a5f9aa0acf9fded1459938c70c7fb478f659817606a133af4b38019a3dfcc7fd3b3f9dd"; + sha512 = "fc93aaa68159c75d5c53d253e71aa87d099f499ff54a10606f0b87912837a1b85d897719d69753f6f84d389cbdf64a4a9306a9d19b809892032431d1a142b03c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/et/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/et/firefox-51.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "2fa4a1683102849ef33c7a149b7628a3c783ee2466d733b328fb8ea4e1ba96917b128a00ad9a8fb75cec181b0208635667bc16d959b28ac1a4af7c96af10e07a"; + sha512 = "e665a3e923bcd1ed070c1c4852d385f61ef43b5e6b39ad1eb0f547666d9c1cf82022638b9b60ef25f1621499ec930fec09367634ac972f7ce4c95f9bfb21cd15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/eu/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/eu/firefox-51.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "0b53f26346f16dc06478bad62a0191fb2c9c9fdf2864e0d5332540eaa81a4c22b0492128df5c8d7eea9d122482986b3f97837538436730b4ddfcd1c02098d1ed"; + sha512 = "aaad849c7de92f4dcda618b882b82f9c1ccf1de45454162f90f7beebe060d2f2c53e21dbc7a50ccfe24c505608f45aebd1744900647d7131234a55e79e4e8a6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fa/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/fa/firefox-51.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "6e6d92624e89214a4110bfdfa181e46847759bb0735e18ca0fcd4b9e333b40b91f8ca48e271b3d1ff4fadc05cfce9824435dbc429f56dfecb6d98e48ea0a31ca"; + sha512 = "ac4f9518cf658c2438bc6037cccbdfc5f3af40b4c2ec89c6ef82f43b171f3d781ff067ad096322cf316c4b46dd27f7e0da68291289d6f03e81d1b90f3c436d2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ff/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ff/firefox-51.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "59865504f50aa5e5aa2bfafa1159623dd54b91e3cbcc0cd76ae84e8da063e6db11e2594b9448e5ee75fdd15188c5ba9daf335eafa13601ad942e8f6f4d2bca26"; + sha512 = "0a788a34a6f8ac67da73ff0531ceda803a911f30b77957d31b47e5acab221a55501daa94643ebd2d824b475591edb147ae66a06fe2641915c8a18adaaedeecd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fi/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/fi/firefox-51.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "6e07761ce3aa5e42bf887ff13a35619e3e20209b94ed890b505c1f0fd79712a2daeab53ea344378c18f6f05c4673e1f146e8f6a44d325ba387ea6967188357cd"; + sha512 = "c163e07e2097469be8dfaa57b6b722e9787c617cd8833e043b742a4d1424e7835e2c661412aae353fe0373bd163548102fd0b30dc37fbffe53444f0791c1777b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fr/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/fr/firefox-51.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "0abd50bc0a7d5a79b98900cbeff95827c46dc53163ee6cc9220f234049ec43c09bbb8a283c54a1a41387be8d0ac761fd9e215d37ad234a0bdd088b07e339757b"; + sha512 = "481a00f96cd79c04fde00ea39e560193575c1244d6e13c38ff4a81299cf944909a24bc8c8e0ff2a280bd9d4d7e8ca77b66e0532dc0643967ab52f27148dcab5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fy-NL/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/fy-NL/firefox-51.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "2a272b160a2cde4d27f3f3da7a1d6600f4b78af11ecfcfdb3f3596d6a4a1f56b19cec7fee1066afea050b951e1eb7f3245dae28b0a91ac4110010c122609dd58"; + sha512 = "37d8b6df59f8433efbd55de434b2639e83b6306065017b62c8f2d1730dc84842081abd9669eb48ea862b36c0c62f84a0ec03eaac7be17463129b46a03426d8da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ga-IE/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ga-IE/firefox-51.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "730f2c608d9770e2e4c154d6f1ec223290018d2412a1a6103245a71ef17876cf304acbb16e11915cb2e3564c08099a9207839dc8caeb0553cfdcbb869f6cb09c"; + sha512 = "a6516adb884d070f4e6265e89e9a20b99f06f4093eb01df612f19748a1dc5fa07ed949a5d90030b8c512203717f0c9cdfdb307e1dfc2fbcd9def2bb7caf92dd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gd/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/gd/firefox-51.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "cde56f2453d780a9d0debcc012e9a139d61c1d78fcb2a4a7823982321fd65ffe6b538fbaa7a0e5dd69db6f1f3139e5386bd6e02ca5c065510a936fe35583872b"; + sha512 = "1d8710d83abf7e185aa73da047efd15d7e0b9667b80737528900a15b9a6aacd20588c963366f2aa08c7772444843b642e53bb2d3ababbb8b9812926d7c5a858e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gl/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/gl/firefox-51.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "161ee7b027f64698c30bc5147599853c4fa6b8f8629d33e4f11380cf4431835489e834cc3a7b42a676d9da6d6231e1e1bdc5f81f410ccf8f55f33c5ec3e07b32"; + sha512 = "08fee9be09fa365e188cfbe00dfb50c9b82a5228ec9d9feac7b4f01de43097f20dae4cd4f05da9983cff7d9504a5443854e8c13e8114a0977e65875406942007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gn/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/gn/firefox-51.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "b4637e7727bc726acf3c1aff2c199fef896eb98f95a04b5b899b9800d0fa2cc6b23ae0c7b5a5acb591e49b03dcab22ef73840f129d9e82dc49e5636234fa570e"; + sha512 = "4a21dc3c3355c08bf98d6366acfceb84841f50f5686dac61e87def3995c0e0df399834640722ce1c278e461096996320d7eac9af400bb08d1bbfb95cbfafb694"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gu-IN/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/gu-IN/firefox-51.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "b8028122a8132110fb951175d51d07c685c212cc56128788c75bd0c0d21452752e4fd03e6345d80806c8babffeed04f7cdc89b1b338f7d56e539b847c0da7f72"; + sha512 = "0d565d1e41f9b57cd71d30034f576877650941c4e2250b49668232aa7cfc9a3e8c37dbda3e1e8eafc594fab09ac90e4b3f6b52c90613a9b236d9dc4092c65e50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/he/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/he/firefox-51.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "57adfc574ca5160ca5f95f98c76542109dacef231ad8cbcd4c75467bb599e922d6590cb3214f4e4946a947b36e6130b25f12cf4c641b2ca91a36aab5e8489426"; + sha512 = "c0c87223d0c51b2d4df51ccf1d48938cbc2860f90b32a8d32fa69c7a4768c550deb9e9ee3f720404d51fb1461e0f25b56dc927449acc6a5d5dd23ac64fb4bf61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hi-IN/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hi-IN/firefox-51.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "3a71226d56c373663401d144388d5c74e583ae34b4d05bb444703426991162392e338f11e993707a83943c0fe85b8a5192099b932afa03b9d3ff6a17903b1271"; + sha512 = "6c0de623688af6a3eefa1a5a230979d2342d2414d27acca2e64646a9c82356cad47898d9fa791202bbe97464fad6e0903a12d73b15088d36062e89132c8e6d79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hr/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hr/firefox-51.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f919ce865004a64bcfd834475917ba24c1bfe0bf573e578984199085c073abcfce38b4e838d684f4cdf5bbc2408f84758df9f81345da6e0824f290ad311dc6c3"; + sha512 = "637ab29f7bc717b33007970bc23abbf75bcdc39df3be75c71830ec27874269a948aefdec854bf051d702f4201525a279f3f250734a35b773bbcc44e47888cb10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hsb/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hsb/firefox-51.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "4641225b3dcf328dfbe12af68698a4504d0882c1029a36aa617f57ddf11e0edd9cd10add1d887d2154a59e6fa60bb8b13bc185529df166c72195200ef94a5dd4"; + sha512 = "92b7c0e1ecdeb485ea616ed025589add7305be63d401c37ea0372b2bf75d90c41fb8fbdb99de1c21c61da6f8f59ab1c403d512cc0c19828c10336a9f1a315903"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hu/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hu/firefox-51.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "1f34d1d52d28413a46d5f9efa8d8067c41ec5af861f9fca49a5b59f03e6e325455883a2ee4f9c5e3629d7a61a3f1106f24b4bf4f9a75e6659cad4ec511024ce7"; + sha512 = "04e1aa441756e4452d1f8d762a5ba16af0121a3dae2a1fd1f33c223531a5f17f5cd1713b9fe81ee2c3746117df8942c26ed8e27e39e82644684babb060e32eb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hy-AM/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hy-AM/firefox-51.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "926a0a1e036303c53fb0a5c65ec2a0285d562c86eb7396f84fa5926a3b9e67ea7872af6d8d436322ca5a939d1626adad80230abfecdeefd51d5cb3b27e16cd5e"; + sha512 = "a962703c41aa3a9712b9ec98b5c00b621b844de5e277f98db65f9b682222ef580e2bfb259cdd6fc4a165ff319ba62daba3e0445b4cff0c47e4582249e6dd1add"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/id/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/id/firefox-51.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "f3389014409d143a35c66d57974a77d1d811c3ff9d47f6f13b7c40c0f24154d42bb7e4908589de21b3430d44a108f3765792f7573c78e510292d824f96cc77e4"; + sha512 = "fb8a70915b978d61510f843de20e3f6549331fa5e625fd831b1ad7745e33c55cbfdf0afc8fad51e82b92ff60cf88a8a9bfdf4471036aebb75380b713401d03fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/is/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/is/firefox-51.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "58f320b32ba9a83a6a8a4f4d108c3bd87a4879da7205dfae59b24a3550e0bb90917b431b15a18e38da0d702ee8f2c8756179ea07082ff6e0aeae9f51a3820246"; + sha512 = "28af7725b79fbb2ea49514413e886c7e8572d55d943c99c2a08887ba8371526e3879735ca29989465a5fc7a35b09d781740b97988c3667d212c5d3eed5467e00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/it/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/it/firefox-51.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "60acfa5b847b5390fb5b733f4a35a0a9c426c4126c53f517eae3e6fea3c6c7c88092063ae0d5d3be05a1dfbab32a1e392aff7f18c6566f827cdc6d21b0e22c7f"; + sha512 = "c470694846df0b78cf0a9b43215d3e187720953508109e04b6d11c2803dd981bf4c0c2116e804246f95643ea8a8c47c4c4cebe7cf45a867ae50e98b34cd68681"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ja/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ja/firefox-51.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "3d668102a2f56547b49add2dacbfa1a8ac285007d47585325002cf4250465dae809b50ff1d1d13dcd3f05ce6afaf76b607a696004e60d33caf52d2d531297550"; + sha512 = "96c6f130818df3e642c3f43ea05180629ab9ce80cce7da668873c7cac7745d5448815d00c9dc7be88e48384c0603e2019fabd5743e4c48da6aff4495bb54c740"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/kk/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ka/firefox-51.0.1.tar.bz2"; + locale = "ka"; + arch = "linux-x86_64"; + sha512 = "7559a392bb227029cc6950d21e222f48744fa7cdba666219ce66697b7ab97c7d036539ee4527d956a0d74c2fe9fd6129c71c6a0faf36062cf001c2b68c973ceb"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/kab/firefox-51.0.1.tar.bz2"; + locale = "kab"; + arch = "linux-x86_64"; + sha512 = "f98b871784261f0569aac50f10780bcc79e338d0b385c605a3e348b050e54279e4387daffec826710b8703b2ad38fe8d63d54cf3c12d94da8368091668d9ab3b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/kk/firefox-51.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "c35217a07255fcac9bdbfb52777bae3609c22984733297722c62b8391350fe2d68bea20b542d6d2d7f55fc18aa662da226bf83a62e0017c315b92eb460021cac"; + sha512 = "6ecfba23dce0b0ec23c4b309aafc6b6d89a69e889be31dcdffbeed90da4bbecc58c18dfbee6dcb9e09d65a495fc57535457aa7750ebab364cb46a73c548724a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/km/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/km/firefox-51.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "fab7429671c3b866ddb7fd0d25101a4a83c6a1ee3822a57517b9c6288e35f6a4339f5a42d93f865a9c6ddf1a9bb5e2e23d8458b39acc34bc2701d68522feef03"; + sha512 = "b9eef61d168e7f73c537e276c7c4d4ec5ef4e886c10c5c1e0d16c22e07fb68ca39d64b7c0308ae662c73ebd1d1a760638da6000db4ed7a07853f096632df690a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/kn/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/kn/firefox-51.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "2ea7a6094ad8f9b8179028820d79d003f5c04e9bd223fd2df19c7b5daa08ba631176775e9586c7507291aa34fc1c39510bd8851b1fd9a7a08c1786f689949839"; + sha512 = "df5cae66a6b62d74d3b55e96135099bee9744edca2e5f3b0e8b21aa9f3cb6228d4477c63d62c18f95eeb06ba774187d214cdf0161be20c7aed7ca9d835722f11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ko/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ko/firefox-51.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "701a0873b860c62d18ab778d1b0e5c3719cd3e6b49ca37083983f9e3f988d54ebcb2ff27138d7a5e76c940f64f445f96143b0f836af4b9611999b3f49670b8c9"; + sha512 = "c5d023c4f0034950dbef00bf4ac4945f1e8853e10fbcdb904268bcbb855f5997fa091d7739683776af097524a5a0a602bd05dbab9ede702ec8532b18465ed47e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/lij/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/lij/firefox-51.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "b394da463400ebbcb77cda8ed102f42eca419e896f0b95432e565f126e9e20aee0d9790888c691b9f7291322a3f49d44a58349f611ffc159d514a5a68f7013f4"; + sha512 = "1c25e8bdae267c9673783f55dc99a23ba14c904a6763950098591f3a5db2e0007d11fa52506ed86018edfdffa5c3e6a7d3000bc0d30a69381b3a92d9f14192a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/lt/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/lt/firefox-51.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "55ac32604ec630d2540a7cd2d2a46c4161650f1a3607c2e45ee8006e6bbec0039dd4927ef28c9efd70961f7f5c4d9d6fdc83dd60b670aaaff26c31594c25c813"; + sha512 = "7c95e21dae9a449617f3405614f8ab934fadd93de771a4aa44a718ccb20e2976922cf88121d9dd3f2fbee892de7d435915b0fc7aa80ec720b297e668beeb042f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/lv/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/lv/firefox-51.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "df012ca9e5026661622b1d0a1230399e970809f2d8f9a3d81a9b05d438e7f20c706cbf739a229b82296db15bf8bda89c266051c56c7786a673e38600bfd81164"; + sha512 = "61928f84cd78ca91ad758e4b4fe391a3d50cdae457c66a14511e8770c0f1ba76c986c8a1e07728717642d77557fe8d7f70513f5cf2884566e092482f5b98e18d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/mai/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/mai/firefox-51.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "df74e2c1465b74602ba834cedbc3e07671a813d5979e6a0d85c32e504e01136a05f4915253f785f0b03fa98a4c284d066ff2101737f40490bfe9e30165b712e0"; + sha512 = "61ccb7600c1510d6e0480f35f63286cfd095edfeaa24e9ac2540a22fd1ea0c246d221e6e5b4d1f68bdbb1c9071b480240bc660097d2a761ff4166e1b3a6a629c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/mk/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/mk/firefox-51.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "68d80303625c9bf86bc2b86a38d9a41643416bea77445630b10a4219d725a9800fbd973e683c7dad46941fa089df6bcf1d07ba5fcf2c3739eede865eed038a97"; + sha512 = "89ba4db24bc1e1689925885446846a915adc1bc590f2f65752c54cdf6a69ca21333a4d6ef1b3e9d7252fb890de0ec41b0c6c229b9cd0d03b167e1bf4829befa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ml/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ml/firefox-51.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "bd1168a7b3e17edc28dbc051fb2951d134c85637b0e0bfa2ac2542211498a8018f8c8a74584d2ebfc24336dc803ec04bfdb11d5975f261f8ad92cdda6dbc1067"; + sha512 = "2889ed4020dd1ef59d90dcf727d2758937708b1189bee785640bde9d12b32fdd252cc181c193462fb01421fcac7fe71f5989cdb21a46d8a27939bd814dec1177"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/mr/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/mr/firefox-51.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "d62ab5e147d55ef1b02b4b4fa5b10986f4a8db2c6154d519f4704a6ad4eee99235219b5d825571c8e08128ecac84c1ec0dc19d124c83d608b4afb4606786e474"; + sha512 = "d85c03d1dde8003d7f877585e1bd86bf1cd9c3685fa2a3b25d1a0cbe5496b9cf09aa44940babe42fecbe22ab8a261d585695bb441b2e84f29fe4d9721b494361"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ms/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ms/firefox-51.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "e254c8a787f2dda76cc2929665b261437d35351d6725af6d1dbdcca514638800d199827edc8cfeafd927d4f0f758cd246ac47b9cef3011aa68fb0baaaa17c882"; + sha512 = "9e88c9ca69dcc1acb3509d8197a73af221b38e0154e19a0912743064c1a877e23f9966ca111caadebd0245aba019832720aa7e95ac9bcd41c45852aadf7607e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/nb-NO/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/nb-NO/firefox-51.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "b9e53d23338b7d825e0eebce3764862abacaceb5bb40f66c3d0d67a3fffc2c1f60c168385537bb042bdc45d77453977ca3c95660cbe3a27c7c87b68d047ea782"; + sha512 = "2b59fc05c2bb90cdd1c8841aca920bb9dd2f4ce125384b1cc91279f3e125668e54bbe8e73efab1d3dc018130f9c1188f0ef7d2d0031255bab6bc16b820b53ddd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/nl/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/nl/firefox-51.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "0c8de38bdb5ee3636a7a633c57e9e3445374514014221086b9db106247ca08111c987aca889a416997ed6678cae81d1414636d0fc9ff4e490444041b53cb54d9"; + sha512 = "cdd2c8feacd7e22dab6762289f9fe7b42dd8581adf70df47f5fe1c69083ad369da2daa8964f846787085bf6932abada8c447b15a7b5693cdd32f4c00eecbb3e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/nn-NO/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/nn-NO/firefox-51.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "4617abaa89c7caaf9481aca13e61629619b1b4a889a2ed652434c8c01d5b8ad9ad96de167f9d3687d303a8aca49492d7b6d7712f9497ae017200962cb229f855"; + sha512 = "c902e7ad7024e0e2b1acc5ac3b1006edf1d4abc4213db17da4c92628ee3687051363645829db08fd2776221a3048f8373e3a13c6b02f4f13d81f420c93b03df9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/or/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/or/firefox-51.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "27df7d794fa1693fb79aae60ec72004cdc3fffa9eeb0662e71aeb639e46b6a4c740e08227e5e334e6c0167aab95de6310f3142bcbd3eef089dedd5eeedd29f8e"; + sha512 = "c62a5a2135553015bbbf688bc35fa4ebee02cebb5593f7d31e30f8648bdb715b37161d34ac8310a1a0c0f651c6f336e44a71097c6b09f5cb480b0f0a17e3fff8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pa-IN/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/pa-IN/firefox-51.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "33101ba56588e23bb5cbd66bf8fd90e66e2fa382f4fa6b3b5d9fc6a1372957ff4e01a7a01b697ee694c589573c9a5f1e605f205bb17ac63c5b5faf8545879376"; + sha512 = "d993d5808649dc7367c38aefe9dbd49d3e434784dc515e1203260da6a6d13968971cb63949f1cf9188d5a05467f07b420825ab752e7ef3f556ca37853f841733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pl/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/pl/firefox-51.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "373d3355e980a3dbed1cdf8099ba31e370b270402181e61f6e1a829c2f2d9b7b73a9ebbe074e59f21ac3f934898c9c23adb0a5c09c7637fb6c67c3093bd46fbd"; + sha512 = "e58720685e6e55671c332f916d65ea04301fabb05bc250a56c5aed1f9b1044b333d60ef729e08ca382d775dd35b86d84dd266cd5d5bc0d275f58350a598b7464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pt-BR/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/pt-BR/firefox-51.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "ccd935e398095d3b79e2a86b8181e1aa1988fa6a1e12c879d50457756b62ab3dea3087e8de77c7cd98dead6b0078598d22ead36285559af041254bdb454eafad"; + sha512 = "f26934daddb1f43ef364cb4c97eb9f625a816a2aede791adbfeb3cf959ef1b1c9b75f2e1bdb907be1ea4640956e55ae4facdb67a3323099b12cb23faea0891c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pt-PT/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/pt-PT/firefox-51.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "a8adaa40a2fa564663173641b3dc3d5642c8c3909a8c14904213c9e1cf9bdb4f03dbd44412bed023b02e6eae63bf56fcadfef0907a168879121811bffb9b9ac4"; + sha512 = "ea0657b1966553e286bb7c610adcea89da7d435675cf575ed4858f207092f0eda5dd3e91a5127679aaa3b8a17efcc660c363327f4ea20590a890cc43d2ebd5ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/rm/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/rm/firefox-51.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "ce37bb7d969c0fc31c2bfed7ac143e5a6d7d8035a748c5b3eb9a23dc62917ed9ad9b028a9db0b5dca156eb99cb36c763eee39ca893e5a314233e5bf4ec4dbfee"; + sha512 = "197b212a29f056b22d3cf5c881bc9dc1b2cd8f47ef5e90573975a180743d81e696f5a3a3ddcd414fcff66979c6fa0e33332e5ef5586ce6e0d2f3ae7e939cd9b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ro/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ro/firefox-51.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "339120884b8add14d36fdb3fc3ca1355074b0f8a0a87577d1616c392230342c7361859126edfd959e11ebabc6b86c496b440acea679c61e07df59e7e298c47ae"; + sha512 = "06143af441806517a03a2ba1293316f1b2979cefa8395ed3b9f3579cc6d23da8ecdd219c8cb53f871d544149e0e2f18ffa9387cd57b2407336866775c56dbcf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ru/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ru/firefox-51.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "59ade7f2ef86f412fa376e4fa6a9d7e72cbfabc10e687c7c0bb7e4b4bc2324d7e97e86075c1d7e12480b9f1dd8bffb5e4723f4183882976cd35c4ccf6f2b4726"; + sha512 = "9680dc697f2760163737a443b345c657da6eb2cd6d6bfab5016675815cdc4a4b393f6f9b91277bdbb2962c7cbd5cce3670a633398a5c59d86d45d47072a72b1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/si/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/si/firefox-51.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "4a74944879e40876515e03b1dc2261998bfa2264e074874f886a979de5b48e453c7cbd9a020e8854089b77ca5b5182fe13c685b33991e81c7c533246f87825e4"; + sha512 = "24a870b434a3b58cb93d229f12b58b2316f83e0be6c5e30ff724468116679a90887269af42ffb0080b4bf0866084afdf7767d8d17d3f34a6dd9c30de8de3aa1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sk/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sk/firefox-51.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "b1440e76e19ef3ed6786f9a40330881bff498c7ab20030189c3eaed293e1ffdf991172251da1ac5d512da4897f2a46f3e0921436d86d9178d96387e33e82708c"; + sha512 = "60e5947239a89b616616c1a45375c46463b3a0ff0b2c5d37a4f5eeb6cc8992f21ee5ea87592710a89e1237512179fb84a93f471cbd8e8d7a8dfb506cec39eaac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sl/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sl/firefox-51.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "abd4e6da09005698655e2fb2bb749be35f8b9e8302ba1068e20d27e158c4ae57a0f1cb277a87a2229e4e815cd9d4656ab32cdf0614c01deab572e6c8749d4fb2"; + sha512 = "c3b87002895c5cf12314f7f7c1d784228b50b892eda9c2e94a7630aa5f5bbd35a27963cb008063b53869ff18d6d003deb456ce6506f8a52c5ea11df3b736c312"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/son/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/son/firefox-51.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "17d0444a559c7a5331b93bd314003d84f853fba791efc2df6867becabab9fb7d02bba964d208f44f31af1dfb292cfcbd4de7b48454a7e83668bec26139be40b4"; + sha512 = "14437f5b71bc9902fad66e9d7cd3ce144c1dd19a8bfe1f6ce66f7f456da165cc9453b9f314e67e19fca3516d9b2a03b950befa96c2d36cd96593554eaa8a1aff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sq/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sq/firefox-51.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "c416060454550ff04086aba74173500a41c4e592246eb524e682f082a75173a6752e982993df3ca096c176c0a75ed5f26a22414df5e794a042dbeb2a0de22413"; + sha512 = "286d680dabb398e160a1454513938b46d32ab054136b5682533e41d1fea4d860ee192b7de48b822c17ee0386feb05ee2325fe1f135f82b28e8c98b1ab485be1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sr/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sr/firefox-51.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "f615964e4d87b74dadb841993b3c62d6d683a66ff6ed1634311f58e9c7dc522ed9f2a271a043f7ebaff37f3c1a563d862d7abf22af1015d720979f7459e2ceaa"; + sha512 = "980ade36ef136932d668222af83d8be9180070c210813abd896ccf90cca0149af2f1b634d147dc63d88bc91a4a9b2411ac24ad50632e49281fb704875e537383"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sv-SE/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sv-SE/firefox-51.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "4aab1caa825e685923c7c3a32ecf664e2e8cfc2389f48980f51eddaf696cd9056afd944a950dc60987adbfe977d22fab4c994c3aebe1d14c7514369f6898aa7b"; + sha512 = "95a23a1d149cb95927446fcbc74a6e083b390f1f844d3e783a003f2f7a6699e5f0c72b5090ff9f0cda27df90fb2d1bc34c9c70dca33ef22bd1330e916a1de42d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ta/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ta/firefox-51.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "6e556f182e0652b79c338fb0d7bfc9da9eee5ef5c68115e748013404ba4409dbf743b03f8722b36ace38a8732924bb426e7a7af5059256ae1f0065096e68a661"; + sha512 = "0fff10acf1d6f427ad848ad852395d70b441cb6a1fb4191ed4671dcf4320665bdd6b3bf697b75331650adcea2bcde8bb07b98e6d0c65912b1573bad6509e35a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/te/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/te/firefox-51.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ff201a9e66645e148ec740921a7bb1d1b9ffd4b6200d98d06be0f235e829c6a355be0615341f899b433836fc2f2976223a6e46c4f5172590b5254a26f4998959"; + sha512 = "97fd1e8ce3b2910b99a10bae70b8b2f70abbe7d6306045bdd9b2cda65be070fa2cde5ef950716a22eafb6ac4f841179fe7b982575e8c7ed43e056c8277e5f744"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/th/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/th/firefox-51.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "0e9d0c10f21d3d41825194a3afe21cf4281cbf5825839f908d58821d40358ded4226b5dbe7a094b95aa087769de6179331a19a2fe780b4ee56c74ce137a33ac4"; + sha512 = "9da048c44fc7d219d1c6ee0c1298cf98019b1cb14a552d832cb858063e00e3750c364a0bce93bd89a84156ed5cf0e09d5addf0723baf6e607b6516fe1a2a2c6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/tr/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/tr/firefox-51.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "299f07161a3439902110d8929b5ffdc332562b956d25999235b3e212241d95ce94646ba3542d7138c6ac5bbbe274c614d2f49aca8a674d252b240265397fa48b"; + sha512 = "7e8aad1d86a396de699c103e2ea422fc2740cd9d70128b30280901ec9df9453fcaf60346db8b1cb82c06ae51108176ef8bcdd4278c1050cefbe71a4f29b3a1e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/uk/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/uk/firefox-51.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "f108296c0aee994d558cc422403f45c994d2878b69180d3cf526abe4f5b29d8dc59ed9c58f72a0d21d2550a4d32869b96ae43a1ed251e885bc7abc47b22c3894"; + sha512 = "23be58f1f0f75a89fe5ca96c8322b1d3c60b136f479a23b0b96c62767520aa1f09864d7bfc111e924da6c035b03b1eb3f271aecc5799c3c97b7a928c7c8c4a65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/uz/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/uz/firefox-51.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "293e4d99572a22dc053cdc8f5ac40338eadcbd622ee1d47c2bab9914ee1d2507e89a8b4340a12d64c0c4b37f4ec312bcf94921184402852c2a7cb114da93983f"; + sha512 = "fb1f9f93ca6db9510d00c2dc55745cdce67c1e274a952f678d3377d3b3911b20b7a3649acc49c8ad4ca276ae42900ef6560a7a17bf90f758d67208655b9b203d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/vi/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/vi/firefox-51.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "24355d25ecae3e5f18a0f3c7b87dcec8c18077292329a7ea38e5e9411c38812f394656d79f3fa653a70770ae136b3f5fbd1644a7657f448dfa78f8e795de5afb"; + sha512 = "925aed6825e77fa78453cab5fc1c2e92e91be01c2890f4fc93bf148c0423a37c3b4deadfb96b466f56cdb95ea0a983f0f4bc2cc41fb1926a4659a701c1d7362a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/xh/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/xh/firefox-51.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "0c917bc8cf0a5b66f85cf1511d3fb0b2f4c4bfaa10883d277e6d4bf399b4b359d8ec39c4fcdd6dd23ba3645047318eace530527796b4be58058cb15de69853f4"; + sha512 = "1b4297ae13c799cc43b9420c3c6edc7d92700788e77f6871b939fba18120745ad316919b4f8d18528df8da12dea0896ff5e1d78f8699edc72b6cf1f0357c0b6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/zh-CN/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/zh-CN/firefox-51.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "ceb0d7404aa7d8295920e99ccc77e2da7db6101af92d29dfc3c1f2cb4689b582542d154cbc749ad3b7a744f545ccc39e479db4fbe2c7d18c98bf3bf412eccc46"; + sha512 = "2e9683de094417d96718fb60222d85206b9610123db9bced5905c50da21b42e03133160ad523eeb74df33206e44a6889909dfaa2418b043c5e8024ef871a1502"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/zh-TW/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/zh-TW/firefox-51.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "e942d5d6b8891d062b452f1a083de2849cc69ac45801aee0b5c413a786ce9d67555d94416d65fb6bb6e4b74cf11ae75a1036dfc661b50fda10b95febd86a80a2"; + sha512 = "aa1abf501d2ca6bbe71cea5ab885c85f57b88ee68390bdb5a33047f10dbb4e5d4f3c506ee44c62ca293edd3515e32da70d23027aeae23526cbfb9e16402cd803"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ach/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ach/firefox-51.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "7546a3fb1cd0e06c9f6916c668cedcfa4671bc15a7ece8ed3ad8ebd1bce5c6ac84e2e024d7e2149844f1797d66374bb2c8769e67d1c4af941eb626c610c433f2"; + sha512 = "b01fe99df4dd612bd6e5033782e2dedb5416c7cc9f1de0d659f056371e24340423cd098e7775164c8e605bf895b69a0aae287b131c1533d3175d8ef8b183ae3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/af/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/af/firefox-51.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a6981413d7974e2ca13ffce9fc65c0f69242d6c6bfaa6253fb13fd8fc7e62059df718b4722a7a879dc8e352fd94dcf74db41765dbafc277e8debdd7e35a1242c"; + sha512 = "e42c48a74351afee8e40a791dfa1a20a7a867b4fbf6fbdc9141d4905293646a099c032cb9b52859612d9d16983d11d876bcea0dbc40fa9aa88333345d1d1a788"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/an/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/an/firefox-51.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "e123cd3a8c9c8657f09d198b7f113b84192174b021dd816b82ee4497e307794bda1399e5425456c2d990788340a58831cd261a4c5c67e5b0ea3daa3d0ac65f65"; + sha512 = "06670ef25bea3800b7a5639ac945c99b7ca67183f89425f597e515385b63c803159a0b18dc27805b9e718c4751ef5232ce9b6ba39c16073e35f47e7910e47624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ar/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ar/firefox-51.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "618b9c24d37f4b82b1e51a5ceb5b2d3981c764f906e7959eb346adc5c974e464d4a691e50acdad7f9e0cfa5855afb6157e8ab600d22266a31fa444db9b7886da"; + sha512 = "662cc92061ee62619d4b4f397057ec8142572c74a370be74d75c837e853b97eb17dc798f77e0736f3ca6acd0a4183048e81c5f8a32d57776fa72ab0dfd4f1558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/as/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/as/firefox-51.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "93e53546ca9fc554decc0c1d6590b5b84a433ab392abf9fff9712d4432bfd47a1cc57439fc65ae9be91da6d38dd462fbb81fdd7304424e42d08eeb600d298eab"; + sha512 = "e18f231ea53351d473a0ac4a84abc458fc88eafacc4fac7093657c4b226eef7e52c5b3a4d06616e5556a49929fa79dd68a2f3c1a73e04b9d85ede8ff5b8167c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ast/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ast/firefox-51.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "e1115994008db11f3c69679372a3f07b6edde23dca20733b7f06a5b0c63dad2a264c02e9f94dc74976efbb3961155216111522c3f1ebca91929ae356f8218c87"; + sha512 = "05e174a85606820829b279b2226b6f1d2b0f24f6c0b73162b3eaa5955270be8db38c5512aa33c51b0a5df1db304537df5975f061029963eefb5eb06c0174b9b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/az/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/az/firefox-51.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "93be21a2a79d2f4cb2fb5132856837b1ac8d44c699faf623d076b95b5e61126ea540bcabbf57e2752b49cc7b5116f3345a2a78cd07104d873afc2e2127f64224"; + sha512 = "b8fc2bf0d78e511b6c97a731742eb5d36a1ed74f4f6f5a58c8f6652d507b99a51dd6036654d0954488055caeb449be235d006377c3e376b7a650cd14f92945dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/be/firefox-50.1.0.tar.bz2"; - locale = "be"; - arch = "linux-i686"; - sha512 = "ca41cbbe732e8e754cdb0c832ca7820d5320a8106bbb3e5d753f4a7f6eb30045b81cd84191f868076e0edca68e35b344d63ececa45eabff7102fe82c1ca19e61"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/bg/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/bg/firefox-51.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "4e0a3ff42a8502e07afca92ff98ae675213527e68c3907b177e53a580e0391c075a41ba4e5b87c27558f86b28c1abe2dcae191334c737d37bdbbfb25c33d0024"; + sha512 = "e10684f0a0f841cbce17a6dba5aacf780fa0c3226f0638d48a29ecd5c22f21b0b882623be6269edba707394f92a581e8719a78dcf28e31505654557add711049"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/bn-BD/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/bn-BD/firefox-51.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "602cffffa7ebf0f53f3e466d3aa5d8f203698db16089e83c893092e9a0841a9a8ec6a46aa5df1e2fec020cd8a7345e4fe86fc20797ad65bcca56bb2f391390ef"; + sha512 = "a5bc927ef7615543b6ad8afa5b61ac08570be96ac0806c8330150ea9bd7e8dbcbc7c51a79bef45c865a05cfb776898435730954ba5b4d336063e0be4880b699c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/bn-IN/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/bn-IN/firefox-51.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "2f7ab4b093b8be7dfdbdcf2faad88eb99e8b0e19ebc17efba44d46a332754fcf16e9317398e88c8eea73680ac85f08d2f0a99768fad160d79102e8e1fd6fb8f2"; + sha512 = "72d23cf99c23a4ba414469e823ff0b30947f37f0aeeaa857ab09b22fddb6b224a18f3c3a796288030a1a9ef03f9bf14faf7292e58682e75c5ddb1981a47c8171"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/br/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/br/firefox-51.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "abc0fb371ae3144fcb3a5130b13c376169d8a3c3051493fb5fece9a4682757c42bf4717b6494d4220daebc3f1560397f1263706e2a3871d7ee5c0135cdfbe1a5"; + sha512 = "cd5111cd1831c7d7f0498cca21a78f225b9a403cc7e791e0903c88012b6ba31c95b726e8f9df644791350b12a8df5a1d431331a75eb76c8c529935d6447797a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/bs/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/bs/firefox-51.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "f62657ff653edae873269a4113a93dadbbb36920e9e30ff04407d28f755bc04e35223031a60018e69cd4c3b891511109b66e7baa83656b0ac37ef5e334f3a89b"; + sha512 = "0871b142576517d4dc2ec2a24322bd8cdc5206356f71ddfb3c71832a9f5e825b2c38471287f2b2e3a699b2331b088dab1291535b66bbd52805ae1dd78f64315f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ca/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ca/firefox-51.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "bcc4184d882075eb2ea875c7493ca4f276796672a029ab161b4f2168e879b46a6fef454e04e53531a32ed5bf82178d8d2ef15f9e43679625e4f7632e7cf51f32"; + sha512 = "4477a8b0650e39a27035913a956acb952f70f0a7c557ee2b97380b195296db4e2af03d08ea6ddf9d1aab699686375db06074796cb16d71807bca0afaa993840d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/cak/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/cak/firefox-51.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "88448d8c17235e318628bed05d607f30ab9db4e05f181a36e39c02f2df840a10990a534d5d5f8e16fdaeecfbf3e51bc7cd9f45b8a84b3447132bb57a87c4e2d3"; + sha512 = "e0cf154538d8580faafeea44494df16995605eae0f7afb97ebad219f4371de3d92127a05dfcc227eeb3cc161a7013f71e45848c41919e3a1ab918521c6e7bc32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/cs/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/cs/firefox-51.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "acb9fe18d8a5fe97cdeeea24e8a6e56895a3be16c6a5f2099a69c32768e2f76a2c0fd081d3759a2c87d002ea5021dcc5f806195d3bed06e8514c383ee8bf998f"; + sha512 = "f6d94786b8068452de617afbfb19d662defc0c00ec412e84ed0fc58ac0510f3b9b98cbe0e26ef98b2fee41d794b46cfbfd307373a04a71a0dbccb49fa29ea916"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/cy/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/cy/firefox-51.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "89119e29496981f8ebc85d512e5d58d8bd3678cc8ea4c90e544bde60881cf5f768b4060d710f8ba4d61dfbd7299a4437f5e7aab1140a03cd498af18c480e0b4b"; + sha512 = "a794ee2a28402fa0f671b727b16840a8cdf6152e44ff9b0c9bee7bf121a955e570f8d643ae9688db385850e6abd1b9f47574922ad0b3184772184e50370ac788"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/da/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/da/firefox-51.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "285363c04cb6506400077f36867a65372fae80ca6b3fbed88be219c3814d3f38a650c78f36014ae205ba9e5167b5291353c799b918c8e2bca6f23374094db209"; + sha512 = "895da18fcfb79737dcfeac111be8a867df75473cc3efa65c81511b9f10a8b1b7373005e42ebafbad9e1f9bb6b1cae23034e66b012cd766c1d0826ac3c919b1a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/de/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/de/firefox-51.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "ea470ab934f49ff79b8cb04809f5605edb70d3ea9bc997c01802f09e3fbc8d045bb322b97b729916b6371b047f3b4ac14b25dca8e8befea401362c2024a2fa13"; + sha512 = "d212a73bcb4ce90982058e942ec08dbd4054149755dd1cb8f963984b5ad5e7a0c5847760fde105510476f2cea2cb1dca4ccde78a21e9a5769e605e61162505a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/dsb/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/dsb/firefox-51.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "74bb1ab27970819fd9a368ac5f9a14add5378d9a7c39707e12146ae8082f39593ea53b5dd730708764515b0177d7ddb675b04a8a75f259303d30f281b44527cd"; + sha512 = "bbbec4179f5ccd5569c0442deaa23015ea9b21a91eccc150838659d399608124ed34b4c57716c1386504e3b74088df705cb4807bf1a12e29b8bc22c5ed15907c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/el/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/el/firefox-51.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "3d3eb83a16c94eaa0bcb8627239b74c0a261189b67b917d4e2fa9ac538ea353a998b691350797470ab8ab4a5effc65a35a36e4b3d372895bd691c63d439a4c9f"; + sha512 = "f73864a004d1f1bc5460a30ca60f589e7a98d0017b299376e0166ba9bb64b1af6b1523739133c1651945345228130c53bb13c9e9a846afef363a74a9eaf780c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/en-GB/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/en-GB/firefox-51.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "23a75b31d461ebb0a3960c6235b6c77471f3687e76f154c8d1fc8cce40ba571a9699e19a5310faa55c52b243e6fd88ec76ccbcb93dfa8b3521493805ca852d57"; + sha512 = "e7e547490b3dd9ed8260c18077e056beab6d523323c51230200a9f1e019fbb8f691e4ad42d936aca546367434d1fe901eb00c1bb16663e47dd8c6f40f0793589"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/en-US/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/en-US/firefox-51.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "b1667f7c235b3fdbd3a2c3ee6ddd7976b4142983393b0b8e0443896cd0929d7a43ca484ba5922340410fa3c4868f555a4ab581c9664281a31b912c1922a1dce5"; + sha512 = "cf81bd8ea9a98bef6a4ba99e1ed1058bf9cecd2f43bbac310bee8226409512cde220b6a891421adb7166eac83715cbe7e8b41aa96a7ab1cb4d0d8d8a0f15dcbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/en-ZA/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/en-ZA/firefox-51.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "78238141da05b61b797440a04973187bbfb4d3cff7830385e163e8ccaa603368910be89ee7f2f4e65a47a6917835dff8f840a77a507c3ff0242baaf1b7cfb4f4"; + sha512 = "853dd3491519ad29536f0ec078aa2f1ab73f4e436aaf9f367a8ad74188818575016292b0b3b1f9da2e94f6b6caeacfc1fc64460d4f7360be63840e45c82361b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/eo/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/eo/firefox-51.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "af424d87210909ad480823d56f20327b0e7879bb0ce7ab43994870a69e6e91b3181e480dcc2610064f276ccfccb71badca135f3d8e00ff16947c220dfe67ee82"; + sha512 = "dd8be779d5bc57be841580a891cb22a2b0743f9cdcd014a6d2e7b430663c74b0d8553571eab972b902dfd5e2f5c19bd9caf6e6d82499595cb7e97ca57580be22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/es-AR/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/es-AR/firefox-51.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "cca38288b4ef6de4c7469cdcbd7cc29715993ca69c39febb877691b2368182a0efbb0111b45bb5a7ddf47b7c70f20638bc6dc7d6fcd46f8d8127d36bc29da3e3"; + sha512 = "7c8928c448295799e73dcdd2c762f52c4c239d09f16c83dbfd1ed1e3f7910144fa41a7d58fa721418d6ed6e6e6f7973de417af67b9dcd68f1db9d32e31d59b93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/es-CL/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/es-CL/firefox-51.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "104a3fa6bdf86e0e70c54bfdd8c0d388a8e91a9bae0ef973fc043247907295cc5f53c44f414fe8cd6e2f17a02eae14e366fa8c11ccbb45df2055813b17fd7712"; + sha512 = "58ddc5c2020191308d4a6ae23fe2f948592574bb5546a479d7fbfb0e3ace2e9bfbf53a0c26b2bee91e214d2284e8f1c38037b26bfc932c62c5d34dd11e24a84d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/es-ES/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/es-ES/firefox-51.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "be847e51e78991ac739bc32fb29cc0cc166f12f02b5ada4d4656d3447379eb9cd10f80391433607fb63e971d54a48591d60baa5cb963421f1934033e08525d7a"; + sha512 = "2aa9e83b82b23e7360cfe1aa8e70131ddd3ec32271ce951fe50aaefa1b45d083c01dfcbd2581dc2377cfca127c16d79f818e1ee09a858f6b0138574a5b8b6b33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/es-MX/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/es-MX/firefox-51.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "7a7464de3223e9cf1cd0f6b7767ea0fb7ee8db0b3b2c3eb9d284cd5ee8db77b9b0ec3c604625c8c6ffffc41bbac4ea47543c1508f7f8aadbaaeb9954b7e62247"; + sha512 = "689d87ac2ea33dadb20cf6b44426a63e5f058e899c29121caf2d83cf37b13de572e9c32c9e483dedb56f7de198c1745f7e5cab85988399e6790fdf337d85d2e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/et/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/et/firefox-51.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "907612ce5691ec5e4647e943ed58d437db872551da8490af3e5f7af44e7d9ac78a8c5eaf721f719af782c8b202aa24ee6a87640e54323b5eb823dbee39b2903b"; + sha512 = "18382e5c6cff469357ea010653665d03a7e9ff9588aa2d6657b98c09ae7f30c2c04c1507475596635843f222419f5caffcd95556eb9b4176ad8d60bf7c5d7f68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/eu/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/eu/firefox-51.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "29c76a0f49d87d162749f824e287f2c1b37cab465cdd5e5e991ce429273d492fc905772c25f4c812c6fb899249a9bb7346eefc91af9f642b4acdc70d3af6f338"; + sha512 = "5e5464dbfed7e91a087c7b67d715060ff97e24c83b99a68439b823992cd93bbdf994a2977a187761f92d911b19b5f53ce473628a45a8ea160c65bdab3f51c300"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/fa/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/fa/firefox-51.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "0deec5372d5876861af20a60d8db9d4c5aaef8c133c81bc3af6d85d2de528f96ae1da7f5fc78a9bf34bf06d9121fdb6d74e28ad40ae2b7fc23b4a0c161e09722"; + sha512 = "34242b1cf86c83920947862561ceff073f818389164f05e88cab01d8949bba2b30a43e212be1bb71e2bb9a2498bd6ab604c52fa169d31b96864c07b747e4e5de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ff/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ff/firefox-51.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "07c87801154ce44d37b1a477850bf9568651beabb4004d7cfe427c0ecf75fc85da91cffbbd60af773c8b3b7cd30e10937c9ff2fcf65409faf2dd194694d9b6c1"; + sha512 = "ee83ecc78c8b3c7c304971110df8fc9402e67ddcaa8d38bc6a7d0471f3122cbab2a69b578ed85b0d58b0f67bf5e775696e18685e706aacf5787b0d24931df517"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/fi/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/fi/firefox-51.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "310b71c8e46fd7ab3127cfc0743c1d98ede8adbfd01a645089cb6e5752e8ff4e3da9f8f47ab5fd7d06284b3fd76b9780d60c2898d0868e30a76dcebf35c24b05"; + sha512 = "9eac668caa56dd7d819e388d994caa8633d18828e9ce469d0044b90e260a2fcf9b056c5d43274e6392830fa48420b6f3718988e88db70f2820ded2ed6b4527b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/fr/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/fr/firefox-51.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "1bc1e595f12d04067b9985be57fe4ec17de89069e4d6b780c16231c4ea195fa0cd8e6daece265335fa56ac3dae9d94c3b76f93199cf1e0946f6d6ac75bd01a1a"; + sha512 = "9abb5cac7ee05039c374444f7c03604df1b3a79055b1afb42550765ac3f337dcee93cb30f2076697149f560d3d0de4840304259dc9c79325ea04d5585432c1e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/fy-NL/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/fy-NL/firefox-51.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "d07b171d615306c6de663f4592450dea92cd7298e6994ea7fb5d55f01f260c2b66d1b4bc4109f44c3d007107c78feccaa6540ddb14dc8666e0192ff3978d8f5f"; + sha512 = "197d3aa8d9954f4bc6a3a318869310bcd4745b9c611c6df421c0c3f8bbacca48c7118322990a650e00104a429f16cc0eaa81fb56b68c4dca957b14cf2e2746c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ga-IE/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ga-IE/firefox-51.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "1c234083d098c52a7597dd727c246ea6dfc177edd1e4fc021ad5868ce9082353036d78b9297503a5eb14dc8d500a7a2549d771ea2d3c849817ab791329925d25"; + sha512 = "b26159956597932d413e40789e8eda3191cd2e2581e22a4c450bf6a901dd3c40e330fd486a401fed5f2bd94d3affe4763debb118d524aa31d1ff7d1676e02c2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/gd/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/gd/firefox-51.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "0e88344c58c1b2e63b765949db63ed9e874b23e382f9fe833206cadde1d6c32d804d68a22f17741cc7964773858fa7adb6a6a42e7ed56dad54f2d7d0a71dce08"; + sha512 = "38623b6b077c5cee3f4f39bdad198d2a7453a851547a966fc211f4194bff6fee47e7e6022a7600726109fd7043b83ff37275958a1fccb863f57c4e60d175997e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/gl/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/gl/firefox-51.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "244cf85b95f4a1eed0369f4f41ba870f4a3fd48fd85979b005ffc19ab4c03e52da87ae8687f5e3048c33599baab46fa8ed8274db5b180936076fd63e02b955b2"; + sha512 = "d9a4287c5c5c28c15d6ac3913ea8cd51b88701ee0c5c091a9127e753d5417eefa7d10bdd159ba63204111ad032498bf80b4c944a194d60a14343db4ee1770d56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/gn/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/gn/firefox-51.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "20d51aefbc2f98f83fafd23a5800840d1bce7f0688f76d0ef322b2f1dfe44e75fd82c39fef23cc9afb15faa41514f29f8313748a2e969e2051b3824962de6e56"; + sha512 = "f8ad4718fe88e594eca07cd8ceabd19a51cffb17337eead004b9871f7576fbea35cd5a51434b4225e831f4a76c4fb47f1669936d4ded0953160e978f07e3e6ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/gu-IN/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/gu-IN/firefox-51.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "b07adecbbf8aaa8dce8e7d8e03b86d5ce3bb97646404433d89d82832e692efeb532df86a5a4276dcf1f63c705507e0d87f3d72440c49e5d70c9a08968f75fbe7"; + sha512 = "0cd44e6375a7c11826428a7d13e9b59e73075452806f6f2d8d1e20cd9d32c36e4de684c511544aaf9845ddb6320f8f72657a9f56cae2ab10cc880428bcc55048"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/he/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/he/firefox-51.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "a6d9a10704ad4097af79ee05aae504a9a6ff109192241cd99c3be665f0adaffa6e5b7b39da859d61d9294cf899a5496ce0c82ac4012a318ad4aa96d6418f380f"; + sha512 = "963562443976aa856b5d7e389d057c8bf17bb6045d5f763f5e3f46c500c5f6877d046bebb5515c726bb652b986bde4189fad3c84bc6b8812c7ab6aa47b629d8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/hi-IN/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hi-IN/firefox-51.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "6d78b83b289abf37267b08c72c3b3c42005ddc2f2b13c846012f342b16a3bbf9a891fcd6e24af01160d1749c1b7e76a9f62060970d52144405e4162d4c6297e1"; + sha512 = "2ea7bdbf502a950863574bf3502df03a6d2ce8128934f52aa33f2f1d41d41320a0eb0da6b51d0fffe8ffda1ab7dccf72fc904230f2b3f11b82421f55e494a4a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/hr/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hr/firefox-51.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "e70daf40c8a0885c344a01d1cde03b34af23a2d9c76450f0723cc5ec1b577251dfbb8bfacd3eba866953c5b3dcd2974456305a9e171025cfbd43416f679f1cc4"; + sha512 = "f7f865feab6b90082a59b2d1cf4d5f73380baecdbdda5eabffab3926747c83f3668a5feb4a792e35b56ae47e2c690b2f97b23662f2d5868f6e7be4ec4828f43e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/hsb/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hsb/firefox-51.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "8c137a61cb020dbfb1d73a698d76c4921c9a1dff5f836185caba29c22c81c7c0683cb4139b0642d4bf408e01d498de46022c36de78a3c0413eae048f2be69e72"; + sha512 = "5aefabeef739ce224cc4d1d3a83f9cca3a5626cb6a3d0026ecf068e5b4283bc16735107f78d5b4ca3748e56489a0463701f1ddc021772f3d3b97ea04254a7d4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/hu/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hu/firefox-51.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "1630ad84eff835e1f56e424000515e37d52a268ce569ea12fe5abb8afde231f2aee2293046ee8aeb338ccd81ec98c92246f4b62e000ece032349eedb2ca3bb82"; + sha512 = "fe1c8538d5df66ddf27b2e8e4b2e01fffdba689103371bd5a58f0ed6fe08f704438c440277272a5eeb2c261e51cd6b81d92fc28c23fbd78f87afef3564656199"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/hy-AM/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hy-AM/firefox-51.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "dc2359753972d1eac82bc357461331d69e52bde41736ab5c4bd590491add2b592bd3e4f15f32db94922afee84af04500928ece6be14071b10ad1fc4c8b82314b"; + sha512 = "8ed0da0f6df8d2c6ef65f58fc06a25ea1d96b6c69161600b104772c61ddaa3d7a572b9e971e616a6870f57668bdea326b59bdcd968ffcff5485bf8e7399a60aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/id/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/id/firefox-51.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "61717f0c508b61b874080e21f7cf22283b1d123e2301490af409c710ee612ee8e0e7709f3bee20891c0a76b3b2de05b4ba94885d1b3813e6612a1dd1f871d34c"; + sha512 = "6f90d870f2964e76b394ba419479f87ad30c0b7677b37305592e028f1611690fa59fe50f32bae694bd30854d8d0cb36c1dd0ff5cb04e3e8d0a3caa779797f734"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/is/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/is/firefox-51.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "57d649dd96889b533c336078b4d2380a8417a1f77e40379d51a80518ffe2024a303c2b9c42861436425098cbf2e328264972b82039b9fe13054ae3d33a93e737"; + sha512 = "68559b8cc00c5d0ec92e274e30a10bcacf5c87096617e0a7a0ce30e495482ffd5f2b4f4bc9f61e0f5d41aba722ae2ee12d9a17e2124199717720bd6e4d1a4874"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/it/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/it/firefox-51.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "b8bb4e379f4e21bdea2190695b0f74c23b72af5c6149e8790a433c09cbe3ee170fc68a375b71ea112d15eb00b948b6c30466fe382f86e8c5da85ea7479b355ed"; + sha512 = "3bbbdeae057aafe87b9b7c7c99b67de5c4a2642569570cba9456d680f726a5bace48d785f6871d1731375d0d92084bf30fc60a390dddbd410573f9ffc9c81fce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ja/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ja/firefox-51.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "287d4ba06988e7a6022fead8af2d921fb761222cd0cbaacb7136c44e397b4620a6129f59f97d98d8a992caaf203e7c8fc130aa4e5e9c58b13a2700f63d786497"; + sha512 = "38dbf45822d7d2cabe38f3d0b36a5c0dc93436d42554fc9802c9f69f34241553fc95256edaeb410c9eb16e640e1ba09fd3f6cef48c507660234a892ee1abef43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/kk/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ka/firefox-51.0.1.tar.bz2"; + locale = "ka"; + arch = "linux-i686"; + sha512 = "d49b3024a54f3ff2ee08b5e9a416b4e3b5ff0a69407d34b8b66a165cd5c9d167adee6cc7107a611a250bbabbf90b798d152d049bcb5c6d59846098035a081afa"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/kab/firefox-51.0.1.tar.bz2"; + locale = "kab"; + arch = "linux-i686"; + sha512 = "6baebe38ecb1412b464702e6ab5d2d46166fc3e4ccaa4e4fb3f012ef5049146136a0eec94849148800d4fc4a1f803caec9fe9ae60b330fd4d97662a61d9bb1a0"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/kk/firefox-51.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "f96a9b418849234b41d181ad141dbb030a8b2f26e73944694c5a805a21778d708862df988dda8ab8fe28eca0aa342153db84d6af971461f0eb8072590445ac15"; + sha512 = "8300f42545782543318c789f4537bcf12a4e1a1674ed34e11ad3ebc2583aa944ba4f7fb9a92268d36f4c95f4ab06d8b79bb6cf3bd859edbb98c0fc5bc2ac1891"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/km/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/km/firefox-51.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "63af9259f4326d4dc356513203646712f26dd992d2150d58c4f1892d76f0a3944063dbfec0db68f67d20538aea3247313357e5a822e0a8507bfad2a7209067d4"; + sha512 = "8352dc1b0eee5476bc40ba81bd7e387bb36b781df823e900bff4cffa2fce5295aec05aaefe01e24640d3ca015d83d320e95caed91539504f71b2c4591ea9707a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/kn/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/kn/firefox-51.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "afa965fd87ca7dcf5217011cf0aa53d89e1656d64cb8ad973a149eed3897eb577bdbe3359a5310bf9e11dc6e927883c08fb7ef069756313dfc75850378ae7820"; + sha512 = "0767e6bbcd9db184206dbd8d6a8519bee3824451ef1f856608ebf6eb6bfff0266b3f4f680d47fccbe5e86f4b14d8243354f3ca8683d6741d76aa8fa77621e10e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ko/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ko/firefox-51.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "724726e85066350ba9fb0254462b198e198c20970664737c925ca41a474ac4070d2e746b671e8583339fb1935e9a05d6191856f5abaa6e23413efdb707d34d19"; + sha512 = "f9b18473ffddd1f9d9f63d29ce7ba7fbaddf195d57e791a7c2a03e634714b2dc2f811730d9ad1534f2bb6271a79522f32f1e88d365b664df54146db9366f6911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/lij/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/lij/firefox-51.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "e17504c60dcf3eea34c9525b3ca537656fabf90a7d888284cd5ac014a939565ba50e8b3d0fd1c936dd5be1ac59ee9f61e2de22b5b1eaeb12fca0f59a094a06eb"; + sha512 = "b72a26fc384860a17bd81f075b7080129711fc9b640b5c332958ece8c47540d2b3ca41c46f35999afdacb15e4f7928b2ba943ae10ed1ea3863a7222f30329756"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/lt/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/lt/firefox-51.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "00689c1e19f748e5676ea3b8ed0076f6a63698c57b171eb771d45e9d9ba5bcf359eeb827f5791c96ca6a31eb9ca166208fc63b4a211676b466656e537323719d"; + sha512 = "2b8e656a402b935c640a17db9d3907bb99498180d36fc0b8f2eab2a007fea9d0dddd7283292f549aead49c6ec2c926eeba728e03975905adfc561f159eae5e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/lv/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/lv/firefox-51.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "1218ec478e28229f0ef8d5a7a669ed6f69722602f75185c4817a9870b35b6955f87f004317bb32cdada379075115c12ad92f73f74818c182a480393961a85bf4"; + sha512 = "b571c834c1181c5ba2685c8ae77165cc0dad5a60d45717d2fe9e2528814b2352748295a0817fc127057a1403bd5ee2c154d8eb2d876d3ac428638562c19fa3f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/mai/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/mai/firefox-51.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "6fe97505743b8aa14b9bb3be57077c9da14c2049b2d0d455fc2b777b09bc42924f04c781073188fcdb3130bd5d1cba2cbc5c2ebd04fecc7e73ddb8f20f61c716"; + sha512 = "1f703f3f3456d6fdb69f6702a8c7b8e069387862b99e09d9e85ba0d34d35f5ce30bca8268d1332930f55a9d7e614ae77afbfdae5caec7c1fbbc7abb8c9898710"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/mk/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/mk/firefox-51.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "e0bbe68d53a08df8e2ac46b9b51567f69fcd11b03d19b6e84f86ca9f255c0920f89b011df5fd4ff300cb3fda65470fc15ad779757421eea2b3b6db6bc7ae9c1d"; + sha512 = "526b2b8709942a6c3d071c39b03625e90aba2e298b89934c3623dd61bc0beb8680729ef8f716375abb0d487507eafe885407a995f3d4365cdaea8b2d0fb55070"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ml/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ml/firefox-51.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "0e6560b60dc8c0fa309c3a73c1aa3331aec82556e3ee5eec9014d8787c9a5f8311049fc7939ec69569abf689e349be08bce040bfab8bd2ee3ac0042753ce2860"; + sha512 = "0c36352abe8088a2d0fe151e6e7d39273dafc370e1222e8251859f99b89baa8782bf108cd97c2df7dc22fc1231c6cac5409a3c0bcdb1a849c7f894732bebf78a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/mr/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/mr/firefox-51.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "cc31171f3ee669fb47dfe4e416c84ed58125b1a4787a92588c3650a2062e4e7fed28f2cc5c784fcf1d804c64fb335c2e16340d46f2d879b73e4465f8c662350a"; + sha512 = "ba013b86e7b16f1d90b1e6328ef9932e3fed6b6e9f2961944ff4a3a00afd0d0c94f9db1b25c54191b50b798bad9e5f740c2b63e094077df562d39634074d1b01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ms/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ms/firefox-51.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "12d3bfa0c956b342604a043beefadbe5bff639fbe4b12614832ca36ac11a4046987f3be34dfeb5d3dbb4e9c1d8533645a8d78c3413f9730a72ae952bb07fd703"; + sha512 = "a5df3ab9feaaaf459f545154a0f30dafb384febc269e701974e221a6a33e2701777141b7ca15624eeae009e984f4e813d134823ba733955d2deaeccfb1add161"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/nb-NO/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/nb-NO/firefox-51.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b144e104f01a075bd0d107f77af39664323eed78987ebc78a7a2917b86d83c2d6ff3bb35b6c5230e27c8164246fb32defea91e5b84672e20f5071e0d52456726"; + sha512 = "81e16991c9e68b8fffc47eda12c1858879781a1e512a244cdb5ea202ed4abc8366b587433568b1d31a943520bbf56416b62bd00a52a2db313de619f037f5e87e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/nl/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/nl/firefox-51.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "da466f3dc573096be1d55bdb03f926f0b94ee2ad8e326a3fdc29d519d00f5c0c9166b85c0c8c191d1ca7c992b05b68abff5f33882e52e43be3015a35333be3d8"; + sha512 = "31bc837dd0a974e51712f0e3be8fbd114ebb285d34329a4282d9d41c4927bb031738958997ba77f8ec5ecff09342d2c2dbc13bc8161e8d54d331c55e7df3684c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/nn-NO/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/nn-NO/firefox-51.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "85f83572953a0b54805b22f3a21cea70343092912c3b988f8408ac1df1931dda52a8686c32cdd7c91e776a17af0a390d6394b22fdf46ae1205a01499f390dc5a"; + sha512 = "361730a873a3912a10437eb3f766fde1a79f2a8f9f2302e6515fb5fdc34d615fea07a225f9ef25314d4cba2b83b35f9fceda7dbdb31433ebe9cacc2dbcc4794d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/or/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/or/firefox-51.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "1a0b08aa675bfe8b26675f1eac53389f34d02b0c28287d1a73e663ce5d747efd0bc4db5f0f29e3e864c99447e759fdf35ff573235a7ac9b815fe8b749f0a0e88"; + sha512 = "cbdc0f8f11194bec2894daa29d92ac6c644ba55a6921315d3e30c560d761c226c0673a35c98e19e31afda3992583ce14ecb51ced97077a6a52196f30da7c127d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/pa-IN/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/pa-IN/firefox-51.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "ee9c1c9cc27cd8470cee9a1600951274f9a663e4562cacf7452426c562815f393b726402b1356f9a60095e85278030d64f35cb1fdadd5c8cd11d6917f9c70d60"; + sha512 = "21819c58f4c7e9f98f714e6392283bb2e5aedc3866a5f7360535050d75f8b54b527593af4b0004accce95459545c176cbbefb09199be15e088123556e378c5b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/pl/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/pl/firefox-51.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "a326d11cb0df567ad13e6d543426c0a28d9158f7d8f0f519b208bddad26145e3eee6350dfb54735cfc05d656ed40b022fa132991a91f1de78eb36ee4f7333fcc"; + sha512 = "293090773a416b8282e8eda9904646390a0b17215a156cb63bee043bf68e69a28656ab880f9c825c280deea9b6c9e13ae55e08284f540c7b50d7b7844c5989f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/pt-BR/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/pt-BR/firefox-51.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "cb99dec511614bfdccf43b06e4babd28dbe0dfac464147aadccbf69bdedf3a093e625e4fcdfe0cf8db867b5854ce4c3c5d399a6e9ba932a9fd8574928962360c"; + sha512 = "ce58560445849eb90798150ebe4ffe6bad23a6cf2bdffe1688b1e0e8da01c088334604a2d32ed9317ba63f9064f4a3ba406a282cf74ca64bbb5abfb0a6c37f6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/pt-PT/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/pt-PT/firefox-51.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "2c4215b8bd5ee9ff78fdfda763c5506fb6a3c7056c9b4494d89f77ff4255c86617f4102f36bf534c0e3ff24ed27ef4a0853d24578bb39ae0a04f741422e6eba3"; + sha512 = "04f86eb4d434190f313a76a3b366c35cd132930ec5fbcdf6f5bafacbaa7433cb161c278ee28a120dcdb0ea70cd9d2a36cb5fd52d45b6811bf748bde11dc43398"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/rm/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/rm/firefox-51.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "470b3ce93cd25c24c0c9a1581da7a48c101d7a93764423073b1934dbeb5a0fc401150009a622feba1f2f799501fb03e0af79a308c4fef08ac942c5adcaaf0d91"; + sha512 = "0e1307cae4e83a0c0b883c8b84c623ccdf5f91b2d39097eb4ba86db7cbca70982c9ddf76b7036ce5dc574fbec0f02ccede1bf5ff28e2a53c4afcecab33c0073b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ro/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ro/firefox-51.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "7cfaa6b7b2dbe4dadc464591ffbb508e66b724eba76b6fa8e9547ef1092f1aa51f1846e9392a8531c7ba24aedb4ba49e7a2e0c1f41a0b97e6dbacdf1d6c34c75"; + sha512 = "cb93e5a9ba39abab21069206a6267d87773177cda7d5966dfe76cf2a6ea83a00348a7f4b1aadfa890585874a9b2cc2e27cbaba73037f4026a56f7790ce0b7df4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ru/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ru/firefox-51.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "5915a55e881a57797a67d59b4ae9fd95da8bcc4caaa1ad7decb78a6de7a5da7ff35139ff33f7e4ed171615ba9c25ab7df43677a58cecbee530eed25d8a7cc8ca"; + sha512 = "3972def5e0d34011e33476306d748e6e8936bedd3a3a4746c21a572bbf1dc71db364b5b4f83506d677d9d148dfe49aefeb56bff91e4943910348e7ec58c791ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/si/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/si/firefox-51.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "a1702939f705a7c2b3b66efdd6dc27a4320ed019dcd62b59da67ef3f078be0afab91ee5158e67cb62691b1a4a002783f807d6133885bd0ac9bb05401268d5f24"; + sha512 = "216f65d5f9ec399cb4317123d4fe9186c3caa1c403df16acf86d1987c356c32db809155bc3d9904c7396951a09b8398e402bb93d269372c924da7e690a7569d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/sk/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sk/firefox-51.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "43b72dd5ebcb1524c5b633cbfb73eed21aaf466227f29f4ffdd93f1c49dcc2295a38b57b3ce072c40da72184e1fb954a9097ea6d6d6df6807dfc5d04ff48b327"; + sha512 = "a23944d43660d5d151b8fa618303aa5cc673eec16868ceb3b1b1c7e197f6a707cc511f63ea07263fabf20ec75d630dd699f0ec8cb2c5fc53d1642b35c90b4e2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/sl/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sl/firefox-51.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "24840e76f00d6a07de581d06050f924018ae2613a6e4cba993073859dd05007b6c97a7d518a6c4b111740945357621c7325c4cd7f45adddceea270e08c1a09c3"; + sha512 = "ff3bd653e64c26f387c231687d4f26502ba284138596bb1f5f75549476270be712242c42be07902faed80bc327bba49f2be37db3ffa5258a9c944c3408461cb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/son/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/son/firefox-51.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "004f8732e194d9c1972390d0ce0d04f9e8f91583676fa5d65bcfb1ee58a6b52db5176ce8a281a3ac94391b43aa637ed157128950e589a0f0a354622da6f04132"; + sha512 = "adfcae5aa31e9c153b53234c9c10ff51927b8785e0952c233aff08a3de800d7b0076c9304368a0ffd52ef91b9aab1dd0718a5228c28300b03fac69edfebba0dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/sq/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sq/firefox-51.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "3dead0e008b4255585d22dacb6fa0aec125da6581b7ef4b1ccc6697e03a5afacd14d340bd8eb7bc0b38478bc6ca20f09364e9180313ceedf1853739ee181d125"; + sha512 = "32f039f1f05771766d0413d0ed9a526c5cb21a0ebf5688ed577afa73e39d482cbec87878c8acd2ddf56e048992ef0c37725a6209d89add9fab72c48bcf135553"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/sr/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sr/firefox-51.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "cdbf5fa9d085829828f5a395114c3efae9b82e77e34aa69b622e611de8aaf54c525ad12ca445190ba5cc9c22d979be902e4f1f6e6a746b5f97570326cd90009b"; + sha512 = "22a0ec9854a80f0ca6aeaf8baa98d72d0781b6e67af899701686a8b4def205b90d9b9084a2d0b160b690d4fbfc6eb55c6bb6cfaffe9f1e394b484f264fade306"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/sv-SE/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sv-SE/firefox-51.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "ef8a625973d0286799e2a9ea3a5a10078d912a65521be8f935ec6eb207ba53942ec5d0e0c4c5c013ea2705307dafda12294fdf708dca35f72d5ba3eb48733238"; + sha512 = "3f1204d3b069dbfcfac753ec72ca7265008f2543c14455fec81f4cab1cacb815c1529e7c9b50672552acf6855c2de81645428bb5ae43d514d2aeab3c750159d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ta/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ta/firefox-51.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "64652e5c68680f1ab15bdb5ec6487387789bd4b1a1537daa215094e57156fd4a1272311d8084435994151aff5e7ddffb16b93c2048989d9c2dc455f98d072b06"; + sha512 = "4f32b734fd4e4cfa1f031516176ba82b9128cf7f9577eef1b5243aaf20dc719697c86330fe58feb54aa650109fd33a97ce3e6c0d5639ca7a40d90208a0a195f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/te/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/te/firefox-51.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "e516ee1f536dd98ab95a9a621cf4634f1ac70a3b5952cd8c6498890536b1630b362ebda8e69577eda4c0a6224f1a9cbf19453e5709dbca467e37597016eb5fe3"; + sha512 = "55cc6c548a2f0a89ecbced9aa9903089d04771d97e71f99ca943f73c489e8f3dd0fb0a3f999d641d5162b3f43a0b2058eec62ee5009f7d796ac89d013ac15426"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/th/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/th/firefox-51.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "0b9ae06d78e94d6f9ee5861dc911eca02f39671d8f13f2119323ed7dc394dffbe99f2d23dd3eba955d46f7d4b9775cd9fc3311337d4339748c178aa67d7467eb"; + sha512 = "64202fab7515634d5cc12845902e4c0df6b1e4b59606f1c4ca779ed684edd329915b9e133b19b465ac6343d5af91572b767171f56c7ea2883d1dd216a39eb1b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/tr/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/tr/firefox-51.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "31be512e591504d3e8a776933f0926ae54a7797fa037e53a4627b1bb39ed61e4689cafee7d84dfb6b930ee2e4a84df158a97c1c5b201a3a8ea112e2910e65846"; + sha512 = "aec62567d934fae018c8ab4273c7f3a7350ea1e14820990374ab2542c512e005536e851b6fe315667c9ec63d48ed391ffa896fe7cbd24405945ed7f8aca4d945"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/uk/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/uk/firefox-51.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "19614a4999f5c7509a3c0b1c6bb2bc3d9f408ff6727bcf9bf93bf91a59ec8d3c04206719fe2aa2319a0e62687df871bfa2fe67117219398e19aa5a6e0782c15c"; + sha512 = "e1f3df0c6637cfa394ae0d2829b24b486d0af39d46f7747e77e579e0ad4325663ba312504f5cdbc5fc2da378e7205a5e9528df99e61af20b9df58f8cf1cd54db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/uz/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/uz/firefox-51.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "22bb3b4a3a5a98ad8da002a220dd2779a46fd50a3d0ff41bec8312186ae34543da44fc49518fee160aa4b48176a0d3ba0dd0c4853fea9befc66911684b83ddb1"; + sha512 = "c095ff29e2c42920975400b0f80a55e22b3334859d82dde662fd9a8889884bdb045601522e961f4d0f6c6c934a5d42cc838fd263e91337fa9838479acb2064fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/vi/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/vi/firefox-51.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "99140a71208a7912dc8b9fd3bd7f5454a0b032dee4d903304dfd14aa9abec0722fdcc6624f3c0a1c6e753bc6ab6ea512d6f8c55b5482069ed6c65d5579f562e0"; + sha512 = "14ae54681bd1a6e48f94c6d624e00a034689489e631f4216beb019baa51f35f00eb2a764c66a4e79762c9d1188659b78e5ad50b8187354863abe9b501d4fef77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xh/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/xh/firefox-51.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "440573a5e364ecd59121b30f664ed23bd2fa80945562d1e5cc04303f12dfff23c96ef53ce07cf689d247a5120b9d7679533ccb6e17c27b29898154f0fc9fc581"; + sha512 = "6bcba0e20540cb93811aae08f6b10e0cf6a9108528fd0f00aa84d2af9d982578d4e03f034e6d0f155fac4519ff0ea90f3d8aa4731aafc179a5a497a26d224ef9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/zh-CN/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/zh-CN/firefox-51.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "4a2f5550c130d0992408d328afa3dbd37f80e5b63c2b33c095ab74e397ea394cb33f87214f1b0d3650c60450738fe3eca636ed51ca1c4e5dce9b58e0f09c30f6"; + sha512 = "ffa67e88d736bdb41dd7bc046bdfa02161f3c703e992615cd98df788cce5e9f97a610f8b7b31e825dcf17dff790029081aa13316433db2c2ecd06de6aec4f811"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/zh-TW/firefox-50.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/zh-TW/firefox-51.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "6417da7af1792f241c8d57dd5bb05dac974db2b73a6274fe3159037bcf8ae8a23b3f1849f5b42a0bfc09f1dcbf949bcaa8b1e9cc633fd3726c12cde7e3cf542f"; + sha512 = "d67b82836f4035ac4050751b9235d49bafb2bbea2da9d1b209451e0fc3cbf54ce70b4111d66f107a22be30baa6b6a043c2736f6e05961f0aa3cff95531601134"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 6a688de02d0..a01cde4d6de 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -5,7 +5,7 @@ , hunspell, libevent, libstartup_notification, libvpx , cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio , autoconf213, which -, writeScript, xidel, coreutils, gnused, gnugrep, curl, ed +, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl , enableGTK3 ? false , debugBuild ? false , # If you want the resulting program to call itself "Firefox" instead @@ -148,22 +148,22 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "50.1.0"; - sha512 = "370d2e9b8c4b1b59c3394659c3a7f0f79e6a911ccd9f32095b50b3a22d087132b1f7cb87b734f7497c4381b1df6df80d120b4b87c13eecc425cc66f56acccba5"; + version = "51.0.1"; + sha512 = "556e31b717c0640ef5e181e00b9d2a6ea0ace7c16ae04333d0f2e9e120d0ab9efe82a4ca314ef43594c080523edf37953e65dbf694c7428be0a024f3719d8312"; updateScript = import ./update.nix { - name = "firefox"; - inherit writeScript xidel coreutils gnused gnugrep curl ed; + attrPath = "firefox-unwrapped"; + inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl; }; }; firefox-esr-unwrapped = common { pname = "firefox-esr"; - version = "45.6.0esr"; - sha512 = "b96c71aeed8a1185a085512f33d454a1735237cd9ddf37c8caa9cc91892eafab0615fc0ca6035f282ca8101489fa84c0de1087d1963c05b64df32b0c86446610"; + version = "45.7.0esr"; + sha512 = "6424101b6958191ce654d0619950dfbf98d4aa6bdd979306a2df8d6d30d3fecf1ab44638061a2b4fb1af85fe972f5ff49400e8eeda30cdcb9087c4b110b97a7d"; updateScript = import ./update.nix { - name = "firefox-esr"; - versionSuffix = "esr"; - inherit writeScript xidel coreutils gnused gnugrep curl ed; + attrPath = "firefox-esr-unwrapped"; + versionSuffix = "esr"; + inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl; }; }; diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix index 33c9f307918..0f465122806 100644 --- a/pkgs/applications/networking/browsers/firefox/update.nix +++ b/pkgs/applications/networking/browsers/firefox/update.nix @@ -1,23 +1,18 @@ -{ name -, writeScript +{ writeScript +, lib , xidel +, common-updater-scripts , coreutils , gnused , gnugrep , curl -, ed -, sourceSectionRegex ? "${name}-unwrapped = common" -, basePath ? "pkgs/applications/networking/browsers/firefox" +, attrPath , baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/" , versionSuffix ? "" }: -let - version = (builtins.parseDrvName name).version; -in writeScript "update-${name}" '' - PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${ed}/bin - - pushd ${basePath} +writeScript "update-${attrPath}" '' + PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused xidel ]} url=${baseUrl} @@ -35,20 +30,5 @@ in writeScript "update-${name}" '' shasum=`curl --silent $url$version/SHA512SUMS | grep 'source\.tar\.xz' | cut -d ' ' -f 1` - ed default.nix < $out/${passthru.mozillaPlugin}/extra-bin-path - ''; - - passthru.mozillaPlugin = "/lib/mozilla/plugins"; - - meta = { - description = "A browser plugin that uses GNOME MPlayer to play media in a browser"; - homepage = http://kdekorte.googlepages.com/gecko-mediaplayer; - broken = true; - }; -} - diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix deleted file mode 100644 index 82a1c271225..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk2, GConf, alsaLib }: - -stdenv.mkDerivation rec { - name = "gmtk-1.0.9b"; - - src = fetchurl { - url = "http://gmtk.googlecode.com/files/${name}.tar.gz"; - sha256 = "07y5hd94qhvlk9a9vhrpznqaml013j3rq52r3qxmrj74gg4yf4zc"; - }; - - buildInputs = [ intltool pkgconfig gtk2 GConf alsaLib ]; - - meta = { - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 0edd982f0f7..7e9d4cd50b4 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -14,6 +14,7 @@ , gnome2 , gtk2 , libX11 +, libxcb , libXScrnSaver , libXcomposite , libXcursor @@ -36,7 +37,7 @@ let mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "41.0.2353.56"; + version = "42.0.2393.517"; rpath = stdenv.lib.makeLibraryPath [ @@ -66,6 +67,7 @@ let libXrandr.out libXrender.out libXtst.out + libxcb.out libnotify.out nspr.out nss.out @@ -89,12 +91,12 @@ in stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb"; - sha256 = "0qjkhadlpn5c20wm66hm7rn12kdk4bh2plfgpfkzp85jmsjdxri5"; + sha256 = "1zdhg6lrnpn8f4rdibnagj3ps3i8s9ygm4dpj5h605rqk24xxpvs"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "1f3slbydxkk15banjbm7d8602l3vxy834ijsdqpyj0ckc5mw0g9y"; + sha256 = "04yklvxprl7kcnl43fmvk1qfj5ifvivj715n26ylzcf29pvcy1mp"; } else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 3746bbe4f7e..4c186fcf5ea 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -7,11 +7,11 @@ let pdfjs = stdenv.mkDerivation rec { name = "pdfjs-${version}"; - version = "1.5.188"; + version = "1.7.225"; src = fetchurl { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "1y3yaqfgjj96qzvbm5200x68j5hy1qs7l2mqm3kbbj2b58z9f1qv"; + sha256 = "1n8ylmv60r0qbw2vilp640a87l4lgnrsi15z3iihcs6dj1n1yy67"; }; nativeBuildInputs = [ unzip ]; @@ -24,12 +24,12 @@ let in buildPythonApplication rec { name = "qutebrowser-${version}"; - version = "0.9.0"; + version = "0.9.1"; namePrefix = ""; src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1fp7yddx8xmy6hx01gg4z3vnw8b9qa5ixam7150i3xaalx0gjzfq"; + sha256 = "0pf91nc0xcykahc3x7ww525c9czm8zpg80nxl8n2mrzc4ilgvass"; }; # Needs tox diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index d714033e412..0985c86949a 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.8.1"; + version = "0.9.0"; goPackagePath = "github.com/docker/machine"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "docker"; repo = "machine"; - sha256 = "0l4a5bqfw8i8wrl5yzkqy848r7vdx6hw8p5m3z3vzabvsmsjjwy7"; + sha256 = "1kl30ylgdsyr9vkdms6caypnixxjv9a322wx416x6266c8lal6k4"; }; postInstall = '' diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 2b2cca6a609..0040d0ca823 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchFromGitHub, which, go, go-bindata, makeWrapper, rsync , iptables, coreutils , components ? [ + "cmd/kubeadm" "cmd/kubectl" "cmd/kubelet" "cmd/kube-apiserver" diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index cd1ace993d6..c773d8ac23a 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl, kubernetes }: +{ stdenv, lib, fetchurl, makeWrapper, docker-machine-kvm, kubernetes, libvirt, qemu }: + let arch = if stdenv.isLinux then "linux-amd64" else "darwin-amd64"; checksum = if stdenv.isLinux - then "1g6k3va84nm2h9z2ywbbkc8jabgkarqlf8wv1sp2p6s6hw7hi5h3" - else "0jpwyvgpl34n07chcyd7ldvk3jq3rx72cp8yf0bh7gnzr5lcnxnc"; -in -stdenv.mkDerivation rec { + then "0njx4vzr0cpr3dba08w0jrlpfb8qrmxq5lqfrk3qrx29x5y6i6hi" + else "0i21m1pys6rdxcwsk987l08lhzpcbg4bdrznaam02g6jj6jxvq0x"; + +# TODO: compile from source + +in stdenv.mkDerivation rec { pname = "minikube"; - version = "0.15.0"; + version = "0.16.0"; name = "${pname}-${version}"; src = fetchurl { @@ -17,26 +20,24 @@ stdenv.mkDerivation rec { sha256 = "${checksum}"; }; - buildInputs = [ ]; + phases = [ "installPhase" ]; - propagatedBuildInputs = [ kubernetes ]; + buildInputs = [ makeWrapper ]; - phases = [ "buildPhase" "installPhase" ]; - - buildPhase = '' - mkdir -p $out/bin - ''; + binPath = lib.makeBinPath [ docker-machine-kvm kubernetes libvirt qemu ]; installPhase = '' - cp $src $out/bin/${pname} - chmod +x $out/bin/${pname} + install -Dm755 ${src} $out/bin/${pname} + + wrapProgram $out/bin/${pname} \ + --prefix PATH : ${binPath} ''; meta = with stdenv.lib; { homepage = https://github.com/kubernetes/minikube; description = "A tool that makes it easy to run Kubernetes locally"; license = licenses.asl20; - maintainers = [ maintainers.ebzzry ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ ebzzry ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index fdb8e09d6a5..ae3415adef9 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.4.1"; + version = "0.5.4"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "nomad"; inherit rev; - sha256 = "093nljhibphhccjwxkylbvlc8dh8g2js36mlxxdh9nh21b3mghcs"; + sha256 = "0x7bi6wq7kpqv3wfhk5mqikj4hsb0f6lx867xz5l9cq3i39b5gj3"; }; meta = with stdenv.lib; { @@ -20,6 +20,6 @@ buildGoPackage rec { description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; platforms = platforms.linux; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem ]; + maintainers = with maintainers; [ rushmorem pradeepchhetri ]; }; } diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index b4c20e22680..bdcb0a84625 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,22 +1,38 @@ { stdenv, fetchzip, makeWrapper, jre, pythonPackages , mesosSupport ? true, mesos +, version }: +let + versionMap = { + "1.6.0" = { + hadoopVersion = "cdh4"; + sparkSha256 = "19ycx1r8g82vkvzmn9wxkssmv2damrg72yfmrgzpc6xyh071g91c"; + }; + "2.1.0" = { + hadoopVersion = "hadoop2.4"; + sparkSha256 = "0pbsmbjwijsfgbnm56kgwnmnlqkz3w010ma0d7vzlkdklj40vqn2"; + }; + }; +in + +with versionMap.${version}; + with stdenv.lib; stdenv.mkDerivation rec { - name = "spark-${version}"; - version = "1.6.0"; + + name = "spark-${version}"; src = fetchzip { - url = "mirror://apache/spark/${name}/${name}-bin-cdh4.tgz"; - sha256 = "19ycx1r8g82vkvzmn9wxkssmv2damrg72yfmrgzpc6xyh071g91c"; + url = "mirror://apache/spark/${name}/${name}-bin-${hadoopVersion}.tgz"; + sha256 = sparkSha256; }; buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] ++ optional mesosSupport mesos; - untarDir = "${name}-bin-cdh4"; + untarDir = "${name}-bin-${hadoopVersion}"; installPhase = '' mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java} mv * $out/lib/${untarDir} diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix new file mode 100644 index 00000000000..bb179606b36 --- /dev/null +++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "${pname}-${version}"; + pname = "amazon-ssm-agent"; + version = "2.0.633.0"; + + goPackagePath = "github.com/aws/${pname}"; + subPackages = [ "agent" ]; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "aws"; + repo = pname; + sha256 = "10arshfn2k3m3zzgw8b3xc6ywd0ss73746nq5srh2jir7mjzi4xv"; + }; + + preBuild = '' + mv go/src/${goPackagePath}/vendor strange-vendor + mv strange-vendor/src go/src/${goPackagePath}/vendor + ''; + + meta = with stdenv.lib; { + description = "Agent to enable remote management of your Amazon EC2 instance configuration"; + homepage = "https://github.com/aws/amazon-ssm-agent"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ copumpkin ]; + }; +} + diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index ffbdec6e117..2f57456f309 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,16 +2,15 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.8.4"; - rev = "v${version}"; + version = "0.8.7"; goPackagePath = "github.com/hashicorp/terraform"; src = fetchFromGitHub { - inherit rev; - owner = "hashicorp"; - repo = "terraform"; - sha256 = "0wjz7plzi7bgrbw22kgqpbai1j3rmqayrmjcp9dq6a361l9a0msw"; + owner = "hashicorp"; + repo = "terraform"; + rev = "v${version}"; + sha256 = "0b30m0qc50x84klc8ggc3i83z36l46b1qmc8mpw90mxp07ra8vbw"; }; postInstall = '' diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 4362d7cff90..4c5c6fe53ce 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.9.1"; + version = "0.10.1"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,12 +10,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "gruntwork-io"; repo = "terragrunt"; - sha256 = "19im4sazw09854lnzalljwx22qswly8ffyys3yrjkd2l9vfxfly3"; + sha256 = "04q9wm8dnbm1pcy9i3c7ral49k3z10a7gx7h6h4bsvjy1sdf58vz"; }; goDeps = ./deps.nix; - buildInputs = [ makeWrapper terraform ]; + buildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $bin/bin/terragrunt \ diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index d903863118c..bb438ef4e32 100644 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -5,8 +5,17 @@ fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "5e1afe1c0a077fb2da9b5f74232b790d99397ce8"; - sha256 = "073yx5acqybw0h2zshg209wmldm0g5h5x9bhbn6h08ak0r4i80al"; + rev = "f85f603a3e5b4d0eb9516dddb33778918f3b45c6"; + sha256 = "10frgavkbsqpfninrlgwh64qjx9rwyjzbdfrikciv75v1gljh6zv"; + }; + } + { + goPackagePath = "github.com/bgentry/go-netrc"; + fetch = { + type = "git"; + url = "https://github.com/bgentry/go-netrc"; + rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"; + sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l"; }; } { @@ -18,13 +27,31 @@ sha256 = "02mvb2clbmfcqb4yclv5zhs4clkk9jxi2hiawsynl5fwmgn0d3xa"; }; } + { + goPackagePath = "github.com/hashicorp/go-getter"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-getter"; + rev = "c3d66e76678dce180a7b452653472f949aedfbcd"; + sha256 = "0ykpkiszcwp3hnvnnyl95zdrsziwrzr989ynyvbfkgpnkqfdhfy7"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-version"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-version"; + rev = "03c5bf6be031b6dd45afec16b1cf94fc8938bc77"; + sha256 = "0sjq57gpfznaqdrbyb2p0bn90g9h661cvr0jrk6ngags4pbw14ik"; + }; + } { goPackagePath = "github.com/hashicorp/hcl"; fetch = { type = "git"; url = "https://github.com/hashicorp/hcl"; - rev = "eb6f65b2d77ed5078887f960ff570fbddbbeb49d"; - sha256 = "1wx6hpxmq5sby54025j9hliz10gv5v0bq6q1z2cd0asznj154ij1"; + rev = "372e8ddaa16fd67e371e9323807d056b799360af"; + sha256 = "1hv8p1858k1b99p3yc2jj6h77bl0iv9ziyzyp4w3xlcci2s13hnr"; }; } { @@ -32,8 +59,17 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-zglob"; - rev = "1783ae1a9f7ff3a79240e8c249d8b575d70a6528"; - sha256 = "0g4ih6swqpq0bqwsv5mv8ymicgr92xh9i6sm1793lqwb63x8ga1x"; + rev = "95345c4e1c0ebc9d16a3284177f09360f4d20fab"; + sha256 = "012hrd67v4gp3b621rykg2kp6a7iq4dr585qavragbif0z1whckx"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; + sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; }; } { @@ -41,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "bfdb1a85537d60bc7e954e600c250219ea497417"; - sha256 = "141kkh801jyp1r6hba14krydqg1iivp13j12is70j0g05z9fbji8"; + rev = "db1efb556f84b25a0a13a04aad883943538ad2e0"; + sha256 = "1pl1rwc9q3kz0banwi493cyhmn5mlc4mb97sx68jkdz6pck7fy0h"; }; } { @@ -50,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "2402e8e7a02fc811447d11f881aa9746cdc57983"; - sha256 = "01qaz781cvrv3h1428xqq8knf5ahdcj93m5k9dnivg2hcrlnqibj"; + rev = "4d4bfba8f1d1027c4fdbe371823030df51419987"; + sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp"; }; } { @@ -59,8 +95,8 @@ fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "8ef3805c9de2519805c3f060524b695bba2cd715"; - sha256 = "0680rd87skmz8p8s3cwy55siz4bgjls314agfi03d7640gz7mp24"; + rev = "2526b57c56f30b50466c96c4133b1a4ad0f0191f"; + sha256 = "03vvr1wq4pw2fixxsbr1d623hwqxf93d07p8vjml6iyd6k97b15p"; }; } ] diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix new file mode 100644 index 00000000000..8be5ee3c775 --- /dev/null +++ b/pkgs/applications/networking/droopy/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, wrapPython }: + +with lib; + +stdenv.mkDerivation rec { + name = "droopy-${version}"; + version = "20160830"; + + src = fetchFromGitHub { + owner = "stackp"; + repo = "Droopy"; + rev = "7a9c7bc46c4ff8b743755be86a9b29bd1a8ba1d9"; + sha256 = "03i1arwyj9qpfyyvccl21lbpz3rnnp1hsadvc0b23nh1z2ng9sff"; + }; + + nativeBuildInputs = [ wrapPython ]; + + installPhase = '' + install -vD droopy $out/bin/droopy + install -vD -m 644 man/droopy.1 $out/share/man/man1/droopy.1 + wrapPythonPrograms + ''; + + meta = { + description = "Mini Web server that let others upload files to your computer"; + homepage = http://stackp.online.fr/droopy; + license = licenses.bsd3; + maintainers = maintainers.profpatsch; + }; + +} diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 2ea1de96109..a083b17dcb0 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "17.4.33"; + version = "19.4.13"; sha256 = { - "x86_64-linux" = "0q3afwzd48mdv4mj4zbm6bvafj4hv18ianzhwjxz5dj6njv7s47y"; - "i686-linux" = "0wgq94if8wx08kqzsj6n20aia29h1qfn448ww63yn8dvkp6nlpya"; + "x86_64-linux" = "06lgmjj204xpid35cqrp2msasg4s4w6lf1zpz1lnk3f9x6q10254"; + "i686-linux" = "1kdj3c5s8s4smd52p2mqbzjsk68a9cd5f8x92xgsx9zzdzjqmagl"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = @@ -146,6 +146,8 @@ in stdenv.mkDerivation { fi fi done + + paxmark m $out/${appdir}/dropbox ''; meta = { diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 0a938766e93..64519ce17d5 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -2,12 +2,12 @@ , ocaml, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: stdenv.mkDerivation rec { - name = "google-drive-ocamlfuse-${version}"; - version = "0.5.22"; + name = "google-drive-ocamlfuse-${version}"; + version = "0.6.17"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1587/${name}.tar.gz"; - sha256 = "1hjm6hyva9sl6lddb0372wsy7f76105iaxh976yyzfn3b4ran6ab"; + url = "https://forge.ocamlcore.org/frs/download.php/1674/${name}.tar.gz"; + sha256 = "1ldja7080pnjaibrbdvfqwakp4mac8yw1lkb95f7lgldmy96lxas"; }; buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl]; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 8b0dda1694d..5ee93bd4df5 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -2,11 +2,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-3.5"; + name = "bitlbee-3.5.1"; src = fetchurl { url = "mirror://bitlbee/src/${name}.tar.gz"; - sha256 = "06c371bjly38yrkvfwdh5rjfx9xfl7bszyhrlbldy0xk38c057al"; + sha256 = "0sgsn0fv41rga46mih3fyv65cvfa6rvki8x92dn7bczbi7yxfdln"; }; nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 1d1ae151caa..4085324a2aa 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "discord"; - version = "0.0.13"; + version = "0.0.1"; name = "${pname}-${version}"; src = fetchurl { - url = "https://cdn-canary.discordapp.com/apps/linux/${version}/${pname}-canary-${version}.tar.gz"; - sha256 = "1pwb8y80z1bmfln5wd1vrhras0xygd1j15sib0g9vaig4mc55cs6"; + url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; + sha256 = "10m3ixvhmxdw55awd84gx13m222qjykj7gcigbjabcvsgp2z63xs"; }; libPath = stdenv.lib.makeLibraryPath [ @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { # see pkgs/applications/misc/adobe-reader/builder.sh patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out:$libPath" \ - $out/DiscordCanary + $out/Discord - paxmark m $out/DiscordCanary + paxmark m $out/Discord - ln -s $out/DiscordCanary $out/bin/ + ln -s $out/Discord $out/bin/ ln -s $out/discord.png $out/share/pixmaps # Putting udev in the path won't work :( @@ -44,9 +44,9 @@ stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = pname; - exec = "DiscordCanary"; + exec = "Discord"; icon = pname; - desktopName = "Discord Canary"; + desktopName = "Discord"; genericName = meta.description; categories = "Network;InstantMessaging;"; }; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 52d1e3d7933..d78bd759ea6 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchurl, python, intltool, pkgconfig, libX11 +{ 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 @@ -25,17 +28,33 @@ stdenv.mkDerivation rec { version = "0.16.6"; src = fetchurl { - url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2"; - sha256 = "1p3qwzy07f0wkika9yigyiq167l2k6wn12flqa7x55z4ihbysmqk"; + name = "${name}.tar.bz2"; + url = "https://dev.gajim.org/gajim/gajim/repository/archive.tar.bz2?" + + "ref=${name}"; + sha256 = "1s0h4xll9490vh7ygmi4zsd1fa107f3s9ykhpq0snb04fllwhjq7"; }; - patches = [ - (fetchurl { - name = "gajim-icon-index.patch"; - url = "https://dev.gajim.org/gajim/gajim/commit/7d20ed2b98a3070add188efab7308a5a06d9f4a2.diff"; - sha256 = "0w54hr5dq9y36val55kmh8d6cid7h4fs2nghx09714jylz2nyxxv"; - }) - ]; + patches = let + # An attribute set of revisions to apply from the upstream repository. + cherries = { + misc-test-fixes = { + rev = "1f0d7387fd020df5dfc9a6349005ec7dedb7c008"; + sha256 = "0nazpzyg50kl0k8z4dkn033933iz60g1i6nzhib1nmzhwwbnacc5"; + }; + jingle-fix = { + rev = "491d32a2ec13ed3a482e151e0b403eda7b4151b8"; + sha256 = "1pfg1ysr0p6rcwmd8ikjs38av3c4gcxn8pxr6cnnj27n85gvi30g"; + }; + fix-connection-mock = { + rev = "46a19733d208fbd2404cbaeedd8c203d0b6557a4"; + sha256 = "0l3s577pksnz16r4mqa1zmz4y165amsx2mclrm4vzlszy35rmy2b"; + }; + }; + in mapAttrsToList (name: { rev, sha256 }: fetchurl { + name = "gajim-${name}.patch"; + url = "https://dev.gajim.org/gajim/gajim/commit/${rev}.diff"; + inherit sha256; + }) cherries; postPatch = '' sed -i -e '0,/^[^#]/ { @@ -44,9 +63,13 @@ stdenv.mkDerivation rec { }$GST_PLUGIN_PATH"'" }' scripts/gajim.in - sed -i -e 's/return helpers.is_in_path('"'"'drill.*/return True/' \ - src/features_window.py - sed -i -e "s|'drill'|'${ldns}/bin/drill'|" src/common/resolver.py + # 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 @@ -57,15 +80,22 @@ stdenv.mkDerivation rec { ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ]; nativeBuildInputs = [ - pythonPackages.wrapPython intltool pkgconfig + autoreconfHook pythonPackages.wrapPython intltool pkgconfig + # Test dependencies + xvfb_run ]; - propagatedBuildInputs = [ - pythonPackages.pygobject2 pythonPackages.pyGtkGlade - pythonPackages.pyasn1 - pythonPackages.pyxdg - pythonPackages.nbxmpp - pythonPackages.pyopenssl pythonPackages.dbus-python + autoreconfPhase = '' + sed -e 's/which/type -P/;s,\./configure,:,' autogen.sh | bash + ''; + + propagatedBuildInputs = with pythonPackages; [ + libasyncns + pygobject2 pyGtkGlade + pyasn1 + pyxdg + nbxmpp + pyopenssl dbus-python ] ++ optional enableE2E pythonPackages.pycrypto ++ optional enableRST pythonPackages.docutils ++ optional enableNotifications pythonPackages.notify @@ -89,6 +119,13 @@ stdenv.mkDerivation rec { 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; meta = { diff --git a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch b/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch index f9c3e3c5592..33e3e09a96d 100644 --- a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch +++ b/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch @@ -26,7 +26,7 @@ index 50e8ad8..eec0ed2 100644 + is_nixos=no +fi + -+if [ -u /var/setuid-wrappers/gksign ]; then ++if [ -u /run/wrappers/bin/gksign ]; then + cat < commit.h ''; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index 90f6655d145..3997980bed4 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -1,29 +1,27 @@ { stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }: -let - version = "dd181722ea"; - date = "20141202"; -in stdenv.mkDerivation rec { - name = "tox-prpl-${date}-${version}"; + name = "tox-prpl-${version}"; + version = "0.5.1"; src = fetchFromGitHub { - owner = "jin-eld"; - repo = "tox-prpl"; - rev = "${version}"; - sha256 = "0wzyvg11h4ym28zqd24p35lza3siwm2519ga0yhk98rv458zks0v"; + owner = "jin-eld"; + repo = "tox-prpl"; + rev = "v${version}"; + sha256 = "0ms367l2f7x83k407c93bmhpyc820f1css61fh2gx4jq13cxqq3p"; }; NIX_LDFLAGS = "-lssp -lsodium"; postInstall = "mv $out/lib/purple-2 $out/lib/pidgin"; - buildInputs = [ libtoxcore pidgin autoreconfHook libsodium ]; + buildInputs = [ libtoxcore pidgin libsodium ]; + nativeBuildInputs = [ autoreconfHook ]; - meta = { + meta = with stdenv.lib; { homepage = http://tox.dhs.org/; description = "Tox plugin for Pidgin / libpurple"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 9a26e2e4fc0..036d7fb3ce5 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,46 +1,31 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, openal, opencv, - libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, +{ stdenv, fetchFromGitHub, cmake, pkgconfig, openal, opencv, + libtoxcore, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, xorg, pango, atk, qrencode, ffmpeg, filter-audio, makeQtWrapper, - qtbase, qtsvg, qttools, qmakeHook, qttranslations, sqlcipher }: - -let - version = "1.5.0"; - revision = "v${version}"; -in + qtbase, qtsvg, qttools, qttranslations, sqlcipher, + libvpx, libopus }: stdenv.mkDerivation rec { name = "qtox-${version}"; + version = "1.8.1"; src = fetchFromGitHub { - owner = "tux3"; - repo = "qTox"; - rev = revision; - sha256 = "1na2qqzbdbjfw8kymxw5jfglslmw18fz3vpw805pqg4d5y7f7vsi"; + owner = "tux3"; + repo = "qTox"; + rev = "v${version}"; + sha256 = "073kwfaw5n7vvcpwrpdbw5mlswbbwjipx7yy4a95r9z0gjljqnhq"; }; - buildInputs = - [ - libtoxcore-dev openal opencv libsodium filter-audio - qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo - pango atk qrencode ffmpeg qttranslations makeQtWrapper - sqlcipher - ]; + buildInputs = [ + libtoxcore openal opencv libsodium filter-audio + qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo + pango atk qrencode ffmpeg qttranslations + sqlcipher + libopus libvpx + ] ++ (with xorg; [ + libpthreadstubs libXdmcp + ]); - nativeBuildInputs = [ pkgconfig qmakeHook ]; - - preConfigure = '' - # patch .pro file for proper set of the git hash - sed -i '/git rev-parse/d' qtox.pro - sed -i 's/$$quote($$GIT_VERSION)/${revision}/' qtox.pro - # since .pro have hardcoded paths, we need to explicitly set paths here - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags glib-2.0)" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gdk-pixbuf-2.0)" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0)" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags cairo)" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags pango)" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags atk)" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags sqlcipher)" - ''; + nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index e0b86dfc633..15df03ac90d 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -6,7 +6,7 @@ let bits = if stdenv.system == "x86_64-linux" then "x64" else "ia32"; - version = "0.4.5"; + version = "0.5.3"; myIcon = fetchurl { url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png"; @@ -15,7 +15,7 @@ let desktopItem = makeDesktopItem rec { name = "Rambox"; - exec = name; + exec = "rambox"; icon = myIcon; desktopName = name; genericName = "Rambox messenger"; @@ -26,8 +26,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz"; sha256 = if bits == "x64" then - "0z2rmfiwhb6v2hkzgrbkd4nhdvm1rssh0mbfbdmdwxq91qzp6558" else - "0gq0ywk1jr0apl39dnm0vwdwg1inr7fari3cmfz3fvaym7gc8fki"; + "14pp466l0fj98p5qsb7i11hd603gwsir26m3j4gljzcizb9hirqv" else + "13xmljsdahffdzndg30qxh8mj7bgd9jwkxknrvlh3l6w35pbj085"; }; phases = [ "unpackPhase" "installPhase" "postFixup" ]; @@ -42,19 +42,19 @@ in stdenv.mkDerivation rec { ]; installPhase = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Rambox - patchelf --set-rpath "$out/share/rambox:${stdenv.lib.makeLibraryPath deps}" Rambox + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" rambox + patchelf --set-rpath "$out/share/rambox:${stdenv.lib.makeLibraryPath deps}" rambox mkdir -p $out/bin $out/share/rambox cp -r * $out/share/rambox - ln -s $out/share/rambox/Rambox $out/bin + ln -s $out/share/rambox/rambox $out/bin mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications ''; postFixup = '' - paxmark m $out/share/rambox/Rambox + paxmark m $out/share/rambox/rambox ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index 5e5c2fe8eed..9bed654b9b3 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, python3Packages }: python3Packages.buildPythonPackage { - name = "scudcloud-1.38"; + name = "scudcloud-1.40"; # Branch 254-port-to-qt5 - # https://github.com/raelgc/scudcloud/commit/6bcd877daea3d679cd5fd2c946c2d933940c48d9 + # https://github.com/raelgc/scudcloud/commit/43ddc87f123a641b1fa78ace0bab159b05d34b65 src = fetchgit { url = https://github.com/raelgc/scudcloud/; - rev = "6bcd877daea3d679cd5fd2c946c2d933940c48d9"; - sha256 = "1884svz6m5vl06d0yac5zjb2phxwg6bjva72y15fw4larkjnh72s"; + rev = "43ddc87f123a641b1fa78ace0bab159b05d34b65"; + sha256 = "1lh9naf9xfrmj1pj7p8bd3fz7vy3gap6cvda4silk4b6ylyqa8vj"; }; propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ]; diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix deleted file mode 100644 index 10f63369a9b..00000000000 --- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, libpulseaudio, libsamplerate -, commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus -, autoconf, automake, libtool, gettext, perl -, cmake, qt4 -, gtk, glib, dbus_glib, libnotify, intltool, makeWrapper }: - -let - name = "sflphone-1.2.3"; - - src = fetchurl { - url = "https://projects.savoirfairelinux.com/attachments/download/6423/${name}.tar.gz"; - sha256 = "0aiwlky7mp5l51a7kkhkmaz7ivapypar291kdxzdxl1s3qy0x6fd"; - }; - - meta = { - homepage = http://sflphone.org/; - license = stdenv.lib.licenses.gpl3Plus; - description = "Free software enterprise-class softphone for GNU/Linux"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [viric]; - }; - -in -rec { - daemon = stdenv.mkDerivation { - name = name + "-daemon"; - - inherit src; - - patches = [ ./libzrtpcpp-cflags.patch ]; - - preConfigure = '' - cd daemon - - # Post patch, required - autoreconf -vfi - - cd libs - bash ./compile_pjsip.sh - cd .. - ''; - - configureFlags = "--with-expat --with-expat-inc=${expat.dev}/include " + - "--with-expat-lib=-lexpat --with-opus "; - - buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig libpulseaudio libsamplerate - commoncpp2 ccrtp libzrtpcpp dbus dbus_cplusplus expat pcre gsm speex ilbc libopus - autoconf automake libtool gettext perl ]; - }; - - # This fails still. - # I don't know the best way to make this a KDE program (with switchable kde - # libs, like digikam for example) - /* - kde = stdenv.mkDerivation { - name = name + "-kde"; - - inherit src; - - preConfigure = '' - cd kde - ''; - - buildInputs = [ daemon cmake qt4 pkgconfig ]; - }; - */ - - gnome = stdenv.mkDerivation { - name = name + "-gnome"; - - inherit src; - - preConfigure = '' - cd gnome - ''; - - # gtk3 programs have the runtime dependency on XDG_DATA_DIRS - preFixup = '' - for f in "$out/bin/sflphone" "$out/bin/sflphone-client-gnome"; do - wrapProgram $f --prefix XDG_DATA_DIRS ":" "${gtk.out}/share:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - buildInputs = [ daemon pkgconfig gtk glib dbus_glib libnotify intltool makeWrapper ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch b/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch deleted file mode 100644 index 972d9c58808..00000000000 --- a/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/daemon/src/audio/audiortp/Makefile.am b/daemon/src/audio/audiortp/Makefile.am -index c27eedd..fe64077 100644 ---- a/daemon/src/audio/audiortp/Makefile.am -+++ b/daemon/src/audio/audiortp/Makefile.am -@@ -4,6 +4,10 @@ noinst_LTLIBRARIES = libaudiortp.la - - if BUILD_ZRTP - SFL_ZRTP_SRC=audio_zrtp_session.h audio_zrtp_session.cpp zrtp_session_callback.cpp zrtp_session_callback.h -+libaudiortp_la_CXXFLAGS = \ -+ @CCGNU2_CFLAGS@ \ -+ @ZRTPCPP_CFLAGS@ \ -+ @CCRTP_CFLAGS@ - endif - - libaudiortp_la_SOURCES = \ diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 16956782a24..67d86571b88 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,14 +19,14 @@ let in stdenv.mkDerivation rec { name = "telegram-desktop-${version}"; - version = "1.0.0"; + version = "1.0.2"; qtVersion = lib.replaceStrings ["."] ["_"] packagedQt; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "1qxzi82cgd8klk6rn83rzrmik0s76alarfaknknww5iw5px7gi8b"; + sha256 = "1pakxzs28v794x9mm7pb2m0phkfrwq19shz8a6lfyidb6ng85hy2"; }; tgaur = fetchgit { diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index be72895b430..fb7a13b3af9 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -1,26 +1,27 @@ { stdenv, fetchFromGitHub, libsodium, ncurses, curl -, libtoxcore-dev, openal, libvpx, freealut, libconfig, pkgconfig -, libqrencode }: +, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig, libopus +, libqrencode, gdk_pixbuf, libnotify }: stdenv.mkDerivation rec { - name = "toxic-dev-20160728"; + name = "toxic-${version}"; + version = "0.7.2"; src = fetchFromGitHub { - owner = "Tox"; - repo = "toxic"; - rev = "cb21672600206423c844306a84f8b122e534c348"; - sha256 = "1nq1xnbyjfrk8jrjvk5sli1bm3i9r8b4m8f4xgmiz68mx1r3fn5k"; + owner = "Tox"; + repo = "toxic"; + rev = "v${version}"; + sha256 = "1kws6bx5va1wc0k6pqihrla91vicxk4zqghvxiylgfbjr1jnkvwc"; }; - makeFlags = [ "PREFIX=$(out)" ]; - installFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)"]; + installFlags = [ "PREFIX=$(out)"]; - nativeBuildInputs = [ pkgconfig libconfig ]; buildInputs = [ - libtoxcore-dev libsodium ncurses curl + libtoxcore libsodium ncurses curl gdk_pixbuf libnotify ] ++ stdenv.lib.optionals (!stdenv.isArm) [ - openal libvpx freealut libqrencode + openal libopus libvpx freealut libqrencode ]; + nativeBuildInputs = [ pkgconfig libconfig ]; meta = with stdenv.lib; { description = "Reference CLI for Tox"; diff --git a/pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch b/pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch deleted file mode 100644 index 3d4c46b2431..00000000000 --- a/pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: twinkle-1.4.2/configure.in -=================================================================== ---- twinkle-1.4.2.orig/configure.in 2013-07-25 11:07:54.160534950 -0400 -+++ twinkle-1.4.2/configure.in 2013-07-25 11:07:59.000000000 -0400 -@@ -294,7 +294,11 @@ - AC_CHECK_LIB(boost_regex-gcc, main, [ - LIBS="-lboost_regex-gcc $LIBS" - echo "LIBS += -lboost_regex-gcc" >> $QT_INCL_PRO], -- [AC_MSG_ERROR([libboost_regex library is missing (boost package).])])]) -+ [ -+ AC_CHECK_LIB(boost_regex, main, [ -+ LIBS="-lboost_regex $LIBS" -+ echo "LIBS += -lboost_regex" >> $QT_INCL_PRO], -+ [AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])]) - - ms_CHECK_LRELEASE() - diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix deleted file mode 100644 index 90528b35140..00000000000 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, commoncpp2, ccrtp, openssl, boost -, libsndfile, libxml2, libjpeg, readline, qt3, perl, file -, alsaLib, speex, libzrtpcpp, xorg }: - -stdenv.mkDerivation rec { - name = "twinkle-1.4.2"; - - src = fetchurl { - url = "http://www.xs4all.nl/~mfnboer/twinkle/download/${name}.tar.gz"; - sha256 = "19c9gqam78srsgv0463g7lfnv4mn5lvbxx3zl87bnm0vmk3qcxl0"; - }; - - patches = [ # all from Debian - ./newer-libccrtp.diff - ./libgsm.patch - ./localetime_r_conflict.diff - ./boost_regex.patch # modified not to use "-mt" suffix - ]; - - configureFlags = "--with-extra-includes=${libjpeg.dev}/include"; - - buildInputs = - [ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile - libxml2 libjpeg readline qt3 perl file ccrtp - # optional ? : - alsaLib speex - libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext - ]; - - NIX_CFLAGS_LINK = "-Wl,--as-needed -lboost_regex -lasound -lzrtpcpp -lspeex -lspeexdsp"; - - #enableParallelBuilding = true; # fatal error: messageform.h: No such file or directory - - meta = with stdenv.lib; { - homepage = http://www.twinklephone.com/; - license = licenses.gpl2Plus; - maintainers = [ maintainers.marcweber ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/twinkle/libgsm.patch b/pkgs/applications/networking/instant-messengers/twinkle/libgsm.patch deleted file mode 100644 index 1574273feb5..00000000000 --- a/pkgs/applications/networking/instant-messengers/twinkle/libgsm.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: twinkle-1.4.2/configure.in -=================================================================== ---- twinkle-1.4.2.orig/configure.in 2013-07-25 11:07:54.264533206 -0400 -+++ twinkle-1.4.2/configure.in 2013-07-25 11:07:54.256533340 -0400 -@@ -195,22 +195,33 @@ - - # This check does not work on all platforms - # Check if libgsm is available --# AC_CHECK_LIB(gsm, sf_open, [ --# AC_CHECK_HEADER(gsm.h, [], --# [AC_MSG_ERROR([gsm header files missing (gsm.h)])]) --# AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the library.]) --# GSM_LIBS="-lgsm" --# echo "LIBS += -lgsm" >> $QT_INCL_PRO --# have_gsm="yes" ], [ --# have_gsm="no" --# GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a" --# echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ]) --have_gsm="no" --GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a" --echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO -+AC_CHECK_LIB(gsm, sf_open, [ -+ AC_CHECK_HEADER(gsm.h, [], -+ [AC_MSG_ERROR([gsm header files missing (gsm.h)])]) -+ AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the library.]) -+ GSM_LIBS="-lgsm" -+ echo "LIBS += -lgsm" >> $QT_INCL_PRO -+ have_gsm="yes" ], [ -+ have_gsm="no" -+ GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a" -+ echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ]) -+#have_gsm="no" -+#GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a" -+#echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO - - AC_SUBST(GSM_LIBS) - -+# Check if libgsm is available -+AC_CHECK_LIB(gsm, sf_open, [ -+ AC_CHECK_HEADER(gsm.h, [], -+ [AC_MSG_ERROR([gsm header files missing (gsm.h)])]) -+ AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the library.]) -+ LIBS="-lgsm $LIBS" -+ echo "LIBS += -lgsm" >> $QT_INCL_PRO -+ have_gsm="yes" ], [ -+ have_gsm="no" -+ echo "$(top_builddir)/src/audio/gsm/libgsm.a" >> $QT_INCL_PRO ]) -+ - # Check if ALSA is available - AC_CHECK_LIB(asound, main, [ - AC_CHECK_HEADER(alsa/asoundlib.h, [], -@@ -348,3 +359,4 @@ - AC_MSG_RESULT([Speex: $have_speex]) - AC_MSG_RESULT([iLBC: $have_ilbc]) - AC_MSG_RESULT([ZRTP: $have_zrtp]) -+AC_MSG_RESULT([Libgsm dynamic link: $have_gsm]) -Index: twinkle-1.4.2/src/twinkle_config.h.in -=================================================================== ---- twinkle-1.4.2.orig/src/twinkle_config.h.in 2013-07-25 11:07:54.264533206 -0400 -+++ twinkle-1.4.2/src/twinkle_config.h.in 2013-07-25 11:07:54.256533340 -0400 -@@ -19,6 +19,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_HISTORY_H - -+/* Define to 1 if you have the library. */ -+#undef HAVE_GSM -+ - /* Define to 1 if you have the library. */ - #undef HAVE_ILBC - diff --git a/pkgs/applications/networking/instant-messengers/twinkle/localetime_r_conflict.diff b/pkgs/applications/networking/instant-messengers/twinkle/localetime_r_conflict.diff deleted file mode 100644 index 3fbc2eb0cb1..00000000000 --- a/pkgs/applications/networking/instant-messengers/twinkle/localetime_r_conflict.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: twinkle-1.4.2/src/log.cpp -=================================================================== ---- twinkle-1.4.2.orig/src/log.cpp 2009-01-18 09:35:28.000000000 -0500 -+++ twinkle-1.4.2/src/log.cpp 2013-07-25 11:43:08.901209713 -0400 -@@ -161,7 +161,7 @@ - - gettimeofday(&t, NULL); - date = t.tv_sec; -- localtime_r(&date, &tm); -+ ost::localtime_r(&date, &tm); - - *log_stream << "+++ "; - *log_stream << tm.tm_mday; diff --git a/pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff b/pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff deleted file mode 100644 index 9d07b3dbd6a..00000000000 --- a/pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff +++ /dev/null @@ -1,22 +0,0 @@ -Index: twinkle-1.4.2/configure.in -=================================================================== ---- twinkle-1.4.2.orig/configure.in 2013-07-25 11:09:16.000000000 -0400 -+++ twinkle-1.4.2/configure.in 2013-07-25 11:11:59.512418187 -0400 -@@ -66,7 +66,7 @@ - - export PKG_CONFIG_PATH - --PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0) -+PKG_CHECK_MODULES(CCRTP, libccrtp >= 1.6.0) - - PKG_CHECK_MODULES(XML2, libxml-2.0) - # AC_CHECK_HEADER(libxml/tree.h, [], -@@ -136,7 +136,7 @@ - #echo "INCLUDEPATH += `$CCGNU2_CONFIG --includes`" | sed -e s/-I//g > $QT_INCL_PRO - # libccrtp1(ccrtp) depend from libccgnu2(commoncpp2) and - # should include above flags ! --echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp1`" | sed -e s/-I//g >> $QT_INCL_PRO -+echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp`" | sed -e s/-I//g >> $QT_INCL_PRO - echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libxml-2.0`" | sed -e s/-I//g >> $QT_INCL_PRO - - # get libraries specified on command line diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 75995a6c5e3..0653558c940 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,20 +1,26 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l , libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }: stdenv.mkDerivation rec { name = "utox-${version}"; - version = "0.9.8"; + version = "0.12.2"; src = fetchFromGitHub { - owner = "GrayHatter"; - repo = "uTox"; - rev = "v${version}"; - sha256 = "0ahwdwqhi1gmvw80jihc1ba4cqqnx8ifjnzazxidfdky4ikzccmn"; + owner = "uTox"; + repo = "uTox"; + rev = "v${version}"; + sha256 = "1y26dpx0qc01mhv2f325ymyc3r7ihayrr10rp25p1bs24010azwn"; }; - buildInputs = [ pkgconfig libtoxcore-dev dbus libvpx libX11 openal freetype - libv4l libXrender fontconfig libXext libXft filter-audio - git libsodium ]; + buildInputs = [ + libtoxcore dbus libvpx libX11 openal freetype + libv4l libXrender fontconfig libXext libXft filter-audio + libsodium + ]; + + nativeBuildInputs = [ + cmake git pkgconfig + ]; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 2e3832b9ee8..71d1bccc2b1 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,20 +1,17 @@ {fetchurl, stdenv, dpkg, makeWrapper, alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, - libpulseaudio, mesa, nspr, nss, systemd, wayland, xorg, zlib, ... + libpulseaudio, libxml2, libxslt, mesa, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: assert stdenv.system == "x86_64-linux"; -# BUG: Viber requires running tray application, segfaulting if it's missing -# FIX: Start something like `stalonetray` if you DE doesn't provide tray - stdenv.mkDerivation rec { name = "viber-${version}"; - version = "6.0.1.5"; + version = "6.5.5.1481"; src = fetchurl { url = "http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; - sha256 = "026vp2pv66b2dlwi5w5wk4yjnnmnsqapdww98p7xdnz8n0hnsbbi"; + sha256 = "0gvpaprfki04x66ga2ljksspdxd4cz455h92a7i2dnd69w1kik5s"; }; buildInputs = [ dpkg makeWrapper ]; @@ -35,9 +32,12 @@ stdenv.mkDerivation rec { harfbuzz libcap libpulseaudio + libxml2 + libxslt mesa nspr nss + openssl stdenv.cc.cc systemd wayland diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 0d018c9588f..40ac0917797 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "ipfs-${version}"; - version = "0.4.4"; - rev = "d905d485192616abaea25f7e721062a9e1093ab9"; + version = "0.4.5"; + rev = "2cb68b2210ba883bcd38a429ed62b7f832f8c064"; goPackagePath = "github.com/ipfs/go-ipfs"; extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "0mm1rs2mbs3rmxfcji5yal9ai3v1w75kk05bfyhgzmcjvi6lwpyb"; + sha256 = "0lq4najagdcga0zfprccprjy94nq46ja2gajij2pycag0wcc538d"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "06iq7fmq7p0854aqrnmd0f0jvnxy9958wvw7ibn754fdfii9l84l"; + sha256 = "087478rdj9cfl8hfrhrbb8rdlh7b1ixdj127vvkgn2k3mlz6af47"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix new file mode 100644 index 00000000000..35e436eb715 --- /dev/null +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils }: + +stdenv.mkDerivation rec { + name = "epic5-${version}"; + version = "2.0.1"; + + src = fetchurl { + url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${name}.tar.xz"; + sha256 = "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm"; + }; + + # Darwin needs libiconv, tcl; while Linux build don't + buildInputs = [ openssl ncurses ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv tcl ]; + + configureFlags = [ "--disable-debug" "--with-ipv6" ]; + + postConfigure = '' + substituteInPlace bsdinstall \ + --replace /bin/cp ${coreutils}/bin/cp \ + --replace /bin/rm ${coreutils}/bin/rm \ + --replace /bin/chmod ${coreutils}/bin/chmod \ + ''; + + meta = with stdenv.lib; { + homepage = "http://epicsol.org"; + description = "A IRC client that offers a great ircII interface"; + license = licenses.bsd3; + maintainers = [ maintainers.ndowens ]; + }; +} + + + diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 4d7ebbfac2e..f8acc180700 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,34 +1,42 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, lua, perl, python +{ stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2 , libtool, pciutils, dbus_glib, libcanberra_gtk2, libproxy , libsexy, enchant, libnotify, openssl, intltool , desktop_file_utils, hicolor_icon_theme +, autoconf, automake, autoconf-archive }: stdenv.mkDerivation rec { - version = "2.12.3"; + version = "2.12.4"; name = "hexchat-${version}"; - src = fetchurl { - url = "http://dl.hexchat.net/hexchat/${name}.tar.xz"; - sha256 = "1fpj2kk1p85snffchqxsz3sphhcgiripjw41mgzxi7ks5hvj4avg"; + src = fetchFromGitHub { + owner = "hexchat"; + repo = "hexchat"; + rev = "v${version}"; + sha256 = "1z8v7jg1mc2277k3jihnq4rixw1q27305aw6b6rpb1x7vpiy2zr3"; }; nativeBuildInputs = [ pkgconfig libtool intltool + autoconf autoconf-archive automake ]; buildInputs = [ - gtk2 lua perl python pciutils dbus_glib libcanberra_gtk2 libproxy + gtk2 lua perl python2 pciutils dbus_glib libcanberra_gtk2 libproxy libsexy libnotify openssl desktop_file_utils hicolor_icon_theme ]; enableParallelBuilding = true; - #hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path + #hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path patchPhase = '' sed -i "s,libenchant.so.1,${enchant}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c ''; + preConfigure = '' + ./autogen.sh + ''; + configureFlags = [ "--enable-shm" "--enable-textfe" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 88e2ede631b..d46539a88b7 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.0"; + version = "1.0.1"; name = "irssi-${version}"; src = fetchurl { url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; - sha256 = "11x47ahkvzzx3xkvqak34235ghnpln65v13k77xx32c85nvb63kr"; + sha256 = "1nqrm376bipvh4x483vygydjzs05n4fmfzip1gfakq1vfqqfhshr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 911555fa6a6..877eb91624c 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -21,12 +21,12 @@ let in stdenv.mkDerivation rec { - version = "1.6"; + version = "1.7"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0d1wcpsxx13clcf1ygcn5hsa1pjkck4xznbjbxphbdxd5whsbv3k"; + sha256 = "1l34rgr83nf2h71mwzhv5c0x03msrwv3kzx3cwzczx72xrih12n7"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 31cad15296c..96b1b7d285e 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,31 +1,28 @@ { stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime, webkitgtk24x - , libsass, notmuch, boost, makeWrapper }: +, libsass, notmuch, boost, wrapGAppsHook }: stdenv.mkDerivation rec { name = "astroid-${version}"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "astroidmail"; repo = "astroid"; rev = "v${version}"; - sha256 = "0zashjmqv8ips9q8ckyhgm9hfyf01wpgs6g21cwl05q5iklc5x7r"; + sha256 = "0r3hqwwr68bjhqaa1r3l9brbmvdp11pf8vhsjlvm5zv520z5y1rf"; }; patches = [ ./propagate-environment.patch ]; - buildInputs = [ scons pkgconfig gnome3.gtkmm gmime webkitgtk24x libsass - gnome3.libpeas notmuch boost gnome3.gsettings_desktop_schemas - makeWrapper ]; + nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; + + buildInputs = [ gnome3.gtkmm gmime webkitgtk24x libsass gnome3.libpeas + notmuch boost gnome3.gsettings_desktop_schemas + gnome3.adwaita-icon-theme ]; buildPhase = "scons --prefix=$out build"; installPhase = "scons --prefix=$out install"; - preFixup = '' - wrapProgram "$out/bin/astroid" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - meta = { homepage = "https://astroidmail.github.io/"; description = "GTK+ frontend to the notmuch mail system"; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 346dba3acd5..7186917269d 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -32,19 +32,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "claws-mail-${version}"; - version = "3.14.0"; - - meta = { - description = "The user-friendly, lightweight, and fast email client"; - homepage = http://www.claws-mail.org/; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ khumba fpletz ]; - }; + version = "3.14.1"; src = fetchurl { url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "0nfchgga3ir91s8rky0a0vnz8cgj2f6h716wh3cmb466a01xfss6"; + sha256 = "0df34gj4r5cbb92834hph19gnh7ih9rgmmw47rliyg8b9z01v6mp"; }; patches = [ ./mime.patch ]; @@ -99,4 +91,12 @@ stdenv.mkDerivation rec { mkdir -p $out/share/applications cp claws-mail.desktop $out/share/applications ''; + + meta = { + description = "The user-friendly, lightweight, and fast email client"; + homepage = http://www.claws-mail.org/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ khumba fpletz globin ]; + }; } diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index 1aa30ddcb67..0606ed86e13 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, openssl, lua, pcre }: +{ stdenv, fetchFromGitHub, openssl, lua, pcre }: stdenv.mkDerivation rec { - name = "imapfilter-2.6.3"; + name = "imapfilter-${version}"; + version = "2.6.10"; - src = fetchurl { - url = "https://github.com/lefcha/imapfilter/archive/v2.6.3.tar.gz"; - sha256 = "0i6j9ilzh43b9gyqs3y3rv0d9yvbbg12gcbqbar9i92wdlnqcx0i"; + src = fetchFromGitHub { + owner = "lefcha"; + repo = "imapfilter"; + rev = "v${version}"; + sha256 = "1011pbgbaz43kmxcc5alv06jly9wqmqgr0b64cm5i1md727v3rzc"; }; makeFlagsArray = "PREFIX=$(out)"; diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix new file mode 100644 index 00000000000..d28144f92ba --- /dev/null +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, pkgconfig, lua5_2, file, ncurses, gmime, pcre-cpp +, perl, perlPackages }: + +let + version = "2.9"; +in +stdenv.mkDerivation { + name = "lumail-${version}"; + + src = fetchurl { + url = "https://lumail.org/download/lumail-${version}.tar.gz"; + sha256 = "1rni5lbic36v4cd1r0l28542x0hlmfqkl6nac79gln491in2l2sc"; + }; + + buildInputs = [ + pkgconfig lua5_2 file ncurses gmime pcre-cpp + perl perlPackages.JSON perlPackages.NetIMAPClient + ]; + + preConfigure = '' + sed -e 's|"/etc/lumail2|LUMAIL_LUAPATH"/..|' -i src/lumail2.cc src/imap_proxy.cc + + perlFlags= + for i in $(IFS=:; echo $PERL5LIB); do + perlFlags="$perlFlags -I$i" + done + + sed -e "s|^#\!\(.*/perl.*\)$|#\!\1$perlFlags|" -i perl.d/imap-proxy + ''; + + makeFlags = [ + "LVER=lua" + "PREFIX=$(out)" + "SYSCONFDIR=$(out)/etc" + ]; + + postInstall = '' + cp lumail2.user.lua $out/etc/lumail2/ + ''; + + meta = with stdenv.lib; { + description = "Console-based email client"; + homepage = https://lumail.org/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [orivej]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 57f633d2c99..18ea017cb8c 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -2,19 +2,20 @@ , cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb }: stdenv.mkDerivation rec { - version = "20161126"; + version = "20170128"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "10ycfya11pvwv0rdyyak56r6f8ia8yf0h8qyi904bbpvm8lqvqfd"; + sha256 = "082ksn4fsj48nkz61ia0hcxz3396p6a4p9q8738w15qkycq23c20"; }; + nativeBuildInputs = [ which autoconf automake ]; buildInputs = - [ autoconf automake cyrus_sasl gdbm gpgme kerberos libidn ncurses - notmuch which openssl perl lmdb ]; + [ cyrus_sasl gdbm gpgme kerberos libidn ncurses + notmuch openssl perl lmdb ]; configureFlags = [ "--enable-debug" @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { "--enable-keywords" "--enable-smtp" "--enable-nntp" + "--enable-compressed" "--with-homespool=mailbox" "--with-gss" "--with-mailpath=" diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index c1a32341ffe..212d366facb 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation rec { - version = "0.23.4"; + version = "0.23.5"; name = "notmuch-${version}"; passthru = { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0fs5crf8v3jghc8jnm61cv7wxhclcg88hi5894d8fma9kkixcv8h"; + sha256 = "0ry2k9sdwd1vw8cf6svch8wk98523s07mwxvsf7b8kghqnrr89n6"; }; buildInputs = [ @@ -95,6 +95,7 @@ stdenv.mkDerivation rec { postInstall = '' make install-man ''; + dontGzipMan = true; # already compressed meta = { description = "Mail indexer"; diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix new file mode 100644 index 00000000000..17d66ba6043 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl +, notmuch, openssl, pkgconfig, sqlite, xapian +}: +stdenv.mkDerivation rec { + version = "2"; + name = "muchsync-${version}"; + passthru = { + inherit version; + }; + src = fetchurl { + url = "http://www.muchsync.org/src/${name}.tar.gz"; + sha256 = "1dqp23a043kkzl0g2f4j3m7r7lg303gz7a0fsj0dm5ag3kpvp5f1"; + }; + buildInputs = [ notmuch openssl pkgconfig sqlite xapian ]; + meta = { + description = "Synchronize maildirs and notmuch databases"; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ ocharles ]; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 5d385eeb950..556101f6f95 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -1,585 +1,585 @@ { - version = "45.6.0"; + version = "45.7.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ar/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ar/thunderbird-45.7.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "7a2976d272ecc0a3727e34b0841865fea6de9f05195089aa912831836c6f74b9fd34de0ed327cf96cf5b8c0e39829e2db5dd364a92e4ffc48e7139a0fd9cf066"; + sha512 = "e1c0092e9068c5b687443c66e51d0a66821b509d554ae49563ceb5ca7f9f1429b47b084d39d9b8c7726aad79d61ad09b3b256118560b77ae9a179152d4914147"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ast/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ast/thunderbird-45.7.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "fcb1efd553617825e5ca55afe56a6e36cd8a0c067f4e851c6527058fe1b8169da2e548932e21bc7a52eacec9fa2c55b0cc1369a850a9927ba6c686ed6f5940e6"; + sha512 = "0dfa480291f654fcd3af50711b3634202b81e9661a037a98d1e32e7b51bdc0395331fa99d8806a49873f23a02be95a383bfbdf001f905eac42d9b132d1e170ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/be/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/be/thunderbird-45.7.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "7ca8e07771a984510f2114bcf58397e49e6d64013dfba94e3312ad926e05afb01dc5beced22e5c00f0e43d742752f8a96b5ef167f4d892a01fbaedc194b76d49"; + sha512 = "fd705a8bdbe5bb6e8c7e120495021b538f75ca8d5c485d9d224392808c5397e149004c2262e2dbf982d5248a7ab036ed82980665be7628cf87e789b5d4ed4e19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/bg/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/bg/thunderbird-45.7.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "fe717fc5590f420e13a0c8bedba031b8ed5e2379ddf613fc14d82f718afe9341d953baf4f056fca88366248a5f3777cbcc3c12e5bccc33ac07698d3de8306370"; + sha512 = "f6ceb36dfd93e10b29a8d5322604c1fe17d1ef96113e79bd3c5a0f9912b4a77f8a182f676919ad5a58c15ef9555fc2ab07d8c2f375654057cdf2efc0be9a1ea1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/bn-BD/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/bn-BD/thunderbird-45.7.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "9e87ff7976eed19137767b0e9ee2b43b41701edc060201da8d54c68d40f26d88f07c3972d59d59e74191bf30163eec642d6b72f7e633fe48d5cc34f1624d7983"; + sha512 = "d3dfebeb5d6a301449130c94c7cbdea50e8c29c2571b408d89b3a632a164056605bc0e15dc2957f677d639ca9712088d94c62d26c0b2ade4faadb159978519c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/br/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/br/thunderbird-45.7.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "2c829c85255d15aa6ad9a941404290a546dbe7522877bfc0b9869415e6f806f853252bb646650d8a9f9729cfd139121dceafc4c1c052030ff7ff7b17e9cef4c3"; + sha512 = "1de73392b72d595504314e36c2c8cda7ee781a246dab443ba8f1cf46027c40a85a1e7a8626bfc46901940a08d89de69c2779a0702e5271da3f703aa299ae4767"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ca/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ca/thunderbird-45.7.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "452f701dd496fe6da40372188f7db2628cbe9b7db737b167d052a4dd75c668fb2505e68b6ec299b8a9d0e4cb448a57f8805aabd0d898e21cb67e89eba0163014"; + sha512 = "e481f63846a437dd1326820f455ec7c50ae56e638bc771814c4a53b5fcd7b397e0b6d7886965f4ebc94c15d33eeabb947c65a72ddad8ebd6a0549ec5df94be73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/cs/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/cs/thunderbird-45.7.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "2574febad30bf072d7a0674ff821ca35845d6a5fda09cfce9cff18960af210ded42370bd148324e3599b14977cea770e59e8425c1bf0e6a52824c52f0a864457"; + sha512 = "148114a531d1dd467fa59690836dee75e2640dca5b448175424d56224867676990561693e12faef7ea53b0e0a87cb039a5f7b35432901703f135cfb99f48e53f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/cy/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/cy/thunderbird-45.7.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "f07456acf596b6e3e98586177ebe41cdc09a7476c465371153062b394f0e89a0bf17ead255375cd0616c2db063dce3ac9aeba8d29f7e5906fc1c323000b49f22"; + sha512 = "6ee390cc87fc717cb1e413e5e2b46eb1f7335f617877f9c190075f808f9e0f7d21f59a41a651f2bce14323a46994c499056c6ba3308dfc28a2733f125e200a0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/da/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/da/thunderbird-45.7.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "7bda2aeb26814fc9b2b1afb4470ec17f0b069b779e99ddd3ee423ac3776ca47d23223009cd35d2f6e495e7b5523787a228fa55db6e56f0c724b45e5ba2bac9d4"; + sha512 = "1246c3338ec1c66ec0631cd3dd2e2ddfa2f55eaac2ebf36d6fc78a58cdafe15b5bb02c542447fa7aeac56eb9dce2501951b998c605844ce37fe8bb4868c100c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/de/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/de/thunderbird-45.7.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "7a9c629f957c74e54c2e82912836fc1f2688f37ceee43a31b29d1d4b9b2c477e7ebff3f4b4969386e7aee458215f22a76ede4abba9138fd8d64411a0bd7103d3"; + sha512 = "ba651c2f07eceb4c20a9997bd518c322b025467e3474a56c17e1c35ea9dab7c3ac08295f573cdb7c4967e531dfcaa76facf4185ecc12a66436690817c73c0454"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/dsb/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/dsb/thunderbird-45.7.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "666a64764cbd0f216f9b960f78b1e45d63c008332efd93b9e233842f37478d9c0f2d1faac494a5b28d43ff21a9e01059fa8b46554d05f47d919483b6d63befab"; + sha512 = "5fcbb029e59b50e3c8762acdcb561f3541a1056bd467f2830b316ef39b9f55f88797693ef4c281d8411c678bfbe86abde74483f0b9418e185fe80463487da489"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/el/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/el/thunderbird-45.7.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "02a7f06adfb93ee1694e0389e01b6bd2fe51e5e2379cf3c0fd34b8c7c8d7f58a848679fae19a7cea851bbfcf96fae493a020701841b2753678a142e3925b56e8"; + sha512 = "36fa1fe8d3b52ee95275acfcda8eeda175f9ff5d44b7fcd0e33df2a27fd4c815d79b647265e9c32bfdcd9f1900bc98195bee6de5e580abb452ca47003a438b40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/en-GB/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/en-GB/thunderbird-45.7.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "1e45378d32c04db6b802480e245663f3c4522105da6c548d6ff1e5eebead55f53322909b87ecf0b97b85fab30b684ef8e9f3c0175a033824bccadffbb42cad7f"; + sha512 = "15973247dab22789b8c63f5617fd1d85aa2a889e78d1bfd8ade002d769bf81857cf7d84c6302c168c5923ccdd08ea561df4fca1f17f0fe3337608af161c6e86e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/en-US/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/en-US/thunderbird-45.7.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "ab06b894f881ebc847cdcc11ffabcf7d9b626da9ce17c4195e7c401963bb3937b8a05eb73ea2fb988662f318568af3ad7142d3fc556cfe139d4393249c353446"; + sha512 = "4acce7404bad1bef72d1ba0630a6d9e7678716121b5520d399c3e47096a5b82c03b797a3680428d1c8447121d403de227d7f327001a27092db8df438f1d88d18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/es-AR/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/es-AR/thunderbird-45.7.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "07be1c0f88aa49a8264bfccbc6db3e738dcde83d93f86939bf3ffb5f85c835252f2f4a74a8cb3eb5d2ea6a1b4af31d3d84418090a23be36aa11965cd4ed67b66"; + sha512 = "68e7e8b134d6b3a6b44ecf9deaaa4fe58a2ba2324621722300eb39c74f6d4801edb7532ff81a2a22f473b55d227caefce4e5460b9527fee2bc7e9b765b4a66e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/es-ES/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/es-ES/thunderbird-45.7.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "2c51ff6931dea175ad6d8eb64c768792f61bef1cb5762efa3e7261cbf14c7619c81ef44a8d6e1ebe7d9764d2608b85e6ddbe47ec437f500c65037d6be8341d88"; + sha512 = "80517102d930a0613254f5f2ebbccfadc27606664e957b217e899b2d519f1a7fd189caa17756ae9849f870b97ed8a589c327d3239d2312368a94583434a31bf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/et/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/et/thunderbird-45.7.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "e726a397cecb1d624fef5840b89a177591c8a10d397042b2c5f47574d9b88d0725a1b53999e2d268a67c4efd1b4551ffa2052398c1ad14903a8b0217b5b353bc"; + sha512 = "3399aaf7a8eb812b4ed4c56e8e6619c9e7018e552bc810f9a20773854cdaaa3a4382754fafde2809bb945885059c1613e3832071bdc55d32816aac49e38acc9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/eu/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/eu/thunderbird-45.7.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "85c2fdc7e27a8298d8e553f221595ae0d7872eae4e78d143d533a18582d8f40195db38f179aa2ed558e790fb7c58510a8ad6037c698ab149d3bd582e34528e5c"; + sha512 = "4b7ace6485b3d9f14a924a9827226c3337f4b95107b94e51925524aea6eff2d446868f7a7f350c22ef7dec0c3c04c0fbb79f9eac9c1db0070195ce402559b3c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/fi/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/fi/thunderbird-45.7.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "ad4516f11670424d31e7fc5c9b12bcf1f0c63110b81ab45a3c5b5a897e1d0a3ce1855117254902ca177a04fc422c193c742098a431dbd8b760bdefe1d7c4c6a3"; + sha512 = "42330fa494ff9e09ddddaa5828fd6e984f4e016d45f90638a72d958f1d0d52458c4d66492c4bf3a9a57fad32ebb24ecd4d43efc51795f738f50d7385b3090015"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/fr/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/fr/thunderbird-45.7.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "4abb3fd8430867262811a4aa56304666ad6a1336959afff73fcdc38f157505975d6c340219db4980157f38dcb4b2596cdf623f311f6fbd29e613a89bed35beca"; + sha512 = "53696b4b77c2dfc4eeb03059429dbf38dc31910664ef7638ce291adee5d9e0bcfb1b8a19524a96fed02594b664d125e9c4791aac674c03e9dbb272544f429cb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/fy-NL/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/fy-NL/thunderbird-45.7.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "dddab8f7453bfc074f3cd8d6aea33402f66be1bec08ea7c152873af63c802e03edf01e74db236dac6e088f836f188258d3dc62fefa833ffc525ca15b71cfbf21"; + sha512 = "2c8a487a2a77451d2d4c239a16cdf114e1d9ef37d7c0a1f2dd2e3e9ba6270004e39fc38828b363805ac530b2f6cd3016594dfcccf2db37525f9700866d6a513f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ga-IE/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ga-IE/thunderbird-45.7.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "66acfc92a997ef6a2f1dfdf6a6952eebd7788b14d3080867349619b3f9559bbac4cfe6e983ad87900e089a0cb15dab2b9f77dcac69adb66ef0f97f9b5cc4e809"; + sha512 = "127d0cfc24b8e3e00aedee39aa400af198c7e48239fce97dde27416ac517108957d5f18735e5106eaba0433321f406ca9c82d774a83f1e58dc297b80e55a33dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/gd/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/gd/thunderbird-45.7.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "e4d2fefb8e7c0c14395af7f695e216f6fdb685ca150cb803a347228aaea988169a7093747e770921716123a9333bbc00560e6324ff2f4f966cd895c2fbe6e21d"; + sha512 = "48dca91d52b3f71a76c3a08003247bcfe498342b3e2e6158f58087251a9248959d17a7c91437475892a5b5124d9a76a1f0cc99c118e34c763ae4227fc4776dd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/gl/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/gl/thunderbird-45.7.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "6cc628399fa0adce0fe740e77a8e708988f7dee4d004bcb785fe567ca680fca79fde756e479cab9017828cebe48fa091e402d52d6bed54aae9cc5b6e28f246d8"; + sha512 = "92993f4090d641ee6573ec08c9ed25d3126e0e9796568aaa77296e859fd70069ce0f63f017fc08a3e01d65dd9864063f8ec089ee8e43197d511358b53259fb76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/he/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/he/thunderbird-45.7.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "82bbf5a5fe84953d9118948fe3e9d4d6a46ceaafe42f76ea3dda36134458d30f0c73f2ab61682d2627b8c3d598d2174d549d8b4b80bf5c3071627b57b713329a"; + sha512 = "c7e78d6aa2920fa81820b54a3f1047d42089e65fcc424ff663ef287cf581aec7b11fec33c309c88ae5986c9a78d3967dbc3cccd6efadbacfb145e36d2409e514"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hr/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/hr/thunderbird-45.7.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "c70dcfc8506132ce0764de325c8e0debafdc8460052bfa4901172f880b935d1c0bd70b1f7d227604f6bfd155c2ff165c1ad7a5b509d512483b54eff80e910a1a"; + sha512 = "0160db00133e4564b9ca0ddcb2771abd343bd3cef1bfc09303805bc0aaa01a5cbeeb6a23effd2e8256ae5457a2fddc149156d1702705531c728134845945dc56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hsb/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/hsb/thunderbird-45.7.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "5baeaa2ae960514551d062979cd60644971b6603ab33b9773a3eff10e267f0029b2edd5d48734dfcf99697ec77c88e12f4f240ea18a7433a0a2eb07f70283389"; + sha512 = "012f4544e60f7a917ffd49fd6668da548e6e44ce666a86f61cc0e36e53806db16496824bd20b253d079e27d5601ddb6cc1ee290c600e116c922bb842a2232294"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hu/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/hu/thunderbird-45.7.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "bbba8bfef9168efcf0aca6fa98596b3d7bbfaf456ceca263825d2f96b054d6dbc672e1086db645a48966f82cd0d6f4c85e9846935dc7b2595faeefa81c66904f"; + sha512 = "ff13587b1098f0d503c6f3b81c2a9f3c075d192517e0dee6d9fe324927a6dce8686d989a34c3d36cff7a8e2bd6a074aee5fc96f7527ec3fd78cc0c96f4279b2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hy-AM/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/hy-AM/thunderbird-45.7.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "b58088defd9a2f76aa779bf080135a5735e1531de065b1a3ac6f9048266e763bee8a22be634f435584d308aa5a532b72687bbddc8f7dedaca39642ed04137bfa"; + sha512 = "84f3ca15346c821dcb9efdcfbc2b599a68b608cf8dc28145e0aac80babcf3b82da456a0816f2e31ed47b19c47f3afa9a265f864de6662fdd4fa8586d520ea025"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/id/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/id/thunderbird-45.7.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "c83198b8ac60132f3124253c082ea0d5a45f1db7a7a6509ea18e3d084e26796364e6ced3c20675620cfc7f849b4e7fe342c86d0cea24eee48c815dc02730074f"; + sha512 = "2310cca9ced00d10b932eb6d27797b53e427f997671b836a5d03bc3f263fd469ea3dc5a2ba35a71da6b73e4dec83c60fc31203329562d6250ec573a38c55f115"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/is/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/is/thunderbird-45.7.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "285427b6f53c181889b78d005071f71211a2a51b6fa5f3eaf5a573a4a5e15cd83d946b97f3da89d383fd797a6985f8c1d589fe40e1267a73224848080af9b79c"; + sha512 = "710f180201035cde81d8e07cbc7e9e83289a160f6679393d2dd70c48c92f5b3568c0f7290e18613945abee052433f31c2b3b11019cb95cb8f6b23f04e985741d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/it/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/it/thunderbird-45.7.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "5e763b01fce3bb3ce5deaea0d3e4bb51b5cd752ab5fa191a064400f7961d237924b98013179f0d32017bc527478d665d6fbc74482680aaf041444d3c376497ae"; + sha512 = "d5596d86c425f2d1251947a6d66558d87ec22a20490db23c267c514b98ddb9acebc30180c6c29a242ead4bf079fb8e9bc35414210c1d294dc735923f0ab29d3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ja/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ja/thunderbird-45.7.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "7dd7b1f9fcfe103d8b70587e2a8307bec93766b504390ee138cab52bb8b8f76759af84568eccc71e5a88ee8cf3e326313930760cc92267ecf7e0fb29fc09f8e8"; + sha512 = "954e41ec6842e4ea40c84354a3499085d5fa754c0a8fe581fd0e1ddafb84c218b0afc6b84d6b89448573372ca8170563f4732eb0e00388d5daf918fc9eccab5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ko/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ko/thunderbird-45.7.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "1776ae557e7f7d6df013d178a68f969aee4da9de6049f0055e290a808da61af4bd712d7915ac05a04c159db93fab7d994bd0317a471dc0498c2b5c0b8696cf71"; + sha512 = "3b48ec21a87f4763e95a045f273b3077cc0f73f0cd79d0fd341bab93308ca6aa122aa1b6fe60cd9857e2af30f8b868a1ce56ca5e2418235b9207c33339abe66b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/lt/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/lt/thunderbird-45.7.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "499a710619b3e9f86fe7e77e35ddbfece5609af92d79b50b697ea8539cd0b198ec88702a7c19a9169cdb2b1dead19fe786d0af16bc6fe2b9f3e0414780a1e1e9"; + sha512 = "e314d8aebc993a9471610d885736e50a174905cdd862eacb3cc08516fda8538cd86afbe62744a7a28947f289cd9d3847436ac4be6966097c4e2d81f74bb3aa19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/nb-NO/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/nb-NO/thunderbird-45.7.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d97a5f532a000f3cf44e1b741a3a7026d07bf2c6012b4f6361021b81058aa93876304014d3d8d7181695c526cfd887523e217b7b502c493f5327bb4ba4d00461"; + sha512 = "2d14dad1eedc2b5043adca4d8ae9ddfa7bd7c4d9c246fb5abaf552f2bd1a27cd7d64638291a82391ceb84ba83c6c4f22f9ae09c7efc1c2530cfe986654b8b27e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/nl/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/nl/thunderbird-45.7.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "06df0ab52f6a9916bef1605283c7669a1afbe5ce7f6bed5746673ad5ad222034333bb41a6a1d81e87165105e3493d095bc90c5a910cb48041042367972dd9d61"; + sha512 = "fcde3900e201175fb9071b553f26dc49cad67888137df2e6ca4c7a85ffcf85aa23ca331bd4e5a3430b20615b2dbfae1ca4fe59833cd9d303f7ea6f8b73f42f64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/nn-NO/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/nn-NO/thunderbird-45.7.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "3509fbcb2955b226d869e43812665c7d2752956f68cff8cd4df3dbb3d0bda2b060218ede3eb9fdae285ed6765ce89c720793f905e09a97d6d22c2e36db890261"; + sha512 = "a3e41f8fe0486a691c413104fe89009db9e4709821bac4a7062a78a6a30b083fed5a522c6d5b7c004e0e9b2131aa4bdbae85e8dae3300d2f81fd875981d79b44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pa-IN/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/pa-IN/thunderbird-45.7.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "b113f1134df372dd4d369eb9d4c9c30dfe15fc8d65c153ca2087a6ce3ade368554ea2e9561b7d4642f7ec52247071bb323649e884ebd89b8472bc046c1e3be5e"; + sha512 = "841cf7f21b436d1194c4082ec0fd0067bed7ae625299b8f07f535708005ea3a7c217f4a6d3acd8b392e620ebdd15447f62f969c4e0c8e40e69f77c3b89402517"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pl/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/pl/thunderbird-45.7.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "4ea27afc66451ba40c8cfa22930598925dc18b4b074ab190d8c8866d0f516e9887e8c006ec1564b490a79f67b0b2c88d3fdfa616727e36bf705d780af82a27f3"; + sha512 = "026002b4161801b9ba44442ac2b54f0897b6fd3dea3c6819a16c5b886c829308558917470e87eba1e7bfa9adf6d5a33dcce4645f24cec8b8cf7ef4773d924e65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pt-BR/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/pt-BR/thunderbird-45.7.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "263ac30d26e20733eb332c6ae6837e3ebe7b8c41ff1cc15e47951f22e89873a620218e9caa2a3cfb74a93e619575a4812b362d4908372fd3ce05406d7ef295d5"; + sha512 = "7b78eed009541c2b5e99fac1c6267f42511feab8cd26b8c6cd758c8cc4fade84195da5b4ed1dd44ba078c3ae6a3d2aeed0bdd04e37a48f585938765a7e14021e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pt-PT/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/pt-PT/thunderbird-45.7.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "90ed68c12871e11165f9357a1e836fe8cf872bf654303c07e26f1bf30979d756e9fe6f034b4265d8f22fe8d31853ba76a983a8c7fe3759d7793f904f8cd0f788"; + sha512 = "15f5f46ad34ab5506d462c68ae5a2c0ab1548b8588ac877863ca73c97166d10ed26a6af32c9f0f57bb94da7b0c025813585a17e52dd3238b49344995905bb705"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/rm/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/rm/thunderbird-45.7.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "ba6aa5a07a06e57a4241f1e9962f4a28b4221032b8b3220cbfec2f3675f808367c586da0fba987e7d1309bb3bcc4d2ed48ea8ef98a6f4a3e65d4fd9fe06c527d"; + sha512 = "d0e70c192fdd0cc440f81173b13a09e6916355c2f65292c234e1da288e9a54ff1696e20c3a04f3a18fdb664d0fd76d8c477c7b19b0368a1d5dd889a5bfdf8f49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ro/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ro/thunderbird-45.7.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "caeecf69a9da3dfeb2c3ef8b0d8733e81e32ac201c0c5b60206160d47172863c91f2a0fddf3e7d2f707918934467c01a0dbbe1f63e3859a7106974b3a5f084a8"; + sha512 = "0bd336fa6f8e1f22e8d9f8e10071518a91922d9f8b75d4e462cda1ff9a7e6a744a4d8b4412dd3d1f5617553cea67bf73599b5023dd205437ff3aa26854916e24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ru/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ru/thunderbird-45.7.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "22727502ca4dec94470a71456c19ffd7f01b75118480ae67ed4849510bf77c8ec1359ddb0233e41c1b1dbad219ad5111d0b11c6c7ae7258ec10167f27b08f197"; + sha512 = "61a02467ee16e6a14b535be1b4a3ce2fa3a6bc6a61c2804e234242758361182df976f7edd0c8080637f3403436b018946c28668da09ecb9322c0eaa5fe395ba1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/si/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/si/thunderbird-45.7.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b872fb53f0380f77dd4dd87ccde7151db206adaa81801aa907db398df1a51bf3ae65510c452b035cf71c9000dd949106c9d64f44cbde7f1419cc41e403ac6d29"; + sha512 = "823e069b47f42c35c194bbfae832f71203e78f14057223bc569d8a18bc631d2d5bfdc3dfe5cb18c0bbae561b39023cb43dc26bf841a0e20e53bf336128bc1210"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sk/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sk/thunderbird-45.7.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "32b1e962e7e4e6aa8d198e080a09b43d21cb307bb8a3af50fc7170748604ce3b6f96b5f59b56b5c0edd61f7af31ccec9446aac50ef9eb94e5ef7a48c71e99541"; + sha512 = "c3bf6785424419f7a1240c2069abafcd1275dfdf8908fe2e80dbd395176328e7c8c0c2cad9ce7ef46a605bae9e153e6c98fa696145fe7a186e30c7a2b147dde2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sl/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sl/thunderbird-45.7.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "c9192435795c677aae642884e773362d17e5afd8e5943e2759d1486e4ca5bddb35be3c99a4b6869aa7018db4bffa09f0b63e500eb26a00cd35c141543eec0a00"; + sha512 = "bbf63ca0e0992c5102b047c5e41dd9a2dd04d38bcbb983393345a54679ddf100496082804d17c088f6dbb76bcaf1d9be39f0e45d1e1cb0abc33fef98a79bde7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sq/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sq/thunderbird-45.7.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "2150abcdded45107ce54ee58f55bbb78f9fdd0fae143fe423e14f4debfa4819c23b021c8d4d36dfe606e206d3dc3deda0671cd08f6d82f7ceca7e7591e7df3a6"; + sha512 = "68f2977a84aa0a1fc94b19a3504733cb4168d5835244482e775b0200cc0e17a548cb3f4e29d81edffb9172d3faced2a8d459709ddb90e1957c6c05ff792ce05d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sr/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sr/thunderbird-45.7.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "a9bdf3062d72095d080ad309f25bb8aa27635d3497fd99e6982ae3ba635f61c97e66fe9aefb88466f6f22c6e691692d70abe00c10294353d88fc288111dad6f1"; + sha512 = "d0de9ea4f4cfb619d37b957b4260477522ae1c2df9af19e6001672f7f693015c09e8e74ff0278d0107abbb0483de0c9f6d251efaa3d9175947beb8c156145ae8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sv-SE/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sv-SE/thunderbird-45.7.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "4353836558baf234d4dd3376a6262ac0af576f16d725c71ec5eb994a72599e748d2334cb916a3050db8f719aa68f2f9d7204aaa4a41ff9da339db933fb64d496"; + sha512 = "db4af37830a458808b9450b414b7e25aede621c602b344cfbb62f00fb610747ee48fe3a7aceb1a58c0b1fc397415ea7a9e0888e0cbd7116922f2bc28d09c6426"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ta-LK/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ta-LK/thunderbird-45.7.1.tar.bz2"; locale = "ta-LK"; arch = "linux-x86_64"; - sha512 = "9f4c8192c6d683325efcfed3d5ccea7218e2eaf3193ccde00be8542f13e8b3771d2a3690ff212cabaef067452f72061fb47a8184ef16fdf59d687e3b760126a5"; + sha512 = "1db6844293dce004878176cb76df68e7c7b3fd1147b4e78bf647d155d1a7efe01e5126c088c96d26f78dd2c9de98e0703b7eedef1f2de1584a0cb835f9123c1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/tr/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/tr/thunderbird-45.7.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "12f567a390f44a79af8615f677b87164d74172f7540ebe6d08023e017576493b0da5a63c466ffc2c3a4c406b0d9e8753e00aaa45dd1acb751621cbb8d9e53415"; + sha512 = "f05b1f63839a9d38431b9c1bce8a2f31ad242edc4df5b327f9f0a562dca1f94a9f3947ba55a517cca5dab9a96fc44b938496bf72086f1dd8d1399aa3170167a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/uk/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/uk/thunderbird-45.7.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "844e7ee825d304ae19edfbd4c324ba11c2037c9a97fc96f8b99da7fc3ad0137d3106069fdfb06814d2df20a75c6051416b52448ec56980858c70110676294f90"; + sha512 = "303d6b4ea136dba2217301f6c42bd91e45ff635ffa1ab38ec0633d963a1bafc1625475bbd24383e5b9dcf233a19ab0a712e70891614e14207b651c4e65016456"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/vi/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/vi/thunderbird-45.7.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "35c0fee2083c922284fc11a048150d53a343fe7980160d2c4cf2046e588056457b4e5876dfceb51b79a828886d9671a1934d51079c6d1e64e9af979927d9d8db"; + sha512 = "3f712c97073ff191bf2e16d61877711ca4faac204e85b2394015d53a4f600a3c0fa352787ccddf863379ebefce4020b3526f957f2556620e4632bcb20204421c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/zh-CN/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/zh-CN/thunderbird-45.7.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "039cb44b4e07fdaf6d9b1eb717baf798b3f3a3cf8726ce97b4fa7ab7e938b9365158597747e406916ae35150c9cf96af74590c5189a64ddfbf65740c1cd45c5c"; + sha512 = "d986a5e9a60512ca4d398fc4fb503aa7980947eee68dfcd5c4a73bcc8b324c20c6a3be66855eece6d0d77019e6b22d8ae220058948488d197063f55a291a8865"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/zh-TW/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/zh-TW/thunderbird-45.7.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "4721eed25de2cc71728d7cee651fdf51ef5b791873a3e59df2720c0f46269bf375e0e9456024ca4ec9ca31f8178b5af704e2fa9cb057860fa46b72ff4b22970c"; + sha512 = "7dee7ced1c48aa6019eb80c66d2c68af9b5afe89ba3c147bd83e78532fab84fbdba8afce934ef8bb55a82837b84475797cad25710001e22fa522823bc60d6a96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ar/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ar/thunderbird-45.7.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "e149770dd3229d3a00e56cd34848afbb1ff6765e66da4fa449156dc58c6990bd35e442ea8c14cf90e63541a34fbcfec8d8714350186e863ded72391b60622c69"; + sha512 = "0453a451bc0ef3704cf54121f7781f11c2a35c29fa407b36a1159bdb462daf35ac13da1cb0deca19b5b9456a4bc68c8bcfa12384dde82441a8e69c5376875d5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ast/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ast/thunderbird-45.7.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3bf557b9e9ce9f4b84e3407dfed2fbaaa280893033d4bee0724543b6951e0533050b8feeb0a01b4693140815ced705a5ef16e800d149f967bb39329dcbecb5f7"; + sha512 = "4bc10c64922604b95dfb310f0415a8e49552378c51025511265e7f1e7f2cf7bd8f9e9c6b3e45f8806f2df9fd02db451014cae4de7c2e5ce57e48dc1288cb30b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/be/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/be/thunderbird-45.7.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ace07c8982b68ed259b344aab73790fc9f90f98f39b65a57c6be7463c3918d545c4a0a6ff6df5b8ef7b7b07ae44c7e69a1bfa84c7cc82b9dd62bba075a2a113c"; + sha512 = "0fb8f8d0a2c7ea4455c0ff90b85e4ef6b0b6f8ccd08f9f9d4852743ebc1f6a6277011be82be979142097fe8cba853d244afad30749aaa423bd9ffcde9fc3a00a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/bg/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/bg/thunderbird-45.7.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "fed2ed25fe530939c4116daa3a3a09075812b005a937c36cab385bfb867d703a84feef50e2006f83009a25c0736c9b032c17605b2364d8fde4799d1e9f479b8c"; + sha512 = "6d586700050d399e4058eb03931bc6915ec56a9270462a7a60846f66b884aea9627526b87b14a654166e30b8a1d43412ba8acfcb12ba4af8d3fd4fd15d4d7cbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/bn-BD/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/bn-BD/thunderbird-45.7.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "84190d0cc6884f14ccf4ce06dbd69193f90591becd5d8064ea89c7ec12ec411bf766bff1bc5d5c6f142fa53ed2b9ce494718f7d32a74a027819de32381b24526"; + sha512 = "1cfa845129724a098cb913b3bcaf7174ab125321b35f58279ec9c11c04f7f991b37bb9000eeea4003cf033f6f0089992ebd0d7ebf1d6f8b4d7c558eb8c850d99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/br/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/br/thunderbird-45.7.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "619857fadb8721ccf103a3739a1336e2cafbfa62a0a2ab074254481d50f0d301f7718d47b5a3d42922fa562f1382de2aa8b5256bc62d829400926a494bc19403"; + sha512 = "951631129aff5cbfc2695e1a5dddd88e855d57716ce335a15ae069b7bb4572d082495ddad9caea202c5d36f46f599cdcb8f028def63252f7888fb2ba24f4437f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ca/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ca/thunderbird-45.7.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "3314b1129be6ce854a6b028849167af5f93c289073f962f5de09eb37fc7a2c40eb75b8b361289c879c4b7f752170f05a01dc6ae996bba4a5b706c1deb037cfc4"; + sha512 = "cae03ff18fb33f6d097836e5e7f5884f64e7c594eaaf77cb3a0e1f46214b878ef2de51c750bf1f849f5cfddc68da21c3fb72927ddf6824a89ae51e44378123fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/cs/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/cs/thunderbird-45.7.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "07d21c5f4aef38b9f7b330bf0c06f10ba3fc7cfeedcdd45e45ffb9ad4e5b1f729cb5d249028a87a8ce122da96c240447a6eed4be2220e302a2c55ac39cb1628a"; + sha512 = "ea9ec870c91cc2eaab758a3585e20779d24734e62c285f1f591646f9aba92e33c6a7966b0b1e484f28ba0a2f40d74f918dc899c87518f052b793fb5d1cc867ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/cy/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/cy/thunderbird-45.7.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "b2f86ed9ebfd8124611f6d9e20cf36322e36cecc2fea688649b9f6df231d65ed4cad192e12b7a27367b3b7706e510c5547c5bb22aedab76d420540cea9b81ee5"; + sha512 = "082d8f2fa527a75b8a388f84085a709cde9d9c455aaa2615f35bad0eb6962de0af163d515e0481edcbba29fb858095aebb05c0a3f25f33e1e14f7136b83a73d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/da/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/da/thunderbird-45.7.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "00ef125afcb33ebd5f11b765c9c3ea9e3e240e3416d00012cbf1b82377f8d610ab2b4aac800d7a0ae0f443447840b35d92e58600d83dfb6c6dd76e8ecabd3924"; + sha512 = "9ccb84b78ec7fbef596b64e76fae50bbc8af63eb0c0d37c6f81e1353f3afc242c0e3be9495d4b0125fc0500e0b4569df3e00d5e302f93f7007bcdf3089cf0c22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/de/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/de/thunderbird-45.7.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "05e1cae57b9a2e2fb274c2efc130e596c5f6c35ce14055156f728a662e9f8f5423a42708629726e0a70e3420aeb1d9b3b224c019cbbaa6f4a0cee69f78c740ac"; + sha512 = "a493f5e2c4c787f7c8f15d1d2da6f457a52af3deee161d3d9c031525eff48d2aeb294b6745e3ada079026f727db06baaca943d0711aeedb8df5bcd37c3f13286"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/dsb/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/dsb/thunderbird-45.7.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "dd0dadb02dd11dc9c39c6aa67eb995b786fdec47e966cb79177bde56400300b214ba90509a50ad839b36908da18829eb02431a4e1cae3e878dcb3debed258bc1"; + sha512 = "4d1e7a0bf3f55d913aaa47c37ed5529c59240168f2a53faa4367d3c47e900e136d25446b2b4e465d05b3857fdf3671e9bc7f98be6fe7b42c1ec926d0216d6022"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/el/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/el/thunderbird-45.7.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "12fc5fe4fb9fcccc295cd05c46850dab1ebfa81e0fc1ea073c493ef7c8db73e2c96999e9b1a29cda8f8cfa5437920f8a6b88d3b6911fd88dfde2673563e2afc1"; + sha512 = "145bf4a0db9b2fd3b16637fed966d6c0f0d184eeb7ce373024609b869219720f73feb0c10b13c761a4214a88d68ceeee234ac50694ac16599a92e2fe6ea61e4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/en-GB/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/en-GB/thunderbird-45.7.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "0e195cd68923d8b8bedb4028d17b08d029eecc82d0b40de575b55d573dda6227684043cf50c959c790746a6b38089e02cc996cc8a23cb31011c6fe4c3fd2ae89"; + sha512 = "1d3deeccfbba4a871a54eb4ad6077be1cf2e6fc7adb0ad0c04b3638db3b7fb3cbf66b55737befaef034d0b1671e9a53bdadc8d9ee7b3b9eb33a7c64e53ce5b2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/en-US/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/en-US/thunderbird-45.7.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "d3ceea1ef1e3562d682882b14f518f917143e4c4417ac07e8a474c52a57ccf0169fe1580355dcda0710e03c67b46eeb78fd59b31b831b8f431ef1a0cd9a37c2e"; + sha512 = "b1340885d6c92da79ad99f9f491ca1f15429aca73759d4e5055c212f33af96f7a7d4446eec6bc37ffcff4371213051188d7211c021da50f25b85fcf445ca58dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/es-AR/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/es-AR/thunderbird-45.7.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "19a3703f4f3fc5ce82ac8f69468fabb494ff663ed0b507af4a7cb74fcfefc5eb7e8090771392a800cbec88897c9c00315b457289eb1be860e1b47dff2f25a5d3"; + sha512 = "307473247bbcf0064380b4d9f9bb12ea796c32dfc012af2d4246466aab880dc040a92f06e0917acdf2f930a9df0cc0fce39b17e4ff710ea2311f4b2250b90f53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/es-ES/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/es-ES/thunderbird-45.7.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "706987651522f9c843c8771a4e58c474661da8a45104e1dfdd1b72be74c3a43d9eaaf4f9eb3661718c4237515afc90272c535579d0db1fa3715a29d03bef36af"; + sha512 = "3245ee600a95e1f59e8e7aabb521be96d88c1e59ae5cd29cc78825ed2c8c2abd1135dce1c2272d1eef2716717719947ca4b223359e1c56df406569b55226de61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/et/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/et/thunderbird-45.7.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "3ec0d0fa4ab85a3ce958b8c637e4d208f803e861f3b544d3f15a79ac1e1704efa963eb127f1687cbe5f4e75926bf1731bd9fd781a6e7fdda07035766eba8d39d"; + sha512 = "b1cd90842d3888e555799cef84bd2e8d3eeb0c73abd4af9bab2a9db2b24ee90770f39d1376e63df567f8ab63778f6cde305ea8ba2a070aad36d6809a676a2344"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/eu/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/eu/thunderbird-45.7.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "54eaeebfce0f0c805954be911c3ac666993d9bf927ccdb01ce0f322524451523ccb7d6d8fee473eebd9cac14d6653655de8f0e6861f8d4fb0953658cd808b74e"; + sha512 = "6278435a0f46cbd40514780beacda014c8528a79bb5d9be1366b0dd46dc71aa1f7a387311511e8d04cea3e78dd84157b97307df5bb69797b6d39cd299be18a33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/fi/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/fi/thunderbird-45.7.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "51d09e9b7ecbf4891ceee5fde9fe00ce2ac9cbf4a2fc0a3f1433e7004677d6fc35067734c3f0506362b346953423f71844937c1187db9194ebe952adad1abef6"; + sha512 = "000fbb4519ed626af2dfaec3d588f4ce567212b8a01c4aeae34b1f9e8ec6086ad45b90b57412fe830b8e236606d686e05c807e60bc2078df1364fd9f58d06d0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/fr/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/fr/thunderbird-45.7.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "0c3b9635cf107cdfb91c4cdc4771c25b112fd7d87341c88259a5670c5fa716e105cb910b1b6b85d8c22d518abba5a538f87250c8bb34c71df4cb98bf7026f8be"; + sha512 = "5120e880f297f8899ee6067660d65cf1ffd66d3ae6c16a888ab5e5e1b32f48a58aefef9a7023b1a8860987a5ca6399d69fd6df8e12838c00c305c3854c18582f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/fy-NL/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/fy-NL/thunderbird-45.7.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "45adb1b96d4d57c5302ca373f193b5a7e0a9f8577fabcb37c184bc8aaa66cdd4b0136e810af0ca8f1a7727fd51d60ee1006f6dc3e5fd182ff45056fc923d7d13"; + sha512 = "2e3b2a7cdcd4e5bcae6e46f86c5a4956f164ec37f4cb657ac18c1233c5b36b8c0f041e6930ea15adbcd8269662f9315e2822a9ed43be38a5fae8b7c747812035"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ga-IE/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ga-IE/thunderbird-45.7.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "4c3453566e747b57f94ef980a7d9b4d2a1c5b78584b0bcf1eea4d8c6b26ca177f18cf94811e5301a12e7de8939a11bbebe202683449b367f29a391a94d020cb1"; + sha512 = "b4567af9057eaffe812feb43fa195474094fe1c0d804eb79a9dc936b93662cdfafd1c1f4bba51adda57abed677473fe2bd5e5ce9523659c931035b617a1e3ad7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/gd/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/gd/thunderbird-45.7.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "ba0f0ee9c8a2a64c414e1621c8d5ce47194ef144f026e3306cf2c81d214fd0e1df541fea11dfdc2de7629cdc8ba2a4aaccb16dc7cc0c3404925177b893ca5d73"; + sha512 = "1200cfb333861d2bd5013cfa5c764f202b7a2febadff5f4c8c0bc648f744af19362b07147e720c06046d4ceae7fac186c5bc33c1b637104241493f960a5c307c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/gl/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/gl/thunderbird-45.7.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "f1d948b366842bfc2fd349ccae3c6c9f586fd69e99f0a0f9804bf3bff25ce6262451513952ad30f128626bffd6f9719d377868fb7d2fa56d8b6f54b2f4751ea8"; + sha512 = "10ec0d042e14c80d65af5ce7a271844553e4bfb96f349a16d94c5caed3c33fa35fb2065ec99b2ae1dfb7b1e47059f6f3ce730d6d293efdd380862fe18b03c877"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/he/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/he/thunderbird-45.7.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "1e0f048b272b4927d19f66390577ae2a37a32dadc24e36a7cdfd48e4257db09f5433c2812429c1700a5fa1f3630deb3c43db316de921d8e9be58f41388d2502d"; + sha512 = "7d7edbf3fd840fcf80c3d3491fcf9cbeed923b597840bdc16e7e43097cd5843554030e2690ff178f10ad97b0f447760bd06da87b4cae545dfb32c3b0f4668b68"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hr/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/hr/thunderbird-45.7.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "a821b66d67f32c84d0bf4172fb82ee487c13703122821042b00739890777573288c31c5178f4dfb6fce587eb58a19eaccd6f23b4b8f3d851fc203293674fb510"; + sha512 = "28a2e3e0dcabecced0a9b66a5e11434fcbabe11257508eb481513e56a82d13c5bf36e79d8174fcd0080b0b310df4ada6f92f3d24fb67658d40db66823d18e0a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hsb/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/hsb/thunderbird-45.7.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "c756ae475fc1964ae915a68313411ec8ab4a7d4744685de2ffeaaae33d58fcc08712657a2f030b1b358d02d9653c26478515ecbd915881e33cdaca9d9842fb38"; + sha512 = "760c99978bc2a326fa5e5d8f9b4a6fc9420a8a3c95251b42dc3db26bb399942a5fdd08f3eff3eaea9f3bc96ca85b0523abdae3f72b7400f8bed136e906a8e79f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hu/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/hu/thunderbird-45.7.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "d2f68c86f57fb9351c5c2ba74a8976bc89810634dbf5a521c34a553ccb6ff27eaf66fdc92e50c0f226246e9fc25316d4305feea1c3801513f418f58dff1955bd"; + sha512 = "4118ae0a62d7c8c6e68f7468040361091f98197c8135ba88ba9165ff3c807ae3ec8ac7e587224e9f45cb49290abe7c85aa11518714440db0f797f426fb73b5d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hy-AM/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/hy-AM/thunderbird-45.7.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "42ad523ad7f30638a69d8d549491af06ab9f740f8eb0b81e681236a09ce39de3758e2af61f2857293d085603f3530df3edaa23c19a014034528d3d130517fcef"; + sha512 = "664dade424cdca68158c98e531dc0b46ee5482f728b4f172684061da029c7dac76d80bcaa4c0228ff929a19e6bf11fd08890b3ed71fa6e23f442dba174de84da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/id/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/id/thunderbird-45.7.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "42a023e474e440b8201dbe5caaa7354546f89d5e4e9fcd34152dae93349bab8872f6060e5029fa629fd9853999ecf08688e51a2d9a16400265bc5c61a9abf783"; + sha512 = "58e48787ec26d8cfaa7be233055d95982d073ae8a1a01e4556d239e18598939ab6077f0aaa4b14051c6460730f89c1710a6dbb54ce5aaaa75967418f324073ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/is/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/is/thunderbird-45.7.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "6fe784f65ee584a1fb9fdc962be412e09ff43e88afa29365ddabf6a237ae7a1c854c05d5e3b3bbef83653fae94646c7a32144c2f7907304573b5f71e5f978ac9"; + sha512 = "77e95822a92855c41ed557574ab3f0e464d8be21146139a1cbff243ae76b035ae0912e92c07513d4c5fc9d522a2da1a738dc7ab790f9327ecc6d94c0d577a124"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/it/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/it/thunderbird-45.7.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "dae36c69bfa5cc80ad9489c76acdc6094f5fcd2c41f8c2f5dcd5d8d103aca564daaa96b27426f8096aaf555b6786f7d2c2227cbf1096d7eae53285b337d8221c"; + sha512 = "835a2059b02ffd019fefa2988bc2f05f456e5fc8b05badc7f5477a6958ba8fac1bc3539cc66ce6eca73fe86b4c70a172b609fa365e83593ff97405e9bbb533cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ja/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ja/thunderbird-45.7.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "c33ba443ee0556b28b60ba4517913d54a931cc2b63339262b35a1d576166e9abe1e7f6297f11683397a13f5c7b71cd96f97e60ad1a956aa27ba9fbd7f0c5fb43"; + sha512 = "11b6f0d2326bb89a6cf6d8452d2312eb8f7af616a0fcd43dd2b2263f52397c1c0a0a3ad7ceb67dd09b81a624adb95ed8a905bd7c9dba5f1d2a94114776257ff6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ko/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ko/thunderbird-45.7.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "0587a7bb7218b16c859717e99a3fd96e697b3a32dd322361edfbaf0b069522914e84b74160466d3b25fac76d925af485b9688fb5a3e072f1eff94dabb0239669"; + sha512 = "69f804d87a17072803b6e081dedcea57d633036299eaee9599b7df83604dd599234236b5b5b647da25c066633ee481e196fe9b219bc3da29d07b6dd55fdbf4f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/lt/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/lt/thunderbird-45.7.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "0789f1357a0c2a61fa676c9c375c79c29e78c3b3bf8faa2a392ec90714e1e581bd07eb75628284e6873c66553c613e7b43a18532a01cc66510f0bdcbef5f5b83"; + sha512 = "4534bc70c43b108e59d7e7c15cb53e32f54c20e0ad21a5c0e1d309b3fec32db870ab8cb268d59b8964c526c28382cd89753ccc978e34d0aedd5c87eeeb525a5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/nb-NO/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/nb-NO/thunderbird-45.7.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "906ebc96274cc490b82b434f648ba33f16a4f2b641e99142fcf18cd24701ed0b4b34558b2b380a0ff1d4ebe253ffd99d6b2cf4b9cf059a3f071c9e3bee94dd0b"; + sha512 = "13d4f6b638d6005ec854cac82b16c02dc347d0cd1eb804a056c106fb1031c11982973abbfbd319f4925264a1095cce8bede670f68c2efc9bd4be49ceb6b2f2a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/nl/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/nl/thunderbird-45.7.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "d18b521eddf0e71cecb33473275bb44038717cefadddc648441b0d4c7a01aaa08e45fad28e3eb74e8d01d1a637db1ef4d999d45a83c2fcb3aa3e7430b73b666f"; + sha512 = "b6e49ff5a473dee02bb749481924fdbb345be2d532119dde93f80396a29da726b0450e2f2ee522454c8dcef74b09dfcb57474264873b873beeaa6edc81853fb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/nn-NO/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/nn-NO/thunderbird-45.7.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "66f7b07352f7a6064d3a805d8d348ae4956240b42359a2d3fbd1d96291a025e1f4920ddcb0cd9312e1d8f146fcceae4e0d9811a9e6ae43479307aa204d8de8d3"; + sha512 = "3992cb6ca869e9470bb30042ba3c8d1710511a2170504a5a65cafa4a9091492903509ddd366c29f5e9e7ada9ac657416972002a297a57550a418031a7ed6ee0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pa-IN/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/pa-IN/thunderbird-45.7.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "828e57876a063979f945d0cee371b57e43d2f26eba4723a8983b448b85a091a303da068f17ba73f1eb23b35e06d9b3a37b56d9a3be49c202c950d2bd2ed9db05"; + sha512 = "6aca05743fe7383490cd94281fe1d0c64451832e128b8b3da5d2643bf59f05cdcfe2130ba5218f7e314ac7c55b126ad62d4d24f987b215bfe767a17d6a8eeeed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pl/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/pl/thunderbird-45.7.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "6ca824649b5f030423213dd573018af5b6a8033fa86b6b23c5b99e59afdd5234cd2c7a8237124dabbf75175511afff980dd3d971f59967c3522b633680d7277a"; + sha512 = "0b8969b08e11792c547d666843799459e27d3732f4e56ab64d7624df4360e6cf65fc2cce538ffd0a287f239cf6c57ebe7aad68bd397c0f56a85dcc499f35e4a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pt-BR/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/pt-BR/thunderbird-45.7.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "399dc86d31375ea3af21e6032b686ffdec65a3c0ca403d95bc89e0e7715e6c998dc846057ff4a6b919fda794a9fdabb53eafd7a07d8894a65e1109c9c52e43d1"; + sha512 = "4a921106175214b7fd029e27e19f4442a50076d08c2bf6f6ad4b27c1c37730d2f90ac4bd058363395777d336e5170bdd48276f71b0d253375d32daac9af66412"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pt-PT/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/pt-PT/thunderbird-45.7.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "f758fb69c99c02fe1bcab8c9a4b02eeebcc190c30e73f4b009521c36956cc7f076e1f544181a332807bee93ec39d7d170cca3f0d87fc6ed89b60a4515c394749"; + sha512 = "f64a4396570349d2f520f8eeca157a012e028cba1e3cf592f5e11807997b4501a2af829dd4920ffac5fee8c50bd691d037aa86bbe9396305352ed4710e854e25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/rm/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/rm/thunderbird-45.7.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "d338c243cbfa41e5b54195923bc12876e45683271df477d492058973dbc0f7352d59863a3bde571ab001612b8ce5704512f1bc0ad1e8af066f7aa448b5c89f0a"; + sha512 = "540d6db390cbe93dbb607f84286e445da5234b01c55846f3d3a91cc61d30d1d32f0216fbfefc0ab0d7a60c5369a63aaab385c73362adf1a0595db57282dad01e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ro/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ro/thunderbird-45.7.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "2c011b2cef9c5761c1297b2cc2dcd442ae9fd8d0f28d0f469aa2abbd6da80fe11bd607df8fb224ff03bd21932bdd40591532722756c467b498313da0f639c3fc"; + sha512 = "37cede489bb3082efa853f310dec5293baa411abcf15e9f193a760768cfc2b9f7be952bb6225bf901a0097bc19e77d9133c0e6dfed880c6e33cef250e80ff0f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ru/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ru/thunderbird-45.7.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "90fe536806f6e2ec20c470c72812ff8e54af58499ba220f9b6a5b6043c3a6072c78dc834c4204ca4e1f9d5ab71093296c958fe12409e50435136903f3ea3d544"; + sha512 = "b091376e3937712f5f92ac789dbe39b90e1b486b4409325341dadb06d4a4a3ff4fa9438d8da2fb5b7923beab4ec6b568d6be309cd22a68c277c822614205734d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/si/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/si/thunderbird-45.7.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "36fed4f969775870a3e224aef66b36d8b8f1adec2471b4b45d75c52318b9481bdd81a9f583589b4c5450045e4a8abff91f3fb9083f4bafd237c742015626291f"; + sha512 = "bb53ecebf56785d7ede52b7a0afed0a01e6248d537ccd8bcd236a837fed86b3f390cf9493f1c2d6d6d58c0d349cd6cfef2a59996fd7766ee77f25dc1af75faca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sk/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sk/thunderbird-45.7.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "e89ac23a25ae446f69e9c31478cc844253ba57de01893bd12b6b2bbe0e599fa09bf1506e9cfcbeab506998d81bc170fe1cff2d0e9aa13411299a5441d40d8959"; + sha512 = "c13c32cf17b0291bf049c2790fce2066e8b07aa2f30fb7bbecaf8cb88b4660bbf07506cb04e5aa8b756a35371d25c5a793b54d0134a81027946d35109e7714a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sl/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sl/thunderbird-45.7.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "6a74cc252d64d6d11a98af51e8fffc8a4bba8c74e2647afee9cfaae55ffcabe7ef9d82ee95a1a4d169fc057025c84f1253f455c6bd5e8f5fb9e33d7372c96a01"; + sha512 = "be0d2a0e501f074329b815f61c1ce04337499c7a88f58e3526e762b47c82ccd975c22063a363a338e22bfc12ad3403107751f66376b1d269101b660e391e7437"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sq/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sq/thunderbird-45.7.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "2ab4b18e5560eb495093aa0e5867f6e91148fe1cf7123f50306cb19b646b0834cde8cbd449df46f7e12b597465ee69910ad386e9920e26cdadc2085ca92e7af9"; + sha512 = "1aadc162591de3467af622c3e1fc7655885d7831d2faa470a5f53b2fb12a42dfbd44f3a942dc4089a28235942ba0e46749810a88adbb396e1417f7ed0fc07586"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sr/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sr/thunderbird-45.7.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "dc23ac3a9c3fc8b0105bdac2b14f24a0cd76b7f6c3bcd3994d979ef2db44a9f11bc2e5648148bd45008ea832261399898737b39727c0a61a03b8315aeede6bde"; + sha512 = "aab1299fb2e2b022bfaaa6403461bd2f5ed70d5fea77ea29936fea465984cc57bfa1ed5be1e8968138e757118d1caa3eb664388fddb04d0008abe932035c818e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sv-SE/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sv-SE/thunderbird-45.7.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "ebcac4ddcb84291613eeb64289e1f9f374a6085eb587df3cffc906dd7d7950f7564be1aed17c794d37f415840459b82c0c6edebefab2d8ba6f3e34c20426757a"; + sha512 = "11ce9c1b444adb242e826d4e1e8ab88e2272ac6b77f68f9d2a860c75e421c7b69f1841d0a4fef0b9b4d3a636678f0d57d5abb985f5fda6b5afd6cfb319f39b14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ta-LK/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ta-LK/thunderbird-45.7.1.tar.bz2"; locale = "ta-LK"; arch = "linux-i686"; - sha512 = "b164c7e70aa313517ecd85828a3734113f504f7e86ae615a24465a4334f41197af42b181f1f0048782d841422c3847eff1b8868450d190e362a36ffb5d1f2b6d"; + sha512 = "e46dff7831a6805917d2982347e4899aea9c726bcbf1e0b081c8ead225d585df1d0e9c485729d28483fd7ea8e0e5a47598fa9146f0138ed8ed65162c8191a381"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/tr/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/tr/thunderbird-45.7.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "6c3d65c4c277382961238e491f90e0f33a265614614428f2abeeb3779cc3b23b068d8ddf7f4a7c98a4c7497b22df79b3ba16ef0191b9cfb752aa24316d4fb8e3"; + sha512 = "158e4d49beae2af88c9aeddf5933e58a73541d0acc960d3965159662dd18ec876fd9a598b7bdba31261f8eeccf1595eb5e66ace3656658b3557c1482b7a4263f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/uk/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/uk/thunderbird-45.7.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "6754bead8887f244c6d87a6c76f45247933fae42fc74240c453bbef8acfa7a85ba282db4185c1fb6ec9e93115e3d9e4ac0ee113c00db9634f26a4eec6f79ea6b"; + sha512 = "0d298daa6b416b60b696d57ae7508f56749f1fdc7f8d4ca3514fc106b91567fcc3bf41881cce398d431c0aa0b6bb9d5913d25abcded8e68628fe54fae3cbec25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/vi/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/vi/thunderbird-45.7.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "34110501557ea23c1c854fbba9e6c043e25634f5993f34197b8d5842ee88d4717c87a0a8fe326a35dd12e74fcfbf9ddb0b6e7db0b09a058d710680e37cd5b939"; + sha512 = "f3e21ff0bf5b0b57bf6a3d1564ec0194c4c4b8987e0db89c84662e091131601526cd1b109e113fa8738d6b16d61220df1ef6c09acfd46c154de7e86dd9aa744b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/zh-CN/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/zh-CN/thunderbird-45.7.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "493073bee16e9e22db0d3c2700f13f1304129c28528a80fb9a548afbabaaa147b7ac46a254cc3b05619d47e94e61c29ff7cc80618c8af09b3659e6c91883c017"; + sha512 = "ad624ccf882b3703de853d67b9fb2d53fa4a69a20353638dc108750b35b486f2333307e7fb947e39a76f32cc204459347fe9c52e5c6c60c8b9210d9f7ca68632"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/zh-TW/thunderbird-45.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/zh-TW/thunderbird-45.7.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "7ac66a0ee967e7f87d084acda72120c65bb64c2572f42249b97baf9755b0b7dc314a1d88049941a7be86846f98f236cdfe54b87b22ff7f66b6099397788373b2"; + sha512 = "877e9fbfd4421fecb01d94142ae753c7b90b7a1430a01dfdfbf916e4505a1b647fc3f75d896558437e7d5c4ae3a0aefe0892881f4bec7ce9ab672d7b44c337b3"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 5f1483672b2..f71a6dff37c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, which, m4, gtk2, pango, perl, python2, zip, libIDL +{ stdenv, lib, fetchurl, pkgconfig, which, m4, gtk2, pango, perl, python2, zip, libIDL , libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx , cairo, gstreamer, gst_plugins_base, icu -, writeScript, xidel, coreutils, gnused, gnugrep, curl, ed +, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl , debugBuild ? false , # If you want the resulting program to call itself "Thunderbird" # instead of "Earlybird", enable this option. However, those @@ -14,7 +14,7 @@ enableOfficialBranding ? false }: -let version = "45.6.0"; in +let version = "45.7.1"; in let verName = "${version}"; in stdenv.mkDerivation rec { @@ -22,9 +22,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz"; - sha512 = "1f4579ac37b8ab98c91fe2e3e6742ba1b005ca9346d23f467d19e6af45eb457cab749bf91ed2a79f2058bd66f54da661da3ea5d5786f8c4b472d8a2a6c34db4b"; + sha512 = "aa1231169cfe243a257e6b9088281b85d0cf75207e3b9ebeda7792567a86f6098fb5c74dc397e3eeeb1925d221d2fb1b17df8762afd115eff9ad4d1370a49e56"; }; + patches = [ ./gcc6.patch ]; + # New sed no longer tolerates this mistake. postPatch = '' for f in mozilla/{js/src,}/configure; do @@ -138,10 +140,8 @@ stdenv.mkDerivation rec { }; passthru.updateScript = import ./../../browsers/firefox/update.nix { - name = "thunderbird"; - sourceSectionRegex = "."; - basePath = "pkgs/applications/networking/mailreaders/thunderbird"; + attrPath = "thunderbird"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; - inherit writeScript xidel coreutils gnused gnugrep curl ed; + inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch b/pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch new file mode 100644 index 00000000000..bd102220285 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch @@ -0,0 +1,75 @@ + +# HG changeset patch +# User Mike Hommey +# Date 1457596445 -32400 +# Node ID 55212130f19da3079167a6b0a5a0ed6689c9a71d +# Parent 27c94617d7064d566c24a42e11cd4c7ef725923d +Bug 1245076 - Don't include mozalloc.h from the cstdlib wrapper. r=froydnj + +Our STL wrappers do various different things, one of which is including +mozalloc.h for infallible operator new. mozalloc.h includes stdlib.h, +which, in libstdc++ >= 6 is now itself a wrapper around cstdlib, which +circles back to our STL wrapper. + +But of the things our STL wrappers do, including mozalloc.h is not one +that is necessary for cstdlib. So skip including mozalloc.h in our +cstdlib wrapper. + +Additionally, some C++ sources (in media/mtransport) are including +headers in an extern "C" block, which end up including stdlib.h, which +ends up including cstdlib because really, this is all C++, and our +wrapper pre-includes for mozalloc.h, which fails because templates +don't work inside extern "C". So, don't pre-include when we're not +including mozalloc.h. + + +diff --git a/mozilla/config/gcc-stl-wrapper.template.h b/mozilla/config/gcc-stl-wrapper.template.h +--- a/mozilla/config/gcc-stl-wrapper.template.h ++++ b/mozilla/config/gcc-stl-wrapper.template.h +@@ -12,33 +12,40 @@ + // compiling ObjC. + #if defined(__EXCEPTIONS) && __EXCEPTIONS && !(__OBJC__ && __GNUC__ && XP_IOS) + # error "STL code can only be used with -fno-exceptions" + #endif + + // Silence "warning: #include_next is a GCC extension" + #pragma GCC system_header + ++// Don't include mozalloc for cstdlib. See bug 1245076. ++#ifndef moz_dont_include_mozalloc_for_cstdlib ++# define moz_dont_include_mozalloc_for_cstdlib ++#endif ++#ifndef moz_dont_include_mozalloc_for_${HEADER} + // mozalloc.h wants ; break the cycle by always explicitly + // including here. NB: this is a tad sneaky. Sez the gcc docs: + // + // `#include_next' does not distinguish between and "file" + // inclusion, nor does it check that the file you specify has the + // same name as the current file. It simply looks for the file + // named, starting with the directory in the search path after the + // one where the current file was found. +-#include_next ++# include_next + + // See if we're in code that can use mozalloc. NB: this duplicates + // code in nscore.h because nscore.h pulls in prtypes.h, and chromium + // can't build with that being included before base/basictypes.h. +-#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) +-# include "mozilla/mozalloc.h" +-#else +-# error "STL code can only be used with infallible ::operator new()" ++# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) ++# include "mozilla/mozalloc.h" ++# else ++# error "STL code can only be used with infallible ::operator new()" ++# endif ++ + #endif + + #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG) + // Enable checked iterators and other goodies + // + // FIXME/bug 551254: gcc's debug STL implementation requires -frtti. + // Figure out how to resolve this with -fno-rtti. Maybe build with + // -frtti in DEBUG builds? + diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix index d8e417cdd3a..f4bd04e8a2d 100644 --- a/pkgs/applications/networking/newsreaders/kwooty/default.nix +++ b/pkgs/applications/networking/newsreaders/kwooty/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://kde-apps.org/CONTENT/content-files/114385-${name}.tar.gz"; + url = "https://dl.opendesktop.org/api/files/download/id/1466631747/114385-${name}.tar.gz"; sha256 = "10a9asjv6ja1xdjli2399dyka2rbia3qdm5bdpmcng6xdsbhx3ap"; }; @@ -34,5 +34,6 @@ in stdenv.mkDerivation { meta = { description = "Binary news reader of KDE"; + broken = true; }; } diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 620b8601d7d..cdafea3be79 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null); with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "3.3.7"; + version = "3.3.10"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "0h2ccqmjnm0x0qjvd0vz5hk7dy9qbqhiqvxywqjhip7sj1585p3j"; + sha256 = "1lm8y5k9363gajbw0k9jb1cb7zg0lz5rw2ja0kd36h68rpm7qr9c"; }; nativeBuildInputs = [ pkgconfig which ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "Free Software alternative to µtorrent"; homepage = http://www.qbittorrent.org/; license = licenses.gpl2; - maintainers = with maintainers; [ viric ]; platforms = platforms.linux; + maintainers = with maintainers; [ viric ]; }; } diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 05ec51d6681..d35f22c1839 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,67 +1,76 @@ -{ stdenv -, fetchurl -, cmake -, openssl -, printerSupport ? true, cups -, pkgconfig -, zlib -, libX11 -, libXcursor -, libXdamage -, libXext -, alsaLib -, ffmpeg -, libxkbfile -#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt -, libXinerama -, libXv -, pulseaudioSupport ? true, libpulseaudio +{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, pkgconfig +, alsaLib, ffmpeg_2, glib, openssl, pcre, zlib +, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv +, libxkbcommon, libxkbfile +, wayland +, gstreamer, gst-plugins-base, gst-plugins-good +, libpulseaudio ? null +, cups ? null +, pcsclite ? null +, systemd ? null +, buildServer ? true +, optimize ? true }: -assert printerSupport -> cups != null; stdenv.mkDerivation rec { - name = "freerdp-${version}"; - version = "1.0.2"; + name = "freerdp-git-${version}"; + version = "20170201"; - src = fetchurl { - url = "https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"; - sha256 = "1w9dk7dsbppspnnms2xwwmbg7jm61i7aw5nkwzbpdyxngbgkgwf0"; + src = fetchFromGitHub { + owner = "FreeRDP"; + repo = "FreeRDP"; + rev = "6001cb710dc67eb8811362b7bf383754257a902b"; + sha256 = "0l2lwqk2r8rq8a0f91wbb30kqg21fv0k0508djpwj0pa9n73fgmg"; }; - buildInputs = [ - cmake - openssl - pkgconfig - zlib - libX11 - libXcursor - libXdamage - libXext - alsaLib - ffmpeg - libxkbfile -# xmlto docbook_xml_dtd_412 docbook_xml_xslt - libXinerama - libXv - ] ++ stdenv.lib.optional printerSupport cups; + # outputs = [ "bin" "out" "dev" ]; - configureFlags = [ - "--with-x" "-DWITH_MANPAGES=OFF" - ] ++ stdenv.lib.optional printerSupport "--with-printer=cups" - ++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON"; + prePatch = '' + export HOME=$TMP + substituteInPlace "libfreerdp/freerdp.pc.in" \ + --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@" + ''; - meta = { + patches = with lib; [ + ] ++ optional (pcsclite != null) + (substituteAll { + src = ./dlopen-absolute-paths.diff; + inherit pcsclite; + }); + + buildInputs = with lib; [ + alsaLib cups ffmpeg_2 glib openssl pcre pcsclite libpulseaudio zlib + gstreamer gst-plugins-base gst-plugins-good + libX11 libXcursor libXdamage libXext libXi libXinerama libXrandr libXrender libXv + libxkbcommon libxkbfile + wayland + ] ++ optional stdenv.isLinux systemd; + + nativeBuildInputs = [ + cmake pkgconfig + ]; + + 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"; + + meta = with lib; { description = "A Remote Desktop Protocol Client"; - longDescription = '' FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP) following the Microsoft Open Specifications. ''; - homepage = http://www.freerdp.com/; - - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; - broken = true; + license = licenses.asl20; + maintainers = with maintainers; [ wkennington peterhoeg ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/remote/freerdp/legacy.nix b/pkgs/applications/networking/remote/freerdp/legacy.nix new file mode 100644 index 00000000000..d3746fa6c7a --- /dev/null +++ b/pkgs/applications/networking/remote/freerdp/legacy.nix @@ -0,0 +1,73 @@ +{ stdenv +, fetchurl +, cmake +, openssl +, glib, pcre +, printerSupport ? true, cups +, pkgconfig +, zlib +, libX11 +, libXcursor +, libXdamage +, libXext +, alsaLib +, ffmpeg +, libxkbfile +#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt +, libXfixes +, libXinerama +, libXv +, pulseaudioSupport ? true, libpulseaudio +}: + +assert printerSupport -> cups != null; + +stdenv.mkDerivation rec { + name = "freerdp-${version}"; + version = "1.2.0-beta1+android9"; + + src = fetchurl { + url = "https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"; + sha256 = "181w4lkrk5h5kh2zjlx6h2cl1mfw2aaami3laq3q32pfj06q3rxl"; + }; + + buildInputs = [ + cmake + openssl + glib pcre + pkgconfig + zlib + libX11 + libXcursor + libXdamage + libXext + alsaLib + ffmpeg + libxkbfile +# xmlto docbook_xml_dtd_412 docbook_xml_xslt + libXinerama + libXv + ] ++ stdenv.lib.optional printerSupport cups; + + preConfigure = '' + export HOME=$TMP + ''; + + configureFlags = [ + "--with-x" "-DWITH_MANPAGES=OFF" + ] ++ stdenv.lib.optional printerSupport "--with-printer=cups" + ++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON"; + + meta = with stdenv.lib; { + description = "A Remote Desktop Protocol Client"; + + longDescription = '' + FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP) + following the Microsoft Open Specifications. + ''; + + homepage = http://www.freerdp.com/; + license = licenses.free; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix deleted file mode 100644 index 5483e942076..00000000000 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor -, libXdamage, libXext, libXrender, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv -, substituteAll -, libpulseaudio ? null, cups ? null, pcsclite ? null -, buildServer ? true, optimize ? true -}: - -stdenv.mkDerivation rec { - name = "freerdp-2.0-dev"; - - src = fetchFromGitHub { - owner = "FreeRDP"; - repo = "FreeRDP"; - rev = "1855e36179fb197e713d41c4ef93e19cf1f0be2f"; - sha256 = "1lydkh6by0sjy6dl57bzg7c11ccyp24s80pwxw9h5kmxkbw6mx5q"; - }; - - prePatch = '' - substituteInPlace "libfreerdp/freerdp.pc.in" --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@" - ''; - - patches = [ - ] ++ stdenv.lib.optional (pcsclite != null) - (substituteAll { - src = ./dlopen-absolute-paths.diff; - inherit pcsclite; - }); - - buildInputs = [ - cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext libXrender glib - alsaLib ffmpeg libxkbfile libXinerama libXv cups libpulseaudio pcsclite - ]; - - doCheck = false; - - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DWITH_CUNIT=OFF" - ] ++ stdenv.lib.optional (libpulseaudio != null) "-DWITH_PULSE=ON" - ++ stdenv.lib.optional (cups != null) "-DWITH_CUPS=ON" - ++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON" - ++ stdenv.lib.optional buildServer "-DWITH_SERVER=ON" - ++ stdenv.lib.optional optimize "-DWITH_SSE2=ON"; - - meta = with stdenv.lib; { - description = "A Remote Desktop Protocol Client"; - longDescription = '' - FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP) - following the Microsoft Open Specifications. - ''; - homepage = http://www.freerdp.com/; - license = licenses.asl20; - maintainers = with maintainers; [ wkennington ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index ec31beb0080..c3eca16af01 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -10,7 +10,7 @@ }: let - version = "1.2.0-rcgit.15"; + version = "1.2.0-rcgit.17"; desktopItem = makeDesktopItem { name = "remmina"; @@ -22,41 +22,33 @@ let categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; }; - # Latest release of remmina refers to thing that aren't yet in - # a FreeRDP release so we need to build one from git source - # See also https://github.com/FreeRDP/Remmina/pull/731 - # Remove when FreeRDP release catches up with this commit - freerdp_git = stdenv.lib.overrideDerivation freerdp (args: { - name = "freerdp-git-2016-09-30"; - src = fetchFromGitHub { - owner = "FreeRDP"; - repo = "FreeRDP"; - rev = "dbb353db92e7a5cb0be3c73aa950fb1113e627ec"; - sha256 = "1nhm4v6z9var9hasp4bkmhvlrksbdizx95swx19shizfc82s9g4y"; - }; - }); - -in - -stdenv.mkDerivation { +in stdenv.mkDerivation { name = "remmina-${version}"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "Remmina"; rev = "v${version}"; - sha256 = "07lj6a7x9cqcff18pwfkx8c8iml015zp6sq29dfcxpfg4ai578h0"; + sha256 = "1vfg8sfpj83ircp7ny6xsbn2ba5xbp3xrdl5wwyfcg1zrpdmi7f1"; }; buildInputs = [ cmake pkgconfig wrapGAppsHook gsettings_desktop_schemas glib gtk3 gettext libxkbfile libgnome_keyring libX11 - freerdp_git libssh libgcrypt gnutls + 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 ]; - cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF -DWINPR_INCLUDE_DIR=${freerdp_git}/include/winpr2"; + cmakeFlags = [ + "-DWITH_VTE=OFF" + "-DWITH_TELEPATHY=OFF" + "-DWITH_AVAHI=OFF" + "-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2.so" + "-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2.so" + "-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2.so" + "-DWINPR_INCLUDE_DIR=${freerdp}/include/winpr2" + ]; preFixup = '' gappsWrapperArgs+=( diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 637f2cdca9c..d3c3b278607 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,69 +1,58 @@ -{ stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares -, gnutls, libgcrypt, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib -, zlib -, withGtk ? false, gtk2 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null -, withQt ? false, qt4 ? null +{ 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, ecm +, withGtk ? false, gtk3 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null +, withQt ? false, qt5 ? null , ApplicationServices, SystemConfiguration, gmp }: -assert withGtk -> !withQt && gtk2 != null; -assert withQt -> !withGtk && qt4 != null; +assert withGtk -> !withQt && gtk3 != null; +assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.2.3"; + version = "2.2.4"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; -in -stdenv.mkDerivation { +in stdenv.mkDerivation { name = "wireshark-${variant}-${version}"; src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2"; - sha256 = "0fsrvl6sp772g2q2j24h10h9lfda6q67x7wahjjm8849i2gciflp"; + sha256 = "049r5962yrajhhz9r4dsnx403dab50d6091y2mw298ymxqszp9s2"; }; buildInputs = [ - bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls + bison cmake ecm flex gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls geoip c-ares python glib zlib - ] ++ optional withQt qt4 - ++ (optionals withGtk [gtk2 pango cairo gdk_pixbuf]) - ++ optionals stdenv.isLinux [ libcap libnl ] + ] ++ (optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])) + ++ (optionals withGtk [ gtk3 pango cairo gdk_pixbuf ]) + ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; - configureFlags = "--disable-usr-local --disable-silent-rules --with-ssl" - + (if withGtk then - " --with-gtk2 --without-gtk3 --without-qt" - else if withQt then - " --without-gtk2 --without-gtk3 --with-qt" - else " --disable-wireshark"); - - desktopItem = makeDesktopItem { - name = "Wireshark"; - exec = "wireshark"; - icon = "wireshark"; - comment = "Powerful network protocol analysis suite"; - desktopName = "Wireshark"; - genericName = "Network packet analyzer"; - categories = "Network;System"; - }; - postInstall = optionalString (withQt || withGtk) '' - mkdir -p "$out"/share/applications/ - mkdir -p "$out"/share/icons/ - cp "$desktopItem/share/applications/"* "$out/share/applications/" - cp image/wsicon.svg "$out"/share/icons/wireshark.svg + ${optionalString withGtk '' + install -Dm644 -t $out/share/applications ../wireshark-gtk.desktop + ''} + ${optionalString withQt '' + install -Dm644 -t $out/share/applications ../wireshark.desktop + ''} + + substituteInPlace $out/share/applications/*.desktop \ + --replace "Exec=wireshark" "Exec=$out/bin/wireshark" + + install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg ''; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.wireshark.org/; description = "Powerful network protocol analyzer"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; longDescription = '' Wireshark (formerly known as "Ethereal") is a powerful network @@ -71,7 +60,7 @@ stdenv.mkDerivation { experts. It runs on UNIX, OS X and Windows. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ bjornfor fpletz ]; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor fpletz ]; }; } diff --git a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch index 35b54c79e8f..549da5436e6 100644 --- a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch +++ b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch @@ -4,7 +4,7 @@ Date: Thu, 26 Nov 2015 21:03:35 +0100 Subject: [PATCH] Lookup dumpcap in PATH NixOS patch: Look for dumpcap in PATH first, because there may be a -dumpcap setuid-wrapper that we want to use instead of the default +dumpcap wrapper that we want to use instead of the default non-setuid dumpcap binary. Also change execv() to execvp() because we've set argv[0] to "dumpcap" @@ -27,7 +27,7 @@ index 970688e..49914d5 100644 - exename = g_strdup_printf("%s/dumpcap", progfile_dir); + /* + * NixOS patch: Look for dumpcap in PATH first, because there may be a -+ * dumpcap setuid-wrapper that we want to use instead of the default ++ * dumpcap wrapper that we want to use instead of the default + * non-setuid dumpcap binary. + */ + if (system("command -v dumpcap >/dev/null") == 0) { diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index 23c226b9f8a..bcdc3cd8342 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -40,6 +40,8 @@ in stdenv.mkDerivation { cp -r "./"* "$out" mkdir "$out/bin" rm "$out/usr/bin/SpiderOakONE" + rmdir $out/usr/bin || true + mv $out/usr/share $out/ patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} \ "$out/opt/SpiderOakONE/lib/SpiderOakONE" @@ -48,6 +50,8 @@ in stdenv.mkDerivation { makeWrapper $out/opt/SpiderOakONE/lib/SpiderOakONE $out/bin/spideroak --set LD_LIBRARY_PATH $RPATH \ --set QT_PLUGIN_PATH $out/opt/SpiderOakONE/lib/plugins/ \ --set SpiderOak_EXEC_SCRIPT $out/bin/spideroak + + sed -i 's/^Exec=.*/Exec=spideroak/' $out/share/applications/SpiderOakONE.desktop ''; buildInputs = [ patchelf makeWrapper ]; diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 3190d999a91..ccd08e2844e 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { homepage = https://github.com/bit-team/backintime; description = "Simple backup tool for Linux"; license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; longDescription = '' Back In Time is a simple backup tool (on top of rsync) for Linux diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 4cd8c998d41..2daa846990a 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -11,9 +11,11 @@ stdenv.mkDerivation (rec { buildInputs = [ ocaml makeWrapper ncurses ]; - preBuild = if enableX11 then '' + preBuild = (if enableX11 then '' sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" Makefile.OCaml - '' else ""; + '' else "") + '' + echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> fsmonitor/linux/Makefile + ''; makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "") + (if ! ocaml.nativeCompilers then " NATIVE=false" else ""); diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 16e3c61bcc1..864acacaa9f 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,20 +1,19 @@ { stdenv, lib, fetchFromGitHub, go, pkgs }: + let removeExpr = ref: '' sed -i "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \ ''; -in - -stdenv.mkDerivation rec { - version = "0.14.19"; +in stdenv.mkDerivation rec { + version = "0.14.23"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "16wpw9ndx3x37mfnymp2fx9n2az9ibyr61zgq3mh2mszzzl7bkcg"; + sha256 = "1himf8yhfpjsv5m068y2f6f696d7ip0jq7jmg69kn7035zlxicis"; }; buildInputs = [ go ]; diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix index 7b0be65c8af..d8b087dcb80 100644 --- a/pkgs/applications/networking/syncthing/inotify-deps.nix +++ b/pkgs/applications/networking/syncthing/inotify-deps.nix @@ -1,3 +1,4 @@ +# This file was generated by go2nix. [ { goPackagePath = "github.com/cenkalti/backoff"; @@ -13,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/syncthing/syncthing"; - rev = "7fba8cf759a3b48cfc1507a8c32355865500a571"; - sha256 = "1s8l528fqq661ks70cna5cx1bawpv7szcx88z33bs4gkaq2fbws5"; + rev = "fb6d453c74d8420af847460e42e05779e90311b6"; + sha256 = "18fya44i80ij5wqpwg0bff2hp058rh87b9zld2rpw0z8r04bnsv0"; }; } { diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix index 8d9a813f961..db99a1aa109 100644 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ b/pkgs/applications/networking/syncthing/inotify.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "syncthing-inotify-${version}"; - version = "0.8.4"; + version = "0.8.5"; goPackagePath = "github.com/syncthing/syncthing-inotify"; src = fetchFromGitHub { - owner = "syncthing"; - repo = "syncthing-inotify"; - rev = "v${version}"; - sha256 = "0iix4gd5zh2ydn429jmcf0pr1pxxd1wq1vp5ciq9bavhvnim9clw"; + owner = "syncthing"; + repo = "syncthing-inotify"; + rev = "v${version}"; + sha256 = "13qfppwlqrx3fs44ghnffdp9x0hs7mn1gal2316p7jb0klkcpfzh"; }; goDeps = ./inotify-deps.nix; diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 194b22f0fd7..19a077d1589 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "umurmur-${version}"; - version = "0.2.16"; - + version = "0.2.16a"; + src = fetchFromGitHub { owner = "fatbob313"; repo = "umurmur"; rev = version; - sha256 = "0njvdqvjda13v1a2yyjn47mb0l0cdfb2bfvb5s13wpgwy2xxk0px"; + sha256 = "1xv1knrivy2i0ggwrczw60y0ayww9df9k6sif7klgzq556xk47d1"; }; - + buildInputs = [ autoreconfHook openssl protobufc libconfig ]; configureFlags = [ diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 4e73a305ea4..7535b6abf3c 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-2016-12-02"; + name = "bean-add-2017-01-20"; src = fetchFromGitHub { owner = "simon-v"; repo = "bean-add"; - rev = "8038dabf5838c880c8e750c0e65cf0da4faf40b9"; - sha256 = "016ybq570xicj90x4kxrbxhzdvkjh0d6v3r6s3k3qfzz2c5vwh09"; + rev = "752674259fb9512e076ef2048927fb791ad21507"; + sha256 = "1ja26dgl2j25873s5nav57pjaqb9rr3mdbmkawajz2gdkk9r7n61"; }; propagatedBuildInputs = with python3Packages; [ python ]; diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index aa246d241ca..abff61b881f 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt5Full, lzo, libX11 }: +{ stdenv, fetchurl, qmakeHook, qtbase, qtwebkit, qtx11extras, lzo, libX11 }: stdenv.mkDerivation rec { name = pname + "-" + version; @@ -8,10 +8,13 @@ stdenv.mkDerivation rec { url = "http://www.molspaces.com/dl/progs/${name}.tar.gz"; sha256 = "0yz79v023w1229wzck3gij0iqah1xg8rg4a352q8idvg7bdmyfin"; }; - buildInputs = [ qt5Full lzo libX11 ]; - QTDIR=qt5Full; - configurePhase ='' - ./configure --prefix $out + buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; + nativeBuildInputs = [ qmakeHook ]; + + configurePhase = '' + runHook preConfigure + ./configure --prefix $out --qmakepath $QMAKE + runHook postConfigure ''; meta = with stdenv.lib; { @@ -21,4 +24,4 @@ stdenv.mkDerivation rec { license = licenses.gpl3; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 5f1c721e4c4..b4df8fdd460 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , hicolor_icon_theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.1.2"; + name = "homebank-5.1.3"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "09zsq5l3s8cg4slhsyybsq8v1arnhh07i0rzka3j6ahysky15pfh"; + sha256 = "0wzv2hkm30a1kqjldw02bzbh49bdmac041d6qybjzvkgwvrbmci2"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index 497d4305873..919ab01f5f6 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -2,9 +2,9 @@ rec { major = "5"; - minor = "2"; - patch = "4"; - tweak = "2"; + minor = "3"; + patch = "0"; + tweak = "3"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "047byvyg13baws1bycaq1s6wqhkcr2pk27xbag0npzx1lspx2wwb"; + sha256 = "0vjmc8id9krpy9n4f0yil8k782cdzwmk53lvszi7r32b3ig23f84"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 29cc1dc118f..989cf17e276 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -9,11 +9,11 @@ , libwpg, dbus_glib, glibc, qt4, kde4, 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" ] +, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" ] , withHelp ? true , kdeIntegration ? false }: @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "075f7jpp8qi6piwrw4n8inynvsgp0270pdd9jmc2fqv6j5gsn332"; + sha256 = "1ld1zj2f0cbyr0fkibsiazyrb4qkshc9yqkfmq7b64hhp9zsa8a3"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "10p1xd077278gm3syd3lc54fzjsvrvzm0zr6csn9iq90kmlsgwzy"; + sha256 = "0zqs9g6hqjv5z0yzi0ag4ii158249c70ppqhg1v60haip40xan6z"; }; }; @@ -65,9 +65,7 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - # curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and - # therefore requires the -fpermissive flag until this package gets updated - NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -fpermissive"; + NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal"; # If we call 'configure', 'make' will then call configure again without parameters. # It's their system. @@ -126,6 +124,14 @@ in stdenv.mkDerivation rec { sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk # one more fragile test? sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # rendering-dependent tests + sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx + sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx + sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx + sed -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 + # not sure about this fragile test + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ''; makeFlags = "SHELL=${bash}/bin/bash"; @@ -219,6 +225,7 @@ in stdenv.mkDerivation rec { "--without-system-libmspub" "--without-system-libpagemaker" "--without-system-libgltf" + "--without-system-libstaroffice" # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" ]; @@ -239,7 +246,7 @@ in stdenv.mkDerivation rec { gst_all_1.gst-plugins-base gsettings_desktop_schemas 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 + 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 @@ -259,6 +266,5 @@ in stdenv.mkDerivation rec { license = licenses.lgpl3; maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; - hydraPlatforms = []; }; } diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py index 3d56c74e3ab..f77829da340 100755 --- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py +++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py @@ -293,7 +293,7 @@ def interpret_tarball_with_md5(x): 'md5': '48d647fbd8ef8889e5a7f422c1bfda94', 'brief': False}} """ - match = {'key': re.match('^(.*)_TARBALL$', x['key']), + match = {'key': re.match('^(.*)_(TARBALL|JAR)$', x['key']), 'value': re.match('(?P[0-9a-fA-F]{32})-(?P.+)$', x['value'])} diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json index 75d4cced92a..5b4363189f7 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json @@ -1,3 +1,5 @@ { - "LIBGLTF": {"subdir": "libgltf/"} + "LIBGLTF": {"subdir": "libgltf/"}, + "ODFVALIDATOR": {"subdir": "../extern/"}, + "OFFICEOTRON": {"subdir": "../extern/"} } diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix index 3d2514f8414..8bfb54fef55 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -28,18 +28,25 @@ md5name = "71a11d037240b292f824ba1eb537b4e3-apr-util-1.5.3.tar.gz"; } { - name = "boost_1_59_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_59_0.tar.bz2"; - sha256 = "727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca"; - md5 = "6aa9a5c6a4ca1016edd0ed1178e3cb87"; - md5name = "6aa9a5c6a4ca1016edd0ed1178e3cb87-boost_1_59_0.tar.bz2"; + 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 = "bsh-2.0b5-src.zip"; - url = "http://dev-www.libreoffice.org/src/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip"; - sha256 = "90993aa17a786996653fc5fcf148e879fb3689b8678f9ba99b376a5a13dff513"; - md5 = "ec1941a74d3ef513c4ce57a9092b74e1"; - md5name = "ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip"; + name = "breakpad.zip"; + url = "http://dev-www.libreoffice.org/src/breakpad.zip"; + sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; + md5 = "415ce291aa6f2ee1d5db7b62bf62ade8"; + md5name = "415ce291aa6f2ee1d5db7b62bf62ade8-breakpad.zip"; + } + { + name = "bsh-2.0b6-src.zip"; + url = "http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; + sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96"; + md5 = "beeca87be45ec87d241ddd0e1bad80c1"; + md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; } { name = "bzip2-1.0.6.tar.gz"; @@ -70,11 +77,11 @@ md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; } { - name = "libcmis-0.5.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz"; - sha256 = "a87e02913dee3ee659db5abf6d7dafcfcd85dd4b24bf4389d8d4afe8c8dcf9b6"; - md5 = "5821b806a98e6c38370970e682ce76e8"; - md5name = "5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz"; + 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"; } { name = "CoinMP-1.7.6.tgz"; @@ -105,11 +112,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.43.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/curl-7.43.0.tar.bz2"; - sha256 = "baa654a1122530483ccc1c58cc112fec3724a82c11c6a389f1e6a37dc8858df9"; - md5 = "11bddbb452a8b766b932f859aaeeed39"; - md5name = "11bddbb452a8b766b932f859aaeeed39-curl-7.43.0.tar.bz2"; + name = "curl-7.51.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/curl-7.51.0.tar.gz"; + sha256 = "65b5216a6fbfa72f547eb7706ca5902d7400db9868269017a8888aa91d87977c"; + md5 = "490e19a8ccd1f4a244b50338a0eb9456"; + md5name = "490e19a8ccd1f4a244b50338a0eb9456-curl-7.51.0.tar.gz"; } { name = "libe-book-0.1.2.tar.bz2"; @@ -133,18 +140,18 @@ md5name = "77ff46936dcc83670557274e7dd2aa33-libetonyek-0.1.6.tar.bz2"; } { - name = "expat-2.1.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.1.1.tar.bz2"; - sha256 = "aff584e5a2f759dcfc6d48671e9529f6afe1e30b0cd6a4cec200cbe3f793de67"; - md5 = "7380a64a8e3a9d66a9887b01d0d7ea81"; - md5name = "7380a64a8e3a9d66a9887b01d0d7ea81-expat-2.1.1.tar.bz2"; + name = "expat-2.2.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.2.0.tar.bz2"; + sha256 = "d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff"; + md5 = "2f47841c829facb346eb6e3fab5212e2"; + md5name = "2f47841c829facb346eb6e3fab5212e2-expat-2.2.0.tar.bz2"; } { - name = "Firebird-2.5.4.26856-0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/Firebird-2.5.4.26856-0.tar.bz2"; - sha256 = "4e775dcf218640d3af507a816aef0060f52a295b9ee5f66ec66f0b0564da18d3"; - md5 = "7a17ec9889424b98baa29e001a054434"; - md5name = "7a17ec9889424b98baa29e001a054434-Firebird-2.5.4.26856-0.tar.bz2"; + name = "Firebird-2.5.5.26952-0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/Firebird-2.5.5.26952-0.tar.bz2"; + sha256 = "b33e63ede88184d9ef2ae6760537ab75bfe641513821410b83e837946162b7d1"; + md5 = "b0b5293991fcf07347b38431c80be1d4"; + md5name = "b0b5293991fcf07347b38431c80be1d4-Firebird-2.5.5.26952-0.tar.bz2"; } { name = "fontconfig-2.8.0.tar.gz"; @@ -217,11 +224,11 @@ md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; } { - name = "source-code-font-1.009.tar.gz"; - url = "http://dev-www.libreoffice.org/src/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz"; - sha256 = "9b295127164c81bcf28c7ebb687f1555b71796108b443a04d40202b7364e4cce"; - md5 = "0279a21fab6f245e85a6f85fea54f511"; - md5name = "0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.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"; + sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f"; + md5 = "907d6e99f241876695c19ff3db0b8923"; + md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; } { name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; @@ -266,18 +273,18 @@ md5name = "5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2"; } { - name = "graphite-minimal-1.3.6.tgz"; - url = "http://dev-www.libreoffice.org/src/17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz"; - sha256 = "db27e1a6092b8ea00b5f8eec2a3ea500756fbb769c1023a1afc3386c5918d1b8"; - md5 = "17df8301bcc459e83f8a8f3aca6183b2"; - md5name = "17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz"; + name = "graphite2-minimal-1.3.8.tgz"; + url = "http://dev-www.libreoffice.org/src/4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz"; + sha256 = "d16940175822760753e9762d0af9679c9726e64f25955677fe7ab68448601c3b"; + md5 = "4311dd9ace498b57c85f611e0670df64"; + md5name = "4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz"; } { - name = "harfbuzz-0.9.40.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-0.9.40.tar.bz2"; - sha256 = "1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f"; - md5 = "0e27e531f4c4acff601ebff0957755c2"; - md5name = "0e27e531f4c4acff601ebff0957755c2-harfbuzz-0.9.40.tar.bz2"; + name = "harfbuzz-1.2.6.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-1.2.6.tar.bz2"; + sha256 = "7537bacccb3524df0cd2a4d5bc7e168bcc10e8171e0324f3cd522583868192c1"; + md5 = "9f4b6831c86135faef011e991f59f77f"; + md5name = "9f4b6831c86135faef011e991f59f77f-harfbuzz-1.2.6.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -287,11 +294,11 @@ md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { - name = "hunspell-1.3.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz"; - sha256 = "a7b2c0de0e2ce17426821dc1ac8eb115029959b3ada9d80a81739fa19373246c"; - md5 = "4967da60b23413604c9e563beacc63b4"; - md5name = "4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz"; + name = "hunspell-1.4.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz"; + sha256 = "c4476aff0ced52eec334eae1e8d3fdaaebdd90f5ecd0b57cf2a92a6fd220d1bb"; + md5 = "33d370f7fe5a030985e445a5672b2067"; + md5name = "33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; @@ -301,11 +308,11 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-56_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz"; - sha256 = "3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816"; - md5 = "c4a2d71ff56aec5ebfab2a3f059be99d"; - md5name = "c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz"; + name = "icu4c-57_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz"; + sha256 = "ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581"; + md5 = "976734806026a4ef8bdd17937c8898b9"; + md5name = "976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz"; } { name = "flow-engine-0.9.4.zip"; @@ -399,11 +406,11 @@ md5name = "86b0d5f7507c2e6c21c00219162c3c44-libjpeg-turbo-1.4.2.tar.gz"; } { - name = "language-subtag-registry-2016-02-10.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2016-02-10.tar.bz2"; - sha256 = "1e3a74b39e999bc9ff9fb0dd6fa6a64a0ed6bf7f0775ff3756e7c9e8db45a353"; - md5 = "d1e7c55a0383f7d720d3ead0b6117284"; - md5name = "d1e7c55a0383f7d720d3ead0b6117284-language-subtag-registry-2016-02-10.tar.bz2"; + name = "language-subtag-registry-2016-07-19.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2016-07-19.tar.bz2"; + sha256 = "e3dc30bdbfdad442c542dc0e165df9d8d2ba06a357cd55957155d8259d1661dc"; + md5 = "8a037dc60b16bf8c5fe871b33390a4a2"; + md5name = "8a037dc60b16bf8c5fe871b33390a4a2-language-subtag-registry-2016-07-19.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -455,11 +462,11 @@ md5name = "aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2"; } { - name = "xmlsec1-1.2.14.tar.gz"; - url = "http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"; - sha256 = "390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a"; - md5 = "1f24ab1d39f4a51faf22244c94a6203f"; - md5name = "1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"; + name = "xmlsec1-1.2.20.tar.gz"; + url = "http://dev-www.libreoffice.org/src/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz"; + sha256 = "3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305"; + md5 = "ce12af00283eb90d9281956524250d6e"; + md5name = "ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz"; } { name = "libxml2-2.9.4.tar.gz"; @@ -469,11 +476,11 @@ md5name = "ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; } { - name = "libxslt-1.1.28.tar.gz"; - url = "http://dev-www.libreoffice.org/src/9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz"; - sha256 = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c"; - md5 = "9667bf6f9310b957254fdcf6596600b7"; - md5name = "9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.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 = "lp_solve_5.5.tar.gz"; @@ -490,11 +497,18 @@ md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; } { - name = "mdds_0.12.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds_0.12.1.tar.bz2"; - sha256 = "23565e9d7810a6ac30478833813db847f80e927b414a7be07b7cc03ed3aae83d"; - md5 = "ef2560ed5416652a7fe195305b14cebe"; - md5name = "ef2560ed5416652a7fe195305b14cebe-mdds_0.12.1.tar.bz2"; + 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"; + } + { + 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"; } { name = "libmspub-0.1.2.tar.bz2"; @@ -532,11 +546,11 @@ md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; } { - name = "nss-3.22.2-with-nspr-4.12.tar.gz"; - url = "http://dev-www.libreoffice.org/src/6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz"; - sha256 = "7bc7e5483fc90071be5facd3043f94c69b153055a369c8f0b751ad374c5ae09e"; - md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7"; - md5name = "6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz"; + name = "nss-3.27-with-nspr-4.13.tar.gz"; + url = "http://dev-www.libreoffice.org/src/0e3eee39402386cf16fd7aaa7399ebef-nss-3.27-with-nspr-4.13.tar.gz"; + sha256 = "c74ad468ed5da0304b58ec56fa627fa388b256451b1a44fd184145c6d8203820"; + md5 = "0e3eee39402386cf16fd7aaa7399ebef"; + md5name = "0e3eee39402386cf16fd7aaa7399ebef-nss-3.27-with-nspr-4.13.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; @@ -567,11 +581,11 @@ md5name = "9392e65072ce4b614c1392eefc1f23d0-openssl-1.0.2h.tar.gz"; } { - name = "liborcus-0.9.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.9.2.tar.gz"; - sha256 = "adcf90f6cb1e6546ef1ea11277db39cb875786ea4b283e37f5e37c8c09b4952b"; - md5 = "e6efcbe50a5fd4d50d513c9a7a4139b0"; - md5name = "e6efcbe50a5fd4d50d513c9a7a4139b0-liborcus-0.9.2.tar.gz"; + name = "liborcus-0.11.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.11.2.tar.gz"; + sha256 = "10afc617fd7600fa02bd4467d2e3c7bd058f84e4d672d558e1db90e82dafd256"; + md5 = "205badaee72adf99422add8c4c49d669"; + md5name = "205badaee72adf99422add8c4c49d669-liborcus-0.11.2.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -581,11 +595,11 @@ md5name = "593f0aa47bf2efc0efda2d28fae063b2-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; } { - name = "libpagemaker-0.0.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.2.tar.bz2"; - sha256 = "43be46721affcb5a967406c09acfc36c79d2d968917fe36a21cc004230a01e0f"; - md5 = "795cc7a59ace4db2b12586971d668671"; - md5name = "795cc7a59ace4db2b12586971d668671-libpagemaker-0.0.2.tar.bz2"; + 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"; } { name = "pixman-0.24.4.tar.bz2"; @@ -595,18 +609,18 @@ md5name = "c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"; } { - name = "libpng-1.6.24.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libpng-1.6.24.tar.gz"; - sha256 = "be46e0d14ccac3800f816ae860d191a1187a40164b7552c44afeee97a9caa0a3"; - md5 = "65213080dd30a9b16193d9b83adc1ee9"; - md5name = "65213080dd30a9b16193d9b83adc1ee9-libpng-1.6.24.tar.gz"; + 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"; } { - name = "poppler-0.26.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.26.4.tar.gz"; - sha256 = "e05a4d8d8252a564ec7a96a99af772042b2d85275ffda8043f427dde31e97fe8"; - md5 = "35c0660065d023365e9854c13e289d12"; - md5name = "35c0660065d023365e9854c13e289d12-poppler-0.26.4.tar.gz"; + name = "poppler-0.46.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/poppler-0.46.0.tar.bz2"; + sha256 = "e3b53c4d1baffb047d4752d68886210fcb279e75cc32c0c61c7165e4d4cf846a"; + md5 = "38c758d84437378ec4f5aae9f875301d"; + md5name = "38c758d84437378ec4f5aae9f875301d-poppler-0.46.0.tar.bz2"; } { name = "postgresql-9.2.1.tar.bz2"; @@ -685,13 +699,6 @@ md5 = "0168229624cfac409e766913506961a8"; md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } - { - name = "vigra1.6.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"; - sha256 = "1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f"; - md5 = "d62650a6f908e85643e557a236ea989c"; - md5name = "d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"; - } { name = "libvisio-0.1.5.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2"; @@ -714,11 +721,11 @@ md5name = "dfd066658ec9d2fb2262417039a8a1c3-libwpg-0.3.1.tar.bz2"; } { - name = "libwps-0.4.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.2.tar.bz2"; - sha256 = "254b8aeb36a3b58eabf682b04a5a6cf9b01267e762c7dc57d4533b95f30dc587"; - md5 = "8a6c55542ce80203dd6d3b1cba99d4e5"; - md5name = "8a6c55542ce80203dd6d3b1cba99d4e5-libwps-0.4.2.tar.bz2"; + name = "libwps-0.4.3.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.3.tar.bz2"; + sha256 = "0c30407865a873ff76b6d5b2d2aa599f6af68936638c81ca8292449324042a6c"; + md5 = "027fb17fb9e43553aa6624dc18f830ac"; + md5name = "027fb17fb9e43553aa6624dc18f830ac-libwps-0.4.3.tar.bz2"; } { name = "xsltml_2.1.2.zip"; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 6cacff49fc6..375db389da9 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -14,18 +14,18 @@ md5name = "ce977548f1cbf46918e93cd38ac35163-commons-logging-1.2-src.tar.gz"; } { - name = "apr-1.4.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/apr-1.4.8.tar.gz"; - sha256 = "1689e415bdfab6aaa41f07836b5dd9ed4901d22ddeb99feffdb2cee3124adf49"; - md5 = "eff9d741b0999a9bbab96862dd2a2a3d"; - md5name = "eff9d741b0999a9bbab96862dd2a2a3d-apr-1.4.8.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"; } { - name = "apr-util-1.5.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/apr-util-1.5.3.tar.gz"; - sha256 = "76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743"; - md5 = "71a11d037240b292f824ba1eb537b4e3"; - md5name = "71a11d037240b292f824ba1eb537b4e3-apr-util-1.5.3.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"; } { name = "boost_1_60_0.tar.bz2"; @@ -56,18 +56,18 @@ md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { - name = "cairo-1.10.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"; - sha256 = "32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41"; - md5 = "f101a9e88b783337b20b2e26dfd26d5f"; - md5name = "f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.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 = "libcdr-0.1.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libcdr-0.1.2.tar.bz2"; - sha256 = "d05a986dab9f960e64466072653a900d03f8257b084440d9d16599e16060581e"; - md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2"; - md5name = "6e3062b55b149d7b3c6aedb3bb5b86e2-libcdr-0.1.2.tar.bz2"; + 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"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -147,11 +147,11 @@ md5name = "2f47841c829facb346eb6e3fab5212e2-expat-2.2.0.tar.bz2"; } { - name = "Firebird-2.5.5.26952-0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/Firebird-2.5.5.26952-0.tar.bz2"; - sha256 = "b33e63ede88184d9ef2ae6760537ab75bfe641513821410b83e837946162b7d1"; - md5 = "b0b5293991fcf07347b38431c80be1d4"; - md5name = "b0b5293991fcf07347b38431c80be1d4-Firebird-2.5.5.26952-0.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"; } { name = "fontconfig-2.8.0.tar.gz"; @@ -175,18 +175,18 @@ md5name = "c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; } { - name = "dejavu-fonts-ttf-2.35.zip"; - url = "http://dev-www.libreoffice.org/src/d8b5214d35bcd2bfcb2cffa7795b351d-dejavu-fonts-ttf-2.35.zip"; - sha256 = "7e0d00f20080784c3a38a845d5858c161af14f0073d9474cdbfdedae883cc747"; - md5 = "d8b5214d35bcd2bfcb2cffa7795b351d"; - md5name = "d8b5214d35bcd2bfcb2cffa7795b351d-dejavu-fonts-ttf-2.35.zip"; + name = "dejavu-fonts-ttf-2.37.zip"; + url = "http://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; + sha256 = "7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a"; + md5 = "33e1e61fab06a547851ed308b4ffef42"; + md5name = "33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; } { - name = "gentiumbasic-fonts-1.10.zip"; - url = "http://dev-www.libreoffice.org/src/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"; - sha256 = "f1691e48d02effdee0701622297394451759f13e0e0b36e788847f4b3e2ba11b"; - md5 = "35efabc239af896dfb79be7ebdd6e6b9"; - md5name = "35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"; + name = "GentiumBasic_1102.zip"; + url = "http://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; + sha256 = "2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc"; + md5 = "1725634df4bb3dcb1b2c91a6175f8789"; + md5name = "1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; } { name = "liberation-fonts-ttf-1.07.4.tar.gz"; @@ -237,6 +237,13 @@ md5 = "edc4d741888bc0d38e32dbaa17149596"; md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; } + { + 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"; + } { name = "libfreehand-0.1.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2"; @@ -266,25 +273,18 @@ md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; } { - name = "glyphy-0.2.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2"; - sha256 = "9a8f629f7ea40ba118199a37adee8f2dfb084cffa5f7f4db3a47b8b0075777be"; - md5 = "5d303fb955beb9bf112267316ca9d021"; - md5name = "5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2"; + name = "graphite2-minimal-1.3.9.tgz"; + url = "http://dev-www.libreoffice.org/src/3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz"; + sha256 = "4fcbfa52527fd6fd6b54786c82bdbb96ec6b34fa2e799361e5164b6bbb671b76"; + md5 = "3069842a88b8f40c6b83ad2850cda293"; + md5name = "3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz"; } { - name = "graphite2-minimal-1.3.8.tgz"; - url = "http://dev-www.libreoffice.org/src/4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz"; - sha256 = "d16940175822760753e9762d0af9679c9726e64f25955677fe7ab68448601c3b"; - md5 = "4311dd9ace498b57c85f611e0670df64"; - md5name = "4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz"; - } - { - name = "harfbuzz-1.2.6.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.2.6.tar.bz2"; - sha256 = "7537bacccb3524df0cd2a4d5bc7e168bcc10e8171e0324f3cd522583868192c1"; - md5 = "9f4b6831c86135faef011e991f59f77f"; - md5name = "9f4b6831c86135faef011e991f59f77f-harfbuzz-1.2.6.tar.bz2"; + 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 = "hsqldb_1_8_0.zip"; @@ -308,11 +308,11 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-57_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz"; - sha256 = "ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581"; - md5 = "976734806026a4ef8bdd17937c8898b9"; - md5name = "976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz"; + 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 = "flow-engine-0.9.4.zip"; @@ -455,18 +455,25 @@ md5name = "d63a9f47ab048f5009d90693d6aa6424-libgltf-0.0.2.tar.bz2"; } { - name = "liblangtag-0.5.8.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2"; - sha256 = "08e2f64bfe3f750be7391eb0af53967e164b628c59f02be4d83789eb4f036eaa"; - md5 = "aa899eff126216dafe721149fbdb511b"; - md5name = "aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.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"; } { - name = "xmlsec1-1.2.20.tar.gz"; - url = "http://dev-www.libreoffice.org/src/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz"; - sha256 = "3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305"; - md5 = "ce12af00283eb90d9281956524250d6e"; - md5name = "ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz"; + 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"; + } + { + 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 = "libxml2-2.9.4.tar.gz"; @@ -518,11 +525,11 @@ md5name = "ff9d0f9dd8fbc523408ea1953d5bde41-libmspub-0.1.2.tar.bz2"; } { - name = "libmwaw-0.3.7.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.7.tar.bz2"; - sha256 = "a66b3e45a5ba5dd89849a766e128585cac8aaf9e9c6f037040200e5bf31f1427"; - md5 = "4a8a53a9d997cf0e2bd208178797dbfb"; - md5name = "4a8a53a9d997cf0e2bd208178797dbfb-libmwaw-0.3.7.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 = "mysql-connector-c++-1.1.4.tar.gz"; @@ -559,6 +566,20 @@ md5 = "32572ea48d9021bbd6fa317ddb697abc"; md5name = "32572ea48d9021bbd6fa317ddb697abc-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 = "officeotron-0.7.4-master.jar"; + url = "http://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; + sha256 = "f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770"; + md5 = "8249374c274932a21846fa7629c2aa9b"; + 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"; @@ -567,11 +588,11 @@ md5name = "4ca8a6ef0afeefc864e9ef21b9f14bd6-OpenCOLLADA-master-6509aa13af.tar.bz2"; } { - name = "openldap-2.4.31.tgz"; - url = "http://dev-www.libreoffice.org/src/804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz"; - sha256 = "bde845840df4794b869a6efd6a6b1086f80989038e4844b2e4d7d6b57b39c5b6"; - md5 = "804c6cb5698db30b75ad0ff1c25baefd"; - md5name = "804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz"; + 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"; } { name = "openssl-1.0.2h.tar.gz"; @@ -581,11 +602,11 @@ md5name = "9392e65072ce4b614c1392eefc1f23d0-openssl-1.0.2h.tar.gz"; } { - name = "liborcus-0.11.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.11.2.tar.gz"; - sha256 = "10afc617fd7600fa02bd4467d2e3c7bd058f84e4d672d558e1db90e82dafd256"; - md5 = "205badaee72adf99422add8c4c49d669"; - md5name = "205badaee72adf99422add8c4c49d669-liborcus-0.11.2.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"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -602,25 +623,25 @@ md5name = "5c4985a68be0b79d3f809da5e12b143c-libpagemaker-0.0.3.tar.bz2"; } { - name = "pixman-0.24.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"; - sha256 = "3d1bf79329be76103c7d9632a79962178364371807104a10e5f63ae0551731dc"; - md5 = "c63f411b3ad147db2bcce1bf262a0e02"; - md5name = "c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"; + name = "pixman-0.34.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; + sha256 = "21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e"; + md5 = "e80ebae4da01e77f68744319f01d52a3"; + md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; } { - name = "libpng-1.6.24.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libpng-1.6.24.tar.gz"; - sha256 = "be46e0d14ccac3800f816ae860d191a1187a40164b7552c44afeee97a9caa0a3"; - md5 = "65213080dd30a9b16193d9b83adc1ee9"; - md5name = "65213080dd30a9b16193d9b83adc1ee9-libpng-1.6.24.tar.gz"; + 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"; } { - name = "poppler-0.46.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/poppler-0.46.0.tar.bz2"; - sha256 = "e3b53c4d1baffb047d4752d68886210fcb279e75cc32c0c61c7165e4d4cf846a"; - md5 = "38c758d84437378ec4f5aae9f875301d"; - md5name = "38c758d84437378ec4f5aae9f875301d-poppler-0.46.0.tar.bz2"; + 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 = "postgresql-9.2.1.tar.bz2"; @@ -637,32 +658,32 @@ md5name = "803a75927f8f241ca78633890c798021-Python-3.3.5.tgz"; } { - name = "Python-3.5.0.tgz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.0.tgz"; - sha256 = "584e3d5a02692ca52fce505e68ecd77248a6f2c99adf9db144a39087336b0fe0"; - md5 = "a56c0c0b45d75a0ec9c6dee933c41c36"; - md5name = "a56c0c0b45d75a0ec9c6dee933c41c36-Python-3.5.0.tgz"; + name = "Python-3.5.3.tgz"; + url = "http://dev-www.libreoffice.org/src/Python-3.5.3.tgz"; + sha256 = "d8890b84d773cd7059e597dbefa510340de8336ec9b9e9032bf030f19291565a"; + md5 = "6192f0e45f02575590760e68c621a488"; + md5name = "6192f0e45f02575590760e68c621a488-Python-3.5.3.tgz"; } { - name = "raptor2-2.0.9.tar.gz"; - url = "http://dev-www.libreoffice.org/src/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz"; - sha256 = "e26fb9c18e6ebf71100f434070d50196a21d592b715e361850c3b4e789b5f6ef"; - md5 = "4ceb9316488b0ea01acf011023cf7fff"; - md5name = "4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz"; + name = "raptor2-2.0.15.tar.gz"; + url = "http://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; + sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"; + md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd"; + md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; } { - name = "rasqal-0.9.30.tar.gz"; - url = "http://dev-www.libreoffice.org/src/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz"; - sha256 = "abf0e93d80cc79bdf383fd3e904255bf98bc729356d6cf2f673bce74b08b1cfd"; - md5 = "b12c5f9cfdb6b04efce5a4a186b8416b"; - md5name = "b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz"; + name = "rasqal-0.9.33.tar.gz"; + url = "http://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; + sha256 = "6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c"; + md5 = "1f5def51ca0026cd192958ef07228b52"; + md5name = "1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; } { - name = "redland-1.0.16.tar.gz"; - url = "http://dev-www.libreoffice.org/src/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz"; - sha256 = "d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd"; - md5 = "32f8e1417a64d3c6f2c727f9053f55ea"; - md5name = "32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz"; + name = "redland-1.0.17.tar.gz"; + url = "http://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; + sha256 = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681"; + md5 = "e5be03eda13ef68aabab6e42aa67715e"; + md5name = "e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; } { name = "librevenge-0.0.4.tar.bz2"; @@ -685,6 +706,13 @@ md5 = "4f8e76c9c6567aee1d66aba49f76a58b"; md5name = "4f8e76c9c6567aee1d66aba49f76a58b-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 = "swingExSrc.zip"; url = "http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; @@ -721,11 +749,11 @@ md5name = "dfd066658ec9d2fb2262417039a8a1c3-libwpg-0.3.1.tar.bz2"; } { - name = "libwps-0.4.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.3.tar.bz2"; - sha256 = "0c30407865a873ff76b6d5b2d2aa599f6af68936638c81ca8292449324042a6c"; - md5 = "027fb17fb9e43553aa6624dc18f830ac"; - md5name = "027fb17fb9e43553aa6624dc18f830ac-libwps-0.4.3.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 = "xsltml_2.1.2.zip"; @@ -741,4 +769,11 @@ md5 = "44d667c142d7cda120332623eab69f40"; md5name = "44d667c142d7cda120332623eab69f40-zlib-1.2.8.tar.gz"; } + { + 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"; + } ] diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix index 078efa0227d..0fae854f42f 100644 --- a/pkgs/applications/office/libreoffice/still-primary-src.nix +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -2,9 +2,9 @@ rec { major = "5"; - minor = "1"; - patch = "6"; - tweak = "2"; + minor = "2"; + patch = "5"; + tweak = "1"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "150xb76pc3889gfy4jrnq8sidymm1aihkm5pzy8b1fdy51zip804"; + sha256 = "006kn1m5d6c1skgc1scc0gssin922raca2psjv887alplhia6mlp"; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 75d295887f6..26bb53c9b38 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -13,7 +13,7 @@ , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas , defaultIconTheme, glib, ncurses -, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ] +, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" ] , withHelp ? true , kdeIntegration ? false }: @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0g88dscdmixhv17lzz4k00jrrvmafxzv0bakzf0v9zny2b3hb6r2"; + sha256 = "0lv3jbnzzkr7nbivsl9jm9b4m9mxvngbmhz6yasblhi0m9ifkxmb"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1aqdzw4sqwfli9aah7zjir93nc1v5zdrbbgvmbn5wh1kawa8dr5g"; + sha256 = "1d29ppdkhhy5x8cric0l872x607ng02bnp2gvv5ck3blb759q68i"; }; }; @@ -58,16 +58,6 @@ in stdenv.mkDerivation rec { inherit (primary-src) src; - # we only have this problem on i686 ATM - patches = if stdenv.is64bit then null else [ - (fetchurl { - name = "disable-flaky-tests.diff"; - url = "https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git/plain" - + "/patches/disable-flaky-tests.diff?h=libreoffice_5.1.5_rc2-1"; - sha256 = "1v1aiqdi64iijjraj6v4ljzclrd9lqan54hmy2h6m20x3ab005wb"; - }) - ]; - # Openoffice will open libcups dynamically, so we link it directly # to make its dlopen work. # It also seems not to mention libdl explicitly in some places. @@ -75,9 +65,7 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - # curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and - # therefore requires the -fpermissive flag until this package gets updated - NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -fpermissive"; + NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal"; # If we call 'configure', 'make' will then call configure again without parameters. # It's their system. @@ -127,8 +115,20 @@ in stdenv.mkDerivation rec { sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx # rendering-dependent test sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx + # tilde expansion in path processing checks the existence of $HOME + sed -e 's@rtl::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 + sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk # one more fragile test? sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # rendering-dependent tests + sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx + sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx + sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ''; makeFlags = "SHELL=${bash}/bin/bash"; @@ -216,7 +216,6 @@ in stdenv.mkDerivation rec { "--without-system-hsqldb" "--without-system-altlinuxhyph" "--without-system-lpsolve" - "--without-system-npapi-headers" "--without-system-libetonyek" "--without-system-libfreehand" "--without-system-liblangtag" diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index 2c55be55b08..c2481241818 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { }' src/paperwork/frontend/util/__init__.py sed -i -e '/^LOCALE_PATHS = \[/,/^\]$/ { - c LOCALE_PATHS = ["'"$out/share/locale"'"] + c LOCALE_PATHS = ["'"$out/share"'"] }' src/paperwork/paperwork.py sed -i -e 's/"icon"/"icon-name"/g' \ diff --git a/pkgs/applications/office/skrooge/2.nix b/pkgs/applications/office/skrooge/2.nix index 98c1c4c8b79..42cc9b0c6eb 100644 --- a/pkgs/applications/office/skrooge/2.nix +++ b/pkgs/applications/office/skrooge/2.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "skrooge-${version}"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; - sha256 = "13sd669rx66fpk9pm72nr2y69k2h4mcs4b904i9xm41i0fiy6szp"; + sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x"; }; nativeBuildInputs = [ cmake ecm makeQtWrapper ]; diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/applications/science/biology/ecopcr/default.nix new file mode 100644 index 00000000000..9e1b16ff944 --- /dev/null +++ b/pkgs/applications/science/biology/ecopcr/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, gcc, zlib, python27 }: + +stdenv.mkDerivation rec { + name = "ecopcr-0.8.0"; + + src = fetchurl { + url = "https://git.metabarcoding.org/obitools/ecopcr/uploads/6f37991b325c8c171df7e79e6ae8d080/${name}.tar.gz"; + sha256 = "10c58hj25z78jh0g3zcbx4890yd2qrvaaanyx8mn9p49mmyf5pk6"; + }; + + sourceRoot = "ecoPCR/src"; + + buildInputs = [ gcc python27 zlib ]; + + installPhase = '' + mkdir -p $out/bin + cp -v ecoPCR $out/bin + cp -v ecogrep $out/bin + cp -v ecofind $out/bin + cp -v ../tools/ecoPCRFormat.py $out/bin/ecoPCRFormat + chmod a+x $out/bin/ecoPCRFormat + ''; + + meta = with stdenv.lib; { + description = "Electronic PCR software tool"; + longDescription = '' + ecoPCR is an electronic PCR software developed by the LECA. It + helps you estimate Barcode primers quality. In conjunction with + OBITools, you can postprocess ecoPCR output to compute barcode + coverage and barcode specificity. New barcode primers can be + developed using the ecoPrimers software. + ''; + homepage = https://git.metabarcoding.org/obitools/ecopcr/wikis/home; + license = licenses.cecill20; + maintainers = [ maintainers.metabar ]; + }; +} diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index c9974660da3..33182027655 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, readline, perl, libX11, libpng, libXt, zlib}: stdenv.mkDerivation { - name = "emboss-6.0.1"; + name = "emboss-6.6.0"; src = fetchurl { - url = ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.0.1.tar.gz; - sha256 = "0g939k9wmpvmy55hqmbbzj6kj6agg4izymv492zqiawxm812jd9y"; + url = "ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.6.0.tar.gz"; + sha256 = "7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e"; }; # patch = fetchurl { # url = ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-9.gz; diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index f4870d7bfbb..dfcdac20ae0 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -1,22 +1,22 @@ -{stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}: +{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext}: stdenv.mkDerivation { - name = "ngspice-25"; + name = "ngspice-26"; src = fetchurl { - url = "mirror://sourceforge/ngspice/ngspice-25.tar.gz"; - sha256 = "03hlxwvl2j1wlb5yg4swvmph9gja37c2gqvwvzv6z16vg2wvn06h"; + url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz"; + sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108"; }; - buildInputs = [ readline libX11 bison libICE libXaw libXext ]; + buildInputs = [ readline libX11 flex bison libICE libXaw libXext ]; - configureFlags = [ "--enable-x" "--with-x" "--with-readline" ]; + configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" ]; meta = with stdenv.lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; homepage = "http://ngspice.sourceforge.net"; license = with licenses; [ "BSD" gpl2 ]; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ viric rongcuid ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix index f162fe4a86e..32007ba45ce 100644 --- a/pkgs/applications/science/logic/coq/8.4.nix +++ b/pkgs/applications/science/logic/coq/8.4.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation { ''; passthru = { + inherit findlib; emacsBufferSetup = pkgs: '' ; Propagate coq paths to children (inherit-local-permanent coq-prog-name "${self}/bin/coqtop") diff --git a/pkgs/applications/science/logic/coq/8.6.nix b/pkgs/applications/science/logic/coq/8.6.nix deleted file mode 100644 index 9d3aa756aa5..00000000000 --- a/pkgs/applications/science/logic/coq/8.6.nix +++ /dev/null @@ -1,88 +0,0 @@ -# - coqide compilation can be disabled by setting lablgtk to null; -# - The csdp program used for the Micromega tactic is statically referenced. -# However, coq can build without csdp by setting it to null. -# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found. -# - The patch-level version can be specified through the `pl` argument to -# the derivation; it defaults to the greatest. - -{ stdenv, fetchurl, writeText, pkgconfig -, ocaml, findlib, camlp5, ncurses -, lablgtk ? null, csdp ? null -, pl ? "1" -}: - -let - # version = "8.6pl${pl}"; - version = "8.6"; - sha256 = "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f"; - coq-version = "8.6"; - buildIde = lablgtk != null; - ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; - csdpPatch = if csdp != null then '' - substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" - substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" - '' else ""; -in - -stdenv.mkDerivation { - name = "coq-${version}"; - - inherit coq-version; - inherit ocaml camlp5; - - src = fetchurl { - url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; - inherit sha256; - }; - - buildInputs = [ pkgconfig 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 '"md5 -q"' '"md5sum"' - ${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 bin/votour"; - - postInstall = '' - cp bin/votour $out/bin/ - ''; - - 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/8.5.nix b/pkgs/applications/science/logic/coq/default.nix similarity index 69% rename from pkgs/applications/science/logic/coq/8.5.nix rename to pkgs/applications/science/logic/coq/default.nix index aae2101f50e..bc9ba049cd2 100644 --- a/pkgs/applications/science/logic/coq/8.5.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -1,26 +1,27 @@ -# - coqide compilation can be disabled by setting lablgtk to null; +# - 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. -# - The patch-level version can be specified through the `pl` argument to +# - The patch-level version can be specified through the `version` argument to # the derivation; it defaults to the greatest. { stdenv, fetchurl, writeText, pkgconfig -, ocaml, findlib, camlp5, ncurses -, lablgtk ? null, csdp ? null -, pl ? "3" +, ocamlPackages, ncurses +, buildIde ? true +, csdp ? null +, version ? "8.6" }: let - version = "8.5pl${pl}"; sha256 = { - "1" = "1w2xvm6w16khfn63bp95s25hnkn2ny3w0yqg3lq63gp11aqpbyjb"; - "2" = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3"; - "3" = "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh"; - }."${pl}"; - coq-version = "8.5"; - buildIde = lablgtk != null; - ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; + "8.5pl1" = "1w2xvm6w16khfn63bp95s25hnkn2ny3w0yqg3lq63gp11aqpbyjb"; + "8.5pl2" = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3"; + "8.5pl3" = "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh"; + "8.6" = "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f"; + }."${version}"; + coq-version = builtins.substring 0 3 version; + camlp5 = ocamlPackages.camlp5_transitional; + ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.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" @@ -31,14 +32,18 @@ stdenv.mkDerivation { name = "coq-${version}"; inherit coq-version; - inherit ocaml camlp5; + inherit camlp5; + inherit (ocamlPackages) ocaml; + passthru = { + inherit (ocamlPackages) findlib; + }; src = fetchurl { url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; inherit sha256; }; - buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; + buildInputs = [ pkgconfig ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.lablgtk ]; postPatch = '' UNAME=$(type -tp uname) diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix index 53ab084321d..ca3673d7bf9 100644 --- a/pkgs/applications/science/logic/verit/default.nix +++ b/pkgs/applications/science/logic/verit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "veriT-${version}"; - version = "201506"; + version = "2016"; src = fetchurl { - url = "http://www.verit-solver.org/distrib/${name}.tar.gz"; - sha256 = "1cc9gcspw3namkdfypkians2j5dn224dsw6xx95qicad6033bsgk"; + url = "http://www.verit-solver.org/distrib/veriT-stable2016.tar.gz"; + sha256 = "0gvp4diz0qjg0y5ry0p1z7dkdkxw8l7jb8cdhvcnhl06jx977v4b"; }; nativeBuildInputs = [ autoreconfHook flex bison ]; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index 0e16e1fb305..45f8dd1960b 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "geogebra-${version}"; - version = "5.0.271.0"; + version = "5-0-331-0"; preferLocalBuild = true; src = fetchurl { url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"; - sha256 = "5dd5be1cde27c9b567f79c38048045864064b69c0d2b469ae93e1fca5f543475"; + sha256 = "135g2xqafgs1gv98vqq2jpfwyi1aflyiynx1gmsgs23jxbr218v2"; }; srcIcon = fetchurl { url = "http://static.geogebra.org/images/geogebra-logo.svg"; - sha256 = "55ded6b5ec9ad382494f858d8ab5def0ed6c7d529481cd212863b2edde3b5e07"; + sha256 = "01sy7ggfvck350hwv0cla9ynrvghvssqm3c59x4q5lwsxjsxdpjm"; }; desktopItem = makeDesktopItem { @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { calculus in one easy-to-use package. ''; homepage = https://www.geogebra.org/; + maintainers = with maintainers; [ ma27 ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; platforms = platforms.all; hydraPlatforms = []; diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index 56ae454831b..334423660a0 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -1,19 +1,23 @@ -{ stdenv, fetchurl, qt, cmake }: +{ stdenv, fetchgit, cmake, qtbase, qttools }: stdenv.mkDerivation rec { name = "speedcrunch-${version}"; - version = "0.11"; + version = "0.12.0"; - src = fetchurl { - url = "https://bitbucket.org/heldercorreia/speedcrunch/get/${version}.tar.gz"; - sha256 = "0phba14z9jmbmax99klbxnffwzv3awlzyhpcwr1c9lmyqnbcsnkd"; + src = fetchgit { + # the tagging is not standard, so you probably need to check this when updating + rev = "refs/tags/release-${version}"; + url = "https://bitbucket.org/heldercorreia/speedcrunch"; + sha256 = "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk"; }; - buildInputs = [cmake qt]; + buildInputs = [ qtbase qttools ]; - dontUseCmakeBuildDir = true; + nativeBuildInputs = [ cmake ]; - cmakeDir = "src"; + preConfigure = '' + cd src + ''; meta = with stdenv.lib; { homepage = http://speedcrunch.org; diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index 40d23cc7e8a..8902bacf11c 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, python, zlib, mesa, libX11}: +{stdenv, fetchurl, wxGTK, perl, python2, zlib, mesa, libX11}: let s = # Generated upstream information rec { @@ -10,7 +10,7 @@ let sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204"; }; buildInputs = [ - wxGTK perl python zlib mesa libX11 + wxGTK perl python2 zlib mesa libX11 ]; in stdenv.mkDerivation rec { @@ -26,12 +26,12 @@ stdenv.mkDerivation rec { makeFlags=[ "AM_LDFLAGS=" ]; - NIX_LDFLAGS="-lpython${python.majorVersion} -lperl"; + NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl"; preConfigure='' export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DPYTHON_SHLIB=$(basename "$( - readlink -f ${python}/lib/libpython*.so)")" + readlink -f ${python2}/lib/libpython*.so)")" ''; meta = { diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix index 0e35a0b2264..eb157e8b99f 100644 --- a/pkgs/applications/science/programming/plm/default.nix +++ b/pkgs/applications/science/programming/plm/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Free cross-platform programming exerciser"; Homepage = http://webloria.loria.fr/~quinson/Teaching/PLM/; license = licenses.gpl3; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/version-management/cvs/CVE-2012-0804.patch b/pkgs/applications/version-management/cvs/CVE-2012-0804.patch new file mode 100644 index 00000000000..cd2b324729f --- /dev/null +++ b/pkgs/applications/version-management/cvs/CVE-2012-0804.patch @@ -0,0 +1,16 @@ +diff --git a/src/client.c b/src/client.c +index 751406b..b45d89c 100644 +--- a/src/client.c ++++ b/src/client.c +@@ -3558,9 +3558,9 @@ connect_to_pserver (cvsroot_t *root, struct buffer **to_server_p, + * code. + */ + read_line_via (from_server, to_server, &read_buf); +- sscanf (read_buf, "%s %d", write_buf, &codenum); ++ count = sscanf (read_buf, "%*s %d", &codenum); + +- if ((codenum / 100) != 2) ++ if (count != 1 || (codenum / 100) != 2) + error (1, 0, "proxy server %s:%d does not support http tunnelling", + root->proxy_hostname, proxy_port_number); + free (read_buf); diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 74a2267043c..7ad3aac61d9 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -8,7 +8,10 @@ stdenv.mkDerivation { sha256 = "0pjir8cwn0087mxszzbsi1gyfc6373vif96cw4q3m1x6p49kd1bq"; }; - patches = [ ./getcwd-chroot.patch ]; + patches = [ + ./getcwd-chroot.patch + ./CVE-2012-0804.patch + ]; hardeningDisable = [ "fortify" "format" ]; 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 new file mode 100644 index 00000000000..b2324581244 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, jre, makeWrapper }: + +let + version = "1.12.15"; + jarName = "bfg-${version}.jar"; + mavenUrl = "http://central.maven.org/maven2/com/madgag/bfg/${version}/${jarName}"; +in + stdenv.mkDerivation { + inherit version jarName; + + name = "bfg-repo-cleaner"; + + src = fetchurl { + url = mavenUrl; + sha256 = "17dh25jambkk55khknlhy8wa9s1i1xmh9hdgj72j1lzyl0ag42ik"; + }; + + buildInputs = [ jre makeWrapper ]; + + phases = "installPhase"; + + installPhase = '' + mkdir -p $out/share/java + mkdir -p $out/bin + cp $src $out/share/java/$jarName + makeWrapper "${jre}/bin/java" $out/bin/bfg --add-flags "-cp $out/share/java/$jarName com.madgag.git.bfg.cli.Main" + ''; + + meta = with stdenv.lib; { + homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; + # Descriptions taken with minor modification from the homepage of bfg-repo-cleaner + description = "Removes large or troublesome blobs in a git repository like git-filter-branch does, but faster"; + longDescription = '' + The BFG is a simpler, faster alternative to git-filter-branch for + cleansing bad data out of your Git repository history, in particular removing + crazy big files and removing passwords, credentials, and other private data. + + The git-filter-branch command is enormously powerful and can do things + that the BFG can't - but the BFG is much better for the tasks above, because + it's faster (10-720x), simpler (dedicated to just removing things), and + beautiful (can use Scala instead of bash to script customizations). + ''; + license = licenses.gpl3; + maintainers = [ maintainers.changlinli ]; + platforms = platforms.unix; + downloadPage = "https://mvnrepository.com/artifact/com.madgag/bfg/${version}"; + }; + + } diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e8c7c3bfbfd..d68b1e41c8d 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -22,6 +22,8 @@ in rec { # Try to keep this generally alphabetized + bfg-repo-cleaner = callPackage ./bfg-repo-cleaner { }; + bitbucket-server-cli = callPackage ./bitbucket-server-cli { }; darcsToGit = callPackage ./darcs-to-git { }; @@ -80,7 +82,7 @@ rec { inherit (darwin) Security; }; - qgit = callPackage ./qgit { }; + qgit = qt5.callPackage ./qgit { }; stgit = callPackage ./stgit { }; 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 f67d575b5b3..82549fd9a57 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "git-hub-${version}"; - version = "0.10"; + version = "0.11.0"; src = fetchFromGitHub { - sha256 = "0zy1g6zzv6cw8ffj8ffm28qa922fys2826n5813p8icqypi04y0k"; + sha256 = "1lpi373vzr6gda0gic7w37qhipfg7bjpn8nwjjgz44vf2vjlhf9k"; rev = "v${version}"; repo = "git-hub"; owner = "sociomantic-tsunami"; 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 c77c746c88f..c93015678e2 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.11.0"; + version = "2.11.1"; svn = subversionClient.override { perlBindings = true; }; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "02zx368id8rys0bh2sjrxz0ln2l2wm5nf1vhp1rj72clsilqszky"; + sha256 = "05b4jw86w77c3pyh3nm6aw31vhxwzvhnx2x0bcfqmm15wg57k9y0"; }; hardeningDisable = [ "format" ]; 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 b8d001ee97c..5e3532b5643 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -1,27 +1,22 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, libXext, libX11 }: +{ stdenv, fetchurl, cmake, qtbase }: stdenv.mkDerivation rec { - name = "qgit-2.5"; + name = "qgit-2.6"; src = fetchurl { - url = "http://libre.tibirna.org/attachments/download/9/${name}.tar.gz"; - sha256 = "25f1ca2860d840d87b9919d34fc3a1b05d4163671ed87d29c3e4a8a09e0b2499"; + url = "http://libre.tibirna.org/attachments/download/12/${name}.tar.gz"; + sha256 = "1brrhac6s6jrw3djhgailg5d5s0vgrfvr0sczqgzpp3i6pxf8qzl"; }; - hardeningDisable = [ "format" ]; + buildInputs = [ qtbase ]; - buildInputs = [ qt4 libXext libX11 ]; + nativeBuildInputs = [ cmake ]; - nativeBuildInputs = [ qmake4Hook ]; - - installPhase = '' - install -s -D -m 755 bin/qgit "$out/bin/qgit" - ''; - - meta = { - license = stdenv.lib.licenses.gpl2; - homepage = "http://libre.tibirna.org/projects/qgit/wiki/QGit"; + meta = with stdenv.lib; { + license = licenses.gpl2; + homepage = http://libre.tibirna.org/projects/qgit/wiki/QGit; description = "Graphical front-end to Git"; - inherit (qt4.meta) platforms; + maintainer = with maintainers; [ peterhoeg ]; + inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 4cbec62b2f9..b15576b364e 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 = "1.2.1"; + version = "1.3.0"; name = "gitlab-workhorse-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1z4iyymld3pssf1dwar0hy6c5hii79gk4k59mqj0mgy2k73405y0"; + sha256 = "06pxnb675c5fwk7rv6fjh0cwbdylrdbjcyf8b0pins8jl0ix0szy"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index 8edb08638dd..6d6564ea5f9 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -16,10 +16,12 @@ gem 'default_value_for', '~> 3.0.0' gem 'mysql2', '~> 0.3.16', group: :mysql gem 'pg', '~> 0.18.2', group: :postgres +gem 'rugged', '~> 0.24.0' + # Authentication libraries gem 'devise', '~> 4.2' gem 'doorkeeper', '~> 4.2.0' -gem 'omniauth', '~> 1.3.1' +gem 'omniauth', '~> 1.3.2' gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.6' gem 'omniauth-cas3', '~> 1.1.2' @@ -49,10 +51,6 @@ gem 'u2f', '~> 0.2.1' # Browser detection gem 'browser', '~> 2.2' -# Extracting information from a git repository -# Provide access to Gitlab::Git library -gem 'gitlab_git', '~> 10.7.0' - # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master @@ -101,18 +99,19 @@ gem 'unf', '~> 0.1.4' gem 'seed-fu', '~> 2.3.5' # Markdown and HTML processing -gem 'html-pipeline', '~> 1.11.0' -gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie' -gem 'gitlab-markup', '~> 1.5.1' -gem 'redcarpet', '~> 3.3.3' -gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~> 4.2' -gem 'org-ruby', '~> 0.9.12' -gem 'creole', '~> 0.5.0' -gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 1.5.2' -gem 'rouge', '~> 2.0' -gem 'truncato', '~> 0.7.8' +gem 'html-pipeline', '~> 1.11.0' +gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie' +gem 'gitlab-markup', '~> 1.5.1' +gem 'redcarpet', '~> 3.3.3' +gem 'RedCloth', '~> 4.3.2' +gem 'rdoc', '~> 4.2' +gem 'org-ruby', '~> 0.9.12' +gem 'creole', '~> 0.5.0' +gem 'wikicloth', '0.8.1' +gem 'asciidoctor', '~> 1.5.2' +gem 'asciidoctor-plantuml', '0.0.6' +gem 'rouge', '~> 2.0' +gem 'truncato', '~> 0.7.8' # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM @@ -253,10 +252,9 @@ end group :development do gem 'foreman', '~> 0.78.0' - gem 'brakeman', '~> 3.3.0', require: false + gem 'brakeman', '~> 3.4.0', require: false gem 'letter_opener_web', '~> 1.3.0' - gem 'rerun', '~> 0.11.0' gem 'bullet', '~> 5.2.0', require: false gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false gem 'web-console', '~> 2.0' @@ -287,7 +285,7 @@ group :development, :test do gem 'minitest', '~> 5.7.0' # Generate Fake data - gem 'ffaker', '~> 2.0.0' + gem 'ffaker', '~> 2.4' gem 'capybara', '~> 2.6.2' gem 'capybara-screenshot', '~> 1.0.0' @@ -301,8 +299,8 @@ group :development, :test do gem 'spring-commands-spinach', '~> 1.1.0' gem 'spring-commands-teaspoon', '~> 0.0.2' - gem 'rubocop', '~> 0.43.0', require: false - gem 'rubocop-rspec', '~> 1.5.0', require: false + gem 'rubocop', '~> 0.46.0', require: false + gem 'rubocop-rspec', '~> 1.9.1', require: false gem 'scss_lint', '~> 0.47.0', require: false gem 'haml_lint', '~> 0.18.2', require: false gem 'simplecov', '0.12.0', require: false @@ -324,18 +322,18 @@ group :test do gem 'email_spec', '~> 1.6.0' gem 'json-schema', '~> 2.6.2' gem 'webmock', '~> 1.21.0' - gem 'test_after_commit', '~> 0.4.2' + gem 'test_after_commit', '~> 1.1' gem 'sham_rack', '~> 1.3.6' gem 'timecop', '~> 0.8.0' end gem 'newrelic_rpm', '~> 3.16' -gem 'octokit', '~> 4.3.0' +gem 'octokit', '~> 4.6.2' gem 'mail_room', '~> 0.9.0' -gem 'email_reply_parser', '~> 0.5.8' +gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' gem 'ruby-prof', '~> 0.16.2' @@ -350,7 +348,7 @@ gem 'paranoia', '~> 2.2' gem 'health_check', '~> 2.2.0' # System information -gem 'vmstat', '~> 2.2' +gem 'vmstat', '~> 2.3.0' gem 'sys-filesystem', '~> 1.1.6' gem "activerecord-nulldb-adapter" diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index 211bdd20fd1..80cdf9d3258 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -56,6 +56,8 @@ GEM faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) asciidoctor (1.5.3) + asciidoctor-plantuml (0.0.6) + asciidoctor (~> 1.5) ast (2.3.0) attr_encrypted (3.0.3) encryptor (~> 3.0.0) @@ -88,7 +90,7 @@ GEM bootstrap-sass (3.3.6) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - brakeman (3.3.2) + brakeman (3.4.1) browser (2.2.0) builder (3.2.2) bullet (5.2.0) @@ -173,7 +175,7 @@ GEM railties (>= 4.2) dropzonejs-rails (0.7.2) rails (> 3.1) - email_reply_parser (0.5.8) + email_reply_trimmer (0.1.6) email_spec (1.6.0) launchy (~> 2.1) mail (~> 2.2) @@ -198,7 +200,7 @@ GEM faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json - ffaker (2.0.0) + ffaker (2.4.0) ffi (1.9.10) flay (2.6.1) ruby_parser (~> 3.0) @@ -268,11 +270,6 @@ GEM gitlab-markup (1.5.1) gitlab-turbolinks-classic (2.5.6) coffee-rails - gitlab_git (10.7.0) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) omniauth (~> 1.0) @@ -412,9 +409,6 @@ GEM xml-simple licensee (8.0.0) rugged (>= 0.24b) - listen (3.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) little-plugger (1.1.4) logging (2.1.0) little-plugger (~> 1.1) @@ -454,10 +448,10 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.3.0) - sawyer (~> 0.7.0, >= 0.5.3) + octokit (4.6.2) + sawyer (~> 0.8.0, >= 0.5.3) oj (2.17.4) - omniauth (1.3.1) + omniauth (1.3.2) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) omniauth-auth0 (1.4.1) @@ -585,9 +579,6 @@ GEM rainbow (2.1.0) raindrops (0.17.0) rake (10.5.0) - rb-fsevent (0.9.6) - rb-inotify (0.9.5) - ffi (>= 0.5.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) rdoc (4.2.2) @@ -616,8 +607,6 @@ GEM redis-store (1.2.0) redis (>= 2.2) request_store (1.3.1) - rerun (0.11.0) - listen (~> 3.0) responders (2.3.0) railties (>= 4.2.0, < 5.1) rest-client (2.0.0) @@ -655,14 +644,14 @@ GEM rspec-retry (0.4.5) rspec-core rspec-support (3.5.0) - rubocop (0.43.0) + rubocop (0.46.0) parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-rspec (1.5.0) - rubocop (>= 0.40.0) + rubocop-rspec (1.9.1) + rubocop (>= 0.42.0) ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-prof (0.16.2) @@ -686,9 +675,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sawyer (0.7.0) - addressable (>= 2.3.5, < 2.5) - faraday (~> 0.8, < 0.10) + sawyer (0.8.1) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) scss_lint (0.47.1) rake (>= 0.9, < 11) sass (~> 3.4.15) @@ -773,7 +762,7 @@ GEM teaspoon-jasmine (2.2.0) teaspoon (>= 1.0.0) temple (0.7.7) - test_after_commit (0.4.2) + test_after_commit (1.1.0) activerecord (>= 3.2) thin (1.7.0) daemons (~> 1.0, >= 1.0.9) @@ -812,7 +801,7 @@ GEM coercible (~> 1.0) descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) - vmstat (2.2.0) + vmstat (2.3.0) warden (1.2.6) rack (>= 1.0) web-console (2.3.0) @@ -849,6 +838,7 @@ DEPENDENCIES allocations (~> 1.0) asana (~> 0.4.0) asciidoctor (~> 1.5.2) + asciidoctor-plantuml (= 0.0.6) attr_encrypted (~> 3.0.0) awesome_print (~> 1.2.0) babosa (~> 1.0.2) @@ -857,7 +847,7 @@ DEPENDENCIES better_errors (~> 1.0.1) binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.3.0) - brakeman (~> 3.3.0) + brakeman (~> 3.4.0) browser (~> 2.2) bullet (~> 5.2.0) bundler-audit (~> 0.5.0) @@ -879,10 +869,10 @@ DEPENDENCIES diffy (~> 3.1.0) doorkeeper (~> 4.2.0) dropzonejs-rails (~> 0.7.1) - email_reply_parser (~> 0.5.8) + email_reply_trimmer (~> 0.1) email_spec (~> 1.6.0) factory_girl_rails (~> 4.7.0) - ffaker (~> 2.0.0) + ffaker (~> 2.4) flay (~> 2.6.1) fog-aws (~> 0.9) fog-core (~> 1.40) @@ -899,7 +889,6 @@ DEPENDENCIES gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) gitlab-turbolinks-classic (~> 2.5, >= 2.5.6) - gitlab_git (~> 10.7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.2) @@ -937,9 +926,9 @@ DEPENDENCIES newrelic_rpm (~> 3.16) nokogiri (~> 1.6.7, >= 1.6.7.2) oauth2 (~> 1.2.0) - octokit (~> 4.3.0) + octokit (~> 4.6.2) oj (~> 2.17.4) - omniauth (~> 1.3.1) + omniauth (~> 1.3.2) omniauth-auth0 (~> 1.4.1) omniauth-authentiq (~> 0.2.0) omniauth-azure-oauth2 (~> 0.0.6) @@ -974,16 +963,16 @@ DEPENDENCIES redis-namespace (~> 1.5.2) redis-rails (~> 5.0.1) request_store (~> 1.3) - rerun (~> 0.11.0) responders (~> 2.0) rouge (~> 2.0) rqrcode-rails3 (~> 0.1.7) rspec-rails (~> 3.5.0) rspec-retry (~> 0.4.5) - rubocop (~> 0.43.0) - rubocop-rspec (~> 1.5.0) + rubocop (~> 0.46.0) + rubocop-rspec (~> 1.9.1) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.16.2) + rugged (~> 0.24.0) sanitize (~> 2.0) sass-rails (~> 5.0.6) scss_lint (~> 0.47.0) @@ -1023,7 +1012,7 @@ DEPENDENCIES unicorn-worker-killer (~> 0.4.4) version_sorter (~> 2.1.0) virtus (~> 1.0.1) - vmstat (~> 2.2) + vmstat (~> 2.3.0) web-console (~> 2.0) webmock (~> 1.21.0) wikicloth (= 0.8.1) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 659e002dfb6..23100a85e7e 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "8.15.4"; + version = "8.16.4"; buildInputs = [ env ruby bundler tzdata git nodejs procps ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "1cd6dl8niy1xxifxdrm1kwm8qhy4x4zyvwdsb722kr136rwnxm84"; + sha256 = "118p3c9i9r2acc0yv5jzw9p7hql5pbp37k54qzrfgrs8vjjxi14i"; }; patches = [ diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index 64ebf34e477..1ebb7c5b1fa 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -143,6 +143,14 @@ }; version = "1.5.3"; }; + asciidoctor-plantuml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rd8yh0by5sxhg1c3cb1mzkp4jp3j8v6vzbyv1mx492s9ml451fx"; + type = "gem"; + }; + version = "0.0.6"; + }; ast = { source = { remotes = ["https://rubygems.org"]; @@ -274,10 +282,10 @@ brakeman = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0v2yllqcn2zyi60ahgi8ds8pix6a82703ln25p9pkm1bvrwj3fsq"; + sha256 = "0kmg55glfnx7jidrl1ivkfqc0zqya78wxk8wf5j37rj8ya3lzxgd"; type = "gem"; }; - version = "3.3.2"; + version = "3.4.1"; }; browser = { source = { @@ -607,13 +615,13 @@ }; version = "0.7.2"; }; - email_reply_parser = { + email_reply_trimmer = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0k2p229mv7xn7q627zwmvhrcvba4b9m70pw2jfjm6iimg2vmf22r"; + sha256 = "0vijywhy1acsq4187ss6w8a7ksswaf1d5np3wbj962b6rqif5vcz"; type = "gem"; }; - version = "0.5.8"; + version = "0.1.6"; }; email_spec = { source = { @@ -738,10 +746,10 @@ ffaker = { source = { remotes = ["https://rubygems.org"]; - sha256 = "19fnbbsw87asyb1hvkr870l2yldah2jcjb8074pgyrma5lynwmn0"; + sha256 = "1rlfvf2iakphs3krxy1hiywr2jzmrhvhig8n8fw6rcivpz9v52ry"; type = "gem"; }; - version = "2.0.0"; + version = "2.4.0"; }; ffi = { source = { @@ -944,14 +952,6 @@ }; version = "2.5.6"; }; - gitlab_git = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nnr6dlqq30syab2g7yvffgzinj5c8n9q7fvr3d88ix8hsawjrjm"; - type = "gem"; - }; - version = "10.7.0"; - }; gitlab_omniauth-ldap = { source = { remotes = ["https://rubygems.org"]; @@ -1312,14 +1312,6 @@ }; version = "8.0.0"; }; - listen = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "182wd2pkf690ll19lx6zbk01a3rqkk5lwsyin6kwydl7lqxj5z3g"; - type = "gem"; - }; - version = "3.0.5"; - }; little-plugger = { source = { remotes = ["https://rubygems.org"]; @@ -1531,10 +1523,10 @@ octokit = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1hq47ck0z03vr3rzblyszihn7x2m81gv35chwwx0vrhf17nd27np"; + sha256 = "1bppfc0q8mflbcdsb66dly3skx42vad30q0fkzwx4za908qwvjpd"; type = "gem"; }; - version = "4.3.0"; + version = "4.6.2"; }; oj = { source = { @@ -1547,10 +1539,10 @@ omniauth = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0vsqxgzkcfi10b7k6vpv3shmlphbs8grc29hznwl9s0i16n8962p"; + sha256 = "1dp5g3a6jnppy2kriz365p3jf9alrir4fhrj2nff2gm9skci2bk6"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; omniauth-auth0 = { source = { @@ -1928,22 +1920,6 @@ }; version = "10.5.0"; }; - rb-fsevent = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hq57by28iv0ijz8pk9ynih0xdg7vnl1010xjcijfklrcv89a1j2"; - type = "gem"; - }; - version = "0.9.6"; - }; - rb-inotify = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9"; - type = "gem"; - }; - version = "0.9.5"; - }; rblineprof = { source = { remotes = ["https://rubygems.org"]; @@ -2056,14 +2032,6 @@ }; version = "1.3.1"; }; - rerun = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0av239bpmy55fdx4qaw9n71aapjy2myr51h5plzjxsyr0fdwn1xq"; - type = "gem"; - }; - version = "0.11.0"; - }; responders = { source = { remotes = ["https://rubygems.org"]; @@ -2187,18 +2155,18 @@ rubocop = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0r2p4v6w5w1zx4skj9i3g3pshg3rykhgswimydrswp6nb8nkaphj"; + sha256 = "0604qa0s0xcq0avnh9aa6iw58azpz6a7bavcs0ch61xnaz0qfl0c"; type = "gem"; }; - version = "0.43.0"; + version = "0.46.0"; }; rubocop-rspec = { source = { remotes = ["https://rubygems.org"]; - sha256 = "11701iw858vkxmb6khc9apmagz3lmnbdxm8irsxsgg57d0p8bs8p"; + sha256 = "0h3781f4mz72qz8i30ah4fjfm4i20aqncak6rc9kwsvm5hw48i18"; type = "gem"; }; - version = "1.5.0"; + version = "1.9.1"; }; ruby-fogbugz = { source = { @@ -2315,10 +2283,10 @@ sawyer = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1cn48ql00mf1ag9icmfpj7g7swh7mdn7992ggynjqbw1gh15bs3j"; + sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd"; type = "gem"; }; - version = "0.7.0"; + version = "0.8.1"; }; scss_lint = { source = { @@ -2611,10 +2579,10 @@ test_after_commit = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1fzg8qan6f0n0ynr594bld2k0rwwxj99yzhiga2f3pkj9ina1abb"; + sha256 = "0s8pz00xq28lsa1rfczm83yqwk8wcb5dqw2imlj8gldnsdapcyc2"; type = "gem"; }; - version = "0.4.2"; + version = "1.1.0"; }; thin = { source = { @@ -2779,10 +2747,10 @@ vmstat = { source = { remotes = ["https://rubygems.org"]; - sha256 = "10hlfam5gvxjvr5p1f4f81wlv5k81mrlg556rc9525290bcz31f0"; + sha256 = "0vb5mwc71p8rlm30hnll3lb4z70ipl5rmilskpdrq2mxwfilcm5b"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; warden = { source = { diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index dec0f752fb7..dfd024a762a 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -11,7 +11,7 @@ index a9d8ac4..85f13f5 100644 - # # arguments: '-i -t' - # # } + config.action_mailer.sendmail_settings = { -+ location: '/var/setuid-wrappers/sendmail', ++ location: '/run/wrappers/bin/sendmail', + arguments: '-i -t' + } config.action_mailer.perform_deliveries = true diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index 154d6442a2f..7b8b0598925 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -1,9 +1,17 @@ -{stdenv, fetchurl, ocaml, lablgtk, libgnomecanvas, camlp4, glib, pkgconfig, graphviz_2_0, makeWrapper}: +{stdenv, fetchurl, ocaml, lablgtk, libgnomecanvas, camlp4, glib, pkgconfig, makeWrapper +, libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw +}: +# We need an old version of Graphviz for format compatibility reasons. +# This version is vulnerable, but monotone-viz will never feed it bad input. +let graphviz_2_0 = import ./graphviz-2.0.nix { + inherit stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw + yacc libtool fontconfig pango gd libwebp; + }; in stdenv.mkDerivation rec { version = "1.0.2"; name = "monotone-viz-${version}"; - buildInputs = [ocaml lablgtk libgnomecanvas glib pkgconfig graphviz_2_0 makeWrapper]; + buildInputs = [ocaml lablgtk libgnomecanvas glib pkgconfig graphviz_2_0 makeWrapper camlp4]; src = fetchurl { url = "http://oandrieu.nerim.net/monotone-viz/${name}-nolablgtk.tar.gz"; sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk"; diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix similarity index 100% rename from pkgs/tools/graphics/graphviz/2.0.nix rename to pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index 841fe299430..c98e2747989 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Powerful and easy-to-use multimedia player"; - homepage = https://bomi-player.github.io/; + homepage = "https://bomi-player.github.io/"; license = licenses.gpl2Plus; maintainers = [ maintainers.abbradar ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 872ac098f00..ca9620a0eb0 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/GNOME/byzanz; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index b250f9496d6..e3d1e1b1bfd 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -2,8 +2,9 @@ , pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr -, libXext, libXxf86vm, libXv, libXi, libX11, xextproto, libtheora, libpng -, libdv, libuuid, file, nasm, perl }: +, libXext, libXxf86vm, libXv, libXi, libX11, libXft, xextproto, libtheora, libpng +, libdv, libuuid, file, nasm, perl +, fontconfig, intltool }: stdenv.mkDerivation { name = "cinelerra-git"; @@ -15,8 +16,16 @@ stdenv.mkDerivation { src = fetchgit { url = "git://git.cinelerra-cv.org/j6t/cinelerra.git"; - rev = "01dc4375a0fb65d10dd95151473d0e195239175f"; - sha256 = "0grz644vrnajhxn96x05a3rlwrbd20yq40sw3y5yg7bvi96900gf"; + # 2.3 + #rev = "58ef118e63bf2fac8c99add372c584e93b008bae"; + #sha256 = "1wx8c9rvh4y7fgg39lb02cy3sanms8a4fayr70jbhcb4rp691lph"; + # master 22 nov 2016 + #rev = "dbc22e0f35a9e8c274b06d4075b51dc9bace34aa"; + #sha256 = "0c76j98ws1x2s5hzcdlykxm2bi7987d9nanka428xj62id0grla5"; + + # j6t/cinelerra.git + rev = "454be60e201c18c1fc3f1f253a6d2184fcfc94c4"; + sha256 = "1n4kshqhgnr7aivsi8dgx48phyd2nzvv4szbc82mndklvs9jfb7r"; }; # touch config.rpath: work around bug in automake 1.10 ? @@ -34,12 +43,15 @@ stdenv.mkDerivation { a52dec alsaLib fftw lame libavc1394 libiec61883 libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype mjpegtools x264 gettext openexr - libXext libXxf86vm libXv libXi libX11 xextproto + libXext libXxf86vm libXv libXi libX11 libXft xextproto libtheora libpng libdv libuuid nasm perl + fontconfig intltool ]; + enableParallelBuilding = true; + meta = { description = "Video Editor"; homepage = http://www.cinelerra.org; diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 26128f44fa2..69f58fe94bd 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "clipgrab-${version}"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { - sha256 = "1pmsnb9yfyadp8kzxldw09wmv2r0wmg9yza9ariqc27jz1j3kpsc"; + sha256 = "0n7bhwkzknjpp54h54hxv1s8nsmmb7cwwf1aqpbcsnd7y6cv28nm"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${name}.tar.gz"; }; diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix deleted file mode 100644 index cf17b66ef48..00000000000 --- a/pkgs/applications/video/gnash/default.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ stdenv, fetchurl, fetchpatch -, SDL, SDL_mixer, gstreamer, gst_plugins_base, gst_plugins_good -, gst_ffmpeg, speex -, libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool -, boost, freetype, agg, dbus, curl, pkgconfig, gettext -, glib, gtk2, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl -, freefont_ttf, haxe, swftools -, lib, makeWrapper -, xulrunner }: - -assert stdenv ? glibc; - -let version = "0.8.10"; - patch_CVE = fetchpatch { - url = "http://git.savannah.gnu.org/cgit/gnash.git/patch/?id=bb4dc77eecb6ed1b967e3ecbce3dac6c5e6f1527"; - sha256 = "0ghnki5w7xf3qwfl1x6vhijpd6q608niyxrvh0g8dw5xavkvallk"; - name = "CVE-2012-1175.patch"; - }; -in - -stdenv.mkDerivation rec { - name = "gnash-${version}"; - - src = fetchurl { - url = "mirror://gnu/gnash/${version}/${name}.tar.bz2"; - sha256 = "090j5lly5r6jzbnvlc3mhay6dsrd9sfrkjcgqaibm4nz8lp0f9cn"; - }; - - patchPhase = '' - patch -p1 < ${patch_CVE} - - # Add all libs to `macros/libslist', a list of library search paths. - libs=$(echo "$NIX_LDFLAGS" | tr ' ' '\n' | sed -n 's/.*-L\(.*\).*/\1/p') - for lib in $libs; do - echo -n "$lib " >> macros/libslist - done - echo -n "${stdenv.glibc.out}/lib" >> macros/libslist - - # Make sure to honor $TMPDIR, for chroot builds. - for file in configure gui/Makefile.in Makefile.in - do - sed -i "$file" -es'|/tmp/|$TMPDIR/|g' - done - - # Provide a default font. - sed -i "configure" \ - -e 's|/usr/share/fonts/truetype/freefont/|${freefont_ttf}/share/fonts/truetype/|g' - ''; - - enableParallelBuilding = true; - - # XXX: KDE is supported as well so we could make it available optionally. - buildInputs = [ - gettext xlibsWrapper SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good - gst_ffmpeg speex libtool - libogg libxml2 libjpeg mesa libpng libungif boost freetype agg - dbus curl pkgconfig glib gtk2 gtkglext pangox_compat - xulrunner - makeWrapper - ] - - ++ (stdenv.lib.optionals doCheck [ - ming dejagnu python perl haxe swftools - ]); - - preConfigure = - '' configureFlags=" \ - --with-sdl-incl=${SDL.dev}/include/SDL \ - --with-npapi-plugindir=$out/plugins \ - --enable-media=gst \ - --without-gconf - --enable-gui=gtk" - - # In `libmedia', Gnash compiles with "-I$gst_plugins_base/include", - # whereas it really needs "-I$gst_plugins_base/include/gstreamer-0.10". - # Work around this using GCC's $CPATH variable. - export CPATH="${gst_plugins_base}/include/gstreamer-0.10:${gst_plugins_good}/include/gstreamer-0.10" - echo "\$CPATH set to \`$CPATH'" - - echo "\$GST_PLUGIN_PATH set to \`$GST_PLUGIN_PATH'" - ''; - - postConfigure = "echo '#define nullptr NULL' >> gnashconfig.h"; - - # Make sure `gtk-gnash' gets `libXext' in its `RPATH'. - NIX_LDFLAGS="-lX11 -lXext"; - - # XXX: Tests currently fail. - doCheck = false; - - preInstall = ''mkdir -p $out/plugins''; - postInstall = '' - make install-plugins - - # Wrap programs so the find the GStreamer plug-ins they need - # (e.g., gst-ffmpeg is needed to watch movies such as YouTube's). - for prog in "$out/bin/"* - do - wrapProgram "$prog" --prefix GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH" - done - ''; - - meta = { - homepage = http://www.gnu.org/software/gnash/; - description = "A libre SWF (Flash) movie player"; - - longDescription = '' - Gnash is a GNU Flash movie player. Flash is an animation file format - pioneered by Macromedia which continues to be supported by their - successor company, Adobe. Flash has been extended to include audio and - video content, and programs written in ActionScript, an - ECMAScript-compatible language. Gnash is based on GameSWF, and - supports most SWF v7 features and some SWF v8 and v9. - ''; - - license = stdenv.lib.licenses.gpl3Plus; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; - broken = true; - }; -} // {mozillaPlugin = "/plugins";} diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 2e62cb139e3..cbd0347078e 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation { description = "MPlayer front-end for KDE"; license = "GPL"; homepage = http://kmplayer.kde.org; + broken = true; # Also unavailable on this mirror maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index dccb8412733..ee0be6419aa 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper , pkgconfig, cmake, gnumake, yasm, python2 -, boost, avahi, libdvdcss, lame, autoreconfHook +, boost, avahi, libdvdcss, libdvdnav, libdvdread, lame, autoreconfHook , gettext, pcre-cpp, yajl, fribidi, which , openssl, gperf, tinyxml2, taglib, libssh, swig, jre , libX11, xproto, inputproto, libxml2 @@ -38,18 +38,18 @@ assert pulseSupport -> libpulseaudio != null; assert rtmpSupport -> rtmpdump != null; let - rel = "Jarvis"; - ffmpeg_2_8_6 = fetchurl { - url = "https://github.com/xbmc/FFmpeg/archive/2.8.6-${rel}-16.1.tar.gz"; - sha256 = "1qp8b97298l2pnhhcp7xczdfwr7q7ibxlk4vp8pfmxli2h272wan"; + rel = "Krypton"; + ffmpeg_3_1_6 = fetchurl { + url = "https://github.com/xbmc/FFmpeg/archive/3.1.6-${rel}.tar.gz"; + sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81"; }; in stdenv.mkDerivation rec { name = "kodi-" + version; - version = "16.1"; + version = "17.0"; src = fetchurl { url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz"; - sha256 = "047xpmz78k3d6nhk1x9s8z0bw1b1w9kca46zxkg86p3iyapwi0kx"; + sha256 = "0ib59x733yf8ivsw82qlsq43jn5214n668nrn5df2flpjcjgmzsb"; }; buildInputs = [ @@ -90,7 +90,10 @@ in stdenv.mkDerivation rec { --replace 'usr/share/zoneinfo' 'etc/zoneinfo' substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \ --replace "/bin/bash" "${bash}/bin/bash -ex" - cp ${ffmpeg_2_8_6} tools/depends/target/ffmpeg/ffmpeg-2.8.6-${rel}-16.0.tar.gz + cp ${ffmpeg_3_1_6} tools/depends/target/ffmpeg/ffmpeg-3.1.6-${rel}.tar.gz + ln -s ${libdvdcss.src} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz + ln -s ${libdvdnav.src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz + ln -s ${libdvdread.src} tools/depends/target/libdvdread/libdvdread-master.tar.gz ''; preConfigure = '' diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 6abb47b81c3..41298269a18 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, cmake, kodi, steam, libcec_platform, tinyxml, unzip }: +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, lib +, unzip, cmake, kodi, steam, libcec_platform, tinyxml }: let @@ -6,22 +7,22 @@ let kodi-platform = stdenv.mkDerivation rec { project = "kodi-platform"; - version = "15.2"; + version = "17.1"; name = "${project}-${version}"; src = fetchFromGitHub { owner = "xbmc"; repo = project; - rev = "45d6ad1984fdb1dc855076ff18484dbec33939d1"; - sha256 = "1fai33mwyv5ab47b16i692g7a3vcnmxavx13xin2gh16y0qm62hi"; + rev = "c8188d82678fec6b784597db69a68e74ff4986b5"; + sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199"; }; buildInputs = [ cmake kodi libcec_platform tinyxml ]; }; - mkKodiPlugin = { plugin, namespace, version, src, meta, ... }: + mkKodiPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }: stdenv.lib.makeOverridable stdenv.mkDerivation rec { - inherit src meta; + inherit src meta sourceDir; name = "kodi-plugin-${plugin}-${version}"; passthru = { kodiPlugin = pluginDir; @@ -29,6 +30,7 @@ let }; dontStrip = true; installPhase = '' + ${if isNull sourceDir then "" else "cd $src/$sourceDir"} d=$out${pluginDir}/${namespace} mkdir -p $d sauce="." @@ -70,34 +72,69 @@ in }; - genesis = (mkKodiPlugin rec { + controllers = let + pname = "game-controller"; + version = "1.0.3"; - plugin = "genesis"; - namespace = "plugin.video.genesis"; - version = "5.1.4"; - - src = fetchurl { - url = "https://offshoregit.com/lambda81/lambda-repo/${namespace}/${namespace}-${version}.zip"; - sha256 = "0b0pdzgg42mgxgkb6sb83rldh4k19c3l9z7g2wnvxm3s2p6rjy3v"; + src = fetchFromGitHub { + owner = "kodi-game"; + repo = "kodi-game-controllers"; + rev = "01acb5b6e8b85392b3cb298b034aadb1b24ccf18"; + sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb"; }; meta = with stdenv.lib; { - homepage = "http://forums.tvaddons.ag/forums/148-lambda-s-kodi-addons"; - description = "The origins of streaming"; + description = "Add support for different gaming controllers."; platforms = platforms.all; maintainers = with maintainers; [ edwtjo ]; }; + + mkController = controller: { + "${controller}" = mkKodiPlugin rec { + plugin = pname + "-" + controller; + namespace = "game.controller." + controller; + sourceDir = "addons/" + namespace; + inherit version src meta; + }; + }; + in (mkController "default") + // (mkController "dreamcast") + // (mkController "gba") + // (mkController "genesis") + // (mkController "mouse") + // (mkController "n64") + // (mkController "nes") + // (mkController "ps") + // (mkController "snes"); + + exodus = (mkKodiPlugin rec { + + plugin = "exodus"; + namespace = "plugin.video.exodus"; + version = "3.0.5"; + + src = fetchurl { + url = "https://offshoregit.com/${plugin}/${namespace}/${namespace}-${version}.zip"; + sha256 = "0di34sp6y3v72l6gfhj7cvs1vljs9vf0d0x2giix3jk433cj01j0"; + }; + + meta = with stdenv.lib; { + description = "A streaming plugin for Kodi"; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; + }).override { buildInputs = [ unzip ]; }; hyper-launcher = let pname = "hyper-launcher"; - version = "1.2.0"; + version = "1.5.2"; src = fetchFromGitHub rec { name = pname + "-" + version + ".tar.gz"; owner = "teeedubb"; repo = owner + "-xbmc-repo"; - rev = "9bd170407436e736d2d709f8af9968238594669c"; - sha256 = "019nqf7kixicnrzkg671x4yq723igjkhfl8hz5bifi9gx2qcy8hy"; + rev = "f958ba93fe85b9c9025b1745d89c2db2e7dd9bf6"; + sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5"; }; meta = with stdenv.lib; { homepage = http://forum.kodi.tv/showthread.php?tid=258159; @@ -107,8 +144,9 @@ in in { service = mkKodiPlugin { plugin = pname + "-service"; + version = "1.2.1"; namespace = "service.hyper.launcher"; - inherit version src meta; + inherit src meta; }; plugin = mkKodiPlugin { plugin = pname; @@ -117,39 +155,18 @@ in }; }; - salts = mkKodiPlugin rec { - - plugin = "salts"; - namespace = "plugin.video.salts"; - version = "2.0.19"; - - src = fetchFromGitHub { - name = plugin + "-" + version + ".tar.gz"; - owner = "tknorris"; - repo = plugin; - rev = "9c1882bad35cab9e62687847e097c37a576b900d"; - sha256 = "0saq578xsxvyg1v8jg2m3131hfrr95gv74b2npxr7g715yyx5bjq"; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/tknorris/salts"; - description = "Stream All The Sources"; - maintainers = with maintainers; [ edwtjo ]; - }; - }; - svtplay = mkKodiPlugin rec { plugin = "svtplay"; namespace = "plugin.video.svtplay"; - version = "4.0.24"; + version = "4.0.42"; src = fetchFromGitHub { name = plugin + "-" + version + ".tar.gz"; owner = "nilzen"; repo = "xbmc-" + plugin; - rev = "e66e2af6529e3ffd030ad486c849894a9ffdeb45"; - sha256 = "01nq6gac83q6ayhqcj1whvk58pzrm1haw801s321f4vc8gswag56"; + rev = "83cb52b949930a1b6d2e51a7a0faf9bd69c7fb7d"; + sha256 = "0ync2ya4lwmfn6ngg8v0z6bng45whwg280irsn4bam5ca88383iy"; }; meta = with stdenv.lib; { @@ -219,13 +236,13 @@ in pvr-hts = (mkKodiPlugin rec { plugin = "pvr-hts"; namespace = "pvr.hts"; - version = "2.2.13"; + version = "3.4.16"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; - rev = "3274354511e970e2101c2aa437001b2f245f80da"; - sha256 = "0i7cb61pjv6vbj3x96cm1n4w91mvc8z6lxa8ykjasrrbi95ph7ld"; + rev = "b39e4e9870d68841279cbc7d7214f3ad9b27f330"; + sha256 = "0pmlgqr4kd0gvckz77mj6v42kcx6lb23anm8jnf2fbn877snnijx"; }; meta = with stdenv.lib; { @@ -248,48 +265,4 @@ in ln -s $out/lib/addons/pvr.hts/pvr.hts.so* $out/share/kodi/addons/pvr.hts ''; }; - - t0mm0-common = mkKodiPlugin rec { - - plugin = "t0mm0-common"; - namespace = "script.module.t0mm0.common"; - version = "0.0.1"; - - src = fetchFromGitHub { - name = plugin + "-" + version + ".tar.gz"; - owner = "t0mm0"; - repo = "xbmc-urlresolver"; - rev = "ab16933a996a9e77b572953c45e70900c723d6e1"; - sha256 = "1yd00md8iirizzaiqy6fv1n2snydcpqvp2f9irzfzxxi3i9asb93"; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/t0mm0/xbmc-urlresolver/"; - description = "t0mm0's common stuff"; - maintainers = with maintainers; [ edwtjo ]; - }; - }; - - urlresolver = (mkKodiPlugin rec { - - plugin = "urlresolver"; - namespace = "script.module.urlresolver"; - version = "2.10.0"; - - src = fetchFromGitHub { - name = plugin + "-" + version + ".tar.gz"; - owner = "Eldorados"; - repo = namespace; - rev = "72b9d978d90d54bb7a0224a1fd2407143e592984"; - sha256 = "0r5glfvgy9ri3ar9zdkvix8lalr1kfp22fap2pqp739b6k2iqir6"; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/Eldorados/urlresolver"; - description = "Resolve common video host URL's to be playable in XBMC/Kodi"; - maintainers = with maintainers; [ edwtjo ]; - }; - }).override { - postPatch = "sed -i -e 's,settings_file = os.path.join(addon_path,settings_file = os.path.join(profile_path,g' lib/urlresolver/common.py"; - }; } diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 9c987534065..e8dc1227ef8 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoconf, automake -, ruby, file, xdg_utils, gettext, expat, qt5, boost +, drake, ruby, file, xdg_utils, gettext, expat, qt5, boost , libebml, zlib, libmatroska, libogg, libvorbis, flac , withGUI ? true }: @@ -10,16 +10,16 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "9.6.0"; + version = "9.8.0"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "14v6iclzkqxibzcdxr65bb5frmnsjyyly0d3lwv1gg7g1mkcw3jd"; + sha256 = "1hnk92ksgg290q4kwdl8jqrz7vzlwki4f85bb6kgdgzpjkblw76n"; }; - nativeBuildInputs = [ pkgconfig autoconf automake gettext ruby ]; + nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby ]; buildInputs = [ expat file xdg_utils boost libebml zlib libmatroska libogg @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { ] ++ optional withGUI qt5.qtbase; preConfigure = "./autogen.sh; patchShebangs ."; - buildPhase = "./drake -j $NIX_BUILD_CORES"; - installPhase = "./drake install -j $NIX_BUILD_CORES"; + buildPhase = "drake -j $NIX_BUILD_CORES"; + installPhase = "drake install -j $NIX_BUILD_CORES"; configureFlags = [ "--enable-magic" @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { "--disable-profiling" "--disable-precompiled-headers" "--disable-static-qt" - "--without-curl" "--with-gettext" (enableFeature withGUI "qt") ]; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 80676b3cd0a..8051d5ee376 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -22,13 +22,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "0.15.2"; + version = "17.0.1"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "0vw203a1zj2npras589ml6gr5s11h9bhaica90plrh5ajayg0qwj"; + sha256 = "0x5lnl1xkmm8x4g0f8rma8ir1bcldz9sssj2fzkv80hn79h2cvxm"; }; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/video/recordmydesktop/default.nix b/pkgs/applications/video/recordmydesktop/default.nix index 54dc88b452e..8797ad8f953 100644 --- a/pkgs/applications/video/recordmydesktop/default.nix +++ b/pkgs/applications/video/recordmydesktop/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = http://recordmydesktop.sourceforge.net/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix index f3bf714b941..2beb3ca94f2 100644 --- a/pkgs/applications/video/recordmydesktop/gtk.nix +++ b/pkgs/applications/video/recordmydesktop/gtk.nix @@ -32,6 +32,6 @@ in stdenv.mkDerivation rec { homepage = http://recordmydesktop.sourceforge.net/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/video/recordmydesktop/qt.nix b/pkgs/applications/video/recordmydesktop/qt.nix index de372c905bd..56080135151 100644 --- a/pkgs/applications/video/recordmydesktop/qt.nix +++ b/pkgs/applications/video/recordmydesktop/qt.nix @@ -32,6 +32,6 @@ in stdenv.mkDerivation rec { homepage = http://recordmydesktop.sourceforge.net/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 34c5650e9f7..140c8e5863d 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -5,11 +5,11 @@ qmakeHook, makeQtWrapper }: stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "16.10"; + version = "17.02"; src = fetchurl { url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"; - sha256 = "0brskci86bwdj2ahjfvv3v254ligjn97bm0f6c8yg46r0jb8q5xw"; + sha256 = "09nygz1x9fvqf33gqpc6jnr1j7ny0yny3w2ngwqqfkf3f8n83qhr"; }; buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit @@ -17,10 +17,17 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + prePatch = '' + sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp + sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp + NICE=$(type -P nice) + sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp + ''; + postInstall = '' mkdir -p $out/share/shotcut cp -r src/qml $out/share/shotcut/ - wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} + wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} --prefix PATH : ${mlt}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 0801dc8573d..9c2f6d04119 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmakeHook, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-17.1.0"; + name = "smplayer-17.2.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0wgw940gxf3gqh6xzxvz037ipvr1xcw86gf0myvpb4lkwqh5jds0"; + sha256 = "05nqwpyh3zlyzip7chs711sz97cgijb92h44cd5aqbwbx06hihdd"; }; buildInputs = [ qtscript ]; diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 5026e6c4831..ea0bd083b1d 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qmakeHook, qtscript, qtwebkit }: stdenv.mkDerivation rec { - version = "16.7.2"; + version = "17.1.0"; name = "smtube-${version}"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; - sha256 = "0k64hc6grn4nlp739b0w5fznh0k9xx9qdwx6s7w3fb5m5pfkdrmm"; + sha256 = "1kg45qkr7nvchy9ih24vlbpkn6vd8v8qw5xqsjhjpjkizcmzaa61"; }; makeFlags = [ diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index f516c871f51..462d74c9672 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,14 +1,14 @@ { stdenv, pythonPackages, fetchFromGitHub, rtmpdump }: pythonPackages.buildPythonApplication rec { - version = "0.0.2"; + version = "0.3.0"; name = "streamlink-${version}"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = "${version}"; - sha256 = "156b3smivs8lja7a98g3qa74bawqhc4mi8w8f3dscampbxx4dr9y"; + sha256 = "1bjih6y21vmjmsk3xvhgc1innymryklgylyvjrskqw610niai59j"; }; propagatedBuildInputs = (with pythonPackages; [ pycrypto requests2 ]) ++ [ rtmpdump ]; diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 3f8f683e0ca..88768b3cb8f 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, file, desktop_file_utils, +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, desktop_file_utils, enchant, gnome3, gst_all_1, hicolor_icon_theme, libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook }: @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { sha256 = "087rxignjawby4z3lwnh9m6pcjphl3a0jf7gfp83h92mzcq79b4g"; }; + 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 = [ pkgconfig intltool diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix new file mode 100644 index 00000000000..204580b108f --- /dev/null +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchgit +, pkgconfig, qtbase, qttools, qmakeHook, qtx11extras, alsaLib, libv4l, libXrandr +, ffmpeg +}: + +stdenv.mkDerivation { + name = "vokoscreen-2.5.0"; + src = fetchgit { + url = "https://github.com/vkohaupt/vokoscreen.git"; + rev = "8325c8658d6e777d34d2e6b8c8bc03f8da9b3d2f"; + sha256 = "1hvw7xz1mj16ishbaip73wddbmgibsz0pad4y586zbarpynss25z"; + }; + + buildInputs = [ + alsaLib + libv4l + pkgconfig + qtbase + qttools + qmakeHook + qtx11extras + libXrandr + ]; + + patches = [ + ./ffmpeg-out-of-box.patch + ]; + + preConfigure = '' + sed -i 's/lrelease-qt5/lrelease/g' vokoscreen.pro + ''; + + postConfigure = '' + substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg} + ''; + + meta = with stdenv.lib; { + description = "Simple GUI screencast recorder, using ffmpeg"; + homepage = "http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html"; + longDescription = '' + vokoscreen is an easy to use screencast creator to record + educational videos, live recordings of browser, installation, + videoconferences, etc. + ''; + license = licenses.gpl2Plus; + maintainers = [maintainers.league]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch b/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch new file mode 100644 index 00000000000..8f696f26301 --- /dev/null +++ b/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch @@ -0,0 +1,31 @@ +diff --git a/settings/QvkSettings.cpp b/settings/QvkSettings.cpp +index bbf2abf..187efad 100644 +--- a/settings/QvkSettings.cpp ++++ b/settings/QvkSettings.cpp +@@ -56,17 +56,8 @@ void QvkSettings::readAll() + GIFPlayer = settings.value( "GIFplayer" ).toString(); + Minimized = settings.value( "Minimized", 0 ).toUInt(); + Countdown = settings.value( "Countdown", 0 ).toUInt(); +- QFile file; +- if ( file.exists( qApp->applicationDirPath().append( "/bin/ffmpeg" ) ) == true ) +- { +- vokoscreenWithLibs = true; +- Recorder = qApp->applicationDirPath().append( "/bin/ffmpeg" ); +- } +- else +- { +- vokoscreenWithLibs = false; +- Recorder = settings.value( "Recorder", "ffmpeg" ).toString(); +- } ++ vokoscreenWithLibs = true; ++ Recorder = settings.value( "Recorder", "@ffmpeg@/bin/ffmpeg" ).toString(); + settings.endGroup(); + + settings.beginGroup( "Videooptions" ); +@@ -398,4 +389,4 @@ double QvkSettings::getShowClickTime() + int QvkSettings::getShowKeyOnOff() + { + return showKeyOnOff; +-} +\ No newline at end of file ++} diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix new file mode 100644 index 00000000000..e7cd5b7bde6 --- /dev/null +++ b/pkgs/applications/virtualization/aqemu/default.nix @@ -0,0 +1,26 @@ +{ cmake, fetchFromGitHub, libvncserver, qemu, qtbase, stdenv +}: + +stdenv.mkDerivation rec { + name = "aqemu-${version}"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "tobimensch"; + repo = "aqemu"; + rev = "v${version}"; + sha256 = "1h1mcw8x0jir5p39bs8ka0lcisiyi4jq61fsccgb9hsvl1i8fvk5"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libvncserver qtbase qemu ]; + + meta = with stdenv.lib; { + description = "A virtual machine manager GUI for qemu"; + homepage = https://github.com/tobimensch/aqemu; + license = licenses.gpl2; + maintainers = with maintainers; [ hrdinka ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 2391775af42..903ee98a0e1 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -11,13 +11,14 @@ with lib; stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.13.0"; + version = "1.13.1"; + rev = "092cba3"; # should match the version commit src = fetchFromGitHub { owner = "docker"; repo = "docker"; rev = "v${version}"; - sha256 = "03b181xiqgnwanc567w9p6rbdgdvrfv0lk4r7b604ksm0fr4cz23"; + sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar"; }; docker-runc = runc.overrideAttrs (oldAttrs: rec { @@ -25,8 +26,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "docker"; repo = "runc"; - rev = "2f7393a47307a16f8cee44a37b262e8b81021e3e"; - sha256 = "1s5nfnbinzmcnm8avhvsniz0ihxyva4w5qz1hzzyqdyr0w2scnbj"; + rev = "9df8b306d01f59d3a8029be411de015b7304dd8f"; + sha256 = "1yvrk1w2409b90gk55k72z7l3jlkj682x4h3b7004mkl9bhscqd9"; }; # docker/runc already include these patches / are not applicable patches = []; @@ -36,8 +37,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "docker"; repo = "containerd"; - rev = "03e5862ec0d8d3b3f750e19fca3ee367e13c090e"; - sha256 = "184sd9dwkcba3zhxnz9grw8p81x05977p36cif2dgkhjdhv12map"; + rev = "aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1"; + sha256 = "0vidbsgyn77m98kisrqnbykva0zmk1ljprgqhbfp5lw16ac6qj8c"; }; }); docker-tini = tini.overrideAttrs (oldAttrs: rec { @@ -79,7 +80,7 @@ stdenv.mkDerivation rec { buildPhase = '' patchShebangs . export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="23cf638" + export DOCKER_GITCOMMIT="${rev}" ./hack/make.sh dynbinary ''; diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix new file mode 100644 index 00000000000..5b3610243be --- /dev/null +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "${pname}-${version}"; + pname = "amazon-ecs-agent"; + version = "1.14.0"; + + goPackagePath = "github.com/aws/${pname}"; + subPackages = [ "agent" ]; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "aws"; + repo = pname; + sha256 = "12c8l0x8pm883rlbdr1m07r0kjkzggkfz35cjqz8pzyr5ymjdrc3"; + }; + + meta = with stdenv.lib; { + description = "The agent that runs on AWS EC2 container instances and starts containers on behalf of Amazon ECS"; + homepage = "https://github.com/aws/amazon-ecs-agent"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ copumpkin ]; + }; +} + diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index b1b3c3aebee..a307099783e 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0x1hdjsrj6hfk1sgfw11ihm00fmp6g158sr2q3cgjy2b6jnsr4hp"; }; + # Fix a /usr/bin/env reference in here that breaks sandboxed builds + prePatch = "patchShebangs arch/lkl/scripts"; + installPhase = '' mkdir -p $out/{bin,lib} diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index dd8ddfd0e0b..78fa090f925 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,42 +1,48 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, - libmspack, openssl, pam, xercesc, icu, libdnet, procps, - xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst, - pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd }: + fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, + libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, + pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd, which, + withX ? true }: -let - majorVersion = "10.0"; - minorVersion = "7"; - version = "${majorVersion}.${minorVersion}"; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "open-vm-tools-${version}"; + version = "10.1.0"; + src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "0xxgppxjisg3jly21r7mjk06rc4n7ssyvapasxhbi2d1bw0xkvrj"; + sha256 = "1qzk4mvw618ca4j9agsfpqch9jgwghvdc4rpkvlyz8kirvh9iniz"; }; sourceRoot = "${src.name}/open-vm-tools"; - buildInputs = - [ autoreconfHook makeWrapper libmspack openssl pam xercesc icu libdnet procps - pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ]; + outputs = [ "out" "dev" ]; - postPatch = '' - sed -i s,-Werror,,g configure.ac - sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am - sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am - ''; + nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; + buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ] + ++ lib.optionals withX [ gtk gtkmm libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; patches = [ ./recognize_nixos.patch ]; + postPatch = '' + # Build bugfix for 10.1.0, stolen from Arch PKGBUILD + mkdir -p common-agent/etc/config + sed -i 's|.*common-agent/etc/config/Makefile.*|\\|' configure.ac - configureFlags = "--without-kernel-modules --without-xmlsecurity"; + sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am + sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am + sed -i 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),' services/vmtoolsd/Makefile.am + sed -i 's,$(UDEVRULESDIR),''${prefix}/$(UDEVRULESDIR),' udev/Makefile.am + ''; + + configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ] + ++ lib.optional (!withX) "--without-x"; + + enableParallelBuilding = true; postInstall = '' - sed -i 's,which ,command -v ,' "$out/etc/vmware-tools/scripts/vmware/network" - wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ - --prefix PATH ':' "${lib.makeBinPath [ iproute dbus systemd ]}" + wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ + --prefix PATH ':' "${lib.makeBinPath [ iproute dbus systemd which ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch index 64991a152bc..46d8ea7f7f3 100644 --- a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch +++ b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch @@ -1,30 +1,20 @@ -diff -ruN open-vm-tools.orig/lib/include/guest_os.h open-vm-tools/lib/include/guest_os.h ---- open-vm-tools.orig/lib/include/guest_os.h 2016-02-12 00:50:33.000000000 +0000 -+++ open-vm-tools/lib/include/guest_os.h 2016-04-18 20:07:41.677251511 +0000 -@@ -222,6 +222,7 @@ +diff --git a/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h +index ef202e3..c7a105d 100644 +--- a/lib/include/guest_os.h ++++ b/lib/include/guest_os.h +@@ -238,6 +238,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); #define STR_OS_MANDRAKE_FULL "Mandrake Linux" #define STR_OS_MANDRIVA "mandriva" #define STR_OS_MKLINUX "MkLinux" +#define STR_OS_NIXOS "NixOS" #define STR_OS_NOVELL "nld9" #define STR_OS_NOVELL_FULL "Novell Linux Desktop 9" - #define STR_OS_ORACLE "oraclelinux" -diff -ruN open-vm-tools.orig/lib/include/vmblock.h open-vm-tools/lib/include/vmblock.h ---- open-vm-tools.orig/lib/include/vmblock.h 2016-02-12 00:50:33.000000000 +0000 -+++ open-vm-tools/lib/include/vmblock.h 2016-04-18 21:51:15.651235848 +0000 -@@ -145,7 +145,7 @@ - # define VMBLOCK_DEVICE_MODE VMBLOCK_FUSE_DEVICE_MODE - # define VMBLOCK_MOUNT_POINT VMBLOCK_FUSE_MOUNT_POINT - --#elif defined(linux) -+#elif defined(__linux__) - # define VMBLOCK_ADD_FILEBLOCK 98 - # define VMBLOCK_DEL_FILEBLOCK 99 - # ifdef VMX86_DEVEL -diff -ruN open-vm-tools.orig/lib/misc/hostinfoPosix.c open-vm-tools/lib/misc/hostinfoPosix.c ---- open-vm-tools.orig/lib/misc/hostinfoPosix.c 2016-02-12 00:50:33.000000000 +0000 -+++ open-vm-tools/lib/misc/hostinfoPosix.c 2016-04-18 20:09:45.841668252 +0000 -@@ -195,6 +195,7 @@ + #define STR_OS_ORACLE6 "oraclelinux6" +diff --git a/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c +index 0f55070..2d8467c 100644 +--- a/lib/misc/hostinfoPosix.c ++++ b/lib/misc/hostinfoPosix.c +@@ -195,6 +195,7 @@ static const DistroInfo distroArray[] = { {"Mandrake", "/etc/mandrake-release"}, {"Mandriva", "/etc/mandriva-release"}, {"MkLinux", "/etc/mklinux-release"}, @@ -32,12 +22,12 @@ diff -ruN open-vm-tools.orig/lib/misc/hostinfoPosix.c open-vm-tools/lib/misc/hos {"Novell", "/etc/nld-release"}, {"OracleLinux", "/etc/oracle-release"}, {"Photon", "/etc/lsb-release"}, -@@ -619,6 +620,8 @@ - Str_Strcpy(distroShort, STR_OS_MANDRIVA, distroShortSize); - } else if (strstr(distroLower, "mklinux")) { - Str_Strcpy(distroShort, STR_OS_MKLINUX, distroShortSize); +@@ -554,6 +555,8 @@ HostinfoGetOSShortName(char *distro, // IN: full distro name + } + } else if (strstr(distroLower, "mandrake")) { + Str_Strcpy(distroShort, STR_OS_MANDRAKE, distroShortSize); + } else if (strstr(distroLower, "nixos")) { + Str_Strcpy(distroShort, STR_OS_NIXOS, distroShortSize); - } else if (strstr(distroLower, "pld")) { - Str_Strcpy(distroShort, STR_OS_PLD, distroShortSize); - } else if (strstr(distroLower, "slackware")) { + } else if (strstr(distroLower, "turbolinux")) { + Str_Strcpy(distroShort, STR_OS_TURBO, distroShortSize); + } else if (strstr(distroLower, "sun")) { diff --git a/pkgs/applications/virtualization/qemu/2.8.nix b/pkgs/applications/virtualization/qemu/2.8.nix deleted file mode 100644 index 677386819d3..00000000000 --- a/pkgs/applications/virtualization/qemu/2.8.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib -, ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex -, bison, lzo, snappy, libaio, gnutls, nettle, curl -, makeWrapper -, attr, libcap, libcap_ng -, CoreServices, Cocoa, rez, setfile -, numaSupport ? stdenv.isLinux, numactl -, seccompSupport ? stdenv.isLinux, libseccomp -, pulseSupport ? !stdenv.isDarwin, libpulseaudio -, sdlSupport ? !stdenv.isDarwin, SDL -, vncSupport ? true, libjpeg, libpng -, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol, usbredir -, x86Only ? false -, nixosTestRunner ? false -}: - -with stdenv.lib; -let - version = "2.8.0"; - audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," - + optionalString pulseSupport "pa," - + optionalString sdlSupport "sdl,"; -in - -stdenv.mkDerivation rec { - name = "qemu-" - + stdenv.lib.optionalString x86Only "x86-only-" - + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-" - + version; - - src = fetchurl { - url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "0qjy3rcrn89n42y5iz60kgr0rrl29hpnj8mq2yvbc1wrcizmvzfs"; - }; - - buildInputs = - [ python2 zlib pkgconfig glib ncurses perl pixman - vde2 texinfo libuuid flex bison makeWrapper lzo snappy - gnutls nettle curl - ] - ++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ] - ++ optionals seccompSupport [ libseccomp ] - ++ optionals numaSupport [ numactl ] - ++ optionals pulseSupport [ libpulseaudio ] - ++ optionals sdlSupport [ SDL ] - ++ optionals vncSupport [ libjpeg libpng ] - ++ optionals spiceSupport [ spice_protocol spice usbredir ] - ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]; - - enableParallelBuilding = true; - - patches = [ - ./no-etc-install.patch - ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch; - hardeningDisable = [ "stackprotector" ]; - - configureFlags = - [ "--smbd=smbd" # use `smbd' from $PATH - "--audio-drv-list=${audio}" - "--sysconfdir=/etc" - "--localstatedir=/var" - ] - ++ optional numaSupport "--enable-numa" - ++ optional seccompSupport "--enable-seccomp" - ++ optional spiceSupport "--enable-spice" - ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu" - ++ optional stdenv.isDarwin "--enable-cocoa" - ++ optional stdenv.isLinux "--enable-linux-aio"; - - postFixup = - '' - for exe in $out/bin/qemu-system-* ; do - paxmark m $exe - done - ''; - - 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 - ''; - - meta = with stdenv.lib; { - homepage = http://www.qemu.org/; - description = "A generic and open source machine emulator and virtualizer"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric eelco ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/applications/virtualization/qemu/CVE-2016-9102.patch b/pkgs/applications/virtualization/qemu/CVE-2016-9102.patch deleted file mode 100644 index 05a95599937..00000000000 --- a/pkgs/applications/virtualization/qemu/CVE-2016-9102.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c -index d938427..7557a7d 100644 ---- a/hw/9pfs/9p.c -+++ b/hw/9pfs/9p.c -@@ -3261,6 +3261,7 @@ - xattr_fidp->fs.xattr.flags = flags; - v9fs_string_init(&xattr_fidp->fs.xattr.name); - v9fs_string_copy(&xattr_fidp->fs.xattr.name, &name); -+ g_free(xattr_fidp->fs.xattr.value); - xattr_fidp->fs.xattr.value = g_malloc0(size); - err = offset; - put_fid(pdu, file_fidp); diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index ae88399f13a..d7910eb938f 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib -, ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex +, ncurses, perl, pixman, vde2, alsaLib, texinfo, flex , bison, lzo, snappy, libaio, gnutls, nettle, curl , makeWrapper , attr, libcap, libcap_ng @@ -16,26 +16,26 @@ with stdenv.lib; let - version = "2.7.0"; + version = "2.8.0"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; in stdenv.mkDerivation rec { - name = "qemu-" + name = "qemu-" + stdenv.lib.optionalString x86Only "x86-only-" + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-" + version; src = fetchurl { url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "0lqyz01z90nvxpc3nx4djbci7hx62cwvs5zwd6phssds0sap6vij"; + sha256 = "0qjy3rcrn89n42y5iz60kgr0rrl29hpnj8mq2yvbc1wrcizmvzfs"; }; buildInputs = [ python2 zlib pkgconfig glib ncurses perl pixman - vde2 texinfo libuuid flex bison makeWrapper lzo snappy + vde2 texinfo flex bison makeWrapper lzo snappy gnutls nettle curl ] ++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ] @@ -51,123 +51,6 @@ stdenv.mkDerivation rec { patches = [ ./no-etc-install.patch - (fetchpatch { - url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/net-vmxnet-initialise-local-tx-descriptor-CVE-2016-6836.patch"; - sha256 = "1i01vsxsdwrb5r7i9dmrshal4fvpj2j01cmvfkl5wz3ssq5z02wc"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptconfig-fix-an-assert-expression-CVE-2016-7157.patch"; - sha256 = "1wqf9k79wdr1k25siyhhybz1bpb0iyshv6fvsf55pgk5p0dg1970"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptconfig-fix-misuse-of-MPTSAS_CONFIG_PACK-CVE-2016-7157.patch"; - sha256 = "0l78fcbq8mywlgax234dh4226kxzbdgmarz1yrssaaiipkzq4xgw"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptsas-use-g_new0-to-allocate-MPTSASRequest-obj-CVE-2016-7423.patch"; - sha256 = "14l8w40zjjhpmzz4rkh69h5na8d4did7v99ng7nzrychakd5l29h"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-check-page-count-while-initialising-descriptor-rings-CVE-2016-7155.patch"; - sha256 = "1dwkci5mqgx3xz2q69kbcn48l8vwql9g3qaza2jxi402xdgc07zn"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-limit-loop-to-fetch-SG-list-CVE-2016-7156.patch"; - sha256 = "1r5xm4m9g39p89smsia4i9jbs32nq9gdkpx6wgd91vmswggcbqsi"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-limit-process-IO-loop-to-ring-size-CVE-2016-7421.patch"; - sha256 = "07661d1kd0ddkmzsrjph7jnhz2qbfavkxamnvs3axaqpp52kx6ga"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/usb-xhci-fix-memory-leak-in-usb_xhci_exit-CVE-2016-7466.patch"; - sha256 = "0nckwzn9k6369vni12s8hhjn73gbk6ns0mazns0dlgcq546q2fjj"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/virtio-add-check-for-descriptor-s-mapped-address-CVE-2016-7422.patch"; - sha256 = "1f1ilpzlxfjqvwmv9h0mzygwl5l8zd690f32vxfv9g6rfbr5h72k"; - }) - (fetchpatch { - name = "qemu-CVE-2016-8909.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=0c0fc2b5fd534786051889459848764edd798050"; - sha256 = "0mavkajxchfacpl4gpg7dhppbnhs1bbqn2rwqwiwkl0m5h19d9fv"; - }) - (fetchpatch { - name = "qemu-CVE-2016-8910.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=c7c35916692fe010fef25ac338443d3fe40be225"; - sha256 = "10qmlggifdmvj5hg3brs712agjq6ppnslm0n5d5jfgjl7599wxml"; - }) - (fetchpatch { - name = "qemu-CVE-2016-9103.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=eb687602853b4ae656e9236ee4222609f3a6887d"; - sha256 = "0j20n4z1wzybx8m7pn1zsxmz4rbl8z14mbalfabcjdgz8sx8g90d"; - }) - (fetchpatch { - name = "qemu-CVE-2016-9104.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=7e55d65c56a03dcd2c5d7c49d37c5a74b55d4bd6"; - sha256 = "1l99sf70098l6v05dq4x7p2glxx1l4nq1l8l3711ykp9vxkp91qs"; - }) - (fetchpatch { - name = "qemu-CVE-2016-9105.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=4c1586787ff43c9acd18a56c12d720e3e6be9f7c"; - sha256 = "0b2w5myw2vjqk81wm8dz373xfhfkx3hgy7bxr94l060snxcl7ar4"; - }) - (fetchpatch { - name = "qemu-CVE-2016-9106.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=fdfcc9aeea1492f4b819a24c94dfb678145b1bf9"; - sha256 = "0npi3fag52icq7xr799h5zi11xscbakdhqmdab0kyl6q331cc32z"; - }) - (fetchpatch { - name = "qemu-CVE-2016-7994.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=cb3a0522b694cc5bb6424497b3f828ccd28fd1dd"; - sha256 = "1zhmbqlj0hc69ia4s6h59pi1z3nmijkryxwmf4bzp9gahx8x4xm3"; - }) - (fetchpatch { - name = "qemu-CVE-2016-8668.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=8caed3d564672e8bc6d2e4c6a35228afd01f4723"; - sha256 = "19sq6fh7nh8wrk52skky4vwm80029lhm093g11f539krmzjgipik"; - }) - (fetchpatch { - name = "qemu-CVE-2016-7907.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=070c4b92b8cd5390889716677a0b92444d6e087a"; - sha256 = "0in89697r6kwkf302v3cg16390q7qs33n2b4kba26m4x65632dxm"; - }) - - # FIXME: Fix for CVE-2016-9101 not yet ready: https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg03024.html - - # from http://git.qemu.org/?p=qemu.git;a=patch;h=ff55e94d23ae94c8628b0115320157c763eb3e06 - ./CVE-2016-9102.patch - - (fetchpatch { - name = "qemu-CVE-2016-9911.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=791f97758e223de3290592d169f8e6339c281714"; - sha256 = "0952mpc81h42k5kqsw42prnw5vw86r3j88wk5z4sr1xd1sg428d6"; - }) - (fetchpatch { - name = "qemu-CVE-2016-9921_9922.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=4299b90e9ba9ce5ca9024572804ba751aa1a7e70"; - sha256 = "125xlysdgpp59m4rp1mb59i3ipmf3yjk8x01gzvxcg1hnpgm4j4c"; - }) - (fetchpatch { - name = "qemu-CVE-2016-9845.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=42a8dadc74f8982fc269e54e3c5627b54d9f83d8"; - sha256 = "0qivj585pp1g6xfzknzgi5d2p6can3ihfgpxz3wi12h5jl5q6677"; - }) - (fetchpatch { - name = "qemu-CVE-2016-9846.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=2d1cd6c7a91a4beb99a0c3a21be529222a708545"; - sha256 = "1pa8wwxaz4k4sw1zfa4w0zlxkw6qpsrny1z8c8i8di91aswspq3i"; - }) - (fetchpatch { - name = "qemu-CVE-2016-9907.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=07b026fd82d6cf11baf7d7c603c4f5f6070b35bf"; - sha256 = "0phsk2x6mfsd6gabmfk4pr5nc4aymcqsfd88zihlm9d20gg9pbv3"; - }) - (fetchpatch { - name = "qemu-CVE-2016-9912.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=b8e23926c568f2e963af39028b71c472e3023793"; - sha256 = "1b711s63pg6rzqkqyx0mrlb4x6jv3dscc90qg8w6lflwlhwa73iv"; - }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index c0bd9d8ed13..7059b860680 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -12,7 +12,7 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.22.0"; + version = "1.24.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "14rp3652awvx2iw1l6mia5flfib9jfkiaic16afchrlp17sdq2ji"; + sha256 = "11vp3pm00xsksdgdv67sgvrrpj3ayp7sx1wprn4aa579vbbr83bd"; }; stage1BaseImage = fetchurl { diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix new file mode 100644 index 00000000000..f411ea5c83e --- /dev/null +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, ocamlPackages }: + +stdenv.mkDerivation rec { + name = "virt-top-${version}"; + version = "1.0.8"; + + src = fetchurl { + url = "https://people.redhat.com/~rjones/virt-top/files/virt-top-${version}.tar.gz"; + sha256 = "04i1sf2d3ghilmzvr2vh74qcy009iifyc2ymj9kxnbkp97lrz13w"; + }; + + buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt ocaml_gettext curses csv xml-light ]; + + buildPhase = "make opt"; + + meta = with stdenv.lib; { + description = "A top-like utility for showing stats of virtualized domains"; + homepage = https://people.redhat.com/~rjones/virt-top/; + license = licenses.gpl2; + maintainers = [ maintainers.volth ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 14a87151e97..7512ddb6b0f 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -18,11 +18,14 @@ let python = python2; buildType = "release"; - inherit (importJSON ./upstream-info.json) version extpackRev extpack main; + extpack = "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85"; + extpackRev = 112924; + main = "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a"; + version = "5.1.14"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { - name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRev}.vbox-extpack"; + name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${toString extpackRev}.vbox-extpack"; sha256 = extpack; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 5a97d2a8efd..6e58d42a1cb 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -4,7 +4,14 @@ let version = virtualbox.version; xserverVListFunc = builtins.elemAt (stdenv.lib.splitString "." xorg.xorgserver.version); - xserverABI = xserverVListFunc 0 + xserverVListFunc 1; + + # Forced to 1.18 in + # as it even fails to build otherwise. Still, override this even here, + # in case someone does just a standalone build + # (not via videoDrivers = ["vboxvideo"]). + # It's likely to work again in some future update. + xserverABI = let abi = xserverVListFunc 0 + xserverVListFunc 1; + in if abi == "119" then "118" else abi; in stdenv.mkDerivation { @@ -12,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = (lib.importJSON ../upstream-info.json).guest; + sha256 = "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch index 37d2ad3a515..8d408d3494e 100644 --- a/pkgs/applications/virtualization/virtualbox/hardened.patch +++ b/pkgs/applications/virtualization/virtualbox/hardened.patch @@ -96,7 +96,7 @@ index 95dc9a7..39170bc 100644 /* get the path to the executable */ char szPath[RTPATH_MAX]; - RTPathAppPrivateArch(szPath, sizeof(szPath) - 1); -+ RTStrCopy(szPath, sizeof(szPath) - 1, "/var/setuid-wrappers"); ++ RTStrCopy(szPath, sizeof(szPath) - 1, "/run/wrappers/bin"); size_t cchBufLeft = strlen(szPath); szPath[cchBufLeft++] = RTPATH_DELIMITER; szPath[cchBufLeft] = 0; @@ -154,7 +154,7 @@ index be2ad8f..7ddf105 100644 +RTDECL(int) RTPathSuidDir(char *pszPath, size_t cchPath) +{ -+ return RTStrCopy(pszPath, cchPath, "/var/setuid-wrappers"); ++ return RTStrCopy(pszPath, cchPath, "/run/wrappers/bin"); +} + + @@ -174,7 +174,7 @@ index 7bde6af..2656cae 100644 + * will cut off everything after the rightmost / as this function is analogous + * to RTProcGetExecutablePath(). + */ -+#define SUIDDIR "/var/setuid-wrappers/" ++#define SUIDDIR "/run/wrappers/bin/" + +RTR3DECL(char *) RTProcGetSuidPath(char *pszExecPath, size_t cbExecPath) +{ diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json deleted file mode 100644 index 1b85d2b8847..00000000000 --- a/pkgs/applications/virtualization/virtualbox/upstream-info.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "__NOTE": "Generated using update.py from the same directory.", - "extpack": "3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5", - "extpackRev": "112026", - "guest": "29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41", - "main": "98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40", - "version": "5.1.10" -} diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 9fa4d6a6d8e..0a1256d67a4 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -4,29 +4,17 @@ , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , which, dbus, nettools, git, asciidoc, doxygen , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs -, libxkbcommon, xcbutilxrm +, libxkbcommon, xcbutilxrm, hicolor_icon_theme }: -let - version = "4.0"; -in with luaPackages; - -stdenv.mkDerivation rec { +with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; - + version = "4.0"; src = fetchurl { url = "http://github.com/awesomeWM/awesome-releases/raw/master/${name}.tar.xz"; sha256 = "0czkcz67sab63gf5m2p2pgg05yinjx60hfb9rfyzdkkg28q9f02w"; }; - meta = with stdenv.lib; { - description = "Highly configurable, dynamic window manager for X"; - homepage = https://awesomewm.org/; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 rasendubi ]; - platforms = platforms.linux; - }; - nativeBuildInputs = [ asciidoc cmake @@ -36,33 +24,14 @@ stdenv.mkDerivation rec { pkgconfig xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs ]; - - buildInputs = [ - cairo - dbus - gdk_pixbuf - gobjectIntrospection - git - lgi - libpthreadstubs - libstartup_notification - libxdg_basedir - lua - nettools - pango - xcb-util-cursor - xorg.libXau - xorg.libXdmcp - xorg.libxcb - xorg.libxshmfence - xorg.xcbutil - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - libxkbcommon - xcbutilxrm - ]; + propagatedUserEnvPkgs = [ hicolor_icon_theme ]; + buildInputs = [ cairo dbus gdk_pixbuf gobjectIntrospection + git lgi libpthreadstubs libstartup_notification + libxdg_basedir lua nettools pango xcb-util-cursor + xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence + xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms + xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon + xcbutilxrm ]; #cmakeFlags = "-DGENERATE_MANPAGES=ON"; @@ -86,4 +55,12 @@ stdenv.mkDerivation rec { passthru = { inherit lua; }; + + meta = with stdenv.lib; { + description = "Highly configurable, dynamic window manager for X"; + homepage = https://awesomewm.org/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 rasendubi ndowens ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index 5a79c0829b5..8388e387075 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -1,38 +1,52 @@ -{ stdenv, fetchurl, pkgconfig, dbus, libconfig, libdrm, libxml2, mesa, pcre, - libXcomposite, libXfixes, libXdamage, libXinerama, libXrandr, libXrender, - libXext, xwininfo }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45 +, docbook_xsl, libxslt, libxml2, makeWrapper +, dbus, libconfig, libdrm, mesa_noglu, pcre, libX11, libXcomposite, libXdamage +, libXinerama, libXrandr, libXrender, libXext, xwininfo }: stdenv.mkDerivation rec { - name = "compton-0.1_beta2"; + name = "compton-0.1_beta2.5"; - src = fetchurl { - url = https://github.com/chjj/compton/releases/download/v0.1_beta2/compton-git-v0.1_beta2-2013-10-21.tar.xz; - sha256 = "1mpgn1d98dv66xs2j8gaxjiw26nzwl9a641lrday7h40g3k45g9v"; + src = fetchFromGitHub { + owner = "chjj"; + repo = "compton"; + rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8"; + sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18"; }; buildInputs = [ - pkgconfig - dbus - libconfig - libdrm - libxml2 - mesa - pcre + libX11 libXcomposite - libXfixes libXdamage - libXinerama - libXrandr libXrender + libXrandr libXext + libXinerama + libdrm + pcre + libconfig + dbus + mesa_noglu + ]; + + nativeBuildInputs = [ + pkgconfig + asciidoc + libxml2 + docbook_xml_dtd_45 + docbook_xsl + libxslt + makeWrapper ]; - propagatedBuildInputs = [ xwininfo ]; - - installFlags = "PREFIX=$(out)"; + installFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/compton-trans \ + --prefix PATH : ${lib.makeBinPath [ xwininfo ]} + ''; meta = with stdenv.lib; { - homepage = https://github.com/chjj/compton/; + homepage = "https://github.com/chjj/compton/"; description = "A fork of XCompMgr, a sample compositing manager for X servers"; longDescription = '' A fork of XCompMgr, which is a sample compositing manager for X diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 1693e7ed0fd..bd79f6b8ff0 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -2,11 +2,11 @@ }: stdenv.mkDerivation rec { - name = "i3status-2.10"; + name = "i3status-2.11"; src = fetchurl { url = "http://i3wm.org/i3status/${name}.tar.bz2"; - sha256 = "1497dsvb32z9xljmxz95dnyvsbayn188ilm3l4ys8m5h25vd1xfs"; + sha256 = "0pwcy599fw8by1a1sf91crkqba7679qhvhbacpmhis8c1xrpxnwq"; }; buildInputs = [ confuse yajl alsaLib libpulseaudio libnl pkgconfig ]; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 47130ac71ec..c670dc52e52 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 = "1563"; + version = "1580"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "s${version}"; - sha256 = "0xfrsk0cffc0fmlmq1340ylzdcmancn2bwgzv6why3gklxplsp9z"; + sha256 = "098m54mn8f1vzdb7j6zmlflid7a4yjinbdh7avg2a0z45nl1znb4"; }; nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index ba0c812ef6a..7b60d573d1e 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig -, libxml2, libXinerama, libXcursor, libXau, libXrandr +{ stdenv, fetchurl, pkgconfig, python2 +, libxml2, libXinerama, libXcursor, libXau, libXrandr, libICE, libSM , imlib2, pango, libstartup_notification, makeWrapper }: stdenv.mkDerivation rec { @@ -8,8 +8,13 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 - libXinerama libXcursor libXau libXrandr + libXinerama libXcursor libXau libXrandr libICE libSM libstartup_notification makeWrapper + python2.pkgs.wrapPython + ]; + + pythonPath = with python2.pkgs; [ + pyxdg ]; propagatedBuildInputs = [ @@ -35,7 +40,8 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share" wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share" wrapProgram "$out/bin/openbox-kde-session" --prefix XDG_DATA_DIRS : "$out/share" - ''; + wrapPythonPrograms + ''; meta = { description = "X window manager for non-desktop embedded systems"; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index df4a33fbd46..79077b477b4 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, pango, libinput , makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo -, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs +, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap }: let - version = "0.9"; + version = "0.11"; in stdenv.mkDerivation rec { name = "sway-${version}"; @@ -13,12 +13,12 @@ in owner = "Sircmpwn"; repo = "sway"; rev = "${version}"; - sha256 = "0qqqg23rknxnjcgvkfrx3pijqc3dvi74qmmavq07vy2qfs1xlwg0"; + sha256 = "01k01f72kh90fwgqh2hgg6dv9931x4v18bzz11b47mn7p9z68ddv"; }; nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ]; - buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput ]; + buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap ]; patchPhase = '' sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt; diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 8bc34d672c9..9a1897695a9 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -51,7 +51,7 @@ let export PS1='${name}-chrootenv:\u@\h:\w\$ ' export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32' - export PATH='/var/setuid-wrappers:/usr/bin:/usr/sbin' + export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin' export PKG_CONFIG_PATH=/usr/lib/pkgconfig # Force compilers to look in default search paths diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index c8e3d8b4cc8..95c6bee3cc7 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -272,6 +272,7 @@ stdenv.mkDerivation { if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else # ARM with a wildcard, which can be "" or "-armhf". if stdenv.isArm then "ld-linux*.so.3" else + if stdenv.system == "aarch64-linux" then "ld-linux-aarch64.so.1" else if stdenv.system == "powerpc-linux" then "ld.so.1" else if stdenv.system == "mips64el-linux" then "ld.so.1" else if stdenv.system == "x86_64-darwin" then "/usr/lib/dyld" else @@ -281,9 +282,6 @@ stdenv.mkDerivation { crossAttrs = { shell = shell.crossDrv + shell.crossDrv.shellPath; libc = stdenv.ccCross.libc; - coreutils = coreutils.crossDrv; - binutils = binutils.crossDrv; - cc = cc.crossDrv; # # This is not the best way to do this. I think the reference should be # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I diff --git a/pkgs/build-support/dhall-to-nix.nix b/pkgs/build-support/dhall-to-nix.nix new file mode 100644 index 00000000000..c563b34ff3b --- /dev/null +++ b/pkgs/build-support/dhall-to-nix.nix @@ -0,0 +1,38 @@ +/* `dhallToNix` is a utility function to convert expressions in the Dhall + configuration language to their corresponding Nix expressions. + + Example: + dhallToNix "{ foo = 1, bar = True }" + => { foo = 1; bar = true; } + dhallToNix "λ(x : Bool) → x == False" + => x : x == false + dhallToNix "λ(x : Bool) → x == False" false + => true + + See https://hackage.haskell.org/package/dhall-nix/docs/Dhall-Nix.html for + a longer tutorial + + Note that this uses "import from derivation", meaning that Nix will perform + a build during the evaluation phase if you use this `dhallToNix` utility +*/ +{ stdenv, dhall-nix }: + +let + dhallToNix = code : + let + file = builtins.toFile "dhall-expression" code; + + drv = stdenv.mkDerivation { + name = "dhall-compiled.nix"; + + buildCommand = '' + dhall-to-nix <<< "${file}" > $out + ''; + + buildInputs = [ dhall-nix ]; + }; + + in + import "${drv}"; +in + dhallToNix diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix index 11d88ae10e9..835fbec6bf0 100644 --- a/pkgs/build-support/fetchbower/default.nix +++ b/pkgs/build-support/fetchbower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bower2nix }: +{ stdenv, lib, bower2nix, cacert }: let bowerVersion = version: let @@ -9,6 +9,7 @@ let fetchbower = name: version: target: outputHash: stdenv.mkDerivation { name = "${name}-${bowerVersion version}"; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; buildCommand = '' fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}" # In some cases, the result of fetchBower is different depending diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 5ae5eb105e7..7071fa18c23 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -128,7 +128,7 @@ rec { ]; samba = [ - http://samba.org/ftp/ + https://www.samba.org/ftp/ http://ftp.riken.jp/net/samba ]; @@ -387,6 +387,9 @@ rec { # Python PyPI mirrors pypi = [ + https://files.pythonhosted.org/packages/source/ + # pypi.io is a more semantic link, but atm it’s referencing + # files.pythonhosted.org over two redirects https://pypi.io/packages/source/ ]; diff --git a/pkgs/build-support/fetchzip/nix-prefetch-zip b/pkgs/build-support/fetchzip/nix-prefetch-zip deleted file mode 100755 index d9a5f51057f..00000000000 --- a/pkgs/build-support/fetchzip/nix-prefetch-zip +++ /dev/null @@ -1,171 +0,0 @@ -#! /bin/sh -e - -usage(){ - echo >&2 "syntax: nix-prefetch-zip [OPTIONS] [URL [EXPECTED-HASH]] - -Options: - --url url The url of the archive to fetch. - --name name The name to use for the store path (defaults to \`basename \$url\`). - --ext ext The file extension (.zip, .tar.gz, ...) to be REMOVED from name - --hash hash The hash of unpacked archive. - --hash-type type Use the specified cryptographic hash algorithm, which can be one of md5, sha1, and sha256. - --leave-root Keep the root directory of the archive. - --help Show this help text. -" - exit 1 -} - - -name="" -ext="" -argi=0 -argfun="" -for arg; do - if test -z "$argfun"; then - case $arg in - --url) argfun=set_url;; - --name) argfun=set_name;; - --ext) argfun=set_ext;; - --hash) argfun=set_expHash;; - --hash-type) argfun=set_hashType;; - --leave-root) leaveRoot=true;; - --help) usage;; - *) argi=$(($argi + 1)) - case $argi in - 1) url=$arg;; - 2) rev=$arg;; - 3) expHash=$arg;; - *) echo "Unexpected argument: $arg" >&2 - usage - ;; - esac - ;; - esac - else - case $argfun in - set_*) - var=$(echo $argfun | sed 's,^set_,,') - eval "$var=\$arg" - ;; - esac - argfun="" - fi -done - -if [ -z "$url" ]; then - echo "Error: No --url flag given" >&2 - usage -fi - -if [ -z "$name" ]; then - name=$(basename "$url") -fi - -if test -z "$hashType"; then - hashType=sha256 -fi - -hashFormat="--base32" - -tmp=$(mktemp -d 2>/dev/null || mktemp -d -t "$$") -trap "rm -rf '$tmp'" EXIT - -dirname=$(basename -s "$ext" "$name") - -unpackDirTmp=$tmp/unpacked-tmp/$dirname -mkdir -p $unpackDirTmp - -unpackDir=$tmp/unpacked/$dirname -mkdir -p $unpackDir - -downloadedFile=$tmp/$(basename "$url") - -unpackFile() { - local curSrc="$1" - - case "$curSrc" in - *.tar.xz | *.tar.lzma) - # Don't rely on tar knowing about .xz. - xz -d < $curSrc | tar xf - - ;; - *.tar | *.tar.* | *.tgz | *.tbz2) - # GNU tar can automatically select the decompression method - # (info "(tar) gzip"). - tar xf $curSrc - ;; - *.zip) - unzip -qq $curSrc - ;; - *) - echo "source archive $curSrc has unknown type" >&2 - exit 1 - ;; - esac -} - -# If the hash was given, a file with that hash may already be in the -# store. -if test -n "$expHash"; then - finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" "$name") - if ! nix-store --check-validity "$finalPath" 2> /dev/null; then - finalPath= - fi - hash=$expHash -fi - -# If we don't know the hash or a path with that hash doesn't exist, -# download the file and add it to the store. -if test -z "$finalPath"; then - curl="curl \ - --location --max-redirs 20 \ - --disable-epsv \ - --insecure" - - if ! $curl --fail "$url" --output "$downloadedFile"; then - echo "error: could not download $url" >&2 - exit 1 - fi - - if [ -z "$leaveRoot" ]; then - shopt -s dotglob - - cd "$unpackDirTmp" - unpackFile "$downloadedFile" - - if [ $(ls "$unpackDirTmp" | wc -l) != 1 ]; then - echo "error: zip file must contain a single file or directory." - exit 1 - fi - - fn=$(cd "$unpackDirTmp" && echo *) - - if [ -f "$unpackDirTmp/$fn" ]; then - mv "$unpackDirTmp/$fn" "$unpackDir" - else - mv "$unpackDirTmp/$fn/"* "$unpackDir/" - fi - else - cd $unpackDir - unpackFile "$downloadedFile" - fi - - # Compute the hash. - hash=$(nix-hash --type $hashType $hashFormat $unpackDir) - if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi - - # Add the downloaded file to the Nix store. - finalPath=$(nix-store --add-fixed --recursive "$hashType" $unpackDir) - - if test -n "$expHash" -a "$expHash" != "$hash"; then - echo "hash mismatch for URL \`$url'" - exit 1 - fi -fi - -if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi - -echo $hash - -if test -n "$PRINT_PATH"; then - echo $finalPath -fi diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index d922db5ccf5..4f55493ae48 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -1,8 +1,28 @@ +# construct an executable file that wraps the actual executable +# makeWrapper EXECUTABLE ARGS + +# ARGS: +# --argv0 NAME : set name of executed process to NAME +# (otherwise it’s called …-wrapped) +# --set VAR VAL : add VAR with value VAL to the executable’s environment +# --unset VAR : remove VAR from the environment +# --run COMMAND : run command before the executable +# The command can push extra flags to a magic list variable +# extraFlagsArray, which are then added to the invocation +# of the executable +# --add-flags FLAGS : add FLAGS to invocation of executable + +# --prefix ENV SEP VAL : suffix/prefix ENV with VAL, separated by SEP +# --suffix +# --suffix-each ENV SEP VALS : like --suffix, but VALS is a list +# --prefix-contents ENV SEP FILES : like --suffix-each, but contents of FILES +# are read first and used as VALS +# --suffix-contents makeWrapper() { local original=$1 local wrapper=$2 local params varName value command separator n fileNames - local argv0 flagsBefore flags + local argv0 flagsBefore flags extraFlagsArray mkdir -p "$(dirname $wrapper)" diff --git a/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh b/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh new file mode 100644 index 00000000000..66f4e91c7bb --- /dev/null +++ b/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh @@ -0,0 +1,12 @@ +preConfigurePhases+=" updateAutotoolsGnuConfigScriptsPhase" + +updateAutotoolsGnuConfigScriptsPhase() { + if [ -n "$dontUpdateAutotoolsGnuConfigScripts" ]; then return; fi + + for script in config.sub config.guess; do + for f in $(find . -type f -name "$script"); do + echo "Updating Autotools / GNU config script to a newer upstream version: $f" + cp -f "@gnu_config@/$script" "$f" + done + done +} diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 36cb068d93d..461bdd08fb5 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -130,7 +130,7 @@ rec { echo "mounting Nix store..." mkdir -p /fs${storeDir} - mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,veryloose + mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose mkdir -p /fs/tmp /fs/run /fs/var mount -t tmpfs -o "mode=1777" none /fs/tmp @@ -139,7 +139,7 @@ rec { echo "mounting host's temporary directory..." mkdir -p /fs/tmp/xchg - mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,veryloose + mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,cache=loose mkdir -p /fs/proc mount -t proc none /fs/proc diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix index 625071c9c33..01884f48878 100644 --- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix +++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, runCommand, python, perl, cdrkit, pathsFromGraph +{ stdenv, fetchurl, runCommand, python, perl, xorriso, pathsFromGraph , arch ? "x86_64" }: @@ -10,10 +10,10 @@ let cygPkgList = if arch == "x86_64" then fetchurl { url = "${mirror}/x86_64/setup.ini"; - sha256 = "0ljsxdkx9s916wp28kcvql3bjx80zzzidan6jicby7i9s3sm96n9"; + sha256 = "0arrxvxbl85l82iy648snx5cl952w791p45p0dfg1xpiaf96cbkj"; } else fetchurl { url = "${mirror}/x86/setup.ini"; - sha256 = "1slyj4qha7x649ggwdski9spmyrbs04z2d46vgk8krllg0kppnjv"; + sha256 = "1fayx34868vd5h2nah7chiw65sl3i9qzrwvs7lrlv2h8k412vb69"; }; cygwinCross = (import ../../../../.. { @@ -25,23 +25,24 @@ let inherit arch; config = "${arch}-w64-mingw32"; }; - }).windows.cygwinSetup.crossDrv; + }).windows.cygwinSetup; makeCygwinClosure = { packages, packageList }: let expr = import (runCommand "cygwin.nix" { buildInputs = [ python ]; } '' python ${./mkclosure.py} "${packages}" ${toString packageList} > "$out" ''); - gen = { url, md5 }: { + gen = { url, hash }: { source = fetchurl { url = "${mirror}/${url}"; - inherit md5; + sha512 = hash; }; target = url; }; in map gen expr; in import ../../../../../nixos/lib/make-iso9660-image.nix { - inherit stdenv perl cdrkit pathsFromGraph; + inherit stdenv perl xorriso pathsFromGraph; + syslinux = null; contents = [ { source = "${cygwinCross}/bin/setup.exe"; target = "setup.exe"; diff --git a/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py b/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py index 48d569a6bd3..4c0d67c43ba 100644 --- a/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py +++ b/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py @@ -63,12 +63,12 @@ def main(): if install_line is None: continue - url, size, md5 = install_line.split(' ', 2) + url, size, hash = install_line.split(' ', 2) pack = [ ' {', ' url = "{0}";'.format(url), - ' md5 = "{0}";'.format(md5), + ' hash = "{0}";'.format(hash), ' }', ]; sys.stdout.write('\n'.join(pack) + '\n') diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix new file mode 100644 index 00000000000..cb7f23f7480 --- /dev/null +++ b/pkgs/common-updater/scripts.nix @@ -0,0 +1,18 @@ +{ stdenv, makeWrapper, coreutils, gawk, gnused, nix }: + +stdenv.mkDerivation { + name = "common-updater-scripts"; + + buildInputs = [ makeWrapper ]; + + unpackPhase = "true"; + + installPhase = '' + mkdir -p $out/bin + cp ${./scripts}/* $out/bin + + for f in $out/bin/*; do + wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk gnused nix ]} + done + ''; +} diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version new file mode 100755 index 00000000000..13f8adf5677 --- /dev/null +++ b/pkgs/common-updater/scripts/update-source-version @@ -0,0 +1,91 @@ +#!/usr/bin/env bash +set -e + +die() { + echo "$0: error: $1" >&2 + exit 1 +} + +# Usage: update-source-hash [] +attr=$1 +newVersion=$2 +newHash=$3 + +nixFile=$(nix-instantiate --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') +if [ ! -f "$nixFile" ]; then + die "Couldn't evaluate '$attr.meta.position' to locate the .nix file!" +fi + +oldHashAlgo=$(nix-instantiate --eval --strict -A "$attr.src.drvAttrs.outputHashAlgo" | tr -d '"') +oldHash=$(nix-instantiate --eval --strict -A "$attr.src.drvAttrs.outputHash" | tr -d '"') + +if [ -z "$oldHashAlgo" -o -z "$oldHash" ]; then + die "Couldn't evaluate old source hash from '$attr.src'!" +fi + +if [ $(grep -c "$oldHash" "$nixFile") != 1 ]; then + die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!" +fi + +drvName=$(nix-instantiate --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"') +oldVersion=$(nix-instantiate --eval -E "with import ./. {}; $attr.version or (builtins.parseDrvName $attr.name).version" | tr -d '"') + +if [ -z "$drvName" -o -z "$oldVersion" ]; then + die "Couldn't evaluate name and version from '$attr.name'!" +fi + +if [ "$oldVersion" = "$newVersion" ]; then + echo "$0: New version same as old version, nothing to do." >&2 + exit 0 +fi + +# Escape dots, there should not be any other regex characters allowed in store path names +oldVersion=$(echo "$oldVersion" | sed -re 's|\.|\\.|g') + +if [ $(grep -c -E "^\s*(let\b)?\s*version\s+=\s+\"$oldVersion\"" "$nixFile") = 1 ]; then + pattern="/\bversion\b\s*=/ s|\"$oldVersion\"|\"$newVersion\"|" +elif [ $(grep -c -E "^\s*(let\b)?\s*name\s+=\s+\"$drvName-$oldVersion\"" "$nixFile") = 1 ]; then + pattern="/\bname\b\s*=/ s|\"$drvName-$oldVersion\"|\"$drvName-$newVersion\"|" +else + die "Couldn't figure out where out where to patch in new version in '$attr'!" +fi + +# Replace new version +sed -i.bak "$nixFile" -re "$pattern" +if cmp -s "$nixFile" "$nixFile.bak"; then + die "Failed to replace version '$oldVersion' to '$newVersion' in '$attr'!" +fi + +case "$oldHashAlgo" in + sha256) hashLength=64 ;; + sha512) hashLength=128 ;; + *) die "Unhandled hash algorithm '$oldHashAlgo' in '$attr'!" ;; +esac + +# Make a temporary all-zeroes hash of $hashLength characters +tempHash=$(printf '%0*d' "$hashLength" 0) + +sed -i "$nixFile" -re "s|\"$oldHash\"|\"$tempHash\"|" +if cmp -s "$nixFile" "$nixFile.bak"; then + die "Failed to replace source hash of '$attr' to a temporary hash!" +fi + +# If new hash not given on the command line, recalculate it ourselves. +if [ -z "$newHash" ]; then + nix-build --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true + # FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed + newHash=$(tail -n2 "$attr.fetchlog" | grep "output path .* has .* hash .* when .* was expected" | head -n1 | tr -dc '\040-\177' | awk '{ print $(NF-4) }') +fi + +if [ -z "$newHash" ]; then + cat "$attr.fetchlog" >&2 + die "Couldn't figure out new hash of '$attr.src'!" +fi + +sed -i "$nixFile" -re "s|\"$tempHash\"|\"$newHash\"|" +if cmp -s "$nixFile" "$nixFile.bak"; then + die "Failed to replace temporary source hash of '$attr' to the final source hash!" +fi + +rm -f "$nixFile.bak" +rm -f "$attr.fetchlog" diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix index 8bc9ec5e2f3..2c7b1eea577 100644 --- a/pkgs/data/fonts/gentium-book-basic/default.nix +++ b/pkgs/data/fonts/gentium-book-basic/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://software.sil.org/gentium/"; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; license = licenses.ofl; platforms = platforms.all; }; diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index 6addc779f35..9e4a88ab770 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "5.000"; src = fetchzip { - url = "http://software.sil.org/downloads/gentium/GentiumPlus-${version}.zip"; + url = "http://software.sil.org/downloads/d/gentium/GentiumPlus-${version}.zip"; sha256 = "0g9sx38wh7f0m16gr64g2xggjwak2q6jw9y4zhrvhmp4aq4xfqm6"; }; diff --git a/pkgs/data/fonts/liberastika/default.nix b/pkgs/data/fonts/liberastika/default.nix new file mode 100644 index 00000000000..964210c8dfe --- /dev/null +++ b/pkgs/data/fonts/liberastika/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + name = "liberastika-${version}"; + version = "1.1.5"; + + src = fetchurl { + url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip"; + sha256 = "0vg5ki120lb577ihvq8w0nxs8yacqzcvsmnsygksmn6281hyj0xj"; + }; + + buildInputs = [ unzip ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp -v $(find . -name '*.ttf') $out/share/fonts/truetype + + mkdir -p "$out/doc/${name}" + cp -v AUTHORS ChangeLog COPYING README "$out/doc/${name}" || true + ''; + + meta = with stdenv.lib; { + description = "Liberation Sans fork with improved cyrillic support"; + homepage = https://sourceforge.net/projects/lib-ka/; + + license = licenses.gpl2; + platforms = platforms.all; + hydraPlatforms = []; + maintainers = [ maintainers.volth ]; + }; +} diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix index d441ac514d3..e24d61d5ba1 100644 --- a/pkgs/data/fonts/overpass/default.nix +++ b/pkgs/data/fonts/overpass/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchFromGitHub, unzip }: stdenv.mkDerivation rec { name = "overpass-${version}"; - version = "2.1"; + version = "3.0.2"; - src = fetchurl { - url = "https://github.com/RedHatBrand/overpass/releases/download/2.1/overpass-fonts-ttf-2.1.zip"; - sha256 = "1kd7vbqffp5988j3p4zxkxajdmfviyv4y6rzk7jazg81xcsxicwf"; + src = fetchFromGitHub { + owner = "RedHatBrand"; + repo = "Overpass"; + rev = version; + sha256 = "1bgmnhdfmp4rycyadcnzw62vkvn63nn29pq9vbjf4c9picvl8ah6"; }; nativeBuildInputs = [ unzip ]; @@ -15,8 +17,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/doc/${name} - mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype + mkdir -p $out/share/fonts/opentype + cp -v "desktop-fonts/"*"/"*.otf $out/share/fonts/opentype cp -v LICENSE.md README.md $out/share/doc/${name} ''; diff --git a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix deleted file mode 100644 index 9cbe951cf4a..00000000000 --- a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, liberation_ttf_from_source }: - -stdenv.mkDerivation rec { - version = "2.00.1"; - name = "liberation-fonts-${version}"; - src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; - sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q"; - }; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v $( find . -name '*.ttf') $out/share/fonts/truetype - - mkdir -p "$out/doc/${name}" - cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true - ''; - - inherit (liberation_ttf_from_source) meta; -} diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index e914501721b..a0511c6a353 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -1,42 +1,72 @@ -{stdenv, fetchurl, fontforge, pythonPackages, python}: +{stdenv, fetchurl, fontforge, python2}: -stdenv.mkDerivation rec { - name = "liberation-fonts-2.00.1"; +let + inherit (python2.pkgs) fonttools; - src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/liberation-fonts/${name}.tar.gz"; - sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; + common = + {version, url, sha256, buildInputs}: + stdenv.mkDerivation rec { + name = "liberation-fonts-${version}"; + src = fetchurl { + inherit url sha256; + }; + + inherit buildInputs; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp -v $( find . -name '*.ttf') $out/share/fonts/truetype + + mkdir -p "$out/doc/${name}" + cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true + ''; + + meta = with stdenv.lib; { + description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; + longDescription = '' + The Liberation Fonts are intended to be replacements for the three most + commonly used fonts on Microsoft systems: Times New Roman, Arial, and + Courier New. Since 2012 they are based on croscore fonts. + + There are three sets: Sans (a substitute for Arial, Albany, Helvetica, + Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times + New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono + (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and + Bitstream Vera Sans Mono). + ''; + + license = licenses.ofl; + homepage = https://fedorahosted.org/liberation-fonts/; + maintainers = [ + maintainers.raskin + ]; + platforms = platforms.unix; + }; + }; + +in { + liberation_ttf_v1_from_source = common rec { + version = "1.07.4"; + url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${version}.tar.gz"; + sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d"; + buildInputs = [ fontforge fonttools ]; }; - - buildInputs = [ fontforge pythonPackages.fonttools python ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v $(find . -name '*.ttf') $out/share/fonts/truetype - - mkdir -p "$out/doc/${name}" - cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true - ''; - - meta = with stdenv.lib; { - description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; - longDescription = '' - The Liberation Fonts are intended to be replacements for the three most - commonly used fonts on Microsoft systems: Times New Roman, Arial, and - Courier New. Since 2012 they are based on croscore fonts. - - There are three sets: Sans (a substitute for Arial, Albany, Helvetica, - Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times - New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono - (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and - Bitstream Vera Sans Mono). - ''; - - license = licenses.ofl; - homepage = https://fedorahosted.org/liberation-fonts/; - maintainers = [ - maintainers.raskin - ]; - platforms = platforms.unix; + liberation_ttf_v1_binary = common rec { + version = "1.07.4"; + url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; + sha256 = "0p7frz29pmjlk2d0j2zs5kfspygwdnpzxkb2hwzcfhrafjvf59v1"; + buildInputs = [ ]; + }; + liberation_ttf_v2_from_source = common rec { + version = "2.00.1"; + url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${version}.tar.gz"; + sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; + buildInputs = [ fontforge fonttools ]; + }; + liberation_ttf_v2_binary = common rec { + version = "2.00.1"; + url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; + sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q"; + buildInputs = [ ]; }; } diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix index e0d2545973b..fbb364b9d72 100644 --- a/pkgs/data/fonts/roboto/default.nix +++ b/pkgs/data/fonts/roboto/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "roboto-${version}"; - version = "2.135"; + version = "2.136"; src = fetchurl { url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip"; - sha256 = "1ndlh36bcx4mhi58sxfx6ywbib586brh6s5sk3jyji78h1i7j8zr"; + sha256 = "0yx3q5wbbl1qkxfx1fglzy3rvms98jr8fcfj70vvvz3r3lppv201"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix new file mode 100644 index 00000000000..c5ad1d1e1b6 --- /dev/null +++ b/pkgs/data/fonts/siji/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "siji-${date}"; + date = "2016-05-13"; + + src = fetchFromGitHub { + owner = "stark"; + repo = "siji"; + rev = "95369afac3e661cb6d3329ade5219992c88688c1"; + sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/pcf + cp -v */*.pcf $out/share/fonts/pcf + ''; + + meta = { + homepage = "https://github.com/stark/siji"; + description = "An iconic bitmap font based on Stlarch with additional glyphs"; + liscense = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.asymmetric ]; + }; +} diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 95296108618..fd8b50e4c0b 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -6,6 +6,6 @@ fetchFromGitHub { owner = "commercialhaskell"; repo = "all-cabal-hashes"; - rev = "5c5b04af472eb6c2854b21cb52ee6324252280de"; - sha256 = "1cnr350044yrlg7wa09fmdarl7y9gkydh25lv94wcqg3w9cdv0fb"; + rev = "53fcf983669a3f0cdfd795fec28ecb40740a64ca"; + sha256 = "0jfrr6mjb3x1ybgrsinhm0nl3jmdjyf9mghpgsm75lgr83cm12a5"; } diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index b16b10952a2..3949bffaba1 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { # this is a hack and without this cpufreq module is not working. does the following: # 1. moves the "freqset" binary to "e_freqset", # 2. linkes "e_freqset" to enlightenment/bin so that, - # 3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e_freqset, - # 4. and finaly, linkes /var/setuid-wrappers/e_freqset to original destination where enlightenment wants it + # 3. wrappers.setuid detects it and places wrappers in /run/wrappers/bin/e_freqset, + # 4. and finally, links /run/wrappers/bin/e_freqset to original destination where enlightenment wants it postInstall = '' export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`; mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e_freqset ln -sv $CPUFREQ_DIRPATH/e_freqset $out/bin/e_freqset - ln -sv /var/setuid-wrappers/e_freqset $CPUFREQ_DIRPATH/freqset + ln -sv /run/wrappers/bin/e_freqset $CPUFREQ_DIRPATH/freqset ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index 34506c05fab..fc36a7e7a65 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "terminology-${version}"; - version = "0.9.1"; + version = "1.0.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz"; - sha256 = "1kwv9vkhngdm5v38q93xpcykghnyawhjjcb5bgy0p89gpbk7mvpc"; + sha256 = "1x4j2q4qqj10ckbka0zaq2r2zm66ff1x791kp8slv1ff7fw45vdz"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "The best terminal emulator written with the EFL"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; }; } diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 76c2f8c0d40..48523f512b3 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib +{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus_glib , glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = - [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia + [ pkgconfig libxml2 bzip2 openssl dbus_glib fam cdparanoia intltool gnome_mime_data avahi acl ]; diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix index edb0075fdae..a9bb4514a3a 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix @@ -3,7 +3,7 @@ , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32 , libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg , desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen -, libusb, libarchive, acl, libgudev, qemu +, libusb, libarchive, acl, libgudev, qemu, libsecret }: # TODO: ovirt (optional) @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol libuuid libsoup libosinfo systemd tracker vala_0_32 libcap_ng libcap yajl gmp gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive - librsvg desktop_file_utils acl libgudev numactl xen + librsvg desktop_file_utils acl libgudev numactl xen libsecret ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix index 7fa6fbf9da6..ff43d41c53a 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-boxes-3.22.0"; + name = "gnome-boxes-3.22.4"; src = fetchurl { - url = mirror://gnome/sources/gnome-boxes/3.22/gnome-boxes-3.22.0.tar.xz; - sha256 = "9f02e3032f8b6aaa77d9eab6aabe7fc09902be429e266ad9fd4185b94ac867ee"; + url = mirror://gnome/sources/gnome-boxes/3.22/gnome-boxes-3.22.4.tar.xz; + sha256 = "1wngw4c052p5ghdsd0mdrn20yi8xs0hjdq30rdwv9sqh40liqnjq"; }; } diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix index dbb162dc432..2ec9189964a 100644 --- a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix +++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "epiphany-3.22.5"; + name = "epiphany-3.22.6"; src = fetchurl { url = mirror://gnome/sources/epiphany/3.22/epiphany-3.22.5.tar.xz; - sha256 = "e9c307b3f53a77c16ca698fb62fbb8d9b16773702d8163d83699bd623afa6745"; + sha256 = "0ib7z8x65gcr6vc6709df1rngcfrp3xn5ywqlrnc2xrsynrhghz9"; }; } diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix index 2f4aefe69a8..8dec630354c 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { for desktopFile in $(grep -rl "Exec=gnome-session" $out/share) do echo "Patching gnome-session path in: $desktopFile" - sed -i "s,^Exec=gnome-session,Exec=$out/bin/gnome-session --debug," $desktopFile + sed -i "s,^Exec=gnome-session,Exec=$out/bin/gnome-session," $desktopFile done wrapProgram "$out/bin/gnome-session" \ --prefix PATH : "${glib.dev}/bin" \ diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix index f8b40e42d02..587165e107b 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix @@ -1,6 +1,6 @@ -{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus +{ stdenv, intltool, fetchurl, apacheHttpd, nautilus , pkgconfig, gtk3, glib, libxml2, gnused, systemd -, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd +, bash, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd , gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: stdenv.mkDerivation rec { @@ -11,17 +11,18 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; preConfigure = '' - sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf + sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ + -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \ + -i data/dav_user_2.4.conf ''; - configureFlags = [ "--with-httpd=${apacheHttpd_2_2.out}/bin/httpd" - "--with-modules-path=${apacheHttpd_2_2.dev}/modules" + configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd" + "--with-modules-path=${apacheHttpd.dev}/modules" "--with-systemduserunitdir=$(out)/etc/systemd/user" - "--disable-bluetooth" "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - makeWrapper file gdk_pixbuf gnome3.defaultIconTheme librsvg + wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg nautilus libnotify libcanberra_gtk3 systemd ]; postInstall = '' @@ -30,12 +31,6 @@ stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas ''; - preFixup = '' - wrapProgram "$out/libexec/gnome-user-share-webdav" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - meta = with stdenv.lib; { homepage = https://help.gnome.org/users/gnome-user-share/3.8; description = "Service that exports the contents of the Public folder in your home directory on the local network"; diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/fix_g_test_init_calls.patch b/pkgs/desktops/gnome-3/3.22/core/vte/fix_g_test_init_calls.patch new file mode 100644 index 00000000000..4c5696d4e17 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/vte/fix_g_test_init_calls.patch @@ -0,0 +1,26 @@ +diff --git a/src/vteconv.cc b/src/vteconv.cc +index b78d3928..5cb63e7e 100644 +--- a/src/vteconv.cc ++++ b/src/vteconv.cc +@@ -771,7 +771,7 @@ int + main (int argc, + char *argv[]) + { +- g_test_init (&argc, &argv, NULL); ++ g_test_init (&argc, &argv, (char *)NULL); + + g_test_add_func ("/vte/conv/utf8/strlen", test_utf8_strlen); + g_test_add_func ("/vte/conv/utf8/validate", test_utf8_validate); +diff --git a/src/vtetypes.cc b/src/vtetypes.cc +index 1365a295..8f38c9d9 100644 +--- a/src/vtetypes.cc ++++ b/src/vtetypes.cc +@@ -407,7 +407,7 @@ test_util_smart_fd(void) + int + main(int argc, char *argv[]) + { +- g_test_init (&argc, &argv, NULL); ++ g_test_init (&argc, &argv, (char *)NULL); + + g_test_add_func("/vte/c++/grid/coords", test_grid_coords); + g_test_add_func("/vte/c++/grid/span", test_grid_span); diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/fix_vteseq_n_lookup_declaration.patch b/pkgs/desktops/gnome-3/3.22/core/vte/fix_vteseq_n_lookup_declaration.patch new file mode 100644 index 00000000000..70ef7faa782 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/vte/fix_vteseq_n_lookup_declaration.patch @@ -0,0 +1,13 @@ +diff --git a/src/vteseq.cc b/src/vteseq.cc +index 2330939d..e0ac14eb 100644 +--- a/src/vteseq.cc ++++ b/src/vteseq.cc +@@ -3409,7 +3409,7 @@ vte_sequence_handler_iterm2_1337(VteTerminalPrivate *that, GValueArray *params) + #define VTE_SEQUENCE_HANDLER(name) name + + static const struct vteseq_n_struct * +-vteseq_n_lookup (register const char *str, register unsigned int len); ++vteseq_n_lookup (register const char *str, register size_t len); + #include"vteseq-n.cc" + + #undef VTE_SEQUENCE_HANDLER diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/ng.nix b/pkgs/desktops/gnome-3/3.22/core/vte/ng.nix new file mode 100644 index 00000000000..ad0188b0053 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/vte/ng.nix @@ -0,0 +1,24 @@ +{ gnome3, fetchFromGitHub, autoconf, automake, gtk_doc, gettext, libtool, gperf }: + +gnome3.vte.overrideAttrs (oldAttrs: rec { + name = "vte-ng-${version}"; + version = "0.46.1.a"; + + src = fetchFromGitHub { + owner = "thestinger"; + repo = "vte-ng"; + rev = version; + sha256 = "125fpibid1liz50d7vbxy71pnm8b01x90xnkr4z3419b90lybr0a"; + }; + + # The patches apply the changes from https://github.com/GNOME/vte/pull/7 and + # can be removed once the commits are merged into vte-ng. + patches = [ + ./fix_g_test_init_calls.patch + ./fix_vteseq_n_lookup_declaration.patch + ]; + + preConfigure = oldAttrs.preConfigure + "; ./autogen.sh"; + + nativeBuildInputs = [ gtk_doc autoconf automake gettext libtool gperf ]; +}) diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix index 3b76ac80fdb..21e1ecc7a04 100644 --- a/pkgs/desktops/gnome-3/3.22/default.nix +++ b/pkgs/desktops/gnome-3/3.22/default.nix @@ -14,13 +14,13 @@ let callPackage = pkgs.newScope self; version = "3.22"; - maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds DamienCassou ]; + maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds ]; corePackages = with gnome3; [ pkgs.desktop_file_utils pkgs.ibus pkgs.shared_mime_info # for update-mime-database glib # for gsettings - gtk3 # for gtk-update-icon-cache + gtk3.out # for gtk-update-icon-cache glib_networking gvfs dconf gnome-backgrounds gnome_control_center gnome-menus gnome_settings_daemon gnome_shell gnome_themes_standard defaultIconTheme gnome-shell-extensions @@ -234,6 +234,8 @@ let vte_290 = callPackage ./core/vte/2.90.nix { }; + vte-ng = callPackage ./core/vte/ng.nix { }; + vino = callPackage ./core/vino { }; yelp = callPackage ./core/yelp { }; diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix index e6c4b8c8202..f75cdd0e83e 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix @@ -12,6 +12,15 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + # Make sure that Python 2 is first in $PATH because gnome3.gnome_shell + # propagates python3Packages.python. If we do not do this, autoconf will use + # Python 3 instead which gnome-tweak-tool does not support at this time. See: + # https://github.com/NixOS/nixpkgs/issues/21851 + # https://github.com/NixOS/nixpkgs/pull/22370 + preConfigure = '' + PATH="${python}/bin:$PATH" + ''; + makeFlags = [ "DESTDIR=/" ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 diff --git a/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix index e3f6bca10a4..a5dd1480d3d 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { description = "Make Pidgin IM conversations appear in the Gnome Shell message tray"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix index 1c7f712b12c..8c1ab41de52 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { This GNOME utility helps to manage time according to Pomodoro Technique. It intends to improve productivity and focus by taking short breaks. ''; - maintainers = with maintainers; [ DamienCassou jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix index 80557e827fe..12cdd4a569c 100644 --- a/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix +++ b/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, libvncserver, freerdp, telepathy_qt }: +{ kde, kdelibs, libvncserver, freerdp_legacy, telepathy_qt }: kde { - buildInputs = [ kdelibs libvncserver freerdp telepathy_qt ]; + buildInputs = [ kdelibs libvncserver freerdp_legacy telepathy_qt ]; meta = { description = "KDE remote desktop client"; diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix index db255a1d5b7..228d9443f6d 100644 --- a/pkgs/desktops/kde-5/applications/default.nix +++ b/pkgs/desktops/kde-5/applications/default.nix @@ -1,11 +1,27 @@ /* +# New packages + +READ THIS FIRST + +This module is for official packages in the KDE Applications Bundle. All +available packages are listed in `./srcs.nix`, although some are not yet +packaged in Nixpkgs (see below). + +IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. + +Many of the packages released upstream are not yet built in Nixpkgs due to lack +of demand. To add a Nixpkgs build for an upstream package, copy one of the +existing packages here and modify it as necessary. A simple example package that +still shows most of the available features is in `./gwenview.nix`. + # Updates -1. Update the URL in `maintainers/scripts/generate-kde-applications.sh` and - run that script from the top of the Nixpkgs tree. -2. Check that the new packages build correctly. -3. Commit the changes and open a pull request. +1. Update the URL in `./fetch.sh`. +2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications` + from the top of the Nixpkgs tree. +3. Invoke `nix-build -A kde5` and ensure that everything builds. +4. Commit the changes and open a pull request. */ @@ -56,6 +72,7 @@ let khelpcenter = callPackage ./khelpcenter.nix {}; kio-extras = callPackage ./kio-extras.nix {}; kmime = callPackage ./kmime.nix {}; + kmix = callPackage ./kmix.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; @@ -64,16 +81,12 @@ let libkipi = callPackage ./libkipi.nix {}; libkomparediff2 = callPackage ./libkomparediff2.nix {}; marble = callPackage ./marble.nix {}; + okteta = callPackage ./okteta.nix {}; okular = callPackage ./okular.nix {}; print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; }); - - # External packages - kipi-plugins = callPackage ../../../applications/graphics/kipi-plugins/5.x.nix {}; - ktorrent = callPackage ../../../applications/networking/p2p/ktorrent/5.nix { }; - libktorrent = callPackage ../../../development/libraries/libktorrent/5.nix { }; }; in packages diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh index 1ef623fe513..607a16eb45b 100644 --- a/pkgs/desktops/kde-5/applications/fetch.sh +++ b/pkgs/desktops/kde-5/applications/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/applications/16.12.1/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/applications/16.12.2/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/applications/gwenview.nix b/pkgs/desktops/kde-5/applications/gwenview.nix index b97e4ce3bd6..37a1605fe70 100644 --- a/pkgs/desktops/kde-5/applications/gwenview.nix +++ b/pkgs/desktops/kde-5/applications/gwenview.nix @@ -2,7 +2,7 @@ kdeApp, lib, kdeWrapper, ecm, kdoctools, baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2, - libkdcraw, libkipi, phonon, qtsvg, qtx11extras + libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras }: let @@ -15,8 +15,8 @@ let }; nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ - baloo kactivities kdelibs4support kio qtx11extras exiv2 lcms2 libkdcraw - libkipi phonon qtsvg + baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw + libkipi phonon qtimageformats qtsvg qtx11extras ]; }; in diff --git a/pkgs/desktops/kde-5/applications/kmix.nix b/pkgs/desktops/kde-5/applications/kmix.nix new file mode 100644 index 00000000000..46a67e06ee0 --- /dev/null +++ b/pkgs/desktops/kde-5/applications/kmix.nix @@ -0,0 +1,30 @@ +{ + kdeApp, lib, kdeWrapper, + ecm, kdoctools, + kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support, + plasma-framework, libpulseaudio, alsaLib, libcanberra_kde +}: + +let + unwrapped = + kdeApp { + name = "kmix"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = [ lib.maintainers.rongcuid ]; + }; + nativeBuildInputs = [ ecm kdoctools ]; + buildInputs = [ libpulseaudio alsaLib libcanberra_kde ]; + propagatedBuildInputs = [ + kglobalaccel kxmlgui kcoreaddons kdelibs4support + plasma-framework + ]; + cmakeFlags = [ + "-DKMIX_KF5_BUILD=1" + ]; + }; +in +kdeWrapper { + inherit unwrapped; + targets = [ "bin/kmix" ]; +} diff --git a/pkgs/desktops/kde-5/applications/okteta.nix b/pkgs/desktops/kde-5/applications/okteta.nix new file mode 100644 index 00000000000..6683b9876fc --- /dev/null +++ b/pkgs/desktops/kde-5/applications/okteta.nix @@ -0,0 +1,26 @@ +{ + kdeApp, lib, kdeWrapper, + ecm, kdoctools, + kconfig, kinit, + kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5 +}: + +let + unwrapped = + kdeApp { + name = "okteta"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ peterhoeg ]; + }; + nativeBuildInputs = [ ecm kdoctools ]; + propagatedBuildInputs = [ + kconfig kinit + kcmutils kconfigwidgets knewstuff kparts qca-qt5 + ]; + }; + +in kdeWrapper { + inherit unwrapped; + targets = [ "bin/okteta" ]; +} diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/desktops/kde-5/applications/srcs.nix index 10bb6936bca..60c412e55fd 100644 --- a/pkgs/desktops/kde-5/applications/srcs.nix +++ b/pkgs/desktops/kde-5/applications/srcs.nix @@ -3,2227 +3,2227 @@ { akonadi = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/akonadi-16.12.1.tar.xz"; - sha256 = "1snf6jdr7yz1ng5whqkjsc89h82a97zj6vw8ijwiqqyas1cifdm3"; - name = "akonadi-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/akonadi-16.12.2.tar.xz"; + sha256 = "1csaa69n65d3cnkajzk5702vxskfaiajvxw724s17a5y6sgk0h5z"; + name = "akonadi-16.12.2.tar.xz"; }; }; akonadi-calendar = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/akonadi-calendar-16.12.1.tar.xz"; - sha256 = "0q2gpk8ci5snlz1v4rwwnrl74damjlz7fvdys875jykdnnb7jsfi"; - name = "akonadi-calendar-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/akonadi-calendar-16.12.2.tar.xz"; + sha256 = "1qfkwmh82l5ahzjpsla9gwwk2kqxv773ddq8f5h52qlxx56agc6k"; + name = "akonadi-calendar-16.12.2.tar.xz"; }; }; akonadi-calendar-tools = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/akonadi-calendar-tools-16.12.1.tar.xz"; - sha256 = "1v9nj1nv4sxvqvd397vr38vscda0r3z80hll7jr8psyx7lyn91jx"; - name = "akonadi-calendar-tools-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/akonadi-calendar-tools-16.12.2.tar.xz"; + sha256 = "1isjvsas6fnz2v2a8yl6ggkimfknr56a3zydwhq59lzcm15hn0hj"; + name = "akonadi-calendar-tools-16.12.2.tar.xz"; }; }; akonadiconsole = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/akonadiconsole-16.12.1.tar.xz"; - sha256 = "11rqyp7grjijhbl1apjjhc3d9qcxf0mz31l9mgd223vaxkv5lbjs"; - name = "akonadiconsole-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/akonadiconsole-16.12.2.tar.xz"; + sha256 = "188qb2lc6d0xhvq8n5y7ax13a6wz3agg1mx3j2kphwn8f53grgzb"; + name = "akonadiconsole-16.12.2.tar.xz"; }; }; akonadi-contacts = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/akonadi-contacts-16.12.1.tar.xz"; - sha256 = "042m4mnvs8a6jgrlyybysm0jax07r1756fixn4kglb0ki3lp57kr"; - name = "akonadi-contacts-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/akonadi-contacts-16.12.2.tar.xz"; + sha256 = "1ixd1qzakxhq9qlfr6l8igii2ny8fi8hxasdadq9cyr5jl20rpgp"; + name = "akonadi-contacts-16.12.2.tar.xz"; }; }; akonadi-import-wizard = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/akonadi-import-wizard-16.12.1.tar.xz"; - sha256 = "1ns7y1wqd4zvbgpzlczyailmvf6raqwqrpxxhshdskdd672n849p"; - name = "akonadi-import-wizard-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/akonadi-import-wizard-16.12.2.tar.xz"; + sha256 = "0xdmcs8l0lqqx2f2yabp1xx60h1jcz05q7lk6zzapzc0xqa8pqnq"; + name = "akonadi-import-wizard-16.12.2.tar.xz"; }; }; akonadi-mime = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/akonadi-mime-16.12.1.tar.xz"; - sha256 = "01bzh2hb73q25jnw9wkragvglr9j89rh079p6k4f898cpjqfvdin"; - name = "akonadi-mime-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/akonadi-mime-16.12.2.tar.xz"; + sha256 = "0w88splvk1ci6l590kybb8dgddhk8q0mqag1xxliws534kl9bd0s"; + name = "akonadi-mime-16.12.2.tar.xz"; }; }; akonadi-notes = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/akonadi-notes-16.12.1.tar.xz"; - sha256 = "1brc53mc1zggqgx6gy9f3vysis3cqyrsn7h02zc49mljycmkri7n"; - name = "akonadi-notes-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/akonadi-notes-16.12.2.tar.xz"; + sha256 = "181d4sv6vqrx0iy5fwdpd28h78i0jy4bj51jxbdn7fqmx1mavbkl"; + name = "akonadi-notes-16.12.2.tar.xz"; }; }; akonadi-search = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/akonadi-search-16.12.1.tar.xz"; - sha256 = "05xdznd4g3jm74n3yjg0w9vh435l0ix4sssmh2z3i2apxak3rxdy"; - name = "akonadi-search-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/akonadi-search-16.12.2.tar.xz"; + sha256 = "1jfcpjn45cxxnfg9y15fjkig6nfj6w8ggq3a7339kdhb79lkh1p5"; + name = "akonadi-search-16.12.2.tar.xz"; }; }; akregator = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/akregator-16.12.1.tar.xz"; - sha256 = "1f1hf3r124icy59k829f6yfrk6zy512f3zy9rm5zv33vl5fmc437"; - name = "akregator-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/akregator-16.12.2.tar.xz"; + sha256 = "0yyjpl6kajy0ip60m6vf0jnm217m5ax34a5y14k1wj7civ4fz9il"; + name = "akregator-16.12.2.tar.xz"; }; }; analitza = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/analitza-16.12.1.tar.xz"; - sha256 = "1b07hl516sd7qvrkhv0ihsc83jycyp2dqckziw8g0cm2sj81ymcz"; - name = "analitza-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/analitza-16.12.2.tar.xz"; + sha256 = "1jii70a2nppfzqlzwrjvawfq2cfjqrcsj0mbpgahb8zphcfs5xhy"; + name = "analitza-16.12.2.tar.xz"; }; }; ark = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ark-16.12.1.tar.xz"; - sha256 = "1l78pshhkpyc9fybpypi3kdp7jism1c6lljflncpvxxvk1q16k5m"; - name = "ark-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ark-16.12.2.tar.xz"; + sha256 = "07jp25jqnfcx48x7w0wwyldk56czyx2341yf2k73p3fy67rldlr3"; + name = "ark-16.12.2.tar.xz"; }; }; artikulate = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/artikulate-16.12.1.tar.xz"; - sha256 = "1v8p494x9dgm6yqw6mfhzkg6hkbb1rnk8x4jfjdsncknfk27ni5b"; - name = "artikulate-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/artikulate-16.12.2.tar.xz"; + sha256 = "11065zl5gdc1q7rvzmjvbz33k9xhdph7ynqwnv628c6a0478xwc5"; + name = "artikulate-16.12.2.tar.xz"; }; }; audiocd-kio = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/audiocd-kio-16.12.1.tar.xz"; - sha256 = "1s06lnmzllb4nd24x7bri1g4g77865k1w5gdn46ryfmlhwg4bccm"; - name = "audiocd-kio-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/audiocd-kio-16.12.2.tar.xz"; + sha256 = "184grq1nfpv9sfcsk6kcx6bdnbh938jc3qr6n00gnnj509347xga"; + name = "audiocd-kio-16.12.2.tar.xz"; }; }; baloo-widgets = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/baloo-widgets-16.12.1.tar.xz"; - sha256 = "0z1109wi0gdz9c8qr278ca1r0ff1p89966245fgg6rcxpm52zzsb"; - name = "baloo-widgets-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/baloo-widgets-16.12.2.tar.xz"; + sha256 = "000v5s33j6qsdbxqf856si0z5dmh9dan41kf2lrzc017hj6pr34x"; + name = "baloo-widgets-16.12.2.tar.xz"; }; }; blinken = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/blinken-16.12.1.tar.xz"; - sha256 = "0jijzz31iv9v1yv898j6q25y5fmrk8vqsvx7xwcj84ca8qmp9scf"; - name = "blinken-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/blinken-16.12.2.tar.xz"; + sha256 = "1wcl8199wg74cv9hyrhcpqkf1awpf3q960jzgfv0z0c28xywb76x"; + name = "blinken-16.12.2.tar.xz"; }; }; blogilo = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/blogilo-16.12.1.tar.xz"; - sha256 = "11dq36vis770hgmyq119aw2bl99855j5r38f7kr81ad2fjmla54z"; - name = "blogilo-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/blogilo-16.12.2.tar.xz"; + sha256 = "0j5mz8nfndr0g99l84s7n3gxrj6y4jbql1srnyl0yspmcjwmnc09"; + name = "blogilo-16.12.2.tar.xz"; }; }; bomber = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/bomber-16.12.1.tar.xz"; - sha256 = "081109mf1lqcc03ba852h021s2i3kwy6nnl3jc4zyn5igkm08cad"; - name = "bomber-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/bomber-16.12.2.tar.xz"; + sha256 = "1fy17y5grir6kbr7xzclslrxyip4favhag6wasg9ah60r6k15cqc"; + name = "bomber-16.12.2.tar.xz"; }; }; bovo = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/bovo-16.12.1.tar.xz"; - sha256 = "1dk0hrpn22v5ia8qnlan0i4wrxbccwl88k9bapxydnrgwyw4vfkx"; - name = "bovo-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/bovo-16.12.2.tar.xz"; + sha256 = "0dszbxisq172x5jv10w62wg3kcs1f8wdxgw9pjq423j3jq8rw9zq"; + name = "bovo-16.12.2.tar.xz"; }; }; calendarsupport = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/calendarsupport-16.12.1.tar.xz"; - sha256 = "0d74sghas76ry9vyd19fr9hgirvhycljdrvdmrxsh1sxjd04q96g"; - name = "calendarsupport-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/calendarsupport-16.12.2.tar.xz"; + sha256 = "065h09kq6h2hr4lg34lqckw0g91zkhxpviagdgymx7qpdy36l2sb"; + name = "calendarsupport-16.12.2.tar.xz"; }; }; cantor = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/cantor-16.12.1.tar.xz"; - sha256 = "1m7n7n03p7060w7rw3mgzpkv841azv42flrzq4h9589akl91k0js"; - name = "cantor-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/cantor-16.12.2.tar.xz"; + sha256 = "055sxyl2x2mipnidrsgkmbjy4vw64pf5k0fql64p7pjhknn3i6x4"; + name = "cantor-16.12.2.tar.xz"; }; }; cervisia = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/cervisia-16.12.1.tar.xz"; - sha256 = "1lsg8hb2kgsbygi63hdfbfng2lk7kl8mdksfhkwfa2g4l7sjlcy8"; - name = "cervisia-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/cervisia-16.12.2.tar.xz"; + sha256 = "1fdnvdp27wa8pni4vq501ajdln6dmg2kc0468x1c375g734npabx"; + name = "cervisia-16.12.2.tar.xz"; }; }; dolphin = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/dolphin-16.12.1.tar.xz"; - sha256 = "0vpsj1s2hijksay7wblzgk97md4hbrpzzdnrdxmfz3izdnzbyaxh"; - name = "dolphin-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/dolphin-16.12.2.tar.xz"; + sha256 = "1xqkrkhpcxcrrk3msd7fkhqikwrx2mjd0c4cna2iwd0s4h7ahmy6"; + name = "dolphin-16.12.2.tar.xz"; }; }; dolphin-plugins = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/dolphin-plugins-16.12.1.tar.xz"; - sha256 = "1g9sdfmq04incgxj428y5r3k7wgjl77bv95cp3svwd5kxz6syipz"; - name = "dolphin-plugins-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/dolphin-plugins-16.12.2.tar.xz"; + sha256 = "07i4w95b20db51bzg0rnx6m3dgk2bz5nwivz6zngfiiksmb39dj3"; + name = "dolphin-plugins-16.12.2.tar.xz"; }; }; dragon = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/dragon-16.12.1.tar.xz"; - sha256 = "14k0q96k1h6b21c5wpwr3bxjngkm1qz3pisv0cvx7dcahy4z20ik"; - name = "dragon-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/dragon-16.12.2.tar.xz"; + sha256 = "07iip379kpwy8yfiwacykkgzj7bfw2nz3vij61q68lr64k5sg4kk"; + name = "dragon-16.12.2.tar.xz"; }; }; eventviews = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/eventviews-16.12.1.tar.xz"; - sha256 = "1ghpd7rsfkh2xvy2p8pfxgrabhkq4hbq05n1sqa95zb3ax2q4qwd"; - name = "eventviews-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/eventviews-16.12.2.tar.xz"; + sha256 = "1hl0adi0ss533mnncyih3y9075i90accklbk8068dvxb7la9b7zd"; + name = "eventviews-16.12.2.tar.xz"; }; }; ffmpegthumbs = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ffmpegthumbs-16.12.1.tar.xz"; - sha256 = "19rnqkwbv5dflhhkrczr5hd8qnscvbdfr8kfb3phcai2shgn0pps"; - name = "ffmpegthumbs-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ffmpegthumbs-16.12.2.tar.xz"; + sha256 = "0p1fqxqcgz3k910acacr86pa66yl5d65wxf93nlg4627dfhmrbkc"; + name = "ffmpegthumbs-16.12.2.tar.xz"; }; }; filelight = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/filelight-16.12.1.tar.xz"; - sha256 = "0zax3vmynh2aajq24znbdqnxslgkyqmy6n0d9xasi10zq0hli97q"; - name = "filelight-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/filelight-16.12.2.tar.xz"; + sha256 = "0ynqnagyrn61gzvi0rl38200yxbxa2zpch3cl917wff527kjd7cw"; + name = "filelight-16.12.2.tar.xz"; }; }; granatier = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/granatier-16.12.1.tar.xz"; - sha256 = "1v85cw83gfzd3vwnbmmpbvsz85n6vh7478r572pikq1scgvxpn62"; - name = "granatier-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/granatier-16.12.2.tar.xz"; + sha256 = "01b0nvfj5v2spaml003bpd4f5snncxsilfplwgb06kf8wwsb9mzd"; + name = "granatier-16.12.2.tar.xz"; }; }; grantlee-editor = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/grantlee-editor-16.12.1.tar.xz"; - sha256 = "08jkdcj3nka8r31h76vl9nf2wlmr92ndab8pj42wx7kf7nldbzh1"; - name = "grantlee-editor-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/grantlee-editor-16.12.2.tar.xz"; + sha256 = "16r1f7vwsqfngv3kld4wqmvxn4pnxgcpiaaxa2z9szsjfrz10bp9"; + name = "grantlee-editor-16.12.2.tar.xz"; }; }; grantleetheme = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/grantleetheme-16.12.1.tar.xz"; - sha256 = "1b199870pkg1lkqbyf27b2rn4xqpbkm5hkwr08x65y67cfy1jm8v"; - name = "grantleetheme-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/grantleetheme-16.12.2.tar.xz"; + sha256 = "09qr7icbkq4my594xkjkydkfwx8sixbc73i3gxjnki64w549gan2"; + name = "grantleetheme-16.12.2.tar.xz"; }; }; gwenview = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/gwenview-16.12.1.tar.xz"; - sha256 = "0r1cg3zw98wmbvdfb1cjlqpca30067zzc3w8flrql9rldfbgcp95"; - name = "gwenview-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/gwenview-16.12.2.tar.xz"; + sha256 = "1ldflh10b34r9xy8a8yh72jcjdxs3ylhyjhs97xcg381q4dyg1dr"; + name = "gwenview-16.12.2.tar.xz"; }; }; incidenceeditor = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/incidenceeditor-16.12.1.tar.xz"; - sha256 = "0n4fq7pbmnkn9zx96svd6azs89arhpzlnrbjp60vbrpix8r6m0q5"; - name = "incidenceeditor-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/incidenceeditor-16.12.2.tar.xz"; + sha256 = "0z8ysrdkxfkn71anlzifd0dxh6fysl924jh4wjsphb4dnb417rym"; + name = "incidenceeditor-16.12.2.tar.xz"; }; }; jovie = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/jovie-16.12.1.tar.xz"; - sha256 = "0c5sz80yzkmp18r1c9wcf6n9cg9rj12sax5yx3j3x7gz5p9r5jj0"; - name = "jovie-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/jovie-16.12.2.tar.xz"; + sha256 = "19ifp3p02ayka2zqnwfq381mjqpxhm0hydf1yx9lh2p8n6j9s4gy"; + name = "jovie-16.12.2.tar.xz"; }; }; juk = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/juk-16.12.1.tar.xz"; - sha256 = "0v647vlfvq7lm33295v2c8w5qjm8ww9mxmxvvqd4rj35vg419zsb"; - name = "juk-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/juk-16.12.2.tar.xz"; + sha256 = "1453s0zxagqmx91f3x7fqrb6xdlgzr2sqj6hcj2pgl6jaz2x3n1c"; + name = "juk-16.12.2.tar.xz"; }; }; kaccessible = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kaccessible-16.12.1.tar.xz"; - sha256 = "04j74411rsjyvv7ann1hgb6wmqxk2ym7g6h2y07ld1vdl9kcj1vl"; - name = "kaccessible-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kaccessible-16.12.2.tar.xz"; + sha256 = "1ibh2nw4bdnj1ll8qp3d3vkwvzdkv2k53n98p9282w3jhckpiq5r"; + name = "kaccessible-16.12.2.tar.xz"; }; }; kaccounts-integration = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kaccounts-integration-16.12.1.tar.xz"; - sha256 = "0d4z9b8w76njnjqsr5w555p3016d0aa5hlsxplac9h82gysdj6q7"; - name = "kaccounts-integration-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kaccounts-integration-16.12.2.tar.xz"; + sha256 = "0nx9wlh7arjqz0wf2zyaj3fwzm7sn38hn00m74mj7zvxr1pwcypv"; + name = "kaccounts-integration-16.12.2.tar.xz"; }; }; kaccounts-providers = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kaccounts-providers-16.12.1.tar.xz"; - sha256 = "1aphsn0xwlrsw2snwhzbj4kpwpw09nwsv61lpmp97byl3sq814fw"; - name = "kaccounts-providers-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kaccounts-providers-16.12.2.tar.xz"; + sha256 = "0dln1l44bzaw782qjc57w2hgydbqzn4g7xh8d93qq52yz8ph875g"; + name = "kaccounts-providers-16.12.2.tar.xz"; }; }; kaddressbook = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kaddressbook-16.12.1.tar.xz"; - sha256 = "14sdkfzmfhfyvy8cky6015gnsz199ngj4ffg9r4qrkkdqcvw5rar"; - name = "kaddressbook-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kaddressbook-16.12.2.tar.xz"; + sha256 = "023mfnin8si234yczhhfm3nk083w8bixg1b3gr8bzc1x92ka93m2"; + name = "kaddressbook-16.12.2.tar.xz"; }; }; kajongg = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kajongg-16.12.1.tar.xz"; - sha256 = "0g6amf644q2540y5iyqcv5d25g32hfi13qm3hcc1rmqghz7dn4k4"; - name = "kajongg-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kajongg-16.12.2.tar.xz"; + sha256 = "0909hzwj8yf6sv97r2rgzbp8l7ixlxxy8nwy8dcv471dznlvqznn"; + name = "kajongg-16.12.2.tar.xz"; }; }; kalarm = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kalarm-16.12.1.tar.xz"; - sha256 = "015hylcqn4z57a9ibhvi5wrngjks8qkp7wg5faiwhx6cvw77jhw7"; - name = "kalarm-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kalarm-16.12.2.tar.xz"; + sha256 = "1znp4lym95jz93wwn1nrw9q8nkbwg7x489iccndrv4pl93jfsnqk"; + name = "kalarm-16.12.2.tar.xz"; }; }; kalarmcal = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kalarmcal-16.12.1.tar.xz"; - sha256 = "061wzn0y5cslgarz8lv73waipp0cahm5am27hc1a9j7y14cbqm16"; - name = "kalarmcal-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kalarmcal-16.12.2.tar.xz"; + sha256 = "06rx33hdwz940cggr5rg6g1gh84yzz6vrnvk5lrgr8vxqgrssp3s"; + name = "kalarmcal-16.12.2.tar.xz"; }; }; kalgebra = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kalgebra-16.12.1.tar.xz"; - sha256 = "0fyfpsh8pgdnspyaxrnmr93rh2shxrhn0nl0772a5bssw35xgb3x"; - name = "kalgebra-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kalgebra-16.12.2.tar.xz"; + sha256 = "02yykjrsa01r697bk4jsly7762hvml7f67gy33vgywhh8lz3h3cd"; + name = "kalgebra-16.12.2.tar.xz"; }; }; kalzium = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kalzium-16.12.1.tar.xz"; - sha256 = "1ipscw8721sl9kkb4lxpz3bg9pgf0fp3jx1y4643pk6qrrci1mcm"; - name = "kalzium-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kalzium-16.12.2.tar.xz"; + sha256 = "043prql6bwg2ka6y0inh8h46y7d5060b0h2inw0lhm49vizgkmsh"; + name = "kalzium-16.12.2.tar.xz"; }; }; kamera = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kamera-16.12.1.tar.xz"; - sha256 = "1rwd88qnbp7ha5rlndbillwhshs6fnv0ppr2gva4m8w9s4sj008q"; - name = "kamera-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kamera-16.12.2.tar.xz"; + sha256 = "1kxmjpk0vdj9s3kxgcp2vw8dpx4r69j3jwifyvzrh06sg9z0bnqd"; + name = "kamera-16.12.2.tar.xz"; }; }; kanagram = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kanagram-16.12.1.tar.xz"; - sha256 = "0rrdav0rigbvi1ya8iwv9h2jjkf4vqcywsb7wxdrksrng35hc57h"; - name = "kanagram-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kanagram-16.12.2.tar.xz"; + sha256 = "09d20x0z066pgkwp25ig49v78k89nyxs769a3zjmq1y490nm34y1"; + name = "kanagram-16.12.2.tar.xz"; }; }; kapman = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kapman-16.12.1.tar.xz"; - sha256 = "1wxxk7airpfq43rmwskjkv8r9zyrlb7vzd9ihbsxgacb8i0dvb86"; - name = "kapman-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kapman-16.12.2.tar.xz"; + sha256 = "0g9swdgz8sd49q3sw2107b50ww978nppzp1b7bkv7ygiz49p28bq"; + name = "kapman-16.12.2.tar.xz"; }; }; kapptemplate = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kapptemplate-16.12.1.tar.xz"; - sha256 = "0k7gvjqfp8iq9z9mc6jvp7f90kysgmqla83qfxqmpin1k5l24p8z"; - name = "kapptemplate-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kapptemplate-16.12.2.tar.xz"; + sha256 = "1agpq16wxbzd7crgbj1cj60alqv090dkvxi2szg054bmks82j6rc"; + name = "kapptemplate-16.12.2.tar.xz"; }; }; kate = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kate-16.12.1.tar.xz"; - sha256 = "1p0jf0fwsq28jk3rmck4sv0pnipp4sv1amsjn3m57dcpb0084jlq"; - name = "kate-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kate-16.12.2.tar.xz"; + sha256 = "1hkqzidd2cfp3wg7pq47ymsw1dh26qwn4cybnxw23d95ss85wx2p"; + name = "kate-16.12.2.tar.xz"; }; }; katomic = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/katomic-16.12.1.tar.xz"; - sha256 = "1galbrlpj331mxi9a1zivx78v1qjvb1mdbf7nzgsqg9qqdszrx2p"; - name = "katomic-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/katomic-16.12.2.tar.xz"; + sha256 = "1sgi8npzq3p7qwv3c4q8ji83gp33zxb0i19dx2i6rb45lir3lj68"; + name = "katomic-16.12.2.tar.xz"; }; }; kblackbox = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kblackbox-16.12.1.tar.xz"; - sha256 = "0782v6dqc8jvzvmsirfjg9ddngx3m9wxjwbj3mahxdn0hjzghxhj"; - name = "kblackbox-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kblackbox-16.12.2.tar.xz"; + sha256 = "1cv5kqyqspiz0aaamnyq37s683m2iw27ma6yf3blm5f9g1r43n2k"; + name = "kblackbox-16.12.2.tar.xz"; }; }; kblocks = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kblocks-16.12.1.tar.xz"; - sha256 = "16i9c7w81y70r834g3chv479pv28xvkb8p2b8kapqdl1qci17niw"; - name = "kblocks-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kblocks-16.12.2.tar.xz"; + sha256 = "1xd5pxpi97nmrp4xglhm2qfpz8ksv8vyq4wrv25qbgvfc8jis790"; + name = "kblocks-16.12.2.tar.xz"; }; }; kblog = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kblog-16.12.1.tar.xz"; - sha256 = "1azg2yp0nbvknkff4d8g2i28l48gvgny1j12aqs540wag9jv8j68"; - name = "kblog-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kblog-16.12.2.tar.xz"; + sha256 = "001mqvahsmf4amxqmz2ah5chlgpp2zi8g4pcg83qb9d65cvr6877"; + name = "kblog-16.12.2.tar.xz"; }; }; kbounce = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kbounce-16.12.1.tar.xz"; - sha256 = "109lik70lqvfpk4b2k5pkcbb9dfn2b9cfl6s3vdybvd8j79w3kcf"; - name = "kbounce-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kbounce-16.12.2.tar.xz"; + sha256 = "1gsrafcjk55lbxi2mx382hj2lahlgnn3pv13ldi7zh6ms4sms1wm"; + name = "kbounce-16.12.2.tar.xz"; }; }; kbreakout = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kbreakout-16.12.1.tar.xz"; - sha256 = "0wfdskc3bqb8cffqc6abgdziqg47k9w06s0w58khzvh6skjafxn5"; - name = "kbreakout-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kbreakout-16.12.2.tar.xz"; + sha256 = "0lwwz17ynhdi6qw76yih8an6p890w8gwh1khsr8casc1wlm04s0y"; + name = "kbreakout-16.12.2.tar.xz"; }; }; kbruch = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kbruch-16.12.1.tar.xz"; - sha256 = "058lidgj8b03lkksy0jjrkh4jk7fmajc7sx994bxccb907r9jbav"; - name = "kbruch-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kbruch-16.12.2.tar.xz"; + sha256 = "1n119nkm0385pv8pngsbwxd56v6y6pwh0rshbk0ryd7974i2z4mi"; + name = "kbruch-16.12.2.tar.xz"; }; }; kcachegrind = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kcachegrind-16.12.1.tar.xz"; - sha256 = "1qr5fgxkzk4ql8ib2bb3m85bx033gxg468860aqkz0im0lf216s4"; - name = "kcachegrind-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kcachegrind-16.12.2.tar.xz"; + sha256 = "0wcizav1z3n31n7qcc05mx42vl2rv71c7haaa8vn0ma39rj4iaqv"; + name = "kcachegrind-16.12.2.tar.xz"; }; }; kcalc = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kcalc-16.12.1.tar.xz"; - sha256 = "0ncq609jil3ssqj8rslxz9pn4cdlbik0y93rc6mvw4hgk0p0yfgv"; - name = "kcalc-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kcalc-16.12.2.tar.xz"; + sha256 = "07lyssmkq34ym1w3ajm1vf4f57xv2h8y2zb039vj7gdx609syaq0"; + name = "kcalc-16.12.2.tar.xz"; }; }; kcalcore = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kcalcore-16.12.1.tar.xz"; - sha256 = "167c8rl5zqfbnk5ricy0lrw8jjyqm5j5d39d2xgf6p5hd3lqw22f"; - name = "kcalcore-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kcalcore-16.12.2.tar.xz"; + sha256 = "1lq5shp8jwy490qx0rnc0sd67976r7j3sblzw0j5hn95k8n23hzd"; + name = "kcalcore-16.12.2.tar.xz"; }; }; kcalutils = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kcalutils-16.12.1.tar.xz"; - sha256 = "1p36vhk3ylvw1zn82pahg3grwl6ag4rdwn8lzgf9day3bdr9fr8h"; - name = "kcalutils-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kcalutils-16.12.2.tar.xz"; + sha256 = "1sf5f8mwjdi2d8lpkrprnqc9jkj72p6mdz3pbczmixgfy7d7y4ci"; + name = "kcalutils-16.12.2.tar.xz"; }; }; kcharselect = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kcharselect-16.12.1.tar.xz"; - sha256 = "0fv989ff94bhlhapk1irwkdghx8vq19n5b208qkrbfna5jzs0nfz"; - name = "kcharselect-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kcharselect-16.12.2.tar.xz"; + sha256 = "0a5cmc6n9h8h64in68qdi8bmqx341fvm8vf98vcqn5sivwwnflhc"; + name = "kcharselect-16.12.2.tar.xz"; }; }; kcolorchooser = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kcolorchooser-16.12.1.tar.xz"; - sha256 = "1vq72gm73vpmjb635cmjx25cfx5rgvpmapjkw6yhdpp9bdv3xs3z"; - name = "kcolorchooser-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kcolorchooser-16.12.2.tar.xz"; + sha256 = "07psjid00bjw0s6xx2hq96f8cj2axdsr7lqvgrclksa07lphzcvm"; + name = "kcolorchooser-16.12.2.tar.xz"; }; }; kcontacts = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kcontacts-16.12.1.tar.xz"; - sha256 = "10g2r62db7mbfrkr8qjf7m4kl7c9ybv5l3ci37mabkvnnnacqqni"; - name = "kcontacts-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kcontacts-16.12.2.tar.xz"; + sha256 = "18z7894xh1ifkg177xxy41n61djcy07m8a39favbpab0ya1xk81l"; + name = "kcontacts-16.12.2.tar.xz"; }; }; kcron = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kcron-16.12.1.tar.xz"; - sha256 = "00ipxmfm5wvj3szjlw550xsm3cpcm27wnvwbffxjpikzipzrhsr9"; - name = "kcron-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kcron-16.12.2.tar.xz"; + sha256 = "1z72wcrr8ggw89ivq70v98zwg1hw3sn5l5czpq00scqpaf8664g2"; + name = "kcron-16.12.2.tar.xz"; }; }; kdebugsettings = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kdebugsettings-16.12.1.tar.xz"; - sha256 = "0valppahimpdj00gbvhasqq12d2rvl4i16cqc7g9q5mbmr51fs3y"; - name = "kdebugsettings-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kdebugsettings-16.12.2.tar.xz"; + sha256 = "1zbmvn9c1sjjxiskivl0s4mpmh52hqj7921v2bac7bvqd2hkc5cv"; + name = "kdebugsettings-16.12.2.tar.xz"; }; }; kde-dev-scripts = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-dev-scripts-16.12.1.tar.xz"; - sha256 = "11b4mbxs22x78qzz4dnq15cgvjsb3z8w23xz4x6af8vd6dizy8xc"; - name = "kde-dev-scripts-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-dev-scripts-16.12.2.tar.xz"; + sha256 = "0l4sbzpnczixavyppc3swb09jna44rb61awwgh37ngsz97iza3sx"; + name = "kde-dev-scripts-16.12.2.tar.xz"; }; }; kde-dev-utils = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-dev-utils-16.12.1.tar.xz"; - sha256 = "1acadqsi5sv3dbdxrlil8a5yrhgqvvibi05sdvvqzmz0c1fw6w0k"; - name = "kde-dev-utils-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-dev-utils-16.12.2.tar.xz"; + sha256 = "0fhf9w5v355jsrr25yhj612gi0qh8kvrbfdfplns04q7viycn44f"; + name = "kde-dev-utils-16.12.2.tar.xz"; }; }; kdeedu-data = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kdeedu-data-16.12.1.tar.xz"; - sha256 = "1axg6k0jwnpsfbk5mis17fnsacdlf9p8pfqy8qp83l0n8pink1nb"; - name = "kdeedu-data-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kdeedu-data-16.12.2.tar.xz"; + sha256 = "05jhqasi5h5dl4xlydx6jmn1i81qd8q8bzimhc2f9bwakkhqf73b"; + name = "kdeedu-data-16.12.2.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kdegraphics-mobipocket-16.12.1.tar.xz"; - sha256 = "0a59irbkwcvf81jj0rqf9fb1ks6crk4xrrqzp0l0h0hjza7qmk6n"; - name = "kdegraphics-mobipocket-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kdegraphics-mobipocket-16.12.2.tar.xz"; + sha256 = "07mpm55ipdqq6absvhcsrbc3c9xmb3b5bnl5k852mqpp0v36ijs8"; + name = "kdegraphics-mobipocket-16.12.2.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kdegraphics-thumbnailers-16.12.1.tar.xz"; - sha256 = "08qj67xkij6g8hzs5wj4c53pwnm711y54qdcrnrl4cpbcfvcynzd"; - name = "kdegraphics-thumbnailers-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kdegraphics-thumbnailers-16.12.2.tar.xz"; + sha256 = "0asv8wjr5nm5i6zylvhn8qgxvpr79yg681rc6mg1liimimwzxia3"; + name = "kdegraphics-thumbnailers-16.12.2.tar.xz"; }; }; kde-l10n-ar = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ar-16.12.1.tar.xz"; - sha256 = "0s4a05zl66xks3kixf07z1s05y932qb5ssz1njwas6j8sx7dxvl5"; - name = "kde-l10n-ar-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ar-16.12.2.tar.xz"; + sha256 = "0an0r2l4vc2sdi4lc2p7iks9gnwasgvxnq81vf3qb40q290x4fim"; + name = "kde-l10n-ar-16.12.2.tar.xz"; }; }; kde-l10n-ast = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ast-16.12.1.tar.xz"; - sha256 = "0dk2wcb3yd9lgc5j0imkfsclir54za83g5kqkyf7a81fwy799ndm"; - name = "kde-l10n-ast-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ast-16.12.2.tar.xz"; + sha256 = "0fjpypz9w1ic9w75gpp1c71l43x3j8nm37h1bgbqkyik3spxin2l"; + name = "kde-l10n-ast-16.12.2.tar.xz"; }; }; kde-l10n-bg = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-bg-16.12.1.tar.xz"; - sha256 = "15qz82sbmyxi1gj62d36a6hdx1q9fmg8b9wchxkbls84429ancgz"; - name = "kde-l10n-bg-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-bg-16.12.2.tar.xz"; + sha256 = "1iwcs8nz2rfi0b05ypl6mydiw02c64hscy3zlz998nww65x3nks0"; + name = "kde-l10n-bg-16.12.2.tar.xz"; }; }; kde-l10n-bs = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-bs-16.12.1.tar.xz"; - sha256 = "1jqcib98rs2albx9vxcn2cnk23rx05pk2fhd4mgbcdcx7vmj2ws3"; - name = "kde-l10n-bs-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-bs-16.12.2.tar.xz"; + sha256 = "0kps4paygx10l2nijwd946wns6sxlgn2771fzv1cmn5h1smffhkn"; + name = "kde-l10n-bs-16.12.2.tar.xz"; }; }; kde-l10n-ca = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ca-16.12.1.tar.xz"; - sha256 = "0vnvpnrxfasfmkahmvs28x2kbq7rb725nspgp9y96m58brwis4h9"; - name = "kde-l10n-ca-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ca-16.12.2.tar.xz"; + sha256 = "0r6yccw7fdi2dsz9qf9rccgdmznkc66z5c51asdhrmyzq4x7c7r2"; + name = "kde-l10n-ca-16.12.2.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-16.12.1"; + version = "ca_valencia-16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ca@valencia-16.12.1.tar.xz"; - sha256 = "0mhiwqih6z4cj9hwksnkiad29l4bn9bvbnngnh5dgz8m566471sq"; - name = "kde-l10n-ca_valencia-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ca@valencia-16.12.2.tar.xz"; + sha256 = "15wpsjzk9z61rpai8dzpzi5j9w57nmhm7fx4b6i5hsr9c4ypmi01"; + name = "kde-l10n-ca_valencia-16.12.2.tar.xz"; }; }; kde-l10n-cs = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-cs-16.12.1.tar.xz"; - sha256 = "033yzzvs8cb747fnjjy982y6sadprmwbjhpxy2icgkhppimyi90y"; - name = "kde-l10n-cs-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-cs-16.12.2.tar.xz"; + sha256 = "1z6a3rl7p0wmq6zs8fap052dp5hvlpzxf4xvjxk9c75wl2m9nvlg"; + name = "kde-l10n-cs-16.12.2.tar.xz"; }; }; kde-l10n-da = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-da-16.12.1.tar.xz"; - sha256 = "01kwa0swc2jg870v60hp01hkksw4h85644qf0capq84diqy370j9"; - name = "kde-l10n-da-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-da-16.12.2.tar.xz"; + sha256 = "0zi7h0cvzza1ly88821fsl2bnr2vn524rrdqsfc9yj3z1jbpnn2h"; + name = "kde-l10n-da-16.12.2.tar.xz"; }; }; kde-l10n-de = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-de-16.12.1.tar.xz"; - sha256 = "0rlv3mqd1m7vk29ywlhs11zspgzzlhvai25w1j3cj89mbsyryqja"; - name = "kde-l10n-de-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-de-16.12.2.tar.xz"; + sha256 = "0s1c22ad1r0qxpkc878gxz2wqkb52qrn1k753kqpn9105p5l92fh"; + name = "kde-l10n-de-16.12.2.tar.xz"; }; }; kde-l10n-el = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-el-16.12.1.tar.xz"; - sha256 = "087nj0w3r9vs9ph8459jy26bmyj9dq1q8hwww40dsvi6lg4pm09m"; - name = "kde-l10n-el-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-el-16.12.2.tar.xz"; + sha256 = "02d4j12yr4v9apa3iziza611v6cgjf6725wgd41g00pj41p61kcq"; + name = "kde-l10n-el-16.12.2.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-16.12.1"; + version = "en_GB-16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-en_GB-16.12.1.tar.xz"; - sha256 = "0wf6kwb2i5lp5j2mhh4sdj14w6gzgmpz4avjvxsydal13mcvb8q0"; - name = "kde-l10n-en_GB-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-en_GB-16.12.2.tar.xz"; + sha256 = "09h3zsq5qhzyagl8xysv74g2iv26739y02xgbwv5dahv0iln99rs"; + name = "kde-l10n-en_GB-16.12.2.tar.xz"; }; }; kde-l10n-eo = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-eo-16.12.1.tar.xz"; - sha256 = "1qbb3pcvyszfmjzl1jcwhj3fybfza181wnm28jzw2c68s7n7f18s"; - name = "kde-l10n-eo-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-eo-16.12.2.tar.xz"; + sha256 = "1isqdnnj1g9jxagns3yq611pfd6nbanji9a8igfgm55djj5hx527"; + name = "kde-l10n-eo-16.12.2.tar.xz"; }; }; kde-l10n-es = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-es-16.12.1.tar.xz"; - sha256 = "1whwbaxklr972w0s6ck277ql5vhh2v15dnw3gfasp5k5rx1g1rcb"; - name = "kde-l10n-es-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-es-16.12.2.tar.xz"; + sha256 = "0h3c5an1i072rk9mkc9mc6k3bvlk37slhgl6qy3rs2l77mhhnpyi"; + name = "kde-l10n-es-16.12.2.tar.xz"; }; }; kde-l10n-et = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-et-16.12.1.tar.xz"; - sha256 = "0jlx8rf4y7mdwcmc9ypyi2rm09mddmpz2l2p0k1p2fb3596n6yg8"; - name = "kde-l10n-et-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-et-16.12.2.tar.xz"; + sha256 = "0dpkxwpl17pgimx94v67wq90fzdayp6p3wcz7y0g8b0hn3bsbidj"; + name = "kde-l10n-et-16.12.2.tar.xz"; }; }; kde-l10n-eu = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-eu-16.12.1.tar.xz"; - sha256 = "0x8pmxdnzzxbki9r66y5ha44q6j7sihjkn6y5psqrqghrgxmg11b"; - name = "kde-l10n-eu-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-eu-16.12.2.tar.xz"; + sha256 = "0q7l5s502ayr2vfa4ysvk4c6k5i8y5ci6yb34mm3lpwlain3bssb"; + name = "kde-l10n-eu-16.12.2.tar.xz"; }; }; kde-l10n-fa = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-fa-16.12.1.tar.xz"; - sha256 = "0m886zx1kp6aykwcmrhc6w2g20va3sskwjg5l03lb0dq2g4b8nlv"; - name = "kde-l10n-fa-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fa-16.12.2.tar.xz"; + sha256 = "03qvv814kvddf24fjvg55pbxaq58kc936b5qwbddxjr05n1dy964"; + name = "kde-l10n-fa-16.12.2.tar.xz"; }; }; kde-l10n-fi = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-fi-16.12.1.tar.xz"; - sha256 = "0mcz0cc1wzrfhbacgxas9wlk9jczbnbbdb96q0dypj7vbwdw15j2"; - name = "kde-l10n-fi-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fi-16.12.2.tar.xz"; + sha256 = "0902bbyi10vpn0qn0xn46p8fy98kaa4cvlgnn4cb2dgp8q3kni8j"; + name = "kde-l10n-fi-16.12.2.tar.xz"; }; }; kde-l10n-fr = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-fr-16.12.1.tar.xz"; - sha256 = "07ax7ldfjzvrlkwh1bl4y1j8ngq5rgnikykjqc0iy5g8vv71pb24"; - name = "kde-l10n-fr-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fr-16.12.2.tar.xz"; + sha256 = "0zjlryvyq8z2llrba4hp3awz5hq74b6z21wp2x86g4k6y154i0as"; + name = "kde-l10n-fr-16.12.2.tar.xz"; }; }; kde-l10n-ga = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ga-16.12.1.tar.xz"; - sha256 = "19gqdnih89cbqjxdxxj6mv1528z0kqhh020pf6cnb638k6fw2jpf"; - name = "kde-l10n-ga-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ga-16.12.2.tar.xz"; + sha256 = "1gwd4r28qv5sh4r008nq5mdzzb8cwq8dg17r19l3syydxxhjlf86"; + name = "kde-l10n-ga-16.12.2.tar.xz"; }; }; kde-l10n-gl = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-gl-16.12.1.tar.xz"; - sha256 = "03bwvly40j9ynh6gqxjxq3p9rqdiwclm3iyn6iwa0ri1y8jix0dy"; - name = "kde-l10n-gl-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-gl-16.12.2.tar.xz"; + sha256 = "1jka29dh5aqdzgmqc9rf3lmrq4mm4vahhsk2klhp12ajzp9dgg70"; + name = "kde-l10n-gl-16.12.2.tar.xz"; }; }; kde-l10n-he = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-he-16.12.1.tar.xz"; - sha256 = "0zj9ppvj6k2wxsp0f8drrrwhb93xlgggskhyp93dcb7d6dpl561x"; - name = "kde-l10n-he-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-he-16.12.2.tar.xz"; + sha256 = "0g87g0mpa3i59fk4fm5hk2z54s07cy9niy2kal50fbm5lnr7czfk"; + name = "kde-l10n-he-16.12.2.tar.xz"; }; }; kde-l10n-hi = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-hi-16.12.1.tar.xz"; - sha256 = "0l8aa97mkl0csz3yrq8ib1ypdwiir47nhnll8zgw8gxh97rzkr4w"; - name = "kde-l10n-hi-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hi-16.12.2.tar.xz"; + sha256 = "05q608wic0ssx0d14n39s786k8xw86hc560ywfs3k89v973nba5b"; + name = "kde-l10n-hi-16.12.2.tar.xz"; }; }; kde-l10n-hr = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-hr-16.12.1.tar.xz"; - sha256 = "1azp8rpai0v7wyqm8a8cfw8dnx9053nmb9cjps4jxvzfcxggbb1x"; - name = "kde-l10n-hr-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hr-16.12.2.tar.xz"; + sha256 = "0sm7ba6x3hgw1ml6qm00g9dfi56w2kx3pk37944l3r4jx2wdqs4f"; + name = "kde-l10n-hr-16.12.2.tar.xz"; }; }; kde-l10n-hu = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-hu-16.12.1.tar.xz"; - sha256 = "111g42krxx41zph5h02mrxd8zj31gfpji9ai7hw88h089gxy1c0z"; - name = "kde-l10n-hu-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hu-16.12.2.tar.xz"; + sha256 = "1qcdqm6wjcgd5br99mm93lwlaxk5dvrliyj1ff4bxfxx0cabhx2g"; + name = "kde-l10n-hu-16.12.2.tar.xz"; }; }; kde-l10n-ia = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ia-16.12.1.tar.xz"; - sha256 = "0bncwdnwa7bzm5n5gac3f44qai9z6ymwgn72g3fr9g8lw0a48h2m"; - name = "kde-l10n-ia-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ia-16.12.2.tar.xz"; + sha256 = "0r1fryhi4czgbl1r228zry0msk11s075y15i4flznwdps99s5q8c"; + name = "kde-l10n-ia-16.12.2.tar.xz"; }; }; kde-l10n-id = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-id-16.12.1.tar.xz"; - sha256 = "0nqnl8aisvvmx4rrycyixarjrkq8cil6wq9xyxd1gv6r3wyxi25i"; - name = "kde-l10n-id-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-id-16.12.2.tar.xz"; + sha256 = "1lz51bilx8dziiff65l91pknif9w7390q3l9amdlcjq86cj44khz"; + name = "kde-l10n-id-16.12.2.tar.xz"; }; }; kde-l10n-is = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-is-16.12.1.tar.xz"; - sha256 = "0afkgwz3rqsl5fmvi7lij4krwkal9qcfgafpqfsgxh053ip4h97r"; - name = "kde-l10n-is-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-is-16.12.2.tar.xz"; + sha256 = "08bqhxppib360ywzmphjqx5yalzr3bgwpqkff79rl5ffq9dd4psv"; + name = "kde-l10n-is-16.12.2.tar.xz"; }; }; kde-l10n-it = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-it-16.12.1.tar.xz"; - sha256 = "0bjbq21w7pm88ij5p69rjg5a5plbk5kblf760zyxw19dhmj1rx98"; - name = "kde-l10n-it-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-it-16.12.2.tar.xz"; + sha256 = "12k9vqdr2nrcqh535crylxrmznndx7bkwz68vrdvqidlabd0ci7m"; + name = "kde-l10n-it-16.12.2.tar.xz"; }; }; kde-l10n-ja = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ja-16.12.1.tar.xz"; - sha256 = "0y05zaw7a6xyvzkc0zy5snlxzpdmh796h1nm6hqjr3l1w65anj0x"; - name = "kde-l10n-ja-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ja-16.12.2.tar.xz"; + sha256 = "0i9hc66qlnq0yij9d3754m5wa2wkra95wcdbp6xwk82ws7lkckai"; + name = "kde-l10n-ja-16.12.2.tar.xz"; }; }; kde-l10n-kk = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-kk-16.12.1.tar.xz"; - sha256 = "16ca99aaqmg4n9lp0h554s399kxmk42i6qlkaw3slzr9s2ljbb70"; - name = "kde-l10n-kk-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-kk-16.12.2.tar.xz"; + sha256 = "1h9scz1z046szxf54702w3wzlsvzr8016rx9fwg7z5fc1vpkhxxn"; + name = "kde-l10n-kk-16.12.2.tar.xz"; }; }; kde-l10n-km = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-km-16.12.1.tar.xz"; - sha256 = "0sm0v7y9lpzzdagvbjybj8ym0ihr26j4slmga4izr9i035rid24m"; - name = "kde-l10n-km-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-km-16.12.2.tar.xz"; + sha256 = "09vw686y9qdx09cz58d11ldqz5bsnch1sx2dsbxvp1drypb1nhxk"; + name = "kde-l10n-km-16.12.2.tar.xz"; }; }; kde-l10n-ko = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ko-16.12.1.tar.xz"; - sha256 = "0g54fz1z611i6r49ahr54mz40950w8yv8ii4w6gx66yh7m805czw"; - name = "kde-l10n-ko-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ko-16.12.2.tar.xz"; + sha256 = "1q9kla2djqsvkj773wybxb1lds50v0lg3jkfpnrg2pvm49jl2c9g"; + name = "kde-l10n-ko-16.12.2.tar.xz"; }; }; kde-l10n-lt = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-lt-16.12.1.tar.xz"; - sha256 = "19z5fwsv67pm5fj62g5vsjy56614kwv198sh9wr06b0c1122a33s"; - name = "kde-l10n-lt-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-lt-16.12.2.tar.xz"; + sha256 = "1i6nzmqm1sl895x7hnsk9snw2ci8cbdvswdfbvllqivcd8l4vmg5"; + name = "kde-l10n-lt-16.12.2.tar.xz"; }; }; kde-l10n-lv = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-lv-16.12.1.tar.xz"; - sha256 = "0q8ni73yyfkqzc4kdh9cm7518pvczjbf7z27fy662vpx6bdw8dab"; - name = "kde-l10n-lv-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-lv-16.12.2.tar.xz"; + sha256 = "0why1sa09pd7pwwa57c27y969ijgmjsmni8x7n9gxx5w0317kq9d"; + name = "kde-l10n-lv-16.12.2.tar.xz"; }; }; kde-l10n-mr = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-mr-16.12.1.tar.xz"; - sha256 = "143s0ldvz1lkq1mc3cv4xifhrmiqbqavval40dn5w78f3qsb2h6q"; - name = "kde-l10n-mr-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-mr-16.12.2.tar.xz"; + sha256 = "0wkncbs5di9vlcfqbc8g4msp6kp926049jlkj4jhvgj1in434ay8"; + name = "kde-l10n-mr-16.12.2.tar.xz"; }; }; kde-l10n-nb = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-nb-16.12.1.tar.xz"; - sha256 = "100ykwdw4nhwahijn9mqp1y9cyllw8i7dy9lyhvhw4zw1r89nbyj"; - name = "kde-l10n-nb-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nb-16.12.2.tar.xz"; + sha256 = "0p9yq33jzh83c1471072p94mrx8jazrinb987ifrl5lk8m54k34z"; + name = "kde-l10n-nb-16.12.2.tar.xz"; }; }; kde-l10n-nds = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-nds-16.12.1.tar.xz"; - sha256 = "0gn35547hjya99bxzf47frh3y2jm6vgmwfc822s7hr7a629bdvmv"; - name = "kde-l10n-nds-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nds-16.12.2.tar.xz"; + sha256 = "1yb7axm4k1rlfp41s9q8ql7l2mjbyrf7ry1ww7c1rprcb93gm7f8"; + name = "kde-l10n-nds-16.12.2.tar.xz"; }; }; kde-l10n-nl = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-nl-16.12.1.tar.xz"; - sha256 = "0a11cqn7brvxfbh497qmqivdki0hwbgjnmlp1y438xgnmmny8kr8"; - name = "kde-l10n-nl-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nl-16.12.2.tar.xz"; + sha256 = "04d75kfxxijb4a7xk5saxz5vbrwfsl2nx0i4x3d4i2k06wzysvch"; + name = "kde-l10n-nl-16.12.2.tar.xz"; }; }; kde-l10n-nn = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-nn-16.12.1.tar.xz"; - sha256 = "1s43fh3kc0w9cd0fnwhb04hm8q2la5s5qkx9dadc0v8mwxnr56k9"; - name = "kde-l10n-nn-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nn-16.12.2.tar.xz"; + sha256 = "09vmvvmakcybgy6zl51xj05wflq88xkbjmns4wv42jf0fn4kipif"; + name = "kde-l10n-nn-16.12.2.tar.xz"; }; }; kde-l10n-pa = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-pa-16.12.1.tar.xz"; - sha256 = "1zzv3bjn159a4lapfiqcvhdlvvac29q5h42jc7w1kfbv15byykz8"; - name = "kde-l10n-pa-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pa-16.12.2.tar.xz"; + sha256 = "0nv9pch0s24aamcz8lgbs26kp343kyw0rnz4a7myzcrb8g8sm0d3"; + name = "kde-l10n-pa-16.12.2.tar.xz"; }; }; kde-l10n-pl = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-pl-16.12.1.tar.xz"; - sha256 = "07l5vfchiwwszxfw3fpidh869049wg9fkjkjzpf0hvqgknlii2va"; - name = "kde-l10n-pl-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pl-16.12.2.tar.xz"; + sha256 = "1bxhcqwmcfl2srfrn50ib57890m3m6w4x9vwn24qxwapb9s6nzav"; + name = "kde-l10n-pl-16.12.2.tar.xz"; }; }; kde-l10n-pt = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-pt-16.12.1.tar.xz"; - sha256 = "14cp6mm740v8fwc2p8c1w164yl925wk5ysz19527g6nmydfww3f0"; - name = "kde-l10n-pt-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pt-16.12.2.tar.xz"; + sha256 = "02x96cdvrbdcmrhnn4pamsdnr8m530p047avh82xvjvqywsnqf7z"; + name = "kde-l10n-pt-16.12.2.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-16.12.1"; + version = "pt_BR-16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-pt_BR-16.12.1.tar.xz"; - sha256 = "173yjk28hbvgjcr07p99svw2z5g3bb58ln2cv50lckj0lmr4j379"; - name = "kde-l10n-pt_BR-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pt_BR-16.12.2.tar.xz"; + sha256 = "17155laifayfb5c2hznlpnmaa8kwxzlmk7yb2skrf92fzzqx2379"; + name = "kde-l10n-pt_BR-16.12.2.tar.xz"; }; }; kde-l10n-ro = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ro-16.12.1.tar.xz"; - sha256 = "1jakhzs21417rd6cafq6p1qda3w3w0vq8v4lp45nas45iij2f9vr"; - name = "kde-l10n-ro-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ro-16.12.2.tar.xz"; + sha256 = "1zsng3m031cbyz1jl5lv1fjg5vb3ig3pk0gaamvxbs6fxaz14ss3"; + name = "kde-l10n-ro-16.12.2.tar.xz"; }; }; kde-l10n-ru = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ru-16.12.1.tar.xz"; - sha256 = "05hxgd4dpqdvyhbn1vj64x7h00iylwl2cih4myb77pcjw0hdpgi4"; - name = "kde-l10n-ru-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ru-16.12.2.tar.xz"; + sha256 = "1shs2j4kqqf2b8jz2691yi45f5bpsr9nx2i5j67mmn94dnds4ps6"; + name = "kde-l10n-ru-16.12.2.tar.xz"; }; }; kde-l10n-sk = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-sk-16.12.1.tar.xz"; - sha256 = "0rhjqsa15xp99k67yy88qp2v7pi1i29v7kr1jvvwrfn4byrgjr5f"; - name = "kde-l10n-sk-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sk-16.12.2.tar.xz"; + sha256 = "1397sxczn9jdxbab3d9296w15swc40a8ypa3f4yhckqm4nmr8xn1"; + name = "kde-l10n-sk-16.12.2.tar.xz"; }; }; kde-l10n-sl = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-sl-16.12.1.tar.xz"; - sha256 = "00p4j40f5sbsfnbmnfj6hciq2817m41ii81m6g3ckg3fyv184vbh"; - name = "kde-l10n-sl-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sl-16.12.2.tar.xz"; + sha256 = "1z14sbdk5zdshn36wija4hkj7l825i336bz92rq42f8by4mha0h4"; + name = "kde-l10n-sl-16.12.2.tar.xz"; }; }; kde-l10n-sr = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-sr-16.12.1.tar.xz"; - sha256 = "18k4nhbiriq0wng0jr51wbkgi6hzwn7g3r2aqh57gsf50z5rjj6k"; - name = "kde-l10n-sr-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sr-16.12.2.tar.xz"; + sha256 = "12v6whnydgxxpx9vl3pimnxqny22kfiv51i1r9dk6vfqik18kxzy"; + name = "kde-l10n-sr-16.12.2.tar.xz"; }; }; kde-l10n-sv = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-sv-16.12.1.tar.xz"; - sha256 = "0ca6gyxfvss3sxl3lxb9jf6ac2fb1lnz5bs4imrgxly1wphzd66p"; - name = "kde-l10n-sv-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sv-16.12.2.tar.xz"; + sha256 = "10dzz39779lbb5mcnnmhwm86pkwc2g5qyiqg5jzpf0mg1zbl9y3w"; + name = "kde-l10n-sv-16.12.2.tar.xz"; }; }; kde-l10n-tr = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-tr-16.12.1.tar.xz"; - sha256 = "10j649xb1zvn9zp9i0zmsmc6bwx08wgm0a3y66213w2framsx9fn"; - name = "kde-l10n-tr-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-tr-16.12.2.tar.xz"; + sha256 = "0m4rgz7ha2i9bladavc5g3n94kai82ilx8akd2jcxz6q3wb75r0r"; + name = "kde-l10n-tr-16.12.2.tar.xz"; }; }; kde-l10n-ug = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ug-16.12.1.tar.xz"; - sha256 = "0dr23z6f9azvxnagdsyzgbwqr0xknricxwm6lykqdaa1r4s3mnzs"; - name = "kde-l10n-ug-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ug-16.12.2.tar.xz"; + sha256 = "1kjdiy92pi5vdxbfy61ckq8j9pc8kmrccfqnlm7yqvh8p5i28p2x"; + name = "kde-l10n-ug-16.12.2.tar.xz"; }; }; kde-l10n-uk = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-uk-16.12.1.tar.xz"; - sha256 = "0cxjz1d07429z0fasppjl8p0gr9a4ylz8ymcx3pqmaa872sgg7h6"; - name = "kde-l10n-uk-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-uk-16.12.2.tar.xz"; + sha256 = "1nhclnwy5lgkzhs6lm8dkhh4957v78rv2d9ss13a1jn2salz5kfv"; + name = "kde-l10n-uk-16.12.2.tar.xz"; }; }; kde-l10n-wa = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-wa-16.12.1.tar.xz"; - sha256 = "1pdzr1hs0zr31qv11n029chjgbwi7si8nas26y8wz5xxbfrjrb07"; - name = "kde-l10n-wa-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-wa-16.12.2.tar.xz"; + sha256 = "12f2kvks21hj5gjqjys7fa295148j0ndhxbzs5jysl0zq9y4909j"; + name = "kde-l10n-wa-16.12.2.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-16.12.1"; + version = "zh_CN-16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-zh_CN-16.12.1.tar.xz"; - sha256 = "04bxkjdpld13i609dircbdh8zknlsn9jcwy4nvcwa1p2xf04dr5z"; - name = "kde-l10n-zh_CN-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-zh_CN-16.12.2.tar.xz"; + sha256 = "1v21kap5lyzgygqv02jjx9yrfnkjkk0qrd85l0pjhqjyycs5r97w"; + name = "kde-l10n-zh_CN-16.12.2.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-16.12.1"; + version = "zh_TW-16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-zh_TW-16.12.1.tar.xz"; - sha256 = "0wmcf8v3c68a4mfqzfy1dxdyb1bx29ak1zy8skmrvshn1arfhyab"; - name = "kde-l10n-zh_TW-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-zh_TW-16.12.2.tar.xz"; + sha256 = "049q9d9ykhxk0dkmm4aw7fx1aa39s5cslk4011335jmg1msmrfna"; + name = "kde-l10n-zh_TW-16.12.2.tar.xz"; }; }; kdelibs = { - version = "4.14.28"; + version = "4.14.29"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kdelibs-4.14.28.tar.xz"; - sha256 = "1r2dyr723w75yh65zgpzg9irm0jx3nsywa9zxw1xgls4p8xksyy0"; - name = "kdelibs-4.14.28.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kdelibs-4.14.29.tar.xz"; + sha256 = "0xvw0cscvz8arclgfhrrbgdg94mz4h9y33nyndlsw67qrbg8slqv"; + name = "kdelibs-4.14.29.tar.xz"; }; }; kdenetwork-filesharing = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kdenetwork-filesharing-16.12.1.tar.xz"; - sha256 = "100pagqj2y2jdzn5b37zyiab382dmx7j4kdwyrrnz6rzsr0lm9pr"; - name = "kdenetwork-filesharing-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kdenetwork-filesharing-16.12.2.tar.xz"; + sha256 = "0q43c2xim5ibxyib1xz1wfz6bigkmk97bkvy9wrlk869c0qvrcn5"; + name = "kdenetwork-filesharing-16.12.2.tar.xz"; }; }; kdenlive = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kdenlive-16.12.1.tar.xz"; - sha256 = "13bn0i7qyw4cil5cp0s1ynx80y2xp9wzbycmw9mcvbi66clyk9dw"; - name = "kdenlive-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kdenlive-16.12.2.tar.xz"; + sha256 = "116lk641qlx8jkiaxm54g6svc6adg0bilhf634cyc8c46991a8z7"; + name = "kdenlive-16.12.2.tar.xz"; }; }; kdepim-addons = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kdepim-addons-16.12.1.tar.xz"; - sha256 = "1yaymzyh6rg1b17d556v5prbd4y46kph33r55riq5mbzfwfwx85j"; - name = "kdepim-addons-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kdepim-addons-16.12.2.tar.xz"; + sha256 = "1gi87bbdkj8cwinhicr5r6qxysc5rmylj8gajn0qh99rsyxy52dn"; + name = "kdepim-addons-16.12.2.tar.xz"; }; }; kdepim-apps-libs = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kdepim-apps-libs-16.12.1.tar.xz"; - sha256 = "14sx43g7fi62g278m95mjpfixwcyrj2qrz0hlp3zzlcjpq0ra9zv"; - name = "kdepim-apps-libs-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kdepim-apps-libs-16.12.2.tar.xz"; + sha256 = "07imq7nb1aqan8pbapvqg9mkzj18pj1v9xah9lpi6k64rhh0bkw9"; + name = "kdepim-apps-libs-16.12.2.tar.xz"; }; }; kdepim-runtime = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kdepim-runtime-16.12.1.tar.xz"; - sha256 = "0l8ypmynwmiyh2v9kwr3b5wdydwzmm9q02qij1vff01frq7hnh8s"; - name = "kdepim-runtime-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kdepim-runtime-16.12.2.tar.xz"; + sha256 = "0wd04zhc7nq2qf8iyjqf036bjs5by0zl0c58hl8r579b7gp5xljz"; + name = "kdepim-runtime-16.12.2.tar.xz"; }; }; kde-runtime = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kde-runtime-16.12.1.tar.xz"; - sha256 = "1inz7dlbw9ngjizc7nrnr6y93b34zmkjp89v58xqzmyajk1hbqp1"; - name = "kde-runtime-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kde-runtime-16.12.2.tar.xz"; + sha256 = "1bsnb7inxqv652vq9izwdj02gi15xxf34my51kdq2xk9dn2kmj8x"; + name = "kde-runtime-16.12.2.tar.xz"; }; }; kdesdk-kioslaves = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kdesdk-kioslaves-16.12.1.tar.xz"; - sha256 = "0qi9pkbg63kc8b27my05z9ih8z48mffc54m05gdcapgqx1qxigis"; - name = "kdesdk-kioslaves-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kdesdk-kioslaves-16.12.2.tar.xz"; + sha256 = "18wd4lb3v2br40xclsig718r8mqs5hgl7xw13pq5bfqk5kx11md1"; + name = "kdesdk-kioslaves-16.12.2.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kdesdk-thumbnailers-16.12.1.tar.xz"; - sha256 = "07fbm60x6rqf39w13980dmg4qcm9i6y004hzydfgjd7gyfmh2jrx"; - name = "kdesdk-thumbnailers-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kdesdk-thumbnailers-16.12.2.tar.xz"; + sha256 = "1jjchrbpyxjzs4zv68av53zhnlj46705261p0ad7x9ayb1mdrr24"; + name = "kdesdk-thumbnailers-16.12.2.tar.xz"; }; }; kdf = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kdf-16.12.1.tar.xz"; - sha256 = "1nhb718fmqqk22vrb5brykymsjfvh6w57v83lnyvp7w9ryks52fv"; - name = "kdf-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kdf-16.12.2.tar.xz"; + sha256 = "0zkwqqrcna2f9j4g798lhdi2v5j9p6r3zqkhf7clh4nk2c6f766k"; + name = "kdf-16.12.2.tar.xz"; }; }; kdialog = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kdialog-16.12.1.tar.xz"; - sha256 = "1qg1fcjyh8fybl2vg9dp1v9bwb3xx2mrlcx4zdr3fhpaq13pqs3f"; - name = "kdialog-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kdialog-16.12.2.tar.xz"; + sha256 = "0jrp06zbdj5c3nigdard0a7whb3lg8j2lgnf3dp2gf7iqj8gb189"; + name = "kdialog-16.12.2.tar.xz"; }; }; kdiamond = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kdiamond-16.12.1.tar.xz"; - sha256 = "16vssx8zklsia84zdp5yb5y9did92dqfly95a8w82zabdm47rx3b"; - name = "kdiamond-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kdiamond-16.12.2.tar.xz"; + sha256 = "1bflb2lbhahwmcqzck0xbr39rcbyaw4fzjaalbsdf9n5mk5ixmxs"; + name = "kdiamond-16.12.2.tar.xz"; }; }; keditbookmarks = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/keditbookmarks-16.12.1.tar.xz"; - sha256 = "0jnldxlx9kdqrl3i8b4xa1p2dbna80ffxw83cbv53125fqg5ii71"; - name = "keditbookmarks-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/keditbookmarks-16.12.2.tar.xz"; + sha256 = "16a2sq92r6nq7ksp905xp9v3fv8ynhfp9hslq4a46v71an06yh4p"; + name = "keditbookmarks-16.12.2.tar.xz"; }; }; kfilereplace = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kfilereplace-16.12.1.tar.xz"; - sha256 = "1pzf2gz89slv7fhp9d7n32p7vjpdr594qqmc4qi4i51gv0cksj2m"; - name = "kfilereplace-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kfilereplace-16.12.2.tar.xz"; + sha256 = "086x9k71s2bc80863vlfryblg0cyw1qhk20vwhxmq81xkxsah6ky"; + name = "kfilereplace-16.12.2.tar.xz"; }; }; kfind = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kfind-16.12.1.tar.xz"; - sha256 = "0bddyxjzha9flbj3b8ry805w5xns7al7hmx7hmpik7w1ph3ch0fx"; - name = "kfind-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kfind-16.12.2.tar.xz"; + sha256 = "0jpn75d331qiyhqswflkad5nc5r6c21q1d8236k2qvcm80xp10bm"; + name = "kfind-16.12.2.tar.xz"; }; }; kfloppy = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kfloppy-16.12.1.tar.xz"; - sha256 = "0g9v6rgvjfwmikyd7c7w6xpbdymvqm8p4gs0mlbb7d1ianylfgv1"; - name = "kfloppy-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kfloppy-16.12.2.tar.xz"; + sha256 = "1q1fh16msixpn59y0yglmjbib6a5c9pb3hpmcd5vsiy2ilpgffbm"; + name = "kfloppy-16.12.2.tar.xz"; }; }; kfourinline = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kfourinline-16.12.1.tar.xz"; - sha256 = "1zna1l1pll6hvjh1cbrh2kji17d67axwc955mx8xpjjm2fhw3np3"; - name = "kfourinline-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kfourinline-16.12.2.tar.xz"; + sha256 = "1df3si16d4ra3x3v9m4kiknlflx1ac10fq3vydcsn4yi89rhx2ix"; + name = "kfourinline-16.12.2.tar.xz"; }; }; kgeography = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kgeography-16.12.1.tar.xz"; - sha256 = "1irs63lb8gaghb2qxqbih4bi7w3fyjbkl379jzlxacz963a35hk8"; - name = "kgeography-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kgeography-16.12.2.tar.xz"; + sha256 = "1sw7blr264p88702718m5ch9qdzyd5krpf5qjvfhypx0fgzr40b6"; + name = "kgeography-16.12.2.tar.xz"; }; }; kget = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kget-16.12.1.tar.xz"; - sha256 = "0n670vxkqa9w51rdmp07g8ihh80v60m076f4rcrlliavw3wg2s76"; - name = "kget-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kget-16.12.2.tar.xz"; + sha256 = "1qiwcbdvr9g7cgqm4i3gcc6aw60d36n2m8a7faqa28srrw8f55lj"; + name = "kget-16.12.2.tar.xz"; }; }; kgoldrunner = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kgoldrunner-16.12.1.tar.xz"; - sha256 = "17gi794m6s0v7c1xgxwmy5sldicds3yiyyf5520s56q3vx8sav93"; - name = "kgoldrunner-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kgoldrunner-16.12.2.tar.xz"; + sha256 = "0sa7yf3656f8mib785xdv7q86gsslx1hwy69vqrnrfwg24vzx3gy"; + name = "kgoldrunner-16.12.2.tar.xz"; }; }; kgpg = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kgpg-16.12.1.tar.xz"; - sha256 = "08f8jq9inic05639xx0jh31d8mky4v3w7ig6d7b4k47nm06zzkpi"; - name = "kgpg-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kgpg-16.12.2.tar.xz"; + sha256 = "082fvxpawhsvfn6c1y32rvgp2qcim6lnk1gpp92cgn6k70dcx4lr"; + name = "kgpg-16.12.2.tar.xz"; }; }; khangman = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/khangman-16.12.1.tar.xz"; - sha256 = "1lcwkfppkkiq3fswhydgkxcqgcaq65x0ijdymrnp4g0bsk4y6w2l"; - name = "khangman-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/khangman-16.12.2.tar.xz"; + sha256 = "1v57za5bqhppc1fy2xd7d1x1fvanwxgl3xzckfz1k7kbx1kcpn1s"; + name = "khangman-16.12.2.tar.xz"; }; }; khelpcenter = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/khelpcenter-16.12.1.tar.xz"; - sha256 = "1psjs1p3va6f3prymr9pzk0bn41zk6g69y0v1dpxf5ylgpn45234"; - name = "khelpcenter-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/khelpcenter-16.12.2.tar.xz"; + sha256 = "1cij7v57zs14ynvmplcgn14m30hdc554kvrsbjgb695kmcvm1jv9"; + name = "khelpcenter-16.12.2.tar.xz"; }; }; kholidays = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kholidays-16.12.1.tar.xz"; - sha256 = "137rkfngcfjb5piva7iihyb3fib3qg84b9xk7f801pwy61pq30rk"; - name = "kholidays-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kholidays-16.12.2.tar.xz"; + sha256 = "0pybdq2asx10sxf4kz1p85yfs66dhccz2xvf95n8hky7833kqs1n"; + name = "kholidays-16.12.2.tar.xz"; }; }; kidentitymanagement = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kidentitymanagement-16.12.1.tar.xz"; - sha256 = "0m0x42jd2nlr3xj15zp8iv527driihxqsi64km20577jniw0jz6i"; - name = "kidentitymanagement-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kidentitymanagement-16.12.2.tar.xz"; + sha256 = "0wv7b3rfysbsj87xgp5ymy5glh9p12i9x8ffv483nm8xqyzwaa9p"; + name = "kidentitymanagement-16.12.2.tar.xz"; }; }; kig = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kig-16.12.1.tar.xz"; - sha256 = "148mnp03j9kx3n2xlswc6jpamazljrh3j1r3xi3fkwqhdmqx7ybf"; - name = "kig-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kig-16.12.2.tar.xz"; + sha256 = "0v261pb1l7cnjkqcqfg3885wxa2hb2bgdk0a1dcwrg4q6fr9kw1g"; + name = "kig-16.12.2.tar.xz"; }; }; kigo = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kigo-16.12.1.tar.xz"; - sha256 = "09srhp1p14yxnk31fps6cpm4cbpaqghlijf62mjg9414hpm13wyf"; - name = "kigo-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kigo-16.12.2.tar.xz"; + sha256 = "19sns6w32pm12634xqxx53hgpmrb4ggzx2idcx3ldknbixhmqm7c"; + name = "kigo-16.12.2.tar.xz"; }; }; killbots = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/killbots-16.12.1.tar.xz"; - sha256 = "0dabz54bdncvbhldgwdwp7yb5p0fzxjd7rhgciqs387isnrf9l3k"; - name = "killbots-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/killbots-16.12.2.tar.xz"; + sha256 = "1cc2ddmp7a21yn0aavbh887j4xmzm2a6xlyq71b3msraw3p5vbmy"; + name = "killbots-16.12.2.tar.xz"; }; }; kimagemapeditor = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kimagemapeditor-16.12.1.tar.xz"; - sha256 = "1ljkbljxz4656pn6yhsni5jxdw3zpkik7d3b86ns1gaicq2ghw3r"; - name = "kimagemapeditor-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kimagemapeditor-16.12.2.tar.xz"; + sha256 = "0n82v73da8hnan2c96g2lxy826dg6xhln28wwr8iib89zd5gmbi6"; + name = "kimagemapeditor-16.12.2.tar.xz"; }; }; kimap = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kimap-16.12.1.tar.xz"; - sha256 = "0c58jf16i8mwk20446sy7wf72a519nj7aa3g7iw79shjxzljx4zb"; - name = "kimap-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kimap-16.12.2.tar.xz"; + sha256 = "04shglmr8rv5r16qb3n9x7vwrsm55121rkj9pz1y7l40kybajl87"; + name = "kimap-16.12.2.tar.xz"; }; }; kio-extras = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kio-extras-16.12.1.tar.xz"; - sha256 = "14vhh16xbrb1ywmclc2sbr1dm3lvjjcbv2riz5kyx548cnkmid9c"; - name = "kio-extras-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kio-extras-16.12.2.tar.xz"; + sha256 = "0bfjmggyl7x7nmkqq10pmcc2507yfkbv5c5v86225g9mk02frmhp"; + name = "kio-extras-16.12.2.tar.xz"; }; }; kiriki = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kiriki-16.12.1.tar.xz"; - sha256 = "0rvj9f3kpdc0p6bpjgfjm3j4gxfhmqswag866s9zkm4zmr9l05y9"; - name = "kiriki-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kiriki-16.12.2.tar.xz"; + sha256 = "1fgdw7f4fqdfzsryvd8crdv60j2s2g3cvbibv3g91xkcq6p155wk"; + name = "kiriki-16.12.2.tar.xz"; }; }; kiten = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kiten-16.12.1.tar.xz"; - sha256 = "1kzw3867jvmc7yj3897hn2lgh59s571g6629ih7ncwsqbilbagz3"; - name = "kiten-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kiten-16.12.2.tar.xz"; + sha256 = "1ya1wwgh1x4iap3vs947ln949hjc499aiylg24666ab7vcqkbhh8"; + name = "kiten-16.12.2.tar.xz"; }; }; kjumpingcube = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kjumpingcube-16.12.1.tar.xz"; - sha256 = "0mfllbzhlvhr3h8crzg89zarxzsn9lgridyc6q9ljxzv6hf6w9rp"; - name = "kjumpingcube-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kjumpingcube-16.12.2.tar.xz"; + sha256 = "0flx7sxqac763i2nsvyjzjv9aii27hnv51k0yhqcp6pnsjy1fbhh"; + name = "kjumpingcube-16.12.2.tar.xz"; }; }; kldap = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kldap-16.12.1.tar.xz"; - sha256 = "070vk1ig1qp8aqv457bwxg8z9gszj90g9ff5n5wyjcgl721n23nz"; - name = "kldap-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kldap-16.12.2.tar.xz"; + sha256 = "06ql2d7l22c19gnw6wigym3qpqw22arsmwpnnwz9i76l3wq32s3x"; + name = "kldap-16.12.2.tar.xz"; }; }; kleopatra = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kleopatra-16.12.1.tar.xz"; - sha256 = "14d71qym527akx90krzk863f45rmbyj632bvhl2zfwx6ra5wpayx"; - name = "kleopatra-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kleopatra-16.12.2.tar.xz"; + sha256 = "1kh75qjas4x4aqvshdgcryqdrp475lx60gksjfh34ygz03avdssl"; + name = "kleopatra-16.12.2.tar.xz"; }; }; klettres = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/klettres-16.12.1.tar.xz"; - sha256 = "0d9z4g6hkryky8gs5x2agrql4lyw0n64miwk88b5gb7yg3723mp5"; - name = "klettres-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/klettres-16.12.2.tar.xz"; + sha256 = "116igb1gbl3dfh5rm4mp0n8krm0d9kpgns63sh355g02wf0cbz3f"; + name = "klettres-16.12.2.tar.xz"; }; }; klickety = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/klickety-16.12.1.tar.xz"; - sha256 = "1gg91l2fy5iwkmd8z990b561nhgqwvy4rb5i0cv67sikd1mafx0m"; - name = "klickety-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/klickety-16.12.2.tar.xz"; + sha256 = "00fqfnxh8bb069q3a5jszggnwq0z45najd6qg3z9gqb2i6bb4w93"; + name = "klickety-16.12.2.tar.xz"; }; }; klines = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/klines-16.12.1.tar.xz"; - sha256 = "04mrgv7xbqn4cjwiwr9cydpnkw50zkiv1a0nf2syppcayib3jgyz"; - name = "klines-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/klines-16.12.2.tar.xz"; + sha256 = "1pr5pvxd6fnybkjqxig9zjiq04d7g6igw24p2j6kfz91ihaf4g6q"; + name = "klines-16.12.2.tar.xz"; }; }; klinkstatus = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/klinkstatus-16.12.1.tar.xz"; - sha256 = "1g13npcqdslg6ggk5bjr61q06skkb92w9z8gd0nbkkq8ca6438kd"; - name = "klinkstatus-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/klinkstatus-16.12.2.tar.xz"; + sha256 = "07wmaphs56x0jwgbkdynahwa0hrr3rakkbbfa4w046dga5z6dz60"; + name = "klinkstatus-16.12.2.tar.xz"; }; }; kmag = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kmag-16.12.1.tar.xz"; - sha256 = "0398jb6fj1vw2lrby3smns59fiv3s109bd1nnzv69jba11gnr47f"; - name = "kmag-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kmag-16.12.2.tar.xz"; + sha256 = "02vjwfh926jvhxn1sw603ijdrayk4jxrw9rl7kv48q00kgk5sr23"; + name = "kmag-16.12.2.tar.xz"; }; }; kmahjongg = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kmahjongg-16.12.1.tar.xz"; - sha256 = "1qpvykd7adf3fx3sl6rd4d64d6y1ffmx9b048bm3vhlx32g6ksim"; - name = "kmahjongg-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kmahjongg-16.12.2.tar.xz"; + sha256 = "1rbcbak87jyf6bc8k44xvpcihagwh4i3v20af14hvm52gdvzdhij"; + name = "kmahjongg-16.12.2.tar.xz"; }; }; kmail = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kmail-16.12.1.tar.xz"; - sha256 = "0vx7ydm9rzw71b46va89k83l1ck364nczla3jia5wcqmli13wswl"; - name = "kmail-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kmail-16.12.2.tar.xz"; + sha256 = "0a3r6pwm3dvvmljp5grl1mgymp3fb1l3hb8issdqlk4s805q0pql"; + name = "kmail-16.12.2.tar.xz"; }; }; kmail-account-wizard = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kmail-account-wizard-16.12.1.tar.xz"; - sha256 = "0166vfycgcvxfj2zlizcmzqdsv6s41djb14x8sff6hxhhxni4hyd"; - name = "kmail-account-wizard-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kmail-account-wizard-16.12.2.tar.xz"; + sha256 = "1vm4lx5jwk5kqf3zdfm3zyzhap1dalslwj03gxmif6hh65d2s7h5"; + name = "kmail-account-wizard-16.12.2.tar.xz"; }; }; kmailtransport = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kmailtransport-16.12.1.tar.xz"; - sha256 = "1jwdpw7b1yji2zj70d4bn8z5cjrc51ar00qd0chzi2ykjb4fwvla"; - name = "kmailtransport-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kmailtransport-16.12.2.tar.xz"; + sha256 = "0g2f25l4l8jlj4d5dcdlbz8rgy4xvm6if2i3qm4naqh35kb4rycn"; + name = "kmailtransport-16.12.2.tar.xz"; }; }; kmbox = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kmbox-16.12.1.tar.xz"; - sha256 = "0s1qimkiglhsb889sxvsg7w4w9k0l703f8r0092bv0zpz54rzx7l"; - name = "kmbox-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kmbox-16.12.2.tar.xz"; + sha256 = "1j30kvvlnfbky5x19gxjsbrshrdys6ajdbhpd9fy46jjh2dv3y6j"; + name = "kmbox-16.12.2.tar.xz"; }; }; kmime = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kmime-16.12.1.tar.xz"; - sha256 = "1g792vqm8lb60psccwjg8kdcawdfrbnsflpg1kqif8a2327p0df4"; - name = "kmime-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kmime-16.12.2.tar.xz"; + sha256 = "0sl34qahgvxaw9xi56d0l2a2iim9bpiv8ysf3spsc1m2ribf3400"; + name = "kmime-16.12.2.tar.xz"; }; }; kmines = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kmines-16.12.1.tar.xz"; - sha256 = "1vq836nj46r3rn2hddg2vs3541p7q4s4sh6l554pjpdd8dbs8kjv"; - name = "kmines-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kmines-16.12.2.tar.xz"; + sha256 = "1324j3myr1wds3f6nzw186d1rc2aakxv0mqsx89bdvnky6zq2v5q"; + name = "kmines-16.12.2.tar.xz"; }; }; kmix = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kmix-16.12.1.tar.xz"; - sha256 = "1acc77v9arr7593qzw0vwhdpxdxd00gmvymkyyn2qlzwy4ihci8g"; - name = "kmix-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kmix-16.12.2.tar.xz"; + sha256 = "1s8di3jbgcaamfxfmmwxlajixia9m2ngl4qc1z7rq6a14fk3w5hz"; + name = "kmix-16.12.2.tar.xz"; }; }; kmousetool = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kmousetool-16.12.1.tar.xz"; - sha256 = "02qm8x9jfs86d1hv3g130q0kqiqxm7i9ab11f5n93xb9migi7q68"; - name = "kmousetool-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kmousetool-16.12.2.tar.xz"; + sha256 = "128hp75zyyariflx03ilmvw09jngfy9ylykb73gg7xw2zqnjjw4i"; + name = "kmousetool-16.12.2.tar.xz"; }; }; kmouth = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kmouth-16.12.1.tar.xz"; - sha256 = "1l7r63f93q46p1kgjyyvg49mfdfr3n1bbzy6081wlb18igjgwkmq"; - name = "kmouth-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kmouth-16.12.2.tar.xz"; + sha256 = "0gk8rdlpwh304k7g85i80rfdjnvj4fcd1nlj89zmq2qh5s9jmqzg"; + name = "kmouth-16.12.2.tar.xz"; }; }; kmplot = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kmplot-16.12.1.tar.xz"; - sha256 = "0djrxsh8zm5dncmiy8xn1x54k3g1hscds0f7vaa1lv97prcclqcz"; - name = "kmplot-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kmplot-16.12.2.tar.xz"; + sha256 = "0lwx0d1gv6k3nm0nxry6bl282j3vjc0p7rssbvhi5qsc7z9lc8s3"; + name = "kmplot-16.12.2.tar.xz"; }; }; knavalbattle = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/knavalbattle-16.12.1.tar.xz"; - sha256 = "1h98fvi31l20b2mx812z1wy0njp22jwc546h6wp50q4l1m7shxg1"; - name = "knavalbattle-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/knavalbattle-16.12.2.tar.xz"; + sha256 = "065hyrdqaj0g7kpgxdyjbf2msdxb6w6m2y50bw23p4w69y7fdxgn"; + name = "knavalbattle-16.12.2.tar.xz"; }; }; knetwalk = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/knetwalk-16.12.1.tar.xz"; - sha256 = "1129v31xabk27wqfq3nvyhd8gx3yipcl15zcn2vg89qbj5j71pc9"; - name = "knetwalk-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/knetwalk-16.12.2.tar.xz"; + sha256 = "1rhmgr2qk8h04y87dviy0yhrv5dg8za5v00csmia3s1jyvz0fbwp"; + name = "knetwalk-16.12.2.tar.xz"; }; }; knotes = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/knotes-16.12.1.tar.xz"; - sha256 = "0i8s8rfqilc8r4x26bisshhp2x3hss748kz1rs9wv2lb6s60r2n8"; - name = "knotes-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/knotes-16.12.2.tar.xz"; + sha256 = "12bdrw4ikw014phbq9w4q5y9lgjnazhvri7j13ld5r6806bxls04"; + name = "knotes-16.12.2.tar.xz"; }; }; kolf = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kolf-16.12.1.tar.xz"; - sha256 = "0rjzk40szpfkfc32qyhc41kpnpd96avwl6l4ahgdghx86bdn233k"; - name = "kolf-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kolf-16.12.2.tar.xz"; + sha256 = "1v9lhir520n7kcc061z3zcc8wxswhnmjv7yifbqvviazl1n0p0vx"; + name = "kolf-16.12.2.tar.xz"; }; }; kollision = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kollision-16.12.1.tar.xz"; - sha256 = "0yml0a5c2iypj4gzdvak2jjm09gjslbzcyqv0cwaygydzclkn896"; - name = "kollision-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kollision-16.12.2.tar.xz"; + sha256 = "1dklg0ns3abfxbfr7xrnzkcxxng3v7avzj4bjvsmsbq3lzy3pb8c"; + name = "kollision-16.12.2.tar.xz"; }; }; kolourpaint = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kolourpaint-16.12.1.tar.xz"; - sha256 = "06fg433dqnm1x4v7ixiix5vq33kr865jhw2bnbrpfhyq8qhvcqk1"; - name = "kolourpaint-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kolourpaint-16.12.2.tar.xz"; + sha256 = "1himisb1f68pgaz15qam73qv9acqqh8i1jnk9wbsqjyj6z67wvnj"; + name = "kolourpaint-16.12.2.tar.xz"; }; }; kommander = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kommander-16.12.1.tar.xz"; - sha256 = "12d7j6nifblg24zn9bgghil0qcc9sljy4h09sh6qxchnagdx8bb3"; - name = "kommander-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kommander-16.12.2.tar.xz"; + sha256 = "140sz82gm5p8f8mhr2kdfy24fr6jjs0l53jcqr9hwdw6vlrm399w"; + name = "kommander-16.12.2.tar.xz"; }; }; kompare = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kompare-16.12.1.tar.xz"; - sha256 = "0kjk6bad6321mgfxfvh9hjj823cilpjrihlrspwr4jh7w8gkb730"; - name = "kompare-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kompare-16.12.2.tar.xz"; + sha256 = "1dd4k3rq8wlzsvl5nv5mrd0ddxgwlriik3vxj8xx3b4nqk720lh6"; + name = "kompare-16.12.2.tar.xz"; }; }; konqueror = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/konqueror-16.12.1.tar.xz"; - sha256 = "1rrv20mi5czcpdq0h294s9gr9970f88yhv8hvc10i3h3gpjcv5vg"; - name = "konqueror-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/konqueror-16.12.2.tar.xz"; + sha256 = "0md9glzr1br2n5dsfmmv6gxsfhv6jl0r4fa1qgw4d2j2kpm94zw7"; + name = "konqueror-16.12.2.tar.xz"; }; }; konquest = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/konquest-16.12.1.tar.xz"; - sha256 = "1fib398af900c99x1k263dwqhwp2d6wfp8qn04ry6siyfwlpxkrj"; - name = "konquest-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/konquest-16.12.2.tar.xz"; + sha256 = "0k58adqr20k9wrwbaf1s6lqqgcma08wqnv66zrxbgacgsgx3pnzi"; + name = "konquest-16.12.2.tar.xz"; }; }; konsole = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/konsole-16.12.1.tar.xz"; - sha256 = "0nik8xvfppr30942pjcz2h70xdj0p35mxvq2cirh4h1wwb4458nm"; - name = "konsole-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/konsole-16.12.2.tar.xz"; + sha256 = "1mwfv2hznmd1qml8hq1z81jv9y8jn1ybc69dqgnf1n6ygmz14676"; + name = "konsole-16.12.2.tar.xz"; }; }; kontact = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kontact-16.12.1.tar.xz"; - sha256 = "1ynk2cv9ik6zahb92cq4miw05qrw0ffipcq9j71n6m79f319hmkc"; - name = "kontact-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kontact-16.12.2.tar.xz"; + sha256 = "1rfqb5a4brbvkhv905lcvc40r0as8zwdm2h67jc96cix358cpshv"; + name = "kontact-16.12.2.tar.xz"; }; }; kontactinterface = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kontactinterface-16.12.1.tar.xz"; - sha256 = "1qdii6y05ya8jjjfimr61r6d6x31bqgrdb89gms9qpf5rpr3ql2l"; - name = "kontactinterface-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kontactinterface-16.12.2.tar.xz"; + sha256 = "0z6mjg8sy18jhkfmk9s098851gdqbh03031l92yqzsgsfph9nk77"; + name = "kontactinterface-16.12.2.tar.xz"; }; }; kopete = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kopete-16.12.1.tar.xz"; - sha256 = "0pi3i02myj8bgkqif94n434l13k2ydslrn2nvy47rwsiyr77wrn2"; - name = "kopete-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kopete-16.12.2.tar.xz"; + sha256 = "0bf0bffcsyhrj70yb4l5g6n0jr38i5zkcl4hsfi9hac43xvp62ib"; + name = "kopete-16.12.2.tar.xz"; }; }; korganizer = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/korganizer-16.12.1.tar.xz"; - sha256 = "1v85bfyq0iyd9qc3lcqi7k65w8hpaq9yx093g4l6yh561xkw8yac"; - name = "korganizer-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/korganizer-16.12.2.tar.xz"; + sha256 = "1211rhxvx42lndqv6n23mj6ibhfp09vvmzz59k1j0l9z8y1zyr2g"; + name = "korganizer-16.12.2.tar.xz"; }; }; kpat = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kpat-16.12.1.tar.xz"; - sha256 = "1zgwg6pvpq6adlzcm12mqq73w9rpixh7cx892c687930d17r5l8i"; - name = "kpat-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kpat-16.12.2.tar.xz"; + sha256 = "1yc16yfsq18m5xxm9b17zba3ppw7j5hq82z0ln8sw2yisz59mylr"; + name = "kpat-16.12.2.tar.xz"; }; }; kpimtextedit = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kpimtextedit-16.12.1.tar.xz"; - sha256 = "1x1q26qwby3d3krx9nimwnx72zp3yns5inc88xkb0r74sn9743la"; - name = "kpimtextedit-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kpimtextedit-16.12.2.tar.xz"; + sha256 = "0xspr7hip57j8n3mp71x8s908vlj7acl27jwyc33yi4xvlyfcgfy"; + name = "kpimtextedit-16.12.2.tar.xz"; }; }; kppp = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kppp-16.12.1.tar.xz"; - sha256 = "01alps13995d1b3974c8ihi7i1pjm5xf5iskrp9bsc2ad8hka7xb"; - name = "kppp-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kppp-16.12.2.tar.xz"; + sha256 = "1gvb3sgxg1ysdrv18rf5kh6znvwlkp673yld6ghj3dcif8w6xq0n"; + name = "kppp-16.12.2.tar.xz"; }; }; kqtquickcharts = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kqtquickcharts-16.12.1.tar.xz"; - sha256 = "0pff2jm814x9f1zyxb8c718f43x34g9diggd15hbzshl0mhdx9h8"; - name = "kqtquickcharts-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kqtquickcharts-16.12.2.tar.xz"; + sha256 = "1gh3alqlmj2icd2jblncps4k6kklckbpqv18wplybgaz4h0pi4pi"; + name = "kqtquickcharts-16.12.2.tar.xz"; }; }; krdc = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/krdc-16.12.1.tar.xz"; - sha256 = "1v1p6ghvv72swqpv43f6k6wn5jwvk5b21aarm2as6c4x4nzkhffx"; - name = "krdc-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/krdc-16.12.2.tar.xz"; + sha256 = "1ql2mkx7xc2y0vkxjk3i5scxa6ws5mwz39zynmyx7rmxp9f8frsf"; + name = "krdc-16.12.2.tar.xz"; }; }; kremotecontrol = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kremotecontrol-16.12.1.tar.xz"; - sha256 = "0l4i47wlzpsm02r5fvkzfqjx9jixkc5c9j69s3ms4h4wwysi7r2z"; - name = "kremotecontrol-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kremotecontrol-16.12.2.tar.xz"; + sha256 = "1c1xx458lchn9b3c9h27zb13m2y6b01sb0g6lf6bpx4skbdwdwma"; + name = "kremotecontrol-16.12.2.tar.xz"; }; }; kreversi = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kreversi-16.12.1.tar.xz"; - sha256 = "1mhdz7wqi8ij2rdbsa30wsmz33z04dbxbczymi0wcbnvm2hai34a"; - name = "kreversi-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kreversi-16.12.2.tar.xz"; + sha256 = "18zfy3dzi9rgwhgvci93iv0gkmvac30rbj4xwpvzr3bc8zwz76df"; + name = "kreversi-16.12.2.tar.xz"; }; }; krfb = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/krfb-16.12.1.tar.xz"; - sha256 = "0ggpzycqd2jdi0k3knbc0hyfa1vl8mim9v5s4nbclg99y2yyybvl"; - name = "krfb-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/krfb-16.12.2.tar.xz"; + sha256 = "1sqij11a6pbivf2xbcglxzkfrpqvzcqxb4d85jxrhbp2wljx0xvy"; + name = "krfb-16.12.2.tar.xz"; }; }; kross-interpreters = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kross-interpreters-16.12.1.tar.xz"; - sha256 = "1m7xpjsggsrig1wqar8m7hjnhr561h20wqkyz66xf11fvwrc7zks"; - name = "kross-interpreters-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kross-interpreters-16.12.2.tar.xz"; + sha256 = "1cw84z2wdh1kb7fgwmmljmc5d57skh6hlm0p6kzlqdbqknnva8ad"; + name = "kross-interpreters-16.12.2.tar.xz"; }; }; kruler = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kruler-16.12.1.tar.xz"; - sha256 = "1j4xl3s2yw44qb1p287zc8af1nsjrc8dxvsn4xhc5cl0c5hcwi0s"; - name = "kruler-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kruler-16.12.2.tar.xz"; + sha256 = "11i7k53kpfampbkzzabp0v97pb22h7sb2i0r6qdx78kyhmkgdrvp"; + name = "kruler-16.12.2.tar.xz"; }; }; ksaneplugin = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ksaneplugin-16.12.1.tar.xz"; - sha256 = "05s38s1j1nf9flhaf089bjd10s8mi97ngw0ckr2xjjjkfj4p6abq"; - name = "ksaneplugin-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ksaneplugin-16.12.2.tar.xz"; + sha256 = "0ljk7cf4ns39xszn6g1vk8av3dkkgwzj4ry4n56305mqyjgqx258"; + name = "ksaneplugin-16.12.2.tar.xz"; }; }; kscd = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kscd-16.12.1.tar.xz"; - sha256 = "1njzzvkhxqfw889rxw4vd6jyqsmqsrrcjgb5fmrjvwhg94h4i745"; - name = "kscd-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kscd-16.12.2.tar.xz"; + sha256 = "1w1gcfwp1r18pjfp526pdb837kpd8zj08g1jrjcb3bmvh600apm0"; + name = "kscd-16.12.2.tar.xz"; }; }; kshisen = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kshisen-16.12.1.tar.xz"; - sha256 = "118fad0k4cv7klkv20x7rvwabnn6fcymypmraamprc76ygvyvk02"; - name = "kshisen-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kshisen-16.12.2.tar.xz"; + sha256 = "0sw78qwlpimlhqzlz5migbngrhj7w6gdbqx12q7949paa03ash1b"; + name = "kshisen-16.12.2.tar.xz"; }; }; ksirk = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ksirk-16.12.1.tar.xz"; - sha256 = "0w05nxqw5a18h0ylwx5lmw10wcmjrv293npfz1fl7nkhkxry0wy5"; - name = "ksirk-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ksirk-16.12.2.tar.xz"; + sha256 = "0f9k476wbwx0maf0wsicgipqyv7gccm7ydwvns399iamb6xkiqnn"; + name = "ksirk-16.12.2.tar.xz"; }; }; ksnakeduel = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ksnakeduel-16.12.1.tar.xz"; - sha256 = "1zrh34kb66sg1crhbndxhqychz359d1779ykw25q577panagwhgd"; - name = "ksnakeduel-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ksnakeduel-16.12.2.tar.xz"; + sha256 = "0lhwz1b1v1dir7k1vbkcwb73x7f3h7prb3zv4f8wlh32dj1yg983"; + name = "ksnakeduel-16.12.2.tar.xz"; }; }; kspaceduel = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kspaceduel-16.12.1.tar.xz"; - sha256 = "1g0ghr8lwvhlxq9b27864hfbsirb3y3zn0ipcw5cc0qdfcs9cqq2"; - name = "kspaceduel-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kspaceduel-16.12.2.tar.xz"; + sha256 = "0h6m8xnmxx0q2r863ikck0kpyscd8s4iidcjiqz7wqgbsw1dadqb"; + name = "kspaceduel-16.12.2.tar.xz"; }; }; ksquares = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ksquares-16.12.1.tar.xz"; - sha256 = "1bb7saml0l76cpkngpvdfn9yv7kg3fzj152dgav6cgvfzaj6xdz5"; - name = "ksquares-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ksquares-16.12.2.tar.xz"; + sha256 = "14x1d9300wdhrnri5f5n5i31bs83hcbxs5w9cai1m8mlql99vvfy"; + name = "ksquares-16.12.2.tar.xz"; }; }; kstars = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kstars-16.12.1.tar.xz"; - sha256 = "0pfmg3669nigdl0zhab45jh7h6gh5jmxvca1vxavwp8jmn96ghkl"; - name = "kstars-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kstars-16.12.2.tar.xz"; + sha256 = "0acbirhr970fh53hfsbfw9jn4jqlww9zf80jfyg2drixi9d70mpp"; + name = "kstars-16.12.2.tar.xz"; }; }; ksudoku = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ksudoku-16.12.1.tar.xz"; - sha256 = "07h550yvv48xk8s8ppnhxr6lfv69qsfxghadybf4g777hyxl06dy"; - name = "ksudoku-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ksudoku-16.12.2.tar.xz"; + sha256 = "1nvk8l6n7sja19s2kazf6xhzqwi9mrjxvz5i0i9nmpwmksii6lbg"; + name = "ksudoku-16.12.2.tar.xz"; }; }; ksystemlog = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ksystemlog-16.12.1.tar.xz"; - sha256 = "0mjwqczvmncrf7hr19vdyyswnnfnvzqx18i7fqj7f15cg29yzh86"; - name = "ksystemlog-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ksystemlog-16.12.2.tar.xz"; + sha256 = "13q2h3yhlpjy8hiiz6vdx5xwniysbmz5agvvn28a469710601154"; + name = "ksystemlog-16.12.2.tar.xz"; }; }; kteatime = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kteatime-16.12.1.tar.xz"; - sha256 = "0dx74zz4mk3ckg51hyckwk5ff96jd95pdcpmywkyjzxqlqkyg5j0"; - name = "kteatime-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kteatime-16.12.2.tar.xz"; + sha256 = "0m163a11hp90rqf5170iqapmvn4ym6m2n42da2p1jgyim4877613"; + name = "kteatime-16.12.2.tar.xz"; }; }; ktimer = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ktimer-16.12.1.tar.xz"; - sha256 = "18va6sb4qcb54rgrxaa0s87bxh15ynvvz8vispb054h8mj5k469j"; - name = "ktimer-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ktimer-16.12.2.tar.xz"; + sha256 = "1l9xwfg3701h1f16ifh74c5hv7j7z0f332izcvfpiccps7gplhvz"; + name = "ktimer-16.12.2.tar.xz"; }; }; ktnef = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ktnef-16.12.1.tar.xz"; - sha256 = "18k9a36qn0fbfx797cb7ngg9xss7h4svl491inwg6l0s2ydwxf74"; - name = "ktnef-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ktnef-16.12.2.tar.xz"; + sha256 = "0id9shripwahgb258hgfpmxyg0z9x2dqpxgyrvb47d44rrcf9dxg"; + name = "ktnef-16.12.2.tar.xz"; }; }; ktouch = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ktouch-16.12.1.tar.xz"; - sha256 = "03q9l2s09gm1fgqkr4c71zyyrsrymikfh69z4yyba3azr15ayzy3"; - name = "ktouch-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ktouch-16.12.2.tar.xz"; + sha256 = "08c0g35ypsndh8pj1nbxn8gnzis10a5cxkz175x4asi5lcpw3kc1"; + name = "ktouch-16.12.2.tar.xz"; }; }; ktp-accounts-kcm = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ktp-accounts-kcm-16.12.1.tar.xz"; - sha256 = "1lmmy4pmr44x7kgwc72xn8sijbqgblqkxcr08qj8hrmpvzrc8nh0"; - name = "ktp-accounts-kcm-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ktp-accounts-kcm-16.12.2.tar.xz"; + sha256 = "1p3pqvkyhwcqcwgpyfghhii3d5shbfpm8i9vap8vc43clvj9sfah"; + name = "ktp-accounts-kcm-16.12.2.tar.xz"; }; }; ktp-approver = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ktp-approver-16.12.1.tar.xz"; - sha256 = "0nzpmylm58yx28lz1wx1c0ib19v980h6r0dylp2lx9h738jh0wq4"; - name = "ktp-approver-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ktp-approver-16.12.2.tar.xz"; + sha256 = "1ky4wg8qk4n2qyh5009zz6487pf31jb8w8zmjmck9fypc9rhzw2j"; + name = "ktp-approver-16.12.2.tar.xz"; }; }; ktp-auth-handler = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ktp-auth-handler-16.12.1.tar.xz"; - sha256 = "14b31mqy4n5ymm0adxlsi2aqlgdhzhhg5yq3smg13361dj0jxf70"; - name = "ktp-auth-handler-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ktp-auth-handler-16.12.2.tar.xz"; + sha256 = "05dvbq1q0fbznyj11wkg0ic8svgkqdq8i20xddkkx2jpwhpkmcnl"; + name = "ktp-auth-handler-16.12.2.tar.xz"; }; }; ktp-call-ui = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ktp-call-ui-16.12.1.tar.xz"; - sha256 = "00s81rh7zffry754yzqvxz6q9wcn0nb7v2z9xq4iav6spl7b35c3"; - name = "ktp-call-ui-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ktp-call-ui-16.12.2.tar.xz"; + sha256 = "1czm56vvbjbyyib2wi60f9s2icnyac007zzh2qxsxfnlp52mkzm2"; + name = "ktp-call-ui-16.12.2.tar.xz"; }; }; ktp-common-internals = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ktp-common-internals-16.12.1.tar.xz"; - sha256 = "083hbvdd8xzlvdgldvxc45a8jq78k4dsz2idz9ljj7x5naizmkjx"; - name = "ktp-common-internals-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ktp-common-internals-16.12.2.tar.xz"; + sha256 = "0323dhfiddq5yhbp0rpmpw60334z41f45ml8lcada8dv6mbjxlc6"; + name = "ktp-common-internals-16.12.2.tar.xz"; }; }; ktp-contact-list = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ktp-contact-list-16.12.1.tar.xz"; - sha256 = "0qddi195ayq63nji7cppqxxq2jifflfxr8zskd6shr720invkdm3"; - name = "ktp-contact-list-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ktp-contact-list-16.12.2.tar.xz"; + sha256 = "0gk0lims3ypjsir9k9a010kylnqzqb2dsh5yfv24a6fb1ix6q4yy"; + name = "ktp-contact-list-16.12.2.tar.xz"; }; }; ktp-contact-runner = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ktp-contact-runner-16.12.1.tar.xz"; - sha256 = "10f2cygyjchydd35rx1daimlfkab4wijahp0vznjc46k332znl37"; - name = "ktp-contact-runner-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ktp-contact-runner-16.12.2.tar.xz"; + sha256 = "1bfm4639jshw9ncchcj6m8q6xg49a20z4fzc66vrjkdbha8fwr0g"; + name = "ktp-contact-runner-16.12.2.tar.xz"; }; }; ktp-desktop-applets = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ktp-desktop-applets-16.12.1.tar.xz"; - sha256 = "109aq8dgf9gig4dvb5n2khcslnyhfcfrl95b3h0dkbfiz6xlxhby"; - name = "ktp-desktop-applets-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ktp-desktop-applets-16.12.2.tar.xz"; + sha256 = "1ahm69h309dyg3byv3jxxm3j0c5jphzxng2g87hvjs9dvgx00msv"; + name = "ktp-desktop-applets-16.12.2.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ktp-filetransfer-handler-16.12.1.tar.xz"; - sha256 = "1qwhqyn2v0axn7rdlm5ckkjybfhmysz8612akd499yp8jyvgm046"; - name = "ktp-filetransfer-handler-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ktp-filetransfer-handler-16.12.2.tar.xz"; + sha256 = "1j1bmrwabh0mzm51ibb0qyf164g7hznjk2vm2kwkgk5sy8r1a363"; + name = "ktp-filetransfer-handler-16.12.2.tar.xz"; }; }; ktp-kded-module = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ktp-kded-module-16.12.1.tar.xz"; - sha256 = "173a3pdrlsl7vv8xxxckfn7y0vi2ndbds2vzm2ir4crxcl5mm3cm"; - name = "ktp-kded-module-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ktp-kded-module-16.12.2.tar.xz"; + sha256 = "1ia62r55my8s6l3am22z6nkvmi2x2gnpbwmmpiv8n2i7j2ysdjp9"; + name = "ktp-kded-module-16.12.2.tar.xz"; }; }; ktp-send-file = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ktp-send-file-16.12.1.tar.xz"; - sha256 = "0makfaalzidnqm4gk3kd2qnchjy15xcqprbjs9908jvixk3nfj1c"; - name = "ktp-send-file-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ktp-send-file-16.12.2.tar.xz"; + sha256 = "0vl00bbnpddq9nczb53apf3sdr1r2hnpa3fa390yx3jrrr4hp3k0"; + name = "ktp-send-file-16.12.2.tar.xz"; }; }; ktp-text-ui = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ktp-text-ui-16.12.1.tar.xz"; - sha256 = "16lwsy4fjxc77pg2gsjsmj7fhbrsjcgpiv0yx6a6nh2mz69zw3ml"; - name = "ktp-text-ui-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ktp-text-ui-16.12.2.tar.xz"; + sha256 = "0c0khkargj4hg2j1va72hp45b3dzwvkvbssq7k309iljxgfi9qry"; + name = "ktp-text-ui-16.12.2.tar.xz"; }; }; ktuberling = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/ktuberling-16.12.1.tar.xz"; - sha256 = "1g1sbvnizs5cp80jyn1liizd8lj3jl38nysgii8fzdfpqmspwx35"; - name = "ktuberling-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/ktuberling-16.12.2.tar.xz"; + sha256 = "0867ci5bi0phcwwxlqlyn3w1pv5q5wvzyqnzjvywc0bzy2qbpp0p"; + name = "ktuberling-16.12.2.tar.xz"; }; }; kturtle = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kturtle-16.12.1.tar.xz"; - sha256 = "0q1qq2a9308y85b9lk44k109gfi9cmzrkaqd8darp3alwaqbaphr"; - name = "kturtle-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kturtle-16.12.2.tar.xz"; + sha256 = "183glhn0amkcrzylax9cjyj3if9iz3dybmw55ljw003mf1s0sydq"; + name = "kturtle-16.12.2.tar.xz"; }; }; kubrick = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kubrick-16.12.1.tar.xz"; - sha256 = "01q3rswfn5r32r2ssq6xmhym158x4pwb7l76xw0h096s4swwri2k"; - name = "kubrick-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kubrick-16.12.2.tar.xz"; + sha256 = "10yakz1ffdx33sqgqmlga525r3cnz90m0rm5m2sl3b97ib7r0fxl"; + name = "kubrick-16.12.2.tar.xz"; }; }; kwalletmanager = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kwalletmanager-16.12.1.tar.xz"; - sha256 = "16kjgqrv9w9il9kla5swywqbc3qrijiz1ii49bjhn1vsa4g1f9n1"; - name = "kwalletmanager-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kwalletmanager-16.12.2.tar.xz"; + sha256 = "129q3c805g4jsrws3gvy751y4pdwp9m8yvlc62pkp703xwlnkzj4"; + name = "kwalletmanager-16.12.2.tar.xz"; }; }; kwave = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kwave-16.12.1.tar.xz"; - sha256 = "1sr19gjr7m3f140vl2lqp6ms8j6vz1djdnkh1ggs7chr2aws52p2"; - name = "kwave-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kwave-16.12.2.tar.xz"; + sha256 = "0g3n0fm3pyp6sd28qjpadpqs2kqd5gsbicdz1c5jkm8c1bypi0ij"; + name = "kwave-16.12.2.tar.xz"; }; }; kwordquiz = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/kwordquiz-16.12.1.tar.xz"; - sha256 = "14sa1gjswp9y9kzxk5qfg3df8n9527zkspdz2v9phf9n0jdl9wqw"; - name = "kwordquiz-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/kwordquiz-16.12.2.tar.xz"; + sha256 = "1jy9833zrgaddzpfaaps2gcxjnf9mg2yx4w7mfpa3vglsyvhqlzx"; + name = "kwordquiz-16.12.2.tar.xz"; }; }; libgravatar = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/libgravatar-16.12.1.tar.xz"; - sha256 = "1j53kqa9ypv3igcllr1a9z7pvg1ax3lk957l2i7bb0kwjqhvlqkb"; - name = "libgravatar-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/libgravatar-16.12.2.tar.xz"; + sha256 = "0vdryr9q30jkk5b9fa75yiqpspj83wvcy2zry8rsrx7pj21cdlsw"; + name = "libgravatar-16.12.2.tar.xz"; }; }; libkcddb = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/libkcddb-16.12.1.tar.xz"; - sha256 = "16429hxxq1kw9gv61sljy96y4zxyq5qgs3hvq1n73rq7vwl4bgl3"; - name = "libkcddb-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/libkcddb-16.12.2.tar.xz"; + sha256 = "0gs0zyisrgbzbcnwp95qi8msj5x2ysmqk9nwja3bwqzbangm0y82"; + name = "libkcddb-16.12.2.tar.xz"; }; }; libkcompactdisc = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/libkcompactdisc-16.12.1.tar.xz"; - sha256 = "0s4107aa4qrzrh4xi3p4j40alx9nynckawjhyh42c0yz2cgzdvbg"; - name = "libkcompactdisc-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/libkcompactdisc-16.12.2.tar.xz"; + sha256 = "1ydhfi3hp30zg9nlmnzd5pslwlq6v6jbim2jda8ciyvniw0pm6va"; + name = "libkcompactdisc-16.12.2.tar.xz"; }; }; libkdcraw = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/libkdcraw-16.12.1.tar.xz"; - sha256 = "09vrj7ds257f699782vgp4pvanirkbacar5w2aiy89s5c88wcf3p"; - name = "libkdcraw-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/libkdcraw-16.12.2.tar.xz"; + sha256 = "0w54h8fa1hgyvqps936annb8dhbrpizv4ifcix0gq714p573l8w3"; + name = "libkdcraw-16.12.2.tar.xz"; }; }; libkdegames = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/libkdegames-16.12.1.tar.xz"; - sha256 = "0a511clm36dvlvqzarf2sppp5mmr3jqzbvq3873fwyyjhk17n9si"; - name = "libkdegames-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/libkdegames-16.12.2.tar.xz"; + sha256 = "0lw6v81pr4xq5h58mgkbzlvp5bxic9szfmabgd3nrdijh6mla4ly"; + name = "libkdegames-16.12.2.tar.xz"; }; }; libkdepim = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/libkdepim-16.12.1.tar.xz"; - sha256 = "04l073xl6wdzslvnlpg4jxg74bc5jnqij4gk9cw6zm93fxcs61kh"; - name = "libkdepim-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/libkdepim-16.12.2.tar.xz"; + sha256 = "1xblfj2i205jsm6nl05r3jis4gb4d15naq2mmfgxwy913pjh74jf"; + name = "libkdepim-16.12.2.tar.xz"; }; }; libkeduvocdocument = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/libkeduvocdocument-16.12.1.tar.xz"; - sha256 = "1s3qbv67vzqvwaym9ac1izpfffp1gvc9crydg1hwgpfxccgnk0sf"; - name = "libkeduvocdocument-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/libkeduvocdocument-16.12.2.tar.xz"; + sha256 = "118z200ffqb2rj6yhmqp4b998cq6mlbpzn2gh2pdp70yin9w35qz"; + name = "libkeduvocdocument-16.12.2.tar.xz"; }; }; libkexiv2 = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/libkexiv2-16.12.1.tar.xz"; - sha256 = "0mnw9ck144x1b2bhjs0llx4kx95z2y1qrblzrvjaydg7f4q5h3qd"; - name = "libkexiv2-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/libkexiv2-16.12.2.tar.xz"; + sha256 = "1bpk2mwiplk7c5xrdx7nq9fa0g53sgx6f5xa7d4k2i9mzn2s8hyr"; + name = "libkexiv2-16.12.2.tar.xz"; }; }; libkface = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/libkface-16.12.1.tar.xz"; - sha256 = "0pmwxrd1afgmj2bhqnk903kq20mzfji3wnzrlv5xyc8jd7w5f7s8"; - name = "libkface-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/libkface-16.12.2.tar.xz"; + sha256 = "0jhnx71bnn2f8x5w5iylkk7369fcbx0y793182vc5rdqaax983sc"; + name = "libkface-16.12.2.tar.xz"; }; }; libkgeomap = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/libkgeomap-16.12.1.tar.xz"; - sha256 = "0phqx125n1nklk9v3bnhnfr13b7qylga0zwvb9hajq6g67frsh95"; - name = "libkgeomap-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/libkgeomap-16.12.2.tar.xz"; + sha256 = "1skmmg3hppzj923nl90r7v26k4fii7h3sr6yxzzvzaakwbil7d9q"; + name = "libkgeomap-16.12.2.tar.xz"; }; }; libkipi = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/libkipi-16.12.1.tar.xz"; - sha256 = "137r2kympkqf06a9w1a174krinra63yknnphprygaxxr6dbrh3a4"; - name = "libkipi-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/libkipi-16.12.2.tar.xz"; + sha256 = "0g1yyd5lhvwwa7q4in1p3q4mwlpp00lbir1a25wanlr6hqr2247w"; + name = "libkipi-16.12.2.tar.xz"; }; }; libkleo = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/libkleo-16.12.1.tar.xz"; - sha256 = "0cziv4pwippcikj4nlsdgz5nkrb7kimap0nyldvq8rzhi6s7dy4r"; - name = "libkleo-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/libkleo-16.12.2.tar.xz"; + sha256 = "031lfrn48xzi0kxkvg9597nxzharv0s0nxlkbdcr4xx8d8iga2l0"; + name = "libkleo-16.12.2.tar.xz"; }; }; libkmahjongg = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/libkmahjongg-16.12.1.tar.xz"; - sha256 = "0crbkxaym2z9p76v3bya414xcpn6h52nbp5902fa4l67a3z1k736"; - name = "libkmahjongg-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/libkmahjongg-16.12.2.tar.xz"; + sha256 = "0imj2xv6qcf00dx53h37yq84cqrg806qjfmm836hw6wicw24117f"; + name = "libkmahjongg-16.12.2.tar.xz"; }; }; libkomparediff2 = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/libkomparediff2-16.12.1.tar.xz"; - sha256 = "1garymnwcnwrlcpxz9dyh9spqgx91z8cznrxirw22cgz5n6mn1ld"; - name = "libkomparediff2-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/libkomparediff2-16.12.2.tar.xz"; + sha256 = "02d3bd7miq1nq81z6b4c8c64wjj2z9shr8y0rd0yqlzmf8ma05p2"; + name = "libkomparediff2-16.12.2.tar.xz"; }; }; libksane = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/libksane-16.12.1.tar.xz"; - sha256 = "0p133qfrd5pmsifmq8064wrw49vrrn27d6543nrg88x9l2d7hi53"; - name = "libksane-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/libksane-16.12.2.tar.xz"; + sha256 = "0p215qc56ma4laajmql72f8bngi2x88nk1q8ysq0wviadgack885"; + name = "libksane-16.12.2.tar.xz"; }; }; libksieve = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/libksieve-16.12.1.tar.xz"; - sha256 = "1qbnd2pwbb39nkdc6v4mrmyiva333b0l2h0x57cxsjw5zbcpx467"; - name = "libksieve-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/libksieve-16.12.2.tar.xz"; + sha256 = "1bzd8lfz0d9gnq6kh8k9wrcfbc61mdigy2madn7ywpxpcjp4rp3v"; + name = "libksieve-16.12.2.tar.xz"; }; }; lokalize = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/lokalize-16.12.1.tar.xz"; - sha256 = "1cf3zs81p6fqi6dgn12bskldydwm0yqbfvkjqh5h41qzlfky1j7s"; - name = "lokalize-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/lokalize-16.12.2.tar.xz"; + sha256 = "03cr89skhwbzq4h6fr78iaziplahpr4i7fvsf8395w6yiwsvcnyk"; + name = "lokalize-16.12.2.tar.xz"; }; }; lskat = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/lskat-16.12.1.tar.xz"; - sha256 = "0ldyw445cqgb2bf6ymcpwcrizypldghh611ihr6sa1l1x16238v2"; - name = "lskat-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/lskat-16.12.2.tar.xz"; + sha256 = "1jz7bjzw5msz5nyjvr21n3c355598afdnnqc6xzfl9zjkfgx4q9w"; + name = "lskat-16.12.2.tar.xz"; }; }; mailcommon = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/mailcommon-16.12.1.tar.xz"; - sha256 = "18mm2fmyvqs6rlxdgi2fh1vj4b3jjs6vf2jsy4dimw4ghgbag0m2"; - name = "mailcommon-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/mailcommon-16.12.2.tar.xz"; + sha256 = "0b9qawglc42y4wd98xaaiqdz7586wabj9zabs3dvk9vs10qpb9p0"; + name = "mailcommon-16.12.2.tar.xz"; }; }; mailimporter = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/mailimporter-16.12.1.tar.xz"; - sha256 = "0ivgyl3bz2vcn6vwshcbxlydlxcsxqhkxzfy9rc690asvn9152cg"; - name = "mailimporter-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/mailimporter-16.12.2.tar.xz"; + sha256 = "0dvnqqmmxdca7wmsajhzdxgz1k07dfbac0z1paww4d2inr164b8q"; + name = "mailimporter-16.12.2.tar.xz"; }; }; marble = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/marble-16.12.1.tar.xz"; - sha256 = "1hv2qpikskx7n4myfvfh403cjcsrxdd24955743mlnsikbq3rj0s"; - name = "marble-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/marble-16.12.2.tar.xz"; + sha256 = "0p7ka2hl0f9ghpmyh124p57dy1ynhw0dszihg4rbbrjfjj65vig0"; + name = "marble-16.12.2.tar.xz"; }; }; mbox-importer = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/mbox-importer-16.12.1.tar.xz"; - sha256 = "0jpxrwl3v8fkpx5blbagm1ls9h1j9bd7ac7pm78ihavvm4n4piw6"; - name = "mbox-importer-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/mbox-importer-16.12.2.tar.xz"; + sha256 = "00q7x30bl1fwfgwvqmgbspp74bmjm40d30rykq052v1cp6n0c060"; + name = "mbox-importer-16.12.2.tar.xz"; }; }; messagelib = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/messagelib-16.12.1.tar.xz"; - sha256 = "054hjrm3z8mslkl5j05ik30bwbn95rrbbrnc5b6jmi937ks57z56"; - name = "messagelib-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/messagelib-16.12.2.tar.xz"; + sha256 = "0b65248mc6qamj1wcpv73v1ywda9gk2s2y20vjf35lmv5xi4cz88"; + name = "messagelib-16.12.2.tar.xz"; }; }; minuet = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/minuet-16.12.1.tar.xz"; - sha256 = "07jl0n0w34wbnzxwjj6zainkw3gyzkk99p7c21hqkhmiivbk3rab"; - name = "minuet-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/minuet-16.12.2.tar.xz"; + sha256 = "1sv9b1lq2dyvlwq0bmmnxak60nz83wbwnw1d8w3n5xadssarbr1s"; + name = "minuet-16.12.2.tar.xz"; }; }; okteta = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/okteta-16.12.1.tar.xz"; - sha256 = "08zygqhrz7i1dvb2i6dqpn9zmyr43y2rkdjl43rwlgcj59hd0xvc"; - name = "okteta-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/okteta-16.12.2.tar.xz"; + sha256 = "1xq1bjpy7g8qn9d7dfgy00kf5bdcpvj1489b65yrlmyi382m5k7s"; + name = "okteta-16.12.2.tar.xz"; }; }; okular = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/okular-16.12.1.tar.xz"; - sha256 = "134afacy3d9hjq2avzp8d0fp3vwlaaxcvf4b65wvkds2zhggi8w3"; - name = "okular-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/okular-16.12.2.tar.xz"; + sha256 = "020z6wlycip067j398lznqcspi3b6dx1zds9ibhxw9zzh3ms92kc"; + name = "okular-16.12.2.tar.xz"; }; }; palapeli = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/palapeli-16.12.1.tar.xz"; - sha256 = "1kpca4l45c9ydhls1sqqlhca7wv2d0xf33wxa5dmgriivn0s0qym"; - name = "palapeli-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/palapeli-16.12.2.tar.xz"; + sha256 = "1vkkq9r9r85x46xx91gqyhpagx1xscrvlkx4knd72rcxfygipzf9"; + name = "palapeli-16.12.2.tar.xz"; }; }; parley = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/parley-16.12.1.tar.xz"; - sha256 = "0jxzz9dg3bb1pk8rrfqvjf5aww361wkaiz4xvsfc6vj4333kgzid"; - name = "parley-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/parley-16.12.2.tar.xz"; + sha256 = "0fvkhph41y5ig3nwmb4zfh8n3sip52r5al3vn4yll2ndkbwdkgjb"; + name = "parley-16.12.2.tar.xz"; }; }; picmi = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/picmi-16.12.1.tar.xz"; - sha256 = "0l9y4h9q032vqham0nlci9kcp143rdaaz9rhwwh0i7mw5p98xg5r"; - name = "picmi-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/picmi-16.12.2.tar.xz"; + sha256 = "0j0jhvw8b18sskvd32snk4g7xpjk3kqfw9kpvfri0qayrshcxk2c"; + name = "picmi-16.12.2.tar.xz"; }; }; pimcommon = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/pimcommon-16.12.1.tar.xz"; - sha256 = "0hk0p5x78mcxv07x4jpx2d6dh2wxxiqp79vma37g90zlh8p28323"; - name = "pimcommon-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/pimcommon-16.12.2.tar.xz"; + sha256 = "1c4h1g6hpa7hw3ka2r561q813if031vriz646skin840jwdhnv7m"; + name = "pimcommon-16.12.2.tar.xz"; }; }; pim-data-exporter = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/pim-data-exporter-16.12.1.tar.xz"; - sha256 = "0qx156jg03xpl62rxsm5lma0z7pr6nrsq5912d6kx1w7zxwizjln"; - name = "pim-data-exporter-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/pim-data-exporter-16.12.2.tar.xz"; + sha256 = "14gkkyvcwa7q1yq6qhswq4ch9gcp1ddpjyf46d0550z1rkpws28m"; + name = "pim-data-exporter-16.12.2.tar.xz"; }; }; pim-sieve-editor = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/pim-sieve-editor-16.12.1.tar.xz"; - sha256 = "02km83p4h39bl8zm5lf7qypqq6qs1cl0b9ncr0c68b0kd05pfms3"; - name = "pim-sieve-editor-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/pim-sieve-editor-16.12.2.tar.xz"; + sha256 = "03a3imm5zs4p6zlp3m0pdc22cii26cnkgl1s1059lhmd3g3dhl85"; + name = "pim-sieve-editor-16.12.2.tar.xz"; }; }; pim-storage-service-manager = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/pim-storage-service-manager-16.12.1.tar.xz"; - sha256 = "19mfxxpvx5lz0067ssdmw0xdmznl7jak4rapkawvfwkbk0vsfpd3"; - name = "pim-storage-service-manager-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/pim-storage-service-manager-16.12.2.tar.xz"; + sha256 = "1kcbrg9h3c5khyabs5n6adqljj60vks7npb8iy649y0rx2qc2fn9"; + name = "pim-storage-service-manager-16.12.2.tar.xz"; }; }; poxml = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/poxml-16.12.1.tar.xz"; - sha256 = "19g964bb96z86ynx7zi3chg1pksvcyrv41qz5qnhlj258a3b9g4m"; - name = "poxml-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/poxml-16.12.2.tar.xz"; + sha256 = "17sv19rg1d65h6ks11k7f8zx6yliyhk1j2fxnc81l8md1flarfm0"; + name = "poxml-16.12.2.tar.xz"; }; }; print-manager = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/print-manager-16.12.1.tar.xz"; - sha256 = "1vwsd71y3r6w9gix6d5n06j0yv4rw9qgzz1d4nb8axlnmwdnkzy6"; - name = "print-manager-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/print-manager-16.12.2.tar.xz"; + sha256 = "1amhl13n7i5z1jfhyrhvigk0bhh9myag7kk83bqkxffsx0lzzwbw"; + name = "print-manager-16.12.2.tar.xz"; }; }; rocs = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/rocs-16.12.1.tar.xz"; - sha256 = "0xkkd3hwrnv52074q53wx5agdc75arm2pg80k2ck7vnxl3mpp997"; - name = "rocs-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/rocs-16.12.2.tar.xz"; + sha256 = "1gd0wdvp3c4s8br23fqqa0cp2vwfjp3xqkj1y3xf6pzv01sk7n7g"; + name = "rocs-16.12.2.tar.xz"; }; }; signon-kwallet-extension = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/signon-kwallet-extension-16.12.1.tar.xz"; - sha256 = "1xfmwz3h7acdkj61zq9rwz654lf8z9wfhzlmr1ss530c94isfpjb"; - name = "signon-kwallet-extension-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/signon-kwallet-extension-16.12.2.tar.xz"; + sha256 = "187xjbjw9a34p9cjjhijmwg8n7m83qikxa5q8nsffd48pl7pag2i"; + name = "signon-kwallet-extension-16.12.2.tar.xz"; }; }; spectacle = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/spectacle-16.12.1.tar.xz"; - sha256 = "1pmpmfzch9d8iapjpgyzy77d9a8zjhafkw52x9mqj0r8ym0kgq2p"; - name = "spectacle-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/spectacle-16.12.2.tar.xz"; + sha256 = "1snz8kgnwm2cbfa6y9awb3d0markfmmbgkjs1k0xs938mqam4507"; + name = "spectacle-16.12.2.tar.xz"; }; }; step = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/step-16.12.1.tar.xz"; - sha256 = "0ks8mzw9wmp57pkz3mbpnlpa2vsvdhngvj0i2pyvhwzmclifgm03"; - name = "step-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/step-16.12.2.tar.xz"; + sha256 = "0ghr054c644hvay0k4xsahrl8bwnd9w8yqq3slrdblhs7z3c7iqk"; + name = "step-16.12.2.tar.xz"; }; }; svgpart = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/svgpart-16.12.1.tar.xz"; - sha256 = "0m84z6jm52mvsbb6khajxp8cp52bhyix8s2ssc3j86dhi0n7imbi"; - name = "svgpart-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/svgpart-16.12.2.tar.xz"; + sha256 = "0z9a7654f3n5870d02zm8a9dpymc3jxgmf79wavsp8jjr8sdgy6g"; + name = "svgpart-16.12.2.tar.xz"; }; }; sweeper = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/sweeper-16.12.1.tar.xz"; - sha256 = "0ds7w70zhnqmyq0b5703sjw3airmfby21vfjl69nqqmsncf8snb4"; - name = "sweeper-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/sweeper-16.12.2.tar.xz"; + sha256 = "0g0iw89l27v4ivqzsrv9j1q4dgihk80nvgf2cfagadfd50hmifr4"; + name = "sweeper-16.12.2.tar.xz"; }; }; syndication = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/syndication-16.12.1.tar.xz"; - sha256 = "1l1klni18xlgfjlhwc3gdzpkj5gfcmwzwv6f6q731xkjay7rdlqh"; - name = "syndication-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/syndication-16.12.2.tar.xz"; + sha256 = "0vgpbr46ibyb097pbqmvpl934d4zwz3gb0fkyc23gwpxq1fgsizp"; + name = "syndication-16.12.2.tar.xz"; }; }; umbrello = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/umbrello-16.12.1.tar.xz"; - sha256 = "1f8bsf60y5s5ms9ypgd0865is5xf8fjhsfrp7dg8hi15nmd69k9c"; - name = "umbrello-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/umbrello-16.12.2.tar.xz"; + sha256 = "1g4856mvj9vzm3k86nqm9sfynall1wcj3mvnc80jji7aazmpkl6z"; + name = "umbrello-16.12.2.tar.xz"; }; }; zeroconf-ioslave = { - version = "16.12.1"; + version = "16.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.1/src/zeroconf-ioslave-16.12.1.tar.xz"; - sha256 = "1r6ls8hsahgbqvailwaz2qwk3m3z3mfwav8g2rwdqk7s3p2fp1cx"; - name = "zeroconf-ioslave-16.12.1.tar.xz"; + url = "${mirror}/stable/applications/16.12.2/src/zeroconf-ioslave-16.12.2.tar.xz"; + sha256 = "1wqiakgc82zylvssxrm2askw6rjw89x85dws7q9zw13hdpvh12ss"; + name = "zeroconf-ioslave-16.12.2.tar.xz"; }; }; } diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix index 36850824d63..3ac1c51848e 100644 --- a/pkgs/desktops/kde-5/plasma/default.nix +++ b/pkgs/desktops/kde-5/plasma/default.nix @@ -1,11 +1,26 @@ /* +# New packages + +READ THIS FIRST + +This module is for official packages in KDE Plasma 5. All available packages are +listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see +below). + +IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. + +Many of the packages released upstream are not yet built in Nixpkgs due to lack +of demand. To add a Nixpkgs build for an upstream package, copy one of the +existing packages here and modify it as necessary. + # Updates -1. Update the URL in `maintainers/scripts/generate-kde-plasma.sh` and run - that script from the top of the Nixpkgs tree. -2. Check that the new packages build correctly. -3. Commit the changes and open a pull request. +1. Update the URL in `./fetch.sh`. +2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/plasma` + from the top of the Nixpkgs tree. +3. Invoke `nix-build -A kde5` and ensure that everything builds. +4. Commit the changes and open a pull request. */ diff --git a/pkgs/desktops/kde-5/plasma/khotkeys.nix b/pkgs/desktops/kde-5/plasma/khotkeys.nix index 760a2a4ee37..f23a17e5479 100644 --- a/pkgs/desktops/kde-5/plasma/khotkeys.nix +++ b/pkgs/desktops/kde-5/plasma/khotkeys.nix @@ -1,11 +1,20 @@ { plasmaPackage, ecm, kdoctools, kcmutils , kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui , plasma-framework, plasma-workspace, qtx11extras +, fetchpatch }: plasmaPackage { name = "khotkeys"; nativeBuildInputs = [ ecm kdoctools ]; + + patches = [ + # Patch is in 5.9 and up. + (fetchpatch { + url = "https://cgit.kde.org/khotkeys.git/patch/?id=f8f7eaaf41e2b95ebfa4b2e35c6ee252524a471b"; + sha256 = "1wxx3qv16jd623jh728xcda8i4y1daq25skwilhv4cfvqxyzk7nn"; + }) + ]; propagatedBuildInputs = [ kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace qtx11extras kcmutils kdbusaddons kxmlgui diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index dcacabc39c1..f593bd14437 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "lumina-${version}"; - version = "1.1.0-p1"; + version = "1.2.0-p1"; src = fetchFromGitHub { owner = "trueos"; repo = "lumina"; rev = "v${version}"; - sha256 = "1kkb6v6p6w5mx1qdmcrq3r674k9ahpc6wlsb9pi2lq8qk9yaid0m"; + sha256 = "0k16lcpxp9avwkadbbyqficd1wxsmwian5ji38wyax76v22yq7p6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index 06a0b5b8bff..b6b63e31615 100644 --- a/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2 }: stdenv.mkDerivation rec { - name = "lxappearance-0.6.2"; + name = "lxappearance-0.6.3"; src = fetchurl{ url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz"; - sha256 = "07r0xbi6504zjnbpan7zrn7gi4j0kbsqqfpj8v2x94gr05p16qj4"; + sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj"; }; nativeBuildInputs = [ pkgconfig intltool ]; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight program for configuring the theme and fonts of gtk applications"; + homepage = "http://lxde.org/"; maintainers = [ stdenv.lib.maintainers.hinton ]; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl2; - homepage = "http://lxde.org/"; }; } diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix index 99a372553a1..2ef1c7532a5 100644 --- a/pkgs/desktops/lxqt/optional/screengrab/default.nix +++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSG_USE_SYSTEM_QXT=ON" "-DCMAKE_INSTALL_LIBDIR=lib" ]; + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + meta = with stdenv.lib; { description = "Crossplatform tool for fast making screenshots"; homepage = https://github.com/lxde/screengrab; diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index dde8481b519..9a5d390f3b8 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -7,14 +7,14 @@ let inherit (stdenv.lib) optional; p_name = "xfce4-panel"; ver_maj = "4.12"; - ver_min = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1c4p3ckghvsad1sj5v8wmar5mh9cbhail9mmhad2f9pwwb10z4ih"; + sha256 = "1s52k80911pkp65zkxw9mrnczxsd81svr0djmmcfpjd9rj08pmck"; }; patches = [ ./xfce4-panel-datadir.patch ]; diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index 3696cb6ed88..edbc11b8605 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -2,14 +2,14 @@ let p_name = "xfconf"; ver_maj = "4.12"; - ver_min = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r"; + sha256 = "0dns190bwb615wy9ma2654sw4vz1d0rcv061zmaalkv9wmj8bx1m"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix index a9c4da810c1..ffda5b94e07 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-whiskermenu-plugin"; - version = "1.6.1"; + version = "1.6.2"; name = "${p_name}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "gottcode"; repo = "xfce4-whiskermenu-plugin"; rev = "v${version}"; - sha256 = "19hldrrgy7qmrncv5rfsclybycjp9rjfnslhm996h62d2p675qpc"; + sha256 = "0vfyav01hynjm7p73wwbwnn2l8l9a0hkz755wmjzr6qv06f9019d"; }; nativeBuildInputs = [ cmake pkgconfig intltool ]; diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index f783683cd4a..de2c6d40d40 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -26,6 +26,10 @@ let buildInputs = [ drv ]; }; + customPhases = filterAttrs + (_: v: v != null) + { inherit setupHook configurePhase buildPhase installPhase; }; + pkg = self: stdenv.mkDerivation (attrs // { name = "${name}-${version}"; @@ -41,37 +45,30 @@ let inherit src; - setupHook = if setupHook == null - then writeText "setupHook.sh" '' + setupHook = writeText "setupHook.sh" '' addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" - '' - else setupHook; + ''; postPatch = '' rm -f rebar rebar3 '' + postPatch; - configurePhase = if configurePhase == null - then '' + configurePhase = '' runHook preConfigure ${erlang}/bin/escript ${rebar3.bootstrapper} ${debugInfoFlag} runHook postConfigure - '' - else configurePhase; + ''; - buildPhase = if buildPhase == null - then '' + buildPhase = '' runHook preBuild HOME=. rebar3 compile ${if compilePorts then '' HOME=. rebar3 pc compile '' else ''''} runHook postBuild - '' - else installPhase; + ''; - installPhase = if installPhase == null - then '' + installPhase = '' runHook preInstall mkdir -p "$out/lib/erlang/lib/${name}-${version}" for reldir in src ebin priv include; do @@ -81,8 +78,7 @@ let success=1 done runHook postInstall - '' - else installPhase; + ''; meta = { inherit (erlang.meta) platforms; @@ -93,6 +89,6 @@ let env = shell self; inherit beamDeps; }; - }); + } // customPhases); in fix pkg diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix index 264e76d038c..f9e79226033 100644 --- a/pkgs/development/compilers/aspectj/default.nix +++ b/pkgs/development/compilers/aspectj/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, jre}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "aspectj-1.5.2"; builder = ./builder.sh; src = fetchurl { - url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/aspectj/aspectj-1.5.2.jar; - md5 = "64245d451549325147e3ca1ec4c9e57c"; + url = "http://archive.eclipse.org/tools/aspectj/${name}.jar"; + sha256 = "1b3mx248dc1xka1vgsl0jj4sm0nfjsqdcj9r9036mvixj1zj3nmh"; }; inherit jre; diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index f5554ee0ce3..20d4a430ac4 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace ./configure --replace pl2 pl3 substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' - ./configure -prefix $out -toolprefix ${tools}/bin/ '' + + ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' + (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux"); installTargets = "documentation install"; diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 7799cab76a6..558cfa35ada 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -2,8 +2,8 @@ , fetchFromGitHub , which , cmake -, clang_35 -, llvmPackages_36 +, clang +, llvmPackages , libunwind , gettext , openssl @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { buildInputs = [ which cmake - clang_35 - llvmPackages_36.llvm - llvmPackages_36.lldb + clang + llvmPackages.llvm + llvmPackages.lldb libunwind gettext openssl @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { configurePhase = '' # Prevent clang-3.5 (rather than just clang) from being selected as the compiler as that's # not wrapped - substituteInPlace src/pal/tools/gen-buildsys-clang.sh --replace "which \"clang-\$" "which \"clang-DoNotFindThisOne\$" + # substituteInPlace src/pal/tools/gen-buildsys-clang.sh --replace "which \"clang-\$" "which \"clang-DoNotFindThisOne\$" patchShebangs build.sh patchShebangs src/pal/tools/gen-buildsys-clang.sh @@ -67,7 +67,10 @@ stdenv.mkDerivation rec { BuildType = if debug then "Debug" else "Release"; hardeningDisable = [ "strictoverflow" "format" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=unused-result" "-Wno-error=delete-non-virtual-dtor" + "-Wno-error=null-dereference" + ]; buildPhase = '' ./build.sh $BuildArch $BuildType diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 7162f85e05d..6202a8e968b 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_39, makeWrapper }: stdenv.mkDerivation rec { - version = "0.20.4"; + version = "0.20.5"; name = "crystal-${version}-1"; arch = { @@ -14,15 +14,15 @@ stdenv.mkDerivation rec { url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-1-${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "cdc11c30235f8bd3b89e1fc13b56838f99d585715fb66563d6599026f5393e37"; - "i686-linux" = "93e7df2bea3220728987a49a2f93d1c615e2ccae63843e0259a5d891c53a0b80"; - "x86_64-darwin" = "3fd291a4a5c9eccdea933a9df25446c90d80660a17e89f83503fcb5b6deba03e"; + "x86_64-linux" = "fd077c0a727419e131b1be6198a5aa5820ecbdaafd2d2bb38be5716ba75b5100"; + "i686-linux" = "e3a890f11833c57c9004655d108f981c7c630cd7a939f828d9a6c571705bc3e7"; + "x86_64-darwin" = "79462c8ff994b36cff219c356967844a17e8cb2817bb24a196a960a08b8c9e47"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); }; src = fetchurl { url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz"; - sha256 = "fd099f278b71bbb5cad1927c93933d1feba554fbf8f6f4ab9165f535765f5e31"; + sha256 = "ee1e5948c6e662ccb1e62671cf2c91458775b559b23d74ab226dc2a2d23f7707"; }; # crystal on Darwin needs libiconv to build diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index f74815a3b95..927a1bcdf0b 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python26, python27, zlib +{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python27, zlib , xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc }: @@ -85,13 +85,6 @@ let in { - cudatoolkit5 = common { - version = "5.5.22"; - url = http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_5.5.22_linux_64.run; - sha256 = "b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4"; - python = python26; - }; - cudatoolkit6 = common { version = "6.0.37"; url = http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index a0def65d531..e6f990113cc 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -544,7 +544,7 @@ stdenv.mkDerivation ({ } # Strip kills static libs of other archs (hence cross != null) -// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } +// optionalAttrs (!stripped || cross != null) { dontStrip = true; } // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 4b53bc35599..eb03148a4b8 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -551,7 +551,7 @@ stdenv.mkDerivation ({ } # Strip kills static libs of other archs (hence cross != null) -// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } +// optionalAttrs (!stripped || cross != null) { dontStrip = true; } // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 3d75c0e76da..1721eba325b 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -547,7 +547,7 @@ stdenv.mkDerivation ({ } # Strip kills static libs of other archs (hence cross != null) -// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } +// optionalAttrs (!stripped || cross != null) { dontStrip = true; } // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 3edfb177b11..c6fac16a76c 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -545,7 +545,7 @@ stdenv.mkDerivation ({ } # Strip kills static libs of other archs (hence cross != null) -// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } +// optionalAttrs (!stripped || cross != null) { dontStrip = true; } // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix index e384a42a51f..521afbd88b4 100644 --- a/pkgs/development/compilers/ghc/7.10.2.nix +++ b/pkgs/development/compilers/ghc/7.10.2.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils +{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour + + # If enabled GHC will be build with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. +, enableIntegerSimple ? false, gmp }: let inherit (bootPkgs) ghc; buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" ${stdenv.lib.optionalString stdenv.isDarwin '' libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" ''} - ''; + '' + (if enableIntegerSimple then '' + INTEGER_LIBRARY=integer-simple + '' else '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" + ''); in @@ -46,8 +53,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" "--datadir=$doc/share/doc/ghc" + ] ++ stdenv.lib.optional (! enableIntegerSimple) [ + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" ]; # required, because otherwise all symbols from HSffi.o are stripped, and diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 020e4fd30cf..d75f5df370f 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -1,5 +1,9 @@ -{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils +{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour + + # If enabled GHC will be build with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. +, enableIntegerSimple ? false, gmp }: let @@ -38,13 +42,16 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" '' + stdenv.lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString enableIntegerSimple '' + echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk ''; configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" "--datadir=$doc/share/doc/ghc" + ] ++ stdenv.lib.optional (! enableIntegerSimple) [ + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ]; diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index 31cac49135f..b3f672a8ef5 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }: +{ stdenv, fetchurl, ghc, perl, ncurses, libiconv + + # If enabled GHC will be build with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. +, enableIntegerSimple ? false, gmp +}: stdenv.mkDerivation rec { version = "7.2.2"; @@ -11,18 +16,22 @@ stdenv.mkDerivation rec { patches = [ ./fix-7.2.2-clang.patch ./relocation.patch ]; - buildInputs = [ ghc perl gmp ncurses ]; + buildInputs = [ ghc perl ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp; buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" ${stdenv.lib.optionalString stdenv.isDarwin '' libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" ''} - ''; + '' + (if enableIntegerSimple then '' + INTEGER_LIBRARY=integer-simple + '' else '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" + ''); preConfigure = '' echo "${buildMK}" > mk/build.mk diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index 63ce7ddfacc..08b4f6f5471 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }: +{ stdenv, fetchurl, ghc, perl, ncurses, libiconv + + # If enabled GHC will be build with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. +, enableIntegerSimple ? false, gmp +}: stdenv.mkDerivation rec { version = "7.4.2"; @@ -12,18 +17,22 @@ stdenv.mkDerivation rec { patches = [ ./fix-7.4.2-clang.patch ./relocation.patch ]; - buildInputs = [ ghc perl gmp ncurses ]; + buildInputs = [ ghc perl ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp; buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" ${stdenv.lib.optionalString stdenv.isDarwin '' libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" ''} - ''; + '' + (if enableIntegerSimple then '' + INTEGER_LIBRARY=integer-simple + '' else '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" + ''); preConfigure = '' echo "${buildMK}" > mk/build.mk diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index 5a933a23aa8..bdc0a20d3b4 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, ghc, perl, gmp, ncurses, binutils, libiconv }: +{ stdenv, fetchurl, ghc, perl, ncurses, binutils, libiconv + + # If enabled GHC will be build with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. +, enableIntegerSimple ? false, gmp +}: let # The "-Wa,--noexecstack" options might be needed only with GNU ld (as opposed @@ -19,11 +24,10 @@ in stdenv.mkDerivation rec { patches = [ ./fix-7.6.3-clang.patch ./relocation.patch ]; - buildInputs = [ ghc perl gmp ncurses ]; + buildInputs = [ ghc perl ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp; buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" ${stdenv.lib.optionalString stdenv.isDarwin '' @@ -34,7 +38,12 @@ in stdenv.mkDerivation rec { # Set ghcFlags for building ghc itself SRC_HC_OPTS += ${ghcFlags} SRC_CC_OPTS += ${cFlags} - ''; + '' + (if enableIntegerSimple then '' + INTEGER_LIBRARY=integer-simple + '' else '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" + ''); preConfigure = '' echo "${buildMK}" > mk/build.mk diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix index f631ad92356..986ec98c6b3 100644 --- a/pkgs/development/compilers/ghc/7.8.3.nix +++ b/pkgs/development/compilers/ghc/7.8.3.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }: +{ stdenv, fetchurl, ghc, perl, ncurses, libiconv + + # If enabled GHC will be build with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. +, enableIntegerSimple ? false, gmp +}: stdenv.mkDerivation rec { version = "7.8.3"; @@ -11,13 +16,12 @@ stdenv.mkDerivation rec { patches = [ ./relocation.patch ]; - buildInputs = [ ghc perl gmp ncurses ]; + buildInputs = [ ghc perl ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp; enableParallelBuilding = true; buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" DYNAMIC_BY_DEFAULT = NO @@ -25,7 +29,12 @@ stdenv.mkDerivation rec { libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" ''} - ''; + '' + (if enableIntegerSimple then '' + INTEGER_LIBRARY=integer-simple + '' else '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" + ''); preConfigure = '' echo "${buildMK}" > mk/build.mk diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index f41a1cf7d98..057b9f70fc7 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }: +{ stdenv, fetchurl, ghc, perl, ncurses, libiconv + + # If enabled GHC will be build with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. +, enableIntegerSimple ? false, gmp +}: stdenv.mkDerivation (rec { version = "7.8.4"; @@ -11,13 +16,12 @@ stdenv.mkDerivation (rec { patches = [ ./relocation.patch ]; - buildInputs = [ ghc perl gmp ncurses ]; + buildInputs = [ ghc perl ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp; enableParallelBuilding = true; buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" DYNAMIC_BY_DEFAULT = NO @@ -25,7 +29,12 @@ stdenv.mkDerivation (rec { libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" ''} - ''; + '' + (if enableIntegerSimple then '' + INTEGER_LIBRARY=integer-simple + '' else '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" + ''); preConfigure = '' echo "${buildMK}" > mk/build.mk diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index 1834f3ae50b..ae6edb739c9 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -1,5 +1,9 @@ -{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils +{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils , hscolour, patchutils, sphinx + + # If enabled GHC will be build with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. +, enableIntegerSimple ? false, gmp }: let @@ -41,13 +45,16 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" '' + stdenv.lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString enableIntegerSimple '' + echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk ''; configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" "--datadir=$doc/share/doc/ghc" + ] ++ stdenv.lib.optional (! enableIntegerSimple) [ + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ]; diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 5979eba3e10..5f687aca63a 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -1,16 +1,13 @@ -{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils +{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils , hscolour, patchutils, sphinx + + # If enabled GHC will be build with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. +, enableIntegerSimple ? false, gmp }: let inherit (bootPkgs) ghc; - - fetchFilteredPatch = args: fetchurl (args // { - downloadToTemp = true; - postFetch = '' - ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out" - ''; # fix syntax highlighting: */ - }); in stdenv.mkDerivation rec { version = "8.0.2"; @@ -35,13 +32,16 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" '' + stdenv.lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString enableIntegerSimple '' + echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk ''; configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" "--datadir=$doc/share/doc/ghc" + ] ++ stdenv.lib.optional (! enableIntegerSimple) [ + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ]; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 971365eda48..0ca8e8c299e 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,10 @@ -{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils -, autoconf, automake, happy, alex, python3, crossSystem, selfPkgs, cross ? null +{ stdenv, fetchgit, bootPkgs, perl, ncurses, libiconv, binutils, coreutils +, autoconf, automake, happy, alex, python3, buildPlatform, targetPlatform +, selfPkgs, cross ? null + + # If enabled GHC will be build with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. +, enableIntegerSimple ? false, gmp }: let @@ -19,6 +24,8 @@ let export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" '' + stdenv.lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString enableIntegerSimple '' + echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk ''; in stdenv.mkDerivation (rec { inherit version rev; @@ -40,8 +47,9 @@ in stdenv.mkDerivation (rec { configureFlags = [ "CC=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optional (! enableIntegerSimple) [ + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ]; @@ -68,9 +76,9 @@ in stdenv.mkDerivation (rec { passthru = { inherit bootPkgs; - } // stdenv.lib.optionalAttrs (crossSystem != null) { + } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { crossCompiler = selfPkgs.ghc.override { - cross = crossSystem; + cross = targetPlatform; bootPkgs = selfPkgs; }; }; diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index b191f9655d2..1c347655ebe 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -10,8 +10,8 @@ bootPkgs.callPackage ./base.nix { ghcjsSrc = fetchFromGitHub { owner = "ghcjs"; repo = "ghcjs"; - rev = "899c834a36692bbbde9b9d16fe5b92ce55a623c4"; - sha256 = "024yj4k0dxy7nvyq19n3xbhh4b4csdrgj19a3l4bmm1zn84gmpl6"; + rev = "2dc14802e78d7d9dfa35395d5dbfc9c708fb83e6"; + sha256 = "0cvmapbrwg0h1pbz648isc2l84z694ylnfm8ncd1g4as28lmj0pz"; }; ghcjsBootSrc = fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index cd03c246624..d2384598456 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "glslang-git-${version}"; - version = "2016-08-26"; + version = "2016-12-21"; # `vulkan-loader` requires a specific version of `glslang` as specified in # `/glslang_revision`. src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "81cd764b5ffc475bc73f1fb35f75fd1171bb2343"; - sha256 = "1vfwl6lzkjh9nh29q32b7zca4q1abf3q4nqkahskijgznw5lr59g"; + rev = "807a0d9e2f4e176f75d62ac3c179c81800ec2608"; + sha256 = "02jckgihqhagm73glipb4c6ri5fr3pnbxb5vrznn2vppyfdfghbj"; }; patches = [ ./install-headers.patch ]; diff --git a/pkgs/development/compilers/glslang/install-headers.patch b/pkgs/development/compilers/glslang/install-headers.patch index 9ad6f5e1906..75f27130978 100644 --- a/pkgs/development/compilers/glslang/install-headers.patch +++ b/pkgs/development/compilers/glslang/install-headers.patch @@ -1,21 +1,30 @@ diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index 48a6c46..593d941 100755 +index c538e84..6ece1ab 100755 --- a/SPIRV/CMakeLists.txt +++ b/SPIRV/CMakeLists.txt -@@ -42,3 +42,8 @@ endif(WIN32) +@@ -34,8 +34,9 @@ if(ENABLE_AMD_EXTENSIONS) + endif(ENABLE_AMD_EXTENSIONS) + + if(ENABLE_NV_EXTENSIONS) +- set(HEADERS +- GLSL.ext.NV.h) ++ list(APPEND ++ HEADERS ++ GLSL.ext.NV.h) + endif(ENABLE_NV_EXTENSIONS) + + add_library(SPIRV STATIC ${SOURCES} ${HEADERS}) +@@ -51,3 +52,5 @@ endif(WIN32) install(TARGETS SPIRV SPVRemapper ARCHIVE DESTINATION lib) + -+foreach(file ${HEADERS} ${SPVREMAP_HEADERS}) -+ get_filename_component(dir ${file} DIRECTORY) -+ install(FILES ${file} DESTINATION include/SPIRV/${dir}) -+endforeach() ++install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION include/SPIRV/) diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index ff91135..4318279 100644 +index 95d4bdd..e7fda90 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt -@@ -90,3 +90,8 @@ endif(WIN32) +@@ -93,3 +93,8 @@ endif(WIN32) install(TARGETS glslang ARCHIVE DESTINATION lib) diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index eb4c64ed334..b703a92f3ea 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -77,6 +77,29 @@ stdenv.mkDerivation rec { # fails when running inside tmux sed -i '/TestNohup/areturn' src/os/signal/signal_test.go + # unix socket tests fail on darwin + sed -i '/TestConnAndListener/areturn' src/net/conn_test.go + sed -i '/TestPacketConn/areturn' src/net/conn_test.go + sed -i '/TestPacketConn/areturn' src/net/packetconn_test.go + sed -i '/TestConnAndPacketConn/areturn' src/net/packetconn_test.go + sed -i '/TestUnixListenerSpecificMethods/areturn' src/net/packetconn_test.go + sed -i '/TestUnixConnSpecificMethods/areturn' src/net/packetconn_test.go + sed -i '/TestUnixListenerSpecificMethods/areturn' src/net/protoconn_test.go + sed -i '/TestUnixConnSpecificMethods/areturn' src/net/protoconn_test.go + sed -i '/TestStreamConnServer/areturn' src/net/server_test.go + sed -i '/TestReadUnixgramWithUnnamedSocket/areturn' src/net/unix_test.go + sed -i '/TestReadUnixgramWithZeroBytesBuffer/areturn' src/net/unix_test.go + sed -i '/TestUnixgramWrite/areturn' src/net/unix_test.go + sed -i '/TestUnixConnLocalAndRemoteNames/areturn' src/net/unix_test.go + sed -i '/TestUnixgramConnLocalAndRemoteNames/areturn' src/net/unix_test.go + sed -i '/TestWithSimulated/areturn' src/log/syslog/syslog_test.go + sed -i '/TestFlap/areturn' src/log/syslog/syslog_test.go + sed -i '/TestNew/areturn' src/log/syslog/syslog_test.go + sed -i '/TestNewLogger/areturn' src/log/syslog/syslog_test.go + sed -i '/TestDial/areturn' src/log/syslog/syslog_test.go + sed -i '/TestWrite/areturn' src/log/syslog/syslog_test.go + sed -i '/TestConcurrentWrite/areturn' src/log/syslog/syslog_test.go + sed -i '/TestConcurrentReconnect/areturn' src/log/syslog/syslog_test.go # remove IP resolving tests, on darwin they can find fe80::1%lo while expecting ::1 sed -i '/TestResolveIPAddr/areturn' src/net/ipraw_test.go diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index 982446f4fdb..7d78f5efd10 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go sed -i '/TestRead0/areturn' src/os/os_test.go sed -i '/TestNohup/areturn' src/os/signal/signal_test.go - sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go + rm src/crypto/x509/root_darwin_test.go src/crypto/x509/verify_test.go sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go diff --git a/pkgs/development/compilers/jikes/default.nix b/pkgs/development/compilers/jikes/default.nix index 1423bc8d51e..1e202160b3c 100644 --- a/pkgs/development/compilers/jikes/default.nix +++ b/pkgs/development/compilers/jikes/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "jikes-1.22"; src = fetchurl { url = mirror://sourceforge/jikes/jikes-1.22.tar.bz2; - md5 = "cda958c7fef6b43b803e1d1ef9afcb85"; + sha256 = "1qqldrp74pzpy5ly421srqn30qppmm9cvjiqdngk8hf47dv2rc0c"; }; meta = { diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix index 04ef7b86c48..32d98b1ce13 100644 --- a/pkgs/development/compilers/julia/0.5.nix +++ b/pkgs/development/compilers/julia/0.5.nix @@ -2,6 +2,7 @@ # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2 , runCommand +, paxctl # libjulia dependencies , libunwind, readline, utf8proc, zlib , llvm, libffi, ncurses @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { patches = [ ./0001.1-use-system-utf8proc.patch ./0002-use-system-suitesparse.patch - ]; + ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch; postPatch = '' patchShebangs . contrib @@ -89,7 +90,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; - nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; + nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ] + ++ stdenv.lib.optional stdenv.needsPax paxctl; makeFlags = let diff --git a/pkgs/development/compilers/julia/0004-hardened-0.4.7.patch b/pkgs/development/compilers/julia/0004-hardened-0.4.7.patch new file mode 100644 index 00000000000..1950cd7836a --- /dev/null +++ b/pkgs/development/compilers/julia/0004-hardened-0.4.7.patch @@ -0,0 +1,25 @@ +From 0bdbe60325a22202f8e250a9578407648a0d29b9 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Wed, 1 Feb 2017 06:09:49 -0600 +Subject: [PATCH] Set pax flags on julia binaries to disable memory protection. + +--- + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile b/Makefile +index 8d45a1baa..91ea33b21 100644 +--- a/Makefile ++++ b/Makefile +@@ -61,6 +61,8 @@ julia-src-release julia-src-debug : julia-src-% : julia-deps + + julia-ui-release julia-ui-debug : julia-ui-% : julia-src-% + @$(MAKE) $(QUIET_MAKE) -C ui julia-$* ++ @echo "setting PaX flags on $(JULIA_EXECUTABLE_$*)" ++ @paxctl -czexm $(JULIA_EXECUTABLE_$*) + + julia-inference : julia-base julia-ui-$(JULIA_BUILD_MODE) $(build_prefix)/.examples + @$(MAKE) $(QUIET_MAKE) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE) +-- +2.11.0 + diff --git a/pkgs/development/compilers/julia/0004-hardened.patch b/pkgs/development/compilers/julia/0004-hardened.patch new file mode 100644 index 00000000000..901f967c9d5 --- /dev/null +++ b/pkgs/development/compilers/julia/0004-hardened.patch @@ -0,0 +1,25 @@ +From eddb251a00ace6e63e32e7dcb9e1ec632cac14e0 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Wed, 1 Feb 2017 06:09:49 -0600 +Subject: [PATCH] Set pax flags on julia binaries to disable memory protection. + +--- + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile b/Makefile +index 0e28cc87b..aab8cfa8d 100644 +--- a/Makefile ++++ b/Makefile +@@ -91,6 +91,8 @@ julia-src-release julia-src-debug : julia-src-% : julia-deps julia_flisp.boot.in + + julia-ui-release julia-ui-debug : julia-ui-% : julia-src-% + @$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/ui julia-$* ++ @echo "setting PaX flags on $(JULIA_EXECUTABLE_$*)" ++ @paxctl -czexm $(JULIA_EXECUTABLE_$*) + + julia-inference : julia-base julia-ui-$(JULIA_BUILD_MODE) $(build_prefix)/.examples + @$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE) +-- +2.11.0 + diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 214b3153481..ebdd4c760d1 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, fetchurl # build tools -, gfortran, m4, makeWrapper, patchelf, perl, which, python2 +, gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl # libjulia dependencies , libunwind, llvm, readline, utf8proc, zlib # standard library dependencies @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ./0001-use-system-utf8proc.patch ./0002-use-system-suitesparse.patch ./0003-no-ldconfig.patch - ]; + ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened-0.4.7.patch; postPatch = '' patchShebangs . contrib @@ -79,7 +79,8 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; - nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; + nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ] + ++ stdenv.lib.optional stdenv.needsPax paxctl; makeFlags = let diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index 73f0e67baa5..9cfa8895f74 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, fetchurl # build tools -, gfortran, m4, makeWrapper, patchelf, perl, which, python2 +, gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl # libjulia dependencies , libunwind, readline, utf8proc, zlib , llvm @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { patches = [ ./0001.1-use-system-utf8proc.patch ./0002-use-system-suitesparse.patch - ]; + ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch; postPatch = '' patchShebangs . contrib @@ -86,7 +86,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; - nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; + nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ] + ++ stdenv.lib.optional stdenv.needsPax paxctl; makeFlags = let diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 52a47c50420..0f2f3d12a1c 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: stdenv.mkDerivation rec { - version = "1.0.5-2"; + version = "1.0.6"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha512 = "0z8phc51y8dfjnm95fs2dnmvhp7xm2am5xm71byh598flkpjmagnwah4j8z9fpg4qy94dwmqxf5zs3q8nfra89kmwskzpvp7bbibi0h"; + sha256 = "1dhliqd79hydd62xmrn2nwrcqy7lb5svkahkkpx9w3z9s5r0p8j2"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index b05496eabf2..741ecc3856f 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.4/lld.nix b/pkgs/development/compilers/llvm/3.4/lld.nix index c1841610f31..0398a5a543a 100644 --- a/pkgs/development/compilers/llvm/3.4/lld.nix +++ b/pkgs/development/compilers/llvm/3.4/lld.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "A set of modular code for creating linker tools"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.4/lldb.nix b/pkgs/development/compilers/llvm/3.4/lldb.nix index a50f9536542..c5ed82f53e5 100644 --- a/pkgs/development/compilers/llvm/3.4/lldb.nix +++ b/pkgs/development/compilers/llvm/3.4/lldb.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = { description = "A next-generation high-performance debugger"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 54346baba0d..0a18f7e01cf 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/3.4/polly.nix b/pkgs/development/compilers/llvm/3.4/polly.nix index 3d3483afafa..1ea806a1266 100644 --- a/pkgs/development/compilers/llvm/3.4/polly.nix +++ b/pkgs/development/compilers/llvm/3.4/polly.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A polyhedral optimizer for llvm"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index d11259c82f0..f15c989ef51 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation { meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix index 476fc7bcd43..abc198b0686 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; - license = "BSD"; + license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix index 963caf80970..268f2702a23 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation { meta = { homepage = http://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; - license = "BSD"; + license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/pkgs/development/compilers/llvm/3.5/lld.nix index 7ee90818ac9..4a398bd96a0 100644 --- a/pkgs/development/compilers/llvm/3.5/lld.nix +++ b/pkgs/development/compilers/llvm/3.5/lld.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "A set of modular code for creating linker tools"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix index bbffa1a9a93..a5161333b28 100644 --- a/pkgs/development/compilers/llvm/3.5/lldb.nix +++ b/pkgs/development/compilers/llvm/3.5/lldb.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = { description = "A next-generation high-performance debugger"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; broken = true; }; diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 4f54f1438a7..8bb5a6c684b 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/pkgs/development/compilers/llvm/3.5/polly.nix index 42b3fd74e6c..bacf4d30556 100644 --- a/pkgs/development/compilers/llvm/3.5/polly.nix +++ b/pkgs/development/compilers/llvm/3.5/polly.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A polyhedral optimizer for llvm"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch b/pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch deleted file mode 100644 index fbe9489d8e2..00000000000 --- a/pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur clang-3.6.0.src-orig/CMakeLists.txt clang-3.6.0.src/CMakeLists.txt ---- clang-3.6.0.src-orig/CMakeLists.txt 2015-03-05 05:56:20.788520896 +0100 -+++ clang-3.6.0.src/CMakeLists.txt 2015-03-05 06:02:15.589365469 +0100 -@@ -362,6 +362,7 @@ - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "libclang") - install(TARGETS ${name} -+ EXPORT ClangTargets - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} - RUNTIME DESTINATION bin) -@@ -516,15 +517,15 @@ - set(CLANG_INSTALL_PACKAGE_DIR share/clang/cmake) - set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}") - get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS) -- export(TARGETS ${CLANG_EXPORTS} FILE ${clang_cmake_builddir}/ClangTargets.cmake) - - # Install a /share/clang/cmake/ClangConfig.cmake file so that - # find_package(Clang) works. Install the target list with it. - install(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/ClangConfig.cmake -- ${CLANG_BINARY_DIR}/share/clang/cmake/ClangTargets.cmake - DESTINATION share/clang/cmake) - -+ install(EXPORT ClangTargets DESTINATION share/clang/cmake) -+ - # Also copy ClangConfig.cmake to the build directory so that dependent projects - # can build against a build directory of Clang more easily. - configure_file( diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix deleted file mode 100644 index c1d0cf8062c..00000000000 --- a/pkgs/development/compilers/llvm/3.6/clang/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: - -let - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; - self = stdenv.mkDerivation { - name = "clang-${version}"; - - unpackPhase = '' - unpackFile ${fetch "cfe" "1wwr8s6lzr324hv4s1k6na4j5zv6n9kdhi14s4kb9b13d93814df"} - mv cfe-${version}.src clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra - ''; - - buildInputs = [ cmake libedit libxml2 llvm ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - ] ++ - # Maybe with compiler-rt this won't be needed? - (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ - (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); - - patches = [ ./purity.patch ./cmake-exports.patch ]; - - postPatch = '' - sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp - ''; - - # Clang expects to find LLVMgold in its own prefix - # Clang expects to find sanitizer libraries in its own prefix - postInstall = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib - ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ - ln -sv $out/bin/clang $out/bin/cpp - ''; - - enableParallelBuilding = true; - - passthru = { - lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both - isClang = true; - } // stdenv.lib.optionalAttrs stdenv.isLinux { - inherit gcc; - }; - - meta = { - description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - }; - }; -in self diff --git a/pkgs/development/compilers/llvm/3.6/clang/purity.patch b/pkgs/development/compilers/llvm/3.6/clang/purity.patch deleted file mode 100644 index dc3b54e304f..00000000000 --- a/pkgs/development/compilers/llvm/3.6/clang/purity.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp -index 198e82e..810d006 100644 ---- a/lib/Driver/Tools.cpp -+++ b/lib/Driver/Tools.cpp -@@ -7355,17 +7355,6 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA, - CmdArgs.push_back("-shared"); - } - -- if (ToolChain.getArch() == llvm::Triple::arm || -- ToolChain.getArch() == llvm::Triple::armeb || -- ToolChain.getArch() == llvm::Triple::thumb || -- ToolChain.getArch() == llvm::Triple::thumbeb || -- (!Args.hasArg(options::OPT_static) && -- !Args.hasArg(options::OPT_shared))) { -- CmdArgs.push_back("-dynamic-linker"); -- CmdArgs.push_back(Args.MakeArgString( -- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain))); -- } -- - CmdArgs.push_back("-o"); - CmdArgs.push_back(Output.getFilename()); - diff --git a/pkgs/development/compilers/llvm/3.6/default.nix b/pkgs/development/compilers/llvm/3.6/default.nix deleted file mode 100644 index c99070ba383..00000000000 --- a/pkgs/development/compilers/llvm/3.6/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }: -let - callPackage = newScope (self // { inherit stdenv isl version fetch; }); - - version = "3.6.2"; - - fetch = fetch_v version; - fetch_v = ver: name: sha256: fetchurl { - url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.xz"; - inherit sha256; - }; - - compiler-rt_src = fetch "compiler-rt" "11qx8d3pbfqjaj2x207pvlvzihbs1z2xbw4crpz7aid6h1yz6bqg"; - clang-tools-extra_src = fetch "clang-tools-extra" "1ssgs1108gnsggyx9wcl4hmq196f5ix0y1j7ygfh3xcqsckwc3ka"; - - self = { - llvm = callPackage ./llvm.nix { - inherit compiler-rt_src stdenv; - }; - - clang-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src stdenv; - }; - - clang = wrapCC self.clang-unwrapped; - - stdenv = overrideCC stdenv self.clang; - - lldb = callPackage ./lldb.nix {}; - - libcxx = callPackage ./libc++ {}; - - libcxxabi = callPackage ./libc++abi.nix {}; - }; -in self diff --git a/pkgs/development/compilers/llvm/3.6/libc++/darwin.patch b/pkgs/development/compilers/llvm/3.6/libc++/darwin.patch deleted file mode 100644 index bf83f169cfc..00000000000 --- a/pkgs/development/compilers/llvm/3.6/libc++/darwin.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ru -x '*~' libcxx-3.4.2.src-orig/lib/CMakeLists.txt libcxx-3.4.2.src/lib/CMakeLists.txt ---- libcxx-3.4.2.src-orig/lib/CMakeLists.txt 2013-11-15 18:18:57.000000000 +0100 -+++ libcxx-3.4.2.src/lib/CMakeLists.txt 2014-09-24 14:04:01.000000000 +0200 -@@ -56,7 +56,7 @@ - "-compatibility_version 1" - "-current_version ${LIBCXX_VERSION}" - "-install_name /usr/lib/libc++.1.dylib" -- "-Wl,-reexport_library,/usr/lib/libc++abi.dylib" -+ "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" - "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" - "/usr/lib/libSystem.B.dylib") - else() -@@ -64,14 +64,14 @@ - list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7) - if (OSX_HAS_ARMV7) - set(OSX_RE_EXPORT_LINE -- "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib" -+ "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" - "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp") - else() - set(OSX_RE_EXPORT_LINE -- "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib") -+ "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib") - endif() - else() -- set (OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") -+ set (OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") - endif() - - list(APPEND link_flags diff --git a/pkgs/development/compilers/llvm/3.6/libc++/default.nix b/pkgs/development/compilers/llvm/3.6/libc++/default.nix deleted file mode 100644 index b07b8eb35fa..00000000000 --- a/pkgs/development/compilers/llvm/3.6/libc++/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: - -stdenv.mkDerivation rec { - name = "libc++-${version}"; - - src = fetch "libcxx" "10cbgi1nfksjrlgvbsx8pkcqxsgkszdqy5cj2zgwj2c2yi9d9wsj"; - - # instead of allowing libc++ to link with /usr/lib/libc++abi.dylib, - # force it to link with our copy - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace lib/CMakeLists.txt \ - --replace 'OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib' \ - 'OSX_RE_EXPORT_LINE "${libcxxabi}/lib/libc++abi.dylib' \ - --replace '"''${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib"' \ - '"${libcxxabi}/lib/libc++abi.dylib"' - ''; - - patches = [ ./darwin.patch ]; - - buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - - cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; - - enableParallelBuilding = true; - - linkCxxAbi = stdenv.isLinux; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = http://libcxx.llvm.org/; - description = "A new implementation of the C++ standard library, targeting C++11"; - license = "BSD"; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh deleted file mode 100644 index 9022fced6ec..00000000000 --- a/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh +++ /dev/null @@ -1,3 +0,0 @@ -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/3.6/libc++abi.nix b/pkgs/development/compilers/llvm/3.6/libc++abi.nix deleted file mode 100644 index 8979ce314c8..00000000000 --- a/pkgs/development/compilers/llvm/3.6/libc++abi.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: - -stdenv.mkDerivation { - name = "libc++abi-${version}"; - - src = fetch "libcxxabi" "16xh54rlnbip4f2bwwbdm1sd6bkqky35jgp7fndnns0llpjqrd3g"; - - buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind; - - postUnpack = '' - unpackFile ${libcxx.src} - unpackFile ${llvm.src} - export NIX_CFLAGS_COMPILE+=" -I$PWD/include" - export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export TRIPLE=x86_64-apple-darwin - ''; - - installPhase = if stdenv.isDarwin - then '' - for file in lib/*; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling - install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/cxxabi.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.so.1.0 $out/lib - install -m 644 ../include/cxxabi.h $out/include - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 - ''; - - meta = { - homepage = http://libcxxabi.llvm.org/; - description = "A new implementation of low level support for a standard C++ library"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/llvm/3.6/lldb.nix b/pkgs/development/compilers/llvm/3.6/lldb.nix deleted file mode 100644 index 17f7f5793b9..00000000000 --- a/pkgs/development/compilers/llvm/3.6/lldb.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv -, fetch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, llvm -, clang-unwrapped -, python -, version -}: - -stdenv.mkDerivation { - name = "lldb-${version}"; - - src = fetch "lldb" "1a93cpmlcnpyglgcyfjb3n7c33683wfhwzn36azpv6wicimwj3cl"; - - patchPhase = '' - sed -i 's|/usr/bin/env||' \ - scripts/Python/finish-swig-Python-LLDB.sh \ - scripts/Python/build-swig-Python.sh - ''; - - buildInputs = [ cmake python which swig ncurses zlib libedit ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" - "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" - "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 - ]; - - enableParallelBuilding = true; - - meta = { - description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix deleted file mode 100644 index 54de4b200f3..00000000000 --- a/pkgs/development/compilers/llvm/3.6/llvm.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv -, fetch -, perl -, groff -, cmake -, python -, libffi -, binutils -, libxml2 -, valgrind -, ncurses -, version -, zlib -, compiler-rt_src -, debugVersion ? false -, enableSharedLibraries ? !stdenv.isDarwin -}: - -let - src = fetch "llvm" "153vcvj8gvgwakzr4j0kndc0b7wn91c2g1vy2vg24s6spxcc23gn"; -in stdenv.mkDerivation rec { - name = "llvm-${version}"; - - unpackPhase = '' - unpackFile ${src} - mv llvm-${version}.src llvm - sourceRoot=$PWD/llvm - unpackFile ${compiler-rt_src} - mv compiler-rt-* $sourceRoot/projects/compiler-rt - ''; - - buildInputs = [ perl groff cmake libxml2 python libffi ] /* ++ stdenv.lib.optional stdenv.isLinux valgrind */; - - propagatedBuildInputs = [ ncurses zlib ]; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" - "-DLLVM_BUILD_TESTS=ON" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_ENABLE_RTTI=ON" - ] ++ stdenv.lib.optional enableSharedLibraries - "-DBUILD_SHARED_LIBS=ON" - ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" - ++ stdenv.lib.optionals ( isDarwin) [ - "-DCMAKE_CXX_FLAGS=-stdlib=libc++" - "-DCAN_TARGET_i386=false" - ]; - - postBuild = '' - rm -fR $out - - paxmark m bin/{lli,llvm-rtdyld} - ''; - - enableParallelBuilding = true; - - passthru.src = src; - - meta = { - description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix index 6c1a89cf60a..535dbbc93d5 100644 --- a/pkgs/development/compilers/llvm/3.7/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix @@ -49,7 +49,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; }; diff --git a/pkgs/development/compilers/llvm/3.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix index 1196645b923..69ce87bcbf3 100644 --- a/pkgs/development/compilers/llvm/3.7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.7/libc++/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; - license = "BSD"; + license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix index ec0be51a11c..6a62a6256b4 100644 --- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.7/libc++abi.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { homepage = http://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; - license = "BSD"; + license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix index 36f9cb1f139..294410f9986 100644 --- a/pkgs/development/compilers/llvm/3.7/lldb.nix +++ b/pkgs/development/compilers/llvm/3.7/lldb.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = { description = "A next-generation high-performance debugger"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index c674b959c78..d4e7c73ad0d 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -83,7 +83,7 @@ in stdenv.mkDerivation rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 6052246dad0..41e515249eb 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -60,7 +60,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; }; diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix index 15f7ee1e3e4..e4198599904 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; - license = "BSD"; + license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix index 61ff6341c30..6b98a5726cf 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { homepage = http://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; - license = "BSD"; + license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix index fe0dcfc8306..d27786464c0 100644 --- a/pkgs/development/compilers/llvm/3.8/lldb.nix +++ b/pkgs/development/compilers/llvm/3.8/lldb.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = { description = "A next-generation high-performance debugger"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index fa647e62ff1..9394179a8f9 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index e6c804c96b1..677c4a526ea 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -49,7 +49,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; }; diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index 7a53ffa0d8f..f656f553f16 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; - license = "BSD"; + license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix index aff4205d6a9..1ad2cb10295 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { homepage = http://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; - license = "BSD"; + license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix index 5d8878b3b06..52f27de8cdb 100644 --- a/pkgs/development/compilers/llvm/3.9/lldb.nix +++ b/pkgs/development/compilers/llvm/3.9/lldb.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = { description = "A next-generation high-performance debugger"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index b64cf4fed5b..62f1514e231 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , perl , groff , cmake @@ -45,6 +46,13 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ ncurses zlib ]; postPatch = "" + + '' + patch -p1 --reverse < ${fetchpatch { + name = "fix-red-icons.diff"; # https://bugs.freedesktop.org/show_bug.cgi?id=99078 + url = https://github.com/llvm-mirror/llvm/commit/c280d74837d8.diff; + sha256 = "11sq86spw41v72f676igksapdlsgh7fiqp5qkkmgfj0ndqcn9skf"; + }} + '' # hacky fix: New LLVM releases require a newer OS X SDK than # 10.9. This is a temporary measure until nixpkgs darwin support is # updated. @@ -109,7 +117,7 @@ in stdenv.mkDerivation rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix index 105844887f1..3869bdad84f 100644 --- a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix +++ b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix @@ -2,7 +2,7 @@ name = "meta-build-env-0.1"; src = fetchurl { url = http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz ; - md5 = "827b54ace4e2d3c8e7605ea149b34293"; + sha256 = "1imn1gaan4fv73v8w3k3lgyjzkcn7bdp69k6hlz0vqdg17ysd1x3"; }; meta = { diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index e3dd950e0d1..d802aa4fe2e 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -1,23 +1,30 @@ -{ stdenv, fetchurl, boost, emacs, gmp, makeWrapper +{ stdenv, fetchurl, makeWrapper +, boost, gmp , tcl-8_5, tk-8_5 +, emacs }: let - version = "2.0.0"; -in stdenv.mkDerivation { + binaries = { + "x86_64-linux" = fetchurl { + url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz"; + sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z"; + }; + }; +in + +stdenv.mkDerivation { name = "mozart-binary-${version}"; - src = fetchurl { - url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz"; - sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z"; - }; + preferLocalBuild = true; + + src = binaries."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc boost - emacs gmp tcl-8_5 tk-8_5 @@ -25,10 +32,36 @@ in stdenv.mkDerivation { TK_LIBRARY = "${tk-8_5}/lib/tk8.5"; - builder = ./builder.sh; - buildInputs = [ makeWrapper ]; + buildCommand = '' + mkdir $out + tar xvf $src -C $out --strip-components=1 + + for exe in $out/bin/{ozemulator,ozwish} ; do + patchelf --set-interpreter $(< $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath $libPath \ + $exe + done + + wrapProgram $out/bin/ozwish \ + --set OZHOME $out \ + --set TK_LIBRARY $TK_LIBRARY + + wrapProgram $out/bin/ozemulator --set OZHOME $out + + ${stdenv.lib.optionalString (emacs != null) '' + wrapProgram $out/bin/oz --suffix PATH ":" ${stdenv.lib.makeBinPath [ emacs ]} + ''} + + sed -i $out/share/applications/oz.desktop \ + -e "s,Exec=oz %u,Exec=$out/bin/oz %u," + + gzip -9n $out/share/mozart/elisp"/"*.elc + + patchShebangs $out + ''; + meta = with stdenv.lib; { homepage = "http://www.mozart-oz.org/"; description = "Multiplatform implementation of the Oz programming language"; @@ -40,6 +73,7 @@ in stdenv.mkDerivation { expressive power and advanced functionality. ''; license = licenses.mit; - platforms = [ "x86_64-linux" ]; + platforms = attrNames binaries; + hydraPlatforms = []; }; } diff --git a/pkgs/development/compilers/mozart/builder.sh b/pkgs/development/compilers/mozart/builder.sh deleted file mode 100644 index b606d4c1bde..00000000000 --- a/pkgs/development/compilers/mozart/builder.sh +++ /dev/null @@ -1,26 +0,0 @@ -source $stdenv/setup - -echo "unpacking $src..." -tar xvfz $src - -mkdir -p $out/bin -mkdir -p $out/share - -mv mozart*linux/bin/* $out/bin -mv mozart*linux/share/* $out/share - -patchShebangs $out - -for f in $out/bin/*; do - b=$(basename $f) - - if [ $b == "ozemulator" ] || [ $b == "ozwish" ]; then - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libPath \ - $f - continue; - fi - - wrapProgram $f --set OZHOME $out \ - --set TK_LIBRARY $TK_LIBRARY -done diff --git a/pkgs/development/compilers/ocaml/4.04.nix b/pkgs/development/compilers/ocaml/4.04.nix new file mode 100644 index 00000000000..1ded1aed232 --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.04.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "04"; + patch_version = "0"; + sha256 = "1d2nk3kq4dyzz8dls45r13jprq5by3q8kshc8kvxzm8n4fnnvvb4"; + + # If the executable is stipped it does not work + dontStrip = true; +} diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index abded4b6690..17b3033c31d 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (args // rec { buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; - preConfigure = '' + preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang ''; @@ -56,7 +56,7 @@ stdenv.mkDerivation (args // rec { meta = with stdenv.lib; { homepage = http://caml.inria.fr/ocaml; - branch = "4.03"; + branch = versionNoPatch; license = with licenses; [ qpl /* compiler */ lgpl2 /* library */ diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index d0933b9a195..6eb8f67b5f5 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -21,42 +21,42 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "122"; - build = "04"; + update = "121"; + build = "13"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; repover = "jdk8u${update}-b${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "1zqqy5gzrx7f438j5pjdavj41plb04p6b1ikspksrgnhs5wrrr02"; + sha256 = "1ns0lnl5n05k1kgp8d6fyyk6gx57sx7rmlcc33d3vxhr58560nbv"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0hhsm23mxvjxmf0jxlhm57s203k88s8xbmk71l8zlnjsz88ni4gx"; + sha256 = "0vj5mnqw80r4xqlmiab7wbrkhz3rl8ijhwqplkbs42wad75lvnh8"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "1r4a52brsg1xd2dc2b8lzd4w4yvcjdmj9a6avjihx1hpgcs4xzd1"; + sha256 = "0mcjjc34jvckg1f1x9v7gik3h5y4kx7skkfgzhknh14637jzb2hs"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "0ixa6kdqkiq83817qdymiy772449iva11rh3pr68qpfnmbx1zzil"; + sha256 = "0bxf1mrpmxgjmg40yi3ww7lh22f6h0nrvlvf5jwwzf4hb3a3998g"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "1kw4h3j93cvnlzh0vhj4xxdm90bk7hfg6kpqk09x0a12whh2ww3h"; + sha256 = "10f641ngwiqr2z6hbz0xkyfh8h3z7kdxj5b1d30rgynzghf5wksr"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "0wrj3jyv3922m3pxfg0i9c3ap71b0rass7swvhi996c029rd12r7"; + sha256 = "1bgjpivlxi0qlmhvz838zzkzz26d4ly8b0c963kx0lpabz8p99xi"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "0b743mygzdavdd59l98b3l6a03dihs4ipd1xlpkacy778wzpr59d"; + sha256 = "17bcb5ic1ifk5rda1dzjd1483k9mah5npjg5dg77iyziq8kprvri"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "10wkshhzj15wvx7i53dbkwi85f4fbbxi26zphr5b6daf3ib0hind"; + sha256 = "19fmlipqk9qiv7jc84b0z022q403nyp7b32a5qqqcn6aavdqnf7c"; }; openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 93deee01e56..b582b21dcc4 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -14,16 +14,16 @@ let then "x86_64-apple-darwin" else abort "missing boostrap url for platform ${stdenv.system}"; - # fetch hashes by running `print-hashes.sh 1.13.0` + # fetch hashes by running `print-hashes.sh 1.14.0` bootstrapHash = if stdenv.system == "i686-linux" - then "239734113f6750d31085c7a08c260d492991cc1ef10817b6d44154515f3f9439" + then "8d5c75728b44468216f99651dfae9d60ae0696a77105dd2b02942d75f3256840" else if stdenv.system == "x86_64-linux" - then "95f4c372b1b81ac1038161e87e932dd7ab875d25c167a861c3949b0f6a65516d" + then "c71325cfea1b6f0bdc5189fa4c50ff96f828096ff3f7b5056367f9685d6a4d04" else if stdenv.system == "i686-darwin" - then "f6e01cab3bf8d0a6fe9cc2447aa10ce894569daaa72d44063c229da918b96023" + then "fe1b3d67329a22d67e3b8db8858a43022e2e746dde60ef4a2db3f2cac16ea9bd" else if stdenv.system == "x86_64-darwin" - then "f538ca5732b844cf7f00fc4aaaf200a49a845b58b4ec8aef38da0b00e2cf6efe" + then "3381341524b0184da5ed2cdcddc2a25e2e335e87f1cf676f64d98ee5e6479f20" else throw "missing boostrap hash for platform ${stdenv.system}"; needsPatchelf = stdenv.isLinux; @@ -33,7 +33,7 @@ let sha256 = bootstrapHash; }; - version = "1.13.0"; + version = "1.14.0"; in rec { diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 7b8d5a3d1ef..91d7cda1c00 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -6,15 +6,14 @@ let in rec { rustc = callPackage ./rustc.nix { - shortVersion = "1.14"; + shortVersion = "1.15.1"; isRelease = true; forceBundledLLVM = false; configureFlags = [ "--release-channel=stable" ]; - srcRev = "e8a0123241f0d397d39cd18fcc4e5e7edde22730"; - srcSha = "1sla3gnx9dqvivnyhvwz299mc3jmdy805q2y5xpmpi1vhfk0bafx"; + srcRev = "021bd294c039bd54aa5c4aa85bcdffb0d24bc892"; + srcSha = "1dp7cjxj8nv960jxkq3p18agh9bpfb69ac14x284jmhwyksim3y7"; patches = [ - ./patches/disable-lockfile-check-stable.patch ./patches/darwin-disable-fragile-tcp-tests.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; @@ -25,10 +24,10 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.15.0"; - srcRev = "298a0127f703d4c2500bb06d309488b92ef84ae1"; - srcSha = "0v74r18vszapw2rfk7w72czkp9gbq4s1sggphm5vx0kyh058dxc5"; - depsSha256 = "0ksiywli8r4lkprfknm0yz1w27060psi3db6wblqmi8sckzdm44h"; + version = "0.16.0"; + srcRev = "6e0c18cccc8b0c06fba8a8d76486f81a792fb420"; + srcSha = "117ivvs9wz848mwf8bw797n10qpn77agd353z8b0hxgbxhpribya"; + depsSha256 = "11s2xpgfhl4mb4wa2nk4mzsypr7m9daxxc7l0vraiz5cr77gk7qq"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix index bac35c790d0..5f92e5c6d92 100644 --- a/pkgs/development/compilers/rust/nightlyBin.nix +++ b/pkgs/development/compilers/rust/nightlyBin.nix @@ -9,7 +9,7 @@ let bootstrapHash = if stdenv.system == "x86_64-linux" - then "05bppmc6hqgv2g4x76rj95xf40x2aikqmcnql5li27rqwliyxznj" + then "1v7jvwigb29m15wilzcrk5jmlpaccpzbkhlzf7z5qw08320gvc91" else throw "missing boostrap hash for platform ${stdenv.system}"; needsPatchelf = stdenv.isLinux; @@ -19,7 +19,7 @@ let sha256 = bootstrapHash; }; - version = "2016-12-29"; + version = "2017-01-26"; in rec { diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch deleted file mode 100644 index c5009b7ba67..00000000000 --- a/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e7378e267bba203bd593b49705c24303b0a46cb7 Mon Sep 17 00:00:00 2001 -From: David Craven -Date: Wed, 1 Jun 2016 01:41:35 +0200 -Subject: [PATCH] disable-lockfile-check - ---- - src/tools/tidy/src/main.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs -index 2839bbd..50142ff 100644 ---- a/src/tools/tidy/src/main.rs -+++ b/src/tools/tidy/src/main.rs -@@ -48,7 +48,7 @@ fn main() { - errors::check(&path, &mut bad); - cargo::check(&path, &mut bad); - features::check(&path, &mut bad); -- cargo_lock::check(&path, &mut bad); -+ //cargo_lock::check(&path, &mut bad); - pal::check(&path, &mut bad); - - if bad { - panic!("some tidy checks failed"); --- -2.8.3 - diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 056177fd265..a693afb8b59 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -56,6 +56,8 @@ stdenv.mkDerivation { ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ] # ++ [ "--jemalloc-root=${jemalloc}/lib" ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ] + # TODO: Remove when fixed build with rustbuild + ++ [ "--disable-rustbuild" ] ++ optional (stdenv.cc.cc ? isClang) "--enable-clang" ++ optional (targets != []) "--target=${target}" ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 85c558c92e8..c713d819661 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.13"; + version = "1.3.14"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1k3nij1pchkard02p51mbbsn4rrj116v1apjjpd3f9h2m7j3asac"; + sha256 = "1jnwsv8bdkrrg1w0gkjx9nb8sw3if38sna40davrx0rxadc3v5mz"; }; patchPhase = '' diff --git a/pkgs/development/compilers/souper/default.nix b/pkgs/development/compilers/souper/default.nix new file mode 100644 index 00000000000..74e1cbf68d3 --- /dev/null +++ b/pkgs/development/compilers/souper/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchFromGitHub, cmake, makeWrapper +, llvmPackages_39, hiredis, z3_opt, gtest +}: + +let + klee = fetchFromGitHub { + owner = "klee"; + repo = "klee"; + rev = "a743d7072d9ccf11f96e3df45f25ad07da6ad9d6"; + sha256 = "0qwzs029vlba8xz362n4b00hdm2z3lzhzmvix1r8kpbfrvs8vv91"; + }; +in stdenv.mkDerivation { + name = "souper-unstable-2017-01-05"; + + src = fetchFromGitHub { + owner = "google"; + repo = "souper"; + rev = "1be75fe6a96993b57dcba038798fe6d1c7d113eb"; + sha256 = "0r8mjb88lwz9a3syx7gwsxlwfg0krffaml04ggaf3ad0cza2mvm8"; + }; + + nativeBuildInputs = [ + cmake + makeWrapper + ]; + + buildInputs = [ + llvmPackages_39.llvm + llvmPackages_39.clang-unwrapped + hiredis + gtest + ]; + + enableParallelBuilding = true; + + preConfigure = '' + mkdir -pv third_party + cp -R "${klee}" third_party/klee + ''; + + installPhase = '' + mkdir -pv $out/bin + cp -v ./souper $out/bin/ + cp -v ./clang-souper $out/bin/ + wrapProgram "$out/bin/souper" \ + --add-flags "-z3-path=\"${z3_opt}/bin/z3\"" + ''; + + meta = with stdenv.lib; { + description = "A superoptimizer for LLVM IR"; + homepage = "https://github.com/google/souper"; + license = licenses.asl20; + maintainers = with maintainers; [ taktoa ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 446db73bacc..d9f33bcc6b2 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -1,14 +1,11 @@ { stdenv, fetchFromRepoOrCz, perl, texinfo }: - -assert (stdenv.isGlibc); - with stdenv.lib; let - date = "20160525"; + date = "20170108"; version = "0.9.27pre-${date}"; - rev = "1ca685f887310b5cbdc415cdfc3a578dbc8d82d8"; - sha256 = "149s847jkg2zdmk09h0cp0q69m8kxxci441zyw8b08fy9b87ayd8"; + rev = "5420bb8a67f5f782ac49c90afb7da178a60c448a"; + sha256 = "0gf1ys4vv5qfkh6462fkdv44mz5chhrchlvgcl0m44f8mm8cjwa3"; in stdenv.mkDerivation rec { @@ -20,8 +17,6 @@ stdenv.mkDerivation rec { inherit sha256; }; - outputs = [ "bin" "dev" "out" ]; - nativeBuildInputs = [ perl texinfo ]; hardeningDisable = [ "fortify" ]; @@ -32,17 +27,20 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - configureFlagsArray+=("--elfinterp=$(cat $NIX_CC/nix-support/dynamic-linker)") - configureFlagsArray+=("--crtprefix=${stdenv.glibc.out}/lib") - configureFlagsArray+=("--sysincludepaths=${stdenv.glibc.dev}/include:{B}/include") - configureFlagsArray+=("--libpaths=${stdenv.glibc.out}/lib") + echo ${version} > VERSION + + configureFlagsArray+=("--cc=cc") + configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)") + configureFlagsArray+=("--crtprefix=${getLib stdenv.cc.libc}/lib") + configureFlagsArray+=("--sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include") + configureFlagsArray+=("--libpaths=${getLib stdenv.cc.libc}/lib") ''; doCheck = true; checkTarget = "test"; postFixup = '' - paxmark m $bin/bin/tcc + paxmark m $out/bin/tcc ''; meta = { diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix new file mode 100644 index 00000000000..7621aa82bc7 --- /dev/null +++ b/pkgs/development/compilers/zulu/default.nix @@ -0,0 +1,71 @@ +{ stdenv, pkgs, fetchurl, unzip, makeWrapper, setJavaClassPath, swingSupport ? true }: + +with pkgs; + +let + version = "8.19.0.1"; + openjdk = "8.0.112"; + + sha256_linux = "1icb6in1197n44wk2cqnrxr7w0bd5abxxysfrhbg56jlb9nzmp4x"; + sha256_darwin = "0kxwh62a6kckc9l9jkgakf86lqkqazp3dwfwaxqc4cg5zczgbhmd"; + + platform = if stdenv.isDarwin then "macosx" else "linux"; + hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; + extension = if stdenv.isDarwin then "zip" else "tar.gz"; +in stdenv.mkDerivation rec { + inherit version openjdk platform hash extension; + + name = "zulu-${version}"; + + src = fetchurl { + url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}"; + sha256 = hash; + }; + + buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin [ unzip ]; + + installPhase = '' + mkdir -p $out + cp -r ./* "$out/" + + jrePath="$out/jre" + + rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/jli + rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/server + rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/xawt + rpath=$rpath''${rpath:+:}$jrePath/lib/amd64 + + # set all the dynamic linkers + find $out -type f -perm -0100 \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$rpath" {} \; + + find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; + + mkdir -p $out/nix-support + echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + + # Set JAVA_HOME automatically. + cat <> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + libraries = [ stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk ] + ++ (if swingSupport then [ xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc ] else [ ]); + + rpath = stdenv.lib.strings.makeLibraryPath libraries; + + passthru = { + home = "${zulu}"; + }; + + meta = with stdenv.lib; { + homepage = https://www.azul.com/products/zulu/; + license = licenses.gpl2; + description = "Certified builds of OpenJDK"; + longDescription = "Certified builds of OpenJDK that can be deployed across multiple operating systems, containers, hypervisors and Cloud platforms"; + maintainers = with maintainers; [ nequissimus ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index a57686177c4..a81b76849bc 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -1,11 +1,26 @@ { stdenv, fetchurl, which, coq, ssreflect }: -stdenv.mkDerivation { - name = "coq${coq.coq-version}-coquelicot-2.1.1"; - src = fetchurl { +let param = + let + v2_1_1 = { + version = "2.1.1"; url = https://gforge.inria.fr/frs/download.php/file/35429/coquelicot-2.1.1.tar.gz; sha256 = "1wxds73h26q03r2xiw8shplh97rsbim2i2s0r7af0fa490bp44km"; }; + v2_1_2 = { + version = "2.1.2"; + url = https://gforge.inria.fr/frs/download.php/file/36320/coquelicot-2.1.2.tar.gz; + sha256 = "09q9xbzyndx8i68hn3ir4pmzgqd1q33qpk3xghf2l849g8w3q5an"; + }; + in { + "8.4" = v2_1_1; + "8.5" = v2_1_2; + "8.6" = v2_1_2; +}."${coq.coq-version}"; in + +stdenv.mkDerivation { + name = "coq${coq.coq-version}-coquelicot-${param.version}"; + src = fetchurl { inherit (param) url sha256; }; nativeBuildInputs = [ which ]; buildInputs = [ coq ]; diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index f367dad1fca..e07c7c80ac0 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp }: stdenv.mkDerivation { - name = "coq-interval-${coq.coq-version}-2.2.1"; + name = "coq${coq.coq-version}-interval-3.1.1"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/35431/interval-2.2.1.tar.gz; - sha256 = "1i6v7da9mf6907sa803xa0llsf9lj4akxbrl8rma6gsdgff2d78n"; + url = https://gforge.inria.fr/frs/download.php/file/36342/interval-3.1.1.tar.gz; + sha256 = "0jzkb0xykiz9bfaminy9yd88b5w0gxcpw506yaaqmnmb43gdksyf"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix new file mode 100644 index 00000000000..e12327a347f --- /dev/null +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, coq }: + +stdenv.mkDerivation { + name = "coq${coq.coq-version}-math-classes-2016-06-08"; + + src = fetchFromGitHub { + owner = "math-classes"; + repo = "math-classes"; + rev = "751e63b260bd2f78b280f2566c08a18034bd40b3"; + sha256 = "0kjc2wzb6n9hcqb2ijx2pckn8jk5g09crrb87yb4s9m0mrw79smr"; + }; + + buildInputs = [ coq ]; + enableParallelBuilding = true; + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = with stdenv.lib; { + homepage = https://math-classes.github.io; + description = "A library of abstract interfaces for mathematical structures in Coq."; + maintainers = with maintainers; [ siddharthist ]; + platforms = coq.meta.platforms; + }; +} diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 81cfdecdfff..a80c934c6c1 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -1,39 +1,13 @@ { callPackage, fetchurl, coq }: -if coq.coq-version == "8.4" then - -callPackage ./generic.nix { - - name = "coq-mathcomp-1.6-${coq.coq-version}"; - src = fetchurl { - url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; - sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; - }; - -} - -else if coq.coq-version == "8.5" then - -callPackage ./generic.nix { - - name = "coq-mathcomp-1.6-${coq.coq-version}"; - src = fetchurl { - url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; - sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; - }; - -} - -else if coq.coq-version == "8.6" then - -callPackage ./generic.nix { - - name = "coq-mathcomp-1.6.1-${coq.coq-version}"; - src = fetchurl { +let param = + { + version = "1.6.1"; url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - }; + }; in +callPackage ./generic.nix { + name = "coq${coq.coq-version}-mathcomp-${param.version}"; + src = fetchurl { inherit (param) url sha256; }; } - -else throw "No ssreflect package for Coq version ${coq.coq-version}" diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix index 9a6a98609d2..564cb6f6571 100644 --- a/pkgs/development/coq-modules/mathcomp/generic.nix +++ b/pkgs/development/coq-modules/mathcomp/generic.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, coq, ssreflect, ncurses, which -, graphviz, ocamlPackages, withDoc ? false +{ stdenv, fetchurl, coq, ncurses, which +, graphviz, withDoc ? false , src, name }: @@ -9,8 +9,8 @@ stdenv.mkDerivation { inherit src; nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; - buildInputs = [ coq.ocaml coq.camlp5 ncurses which ]; - propagatedBuildInputs = [ coq ssreflect ]; + buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ]; + propagatedBuildInputs = [ coq ]; enableParallelBuilding = true; @@ -24,9 +24,6 @@ stdenv.mkDerivation { installPhase = '' make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install - rm -fr $out/lib/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect* - rm -fr $out/lib/coq/${coq.coq-version}/user-contrib/ssrmatching.cmi - rm -fr $out/share/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect* '' + stdenv.lib.optionalString withDoc '' make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/ ''; diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 16147c4dc2a..352b98ab88b 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -1,39 +1,13 @@ { callPackage, fetchurl, coq }: -if coq.coq-version == "8.4" then - -callPackage ./generic.nix { - - name = "coq-ssreflect-1.6-${coq.coq-version}"; - src = fetchurl { - url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; - sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; - }; - -} - -else if coq.coq-version == "8.5" then - -callPackage ./generic.nix { - - name = "coq-ssreflect-1.6-${coq.coq-version}"; - src = fetchurl { - url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; - sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; - }; - -} - -else if coq.coq-version == "8.6" then - -callPackage ./generic.nix { - - name = "coq-ssreflect-1.6.1-${coq.coq-version}"; - src = fetchurl { +let param = + { + version = "1.6.1"; url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - }; + }; in +callPackage ./generic.nix { + name = "coq${coq.coq-version}-ssreflect-${param.version}"; + src = fetchurl { inherit (param) url sha256; }; } - -else throw "No ssreflect package for Coq version ${coq.coq-version}" diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix index 3362e8839a7..c598345403d 100644 --- a/pkgs/development/coq-modules/ssreflect/generic.nix +++ b/pkgs/development/coq-modules/ssreflect/generic.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { inherit src; nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; - buildInputs = [ coq.ocaml coq.camlp5 ncurses which ]; + buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ]; propagatedBuildInputs = [ coq ]; enableParallelBuilding = true; diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 291b410ef93..bd6d9075130 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, guile, ncurses, libffi }: +{ fetchurl, stdenv, pkgconfig, guile, ncurses, libffi }: stdenv.mkDerivation rec { name = "guile-ncurses-1.7"; @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ guile ncurses libffi ]; preConfigure = diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix index 94f3418b031..e2bfe485c5b 100644 --- a/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, guile, buildEnv +{ stdenv, fetchurl, pkgconfig, guile, buildEnv , SDL, SDL_image, SDL_ttf, SDL_mixer }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "126n4rd0ydh6i2s11ari5k85iivradlf12zq13b34shf9k1wn5am"; }; - nativeBuildInputs = [ guile ]; + nativeBuildInputs = [ pkgconfig guile ]; buildInputs = [ SDL.dev SDL_image SDL_ttf SDL_mixer diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 90e80e21406..4370feef40f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1,3 +1,14 @@ +# COMMON OVERRIDES FOR THE HASKELL PACKAGE SET IN NIXPKGS +# +# This file contains haskell package overrides that are shared by all +# haskell package sets provided by nixpkgs and distributed via the official +# NixOS hydra instance. +# +# Overrides that would also make sense for custom haskell package sets not provided +# as part of nixpkgs and that are specific to Nix should go in configuration-nix.nix +# +# See comment at the top of configuration-nix.nix for more information about this +# distinction. { pkgs }: with import ./lib.nix { inherit pkgs; }; @@ -15,9 +26,6 @@ self: super: { # Link statically to avoid runtime dependency on GHC. jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; }; - # Apply NixOS-specific patches. - ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch; - # enable using a local hoogle with extra packagages in the database # nix-shell -p "haskellPackages.hoogleLocal (with haskellPackages; [ mtl lens ])" # $ hoogle server @@ -33,10 +41,10 @@ self: super: { nanospec = dontCheck super.nanospec; options = dontCheck super.options; statistics = dontCheck super.statistics; - c2hs = dontCheck super.c2hs; + http-streams = dontCheck super.http-streams; - # fix errors caused by hardening flags - epanet-haskell = disableHardening super.epanet-haskell ["format"]; + # segfault due to missing return: https://github.com/haskell/c2hs/pull/184 + c2hs = dontCheck super.c2hs; # This test keeps being aborted because it runs too quietly for too long Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; @@ -45,6 +53,9 @@ self: super: { # test phase requires networking mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.lib; }); + # check requires mysql server + mysql-simple = dontCheck super.mysql-simple; + # Link the proper version. zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; @@ -54,65 +65,20 @@ self: super: { src = pkgs.fetchFromGitHub { owner = "joeyh"; repo = "git-annex"; - sha256 = "1vy6bj7f8zyj4n1r0gpi0r7mxapsrjvhwmsi5sbnradfng5j3jya"; + sha256 = "0f79i2i1cr8j02vc4ganw92prbkv9ca1yl9jgkny0rxf28wdlc6v"; rev = drv.version; }; - })).overrideScope (self: super: { - # https://github.com/bitemyapp/esqueleto/issues/8 - esqueleto = self.esqueleto_2_4_3; - # https://github.com/prowdsponsor/esqueleto/issues/137 - persistent = self.persistent_2_2_4_1; - persistent-template = self.persistent-template_2_1_8_1; - persistent-sqlite = self.persistent-sqlite_2_2_1; - })).override { + }))).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; }; - # CUDA needs help finding the SDK headers and libraries. - cuda = overrideCabal super.cuda (drv: { - extraLibraries = (drv.extraLibraries or []) ++ [pkgs.linuxPackages.nvidia_x11]; - configureFlags = (drv.configureFlags or []) ++ - pkgs.lib.optional pkgs.stdenv.is64bit "--extra-lib-dirs=${pkgs.cudatoolkit}/lib64" ++ [ - "--extra-lib-dirs=${pkgs.cudatoolkit}/lib" - "--extra-include-dirs=${pkgs.cudatoolkit}/include" - ]; - preConfigure = '' - unset CC # unconfuse the haskell-cuda configure script - sed -i -e 's|/usr/local/cuda|${pkgs.cudatoolkit}|g' configure - ''; - }); - - # jni needs help finding libjvm.so because it's in a weird location. - jni = overrideCabal super.jni (drv: { - preConfigure = '' - local libdir=( "${pkgs.jdk}/lib/openjdk/jre/lib/"*"/server" ) - configureFlags+=" --extra-lib-dir=''${libdir[0]}" - ''; - }); - - # The package doesn't know about the AL include hierarchy. - # https://github.com/phaazon/al/issues/1 - al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"; - # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; - # Won't find it's header files without help. - sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL"; - - hzk = overrideCabal super.hzk (drv: { - preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; - configureFlags = "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper"; - doCheck = false; - }); - - haskakafka = overrideCabal super.haskakafka (drv: { - preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d haskakafka.cabal"; - configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka"; - doCheck = false; - }); + hzk = dontCheck super.hzk; + haskakafka = dontCheck super.haskakafka; # Depends on broken "lss" package. snaplet-lss = dontDistribute super.snaplet-lss; @@ -131,9 +97,6 @@ self: super: { # Depends on broken "hails" package. hails-bin = dontDistribute super.hails-bin; - # Foreign dependency name clashes with another Haskell package. - libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; }; - # Switch levmar build to openblas. bindings-levmar = overrideCabal super.bindings-levmar (drv: { preConfigure = '' @@ -169,6 +132,7 @@ self: super: { shakespeare-js = dontHaddock super.shakespeare-js; shakespeare-text = dontHaddock super.shakespeare-text; swagger = dontHaddock super.swagger; # http://hydra.cryp.to/build/2035868/nixlog/1/raw + swagger2 = dontHaddock super.swagger2; wai-test = dontHaddock super.wai-test; zlib-conduit = dontHaddock super.zlib-conduit; @@ -178,9 +142,9 @@ self: super: { # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; - # https://github.com/haskell/vector/issues/47 - # https://github.com/haskell/vector/issues/138 - vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector); + # sse2 flag due to https://github.com/haskell/vector/issues/47. + # dontCheck due to https://github.com/haskell/vector/issues/138 + vector = dontCheck (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector); # Fix Darwin build. halive = if pkgs.stdenv.isDarwin @@ -195,11 +159,6 @@ self: super: { # https://github.com/jaspervdj/hakyll/issues/491 else dontCheck super.hakyll; - # Heist's test suite requires system pandoc - heist = overrideCabal super.heist (drv: { - testToolDepends = [pkgs.pandoc]; - }); - # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required # on darwin: https://github.com/NixOS/cabal2nix/issues/146. hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify; @@ -211,20 +170,6 @@ self: super: { then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa else dontCheck super.fsnotify; - # the system-fileio tests use canonicalizePath, which fails in the sandbox - system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio; - - # Prevents needing to add security_tool as a build tool to all of x509-system's - # dependencies. - x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc - then let inherit (pkgs.darwin) security_tool; - in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: { - postPatch = (drv.postPatch or "") + '' - substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security - ''; - }) - else super.x509-system; - double-conversion = if !pkgs.stdenv.isDarwin then addExtraLibrary super.double-conversion pkgs.stdenv.cc.cc.lib else addExtraLibrary (overrideCabal super.double-conversion (drv: @@ -246,29 +191,9 @@ self: super: { # tests don't compile for some odd reason jwt = dontCheck super.jwt; - # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 - gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.gtk2hs-buildtools) pkgs.glib) ["fortify"]; - glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib) ["fortify"]; - gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"]; - gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"]; - gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; }; - gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; }; - - # Need WebkitGTK, not just webkit. - webkit = super.webkit.override { webkit = pkgs.webkitgtk2; }; - webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; }; - webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; }; - websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; }; - # https://github.com/mvoidex/hsdev/issues/11 hsdev = dontHaddock super.hsdev; - hs-mesos = overrideCabal super.hs-mesos (drv: { - # Pass _only_ mesos; the correct protobuf is propagated. - extraLibraries = [ pkgs.mesos ]; - preConfigure = "sed -i -e /extra-lib-dirs/d -e 's|, /usr/include, /usr/local/include/mesos||' hs-mesos.cabal"; - }); - # Upstream notified by e-mail. permutation = dontCheck super.permutation; @@ -306,42 +231,9 @@ self: super: { wai-middleware-hmac = dontCheck super.wai-middleware-hmac; xkbcommon = dontCheck super.xkbcommon; xmlgen = dontCheck super.xmlgen; - hapistrano = dontCheck super.hapistrano; HerbiePlugin = dontCheck super.HerbiePlugin; wai-cors = dontCheck super.wai-cors; - # These packages try to access the network. - amqp = dontCheck super.amqp; - amqp-conduit = dontCheck super.amqp-conduit; - bitcoin-api = dontCheck super.bitcoin-api; - bitcoin-api-extra = dontCheck super.bitcoin-api-extra; - bitx-bitcoin = dontCheck super.bitx-bitcoin; # http://hydra.cryp.to/build/926187/log/raw - concurrent-dns-cache = dontCheck super.concurrent-dns-cache; - digitalocean-kzs = dontCheck super.digitalocean-kzs; # https://github.com/KazumaSATO/digitalocean-kzs/issues/1 - github-types = dontCheck super.github-types; # http://hydra.cryp.to/build/1114046/nixlog/1/raw - hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw - hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw - hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql - hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; }); - marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw - mongoDB = dontCheck super.mongoDB; - network-transport-tcp = dontCheck super.network-transport-tcp; - network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30 - pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw - raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw - riak = dontCheck super.riak; # http://hydra.cryp.to/build/498763/log/raw - scotty-binding-play = dontCheck super.scotty-binding-play; - servant-router = dontCheck super.servant-router; - serversession-backend-redis = dontCheck super.serversession-backend-redis; - slack-api = dontCheck super.slack-api; # https://github.com/mpickering/slack-api/issues/5 - socket = dontCheck super.socket; - stackage = dontCheck super.stackage; # http://hydra.cryp.to/build/501867/nixlog/1/raw - textocat-api = dontCheck super.textocat-api; # http://hydra.cryp.to/build/887011/log/raw - warp = dontCheck super.warp; # http://hydra.cryp.to/build/501073/nixlog/5/raw - wreq = dontCheck super.wreq; # http://hydra.cryp.to/build/501895/nixlog/1/raw - wreq-sb = dontCheck super.wreq-sb; # http://hydra.cryp.to/build/783948/log/raw - wuss = dontCheck super.wuss; # http://hydra.cryp.to/build/875964/nixlog/2/raw - # https://github.com/NICTA/digit/issues/3 digit = dontCheck super.digit; @@ -351,9 +243,6 @@ self: super: { # https://github.com/ekmett/structures/issues/3 structures = dontCheck super.structures; - # Tries to mess with extended POSIX attributes, but can't in our chroot environment. - xattr = dontCheck super.xattr; - # Disable test suites to fix the build. acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw aeson-lens = dontCheck super.aeson-lens; # http://hydra.cryp.to/build/496769/log/raw @@ -391,7 +280,6 @@ self: super: { dotfs = dontCheck super.dotfs; # http://hydra.cryp.to/build/498599/log/raw DRBG = dontCheck super.DRBG; # http://hydra.cryp.to/build/498245/nixlog/1/raw ed25519 = dontCheck super.ed25519; - either-unwrap = dontCheck super.either-unwrap; # http://hydra.cryp.to/build/498782/log/raw etcd = dontCheck super.etcd; fb = dontCheck super.fb; # needs credentials for Facebook fptest = dontCheck super.fptest; # http://hydra.cryp.to/build/499124/log/raw @@ -420,7 +308,6 @@ self: super: { hi = dontCheck super.hi; hierarchical-clustering = dontCheck super.hierarchical-clustering; hmatrix-tests = dontCheck super.hmatrix-tests; - hPDB-examples = dontCheck super.hPDB-examples; hquery = dontCheck super.hquery; hs2048 = dontCheck super.hs2048; hsbencher = dontCheck super.hsbencher; @@ -429,8 +316,6 @@ self: super: { HTF = dontCheck super.HTF; htsn = dontCheck super.htsn; htsn-import = dontCheck super.htsn-import; - http-client-openssl = dontCheck super.http-client-openssl; - http-client-tls = dontCheck super.http-client-tls; ihaskell = dontCheck super.ihaskell; influxdb = dontCheck super.influxdb; itanium-abi = dontCheck super.itanium-abi; @@ -455,6 +340,7 @@ self: super: { opaleye = dontCheck super.opaleye; openpgp = dontCheck super.openpgp; optional = dontCheck super.optional; + orgmode-parse = dontCheck super.orgmode-parse; os-release = dontCheck super.os-release; persistent-redis = dontCheck super.persistent-redis; pipes-extra = dontCheck super.pipes-extra; @@ -495,9 +381,6 @@ self: super: { snap-core = dontCheck super.snap-core; sourcemap = dontCheck super.sourcemap; - # Needs access to locale data, but looks for it in the wrong place. - scholdoc-citeproc = dontCheck super.scholdoc-citeproc; - # These test suites run for ages, even on a fast machine. This is nuts. Random123 = dontCheck super.Random123; systemd = dontCheck super.systemd; @@ -508,15 +391,8 @@ self: super: { # https://github.com/bos/snappy/issues/1 snappy = dontCheck super.snappy; - # Expect to find sendmail(1) in $PATH. - mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\""; - - # Help the test suite find system timezone data. - tz = overrideCabal super.tz (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; }); - # https://ghc.haskell.org/trac/ghc/ticket/9625 vty = dontCheck super.vty; - vty_5_14 = dontCheck super.vty_5_14; # https://github.com/vincenthz/hs-crypto-pubkey/issues/20 crypto-pubkey = dontCheck super.crypto-pubkey; @@ -533,18 +409,12 @@ self: super: { # https://github.com/pixbi/duplo/issues/25 duplo = dontCheck super.duplo; - # Nix-specific workaround - xmonad = appendPatch (dontCheck super.xmonad) ./patches/xmonad-nix.patch; - # https://github.com/evanrinehart/mikmod/issues/1 mikmod = addExtraLibrary super.mikmod pkgs.libmikmod; # https://github.com/basvandijk/threads/issues/10 threads = dontCheck super.threads; - # https://github.com/ucsd-progsys/liquid-fixpoint/issues/44 - liquid-fixpoint = overrideCabal super.liquid-fixpoint (drv: { preConfigure = "patchShebangs ."; }); - # Missing module. rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5 rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6 @@ -558,17 +428,9 @@ self: super: { # https://github.com/NixOS/nixpkgs/issues/6350 paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; }); - # https://github.com/afcowie/http-streams/issues/80 - http-streams = dontCheck super.http-streams; - # https://github.com/vincenthz/hs-asn1/issues/12 asn1-encoding = dontCheck super.asn1-encoding; - # wxc supports wxGTX >= 3.0, but our current default version points to 2.8. - # http://hydra.cryp.to/build/1331287/log/raw - wxc = (addBuildDepend super.wxc self.split).override { wxGTK = pkgs.wxGTK30; }; - wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; }; - # Depends on QuickCheck 1.x. HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; }; test-framework-quickcheck = super.test-framework-quickcheck.override { QuickCheck = self.QuickCheck_1_2_0_1; }; @@ -587,12 +449,6 @@ self: super: { apiary-session = dontCheck super.apiary-session; apiary-websockets = dontCheck super.apiary-websockets; - # https://github.com/alephcloud/hs-configuration-tools/issues/40 - configuration-tools = dontCheck super.configuration-tools; - - # Test suite wants to connect to $DISPLAY. - hsqml = dontCheck (addExtraLibrary (super.hsqml.override { qt5 = pkgs.qt5Full; }) pkgs.mesa); - # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence) unlambda = dontHyperlinkSource super.unlambda; @@ -610,15 +466,6 @@ self: super: { preConfigure = "sed -i -e 's,time .* < 1.6,time >= 1.5,' -e 's,haddock-library >= 1.1 && < 1.3,haddock-library >= 1.1,' pandoc.cabal"; }); - # Tests attempt to use NPM to install from the network into - # /homeless-shelter. Disabled. - purescript = dontCheck super.purescript; - - # Requires bower-json >= 1.0.0.1 && < 1.1 - purescript_0_10_5 = super.purescript_0_10_5.overrideScope (self: super: { - bower-json = self.bower-json_1_0_0_1; - }); - # https://github.com/tych0/xcffib/issues/37 xcffib = dontCheck super.xcffib; @@ -628,61 +475,17 @@ self: super: { # https://github.com/haskell/haddock/issues/378 haddock-library = dontCheck super.haddock-library; + # https://github.com/haskell/haddock/issues/571 + haddock-api = appendPatch (doJailbreak super.haddock-api) (pkgs.fetchpatch { + url = "https://github.com/basvandijk/haddock/commit/f4c5e46ded05a4b8884f5ad6f3102f79ff3bb127.patch"; + sha256 = "01dawvikzw6y43557sbp9q7z9vw2g3wnzvv5ny0f0ks6ccc0vj0m"; + stripLen = 2; + addPrefixes = true; + }); + # https://github.com/anton-k/csound-expression-dynamic/issues/1 csound-expression-dynamic = dontHaddock super.csound-expression-dynamic; - # Hardcoded include path - poppler = overrideCabal super.poppler (drv: { - postPatch = '' - sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal - sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc - ''; - }); - - # Uses OpenGL in testing - caramia = dontCheck super.caramia; - - llvm-general-darwin = overrideCabal (super.llvm-general.override { llvm-config = pkgs.llvm_35; }) (drv: { - preConfigure = '' - sed -i llvm-general.cabal \ - -e 's,extra-libraries: stdc++,extra-libraries: c++,' - ''; - configureFlags = (drv.configureFlags or []) ++ ["--extra-include-dirs=${pkgs.libcxx}/include/c++/v1"]; - librarySystemDepends = [ pkgs.libcxx ] ++ drv.librarySystemDepends or []; - }); - - # Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142 - llvm-general = - if pkgs.stdenv.isDarwin - then self.llvm-general-darwin - else super.llvm-general.override { llvm-config = pkgs.llvm_35; }; - - # Needs help finding LLVM. - spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; - - # Tries to run GUI in tests - leksah = dontCheck (overrideCabal super.leksah (drv: { - executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [ - gnome3.defaultIconTheme # Fix error: Icon 'window-close' not present in theme ... - wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system - gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed - ]); - postPatch = (drv.postPatch or "") + '' - for f in src/IDE/Leksah.hs src/IDE/Utils/ServerConnection.hs - do - substituteInPlace "$f" --replace "\"leksah-server\"" "\"${self.leksah-server}/bin/leksah-server\"" - done - ''; - })); - - # Requires optparse-applicative 0.13.0.0 - diagrams-pgf = super.diagrams-pgf.overrideScope (self: super: { - optparse-applicative = self.optparse-applicative_0_13_0_0; - }); - - # Patch to consider NIX_GHC just like xmonad does - dyre = appendPatch super.dyre ./patches/dyre-nix.patch; - # Test suite won't compile against tasty-hunit 0.9.x. zlib = dontCheck super.zlib; @@ -693,6 +496,9 @@ self: super: { # https://github.com/nushio3/doctest-prop/issues/1 doctest-prop = dontCheck super.doctest-prop; + # Depends on itself for testing + doctest-discover = addBuildTool super.doctest-discover (dontCheck super.doctest-discover); + # https://github.com/bos/aeson/issues/253 aeson = dontCheck super.aeson; @@ -732,14 +538,6 @@ self: super: { # https://github.com/yesodweb/serversession/issues/1 serversession = dontCheck super.serversession; - yesod-bin = if pkgs.stdenv.isDarwin - then addBuildDepend super.yesod-bin pkgs.darwin.apple_sdk.frameworks.Cocoa - else super.yesod-bin; - - hmatrix = if pkgs.stdenv.isDarwin - then addBuildDepend super.hmatrix pkgs.darwin.apple_sdk.frameworks.Accelerate - else super.hmatrix; - # Hydra no longer allows building texlive packages. lhs2tex = dontDistribute super.lhs2tex; @@ -755,16 +553,6 @@ self: super: { # https://github.com/kazu-yamamoto/logger/issues/42 logger = dontCheck super.logger; - # https://github.com/edwinb/EpiVM/issues/13 - # https://github.com/edwinb/EpiVM/issues/14 - epic = addExtraLibraries (addBuildTool super.epic self.happy) [pkgs.boehmgc pkgs.gmp]; - - # https://github.com/ekmett/wl-pprint-terminfo/issues/7 - wl-pprint-terminfo = addExtraLibrary super.wl-pprint-terminfo pkgs.ncurses; - - # https://github.com/bos/pcap/issues/5 - pcap = addExtraLibrary super.pcap pkgs.libpcap; - # https://github.com/qnikst/imagemagick/issues/34 imagemagick = dontCheck super.imagemagick; @@ -808,14 +596,6 @@ self: super: { # Fine-tune the build. structured-haskell-mode = (overrideCabal super.structured-haskell-mode (drv: { - # Bump version to latest git-version to get support for Emacs 25.x. - version = "1.0.20-28-g1ffb4db"; - src = pkgs.fetchFromGitHub { - owner = "chrisdone"; - repo = "structured-haskell-mode"; - rev = "dde5104ee28e1c63ca9fbc37c969f8e319b4b903"; - sha256 = "0g5qpnxzr9qmgzvsld5mg94rb28xb8kd1a02q045r6zlmv1zx7lp"; - }; # Statically linked Haskell libraries make the tool start-up much faster, # which is important for use in Emacs. enableSharedExecutables = false; @@ -847,45 +627,21 @@ self: super: { # https://github.com/yesodweb/Shelly.hs/issues/106 # https://github.com/yesodweb/Shelly.hs/issues/108 - shelly = dontCheck super.shelly; + # https://github.com/yesodweb/Shelly.hs/issues/130 + shelly = + let drv = appendPatch (dontCheck (doJailbreak super.shelly)) (pkgs.fetchpatch { + url = "https://github.com/k0001/Shelly.hs/commit/32a1e290961755e7b2379f59faa49b13d03dfef6.patch"; + sha256 = "0ccq0qly8bxxv64dk97a44ng6hb01j6ajs0sp3f2nn0hf5j3xv69"; + }); + in overrideCabal drv (drv : { + # doJailbreak doesn't seem to work for build-depends inside an + # if-then-else block so we have to do it manually. + postPatch = "sed -i 's/base >=4\.6 \&\& <4\.9\.1/base -any/' shelly.cabal"; + }); # https://github.com/bos/configurator/issues/22 configurator = dontCheck super.configurator; - # The cabal files for these libraries do not list the required system dependencies. - miniball = overrideCabal super.miniball (drv: { - librarySystemDepends = [ pkgs.miniball ]; - }); - SDL-image = overrideCabal super.SDL-image (drv: { - librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or []; - }); - SDL-ttf = overrideCabal super.SDL-ttf (drv: { - librarySystemDepends = [ pkgs.SDL pkgs.SDL_ttf ]; - }); - SDL-mixer = overrideCabal super.SDL-mixer (drv: { - librarySystemDepends = [ pkgs.SDL pkgs.SDL_mixer ]; - }); - SDL-gfx = overrideCabal super.SDL-gfx (drv: { - librarySystemDepends = [ pkgs.SDL pkgs.SDL_gfx ]; - }); - SDL-mpeg = overrideCabal super.SDL-mpeg (drv: { - configureFlags = (drv.configureFlags or []) ++ [ - "--extra-lib-dirs=${pkgs.smpeg}/lib" - "--extra-include-dirs=${pkgs.smpeg}/include/smpeg" - ]; - }); - - # https://github.com/ivanperez-keera/hcwiid/pull/4 - hcwiid = overrideCabal super.hcwiid (drv: { - configureFlags = (drv.configureFlags or []) ++ [ - "--extra-lib-dirs=${pkgs.bluez.out}/lib" - "--extra-lib-dirs=${pkgs.cwiid}/lib" - "--extra-include-dirs=${pkgs.cwiid}/include" - "--extra-include-dirs=${pkgs.bluez.dev}/include" - ]; - prePatch = '' sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal" ''; - }); - # https://github.com/basvandijk/concurrent-extra/issues/12 concurrent-extra = dontCheck super.concurrent-extra; @@ -901,16 +657,6 @@ self: super: { # https://github.com/goldfirere/singletons/issues/122 singletons = dontCheck super.singletons; - # cabal2nix doesn't pick up some of the dependencies. - ginsu = let - g = addBuildDepend super.ginsu pkgs.perl; - g' = overrideCabal g (drv: { - executableSystemDepends = (drv.executableSystemDepends or []) ++ [ - pkgs.ncurses - ]; - }); - in g'; - # https://github.com/guillaume-nargeot/hpc-coveralls/issues/52 hpc-coveralls = disableSharedExecutables super.hpc-coveralls; @@ -923,72 +669,20 @@ self: super: { # https://github.com/sol/hpack/issues/53 hpack = dontCheck super.hpack; - # Tests require `docker` command in PATH - # Tests require running docker service :on localhost - docker = dontCheck super.docker; - # https://github.com/deech/fltkhs/issues/16 fltkhs = overrideCabal super.fltkhs (drv: { - libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.autoconf]; - librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.fltk13 pkgs.mesa_noglu pkgs.libjpeg]; broken = true; # linking fails because the build doesn't pull in the mesa libraries }); fltkhs-fluid-examples = dontDistribute super.fltkhs-fluid-examples; - # https://github.com/skogsbaer/hscurses/pull/26 - hscurses = overrideCabal super.hscurses (drv: { - librarySystemDepends = (drv.librarySystemDepends or []) ++ [ pkgs.ncurses ]; - }); - # We get lots of strange compiler errors during the test suite run. jsaddle = dontCheck super.jsaddle; - # Looks like Avahi provides the missing library - dnssd = super.dnssd.override { dns_sd = pkgs.avahi.override { withLibdnssdCompat = true; }; }; - # Haste stuff haste-Cabal = markBroken (self.callPackage ../tools/haskell/haste/haste-Cabal.nix {}); haste-cabal-install = markBroken (self.callPackage ../tools/haskell/haste/haste-cabal-install.nix { Cabal = self.haste-Cabal; }); haste-compiler = markBroken (self.callPackage ../tools/haskell/haste/haste-compiler.nix { inherit overrideCabal; super-haste-compiler = super.haste-compiler; }); - # Ensure the necessary frameworks are propagatedBuildInputs on darwin - OpenGLRaw = overrideCabal super.OpenGLRaw (drv: { - librarySystemDepends = - pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; - libraryHaskellDepends = drv.libraryHaskellDepends - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]; - preConfigure = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' - frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done)) - frameworkPaths=$(IFS=, ; echo "''${frameworkPaths[@]}") - configureFlags+=$(if [ -n "$frameworkPaths" ]; then echo -n "--ghc-options=-optl=$frameworkPaths"; fi) - ''; - }); - GLURaw = overrideCabal super.GLURaw (drv: { - librarySystemDepends = - pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; - libraryHaskellDepends = drv.libraryHaskellDepends - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]; - }); - bindings-GLFW = overrideCabal super.bindings-GLFW (drv: { - doCheck = false; # requires an active X11 display - librarySystemDepends = - pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; - libraryHaskellDepends = drv.libraryHaskellDepends - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - (with pkgs.darwin.apple_sdk.frameworks; - [ AGL Cocoa OpenGL IOKit Kernel CoreVideo - pkgs.darwin.CF ]); - }); - OpenCL = overrideCabal super.OpenCL (drv: { - librarySystemDepends = - pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; - libraryHaskellDepends = drv.libraryHaskellDepends - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]; - }); - # tinc is a new build driver a la Stack that's not yet available from Hackage. tinc = self.callPackage ../tools/haskell/tinc {}; @@ -996,23 +690,8 @@ self: super: { cairo = addBuildTool super.cairo self.gtk2hs-buildtools; pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"]; - # Fix tests which would otherwise fail with "Couldn't launch intero process." - intero = overrideCabal super.intero (drv: { - postPatch = (drv.postPatch or "") + '' - substituteInPlace src/test/Main.hs --replace "\"intero\"" "\"$PWD/dist/build/intero/intero\"" - ''; - }); - - # The most current version needs some packages to build that are not in LTS 7.x. - stack = super.stack.overrideScope (self: super: { - http-client = self.http-client_0_5_5; - http-client-tls = self.http-client-tls_0_3_3_1; - http-conduit = self.http-conduit_2_2_3; - optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0; - criterion = super.criterion.override { inherit (super) optparse-applicative; }; - aeson = self.aeson_1_0_2_1; - hpack = self.hpack_0_15_0; - }); + # https://github.com/commercialhaskell/stack/issues/3001 + stack = doJailbreak super.stack; # The latest Hoogle needs versions not yet in LTS Haskell 7.x. hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; }; @@ -1036,21 +715,6 @@ self: super: { # Needs new version. haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_19_1; }; - # Test suite fails a QuickCheck property. - optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0; - - # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for - # it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config - # depend on freeglut, which provides GHC to necessary information to generate a correct RPATH. - # - # Note: Simply patching the dynamic library (.so) of the GLUT build will *not* work, since the - # RPATH also needs to be propagated when using static linking. GHC automatically handles this for - # us when we patch the cabal file (Link options will be recored in the ghc package registry). - # - # Additional note: nixpkgs' freeglut and macOS's OpenGL implementation do not cooperate, - # so disable this on Darwin only - ${if pkgs.stdenv.isDarwin then null else "GLUT"} = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut; - # https://github.com/Philonous/hs-stun/pull/1 # Remove if a version > 0.1.0.1 ever gets released. stunclient = overrideCabal super.stunclient (drv: { @@ -1059,33 +723,19 @@ self: super: { ''; }); - idris = overrideCabal super.idris (drv: { - # "idris" binary cannot find Idris library otherwise while building. After - # installing it's completely fine though. This seems like a bug in Idris - # that's related to builds with shared libraries enabled. It would be great - # if someone who knows a thing or two about Idris could look into this. - preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH"; - # https://github.com/idris-lang/Idris-dev/issues/2499 - librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp]; - # test suite cannot find its own "idris" binary - doCheck = false; - }); + # test suite cannot find its own "idris" binary + idris = dontCheck super.idris; # https://github.com/bos/math-functions/issues/25 math-functions = dontCheck super.math-functions; - # http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version - # is hard because of transitive dependencies, so we just disable tests. - http-api-data_0_3_5 = dontCheck super.http-api-data_0_3_5; + # broken test suite + servant-server = dontCheck super.servant-server; # Fix build for latest versions of servant and servant-client. - servant_0_9_1_1 = super.servant_0_9_1_1.overrideScope (self: super: { - http-api-data = self.http-api-data_0_3_5; - }); - servant-client_0_9_1_1 = super.servant-client_0_9_1_1.overrideScope (self: super: { - http-api-data = self.http-api-data_0_3_5; - servant-server = self.servant-server_0_9_1_1; - servant = self.servant_0_9_1_1; + servant-client_0_10 = super.servant-client_0_10.overrideScope (self: super: { + servant-server = self.servant-server_0_10; + servant = self.servant_0_10; }); # build servant docs from the repository @@ -1098,7 +748,7 @@ self: super: { owner = "haskell-servant"; repo = "servant"; rev = "v${ver}"; - sha256 = "0fynv77m7rk79pdp535c2a2bd44csgr32zb4wqavbalr7grpxg4q"; + sha256 = "09kjinnarf9q9l8irs46gcrai8bprq39n8pj43bmdv47hl38csa0"; }}/doc"; buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; makeFlags = "html"; @@ -1116,26 +766,15 @@ self: super: { # https://github.com/plow-technologies/servant-auth/issues/20 servant-auth = dontCheck super.servant-auth; - servant-auth-server = super.servant-auth-server.overrideScope (self: super: { - jose = super.jose_0_5_0_2; - }); - # https://github.com/pontarius/pontarius-xmpp/issues/105 pontarius-xmpp = dontCheck super.pontarius-xmpp; - # https://github.com/fpco/store/issues/77 - store = dontCheck super.store; - store_0_3 = super.store_0_3.overrideScope (self: super: { store-core = self.store-core_0_3; }); - # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = doJailbreak super.applicative-quoters; # https://github.com/roelvandijk/terminal-progress-bar/issues/13 terminal-progress-bar = doJailbreak super.terminal-progress-bar; - # https://github.com/vshabanov/HsOpenSSL/issues/11 - HsOpenSSL = doJailbreak super.HsOpenSSL; - # https://github.com/NixOS/nixpkgs/issues/19612 wai-app-file-cgi = (dontCheck super.wai-app-file-cgi).overrideScope (self: super: { http-client = self.http-client_0_5_5; @@ -1147,9 +786,8 @@ self: super: { # note: the library is unmaintained, no upstream issue dataenc = doJailbreak super.dataenc; - libsystemd-journal = overrideCabal super.libsystemd-journal (old: { - librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ]; - }); + # https://github.com/divipp/ActiveHs-misc/issues/10 + data-pprint = doJailbreak super.data-pprint; # horribly outdated (X11 interface changed a lot) sindre = markBroken super.sindre; @@ -1167,29 +805,63 @@ self: super: { # https://github.com/josefs/STMonadTrans/issues/4 STMonadTrans = dontCheck super.STMonadTrans; - socket_0_7_0_0 = super.socket_0_7_0_0.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_9_2; }); - - # Encountered missing dependencies: hspec >=1.3 && <2.1 - # https://github.com/rampion/ReadArgs/issues/8 - ReadArgs = doJailbreak super.ReadArgs; - - # https://github.com/philopon/barrier/issues/3 - barrier = doJailbreak super.barrier; - - # requires vty 5.13 - brick = super.brick.overrideScope (self: super: { vty = self.vty_5_14; }); - - # https://github.com/krisajenkins/elm-export/pull/22 - elm-export = doJailbreak super.elm-export; - - turtle_1_3_1 = super.turtle_1_3_1.overrideScope (self: super: { - optparse-applicative = self.optparse-applicative_0_13_0_0; - }); + # No upstream issue tracker + hspec-expectations-pretty-diff = dontCheck super.hspec-expectations-pretty-diff; lentil = super.lentil.overrideScope (self: super: { pipes = self.pipes_4_3_2; - optparse-applicative = self.optparse-applicative_0_13_0_0; # https://github.com/roelvandijk/terminal-progress-bar/issues/14 terminal-progress-bar = doJailbreak self.terminal-progress-bar_0_1_1; }); + + # https://github.com/basvandijk/lifted-base/issues/34 + lifted-base = doJailbreak super.lifted-base; + + # https://github.com/aslatter/parsec/issues/68 + parsec = doJailbreak super.parsec; + + # Don't depend on chell-quickcheck, which doesn't compile due to restricting + # QuickCheck to versions ">=2.3 && <2.9". + system-filepath = dontCheck super.system-filepath; + + # https://github.com/basvandijk/case-insensitive/issues/24 + case-insensitive = doJailbreak super.case-insensitive; + + # https://github.com/hvr/uuid/issues/28 + uuid-types = doJailbreak super.uuid-types; + uuid = doJailbreak super.uuid; + + # https://github.com/hspec/hspec/issues/307 + hspec-contrib = dontCheck super.hspec-contrib; + + # https://github.com/ekmett/lens/issues/713 + lens = disableCabalFlag super.lens "test-doctests"; + + # https://github.com/haskell/fgl/issues/60 + fgl = doJailbreak super.fgl; + fgl-arbitrary = doJailbreak super.fgl-arbitrary; + + # https://github.com/Gabriel439/Haskell-DirStream-Library/issues/8 + dirstream = doJailbreak super.dirstream; + + # https://github.com/xmonad/xmonad-extras/issues/3 + xmonad-extras = doJailbreak super.xmonad-extras; + + # https://github.com/bmillwood/pointfree/issues/21 + pointfree = appendPatch super.pointfree (pkgs.fetchpatch { + url = "https://github.com/bmillwood/pointfree/pull/22.patch"; + sha256 = "04q0b5d78ill2yrpflkphvk2y38qc50si2qff4bllp47wj42aqmp"; + }); + + # https://github.com/int-e/QuickCheck-safe/issues/2 + QuickCheck-safe = doJailbreak super.QuickCheck-safe; + + # https://github.com/mokus0/dependent-sum-template/issues/7 + dependent-sum-template = doJailbreak super.dependent-sum-template; + + # https://github.com/jcristovao/newtype-generics/issues/13 + newtype-generics = doJailbreak super.newtype-generics; + + # https://github.com/lambdabot/lambdabot/issues/158 + lambdabot-core = doJailbreak super.lambdabot-core; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 095b6ee4f1b..78c3823a0f9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -60,12 +60,6 @@ self: super: { sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy"; }); - # https://github.com/christian-marie/xxhash/issues/3 - xxhash = doJailbreak super.xxhash; - - # https://github.com/Deewiant/glob/issues/8 - Glob = doJailbreak super.Glob; - ## GHC 8.0.2 # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 23e452baa78..364c5bcdf32 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,34 +1,34 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.0.1 +compiler: ghc-8.0.2 core-packages: - array-0.5.1.1 - - base-4.9.0.0 + - base-4.9.1.0 - binary-0.8.3.0 - bytestring-0.10.8.1 - - Cabal-1.24.0.0 + - Cabal-1.24.2.0 - containers-0.5.7.1 - deepseq-1.4.2.0 - - directory-1.2.6.2 - - filepath-1.4.1.0 - - ghc-8.0.1 - - ghc-boot-8.0.1 - - ghc-boot-th-8.0.1 + - directory-1.3.0.0 + - filepath-1.4.1.1 + - ghc-8.0.2 + - ghc-boot-8.0.2 + - ghc-boot-th-8.0.2 + - ghci-8.0.2 - ghc-prim-0.5.0.0 - - ghci-8.0.1 - - haskeline-0.7.2.3 + - haskeline-0.7.3.0 - hoopl-3.10.2.1 - hpc-0.6.0.3 - integer-gmp-1.0.0.1 - pretty-1.1.3.3 - - process-1.4.2.0 + - process-1.4.3.0 - rts-1.0 - - template-haskell-2.11.0.0 + - template-haskell-2.11.1.0 - terminfo-0.4.0.2 - time-1.6.0.1 - transformers-0.5.2.0 - - unix-2.7.2.0 + - unix-2.7.2.1 - xhtml-3000.2.1 # Hack: The following package is a core package of GHCJS. If we don't declare @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 7.16 + # LTS Haskell 8.0 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -46,106 +46,124 @@ default-package-overrides: - ace ==0.6 - acid-state ==0.14.2 - action-permutations ==0.0.0.1 - - active ==0.2.0.10 + - active ==0.2.0.12 - ad ==4.3.2.1 - adjunctions ==4.3 - adler32 ==0.1.1.0 - - aeson ==0.11.2.1 + - aeson ==1.0.2.1 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.1.0.5 - aeson-compat ==0.3.6 + - aeson-extra ==0.4.0.0 - aeson-generic-compat ==0.0.1.0 - - aeson-injector ==1.0.6.0 + - aeson-injector ==1.0.7.0 - aeson-pretty ==0.8.2 - aeson-qq ==0.8.1 - aeson-utils ==0.3.0.2 - - Agda ==2.5.1.1 + - Agda ==2.5.2 - airship ==0.6.0 - alarmclock ==0.4.0.2 - - alex ==3.1.7 - - amazonka ==1.4.3 - - amazonka-apigateway ==1.4.3 - - amazonka-application-autoscaling ==1.4.3 - - amazonka-autoscaling ==1.4.3 - - amazonka-certificatemanager ==1.4.3 - - amazonka-cloudformation ==1.4.3 - - amazonka-cloudfront ==1.4.3 - - amazonka-cloudhsm ==1.4.3 - - amazonka-cloudsearch ==1.4.3 - - amazonka-cloudsearch-domains ==1.4.3 - - amazonka-cloudtrail ==1.4.3 - - amazonka-cloudwatch ==1.4.3 - - amazonka-cloudwatch-events ==1.4.3 - - amazonka-cloudwatch-logs ==1.4.3 - - amazonka-codecommit ==1.4.3 - - amazonka-codedeploy ==1.4.3 - - amazonka-codepipeline ==1.4.3 - - amazonka-cognito-identity ==1.4.3 - - amazonka-cognito-idp ==1.4.3 - - amazonka-cognito-sync ==1.4.3 - - amazonka-config ==1.4.3 - - amazonka-core ==1.4.3 - - amazonka-datapipeline ==1.4.3 - - amazonka-devicefarm ==1.4.3 - - amazonka-directconnect ==1.4.3 - - amazonka-discovery ==1.4.3 - - amazonka-dms ==1.4.3 - - amazonka-ds ==1.4.3 - - amazonka-dynamodb ==1.4.3 - - amazonka-dynamodb-streams ==1.4.3 - - amazonka-ec2 ==1.4.3 - - amazonka-ecr ==1.4.3 - - amazonka-ecs ==1.4.3 - - amazonka-efs ==1.4.3 - - amazonka-elasticache ==1.4.3 - - amazonka-elasticbeanstalk ==1.4.3 - - amazonka-elasticsearch ==1.4.3 - - amazonka-elastictranscoder ==1.4.3 - - amazonka-elb ==1.4.3 - - amazonka-emr ==1.4.3 - - amazonka-gamelift ==1.4.3 - - amazonka-glacier ==1.4.3 - - amazonka-iam ==1.4.3 - - amazonka-importexport ==1.4.3 - - amazonka-inspector ==1.4.3 - - amazonka-iot ==1.4.3 - - amazonka-iot-dataplane ==1.4.3 - - amazonka-kinesis ==1.4.3 - - amazonka-kinesis-firehose ==1.4.3 - - amazonka-kms ==1.4.3 - - amazonka-lambda ==1.4.3 - - amazonka-marketplace-analytics ==1.4.3 - - amazonka-marketplace-metering ==1.4.3 - - amazonka-ml ==1.4.3 - - amazonka-opsworks ==1.4.3 - - amazonka-rds ==1.4.3 - - amazonka-redshift ==1.4.3 - - amazonka-route53 ==1.4.3 - - amazonka-route53-domains ==1.4.3 - - amazonka-s3 ==1.4.3 - - amazonka-sdb ==1.4.3 - - amazonka-ses ==1.4.3 - - amazonka-sns ==1.4.3 - - amazonka-sqs ==1.4.3 - - amazonka-ssm ==1.4.3 - - amazonka-storagegateway ==1.4.3 - - amazonka-sts ==1.4.3 - - amazonka-support ==1.4.3 - - amazonka-swf ==1.4.3 - - amazonka-test ==1.4.3 - - amazonka-waf ==1.4.3 - - amazonka-workspaces ==1.4.3 + - alex ==3.2.1 + - alternators ==0.1.1.0 + - ALUT ==2.4.0.2 + - amazonka ==1.4.5 + - amazonka-apigateway ==1.4.5 + - amazonka-application-autoscaling ==1.4.5 + - amazonka-appstream ==1.4.5 + - amazonka-autoscaling ==1.4.5 + - amazonka-budgets ==1.4.5 + - amazonka-certificatemanager ==1.4.5 + - amazonka-cloudformation ==1.4.5 + - amazonka-cloudfront ==1.4.5 + - amazonka-cloudhsm ==1.4.5 + - amazonka-cloudsearch ==1.4.5 + - amazonka-cloudsearch-domains ==1.4.5 + - amazonka-cloudtrail ==1.4.5 + - amazonka-cloudwatch ==1.4.5 + - amazonka-cloudwatch-events ==1.4.5 + - amazonka-cloudwatch-logs ==1.4.5 + - amazonka-codebuild ==1.4.5 + - amazonka-codecommit ==1.4.5 + - amazonka-codedeploy ==1.4.5 + - amazonka-codepipeline ==1.4.5 + - amazonka-cognito-identity ==1.4.5 + - amazonka-cognito-idp ==1.4.5 + - amazonka-cognito-sync ==1.4.5 + - amazonka-config ==1.4.5 + - amazonka-core ==1.4.5 + - amazonka-datapipeline ==1.4.5 + - amazonka-devicefarm ==1.4.5 + - amazonka-directconnect ==1.4.5 + - amazonka-discovery ==1.4.5 + - amazonka-dms ==1.4.5 + - amazonka-ds ==1.4.5 + - amazonka-dynamodb ==1.4.5 + - amazonka-dynamodb-streams ==1.4.5 + - amazonka-ec2 ==1.4.5 + - amazonka-ecr ==1.4.5 + - amazonka-ecs ==1.4.5 + - amazonka-efs ==1.4.5 + - amazonka-elasticache ==1.4.5 + - amazonka-elasticbeanstalk ==1.4.5 + - amazonka-elasticsearch ==1.4.5 + - amazonka-elastictranscoder ==1.4.5 + - amazonka-elb ==1.4.5 + - amazonka-elbv2 ==1.4.5 + - amazonka-emr ==1.4.5 + - amazonka-gamelift ==1.4.5 + - amazonka-glacier ==1.4.5 + - amazonka-health ==1.4.5 + - amazonka-iam ==1.4.5 + - amazonka-importexport ==1.4.5 + - amazonka-inspector ==1.4.5 + - amazonka-iot ==1.4.5 + - amazonka-iot-dataplane ==1.4.5 + - amazonka-kinesis ==1.4.5 + - amazonka-kinesis-analytics ==1.4.5 + - amazonka-kinesis-firehose ==1.4.5 + - amazonka-kms ==1.4.5 + - amazonka-lambda ==1.4.5 + - amazonka-lightsail ==1.4.5 + - amazonka-marketplace-analytics ==1.4.5 + - amazonka-marketplace-metering ==1.4.5 + - amazonka-ml ==1.4.5 + - amazonka-opsworks ==1.4.5 + - amazonka-opsworks-cm ==1.4.5 + - amazonka-pinpoint ==1.4.5 + - amazonka-polly ==1.4.5 + - amazonka-rds ==1.4.5 + - amazonka-redshift ==1.4.5 + - amazonka-rekognition ==1.4.5 + - amazonka-route53 ==1.4.5 + - amazonka-route53-domains ==1.4.5 + - amazonka-s3 ==1.4.5 + - amazonka-s3-streaming ==0.1.0.4 + - amazonka-sdb ==1.4.5 + - amazonka-servicecatalog ==1.4.5 + - amazonka-ses ==1.4.5 + - amazonka-shield ==1.4.5 + - amazonka-sms ==1.4.5 + - amazonka-snowball ==1.4.5 + - amazonka-sns ==1.4.5 + - amazonka-sqs ==1.4.5 + - amazonka-ssm ==1.4.5 + - amazonka-stepfunctions ==1.4.5 + - amazonka-storagegateway ==1.4.5 + - amazonka-sts ==1.4.5 + - amazonka-support ==1.4.5 + - amazonka-swf ==1.4.5 + - amazonka-test ==1.4.5 + - amazonka-waf ==1.4.5 + - amazonka-workspaces ==1.4.5 + - amazonka-xray ==1.4.5 - amqp ==0.14.1 - - angel ==0.6.2 - annotated-wl-pprint ==0.7.0 - - anonymous-sums ==0.4.0.0 + - anonymous-sums ==0.6.0.0 - ansi-terminal ==0.6.2.3 - ansi-wl-pprint ==0.6.7.3 - - ansigraph ==0.2.0.0 - - api-field-json-th ==0.1.0.1 + - ansigraph ==0.3.0.2 - app-settings ==0.2.0.10 - appar ==0.1.4 - - apply-refact ==0.3.0.0 - arbtt ==0.9.0.12 - arithmoi ==0.4.3.0 - array-memoize ==0.6.0 @@ -157,24 +175,29 @@ default-package-overrides: - asn1-types ==0.3.2 - async ==2.1.1 - async-dejafu ==0.1.3.0 - - atndapi ==0.1.1.0 - - atom-conduit ==0.3.1.2 + - async-extra ==0.1.0.0 + - atom-basic ==0.2.4 + - atom-conduit ==0.4.0.1 - atomic-primops ==0.8.0.4 - atomic-write ==0.2.0.5 - attoparsec ==0.13.1.0 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 - authenticate ==1.3.3.2 - - authenticate-oauth ==1.5.1.2 + - authenticate-oauth ==1.6 - auto ==0.4.3.1 - auto-update ==0.1.4 - - autoexporter ==0.2.3 - - aws ==0.14.1 - - b9 ==0.5.30 - - bake ==0.4 + - autoexporter ==1.0.0 + - avers ==0.0.17.1 + - avers-api ==0.0.18.0 + - avers-api-docs ==0.0.18.0 + - avers-server ==0.0.18.0 + - avwx ==0.3.0.2 + - b9 ==0.5.31 + - bake ==0.5 - bank-holidays-england ==0.1.0.5 - base-compat ==0.9.1 - - base-noprelude ==4.9.0.0 + - base-noprelude ==4.9.1.0 - base-orphans ==0.5.4 - base-prelude ==1.0.1.1 - base-unicode-symbols ==0.2.2.4 @@ -193,9 +216,11 @@ default-package-overrides: - bimap-server ==0.1.0.1 - binary-bits ==0.5 - binary-conduit ==1.2.4.1 + - binary-ieee754 ==0.1.0.0 - binary-list ==1.1.1.2 - - binary-orphans ==0.1.5.2 + - binary-orphans ==0.1.6.0 - binary-parser ==0.5.2 + - binary-parsers ==0.2.3.0 - binary-search ==1.0.0.3 - binary-tagged ==0.1.4.2 - binary-typed ==1.0 @@ -208,15 +233,13 @@ default-package-overrides: - biofasta ==0.0.3 - biofastq ==0.1 - biopsl ==0.4 - - bitcoin-api ==0.12.1 - - bitcoin-api-extra ==0.9.1 + - bitarray ==0.0.1.1 - bitcoin-block ==0.13.1 - - bitcoin-payment-channel ==0.3.0.1 - bitcoin-script ==0.11.1 - bitcoin-tx ==0.13.1 - bitcoin-types ==0.9.2 - bits ==0.5 - - bitx-bitcoin ==0.10.0.0 + - bitx-bitcoin ==0.11.0.0 - blake2 ==0.2.0 - blank-canvas ==0.6 - BlastHTTP ==1.2.1 @@ -227,23 +250,29 @@ default-package-overrides: - blaze-markup ==0.7.1.1 - blaze-svg ==0.3.6 - blaze-textual ==0.2.1.0 - - bloodhound ==0.11.0.0 - - blosum ==0.1.1.2 + - BlogLiterately ==0.8.4.3 + - BlogLiterately-diagrams ==0.2.0.5 + - bloodhound ==0.12.1.0 + - blosum ==0.1.1.4 - bmp ==1.2.6.3 + - bool-extras ==0.4.0 - Boolean ==0.2.3 + - boolean-like ==0.1.1.0 - boolsimplifier ==0.1.8 - boomerang ==1.4.5.2 - both ==0.1.1.0 - BoundedChan ==1.0.3.0 - boundingboxes ==0.2.3 - - bower-json ==0.8.1 + - bower-json ==1.0.0.1 - boxes ==0.1.4 + - brick ==0.17 - broadcast-chan ==0.1.1 - bson ==0.3.2.3 - bson-lens ==0.1.1 - - btrfs ==0.1.2.0 + - btrfs ==0.1.2.3 + - buffer-builder ==0.2.4.4 - bumper ==0.6.0.3 - - bustle ==0.5.4 + - bv ==0.4.1 - byteable ==0.1.1 - bytedump ==1.0 - byteorder ==1.0.4 @@ -260,27 +289,26 @@ default-package-overrides: - bzlib-conduit ==0.2.1.4 - c2hs ==0.28.1 - Cabal ==1.24.2.0 - - cabal-dependency-licenses ==0.1.2.0 + - cabal-dependency-licenses ==0.2.0.0 + - cabal-doctest ==1 - cabal-file-th ==0.2.4 - - cabal-helper ==0.7.2.0 - - cabal-rpm ==0.10.1 - - cabal-sort ==0.0.5.3 - - cabal-src ==0.3.0.2 + - cabal-helper ==0.7.3.0 + - cabal-rpm ==0.11 - cache ==0.1.0.0 - - cacophony ==0.8.0 + - cacophony ==0.9.1 - cairo ==0.13.3.1 - call-stack ==0.1.0 - - camfort ==0.900 + - camfort ==0.901 - carray ==0.1.6.5 - cartel ==0.18.0.2 - case-insensitive ==1.2.0.7 - cased ==0.1.0.0 - - cases ==0.1.3.1 + - cases ==0.1.3.2 - cassava ==0.4.5.1 - - cassava-conduit ==0.3.2 + - cassava-conduit ==0.3.5.1 - cassava-megaparsec ==0.1.0 - cassette ==0.1.0 - - cayley-client ==0.2.1.1 + - cayley-client ==0.4.0 - cereal ==0.5.4.0 - cereal-conduit ==0.7.3 - cereal-text ==0.1.0.2 @@ -292,6 +320,7 @@ default-package-overrides: - Chart ==1.8.1 - Chart-cairo ==1.8.1 - Chart-diagrams ==1.8.1 + - chart-unit ==0.1.0.0 - ChasingBottoms ==1.3.1.2 - cheapskate ==0.1.0.5 - cheapskate-highlight ==0.1.0.0 @@ -299,7 +328,7 @@ default-package-overrides: - check-email ==1.0 - checkers ==0.4.6 - chell ==0.4.0.1 - - chell-quickcheck ==0.2.5 + - choice ==0.2.0 - chunked-data ==0.3.0 - cipher-aes ==0.2.11 - cipher-aes128 ==0.7.0.3 @@ -308,49 +337,52 @@ default-package-overrides: - cipher-des ==0.0.6 - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.5 - - clash-lib ==0.6.21 - - clash-prelude ==0.10.14 - - clash-systemverilog ==0.6.10 - - clash-verilog ==0.6.10 - - clash-vhdl ==0.6.16 - - classy-prelude ==1.0.2 - - classy-prelude-conduit ==1.0.2 - - classy-prelude-yesod ==1.0.2 - - clay ==0.11 - - clckwrks ==0.23.19.2 + - clang-pure ==0.2.0.2 + - clash-ghc ==0.7.0.1 + - clash-lib ==0.7 + - clash-prelude ==0.11 + - clash-systemverilog ==0.7 + - clash-verilog ==0.7 + - clash-vhdl ==0.7 + - classy-prelude ==1.2.0 + - classy-prelude-conduit ==1.2.0 + - classy-prelude-yesod ==1.2.0 + - clay ==0.12.1 + - clckwrks ==0.24.0.3 - clckwrks-cli ==0.2.17.1 - - clckwrks-plugin-media ==0.6.16.1 - - clckwrks-plugin-page ==0.4.3.5 + - clckwrks-plugin-media ==0.6.16.3 + - clckwrks-plugin-page ==0.4.3.9 - clckwrks-theme-bootstrap ==0.4.2.1 - cli ==0.1.2 - clientsession ==0.9.1.2 - Clipboard ==2.3.1.0 - clock ==0.7.2 + - clock-extras ==0.1.0.2 - clumpiness ==0.17.0.0 - - ClustalParser ==1.1.4 - - clustering ==0.2.1 - - cmark ==0.5.4 + - ClustalParser ==1.2.1 + - clustering ==0.3.1 + - cmark ==0.5.5 - cmark-highlight ==0.2.0.0 - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.14 - code-builder ==0.1.3 + - code-page ==0.1.1 - codo-notation ==0.5.2 + - colorful-monoids ==0.2.1.0 - colour ==2.3.3 - commutative ==0.0.1.4 - comonad ==5 - comonad-transformers ==4.0 - comonads-fd ==4.0 - compactmap ==0.1.4.2 - - compdata ==0.10.1 - composition ==1.0.2.1 - composition-extra ==2.0.0 - - concatenative ==1.0.1 - concurrency ==1.0.0.0 - - concurrent-extra ==0.7.0.10 - concurrent-output ==1.7.8 - concurrent-supply ==0.1.8 - - conduit ==1.2.8 - - conduit-combinators ==1.0.8.3 + - conduit ==1.2.9 + - conduit-combinators ==1.1.0 + - conduit-connection ==0.1.0.3 - conduit-extra ==1.1.15 - conduit-iconv ==0.1.1.1 - conduit-parse ==0.1.2.0 @@ -358,32 +390,36 @@ default-package-overrides: - configuration-tools ==0.2.15 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - - connection ==0.2.6 - - constraints ==0.8 - - consul-haskell ==0.3 + - connection ==0.2.7 + - console-style ==0.0.2.1 + - constraints ==0.9 + - consul-haskell ==0.4.2 - containers-unicode-symbols ==0.3.1.1 - - continued-fractions ==0.9.1.1 - contravariant ==1.4 - contravariant-extras ==0.3.3.1 - control-bool ==0.2.1 - control-monad-free ==0.6.1 - control-monad-loop ==0.1 - control-monad-omega ==0.3.1 - - converge ==0.1.0.1 + - convert-annotation ==0.5.0.1 - convertible ==1.1.1.0 - cookie ==0.4.2.1 - countable ==1.0 - courier ==0.1.1.4 - - cpphs ==1.20.2 + - cpphs ==1.20.3 - cprng-aes ==0.6.1 - cpu ==0.1.2 - - crackNum ==1.5 - - criterion ==1.1.1.0 - - cron ==0.4.2 + - cpuinfo ==0.1.0.1 + - cql ==3.1.1 + - cql-io ==0.16.0 + - crackNum ==1.9 + - criterion ==1.1.4.0 + - cron ==0.5.0 - crypto-api ==0.13.2 - crypto-api-tests ==0.3 - crypto-cipher-tests ==0.0.11 - crypto-cipher-types ==0.0.9 + - crypto-enigma ==0.0.2.8 - crypto-numbers ==0.2.7 - crypto-pubkey ==0.2.8 - crypto-pubkey-types ==0.4.3 @@ -398,12 +434,16 @@ default-package-overrides: - cryptohash-sha256 ==0.11.100.1 - cryptol ==2.4.0 - cryptonite ==0.21 - - cryptonite-conduit ==0.1 + - cryptonite-conduit ==0.2.0 + - cryptonite-openssl ==0.5 - css-syntax ==0.0.5 - css-text ==0.1.2.2 - csv ==0.1.2 + - csv-conduit ==0.6.7 - ctrie ==0.1.1.0 + - cubicbezier ==0.5.0.0 - cubicspline ==0.1.2 + - cue-sheet ==0.1.0 - curl ==1.3.8 - darcs ==2.12.5 - data-accessor ==0.2.2.7 @@ -419,39 +459,39 @@ default-package-overrides: - data-inttrie ==0.1.2 - data-lens-light ==0.1.2.2 - data-memocombinators ==0.5.1 + - data-msgpack ==0.0.9 - data-or ==1.0.0.5 - data-ordlist ==0.4.7.0 - data-reify ==0.6.1 + - datasets ==0.2.1 - dataurl ==0.1.0.0 - DAV ==1.3.1 - dawg-ord ==0.5.1.0 - - dbus ==0.10.12 - debian-build ==0.10.1.0 - Decimal ==0.4.2 - - declarative ==0.2.3 + - declarative ==0.5.1 - deepseq-generics ==0.2.0.0 - dejafu ==0.4.0.0 - dependent-map ==0.2.4.0 - - dependent-sum ==0.3.2.2 - - dependent-sum-template ==0.0.0.5 - - derive ==2.5.26 + - dependent-sum ==0.4 - deriving-compat ==0.3.5 - descriptive ==0.9.4 - - diagrams ==1.3.0.1 - - diagrams-cairo ==1.3.1.1 - - diagrams-canvas ==1.3.0.6 - - diagrams-contrib ==1.3.0.12 - - diagrams-core ==1.3.0.8 - - diagrams-gtk ==1.3.0.2 - - diagrams-html5 ==1.3.0.7 - - diagrams-lib ==1.3.1.4 - - diagrams-postscript ==1.3.0.7 - - diagrams-rasterific ==1.3.1.8 + - diagrams ==1.4 + - diagrams-builder ==0.8.0.1 + - diagrams-cairo ==1.4 + - diagrams-canvas ==1.4 + - diagrams-contrib ==1.4.0.1 + - diagrams-core ==1.4 + - diagrams-gtk ==1.4 + - diagrams-html5 ==1.4 + - diagrams-lib ==1.4.0.1 + - diagrams-postscript ==1.4 + - diagrams-rasterific ==1.4 - diagrams-solve ==0.1.0.1 - - diagrams-svg ==1.4.0.3 + - diagrams-svg ==1.4.1 - dice ==0.1 - Diff ==0.3.4 - - diff3 ==0.2.0.3 + - diff3 ==0.3.0 - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.0.1.3 @@ -459,23 +499,29 @@ default-package-overrides: - directory-tree ==0.12.1 - discount ==0.1.1 - disk-free-space ==0.1.0.1 + - distance ==0.1.0.0 - distributed-closure ==0.3.3.0 + - distributed-process ==0.6.6 + - distributed-process-simplelocalnet ==0.2.3.3 - distributed-static ==0.3.5.0 - distribution-nixpkgs ==1.0.0.1 - - distributive ==0.5.1 - - diversity ==0.8.0.1 + - distributive ==0.5.2 + - diversity ==0.8.0.2 - djinn-ghc ==0.0.2.3 - djinn-lib ==0.0.1.2 - dlist ==0.8.0.2 - dlist-instances ==0.1.1.1 + - dmenu ==0.3.1.1 + - dmenu-pkill ==0.1.0.1 + - dmenu-pmount ==0.1.0.1 + - dmenu-search ==0.1.0.1 - dns ==2.0.10 - do-list ==1.0.1 - dockerfile ==0.1.0.1 - docopt ==0.7.0.5 - - doctest ==0.11.0 + - doctemplates ==0.1.0.2 + - doctest ==0.11.1 - doctest-discover ==0.1.0.7 - - doctest-prop ==0.2.0.1 - - docvim ==0.3.2.1 - dotenv ==0.3.1.0 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 @@ -484,15 +530,16 @@ default-package-overrides: - drawille ==0.1.2.0 - DRBG ==0.5.5 - drifter ==0.2.2 - - drifter-postgresql ==0.0.2 + - drifter-postgresql ==0.1.0 - dual-tree ==0.2.0.9 - dynamic-state ==0.2.2.0 - dyre ==0.8.12 - Earley ==0.11.0.1 - easy-file ==0.2.1 - Ebnf2ps ==1.0.15 + - echo ==0.1.3 - ed25519 ==0.0.5.0 - - ede ==0.2.8.6 + - ede ==0.2.8.7 - EdisonAPI ==1.3.1 - EdisonCore ==1.3.1.1 - edit-distance ==0.2.2.1 @@ -503,26 +550,34 @@ default-package-overrides: - ekg ==0.4.0.12 - ekg-core ==0.1.1.1 - ekg-json ==0.1.0.4 + - ekg-statsd ==0.2.1.0 - elerea ==2.9.0 - - elm-bridge ==0.3.0.2 + - elm-bridge ==0.4.0 - elm-core-sources ==1.0.0 + - elm-export ==0.6.0.1 + - elm-export-persistent ==0.1.2 - email-validate ==2.2.0 - - emailaddress ==0.1.6.0 + - emailaddress ==0.2.0.0 - enclosed-exceptions ==1.0.2 - encoding-io ==0.0.1 + - EntrezHTTP ==1.0.3 - entropy ==0.3.7 - enummapset-th ==0.6.1.1 - - envelope ==0.1.0.0 + - envelope ==0.2.1.0 + - envparse ==0.4 + - envy ==1.3.0.1 + - epub-metadata ==4.5 - eq ==4.0.4 - - equivalence ==0.3.1 + - equivalence ==0.3.2 - erf ==2.0.0.0 - errors ==2.1.3 - ersatz ==0.3.1 + - esqueleto ==2.5.1 - etcd ==1.0.5 - ether ==0.4.0.2 - euphoria ==0.8.0.0 - event ==0.1.4 - - eventstore ==0.13.1.2 + - eventstore ==0.14.0.1 - exact-combinatorics ==0.2.0.8 - exact-pi ==0.4.1.2 - exception-mtl ==0.4.0.1 @@ -531,28 +586,26 @@ default-package-overrides: - exceptions ==0.8.3 - executable-hash ==0.2.0.4 - executable-path ==0.0.3 - - exp-pairs ==0.1.5.1 + - exhaustive ==1.1.3 + - exp-pairs ==0.1.5.2 - expiring-cache-map ==0.0.6.1 - - explicit-exception ==0.1.8 - extensible ==0.3.7 - extensible-effects ==1.11.0.4 - extensible-exceptions ==0.1.1.4 - - extra ==1.4.10 - - extract-dependencies ==0.2.0.1 + - extra ==1.5.1 - fail ==4.9.0.0 - farmhash ==0.1.0.5 - fast-builder ==0.0.0.6 - fast-digits ==0.2.1.0 - - fast-logger ==2.4.7 - - fasta ==0.10.4.0 - - fay ==0.23.1.12 + - fast-logger ==2.4.10 + - fasta ==0.10.4.1 + - fay ==0.23.1.16 - fay-base ==0.20.0.1 - fay-builder ==0.2.0.5 - fay-dom ==0.5.0.1 - fay-jquery ==0.6.1.0 - fay-text ==0.3.2.2 - fay-uri ==0.2.0.0 - - fb ==1.0.13 - fclabels ==2.0.3.2 - feature-flags ==0.1.0.1 - feed ==0.3.12.0 @@ -565,60 +618,63 @@ default-package-overrides: - filecache ==0.2.9 - filelock ==0.1.0.1 - filemanip ==0.3.6.3 - - find-clumpiness ==0.2.0.1 - - FindBin ==0.0.5 - fingertree ==0.1.1.0 - fingertree-psqueue ==0.3 + - finite-typelits ==0.1.1.0 - fixed ==0.2.1.1 - - fixed-vector ==0.8.1.0 + - fixed-vector ==0.9.0.0 - fixed-vector-hetero ==0.3.1.1 - - flat-mcmc ==1.0.1 + - flac ==0.1.1 + - flac-picture ==0.1.0 + - flat-mcmc ==1.5.0 - flexible-defaults ==0.0.1.2 + - FloatingHex ==0.4 - flock ==0.3.1.8 - flow ==1.0.7 - fmlist ==0.9 - fn ==0.3.0.1 - focus ==0.1.5 - - fold-debounce ==0.2.0.4 - - fold-debounce-conduit ==0.1.0.4 + - fold-debounce ==0.2.0.5 + - fold-debounce-conduit ==0.1.0.5 - foldl ==1.2.3 + - foldl-statistics ==0.1.4.2 + - folds ==0.7.1 - FontyFruity ==0.5.3.2 - force-layout ==0.4.0.6 - - forecast-io ==0.2.0.0 - foreign-store ==0.2 + - format-numbers ==0.1.0.0 - formatting ==6.2.4 - fortran-src ==0.1.0.4 - Frames ==0.1.9 - free ==4.12.4 - free-vl ==0.1.4 - freenect ==1.2.1 - - freer ==0.2.4.1 - friendly-time ==0.4 - frisby ==0.2 + - from-sum ==0.2.1.0 - frontmatter ==0.1.0.2 - fsnotify ==0.2.1 - fsnotify-conduit ==0.1.0.0 - funcmp ==1.8 - fuzzcheck ==0.1.1 - - gamma ==0.9.0.2 - gd ==3000.7.3 - Genbank ==1.0.3 - generic-aeson ==0.2.0.8 - generic-deriving ==1.11.1 + - generic-random ==0.4.0.0 - generic-xmlpickler ==0.1.0.5 - GenericPretty ==1.2.1 - generics-eot ==0.2.1.1 - - generics-sop ==0.2.3.0 + - generics-sop ==0.2.4.0 - generics-sop-lens ==0.1.2.1 - geniplate-mirror ==0.7.4 - - genvalidity ==0.2.0.4 - - genvalidity-hspec ==0.2.0.5 - getopt-generics ==0.13 - ghc-events ==0.4.4.0 - - ghc-exactprint ==0.5.2.1 + - ghc-exactprint ==0.5.3.0 - ghc-heap-view ==0.5.7 - - ghc-mod ==5.6.0.0 + - ghc-mod ==5.7.0.0 - ghc-paths ==0.1.0.9 + - ghc-prof ==1.3.0.2 - ghc-syb-utils ==0.2.3 - ghc-tcplugins-extra ==0.2 - ghc-typelits-extra ==0.2.2 @@ -627,138 +683,145 @@ default-package-overrides: - ghcid ==0.6.6 - ghcjs-codemirror ==0.0.0.1 - ghcjs-hplay ==0.3.4.2 - - ghcjs-perch ==0.3.3 - - gi-atk ==2.0.3 - - gi-cairo ==1.0.3 - - gi-gdk ==3.0.3 - - gi-gdkpixbuf ==2.0.3 - - gi-gio ==2.0.3 - - gi-glib ==2.0.3 - - gi-gobject ==2.0.3 - - gi-gtk ==3.0.3 - - gi-javascriptcore ==3.0.3 - - gi-pango ==1.0.3 - - gi-soup ==2.4.3 - - gi-webkit ==3.0.3 + - ghcjs-perch ==0.3.3.1 + - gi-atk ==2.0.11 + - gi-cairo ==1.0.11 + - gi-gdk ==3.0.11 + - gi-gdkpixbuf ==2.0.11 + - gi-gio ==2.0.11 + - gi-glib ==2.0.11 + - gi-gobject ==2.0.11 + - gi-gtk ==3.0.11 + - gi-javascriptcore ==3.0.11 + - gi-pango ==1.0.11 + - gi-soup ==2.4.11 + - gi-webkit ==3.0.11 + - ginger ==0.3.9.1 - gio ==0.13.3.1 - gipeda ==0.3.3.1 - - giphy-api ==0.4.0.0 - - git-fmt ==0.4.1.0 + - giphy-api ==0.5.2.0 + - github ==0.15.0 + - github-release ==1.0.1 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 + - github-webhook-handler-snap ==0.0.7 - gitlib ==3.1.1 - gitlib-libgit2 ==3.1.1 - gitlib-test ==3.1.0.3 - gitrev ==1.2.0 - gitson ==0.5.2 - - gl ==0.7.8.1 - - glabrous ==0.1.3.0 + - glabrous ==0.3.1 + - glaze ==0.2.0.2 + - glazier ==0.7.0.0 + - glazier-pipes ==0.1.4.0 - GLFW-b ==1.4.8.1 - glib ==0.13.4.1 - Glob ==0.7.14 + - glob-posix ==0.1.0.1 - gloss ==1.10.2.5 - gloss-rendering ==1.10.3.5 - GLURaw ==2.0.0.3 - - GLUT ==2.7.0.10 - - gogol ==0.1.0 - - gogol-adexchange-buyer ==0.1.0 - - gogol-adexchange-seller ==0.1.0 - - gogol-admin-datatransfer ==0.1.0 - - gogol-admin-directory ==0.1.0 - - gogol-admin-emailmigration ==0.1.0 - - gogol-admin-reports ==0.1.0 - - gogol-adsense ==0.1.0 - - gogol-adsense-host ==0.1.0 - - gogol-affiliates ==0.1.0 - - gogol-analytics ==0.1.0 - - gogol-android-enterprise ==0.1.0 - - gogol-android-publisher ==0.1.0 - - gogol-appengine ==0.1.0 - - gogol-apps-activity ==0.1.0 - - gogol-apps-calendar ==0.1.0 - - gogol-apps-licensing ==0.1.0 - - gogol-apps-reseller ==0.1.0 - - gogol-apps-tasks ==0.1.0 - - gogol-appstate ==0.1.0 - - gogol-autoscaler ==0.1.0 - - gogol-bigquery ==0.1.0 - - gogol-billing ==0.1.0 - - gogol-blogger ==0.1.0 - - gogol-books ==0.1.0 - - gogol-civicinfo ==0.1.0 - - gogol-classroom ==0.1.0 - - gogol-cloudmonitoring ==0.1.0 - - gogol-cloudtrace ==0.1.0 - - gogol-compute ==0.1.0 - - gogol-container ==0.1.0 - - gogol-core ==0.1.0 - - gogol-customsearch ==0.1.0 - - gogol-dataflow ==0.1.0 - - gogol-dataproc ==0.1.0 - - gogol-datastore ==0.1.0 - - gogol-debugger ==0.1.0 - - gogol-deploymentmanager ==0.1.0 - - gogol-dfareporting ==0.1.0 - - gogol-discovery ==0.1.0 - - gogol-dns ==0.1.0 - - gogol-doubleclick-bids ==0.1.0 - - gogol-doubleclick-search ==0.1.0 - - gogol-drive ==0.1.0 - - gogol-firebase-rules ==0.1.0 - - gogol-fitness ==0.1.0 - - gogol-fonts ==0.1.0 - - gogol-freebasesearch ==0.1.0 - - gogol-fusiontables ==0.1.0 - - gogol-games ==0.1.0 - - gogol-games-configuration ==0.1.0 - - gogol-games-management ==0.1.0 - - gogol-genomics ==0.1.0 - - gogol-gmail ==0.1.0 - - gogol-groups-migration ==0.1.0 - - gogol-groups-settings ==0.1.0 - - gogol-identity-toolkit ==0.1.0 - - gogol-kgsearch ==0.1.0 - - gogol-latencytest ==0.1.0 - - gogol-logging ==0.1.0 - - gogol-maps-coordinate ==0.1.0 - - gogol-maps-engine ==0.1.0 - - gogol-mirror ==0.1.0 - - gogol-monitoring ==0.1.0 - - gogol-oauth2 ==0.1.0 - - gogol-pagespeed ==0.1.0 - - gogol-partners ==0.1.0 - - gogol-people ==0.1.0 - - gogol-play-moviespartner ==0.1.0 - - gogol-plus ==0.1.0 - - gogol-plus-domains ==0.1.0 - - gogol-prediction ==0.1.0 - - gogol-proximitybeacon ==0.1.0 - - gogol-pubsub ==0.1.0 - - gogol-qpxexpress ==0.1.0 - - gogol-replicapool ==0.1.0 - - gogol-replicapool-updater ==0.1.0 - - gogol-resourcemanager ==0.1.0 - - gogol-resourceviews ==0.1.0 - - gogol-script ==0.1.0 - - gogol-sheets ==0.1.0 - - gogol-shopping-content ==0.1.0 - - gogol-siteverification ==0.1.0 - - gogol-spectrum ==0.1.0 - - gogol-sqladmin ==0.1.0 - - gogol-storage ==0.1.0 - - gogol-storage-transfer ==0.1.0 - - gogol-tagmanager ==0.1.0 - - gogol-taskqueue ==0.1.0 - - gogol-translate ==0.1.0 - - gogol-urlshortener ==0.1.0 - - gogol-useraccounts ==0.1.0 - - gogol-vision ==0.1.0 - - gogol-webmaster-tools ==0.1.0 - - gogol-youtube ==0.1.0 - - gogol-youtube-analytics ==0.1.0 - - gogol-youtube-reporting ==0.1.0 + - GLUT ==2.7.0.11 + - gogol ==0.1.1 + - gogol-adexchange-buyer ==0.1.1 + - gogol-adexchange-seller ==0.1.1 + - gogol-admin-datatransfer ==0.1.1 + - gogol-admin-directory ==0.1.1 + - gogol-admin-emailmigration ==0.1.1 + - gogol-admin-reports ==0.1.1 + - gogol-adsense ==0.1.1 + - gogol-adsense-host ==0.1.1 + - gogol-affiliates ==0.1.1 + - gogol-analytics ==0.1.1 + - gogol-android-enterprise ==0.1.1 + - gogol-android-publisher ==0.1.1 + - gogol-appengine ==0.1.1 + - gogol-apps-activity ==0.1.1 + - gogol-apps-calendar ==0.1.1 + - gogol-apps-licensing ==0.1.1 + - gogol-apps-reseller ==0.1.1 + - gogol-apps-tasks ==0.1.1 + - gogol-appstate ==0.1.1 + - gogol-autoscaler ==0.1.1 + - gogol-bigquery ==0.1.1 + - gogol-billing ==0.1.1 + - gogol-blogger ==0.1.1 + - gogol-books ==0.1.1 + - gogol-civicinfo ==0.1.1 + - gogol-classroom ==0.1.1 + - gogol-cloudmonitoring ==0.1.1 + - gogol-cloudtrace ==0.1.1 + - gogol-compute ==0.1.1 + - gogol-container ==0.1.1 + - gogol-core ==0.1.1 + - gogol-customsearch ==0.1.1 + - gogol-dataflow ==0.1.1 + - gogol-dataproc ==0.1.1 + - gogol-datastore ==0.1.1 + - gogol-debugger ==0.1.1 + - gogol-deploymentmanager ==0.1.1 + - gogol-dfareporting ==0.1.1 + - gogol-discovery ==0.1.1 + - gogol-dns ==0.1.1 + - gogol-doubleclick-bids ==0.1.1 + - gogol-doubleclick-search ==0.1.1 + - gogol-drive ==0.1.1 + - gogol-firebase-rules ==0.1.1 + - gogol-fitness ==0.1.1 + - gogol-fonts ==0.1.1 + - gogol-freebasesearch ==0.1.1 + - gogol-fusiontables ==0.1.1 + - gogol-games ==0.1.1 + - gogol-games-configuration ==0.1.1 + - gogol-games-management ==0.1.1 + - gogol-genomics ==0.1.1 + - gogol-gmail ==0.1.1 + - gogol-groups-migration ==0.1.1 + - gogol-groups-settings ==0.1.1 + - gogol-identity-toolkit ==0.1.1 + - gogol-kgsearch ==0.1.1 + - gogol-latencytest ==0.1.1 + - gogol-logging ==0.1.1 + - gogol-maps-coordinate ==0.1.1 + - gogol-maps-engine ==0.1.1 + - gogol-mirror ==0.1.1 + - gogol-monitoring ==0.1.1 + - gogol-oauth2 ==0.1.1 + - gogol-pagespeed ==0.1.1 + - gogol-partners ==0.1.1 + - gogol-people ==0.1.1 + - gogol-play-moviespartner ==0.1.1 + - gogol-plus ==0.1.1 + - gogol-plus-domains ==0.1.1 + - gogol-prediction ==0.1.1 + - gogol-proximitybeacon ==0.1.1 + - gogol-pubsub ==0.1.1 + - gogol-qpxexpress ==0.1.1 + - gogol-replicapool ==0.1.1 + - gogol-replicapool-updater ==0.1.1 + - gogol-resourcemanager ==0.1.1 + - gogol-resourceviews ==0.1.1 + - gogol-script ==0.1.1 + - gogol-sheets ==0.1.1 + - gogol-shopping-content ==0.1.1 + - gogol-siteverification ==0.1.1 + - gogol-spectrum ==0.1.1 + - gogol-sqladmin ==0.1.1 + - gogol-storage ==0.1.1 + - gogol-storage-transfer ==0.1.1 + - gogol-tagmanager ==0.1.1 + - gogol-taskqueue ==0.1.1 + - gogol-translate ==0.1.1 + - gogol-urlshortener ==0.1.1 + - gogol-useraccounts ==0.1.1 + - gogol-vision ==0.1.1 + - gogol-webmaster-tools ==0.1.1 + - gogol-youtube ==0.1.1 + - gogol-youtube-analytics ==0.1.1 + - gogol-youtube-reporting ==0.1.1 - google-cloud ==0.0.4 - google-oauth2-jwt ==0.1.3 + - google-translate ==0.3 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graph-wrapper ==0.2.5.1 @@ -777,53 +840,64 @@ default-package-overrides: - gtksourceview3 ==0.13.3.1 - H ==0.9.0.1 - hackage-db ==1.22 - - hackage-mirror ==0.1.1.1 - hackage-security ==0.5.2.2 - - hackage-whatsnew ==0.1.0.1 - - hackmanager ==0.1.0.0 - - haddock-api ==2.17.3 + - hackernews ==1.1.1.0 - haddock-library ==1.4.2 - hailgun ==0.4.1.1 + - hailgun-simple ==0.1.0.0 + - hakyll ==4.9.5.1 - half ==0.2.2.3 + - hamilton ==0.1.0.0 - hamlet ==1.2.0 - HandsomeSoup ==0.4.2 - - handwriting ==0.1.0.3 - hapistrano ==0.2.1.2 - happstack-authenticate ==2.3.4.7 - happstack-clientsession ==7.3.1 - happstack-hsp ==7.3.7.1 - happstack-jmacro ==7.0.11 - - happstack-server ==7.4.6.2 + - happstack-server ==7.4.6.3 - happstack-server-tls ==7.1.6.2 - happy ==1.19.5 - - HaRe ==0.8.3.0 - harp ==0.4.2 - - hashable ==1.2.4.0 - - hashable-extras ==0.2.3 + - hashable ==1.2.5.0 - hashable-time ==0.2 - hashmap ==1.3.2 - hashtables ==1.2.1.0 - - haskeline ==0.7.3.0 - - haskell-gi ==0.18 - - haskell-gi-base ==0.18.4 + - haskeline ==0.7.3.1 + - haskell-gi ==0.20 + - haskell-gi-base ==0.20 - haskell-lexer ==1.0.1 - - haskell-names ==0.7.0 + - haskell-names ==0.8.0 - haskell-neo4j-client ==0.3.2.4 - - haskell-packages ==0.4 + - haskell-packages ==0.5 - haskell-spacegoo ==0.2.0.1 - haskell-src ==1.0.2.0 - - haskell-src-exts ==1.17.1 - - haskell-src-meta ==0.6.0.14 + - haskell-src-exts ==1.18.2 + - haskell-src-exts-simple ==1.19.0.0 + - haskell-src-meta ==0.7.0.1 + - haskell-tools-ast ==0.5.0.0 + - haskell-tools-backend-ghc ==0.5.0.0 + - haskell-tools-cli ==0.5.0.0 + - haskell-tools-daemon ==0.5.0.0 + - haskell-tools-debug ==0.5.0.0 + - haskell-tools-demo ==0.5.0.0 + - haskell-tools-prettyprint ==0.5.0.0 + - haskell-tools-refactor ==0.5.0.0 + - haskell-tools-rewrite ==0.5.0.0 - HaskellNet ==0.5.1 - HaskellNet-SSL ==0.3.3.0 - - haskintex ==0.6.0.1 - - haskoin-core ==0.4.0 - - hasql ==0.19.15.2 + - haskintex ==0.7.0.1 + - hasql ==0.19.16 + - hasql-migration ==0.1.3 + - hasql-transaction ==0.5 - hastache ==0.6.1 - - hasty-hamiltonian ==1.1.5 + - hasty-hamiltonian ==1.3.0 - HaTeX ==3.17.1.0 - hatex-guide ==1.3.1.6 - - hbayes ==0.5.2 + - haxl ==0.5.0.0 + - haxl-amazonka ==0.1.1 + - HaXml ==1.25.3 + - haxr ==3000.11.2 - hbeanstalk ==0.2.4 - Hclip ==3.0.0.4 - HCodecs ==0.5 @@ -834,40 +908,46 @@ default-package-overrides: - heap ==1.0.3 - heaps ==0.3.3 - hebrew-time ==0.1.1 - - hedis ==0.9.5 + - hedis ==0.9.7 - here ==1.2.9 - heredoc ==0.2.0.0 + - heterocephalus ==1.0.4.0 - hex ==0.1.2 + - hexml ==0.3.1 - hexstring ==0.11.1 - hflags ==0.4.2 - hformat ==0.1.0.1 - hfsevents ==0.1.6 - - hgettext ==0.1.30 - hid ==0.2.2 - hidapi ==0.1.4 - hierarchical-clustering ==0.4.6 - - highlighting-kate ==0.6.3 + - highjson ==0.4.0.0 + - highjson-swagger ==0.4.0.0 + - highjson-th ==0.4.0.0 + - highlighting-kate ==0.6.4 - hinotify ==0.3.9 - hint ==0.6.0 - - hip ==1.2.0.0 + - hip ==1.5.2.0 - histogram-fill ==0.8.4.1 - hit ==0.6.3 + - hjpath ==3.0.1 - hjsmin ==0.2.0.2 - - hjsonpointer ==1.0.0.2 - - hjsonschema ==1.1.0.1 - - hlibgit2 ==0.18.0.15 + - hjson ==1.3.2 + - hjsonpointer ==1.1.0.2 + - hjsonschema ==1.5.0.1 + - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.5.0 - - hlint ==1.9.35 - - hmatrix ==0.17.0.2 - - hmatrix-gsl ==0.17.0.0 - - hmatrix-gsl-stats ==0.4.1.4 + - hlint ==1.9.41 + - hmatrix ==0.18.0.0 + - hmatrix-gsl ==0.18.0.1 + - hmatrix-gsl-stats ==0.4.1.6 + - hmatrix-repa ==0.1.2.2 - hmatrix-special ==0.4.0.1 - hmpfr ==0.4.2.1 - hmt ==0.15 - - hoauth2 ==0.5.4.0 - - hocilib ==0.1.0 + - hoauth2 ==0.5.7 + - hocilib ==0.2.0 - holy-project ==0.2.0.1 - - homplexity ==0.4.3.3 - hOpenPGP ==2.5.5 - hopenpgp-tools ==0.19.4 - hopenssl ==1.7 @@ -875,93 +955,98 @@ default-package-overrides: - hostname ==1.0 - hostname-validate ==1.0.0 - hourglass ==0.2.10 - - hpack-convert ==0.14.6 - hpc-coveralls ==1.0.8 - hPDB ==1.2.0.9 - hPDB-examples ==1.2.0.7 - HPDF ==1.4.10 - - hpio ==0.8.0.5 - - hprotoc ==2.4.0 + - hpio ==0.8.0.6 + - hpp ==0.4.0 + - hpqtypes ==1.5.1.1 - hquantlib ==0.0.3.3 - - hreader ==1.0.2 - - hruby ==0.3.4.2 + - hreader ==1.1.0 + - hruby ==0.3.4.3 - hs-bibutils ==5.5 - hs-GeoIP ==0.3 - hsass ==0.4.0 - hsb2hs ==0.3.1 - hscolour ==1.24.1 - - hsdns ==1.6.1 - - hse-cpp ==0.1 + - hsdns ==1.7 + - hse-cpp ==0.2 - hsebaysdk ==0.4.0.0 - hsemail ==1.7.7 - HSet ==0.0.0 - hset ==2.2.0 - hsexif ==0.6.0.10 - - hsignal ==0.2.7.4 + - hsignal ==0.2.7.5 + - hsinstall ==1.5 - hslogger ==1.2.10 - hslua ==0.4.1 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - - HsOpenSSL ==0.11.3.2 + - HsOpenSSL ==0.11.4 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - - hspec ==2.2.4 + - hspec ==2.4.1 - hspec-attoparsec ==0.1.0.2 - - hspec-contrib ==0.3.0 - - hspec-core ==2.2.4 - - hspec-discover ==2.2.4 - - hspec-expectations ==0.7.2 + - hspec-core ==2.4.1 + - hspec-discover ==2.4.1 + - hspec-expectations ==0.8.2 - hspec-expectations-pretty-diff ==0.7.2.4 - hspec-golden-aeson ==0.2.0.3 - - hspec-jenkins ==0.1.1 - - hspec-megaparsec ==0.2.1 - - hspec-meta ==2.2.1 - - hspec-setup ==0.1.1.1 - - hspec-smallcheck ==0.4.1 - - hspec-wai ==0.6.6 - - hspec-wai-json ==0.6.1 + - hspec-megaparsec ==0.3.1 + - hspec-meta ==2.3.2 + - hspec-setup ==0.2.1.0 + - hspec-smallcheck ==0.4.2 + - hspec-wai ==0.8.0 + - hspec-wai-json ==0.8.0 - hspec-webdriver ==1.2.0 - - hstatistics ==0.2.5.4 + - hstatistics ==0.3 - hstatsd ==0.1 - HStringTemplate ==0.8.5 - hsx-jmacro ==7.3.8 - - hsx2hs ==0.13.5 + - hsx2hs ==0.14.0 - hsyslog ==4 - htaglib ==1.0.4 - HTF ==0.13.1.0 - html ==1.0.1.2 - html-conduit ==1.2.1.1 + - html-email-validate ==0.2.0.0 - htoml ==1.0.0.3 - - HTTP ==4000.3.4 - - http-api-data ==0.2.4 - - http-client ==0.4.31.2 + - HTTP ==4000.3.5 + - http-api-data ==0.3.5 + - http-client ==0.5.5 - http-client-openssl ==0.2.0.4 - - http-client-tls ==0.2.4.1 + - http-client-tls ==0.3.3.1 - http-common ==0.8.2.0 - - http-conduit ==2.1.11 + - http-conduit ==2.2.3 - http-date ==0.0.6.1 - http-link-header ==1.0.3 - http-media ==0.6.4 - http-reverse-proxy ==0.4.3.2 - http-streams ==0.8.4.0 - http-types ==0.9.1 - - http2 ==1.6.2 - - httpd-shed ==0.4.0.3 + - http2 ==1.6.3 - human-readable-duration ==0.2.0.3 - - HUnit ==1.3.1.2 - - HUnit-approx ==1.0 + - HUnit ==1.5.0.0 + - HUnit-approx ==1.1 - hunit-dejafu ==0.3.0.3 - - hvect ==0.3.1.0 - - hw-bits ==0.1.0.1 - - hw-conduit ==0.0.0.11 + - hvect ==0.4.0.0 + - hw-balancedparens ==0.1.0.0 + - hw-bits ==0.5.0.0 + - hw-conduit ==0.1.0.0 - hw-diagnostics ==0.0.0.5 + - hw-excess ==0.1.0.0 + - hw-int ==0.0.0.1 + - hw-json ==0.4.0.0 + - hw-mquery ==0.1.0.1 - hw-parser ==0.0.0.1 - - hw-prim ==0.1.0.3 - - hw-rankselect ==0.3.0.0 - - hw-succinct ==0.0.0.14 + - hw-prim ==0.4.0.2 + - hw-rankselect ==0.8.0.0 + - hw-rankselect-base ==0.2.0.0 + - hw-string-parse ==0.0.0.3 + - hw-succinct ==0.1.0.1 - hweblib ==0.6.3 - hworker ==0.1.0.1 - - hworker-ses ==0.1.1.0 - hxt ==9.3.1.16 - hxt-charproperties ==9.2.0.1 - hxt-css ==0.1.0.3 @@ -973,33 +1058,38 @@ default-package-overrides: - hyphenation ==0.6 - ical ==0.0.1 - iconv ==0.4.1.3 - - identicon ==0.1.0 - - idris ==0.12.3 - - ieee754 ==0.7.9 + - identicon ==0.2.0 + - ieee754 ==0.8.0 + - if ==0.1.0.0 - IfElse ==0.85 - ignore ==0.1.1.0 - ilist ==0.2.0.0 - imagesize-conduit ==1.1 - - imm ==1.0.1.0 + - imm ==1.1.0.0 - immortal ==0.2.2 - include-file ==0.1.0.3 - incremental-parser ==0.2.5 - indentation-core ==0.0 - indentation-parsec ==0.0 - - indents ==0.3.3 - - inflections ==0.2.0.1 + - indents ==0.4.0.0 + - inflections ==0.3.0.0 - ini ==0.3.5 - - inline-c ==0.5.5.9 + - inline-c ==0.5.6.1 - inline-c-cpp ==0.1.0.0 + - inline-java ==0.6.1 - inline-r ==0.9.0.1 - - insert-ordered-containers ==0.1.0.1 + - insert-ordered-containers ==0.2.0.0 + - instance-control ==0.1.1.1 + - integer-logarithms ==1.0.1 - integration ==0.2.1 - intero ==0.1.20 - interpolate ==0.1.0 - interpolatedstring-perl6 ==1.0.0 - IntervalMap ==0.5.2.0 - intervals ==0.7.2 + - intro ==0.1.0.6 - invariant ==0.4 + - invertible ==0.2.0 - io-choice ==0.0.6 - io-machine ==0.2.0.0 - io-manager ==0.1.0.2 @@ -1028,21 +1118,28 @@ default-package-overrides: - jmacro ==0.6.14 - jmacro-rpc ==0.3.2 - jmacro-rpc-happstack ==0.3.2 - - jose ==0.4.0.3 + - jmacro-rpc-snap ==0.3 + - jni ==0.2.3 + - jose ==0.5.0.2 - jose-jwt ==0.7.4 - js-flot ==0.8.3 - js-jquery ==3.1.1 - json ==0.9.1 - - json-autotype ==1.0.15 + - json-builder ==0.3 - json-rpc-generic ==0.2.1.2 - json-schema ==0.7.4.1 + - json-stream ==0.4.1.3 - JuicyPixels ==3.2.8 - JuicyPixels-extra ==0.1.1 - JuicyPixels-scale-dct ==0.1.1.2 + - jvm ==0.1.2 + - jvm-streaming ==0.1 - jwt ==0.7.2 - kan-extensions ==5.0.1 - kansas-comet ==0.4 - - kawhi ==0.0.1 + - katip ==0.3.1.4 + - katip-elasticsearch ==0.3.0.2 + - kawhi ==0.2.1 - kdt ==0.2.4 - keter ==1.4.3.2 - keycode ==0.2.2 @@ -1051,7 +1148,9 @@ default-package-overrides: - knob ==0.1.1 - koofr-client ==1.0.0.3 - kraken ==0.0.3 - - lackey ==0.4.1 + - l10n ==0.1.0.0 + - labels ==0.3.0 + - lackey ==0.4.2 - language-c ==0.5.0 - language-c-quote ==0.11.7.1 - language-dockerfile ==0.3.5.0 @@ -1063,14 +1162,16 @@ default-package-overrides: - language-javascript ==0.6.0.9 - language-lua2 ==0.1.0.5 - language-nix ==2.1.0.1 - - language-puppet ==1.3.1.1 - - language-thrift ==0.9.0.2 + - language-puppet ==1.3.5.1 + - language-python ==0.5.4 + - language-thrift ==0.10.0.0 + - large-hashable ==0.1.0.3 - largeword ==1.2.5 - lattices ==1.5.0 - lazy-csv ==0.5.1 - lca ==0.3 - leapseconds-announced ==2017 - - lens ==4.14 + - lens ==4.15.1 - lens-action ==0.2.0.2 - lens-aeson ==1.0.0.5 - lens-datetime ==0.3 @@ -1079,6 +1180,7 @@ default-package-overrides: - lens-family-th ==0.5.0.0 - lens-regex ==0.1.0 - lens-simple ==0.1.0.9 + - lentil ==1.0.8.0 - leveldb-haskell ==0.6.4 - lexer-applicative ==2.1.0.1 - lhs2tex ==1.19 @@ -1086,33 +1188,47 @@ default-package-overrides: - libinfluxdb ==0.0.4 - libmpd ==0.9.0.6 - libnotify ==0.2 - - libxml-sax ==0.7.5 + - librato ==0.2.0.1 + - libsystemd-journal ==1.4.1 - LibZip ==1.0.1 + - licensor ==0.2.0 - lift-generics ==0.1.1 - - lifted-async ==0.9.1 + - lifted-async ==0.9.1.1 - lifted-base ==0.2.3.8 - - line ==1.0.1.0 + - line ==2.2.0 - linear ==1.20.5 - linear-accelerate ==0.2 + - linked-list-with-iterator ==0.1.1.0 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.2.0 + - List ==0.6.0 - list-fusion-probe ==0.1.0.6 - list-prompt ==0.1.1.0 - list-t ==1 - - ListLike ==4.5 - - load-env ==0.1.1 + - ListLike ==4.5.1 + - lmdb ==0.2.5 - loch-th ==0.2.1 - - log-domain ==0.10.3.1 + - log ==0.7 + - log-base ==0.7 + - log-domain ==0.11 + - log-elasticsearch ==0.7 + - log-postgres ==0.7 - logfloat ==0.13.3.3 + - logger-thread ==0.1.0.2 + - logging-effect ==1.1.2 - logging-facade ==0.1.1 - logict ==0.6.0.2 - loop ==0.3.0 - lrucache ==1.2.0.0 - lrucaching ==0.3.1 - - ltext ==0.1.2.1 - lucid ==2.9.7 - lucid-svg ==0.7.0.0 + - lzma-conduit ==1.1.3.1 - machines ==0.6.1 + - machines-binary ==0.3.0.3 + - machines-directory ==0.2.0.10 + - machines-io ==0.2.0.13 + - machines-process ==0.2.0.8 - magic ==1.1 - mainland-pretty ==0.4.1.4 - makefile ==0.1.0.5 @@ -1122,43 +1238,47 @@ default-package-overrides: - markdown-unlit ==0.4.0 - markup ==3.1.0 - math-functions ==0.2.1.0 + - mathexpr ==0.3.0.0 - matrices ==0.4.4 - matrix ==0.3.5.0 - maximal-cliques ==0.1.1 - mbox ==0.3.3 - mcmc-types ==1.0.3 - - megaparsec ==5.0.1 - - memory ==0.13 - - MemoTrie ==0.6.4 + - median-stream ==0.7.0.0 + - mega-sdist ==0.3.0 + - megaparsec ==5.2.0 + - memory ==0.14.1 + - MemoTrie ==0.6.7 - mersenne-random ==1.0.0.1 - - mersenne-random-pure64 ==0.2.0.5 + - mersenne-random-pure64 ==0.2.2.0 - messagepack ==0.5.4 - messagepack-rpc ==0.5.1 - - metrics ==0.3.0.2 + - metrics ==0.4.0.1 - MFlow ==0.4.6.0 + - mfsolve ==0.3.2.0 - microformats2-parser ==1.0.1.6 - microlens ==0.4.7.0 - - microlens-aeson ==2.1.1.3 + - microlens-aeson ==2.2.0 - microlens-contra ==0.1.0.1 - microlens-ghc ==0.4.7.0 - microlens-mtl ==0.1.10.0 - microlens-platform ==0.3.7.1 - microlens-th ==0.4.1.1 - - mighty-metropolis ==1.0.4 - - mime-mail ==0.4.12 + - mighty-metropolis ==1.2.0 + - mime-mail ==0.4.13 - mime-mail-ses ==0.3.2.3 - mime-types ==0.1.0.7 + - mintty ==0.1 - misfortune ==0.1.1.2 - missing-foreign ==0.1.1 - MissingH ==1.4.0.1 - mmap ==0.5.9 - mmorph ==1.0.9 - mockery ==0.3.4 - - modify-fasta ==0.8.2.1 - - moesocks ==1.0.0.41 + - modify-fasta ==0.8.2.3 - monad-control ==1.0.1.0 - monad-coroutine ==0.9.0.3 - - monad-extras ==0.5.11 + - monad-extras ==0.6.0 - monad-http ==0.1.0.0 - monad-journal ==0.7.2 - monad-logger ==0.3.20.1 @@ -1166,6 +1286,7 @@ default-package-overrides: - monad-logger-prefix ==0.1.6 - monad-logger-syslog ==0.1.3.0 - monad-loops ==0.4.3 + - monad-metrics ==0.1.0.2 - monad-par ==0.3.4.8 - monad-par-extras ==0.3.3 - monad-parallel ==0.7.2.2 @@ -1176,22 +1297,23 @@ default-package-overrides: - monad-time ==0.2 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.0 - - monadcryptorandom ==0.7.0 + - monadcryptorandom ==0.7.1 - monadic-arrays ==0.2.2 - monadLib ==3.7.3 - monadloc ==0.7.1 - monadplus ==1.4.2 - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.4.2.3 + - MonadRandom ==0.5.1 - monads-tf ==0.1.0.3 - mongoDB ==2.1.1.1 - - mono-traversable ==1.0.1 + - mono-traversable ==1.0.1.1 - mono-traversable-instances ==0.1.0.0 - monoid-extras ==0.4.2 - - monoid-subclasses ==0.4.2.1 + - monoid-subclasses ==0.4.3.1 - monoidal-containers ==0.3.0.1 - - morte ==1.6.2 + - morte ==1.6.5 - mountpoints ==1.0.2 + - mstate ==0.2.7 - mtl ==2.2.1 - mtl-compat ==0.2.1.3 - mtl-prelude ==2.0.3.1 @@ -1200,14 +1322,17 @@ default-package-overrides: - multipart ==0.1.2 - multiset ==0.3.3 - multiset-comb ==0.2.4.1 + - multistate ==0.7.1.1 - murmur-hash ==0.1.0.9 - - murmur3 ==1.0.3 - MusicBrainz ==0.2.4 - - mustache ==2.1.2 - mutable-containers ==0.3.3 - - mwc-probability ==1.2.2 + - mwc-probability ==1.3.0 - mwc-random ==0.13.5.0 - mwc-random-monad ==0.7.3.1 + - mysql ==0.1.4 + - mysql-haskell ==0.8.0.0 + - mysql-haskell-openssl ==0.8.0.0 + - mysql-simple ==0.4.0.0 - nagios-check ==0.3.2 - names-th ==0.2.0.2 - nano-erl ==0.1.0.1 @@ -1215,18 +1340,25 @@ default-package-overrides: - nationstates ==0.5.0.0 - nats ==1.1.1 - natural-sort ==0.1.2 - - natural-transformation ==0.3.1 + - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 - neat-interpolation ==0.3.2.1 - netpbm ==1.0.2 - nettle ==0.2.0 + - netwire ==5.0.2 + - netwire-input ==0.0.6 + - netwire-input-glfw ==0.0.6 - network ==2.6.3.1 - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 + - network-carbon ==1.0.8 - network-conduit-tls ==1.2.2 - network-house ==0.1.0.2 - network-info ==0.2.0.8 + - network-msgpack-rpc ==0.0.3 + - network-multicast ==0.2.0 + - Network-NineP ==0.4.1 - network-simple ==0.4.0.5 - network-transport ==0.4.4.0 - network-transport-composed ==0.2.0.1 @@ -1234,9 +1366,12 @@ default-package-overrides: - network-transport-tcp ==0.5.1 - network-transport-tests ==0.2.3.0 - network-uri ==2.6.1.0 - - network-uri-flag ==0.1 - newtype ==0.2 + - newtype-generics ==0.5 + - next-ref ==0.1.0.2 + - nfc ==0.0.1 - nicify-lib ==1.0.1 + - NineP ==0.0.2.1 - nix-paths ==1.0.0.1 - non-empty-sequence ==0.2.0.2 - nonce ==1.0.2 @@ -1246,21 +1381,23 @@ default-package-overrides: - numeric-extras ==0.1 - NumInstances ==1.4 - numtype-dk ==0.5.0.1 + - oanda-rest-api ==0.3.0.0 - objective ==1.1.1 - ObjectName ==1.1.0.1 - - octane ==0.16.3 + - octane ==0.18.2 - Octree ==0.5.4.3 - oeis ==0.3.8 - ofx ==0.4.2.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.3 - - omnifmt ==0.2.1.1 - once ==0.2 - OneTuple ==0.2.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.5.2.2 - - opaleye-trans ==0.3.3 + - opaleye ==0.5.3.0 + - opaleye-trans ==0.3.4 - open-browser ==0.2.1.0 + - open-witness ==0.4 + - OpenAL ==1.7.0.4 - OpenGL ==3.0.1.0 - OpenGLRaw ==3.2.4.0 - openpgp-asciiarmor ==0.1 @@ -1268,41 +1405,42 @@ default-package-overrides: - openssl-streams ==1.2.1.0 - operational ==0.2.3.5 - operational-class ==0.3.0.0 - - opml-conduit ==0.5.0.1 + - opml-conduit ==0.6.0.1 - optional-args ==1.0.1 - options ==1.2.1.1 - - optparse-applicative ==0.12.1.0 - - optparse-generic ==1.1.1 + - optparse-applicative ==0.13.1.0 + - optparse-generic ==1.1.4 - optparse-helper ==0.2.1.1 - optparse-simple ==0.0.3 - optparse-text ==0.1.1.0 - osdkeys ==0.0 - overloaded-records ==0.4.2.0 - - package-description-remote ==0.2.0.0 - packdeps ==0.4.3 - pager ==0.1.1.0 - - pagerduty ==0.0.7 + - pagerduty ==0.0.8 - pagination ==0.1.1 - palette ==0.1.0.4 - - pandoc ==1.17.1 - - pandoc-citeproc ==0.10.3 - - pandoc-types ==1.16.1.1 + - pandoc ==1.19.2.1 + - pandoc-citeproc ==0.10.4 + - pandoc-types ==1.17.0.5 - pango ==0.13.3.1 - parallel ==3.2.1.0 - parallel-io ==0.3.3 - parseargs ==0.2.0.8 - parsec ==3.1.11 + - parsec-numeric ==0.1.0.0 + - ParsecTools ==0.0.2.0 - parsers ==0.12.4 - partial-handler ==1.0.2 - - path ==0.5.11 + - partial-isomorphisms ==0.2.2 + - patat ==0.5.0.0 + - path ==0.5.12 - path-extra ==0.0.3 - path-io ==1.2.2 - path-pieces ==0.2.1 - pathwalk ==0.3.1.2 - patience ==0.1.1 - pattern-arrows ==0.0.2 - - pbkdf ==1.1.1.1 - - pcap ==0.4.5.2 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.0.4 - pcre-utils ==0.1.8.1 @@ -1315,6 +1453,7 @@ default-package-overrides: - persistable-record ==0.4.1.0 - persistable-types-HDBC-pg ==0.0.1.4 - persistent ==2.6 + - persistent-mysql ==2.6 - persistent-postgresql ==2.6 - persistent-redis ==2.5.2 - persistent-refs ==0.4 @@ -1322,51 +1461,54 @@ default-package-overrides: - persistent-template ==2.5.1.6 - pgp-wordlist ==0.1.0.2 - phantom-state ==0.2.1.2 + - picedit ==0.2.3.0 - picoparsec ==0.1.2.3 - - pinboard ==0.9.6 + - pid1 ==0.1.0.1 + - pinboard ==0.9.12.4 - pinch ==0.3.0.2 - - pinchot ==0.22.0.0 - - pipes ==4.1.9 - - pipes-aeson ==0.4.1.7 + - pinchot ==0.24.0.0 + - pipes ==4.3.2 - pipes-attoparsec ==0.5.1.4 - - pipes-bgzf ==0.2.0.1 - pipes-bytestring ==2.1.4 - - pipes-cacophony ==0.4.0 - - pipes-cliff ==0.12.0.0 + - pipes-cacophony ==0.4.1 + - pipes-category ==0.2.0.1 - pipes-concurrency ==2.0.7 - pipes-csv ==1.4.3 - pipes-extras ==1.0.8 - - pipes-fastx ==0.3.0.0 + - pipes-fluid ==0.5.0.3 - pipes-group ==1.0.6 - - pipes-http ==1.0.5 - - pipes-illumina ==0.1.0.0 + - pipes-misc ==0.2.3.0 - pipes-mongodb ==0.1.0.0 - - pipes-network ==0.6.4.1 - pipes-parse ==3.0.8 - pipes-random ==1.0.0.3 - - pipes-safe ==2.2.4 + - pipes-safe ==2.2.5 - pipes-text ==0.0.2.5 - pipes-wai ==3.2.0 - pixelated-avatar-generator ==0.1.3 - - pkcs10 ==0.1.1.0 + - pkcs10 ==0.2.0.0 - placeholders ==0.1 - plan-b ==0.2.0 + - plot ==0.2.3.6 + - plot-gtk ==0.2.0.4 + - plot-gtk-ui ==0.3.0.2 + - plot-gtk3 ==0.1.0.2 - point-octree ==0.5.5.3 - pointed ==5 - pointedlist ==0.6.1 - - pointful ==1.0.8 + - pointful ==1.0.9 - pointless-fun ==1.1.0.6 - polynomials-bernstein ==1.1.2 - polyparse ==1.12 - posix-realtime ==0.0.0.4 - post-mess-age ==0.2.1.0 - - postgresql-binary ==0.9.1.1 + - postgresql-binary ==0.9.2 - postgresql-libpq ==0.9.3.0 - - postgresql-query ==3.0.1 - - postgresql-schema ==0.1.10 - postgresql-simple ==0.5.2.1 - - postgresql-simple-url ==0.1.0.1 + - postgresql-simple-migration ==0.1.8.0 + - postgresql-simple-url ==0.2.0.0 - postgresql-transactional ==1.1.1 + - postgresql-typed ==0.5.0 + - pqueue ==1.3.2 - pred-set ==0.0.1 - prednote ==0.36.0.4 - prefix-units ==0.2.0 @@ -1377,13 +1519,15 @@ default-package-overrides: - pretty-class ==1.0.1.1 - pretty-hex ==1.0 - pretty-show ==1.6.12 + - pretty-simple ==2.0.0.0 - pretty-types ==0.2.3.1 - prettyclass ==1.0.0.0 - primes ==0.2.1.0 - primitive ==0.6.1.0 - - process-extras ==0.4.1.4 + - printcess ==0.1.0.3 + - process-extras ==0.7.1 - product-profunctors ==0.7.1.0 - - profiteur ==0.3.0.3 + - profiteur ==0.4.2.0 - profunctor-extras ==4.0 - profunctors ==5.2 - project-template ==0.2.0 @@ -1400,30 +1544,29 @@ default-package-overrides: - psql-helpers ==0.1.0.0 - PSQueue ==1.1 - psqueues ==0.2.2.3 - - publicsuffix ==0.20160716 + - publicsuffix ==0.20170109 - pure-cdb ==0.1.2 - pure-io ==0.2.1 - pureMD5 ==2.1.3 - - purescript ==0.9.3 - - purescript-bridge ==0.8.0.1 + - purescript-bridge ==0.10.0.0 + - pusher-http-haskell ==1.1.0.4 - pwstore-fast ==2.4.4 - pwstore-purehaskell ==2.1.4 - - quantum-random ==0.6.4 - QuasiText ==0.1.2.6 - questioner ==0.1.1.0 - quickbench ==1.0 - - QuickCheck ==2.8.2 + - QuickCheck ==2.9.2 - quickcheck-arbitrary-adt ==0.2.0.0 - - quickcheck-assertions ==0.2.0 - - quickcheck-combinators ==0.0.1 + - quickcheck-assertions ==0.3.0 - quickcheck-instances ==0.3.12 - quickcheck-io ==0.1.4 - - quickcheck-properties ==0.1 - quickcheck-simple ==0.1.0.1 + - quickcheck-special ==0.1.0.3 - quickcheck-text ==0.1.2.1 - quickcheck-unicode ==1.0.0.1 - rainbow ==0.28.0.4 - rainbox ==0.18.0.10 + - ramus ==0.1.2 - random ==1.1 - random-fu ==0.2.7.0 - random-shuffle ==0.0.4 @@ -1432,29 +1575,36 @@ default-package-overrides: - range ==0.1.2.0 - range-set-list ==0.1.2.0 - rank1dynamic ==0.3.3.0 - - Rasterific ==0.6.1.1 - - rasterific-svg ==0.3.1.2 + - Rasterific ==0.7.1 + - rasterific-svg ==0.3.2.1 - ratel ==0.3.2 - ratel-wai ==0.2.0 + - rattletrap ==2.1.5 - raw-strings-qq ==1.1 + - rawfilepath ==0.1.0.0 + - rawstring-qm ==0.2.3.0 + - rdf ==0.1.0.1 - read-editor ==0.1.0.2 - read-env-var ==0.1.0.1 - readable ==0.3.1 - ReadArgs ==1.2.3 - readline ==1.0.3.0 - - rebase ==1.0.6 + - rebase ==1.0.8 + - recursion-schemes ==5.0.1 - redis-io ==0.7.0 - redis-resp ==0.4.0 - reducers ==3.12.1 + - reedsolomon ==0.0.4.3 - ref-fd ==0.4.0.1 - refact ==0.3.0.2 + - references ==0.3.2.1 - reflection ==2.1.2 - reform ==0.2.7.1 - - reform-blaze ==0.2.4.1 - - reform-hamlet ==0.0.5.1 + - reform-blaze ==0.2.4.3 + - reform-hamlet ==0.0.5.3 - reform-happstack ==0.2.5.1 - reform-hsp ==0.2.7.1 - - RefSerialize ==0.3.1.4 + - RefSerialize ==0.4.0 - regex-applicative ==0.3.3 - regex-applicative-text ==0.1.0.1 - regex-base ==0.93.2 @@ -1466,7 +1616,7 @@ default-package-overrides: - regex-tdfa ==1.2.2 - regex-tdfa-text ==1.0.0.3 - reinterpret-cast ==0.1.0 - - relational-query ==0.8.3.2 + - relational-query ==0.8.3.4 - relational-query-HDBC ==0.6.0.2 - relational-record ==0.1.5.1 - relational-schemas ==0.1.3.1 @@ -1475,49 +1625,59 @@ default-package-overrides: - repa-algorithms ==3.4.1.1 - repa-io ==3.4.1.1 - RepLib ==0.5.4 - - reroute ==0.4.0.1 + - repline ==0.1.6.0 + - req ==0.2.0 + - req-conduit ==0.1.0 + - rerebase ==1.0.3 + - reroute ==0.4.1.0 - resolve-trivial-conflicts ==0.3.2.4 - resource-pool ==0.2.3.2 - resourcet ==1.1.9 - rest-client ==0.5.1.1 - rest-core ==0.39 - - rest-gen ==0.19.0.3 + - rest-gen ==0.20.0.0 - rest-happstack ==0.3.1.1 + - rest-snap ==0.2.0.1 - rest-stringmap ==0.2.0.6 - rest-types ==1.14.1.1 - rest-wai ==0.2.0.1 - result ==0.2.6.0 - - rethinkdb ==2.2.0.7 + - rethinkdb ==2.2.0.8 - rethinkdb-client-driver ==0.0.23 - retry ==0.7.4.2 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 + - riak ==1.1.1.0 + - riak-protobuf ==0.22.0.0 + - RNAlien ==1.3.1 - rng-utils ==0.2.1 - rose-trees ==0.0.4.3 - - rosezipper ==0.2 - - rotating-log ==0.4 + - rotating-log ==0.4.2 - RSA ==2.2.0 - - rss-conduit ==0.2.0.2 + - rss-conduit ==0.3.0.0 - runmemo ==1.0.0.1 - rvar ==0.2.0.3 - s3-signer ==0.3.0.0 - - safe ==0.3.10 + - safe ==0.3.13 - safe-exceptions ==0.1.4.0 + - safe-exceptions-checked ==0.1.0 - safecopy ==0.9.2 - SafeSemaphore ==0.10.1 - - sampling ==0.2.0 + - sampling ==0.3.2 - sandi ==0.4.0 - sandman ==0.2.0.1 - say ==0.1.0.0 - - sbv ==5.12 - - scalpel ==0.3.1 + - sbv ==5.14 + - scalpel ==0.5.0 + - scalpel-core ==0.5.0 - scanner ==0.2 - - scientific ==0.3.4.9 + - scientific ==0.3.4.10 - scotty ==0.11.0 - - scrape-changes ==0.1.0.4 - scrypt ==0.5.0 - - sdl2 ==2.1.3 - - secp256k1 ==0.4.6 + - sdl2 ==2.2.0 + - sdl2-gfx ==0.2 + - sdl2-image ==2.0.0 + - sdl2-mixer ==0.1 - securemem ==0.1.9 - SegmentTree ==0.3 - semigroupoid-extras ==5 @@ -1529,22 +1689,24 @@ default-package-overrides: - seqalign ==0.2.0.4 - seqloc ==0.6.1.1 - serf ==0.1.1.0 - - servant ==0.8.1 + - servant ==0.9.1.1 - servant-aeson-specs ==0.5.2.0 + - servant-auth-cookie ==0.4.3.2 - servant-blaze ==0.7.1 - servant-cassava ==0.8 - - servant-client ==0.8.1 - - servant-docs ==0.8.1 - - servant-foreign ==0.8.1 - - servant-js ==0.8.1 + - servant-client ==0.9.1.1 + - servant-docs ==0.9.1.1 + - servant-elm ==0.4.0.0 + - servant-foreign ==0.9.1.1 + - servant-js ==0.9.1 - servant-JuicyPixels ==0.3.0.2 - servant-lucid ==0.7.1 - servant-mock ==0.8.1.1 - - servant-purescript ==0.3.1.5 - - servant-server ==0.8.1 + - servant-purescript ==0.6.0.0 + - servant-server ==0.9.1.1 - servant-subscriber ==0.5.0.3 - servant-swagger ==1.1.2 - - servant-swagger-ui ==0.2.1.2.2.8 + - servant-swagger-ui ==0.2.2.2.2.8 - servant-yaml ==0.1.0.0 - serversession ==1.0.1 - serversession-backend-acid-state ==1.0.3 @@ -1556,19 +1718,19 @@ default-package-overrides: - setlocale ==1.0.0.4 - sets ==0.0.5.2 - SHA ==1.6.4.2 - - shake ==0.15.10 + - shake ==0.15.11 - shake-language-c ==0.10.0 - shakespeare ==2.0.12.1 - shell-conduit ==4.5.2 - - shelly ==1.6.8.1 - shortcut-links ==0.4.2.0 - should-not-typecheck ==2.1.0 - - show-type ==0.1.1 + - show-prettyprint ==0.1.2 + - sibe ==0.2.0.4 - signal ==0.1.0.3 - silently ==1.2.5 - simple ==0.11.1 - simple-download ==0.0.2 - - simple-log ==0.4.0 + - simple-log ==0.5.1 - simple-reflect ==0.3.2 - simple-sendfile ==0.2.25 - simple-session ==0.10.1.1 @@ -1579,12 +1741,12 @@ default-package-overrides: - siphash ==1.0.3 - skein ==1.0.9.4 - skeletons ==0.4.0 + - skylighting ==0.1.1.5 - slave-thread ==1.0.2 - slug ==0.1.6 - smallcaps ==0.6.0.4 - smallcheck ==1.1.1 - smoothie ==0.4.2.6 - - smsaero ==0.6.2 - smtLib ==1.0.8 - smtp-mail ==0.1.4.6 - snap-core ==1.0.1.0 @@ -1593,34 +1755,36 @@ default-package-overrides: - soap ==0.2.3.3 - soap-openssl ==0.1.0.2 - soap-tls ==0.1.1.2 - - socket ==0.6.1.0 + - socket ==0.7.0.0 + - socket-activation ==0.1.0.2 - socks ==0.5.5 - - solga ==0.1.0.1 + - solga ==0.1.0.2 - solga-swagger ==0.1.0.2 - sorted-list ==0.2.0.0 - sourcemap ==0.1.6 + - sparkle ==0.4.0.2 + - sparse-linear-algebra ==0.2.2.0 - spdx ==0.2.1.0 - speculation ==1.5.0.3 - - speedy-slice ==0.1.5 + - speedy-slice ==0.3.0 - sphinx ==0.6.0.2 - - Spintax ==0.1.0.1 + - Spintax ==0.3.1 - splice ==0.6.1.1 - split ==0.2.3.1 - - Spock ==0.11.0.0 - - Spock-api ==0.11.0.0 - - Spock-api-server ==0.11.0.0 - - Spock-core ==0.11.0.0 + - Spock ==0.12.0.0 + - Spock-api ==0.12.0.0 + - Spock-api-server ==0.12.0.0 + - Spock-core ==0.12.0.0 - Spock-lucid ==0.3.0.0 - Spock-worker ==0.3.1.0 - spool ==0.1 - spoon ==0.3.1 - sql-words ==0.1.4.1 - sqlite-simple ==0.4.12.1 + - sqlite-simple-errors ==0.6.0.0 - srcloc ==0.5.1.0 - - stache ==0.1.8 - - stack-run-auto ==0.1.1.4 - - stackage-curator ==0.14.3 - - stackage-types ==1.2.0 + - stache ==0.2.0 + - stack-type ==0.1.0.0 - state-plus ==0.1.2 - stateref ==0.3 - statestack ==0.2.0.5 @@ -1628,24 +1792,28 @@ default-package-overrides: - stateWriter ==0.2.8 - static-canvas ==0.2.0.3 - statistics ==0.13.3.0 + - stb-image-redux ==0.2.1.0 + - stemmer ==0.5.2 - stm ==2.4.4.1 - stm-chans ==3.0.0.4 - stm-conduit ==3.0.0 - stm-containers ==0.2.15 - stm-delay ==0.1.1.1 + - stm-extras ==0.1.0.1 - stm-stats ==0.2.0.0 - - STMonadTrans ==0.3.4 - - stopwatch ==0.1.0.3 + - stm-supply ==0.2.0.0 + - STMonadTrans ==0.4.3 + - stopwatch ==0.1.0.4 - storable-complex ==0.2.2 - storable-endian ==0.2.6 - storable-record ==0.0.3.1 - - store ==0.2.1.2 - - store-core ==0.2.0.2 - Strafunski-StrategyLib ==5.0.0.10 - - stratosphere ==0.1.6 - - streaming ==0.1.4.3 - - streaming-bytestring ==0.1.4.5 - - streaming-commons ==0.1.16 + - stratosphere ==0.4.0 + - streaming ==0.1.4.5 + - streaming-bytestring ==0.1.4.6 + - streaming-commons ==0.1.17 + - streaming-utils ==0.1.4.7 + - streaming-wai ==0.1.1 - streamproc ==1.6.2 - streams ==3.3 - strict ==0.3.2 @@ -1658,15 +1826,15 @@ default-package-overrides: - stringable ==0.1.3 - stringbuilder ==0.5.0 - stringsearch ==0.3.6.6 - - stripe-core ==2.1.0 - strive ==3.0.2 - - stylish-haskell ==0.6.1.0 + - stylish-haskell ==0.7.1.0 - success ==0.2.6 - sundown ==0.6 + - superbuffer ==0.2.0.1 - svg-builder ==0.1.0.2 - - svg-tree ==0.5.1.2 - - SVGFonts ==1.5.0.1 - - swagger ==0.2.2 + - svg-tree ==0.6 + - SVGFonts ==1.6.0.1 + - swagger ==0.3.0 - swagger2 ==2.1.3 - syb ==0.6 - syb-with-class ==0.6.1.7 @@ -1680,19 +1848,24 @@ default-package-overrides: - tabular ==0.2.2.7 - tagged ==0.8.5 - tagged-binary ==0.2.0.0 + - tagged-identity ==0.1.1 - taggy ==0.2.0 - taggy-lens ==0.1.2 - tagshare ==0.0 - tagsoup ==0.14 - tagstream-conduit ==0.5.5.3 - tar ==0.5.0.3 + - tar-conduit ==0.1.0 - tardis ==0.4.1.0 - - tasty ==0.11.0.4 + - tasty ==0.11.1 - tasty-ant-xml ==1.0.4 + - tasty-auto ==0.1.0.1 - tasty-dejafu ==0.3.0.2 + - tasty-discover ==1.1.0 - tasty-expected-failure ==0.11.0.4 + - tasty-fail-fast ==0.0.2 - tasty-golden ==2.3.1.1 - - tasty-hspec ==1.1.3 + - tasty-hspec ==1.1.3.1 - tasty-html ==0.4.1.1 - tasty-hunit ==0.9.2 - tasty-kat ==0.0.3 @@ -1701,16 +1874,21 @@ default-package-overrides: - tasty-rerun ==1.1.6 - tasty-silver ==3.1.9 - tasty-smallcheck ==0.8.1 + - tasty-tap ==0.0.4 - tasty-th ==0.1.4 + - Taxonomy ==1.0.2 - TCache ==0.12.0 - - tcp-streams ==0.4.0.0 + - tce-conf ==1.3 + - tcp-streams ==0.6.0.0 + - tcp-streams-openssl ==0.6.0.0 + - telegram-api ==0.6.0.0 - template ==0.2.0.10 - temporary ==1.2.0.4 - temporary-rc ==1.2.0.3 - - terminal-progress-bar ==0.0.1.4 + - terminal-progress-bar ==0.1.1 - terminal-size ==0.3.2.1 - terminfo ==0.4.0.2 - - test-fixture ==0.4.2.0 + - test-fixture ==0.5.0.0 - test-framework ==0.8.1.1 - test-framework-hunit ==0.3.0.2 - test-framework-quickcheck2 ==0.3.0.3 @@ -1718,20 +1896,23 @@ default-package-overrides: - test-framework-th ==0.2.4 - test-simple ==0.1.9 - testing-feat ==0.4.0.3 - - texmath ==0.8.6.7 + - texmath ==0.9.1 - text ==1.2.2.1 - text-all ==0.3.0.2 - text-binary ==0.2.1.1 - text-conversions ==0.3.0 - text-format ==0.3.1.1 + - text-generic-pretty ==1.2.1 - text-icu ==0.7.0.1 - text-ldap ==0.1.1.8 - text-manipulate ==0.2.0.1 - - text-metrics ==0.1.0 + - text-metrics ==0.2.0 - text-postgresql ==0.0.2.2 - text-region ==0.1.0.1 - - text-show ==3.4 - - text-show-instances ==3.4 + - text-show ==3.4.1.1 + - text-show-instances ==3.5 + - text-zipper ==0.10 + - textlocal ==0.1.0.5 - tf-random ==0.5 - th-data-compat ==0.0.2.2 - th-desugar ==1.6 @@ -1740,13 +1921,13 @@ default-package-overrides: - th-lift ==0.7.6 - th-lift-instances ==0.1.11 - th-orphans ==0.13.3 - - th-printf ==0.3.1 - th-reify-compat ==0.0.1.1 - th-reify-many ==0.1.6 - th-to-exp ==0.0.1.0 - - th-utilities ==0.2.0.1 - these ==0.7.3 + - thread-local-storage ==0.1.1 - threads ==0.5.1.4 + - threepenny-gui ==0.7.0.1 - through-text ==0.1.0.0 - thumbnail-plus ==1.0.5 - thyme ==0.3.5.5 @@ -1759,14 +1940,17 @@ default-package-overrides: - timelens ==0.2.0.2 - timemap ==0.0.4 - timerep ==2.0.0.2 + - timespan ==0.3.0.0 - timezone-olson ==0.1.7 - timezone-series ==0.1.6.1 - tinylog ==0.14.0 - tinytemplate ==0.1.2.0 + - titlecase ==0.1.0.3 - tls ==1.3.9 - tls-debug ==0.4.4 - token-bucket ==0.1.0.1 - tostring ==0.2.1.1 + - tracy ==0.1.4.0 - transformers-base ==0.4.4 - transformers-compat ==0.5.1.4 - transformers-lift ==0.1.0.1 @@ -1774,30 +1958,31 @@ default-package-overrides: - transient-universe ==0.3.5.1 - traverse-with-class ==0.2.0.4 - tree-fun ==0.8.1.0 - - tree-view ==0.4 - - tries ==0.0.4 - - trifecta ==1.6.1 + - trifecta ==1.6.2.1 - true-name ==0.1.0.2 - ttrie ==0.1.2.1 - - tttool ==1.6.1.2 + - tttool ==1.7.0.1 - tuple ==0.3.0.2 - tuple-th ==0.2.5 - tuples-homogenous-h98 ==0.1.1.0 - - turtle ==1.2.8 + - turtle ==1.3.1 - turtle-options ==0.1.0.4 - - twitter-conduit ==0.2.1 - twitter-feed ==0.2.0.11 - - twitter-types ==0.7.2.2 - - twitter-types-lens ==0.7.2 - type-aligned ==0.9.6 + - type-assertions ==0.1.0.0 - type-eq ==0.5 - type-fun ==0.1.1 + - type-level-kv-list ==1.1.0 - type-level-numbers ==0.1.1.1 - type-list ==0.5.0.0 - - type-spec ==0.2.0.0 + - type-operators ==0.1.0.4 + - type-spec ==0.3.0.1 + - TypeCompose ==0.9.12 + - typed-process ==0.1.0.0 - typelits-witnesses ==0.2.3.0 - typography-geometry ==1.0.0.1 - - tzdata ==0.1.20160614.0 + - tz ==0.1.2.1 + - tzdata ==0.1.20161123.0 - ua-parser ==0.7.3 - uglymemo ==0.1.0.1 - unbound ==0.5.1 @@ -1805,15 +1990,13 @@ default-package-overrides: - unbounded-delays ==0.1.0.9 - uncertain ==0.3.1.0 - unexceptionalio ==0.3.0 - - unfoldable ==0.8.4 - - unfoldable-restricted ==0.0.2 - unicode-show ==0.1.0.2 - - unicode-transforms ==0.1.0.1 + - unicode-transforms ==0.2.1 - unification-fd ==0.10.0.1 - union ==0.1.1.1 - union-find ==0.2 - uniplate ==1.6.12 - - unit-constraint ==0.0.0 + - Unique ==0.4.6.1 - units ==2.4 - units-defs ==2.0.1.1 - units-parser ==0.1.0.0 @@ -1827,9 +2010,11 @@ default-package-overrides: - unix-compat ==0.4.3.1 - unix-time ==0.3.7 - Unixutils ==1.54.1 + - unlit ==0.4.0.0 - unordered-containers ==0.2.7.2 - uri-bytestring ==0.2.2.1 - uri-encode ==1.5.0.5 + - uri-templater ==0.2.1.0 - url ==2.1.3 - urlpath ==5.0.0.1 - userid ==0.1.2.8 @@ -1846,9 +2031,7 @@ default-package-overrides: - uuid-types ==1.0.3 - vado ==0.0.8 - validate-input ==0.4.0.0 - - validation ==0.5.4 - - validity ==0.3.0.4 - - varying ==0.5.0.3 + - varying ==0.7.0.3 - vault ==0.3.0.6 - vcswrapper ==0.1.5 - vector ==0.11.0.0 @@ -1856,29 +2039,33 @@ default-package-overrides: - vector-binary-instances ==0.2.3.4 - vector-buffer ==0.4.1 - vector-fftw ==0.1.3.7 - - vector-instances ==3.3.1 + - vector-instances ==3.4 + - vector-sized ==0.5.1.0 - vector-space ==0.10.4 + - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 - vectortiles ==1.2.0.2 - versions ==3.0.0 - vhd ==0.2.2 - - ViennaRNAParser ==1.2.9 + - ViennaRNAParser ==1.3.2 + - viewprof ==0.0.0.1 - vinyl ==0.5.3 - vinyl-utils ==0.3.0.0 - void ==0.7.1 - - vty ==5.11.3 + - vty ==5.15 - wai ==3.2.1.1 - wai-app-static ==3.1.6.1 - wai-conduit ==3.0.0.3 - wai-cors ==0.2.5 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.19 + - wai-extra ==3.0.19.1 + - wai-handler-launch ==3.0.2.2 - wai-logger ==2.3.0 - wai-middleware-caching ==0.1.0.2 - wai-middleware-caching-lru ==0.1.0.0 - wai-middleware-caching-redis ==0.2.0.0 - wai-middleware-consul ==0.1.0.2 - - wai-middleware-content-type ==0.4.1 + - wai-middleware-content-type ==0.5.0.1 - wai-middleware-crowd ==0.1.4.2 - wai-middleware-metrics ==0.2.3 - wai-middleware-prometheus ==0.1.0.1 @@ -1886,20 +2073,25 @@ default-package-overrides: - wai-middleware-throttle ==0.2.1.0 - wai-middleware-verbs ==0.3.2 - wai-predicates ==0.9.0 - - wai-request-spec ==0.10.2.4 + - wai-route ==0.3.1.1 + - wai-routes ==0.9.10 + - wai-routing ==0.13.0 - wai-session ==0.3.2 - wai-session-postgresql ==0.2.1.0 - wai-transformers ==0.0.7 - wai-websockets ==3.0.1.1 - waitra ==0.0.4.0 - - warp ==3.2.9 - - warp-tls ==3.2.2 + - warp ==3.2.11 + - warp-tls ==3.2.3 + - wave ==0.1.4 + - wavefront ==0.7.0.2 + - wavefront-obj ==0.1.0.1 - web-plugins ==0.2.9 - web-routes ==0.27.11 - web-routes-boomerang ==0.28.4.2 - web-routes-happstack ==0.23.10 - web-routes-hsp ==0.24.6.1 - - web-routes-th ==0.22.6 + - web-routes-th ==0.22.6.1 - web-routes-wai ==0.24.3 - webdriver ==0.8.4 - webdriver-angular ==0.1.11 @@ -1907,32 +2099,42 @@ default-package-overrides: - webkitgtk3-javascriptcore ==0.14.2.1 - webpage ==0.0.4 - webrtc-vad ==0.1.0.3 - - websockets ==0.9.8.2 + - websockets ==0.10.0.0 + - websockets-snap ==0.10.2.0 - weigh ==0.0.3 - - werewolf ==1.5.1.1 - - werewolf-slack ==1.0.2.0 - - wikicfp-scraper ==0.1.0.6 + - wikicfp-scraper ==0.1.0.8 + - wild-bind ==0.1.0.3 + - wild-bind-indicator ==0.1.0.1 + - wild-bind-task-x11 ==0.1.0.1 + - wild-bind-x11 ==0.1.0.6 - Win32 ==2.3.1.1 - Win32-extras ==0.2.0.1 - Win32-notify ==0.3.0.1 + - wire-streams ==0.1.1.0 - with-location ==0.1.0 - withdependencies ==0.2.4 - witherable ==0.1.3.3 + - witness ==0.4 - wizards ==1.0.2 - wl-pprint ==1.2 + - wl-pprint-annotated ==0.0.1.4 + - wl-pprint-console ==0.1.0.1 - wl-pprint-extras ==3.5.0.5 - wl-pprint-terminfo ==3.7.1.4 - - wl-pprint-text ==1.1.0.4 + - wl-pprint-text ==1.1.1.0 - word-trie ==0.3.0 + - word24 ==2.0.1 - word8 ==0.1.2 - wordpass ==1.0.0.7 - Workflow ==0.8.3 - wrap ==0.0.0 - - wreq ==0.4.1.0 - - writer-cps-mtl ==0.1.1.1 - - writer-cps-transformers ==0.1.1.0 + - writer-cps-full ==0.1.0.0 + - writer-cps-lens ==0.1.0.0 + - writer-cps-morph ==0.1.0.1 + - writer-cps-mtl ==0.1.1.2 + - writer-cps-transformers ==0.1.1.2 - wuss ==1.1.3 - - X11 ==1.6.1.2 + - X11 ==1.8 - x509 ==1.6.5 - x509-store ==1.6.2 - x509-system ==1.6.4 @@ -1943,43 +2145,41 @@ default-package-overrides: - xenstore ==0.1.1 - xhtml ==3000.2.1 - xlsior ==0.1.0.1 - - xlsx ==0.2.4 - - xlsx-tabular ==0.1.0.1 + - xlsx ==0.4.2 + - xlsx-tabular ==0.2.2 - xml ==1.3.14 - - xml-conduit ==1.3.5 + - xml-conduit ==1.4.0.3 - xml-conduit-parse ==0.3.1.0 - xml-conduit-writer ==0.1.1.1 - - xml-hamlet ==0.4.0.12 + - xml-hamlet ==0.4.1 + - xml-html-qq ==0.1.0.1 - xml-lens ==0.1.6.3 + - xml-picklers ==0.3.6 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.6 - xmlgen ==0.6.2.1 - xmlhtml ==0.2.3.5 - - xmonad ==0.12 + - xmonad ==0.13 - xss-sanitize ==0.3.5.7 - yackage ==0.8.1 - - yahoo-finance-api ==0.1.0.0 - - yaml ==0.8.21.1 + - yahoo-finance-api ==0.2.0.1 + - yaml ==0.8.21.2 - Yampa ==0.10.5 - YampaSynth ==0.2 - - yarr ==1.4.0.2 - yes-precure5-command ==5.5.3 - yesod ==1.4.4 - - yesod-auth ==1.4.15 + - yesod-auth ==1.4.16 - yesod-auth-account ==1.4.3 - yesod-auth-basic ==0.1.0.2 - - yesod-auth-hashdb ==1.5.1.3 - - yesod-auth-oauth2 ==0.2.2 - - yesod-bin ==1.4.18.7 - - yesod-core ==1.4.30 + - yesod-auth-hashdb ==1.6.0.1 + - yesod-bin ==1.5.1 + - yesod-core ==1.4.31 - yesod-eventsource ==1.4.0.1 - yesod-fay ==0.8.0 - - yesod-fb ==0.3.4 - - yesod-form ==1.4.9 + - yesod-form ==1.4.10 - yesod-form-richtext ==0.1.0.0 - yesod-gitrepo ==0.2.1.0 - yesod-gitrev ==0.1.0.0 - - yesod-job-queue ==0.3.0.1 - yesod-newsfeed ==1.6 - yesod-persistent ==1.4.1.1 - yesod-sitemap ==1.4.0.1 @@ -1987,22 +2187,31 @@ default-package-overrides: - yesod-static-angular ==0.1.8 - yesod-table ==2.0.3 - yesod-test ==1.5.4.1 - - yesod-websockets ==0.2.4.1 - - yi ==0.12.6 - - yi-fuzzy-open ==0.1.0.1 - - yi-language ==0.2.1 - - yi-rope ==0.7.0.2 + - yesod-websockets ==0.2.5 + - yi-core ==0.13.5 + - yi-frontend-vty ==0.13.5 + - yi-fuzzy-open ==0.13.5 + - yi-ireader ==0.13.5 + - yi-keymap-cua ==0.13.5 + - yi-keymap-emacs ==0.13.5 + - yi-keymap-vim ==0.13.5 + - yi-language ==0.13.5 + - yi-misc-modes ==0.13.5 + - yi-mode-haskell ==0.13.5 + - yi-mode-javascript ==0.13.5 + - yi-rope ==0.8 + - yi-snippet ==0.13.5 - yjtools ==0.9.18 - zero ==0.1.4 - zeromq4-haskell ==0.6.5 - - zip ==0.1.5 + - zip ==0.1.7 - zip-archive ==0.3.0.5 - zippers ==0.2.2 - zlib ==0.6.1.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 - - zoom-refs ==0.0.0.1 - zot ==0.0.3 + - ztail ==1.2 extra-packages: - aeson < 0.8 # newer versions don't work with GHC 6.12.3 @@ -2014,10 +2223,8 @@ extra-packages: - containers < 0.5 # required to build alex with GHC 6.12.3 - control-monad-free < 0.6 # newer versions don't compile with anything but GHC 7.8.x - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3 - - esqueleto < 2.5 # needed for git-annex: https://github.com/bitemyapp/esqueleto/issues/8 - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - - hpack == 0.15.* # needed for stack-1.3.2 - haddock < 2.17 # required on GHC 7.10.x - haddock-api == 2.15.* # required on GHC 7.8.x - haddock-api == 2.16.* # required on GHC 7.10.x @@ -2026,13 +2233,11 @@ extra-packages: - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 - - persistent == 2.2.* # needed for git-annex - - persistent-sqlite == 2.2.* # needed for git-annex - - persistent-template == 2.1.* # needed for git-annex - primitive == 0.5.1.* # required to build alex with GHC 6.12.3 - QuickCheck < 2 # required by test-framework-quickcheck and its users - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x + - servant-auth-server < 0.2.2.0 # https://github.com/plow-technologies/servant-auth/issues/25 - split < 0.2 # newer versions don't work with GHC 6.12.3 - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x - transformers == 0.4.3.* # the latest version isn't supported by mtl yet @@ -2041,8 +2246,8 @@ extra-packages: package-maintainers: peti: - - cabal2nix - cabal-install + - cabal2nix - funcmp - git-annex - hackage-db @@ -2061,6 +2266,8 @@ package-maintainers: - pandoc - stack - streamproc + - structured-haskell-mode + - titlecase gebner: - hledger-diff gridaphobe: @@ -2468,6 +2675,7 @@ dont-distribute-packages: battleships: [ i686-linux, x86_64-linux, x86_64-darwin ] bayes-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ] + bdd: [ i686-linux, x86_64-linux, x86_64-darwin ] beam-th: [ i686-linux, x86_64-linux, x86_64-darwin ] beam: [ i686-linux, x86_64-linux, x86_64-darwin ] beamable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2585,6 +2793,7 @@ dont-distribute-packages: blaze-html-hexpat: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-json: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-textual-native: [ i686-linux, x86_64-linux, x86_64-darwin ] + ble: [ i686-linux, x86_64-linux, x86_64-darwin ] blip: [ i686-linux, x86_64-linux, x86_64-darwin ] bliplib: [ i686-linux, x86_64-linux, x86_64-darwin ] Blobs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2619,7 +2828,6 @@ dont-distribute-packages: breakout: [ i686-linux, x86_64-linux, x86_64-darwin ] breve: [ i686-linux, x86_64-linux, x86_64-darwin ] brians-brain: [ i686-linux, x86_64-linux, x86_64-darwin ] - brick: [ i686-linux, x86_64-linux, x86_64-darwin ] brillig: [ i686-linux, x86_64-linux, x86_64-darwin ] broccoli: [ i686-linux, x86_64-linux, x86_64-darwin ] broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2642,6 +2850,7 @@ dont-distribute-packages: buster-network: [ i686-linux, x86_64-linux, x86_64-darwin ] Buster: [ i686-linux, x86_64-linux, x86_64-darwin ] buster: [ i686-linux, x86_64-linux, x86_64-darwin ] + bustle: [ i686-linux, x86_64-linux, x86_64-darwin ] butterflies: [ i686-linux, x86_64-linux, x86_64-darwin ] byline: [ i686-linux, x86_64-linux, x86_64-darwin ] bytable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2651,6 +2860,7 @@ dont-distribute-packages: bytestring-progress: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-read: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-typenats: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestringparser: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestringreadp: [ i686-linux, x86_64-linux, x86_64-darwin ] c-dsl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2847,6 +3057,7 @@ dont-distribute-packages: clevercss: [ i686-linux, x86_64-linux, x86_64-darwin ] CLI: [ i686-linux, x86_64-linux, x86_64-darwin ] click-clack: [ i686-linux, x86_64-linux, x86_64-darwin ] + clif: [ i686-linux, x86_64-linux, x86_64-darwin ] clifford: [ i686-linux, x86_64-linux, x86_64-darwin ] clippard: [ i686-linux, x86_64-linux, x86_64-darwin ] clipper: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3060,7 +3271,7 @@ dont-distribute-packages: crypto-enigma: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-multihash: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] - cryptonite-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] + crypto-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] cryptsy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ] cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3322,6 +3533,7 @@ dont-distribute-packages: doctest-discover: [ i686-linux, x86_64-linux, x86_64-darwin ] DocTest: [ i686-linux, x86_64-linux, x86_64-darwin ] docvim: [ i686-linux, x86_64-linux, x86_64-darwin ] + doi: [ i686-linux, x86_64-linux, x86_64-darwin ] DOM: [ i686-linux, x86_64-linux, x86_64-darwin ] dominion: [ i686-linux, x86_64-linux, x86_64-darwin ] domplate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3774,6 +3986,10 @@ dont-distribute-packages: gentlemark: [ i686-linux, x86_64-linux, x86_64-darwin ] GenussFold: [ i686-linux, x86_64-linux, x86_64-darwin ] genvalidity-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-hspec-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-hspec-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-path: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-text: [ i686-linux, x86_64-linux, x86_64-darwin ] geo-resolver: [ i686-linux, x86_64-linux, x86_64-darwin ] GeocoderOpenCage: [ i686-linux, x86_64-linux, x86_64-darwin ] geodetic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3916,6 +4132,7 @@ dont-distribute-packages: gooey: [ i686-linux, x86_64-linux, x86_64-darwin ] google-drive: [ i686-linux, x86_64-linux, x86_64-darwin ] google-html5-slide: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-oauth2-for-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] google-oauth2-jwt: [ i686-linux, x86_64-linux, x86_64-darwin ] google-oauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] google-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3969,6 +4186,7 @@ dont-distribute-packages: graphics-formats-collada: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] + graphql-api: [ i686-linux, x86_64-linux, x86_64-darwin ] graphtype: [ i686-linux, x86_64-linux, x86_64-darwin ] graql: [ i686-linux, x86_64-linux, x86_64-darwin ] grasp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4034,6 +4252,7 @@ dont-distribute-packages: h2048: [ i686-linux, x86_64-linux, x86_64-darwin ] H: [ i686-linux, x86_64-linux, x86_64-darwin ] haar: [ i686-linux, x86_64-linux, x86_64-darwin ] + habit: [ i686-linux, x86_64-linux, x86_64-darwin ] Hach: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-contrib-press: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4467,6 +4686,7 @@ dont-distribute-packages: hierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] hiernotify: [ i686-linux, x86_64-linux, x86_64-darwin ] Hieroglyph: [ i686-linux, x86_64-linux, x86_64-darwin ] + hifi: [ i686-linux, x86_64-linux, x86_64-darwin ] HiggsSet: [ i686-linux, x86_64-linux, x86_64-darwin ] higher-leveldb: [ i686-linux, x86_64-linux, x86_64-darwin ] higherorder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4478,6 +4698,7 @@ dont-distribute-packages: hinquire: [ i686-linux, x86_64-linux, x86_64-darwin ] hinstaller: [ i686-linux, x86_64-linux, x86_64-darwin ] hint-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + hinterface: [ i686-linux, x86_64-linux, x86_64-darwin ] hinvaders: [ i686-linux, x86_64-linux, x86_64-darwin ] hinze-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] hip: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4588,6 +4809,7 @@ dont-distribute-packages: hoq: [ i686-linux, x86_64-linux, x86_64-darwin ] horizon: [ i686-linux, x86_64-linux, x86_64-darwin ] hosts-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + hothasktags: [ i686-linux, x86_64-linux, x86_64-darwin ] hotswap: [ i686-linux, x86_64-linux, x86_64-darwin ] hourglass-fuzzy-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ] houseman: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4631,6 +4853,7 @@ dont-distribute-packages: HROOT-hist: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-io: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-math: [ i686-linux, x86_64-linux, x86_64-darwin ] + HROOT-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT: [ i686-linux, x86_64-linux, x86_64-darwin ] hruby: [ i686-linux, x86_64-darwin ] hs-blake2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4731,7 +4954,6 @@ dont-distribute-packages: hsparql: [ i686-linux, x86_64-linux, x86_64-darwin ] hspear: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-expectations-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-expectations-pretty-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-expectations-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-golden-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4818,6 +5040,7 @@ dont-distribute-packages: hunt-searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ] hunt-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hurdle: [ i686-linux, x86_64-linux, x86_64-darwin ] + hurriyet: [ i686-linux, x86_64-linux, x86_64-darwin ] husky: [ i686-linux, x86_64-linux, x86_64-darwin ] hutton: [ i686-linux, x86_64-linux, x86_64-darwin ] huttons-razor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4973,6 +5196,7 @@ dont-distribute-packages: interruptible: [ i686-linux, x86_64-linux, x86_64-darwin ] intro-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] intro: [ i686-linux, x86_64-linux, x86_64-darwin ] + introduction-test: [ i686-linux, x86_64-linux, x86_64-darwin ] intset: [ i686-linux, x86_64-linux, x86_64-darwin ] invertible-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] invertible: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5413,7 +5637,6 @@ dont-distribute-packages: log: [ i686-linux, x86_64-linux, x86_64-darwin ] logentries: [ i686-linux, x86_64-linux, x86_64-darwin ] logger: [ i686-linux, x86_64-linux, x86_64-darwin ] - logging-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] logging-facade-journald: [ i686-linux, x86_64-linux, x86_64-darwin ] logic-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] Logic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5463,6 +5686,7 @@ dont-distribute-packages: lvmlib: [ i686-linux, x86_64-linux, x86_64-darwin ] lxc: [ i686-linux, x86_64-linux, x86_64-darwin ] lye: [ i686-linux, x86_64-linux, x86_64-darwin ] + Lykah: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma-clib: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5471,6 +5695,7 @@ dont-distribute-packages: machinecell: [ i686-linux, x86_64-linux, x86_64-darwin ] machines-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] macosx-make-standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] + madlang: [ i686-linux, x86_64-linux, x86_64-darwin ] mage: [ i686-linux, x86_64-linux, x86_64-darwin ] MagicHaskeller: [ i686-linux, x86_64-linux, x86_64-darwin ] magico: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5735,6 +5960,7 @@ dont-distribute-packages: multirec-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] multirec: [ i686-linux, x86_64-linux, x86_64-darwin ] multisetrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] + multivariant: [ i686-linux, x86_64-linux, x86_64-darwin ] Munkres-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] muon: [ i686-linux, x86_64-linux, x86_64-darwin ] murder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5787,6 +6013,7 @@ dont-distribute-packages: nanovg: [ i686-linux, x86_64-linux, x86_64-darwin ] nanq: [ i686-linux, x86_64-linux, x86_64-darwin ] narc: [ i686-linux, x86_64-linux, x86_64-darwin ] + nat-sized-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] nats-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] natural-number: [ i686-linux, x86_64-linux, x86_64-darwin ] NaturalLanguageAlphabets: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5946,6 +6173,7 @@ dont-distribute-packages: open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] open-union: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-witness: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenAFP-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenAFP: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6291,6 +6519,7 @@ dont-distribute-packages: protobuf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-descriptor-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + protolude-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] proton-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] prove-everywhere-server: [ i686-linux, x86_64-linux, x86_64-darwin ] proxy-kindness: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6331,6 +6560,7 @@ dont-distribute-packages: qd: [ i686-linux, x86_64-linux, x86_64-darwin ] qed: [ i686-linux, x86_64-linux, x86_64-darwin ] qhull-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + qif: [ i686-linux, x86_64-linux, x86_64-darwin ] QIO: [ i686-linux, x86_64-linux, x86_64-darwin ] QLearn: [ i686-linux, x86_64-linux, x86_64-darwin ] qr-imager: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6360,6 +6590,7 @@ dont-distribute-packages: quickcheck-regex: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-relaxng: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-special: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-with-counterexamples: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6417,6 +6648,7 @@ dont-distribute-packages: rawr: [ i686-linux, x86_64-linux, x86_64-darwin ] raz: [ i686-linux, x86_64-linux, x86_64-darwin ] razom-text-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + rbpcp-api: [ i686-linux, x86_64-linux, x86_64-darwin ] rbr: [ i686-linux, x86_64-linux, x86_64-darwin ] rcu: [ i686-linux, x86_64-linux, x86_64-darwin ] rdf4h: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6487,6 +6719,7 @@ dont-distribute-packages: regex-tre: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-type: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-xmlschema: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex: [ i686-linux, x86_64-linux, x86_64-darwin ] regexchar: [ i686-linux, x86_64-linux, x86_64-darwin ] regexdot: [ i686-linux, x86_64-linux, x86_64-darwin ] regexp-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6508,6 +6741,7 @@ dont-distribute-packages: reified-records: [ i686-linux, x86_64-linux, x86_64-darwin ] reify: [ i686-linux, x86_64-linux, x86_64-darwin ] reinterpret-cast: [ i686-linux, x86_64-linux, x86_64-darwin ] + relapse: [ i686-linux, x86_64-linux, x86_64-darwin ] relation: [ i686-linux, x86_64-linux, x86_64-darwin ] relative-date: [ i686-linux, x86_64-linux, x86_64-darwin ] reload: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6543,6 +6777,7 @@ dont-distribute-packages: req: [ i686-linux, x86_64-linux, x86_64-darwin ] reqcatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] request-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + rerebase: [ i686-linux, x86_64-linux, x86_64-darwin ] resistor-cube: [ i686-linux, x86_64-linux, x86_64-darwin ] resource-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] resource-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6728,6 +6963,7 @@ dont-distribute-packages: semi-iso: [ i686-linux, x86_64-linux, x86_64-darwin ] semigroupoids-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] semigroups-actions: [ i686-linux, x86_64-linux, x86_64-darwin ] + semiring-num: [ i686-linux, x86_64-linux, x86_64-darwin ] semiring: [ i686-linux, x86_64-linux, x86_64-darwin ] semver-range: [ i686-linux, x86_64-linux, x86_64-darwin ] sensei: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6749,14 +6985,10 @@ dont-distribute-packages: servant-auth-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-server: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-api: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-github-webhook: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-haxl-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7113,7 +7345,6 @@ dont-distribute-packages: stripe: [ i686-linux, x86_64-linux, x86_64-darwin ] structs: [ i686-linux, x86_64-linux, x86_64-darwin ] structural-induction: [ i686-linux, x86_64-linux, x86_64-darwin ] - structured-haskell-mode: [ i686-linux, x86_64-linux, x86_64-darwin ] structured-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] structures: [ i686-linux, x86_64-linux, x86_64-darwin ] stunts: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7141,7 +7372,6 @@ dont-distribute-packages: svgutils: [ i686-linux, x86_64-linux, x86_64-darwin ] svm-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] svndump: [ i686-linux, x86_64-linux, x86_64-darwin ] - swagger2: [ i686-linux, x86_64-linux, x86_64-darwin ] swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] swapper: [ i686-linux, x86_64-linux, x86_64-darwin ] swearjure: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7214,6 +7444,7 @@ dont-distribute-packages: target: [ i686-linux, x86_64-linux, x86_64-darwin ] task-distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] task: [ i686-linux, x86_64-linux, x86_64-darwin ] + tasty-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-discover: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-fail-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7276,6 +7507,7 @@ dont-distribute-packages: texrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] text-all: [ i686-linux, x86_64-linux, x86_64-darwin ] text-and-plots: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] text-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ] text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7315,6 +7547,7 @@ dont-distribute-packages: Thingie: [ i686-linux, x86_64-linux, x86_64-darwin ] thorn: [ i686-linux, x86_64-linux, x86_64-darwin ] threads-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + threepenny-gui-contextmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] threepenny-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] Thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7360,7 +7593,6 @@ dont-distribute-packages: tip-haskell-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] tip-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] Titim: [ i686-linux, x86_64-linux, x86_64-darwin ] - titlecase: [ i686-linux, x86_64-linux, x86_64-darwin ] tkhs: [ i686-linux, x86_64-linux, x86_64-darwin ] tkyprof: [ i686-linux, x86_64-linux, x86_64-darwin ] tld: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7369,6 +7601,7 @@ dont-distribute-packages: to-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] to-string-class: [ i686-linux, x86_64-linux, x86_64-darwin ] to-string-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + toboggan: [ i686-linux, x86_64-linux, x86_64-darwin ] todos: [ i686-linux, x86_64-linux, x86_64-darwin ] tofromxml: [ i686-linux, x86_64-linux, x86_64-darwin ] toilet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7723,6 +7956,7 @@ dont-distribute-packages: whiskers: [ i686-linux, x86_64-linux, x86_64-darwin ] whitespace: [ i686-linux, x86_64-linux, x86_64-darwin ] why3: [ i686-linux, x86_64-linux, x86_64-darwin ] + wide-word: [ i686-linux, x86_64-linux, x86_64-darwin ] WikimediaParser: [ i686-linux, x86_64-linux, x86_64-darwin ] wikipedia4epub: [ i686-linux, x86_64-linux, x86_64-darwin ] windowslive: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7781,6 +8015,7 @@ dont-distribute-packages: X11-xfixes: [ i686-linux, x86_64-linux, x86_64-darwin ] x11-xinput: [ i686-linux, x86_64-linux, x86_64-darwin ] x86-64bit: [ i686-linux, x86_64-linux, x86_64-darwin ] + xcffib: [ i686-linux, x86_64-linux, x86_64-darwin ] xchat-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] xcp: [ i686-linux, x86_64-linux, x86_64-darwin ] xdcc: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix new file mode 100644 index 00000000000..c62d2702b44 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -0,0 +1,446 @@ +# NIX-SPECIFIC OVERRIDES/PATCHES FOR HASKELL PACKAGES +# +# This file contains overrides which are needed because of Nix. For example, +# some packages may need help finding the location of native libraries. In +# general, overrides in this file are (mostly) due to one of the following reasons: +# +# * packages that hard code the location of native libraries, so they need to be patched/ +# supplied the patch explicitly +# * passing native libraries that are not detected correctly by cabal2nix +# * test suites that fail due to some features not available in the nix sandbox +# (networking being a common one) +# +# In general, this file should *not* contain overrides that fix build failures that could +# also occur on standard, FHS-compliant non-Nix systems. For example, if tests have a compile +# error, that is a bug in the package, and that failure has nothing to do with Nix. +# +# Common examples which should *not* be a part of this file: +# +# * overriding a specific version of a haskell library because some package fails +# to build with a newer version. Such overrides have nothing to do with Nix itself, +# and they would also be neccessary outside of Nix if you use the same set of +# package versions. +# * disabling tests that fail due to missing files in the tarball or compile errors +# * disabling tests that require too much memory +# * enabling/disabling certain features in packages +# +# If you have an override of this kind, see configuration-common.nix instead. +{ pkgs }: + +with import ./lib.nix { inherit pkgs; }; + +self: super: builtins.intersectAttrs super { + + # Apply NixOS-specific patches. + ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch; + + # fix errors caused by hardening flags + epanet-haskell = disableHardening super.epanet-haskell ["format"]; + + # Link the proper version. + zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; + + # Use the default version of mysql to build this package (which is actually mariadb). + # test phase requires networking + mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.lib; }); + + # CUDA needs help finding the SDK headers and libraries. + cuda = overrideCabal super.cuda (drv: { + extraLibraries = (drv.extraLibraries or []) ++ [pkgs.linuxPackages.nvidia_x11]; + configureFlags = (drv.configureFlags or []) ++ + pkgs.lib.optional pkgs.stdenv.is64bit "--extra-lib-dirs=${pkgs.cudatoolkit}/lib64" ++ [ + "--extra-lib-dirs=${pkgs.cudatoolkit}/lib" + "--extra-include-dirs=${pkgs.cudatoolkit}/include" + ]; + preConfigure = '' + unset CC # unconfuse the haskell-cuda configure script + sed -i -e 's|/usr/local/cuda|${pkgs.cudatoolkit}|g' configure + ''; + }); + + # jni needs help finding libjvm.so because it's in a weird location. + jni = overrideCabal super.jni (drv: { + preConfigure = '' + local libdir=( "${pkgs.jdk}/lib/openjdk/jre/lib/"*"/server" ) + configureFlags+=" --extra-lib-dir=''${libdir[0]}" + ''; + }); + + # The package doesn't know about the AL include hierarchy. + # https://github.com/phaazon/al/issues/1 + al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"; + + # Won't find it's header files without help. + sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL"; + + hzk = overrideCabal super.hzk (drv: { + preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; + configureFlags = "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper"; + }); + + haskakafka = overrideCabal super.haskakafka (drv: { + preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d haskakafka.cabal"; + configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka"; + }); + + # Foreign dependency name clashes with another Haskell package. + libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; }; + + # Fix Darwin build. + halive = if pkgs.stdenv.isDarwin + then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit + else super.halive; + + # Heist's test suite requires system pandoc + heist = overrideCabal super.heist (drv: { + testToolDepends = [pkgs.pandoc]; + }); + + # the system-fileio tests use canonicalizePath, which fails in the sandbox + system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio; + + # Prevents needing to add security_tool as a build tool to all of x509-system's + # dependencies. + x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc + then let inherit (pkgs.darwin) security_tool; + in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: { + postPatch = (drv.postPatch or "") + '' + substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security + ''; + }) + else super.x509-system; + + # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 + gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.gtk2hs-buildtools) pkgs.glib) ["fortify"]; + glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib) ["fortify"]; + gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"]; + gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"]; + gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; }; + gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; }; + + # Need WebkitGTK, not just webkit. + webkit = super.webkit.override { webkit = pkgs.webkitgtk2; }; + webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; }; + webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; }; + websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; }; + + hs-mesos = overrideCabal super.hs-mesos (drv: { + # Pass _only_ mesos; the correct protobuf is propagated. + extraLibraries = [ pkgs.mesos ]; + preConfigure = "sed -i -e /extra-lib-dirs/d -e 's|, /usr/include, /usr/local/include/mesos||' hs-mesos.cabal"; + }); + + # These packages try to access the network. + amqp = dontCheck super.amqp; + amqp-conduit = dontCheck super.amqp-conduit; + bitcoin-api = dontCheck super.bitcoin-api; + bitcoin-api-extra = dontCheck super.bitcoin-api-extra; + bitx-bitcoin = dontCheck super.bitx-bitcoin; # http://hydra.cryp.to/build/926187/log/raw + concurrent-dns-cache = dontCheck super.concurrent-dns-cache; + digitalocean-kzs = dontCheck super.digitalocean-kzs; # https://github.com/KazumaSATO/digitalocean-kzs/issues/1 + github-types = dontCheck super.github-types; # http://hydra.cryp.to/build/1114046/nixlog/1/raw + hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw + hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw + hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql + hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; }); + marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw + mongoDB = dontCheck super.mongoDB; + network-transport-tcp = dontCheck super.network-transport-tcp; + network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30 + pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw + raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw + riak = dontCheck super.riak; # http://hydra.cryp.to/build/498763/log/raw + scotty-binding-play = dontCheck super.scotty-binding-play; + servant-router = dontCheck super.servant-router; + serversession-backend-redis = dontCheck super.serversession-backend-redis; + slack-api = dontCheck super.slack-api; # https://github.com/mpickering/slack-api/issues/5 + socket = dontCheck super.socket; + stackage = dontCheck super.stackage; # http://hydra.cryp.to/build/501867/nixlog/1/raw + textocat-api = dontCheck super.textocat-api; # http://hydra.cryp.to/build/887011/log/raw + warp = dontCheck super.warp; # http://hydra.cryp.to/build/501073/nixlog/5/raw + wreq = dontCheck super.wreq; # http://hydra.cryp.to/build/501895/nixlog/1/raw + wreq-sb = dontCheck super.wreq-sb; # http://hydra.cryp.to/build/783948/log/raw + wuss = dontCheck super.wuss; # http://hydra.cryp.to/build/875964/nixlog/2/raw + download = dontCheck super.download; + http-client = dontCheck super.http-client; + http-client-openssl = dontCheck super.http-client-openssl; + http-client-tls = dontCheck super.http-client-tls; + http-conduit = dontCheck super.http-conduit; + transient-universe = dontCheck super.transient-universe; + typed-process = dontCheck super.typed-process; + js-jquery = dontCheck super.js-jquery; + hPDB-examples = dontCheck super.hPDB-examples; + configuration-tools = dontCheck super.configuration-tools; # https://github.com/alephcloud/hs-configuration-tools/issues/40 + tcp-streams = dontCheck super.tcp-streams; + holy-project = dontCheck super.holy-project; + mustache = dontCheck super.mustache; + + # Tries to mess with extended POSIX attributes, but can't in our chroot environment. + xattr = dontCheck super.xattr; + + # Needs access to locale data, but looks for it in the wrong place. + scholdoc-citeproc = dontCheck super.scholdoc-citeproc; + + # Expect to find sendmail(1) in $PATH. + mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\""; + + # Help the test suite find system timezone data. + tz = overrideCabal super.tz (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; }); + + # Nix-specific workaround + xmonad = appendPatch (dontCheck super.xmonad) ./patches/xmonad-nix.patch; + + # https://github.com/ucsd-progsys/liquid-fixpoint/issues/44 + liquid-fixpoint = overrideCabal super.liquid-fixpoint (drv: { preConfigure = "patchShebangs ."; }); + + # wxc supports wxGTX >= 3.0, but our current default version points to 2.8. + # http://hydra.cryp.to/build/1331287/log/raw + wxc = (addBuildDepend super.wxc self.split).override { wxGTK = pkgs.wxGTK30; }; + wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; }; + + # Test suite wants to connect to $DISPLAY. + hsqml = dontCheck (addExtraLibrary (super.hsqml.override { qt5 = pkgs.qt5Full; }) pkgs.mesa); + + # Tests attempt to use NPM to install from the network into + # /homeless-shelter. Disabled. + purescript = dontCheck super.purescript; + + # Hardcoded include path + poppler = overrideCabal super.poppler (drv: { + postPatch = '' + sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal + sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc + ''; + }); + + # Uses OpenGL in testing + caramia = dontCheck super.caramia; + + llvm-general-darwin = overrideCabal (super.llvm-general.override { llvm-config = pkgs.llvm_35; }) (drv: { + preConfigure = '' + sed -i llvm-general.cabal \ + -e 's,extra-libraries: stdc++,extra-libraries: c++,' + ''; + configureFlags = (drv.configureFlags or []) ++ ["--extra-include-dirs=${pkgs.libcxx}/include/c++/v1"]; + librarySystemDepends = [ pkgs.libcxx ] ++ drv.librarySystemDepends or []; + }); + + # Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142 + llvm-general = + if pkgs.stdenv.isDarwin + then self.llvm-general-darwin + else super.llvm-general.override { llvm-config = pkgs.llvm_35; }; + + # Needs help finding LLVM. + spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; + + # Tries to run GUI in tests + leksah = dontCheck (overrideCabal super.leksah (drv: { + executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [ + gnome3.defaultIconTheme # Fix error: Icon 'window-close' not present in theme ... + wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system + gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed + ]); + postPatch = (drv.postPatch or "") + '' + for f in src/IDE/Leksah.hs src/IDE/Utils/ServerConnection.hs + do + substituteInPlace "$f" --replace "\"leksah-server\"" "\"${self.leksah-server}/bin/leksah-server\"" + done + ''; + })); + + # Patch to consider NIX_GHC just like xmonad does + dyre = appendPatch super.dyre ./patches/dyre-nix.patch; + + yesod-bin = if pkgs.stdenv.isDarwin + then addBuildDepend super.yesod-bin pkgs.darwin.apple_sdk.frameworks.Cocoa + else super.yesod-bin; + + hmatrix = if pkgs.stdenv.isDarwin + then addBuildDepend super.hmatrix pkgs.darwin.apple_sdk.frameworks.Accelerate + else super.hmatrix; + + # https://github.com/edwinb/EpiVM/issues/13 + # https://github.com/edwinb/EpiVM/issues/14 + epic = addExtraLibraries (addBuildTool super.epic self.happy) [pkgs.boehmgc pkgs.gmp]; + + # https://github.com/ekmett/wl-pprint-terminfo/issues/7 + wl-pprint-terminfo = addExtraLibrary super.wl-pprint-terminfo pkgs.ncurses; + + # https://github.com/bos/pcap/issues/5 + pcap = addExtraLibrary super.pcap pkgs.libpcap; + + # The cabal files for these libraries do not list the required system dependencies. + miniball = overrideCabal super.miniball (drv: { + librarySystemDepends = [ pkgs.miniball ]; + }); + SDL-image = overrideCabal super.SDL-image (drv: { + librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or []; + }); + SDL-ttf = overrideCabal super.SDL-ttf (drv: { + librarySystemDepends = [ pkgs.SDL pkgs.SDL_ttf ]; + }); + SDL-mixer = overrideCabal super.SDL-mixer (drv: { + librarySystemDepends = [ pkgs.SDL pkgs.SDL_mixer ]; + }); + SDL-gfx = overrideCabal super.SDL-gfx (drv: { + librarySystemDepends = [ pkgs.SDL pkgs.SDL_gfx ]; + }); + SDL-mpeg = overrideCabal super.SDL-mpeg (drv: { + configureFlags = (drv.configureFlags or []) ++ [ + "--extra-lib-dirs=${pkgs.smpeg}/lib" + "--extra-include-dirs=${pkgs.smpeg}/include/smpeg" + ]; + }); + + # https://github.com/ivanperez-keera/hcwiid/pull/4 + hcwiid = overrideCabal super.hcwiid (drv: { + configureFlags = (drv.configureFlags or []) ++ [ + "--extra-lib-dirs=${pkgs.bluez.out}/lib" + "--extra-lib-dirs=${pkgs.cwiid}/lib" + "--extra-include-dirs=${pkgs.cwiid}/include" + "--extra-include-dirs=${pkgs.bluez.dev}/include" + ]; + prePatch = '' sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal" ''; + }); + + # cabal2nix doesn't pick up some of the dependencies. + ginsu = let + g = addBuildDepend super.ginsu pkgs.perl; + g' = overrideCabal g (drv: { + executableSystemDepends = (drv.executableSystemDepends or []) ++ [ + pkgs.ncurses + ]; + }); + in g'; + + # Tests require `docker` command in PATH + # Tests require running docker service :on localhost + docker = dontCheck super.docker; + + # https://github.com/deech/fltkhs/issues/16 + fltkhs = overrideCabal super.fltkhs (drv: { + libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.autoconf]; + librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.fltk13 pkgs.mesa_noglu pkgs.libjpeg]; + }); + + # https://github.com/skogsbaer/hscurses/pull/26 + hscurses = overrideCabal super.hscurses (drv: { + librarySystemDepends = (drv.librarySystemDepends or []) ++ [ pkgs.ncurses ]; + }); + + # Looks like Avahi provides the missing library + dnssd = super.dnssd.override { dns_sd = pkgs.avahi.override { withLibdnssdCompat = true; }; }; + + # Ensure the necessary frameworks are propagatedBuildInputs on darwin + OpenGLRaw = overrideCabal super.OpenGLRaw (drv: { + librarySystemDepends = + pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; + libraryHaskellDepends = drv.libraryHaskellDepends + ++ pkgs.lib.optionals pkgs.stdenv.isDarwin + [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]; + preConfigure = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' + frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done)) + frameworkPaths=$(IFS=, ; echo "''${frameworkPaths[@]}") + configureFlags+=$(if [ -n "$frameworkPaths" ]; then echo -n "--ghc-options=-optl=$frameworkPaths"; fi) + ''; + }); + GLURaw = overrideCabal super.GLURaw (drv: { + librarySystemDepends = + pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; + libraryHaskellDepends = drv.libraryHaskellDepends + ++ pkgs.lib.optionals pkgs.stdenv.isDarwin + [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]; + }); + bindings-GLFW = overrideCabal super.bindings-GLFW (drv: { + doCheck = false; # requires an active X11 display + librarySystemDepends = + pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; + libraryHaskellDepends = drv.libraryHaskellDepends + ++ pkgs.lib.optionals pkgs.stdenv.isDarwin + (with pkgs.darwin.apple_sdk.frameworks; + [ AGL Cocoa OpenGL IOKit Kernel CoreVideo + pkgs.darwin.CF ]); + }); + OpenCL = overrideCabal super.OpenCL (drv: { + librarySystemDepends = + pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; + libraryHaskellDepends = drv.libraryHaskellDepends + ++ pkgs.lib.optionals pkgs.stdenv.isDarwin + [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]; + }); + + # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for + # it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config + # depend on freeglut, which provides GHC to necessary information to generate a correct RPATH. + # + # Note: Simply patching the dynamic library (.so) of the GLUT build will *not* work, since the + # RPATH also needs to be propagated when using static linking. GHC automatically handles this for + # us when we patch the cabal file (Link options will be recored in the ghc package registry). + # + # Additional note: nixpkgs' freeglut and macOS's OpenGL implementation do not cooperate, + # so disable this on Darwin only + ${if pkgs.stdenv.isDarwin then null else "GLUT"} = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut; + + idris = overrideCabal super.idris (drv: { + # https://github.com/idris-lang/Idris-dev/issues/2499 + librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp]; + + # tests and build run executable, so need to set LD_LIBRARY_PATH + preBuild = '' + export LD_LIBRARY_PATH="$PWD/dist/build:$LD_LIBRARY_PATH" + ''; + }); + + libsystemd-journal = overrideCabal super.libsystemd-journal (old: { + librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ]; + }); + + # does not specify tests in cabal file, instead has custom runTest cabal hook, + # so cabal2nix will not detect test dependencies. + either-unwrap = overrideCabal super.either-unwrap (drv: { + testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ]; + }); + + hidapi = addExtraLibrary super.hidapi pkgs.libudev; + + hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; }; + + discount = super.discount.override { markdown = pkgs.discount; }; + + # tests require working stack installation with all-cabal-hashes cloned in $HOME + stackage-curator = dontCheck super.stackage-curator; + + # hardcodes /usr/bin/tr: https://github.com/snapframework/io-streams/pull/59 + io-streams = enableCabalFlag super.io-streams "NoInteractiveTests"; + + # requires autotools to build + secp256k1 = addBuildTools super.secp256k1 [ pkgs.autoconf pkgs.automake pkgs.libtool ]; + + # tests require git + hapistrano = addBuildTool super.hapistrano pkgs.git; + + # requires webkitgtk API version 3 (webkitgtk 2.4 is the latest webkit supporting that version) + gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; }; + gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; }; + + # requires valid, writeable $HOME + hatex-guide = overrideCabal super.hatex-guide (drv: { + preConfigure = '' + ${drv.preConfigure or ""} + export HOME=$PWD + ''; + }); + + # Fails to link against with newer gsl versions because a deprecrated function + # was removed + hmatrix-gsl = super.hmatrix-gsl.override { gsl = pkgs.gsl_1; }; + + # tests run executable, relying on PATH + # without this, tests fail with "Couldn't launch intero process" + intero = overrideCabal super.intero (drv: { + preCheck = '' + export PATH="$PWD/dist/build/intero:$PATH" + ''; + }); +} diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index ef73e47f537..d2ecc338128 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -55,18 +55,26 @@ let inherit packages; }; - hackage2nix = name: version: pkgs.stdenv.mkDerivation { - name = "cabal2nix-${name}-${version}"; - buildInputs = [ pkgs.cabal2nix ]; - phases = ["installPhase"]; - LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive"; - installPhase = '' - export HOME="$TMP" - mkdir $out - hash=$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' ${all-cabal-hashes}/${name}/${version}/${name}.json) - cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} --sha256=$hash ${all-cabal-hashes}/${name}/${version}/${name}.cabal >$out/default.nix - ''; + haskellSrc2nix = { name, src, sha256 ? null }: + let + sha256Arg = if isNull sha256 then "" else ''--sha256="${sha256}"''; + in pkgs.stdenv.mkDerivation { + name = "cabal2nix-${name}"; + buildInputs = [ pkgs.cabal2nix ]; + phases = ["installPhase"]; + LANG = "en_US.UTF-8"; + LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive"; + installPhase = '' + export HOME="$TMP" + mkdir -p "$out" + cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} ${sha256Arg} "${src}" > "$out/default.nix" + ''; + }; + + hackage2nix = name: version: haskellSrc2nix { + name = "${name}-${version}"; + sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${all-cabal-hashes}/${name}/${version}/${name}.json")''; + src = "${all-cabal-hashes}/${name}/${version}/${name}.cabal"; }; in @@ -76,6 +84,9 @@ let callHackage = name: version: self.callPackage (hackage2nix name version); + # Creates a Haskell package from a source package by calling cabal2nix on the source. + callCabal2nix = name: src: self.callPackage (haskellSrc2nix { inherit src name; }); + ghcWithPackages = selectFrom: withPackages (selectFrom self); ghcWithHoogle = selectFrom: @@ -94,6 +105,7 @@ let }; commonConfiguration = import ./configuration-common.nix { inherit pkgs; }; + nixConfiguration = import ./configuration-nix.nix { inherit pkgs; }; in @@ -101,4 +113,5 @@ in (extends overrides (extends packageSetConfig (extends compilerConfig - (extends commonConfiguration haskellPackages)))) + (extends commonConfiguration + (extends nixConfiguration haskellPackages))))) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index a7696dfc2e3..1998b090687 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -20,7 +20,8 @@ # TODO enable shared libs for cross-compiling , enableSharedExecutables ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)) , enableSharedLibraries ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)) -, enableSplitObjs ? !stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013 +, enableSplitObjs ? null # OBSOLETE, use enableDeadCodeElimination +, enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin , enableStaticLibraries ? true , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] , homepage ? "http://hackage.haskell.org/package/${pname}" @@ -31,6 +32,7 @@ , jailbreak ? false , license , maintainers ? [] +, doCoverage ? false # TODO Do we care about haddock when cross-compiling? , doHaddock ? !isCross && (!stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8") , passthru ? {} @@ -53,10 +55,12 @@ } @ args: assert editedCabalFile != null -> revision != null; +# OBSOLETE, use enableDeadCodeElimination +assert enableSplitObjs == null; let - inherit (stdenv.lib) optional optionals optionalString versionOlder + inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast concatStringsSep enableFeature optionalAttrs toUpper; isGhcjs = ghc.isGhcjs or false; @@ -108,13 +112,16 @@ let (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") - (enableFeature enableSplitObjs "split-objs") + (enableFeature (enableDeadCodeElimination && (versionAtLeast "8.0.1" ghc.version)) "split-objs") (enableFeature enableLibraryProfiling "library-profiling") (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling")) (enableFeature enableSharedLibraries "shared") + (optionalString (versionAtLeast ghc.version "7.10") (enableFeature doCoverage "coverage")) (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla")) (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic")) (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests")) + ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [ + "--ghc-option=-split-sections" ] ++ optionals isGhcjs [ "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" "--ghcjs" @@ -148,8 +155,10 @@ let setupBuilder = if isCross || isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand; setupCommand = "./Setup"; - ghcCommand = if isGhcjs then "ghcjs" else if isCross then "${ghc.cross.config}-ghc" else "ghc"; - ghcCommandCaps = toUpper ghcCommand; + ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; + crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; + ghcCommand = "${crossPrefix}${ghcCommand'}"; + ghcCommandCaps= toUpper ghcCommand'; in @@ -279,7 +288,7 @@ stdenv.mkDerivation ({ local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile ) mv $packageConfFile $packageConfDir/$pkgId.conf ''} - + ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"} ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") '' for exe in "$out/bin/"* ; do install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe" diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 13a939fcce9..1a16cf3683f 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -1,4 +1,4 @@ -{ stdenv, ghc, pkgconfig, glibcLocales }: +{ stdenv, ghc, pkgconfig, glibcLocales, cacert }: with stdenv.lib; @@ -27,6 +27,12 @@ stdenv.mkDerivation (args // { LD_LIBRARY_PATH = makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs); # ^^^ Internally uses `getOutput "lib"` (equiv. to getLib) + # Non-NixOS git needs cert + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + # Fixes https://github.com/commercialhaskell/stack/issues/2358 + LANG = "en_US.UTF-8"; + preferLocalBuild = true; configurePhase = args.configurePhase or '' diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 056a98727c1..b83d984b0bb 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -679,54 +679,6 @@ self: { }) {}; "Agda" = callPackage - ({ mkDerivation, alex, array, base, binary, boxes, bytestring - , containers, cpphs, data-hash, deepseq, directory, EdisonAPI - , EdisonCore, edit-distance, emacs, equivalence, filemanip - , filepath, geniplate-mirror, happy, hashable, hashtables - , haskeline, haskell-src-exts, monadplus, mtl, parallel, pretty - , process, QuickCheck, strict, template-haskell, text, time - , transformers, transformers-compat, unordered-containers, xhtml - , zlib - }: - mkDerivation { - pname = "Agda"; - version = "2.5.1.1"; - sha256 = "563b8063fc94349b56ae1867e973f1751db0e9a8997af7ede93d3c3a8c66a6b0"; - revision = "1"; - editedCabalFile = "388327fd9b4f98671a05ba6aa873d8161133d71e6234fcdb208882eda9fd161b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary boxes bytestring containers data-hash deepseq - directory EdisonAPI EdisonCore edit-distance equivalence filepath - geniplate-mirror hashable hashtables haskeline haskell-src-exts - monadplus mtl parallel pretty process QuickCheck strict - template-haskell text time transformers transformers-compat - unordered-containers xhtml zlib - ]; - libraryToolDepends = [ alex cpphs happy ]; - executableHaskellDepends = [ - base binary containers directory filemanip filepath - haskell-src-exts mtl process - ]; - executableToolDepends = [ emacs ]; - postInstall = '' - files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) - for f in "''${files[@]}" ; do - $out/bin/agda $f - done - for f in "''${files[@]}" ; do - $out/bin/agda -c --no-main $f - done - $out/bin/agda-mode compile - ''; - homepage = "http://wiki.portal.chalmers.se/agda/"; - description = "A dependently typed functional programming language and proof assistant"; - license = "unknown"; - maintainers = with stdenv.lib.maintainers; [ abbradar ]; - }) {inherit (pkgs) emacs;}; - - "Agda_2_5_2" = callPackage ({ mkDerivation, alex, array, base, binary, boxes, bytestring , containers, cpphs, data-hash, deepseq, directory, EdisonCore , edit-distance, emacs, equivalence, filepath, geniplate-mirror @@ -739,8 +691,8 @@ self: { pname = "Agda"; version = "2.5.2"; sha256 = "d812cec3bf7f03c4b27248572475c7e060154102771a8434cc11ba89f5691439"; - revision = "1"; - editedCabalFile = "44f0f96c5d26202f964c575e5f94fe52686f4b889078ddfdafef0c6fd2571b47"; + revision = "2"; + editedCabalFile = "4db0b12bc07e72fe1b180acad2a0d59ac11d9a1d45698b46cede7b634fb6bfff"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -767,7 +719,6 @@ self: { homepage = "http://wiki.portal.chalmers.se/agda/"; description = "A dependently typed functional programming language and proof assistant"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ abbradar ]; }) {inherit (pkgs) emacs;}; @@ -1676,8 +1627,8 @@ self: { }: mkDerivation { pname = "BitStringRandomMonad"; - version = "0.1.1.1"; - sha256 = "496715852ecfd5651fee81eba635b88865ef6dbc87792e56ea47eeac36fd9c36"; + version = "0.1.1.2"; + sha256 = "96a5bb1cb04427a64be71f83d1a09abb950d3023ae80e3811a304748ace16dbf"; libraryHaskellDepends = [ base bitstring bytestring mtl parallel primitive transformers vector @@ -2559,6 +2510,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Chart_1_8_2" = callPackage + ({ mkDerivation, array, base, colour, data-default-class, lens, mtl + , old-locale, operational, time, vector + }: + mkDerivation { + pname = "Chart"; + version = "1.8.2"; + sha256 = "8442c16959e2a46355418b82c0c6fc3174d04b41ea6e2e320c56588a563be28d"; + libraryHaskellDepends = [ + array base colour data-default-class lens mtl old-locale + operational time vector + ]; + homepage = "https://github.com/timbod7/haskell-chart/wiki"; + description = "A library for generating 2D Charts and Plots"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Chart-cairo" = callPackage ({ mkDerivation, array, base, cairo, Chart, colour , data-default-class, lens, mtl, old-locale, operational, time @@ -2576,6 +2545,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Chart-cairo_1_8_2" = callPackage + ({ mkDerivation, array, base, cairo, Chart, colour + , data-default-class, lens, mtl, old-locale, operational, time + }: + mkDerivation { + pname = "Chart-cairo"; + version = "1.8.2"; + sha256 = "7cd8ba9da4c43ff4d6ba468d65e91b7239a0543038996a9a626818dc1a408fc1"; + libraryHaskellDepends = [ + array base cairo Chart colour data-default-class lens mtl + old-locale operational time + ]; + homepage = "https://github.com/timbod7/haskell-chart/wiki"; + description = "Cairo backend for Charts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Chart-diagrams" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour , containers, data-default-class, diagrams-core, diagrams-lib @@ -2597,14 +2584,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Chart-diagrams_1_8_2" = callPackage + ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour + , containers, data-default-class, diagrams-core, diagrams-lib + , diagrams-postscript, diagrams-svg, lens, mtl, old-locale + , operational, svg-builder, SVGFonts, text, time + }: + mkDerivation { + pname = "Chart-diagrams"; + version = "1.8.2"; + sha256 = "ca181dec04bac1029101dd75951f48710ebc42f5333e06c57943e3245bba9f41"; + libraryHaskellDepends = [ + base blaze-markup bytestring Chart colour containers + data-default-class diagrams-core diagrams-lib diagrams-postscript + diagrams-svg lens mtl old-locale operational svg-builder SVGFonts + text time + ]; + homepage = "https://github.com/timbod7/haskell-chart/wiki"; + description = "Diagrams backend for Charts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Chart-gtk" = callPackage ({ mkDerivation, array, base, cairo, Chart, Chart-cairo, colour , data-default-class, gtk, mtl, old-locale, time }: mkDerivation { pname = "Chart-gtk"; - version = "1.8.1"; - sha256 = "964a8dd5b23d86f4a0d91fde5d1144fba8dd29d2810a05864ce0e795c2f7056a"; + version = "1.8.2"; + sha256 = "20c97819a35e0983af3e27e196c593e1bb1262f7dda86f4a874485e6042274c9"; libraryHaskellDepends = [ array base cairo Chart Chart-cairo colour data-default-class gtk mtl old-locale time @@ -2771,38 +2780,20 @@ self: { }) {}; "ClustalParser" = callPackage - ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec - , vector - }: - mkDerivation { - pname = "ClustalParser"; - version = "1.1.4"; - sha256 = "d32db29dd58b9fe305b76dbdde6d0b2b328a526b63872e02177600f6832cc48f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base parsec vector ]; - executableHaskellDepends = [ base cmdargs either-unwrap ]; - testHaskellDepends = [ base hspec parsec ]; - description = "Libary for parsing Clustal tools output"; - license = "GPL"; - }) {}; - - "ClustalParser_1_2_0" = callPackage ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec, text , vector }: mkDerivation { pname = "ClustalParser"; - version = "1.2.0"; - sha256 = "e444b4780a976d13178ba0d47d34ff1c7e1222077d2ec6c81f4370dce58a8ec8"; + version = "1.2.1"; + sha256 = "0034a9fdca3e4bcb70edb961536ee4acb162fec0ab1b2c67108598bfcd75879d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec text vector ]; executableHaskellDepends = [ base cmdargs either-unwrap ]; - testHaskellDepends = [ base hspec parsec ]; + testHaskellDepends = [ base hspec parsec text ]; description = "Libary for parsing Clustal tools output"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + license = stdenv.lib.licenses.gpl3; }) {}; "Coadjute" = callPackage @@ -4420,6 +4411,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Earley_0_12_0_0" = callPackage + ({ mkDerivation, base, ListLike, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "Earley"; + version = "0.12.0.0"; + sha256 = "98657d247c04f7f37dc3b7e03a9bf6c0ea20e945ddac0aa0406ba7c464723337"; + libraryHaskellDepends = [ base ListLike ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Parsing all context-free grammars using Earley's algorithm"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Ebnf2ps" = callPackage ({ mkDerivation, array, base, containers, directory, happy , old-time, unix @@ -4992,6 +5000,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "FastPush" = callPackage + ({ mkDerivation, base, STMonadTrans, vector }: + mkDerivation { + pname = "FastPush"; + version = "0.1.0.2"; + sha256 = "301cf0552dc14adc8865038b7d7f5aac7dc791f4039c790c28262603b129c674"; + libraryHaskellDepends = [ base STMonadTrans vector ]; + homepage = "https://github.com/wyager/FastPush/"; + description = "A monad and monad transformer for pushing things onto a stack very fast"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "FastxPipe" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring, pipes , pipes-attoparsec, pipes-bytestring @@ -5751,8 +5771,8 @@ self: { }: mkDerivation { pname = "GLUT"; - version = "2.7.0.10"; - sha256 = "4b11cbf9b7876c0ec14bf0673006bd23e7ffc7d396568987b326a1b706497569"; + version = "2.7.0.11"; + sha256 = "da270ef3027f48fd62115e6f1e90a44334e3da5524e4619dbab6d186f5511b5d"; libraryHaskellDepends = [ array base containers OpenGL StateVar transformers ]; @@ -6273,6 +6293,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "GoogleCodeJam" = callPackage + ({ mkDerivation, array, base, containers, mtl, parallel, safe + , split, transformers + }: + mkDerivation { + pname = "GoogleCodeJam"; + version = "0.0.3"; + sha256 = "e08209b95b264757ce8c4fc1422059c09910b38a4bdd22f6d4e51b24ab1cabdc"; + libraryHaskellDepends = [ + array base containers mtl parallel safe split transformers + ]; + homepage = "http://johannesgerer.com/GoogleCodeJam"; + description = "A monad for flexible parsing of Google Code Jam input files with automatic parallelization"; + license = stdenv.lib.licenses.mit; + }) {}; + "GoogleDirections" = callPackage ({ mkDerivation, AttoJson, base, bytestring, containers, dataenc , download-curl @@ -7795,32 +7831,33 @@ self: { }) {}; "HROOT" = callPackage - ({ mkDerivation, base, fficxx-runtime, HROOT-core, HROOT-graf - , HROOT-hist, HROOT-io, HROOT-math + ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core + , HROOT-graf, HROOT-hist, HROOT-io, HROOT-math, HROOT-tree + , template-haskell }: mkDerivation { pname = "HROOT"; - version = "0.8"; - sha256 = "0e6fa9e42e8843bbd7cb0af48e3f86ba8412a2fb12c70f94990ed10f832cd660"; - revision = "1"; - editedCabalFile = "43058ba39e0517740c45b1087a39e4f84912c1a3c500504850395d4f2fda0917"; + version = "0.9.0.1"; + sha256 = "e8a677131caf8cef55d725a00993a22ed63792900617baa0189be72639a483d5"; libraryHaskellDepends = [ - base fficxx-runtime HROOT-core HROOT-graf HROOT-hist HROOT-io - HROOT-math + base fficxx fficxx-runtime HROOT-core HROOT-graf HROOT-hist + HROOT-io HROOT-math HROOT-tree template-haskell ]; homepage = "http://ianwookim.org/HROOT"; - description = "Haskell binding to ROOT RooFit modules"; + description = "Haskell binding to the ROOT data analysis framework"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HROOT-core" = callPackage - ({ mkDerivation, base, fficxx-runtime }: + ({ mkDerivation, base, fficxx, fficxx-runtime, template-haskell }: mkDerivation { pname = "HROOT-core"; - version = "0.8"; - sha256 = "161807e042e440c6b00d87dda1bb1a945ec9aee53375f2c66d80984c84b080b8"; - libraryHaskellDepends = [ base fficxx-runtime ]; + version = "0.9.0.1"; + sha256 = "053dd486a4b0872fee1536eb5fcec930868c132c664ab3f6b01cb436c76eaae3"; + libraryHaskellDepends = [ + base fficxx fficxx-runtime template-haskell + ]; homepage = "http://ianwookim.org/HROOT"; description = "Haskell binding to ROOT Core modules"; license = stdenv.lib.licenses.lgpl21; @@ -7828,13 +7865,15 @@ self: { }) {}; "HROOT-graf" = callPackage - ({ mkDerivation, base, fficxx-runtime, HROOT-core, HROOT-hist }: + ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core + , HROOT-hist, template-haskell + }: mkDerivation { pname = "HROOT-graf"; - version = "0.8"; - sha256 = "7c817f7c174a2ad026dd494391427719da23addcda9dc3e7fa59aa9fb96102ca"; + version = "0.9.0.1"; + sha256 = "993866cd851a3fff908f5a4484b2ee217825f3a2a60ab0d124e6e3aca83e31a8"; libraryHaskellDepends = [ - base fficxx-runtime HROOT-core HROOT-hist + base fficxx fficxx-runtime HROOT-core HROOT-hist template-haskell ]; homepage = "http://ianwookim.org/HROOT"; description = "Haskell binding to ROOT Graf modules"; @@ -7843,12 +7882,16 @@ self: { }) {}; "HROOT-hist" = callPackage - ({ mkDerivation, base, fficxx-runtime, HROOT-core }: + ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core + , template-haskell + }: mkDerivation { pname = "HROOT-hist"; - version = "0.8"; - sha256 = "01ce1810bcdd1dbf53d2b7f7c5923f7409d1388ceaa328549046f06fc5c3f47b"; - libraryHaskellDepends = [ base fficxx-runtime HROOT-core ]; + version = "0.9.0.1"; + sha256 = "4da911be3e79559af4cc7269db52e3cc6f380baaf9c302d06890a461b1a63015"; + libraryHaskellDepends = [ + base fficxx fficxx-runtime HROOT-core template-haskell + ]; homepage = "http://ianwookim.org/HROOT"; description = "Haskell binding to ROOT Hist modules"; license = stdenv.lib.licenses.lgpl21; @@ -7856,12 +7899,16 @@ self: { }) {}; "HROOT-io" = callPackage - ({ mkDerivation, base, fficxx-runtime, HROOT-core }: + ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core + , template-haskell + }: mkDerivation { pname = "HROOT-io"; - version = "0.8"; - sha256 = "621adb74a41241cb7678e4a28ba3aff3bb21b132c2890ae0be627722be347069"; - libraryHaskellDepends = [ base fficxx-runtime HROOT-core ]; + version = "0.9.0.1"; + sha256 = "1cebc91e14a3ebe98db155efef448884cadab0344879efaa68d7fa7dfd8ca34b"; + libraryHaskellDepends = [ + base fficxx fficxx-runtime HROOT-core template-haskell + ]; homepage = "http://ianwookim.org/HROOT"; description = "Haskell binding to ROOT IO modules"; license = stdenv.lib.licenses.lgpl21; @@ -7869,18 +7916,39 @@ self: { }) {}; "HROOT-math" = callPackage - ({ mkDerivation, base, fficxx-runtime, HROOT-core }: + ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core + , template-haskell + }: mkDerivation { pname = "HROOT-math"; - version = "0.8"; - sha256 = "95ff6a0125141818f4bdb3946dcfa9dd8cbeb4a00674c429b082b7df61deba62"; - libraryHaskellDepends = [ base fficxx-runtime HROOT-core ]; + version = "0.9.0.1"; + sha256 = "2669f815a6b27dce14d561bdcb3d86ab7ea15c24ed9563e6893ab67a4c1d9d89"; + libraryHaskellDepends = [ + base fficxx fficxx-runtime HROOT-core template-haskell + ]; homepage = "http://ianwookim.org/HROOT"; description = "Haskell binding to ROOT Math modules"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HROOT-tree" = callPackage + ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core + , template-haskell + }: + mkDerivation { + pname = "HROOT-tree"; + version = "0.9.0.1"; + sha256 = "442e5c2a786b51b09229907f00b24021f5f1f5631ef8f5d5b4b582eaf28b0cf2"; + libraryHaskellDepends = [ + base fficxx fficxx-runtime HROOT-core template-haskell + ]; + homepage = "http://ianwookim.org/HROOT"; + description = "Haskell binding to ROOT Tree modules"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HRay" = callPackage ({ mkDerivation, array, base, directory, haskell98 }: mkDerivation { @@ -8126,8 +8194,10 @@ self: { }: mkDerivation { pname = "HTTP"; - version = "4000.3.4"; - sha256 = "a4066d6fe45fa41d1c3e262e1100c740dc35cddec34c576723bdc35a8dcfc322"; + version = "4000.3.5"; + sha256 = "bca0bf130666e924abaf3daff22be6e27928f83f91d6a34cbc39616497908aed"; + revision = "2"; + editedCabalFile = "6b9a05236856d7cd5523b18339cc577f3d2522609558816b072f33aa94c9bbc9"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -8192,19 +8262,6 @@ self: { }) {}; "HUnit" = callPackage - ({ mkDerivation, base, deepseq, filepath }: - mkDerivation { - pname = "HUnit"; - version = "1.3.1.2"; - sha256 = "badebf99ae5a4982cdf2f8932f080e349240dc2b75c40e75ce2518ea086c5381"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base deepseq filepath ]; - homepage = "https://github.com/hspec/HUnit#readme"; - description = "A unit testing framework for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "HUnit_1_5_0_0" = callPackage ({ mkDerivation, base, call-stack, deepseq, filepath }: mkDerivation { pname = "HUnit"; @@ -8215,7 +8272,6 @@ self: { homepage = "https://github.com/hspec/HUnit#readme"; description = "A unit testing framework for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HUnit-Diff" = callPackage @@ -8254,19 +8310,6 @@ self: { }) {}; "HUnit-approx" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "HUnit-approx"; - version = "1.0"; - sha256 = "618f492b3f55d7a2c332d2e3916b2cd79af1229421ad64e12a514babd896736b"; - libraryHaskellDepends = [ base HUnit ]; - testHaskellDepends = [ base HUnit ]; - homepage = "https://github.com/goldfirere/HUnit-approx"; - description = "Approximate equality for floating point numbers with HUnit"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "HUnit-approx_1_1" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { pname = "HUnit-approx"; @@ -8277,7 +8320,6 @@ self: { homepage = "https://github.com/goldfirere/HUnit-approx"; description = "Approximate equality for floating point numbers with HUnit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HXMPP" = callPackage @@ -8327,16 +8369,16 @@ self: { }) {}; "HaLeX" = callPackage - ({ mkDerivation, base, mtl }: + ({ mkDerivation, base, HUnit, mtl, QuickCheck }: mkDerivation { pname = "HaLeX"; - version = "1.2.2"; - sha256 = "8b21e5a3c5ff7f2d195f667ae4892ffcdc626fa32ff3e22c1fb0f5b5676b9c95"; + version = "1.2.6"; + sha256 = "5b4e22ecf647362f9d3f1908e9c211f34539c037881701f01b02414130fb7dd7"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base mtl ]; + libraryHaskellDepends = [ base HUnit mtl QuickCheck ]; homepage = "http://www.di.uminho.pt/~jas/Research/HaLeX/HaLeX.html"; - description = "HaLeX enables modelling, manipulation and animation of regular languages"; + description = "HaLeX enables modelling, manipulation and visualization of regular languages"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -8367,43 +8409,33 @@ self: { }) {}; "HaRe" = callPackage - ({ mkDerivation, array, base, Cabal, cabal-helper, containers - , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod - , ghc-paths, ghc-prim, ghc-syb-utils, gitrev, hslogger, hspec - , HUnit, monad-control, monoid-extras, mtl, old-time - , optparse-applicative, optparse-simple, parsec, pretty, process - , QuickCheck, rosezipper, semigroups, silently - , Strafunski-StrategyLib, stringbuilder, syb, syz, time - , transformers, transformers-base + ({ mkDerivation, attoparsec, base, base-prelude, Cabal + , cabal-helper, case-insensitive, containers, conversion + , conversion-case-insensitive, conversion-text, Diff, directory + , filepath, foldl, ghc, ghc-exactprint, ghc-mod, ghc-syb-utils + , gitrev, hslogger, hspec, HUnit, monad-control, mtl + , optparse-applicative, optparse-simple, parsec + , Strafunski-StrategyLib, syb, syz, turtle }: mkDerivation { pname = "HaRe"; - version = "0.8.3.0"; - sha256 = "11e302f5379fe88aa8740a886f321e3e14c29b0b39417ab0621f3a070c1edcd2"; + version = "0.8.4.0"; + sha256 = "733272478f0aa195c86a344b548bdfdc453c41eaf5b9bc482e5a8fa8f81615fb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal cabal-helper containers directory filepath ghc - ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger - monad-control monoid-extras mtl old-time pretty rosezipper - semigroups Strafunski-StrategyLib syb syz time transformers - transformers-base + base cabal-helper containers directory filepath ghc ghc-exactprint + ghc-mod ghc-syb-utils hslogger monad-control mtl + Strafunski-StrategyLib syb syz ]; executableHaskellDepends = [ - array base Cabal cabal-helper containers directory filepath ghc - ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils gitrev - hslogger monad-control monoid-extras mtl old-time - optparse-applicative optparse-simple parsec pretty rosezipper - semigroups Strafunski-StrategyLib syb syz time transformers - transformers-base + base Cabal ghc-mod gitrev mtl optparse-applicative optparse-simple ]; testHaskellDepends = [ - base Cabal cabal-helper containers deepseq Diff directory filepath - ghc ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils - hslogger hspec HUnit monad-control monoid-extras mtl old-time - process QuickCheck rosezipper semigroups silently - Strafunski-StrategyLib stringbuilder syb syz time transformers - transformers-base + attoparsec base base-prelude case-insensitive containers conversion + conversion-case-insensitive conversion-text Diff directory foldl + ghc ghc-exactprint ghc-mod ghc-syb-utils hslogger hspec HUnit mtl + parsec turtle ]; homepage = "https://github.com/RefactoringTools/HaRe/wiki"; description = "the Haskell Refactorer"; @@ -9148,8 +9180,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "HoleyMonoid"; - version = "0.1.1"; - sha256 = "d9a5fcfc1b388dcb7533dfd6916fc007cdfb2bbab48b820740c7226e32406dfc"; + version = "0.1.2"; + sha256 = "299f34a70c85f0f6858b7fb1af6b7466e81e543c4ad9d2007449d2dc977d4978"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/MedeaMelana/HoleyMonoid"; description = "Monoids with holes"; @@ -9409,8 +9441,8 @@ self: { }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.3.2"; - sha256 = "4b5ba629b64a0288faa35eccde5ce0ebb8b3127d17e064eb6f100c5fbbebce3f"; + version = "0.11.4"; + sha256 = "6326b9b1fb07e05a72f8435cc3ae777d696251e43e93b25ec2ff513f7f2bed07"; libraryHaskellDepends = [ base bytestring integer-gmp network time ]; @@ -10003,6 +10035,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Jdh" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "Jdh"; + version = "0.1.0.0"; + sha256 = "df460a97cde668b6d170ddcbfe547e146de56524108a4e811c6ca7bb26b4e864"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/brunoczim/Json-Data-for-Haskell"; + description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding"; + license = stdenv.lib.licenses.mit; + }) {}; + "JsContracts" = callPackage ({ mkDerivation, base, containers, directory, filepath, mtl, parsec , pretty, syb, WebBits, WebBits-Html @@ -10866,28 +10910,6 @@ self: { }) {}; "ListLike" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string - , vector - }: - mkDerivation { - pname = "ListLike"; - version = "4.5"; - sha256 = "3b3a562cf432597c02aa440142e11dc4069fdc30c4397887e8cab6abbd88ef3b"; - libraryHaskellDepends = [ - array base bytestring containers deepseq dlist fmlist text - utf8-string vector - ]; - testHaskellDepends = [ - array base bytestring containers dlist fmlist HUnit QuickCheck - random text utf8-string vector - ]; - homepage = "http://github.com/JohnLato/listlike"; - description = "Generic support for list-like structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ListLike_4_5_1" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string , vector @@ -10907,7 +10929,6 @@ self: { homepage = "http://github.com/JohnLato/listlike"; description = "Generic support for list-like structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ListTree" = callPackage @@ -11108,6 +11129,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Lykah" = callPackage + ({ mkDerivation, array, base, blaze-markup, blazeT, clay + , containers, directory, filepath, filesystem-trees, formatting + , ListLike, mtl, old-locale, pandoc, regex-compat, regex-posix + , safe, split, template-haskell, text, time, transformers + }: + mkDerivation { + pname = "Lykah"; + version = "0.0.2"; + sha256 = "1978ba358278a38cf7f22d60983c4b2d87111e785e9a24109b94e2aa26199cd5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base blaze-markup blazeT clay containers directory filepath + filesystem-trees formatting ListLike mtl old-locale pandoc + regex-compat regex-posix safe split template-haskell text time + transformers + ]; + executableHaskellDepends = [ + array base blaze-markup blazeT clay containers directory filepath + filesystem-trees formatting ListLike mtl old-locale pandoc + regex-compat regex-posix safe split template-haskell text time + transformers + ]; + homepage = "http://johannesgerer.com/buchhaltung"; + description = "A static website and blog generator"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MASMGen" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -11125,8 +11176,8 @@ self: { ({ mkDerivation, base, bytestring, hidapi, mtl }: mkDerivation { pname = "MBot"; - version = "0.1.1.0"; - sha256 = "6752fb112e01c02273ef55254b0f9cb16bbff4954592372ba9c152d9cb41dc12"; + version = "0.1.2.0"; + sha256 = "5edf898d58cfd9fbe4774993db794967e0af4c4202c8e43c788c05ef90a2f223"; libraryHaskellDepends = [ base bytestring hidapi mtl ]; description = "Haskell interface for controlling the mBot educational robot"; license = stdenv.lib.licenses.gpl3; @@ -11227,8 +11278,8 @@ self: { }: mkDerivation { pname = "MagicHaskeller"; - version = "0.9.6.5"; - sha256 = "5289340f0ec721e35f66e13a871f8fe65d55ed8af9c63ebec2a2cc99db699fb8"; + version = "0.9.6.6.1"; + sha256 = "5f477822961bfdf7d3af73903877c1eb448ddbf323afc73f2f5da18f633a9e6e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11376,20 +11427,6 @@ self: { }) {}; "MemoTrie" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "MemoTrie"; - version = "0.6.4"; - sha256 = "4238c8f7ea1ecd2497d0a948493acbdc47728b2528b6e7841ef064b783d68b1c"; - revision = "1"; - editedCabalFile = "035cea173a56cf920ebb4c84b4033d2ea270c1ee24d07ad323b9b2701ebc72e7"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/conal/MemoTrie"; - description = "Trie-based memo functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "MemoTrie_0_6_7" = callPackage ({ mkDerivation, base, newtype-generics }: mkDerivation { pname = "MemoTrie"; @@ -11399,7 +11436,6 @@ self: { homepage = "https://github.com/conal/MemoTrie"; description = "Trie-based memo functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MetaHDBC" = callPackage @@ -11732,34 +11768,18 @@ self: { }) {}; "MonadRandom" = callPackage - ({ mkDerivation, base, mtl, random, transformers - , transformers-compat - }: - mkDerivation { - pname = "MonadRandom"; - version = "0.4.2.3"; - sha256 = "de40b12a70ec6425a9e54b33e2ac652e14d7c005a3b46d701d1e5696b98636c0"; - libraryHaskellDepends = [ - base mtl random transformers transformers-compat - ]; - description = "Random-number generation monad"; - license = "unknown"; - }) {}; - - "MonadRandom_0_5" = callPackage ({ mkDerivation, base, fail, mtl, primitive, random, transformers , transformers-compat }: mkDerivation { pname = "MonadRandom"; - version = "0.5"; - sha256 = "e239800faed1142b348d1125232ee1266209865ff6aa09516d4d516bec88c3dc"; + version = "0.5.1"; + sha256 = "9e3f0f92807285302036dc504066ae6d968c8b0b4c25d9360888f31fe1730d87"; libraryHaskellDepends = [ base fail mtl primitive random transformers transformers-compat ]; description = "Random-number generation monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MonadRandomLazy" = callPackage @@ -12743,6 +12763,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "OnRmt" = callPackage + ({ mkDerivation, async, base, brick, bytestring, conduit + , conduit-extra, containers, control-monad-loop, data-default + , HUnit, itemfield, listsafe, microlens, mtl, old-locale, process + , repl-toolkit, ssh-known-hosts, string-conversions, test-framework + , test-framework-hunit, text, text-zipper, time, transformers + , vector, void, vty + }: + mkDerivation { + pname = "OnRmt"; + version = "1.0.0.0"; + sha256 = "4d9627999b89d50f8211a5cba8ea5821493bfdec8a9de76ee8f39bd4e8003218"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base brick bytestring conduit conduit-extra containers + control-monad-loop data-default itemfield listsafe microlens mtl + old-locale process repl-toolkit string-conversions text text-zipper + time transformers vector void vty + ]; + executableHaskellDepends = [ + async base brick bytestring conduit conduit-extra containers + control-monad-loop data-default itemfield listsafe microlens mtl + old-locale process repl-toolkit ssh-known-hosts string-conversions + text text-zipper time transformers vector void vty + ]; + testHaskellDepends = [ + async base brick bytestring conduit conduit-extra HUnit itemfield + old-locale string-conversions test-framework test-framework-hunit + text text-zipper time transformers vector vty + ]; + description = "Text UI library for performing parallel remote SSH operations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "OneTuple" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -13979,25 +14034,6 @@ self: { }) {}; "QuickCheck" = callPackage - ({ mkDerivation, base, containers, random, template-haskell - , test-framework, tf-random, transformers - }: - mkDerivation { - pname = "QuickCheck"; - version = "2.8.2"; - sha256 = "98c64de1e2dbf801c54dcdcb8ddc33b3569e0da38b39d711ee6ac505769926aa"; - libraryHaskellDepends = [ - base containers random template-haskell tf-random transformers - ]; - testHaskellDepends = [ - base containers template-haskell test-framework - ]; - homepage = "https://github.com/nick8325/quickcheck"; - description = "Automatic testing of Haskell programs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "QuickCheck_2_9_2" = callPackage ({ mkDerivation, base, containers, random, template-haskell , test-framework, tf-random, transformers }: @@ -14014,7 +14050,6 @@ self: { homepage = "https://github.com/nick8325/quickcheck"; description = "Automatic testing of Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QuickCheck-GenT" = callPackage @@ -14047,8 +14082,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "QuickCheckVariant"; - version = "0.1.1.0"; - sha256 = "3d29e3b03f3908b04db06d3912e65e4370f752d57296e509bbf7e17db949c2f8"; + version = "0.2.0.0"; + sha256 = "5ad8557a69793d00facc27a8f3eb9edd7bfde8cd923ea51465a9bfa0a7e7d682"; libraryHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/sanjorgek/QuickCheckVariant"; description = "Generator of \"valid\" and \"invalid\" data in a type class"; @@ -14313,8 +14348,8 @@ self: { }: mkDerivation { pname = "RNAlien"; - version = "1.3.0"; - sha256 = "43d4b160cab7a7c39e4c21744637752beb527ebcb9f12ca674c18fb84135dfab"; + version = "1.3.1"; + sha256 = "2e928bb739cba57427fc3a24780b8b36c8eaf6a709e72dadfc637aab0a862fb3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14503,22 +14538,6 @@ self: { }) {}; "Rasterific" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity - , free, JuicyPixels, mtl, primitive, vector, vector-algorithms - }: - mkDerivation { - pname = "Rasterific"; - version = "0.6.1.1"; - sha256 = "1887b28b9921dfb2d4d64cb888e5febce17db828103a7e2aed0a978d9fa78665"; - libraryHaskellDepends = [ - base bytestring containers dlist FontyFruity free JuicyPixels mtl - primitive vector vector-algorithms - ]; - description = "A pure haskell drawing engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Rasterific_0_7_1" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity , free, JuicyPixels, mtl, primitive, transformers, vector , vector-algorithms @@ -14535,7 +14554,6 @@ self: { ]; description = "A pure haskell drawing engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ReadArgs" = callPackage @@ -14558,21 +14576,20 @@ self: { "Redmine" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, containers , HTTP, http-client-tls, http-conduit, http-types, HUnit, MissingH - , network, old-locale, old-time, resourcet, text, time - , transformers + , network, resourcet, text, time, transformers }: mkDerivation { pname = "Redmine"; - version = "0.0.6"; - sha256 = "e81f23501fc58456db77b9797a196200f20a81013da3b8f89fdffbf1214d9882"; + version = "0.0.8"; + sha256 = "0f0460459b9293b95f55ea966891daf04552de4c8d950da79963fe8b9552acd2"; libraryHaskellDepends = [ aeson base bytestring connection containers HTTP http-client-tls - http-conduit http-types MissingH network old-locale old-time - resourcet text time transformers + http-conduit http-types MissingH network resourcet text time + transformers ]; testHaskellDepends = [ - aeson base bytestring connection containers http-client-tls - http-conduit HUnit MissingH network old-locale resourcet text time + aeson base bytestring connection containers HTTP http-client-tls + http-conduit http-types HUnit MissingH network resourcet text time transformers ]; homepage = "https://github.com/lookunder/RedmineHs"; @@ -14600,8 +14617,8 @@ self: { }: mkDerivation { pname = "RefSerialize"; - version = "0.3.1.4"; - sha256 = "dc38719d34a5e238dc7cda731f49a5367fc5a0bf7d4b1db44be5e2ac5a9781c2"; + version = "0.4.0"; + sha256 = "05b25eb1ab943d96119aa2acca678fc8f194c3411af521e3835f4de5c752bbb2"; libraryHaskellDepends = [ base binary bytestring containers hashtables stringsearch ]; @@ -15080,8 +15097,8 @@ self: { ({ mkDerivation, array, base, Cabal, mtl }: mkDerivation { pname = "STMonadTrans"; - version = "0.3.4"; - sha256 = "44935ff710369da1614e00a40dabea6ba3a4dd02959d7b0e5ed17a915c3f0210"; + version = "0.4.3"; + sha256 = "574fd56cf74036c20d00a09d815659dbbb0ae51c8103d00c93cd9558ad3322db"; libraryHaskellDepends = [ array base mtl ]; testHaskellDepends = [ array base Cabal mtl ]; description = "A monad transformer version of the ST monad"; @@ -15108,24 +15125,6 @@ self: { }) {}; "SVGFonts" = callPackage - ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg - , containers, data-default-class, diagrams-core, diagrams-lib - , directory, parsec, split, text, tuple, vector, xml - }: - mkDerivation { - pname = "SVGFonts"; - version = "1.5.0.1"; - sha256 = "7b3431a70f94e89e78e1e28c5730060c5af522526ac7a1318b51de2c4d4c4ef4"; - libraryHaskellDepends = [ - attoparsec base blaze-markup blaze-svg containers - data-default-class diagrams-core diagrams-lib directory parsec - split text tuple vector xml - ]; - description = "Fonts from the SVG-Font format"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "SVGFonts_1_6_0_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg , bytestring, cereal, cereal-vector, containers, data-default-class , diagrams-core, diagrams-lib, directory, parsec, split, text @@ -15142,7 +15141,6 @@ self: { ]; description = "Fonts from the SVG-Font format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SVGPath" = callPackage @@ -15858,18 +15856,6 @@ self: { }) {}; "Spintax" = callPackage - ({ mkDerivation, attoparsec, base, extra, mwc-random, text }: - mkDerivation { - pname = "Spintax"; - version = "0.1.0.1"; - sha256 = "bf749b240dcec32068ca1b94f34bfd824722f57c63c0c81473fd8ff88533dfe7"; - libraryHaskellDepends = [ attoparsec base extra mwc-random text ]; - homepage = "https://github.com/MichelBoucey/spintax"; - description = "Random text generation based on spintax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Spintax_0_3_1" = callPackage ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: mkDerivation { pname = "Spintax"; @@ -15881,7 +15867,6 @@ self: { homepage = "https://github.com/MichelBoucey/spintax"; description = "Random text generation based on spintax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock" = callPackage @@ -15893,10 +15878,8 @@ self: { }: mkDerivation { pname = "Spock"; - version = "0.11.0.0"; - sha256 = "9dcc232e83860d28f44bd4f35a8b38e59330ada78a30c661aaddf244f4a5deb3"; - revision = "1"; - editedCabalFile = "22e12daad61dfaeefdbad563859bf8efe1ee38cf0be49cb18e954227d7e76eac"; + version = "0.12.0.0"; + sha256 = "8392d1ee34b46238c6bfe951080f06e11e1f3622d8402e7762c70aa61430e3d9"; libraryHaskellDepends = [ base base64-bytestring bytestring containers cryptonite focus hashable http-types hvect list-t monad-control mtl reroute @@ -15916,8 +15899,8 @@ self: { ({ mkDerivation, aeson, base, deepseq, hvect, reroute }: mkDerivation { pname = "Spock-api"; - version = "0.11.0.0"; - sha256 = "993272b289d95f2e7e704b24d8297b63257b1434ec205faddf8a2ec7bc1aea29"; + version = "0.12.0.0"; + sha256 = "8cfdbcbd2fa426c595fb7d29f8a6395dea17476c15d5ae863da2605b1c6ebe00"; libraryHaskellDepends = [ aeson base deepseq hvect reroute ]; homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; @@ -15930,8 +15913,8 @@ self: { }: mkDerivation { pname = "Spock-api-ghcjs"; - version = "0.11.0.0"; - sha256 = "d533e4e76c50e8120675d0bbe1c7dd8d6909a4c7455cf0eea2ee75b7d868518c"; + version = "0.12.0.0"; + sha256 = "84a707da5f84417f5387731497bd51b8d80210b2be97e6afaa79b887568ea501"; libraryHaskellDepends = [ aeson base bytestring ghcjs-base hvect Spock-api text ]; @@ -15945,8 +15928,8 @@ self: { ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }: mkDerivation { pname = "Spock-api-server"; - version = "0.11.0.0"; - sha256 = "35d0fd72caed2bd4e2cc52d2a39b3af528845ec9bc58cf64dfe4b6ccd956ac3d"; + version = "0.12.0.0"; + sha256 = "29734206823875ec71d7cad14bf012adb70b01700975e2181a7cb52713b131ce"; libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ]; homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; @@ -15969,22 +15952,22 @@ self: { "Spock-core" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, containers, cookie, directory, hashable, hspec - , hspec-wai, http-types, hvect, mtl, old-locale, path-pieces - , reroute, resourcet, stm, text, time, transformers + , hspec-wai, http-api-data, http-types, hvect, mtl, old-locale + , reroute, resourcet, stm, superbuffer, text, time, transformers , unordered-containers, vault, wai, wai-extra, warp }: mkDerivation { pname = "Spock-core"; - version = "0.11.0.0"; - sha256 = "d6339c4b8e5ac3a98e5545e3f4c64f1ff515c125ae9fb33d2176972e1244aa9a"; + version = "0.12.0.0"; + sha256 = "e69b70ea3027fa644d546bcae25bbf75e38abd6f4a7f88f0628fea6e16e97895"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers - cookie directory hashable http-types hvect mtl old-locale - path-pieces reroute resourcet stm text time transformers + cookie directory hashable http-api-data http-types hvect mtl + old-locale reroute resourcet stm superbuffer text time transformers unordered-containers vault wai wai-extra warp ]; testHaskellDepends = [ - base base64-bytestring bytestring hspec hspec-wai http-types + aeson base base64-bytestring bytestring hspec hspec-wai http-types reroute text time transformers unordered-containers wai ]; homepage = "https://www.spock.li"; @@ -16265,8 +16248,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "StringUtils"; - version = "0.1.0.0"; - sha256 = "9208f603ae362ab0788b7f61aa424e7b929e4eaaea97b6eca0a1b83c51eaacdb"; + version = "0.2.0.0"; + sha256 = "da88bf375d0889b428fb725c454d44c1c06a526477a18d20356a605554ab48c6"; libraryHaskellDepends = [ base ]; description = "String manipulation utilities"; license = stdenv.lib.licenses.lgpl3; @@ -16404,12 +16387,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "TCache_0_12_1" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , hashtables, mtl, old-time, RefSerialize, stm, text + }: + mkDerivation { + pname = "TCache"; + version = "0.12.1"; + sha256 = "f134b45fcdd127fa1a4214f01d44dc34e994fed137cec63f4c4ea632363ab7bd"; + libraryHaskellDepends = [ + base bytestring containers directory hashtables mtl old-time + RefSerialize stm text + ]; + description = "A Transactional cache with user-defined persistence"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "THEff" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "THEff"; - version = "0.1.1.0"; - sha256 = "545725746fa7ea7d77cdb1447a1f2564ddfe36624c8a3118a7e8d0b009ef2462"; + version = "0.1.4"; + sha256 = "4857093c5be0c15557a5c1b06d6dd16e65ff6da0a9362b1d6ee3614d476af266"; libraryHaskellDepends = [ base template-haskell ]; description = "TH implementation of effects"; license = stdenv.lib.licenses.bsd3; @@ -16574,17 +16574,17 @@ self: { "TaxonomyTools" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, cmdargs , directory, either-unwrap, EntrezHTTP, fgl, hxt, parsec, process - , Taxonomy, vector + , Taxonomy, text, vector }: mkDerivation { pname = "TaxonomyTools"; - version = "1.0.0"; - sha256 = "6019493009c6b720fdabae83c939460780dca06ec67251160814f1dca842f26a"; + version = "1.0.1"; + sha256 = "e424ba53cf01ba63d58c83745a56e0f2eada4eb6b5ce0c30f280e0ad2955cb95"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring cassava cmdargs directory either-unwrap - EntrezHTTP fgl hxt parsec process Taxonomy vector + EntrezHTTP fgl hxt parsec process Taxonomy text vector ]; description = "Tool for parsing, processing, comparing and visualizing taxonomy data"; license = stdenv.lib.licenses.gpl3; @@ -17395,18 +17395,6 @@ self: { }) {}; "ViennaRNAParser" = callPackage - ({ mkDerivation, base, hspec, parsec, process, transformers }: - mkDerivation { - pname = "ViennaRNAParser"; - version = "1.2.9"; - sha256 = "f4e8964ce0710a0461d49e790784a8b82579f4c6079c5732b7fe1ae09fefb219"; - libraryHaskellDepends = [ base parsec process transformers ]; - testHaskellDepends = [ base hspec parsec ]; - description = "Libary for parsing ViennaRNA package output"; - license = "GPL"; - }) {}; - - "ViennaRNAParser_1_3_2" = callPackage ({ mkDerivation, base, hspec, parsec, ParsecTools, process , transformers }: @@ -17420,7 +17408,6 @@ self: { testHaskellDepends = [ base hspec parsec ]; description = "Libary for parsing ViennaRNA package output"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Vulkan" = callPackage @@ -17746,14 +17733,14 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; - "Win32_2_5_0_0" = callPackage + "Win32_2_5_1_0" = callPackage ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32 , msimg32, ntdll, shell32, shfolder, shlwapi, user32, winmm }: mkDerivation { pname = "Win32"; - version = "2.5.0.0"; - sha256 = "45d7fd5f251ba418d649100cfea9d924b7ef42a8c35df5bb373fd6dd687d2694"; + version = "2.5.1.0"; + sha256 = "84e1b1ee7e435ad4237d2f625114f205141988b964f42259b5e294066f31ca52"; libraryHaskellDepends = [ base bytestring filepath ]; librarySystemDepends = [ advapi32 gdi32 imm32 msimg32 ntdll shell32 shfolder shlwapi user32 @@ -18040,27 +18027,8 @@ self: { }: mkDerivation { pname = "X11"; - version = "1.6.1.2"; - sha256 = "5216d485f807bd53bf34fba170896a8930290a6ac28b8e611c28e751ad67f2cf"; - libraryHaskellDepends = [ base data-default ]; - librarySystemDepends = [ - libX11 libXext libXinerama libXrandr libXrender - ]; - homepage = "https://github.com/haskell-pkg-janitors/X11"; - description = "A binding to the X11 graphics library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; - inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; - inherit (pkgs.xorg) libXrender;}; - - "X11_1_7" = callPackage - ({ mkDerivation, base, data-default, libX11, libXext, libXinerama - , libXrandr, libXrender - }: - mkDerivation { - pname = "X11"; - version = "1.7"; - sha256 = "9e7a67b9521fc0140b4804928f3821b6c3d3950fdc1d9c55478844dc4f57f5f4"; + version = "1.8"; + sha256 = "541b166aab1e05a92dc8f42a511d827e7aad373af12ae283b9df9982ccc09d8e"; libraryHaskellDepends = [ base data-default ]; librarySystemDepends = [ libX11 libXext libXinerama libXrandr libXrender @@ -18068,7 +18036,6 @@ self: { homepage = "https://github.com/xmonad/X11"; description = "A binding to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; @@ -18846,13 +18813,15 @@ self: { }: mkDerivation { pname = "accelerate-arithmetic"; - version = "0.0.1"; - sha256 = "819c4d6b24bf5858bf9ef77a002724d1685f80ac8c2c074b329ac3a51a0f7224"; + version = "0.1"; + sha256 = "0f7d4142618ba5d134cd0bf4d20f7e5f3df171cbf05c7d3526a6a50dd0ffa20a"; libraryHaskellDepends = [ accelerate accelerate-utility base QuickCheck utility-ht ]; - testHaskellDepends = [ accelerate base QuickCheck ]; - homepage = "http://code.haskell.org/~thielema/accelerate-arithmetic/"; + testHaskellDepends = [ + accelerate accelerate-utility base QuickCheck + ]; + homepage = "http://hub.darcs.net/thielema/accelerate-arithmetic/"; description = "Linear algebra and interpolation using the Accelerate framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -18912,13 +18881,13 @@ self: { }: mkDerivation { pname = "accelerate-cufft"; - version = "0.0"; - sha256 = "a7f5f2ee43acebd1a5caf6fd268b05def2d279485bf1e7021a0299097ef9ca89"; + version = "0.0.0.1"; + sha256 = "d78fd117e67ad141910f1a95ec5c82beb351bfe9a144c8cdb36fe94950055c8d"; libraryHaskellDepends = [ accelerate accelerate-cuda accelerate-fourier accelerate-utility base cuda cufft ]; - homepage = "http://code.haskell.org/~thielema/accelerate-cufft/"; + homepage = "http://hub.darcs.net/thielema/accelerate-cufft/"; description = "Accelerate frontend to the CUFFT library (Fourier transform)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -19002,8 +18971,8 @@ self: { }: mkDerivation { pname = "accelerate-fourier"; - version = "0.0"; - sha256 = "58acf3266fb8007706c97c69024b5fdf2be08b5e1a1975944c7fd40848a9ec2c"; + version = "0.0.1"; + sha256 = "3ce3fbeaa6f7b280ffcca54fd524f4666487bb79813cf7a3f98601517cd87f82"; libraryHaskellDepends = [ accelerate accelerate-arithmetic accelerate-utility base containers QuickCheck transformers utility-ht @@ -19012,7 +18981,7 @@ self: { accelerate accelerate-arithmetic accelerate-utility base QuickCheck utility-ht ]; - homepage = "http://code.haskell.org/~thielema/accelerate-fourier/"; + homepage = "http://hub.darcs.net/thielema/accelerate-fourier/"; description = "Fast Fourier transform and convolution using the Accelerate framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -19094,10 +19063,10 @@ self: { ({ mkDerivation, accelerate, base, utility-ht }: mkDerivation { pname = "accelerate-utility"; - version = "0.1"; - sha256 = "fbbe0d70a474d82bdfe7d4b6ded152145df23dc0f1fcc256e9a20b1ae9f4b0d8"; + version = "0.1.1"; + sha256 = "570f779a9ef35e6ddbbf2843cad38148c7c07f21686fbc4f4c87c3579de34135"; libraryHaskellDepends = [ accelerate base utility-ht ]; - homepage = "http://code.haskell.org/~thielema/accelerate-utility/"; + homepage = "http://hub.darcs.net/thielema/accelerate-utility/"; description = "Utility functions for the Accelerate framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -19742,24 +19711,6 @@ self: { }) {}; "active" = callPackage - ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids - , semigroups, vector - }: - mkDerivation { - pname = "active"; - version = "0.2.0.10"; - sha256 = "0819b0ae7a690bba42f974ba3d1efb1b356919e0f9e278cb30653d022bce78b1"; - libraryHaskellDepends = [ - base lens linear semigroupoids semigroups vector - ]; - testHaskellDepends = [ - base lens linear QuickCheck semigroupoids semigroups vector - ]; - description = "Abstractions for animation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "active_0_2_0_12" = callPackage ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids , semigroups, vector }: @@ -19775,7 +19726,6 @@ self: { ]; description = "Abstractions for animation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "activehs" = callPackage @@ -20103,36 +20053,6 @@ self: { }) {}; "aeson" = callPackage - ({ mkDerivation, attoparsec, base, base-orphans, bytestring - , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl - , QuickCheck, quickcheck-instances, scientific, syb, tagged - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "aeson"; - version = "0.11.2.1"; - sha256 = "cc3bc708b5ea5598ae4e37fd8a96d117576031be4b4e2943953e9e19af01b74c"; - revision = "1"; - editedCabalFile = "e97fac43eddd037bf21752ea10150a224b9c08d267f634ea54f799023a6c5e13"; - libraryHaskellDepends = [ - attoparsec base bytestring containers deepseq dlist fail ghc-prim - hashable mtl scientific syb tagged template-haskell text time - transformers unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base base-orphans bytestring containers ghc-prim - hashable HUnit QuickCheck quickcheck-instances tagged - template-haskell test-framework test-framework-hunit - test-framework-quickcheck2 text time unordered-containers vector - ]; - homepage = "https://github.com/bos/aeson"; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson_1_0_2_1" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, dlist , generic-deriving, ghc-prim, hashable, hashable-time, HUnit @@ -20161,7 +20081,6 @@ self: { homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson_1_1_0_0" = callPackage @@ -20411,8 +20330,8 @@ self: { }: mkDerivation { pname = "aeson-injector"; - version = "1.0.6.0"; - sha256 = "3c0a68d4b3b55813eb3b4d93a0bd130504f367727308e77c01b8e1774024d78d"; + version = "1.0.7.0"; + sha256 = "de379a3727b81d537bd068d2b22dec4631daf193b992d4a0d9a878535eae41d8"; libraryHaskellDepends = [ aeson base bifunctors deepseq lens servant-docs swagger2 text unordered-containers @@ -21066,6 +20985,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "airtable-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, hashable, lens, text + , time, unordered-containers, wreq + }: + mkDerivation { + pname = "airtable-api"; + version = "0.2.0.0"; + sha256 = "aeb20ea165849959f6a4463dd85a0c3f4d41012bfd11b4b8eef65942f24f024a"; + libraryHaskellDepends = [ + aeson base bytestring hashable lens text time unordered-containers + wreq + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/ooblahman/airtable-api"; + description = "Requesting and introspecting Tables within an Airtable project"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aivika" = callPackage ({ mkDerivation, array, base, containers, mtl, random, vector }: mkDerivation { @@ -21305,26 +21242,6 @@ self: { }) {}; "alex" = callPackage - ({ mkDerivation, array, base, containers, directory, happy, process - , QuickCheck - }: - mkDerivation { - pname = "alex"; - version = "3.1.7"; - sha256 = "89a1a13da6ccbeb006488d9574382e891cf7c0567752b330cc8616d748bf28d1"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base containers directory QuickCheck - ]; - executableToolDepends = [ happy ]; - testHaskellDepends = [ base process ]; - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alex_3_2_1" = callPackage ({ mkDerivation, array, base, containers, directory, happy, process , QuickCheck }: @@ -21342,7 +21259,6 @@ self: { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alex-meta" = callPackage @@ -21498,8 +21414,8 @@ self: { ({ mkDerivation, base, syb, template-haskell }: mkDerivation { pname = "algebraic-classes"; - version = "0.7"; - sha256 = "76ecdf393bb6f9d1e3b429ba1af82b49bd20b966914cb17d307625f7498e5e38"; + version = "0.7.1"; + sha256 = "2c7f14f25fad0fa316de29fa34fbb73ca61e1a7b4aa9f79a8c437abe3f1e1770"; libraryHaskellDepends = [ base syb template-haskell ]; homepage = "https://github.com/sjoerdvisscher/algebraic-classes"; description = "Conversions between algebraic classes and F-algebras"; @@ -21997,27 +21913,6 @@ self: { }) {}; "amazonka" = callPackage - ({ mkDerivation, amazonka-core, base, bytestring, conduit - , conduit-extra, directory, exceptions, http-conduit, ini, mmorph - , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text - , time, transformers, transformers-base, transformers-compat - }: - mkDerivation { - pname = "amazonka"; - version = "1.4.3"; - sha256 = "18aa7816d755df58a824fc252d34cb1f81c6cba2ca2a7194c3a3f0d630c26686"; - libraryHaskellDepends = [ - amazonka-core base bytestring conduit conduit-extra directory - exceptions http-conduit ini mmorph monad-control mtl resourcet - retry text time transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Comprehensive Amazon Web Services SDK"; - license = "unknown"; - }) {}; - - "amazonka_1_4_5" = callPackage ({ mkDerivation, amazonka-core, base, bytestring, conduit , conduit-extra, directory, exceptions, http-conduit, ini, mmorph , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text @@ -22036,29 +21931,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Comprehensive Amazon Web Services SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-apigateway" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-apigateway"; - version = "1.4.3"; - sha256 = "74fe95daa465255ad2a49f3f0b78242c5e1ec33d81d0e9dfffa833324894d948"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon API Gateway SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "amazonka-apigateway_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22078,24 +21953,6 @@ self: { }) {}; "amazonka-application-autoscaling" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-application-autoscaling"; - version = "1.4.3"; - sha256 = "5506a59b594355ab0e78f3e1c0f550bd5b2a858c4a0688732a4931e6ac096f6c"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Application Auto Scaling SDK"; - license = "unknown"; - }) {}; - - "amazonka-application-autoscaling_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22111,7 +21968,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Application Auto Scaling SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-appstream" = callPackage @@ -22134,24 +21990,6 @@ self: { }) {}; "amazonka-autoscaling" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-autoscaling"; - version = "1.4.3"; - sha256 = "4a47502b75b54cae3ab3da1792f5862a1e726e551d25bc0ba54f7854a66fa3df"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Auto Scaling SDK"; - license = "unknown"; - }) {}; - - "amazonka-autoscaling_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22167,7 +22005,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-budgets" = callPackage @@ -22190,24 +22027,6 @@ self: { }) {}; "amazonka-certificatemanager" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-certificatemanager"; - version = "1.4.3"; - sha256 = "d1228f95581d90f53a29dba53c1d7a1d0eb7439e278c4c5aca70af01f3e30d55"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Certificate Manager SDK"; - license = "unknown"; - }) {}; - - "amazonka-certificatemanager_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22223,28 +22042,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Certificate Manager SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudformation" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudformation"; - version = "1.4.3"; - sha256 = "3b2069debd35ddfd08af2281902d7c063b267fd2a23b71057321cd2e55cd7690"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudFormation SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudformation_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22260,28 +22060,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudfront" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudfront"; - version = "1.4.3"; - sha256 = "5241ccb0d39cc055f97eb6496835783a97de0ce0b33c765a1325d01119abecbe"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudFront SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudfront_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22297,28 +22078,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudhsm" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudhsm"; - version = "1.4.3"; - sha256 = "6848989619b58c75fa1d72d122e96c621b881bf4c376b9325eeb54c8c3200c43"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudHSM SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudhsm_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22334,28 +22096,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudsearch" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudsearch"; - version = "1.4.3"; - sha256 = "7126175d24355afa678c9dd59400fd1b1a40c18240d96de88bd831b0099c0c26"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudSearch SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudsearch_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22371,28 +22114,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudsearch-domains" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudsearch-domains"; - version = "1.4.3"; - sha256 = "4416cb88845bd27c845ecac50029e7721f3d13d26d24ab6c9c571b5c2c543f7d"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudSearch Domain SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudsearch-domains_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22408,28 +22132,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudtrail" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudtrail"; - version = "1.4.3"; - sha256 = "04ea4c78e0d73f71e1144eb5a357e1e6bce16109453ab30c31d8e7a9ae77fa6f"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudTrail SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudtrail_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22445,28 +22150,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudwatch"; - version = "1.4.3"; - sha256 = "98df67a18bfdf4c00736f6be41576877f8191ac936ab2f5666b160cb80c22d5f"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudWatch SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudwatch_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22482,28 +22168,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch-events" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudwatch-events"; - version = "1.4.3"; - sha256 = "fb839e3e4c402151e138b1d69356600f2d378d53631a3616b6228f620713df56"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudWatch Events SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudwatch-events_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22519,28 +22186,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Events SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch-logs" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudwatch-logs"; - version = "1.4.3"; - sha256 = "de201710b2d594519b1c9d8b20fab92e1a0f4e777e5c05ed1bd32c91ae260161"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudWatch Logs SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudwatch-logs_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22556,7 +22204,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codebuild" = callPackage @@ -22579,24 +22226,6 @@ self: { }) {}; "amazonka-codecommit" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-codecommit"; - version = "1.4.3"; - sha256 = "fe8d033203bccb7c8c7242a063a814cdbb8a22fb4a95e5fa4f01b200d547966b"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CodeCommit SDK"; - license = "unknown"; - }) {}; - - "amazonka-codecommit_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22612,28 +22241,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeCommit SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codedeploy" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-codedeploy"; - version = "1.4.3"; - sha256 = "d216d3af7472428fecab9763e65e2f2ea412dfaaf8debbbe5e37ab158c5392d9"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CodeDeploy SDK"; - license = "unknown"; - }) {}; - - "amazonka-codedeploy_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22649,28 +22259,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codepipeline" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-codepipeline"; - version = "1.4.3"; - sha256 = "2422824f998a0808151310c88c780bfa411a0f56966f93f614694f4dd526fdb1"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CodePipeline SDK"; - license = "unknown"; - }) {}; - - "amazonka-codepipeline_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22686,28 +22277,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodePipeline SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-identity" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cognito-identity"; - version = "1.4.3"; - sha256 = "a45aa18f815e75da5e928ec8dfe7ed827394b0b1f4654bf059fe1f3897bfb232"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Cognito Identity SDK"; - license = "unknown"; - }) {}; - - "amazonka-cognito-identity_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22723,28 +22295,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-idp" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cognito-idp"; - version = "1.4.3"; - sha256 = "a7c23b78acf5ca6701540bd74bb5e20b007acbce0bf97905083e2e5dcab940e2"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Cognito Identity Provider SDK"; - license = "unknown"; - }) {}; - - "amazonka-cognito-idp_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22760,28 +22313,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity Provider SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-sync" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cognito-sync"; - version = "1.4.3"; - sha256 = "51a484d6dd44e9d6f9506bd8d97f04ccfa48a04e79aadb193b8644e17a696be7"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Cognito Sync SDK"; - license = "unknown"; - }) {}; - - "amazonka-cognito-sync_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22797,28 +22331,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-config" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-config"; - version = "1.4.3"; - sha256 = "d9c105b20e1269c55a59180ef61f040315643f873c0075b8b95e84723508e266"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Config SDK"; - license = "unknown"; - }) {}; - - "amazonka-config_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22834,42 +22349,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-core" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring - , case-insensitive, conduit, conduit-extra, cryptonite, deepseq - , exceptions, hashable, http-conduit, http-types, lens, memory, mtl - , QuickCheck, quickcheck-unicode, resourcet, scientific, semigroups - , tagged, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, transformers, transformers-compat - , unordered-containers, xml-conduit, xml-types - }: - mkDerivation { - pname = "amazonka-core"; - version = "1.4.3"; - sha256 = "8270e26104bb0cbc7654d3522dce631c9804b433ec9ff5a2a0c7f844938eead0"; - revision = "1"; - editedCabalFile = "c2a93b788f323072f99ab6c120449c605f9249ba5e44d9e56221fa95b5254dba"; - libraryHaskellDepends = [ - aeson attoparsec base bifunctors bytestring case-insensitive - conduit conduit-extra cryptonite deepseq exceptions hashable - http-conduit http-types lens memory mtl resourcet scientific - semigroups tagged text time transformers transformers-compat - unordered-containers xml-conduit xml-types - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive http-types QuickCheck - quickcheck-unicode tasty tasty-hunit tasty-quickcheck - template-haskell text time - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Core data types and functionality for Amazonka libraries"; - license = "unknown"; - }) {}; - - "amazonka-core_1_4_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , case-insensitive, conduit, conduit-extra, cryptonite, deepseq , exceptions, hashable, http-conduit, http-types, lens, memory, mtl @@ -22897,28 +22379,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Core data types and functionality for Amazonka libraries"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-datapipeline" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-datapipeline"; - version = "1.4.3"; - sha256 = "04bb3873f247a6fc75b5f0a7822e28c1d212765b7918d490474b6bb0faf3d781"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Data Pipeline SDK"; - license = "unknown"; - }) {}; - - "amazonka-datapipeline_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22934,28 +22397,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-devicefarm" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-devicefarm"; - version = "1.4.3"; - sha256 = "36ac89a5166ac8bf89d628b43ea7bd88e6624e9fedd6e7de2a7be5501a3d35cd"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Device Farm SDK"; - license = "unknown"; - }) {}; - - "amazonka-devicefarm_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22971,28 +22415,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Device Farm SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-directconnect" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-directconnect"; - version = "1.4.3"; - sha256 = "96f67da0a8afb2013c84fc5650e700736711105b7924ce8f288f7f61ba133c7d"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Direct Connect SDK"; - license = "unknown"; - }) {}; - - "amazonka-directconnect_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23008,28 +22433,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-discovery" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-discovery"; - version = "1.4.3"; - sha256 = "bfe7c0601d44ca07c28171cb1def3eec5297fa690e6d005edeed4659ec49365f"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Application Discovery Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-discovery_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23045,28 +22451,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Application Discovery Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dms" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-dms"; - version = "1.4.3"; - sha256 = "1714e72bc22176cab07ab9932cec4050e816c450afc3bf6a2810f3318066f8ff"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Database Migration Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-dms_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23082,28 +22469,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Database Migration Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ds" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ds"; - version = "1.4.3"; - sha256 = "d3433eb5c52093f2274055595174bda99e32eb3a4c4760811c22f9c0bbcfe700"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Directory Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-ds_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23119,28 +22487,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Directory Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dynamodb" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-dynamodb"; - version = "1.4.3"; - sha256 = "309d695e84fcf5fb2234031b5c650ae2d72ee9bb91bee1cc2522b95228e4d652"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon DynamoDB SDK"; - license = "unknown"; - }) {}; - - "amazonka-dynamodb_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23156,28 +22505,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dynamodb-streams" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-dynamodb-streams"; - version = "1.4.3"; - sha256 = "61cc56bdbd831438d1daa1149106df1b1f5f0d8f6d8b20cbafcb4ad2869206c5"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon DynamoDB Streams SDK"; - license = "unknown"; - }) {}; - - "amazonka-dynamodb-streams_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23193,28 +22523,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB Streams SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ec2" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ec2"; - version = "1.4.3"; - sha256 = "caeb98e701196d9350d44cd6b1f7b1f5790cc1c4bbbb30dd70824d025c7cc1b7"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Compute Cloud SDK"; - license = "unknown"; - }) {}; - - "amazonka-ec2_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23230,28 +22541,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ecr" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ecr"; - version = "1.4.3"; - sha256 = "e9c1475c8eb4b89cafc7df8f2e8d6c4cff16b349db5407d014ef49726d7b1861"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon EC2 Container Registry SDK"; - license = "unknown"; - }) {}; - - "amazonka-ecr_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23267,28 +22559,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Registry SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ecs" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ecs"; - version = "1.4.3"; - sha256 = "4c10a7da68605f7a9656714cb134cf47d920b2aa02f0c38e0c06f8ddf9152471"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon EC2 Container Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-ecs_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23304,28 +22577,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-efs" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-efs"; - version = "1.4.3"; - sha256 = "c65054594451e774e1e9ad1fbfbf8a724dac86cbd4efa01aa5119d3d9f7a8301"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic File System SDK"; - license = "unknown"; - }) {}; - - "amazonka-efs_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23341,28 +22595,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic File System SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticache" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elasticache"; - version = "1.4.3"; - sha256 = "673912e1f5db5762dd00da1312cc09e2265da0ac6a35d92ee2bbb6e88230f879"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon ElastiCache SDK"; - license = "unknown"; - }) {}; - - "amazonka-elasticache_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23378,28 +22613,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticbeanstalk" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elasticbeanstalk"; - version = "1.4.3"; - sha256 = "675730e477fcf3926605dc42bf08f3fba48f7272cc63cb5c845bb16c296fbd9b"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Beanstalk SDK"; - license = "unknown"; - }) {}; - - "amazonka-elasticbeanstalk_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23415,28 +22631,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticsearch" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elasticsearch"; - version = "1.4.3"; - sha256 = "9e7b1911946ce7a0df8c7ef13277f32a06a26e2a7a6334b3d1514cf089d014d5"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elasticsearch Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-elasticsearch_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23452,28 +22649,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elasticsearch Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elastictranscoder" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elastictranscoder"; - version = "1.4.3"; - sha256 = "9a5d534e54f5421a37103b4117d07bcf16eb241a0bd153457037f1f83ccb8b2f"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Transcoder SDK"; - license = "unknown"; - }) {}; - - "amazonka-elastictranscoder_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23489,28 +22667,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elb" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elb"; - version = "1.4.3"; - sha256 = "81fae99dff50a8feb54150afdb5ef6a06b1be57b6d46957e37c503a730bd2d56"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Load Balancing SDK"; - license = "unknown"; - }) {}; - - "amazonka-elb_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23526,7 +22685,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elbv2" = callPackage @@ -23549,24 +22707,6 @@ self: { }) {}; "amazonka-emr" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-emr"; - version = "1.4.3"; - sha256 = "b31ab69a06ea6ba585a89c133a78ed0ea2cb89faa9e2a04b6d12228167fa8e75"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic MapReduce SDK"; - license = "unknown"; - }) {}; - - "amazonka-emr_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23582,28 +22722,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-gamelift" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-gamelift"; - version = "1.4.3"; - sha256 = "c7fa8f5e3d83a6c1b2848676e270534dac9c8084d702abcd2edc79b603766429"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon GameLift SDK"; - license = "unknown"; - }) {}; - - "amazonka-gamelift_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23619,28 +22740,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon GameLift SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-glacier" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-glacier"; - version = "1.4.3"; - sha256 = "dddfa10e13eceba289a534fa6f7accd2969c8c6cc06b967e5bf35604c6738bec"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Glacier SDK"; - license = "unknown"; - }) {}; - - "amazonka-glacier_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23656,7 +22758,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-health" = callPackage @@ -23679,24 +22780,6 @@ self: { }) {}; "amazonka-iam" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-iam"; - version = "1.4.3"; - sha256 = "4208dcc7e9f4a5c351246d4c33f7215079dad2325e0e894186284d86c8243734"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Identity and Access Management SDK"; - license = "unknown"; - }) {}; - - "amazonka-iam_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23712,28 +22795,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-importexport" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-importexport"; - version = "1.4.3"; - sha256 = "ce555f40f865c0ef4680b6fd2344927f86f44bc04cb4f97d8bdd47c18de3ca64"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Import/Export SDK"; - license = "unknown"; - }) {}; - - "amazonka-importexport_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23749,28 +22813,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-inspector" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-inspector"; - version = "1.4.3"; - sha256 = "0f54b9b7c5bf3317390e86e3351806116fc55dce8614f26c79af7bfed1bf28c8"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Inspector SDK"; - license = "unknown"; - }) {}; - - "amazonka-inspector_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23786,28 +22831,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Inspector SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-iot" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-iot"; - version = "1.4.3"; - sha256 = "4b9f17daddab2f04f60d84109e8c78077bd1feae610f0053fbe7edf0317c3e91"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon IoT SDK"; - license = "unknown"; - }) {}; - - "amazonka-iot_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23823,28 +22849,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon IoT SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-iot-dataplane" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-iot-dataplane"; - version = "1.4.3"; - sha256 = "2c3ef08bc6a294591f029a7189a35acf5cbd9bc332f1f3f8f94cca0a8e9a5b96"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon IoT Data Plane SDK"; - license = "unknown"; - }) {}; - - "amazonka-iot-dataplane_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23860,28 +22867,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon IoT Data Plane SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-kinesis"; - version = "1.4.3"; - sha256 = "6b9f597488893470ef9914857ec3e593aea3a41b2c69794d95065ce3e332e812"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Kinesis SDK"; - license = "unknown"; - }) {}; - - "amazonka-kinesis_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23897,7 +22885,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis-analytics" = callPackage @@ -23920,24 +22907,6 @@ self: { }) {}; "amazonka-kinesis-firehose" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-kinesis-firehose"; - version = "1.4.3"; - sha256 = "2add7d8f8b27cbc339c473244007683d7ceab6caa00258c9030ed8983d16853a"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Kinesis Firehose SDK"; - license = "unknown"; - }) {}; - - "amazonka-kinesis-firehose_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23953,28 +22922,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis Firehose SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kms" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-kms"; - version = "1.4.3"; - sha256 = "933a098970511c03b72698138329350ac722dd84dbd3fc76b49e2eb5504a73ed"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Key Management Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-kms_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23990,28 +22940,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-lambda" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-lambda"; - version = "1.4.3"; - sha256 = "4ed68d68eaa379b41f0ccf4ef82981687bd029fea84b544a0137ce0408d01787"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Lambda SDK"; - license = "unknown"; - }) {}; - - "amazonka-lambda_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24027,7 +22958,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-lightsail" = callPackage @@ -24050,24 +22980,6 @@ self: { }) {}; "amazonka-marketplace-analytics" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-marketplace-analytics"; - version = "1.4.3"; - sha256 = "cca9bd6001747c33714601b7b9cc85623e179e99f67e05e04d38be340d80dec7"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Marketplace Commerce Analytics SDK"; - license = "unknown"; - }) {}; - - "amazonka-marketplace-analytics_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24083,28 +22995,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Marketplace Commerce Analytics SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-marketplace-metering" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-marketplace-metering"; - version = "1.4.3"; - sha256 = "577270b944784ea27d8cc0e911757c5a5fe18657892d2862e5e20e3e64b37a21"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Marketplace Metering SDK"; - license = "unknown"; - }) {}; - - "amazonka-marketplace-metering_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24120,28 +23013,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Marketplace Metering SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ml" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ml"; - version = "1.4.3"; - sha256 = "dd5731a2df42ecb1d07968436ed27c1a72b61a3e1b5a3b7c8c04d38ed9ada4dd"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Machine Learning SDK"; - license = "unknown"; - }) {}; - - "amazonka-ml_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24157,28 +23031,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Machine Learning SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-opsworks" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-opsworks"; - version = "1.4.3"; - sha256 = "8a3844b702d7d68e7f26b8a886e3c4ca3984b6f2522c13f0e7c5174f2e8ef273"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon OpsWorks SDK"; - license = "unknown"; - }) {}; - - "amazonka-opsworks_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24194,7 +23049,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-opsworks-cm" = callPackage @@ -24255,25 +23109,6 @@ self: { }) {}; "amazonka-rds" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-rds"; - version = "1.4.3"; - sha256 = "4d58e361bdc88245b71e718edace7f2a360fecb7bf243a61d0eac1424abf2acf"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Relational Database Service SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "amazonka-rds_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24293,24 +23128,6 @@ self: { }) {}; "amazonka-redshift" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-redshift"; - version = "1.4.3"; - sha256 = "af9d7957c68c0e66cb1301b611bc196adaead8eb2b88210d369dc01ed377fe68"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Redshift SDK"; - license = "unknown"; - }) {}; - - "amazonka-redshift_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24326,7 +23143,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-rekognition" = callPackage @@ -24349,24 +23165,6 @@ self: { }) {}; "amazonka-route53" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-route53"; - version = "1.4.3"; - sha256 = "a7fb42486f54b7e1b858edc907a57be656b20a2da8a08c982e3d8bf0c592b0cf"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Route 53 SDK"; - license = "unknown"; - }) {}; - - "amazonka-route53_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24382,28 +23180,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53-domains" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-route53-domains"; - version = "1.4.3"; - sha256 = "1a773fc3c18faa770874fc708ff0cb6b7150a09836c3a9c6332b9d222a4fe18b"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Route 53 Domains SDK"; - license = "unknown"; - }) {}; - - "amazonka-route53-domains_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24419,28 +23198,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-s3" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-s3"; - version = "1.4.3"; - sha256 = "9ed6c9e7675e99a545a84ac2c979a7542ecd898dd6e4c2fbbbba2c4a40d8fc50"; - libraryHaskellDepends = [ amazonka-core base lens text ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Storage Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-s3_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -24456,7 +23216,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-s3-streaming" = callPackage @@ -24483,25 +23242,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "amazonka-sdb" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers + "amazonka-s3-streaming_0_2_0_0" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base + , bytestring, conduit, conduit-extra, deepseq, dlist, exceptions + , http-client, lens, lifted-async, mmap, mmorph, mtl, resourcet + , text }: mkDerivation { - pname = "amazonka-sdb"; - version = "1.4.3"; - sha256 = "7fac8b39c2210e09d1ef15f7c964b64397c1b6165638c92f4069be8002ebf1d3"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers + pname = "amazonka-s3-streaming"; + version = "0.2.0.0"; + sha256 = "d4a583eead4b7d050c9a6e762d77050cf07c5da541a04e25424850fa0e66dbd7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-s3 base bytestring conduit deepseq + dlist exceptions http-client lens lifted-async mmap mmorph mtl + resourcet ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon SimpleDB SDK"; - license = "unknown"; + executableHaskellDepends = [ + amazonka amazonka-core amazonka-s3 base bytestring conduit + conduit-extra text + ]; + homepage = "https://github.com/Axman6/amazonka-s3-streaming#readme"; + description = "Provides conduits to upload data to S3 using the Multipart API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "amazonka-sdb_1_4_5" = callPackage + "amazonka-sdb" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24517,7 +23285,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-servicecatalog" = callPackage @@ -24540,24 +23307,6 @@ self: { }) {}; "amazonka-ses" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ses"; - version = "1.4.3"; - sha256 = "2ccab07f3c08d9145c2bc936048e5f973532871f1a366e0111a2bf70973d96a2"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Email Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-ses_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24573,7 +23322,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-shield" = callPackage @@ -24634,24 +23382,6 @@ self: { }) {}; "amazonka-sns" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-sns"; - version = "1.4.3"; - sha256 = "681335a9d385af666d5c895b982fb757fa65862a0047d3a498d544f6d136544a"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Notification Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-sns_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24667,29 +23397,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sqs" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-sqs"; - version = "1.4.3"; - sha256 = "2e94eaab5fc5c9a4471bfe834ccf975c1776b268cb291281740db62148825ece"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Queue Service SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "amazonka-sqs_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24709,24 +23419,6 @@ self: { }) {}; "amazonka-ssm" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ssm"; - version = "1.4.3"; - sha256 = "260a3e4178f48f4df2bb2574809ac7c81c7208fa9d77225c6101844bb21c38c1"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Systems Management Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-ssm_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24742,7 +23434,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Systems Manager (SSM) SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-stepfunctions" = callPackage @@ -24765,24 +23456,6 @@ self: { }) {}; "amazonka-storagegateway" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-storagegateway"; - version = "1.4.3"; - sha256 = "5522fa5aa0bfed529b5b85385d2000aedf5b1c8fb5400bf280d4b131275b7b47"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Storage Gateway SDK"; - license = "unknown"; - }) {}; - - "amazonka-storagegateway_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24798,28 +23471,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sts" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-sts"; - version = "1.4.3"; - sha256 = "d36e38218fe83a696c13dfef9362028cb23f73b96fb468bb9b809ef69598606c"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Security Token Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-sts_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24835,28 +23489,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-support" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-support"; - version = "1.4.3"; - sha256 = "d9acfb0d35f3c987dd534c0a59959cef44825facfc4665ba20bf286e4023d70f"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Support SDK"; - license = "unknown"; - }) {}; - - "amazonka-support_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24872,28 +23507,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-swf" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-swf"; - version = "1.4.3"; - sha256 = "0443d02c23d93eca09f6b91ad7aa1e32ab02e6b92e0bb6595ab65ce5f13ab469"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Workflow Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-swf_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24909,32 +23525,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-test" = callPackage - ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring - , case-insensitive, conduit, conduit-extra, groom, http-client - , http-types, process, resourcet, tasty, tasty-hunit - , template-haskell, temporary, text, time, unordered-containers - , yaml - }: - mkDerivation { - pname = "amazonka-test"; - version = "1.4.3"; - sha256 = "10310abf1036afb3f2ea688b300d738700f780a2459a10f306b1bedff9019d9b"; - libraryHaskellDepends = [ - aeson amazonka-core base bifunctors bytestring case-insensitive - conduit conduit-extra groom http-client http-types process - resourcet tasty tasty-hunit template-haskell temporary text time - unordered-containers yaml - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Common functionality for Amazonka library test-suites"; - license = "unknown"; - }) {}; - - "amazonka-test_1_4_5" = callPackage ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring , case-insensitive, conduit, conduit-extra, groom, http-client , http-types, process, resourcet, tasty, tasty-hunit @@ -24954,28 +23547,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Common functionality for Amazonka library test-suites"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-waf" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-waf"; - version = "1.4.3"; - sha256 = "7e9c9d7ca82c8d1e95e7aabf696980040f8644d96c011438e06c51dd41655a85"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon WAF SDK"; - license = "unknown"; - }) {}; - - "amazonka-waf_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24991,28 +23565,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WAF SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-workspaces" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-workspaces"; - version = "1.4.3"; - sha256 = "61828d17aec286062dd453e69b730e180a651f59387c7355872d1cae47805d78"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon WorkSpaces SDK"; - license = "unknown"; - }) {}; - - "amazonka-workspaces_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25028,7 +23583,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WorkSpaces SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-xray" = callPackage @@ -25495,18 +24049,6 @@ self: { }) {}; "anonymous-sums" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "anonymous-sums"; - version = "0.4.0.0"; - sha256 = "116626dd139f7ba57b66d790915ff21cdf09f267da16f873f396ae76aad16749"; - libraryHaskellDepends = [ base ]; - homepage = "http://www.github.com/massysett/anonymous-sums"; - description = "Anonymous sum types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "anonymous-sums_0_6_0_0" = callPackage ({ mkDerivation, base, lens, template-haskell }: mkDerivation { pname = "anonymous-sums"; @@ -25516,7 +24058,6 @@ self: { homepage = "http://www.github.com/massysett/anonymous-sums"; description = "Anonymous sum types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "anonymous-sums-tests" = callPackage @@ -25540,8 +24081,8 @@ self: { pname = "ansi-pretty"; version = "0.1.2.1"; sha256 = "708819f93f1759919a19dcfccddf3ddc8d9fba930cb73fab3ec9f6f5691394c6"; - revision = "1"; - editedCabalFile = "266eb754d15de06de1d488c82564bbf6c359e4e94e5210a58f2c18917a19d78d"; + revision = "2"; + editedCabalFile = "7d10d2f8605d932394138b76880eb08db72606730394c7f6a895f923e608ba65"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers generics-sop nats scientific semigroups tagged text time unordered-containers @@ -25577,19 +24118,6 @@ self: { }) {}; "ansigraph" = callPackage - ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: - mkDerivation { - pname = "ansigraph"; - version = "0.2.0.0"; - sha256 = "3ded8cb86e659854a051328982c4b3f3527c409c5bbeb37383d717685e76ca43"; - libraryHaskellDepends = [ ansi-terminal base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/BlackBrane/ansigraph"; - description = "Terminal-based graphing via ANSI and Unicode"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ansigraph_0_3_0_2" = callPackage ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { pname = "ansigraph"; @@ -25600,7 +24128,6 @@ self: { homepage = "https://github.com/BlackBrane/ansigraph"; description = "Terminal-based graphing via ANSI and Unicode"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antagonist" = callPackage @@ -26478,39 +25005,6 @@ self: { }) {}; "apply-refact" = callPackage - ({ mkDerivation, base, containers, directory, filemanip, filepath - , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact - , silently, syb, tasty, tasty-expected-failure, tasty-golden - , temporary, transformers, unix-compat - }: - mkDerivation { - pname = "apply-refact"; - version = "0.3.0.0"; - sha256 = "0d2a8845ed554c4a6742a3d0a130dac3f16d0d710b65b20dfeb8e773409ed70f"; - revision = "1"; - editedCabalFile = "372095fc0b1e53e884362d5650486b4c2fb624588271a7b4917903ea977899ea"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filemanip ghc ghc-exactprint mtl process - refact syb temporary transformers unix-compat - ]; - executableHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact syb temporary transformers - unix-compat - ]; - testHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact silently syb tasty - tasty-expected-failure tasty-golden temporary transformers - unix-compat - ]; - description = "Perform refactorings specified by the refact library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "apply-refact_0_3_0_1" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact , silently, syb, tasty, tasty-expected-failure, tasty-golden @@ -26539,7 +25033,6 @@ self: { ]; description = "Perform refactorings specified by the refact library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apportionment" = callPackage @@ -27024,10 +25517,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "arithmatic"; - version = "0.1.0.2"; - sha256 = "1de210330bfde4124c1fc898b71bfc423926c6dc91fbc78b01ad927af3b02939"; + version = "0.1.0.3"; + sha256 = "5825d0d6a8c000ec334b3a6eaa4601a8e329c672bb230b01a564dd2a87a2b45f"; libraryHaskellDepends = [ base ]; - doHaddock = false; description = "do things with numbers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -27830,8 +26322,8 @@ self: { }: mkDerivation { pname = "async-pool"; - version = "0.9.0"; - sha256 = "3083cc4a45ebda8d44d25ed143f670cbdc877603ba1d37353a7dee088c172581"; + version = "0.9.0.1"; + sha256 = "54c7cc38f00e85978c59569744ca11802a28a93d9a7bbfc83d87c72158bee28b"; libraryHaskellDepends = [ async base containers fgl monad-control stm transformers transformers-base @@ -28034,32 +26526,6 @@ self: { }) {}; "atom-conduit" = callPackage - ({ mkDerivation, base, conduit, conduit-parse, data-default - , exceptions, foldl, hlint, lens-simple, mono-traversable, parsers - , quickcheck-instances, resourcet, tasty, tasty-hunit - , tasty-quickcheck, text, time, timerep, uri-bytestring - , xml-conduit, xml-conduit-parse, xml-types - }: - mkDerivation { - pname = "atom-conduit"; - version = "0.3.1.2"; - sha256 = "ab469b789cd81a5dab366c367a5b86a073e7cfc8fbb1a978d3107441795f7a22"; - libraryHaskellDepends = [ - base conduit conduit-parse exceptions foldl lens-simple - mono-traversable parsers text time timerep uri-bytestring - xml-conduit xml-conduit-parse xml-types - ]; - testHaskellDepends = [ - base conduit conduit-parse data-default exceptions hlint - lens-simple mono-traversable parsers quickcheck-instances resourcet - tasty tasty-hunit tasty-quickcheck text time uri-bytestring - xml-conduit xml-conduit-parse xml-types - ]; - description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; - license = "unknown"; - }) {}; - - "atom-conduit_0_4_0_1" = callPackage ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators , data-default, hlint, lens-simple, mono-traversable, parsers , quickcheck-instances, resourcet, safe-exceptions, tasty @@ -28083,7 +26549,6 @@ self: { ]; description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atom-msp430" = callPackage @@ -28231,6 +26696,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "attic-schedule" = callPackage + ({ mkDerivation, attoparsec, base, control-bool, doctest, foldl + , protolude, system-filepath, text, time, turtle + }: + mkDerivation { + pname = "attic-schedule"; + version = "0.2.0"; + sha256 = "23c66396ce46fdb6c617b074257dbda3172e5621bc8079dcc1849c09ed6f35e3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base control-bool foldl protolude system-filepath text + time turtle + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/passy/attic-schedule#readme"; + description = "A script I use to run \"attic\" for my backups"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "atto-lisp" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-textual , bytestring, containers, deepseq, HUnit, test-framework @@ -28322,6 +26807,23 @@ self: { license = "unknown"; }) {}; + "attoparsec-data" = callPackage + ({ mkDerivation, attoparsec, attoparsec-time, base, base-prelude + , bytestring, scientific, text, time + }: + mkDerivation { + pname = "attoparsec-data"; + version = "0.1.1.2"; + sha256 = "65ff7d4a796ea2c1991aeda1e288f0ff931e5fb1831d6571faa3cf68a9367b58"; + libraryHaskellDepends = [ + attoparsec attoparsec-time base base-prelude bytestring scientific + text time + ]; + homepage = "https://github.com/nikita-volkov/attoparsec-data"; + description = "Parsers for the standard Haskell data types"; + license = stdenv.lib.licenses.mit; + }) {}; + "attoparsec-enumerator" = callPackage ({ mkDerivation, attoparsec, base, bytestring, enumerator, text }: mkDerivation { @@ -28405,6 +26907,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "attoparsec-time" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest + , filepath, text, time + }: + mkDerivation { + pname = "attoparsec-time"; + version = "0.1.1"; + sha256 = "9789759199654f3767823b62bb48182b5f83226ebde3ec74e31863309a77a362"; + libraryHaskellDepends = [ attoparsec base-prelude text time ]; + testHaskellDepends = [ + base base-prelude directory doctest filepath + ]; + homepage = "https://github.com/sannsyn/attoparsec-time"; + description = "Attoparsec parsers of time"; + license = stdenv.lib.licenses.mit; + }) {}; + "attoparsec-trans" = callPackage ({ mkDerivation, attoparsec, base, transformers }: mkDerivation { @@ -28607,25 +27126,6 @@ self: { }) {}; "authenticate-oauth" = callPackage - ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring - , crypto-pubkey-types, data-default, http-client, http-types - , random, RSA, SHA, time, transformers - }: - mkDerivation { - pname = "authenticate-oauth"; - version = "1.5.1.2"; - sha256 = "294279ff1a4e746eedb5186d8230c34b2ffa770f020d30341424a59fedb76a33"; - libraryHaskellDepends = [ - base base64-bytestring blaze-builder bytestring crypto-pubkey-types - data-default http-client http-types random RSA SHA time - transformers - ]; - homepage = "http://github.com/yesodweb/authenticate"; - description = "Library to authenticate with OAuth for Haskell web applications"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "authenticate-oauth_1_6" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , crypto-pubkey-types, data-default, http-client, http-types , random, RSA, SHA, time, transformers, transformers-compat @@ -28642,7 +27142,6 @@ self: { homepage = "http://github.com/yesodweb/authenticate"; description = "Library to authenticate with OAuth for Haskell web applications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "authinfo-hs" = callPackage @@ -28708,21 +27207,6 @@ self: { }) {}; "autoexporter" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "autoexporter"; - version = "0.2.3"; - sha256 = "b3b9bfb44a5942ee83b45b4c9bcf3a61335362c507a98acddaf47889e394ab8a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/tfausak/autoexporter#readme"; - description = "Automatically re-export modules"; - license = stdenv.lib.licenses.mit; - }) {}; - - "autoexporter_1_0_0" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; @@ -28735,7 +27219,6 @@ self: { homepage = "https://github.com/tfausak/autoexporter#readme"; description = "Automatically re-export modules"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "autom" = callPackage @@ -28901,8 +27384,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1b45d8aa036b3c2ec7ea180327ff3cdce28dc1e1ef319c062be79f0ffa7626f5"; - revision = "5"; - editedCabalFile = "319f1526093b829e5cbb6fe1591f77f3f5be25da83df7790e37741272e711b24"; + revision = "6"; + editedCabalFile = "4fdb981cfedcc58b8b64a823d826fafd32c7b0fce7e01bd816db1474994d6018"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -28926,10 +27409,8 @@ self: { }: mkDerivation { pname = "avers-api"; - version = "0.0.17.0"; - sha256 = "affeffe0ac3c3eb15823fdb4c61654783ef8aff076bfb20b55c3df34be088182"; - revision = "1"; - editedCabalFile = "6ce2a1a63ecf6fcc5cd1d25ce3ee5b2756ebea0a78b7cc3a94fe73b3097668e3"; + version = "0.0.18.0"; + sha256 = "b1ba2ad32420636bf298efa7d4ff42fda9501672306f04b11c91aee1fe7805c5"; libraryHaskellDepends = [ aeson avers base bytestring cookie http-api-data servant text time vector @@ -28946,10 +27427,8 @@ self: { }: mkDerivation { pname = "avers-api-docs"; - version = "0.0.17.0"; - sha256 = "24029af182f7eff072fa05615cea5cf69ab2c5b481f1b2df5f7a606714ca716f"; - revision = "1"; - editedCabalFile = "cfd40f6559ac3e05f5d0da009454b18208e7b76ec87a15fa7311d4f0a7caf7ec"; + version = "0.0.18.0"; + sha256 = "38a9f290cfd92ee922253337b30297dd5d3fa0db28c5aad5a0e6d01a205efca1"; libraryHaskellDepends = [ aeson avers avers-api base cookie lens servant servant-swagger swagger2 text unordered-containers @@ -28969,10 +27448,8 @@ self: { }: mkDerivation { pname = "avers-server"; - version = "0.0.17.0"; - sha256 = "6da0c28f2b75989805cb4c2c7bf10b1b6ac4211f310d2bb902a4a7725ce05c3c"; - revision = "3"; - editedCabalFile = "025cc10ba6aa604876978781fcfbffbce27867d9155257411a7a40d4c4687988"; + version = "0.0.18.0"; + sha256 = "44ea17fd5f2351ae0c63d630f3c4a4879541f47b63b57bd447683d4644901cf7"; libraryHaskellDepends = [ aeson avers avers-api base base64-bytestring bytestring bytestring-conversion containers cookie cryptonite either @@ -28986,6 +27463,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aviation-cessna172-diagrams" = callPackage + ({ mkDerivation, aviation-cessna172-weight-balance, aviation-units + , aviation-weight-balance, base, colour, diagrams-cairo + , diagrams-core, diagrams-lib, directory, doctest, filepath + , hgeometry, lens, mtl, parsec, plots, QuickCheck, quickcheck-text + , template-haskell + }: + mkDerivation { + pname = "aviation-cessna172-diagrams"; + version = "0.0.2"; + sha256 = "ca9d567106b63c285f6ce149019073a04ecd020e3dc1bda91bcd843e4afae417"; + libraryHaskellDepends = [ + aviation-cessna172-weight-balance aviation-units + aviation-weight-balance base colour diagrams-cairo diagrams-core + diagrams-lib hgeometry lens mtl plots + ]; + testHaskellDepends = [ + base directory doctest filepath parsec QuickCheck quickcheck-text + template-haskell + ]; + homepage = "https://github.com/data61/aviation-cessna172-diagrams"; + description = "Diagrams for the Cessna 172 aircraft in aviation"; + license = "unknown"; + broken = true; + }) {aviation-cessna172-weight-balance = null; + aviation-units = null; aviation-weight-balance = null;}; + "avl-static" = callPackage ({ mkDerivation, base, QuickCheck, test-framework , test-framework-quickcheck2 @@ -29094,19 +27598,19 @@ self: { "aws" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, blaze-builder, byteable, bytestring - , case-insensitive, cereal, conduit, conduit-extra, containers - , cryptohash, data-default, directory, errors, filepath - , http-client, http-client-tls, http-conduit, http-types - , lifted-base, monad-control, mtl, network, old-locale, QuickCheck - , quickcheck-instances, resourcet, safe, scientific, tagged, tasty - , tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-base, unordered-containers, utf8-string, vector - , xml-conduit + , case-insensitive, cereal, conduit, conduit-combinators + , conduit-extra, containers, cryptohash, data-default, directory + , errors, filepath, http-client, http-client-tls, http-conduit + , http-types, lifted-base, monad-control, mtl, network, old-locale + , QuickCheck, quickcheck-instances, resourcet, safe, scientific + , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, transformers-base, unordered-containers + , utf8-string, vector, xml-conduit }: mkDerivation { pname = "aws"; - version = "0.14.1"; - sha256 = "6a2079853ddc781b46fe3ddce31e88c0b6b2441f458141bca3cd1c7216cbe579"; + version = "0.16"; + sha256 = "84b5c60227f3c9eddc0abf0881aee22443fc4a211b8a95f18be628eaa492209c"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring blaze-builder byteable bytestring case-insensitive cereal conduit @@ -29116,52 +27620,16 @@ self: { unordered-containers utf8-string vector xml-conduit ]; testHaskellDepends = [ - aeson base bytestring errors http-client http-client-tls http-types - lifted-base monad-control mtl QuickCheck quickcheck-instances - resourcet tagged tasty tasty-hunit tasty-quickcheck text time - transformers transformers-base + aeson base bytestring conduit-combinators errors http-client + http-client-tls http-types lifted-base monad-control mtl QuickCheck + quickcheck-instances resourcet tagged tasty tasty-hunit + tasty-quickcheck text time transformers transformers-base ]; homepage = "http://github.com/aristidb/aws"; description = "Amazon Web Services (AWS) for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; - "aws_0_15" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , base64-bytestring, blaze-builder, byteable, bytestring - , case-insensitive, cereal, conduit, conduit-extra, containers - , cryptohash, data-default, directory, errors, filepath - , http-client, http-client-tls, http-conduit, http-types - , lifted-base, monad-control, mtl, network, old-locale, QuickCheck - , quickcheck-instances, resourcet, safe, scientific, tagged, tasty - , tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-base, unordered-containers, utf8-string, vector - , xml-conduit - }: - mkDerivation { - pname = "aws"; - version = "0.15"; - sha256 = "53c73595bddd5614d980486a380d4ce83c100fd25b5fa35d477609f1bd03b11b"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring base64-bytestring - blaze-builder byteable bytestring case-insensitive cereal conduit - conduit-extra containers cryptohash data-default directory filepath - http-conduit http-types lifted-base monad-control mtl network - old-locale resourcet safe scientific tagged text time transformers - unordered-containers utf8-string vector xml-conduit - ]; - testHaskellDepends = [ - aeson base bytestring errors http-client http-client-tls http-types - lifted-base monad-control mtl QuickCheck quickcheck-instances - resourcet tagged tasty tasty-hunit tasty-quickcheck text time - transformers transformers-base - ]; - homepage = "http://github.com/aristidb/aws"; - description = "Amazon Web Services (AWS) for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "aws-cloudfront-signer" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring , bytestring, crypto-pubkey-types, RSA, time @@ -29762,39 +28230,6 @@ self: { }) {}; "b9" = callPackage - ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes - , bytestring, conduit, conduit-extra, ConfigFile, directory - , filepath, free, hashable, hspec, hspec-expectations, mtl - , optparse-applicative, parallel, parsec, pretty, pretty-show - , process, QuickCheck, random, semigroups, syb, template, text - , time, transformers, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "b9"; - version = "0.5.30"; - sha256 = "27e1437813bc55f173251c3e38f8de81fdc31ebb0f0ae59f10c954ce4cc4c071"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async base bifunctors binary boxes bytestring conduit - conduit-extra ConfigFile directory filepath free hashable mtl - parallel parsec pretty pretty-show process QuickCheck random - semigroups syb template text time transformers unordered-containers - vector yaml - ]; - executableHaskellDepends = [ - base bytestring directory optparse-applicative - ]; - testHaskellDepends = [ - aeson base bytestring hspec hspec-expectations QuickCheck - semigroups text unordered-containers vector yaml - ]; - homepage = "https://github.com/sheyll/b9-vm-image-builder"; - description = "A tool and library for building virtual machine images"; - license = stdenv.lib.licenses.mit; - }) {}; - - "b9_0_5_31" = callPackage ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes , bytestring, conduit, conduit-extra, ConfigFile, directory , filepath, free, hashable, hspec, hspec-expectations, mtl @@ -29825,7 +28260,6 @@ self: { homepage = "https://github.com/sheyll/b9-vm-image-builder"; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "babl" = callPackage @@ -29935,36 +28369,6 @@ self: { }) {}; "bake" = callPackage - ({ mkDerivation, aeson, base, bytestring, cmdargs, containers - , deepseq, direct-sqlite, directory, disk-free-space, extra - , filepath, hashable, HTTP, http-types, old-locale, process, random - , safe, shake, smtp-mail, sqlite-simple, text, time, transformers - , unordered-containers, wai, warp - }: - mkDerivation { - pname = "bake"; - version = "0.4"; - sha256 = "ff0b6eb38e68f2542713074da3c64368e3a56c029dadb9c1e011262c223abbf7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring cmdargs containers deepseq direct-sqlite - directory disk-free-space extra filepath hashable HTTP http-types - old-locale random safe shake smtp-mail sqlite-simple text time - transformers unordered-containers wai warp - ]; - executableHaskellDepends = [ - aeson base bytestring cmdargs containers deepseq direct-sqlite - directory disk-free-space extra filepath hashable HTTP http-types - old-locale process random safe shake smtp-mail sqlite-simple text - time transformers unordered-containers wai warp - ]; - homepage = "https://github.com/ndmitchell/bake#readme"; - description = "Continuous integration system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bake_0_5" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, containers , deepseq, direct-sqlite, directory, disk-free-space, extra , filepath, hashable, HTTP, http-client, http-conduit, http-types @@ -29995,7 +28399,6 @@ self: { homepage = "https://github.com/ndmitchell/bake#readme"; description = "Continuous integration system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bamboo" = callPackage @@ -30356,19 +28759,6 @@ self: { }) {}; "base-noprelude" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "base-noprelude"; - version = "4.9.0.0"; - sha256 = "1c5509c33366d7d0810c12d3e00579709f1b940733fda0f5f38079eba8f2fe5d"; - libraryHaskellDepends = [ base ]; - doHaddock = false; - homepage = "https://github.com/hvr/base-noprelude"; - description = "\"base\" package sans \"Prelude\" module"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "base-noprelude_4_9_1_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "base-noprelude"; @@ -30379,7 +28769,6 @@ self: { homepage = "https://github.com/hvr/base-noprelude"; description = "\"base\" package sans \"Prelude\" module"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-orphans" = callPackage @@ -30829,6 +29218,7 @@ self: { homepage = "http://github.com/humane-software/haskell-bdd"; description = "Behavior-Driven Development DSL"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bdelta" = callPackage @@ -31035,6 +29425,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "benchpress_0_2_2_9" = callPackage + ({ mkDerivation, base, bytestring, mtl, time }: + mkDerivation { + pname = "benchpress"; + version = "0.2.2.9"; + sha256 = "15c696bdde79a1acf31633a81def65cec8c04bee14cf8b0d0fa6a32d995a4aab"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl time ]; + executableHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/WillSewell/benchpress"; + description = "Micro-benchmarking with detailed statistics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bencode" = callPackage ({ mkDerivation, base, binary, bytestring, containers, parsec }: mkDerivation { @@ -31601,6 +30007,8 @@ self: { pname = "binary"; version = "0.8.4.1"; sha256 = "8d13c700fe96c84644a2af37003f488668fe9cd1f8e5b316fc929de26ce7e7ba"; + revision = "1"; + editedCabalFile = "56a00340fec65458e3c7cfe1d63651db09dd8d6ac925f843aefd2e98f4adbd50"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -31792,33 +30200,6 @@ self: { }) {}; "binary-orphans" = callPackage - ({ mkDerivation, aeson, base, binary, case-insensitive, hashable - , QuickCheck, quickcheck-instances, scientific, tagged, tasty - , tasty-quickcheck, text, text-binary, time, unordered-containers - , vector, vector-binary-instances - }: - mkDerivation { - pname = "binary-orphans"; - version = "0.1.5.2"; - sha256 = "7c644fb1d1657719c04c0f115a36efaeba7287c953de826b55c28fae87aca33d"; - revision = "1"; - editedCabalFile = "cb0932145cefc3ae3be46ef890b0db68864ddb96b0ed69371cbc878f385b6252"; - libraryHaskellDepends = [ - aeson base binary case-insensitive hashable scientific tagged text - text-binary time unordered-containers vector - vector-binary-instances - ]; - testHaskellDepends = [ - aeson base binary case-insensitive hashable QuickCheck - quickcheck-instances scientific tagged tasty tasty-quickcheck text - time unordered-containers vector - ]; - homepage = "https://github.com/phadej/binary-orphans#readme"; - description = "Orphan instances for binary"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "binary-orphans_0_1_6_0" = callPackage ({ mkDerivation, aeson, base, binary, case-insensitive, hashable , QuickCheck, quickcheck-instances, scientific, tagged, tasty , tasty-quickcheck, text, text-binary, time, unordered-containers @@ -31841,7 +30222,6 @@ self: { homepage = "https://github.com/phadej/binary-orphans#readme"; description = "Orphan instances for binary"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-parser" = callPackage @@ -32016,8 +30396,8 @@ self: { pname = "binary-tagged"; version = "0.1.4.2"; sha256 = "311fab8c2bac00cb6785cb144e25ed58b2efce85e5dc64e30e2b5a2a16cdc784"; - revision = "2"; - editedCabalFile = "7abacbe953b33132ec4cd7f4765e58918404e22c8b05eb6411f6bd62b05a828c"; + revision = "3"; + editedCabalFile = "6fd4d363bd8a64deacea2726daa15b67b4331f7d6b47de9980c11435564a3de1"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers generics-sop hashable nats scientific semigroups SHA tagged text @@ -32643,6 +31023,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bindings-monetdb-mapi" = callPackage + ({ mkDerivation, base, monetdb-mapi }: + mkDerivation { + pname = "bindings-monetdb-mapi"; + version = "0.1.0.0"; + sha256 = "63efa91e5c3224666cdda44762e830339ed311148392d14c651b54048ad5218a"; + libraryHaskellDepends = [ base ]; + libraryPkgconfigDepends = [ monetdb-mapi ]; + description = "Low-level bindings for the MonetDB API (mapi)"; + license = stdenv.lib.licenses.bsd3; + }) {monetdb-mapi = null;}; + "bindings-mpdecimal" = callPackage ({ mkDerivation, base, bindings-DSL }: mkDerivation { @@ -33019,32 +31411,23 @@ self: { }) {}; "biohazard" = callPackage - ({ mkDerivation, aeson, aeson-pretty, async, attoparsec, base - , base-prelude, binary, bytestring, bytestring-mmap, containers - , directory, exceptions, filepath, hashable, hybrid-vectors - , iteratee, ListLike, nonlinear-optimization, primitive, process - , random, scientific, shake, stm, template-haskell, text - , transformers, unix, unordered-containers, vector - , vector-algorithms, vector-binary-instances, vector-th-unbox, zlib + ({ mkDerivation, aeson, async, attoparsec, base, base-prelude + , binary, bytestring, bytestring-mmap, containers, directory + , exceptions, filepath, hashable, iteratee, ListLike, primitive + , random, scientific, stm, text, transformers, unix + , unordered-containers, vector, vector-algorithms, vector-th-unbox + , zlib }: mkDerivation { pname = "biohazard"; - version = "0.6.9"; - sha256 = "b69e935377daf170cea90cfb5d7cc765527d5b606d1dacf30b93cccfb2228628"; - isLibrary = true; - isExecutable = true; + version = "0.6.10"; + sha256 = "d966220ae495fb0b4ac792ac02aea3a8786f7a792ce7dcf0e88d4ee27378ebda"; libraryHaskellDepends = [ - aeson aeson-pretty async attoparsec base base-prelude binary - bytestring bytestring-mmap containers directory exceptions filepath - hashable hybrid-vectors iteratee ListLike nonlinear-optimization - primitive random scientific stm template-haskell text transformers - unix unordered-containers vector vector-algorithms - vector-binary-instances vector-th-unbox zlib - ]; - executableHaskellDepends = [ - aeson aeson-pretty async base binary bytestring containers - directory filepath process random shake stm text transformers unix - unordered-containers vector vector-algorithms vector-th-unbox + aeson async attoparsec base base-prelude binary bytestring + bytestring-mmap containers directory exceptions filepath hashable + iteratee ListLike primitive random scientific stm text transformers + unix unordered-containers vector vector-algorithms vector-th-unbox + zlib ]; homepage = "http://github.com/udo-stenzel/biohazard"; description = "bioinformatics support library"; @@ -33314,52 +31697,31 @@ self: { }) {}; "bitcoin-payment-channel" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, base58string - , base64-bytestring, bytestring, cereal, errors, haskoin-core - , hexstring, QuickCheck, scientific, text, time - }: - mkDerivation { - pname = "bitcoin-payment-channel"; - version = "0.3.0.1"; - sha256 = "97bc6dc75c72735f28c84ef90734f2e31bde8693f9c88e216f8a66d3f95ae8c8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring base64-bytestring bytestring cereal - errors haskoin-core hexstring scientific text time - ]; - executableHaskellDepends = [ - aeson base base16-bytestring base58string base64-bytestring - bytestring cereal haskoin-core hexstring QuickCheck text time - ]; - homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel"; - description = "Library for working with Bitcoin payment channels"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "bitcoin-payment-channel_0_6_0_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring - , bytestring, cereal, errors, haskoin-core, hexstring, QuickCheck - , scientific, string-conversions, tagged, test-framework - , test-framework-quickcheck2, text, time + , bytestring, cereal, deepseq, errors, haskoin-core, hexstring + , hspec, monad-time, mtl, QuickCheck, random, rbpcp-api, scientific + , semigroups, string-conversions, tagged, test-framework + , test-framework-quickcheck2, text, tf-random, time }: mkDerivation { pname = "bitcoin-payment-channel"; - version = "0.6.0.1"; - sha256 = "10085ef9254d88a4494986f372b07d4109d1767196cc6d230c02ffe18f5f1abd"; + version = "1.0.1.0"; + sha256 = "b723c4f808fd3e517bdacd27e59f08410a600a05ebea2ca6baf5cafa64490fa2"; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cereal errors haskoin-core - hexstring QuickCheck scientific string-conversions tagged text time + aeson base base16-bytestring bytestring cereal deepseq errors + haskoin-core hexstring hspec monad-time QuickCheck rbpcp-api + scientific semigroups string-conversions tagged text time ]; testHaskellDepends = [ aeson base base16-bytestring base64-bytestring bytestring cereal - haskoin-core hexstring QuickCheck string-conversions test-framework - test-framework-quickcheck2 text time + deepseq errors haskoin-core hexstring hspec monad-time mtl + QuickCheck random rbpcp-api scientific semigroups + string-conversions tagged test-framework test-framework-quickcheck2 + text tf-random time ]; homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel"; - description = "Library for working with Bitcoin payment channels"; - license = stdenv.lib.licenses.publicDomain; + description = "Instant, two-party Bitcoin payments"; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -33712,30 +32074,6 @@ self: { }) {}; "bitx-bitcoin" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, doctest - , exceptions, hspec, http-client, http-client-tls, http-types - , microlens, microlens-th, network, QuickCheck, safe, scientific - , split, text, time - }: - mkDerivation { - pname = "bitx-bitcoin"; - version = "0.10.0.0"; - sha256 = "a55e13de9eadffe78a0fc3edf4055a98c70a6f9738c98db4f055df8aa9fc509c"; - libraryHaskellDepends = [ - aeson base bytestring exceptions http-client http-client-tls - http-types microlens microlens-th network QuickCheck scientific - split text time - ]; - testHaskellDepends = [ - aeson base bytestring directory doctest hspec http-client - http-types microlens safe text time - ]; - homepage = "https://github.com/tebello-thejane/bitx-haskell"; - description = "A Haskell library for working with the BitX bitcoin exchange"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bitx-bitcoin_0_11_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, directory , doctest, exceptions, hspec, http-client, http-client-tls , http-types, microlens, microlens-th, network, QuickCheck, safe @@ -33757,7 +32095,6 @@ self: { homepage = "https://github.com/tebello-thejane/bitx.hs"; description = "A Haskell library for working with the BitX bitcoin exchange"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bk-tree" = callPackage @@ -34078,6 +32415,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blaze-colonnade" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, colonnade, doctest + , text + }: + mkDerivation { + pname = "blaze-colonnade"; + version = "0.1"; + sha256 = "cee73ec0777ecc268958699ead67b527b2b99cfbad38532b4687628bf70138e8"; + libraryHaskellDepends = [ + base blaze-html blaze-markup colonnade text + ]; + testHaskellDepends = [ base colonnade doctest ]; + homepage = "https://github.com/andrewthad/colonnade#readme"; + description = "Helper functions for using blaze-html with colonnade"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blaze-from-html" = callPackage ({ mkDerivation, base, containers, directory, filepath, tagsoup }: mkDerivation { @@ -34116,6 +32470,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-html_0_9_0_1" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring + , containers, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-html"; + version = "0.9.0.1"; + sha256 = "aeceaab3fbccbf7f01a241819e6c16c0a1cf19dccecb795c5de5407bc8660a64"; + libraryHaskellDepends = [ + base blaze-builder blaze-markup bytestring text + ]; + testHaskellDepends = [ + base blaze-builder blaze-markup bytestring containers HUnit + QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast HTML combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blaze-html-contrib" = callPackage ({ mkDerivation, base, blaze-html, cgi, data-default, network, safe , text @@ -34204,6 +32581,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-markup_0_8_0_0" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.8.0.0"; + sha256 = "19e1cbb9303803273ed7f9fcf3b8b6938578afbed2bfafe5ea9fcc6d743f540f"; + libraryHaskellDepends = [ base blaze-builder bytestring text ]; + testHaskellDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast markup combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blaze-shields" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg, text }: mkDerivation { @@ -34307,8 +32704,8 @@ self: { }: mkDerivation { pname = "ble"; - version = "0.1.0.0"; - sha256 = "718781b4acc79797450e46340060088ce5d1a110e3cb8d525b0b0ee5a675fd12"; + version = "0.1.3.0"; + sha256 = "adddceeeca53d3ef79dc6e3d8a01f41d3382d8227a794c5df8adbae24ae799fb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34329,6 +32726,7 @@ self: { homepage = "http://github.com/plow-technologies/ble#readme"; description = "Bluetooth Low Energy (BLE) peripherals"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blink1" = callPackage @@ -34440,35 +32838,6 @@ self: { }) {}; "bloodhound" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers - , data-default-class, derive, directory, doctest, doctest-prop - , errors, exceptions, filepath, hashable, hspec, http-client - , http-types, mtl, mtl-compat, network-uri, QuickCheck - , quickcheck-properties, scientific, semigroups, text, time - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "bloodhound"; - version = "0.11.0.0"; - sha256 = "df3c708675ad1e113aa31f6d1492bcf55dbef6c7e86e6202b118670a6fcbb939"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring containers data-default-class - exceptions hashable http-client http-types mtl mtl-compat - network-uri scientific semigroups text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers derive directory doctest - doctest-prop errors filepath hspec http-client http-types mtl - QuickCheck quickcheck-properties semigroups text time - unordered-containers vector - ]; - homepage = "https://github.com/bitemyapp/bloodhound"; - description = "ElasticSearch client library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bloodhound_0_12_1_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , data-default-class, directory, doctest, errors, exceptions , filepath, generics-sop, hashable, hspec, http-client, http-types @@ -34495,6 +32864,35 @@ self: { homepage = "https://github.com/bitemyapp/bloodhound"; description = "ElasticSearch client library for Haskell"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "bloodhound_0_13_0_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers + , data-default-class, errors, exceptions, generics-sop, hashable + , hspec, http-client, http-types, mtl, mtl-compat, network-uri + , QuickCheck, quickcheck-properties, scientific, semigroups + , temporary, text, time, transformers, unix-compat + , unordered-containers, vector + }: + mkDerivation { + pname = "bloodhound"; + version = "0.13.0.0"; + sha256 = "65217195be1d4d29c99bfc05712e3aa6ed9f67d8e12180e703b67be1b093c4f9"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring containers data-default-class + exceptions hashable http-client http-types mtl mtl-compat + network-uri scientific semigroups text time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers errors exceptions generics-sop + hspec http-client http-types mtl network-uri QuickCheck + quickcheck-properties semigroups temporary text time unix-compat + unordered-containers vector + ]; + homepage = "https://github.com/bitemyapp/bloodhound"; + description = "ElasticSearch client library for Haskell"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -34561,29 +32959,6 @@ self: { }) {}; "blosum" = callPackage - ({ mkDerivation, base, containers, fasta, lens - , optparse-applicative, pipes, pipes-text, split, text, text-show - }: - mkDerivation { - pname = "blosum"; - version = "0.1.1.2"; - sha256 = "acfbca000b0f7da3e20c5ae0b124ff029d4777a056f74546828fe6a9eee29d55"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers fasta lens text text-show - ]; - executableHaskellDepends = [ - base containers fasta optparse-applicative pipes pipes-text split - text - ]; - homepage = "http://github.com/GregorySchwartz/blosum#readme"; - description = "BLOSUM generator"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "blosum_0_1_1_4" = callPackage ({ mkDerivation, base, containers, fasta, lens , optparse-applicative, pipes, pipes-text, split, text, text-show }: @@ -34829,8 +33204,8 @@ self: { }: mkDerivation { pname = "bond"; - version = "0.7.0.0"; - sha256 = "b55acc5eb137f8dc9a85a7eedc8dc2f26c22d91b8593b856b155c6cd2597a7d3"; + version = "0.8.0.0"; + sha256 = "9ba0c8b618d342575d480488783117ea99dc19b0b5485192e3757cdbe267ccf7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35099,6 +33474,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bootstrap-types" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "bootstrap-types"; + version = "0.3"; + sha256 = "84b0c14c4d7c12beadef4b2950b888065e6e94dd0a08bcdfa5f43db4111db5a5"; + libraryHaskellDepends = [ base text ]; + description = "Bootstrap CSS Framework type-safe interface"; + license = stdenv.lib.licenses.mit; + }) {}; + "borel" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bimap, cassava , ceilometer-common, chevalier-common, configurator, containers @@ -35132,12 +33518,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "boring-game" = callPackage + ({ mkDerivation, base, gloss }: + mkDerivation { + pname = "boring-game"; + version = "0.1.0.1"; + sha256 = "51cc6d7b7cdda9ca35021c7005d75773119bdb3331f5fb40c750c9e231392b81"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base gloss ]; + executableHaskellDepends = [ base gloss ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/checkraiser/boring-game#readme"; + description = "An educational game"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "boring-window-switcher" = callPackage ({ mkDerivation, base, gtk, transformers, X11 }: mkDerivation { pname = "boring-window-switcher"; - version = "0.1.0.2"; - sha256 = "e7e568de0b410fd878c6cd6ce9eae66f51e3e98c83090ad5dec23b5738c9721f"; + version = "0.1.0.4"; + sha256 = "4f9f7dbe3ad1e3f5ad40a79e59e03e3598c9be7a91afe9d3ffb7148fd3063196"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base gtk transformers X11 ]; @@ -35246,27 +33648,6 @@ self: { }) {}; "bower-json" = callPackage - ({ mkDerivation, aeson, aeson-better-errors, base, bytestring - , deepseq, mtl, scientific, tasty, tasty-hunit, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "bower-json"; - version = "0.8.1"; - sha256 = "3fb3cdecc55a0997a9d4d9c3443bcf39b7feed09feb8629fc89b48b1ca7b713f"; - libraryHaskellDepends = [ - aeson aeson-better-errors base bytestring deepseq mtl scientific - text transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring tasty tasty-hunit text unordered-containers - ]; - homepage = "https://github.com/hdgarrood/bower-json"; - description = "Read bower.json from Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "bower-json_1_0_0_1" = callPackage ({ mkDerivation, aeson, aeson-better-errors, base, bytestring , deepseq, ghc-prim, mtl, scientific, tasty, tasty-hunit, text , transformers, unordered-containers, vector @@ -35285,7 +33666,6 @@ self: { homepage = "https://github.com/hdgarrood/bower-json"; description = "Read bower.json from Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bowntz" = callPackage @@ -35480,39 +33860,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "brick_0_15_2" = callPackage - ({ mkDerivation, base, containers, contravariant, data-default - , deepseq, microlens, microlens-mtl, microlens-th, template-haskell + "brick" = callPackage + ({ mkDerivation, base, containers, contravariant, deepseq, dlist + , microlens, microlens-mtl, microlens-th, stm, template-haskell , text, text-zipper, transformers, vector, vty }: mkDerivation { pname = "brick"; - version = "0.15.2"; - sha256 = "7407473d133588df46c43480a2b41a50a04a7f0e63a996c6422a07592b8ca85e"; + version = "0.17"; + sha256 = "891cb3323b1de2ed27849399cf8ab1ed1467560813a6182edb53b3726e4b3b68"; libraryHaskellDepends = [ - base containers contravariant data-default deepseq microlens - microlens-mtl microlens-th template-haskell text text-zipper - transformers vector vty - ]; - homepage = "https://github.com/jtdaugherty/brick/"; - description = "A declarative terminal user interface library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "brick" = callPackage - ({ mkDerivation, base, containers, contravariant, data-default - , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm - , template-haskell, text, text-zipper, transformers, vector, vty - }: - mkDerivation { - pname = "brick"; - version = "0.16"; - sha256 = "ebc1dea2d4891e7a66d3b3ee965b6ed16c9ad74ab5143836fa7e1c81dc0c19ff"; - libraryHaskellDepends = [ - base containers contravariant data-default deepseq dlist microlens - microlens-mtl microlens-th stm template-haskell text text-zipper - transformers vector vty + base containers contravariant deepseq dlist microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + vector vty ]; homepage = "https://github.com/jtdaugherty/brick/"; description = "A declarative terminal user interface library"; @@ -35722,27 +34082,14 @@ self: { ({ mkDerivation, base, bytestring, time, unix }: mkDerivation { pname = "btrfs"; - version = "0.1.2.0"; - sha256 = "a1e7bdb44c587686299e3e9e3910fb7a271bcd7462ee6fac0ffccd8c7a60fe0c"; + version = "0.1.2.3"; + sha256 = "7efc0b5c65623dcf60910baf896aec7da7ac2df4231f03a3072c78fb5b2fb88d"; libraryHaskellDepends = [ base bytestring time unix ]; homepage = "https://github.com/redneb/hs-btrfs"; description = "Bindings to the btrfs API"; license = stdenv.lib.licenses.bsd3; }) {}; - "btrfs_0_1_2_2" = callPackage - ({ mkDerivation, base, bytestring, time, unix }: - mkDerivation { - pname = "btrfs"; - version = "0.1.2.2"; - sha256 = "0a362bd0aef9c11212c095a3da17279a5c1ac490eee49822a04138503212e7b5"; - libraryHaskellDepends = [ base bytestring time unix ]; - homepage = "https://github.com/redneb/hs-btrfs"; - description = "Bindings to the btrfs API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "buchhaltung" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, array, async, base, boxes , bytestring, cassava, containers, data-default, Decimal, deepseq @@ -36109,6 +34456,7 @@ self: { homepage = "http://www.freedesktop.org/wiki/Software/Bustle/"; description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {system-glib = pkgs.glib;}; "butterflies" = callPackage @@ -36565,6 +34913,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytestring-typenats" = callPackage + ({ mkDerivation, base, binary, blake2, bytestring, cereal + , cryptohash, deepseq, entropy, QuickCheck + }: + mkDerivation { + pname = "bytestring-typenats"; + version = "1.0.0"; + sha256 = "b02618cf4130b1b83e93670d3d5cf8436cc8ae49ffafa2298156506b35642381"; + libraryHaskellDepends = [ + base binary blake2 bytestring cereal cryptohash deepseq entropy + QuickCheck + ]; + testHaskellDepends = [ base bytestring cryptohash QuickCheck ]; + homepage = "https://github.com/tsuraan/bytestring-typenats"; + description = "Bytestrings with typenat lengths"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytestringparser" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -36754,6 +35121,19 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "c2hs-extra" = callPackage + ({ mkDerivation, base, c2hs }: + mkDerivation { + pname = "c2hs-extra"; + version = "0.1.0.0"; + sha256 = "f22faa55babb95ac1acb29c775ebf9cf0fd1673985c802bd5b6037d6db558b3d"; + libraryHaskellDepends = [ base ]; + libraryToolDepends = [ c2hs ]; + homepage = "http://github.com/sighingnow/mxnet-haskell#readme"; + description = "Convenient marshallers for complicate C types"; + license = stdenv.lib.licenses.mit; + }) {}; + "c2hsc" = callPackage ({ mkDerivation, base, cmdargs, containers, directory, filepath , HStringTemplate, language-c, mtl, pretty, split, transformers @@ -36945,8 +35325,8 @@ self: { ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { pname = "cabal-dependency-licenses"; - version = "0.1.2.0"; - sha256 = "436a3d8745d6645cac1b51f54974f38811fbc37a3784ac0bdba3c3ddb22f2494"; + version = "0.2.0.0"; + sha256 = "1731299d3764dd56fe93da2df0b32ce6d4e794e9a68a3dff96cf84a63fb5341e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36993,6 +35373,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-doctest" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "cabal-doctest"; + version = "1"; + sha256 = "7c769d62029d10f8861d88f48080a64f875346b74028ed2fd808d674accc6147"; + libraryHaskellDepends = [ base Cabal directory filepath ]; + homepage = "https://github.com/phadej/cabal-doctests"; + description = "A Setup.hs helper for doctests running"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cabal-file-th" = callPackage ({ mkDerivation, base, Cabal, directory, pretty, template-haskell }: @@ -37060,36 +35452,6 @@ self: { }) {}; "cabal-helper" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-install, directory - , extra, filepath, ghc-prim, mtl, process, template-haskell - , temporary, transformers, unix, utf8-string - }: - mkDerivation { - pname = "cabal-helper"; - version = "0.7.2.0"; - sha256 = "90572b1e4aeb780464f7d5f2f88c4f59ebb4539fe303f0b86d42ef3b9078a362"; - revision = "1"; - editedCabalFile = "ebe355cd7cc1f6b1fc06054fb645010ab63c7de7dcba0f12e3c58a197bcc8173"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base Cabal directory filepath ghc-prim mtl process transformers - ]; - executableHaskellDepends = [ - base bytestring Cabal directory filepath ghc-prim mtl process - template-haskell temporary transformers utf8-string - ]; - testHaskellDepends = [ - base bytestring Cabal directory extra filepath ghc-prim mtl process - template-haskell temporary transformers unix utf8-string - ]; - testToolDepends = [ cabal-install ]; - doCheck = false; - description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; - license = stdenv.lib.licenses.agpl3; - }) {}; - - "cabal-helper_0_7_3_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-install, containers , directory, extra, filepath, ghc-prim, mtl, process , template-haskell, temporary, transformers, unix, utf8-string @@ -37121,7 +35483,6 @@ self: { doCheck = false; description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-info" = callPackage @@ -37385,8 +35746,8 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "0.10.1"; - sha256 = "46aae9f3b5734ceb9c35d9a5dbe7603bd26235169f16a10035078de33140cde9"; + version = "0.11"; + sha256 = "c705a4fc4bcdf64989d26b94b52381ab465db542e0a99e8614ced9fe872ed9d5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -37838,15 +36199,15 @@ self: { }) {}; "cached-io" = callPackage - ({ mkDerivation, base, stm, time }: + ({ mkDerivation, base, stm, time, transformers }: mkDerivation { pname = "cached-io"; - version = "0.1.1.0"; - sha256 = "b43e7b329aff4a1f96daff221b6e68b7124d35cef3331034b452d794c8b03546"; + version = "1.1.0.0"; + sha256 = "353267bfc4de538ed0811cc4ce9d77683dc7c92654519a29e483d582ba781f30"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base stm time ]; - executableHaskellDepends = [ base stm time ]; + libraryHaskellDepends = [ base stm time transformers ]; + executableHaskellDepends = [ base ]; description = "A simple library to cache a single IO action with timeout"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -37868,29 +36229,6 @@ self: { }) {}; "cacophony" = callPackage - ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring - , cryptonite, deepseq, directory, exceptions, free, hlint, lens - , memory, monad-coroutine, mtl, safe-exceptions, text, transformers - }: - mkDerivation { - pname = "cacophony"; - version = "0.8.0"; - sha256 = "063069adea7ae07f3ec458b76194edca2acb96871acc0fd437cc6b0c68739c01"; - libraryHaskellDepends = [ - base bytestring cryptonite deepseq exceptions free lens memory - monad-coroutine mtl safe-exceptions transformers - ]; - testHaskellDepends = [ - aeson async base base16-bytestring bytestring directory free hlint - lens mtl text - ]; - homepage = "https://github.com/centromere/cacophony"; - description = "A library implementing the Noise protocol"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cacophony_0_9_1" = callPackage ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring , cryptonite, directory, exceptions, free, hlint, lens, memory , monad-coroutine, mtl, safe-exceptions, text, transformers @@ -38251,37 +36589,6 @@ self: { }) {}; "camfort" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim - , happy, hmatrix, hspec, matrix, mtl, QuickCheck, syb, syz, text - , transformers, uniplate, vector - }: - mkDerivation { - pname = "camfort"; - version = "0.900"; - sha256 = "fc92d5a5d5ecf42470d4f7aea2848eb785e44ba925949df86599e7b96f4a4427"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring containers directory fgl filepath fortran-src - GenericPretty ghc-prim hmatrix matrix mtl syb syz text transformers - uniplate vector - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ - array base bytestring containers directory fgl filepath fortran-src - GenericPretty ghc-prim hmatrix matrix mtl QuickCheck syb syz text - transformers uniplate vector - ]; - testHaskellDepends = [ - array base bytestring containers directory filepath fortran-src - hmatrix hspec mtl QuickCheck uniplate - ]; - description = "CamFort - Cambridge Fortran infrastructure"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "camfort_0_901" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim , happy, hmatrix, hspec, matrix, mtl, QuickCheck, syb, syz, text @@ -38310,7 +36617,6 @@ self: { ]; description = "CamFort - Cambridge Fortran infrastructure"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "camh" = callPackage @@ -38393,8 +36699,8 @@ self: { ({ mkDerivation, aeson, base }: mkDerivation { pname = "canteven-listen-http"; - version = "0.1.0.0"; - sha256 = "b7a750e3cf9c1aa7bac89c631714546aea477f3b5a5672dd3df7bb1e2513e168"; + version = "1.0.0.1"; + sha256 = "80035ba4bd16e308dd27008aa989efcbd9bedb96c6a84ca651ebef6fbeb781c5"; libraryHaskellDepends = [ aeson base ]; description = "data types to describe HTTP services"; license = stdenv.lib.licenses.asl20; @@ -38717,8 +37023,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "3.1.0.2"; - sha256 = "c137dece9554219a980a74f0aaa3d44c13f83b6312c8802f4766702250514a95"; + version = "3.1.0.3"; + sha256 = "c9a2e3b246b344f48a771c419db3cdddda7f71c1995d184340d91817bebf6439"; libraryHaskellDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear spatial-math vector vector-binary-instances @@ -38866,6 +37172,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "case-insensitive_1_2_0_8" = callPackage + ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit + , test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "case-insensitive"; + version = "1.2.0.8"; + sha256 = "27aa610a7e0128c346d4a5cddb5d395a85b0889e4a9912acbb3b9ccbc4e99f68"; + libraryHaskellDepends = [ base bytestring deepseq hashable text ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit text + ]; + homepage = "https://github.com/basvandijk/case-insensitive"; + description = "Case insensitive string comparison"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "case-insensitive-match" = callPackage ({ mkDerivation, base, bytestring, mtl, QuickCheck, text }: mkDerivation { @@ -38901,8 +37225,8 @@ self: { }: mkDerivation { pname = "cases"; - version = "0.1.3.1"; - sha256 = "472bd45f1e9361b250e1b48aeaa92494fce5283f4154856cb13d1a8376897987"; + version = "0.1.3.2"; + sha256 = "9ecf632f7751aac2ed7ec93407f9499237316f2eb50f331bb4969abf3359a8a9"; libraryHaskellDepends = [ attoparsec base-prelude loch-th text ]; testHaskellDepends = [ base HTF HUnit loch-th placeholders QuickCheck text @@ -38934,8 +37258,8 @@ self: { ({ mkDerivation, base, split }: mkDerivation { pname = "casing"; - version = "0.1.0.1"; - sha256 = "9039e45dc21851b7b6e5e58c79603beb27a03a79588c3176150d5c83d6e077ac"; + version = "0.1.1.0"; + sha256 = "db3ba2aa997885da68348ff8c71e98434edc5a80e8e665154ccbf6f9ee3b63fb"; libraryHaskellDepends = [ base split ]; description = "Convert between various source code casing conventions"; license = stdenv.lib.licenses.mit; @@ -39186,24 +37510,6 @@ self: { }) {}; "cassava-conduit" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, cassava - , conduit, conduit-extra, containers, mtl, QuickCheck, text - }: - mkDerivation { - pname = "cassava-conduit"; - version = "0.3.2"; - sha256 = "e6ac1e3da4e43540ea0d31ecfa31a30c4ec401878aff10f1a1f6126e4462ffd2"; - libraryHaskellDepends = [ - array base bifunctors bytestring cassava conduit conduit-extra - containers mtl text - ]; - testHaskellDepends = [ base QuickCheck ]; - homepage = "https://github.com/domdere/cassava-conduit"; - description = "Conduit interface for cassava package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cassava-conduit_0_3_5_1" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, cassava , conduit, conduit-extra, containers, mtl, QuickCheck, text }: @@ -39221,7 +37527,6 @@ self: { homepage = "https://github.com/domdere/cassava-conduit"; description = "Conduit interface for cassava package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassava-megaparsec" = callPackage @@ -39465,29 +37770,8 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.2.1.1"; - sha256 = "04547226bf0e504d41527de6e2d81ba66d6c59d4460e2ce37f34a6d9aca747cf"; - libraryHaskellDepends = [ - aeson attoparsec base binary bytestring exceptions http-client - http-conduit lens lens-aeson mtl text transformers - unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec unordered-containers ]; - homepage = "https://github.com/MichelBoucey/cayley-client"; - description = "A Haskell client for the Cayley graph database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cayley-client_0_3_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring - , exceptions, hspec, http-client, http-conduit, lens, lens-aeson - , mtl, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "cayley-client"; - version = "0.3.2"; - sha256 = "f6e8b5cd6909554b8a75dedd303df0948fd3d27826b053ab2fc5779e7a7e5bc7"; + version = "0.4.0"; + sha256 = "bdd21a245b6db5102d11096746edd85545d150ee835c0324e554d8b812ee6571"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -40761,10 +39045,8 @@ self: { }: mkDerivation { pname = "chronos"; - version = "0.3"; - sha256 = "97e9bcdb2a65bb5034d2d6af2e0ac23dd91e797d7d4b914bad0110e9740486b5"; - revision = "1"; - editedCabalFile = "61e89d96d116d28efa59ca1583ce5e1a9dd6bbc8a644000f182233aa5fb480a0"; + version = "0.4"; + sha256 = "547910db795b52bc6aea1202fc2db32324697cad4cba6677edba043fc3c28751"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -41446,32 +39728,6 @@ self: { }) {}; "clash-lib" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude - , concurrent-supply, containers, deepseq, directory, errors, fgl - , filepath, ghc, hashable, integer-gmp, lens, mtl, pretty, process - , template-haskell, text, time, transformers, unbound-generics - , unordered-containers, uu-parsinglib, wl-pprint-text - }: - mkDerivation { - pname = "clash-lib"; - version = "0.6.21"; - sha256 = "2b0135d15e5e3b66a59ccdb40a3bf38bb8895bf67c49eb9b54a80082752b98ad"; - revision = "1"; - editedCabalFile = "4dc5af7e94897c9afc254661bb7e19a09acd0467be034c8d82bbe5b2582bd262"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clash-prelude concurrent-supply - containers deepseq directory errors fgl filepath ghc hashable - integer-gmp lens mtl pretty process template-haskell text time - transformers unbound-generics unordered-containers uu-parsinglib - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - As a Library"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clash-lib_0_7" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude , concurrent-supply, containers, data-binary-ieee754, deepseq , directory, errors, fgl, filepath, ghc, hashable, integer-gmp @@ -41509,30 +39765,6 @@ self: { }) {}; "clash-prelude" = callPackage - ({ mkDerivation, array, base, data-default, deepseq, doctest - , ghc-prim, ghc-typelits-extra, ghc-typelits-natnormalise - , integer-gmp, lens, QuickCheck, reflection, singletons - , template-haskell - }: - mkDerivation { - pname = "clash-prelude"; - version = "0.10.14"; - sha256 = "bf99eabf5a0ac6a86523c95a122242d3f5631d1b1870ba83d8e7319f245ef7f2"; - revision = "1"; - editedCabalFile = "badae6cf81fc1997c660b45485f9779eeeda298e676b2df6c07b060919b63f19"; - libraryHaskellDepends = [ - array base data-default deepseq ghc-prim ghc-typelits-extra - ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection - singletons template-haskell - ]; - testHaskellDepends = [ base doctest ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - Prelude library"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clash-prelude_0_11" = callPackage ({ mkDerivation, array, base, constraints, data-binary-ieee754 , data-default, deepseq, doctest, ghc-prim, ghc-typelits-extra , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp @@ -41568,24 +39800,6 @@ self: { }) {}; "clash-systemverilog" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-systemverilog"; - version = "0.6.10"; - sha256 = "20c33d2966648ecf383793308b0292437cccd06c4bd5535c1f280689180a2d6b"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clash-systemverilog_0_7" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable , lens, mtl, text, unordered-containers, wl-pprint-text }: @@ -41604,24 +39818,6 @@ self: { }) {}; "clash-verilog" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-verilog"; - version = "0.6.10"; - sha256 = "943c2c8752a3b44badce60595ffc5bbea2c87316681cd69460d75053e00fb26c"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - Verilog backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clash-verilog_0_7" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable , lens, mtl, text, unordered-containers, wl-pprint-text }: @@ -41640,26 +39836,6 @@ self: { }) {}; "clash-vhdl" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-vhdl"; - version = "0.6.16"; - sha256 = "42f4be26a545144c0e950c2a0b3d59516e93e73ed2c6d32d3c449e233d32b0c8"; - revision = "1"; - editedCabalFile = "b2816898222a54367e8426adb2f3359fd32b1ec8e00d546f32ff3f2839c01b3c"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - VHDL backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clash-vhdl_0_7" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable , lens, mtl, text, unordered-containers, wl-pprint-text }: @@ -41716,8 +39892,8 @@ self: { }: mkDerivation { pname = "classy-prelude"; - version = "1.0.2"; - sha256 = "4e5facf997758af2f15387349f373997abeee3edf3a3953e412490d4a9f5a467"; + version = "1.2.0"; + sha256 = "74ca864563ae2b6e048f86ec3be256192e81d12fbef0723d2aa2ee3d1d71fd70"; libraryHaskellDepends = [ async base basic-prelude bifunctors bytestring chunked-data containers deepseq dlist exceptions ghc-prim hashable lifted-async @@ -41743,8 +39919,8 @@ self: { }: mkDerivation { pname = "classy-prelude-conduit"; - version = "1.0.2"; - sha256 = "ab8f17db80cf1058013e00a16078275681faa93f91894263cf6a608c03843f19"; + version = "1.2.0"; + sha256 = "24090dd042cd74d2663a5870482a60746b9096754f598b5171b800511230ec7f"; libraryHaskellDepends = [ base bytestring classy-prelude conduit conduit-combinators monad-control resourcet transformers void @@ -41765,28 +39941,8 @@ self: { }: mkDerivation { pname = "classy-prelude-yesod"; - version = "1.0.2"; - sha256 = "3183921a292159e8deb0ed63130defa239510beb1692f505438edebd2ca19406"; - libraryHaskellDepends = [ - aeson base classy-prelude classy-prelude-conduit data-default - http-conduit http-types persistent yesod yesod-newsfeed - yesod-static - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Provide a classy prelude including common Yesod functionality"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "classy-prelude-yesod_1_1_0" = callPackage - ({ mkDerivation, aeson, base, classy-prelude - , classy-prelude-conduit, data-default, http-conduit, http-types - , persistent, yesod, yesod-newsfeed, yesod-static - }: - mkDerivation { - pname = "classy-prelude-yesod"; - version = "1.1.0"; - sha256 = "2b7672093e16850dba4c118c56d8626d8049e3c29b163c8389619bfc265f5b58"; + version = "1.2.0"; + sha256 = "01cfe84ab5de0b803dc68a2bee5f5bfa4b9daf948974113ef9af9dd99c003fd5"; libraryHaskellDepends = [ aeson base classy-prelude classy-prelude-conduit data-default http-conduit http-types persistent yesod yesod-newsfeed @@ -41810,19 +39966,6 @@ self: { }) {}; "clay" = callPackage - ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: - mkDerivation { - pname = "clay"; - version = "0.11"; - sha256 = "c3172361b21508ec0634cf43a3cd018323bd0e24ce936f554b0f16ca4329b3c1"; - libraryHaskellDepends = [ base mtl text ]; - testHaskellDepends = [ base hspec hspec-expectations mtl text ]; - homepage = "http://fvisser.nl/clay"; - description = "CSS preprocessor as embedded Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "clay_0_12_1" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: mkDerivation { pname = "clay"; @@ -41833,7 +39976,6 @@ self: { homepage = "http://fvisser.nl/clay"; description = "CSS preprocessor as embedded Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks" = callPackage @@ -41850,42 +39992,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.23.19.2"; - sha256 = "1453a56daccb669931ef6c1a1e6311abc6fef28341c9c75de0fcc34e03e4fb84"; - libraryHaskellDepends = [ - acid-state aeson aeson-qq attoparsec base blaze-html bytestring - cereal containers directory filepath happstack-authenticate - happstack-hsp happstack-jmacro happstack-server - happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl - network network-uri old-locale process random reform - reform-happstack reform-hsp safecopy stm text time - time-locale-compat unordered-containers userid utf8-string - uuid-orphans uuid-types vector web-plugins web-routes - web-routes-happstack web-routes-hsp web-routes-th xss-sanitize - ]; - librarySystemDepends = [ openssl ]; - homepage = "http://www.clckwrks.com/"; - description = "A secure, reliable content management system (CMS) and blogging platform"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) openssl;}; - - "clckwrks_0_24_0_1" = callPackage - ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base - , blaze-html, bytestring, cereal, containers, directory, filepath - , happstack-authenticate, happstack-hsp, happstack-jmacro - , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs - , ixset, jmacro, lens, mtl, network, network-uri, old-locale - , openssl, process, random, reform, reform-happstack, reform-hsp - , safecopy, stm, text, time, time-locale-compat - , unordered-containers, userid, utf8-string, uuid-orphans - , uuid-types, vector, web-plugins, web-routes, web-routes-happstack - , web-routes-hsp, web-routes-th, xss-sanitize - }: - mkDerivation { - pname = "clckwrks"; - version = "0.24.0.1"; - sha256 = "94e21d56e4a1e7efcc3f8f39252ff1ee6b74b3dd3408fd265dddbdf1606cdede"; + version = "0.24.0.3"; + sha256 = "aeeaf7c0275295ae45d21721fe9a454ab9fa67991495849eff076344b84a1eb0"; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -41981,8 +40089,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-ircbot"; - version = "0.6.15"; - sha256 = "1e6e9747a27e24258448b98d82217f9f69317beea18e4607accab1aa3df0ee88"; + version = "0.6.17.2"; + sha256 = "683b9db965858f5ff428175e7d3e0e3822278a182fb1d96aec727d7132a00a2b"; libraryHaskellDepends = [ acid-state attoparsec base blaze-html bytestring clckwrks containers directory filepath happstack-hsp happstack-server hsp @@ -41990,7 +40098,7 @@ self: { safecopy text web-plugins web-routes web-routes-th ]; libraryToolDepends = [ hsx2hs ]; - homepage = "http://clckwrks.com/"; + homepage = "http://www.clckwrks.com/"; description = "ircbot plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -42005,8 +40113,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-media"; - version = "0.6.16.1"; - sha256 = "acd1df19bf6b98d18202c925f7cf6800d378c190d36e5a88422dda3e19eaf079"; + version = "0.6.16.3"; + sha256 = "26f77337fa1e9c429462f49616432b2bace533cced64961f32761abe7d9054cf"; libraryHaskellDepends = [ acid-state attoparsec base blaze-html cereal clckwrks containers directory filepath gd happstack-server hsp ixset magic mtl reform @@ -42030,34 +40138,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.5"; - sha256 = "fb52a13751c322fde387786e93fdd41e4bb5a6019136fd8daa9d622d15e5d498"; - libraryHaskellDepends = [ - acid-state aeson attoparsec base clckwrks containers directory - filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl - old-locale random reform reform-happstack reform-hsp safecopy - tagsoup template-haskell text time time-locale-compat uuid - uuid-orphans web-plugins web-routes web-routes-happstack - web-routes-th - ]; - homepage = "http://www.clckwrks.com/"; - description = "support for CMS/Blogging in clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clckwrks-plugin-page_0_4_3_8" = callPackage - ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks - , containers, directory, filepath, happstack-hsp, happstack-server - , hsp, hsx2hs, ixset, mtl, old-locale, random, reform - , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell - , text, time, time-locale-compat, uuid, uuid-orphans, web-plugins - , web-routes, web-routes-happstack, web-routes-th - }: - mkDerivation { - pname = "clckwrks-plugin-page"; - version = "0.4.3.8"; - sha256 = "57be510f5d829eb54a37e2777748250923283f8d9eb1690abb069368c36c00e6"; + version = "0.4.3.9"; + sha256 = "4e3095f11f8b627cb74779aaa7356a5a19ed6ce9eade1af741e7417aab4b43e4"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -42281,6 +40363,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "clif" = callPackage + ({ mkDerivation, base, containers, QuickCheck, tasty + , tasty-quickcheck, tasty-th + }: + mkDerivation { + pname = "clif"; + version = "0.1.0.0"; + sha256 = "5c39d33787674c4452fab56f8166920525254e0dd095bdd64e3e51a97285d9c6"; + libraryHaskellDepends = [ base containers QuickCheck ]; + testHaskellDepends = [ + base containers QuickCheck tasty tasty-quickcheck tasty-th + ]; + description = "A Clifford algebra number type for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clifford" = callPackage ({ mkDerivation, base, cereal, Chart, Chart-cairo, colour, converge , criterion, data-default-class, data-ordlist, deepseq, derive @@ -42383,15 +40482,12 @@ self: { }: mkDerivation { pname = "clit"; - version = "0.2.2.3"; - sha256 = "ae1261e3bec1ff034b9fa5fea1be1592f0a32d4581d96d9b4c834554d839c1fc"; - isLibrary = true; - isExecutable = true; + version = "0.2.2.6"; + sha256 = "28913ec550761c623008250ef071840761216eaa1bb9e02b77c32c1dac6bb656"; libraryHaskellDepends = [ aeson authenticate-oauth base bytestring data-default http-client http-client-tls http-types lens optparse-applicative split text ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; description = "Post tweets from stdin"; license = stdenv.lib.licenses.bsd3; @@ -42631,28 +40727,6 @@ self: { }) {}; "clustering" = callPackage - ({ mkDerivation, base, binary, containers, hierarchical-clustering - , matrices, mwc-random, parallel, primitive, Rlang-QQ, split, tasty - , tasty-hunit, tasty-quickcheck, vector - }: - mkDerivation { - pname = "clustering"; - version = "0.2.1"; - sha256 = "5078c28e185fd26770726cb2632ff043d99b6918d7a5d135c30bd53fc27ab9cb"; - libraryHaskellDepends = [ - base binary containers matrices mwc-random parallel primitive - vector - ]; - testHaskellDepends = [ - base binary hierarchical-clustering matrices mwc-random Rlang-QQ - split tasty tasty-hunit tasty-quickcheck vector - ]; - description = "High performance clustering algorithms"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clustering_0_3_1" = callPackage ({ mkDerivation, base, binary, containers, hierarchical-clustering , matrices, mwc-random, parallel, primitive, Rlang-QQ, split, tasty , tasty-hunit, tasty-quickcheck, unordered-containers, vector @@ -42731,8 +40805,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, text }: mkDerivation { pname = "cmark"; - version = "0.5.4"; - sha256 = "06f62f52870103be29c92eabfed84be96b4b38a12c3c0b96dffe61b3a0dfa807"; + version = "0.5.5"; + sha256 = "03bd6fc962bb92127f64a9c597a904492a16fb3f34587775a741d22311fe53e2"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; homepage = "https://github.com/jgm/cmark-hs"; @@ -42773,8 +40847,8 @@ self: { }: mkDerivation { pname = "cmark-sections"; - version = "0.1.0.2"; - sha256 = "3617bb05d899ead54e1f58faa97fd30f6a9ec152112b6b962e26cdd02c34da57"; + version = "0.1.0.3"; + sha256 = "08cf3bb1bf87e7e9685fb24f3204df7023b0c5f0bfd6d16c950cba3507651441"; libraryHaskellDepends = [ base base-prelude cmark containers microlens split text ]; @@ -43479,8 +41553,8 @@ self: { }: mkDerivation { pname = "colonnade"; - version = "0.4.7"; - sha256 = "45bdd0a8d67e483f52d3212149d3dda99813aef4c00a6d4118b425d7d7e49457"; + version = "1.0.0"; + sha256 = "47280e7dc733a66d0e507492e2b5499115027911d6ab859e29c602308f7bdf08"; libraryHaskellDepends = [ base bytestring contravariant text vector ]; @@ -43516,6 +41590,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "colorful-monoids" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "colorful-monoids"; + version = "0.2.1.0"; + sha256 = "426e36c9219ebc19108f0968aee8900bad7642937b5800d6045c5085c2b06532"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/minad/colorful-monoids#readme"; + description = "Styled console text output using ANSI escape sequences"; + license = stdenv.lib.licenses.mit; + }) {}; + "colorize-haskell" = callPackage ({ mkDerivation, ansi-terminal, base, haskell-lexer }: mkDerivation { @@ -43752,8 +41839,8 @@ self: { ({ mkDerivation, attoparsec, base, QuickCheck, text }: mkDerivation { pname = "comma"; - version = "1.0.1"; - sha256 = "c038511aeb2c5651b853cfd64c0251103a3ae4ba4b722b752e070a8e6029df72"; + version = "1.1.0"; + sha256 = "fec0b23d79c39f3d19660dd2c7652c868de64590f8a9efe0115ab4b08b33befb"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ base QuickCheck text ]; homepage = "https://github.com/lovasko/comma"; @@ -43807,17 +41894,18 @@ self: { "commodities" = callPackage ({ mkDerivation, base, comonad, containers, directory, distributive - , doctest, filepath, hspec, hspec-expectations, keys, lens, linear - , mtl, numbers, PSQueue, QuickCheck, semigroupoids, semigroups - , text, thyme, transformers + , doctest, failure, filepath, hspec, hspec-expectations, keys, lens + , linear, mtl, numbers, parsers, PSQueue, QuickCheck, semigroupoids + , semigroups, split, text, thyme, transformers, trifecta }: mkDerivation { pname = "commodities"; - version = "0.2.0"; - sha256 = "093df899954134b657ac338384342f64a4f71dbe9841cef2ec138fc5cfddc275"; + version = "0.2.0.1"; + sha256 = "fa58f2c3c5acf6f14d0079d8cd2d944c6e35c4bd12c128904021094e8c059130"; libraryHaskellDepends = [ - base comonad containers distributive keys lens linear mtl numbers - PSQueue semigroupoids semigroups text thyme transformers + base comonad containers distributive failure keys lens linear mtl + numbers parsers PSQueue semigroupoids semigroups split text thyme + transformers trifecta ]; testHaskellDepends = [ base containers directory doctest filepath hspec hspec-expectations @@ -44684,6 +42772,23 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "concurrent-output_1_7_9" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , process, stm, terminal-size, text, transformers, unix + }: + mkDerivation { + pname = "concurrent-output"; + version = "1.7.9"; + sha256 = "343c9685d24795bb38761f5c3600df5c67dbc6d410e5e0b862aa8d092e4e10d5"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions process stm + terminal-size text transformers unix + ]; + description = "Ungarble output from several threads or commands"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-rpc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -44873,20 +42978,20 @@ self: { "conduit" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base - , mmorph, monad-control, mtl, QuickCheck, resourcet, safe + , mmorph, monad-control, mtl, QuickCheck, resourcet, safe, split , transformers, transformers-base }: mkDerivation { pname = "conduit"; - version = "1.2.8"; - sha256 = "80d5df4c70adf2b7e87138c55fba25e05be30eaef0c9a7926d97ae0c0cdb17fb"; + version = "1.2.9"; + sha256 = "8adf9d8916dcb7abf86c4c82cc1c92e99dea8d0a9a5835302a824142d214cf06"; libraryHaskellDepends = [ base exceptions lifted-base mmorph monad-control mtl resourcet transformers transformers-base ]; testHaskellDepends = [ base containers exceptions hspec mtl QuickCheck resourcet safe - transformers + split transformers ]; homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; @@ -44978,8 +43083,8 @@ self: { }: mkDerivation { pname = "conduit-combinators"; - version = "1.0.8.3"; - sha256 = "3b81e379c4dcb1cb6212bcbad1d0714e46f400ebf9ae2abe23621db500406dbe"; + version = "1.1.0"; + sha256 = "ff1f16f24e2c186ce5d61f079b318e2f58c4bc3a4a2c8d9011d001512786335a"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data conduit conduit-extra filepath monad-control mono-traversable @@ -45543,8 +43648,8 @@ self: { }: mkDerivation { pname = "connection"; - version = "0.2.6"; - sha256 = "03c16c28094a92ccf8fd58c61a4555b60158615914676c5c65c998a69ece37b0"; + version = "0.2.7"; + sha256 = "46d452dc92ebc6e851a9f9ac01dd2d29df846795dfce039cf07ba7102a323235"; libraryHaskellDepends = [ base byteable bytestring containers data-default-class network socks tls x509 x509-store x509-system x509-validation @@ -45578,8 +43683,8 @@ self: { }: mkDerivation { pname = "consistent"; - version = "0.0.1"; - sha256 = "a57d5872c68de93d5f2cf9aaa45c091559ed3877d26eab2b025fae6a60b57b00"; + version = "0.1.0"; + sha256 = "f8d983c3c3bc4f0928681c98dac459c18d4dbe64c575d260ac4576e8866a0833"; libraryHaskellDepends = [ base lifted-async lifted-base monad-control stm transformers transformers-base unordered-containers @@ -45597,8 +43702,8 @@ self: { }: mkDerivation { pname = "console-program"; - version = "0.4.2.0"; - sha256 = "a5476673bb36c25d7103aacffb9748dacf03f4cbafe94e3f16bc8950eececb7a"; + version = "0.4.2.1"; + sha256 = "fe8af591d5adcc26c3c8d7cb8830c8e162e8b7cfd3fd53fd36d17a90c1685bc1"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers directory haskeline parsec parsec-extra split transformers unix utility-ht @@ -45689,15 +43794,15 @@ self: { }: mkDerivation { pname = "constraints"; - version = "0.8"; - sha256 = "4cd08765345a151f21a0a4c5ef0a85661f4e53ffe807a623d5502d9ed3ae1588"; + version = "0.9"; + sha256 = "b7b4135ceacdd18d291bbd83277cc21bbb066d0e16ce35f879619f17c1c8d29d"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable mtl transformers transformers-compat ]; homepage = "http://github.com/ekmett/constraints/"; description = "Constraint manipulation"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd2; }) {}; "constructible" = callPackage @@ -45728,30 +43833,6 @@ self: { }) {}; "consul-haskell" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , connection, either, http-client, http-client-tls, http-types - , HUnit, lifted-async, lifted-base, monad-control, network, stm - , tasty, tasty-hunit, text, transformers - }: - mkDerivation { - pname = "consul-haskell"; - version = "0.3"; - sha256 = "073efdcba614f92e3add447e21e5df032a1f46ec987aa3e12de2353e38121634"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring connection either - http-client http-client-tls http-types lifted-async lifted-base - monad-control network stm text transformers - ]; - testHaskellDepends = [ - base http-client HUnit network tasty tasty-hunit text transformers - ]; - homepage = "https://github.com/alphaHeavy/consul-haskell"; - description = "A consul client for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "consul-haskell_0_4" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , connection, either, exceptions, http-client, http-client-tls , http-types, HUnit, lifted-async, lifted-base, monad-control @@ -45760,8 +43841,8 @@ self: { }: mkDerivation { pname = "consul-haskell"; - version = "0.4"; - sha256 = "f81c503aae87cb38659848d1d797eb1e7ffbf9c2b72836e30f2e5b05267c9bda"; + version = "0.4.2"; + sha256 = "b10812b70dfbce7037f9f23eda71fa2fa6fc97ed309bd63c00f226522d30d80a"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring connection either exceptions http-client http-client-tls http-types lifted-async @@ -45856,15 +43937,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "containers_0_5_9_1" = callPackage + "containers_0_5_10_1" = callPackage ({ mkDerivation, array, base, ChasingBottoms, deepseq, ghc-prim , HUnit, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers }: mkDerivation { pname = "containers"; - version = "0.5.9.1"; - sha256 = "132d2ab0d56a631fc883bc843c5661380135e19992f724897d24cf6ead450a23"; + version = "0.5.10.1"; + sha256 = "fa74241147e58084fe2520a376349df114b8280ddcd9062ae351fed20946d347"; libraryHaskellDepends = [ array base deepseq ghc-prim ]; testHaskellDepends = [ array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck @@ -47079,8 +45160,8 @@ self: { }: mkDerivation { pname = "cpphs"; - version = "1.20.2"; - sha256 = "dcb1d712a0f867c8a4fdd6e4ce7cbd33ce7912c76ac2db3a6157933fad8629db"; + version = "1.20.3"; + sha256 = "c63f0edb351f0977c2af6ad17c7164c44dc7c7499c0effe91d839fc7973dad91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47447,27 +45528,11 @@ self: { }) {crack = null;}; "crackNum" = callPackage - ({ mkDerivation, base, data-binary-ieee754, ieee754 }: - mkDerivation { - pname = "crackNum"; - version = "1.5"; - sha256 = "ef41fe4afa6866a578b17f84ee231ed70493696fdca9fe54341e124215c1e205"; - revision = "1"; - editedCabalFile = "a8b9973ada5a3b5afbebd90991cf8913dc3f4c0f795ce8ebe61a0d4ff2802e13"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base data-binary-ieee754 ieee754 ]; - executableHaskellDepends = [ base data-binary-ieee754 ieee754 ]; - description = "Crack various integer, floating-point data formats"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "crackNum_1_8" = callPackage ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }: mkDerivation { pname = "crackNum"; - version = "1.8"; - sha256 = "26a592d71d6290c1acda8a8acc72f1e5e2be0461236ac9369ab4bc25647b3dc4"; + version = "1.9"; + sha256 = "a5a78b774e17837513b7c6048856c375457095898a59b7f3bbb7f49abb1639c5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47478,7 +45543,6 @@ self: { ]; description = "Crack various integer, floating-point data formats"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "craft" = callPackage @@ -47557,16 +45621,18 @@ self: { }) {}; "crawlchain" = callPackage - ({ mkDerivation, base, bytestring, directory, HTTP, network-uri - , split, tagsoup, time + ({ mkDerivation, base, bytestring, directory, http-streams + , network-uri, split, tagsoup, text, time }: mkDerivation { pname = "crawlchain"; - version = "0.1.1.7"; - sha256 = "93c39d63111fd8bdc4222a763ff1cb289b4e1e9b5342a3f0273fa6180a6062f1"; + version = "0.1.2.0"; + sha256 = "1016c3a0de17b1807443d342a281310bb81a13df36a33294ffe72bd6fdb13b9f"; libraryHaskellDepends = [ - base bytestring directory HTTP network-uri split tagsoup time + base bytestring directory http-streams network-uri split tagsoup + text time ]; + testHaskellDepends = [ base split tagsoup ]; description = "Simulation user crawl paths"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -47673,6 +45739,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "credential-store" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptonite, dbus + , memory, safe-exceptions, tasty, tasty-hunit + }: + mkDerivation { + pname = "credential-store"; + version = "0.1.1"; + sha256 = "35087bea87d96fdeec351805f2bd7d8bf277e96e7b6689e33b6c4ce5314c35e2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers cryptonite dbus memory safe-exceptions + ]; + executableHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + homepage = "https://github.com/rblaze/credential-store#readme"; + description = "Library to access secure credential storage providers"; + license = stdenv.lib.licenses.asl20; + }) {}; + "credentials" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb , amazonka-kms, base, bytestring, conduit, cryptonite, exceptions @@ -47821,38 +45907,6 @@ self: { }) {}; "criterion" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring - , cassava, containers, deepseq, directory, filepath, Glob, hastache - , HUnit, mtl, mwc-random, optparse-applicative, parsec, QuickCheck - , statistics, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , transformers-compat, vector, vector-algorithms - }: - mkDerivation { - pname = "criterion"; - version = "1.1.1.0"; - sha256 = "e71855a7a9cd946044b2137f31603e0578f6e517a2ed667a2b479990cc0949dd"; - revision = "3"; - editedCabalFile = "0e89cf15205fea2b90e95198774fba60839aab36fc67a695baa482d55013978e"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base binary bytestring cassava containers - deepseq directory filepath Glob hastache mtl mwc-random - optparse-applicative parsec statistics text time transformers - transformers-compat vector vector-algorithms - ]; - executableHaskellDepends = [ base optparse-applicative ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck statistics test-framework - test-framework-hunit test-framework-quickcheck2 vector - ]; - homepage = "http://www.serpentine.com/criterion"; - description = "Robust, reliable performance measurement and analysis"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "criterion_1_1_4_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring , cassava, code-page, containers, deepseq, directory, filepath , Glob, hastache, HUnit, js-flot, js-jquery, mtl, mwc-random @@ -47879,7 +45933,6 @@ self: { homepage = "http://www.serpentine.com/criterion"; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion-plus" = callPackage @@ -47930,6 +45983,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "criu-rpc" = callPackage + ({ mkDerivation, base, criu-rpc-types, lens-family, network + , process, proto-lens, text, unix + }: + mkDerivation { + pname = "criu-rpc"; + version = "0.0.2"; + sha256 = "9c9e267eea934021575c15acadb3642292a78a9ebad136563cec43d65d0160ce"; + libraryHaskellDepends = [ + base criu-rpc-types lens-family network process proto-lens text + unix + ]; + description = "CRIU RPC client"; + license = stdenv.lib.licenses.mit; + }) {}; + + "criu-rpc-types" = callPackage + ({ mkDerivation, base, proto-lens, proto-lens-protoc, protobuf }: + mkDerivation { + pname = "criu-rpc-types"; + version = "0.0.0.2"; + sha256 = "ffba61e1bcf0f6975f2411a2facfb4fcf2f5921c3adefdd0caa0b5e331bad586"; + setupHaskellDepends = [ base proto-lens-protoc ]; + libraryHaskellDepends = [ base proto-lens proto-lens-protoc ]; + libraryPkgconfigDepends = [ protobuf ]; + homepage = "https://github.com/wayofthepie/haskell-criu-rpc-types"; + description = "Criu RPC protocol buffer types"; + license = stdenv.lib.licenses.mit; + }) {inherit (pkgs) protobuf;}; + "crockford" = callPackage ({ mkDerivation, base, digits, QuickCheck, safe }: mkDerivation { @@ -47962,29 +46045,6 @@ self: { }) {}; "cron" = callPackage - ({ mkDerivation, attoparsec, base, generics-sop, mtl, mtl-compat - , old-locale, quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers-compat - }: - mkDerivation { - pname = "cron"; - version = "0.4.2"; - sha256 = "31f186b9237c802260a7c1468e9b81006c086df1d6ad3d0d6ef51d9d2e8d07d3"; - revision = "1"; - editedCabalFile = "5f6737e07b84d324ea03dc18096622a49b649c5eb372ef64e504695d442b0bde"; - libraryHaskellDepends = [ - attoparsec base mtl mtl-compat old-locale semigroups text time - ]; - testHaskellDepends = [ - attoparsec base generics-sop quickcheck-instances semigroups tasty - tasty-hunit tasty-quickcheck text time transformers-compat - ]; - homepage = "http://github.com/michaelxavier/cron"; - description = "Cron datatypes and Attoparsec parser"; - license = stdenv.lib.licenses.mit; - }) {}; - - "cron_0_5_0" = callPackage ({ mkDerivation, attoparsec, base, data-default-class, generics-sop , mtl, mtl-compat, old-locale, quickcheck-instances, semigroups , tasty, tasty-hunit, tasty-quickcheck, text, time @@ -48005,7 +46065,6 @@ self: { homepage = "http://github.com/michaelxavier/cron"; description = "Cron datatypes and Attoparsec parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cron-compat" = callPackage @@ -48391,6 +46450,7 @@ self: { homepage = "https://github.com/Risto-Stevcev/haskell-crypto-simple#readme"; description = "A simple high level encryption interface based on cryptonite"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-totp" = callPackage @@ -48562,6 +46622,8 @@ self: { pname = "cryptol"; version = "2.4.0"; sha256 = "d34471f734429c25b52ca71ce63270ec3157a8413eeaf7f65dd7abe3cb27014d"; + revision = "1"; + editedCabalFile = "2bee5fb1a197ddde354e17c2b8b4f3081f005a133efe1eb2a021cedfd3b154f1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48604,17 +46666,22 @@ self: { }) {}; "cryptonite-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , cryptonite, resourcet, transformers + ({ mkDerivation, base, bytestring, conduit, conduit-combinators + , conduit-extra, cryptonite, memory, resourcet, tasty, tasty-hunit + , transformers }: mkDerivation { pname = "cryptonite-conduit"; - version = "0.1"; - sha256 = "a79cd5bc2f86093bbc45290889ca5a9c502804a3c19188874bc2ff3f2a97aac0"; + version = "0.2.0"; + sha256 = "15edae989ad62b0bdaf817bba8e711323b22d3a3466025f778a54757ba567628"; libraryHaskellDepends = [ - base bytestring conduit conduit-extra cryptonite resourcet + base bytestring conduit conduit-extra cryptonite memory resourcet transformers ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators cryptonite memory tasty + tasty-hunit + ]; homepage = "https://github.com/haskell-crypto/cryptonite-conduit"; description = "cryptonite conduit"; license = stdenv.lib.licenses.bsd3; @@ -48637,7 +46704,6 @@ self: { homepage = "https://github.com/haskell-crypto/cryptonite-openssl"; description = "Crypto stuff using OpenSSL cryptographic library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "cryptsy-api" = callPackage @@ -48791,8 +46857,8 @@ self: { }: mkDerivation { pname = "csp"; - version = "1.3"; - sha256 = "8be3102fda62818d3ccb4649dc73b8cb6bb29d9620d7284023475297c6efdd32"; + version = "1.3.1"; + sha256 = "d83c5e51dd32a796af8cfacac94312cb99691be30d924e159bc1c4b8cef9530b"; libraryHaskellDepends = [ base containers mtl nondeterminism ]; testHaskellDepends = [ base nondeterminism tasty tasty-hunit ]; description = "Discrete constraint satisfaction problem (CSP) solver"; @@ -51709,6 +49775,24 @@ self: { }) {}; "datasets" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, directory + , file-embed, filepath, hashable, HTTP, stringsearch, text, time + , vector + }: + mkDerivation { + pname = "datasets"; + version = "0.2.1"; + sha256 = "af3d9e9093358b9b1a320645a0411c750e9b7ed723f3d29088b5addaeeeb1277"; + libraryHaskellDepends = [ + aeson base bytestring cassava directory file-embed filepath + hashable HTTP stringsearch text time vector + ]; + homepage = "https://github.com/glutamate/datasets"; + description = "Classical data sets for statistics and machine learning"; + license = stdenv.lib.licenses.mit; + }) {}; + + "datasets_0_2_3" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, directory , file-embed, filepath, hashable, microlens, stringsearch, text , time, vector, wreq @@ -51724,6 +49808,7 @@ self: { homepage = "https://github.com/glutamate/datasets"; description = "Classical data sets for statistics and machine learning"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dataurl" = callPackage @@ -51756,6 +49841,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "date-conversions" = callPackage + ({ mkDerivation, base, dates, hspec, QuickCheck, time }: + mkDerivation { + pname = "date-conversions"; + version = "0.1.0.0"; + sha256 = "16b3c0ab70c86b25af6202f5a4a9df442d3cdc095b18fd61082659524eac880c"; + libraryHaskellDepends = [ base dates time ]; + testHaskellDepends = [ base dates hspec QuickCheck time ]; + homepage = "https://github.com/thoughtbot/date-conversions#readme"; + description = "Date conversions"; + license = stdenv.lib.licenses.mit; + }) {}; + "dates" = callPackage ({ mkDerivation, base, base-unicode-symbols, parsec, syb, time }: mkDerivation { @@ -52640,25 +50738,6 @@ self: { }) {}; "declarative" = callPackage - ({ mkDerivation, base, hasty-hamiltonian, lens, mcmc-types - , mighty-metropolis, mwc-probability, pipes, primitive - , speedy-slice, transformers - }: - mkDerivation { - pname = "declarative"; - version = "0.2.3"; - sha256 = "f6b0a65295f59d9c696257d667fa9995d9ebefc38b6d98a354fdc428d65d65aa"; - libraryHaskellDepends = [ - base hasty-hamiltonian lens mcmc-types mighty-metropolis - mwc-probability pipes primitive speedy-slice transformers - ]; - testHaskellDepends = [ base mwc-probability ]; - homepage = "http://github.com/jtobin/declarative"; - description = "DIY Markov Chains"; - license = stdenv.lib.licenses.mit; - }) {}; - - "declarative_0_5_1" = callPackage ({ mkDerivation, base, hasty-hamiltonian, kan-extensions, lens , mcmc-types, mighty-metropolis, mwc-probability, pipes, primitive , speedy-slice, transformers @@ -52676,7 +50755,6 @@ self: { homepage = "http://github.com/jtobin/declarative"; description = "DIY Markov Chains"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "decode-utf8" = callPackage @@ -53308,18 +51386,6 @@ self: { }) {}; "dependent-sum" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "dependent-sum"; - version = "0.3.2.2"; - sha256 = "34fbe4675fa3a6ea7ca34913954657a3defee785bd39d55cffcf375f4a3cf864"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/mokus0/dependent-sum"; - description = "Dependent sum type"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "dependent-sum_0_4" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "dependent-sum"; @@ -53329,7 +51395,6 @@ self: { homepage = "https://github.com/mokus0/dependent-sum"; description = "Dependent sum type"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dependent-sum-template" = callPackage @@ -53833,30 +51898,67 @@ self: { "dhall" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers - , http-client, http-client-tls, microlens, microlens-mtl - , neat-interpolation, optparse-generic, parsers, system-fileio - , system-filepath, text, text-format, transformers, trifecta - , unordered-containers, vector + , http-client, http-client-tls, lens, neat-interpolation + , optparse-generic, parsers, system-fileio, system-filepath, text + , text-format, transformers, trifecta, unordered-containers, vector }: mkDerivation { pname = "dhall"; - version = "1.0.1"; - sha256 = "4bc7a6e0de32900ac64b58024ea989c3afaeab0f9a3e1256a04090eb6233b428"; - revision = "1"; - editedCabalFile = "a149e10771a65c573ffb2c9ed1c6694f11392590a36d60a9b1c48f02d0e9e77c"; + version = "1.1.0"; + sha256 = "338152e2bd5e894f6d331f4c7230facb6585ebf789aab18b129d4873093f1302"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base bytestring containers http-client - http-client-tls microlens microlens-mtl neat-interpolation parsers - system-fileio system-filepath text text-format transformers - trifecta unordered-containers vector + http-client-tls lens neat-interpolation parsers system-fileio + system-filepath text text-format transformers trifecta + unordered-containers vector ]; executableHaskellDepends = [ base optparse-generic text trifecta ]; description = "A configuration language guaranteed to terminate"; license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, dhall, neat-interpolation + , optparse-generic, text, trifecta, vector, yaml + }: + mkDerivation { + pname = "dhall-json"; + version = "1.0.0"; + sha256 = "514e14a765b0fd360dad7aec62980ca02424d6670be9bf5b9a5a171835a7758d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base dhall neat-interpolation text vector + ]; + executableHaskellDepends = [ + aeson base bytestring dhall optparse-generic text trifecta yaml + ]; + description = "Compile Dhall to JSON or YAML"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "dhall-nix" = callPackage + ({ mkDerivation, base, containers, data-fix, dhall, hnix + , neat-interpolation, optparse-generic, text, trifecta, vector + }: + mkDerivation { + pname = "dhall-nix"; + version = "1.0.1"; + sha256 = "83e217056193e67bfa9b81074baeb0289372dd4bb185be4aff034956340d8f4c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-fix dhall hnix neat-interpolation text vector + ]; + executableHaskellDepends = [ + base dhall hnix optparse-generic text trifecta + ]; + description = "Dhall to Nix compiler"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dia-base" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -53885,23 +51987,6 @@ self: { }) {}; "diagrams" = callPackage - ({ mkDerivation, diagrams-contrib, diagrams-core, diagrams-lib - , diagrams-svg - }: - mkDerivation { - pname = "diagrams"; - version = "1.3.0.1"; - sha256 = "ee8abf5c262955a6a535ddc297bdf829ccd17bc179f61faf953371118ec4e4a7"; - libraryHaskellDepends = [ - diagrams-contrib diagrams-core diagrams-lib diagrams-svg - ]; - doHaddock = false; - homepage = "http://projects.haskell.org/diagrams"; - description = "Embedded domain-specific language for declarative vector graphics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams_1_4" = callPackage ({ mkDerivation, diagrams-contrib, diagrams-core, diagrams-lib , diagrams-svg }: @@ -53916,7 +52001,6 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative vector graphics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-boolean" = callPackage @@ -53964,27 +52048,6 @@ self: { }) {}; "diagrams-cairo" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, colour, containers - , data-default-class, diagrams-core, diagrams-lib, filepath - , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango - , split, statestack, transformers, unix, vector - }: - mkDerivation { - pname = "diagrams-cairo"; - version = "1.3.1.1"; - sha256 = "00c635a58a480033a2fc1240b703a4afab721f990e1412f57b8fa6becd6878b8"; - libraryHaskellDepends = [ - array base bytestring cairo colour containers data-default-class - diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl - optparse-applicative pango split statestack transformers unix - vector - ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Cairo backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-cairo_1_4" = callPackage ({ mkDerivation, array, base, bytestring, cairo, colour, containers , data-default-class, diagrams-core, diagrams-lib, filepath , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango @@ -54003,30 +52066,9 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-canvas" = callPackage - ({ mkDerivation, base, blank-canvas, cmdargs, containers - , data-default-class, diagrams-core, diagrams-lib, lens, mtl - , NumInstances, optparse-applicative, statestack, text - }: - mkDerivation { - pname = "diagrams-canvas"; - version = "1.3.0.6"; - sha256 = "20e905738a7a78061690fc55209041b2c3cdd6f6b6a534b6fdb75728a595a0ff"; - libraryHaskellDepends = [ - base blank-canvas cmdargs containers data-default-class - diagrams-core diagrams-lib lens mtl NumInstances - optparse-applicative statestack text - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "HTML5 canvas backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "diagrams-canvas_1_4" = callPackage ({ mkDerivation, base, blank-canvas, cmdargs, containers , data-default-class, diagrams-core, diagrams-lib, lens, mtl , NumInstances, optparse-applicative, statestack, text @@ -54047,33 +52089,6 @@ self: { }) {}; "diagrams-contrib" = callPackage - ({ mkDerivation, base, circle-packing, colour, containers - , data-default, data-default-class, diagrams-core, diagrams-lib - , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom - , mtl, parsec, QuickCheck, random, semigroups, split - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text - }: - mkDerivation { - pname = "diagrams-contrib"; - version = "1.3.0.12"; - sha256 = "a576a63fc9f216558415303ace621e42778d5db08286b838dd850e9640279620"; - libraryHaskellDepends = [ - base circle-packing colour containers data-default - data-default-class diagrams-core diagrams-lib diagrams-solve - force-layout lens linear MonadRandom mtl parsec random semigroups - split text - ]; - testHaskellDepends = [ - base containers diagrams-lib HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Collection of user contributions to diagrams EDSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-contrib_1_4_0_1" = callPackage ({ mkDerivation, base, circle-packing, colour, containers , cubicbezier, data-default, data-default-class, diagrams-core , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens @@ -54100,28 +52115,9 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Collection of user contributions to diagrams EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-core" = callPackage - ({ mkDerivation, adjunctions, base, containers, distributive - , dual-tree, lens, linear, monoid-extras, mtl, semigroups - , unordered-containers - }: - mkDerivation { - pname = "diagrams-core"; - version = "1.3.0.8"; - sha256 = "356f5fd77916422616e77fcdcde44aa76c0ff74c9ec9d56c20a54abd96459c73"; - libraryHaskellDepends = [ - adjunctions base containers distributive dual-tree lens linear - monoid-extras mtl semigroups unordered-containers - ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Core libraries for diagrams EDSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-core_1_4" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive , dual-tree, lens, linear, monoid-extras, mtl, profunctors , semigroups, unordered-containers @@ -54137,7 +52133,6 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-graphviz" = callPackage @@ -54157,20 +52152,6 @@ self: { }) {}; "diagrams-gtk" = callPackage - ({ mkDerivation, base, cairo, diagrams-cairo, diagrams-lib, gtk }: - mkDerivation { - pname = "diagrams-gtk"; - version = "1.3.0.2"; - sha256 = "ef4751e30f9b51ddb78f5310c5fd890ab9f26dd7cf409e3dbf39a96e73884c29"; - libraryHaskellDepends = [ - base cairo diagrams-cairo diagrams-lib gtk - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Backend for rendering diagrams directly to GTK windows"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-gtk_1_4" = callPackage ({ mkDerivation, base, cairo, diagrams-cairo, diagrams-lib, gtk }: mkDerivation { pname = "diagrams-gtk"; @@ -54182,7 +52163,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Backend for rendering diagrams directly to GTK windows"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-haddock" = callPackage @@ -54236,25 +52216,6 @@ self: { }) {}; "diagrams-html5" = callPackage - ({ mkDerivation, base, cmdargs, containers, data-default-class - , diagrams-core, diagrams-lib, lens, mtl, NumInstances - , optparse-applicative, split, statestack, static-canvas, text - }: - mkDerivation { - pname = "diagrams-html5"; - version = "1.3.0.7"; - sha256 = "8bddc55b95b6e0616552d09e59ae74ae315d296ef816552c5d7649035d49f7a4"; - libraryHaskellDepends = [ - base cmdargs containers data-default-class diagrams-core - diagrams-lib lens mtl NumInstances optparse-applicative split - statestack static-canvas text - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "HTML5 canvas backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-html5_1_4" = callPackage ({ mkDerivation, base, cmdargs, containers, data-default-class , diagrams-core, diagrams-lib, lens, mtl, NumInstances , optparse-applicative, split, statestack, static-canvas, text @@ -54271,36 +52232,9 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-lib" = callPackage - ({ mkDerivation, active, adjunctions, array, base, colour - , containers, data-default-class, diagrams-core, diagrams-solve - , directory, distributive, dual-tree, exceptions, filepath - , fingertree, fsnotify, hashable, intervals, JuicyPixels, lens - , linear, monoid-extras, mtl, optparse-applicative, process - , semigroups, tagged, tasty, tasty-hunit, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "diagrams-lib"; - version = "1.3.1.4"; - sha256 = "0ed2c2b81a872abc747dffcce74a7b19714f81a78dc44426d9d2baa999009617"; - libraryHaskellDepends = [ - active adjunctions array base colour containers data-default-class - diagrams-core diagrams-solve directory distributive dual-tree - exceptions filepath fingertree fsnotify hashable intervals - JuicyPixels lens linear monoid-extras mtl optparse-applicative - process semigroups tagged text transformers unordered-containers - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Embedded domain-specific language for declarative graphics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-lib_1_4_0_1" = callPackage ({ mkDerivation, active, adjunctions, array, base, cereal, colour , containers, data-default-class, deepseq, diagrams-core , diagrams-solve, directory, distributive, dual-tree, exceptions @@ -54331,7 +52265,6 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-pandoc" = callPackage @@ -54401,25 +52334,6 @@ self: { }) {}; "diagrams-postscript" = callPackage - ({ mkDerivation, base, containers, data-default-class - , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens - , monoid-extras, mtl, semigroups, split, statestack - }: - mkDerivation { - pname = "diagrams-postscript"; - version = "1.3.0.7"; - sha256 = "f045ad88def2ce2d8ebb641a7c48eacfe6d1eccf2baf42f50935ad2a21def751"; - libraryHaskellDepends = [ - base containers data-default-class diagrams-core diagrams-lib dlist - filepath hashable lens monoid-extras mtl semigroups split - statestack - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Postscript backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-postscript_1_4" = callPackage ({ mkDerivation, base, containers, data-default-class , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens , monoid-extras, mtl, semigroups, split, statestack @@ -54436,7 +52350,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-qrcode" = callPackage @@ -54456,28 +52369,6 @@ self: { }) {}; "diagrams-rasterific" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable - , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split - , unix - }: - mkDerivation { - pname = "diagrams-rasterific"; - version = "1.3.1.8"; - sha256 = "b76001105055563e2a51f6dbff2e1c12547644014f748e7564f1ded42b75cb99"; - revision = "1"; - editedCabalFile = "9a5004b0563415202937cd437518f75c9910ff25c605630eed77456ce2238041"; - libraryHaskellDepends = [ - base bytestring containers data-default-class diagrams-core - diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl - optparse-applicative Rasterific split unix - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Rasterific backend for diagrams"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-rasterific_1_4" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , diagrams-core, diagrams-lib, file-embed, filepath, FontyFruity , hashable, JuicyPixels, lens, mtl, optparse-applicative @@ -54495,7 +52386,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-reflex" = callPackage @@ -54547,28 +52437,6 @@ self: { }) {}; "diagrams-svg" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, colour - , containers, diagrams-core, diagrams-lib, directory, filepath - , hashable, JuicyPixels, lens, monoid-extras, mtl, old-time - , optparse-applicative, process, semigroups, split, svg-builder - , text, time - }: - mkDerivation { - pname = "diagrams-svg"; - version = "1.4.0.3"; - sha256 = "1ed1579ea601d2061373e636f558765179981b3d70e62cf18adf0617c4bf59e5"; - libraryHaskellDepends = [ - base base64-bytestring bytestring colour containers diagrams-core - diagrams-lib directory filepath hashable JuicyPixels lens - monoid-extras mtl old-time optparse-applicative process semigroups - split svg-builder text time - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "SVG backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-svg_1_4_1" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, colour , containers, diagrams-core, diagrams-lib, filepath, hashable , JuicyPixels, lens, monoid-extras, mtl, optparse-applicative @@ -54586,7 +52454,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-tikz" = callPackage @@ -54807,23 +52674,6 @@ self: { }) {}; "diff3" = callPackage - ({ mkDerivation, base, Diff, QuickCheck, test-framework - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "diff3"; - version = "0.2.0.3"; - sha256 = "e84c84f03bd100c2ae950b218397fb6af1f838ca1fce8b876817610d65b0ae7d"; - libraryHaskellDepends = [ base Diff ]; - testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - ]; - homepage = "http://github.com/ocharles/diff3.git"; - description = "Perform a 3-way difference of documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diff3_0_3_0" = callPackage ({ mkDerivation, base, Diff, QuickCheck, test-framework , test-framework-quickcheck2 }: @@ -54838,7 +52688,6 @@ self: { homepage = "http://github.com/ocharles/diff3.git"; description = "Perform a 3-way difference of documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diffarray" = callPackage @@ -55018,8 +52867,8 @@ self: { }: mkDerivation { pname = "digestive-functors-aeson"; - version = "1.1.20"; - sha256 = "017594d7489f33a2d162eb83f4f64bc110b3bd0cfb54982e3220ac3abc440bcc"; + version = "1.1.21"; + sha256 = "1f294cf79bd20f872545b84cf88acc3745304d342ff0253c52e948e53d304e78"; libraryHaskellDepends = [ aeson base containers digestive-functors lens lens-aeson safe text vector @@ -55482,12 +53331,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_3_0_1" = callPackage + "directory_1_3_0_2" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.0.1"; - sha256 = "b2b444aea7faac750efa23c994d9a16f207f12b2009cf38ba39fc7334f373f3c"; + version = "1.3.0.2"; + sha256 = "f9ee11de8bbaf7b8e2710d40ca0f1081fd1aaa609faede14a3706d60345c7aa3"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -55751,6 +53600,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "distance-of-time" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, time }: + mkDerivation { + pname = "distance-of-time"; + version = "0.1.2.0"; + sha256 = "f33ee0922bc8ad531407883de9ee70a396f53855f81e38f4ab1ddfb18432cd68"; + libraryHaskellDepends = [ base time ]; + testHaskellDepends = [ base hspec QuickCheck time ]; + homepage = "https://github.com/joshuaclayton/distance-of-time#readme"; + description = "Generate readable distances between times"; + license = stdenv.lib.licenses.mit; + }) {}; + "distributed-closure" = callPackage ({ mkDerivation, base, binary, bytestring, constraints, hspec , QuickCheck, syb, template-haskell @@ -55856,8 +53718,8 @@ self: { pname = "distributed-process-client-server"; version = "0.1.3.2"; sha256 = "2c905624d5486b7bc8bd1a4763b139e7eb364b20467c9abddd553f9afbd3601f"; - revision = "1"; - editedCabalFile = "de3bac2148543dcd00c7cebdaf95a7403d7b0f966683bf9ee23fe4eb8d33fcc6"; + revision = "2"; + editedCabalFile = "aedbbade08de4e7483cc9bc84e41ca9e6227a279480e025a27c78f31f1775413"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process distributed-process-async distributed-process-extras fingertree @@ -55931,25 +53793,25 @@ self: { "distributed-process-extras" = callPackage ({ mkDerivation, ansi-terminal, base, binary, bytestring , containers, data-accessor, deepseq, distributed-process - , distributed-process-tests, distributed-static, fingertree - , ghc-prim, hashable, HUnit, mtl, network, network-transport - , network-transport-tcp, QuickCheck, rematch, stm, test-framework - , test-framework-hunit, test-framework-quickcheck2, time - , transformers, unordered-containers + , distributed-process-systest, distributed-static, exceptions + , fingertree, ghc-prim, hashable, HUnit, mtl, network + , network-transport, network-transport-tcp, QuickCheck, rematch + , stm, test-framework, test-framework-hunit + , test-framework-quickcheck2, time, transformers + , unordered-containers }: mkDerivation { pname = "distributed-process-extras"; - version = "0.2.1.2"; - sha256 = "c1a4e1a5e3ec30089251db40fd479b19c5fd74c9dd8ca50f8eb32aaf9747a048"; - revision = "2"; - editedCabalFile = "e487c5799fa82b7e6b88ddf2d58e21d9add876a967b2820f502ac5c5307aec31"; + version = "0.3.0"; + sha256 = "bffa1640ec7f59bf415e18fb68e6085bf1cf96d4fc4c51c260ef554385e3cb36"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process - fingertree hashable mtl stm time transformers unordered-containers + exceptions fingertree hashable mtl stm time transformers + unordered-containers ]; testHaskellDepends = [ ansi-terminal base binary bytestring containers data-accessor - deepseq distributed-process distributed-process-tests + deepseq distributed-process distributed-process-systest distributed-static fingertree ghc-prim hashable HUnit mtl network network-transport network-transport-tcp QuickCheck rematch stm test-framework test-framework-hunit test-framework-quickcheck2 time @@ -56143,6 +54005,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "distributed-process-systest" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, bytestring + , distributed-process, distributed-static, HUnit, network + , network-transport, random, rematch, stm, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "distributed-process-systest"; + version = "0.1.1"; + sha256 = "a173434da0662635ecd4adebe49eedb5a0e4ec832020bf8e7c154c39b94e118e"; + libraryHaskellDepends = [ + ansi-terminal base binary bytestring distributed-process + distributed-static HUnit network network-transport random rematch + stm test-framework test-framework-hunit + ]; + homepage = "http://github.com/haskell-distributed/distributed-process-systest"; + description = "Cloud Haskell Test Support"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "distributed-process-task" = callPackage ({ mkDerivation, ansi-terminal, base, binary, bytestring , containers, data-accessor, deepseq, distributed-process @@ -56251,8 +54133,8 @@ self: { ({ mkDerivation, array, base, containers, MonadRandom, random }: mkDerivation { pname = "distribution"; - version = "1.0.1.0"; - sha256 = "c5777b37b0b200966f73c69d3586dd694fe13ab7e587c5d8fd23efad9cdc1f0e"; + version = "1.1.0.0"; + sha256 = "dbe2682b5fdf93c3e0d98f950926774a8c7bd9b443a41016e8f86e86e254810e"; libraryHaskellDepends = [ array base containers MonadRandom random ]; @@ -56302,46 +54184,27 @@ self: { }) {}; "distributive" = callPackage - ({ mkDerivation, base, base-orphans, directory, doctest, filepath - , tagged, transformers, transformers-compat + ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest + , generic-deriving, hspec, tagged, transformers + , transformers-compat }: mkDerivation { pname = "distributive"; - version = "0.5.1"; - sha256 = "8fd0968c19b00b64c8219b81903c72841494460fcf1c10e84fa44f321bb3ae92"; + version = "0.5.2"; + sha256 = "ade2be6a5e81950ab2918d938037dde0ce09d04dc399cefbf191ce6cb5f76cd9"; + revision = "2"; + editedCabalFile = "29cf1ac04b774831a231c83cd13c4356c65dc657000f1a79ef3e42ad21e6e2f2"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans tagged transformers transformers-compat ]; - testHaskellDepends = [ base directory doctest filepath ]; + testHaskellDepends = [ base doctest generic-deriving hspec ]; homepage = "http://github.com/ekmett/distributive/"; description = "Distributive functors -- Dual to Traversable"; license = stdenv.lib.licenses.bsd3; }) {}; "diversity" = callPackage - ({ mkDerivation, base, containers, data-ordlist, fasta - , math-functions, MonadRandom, optparse-applicative, parsec, pipes - , random-shuffle, scientific, split - }: - mkDerivation { - pname = "diversity"; - version = "0.8.0.1"; - sha256 = "06ee80a100424346e725777467173198a574d1df354cfd0051b0ee2983c1feba"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers data-ordlist fasta math-functions MonadRandom - parsec random-shuffle scientific split - ]; - executableHaskellDepends = [ - base containers fasta optparse-applicative pipes - ]; - homepage = "https://github.com/GregorySchwartz/diversity"; - description = "Quantify the diversity of a population"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "diversity_0_8_0_2" = callPackage ({ mkDerivation, base, containers, data-ordlist, fasta , math-functions, MonadRandom, optparse-applicative, parsec, pipes , random-shuffle, scientific, semigroups, split @@ -56362,7 +54225,6 @@ self: { homepage = "https://github.com/GregorySchwartz/diversity"; description = "Quantify the diversity of a population"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dixi" = callPackage @@ -56848,24 +54710,24 @@ self: { }) {}; "doctest" = callPackage - ({ mkDerivation, base, base-compat, deepseq, directory, filepath - , ghc, ghc-paths, hspec, HUnit, process, QuickCheck, setenv - , silently, stringbuilder, syb, transformers, with-location + ({ mkDerivation, base, base-compat, code-page, deepseq, directory + , filepath, ghc, ghc-paths, hspec, HUnit, process, QuickCheck + , setenv, silently, stringbuilder, syb, transformers, with-location }: mkDerivation { pname = "doctest"; - version = "0.11.0"; - sha256 = "d225c28a44281f32eb189dc11a4f1c9d15528ac0f973cf636567d69143df6477"; + version = "0.11.1"; + sha256 = "5b6ab30f0bf4061707b7bb33445da4c8a00df3e8b3ed04cf7c86f18a6007ad2a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base-compat deepseq directory filepath ghc ghc-paths process - syb transformers + base base-compat code-page deepseq directory filepath ghc ghc-paths + process syb transformers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base base-compat deepseq directory filepath ghc ghc-paths hspec - HUnit process QuickCheck setenv silently stringbuilder syb + base base-compat code-page deepseq directory filepath ghc ghc-paths + hspec HUnit process QuickCheck setenv silently stringbuilder syb transformers with-location ]; homepage = "https://github.com/sol/doctest#readme"; @@ -56963,6 +54825,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "doi" = callPackage + ({ mkDerivation, async, base, bibtex, directory, filepath + , haskeline, MissingH, optparse-applicative, parsec, process + , regex-base, regex-compat, regex-tdfa, safe, strict, tagsoup + , temporary, time, transformers, urlencoded, utility-ht + }: + mkDerivation { + pname = "doi"; + version = "0.0.2"; + sha256 = "202c7a5bf7b49077a287f6d73d55620684c3cbe8c6b0e30f66d333151bb259a5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bibtex directory filepath haskeline MissingH + optparse-applicative parsec process regex-base regex-compat + regex-tdfa safe strict tagsoup temporary time transformers + urlencoded utility-ht + ]; + executableHaskellDepends = [ + async base bibtex directory filepath haskeline MissingH + optparse-applicative parsec process regex-base regex-compat + regex-tdfa safe strict tagsoup temporary time transformers + urlencoded utility-ht + ]; + homepage = "http://johannesgerer.com/doi"; + description = "Automatic Bibtex and fulltext of scientific articles"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dom-lt" = callPackage ({ mkDerivation, array, base, containers }: mkDerivation { @@ -57642,28 +55534,6 @@ self: { }) {}; "drifter-postgresql" = callPackage - ({ mkDerivation, base, drifter, either, mtl, postgresql-simple - , tasty, tasty-hunit, text, time - }: - mkDerivation { - pname = "drifter-postgresql"; - version = "0.0.2"; - sha256 = "07fbd1e08b517d2fde939657237c7a05f2b1d1abe276681ab7254b1ab8415190"; - revision = "1"; - editedCabalFile = "577c35da613b6dface440995d0428e846dc4014764a635b61aa3f4bd83fa2f6b"; - libraryHaskellDepends = [ - base drifter either mtl postgresql-simple time - ]; - testHaskellDepends = [ - base drifter either postgresql-simple tasty tasty-hunit text - ]; - homepage = "http://github.com/michaelxavier/drifter-postgresql"; - description = "PostgreSQL support for the drifter schema migration tool"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "drifter-postgresql_0_1_0" = callPackage ({ mkDerivation, base, containers, drifter, either, mtl , postgresql-simple, tasty, tasty-hunit, text, time }: @@ -58502,6 +56372,20 @@ self: { license = "GPL"; }) {}; + "each" = callPackage + ({ mkDerivation, base, dlist, hspec, QuickCheck, template-haskell + }: + mkDerivation { + pname = "each"; + version = "1.1.0.0"; + sha256 = "b4935754b33a1078e7ad652c321cd610071ae2c6a37e5812f5f9fc3a0dc2077a"; + libraryHaskellDepends = [ base dlist template-haskell ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/dramforever/each#readme"; + description = "Template Haskell library for writing monadic expressions more easily"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "eager-sockets" = callPackage ({ mkDerivation, base, bytestring, network }: mkDerivation { @@ -58516,6 +56400,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "earclipper" = callPackage + ({ mkDerivation, base, filepath, hspec }: + mkDerivation { + pname = "earclipper"; + version = "0.0.0.1"; + sha256 = "9f0adbe9e9520657a1af71f45b7b0476447ab8466664ddfcb83e0e31394e6615"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base filepath hspec ]; + homepage = "https://github.com/zaidan/earclipper#readme"; + description = "Ear Clipping Triangulation"; + license = stdenv.lib.licenses.mit; + }) {}; + "easy-api" = callPackage ({ mkDerivation, aeson, base, bytestring, either, http-conduit, mtl , resourcet, text @@ -58734,8 +56634,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "echo"; - version = "0.1.2"; - sha256 = "819afc6655c4973f5ff3e65bb604cc871d2a1b17faf2a9840224e27b51a9f030"; + version = "0.1.3"; + sha256 = "704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef"; libraryHaskellDepends = [ base process ]; homepage = "https://github.com/RyanGlScott/echo"; description = "A cross-platform, cross-console way to handle echoing terminal input"; @@ -58833,19 +56733,20 @@ self: { "ede" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors - , bytestring, comonad, directory, filepath, free, lens, mtl - , parsers, scientific, semigroups, tasty, tasty-golden, text - , text-format, text-manipulate, trifecta, unordered-containers - , vector + , bytestring, comonad, directory, double-conversion, filepath, free + , lens, mtl, parsers, scientific, semigroups, tasty, tasty-golden + , text, text-format, text-manipulate, trifecta + , unordered-containers, vector }: mkDerivation { pname = "ede"; - version = "0.2.8.6"; - sha256 = "6388ce61ebc6153fcae1aeabe426ef4eb07f2080fd5019bb4d441184570cf2a5"; + version = "0.2.8.7"; + sha256 = "8b6be46bb0ef2b6503124fb1ae63c26e377013686fbb19ddd0ffeec3d3365e0a"; libraryHaskellDepends = [ aeson ansi-wl-pprint base bifunctors bytestring comonad directory - filepath free lens mtl parsers scientific semigroups text - text-format text-manipulate trifecta unordered-containers vector + double-conversion filepath free lens mtl parsers scientific + semigroups text text-format text-manipulate trifecta + unordered-containers vector ]; testHaskellDepends = [ aeson base bifunctors bytestring directory tasty tasty-golden text @@ -59133,12 +57034,12 @@ self: { }) {}; "effects" = callPackage - ({ mkDerivation, base, containers, newtype, void }: + ({ mkDerivation, base, containers, newtype-generics, void }: mkDerivation { pname = "effects"; - version = "0.2.2"; - sha256 = "64807819354882e0deab7212e6faf9dab1a36108f645ddc211ef25beb1005f7b"; - libraryHaskellDepends = [ base containers newtype void ]; + version = "0.2.3"; + sha256 = "80c116525a7aa51a779614dfb75f945954e1509eb424dbbf14fc0b1bf4a7959c"; + libraryHaskellDepends = [ base containers newtype-generics void ]; homepage = "http://github.com/sjoerdvisscher/effects"; description = "Computational Effects"; license = stdenv.lib.licenses.bsd3; @@ -59384,8 +57285,8 @@ self: { }: mkDerivation { pname = "ekg-bosun"; - version = "1.0.6"; - sha256 = "1083f3fac91439ccd32d1d0fcdf0fd6a1885ef78c688f02082e6369dcbb5364f"; + version = "1.0.7"; + sha256 = "2266b9bd5f43108d9f386efd0c8fa1976e59ec2baa12ecefb815387a3a4be927"; libraryHaskellDepends = [ aeson base ekg-core http-client lens network network-uri old-locale text time unordered-containers vector wreq @@ -59401,8 +57302,8 @@ self: { }: mkDerivation { pname = "ekg-carbon"; - version = "1.0.5"; - sha256 = "a2617140efc624787954f73700a05a79aa466742ae054c50c415ddbb418ad661"; + version = "1.0.6"; + sha256 = "730398bdc04966332584439346e242554b5f0e03c38ff00243eee54c451225b5"; libraryHaskellDepends = [ base ekg-core network network-carbon text time unordered-containers vector @@ -59667,23 +57568,6 @@ self: { }) {}; "elm-bridge" = callPackage - ({ mkDerivation, aeson, base, containers, hspec, QuickCheck - , template-haskell, text - }: - mkDerivation { - pname = "elm-bridge"; - version = "0.3.0.2"; - sha256 = "d83389362bfdc0c526bc574b413136b578cc01b61a694eaf45325531e850192f"; - libraryHaskellDepends = [ aeson base template-haskell ]; - testHaskellDepends = [ - aeson base containers hspec QuickCheck text - ]; - homepage = "https://github.com/agrafix/elm-bridge"; - description = "Derive Elm types from Haskell types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "elm-bridge_0_4_0" = callPackage ({ mkDerivation, aeson, base, containers, hspec, QuickCheck , template-haskell, text }: @@ -59698,7 +57582,6 @@ self: { homepage = "https://github.com/agrafix/elm-bridge"; description = "Derive Elm types from Haskell types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-build-lib" = callPackage @@ -59780,8 +57663,8 @@ self: { }: mkDerivation { pname = "elm-export"; - version = "0.6.0.0"; - sha256 = "ad6342e25a5f71b7eb8abbfb894802d3d72f75b05d588c76eee780d0528dc00f"; + version = "0.6.0.1"; + sha256 = "bf9862015918c72b54b421efcd9d858969dcd94ef0a3d0cb92d9bc0c4363f9d5"; libraryHaskellDepends = [ base bytestring containers directory formatting mtl text time wl-pprint-text @@ -59801,8 +57684,8 @@ self: { }: mkDerivation { pname = "elm-export-persistent"; - version = "0.1.1"; - sha256 = "a1866db56266261df0d8e99acc0534c32db75c1314b0578c089f02e34cad7ca2"; + version = "0.1.2"; + sha256 = "bc45ef54b7538b0c8223a1b966cbd10a69dac3879897d2a75b148dcdc7d8de9d"; libraryHaskellDepends = [ aeson base elm-export persistent scientific text unordered-containers @@ -60176,27 +58059,6 @@ self: { }) {}; "emailaddress" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bytestring, doctest - , email-validate, Glob, http-api-data, opaleye, path-pieces - , persistent, postgresql-simple, product-profunctors, profunctors - , text - }: - mkDerivation { - pname = "emailaddress"; - version = "0.1.6.0"; - sha256 = "5b81ba46a7228bad005cf0370a4762fac06729277355dc02085c4d81697c689d"; - libraryHaskellDepends = [ - aeson base bifunctors bytestring email-validate http-api-data - opaleye path-pieces persistent postgresql-simple - product-profunctors profunctors text - ]; - testHaskellDepends = [ base doctest Glob ]; - homepage = "https://github.com/cdepillabout/emailaddress#readme"; - description = "Wrapper around email-validate library adding instances for common type classes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "emailaddress_0_2_0_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, doctest , email-validate, Glob, http-api-data, opaleye, path-pieces , persistent, postgresql-simple, product-profunctors, profunctors @@ -60215,7 +58077,6 @@ self: { homepage = "https://github.com/cdepillabout/emailaddress#readme"; description = "Wrapper around email-validate library adding instances for common type classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "emailparse" = callPackage @@ -60317,6 +58178,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "empty-monad" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "empty-monad"; + version = "0.1.0.1"; + sha256 = "e5c61b20ce90d48d3eda2da1c1b55cac7b8bdeaba631acefbcca5f0c9c73c840"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/vadimvinnik/empty-monad"; + description = "A container that always has no values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "enchant" = callPackage ({ mkDerivation, base, c2hs, enchant }: mkDerivation { @@ -60413,8 +58286,8 @@ self: { }: mkDerivation { pname = "engine-io"; - version = "1.2.14"; - sha256 = "f321e826d56d7f14b4e027ddb57be59b2efa34a714e566e23a6bcee192ab6f33"; + version = "1.2.15"; + sha256 = "fb9430bec86f82463b7314c9d699441bd96a1681d6b1fac0bfd2cb4be7b9f9df"; libraryHaskellDepends = [ aeson async attoparsec base base64-bytestring bytestring either free monad-loops mwc-random stm stm-delay text transformers @@ -60447,18 +58320,17 @@ self: { }) {}; "engine-io-snap" = callPackage - ({ mkDerivation, attoparsec-enumerator, base, bytestring - , containers, engine-io, MonadCatchIO-transformers, snap-core - , unordered-containers, websockets, websockets-snap + ({ mkDerivation, base, bytestring, containers, engine-io + , io-streams, lifted-base, snap-core, unordered-containers + , websockets, websockets-snap }: mkDerivation { pname = "engine-io-snap"; - version = "1.0.3"; - sha256 = "6f411258df83db0466096a70f3b3eb78aee8de6e24ba68be9d7fe746564a4044"; + version = "1.0.4"; + sha256 = "687323f00aecb1196c5790aaac1361c055ffa3a1d4658a6ad963469e034779f0"; libraryHaskellDepends = [ - attoparsec-enumerator base bytestring containers engine-io - MonadCatchIO-transformers snap-core unordered-containers websockets - websockets-snap + base bytestring containers engine-io io-streams lifted-base + snap-core unordered-containers websockets websockets-snap ]; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; @@ -60737,19 +58609,6 @@ self: { }) {}; "envelope" = callPackage - ({ mkDerivation, aeson, base, doctest, Glob, mtl, text }: - mkDerivation { - pname = "envelope"; - version = "0.1.0.0"; - sha256 = "9116ceda5b6e103219361bcd5cdaa699a1365a43df06e5752c61dfb6419b316e"; - libraryHaskellDepends = [ aeson base mtl text ]; - testHaskellDepends = [ base doctest Glob ]; - homepage = "https://github.com/cdepillabout/envelope#readme"; - description = "Defines generic 'Envelope' type to wrap reponses from a JSON API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "envelope_0_2_1_0" = callPackage ({ mkDerivation, aeson, base, doctest, Glob, http-api-data, mtl , text }: @@ -60762,7 +58621,6 @@ self: { homepage = "https://github.com/cdepillabout/envelope#readme"; description = "Defines generic 'Envelope' type to wrap reponses from a JSON API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "envparse" = callPackage @@ -60784,10 +58642,8 @@ self: { }: mkDerivation { pname = "envy"; - version = "1.0.0.0"; - sha256 = "0505d8883f796b86f362048b7897bab3cad382f325aa423f743a7cab48064bf4"; - revision = "2"; - editedCabalFile = "4557dbc843b8c588b30d3124f3261fb7ffa2ff705e53ad0d0042c3c4e13ebed3"; + version = "1.3.0.1"; + sha256 = "ac630e03e9f4c8c99c39e622b9638c3bdc3b71300ef92597d60acac7ace8e85c"; libraryHaskellDepends = [ base bytestring containers mtl text time transformers ]; @@ -61006,8 +58862,10 @@ self: { }: mkDerivation { pname = "equivalence"; - version = "0.3.1"; - sha256 = "7a0539546e4fc1a00fb190109be45b0cb4af7047d8c2abaf65b8e401e828207e"; + version = "0.3.2"; + sha256 = "7da21ed5f980caa18c995190dd527c69822050390e4237c92f1acbed7d5b0529"; + revision = "1"; + editedCabalFile = "c83ef0092c45011e4d58091d0d90fdd068ef8e04dddaf69e8df66631ef031604"; libraryHaskellDepends = [ base containers mtl STMonadTrans transformers transformers-compat ]; @@ -61016,7 +58874,7 @@ self: { test-framework test-framework-quickcheck2 transformers transformers-compat ]; - homepage = "https://bitbucket.org/paba/equivalence/"; + homepage = "https://github.com/pa-ba/equivalence"; description = "Maintaining an equivalence relation implemented as union-find using STT"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -61357,8 +59215,8 @@ self: { }: mkDerivation { pname = "escape-artist"; - version = "1.0.0"; - sha256 = "50bd3a9b1e8773abff8d2a863c014978a74f3d4cd17a0c14cd8f4fdfb5740c7e"; + version = "1.1.0"; + sha256 = "e2ccea8bfb7e5d6d094b70a47b1449affcffc3e94044351b6a1addcaaad451fe"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base bytestring hspec QuickCheck silently text @@ -61394,33 +59252,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "esqueleto_2_4_3" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, conduit, containers - , hspec, HUnit, monad-control, monad-logger, persistent - , persistent-sqlite, persistent-template, QuickCheck, resourcet - , tagged, text, transformers, unordered-containers - }: - mkDerivation { - pname = "esqueleto"; - version = "2.4.3"; - sha256 = "bf555cfb40519ed1573f7bb90c65f693b9639dfa93fc2222230d3ded6e897434"; - revision = "1"; - editedCabalFile = "651ee129d694aedefa6d6f54e4fd8950f1d8c817e2984141c2ef2fb9174b1e38"; - libraryHaskellDepends = [ - base blaze-html bytestring conduit monad-logger persistent - resourcet tagged text transformers unordered-containers - ]; - testHaskellDepends = [ - base conduit containers hspec HUnit monad-control monad-logger - persistent persistent-sqlite persistent-template QuickCheck - resourcet text transformers - ]; - homepage = "https://github.com/prowdsponsor/esqueleto"; - description = "Type-safe EDSL for SQL queries on persistent backends"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "esqueleto" = callPackage ({ mkDerivation, base, blaze-html, bytestring, conduit, containers , hspec, HUnit, monad-control, monad-logger, persistent @@ -61429,8 +59260,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.5.0"; - sha256 = "2cba54c813bb506024889b29ceb75079e31e4172dc79cfa1e48c84337e064fa2"; + version = "2.5.1"; + sha256 = "76a75c84c4b4e0d41b28d8f8e73cc746282f5e7e50cfb11fcc252286950c87d9"; libraryHaskellDepends = [ base blaze-html bytestring conduit monad-logger persistent resourcet tagged text transformers unordered-containers @@ -61932,32 +59763,6 @@ self: { }) {}; "eventstore" = callPackage - ({ mkDerivation, aeson, array, async, base, bytestring, cereal - , connection, containers, dns, dotnet-timespan, http-client - , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time - , unordered-containers, uuid - }: - mkDerivation { - pname = "eventstore"; - version = "0.13.1.2"; - sha256 = "b519ae59c56c345cc2abe2bc6a779627d35c5553e9c0cfd51cb4aea4db9538fc"; - libraryHaskellDepends = [ - aeson array async base bytestring cereal connection containers dns - dotnet-timespan http-client protobuf random semigroups stm text - time unordered-containers uuid - ]; - testHaskellDepends = [ - aeson base connection dotnet-timespan stm tasty tasty-hunit text - time - ]; - homepage = "http://github.com/YoEight/eventstore"; - description = "EventStore TCP Client"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "eventstore_0_14_0_0" = callPackage ({ mkDerivation, aeson, array, base, cereal, classy-prelude , connection, containers, dns, dotnet-timespan, http-client, mtl , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time @@ -61965,8 +59770,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "0.14.0.0"; - sha256 = "0855c29baa25f14da74804bd324a4e4fb4f51f7609df3d0c6fbb0ef09d81552d"; + version = "0.14.0.1"; + sha256 = "0daf1e7c51405053cbcb35ab53f8b1eaaa4e937b985c49762e9e6814f9b380d0"; libraryHaskellDepends = [ aeson array base cereal classy-prelude connection containers dns dotnet-timespan http-client mtl protobuf random semigroups stm time @@ -62255,6 +60060,36 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "exference" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, containers + , data-pprint, deepseq, deepseq-generics, directory, either + , hashable, haskell-src-exts, hood, lens, mmorph, mtl, multistate + , parsec, pqueue, pretty, process, safe, split, template-haskell + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "exference"; + version = "1.6.0.0"; + sha256 = "303f1deaba594489712351b969b6bc93dc27272b03848b28e44cfe61b5a5cad2"; + revision = "3"; + editedCabalFile = "e3f9d32a394fc1790ce74c5a9ba629f97dbd3a11796d4ac1e5f642f76802cc56"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-orphans bifunctors containers deepseq deepseq-generics + directory either hashable haskell-src-exts hood lens mmorph mtl + multistate parsec pqueue pretty process safe split template-haskell + transformers unordered-containers vector + ]; + executableHaskellDepends = [ + base containers data-pprint deepseq either haskell-src-exts hood + mtl multistate process transformers + ]; + homepage = "https://github.com/lspitzner/exference"; + description = "Tool to search/generate (haskell) expressions with a given type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "exhaustive" = callPackage ({ mkDerivation, base, generics-sop, template-haskell, transformers }: @@ -62273,21 +60108,22 @@ self: { "exherbo-cabal" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal - , containers, data-default, doctest, haddock-library, http-client - , http-types, optparse-applicative, pcre-light, pretty + , containers, data-default, deepseq, directory, doctest, filepath + , haddock-library, http-client, http-types, optparse-applicative + , pcre-light, pretty }: mkDerivation { pname = "exherbo-cabal"; - version = "0.2.0.0"; - sha256 = "f052683dc1c0ecd91dfae4c3c3200e6601615590b51549e756e8ccb5260a7d5f"; + version = "0.2.1.1"; + sha256 = "30b744eced087cbffc9b631e0e4cdd150bf78c13db2363411ddf3330a6c6da3d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal containers data-default haddock-library pretty ]; executableHaskellDepends = [ - ansi-wl-pprint base bytestring Cabal data-default http-client - http-types optparse-applicative pcre-light + ansi-wl-pprint base bytestring Cabal data-default deepseq directory + filepath http-client http-types optparse-applicative pcre-light ]; testHaskellDepends = [ base doctest ]; description = "Exheres generator for cabal packages"; @@ -62442,27 +60278,6 @@ self: { }) {}; "exp-pairs" = callPackage - ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix - , QuickCheck, random, smallcheck, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, wl-pprint - }: - mkDerivation { - pname = "exp-pairs"; - version = "0.1.5.1"; - sha256 = "cb83312447031547092d9eef5ee092494d624d8e0c6a314ea66b8ec006f3aa2f"; - libraryHaskellDepends = [ - base containers deepseq ghc-prim wl-pprint - ]; - testHaskellDepends = [ - base matrix QuickCheck random smallcheck tasty tasty-hunit - tasty-quickcheck tasty-smallcheck - ]; - homepage = "https://github.com/Bodigrim/exp-pairs"; - description = "Linear programming over exponent pairs"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "exp-pairs_0_1_5_2" = callPackage ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix , QuickCheck, random, smallcheck, tasty, tasty-hunit , tasty-quickcheck, tasty-smallcheck, wl-pprint @@ -62481,7 +60296,6 @@ self: { homepage = "https://github.com/Bodigrim/exp-pairs"; description = "Linear programming over exponent pairs"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "expand" = callPackage @@ -62843,25 +60657,6 @@ self: { }) {}; "extra" = callPackage - ({ mkDerivation, base, directory, filepath, process, QuickCheck - , time, unix - }: - mkDerivation { - pname = "extra"; - version = "1.4.10"; - sha256 = "b40b3f74c02e40697f4ba5242a764c2846921e8aafdd92e79a30a7afd9e56759"; - libraryHaskellDepends = [ - base directory filepath process time unix - ]; - testHaskellDepends = [ - base directory filepath QuickCheck time unix - ]; - homepage = "https://github.com/ndmitchell/extra#readme"; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extra_1_5_1" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, time, unix }: @@ -62878,7 +60673,6 @@ self: { homepage = "https://github.com/ndmitchell/extra#readme"; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extract-dependencies" = callPackage @@ -63245,17 +61039,16 @@ self: { }) {}; "fast-logger" = callPackage - ({ mkDerivation, array, auto-update, base, bytestring - , bytestring-builder, directory, easy-file, filepath, hspec, text - , unix, unix-time + ({ mkDerivation, array, auto-update, base, bytestring, directory + , easy-file, filepath, hspec, text, unix, unix-time }: mkDerivation { pname = "fast-logger"; - version = "2.4.7"; - sha256 = "201b07d898da91472aa86662399feb093a7379bc04315f8e84db52fbf3464a38"; + version = "2.4.10"; + sha256 = "dec4a5d1a88f822d08d334ee870a08a8bb63b2b226d145cd24a7f08676ce678d"; libraryHaskellDepends = [ - array auto-update base bytestring bytestring-builder directory - easy-file filepath text unix unix-time + array auto-update base bytestring directory easy-file filepath text + unix unix-time ]; testHaskellDepends = [ base bytestring directory hspec ]; homepage = "https://github.com/kazu-yamamoto/logger"; @@ -63292,8 +61085,8 @@ self: { }: mkDerivation { pname = "fast-tags"; - version = "1.2.1"; - sha256 = "6802c0275d28695c475d2cb41c4e2644b04d6f43befff0b6ac950081eb4cc0d3"; + version = "1.3"; + sha256 = "d81da625154eccdf61c81db1f8d041055470c977a33ad29c302482d7441e1fdf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63302,7 +61095,7 @@ self: { ]; libraryToolDepends = [ alex ]; executableHaskellDepends = [ - async base bytestring containers directory filepath text + async base bytestring containers deepseq directory filepath text ]; testHaskellDepends = [ async base bytestring containers directory filepath tasty @@ -63349,8 +61142,8 @@ self: { }: mkDerivation { pname = "fasta"; - version = "0.10.4.0"; - sha256 = "d37616f6107834ce47cc57163e9dddda055ef13b0400d74d6e77cbdd249f69da"; + version = "0.10.4.1"; + sha256 = "0a282adecb22764cd99c056cc0a871e29adac3568ba92b37eabf8f064ad6d482"; libraryHaskellDepends = [ attoparsec base bytestring containers foldl lens parsec pipes pipes-attoparsec pipes-bytestring pipes-group pipes-text split text @@ -63360,6 +61153,25 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "fasta_0_10_4_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, foldl + , lens, parsec, pipes, pipes-attoparsec, pipes-bytestring + , pipes-group, pipes-text, split, text + }: + mkDerivation { + pname = "fasta"; + version = "0.10.4.2"; + sha256 = "2b760dfd5029dee94d56010f8125f4317d6fa675a84817c352311d308d1897be"; + libraryHaskellDepends = [ + attoparsec base bytestring containers foldl lens parsec pipes + pipes-attoparsec pipes-bytestring pipes-group pipes-text split text + ]; + homepage = "https://github.com/GregorySchwartz/fasta"; + description = "A simple, mindless parser for fasta files"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fastbayes" = callPackage ({ mkDerivation, base, hmatrix, vector }: mkDerivation { @@ -63474,37 +61286,6 @@ self: { }) {}; "fay" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring, containers - , data-default, data-lens-light, directory, filepath, ghc-paths - , haskell-src-exts, language-ecmascript, mtl, mtl-compat - , optparse-applicative, process, safe, sourcemap, split, spoon, syb - , text, time, transformers, transformers-compat - , traverse-with-class, type-eq, uniplate, unordered-containers - , utf8-string, vector - }: - mkDerivation { - pname = "fay"; - version = "0.23.1.12"; - sha256 = "3d9c0a64f6d30923e2e45f27c043a7fa4f451c676466c8ca5b69a4121462f727"; - revision = "6"; - editedCabalFile = "4dd008fc4b03b8fc6e67eff2fb1c42b4f5552529bdd4f63f4290ef25a5327e0b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base-compat bytestring containers data-default - data-lens-light directory filepath ghc-paths haskell-src-exts - language-ecmascript mtl mtl-compat process safe sourcemap split - spoon syb text time transformers transformers-compat - traverse-with-class type-eq uniplate unordered-containers - utf8-string vector - ]; - executableHaskellDepends = [ base mtl optparse-applicative split ]; - homepage = "https://github.com/faylang/fay/wiki"; - description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fay_0_23_1_16" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers , data-default, data-lens-light, directory, filepath, ghc-paths , haskell-src-exts, language-ecmascript, mtl, mtl-compat @@ -63533,7 +61314,6 @@ self: { homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-base" = callPackage @@ -64243,18 +62023,19 @@ self: { "fficxx" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, data-default - , directory, either, errors, filepath, hashable, HStringTemplate - , lens, mtl, process, pureMD5, split, template-haskell - , transformers, unordered-containers + , directory, either, errors, filepath, hashable, haskell-src-exts + , lens, mtl, process, pureMD5, split, template, template-haskell + , text, transformers, unordered-containers }: mkDerivation { pname = "fficxx"; - version = "0.2.1"; - sha256 = "0d2808a81f75db856bb392a9a3968b86abdbc00b74eec3b93047e83cc1e553ee"; + version = "0.3.1"; + sha256 = "93888f04f6d65c92368b69f14e5744a2dcc5194c93eb4793ab21174344a48078"; libraryHaskellDepends = [ base bytestring Cabal containers data-default directory either - errors filepath hashable HStringTemplate lens mtl process pureMD5 - split template-haskell transformers unordered-containers + errors filepath hashable haskell-src-exts lens mtl process pureMD5 + split template template-haskell text transformers + unordered-containers ]; description = "automatic C++ binding generation"; license = stdenv.lib.licenses.bsd3; @@ -64262,12 +62043,12 @@ self: { }) {}; "fficxx-runtime" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, bytestring, template-haskell }: mkDerivation { pname = "fficxx-runtime"; - version = "0.2.1"; - sha256 = "b3dfb29aff05dba4b0f8f70e93370ead11b012a674aeef51f70356b21a609741"; - libraryHaskellDepends = [ base ]; + version = "0.3"; + sha256 = "ab4563421558a4bf6a91e459cf700ca3eb58fe74ac72df073a4e648d1d94ffa2"; + libraryHaskellDepends = [ base bytestring template-haskell ]; description = "Runtime for fficxx-generated library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -64677,12 +62458,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "filepath_1_4_1_1" = callPackage + "filepath_1_4_1_2" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "filepath"; - version = "1.4.1.1"; - sha256 = "52fdbde3bc3a44d920544b8d184bd7241bac3f92d1fc6e299d716e06e99f12b4"; + version = "1.4.1.2"; + sha256 = "7bfb0c8776dc161cf10e324b306f3a0c89db01803ee2f8c7e11fcf3cd9892bc3"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/haskell/filepath#readme"; @@ -64727,8 +62508,8 @@ self: { }: mkDerivation { pname = "filestore"; - version = "0.6.2"; - sha256 = "a545e54c70bd12b5a2dfd9a303784d7eccd1db6a074860263f40fd0dd092d3d7"; + version = "0.6.3.1"; + sha256 = "816f0db22291c7ac719db4b342e8ecc42c8ab749374cc70790887a6d025ad8de"; libraryHaskellDepends = [ base bytestring containers Diff directory filepath old-locale parsec process split time utf8-string xml @@ -65233,18 +63014,6 @@ self: { }) {}; "fixed-vector" = callPackage - ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: - mkDerivation { - pname = "fixed-vector"; - version = "0.8.1.0"; - sha256 = "3c3c29c7248c08061949843727e83ad234584ca77f8076ecd9537a185ebe3a93"; - libraryHaskellDepends = [ base deepseq primitive ]; - testHaskellDepends = [ base doctest filemanip primitive ]; - description = "Generic vectors with statically known size"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fixed-vector_0_9_0_0" = callPackage ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: mkDerivation { pname = "fixed-vector"; @@ -65254,7 +63023,6 @@ self: { testHaskellDepends = [ base doctest filemanip primitive ]; description = "Generic vectors with statically known size"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-vector-binary" = callPackage @@ -65459,8 +63227,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fizz-buzz"; - version = "0.1.0.2"; - sha256 = "b7845c186b3471b9db735e98361540890eb7c94fe8c9c4d97991a339e01d7426"; + version = "0.1.0.3"; + sha256 = "642bf826fe8ef18d95a5f9640171b82f637a7717811bd87fe5ea14044e5616b0"; libraryHaskellDepends = [ base ]; description = "Functional Fizz/Buzz"; license = stdenv.lib.licenses.bsd3; @@ -65586,24 +63354,6 @@ self: { }) {}; "flat-mcmc" = callPackage - ({ mkDerivation, base, mcmc-types, monad-par, monad-par-extras - , mwc-probability, pipes, primitive, transformers, vector - }: - mkDerivation { - pname = "flat-mcmc"; - version = "1.0.1"; - sha256 = "a2852f0b020b086fa9e28e63b502a7bbdcbc4151080ce01baa366d53362de774"; - libraryHaskellDepends = [ - base mcmc-types monad-par monad-par-extras mwc-probability pipes - primitive transformers vector - ]; - testHaskellDepends = [ base vector ]; - homepage = "http://jtobin.github.com/flat-mcmc"; - description = "Painless general-purpose sampling"; - license = stdenv.lib.licenses.mit; - }) {}; - - "flat-mcmc_1_5_0" = callPackage ({ mkDerivation, base, formatting, mcmc-types, monad-par , monad-par-extras, mwc-probability, pipes, primitive, text , transformers, vector @@ -65620,7 +63370,6 @@ self: { homepage = "https://github.com/jtobin/flat-mcmc"; description = "Painless general-purpose sampling"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flat-tex" = callPackage @@ -66027,8 +63776,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.0.2"; - sha256 = "a8f848eb6d47d1ce3e6d102ec61137737371fb68a112155696629d53f81e2cab"; + version = "0.5.0.8"; + sha256 = "1be849d2dbf73a7ad02d0945ae7eb834085ed4a192dcdf5733c2fd764d308adb"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -66259,8 +64008,8 @@ self: { }: mkDerivation { pname = "fold-debounce"; - version = "0.2.0.4"; - sha256 = "429702d10061c9c518a119ece8d3bc890feb124a524a3b6a5cdd31a17bcca67a"; + version = "0.2.0.5"; + sha256 = "78c0ff60d8a69193fbd298ece7a20351566c0a5a9adadfae96ff15e902fa594d"; libraryHaskellDepends = [ base data-default-class stm stm-delay time ]; @@ -66276,8 +64025,8 @@ self: { }: mkDerivation { pname = "fold-debounce-conduit"; - version = "0.1.0.4"; - sha256 = "fb1e937a3e1a78982df53d62ad55c1cd2b79f5ac9c18c56df436435829efa7cc"; + version = "0.1.0.5"; + sha256 = "253e73bcf6e1cb281acce2c9e39b00b2419032e4f1e0234bd19a473d210f84cc"; libraryHaskellDepends = [ base conduit fold-debounce resourcet stm transformers transformers-base @@ -66404,6 +64153,8 @@ self: { pname = "folds"; version = "0.7.1"; sha256 = "e07adf0c9834b5f78180250d7fec6a56ba84c752cbe4c991d52efc6c60b7d25a"; + revision = "1"; + editedCabalFile = "1ef82fedd12e9e46055436c3bfa5992f595c08ca986012dc301fd76f0bcaf05f"; configureFlags = [ "-f-test-hlint" ]; libraryHaskellDepends = [ adjunctions base bifunctors comonad constraints contravariant @@ -66429,6 +64180,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "folgerhs" = callPackage + ({ mkDerivation, base, xml }: + mkDerivation { + pname = "folgerhs"; + version = "0.1.0.0"; + sha256 = "fbaf6da3ce10a7bf33ab696b807e475613257080679a36933cb3097b82df7abf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base xml ]; + executableHaskellDepends = [ base xml ]; + homepage = "https://github.com/SU-LOSP/tools#readme"; + description = "Toolset for Folger Shakespeare Library's XML annotated plays"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "follower" = callPackage ({ mkDerivation, ansi-wl-pprint, base, cmdargs, directory, filepath , hs-twitter, old-locale, strict, time @@ -67332,16 +65098,17 @@ self: { }) {}; "free-functors" = callPackage - ({ mkDerivation, algebraic-classes, base, comonad, constraints - , template-haskell, transformers, void + ({ mkDerivation, algebraic-classes, base, bifunctors, comonad + , constraints, contravariant, profunctors, template-haskell + , transformers }: mkDerivation { pname = "free-functors"; - version = "0.6.5"; - sha256 = "be107f1140b11d043e93682e1ab988a4aa7fd00cb460417daca97c90d61f7ddf"; + version = "0.7"; + sha256 = "bb30362bc3c5f8293a75af0bda8e52dee497e06ab3c0f44b088d619a41f5707d"; libraryHaskellDepends = [ - algebraic-classes base comonad constraints template-haskell - transformers void + algebraic-classes base bifunctors comonad constraints contravariant + profunctors template-haskell transformers ]; homepage = "https://github.com/sjoerdvisscher/free-functors"; description = "Free functors, adjoint to functors that forget class constraints"; @@ -67502,8 +65269,8 @@ self: { }: mkDerivation { pname = "free-vector-spaces"; - version = "0.1.1.0"; - sha256 = "fa4066b3cb1e6e58ca471e953154acaca9f978cfc81d3987552da79c4805f1b4"; + version = "0.1.2.0"; + sha256 = "68aed93d6e73e9d4e68fceb63e5b276b79558474d66cf44df34be667db1ba4ce"; libraryHaskellDepends = [ base lens linear MemoTrie vector vector-space ]; @@ -68065,15 +65832,16 @@ self: { }) {}; "ftp-client" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, connection, network - , transformers + ({ mkDerivation, attoparsec, base, bytestring, connection + , containers, exceptions, network, transformers }: mkDerivation { pname = "ftp-client"; - version = "0.3.0.0"; - sha256 = "f21e6669f32eb088b51a1770cd8eaf66f6af97cb27ae5254ab9ed971325da3da"; + version = "0.4.0.1"; + sha256 = "c4ae91a103e3b3288a803831d55e8ddde1f2c6946d3fc3ec27bfde8995f71b4c"; libraryHaskellDepends = [ - attoparsec base bytestring connection network transformers + attoparsec base bytestring connection containers exceptions network + transformers ]; testHaskellDepends = [ base ]; homepage = "https://github.com/mr/ftp-client"; @@ -68082,15 +65850,16 @@ self: { }) {}; "ftp-client-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection, ftp-client - , ftp-clientconduit, resourcet + ({ mkDerivation, base, bytestring, conduit-combinators, connection + , exceptions, ftp-client, ftp-clientconduit, resourcet }: mkDerivation { pname = "ftp-client-conduit"; - version = "0.3.0.0"; - sha256 = "dc5fd4556567f3d902b4d2a8511dc4732de2a26b0206f7af1e5c9e602ec00c52"; + version = "0.4.0.1"; + sha256 = "baabf54a382463cf91a147f9553edff86baf9b3554e69f2f3e612ea37c8e399f"; libraryHaskellDepends = [ - base bytestring conduit connection ftp-client resourcet + base bytestring conduit-combinators connection exceptions + ftp-client resourcet ]; testHaskellDepends = [ base ftp-clientconduit ]; homepage = "https://github.com/mr/ftp-client"; @@ -69122,8 +66891,8 @@ self: { }: mkDerivation { pname = "gegl"; - version = "0.0.0.2"; - sha256 = "475adb9ff07a1e8cc314e441c76e76e46919e842c77ec092b9ed8d7847549e95"; + version = "0.0.0.4"; + sha256 = "cd938dcc3042980669f01186cc4d0a52d03a5b8cf14553598ef6c04e0748f822"; libraryHaskellDepends = [ babl base containers glib inline-c monad-loops random split template-haskell @@ -69455,13 +67224,12 @@ self: { }: mkDerivation { pname = "generic-random"; - version = "0.3.0.0"; - sha256 = "80a8484be904a8ac7a536c454bffe8e912897e184bfb8574ff317461eb228546"; + version = "0.4.0.0"; + sha256 = "68c5036f55584c5164c79a6adf6d9dc4435844fc98d206be80a1683cc4929f22"; libraryHaskellDepends = [ ad base containers hashable hmatrix ieee754 MonadRandom mtl QuickCheck transformers unordered-containers vector ]; - testHaskellDepends = [ base QuickCheck ]; homepage = "http://github.com/lysxia/generic-random"; description = "Generic random generators"; license = stdenv.lib.licenses.mit; @@ -69582,8 +67350,8 @@ self: { ({ mkDerivation, base, ghc-prim, template-haskell }: mkDerivation { pname = "generics-sop"; - version = "0.2.3.0"; - sha256 = "2e2c8291de476e103d1978c6ad569be05705fbc178ac89ec68d6a8e20672d377"; + version = "0.2.4.0"; + sha256 = "481f73f122970efc24fe9dea71077e265d260834d975dd41395671d9a86a1863"; libraryHaskellDepends = [ base ghc-prim template-haskell ]; testHaskellDepends = [ base ]; description = "Generic Programming using True Sums of Products"; @@ -69785,10 +67553,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.2.0.4"; - sha256 = "dca8c978f6bedb08199042fa7001dc94143cc69bb3bfc0d4dc90346a19ca8e57"; - revision = "2"; - editedCabalFile = "6865bde6373f043b1411042b9837392bcc3662c1ed78fa1b53f905af3fbb3461"; + version = "0.3.1.0"; + sha256 = "fd79841970e8d29a204e8cdf540478760f2a488bde21583668a3e7d8526f588a"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -69796,22 +67562,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "genvalidity_0_3_0_0" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, validity }: - mkDerivation { - pname = "genvalidity"; - version = "0.3.0.0"; - sha256 = "22c279c1409fbb0b9c9d709873c0639f555c34c8919cd481e2eb6fcab729ccff"; - revision = "1"; - editedCabalFile = "fbaf3c842ce3316d3fef10d69dcf9a0279aa0d35be0f420da4749c6cdca1528a"; - libraryHaskellDepends = [ base QuickCheck validity ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/NorfairKing/validity#readme"; - description = "Testing utilities for the validity library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "genvalidity-containers" = callPackage ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-containers @@ -69833,59 +67583,44 @@ self: { }) {}; "genvalidity-hspec" = callPackage - ({ mkDerivation, base, doctest, genvalidity, hspec, QuickCheck - , validity + ({ mkDerivation, base, doctest, genvalidity, hspec, hspec-core + , QuickCheck, validity }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.2.0.5"; - sha256 = "af4b3a7db29bc9cfe9f10de84256350de91a67d6d3676c8fb269dddf32bce62b"; - revision = "1"; - editedCabalFile = "34c42da21c1b3a5120be73a5b01f005d3c9278c8b45bce87b8d10b25d185db46"; + version = "0.3.1.0"; + sha256 = "abead88444f51c39f59cf2b959ad0d9532f4b58b87cb9f53b6e6c0bc6f62ef5d"; libraryHaskellDepends = [ base genvalidity hspec QuickCheck validity ]; - testHaskellDepends = [ base doctest ]; - homepage = "https://github.com/NorfairKing/validity#readme"; - description = "Standard spec's for GenValidity instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-hspec_0_3_0_0" = callPackage - ({ mkDerivation, base, doctest, genvalidity, hspec, QuickCheck - , validity - }: - mkDerivation { - pname = "genvalidity-hspec"; - version = "0.3.0.0"; - sha256 = "0d25376307b9bbbf8a7d438f0e9252e86f1f3227c356a2979f002ebb711d612d"; - revision = "1"; - editedCabalFile = "cd36781a3c2aa0a77ed801ae246560f8e04901bfae7cf88139fa68eb3c5e0e25"; - libraryHaskellDepends = [ - base genvalidity hspec QuickCheck validity + testHaskellDepends = [ + base doctest genvalidity hspec hspec-core QuickCheck ]; - testHaskellDepends = [ base doctest genvalidity hspec ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Standard spec's for GenValidity instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-aeson" = callPackage - ({ mkDerivation, aeson, base, deepseq, doctest, genvalidity - , genvalidity-hspec, hspec, QuickCheck + ({ mkDerivation, aeson, base, bytestring, deepseq, doctest + , genvalidity, genvalidity-hspec, genvalidity-text, hspec + , QuickCheck, text }: mkDerivation { pname = "genvalidity-hspec-aeson"; - version = "0.0.0.0"; - sha256 = "c33756346e6435553f938caa6ed0886852495ebc2cd458badd35d87d76fd00de"; + version = "0.0.1.0"; + sha256 = "58da64350fb137c8fae3a62450fe541adf66ddc4f2d42791350cb6085ac1b2b0"; libraryHaskellDepends = [ - aeson base deepseq genvalidity genvalidity-hspec hspec QuickCheck + aeson base bytestring deepseq genvalidity genvalidity-hspec hspec + QuickCheck + ]; + testHaskellDepends = [ + aeson base doctest genvalidity genvalidity-text hspec text ]; - testHaskellDepends = [ base doctest genvalidity hspec ]; homepage = "http://cs-syd.eu"; description = "Standard spec's for aeson-related instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-cereal" = callPackage @@ -69903,6 +67638,7 @@ self: { homepage = "http://cs-syd.eu"; description = "Standard spec's for cereal-related instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-path" = callPackage @@ -69918,23 +67654,42 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for Path"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-text" = callPackage - ({ mkDerivation, array, base, genvalidity, hspec, QuickCheck, text - , validity, validity-text + ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, text, validity, validity-text }: mkDerivation { pname = "genvalidity-text"; - version = "0.2.0.0"; - sha256 = "93f5a28f1dcb08bbfd65c58764ee73df2cd49b74150b5e4657313048ab08bf0b"; + version = "0.3.0.0"; + sha256 = "ac533aec5b7d845596d5f0caef8fa2c931a8ba9fee17650e0141df4a6baacd0b"; libraryHaskellDepends = [ array base genvalidity QuickCheck text validity validity-text ]; - testHaskellDepends = [ base genvalidity hspec QuickCheck text ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec QuickCheck text + ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for Text"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "genvalidity-time" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec, time + , validity-time + }: + mkDerivation { + pname = "genvalidity-time"; + version = "0.0.0.0"; + sha256 = "6f0a0872e4163afbe03ebdca19cc3411ba60cfc8ff44db03cd06c66c4b974e3e"; + libraryHaskellDepends = [ base genvalidity time validity-time ]; + testHaskellDepends = [ base genvalidity-hspec hspec time ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for time"; + license = stdenv.lib.licenses.mit; }) {}; "geo-resolver" = callPackage @@ -70058,8 +67813,8 @@ self: { }: mkDerivation { pname = "geoip2"; - version = "0.2.1.1"; - sha256 = "74d432e6abbfb82187272a3e35505cdc0714c4dc2b5c3fac730cb4450e32cd0e"; + version = "0.2.2.0"; + sha256 = "04a29f729f3cbfd8bf1c5f041c0412a95a8c496b5215896e9393a6f5f84bd03e"; libraryHaskellDepends = [ base bytestring cereal containers iproute mmap reinterpret-cast text @@ -70418,6 +68173,8 @@ self: { pname = "ghc-events-analyze"; version = "0.2.4"; sha256 = "6161f5491a34252289c8265c7c48c5a70c1e2a69ffbfe64800cfdc3a8d3d4dd9"; + revision = "1"; + editedCabalFile = "3224314053b1774c18a19a558be964916f87e146f7ce47970a5de65a1bc962bc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -70455,21 +68212,21 @@ self: { }) {}; "ghc-exactprint" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filemanip - , filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl, silently - , syb + ({ mkDerivation, base, bytestring, containers, Diff, directory + , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl + , silently, syb }: mkDerivation { pname = "ghc-exactprint"; - version = "0.5.2.1"; - sha256 = "756d6d0a706321a3ccd0b3c11c6cee65b5ecce95a988dda540e4f6743a602f08"; + version = "0.5.3.0"; + sha256 = "90e088b04a5b72d7c502049a201180bd593912d831d48b605582882dc9bc332d"; libraryHaskellDepends = [ base bytestring containers directory filepath free ghc ghc-boot ghc-paths mtl syb ]; testHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-boot ghc-paths - HUnit mtl silently syb + base bytestring containers Diff directory filemanip filepath ghc + ghc-boot ghc-paths HUnit mtl silently syb ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; @@ -70586,45 +68343,6 @@ self: { }) {}; "ghc-mod" = callPackage - ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper - , containers, deepseq, directory, djinn-ghc, doctest, extra - , fclabels, filepath, ghc, ghc-boot, ghc-paths, ghc-syb-utils - , haskell-src-exts, hlint, hspec, monad-control, monad-journal, mtl - , old-time, optparse-applicative, pipes, pretty, process, safe - , split, syb, template-haskell, temporary, text, time, transformers - , transformers-base - }: - mkDerivation { - pname = "ghc-mod"; - version = "5.6.0.0"; - sha256 = "69b880410c028e9b7bf60c67120eeb567927fc6fba4df5400b057eba9efaa20e"; - revision = "4"; - editedCabalFile = "c432e3b9ee808551fe785d6c61b9daa8370add1a6a9b7ec1a25869e2122cd3e4"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ - base Cabal containers filepath process template-haskell - transformers - ]; - libraryHaskellDepends = [ - base binary bytestring cabal-helper containers deepseq directory - djinn-ghc extra fclabels filepath ghc ghc-boot ghc-paths - ghc-syb-utils haskell-src-exts hlint monad-control monad-journal - mtl old-time optparse-applicative pipes pretty process safe split - syb template-haskell temporary text time transformers - transformers-base - ]; - executableHaskellDepends = [ - base binary deepseq directory fclabels filepath ghc monad-control - mtl old-time optparse-applicative pretty process split time - ]; - testHaskellDepends = [ base doctest hspec ]; - homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; - description = "Happy Haskell Programming"; - license = stdenv.lib.licenses.agpl3; - }) {}; - - "ghc-mod_5_7_0_0" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper , containers, deepseq, directory, djinn-ghc, doctest, extra , fclabels, filepath, ghc, ghc-boot, ghc-paths, ghc-syb-utils @@ -70637,6 +68355,8 @@ self: { pname = "ghc-mod"; version = "5.7.0.0"; sha256 = "2aab240c89ab6513807cea4e2065d474274a5ae20f8edc4f77df8e2eafb9e5ca"; + revision = "1"; + editedCabalFile = "2a98257b2c370e8d557b4924c77e088d8220e17558317174dfc35b2e0c94d1e3"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -70660,7 +68380,6 @@ self: { homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; description = "Happy Haskell Programming"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-mtl" = callPackage @@ -70808,8 +68527,8 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.3.0.1"; - sha256 = "8bb866a2389005d91f15a1546ef92e1055b854c9a14dda97d0d92fb0fa598b82"; + version = "1.3.0.2"; + sha256 = "99a13463bf12803c02071206b090c1e4a1364f6f0bbc4162155c478a2c740fa1"; libraryHaskellDepends = [ attoparsec base containers scientific text time ]; @@ -70822,6 +68541,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-prof_1_4_0" = callPackage + ({ mkDerivation, attoparsec, base, containers, directory, filepath + , process, scientific, tasty, tasty-hunit, temporary, text, time + }: + mkDerivation { + pname = "ghc-prof"; + version = "1.4.0"; + sha256 = "2ab282b118684c30cf10f6b69aa362dacaf274a73b7e23b668c36d6830ce4253"; + libraryHaskellDepends = [ + attoparsec base containers scientific text time + ]; + testHaskellDepends = [ + attoparsec base containers directory filepath process tasty + tasty-hunit temporary text + ]; + homepage = "https://github.com/maoe/ghc-prof"; + description = "Library for parsing GHC time and allocation profiling reports"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-prof-flamegraph" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -71303,8 +69043,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "ghcjs-perch"; - version = "0.3.3"; - sha256 = "89691df04bf1c056df7f66969a25a15c8ab7edeaaa36afdd01d15b7f21049416"; + version = "0.3.3.1"; + sha256 = "5a9e656474f2b57c18ed028217f7c44d00468ca2b8d433422b049084143a1275"; libraryHaskellDepends = [ base transformers ]; description = "GHCJS version of Perch library"; license = stdenv.lib.licenses.mit; @@ -71438,25 +69178,6 @@ self: { }) {}; "gi-atk" = callPackage - ({ mkDerivation, atk, base, bytestring, containers, gi-glib - , gi-gobject, haskell-gi, haskell-gi-base, text, transformers - }: - mkDerivation { - pname = "gi-atk"; - version = "2.0.3"; - sha256 = "3470813961cc6223c02b29cceaede04966b4e5ed497748bd0a61c023d7142620"; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers - ]; - libraryPkgconfigDepends = [ atk ]; - doHaddock = false; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Atk bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) atk;}; - - "gi-atk_2_0_11" = callPackage ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, text, transformers }: @@ -71474,35 +69195,9 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Atk bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) atk;}; "gi-cairo" = callPackage - ({ mkDerivation, base, bytestring, cairo, containers - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers - }: - mkDerivation { - pname = "gi-cairo"; - version = "1.0.3"; - sha256 = "0b54aff46b1998285a79a7356c5a74699112d6b09f1952bb30622ee6b53afe8b"; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base text - transformers - ]; - libraryPkgconfigDepends = [ cairo gobjectIntrospection ]; - doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; - preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" - ''; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Cairo bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;}; - - "gi-cairo_1_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gobjectIntrospection, haskell-gi, haskell-gi-base, text , transformers @@ -71526,32 +69221,9 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Cairo bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;}; "gi-gdk" = callPackage - ({ mkDerivation, base, bytestring, containers, gi-cairo - , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 - , haskell-gi, haskell-gi-base, text, transformers - }: - mkDerivation { - pname = "gi-gdk"; - version = "3.0.3"; - sha256 = "12bd380233f41a43479891a3f731391b7ecd1d74712f263f835089cb8090be4b"; - libraryHaskellDepends = [ - base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib - gi-gobject gi-pango haskell-gi haskell-gi-base text transformers - ]; - libraryPkgconfigDepends = [ gtk3 ]; - doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0''; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Gdk bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; - - "gi-gdk_3_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 , haskell-gi, haskell-gi-base, text, transformers @@ -71575,31 +69247,6 @@ self: { }) {gtk3 = pkgs.gnome3.gtk;}; "gi-gdkpixbuf" = callPackage - ({ mkDerivation, base, bytestring, containers, gdk_pixbuf, gi-gio - , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi - , haskell-gi-base, text, transformers - }: - mkDerivation { - pname = "gi-gdkpixbuf"; - version = "2.0.3"; - sha256 = "5c1dcc322ad42839c74e5be2fb715f29bfa1f06d285ea4e90d2f3a19a6f545c9"; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers - ]; - libraryPkgconfigDepends = [ gdk_pixbuf gobjectIntrospection ]; - doHaddock = false; - preConfigure = '' - export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0:${gdk_pixbuf.dev}/share/gir-1.0 - export GI_TYPELIB_PATH=${gdk_pixbuf.out}/lib/girepository-1.0 - ''; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "GdkPixbuf bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) gdk_pixbuf; - inherit (pkgs) gobjectIntrospection;}; - - "gi-gdkpixbuf_2_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf , gi-gio, gi-glib, gi-gobject, gobjectIntrospection, haskell-gi , haskell-gi-base, text, transformers @@ -71622,32 +69269,10 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GdkPixbuf bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gobjectIntrospection;}; "gi-gio" = callPackage - ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject - , glib, gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers - }: - mkDerivation { - pname = "gi-gio"; - version = "2.0.3"; - sha256 = "1b2cc15f3cb60b72a7256ec8b5d0a07644b850055ae45fab5b0be9633d96f09c"; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers - ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; - doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Gio bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - - "gi-gio_2_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, glib, gobjectIntrospection, haskell-gi , haskell-gi-base, text, transformers @@ -71667,7 +69292,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gio bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; "gi-girepository" = callPackage @@ -71693,27 +69317,6 @@ self: { }) {inherit (pkgs) gobjectIntrospection;}; "gi-glib" = callPackage - ({ mkDerivation, base, bytestring, containers, glib - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers - }: - mkDerivation { - pname = "gi-glib"; - version = "2.0.3"; - sha256 = "2a961091547deaf8509ef3213353ec7b6ea458a584a81eef7d2685f8312b1170"; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base text - transformers - ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; - doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "GLib bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - - "gi-glib_2_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib , gobjectIntrospection, haskell-gi, haskell-gi-base, text , transformers @@ -71733,31 +69336,9 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GLib bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; "gi-gobject" = callPackage - ({ mkDerivation, base, bytestring, containers, gi-glib, glib - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers - }: - mkDerivation { - pname = "gi-gobject"; - version = "2.0.3"; - sha256 = "9cd5c2c8a2c1599334f705ea15fc3e7e63f012c60a46669ad108a2965d73973b"; - libraryHaskellDepends = [ - base bytestring containers gi-glib haskell-gi haskell-gi-base text - transformers - ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; - doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "GObject bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - - "gi-gobject_2_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , gobjectIntrospection, haskell-gi, haskell-gi-base, text , transformers @@ -71777,7 +69358,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GObject bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; "gi-gst" = callPackage @@ -71875,29 +69455,6 @@ self: { gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; "gi-gtk" = callPackage - ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo - , gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 - , haskell-gi, haskell-gi-base, text, transformers - }: - mkDerivation { - pname = "gi-gtk"; - version = "3.0.3"; - sha256 = "490acc92f75b231e9770b5bba2e041c2e3cd163c5e6483a153f072b0b6987c31"; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf - gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text - transformers - ]; - libraryPkgconfigDepends = [ gtk3 ]; - doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0''; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Gtk bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; - - "gi-gtk_3_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers @@ -71970,8 +69527,8 @@ self: { }: mkDerivation { pname = "gi-gtksource"; - version = "3.0.11"; - sha256 = "fb130bc4894aa689ecccb01be94ef246585ddba296fef5145a688e9c14027646"; + version = "3.0.12"; + sha256 = "b7babfb18749b73f32dab35c464f641381b1ebc333cbdd6fe2167825db45476c"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf @@ -71987,13 +69544,14 @@ self: { }) {inherit (pkgs.gnome2) gtksourceview;}; "gi-javascriptcore" = callPackage - ({ mkDerivation, base, bytestring, containers, haskell-gi + ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk }: mkDerivation { pname = "gi-javascriptcore"; - version = "3.0.3"; - sha256 = "b2d01c9b72c4da8b2ebe28cc515a6ecbf0f1eed23519b5cabe3f7381872df974"; + version = "3.0.11"; + sha256 = "88f288c8e70dace97422b7385f77a4d7f856e4a2f5940abc4d41947ec76bb250"; + setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base text transformers @@ -72052,33 +69610,6 @@ self: { }) {inherit (pkgs) libnotify;}; "gi-pango" = callPackage - ({ mkDerivation, base, bytestring, cairo, containers, gi-glib - , gi-gobject, gobjectIntrospection, haskell-gi, haskell-gi-base - , pango, text, transformers - }: - mkDerivation { - pname = "gi-pango"; - version = "1.0.3"; - sha256 = "d1a5f97c17038967573576e2eba05207e1d6d8c89a704d87767681e858fb0257"; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers - ]; - libraryPkgconfigDepends = [ cairo gobjectIntrospection pango ]; - doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; - preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" - ''; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Pango bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gnome2) pango;}; - - "gi-pango_1_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi , haskell-gi-base, pango, text, transformers @@ -72108,8 +69639,9 @@ self: { "gi-pangocairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo - , gi-glib, gi-gobject, gi-pango, haskell-gi, haskell-gi-base, pango - , text, transformers + , gi-glib, gi-gobject, gi-pango, gobjectIntrospection, haskell-gi + , haskell-gi-base, pango, system-cairo, system-pango, text + , transformers }: mkDerivation { pname = "gi-pangocairo"; @@ -72120,13 +69652,22 @@ self: { base bytestring containers gi-cairo gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ pango ]; + libraryPkgconfigDepends = [ + gobjectIntrospection pango system-cairo system-pango + ]; doHaddock = false; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${system-pango.dev}/share/gir-1.0''; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${system-pango.dev}/lib/pkgconfig:${system-cairo.dev}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs pangocairo cairo-gobject)" + ''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "PangoCairo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) pango;}; + }) {inherit (pkgs) gobjectIntrospection; + inherit (pkgs.gnome2) pango; system-cairo = pkgs.cairo; + system-pango = pkgs.pango;}; "gi-poppler" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -72151,26 +69692,6 @@ self: { }) {inherit (pkgs) poppler;}; "gi-soup" = callPackage - ({ mkDerivation, base, bytestring, containers, gi-gio, gi-glib - , gi-gobject, haskell-gi, haskell-gi-base, libsoup, text - , transformers - }: - mkDerivation { - pname = "gi-soup"; - version = "2.4.3"; - sha256 = "ee786ad3b35b6468f53f3962611e5316a020bdf98d9b4050a598f7b45a575a4b"; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers - ]; - libraryPkgconfigDepends = [ libsoup ]; - doHaddock = false; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Libsoup bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome2) libsoup;}; - - "gi-soup_2_4_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsoup, text , transformers @@ -72189,7 +69710,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Libsoup bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome2) libsoup;}; "gi-vte" = callPackage @@ -72215,29 +69735,6 @@ self: { }) {inherit (pkgs.gnome2) vte;}; "gi-webkit" = callPackage - ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo - , gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-gtk - , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base, text - , transformers, webkit - }: - mkDerivation { - pname = "gi-webkit"; - version = "3.0.3"; - sha256 = "8652475bdd3bd713a2eb6ceb55c4ab81bf0939824d707dfe888e007c782fd216"; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf - gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup - haskell-gi haskell-gi-base text transformers - ]; - libraryPkgconfigDepends = [ webkit ]; - doHaddock = false; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "WebKit bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; - - "gi-webkit_3_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base @@ -72439,33 +69936,6 @@ self: { }) {}; "giphy-api" = callPackage - ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers - , directory, hspec, http-api-data, http-client, http-client-tls - , lens, microlens, microlens-th, mtl, network-uri, servant - , servant-client, text, transformers - }: - mkDerivation { - pname = "giphy-api"; - version = "0.4.0.0"; - sha256 = "bb2952f54232cead3e66350b514ca31aac511bf172be45115b98dd8777859876"; - revision = "2"; - editedCabalFile = "bf615e33d6be695e26434f8cb6747bb91be136093e0181eb85efe415c689d9f5"; - libraryHaskellDepends = [ - aeson base containers http-api-data http-client http-client-tls - microlens microlens-th mtl network-uri servant servant-client text - transformers - ]; - testHaskellDepends = [ - aeson base basic-prelude bytestring containers directory hspec lens - network-uri text - ]; - homepage = "http://github.com/passy/giphy-api#readme"; - description = "Giphy HTTP API wrapper and CLI search tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "giphy-api_0_5_2_0" = callPackage ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers , directory, hspec, http-api-data, http-client, http-client-tls , lens, microlens, microlens-th, mtl, network-uri, servant @@ -72517,8 +69987,8 @@ self: { }: mkDerivation { pname = "git"; - version = "0.1"; - sha256 = "846907115b7b81dd046c78581d4709b403e307046f1ab4680c7ac0475130bef3"; + version = "0.2.0"; + sha256 = "d773dcfdd34b2b4ca34a1e84fac7c80f44c0ea0f89378ab3d161683c8acd8ea8"; libraryHaskellDepends = [ base byteable bytestring containers cryptonite hourglass memory mtl patience random system-fileio system-filepath unix-compat @@ -72528,7 +69998,7 @@ self: { base bytedump bytestring hourglass tasty tasty-quickcheck ]; doCheck = false; - homepage = "https://github.com/vincenthz/hit"; + homepage = "https://github.com/vincenthz/hs-git"; description = "Git operations in haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -72575,8 +70045,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20170101"; - sha256 = "5fbf88652a84278275d9d4bec083189f590b045e23a73bfe8d395c3e356e3f53"; + version = "6.20170214"; + sha256 = "d2f5a5bfa8077f417a8c0fee556571f498a9fbdabb99cdeed326df0a1f042e4b"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -72909,8 +70379,8 @@ self: { }: mkDerivation { pname = "gitHUD"; - version = "1.3.5"; - sha256 = "7956019a42632f8658ba9a6508943fd212e9796657252eedec53f48850a07009"; + version = "1.3.6"; + sha256 = "a522924926b65d19601726fb5fde020c0523f0b30c95d6bb1e0ba0d751da8a49"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec process text unix ]; @@ -73179,8 +70649,8 @@ self: { }: mkDerivation { pname = "gitit"; - version = "0.12.2"; - sha256 = "160a928d992847823ab11982fa6465a4d80e59ce2a45e54e8a5e1838aba22b78"; + version = "0.12.2.1"; + sha256 = "15114e589f90bb4361fda3cbaec23c82c2a765f4e09debc93b2b46ac698053f4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73280,6 +70750,8 @@ self: { pname = "gitlib-libgit2"; version = "3.1.1"; sha256 = "fc2806ebc1bb51f5043a0d5091c5045be40bf82cae3296213b353507b8c868bb"; + revision = "1"; + editedCabalFile = "15ea81db4b514f97392188994df86421d9a8cb76cfb0558de3fc9ba60903a16c"; libraryHaskellDepends = [ base bytestring conduit conduit-combinators containers directory exceptions fast-logger filepath gitlib hlibgit2 lifted-async @@ -73460,6 +70932,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gjk" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "gjk"; + version = "0.0.0.1"; + sha256 = "8a1dc10dffd485632bb519db13abbfd6a6f9c3cbdc12f33a8c8c6a0359dc104f"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/zaidan/gjk#readme"; + description = "Gilbert-Johnson-Keerthi (GJK) collision detection algorithm"; + license = stdenv.lib.licenses.mit; + }) {}; + "gl" = callPackage ({ mkDerivation, base, containers, directory, filepath, fixed, half , hxt, mesa, split, transformers @@ -73495,8 +70980,8 @@ self: { }: mkDerivation { pname = "glabrous"; - version = "0.1.3.0"; - sha256 = "a9afb52cb80e5a9a1ef6bd77897229e7aa29d8fb2b863019d346357792600576"; + version = "0.3.1"; + sha256 = "419c5ec7c93c981ced838d6711e18565883abbb3b229d34a6fc904722e678ec8"; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring cereal cereal-text either text unordered-containers @@ -73509,28 +70994,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "glabrous_0_3_0" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , cereal, cereal-text, directory, either, hspec, text - , unordered-containers - }: - mkDerivation { - pname = "glabrous"; - version = "0.3.0"; - sha256 = "3e1547d3e2ec7098e52262961bb710683ff83422793ce68b59cc9a0918831490"; - libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring cereal cereal-text - either text unordered-containers - ]; - testHaskellDepends = [ - base directory either hspec text unordered-containers - ]; - homepage = "https://github.com/MichelBoucey/glabrous"; - description = "A template DSL library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "glade" = callPackage ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools , libglade @@ -73620,14 +71083,64 @@ self: { ({ mkDerivation, base, lens }: mkDerivation { pname = "glaze"; - version = "0.2.0.0"; - sha256 = "ab8552b9ccf26ddcf3af418a4ab8f7225e24f2141fc4171f8e10f6bfd8f6d7c5"; + version = "0.2.0.2"; + sha256 = "16b27081d6c2dac74748e6dbcbfdc6855d48c2ebc730648bf74d34ae6a44c92c"; libraryHaskellDepends = [ base lens ]; homepage = "https://github.com/louispan/glaze#readme"; description = "Framework for rendering things with metadata/headers and values"; license = stdenv.lib.licenses.bsd3; }) {}; + "glazier" = callPackage + ({ mkDerivation, base, lens, mmorph, mtl, profunctors + , semigroupoids, transformers + }: + mkDerivation { + pname = "glazier"; + version = "0.7.0.0"; + sha256 = "13eb88a1df905d3ea2671803e8c4f456671223c490b0116779af28298e7ab428"; + libraryHaskellDepends = [ + base lens mmorph mtl profunctors semigroupoids transformers + ]; + homepage = "https://github.com/louispan/glazier#readme"; + description = "Composable widgets framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "glazier_0_8_0_0" = callPackage + ({ mkDerivation, base, lens, mmorph, mtl, profunctors + , semigroupoids, transformers + }: + mkDerivation { + pname = "glazier"; + version = "0.8.0.0"; + sha256 = "758345dee0b3401091ce52ce8e91332dd763bcfba112e211166ee7e7f69efa9c"; + libraryHaskellDepends = [ + base lens mmorph mtl profunctors semigroupoids transformers + ]; + homepage = "https://github.com/louispan/glazier#readme"; + description = "Composable widgets framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "glazier-pipes" = callPackage + ({ mkDerivation, base, glazier, lens, mmorph, mtl, pipes + , pipes-concurrency, pipes-misc, stm, stm-extras, transformers + }: + mkDerivation { + pname = "glazier-pipes"; + version = "0.1.4.0"; + sha256 = "351c8002e893ad8cbb6a8eeb2b54c79b3b13665f110180a52d297f85d0a086cc"; + libraryHaskellDepends = [ + base glazier lens mmorph mtl pipes pipes-concurrency pipes-misc stm + stm-extras transformers + ]; + homepage = "https://github.com/louispan/glazier-pipes#readme"; + description = "Converts Glazier widgets into a Pipe"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gli" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , friendly-time, http-client, http-client-tls, http-conduit @@ -73717,31 +71230,26 @@ self: { "glirc" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring - , bytestring, Cabal, config-value, containers, data-default-class - , directory, filepath, gitrev, hashable, hookup, HsOpenSSL, HUnit - , irc-core, kan-extensions, lens, network, process, regex-tdfa - , socks, split, stm, text, time, transformers, unix - , unordered-containers, vector, vty + , bytestring, Cabal, config-value, containers, directory, filepath + , gitrev, hashable, hookup, HsOpenSSL, HUnit, irc-core + , kan-extensions, lens, network, process, regex-tdfa, socks, split + , stm, text, time, transformers, unix, unordered-containers, vector + , vty }: mkDerivation { pname = "glirc"; - version = "2.20.2"; - sha256 = "acefc316a6075dbeb2fa95bf1ee99a8e4c3097eaf5be9273d676719d07a94b00"; - revision = "2"; - editedCabalFile = "78d1b995b9b7bcb4dc012341c65b8e4d6c4893c8db7c6b66146cfe0726ca1be3"; + version = "2.20.2.1"; + sha256 = "95b148b68701f7a1f521e0884ab405fe61bbb5a4a1a47d399e536cad1a400110"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ async attoparsec base base64-bytestring bytestring config-value - containers data-default-class directory filepath gitrev hashable - hookup HsOpenSSL irc-core kan-extensions lens network process - regex-tdfa socks split stm text time transformers unix - unordered-containers vector vty - ]; - executableHaskellDepends = [ - base data-default-class lens text vty + containers directory filepath gitrev hashable hookup HsOpenSSL + irc-core kan-extensions lens network process regex-tdfa socks split + stm text time transformers unix unordered-containers vector vty ]; + executableHaskellDepends = [ base lens text vty ]; testHaskellDepends = [ base HUnit ]; homepage = "https://github.com/glguy/irc-core"; description = "Console IRC client"; @@ -73755,8 +71263,8 @@ self: { }: mkDerivation { pname = "gll"; - version = "0.4.0.2"; - sha256 = "89ee909a9120d6fa34f718079fca0e07f18ce20be93573caafa506ee72ec7818"; + version = "0.4.0.3"; + sha256 = "9be9e20690fa8e54e6068eaa89c676a704438efa40c2ccfd8e7d8f9a7b5d418f"; libraryHaskellDepends = [ array base containers pretty regex-applicative text TypeCompose ]; @@ -74555,30 +72063,6 @@ self: { }) {}; "gogol" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit - , conduit-extra, cryptonite, data-default-class, directory - , exceptions, filepath, gogol-core, http-client, http-conduit - , http-media, http-types, lens, memory, mime-types, monad-control - , mtl, resourcet, text, time, transformers, transformers-base - , unordered-containers, x509, x509-store - }: - mkDerivation { - pname = "gogol"; - version = "0.1.0"; - sha256 = "3bf4a133da2f9e5343025a272d04290a2d229d3429d748b2a49b9b29b85e398e"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive conduit conduit-extra - cryptonite data-default-class directory exceptions filepath - gogol-core http-client http-conduit http-media http-types lens - memory mime-types monad-control mtl resourcet text time - transformers transformers-base unordered-containers x509 x509-store - ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Comprehensive Google Services SDK"; - license = "unknown"; - }) {}; - - "gogol_0_1_1" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit , conduit-extra, cryptonite, directory, exceptions, filepath , gogol-core, http-client, http-conduit, http-media, http-types @@ -74600,6 +72084,30 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Comprehensive Google Services SDK"; license = "unknown"; + }) {}; + + "gogol_0_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit + , conduit-extra, cryptonite, directory, exceptions, filepath + , gogol-core, http-client, http-conduit, http-media, http-types + , lens, memory, mime-types, monad-control, mtl, resourcet, text + , time, transformers, transformers-base, unordered-containers, x509 + , x509-store + }: + mkDerivation { + pname = "gogol"; + version = "0.2.0"; + sha256 = "5ccc62171ca67889d5e55263627c775b3242bdfa6489b509ae03ceb3d6886c8f"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive conduit conduit-extra + cryptonite directory exceptions filepath gogol-core http-client + http-conduit http-media http-types lens memory mime-types + monad-control mtl resourcet text time transformers + transformers-base unordered-containers x509 x509-store + ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Comprehensive Google Services SDK"; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -74607,20 +72115,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adexchange-buyer"; - version = "0.1.0"; - sha256 = "63a778a15a3bdb595e2c0ff46bbe35616891dfda687a8af520dbba219ff09d83"; + version = "0.1.1"; + sha256 = "d4c9ce149988ca4b2abce408785bfd43da80b55f125a6fc17b639fa4bb8c9a59"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Ad Exchange Buyer SDK"; license = "unknown"; }) {}; - "gogol-adexchange-buyer_0_1_1" = callPackage + "gogol-adexchange-buyer_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adexchange-buyer"; - version = "0.1.1"; - sha256 = "d4c9ce149988ca4b2abce408785bfd43da80b55f125a6fc17b639fa4bb8c9a59"; + version = "0.2.0"; + sha256 = "3d873f33e21113ba0fb37d23596cdc12afcb5945996b11ad9f80c7b584c73cf4"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Ad Exchange Buyer SDK"; @@ -74632,20 +72140,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adexchange-seller"; - version = "0.1.0"; - sha256 = "28c81ea7cc984534c445d3fa2278e1306370464e00194e844dc76b8e33a798cc"; + version = "0.1.1"; + sha256 = "43b6f2037ef3cb44caf371f7639a7e024f27ee13f3d72c1497e0fe05d8c5920b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Ad Exchange Seller SDK"; license = "unknown"; }) {}; - "gogol-adexchange-seller_0_1_1" = callPackage + "gogol-adexchange-seller_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adexchange-seller"; - version = "0.1.1"; - sha256 = "43b6f2037ef3cb44caf371f7639a7e024f27ee13f3d72c1497e0fe05d8c5920b"; + version = "0.2.0"; + sha256 = "47de32da4902d6b04b97986bf30d604422946866f6150163f117584da79ef3be"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Ad Exchange Seller SDK"; @@ -74657,20 +72165,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-datatransfer"; - version = "0.1.0"; - sha256 = "195ab5e18d789959e559d9f7af4db757b5779cdb4b8e61f96bcb14b3fa4ad97b"; + version = "0.1.1"; + sha256 = "4c90607116ed177c84c4980c0f14f50873fff2dcae611e3b620457608f1537a9"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Data Transfer SDK"; license = "unknown"; }) {}; - "gogol-admin-datatransfer_0_1_1" = callPackage + "gogol-admin-datatransfer_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-datatransfer"; - version = "0.1.1"; - sha256 = "4c90607116ed177c84c4980c0f14f50873fff2dcae611e3b620457608f1537a9"; + version = "0.2.0"; + sha256 = "50960b0cd3048d7a3b9860d97f2fd02affea4dd735bc28b4603b3656dba7ef2a"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Data Transfer SDK"; @@ -74682,20 +72190,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-directory"; - version = "0.1.0"; - sha256 = "ce8882d955c7646cb9f2ece2a2827f4db0e44cc0d1af6a968e25ce9cf7cf4622"; + version = "0.1.1"; + sha256 = "7898cdfac19619b73175762cce67d30baf9d1772524daf72b000e834a0cd6ef2"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Directory SDK"; license = "unknown"; }) {}; - "gogol-admin-directory_0_1_1" = callPackage + "gogol-admin-directory_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-directory"; - version = "0.1.1"; - sha256 = "7898cdfac19619b73175762cce67d30baf9d1772524daf72b000e834a0cd6ef2"; + version = "0.2.0"; + sha256 = "df04ced257650903e50ab444c50f4e4e29e33f37a6a54b4995d4e3c3cdb20772"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Directory SDK"; @@ -74707,20 +72215,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-emailmigration"; - version = "0.1.0"; - sha256 = "15b3cea41e4ba648e952adeea91467981e61d8a01b48b5231e78773d89c0da77"; + version = "0.1.1"; + sha256 = "61e9ccb239c95b1ff9da6d4fe9d6c234468a4c21e13b92f6bff65e9831a15990"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Email Migration API v2 SDK"; license = "unknown"; }) {}; - "gogol-admin-emailmigration_0_1_1" = callPackage + "gogol-admin-emailmigration_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-emailmigration"; - version = "0.1.1"; - sha256 = "61e9ccb239c95b1ff9da6d4fe9d6c234468a4c21e13b92f6bff65e9831a15990"; + version = "0.2.0"; + sha256 = "b37267faa6cae7e9e911f0952acbaf558fc0626da4650299141e84f28f4b58d2"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Email Migration API v2 SDK"; @@ -74729,18 +72237,6 @@ self: { }) {}; "gogol-admin-reports" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-admin-reports"; - version = "0.1.0"; - sha256 = "ce4986e756a1f6d9b5bdf30c1775d32634455ed30c59dd914cc9615be68b785d"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Admin Reports SDK"; - license = "unknown"; - }) {}; - - "gogol-admin-reports_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-reports"; @@ -74750,27 +72246,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Reports SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-adsense" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adsense"; - version = "0.1.0"; - sha256 = "2ff7819e65e4378a6e8f875b0dbfe2bc0e839794c738fd3e004957e7a6ac7bde"; + version = "0.1.1"; + sha256 = "725fda77a7215af5828d7f97236b25faf4e1f2120aba1006ede26fcd4c6dd1bc"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Management SDK"; license = "unknown"; }) {}; - "gogol-adsense_0_1_1" = callPackage + "gogol-adsense_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adsense"; - version = "0.1.1"; - sha256 = "725fda77a7215af5828d7f97236b25faf4e1f2120aba1006ede26fcd4c6dd1bc"; + version = "0.2.0"; + sha256 = "96fd93139c8ba6746dc42df54a42a7288d8c874b4be973216cfb16b195a4db4c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Management SDK"; @@ -74782,20 +72277,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adsense-host"; - version = "0.1.0"; - sha256 = "64ff681bd7da5da1fff056678137c82811b3b91dfd6077722f30e5d531b32440"; + version = "0.1.1"; + sha256 = "305e3f7df6b3bcca19810ebbf954178f066fb227c7dbf68c16a49ad691578112"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Host SDK"; license = "unknown"; }) {}; - "gogol-adsense-host_0_1_1" = callPackage + "gogol-adsense-host_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adsense-host"; - version = "0.1.1"; - sha256 = "305e3f7df6b3bcca19810ebbf954178f066fb227c7dbf68c16a49ad691578112"; + version = "0.2.0"; + sha256 = "f52fc7f8b5e07bfd193a428476e7c255e9910505d151ef96848519c44e0c73b3"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Host SDK"; @@ -74807,20 +72302,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-affiliates"; - version = "0.1.0"; - sha256 = "d0800cf733018b75665bbbb382e23f07a033474de438a4064771a541e39e200e"; + version = "0.1.1"; + sha256 = "b90d360660ecd0ac990fa387575a9c32232a885a7b3ecc8fd3c3cf677e469a1c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Affiliate Network SDK"; license = "unknown"; }) {}; - "gogol-affiliates_0_1_1" = callPackage + "gogol-affiliates_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-affiliates"; - version = "0.1.1"; - sha256 = "b90d360660ecd0ac990fa387575a9c32232a885a7b3ecc8fd3c3cf677e469a1c"; + version = "0.2.0"; + sha256 = "83b7d65c19295f276e31fd798eff9a01268dea90419315304be7a6abced94387"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Affiliate Network SDK"; @@ -74832,20 +72327,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-analytics"; - version = "0.1.0"; - sha256 = "e88b9c6b13566cb2d2e1eee62c24b5ec14c0cb96577bbfd690a17f9810b24548"; + version = "0.1.1"; + sha256 = "7a557b0fabb3697434ba97aeae564d2a428b19b701dced5176822c0a388d1922"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Analytics SDK"; license = "unknown"; }) {}; - "gogol-analytics_0_1_1" = callPackage + "gogol-analytics_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-analytics"; - version = "0.1.1"; - sha256 = "7a557b0fabb3697434ba97aeae564d2a428b19b701dced5176822c0a388d1922"; + version = "0.2.0"; + sha256 = "3854fc9b147867dcbdc5517fe2616936bf2dd2699f75463976113c031af429da"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Analytics SDK"; @@ -74857,20 +72352,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-android-enterprise"; - version = "0.1.0"; - sha256 = "b71ee2b74419f575c5c5142dd35a23e3762172f664f489f1fa27143e9b8deb9a"; + version = "0.1.1"; + sha256 = "bc669a71e754e18c3c52099e6101cf882288c365e388cd5f4c208c576aaae124"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play EMM SDK"; license = "unknown"; }) {}; - "gogol-android-enterprise_0_1_1" = callPackage + "gogol-android-enterprise_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-android-enterprise"; - version = "0.1.1"; - sha256 = "bc669a71e754e18c3c52099e6101cf882288c365e388cd5f4c208c576aaae124"; + version = "0.2.0"; + sha256 = "e1761fcfaea7541e219180c6cbad01663b96c6340c58cf059361ea3daf45d5ea"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play EMM SDK"; @@ -74882,20 +72377,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-android-publisher"; - version = "0.1.0"; - sha256 = "0dbcf500379366d09e434a4f17790d53bf91a6214e2ff31d52216cd6be17437e"; + version = "0.1.1"; + sha256 = "0e199dffb26576d64183fd0aa40fc16f4cd2fd1e0ee3b7b083002784c03e1efc"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Developer SDK"; license = "unknown"; }) {}; - "gogol-android-publisher_0_1_1" = callPackage + "gogol-android-publisher_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-android-publisher"; - version = "0.1.1"; - sha256 = "0e199dffb26576d64183fd0aa40fc16f4cd2fd1e0ee3b7b083002784c03e1efc"; + version = "0.2.0"; + sha256 = "c27db46fc5a29f077a79d6fac7af161e891d9931554aed4e3cfa5a18cc380da3"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Developer SDK"; @@ -74907,20 +72402,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-appengine"; - version = "0.1.0"; - sha256 = "3aabc08737482e8f0ef9aa0bec136e827540a8de6f66fbf67a1d8e8167a7d523"; + version = "0.1.1"; + sha256 = "cbf11c854ea9ba24012260cb0e78c3e09b918a05d5569f39633523852ecd9561"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google App Engine Admin SDK"; license = "unknown"; }) {}; - "gogol-appengine_0_1_1" = callPackage + "gogol-appengine_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-appengine"; - version = "0.1.1"; - sha256 = "cbf11c854ea9ba24012260cb0e78c3e09b918a05d5569f39633523852ecd9561"; + version = "0.2.0"; + sha256 = "f59ca638940b39c3b4f1a1a7c5d1951ff53ba0ba29d0b9cf8e4e816fa4d235e5"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google App Engine Admin SDK"; @@ -74932,20 +72427,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-activity"; - version = "0.1.0"; - sha256 = "f0cbd5847f751d7ed5e448d9d610986d390161ae37899d368107b0fb7c7a5704"; + version = "0.1.1"; + sha256 = "bb9c6aed68dc586ede859a2e71c48037c260fc6df2b1a4d4df22dfd411a0eb13"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Apps Activity SDK"; license = "unknown"; }) {}; - "gogol-apps-activity_0_1_1" = callPackage + "gogol-apps-activity_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-activity"; - version = "0.1.1"; - sha256 = "bb9c6aed68dc586ede859a2e71c48037c260fc6df2b1a4d4df22dfd411a0eb13"; + version = "0.2.0"; + sha256 = "b5cb8d5a54165e3bcda3a27ce284bd93bc0b0792b344c6595079df6de4844988"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Apps Activity SDK"; @@ -74957,20 +72452,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-calendar"; - version = "0.1.0"; - sha256 = "4f7d33f1d43d4f9e63d6b1d2077b07280f68a260652fc2d9ed9e5653efa24886"; + version = "0.1.1"; + sha256 = "cbebf7557345799436351e27485f8b4add43e2c449eb0fccb727d921ca16bc67"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Calendar SDK"; license = "unknown"; }) {}; - "gogol-apps-calendar_0_1_1" = callPackage + "gogol-apps-calendar_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-calendar"; - version = "0.1.1"; - sha256 = "cbebf7557345799436351e27485f8b4add43e2c449eb0fccb727d921ca16bc67"; + version = "0.2.0"; + sha256 = "1b1772c5c1084ffd1aef4f3c71afba297823362ef7c674cdf53cf86bfe4ffcae"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Calendar SDK"; @@ -74982,20 +72477,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-licensing"; - version = "0.1.0"; - sha256 = "a037cc3f62f65826e948113f24013349b71b561c97f0d06cd01f8448d136e481"; + version = "0.1.1"; + sha256 = "dcc448bef918990ea339cdf1ac1cf46a5665254c7aab5e1a12d637c31f0c3bca"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Enterprise License Manager SDK"; license = "unknown"; }) {}; - "gogol-apps-licensing_0_1_1" = callPackage + "gogol-apps-licensing_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-licensing"; - version = "0.1.1"; - sha256 = "dcc448bef918990ea339cdf1ac1cf46a5665254c7aab5e1a12d637c31f0c3bca"; + version = "0.2.0"; + sha256 = "1d568798f981d73a4114a58a195ceef17eba6166b07a15036d131c5d8ac46a86"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Enterprise License Manager SDK"; @@ -75007,20 +72502,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-reseller"; - version = "0.1.0"; - sha256 = "8abc6ee6aad16c27d7d7b37c53e9fcc5343d1d6cf50f4fe732fd436c429a71b5"; + version = "0.1.1"; + sha256 = "70dd84674f162012bf0767fdd610bfd85cac9fb083112e38023a44eab6ceee7b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Enterprise Apps Reseller SDK"; license = "unknown"; }) {}; - "gogol-apps-reseller_0_1_1" = callPackage + "gogol-apps-reseller_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-reseller"; - version = "0.1.1"; - sha256 = "70dd84674f162012bf0767fdd610bfd85cac9fb083112e38023a44eab6ceee7b"; + version = "0.2.0"; + sha256 = "97cfd83d01034d0d4c6b8dbe6203da51d0f9c33e3690a38cc0688bdaa41ef60b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Enterprise Apps Reseller SDK"; @@ -75032,20 +72527,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-tasks"; - version = "0.1.0"; - sha256 = "222060457d7c5b790cea90a74317f4a760ec7381f2561db9da0715e639e53b92"; + version = "0.1.1"; + sha256 = "dc68e8b33ec9f34b4b35af210c05fa5b70aadf0b6d7ee634eda5b1dbc5e9feda"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Tasks SDK"; license = "unknown"; }) {}; - "gogol-apps-tasks_0_1_1" = callPackage + "gogol-apps-tasks_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-tasks"; - version = "0.1.1"; - sha256 = "dc68e8b33ec9f34b4b35af210c05fa5b70aadf0b6d7ee634eda5b1dbc5e9feda"; + version = "0.2.0"; + sha256 = "5090d963d887943fc3723396355f746bd84f05df294c04e3c4a1d01a8b84179d"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Tasks SDK"; @@ -75057,20 +72552,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-appstate"; - version = "0.1.0"; - sha256 = "63961d638f4716ea2f7a619aa21a5ca528159a514aa72d52c0a3ae54b9bd519a"; + version = "0.1.1"; + sha256 = "489c7b6ff30176dbf470509864c1820186cd9c435daef45542dc2d95e429f6e5"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google App State SDK"; license = "unknown"; }) {}; - "gogol-appstate_0_1_1" = callPackage + "gogol-appstate_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-appstate"; - version = "0.1.1"; - sha256 = "489c7b6ff30176dbf470509864c1820186cd9c435daef45542dc2d95e429f6e5"; + version = "0.2.0"; + sha256 = "0fcf974036e78e6fb429702a2485ae7c7613b89380c26044e18ce5839658c4ae"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google App State SDK"; @@ -75082,20 +72577,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-autoscaler"; - version = "0.1.0"; - sha256 = "dd7e75cff814b08190add708a014790ab58b1ef8f9456a314e6ce732045f658f"; + version = "0.1.1"; + sha256 = "cb9f8bfdb42a3d8a019d006a54b0c94242c029831fc89c3b16cf89c9e0ab69b9"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Autoscaler SDK"; license = "unknown"; }) {}; - "gogol-autoscaler_0_1_1" = callPackage + "gogol-autoscaler_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-autoscaler"; - version = "0.1.1"; - sha256 = "cb9f8bfdb42a3d8a019d006a54b0c94242c029831fc89c3b16cf89c9e0ab69b9"; + version = "0.2.0"; + sha256 = "99ddf55dc78ecd3b4745259615016b677d0343b31d7c9adc9fbba1d1eb34779c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Autoscaler SDK"; @@ -75107,20 +72602,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-bigquery"; - version = "0.1.0"; - sha256 = "b38065d1d83722b6d39124dc87856343ab11af936e9abb9db4efe55fbf5cf1c3"; + version = "0.1.1"; + sha256 = "0943370cc3d7932bb813156c17bef39e0cb4b7db73ccf4471e114ede297da2d3"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google BigQuery SDK"; license = "unknown"; }) {}; - "gogol-bigquery_0_1_1" = callPackage + "gogol-bigquery_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-bigquery"; - version = "0.1.1"; - sha256 = "0943370cc3d7932bb813156c17bef39e0cb4b7db73ccf4471e114ede297da2d3"; + version = "0.2.0"; + sha256 = "c3ce3a5677375f6ead59d90fa4589bf1d42ee0dc3ceeda25c0700551918e98be"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google BigQuery SDK"; @@ -75132,20 +72627,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-billing"; - version = "0.1.0"; - sha256 = "b8da90f45e13fc4fc3d6b717d15805ad9a2431364c9f66be77f22635e76629dd"; + version = "0.1.1"; + sha256 = "09903877b7e6c3a87e345a26fca0fb7e1da8751f5b19aeb940479dd3f289a9e8"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Billing SDK"; license = "unknown"; }) {}; - "gogol-billing_0_1_1" = callPackage + "gogol-billing_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-billing"; - version = "0.1.1"; - sha256 = "09903877b7e6c3a87e345a26fca0fb7e1da8751f5b19aeb940479dd3f289a9e8"; + version = "0.2.0"; + sha256 = "52d867cda0d2acbd9fe4381379ab80a9821709b02ef358423d60dc83ba1bf3e9"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Billing SDK"; @@ -75157,20 +72652,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-blogger"; - version = "0.1.0"; - sha256 = "ef7105faf8560416fb417b462fb81a21ace2b54983a6c43095f7859a2705277a"; + version = "0.1.1"; + sha256 = "561dac9e87c7cf0930854e42ef9eb71ae3352a1267896dbee3c63cbcbadd326e"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Blogger SDK"; license = "unknown"; }) {}; - "gogol-blogger_0_1_1" = callPackage + "gogol-blogger_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-blogger"; - version = "0.1.1"; - sha256 = "561dac9e87c7cf0930854e42ef9eb71ae3352a1267896dbee3c63cbcbadd326e"; + version = "0.2.0"; + sha256 = "4a65b159bb5d7f55dee7bdcb7aa594c0f7de1014bbe01f8796ed06b400bb5f04"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Blogger SDK"; @@ -75182,20 +72677,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-books"; - version = "0.1.0"; - sha256 = "f3bcdfcf2b5daf79effc5b6b137468af37e8640d63f65ba24929b414b4b1dc22"; + version = "0.1.1"; + sha256 = "0d6e9b1cecf375bc6503ece1582ffc55e151f182497ac5f6da7a1a8312356926"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Books SDK"; license = "unknown"; }) {}; - "gogol-books_0_1_1" = callPackage + "gogol-books_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-books"; - version = "0.1.1"; - sha256 = "0d6e9b1cecf375bc6503ece1582ffc55e151f182497ac5f6da7a1a8312356926"; + version = "0.2.0"; + sha256 = "bd0b528943aeb018809ba7309e5c3b45061b90101f695a050b9cae6ac876e30c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Books SDK"; @@ -75207,20 +72702,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-civicinfo"; - version = "0.1.0"; - sha256 = "0553bf55ec3e453e63e6050528614d6dfe5030413b19c27cdeebf273bae58be7"; + version = "0.1.1"; + sha256 = "53c354c9219c87c2864f9da2883657773c4e13aa635d51164bf89fc5e6d5d442"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Civic Information SDK"; license = "unknown"; }) {}; - "gogol-civicinfo_0_1_1" = callPackage + "gogol-civicinfo_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-civicinfo"; - version = "0.1.1"; - sha256 = "53c354c9219c87c2864f9da2883657773c4e13aa635d51164bf89fc5e6d5d442"; + version = "0.2.0"; + sha256 = "6c33f17eaf8eda636b54c6f6e863d73a3ebbd8edf9ed5b0c22cd548ff9f653c3"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Civic Information SDK"; @@ -75232,20 +72727,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-classroom"; - version = "0.1.0"; - sha256 = "5b5715d5403614b588053a6341a24546eec8f9f9269c4e7fb08f3ec36da71134"; + version = "0.1.1"; + sha256 = "7e61a1725d1864df86e00eaadc9c94d885015c5d1310a1374b7cc8e4b2c9769a"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Classroom SDK"; license = "unknown"; }) {}; - "gogol-classroom_0_1_1" = callPackage + "gogol-classroom_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-classroom"; - version = "0.1.1"; - sha256 = "7e61a1725d1864df86e00eaadc9c94d885015c5d1310a1374b7cc8e4b2c9769a"; + version = "0.2.0"; + sha256 = "b7b101543bcb5e1316dc41d48bcb49f6b516cd38727e5bc052e44198c1f7b230"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Classroom SDK"; @@ -75257,20 +72752,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudmonitoring"; - version = "0.1.0"; - sha256 = "c822932fd8ec45eb690ba197e4dfd08734d2288fe0ac55562649509d2d66f32b"; + version = "0.1.1"; + sha256 = "da90cc22762d8d9b145f06ce2d4861c7b97004730f64a3f7c84b0b0b35c64daa"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Monitoring SDK"; license = "unknown"; }) {}; - "gogol-cloudmonitoring_0_1_1" = callPackage + "gogol-cloudmonitoring_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudmonitoring"; - version = "0.1.1"; - sha256 = "da90cc22762d8d9b145f06ce2d4861c7b97004730f64a3f7c84b0b0b35c64daa"; + version = "0.2.0"; + sha256 = "e2567828a7e50ab4eaef10b82cfea1b97476dc44388cb5ba8b2ca56cf1530790"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Monitoring SDK"; @@ -75282,20 +72777,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudtrace"; - version = "0.1.0"; - sha256 = "98c84fc8086cc7defd131a5c99cf1cd307a15343e8ef3d8c038b3e752ceee2b2"; + version = "0.1.1"; + sha256 = "8977ed4b61beed09daab23f5f2d1ab5495de96963970164153640a4af2e9f095"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Trace SDK"; license = "unknown"; }) {}; - "gogol-cloudtrace_0_1_1" = callPackage + "gogol-cloudtrace_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudtrace"; - version = "0.1.1"; - sha256 = "8977ed4b61beed09daab23f5f2d1ab5495de96963970164153640a4af2e9f095"; + version = "0.2.0"; + sha256 = "3799a1febfe93fce7040eda7e870c6d22bed46b9c23820f8bbbc2157fb65542b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Trace SDK"; @@ -75307,20 +72802,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-compute"; - version = "0.1.0"; - sha256 = "176bf2c9ae0701bba60f8a9f19d886125a983cd46c05241c4d98778f26926f3b"; + version = "0.1.1"; + sha256 = "8b84d7cea48923e3df6221ec28ed6f62a31803036cae73449ee16680b6fa51aa"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine SDK"; license = "unknown"; }) {}; - "gogol-compute_0_1_1" = callPackage + "gogol-compute_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-compute"; - version = "0.1.1"; - sha256 = "8b84d7cea48923e3df6221ec28ed6f62a31803036cae73449ee16680b6fa51aa"; + version = "0.2.0"; + sha256 = "0264743c5b76e8c1c4c522f2d560de91618353594a45647c9b330db97b9adf62"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine SDK"; @@ -75332,20 +72827,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-container"; - version = "0.1.0"; - sha256 = "e2030647c09d58c90a1770c7841d6a0dd2f9f36b19ed12ee2514c34ba9eb79ec"; + version = "0.1.1"; + sha256 = "9b0eaa239338f3a1c23ef6e7fd1587284060419e91cd13dccf7be088d81923b1"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Container Engine SDK"; license = "unknown"; }) {}; - "gogol-container_0_1_1" = callPackage + "gogol-container_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-container"; - version = "0.1.1"; - sha256 = "9b0eaa239338f3a1c23ef6e7fd1587284060419e91cd13dccf7be088d81923b1"; + version = "0.2.0"; + sha256 = "3db448086fc5cd9c2ba967096ebadb44497b00305285cb51a21fd92002f3bcbb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Container Engine SDK"; @@ -75357,8 +72852,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-containerbuilder"; - version = "0.1.1"; - sha256 = "7362d60cf98c8856351669c0c27fb6945098f598f6de55dd17aed817a7547df8"; + version = "0.2.0"; + sha256 = "5566c8f5ffd62882234b98470e2affe5e0df720aca2b2e097519b7576ffbd1f7"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Container Builder SDK"; @@ -75367,31 +72862,6 @@ self: { }) {}; "gogol-core" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring - , case-insensitive, conduit, dlist, exceptions, hashable - , http-api-data, http-client, http-media, http-types, lens, memory - , resourcet, scientific, servant, tasty, text, time - , unordered-containers - }: - mkDerivation { - pname = "gogol-core"; - version = "0.1.0"; - sha256 = "2284f49106b41cc0ea81c848a5b5c31f0a7bcb2fc5c604519451238cbc3c01b0"; - revision = "1"; - editedCabalFile = "11dbfa4b8778e6b446b60ad1add04d9049169936f6f762d45a3e727e92d5a0b6"; - libraryHaskellDepends = [ - aeson attoparsec base bifunctors bytestring case-insensitive - conduit dlist exceptions hashable http-api-data http-client - http-media http-types lens memory resourcet scientific servant text - time unordered-containers - ]; - testHaskellDepends = [ base tasty ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Core data types and functionality for Gogol libraries"; - license = "unknown"; - }) {}; - - "gogol-core_0_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , case-insensitive, conduit, dlist, exceptions, hashable , http-api-data, http-client, http-media, http-types, lens, memory @@ -75414,6 +72884,29 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Core data types and functionality for Gogol libraries"; license = "unknown"; + }) {}; + + "gogol-core_0_2_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring + , case-insensitive, conduit, dlist, exceptions, hashable + , http-api-data, http-client, http-media, http-types, lens + , resourcet, scientific, servant, tasty, text, time + , unordered-containers + }: + mkDerivation { + pname = "gogol-core"; + version = "0.2.0.1"; + sha256 = "62e65a36ec74bca9599741c27f0f9b7432b5db362e1670a6bff5c90468112f0e"; + libraryHaskellDepends = [ + aeson attoparsec base bifunctors bytestring case-insensitive + conduit dlist exceptions hashable http-api-data http-client + http-media http-types lens resourcet scientific servant text time + unordered-containers + ]; + testHaskellDepends = [ base tasty ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Core data types and functionality for Gogol libraries"; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -75421,20 +72914,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-customsearch"; - version = "0.1.0"; - sha256 = "3b264eed97aea0cb6ce97edc32ec66f962af7f4892f0ea6313413fba1512eee0"; + version = "0.1.1"; + sha256 = "f90d8c865d67c75dea23df6e073c63958ffba49326c72b18b5c0ad50b4c17879"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google CustomSearch SDK"; license = "unknown"; }) {}; - "gogol-customsearch_0_1_1" = callPackage + "gogol-customsearch_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-customsearch"; - version = "0.1.1"; - sha256 = "f90d8c865d67c75dea23df6e073c63958ffba49326c72b18b5c0ad50b4c17879"; + version = "0.2.0"; + sha256 = "c96cdef0a652a7859bf5d8dbc8d6c3c05339d4be28d6f34454b337186af15e72"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google CustomSearch SDK"; @@ -75446,20 +72939,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dataflow"; - version = "0.1.0"; - sha256 = "ac82d506a5efd3934f08fde8cd77b4ca387ecbe77409ff4ba2dc657bb7834515"; + version = "0.1.1"; + sha256 = "b7903a479c90d03b778d868da6ae2e4a9603203a19dac3fc875195e99ef6b75c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Dataflow SDK"; license = "unknown"; }) {}; - "gogol-dataflow_0_1_1" = callPackage + "gogol-dataflow_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dataflow"; - version = "0.1.1"; - sha256 = "b7903a479c90d03b778d868da6ae2e4a9603203a19dac3fc875195e99ef6b75c"; + version = "0.2.0"; + sha256 = "45590531284533737405e6cfb7d4ee00c29c262a25926a86dcb0089f81bc12ff"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Dataflow SDK"; @@ -75471,20 +72964,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dataproc"; - version = "0.1.0"; - sha256 = "d4a60220037b16e884499d0944aa6c858889aa322b48783249f7b6006d648b4f"; + version = "0.1.1"; + sha256 = "39fae5e8e1b91b22f1548238cf7974b2c103ade75a8ac138cf203cf8dcde4b8b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Dataproc SDK"; license = "unknown"; }) {}; - "gogol-dataproc_0_1_1" = callPackage + "gogol-dataproc_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dataproc"; - version = "0.1.1"; - sha256 = "39fae5e8e1b91b22f1548238cf7974b2c103ade75a8ac138cf203cf8dcde4b8b"; + version = "0.2.0"; + sha256 = "7b79a0dee033c647982e6883ac0cc57475624a7a8ca86ec3a5bd44e073ea0533"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Dataproc SDK"; @@ -75496,20 +72989,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-datastore"; - version = "0.1.0"; - sha256 = "346888db283ed3ff3ffad7310891cd33d230dfe98234ceb006d9b7aea28b5ea4"; + version = "0.1.1"; + sha256 = "bbf5137dc5f4a43c17b65f2320eb075b7a61e8e85f7ebaffbcffe929d8134175"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Datastore SDK"; license = "unknown"; }) {}; - "gogol-datastore_0_1_1" = callPackage + "gogol-datastore_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-datastore"; - version = "0.1.1"; - sha256 = "bbf5137dc5f4a43c17b65f2320eb075b7a61e8e85f7ebaffbcffe929d8134175"; + version = "0.2.0"; + sha256 = "5cd4a693a90ea2cae406aace00a441398071ae41f61b194562f37eaf4fec3857"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Datastore SDK"; @@ -75521,20 +73014,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-debugger"; - version = "0.1.0"; - sha256 = "2f70ed92ff0edd99e7a2e24a00e546a79c1e082f79f97ffbd48b6a24c0f061da"; + version = "0.1.1"; + sha256 = "51edec5d57f76a4be8769983831ae655332e55f3fec90bd4bdc22a0644bfbca2"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Debugger SDK"; + description = "Google Stackdriver Debugger SDK"; license = "unknown"; }) {}; - "gogol-debugger_0_1_1" = callPackage + "gogol-debugger_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-debugger"; - version = "0.1.1"; - sha256 = "51edec5d57f76a4be8769983831ae655332e55f3fec90bd4bdc22a0644bfbca2"; + version = "0.2.0"; + sha256 = "142b93f72a911e2f039d7b85e5a2b55c85fd631a3251f7089b78ee1496a882e2"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Debugger SDK"; @@ -75546,20 +73039,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-deploymentmanager"; - version = "0.1.0"; - sha256 = "a3f03570dc6c3d0d678dd4a98d993a0daf8dfa8151fb75b572d372e7b2f881fb"; + version = "0.1.1"; + sha256 = "73da04a5597395624bf6dfb3d5c73775dab4e8ef857a282efa25f5eaa2439b03"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Deployment Manager SDK"; license = "unknown"; }) {}; - "gogol-deploymentmanager_0_1_1" = callPackage + "gogol-deploymentmanager_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-deploymentmanager"; - version = "0.1.1"; - sha256 = "73da04a5597395624bf6dfb3d5c73775dab4e8ef857a282efa25f5eaa2439b03"; + version = "0.2.0"; + sha256 = "5dda38584d10a85f90aff0a1d8636c8f1e5b2e7a78a332b41352b1b2a565ac03"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Deployment Manager SDK"; @@ -75571,20 +73064,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dfareporting"; - version = "0.1.0"; - sha256 = "3c42ecab212babf6ff6355f8f0083216897dcf344d26e22d9743c14794466625"; + version = "0.1.1"; + sha256 = "241afa2485a43ee29a93142fc931d8fa4b723389efa99a9c9b8e6f26f278d522"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DCM/DFA Reporting And Trafficking SDK"; license = "unknown"; }) {}; - "gogol-dfareporting_0_1_1" = callPackage + "gogol-dfareporting_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dfareporting"; - version = "0.1.1"; - sha256 = "241afa2485a43ee29a93142fc931d8fa4b723389efa99a9c9b8e6f26f278d522"; + version = "0.2.0"; + sha256 = "9295a5968c696d814fd77f099fbf1fd2dd89357582ae2c2cf8ddeb5b40502c24"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DCM/DFA Reporting And Trafficking SDK"; @@ -75596,20 +73089,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-discovery"; - version = "0.1.0"; - sha256 = "f8f107dedc76a4aeeb6e18874a79e0d6fcb9e0212953b2ff89d1770466f629ac"; + version = "0.1.1"; + sha256 = "5b8ed6b1ea962001f9b64584aa2334987d974b10073e3211f2f1a510f2dd1bfe"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google APIs Discovery Service SDK"; license = "unknown"; }) {}; - "gogol-discovery_0_1_1" = callPackage + "gogol-discovery_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-discovery"; - version = "0.1.1"; - sha256 = "5b8ed6b1ea962001f9b64584aa2334987d974b10073e3211f2f1a510f2dd1bfe"; + version = "0.2.0"; + sha256 = "556992c0da8ad27206211845ab46fbf7dffdad55a9c1ca4274da0df672a896c4"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google APIs Discovery Service SDK"; @@ -75621,20 +73114,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dns"; - version = "0.1.0"; - sha256 = "d07e3fb4f8cdcd079a80509ffe7300b300679900d8234e8833152fd83d378b40"; + version = "0.1.1"; + sha256 = "77448be65e876e0ab9c9bdc2db24a7847eda846a567ed9f9c63b844917d97136"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud DNS SDK"; license = "unknown"; }) {}; - "gogol-dns_0_1_1" = callPackage + "gogol-dns_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dns"; - version = "0.1.1"; - sha256 = "77448be65e876e0ab9c9bdc2db24a7847eda846a567ed9f9c63b844917d97136"; + version = "0.2.0"; + sha256 = "bf24d5a57f7d316a49b3b413ba4c9aa94a164a009f3911f86be19386b204be87"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud DNS SDK"; @@ -75646,20 +73139,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-doubleclick-bids"; - version = "0.1.0"; - sha256 = "0ac3d6be06ae897c9dd59fde3cc160708a04f0b1853749df5186a60077590fd5"; + version = "0.1.1"; + sha256 = "a0e899ecc589df89980868be218741fb2e7ece21e0837ea46618fd970339de2a"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Bid Manager SDK"; license = "unknown"; }) {}; - "gogol-doubleclick-bids_0_1_1" = callPackage + "gogol-doubleclick-bids_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-doubleclick-bids"; - version = "0.1.1"; - sha256 = "a0e899ecc589df89980868be218741fb2e7ece21e0837ea46618fd970339de2a"; + version = "0.2.0"; + sha256 = "19f2d882820a756ddc7ad6d22b91ae1198e2ff53db2ad03c897e241a61c4b73c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Bid Manager SDK"; @@ -75671,20 +73164,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-doubleclick-search"; - version = "0.1.0"; - sha256 = "2ed70d962d5c1ca189682a9ec22af0a903ebe08223ffd6d4b9abff414ea239db"; + version = "0.1.1"; + sha256 = "15a954b3e17f5592d787ada7997cca04d9249e0ccfd432c1e52ae1d83769af60"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Search SDK"; license = "unknown"; }) {}; - "gogol-doubleclick-search_0_1_1" = callPackage + "gogol-doubleclick-search_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-doubleclick-search"; - version = "0.1.1"; - sha256 = "15a954b3e17f5592d787ada7997cca04d9249e0ccfd432c1e52ae1d83769af60"; + version = "0.2.0"; + sha256 = "8ecfa7547c2d08a2d8d39389c4a889bdc32eaf63ae4b80ec2b1be36f969887cb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Search SDK"; @@ -75696,20 +73189,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-drive"; - version = "0.1.0"; - sha256 = "7cccab1d269aa3ee5d6276ff78c86f29974f85418148a15a13d195ac7fd29ca3"; + version = "0.1.1"; + sha256 = "6e46b5ba960ef8481fdcaba84ef006169ff075d63fc6e4dc6cd84e0805e6d46c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Drive SDK"; license = "unknown"; }) {}; - "gogol-drive_0_1_1" = callPackage + "gogol-drive_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-drive"; - version = "0.1.1"; - sha256 = "6e46b5ba960ef8481fdcaba84ef006169ff075d63fc6e4dc6cd84e0805e6d46c"; + version = "0.2.0"; + sha256 = "dc68e0331e441b6b9488fbc29b5864b9955dc3978c7092340870191a8f86cc6c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Drive SDK"; @@ -75721,8 +73214,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-firebase-dynamiclinks"; - version = "0.1.1"; - sha256 = "e98604b85e66579ee99073ed335032e7983db5948f2a8c427be78b00b96ab24f"; + version = "0.2.0"; + sha256 = "8ba21d6d26785e0c43493ba2a035cc3d5eb07f663dff57c166113580a8f1161e"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Firebase Dynamic Links SDK"; @@ -75734,20 +73227,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-firebase-rules"; - version = "0.1.0"; - sha256 = "b3f5483c339b0bc5882fdfeb49865d3b13f2c1d61dc7f4e46e25ccc651af2c74"; + version = "0.1.1"; + sha256 = "981f91ad921d35eb303fb3d9c6d77c7d507ee89bece51baa7d8b8c7951e25fc2"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Firebase Rules SDK"; license = "unknown"; }) {}; - "gogol-firebase-rules_0_1_1" = callPackage + "gogol-firebase-rules_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-firebase-rules"; - version = "0.1.1"; - sha256 = "981f91ad921d35eb303fb3d9c6d77c7d507ee89bece51baa7d8b8c7951e25fc2"; + version = "0.2.0"; + sha256 = "96ba97607341e89c5ca376f6ab77076b9caae896f91c219711ba9e97f2a8bd43"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Firebase Rules SDK"; @@ -75759,20 +73252,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fitness"; - version = "0.1.0"; - sha256 = "486f83148db7c98021f81c9eff1d2e5adea532246adb9627cc0b824aeedda6cd"; + version = "0.1.1"; + sha256 = "0826b140ea187306c0d22fc444b98b060191d185ed125f89044d4c56eeec5601"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fitness SDK"; license = "unknown"; }) {}; - "gogol-fitness_0_1_1" = callPackage + "gogol-fitness_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fitness"; - version = "0.1.1"; - sha256 = "0826b140ea187306c0d22fc444b98b060191d185ed125f89044d4c56eeec5601"; + version = "0.2.0"; + sha256 = "bf8f4136d3cec3e34057731ca02b1ad97e9a6bb15e72ed89a1eb072cca433d8c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fitness SDK"; @@ -75784,20 +73277,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fonts"; - version = "0.1.0"; - sha256 = "b87b347f22f13e7fd0e809841b4b075bc62169318575b59a0a3a4ff979b41dc9"; + version = "0.1.1"; + sha256 = "57f3e537cf035d7fe0355be1014f3df559caec6f736badfcb86e91a58b084167"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fonts Developer SDK"; license = "unknown"; }) {}; - "gogol-fonts_0_1_1" = callPackage + "gogol-fonts_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fonts"; - version = "0.1.1"; - sha256 = "57f3e537cf035d7fe0355be1014f3df559caec6f736badfcb86e91a58b084167"; + version = "0.2.0"; + sha256 = "b4a7ae314ea71acaecb7a60463230d48213b5f4d41f6e82962064bab39309f06"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fonts Developer SDK"; @@ -75809,20 +73302,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-freebasesearch"; - version = "0.1.0"; - sha256 = "668e8e58a7830a391c8bcd1836436bb0adf606017a71d94a6aef638fe078e33c"; + version = "0.1.1"; + sha256 = "0bc23693f49976034cba11ad70a00a76625907856f02c4d9931f1d01cb51751c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Freebase Search SDK"; license = "unknown"; }) {}; - "gogol-freebasesearch_0_1_1" = callPackage + "gogol-freebasesearch_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-freebasesearch"; - version = "0.1.1"; - sha256 = "0bc23693f49976034cba11ad70a00a76625907856f02c4d9931f1d01cb51751c"; + version = "0.2.0"; + sha256 = "b37d8631971615d6e04c1a3b46386336462b3bd63d3ea4e3ab9ba2130398c45f"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Freebase Search SDK"; @@ -75834,20 +73327,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fusiontables"; - version = "0.1.0"; - sha256 = "2473bf1d25ae2cbe2af0c454f6dcb20765ab652502770327e4b0be6b72994ff1"; + version = "0.1.1"; + sha256 = "dda5ab1f88dd93e0bfe8acf046d2feaccb0d3d999dd81b3d06c7e2a5cc7c4a14"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fusion Tables SDK"; license = "unknown"; }) {}; - "gogol-fusiontables_0_1_1" = callPackage + "gogol-fusiontables_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fusiontables"; - version = "0.1.1"; - sha256 = "dda5ab1f88dd93e0bfe8acf046d2feaccb0d3d999dd81b3d06c7e2a5cc7c4a14"; + version = "0.2.0"; + sha256 = "a8a9c0a90d7dea80b4f76047da04e107c45d4eb6a7ffff7ce418f0eaa79ca159"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fusion Tables SDK"; @@ -75859,20 +73352,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games"; - version = "0.1.0"; - sha256 = "0b20a0a057942b5b99b1060c01c6042017d1db5e3cb49e44a8bf95cd5389ffd6"; + version = "0.1.1"; + sha256 = "1292b79718319d125e61ebf1a514c52f72d524c867fce7a8e04b40c98529e0ca"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services SDK"; license = "unknown"; }) {}; - "gogol-games_0_1_1" = callPackage + "gogol-games_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games"; - version = "0.1.1"; - sha256 = "1292b79718319d125e61ebf1a514c52f72d524c867fce7a8e04b40c98529e0ca"; + version = "0.2.0"; + sha256 = "caab93ef1124477ee354bdaf9d9b193c48261cc0adba82d8aa712d4c7b6c7ff5"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services SDK"; @@ -75884,20 +73377,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games-configuration"; - version = "0.1.0"; - sha256 = "8f27ec3b23e704b6cd9d33d4bf41fa336098ef2d06edfc7482daa734ae2aa937"; + version = "0.1.1"; + sha256 = "3abec569eb661666b51ca5585b64adbef3990d8db5991516d6414d6c2068b35f"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services Publishing SDK"; license = "unknown"; }) {}; - "gogol-games-configuration_0_1_1" = callPackage + "gogol-games-configuration_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games-configuration"; - version = "0.1.1"; - sha256 = "3abec569eb661666b51ca5585b64adbef3990d8db5991516d6414d6c2068b35f"; + version = "0.2.0"; + sha256 = "5df2b8b8610e31aeea29f67793377b310aaf16ecb8b18fd4e42a23750ae0c6a5"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services Publishing SDK"; @@ -75909,20 +73402,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games-management"; - version = "0.1.0"; - sha256 = "4a4459968df56bd364be7f62300f9a950c466cfa62bc6db91f2460fd67d9f414"; + version = "0.1.1"; + sha256 = "ebd148164e36e7d6f42066bce24055029044af1022c906c1f63f99af6dd25e78"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services Management SDK"; license = "unknown"; }) {}; - "gogol-games-management_0_1_1" = callPackage + "gogol-games-management_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games-management"; - version = "0.1.1"; - sha256 = "ebd148164e36e7d6f42066bce24055029044af1022c906c1f63f99af6dd25e78"; + version = "0.2.0"; + sha256 = "dfe5b07bd33e2f7997c82e6ffbd01427ad02bbc2a225ac4629c480ce0d1f00c6"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services Management SDK"; @@ -75934,20 +73427,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-genomics"; - version = "0.1.0"; - sha256 = "72098eeef0f3ce6ee3c9febe433ac94a1240a98679a32ca7ce65867f3e972784"; + version = "0.1.1"; + sha256 = "9adf145bd9534fac9b3a16d177099fc50ba0d914635817e16cd51dfaac578c80"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Genomics SDK"; license = "unknown"; }) {}; - "gogol-genomics_0_1_1" = callPackage + "gogol-genomics_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-genomics"; - version = "0.1.1"; - sha256 = "9adf145bd9534fac9b3a16d177099fc50ba0d914635817e16cd51dfaac578c80"; + version = "0.2.0"; + sha256 = "10ef615601475e3baec18567b442fdca5a239f1caf67de66f5703cd00eee1b56"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Genomics SDK"; @@ -75959,20 +73452,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-gmail"; - version = "0.1.0"; - sha256 = "c5f39483cdfc5123b2bc16a85dccb00651f51cbc05be034ab1f72927d8a1aa8f"; + version = "0.1.1"; + sha256 = "7459c4abfdbe582f3027fda96821cf0c2baa93cdc4c00a4c3303b0aedf7886f5"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Gmail SDK"; license = "unknown"; }) {}; - "gogol-gmail_0_1_1" = callPackage + "gogol-gmail_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-gmail"; - version = "0.1.1"; - sha256 = "7459c4abfdbe582f3027fda96821cf0c2baa93cdc4c00a4c3303b0aedf7886f5"; + version = "0.2.0"; + sha256 = "ab972260ba64d358dbb71200b438b042c5549e75a110f2cdcf15f5be332afaf5"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Gmail SDK"; @@ -75984,20 +73477,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-groups-migration"; - version = "0.1.0"; - sha256 = "af18dfa8279bc475851870b44d66f015fa36dfdb6136320a00d76a5245d86364"; + version = "0.1.1"; + sha256 = "2670e78a424cac61d6fc948f4fa0d64bfd878878f0130263b74ac22737e385fd"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Migration SDK"; license = "unknown"; }) {}; - "gogol-groups-migration_0_1_1" = callPackage + "gogol-groups-migration_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-groups-migration"; - version = "0.1.1"; - sha256 = "2670e78a424cac61d6fc948f4fa0d64bfd878878f0130263b74ac22737e385fd"; + version = "0.2.0"; + sha256 = "933e7453e808e3878f38b0263bfd5b48b698284b370b951a99a6dd858bbeabe2"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Migration SDK"; @@ -76009,20 +73502,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-groups-settings"; - version = "0.1.0"; - sha256 = "47c2237898cbf007074c767c738f24d2e099cc17ea2914c1434f703933eb1713"; + version = "0.1.1"; + sha256 = "c8e5efeb91f968fbe5ebe7183f7a2ff362589de03bfa4917417d9707fe6ce1ed"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Settings SDK"; license = "unknown"; }) {}; - "gogol-groups-settings_0_1_1" = callPackage + "gogol-groups-settings_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-groups-settings"; - version = "0.1.1"; - sha256 = "c8e5efeb91f968fbe5ebe7183f7a2ff362589de03bfa4917417d9707fe6ce1ed"; + version = "0.2.0"; + sha256 = "a9239bbb414bc01dc3639d6c808cbbfa681125fc6aa13708c6f6d9c8f24e7ee6"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Settings SDK"; @@ -76034,8 +73527,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-iam"; - version = "0.1.1"; - sha256 = "ec66ff6403ce2b59308703c8dbc47b9609d1a9029cae9b77c2137be336c783b9"; + version = "0.2.0"; + sha256 = "c793665c0cf11fbf609cbc22399b84dd060411524210544ec848eb73f2136f58"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Identity and Access Management (IAM) SDK"; @@ -76047,20 +73540,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-identity-toolkit"; - version = "0.1.0"; - sha256 = "c6ad66395f449cf7900d1f12657977e5864db8a426acc0f56a9d4674dfbd488d"; + version = "0.1.1"; + sha256 = "25e5c7eba65629c70297c05327cd9321bef58ec3ad5b58559b0064fc8de7915b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Identity Toolkit SDK"; license = "unknown"; }) {}; - "gogol-identity-toolkit_0_1_1" = callPackage + "gogol-identity-toolkit_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-identity-toolkit"; - version = "0.1.1"; - sha256 = "25e5c7eba65629c70297c05327cd9321bef58ec3ad5b58559b0064fc8de7915b"; + version = "0.2.0"; + sha256 = "835f936b942a60c3d4290cdbb66d7f8ea36697c8a8192ea7b4613ccc194cbc94"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Identity Toolkit SDK"; @@ -76072,20 +73565,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-kgsearch"; - version = "0.1.0"; - sha256 = "c7f006ee6e37cd3c893cd7a60e9cc44d857a7aca5bb29f9d942269c3c88767f3"; + version = "0.1.1"; + sha256 = "851191e764c93914fcda810cd103a4fbaca3b45c6a47c2a1d699198a81d5f337"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; - description = "Google Identity and Access Management SDK"; + description = "Google Knowledge Graph Search SDK"; license = "unknown"; }) {}; - "gogol-kgsearch_0_1_1" = callPackage + "gogol-kgsearch_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-kgsearch"; - version = "0.1.1"; - sha256 = "851191e764c93914fcda810cd103a4fbaca3b45c6a47c2a1d699198a81d5f337"; + version = "0.2.0"; + sha256 = "e693a96569b16252ca14a7d684e51652b58d691456ab008b74c4276c29cf1a22"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Knowledge Graph Search SDK"; @@ -76093,24 +73586,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gogol-language" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-language"; + version = "0.2.0"; + sha256 = "88233a59c4f1f6319be39332a231aa823a262580b442f875e8e358698dc18fcf"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Natural Language SDK"; + license = "unknown"; + }) {}; + "gogol-latencytest" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-latencytest"; - version = "0.1.0"; - sha256 = "866074c84140f6ff0cb13eaef954d015f681b7fb5250d9299cc7c993b9e0953d"; + version = "0.1.1"; + sha256 = "90caade46451279a4645a71dba459c807d35ded423413e2e2f45078a538ef3cd"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Network Performance Monitoring SDK"; license = "unknown"; }) {}; - "gogol-latencytest_0_1_1" = callPackage + "gogol-latencytest_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-latencytest"; - version = "0.1.1"; - sha256 = "90caade46451279a4645a71dba459c807d35ded423413e2e2f45078a538ef3cd"; + version = "0.2.0"; + sha256 = "8ae96a0d45874f2bd8733d2e7194ba875e09bf081a6425ff943e6ffff367d894"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Network Performance Monitoring SDK"; @@ -76122,20 +73627,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-logging"; - version = "0.1.0"; - sha256 = "88ee7e43040ab494ba9b138cfa01a626546dadd9aaca9ac451325b118bb97f73"; + version = "0.1.1"; + sha256 = "2320ad07e231bdbdcb0e39f702917224e29999041266e9b3a4a67b5ee0854456"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Logging SDK"; + description = "Google Stackdriver Logging SDK"; license = "unknown"; }) {}; - "gogol-logging_0_1_1" = callPackage + "gogol-logging_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-logging"; - version = "0.1.1"; - sha256 = "2320ad07e231bdbdcb0e39f702917224e29999041266e9b3a4a67b5ee0854456"; + version = "0.2.0"; + sha256 = "cd2d8c6d2f72f27fd8ac911ebbdcb8acfad84597036a5cf81f5857cd6985dfad"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Logging SDK"; @@ -76143,24 +73648,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gogol-manufacturers" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-manufacturers"; + version = "0.2.0"; + sha256 = "7d7001d2593365a23ab809a815934e3cf2327f1a40d5597a2fc012bd87df0f36"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Manufacturer Center SDK"; + license = "unknown"; + }) {}; + "gogol-maps-coordinate" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-maps-coordinate"; - version = "0.1.0"; - sha256 = "85a7cc97ca13c5b65d8d7fa4c49b643cec3913fb51952b0032fd5e889e33d9c0"; + version = "0.1.1"; + sha256 = "5b60120062e741337e299724aa09153f9c7985fff4fb25486a9f7c57df5e8b89"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Coordinate SDK"; license = "unknown"; }) {}; - "gogol-maps-coordinate_0_1_1" = callPackage + "gogol-maps-coordinate_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-maps-coordinate"; - version = "0.1.1"; - sha256 = "5b60120062e741337e299724aa09153f9c7985fff4fb25486a9f7c57df5e8b89"; + version = "0.2.0"; + sha256 = "414b03bd9c3679df9c923dd71aa9ecf35fe29c7e17f33630583a2e4e563f30b4"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Coordinate SDK"; @@ -76172,20 +73689,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-maps-engine"; - version = "0.1.0"; - sha256 = "fe092be561b6b93619ad2626d7b31edad0f08b51f7a9c40273dfafa249d93f09"; + version = "0.1.1"; + sha256 = "fb267eb453a2d915629882f448f28488c6d60ccbd8a64071723e5da566616ef4"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Engine SDK"; license = "unknown"; }) {}; - "gogol-maps-engine_0_1_1" = callPackage + "gogol-maps-engine_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-maps-engine"; - version = "0.1.1"; - sha256 = "fb267eb453a2d915629882f448f28488c6d60ccbd8a64071723e5da566616ef4"; + version = "0.2.0"; + sha256 = "aafe4135dcaf7329f86fe80f73b419619765e8ea30db249a912db62c9f0bfb1f"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Engine SDK"; @@ -76197,20 +73714,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-mirror"; - version = "0.1.0"; - sha256 = "de360430d65ded18ba6f0cc3c4bdf381230ad3cf1e37b0c6aaeb0a85737ba41d"; + version = "0.1.1"; + sha256 = "0fb991b8d71f238d3706d7d944271a291aa41172f3a6730fbd2e411128f44eed"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Mirror SDK"; license = "unknown"; }) {}; - "gogol-mirror_0_1_1" = callPackage + "gogol-mirror_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-mirror"; - version = "0.1.1"; - sha256 = "0fb991b8d71f238d3706d7d944271a291aa41172f3a6730fbd2e411128f44eed"; + version = "0.2.0"; + sha256 = "0c60337f67257069096fc1187a48569a3b370d705f80b40c3c7dfcc0f701408b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Mirror SDK"; @@ -76222,8 +73739,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-ml"; - version = "0.1.1"; - sha256 = "bee43d94edd81a53f387bfcf76c6679d91c36bfe50e11dd26f8bd047c758709c"; + version = "0.2.0"; + sha256 = "88202ed828ba87713a522423c2b29add4f7f9fcb9de52101bd5deabd5a2ab44c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Machine Learning SDK"; @@ -76235,20 +73752,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-monitoring"; - version = "0.1.0"; - sha256 = "b3d92680ed5688d6556f58fa5db6ff36e4319f03abb58374ee2d51498b7feab1"; + version = "0.1.1"; + sha256 = "906a513ac17c82c932b50045ca61bf91625d88a8cc962a4d9b0831a218ca3e61"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; - description = "Google Monitoring SDK"; + description = "Google Stackdriver Monitoring SDK"; license = "unknown"; }) {}; - "gogol-monitoring_0_1_1" = callPackage + "gogol-monitoring_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-monitoring"; - version = "0.1.1"; - sha256 = "906a513ac17c82c932b50045ca61bf91625d88a8cc962a4d9b0831a218ca3e61"; + version = "0.2.0"; + sha256 = "e0f505881e97c1fa3d85e8eb12a827928ad8c253c6689ba436ab6fa2886cbf21"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Monitoring SDK"; @@ -76260,20 +73777,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-oauth2"; - version = "0.1.0"; - sha256 = "7dfa28c2babc8f0ba8b82e4ecf58108a289d97147848678662870d1404c4798d"; + version = "0.1.1"; + sha256 = "d2c60dc2976a6d32f980d67d60e54735ac45e265c73956d7b32fa29918c10207"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google OAuth2 SDK"; license = "unknown"; }) {}; - "gogol-oauth2_0_1_1" = callPackage + "gogol-oauth2_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-oauth2"; - version = "0.1.1"; - sha256 = "d2c60dc2976a6d32f980d67d60e54735ac45e265c73956d7b32fa29918c10207"; + version = "0.2.0"; + sha256 = "7bd97bebf58e0aac97e84f86bad65d077bec7f8ead67b2b0518e9d0173284a8f"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google OAuth2 SDK"; @@ -76285,20 +73802,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-pagespeed"; - version = "0.1.0"; - sha256 = "1243c9dc68363fed8a96596d368622ae7b23296f7c231134f354401428f5815b"; + version = "0.1.1"; + sha256 = "a2071deb9101e80f6ffdf6d1945d21df433a256f666e7e0a8e3f1642817c2dd1"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google PageSpeed Insights SDK"; license = "unknown"; }) {}; - "gogol-pagespeed_0_1_1" = callPackage + "gogol-pagespeed_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-pagespeed"; - version = "0.1.1"; - sha256 = "a2071deb9101e80f6ffdf6d1945d21df433a256f666e7e0a8e3f1642817c2dd1"; + version = "0.2.0"; + sha256 = "e5033e168843a2c821d22cf94a8e5402b0908335bdef6baa626a8fe27857dc10"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google PageSpeed Insights SDK"; @@ -76310,20 +73827,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-partners"; - version = "0.1.0"; - sha256 = "205d4a467aa60df3ae42923341eb2fa688f5f9121e92eeff93e042571df8eb7e"; + version = "0.1.1"; + sha256 = "a292356748aa7e00c35f755e1515409b2848244926630902f5ded0773048c8bc"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Partners SDK"; license = "unknown"; }) {}; - "gogol-partners_0_1_1" = callPackage + "gogol-partners_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-partners"; - version = "0.1.1"; - sha256 = "a292356748aa7e00c35f755e1515409b2848244926630902f5ded0773048c8bc"; + version = "0.2.0"; + sha256 = "3bce3a43fc727b78b0d90d566a6769ff704eb4764948d0d2c328d95d5c24722c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Partners SDK"; @@ -76335,20 +73852,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-people"; - version = "0.1.0"; - sha256 = "8cb6eba72fbee2057c58ab7521ba962a44cfd131f4b5dc1a382c8b2e97083e50"; + version = "0.1.1"; + sha256 = "adbb0f4b9df631ddca20f269f7a3518aeefbaab8b0ae51e0568a4e1d0e5abc76"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google People SDK"; license = "unknown"; }) {}; - "gogol-people_0_1_1" = callPackage + "gogol-people_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-people"; - version = "0.1.1"; - sha256 = "adbb0f4b9df631ddca20f269f7a3518aeefbaab8b0ae51e0568a4e1d0e5abc76"; + version = "0.2.0"; + sha256 = "18b1c3d8b916acd8e53c618c00f7e6f06dd310840a7a2f242f271635409bd9bb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google People SDK"; @@ -76360,20 +73877,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-play-moviespartner"; - version = "0.1.0"; - sha256 = "6ddde72865f91a798e8a1e1281a0a79d6f3d5cd2c34b94146d72bd764d91df9a"; + version = "0.1.1"; + sha256 = "d674196adb4deb01578cb93290953c8d8fb88a741937f8f5a53ebc57e8552623"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Movies Partner SDK"; license = "unknown"; }) {}; - "gogol-play-moviespartner_0_1_1" = callPackage + "gogol-play-moviespartner_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-play-moviespartner"; - version = "0.1.1"; - sha256 = "d674196adb4deb01578cb93290953c8d8fb88a741937f8f5a53ebc57e8552623"; + version = "0.2.0"; + sha256 = "397206cf5681131cdd97191b9b98151c468923c6df6df73d8391e600036d8b44"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Movies Partner SDK"; @@ -76385,20 +73902,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-plus"; - version = "0.1.0"; - sha256 = "97646d9b6678b5bb56b0d9ba92bbbdd9baac2e8e50df49f25d60f4bbe08a3840"; + version = "0.1.1"; + sha256 = "a8f2751e8b1c2b55481592b7644672972f3d983fc2c7d3ede9ac696e9c3626d1"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google + SDK"; license = "unknown"; }) {}; - "gogol-plus_0_1_1" = callPackage + "gogol-plus_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-plus"; - version = "0.1.1"; - sha256 = "a8f2751e8b1c2b55481592b7644672972f3d983fc2c7d3ede9ac696e9c3626d1"; + version = "0.2.0"; + sha256 = "32f64fd22d7a2290fe7ef29edf2a982cfe2c76fb9817d068733837bdca48d8da"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google + SDK"; @@ -76410,20 +73927,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-plus-domains"; - version = "0.1.0"; - sha256 = "dce9a8f2f7404a39be2f44b269fc0ef5fa0eb908cc5dda184ea865abca31449f"; + version = "0.1.1"; + sha256 = "7ccfb46bec79938344629a2199df912e6279d8da06f449a16faa69309e49afea"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google + Domains SDK"; license = "unknown"; }) {}; - "gogol-plus-domains_0_1_1" = callPackage + "gogol-plus-domains_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-plus-domains"; - version = "0.1.1"; - sha256 = "7ccfb46bec79938344629a2199df912e6279d8da06f449a16faa69309e49afea"; + version = "0.2.0"; + sha256 = "c5497f9e0637a5e657cfbbf3003e4101de371b407e81e0df8a89db0979dc0a9b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google + Domains SDK"; @@ -76435,20 +73952,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-prediction"; - version = "0.1.0"; - sha256 = "f877ae9455f43b924b91e08f11c0c6053b72b78a5be28d8f4ea4ed7256e68ca9"; + version = "0.1.1"; + sha256 = "7317244d941417971e93b42bc6a4a87220bafdc943e3ab752890380875a37e58"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Prediction SDK"; license = "unknown"; }) {}; - "gogol-prediction_0_1_1" = callPackage + "gogol-prediction_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-prediction"; - version = "0.1.1"; - sha256 = "7317244d941417971e93b42bc6a4a87220bafdc943e3ab752890380875a37e58"; + version = "0.2.0"; + sha256 = "91c34600473b3e09b0e6a0bcf151b4e7d5120a8d0ad7fd6a225cb9312f2e8ba7"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Prediction SDK"; @@ -76460,20 +73977,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-proximitybeacon"; - version = "0.1.0"; - sha256 = "b46bfe6c5bffb3714c3b66a9aa6768ad8d62e84588cc20202956da9fc45ad872"; + version = "0.1.1"; + sha256 = "96ef7f2878d294e0d08b2cef02106c40cfc19774dabdee37890b359579d54fb2"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Proximity Beacon SDK"; license = "unknown"; }) {}; - "gogol-proximitybeacon_0_1_1" = callPackage + "gogol-proximitybeacon_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-proximitybeacon"; - version = "0.1.1"; - sha256 = "96ef7f2878d294e0d08b2cef02106c40cfc19774dabdee37890b359579d54fb2"; + version = "0.2.0"; + sha256 = "5bff5ddbf059ca8fa55a19f9a892339ef50acb5e5864016cc5a6eae58def1456"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Proximity Beacon SDK"; @@ -76485,20 +74002,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-pubsub"; - version = "0.1.0"; - sha256 = "2063ab0083d0f8538bdf9ff73b567dfaf705198efa3507b30a54a38bf4c8c6fb"; + version = "0.1.1"; + sha256 = "ffc159c780ed332cc287ecc953501f405d77c9cb69074601b51f7e36b1d61d18"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Pub/Sub SDK"; license = "unknown"; }) {}; - "gogol-pubsub_0_1_1" = callPackage + "gogol-pubsub_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-pubsub"; - version = "0.1.1"; - sha256 = "ffc159c780ed332cc287ecc953501f405d77c9cb69074601b51f7e36b1d61d18"; + version = "0.2.0"; + sha256 = "643868bfe3e341d81c576e6a274676d5fda86ad542dc8a8021f82570a51a5ed3"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Pub/Sub SDK"; @@ -76510,20 +74027,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-qpxexpress"; - version = "0.1.0"; - sha256 = "388e2920fc6c35d8341fe728652448edfe5305d48f8dac579af4ed369d918d42"; + version = "0.1.1"; + sha256 = "436863f8807d67f615ff615f3c7a3b38f50f1fbdb3ae9351391c4a559aca24be"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google QPX Express SDK"; license = "unknown"; }) {}; - "gogol-qpxexpress_0_1_1" = callPackage + "gogol-qpxexpress_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-qpxexpress"; - version = "0.1.1"; - sha256 = "436863f8807d67f615ff615f3c7a3b38f50f1fbdb3ae9351391c4a559aca24be"; + version = "0.2.0"; + sha256 = "a62fbb56b641032b33b55d26235df766db1e2cca27f307054fcd0e48d5bb7813"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google QPX Express SDK"; @@ -76535,20 +74052,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-replicapool"; - version = "0.1.0"; - sha256 = "765772804708e48f0f443d94bed6980454b2a2d01ae390808cd23fa278e068d3"; + version = "0.1.1"; + sha256 = "e2a0a6a0da1ffc95eee4d233d85bbb6097466fc644ae73c7600477d2b2845b75"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Group Manager SDK"; license = "unknown"; }) {}; - "gogol-replicapool_0_1_1" = callPackage + "gogol-replicapool_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-replicapool"; - version = "0.1.1"; - sha256 = "e2a0a6a0da1ffc95eee4d233d85bbb6097466fc644ae73c7600477d2b2845b75"; + version = "0.2.0"; + sha256 = "82331105facb5afe1d86fdaa1dfd8da0c17ea76b4b5af559e1fb8dfda8ddc245"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Group Manager SDK"; @@ -76560,20 +74077,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-replicapool-updater"; - version = "0.1.0"; - sha256 = "c57504625cbd16f4cb6c8022736f5b6135dacea1daf9a550aba303e38abe8c40"; + version = "0.1.1"; + sha256 = "2cb4678f91f2c8eff2ebf9c84bcdef003abb3e1fcc120dc4d36879e676c71927"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Group Updater SDK"; license = "unknown"; }) {}; - "gogol-replicapool-updater_0_1_1" = callPackage + "gogol-replicapool-updater_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-replicapool-updater"; - version = "0.1.1"; - sha256 = "2cb4678f91f2c8eff2ebf9c84bcdef003abb3e1fcc120dc4d36879e676c71927"; + version = "0.2.0"; + sha256 = "0d35642fdc7d5c319501bd091e1225b516249ef0f082290e8b1750c44c9037b8"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Group Updater SDK"; @@ -76585,20 +74102,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-resourcemanager"; - version = "0.1.0"; - sha256 = "021bfb32c5f98e730815d4731c0beabb61e9ff20645096d6d10ed338a1000d4f"; + version = "0.1.1"; + sha256 = "b111d37b51d11631d32c0ba201d0483a4693a33d4b805038a74ddca049618577"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Resource Manager SDK"; license = "unknown"; }) {}; - "gogol-resourcemanager_0_1_1" = callPackage + "gogol-resourcemanager_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-resourcemanager"; - version = "0.1.1"; - sha256 = "b111d37b51d11631d32c0ba201d0483a4693a33d4b805038a74ddca049618577"; + version = "0.2.0"; + sha256 = "32c1537b1a8238e8c91f67a6289fc07d72c596a4b0b3625306565465173f2445"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Resource Manager SDK"; @@ -76610,20 +74127,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-resourceviews"; - version = "0.1.0"; - sha256 = "3ae66598edf8248f78a82f229c0333b3e1de9bfd56f25ebf1339802f51a1c8a2"; + version = "0.1.1"; + sha256 = "76457816587d173633ae5e421617e384599f104079a7f5db3ce954174a59b823"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Groups SDK"; license = "unknown"; }) {}; - "gogol-resourceviews_0_1_1" = callPackage + "gogol-resourceviews_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-resourceviews"; - version = "0.1.1"; - sha256 = "76457816587d173633ae5e421617e384599f104079a7f5db3ce954174a59b823"; + version = "0.2.0"; + sha256 = "fb8024792a51e8c7a2d4a93edd3b2d4d8d6b03d826ffdadcbfb26cd4d07bc171"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Groups SDK"; @@ -76635,8 +74152,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-runtimeconfig"; - version = "0.1.1"; - sha256 = "44efa4354d6cd66ccf7a49d4af0b2243eeac2ad375b3ba6a394abdb65f4d4e5c"; + version = "0.2.0"; + sha256 = "d4b92f4929007d2da9741c46907137a30a8fb308f0defabe4b64b1c8af58a681"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud RuntimeConfig SDK"; @@ -76648,8 +74165,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-safebrowsing"; - version = "0.1.1"; - sha256 = "fb510fb5f125c02f768f3b0653fe2c8a65776a0f81b989906867004aaed31de8"; + version = "0.2.0"; + sha256 = "32b972796fddf933ef21c28b4904b7f9192459a5e7b98ce46adca4f3f2d3a171"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Safe Browsing APIs SDK"; @@ -76661,20 +74178,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-script"; - version = "0.1.0"; - sha256 = "92ed9c5f8a2ece251dc7a5777cd24ad2f8cab14683eae775b2f9eea30a0bf731"; + version = "0.1.1"; + sha256 = "30b61c4088de0564cafe8fea83d9bd3666db7c3236b6c7b153b6794007f1dd0f"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Apps Script Execution SDK"; license = "unknown"; }) {}; - "gogol-script_0_1_1" = callPackage + "gogol-script_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-script"; - version = "0.1.1"; - sha256 = "30b61c4088de0564cafe8fea83d9bd3666db7c3236b6c7b153b6794007f1dd0f"; + version = "0.2.0"; + sha256 = "e2572e207591d10c8a7eaff165ccb54286ca2b041c4ea2323d010c186ada47cb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Apps Script Execution SDK"; @@ -76686,8 +74203,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-servicecontrol"; - version = "0.1.1"; - sha256 = "1f8da851a8d5056c67fd9f3fdba2269dde07c1ef65572aeb77a74194066b8e77"; + version = "0.2.0"; + sha256 = "0f94288509755891bb1195911a1cb367b1a9304ff1acb30d6713c5d776fb3c27"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Service Control SDK"; @@ -76699,8 +74216,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-servicemanagement"; - version = "0.1.1"; - sha256 = "4a8ed16569b5e342181a91a07479da3fa50e3c00ab12c4dc27313455fd64c4ac"; + version = "0.2.0"; + sha256 = "0b0e654df7bf54672ff8b34feff48208a07ec8215c69f7665946f4b3386a762d"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Service Management SDK"; @@ -76712,20 +74229,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-sheets"; - version = "0.1.0"; - sha256 = "ba134680a2c6337acbf7f302d953a993993553618a5032e39c49eaabdc7b7a94"; + version = "0.1.1"; + sha256 = "44b3028332b6bbfa3243e3085777b5a85a3361a75b6733c563b2462a764da678"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Sheets SDK"; license = "unknown"; }) {}; - "gogol-sheets_0_1_1" = callPackage + "gogol-sheets_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-sheets"; - version = "0.1.1"; - sha256 = "44b3028332b6bbfa3243e3085777b5a85a3361a75b6733c563b2462a764da678"; + version = "0.2.0"; + sha256 = "8494db34d160118c23391864c3d3602179313cd81a874fd2c19059309b6a37e0"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Sheets SDK"; @@ -76737,20 +74254,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-shopping-content"; - version = "0.1.0"; - sha256 = "27d3ea61026c0cf577795d1b36766eddcce90f942409ed0dea512d730fbbd361"; + version = "0.1.1"; + sha256 = "28c77ade1591d243933517cda460edf2f30b2682ccd3e14007cc5383bc65551f"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Content API for Shopping SDK"; license = "unknown"; }) {}; - "gogol-shopping-content_0_1_1" = callPackage + "gogol-shopping-content_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-shopping-content"; - version = "0.1.1"; - sha256 = "28c77ade1591d243933517cda460edf2f30b2682ccd3e14007cc5383bc65551f"; + version = "0.2.0"; + sha256 = "f64953dd9618c5dbf1904df08b4211afb1e06109cf053e3e1244e3b167645662"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Content API for Shopping SDK"; @@ -76762,20 +74279,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-siteverification"; - version = "0.1.0"; - sha256 = "4dd9bcd9e9ba39d4d9a6245086faea856c3baa3b4728e9849d8fe50a7f2ff8e1"; + version = "0.1.1"; + sha256 = "eb2d75deeb35168af169ed77ce69d1e12e888128c3a3a77df7e0fcc98b0cfbe1"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Site Verification SDK"; license = "unknown"; }) {}; - "gogol-siteverification_0_1_1" = callPackage + "gogol-siteverification_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-siteverification"; - version = "0.1.1"; - sha256 = "eb2d75deeb35168af169ed77ce69d1e12e888128c3a3a77df7e0fcc98b0cfbe1"; + version = "0.2.0"; + sha256 = "1f743419a85baafdfa1cbbea01f6f1cfbcf23ae95943517166ae7518cbfc0a32"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Site Verification SDK"; @@ -76783,24 +74300,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gogol-slides" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-slides"; + version = "0.2.0"; + sha256 = "e51390bc85a54109473bf24b7434f0f7dd5ec189cc9b76a6201f9a26c6d4ac4c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Slides SDK"; + license = "unknown"; + }) {}; + "gogol-spectrum" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-spectrum"; - version = "0.1.0"; - sha256 = "1c1f35f2520281a27e9ebd86895cc91432f1ae4f6e26caf5936054fd72fd04a4"; + version = "0.1.1"; + sha256 = "31329fe1e2304d729bc1c36204d466140ebf6ed68183a22f3527eb609ef82ec1"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Spectrum Database SDK"; license = "unknown"; }) {}; - "gogol-spectrum_0_1_1" = callPackage + "gogol-spectrum_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-spectrum"; - version = "0.1.1"; - sha256 = "31329fe1e2304d729bc1c36204d466140ebf6ed68183a22f3527eb609ef82ec1"; + version = "0.2.0"; + sha256 = "268d3a60b2f05702ff63fbaf56d485e36089691c83e1a2a491419e3b547b6f7e"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Spectrum Database SDK"; @@ -76812,20 +74341,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-sqladmin"; - version = "0.1.0"; - sha256 = "04a14790303a9bf830e4fe7471c52924e5ed7f9248676e9f6a3afea7aaab7519"; + version = "0.1.1"; + sha256 = "6f7baa334dfe6e2cc430a1692d48ca20ec656ab10ff504f8f77dbde382c241bf"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud SQL Administration SDK"; license = "unknown"; }) {}; - "gogol-sqladmin_0_1_1" = callPackage + "gogol-sqladmin_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-sqladmin"; - version = "0.1.1"; - sha256 = "6f7baa334dfe6e2cc430a1692d48ca20ec656ab10ff504f8f77dbde382c241bf"; + version = "0.2.0"; + sha256 = "d7cb8593629a7694b12ef4e1249158883e4334d8d1d68ef8612f987aa1dfe153"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud SQL Administration SDK"; @@ -76837,20 +74366,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-storage"; - version = "0.1.0"; - sha256 = "eba6b6c0c2d7fbc9a24f66f08fa02699317a26b5a85cd2936dabb7c418f90912"; + version = "0.1.1"; + sha256 = "7af4f34560e37bbcd7dfb6a872225806afec7736322f20a99497e3817486aa72"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Storage JSON SDK"; license = "unknown"; }) {}; - "gogol-storage_0_1_1" = callPackage + "gogol-storage_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-storage"; - version = "0.1.1"; - sha256 = "7af4f34560e37bbcd7dfb6a872225806afec7736322f20a99497e3817486aa72"; + version = "0.2.0"; + sha256 = "158528dc7488c5ac987c2cd05e9d1d15576aa9085d8c1ed3bfb9f3cba517d8da"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Storage JSON SDK"; @@ -76862,20 +74391,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-storage-transfer"; - version = "0.1.0"; - sha256 = "fb860f45966d2c5a3545a554a2446c9f66ab58b7cb85f09137ba452dcbf965cd"; + version = "0.1.1"; + sha256 = "7f32157f51d3b5d3946a70d8015d03004f9d35c7aa5ef614249e516b9acca745"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Storage Transfer SDK"; license = "unknown"; }) {}; - "gogol-storage-transfer_0_1_1" = callPackage + "gogol-storage-transfer_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-storage-transfer"; - version = "0.1.1"; - sha256 = "7f32157f51d3b5d3946a70d8015d03004f9d35c7aa5ef614249e516b9acca745"; + version = "0.2.0"; + sha256 = "64aa9748678d9ed6785cd0475b1711b13389b83c84dc99c71cd4fde2dbde3f1e"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Storage Transfer SDK"; @@ -76887,20 +74416,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-tagmanager"; - version = "0.1.0"; - sha256 = "cab01a9f11ac12381e410d16c4a951dc4def7a08e42a94cd084c3e156faf61aa"; + version = "0.1.1"; + sha256 = "8dfe4001b9df03cc812ae11d7c9f91dd063da3fc26242426b409b5dd6ae420ee"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Tag Manager SDK"; license = "unknown"; }) {}; - "gogol-tagmanager_0_1_1" = callPackage + "gogol-tagmanager_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-tagmanager"; - version = "0.1.1"; - sha256 = "8dfe4001b9df03cc812ae11d7c9f91dd063da3fc26242426b409b5dd6ae420ee"; + version = "0.2.0"; + sha256 = "fc589362f09adf19a1b4e1b2609d4787eb7df73a27ff6f433fecb4614bd0543f"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Tag Manager SDK"; @@ -76912,20 +74441,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-taskqueue"; - version = "0.1.0"; - sha256 = "5f03a174e2bbf26fa35823e50106b476ecfed71757519fa4c251b24961491765"; + version = "0.1.1"; + sha256 = "4797b39b38fb82fc7edf0314d2b168d78c05494c68fa81ef0c978e172452de1c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google TaskQueue SDK"; license = "unknown"; }) {}; - "gogol-taskqueue_0_1_1" = callPackage + "gogol-taskqueue_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-taskqueue"; - version = "0.1.1"; - sha256 = "4797b39b38fb82fc7edf0314d2b168d78c05494c68fa81ef0c978e172452de1c"; + version = "0.2.0"; + sha256 = "5b172c962a9aca7eed4cb4af3e05ccebef93b80584fb6fc902b1c462a8b5b8a6"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google TaskQueue SDK"; @@ -76937,20 +74466,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-translate"; - version = "0.1.0"; - sha256 = "17d71ff0f9665e8d8737b120cae1d73222d2bea8dce031bf49e9246461921679"; + version = "0.1.1"; + sha256 = "208cf8e92f66cfe35502a07eceb929a63f836af5802344d0b43796cf81c4edaa"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Translate SDK"; license = "unknown"; }) {}; - "gogol-translate_0_1_1" = callPackage + "gogol-translate_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-translate"; - version = "0.1.1"; - sha256 = "208cf8e92f66cfe35502a07eceb929a63f836af5802344d0b43796cf81c4edaa"; + version = "0.2.0"; + sha256 = "b965db2484daf4e5d91594d5e7eed8aa020c99ae1512925718c23406a55e78cc"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Translate SDK"; @@ -76962,20 +74491,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-urlshortener"; - version = "0.1.0"; - sha256 = "7247b9d5432d2ef0386134a6ac011b93365779158e62ec56f2d4c8666ceea4ab"; + version = "0.1.1"; + sha256 = "d958cba0e06b15512713ad893ae1a8a47f0654b2b734d06c91f23dd781fa7cf8"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google URL Shortener SDK"; license = "unknown"; }) {}; - "gogol-urlshortener_0_1_1" = callPackage + "gogol-urlshortener_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-urlshortener"; - version = "0.1.1"; - sha256 = "d958cba0e06b15512713ad893ae1a8a47f0654b2b734d06c91f23dd781fa7cf8"; + version = "0.2.0"; + sha256 = "6bb29a4f08babe57deff1ce6d4ee045266cdfdc91ace37d821962801717e8672"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google URL Shortener SDK"; @@ -76987,20 +74516,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-useraccounts"; - version = "0.1.0"; - sha256 = "5ca3d5fca236a4c17d66daee9db3f79a8e57e3cccfb8d494514a8f3c3fba7b10"; + version = "0.1.1"; + sha256 = "4064ad99cea0db098c6f74fd36b1ba6167354a0e889f7bbc773b08a045ef8647"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud User Accounts SDK"; license = "unknown"; }) {}; - "gogol-useraccounts_0_1_1" = callPackage + "gogol-useraccounts_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-useraccounts"; - version = "0.1.1"; - sha256 = "4064ad99cea0db098c6f74fd36b1ba6167354a0e889f7bbc773b08a045ef8647"; + version = "0.2.0"; + sha256 = "91504ac3cbdb11a45ee6762799bfefb3be973b8883ab84254c3bb3101eb9cc67"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud User Accounts SDK"; @@ -77012,20 +74541,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-vision"; - version = "0.1.0"; - sha256 = "0a501b91618996ee75f127838626b632c987b0e91ae15d948afecdd4de4c0b0d"; + version = "0.1.1"; + sha256 = "e6046ce0d2c131eb0d5c0366577a638eb59e536eb4c4e462a27b0bb05090a565"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Vision SDK"; license = "unknown"; }) {}; - "gogol-vision_0_1_1" = callPackage + "gogol-vision_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-vision"; - version = "0.1.1"; - sha256 = "e6046ce0d2c131eb0d5c0366577a638eb59e536eb4c4e462a27b0bb05090a565"; + version = "0.2.0"; + sha256 = "6c87358e77e3565249701b36d8e5fa552f454dfd496c1f65f6586a5781846071"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Vision SDK"; @@ -77037,20 +74566,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-webmaster-tools"; - version = "0.1.0"; - sha256 = "0137d9c88a2c4fb1ef1a10a026ff44e628e52dcf5c915d6b479457b98536aec4"; + version = "0.1.1"; + sha256 = "cfe78f510843473f6195b870de4de782cb5309e58f85af4afcb015c889fc9608"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Search Console SDK"; license = "unknown"; }) {}; - "gogol-webmaster-tools_0_1_1" = callPackage + "gogol-webmaster-tools_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-webmaster-tools"; - version = "0.1.1"; - sha256 = "cfe78f510843473f6195b870de4de782cb5309e58f85af4afcb015c889fc9608"; + version = "0.2.0"; + sha256 = "00633481f3965ecaf2a3d6b56e4d67d8d13bb901b9023d613b4c527f7a5da04b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Search Console SDK"; @@ -77062,20 +74591,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube"; - version = "0.1.0"; - sha256 = "2edc3a34cb428be4be4bec367f718f047936a80ece335a9b841d82ada7c3cc1f"; + version = "0.1.1"; + sha256 = "a9a9b267bef13f1dcfebd49a2d049a125c5774eba6774e1c8384570e80404f8b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Data SDK"; license = "unknown"; }) {}; - "gogol-youtube_0_1_1" = callPackage + "gogol-youtube_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube"; - version = "0.1.1"; - sha256 = "a9a9b267bef13f1dcfebd49a2d049a125c5774eba6774e1c8384570e80404f8b"; + version = "0.2.0"; + sha256 = "425ead26d5096dc3fff0333971b79e7cd4b2ee49b52efdb1609a5ca557b29005"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Data SDK"; @@ -77087,20 +74616,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube-analytics"; - version = "0.1.0"; - sha256 = "8c6a8681cb678edf8208f58f051db36e25cc4b8326319eab071ef573e9e4783d"; + version = "0.1.1"; + sha256 = "98297021605ee870f20dcd4c8d8724d8390f9564a4acac237210632b70f7c91b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Analytics SDK"; license = "unknown"; }) {}; - "gogol-youtube-analytics_0_1_1" = callPackage + "gogol-youtube-analytics_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube-analytics"; - version = "0.1.1"; - sha256 = "98297021605ee870f20dcd4c8d8724d8390f9564a4acac237210632b70f7c91b"; + version = "0.2.0"; + sha256 = "0e888dce3cba650909e577641d7e60b19e521db3c48b36d83cf7f0e8300a451b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Analytics SDK"; @@ -77112,20 +74641,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube-reporting"; - version = "0.1.0"; - sha256 = "2ba85f30e218fa1718cf1a2dcf3c768d023856cdd30a3544c5ffea0750b3f37c"; + version = "0.1.1"; + sha256 = "96d1bf151a30efa99e0ee01407ed1d3356bbc61bf696e691ba344a2eeae35e2c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Reporting SDK"; license = "unknown"; }) {}; - "gogol-youtube-reporting_0_1_1" = callPackage + "gogol-youtube-reporting_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube-reporting"; - version = "0.1.1"; - sha256 = "96d1bf151a30efa99e0ee01407ed1d3356bbc61bf696e691ba344a2eeae35e2c"; + version = "0.2.0"; + sha256 = "f116487fb543dc596485ce07bf9b17f3867197871ff434a9de68414706a92d39"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Reporting SDK"; @@ -77253,6 +74782,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "google-oauth2-for-cli" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath + , hspec, http-types, req, time, wai, warp + }: + mkDerivation { + pname = "google-oauth2-for-cli"; + version = "0.1.0.0"; + sha256 = "ccbb42b8d946442399d057cf211df23f46a8d95bd82a6965bc078e5385d2232d"; + libraryHaskellDepends = [ + aeson base bytestring directory filepath http-types req time wai + warp + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/ishiy1993/google-oauth2-for-cli#readme"; + description = "Get Google OAuth2 token for CLI tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "google-oauth2-jwt" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL , RSA, text, unix-time @@ -77725,17 +75273,19 @@ self: { }) {}; "graflog" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, mtl, test-fixture - , text, text-conversions + ({ mkDerivation, aeson, base, bytestring, containers, hspec, mtl + , test-fixture, text, text-conversions }: mkDerivation { pname = "graflog"; - version = "1.0.0"; - sha256 = "fcc205034be28055c3f6550e09a94bec4561530926151d7710001b53293c17c0"; + version = "6.1.5"; + sha256 = "8e784641738220a999963e36b9e1b10b88a767bd79763481da5e2f47e4f37ddd"; libraryHaskellDepends = [ - aeson base bytestring text text-conversions + aeson base bytestring containers mtl text text-conversions + ]; + testHaskellDepends = [ + aeson base containers hspec mtl test-fixture text ]; - testHaskellDepends = [ base hspec mtl test-fixture ]; homepage = "https://github.com/m-arnold/graflog#readme"; description = "Monadic correlated log events"; license = stdenv.lib.licenses.bsd3; @@ -78269,6 +75819,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "graphql-api" = callPackage + ({ mkDerivation, aeson, attoparsec, base, containers, directory + , doctest, exceptions, hspec, protolude, QuickCheck, raw-strings-qq + , scientific, tasty, tasty-hspec, text, transformers + }: + mkDerivation { + pname = "graphql-api"; + version = "0.1.1"; + sha256 = "e8d19197ff982e111ec199b411faf78e2800778b82c3c0147f1ef35615522a7d"; + revision = "1"; + editedCabalFile = "593742fa27cf4b14bcb88ced31b9af3a0567a5fab700e18e2f47f49a6c5fd1a9"; + libraryHaskellDepends = [ + aeson attoparsec base containers exceptions protolude QuickCheck + scientific text transformers + ]; + testHaskellDepends = [ + aeson attoparsec base containers directory doctest exceptions hspec + protolude QuickCheck raw-strings-qq tasty tasty-hspec transformers + ]; + homepage = "https://github.com/jml/graphql-api#readme"; + description = "Write type-safe GraphQL services in Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "graphs" = callPackage ({ mkDerivation, array, base, containers, transformers , transformers-compat, void @@ -78546,6 +76121,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gridbounds" = callPackage + ({ mkDerivation, base, earclipper, gjk, gridbox, hspec }: + mkDerivation { + pname = "gridbounds"; + version = "0.0.0.1"; + sha256 = "100a017e6286ec0cc738099982643ea0e0016076d2d48e11f71a061da1641eea"; + libraryHaskellDepends = [ base earclipper gjk gridbox ]; + testHaskellDepends = [ base earclipper gjk gridbox hspec ]; + homepage = "https://github.com/zaidan/gridbounds#readme"; + description = "Collision detection for GridBox"; + license = stdenv.lib.licenses.mit; + }) {}; + + "gridbox" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "gridbox"; + version = "0.3.0.0"; + sha256 = "912792b8f7df3d343f68caafe4bae91ef138686073c80a7f9486cbdb77a0aa45"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/zaidan/gridbox#readme"; + description = "A grid box model"; + license = stdenv.lib.licenses.mit; + }) {}; + "gridfs" = callPackage ({ mkDerivation, base, bson, bytestring, conduit, conduit-extra , monad-control, mongoDB, mtl, pureMD5, resourcet, tagged, text @@ -78631,19 +76232,17 @@ self: { "groundhog" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-builder, bytestring, containers, monad-control - , monad-logger, mtl, scientific, text, time, transformers + , blaze-builder, bytestring, containers, monad-control, mtl + , resourcet, scientific, text, time, transformers , transformers-base }: mkDerivation { pname = "groundhog"; - version = "0.7.0.3"; - sha256 = "39713e7b3423ea34a5ac803d4a563d7f9674bbf72700e263a00c7bc70328ac58"; - revision = "2"; - editedCabalFile = "b4a2f7876feaaf6ad8d4589989902d4452468910c0f3f01a04827a001036f3ff"; + version = "0.8"; + sha256 = "16955dfe46737481400b1accd9e2b4ef3e7318e296c8b4838ba0651f7d51af1c"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring - containers monad-control monad-logger mtl scientific text time + containers monad-control mtl resourcet scientific text time transformers transformers-base ]; homepage = "http://github.com/lykahb/groundhog"; @@ -78678,8 +76277,8 @@ self: { }: mkDerivation { pname = "groundhog-inspector"; - version = "0.7.1.2"; - sha256 = "909e4c47c8c58d57bd286b71db86526dfdf3eba12dfba9e61602908f82ad9d93"; + version = "0.8"; + sha256 = "d43df51f3feb32a8981df6850f35e55d3eed7ec2a5ac28ead4093947740b076e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78699,15 +76298,15 @@ self: { "groundhog-mysql" = callPackage ({ mkDerivation, base, bytestring, containers, groundhog , monad-control, monad-logger, mysql, mysql-simple, resource-pool - , text, time, transformers + , resourcet, text, time, transformers }: mkDerivation { pname = "groundhog-mysql"; - version = "0.7.0.1"; - sha256 = "ee884137d44cb3f391d402f524d149825477a898b29e99e8056a03b56db4f606"; + version = "0.8"; + sha256 = "51ad8be513110081fff4333ae532b35e7ac5b35c4673e4c982bc0eca6c485666"; libraryHaskellDepends = [ base bytestring containers groundhog monad-control monad-logger - mysql mysql-simple resource-pool text time transformers + mysql mysql-simple resource-pool resourcet text time transformers ]; description = "MySQL backend for the groundhog library"; license = stdenv.lib.licenses.bsd3; @@ -78715,21 +76314,19 @@ self: { }) {}; "groundhog-postgresql" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , containers, groundhog, monad-control, monad-logger - , postgresql-libpq, postgresql-simple, resource-pool, text, time - , transformers + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , containers, groundhog, monad-control, postgresql-libpq + , postgresql-simple, resource-pool, resourcet, text, time + , transformers, vector }: mkDerivation { pname = "groundhog-postgresql"; - version = "0.7.0.2"; - sha256 = "312045c39c973596e8e92b8001776bb86898e3c8766e0a42c71e63b343918da3"; - revision = "1"; - editedCabalFile = "014cf49927d870d99d906064fc27ee219f7145e71a409cc69ae3ed0cdc0699ca"; + version = "0.8"; + sha256 = "78a5acb35b9b1dae9a9076e41db2dde46198b8e8494baaac98c6fdfc64b77f8d"; libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring containers groundhog - monad-control monad-logger postgresql-libpq postgresql-simple - resource-pool text time transformers + aeson attoparsec base blaze-builder bytestring containers groundhog + monad-control postgresql-libpq postgresql-simple resource-pool + resourcet text time transformers vector ]; description = "PostgreSQL backend for the groundhog library"; license = stdenv.lib.licenses.bsd3; @@ -78738,16 +76335,16 @@ self: { "groundhog-sqlite" = callPackage ({ mkDerivation, base, bytestring, containers, direct-sqlite - , groundhog, monad-control, monad-logger, resource-pool, text + , groundhog, monad-control, resource-pool, resourcet, text , transformers, unordered-containers }: mkDerivation { pname = "groundhog-sqlite"; - version = "0.7.0.1"; - sha256 = "be89709d458bb03a688281fbeab0408cdbc4f7942bf7559c25feb6ab9c4f5553"; + version = "0.8"; + sha256 = "7dcbbd4bcf9b38408bc29608a514a2b535c85490e4649090c342603c91283092"; libraryHaskellDepends = [ base bytestring containers direct-sqlite groundhog monad-control - monad-logger resource-pool text transformers unordered-containers + resource-pool resourcet text transformers unordered-containers ]; description = "Sqlite3 backend for the groundhog library"; license = stdenv.lib.licenses.bsd3; @@ -78760,8 +76357,8 @@ self: { }: mkDerivation { pname = "groundhog-th"; - version = "0.7.0.1"; - sha256 = "700cd109989bbf4dd8cff72249077035cb2ca8c1d4c9748bfecf4bc17f3ee095"; + version = "0.8"; + sha256 = "cef719b550e0c411fabf177e53466db7734d06ad6494d0548fa8b9aad7a72ec3"; libraryHaskellDepends = [ aeson base bytestring containers groundhog template-haskell text time unordered-containers yaml @@ -80086,8 +77683,8 @@ self: { }: mkDerivation { pname = "habit"; - version = "0.2.1.2"; - sha256 = "d15b24cf6c949469fecaa0e3da8faab350626b260c1dfbce915ba1be4c5e4bea"; + version = "0.2.2.0"; + sha256 = "59aa5d9f13c7aefd9f8134d764b2f8f8fb9a3b42cb7a42737296e36618e9cf22"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80100,6 +77697,7 @@ self: { homepage = "https://github.com/airalab/habit#readme"; description = "Haskell message bot framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hable" = callPackage @@ -81381,6 +78979,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hailgun_0_4_1_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, email-validate + , exceptions, filepath, http-client, http-client-tls, http-types + , tagsoup, text, time, transformers + }: + mkDerivation { + pname = "hailgun"; + version = "0.4.1.2"; + sha256 = "f0b8e11e2a09d0d737620ed46e8029c5679cfe392c47df4be5ee3ba63a114ff1"; + libraryHaskellDepends = [ + aeson base bytestring email-validate exceptions filepath + http-client http-client-tls http-types tagsoup text time + transformers + ]; + description = "Mailgun REST api interface for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hailgun-send" = callPackage ({ mkDerivation, base, bytestring, configurator, hailgun, text }: mkDerivation { @@ -81590,8 +79207,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.9.3.0"; - sha256 = "f15c6cd2118501fa6be44e3cb3d9f37a22fced0fd1ebd64236277e2daf622e7a"; + version = "4.9.5.1"; + sha256 = "8deca33939717372ca227559dfe82aa0b02af49b19e9ea60051f555dcee2cfe6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82945,8 +80562,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.4.6.2"; - sha256 = "0725900491022e8073d0d61408c2f1d170dbeb7c51bc52e1716c9bf829763b09"; + version = "7.4.6.3"; + sha256 = "6dd5f859b114bdbdde00b585800bc4b7ed821dd7bad67bb253e3602d88f5ceef"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -83422,8 +81039,8 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.0.5"; - sha256 = "f0ec1be21cb5560fa575c414c691bcf48f14e6dfb8f53ae5feae013a105639fa"; + version = "0.1.0.9"; + sha256 = "8b013b4fc84019eff89ba9d9e1cba86e84cd5570c8acb51aba9b68a958002097"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 data-default hex network network-simple text transformers @@ -83602,27 +81219,6 @@ self: { }) {}; "hashable" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp - , QuickCheck, random, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, unix - }: - mkDerivation { - pname = "hashable"; - version = "1.2.4.0"; - sha256 = "fb9671db0c39cd48d38e2e13e3352e2bf7dfa6341edfe68789a1753d21bb3cf3"; - libraryHaskellDepends = [ - base bytestring ghc-prim integer-gmp text - ]; - testHaskellDepends = [ - base bytestring ghc-prim HUnit QuickCheck random test-framework - test-framework-hunit test-framework-quickcheck2 text unix - ]; - homepage = "http://github.com/tibbe/hashable"; - description = "A class for types that can be converted to a hash value"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hashable_1_2_5_0" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp , QuickCheck, random, test-framework, test-framework-hunit , test-framework-quickcheck2, text, unix @@ -83641,7 +81237,6 @@ self: { homepage = "http://github.com/tibbe/hashable"; description = "A class for types that can be converted to a hash value"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashable-extras" = callPackage @@ -83749,8 +81344,8 @@ self: { ({ mkDerivation, base, bytestring, containers, split }: mkDerivation { pname = "hashids"; - version = "1.0.2.2"; - sha256 = "989d7d1f50738c664230629b3e43340c929d5995ab978837748a5cc22aaaf308"; + version = "1.0.2.3"; + sha256 = "ecd74235e8f729514214715b828bf479701aa4b777e4f104ea07534a30822534"; libraryHaskellDepends = [ base bytestring containers split ]; testHaskellDepends = [ base bytestring containers split ]; homepage = "http://hashids.org/"; @@ -84083,18 +81678,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_3_0" = callPackage + "haskeline_0_7_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , terminfo, transformers, unix + , process, terminfo, transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.7.3.0"; - sha256 = "566f625ef50877631d72ab2a8335c92c2b03a8c84a1473d915b40e69c9bb4d8a"; + version = "0.7.3.1"; + sha256 = "7bec719c44d03cc78eb343f7927b1fc0482380384eed506ecb1644b86c62db22"; configureFlags = [ "-fterminfo" ]; libraryHaskellDepends = [ - base bytestring containers directory filepath terminfo transformers - unix + base bytestring containers directory filepath process terminfo + transformers unix ]; homepage = "http://trac.haskell.org/haskeline"; description = "A command-line interface for user input, written in Haskell"; @@ -84422,32 +82017,6 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , filepath, glib, gobjectIntrospection, haskell-gi-base, mtl - , pretty-show, process, safe, text, transformers, xdg-basedir - , xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.18"; - sha256 = "c6dabdef4093d0fcbd67fe5b7fa83911f66fdd602bdc02a2615c16d0a1279162"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal containers directory filepath haskell-gi-base - mtl pretty-show process safe text transformers xdg-basedir - xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; - executableHaskellDepends = [ - base containers directory filepath haskell-gi-base pretty-show text - ]; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - - "haskell-gi_0_20" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, glib, gobjectIntrospection, haskell-gi-base, mtl , pretty-show, process, regex-tdfa, safe, text, transformers @@ -84471,23 +82040,9 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; "haskell-gi-base" = callPackage - ({ mkDerivation, base, bytestring, containers, glib, text }: - mkDerivation { - pname = "haskell-gi-base"; - version = "0.18.4"; - sha256 = "45fb9bd2b65668d09f0643c3e4e0629df27610dfb501049c4a4b14a5edba8e16"; - libraryHaskellDepends = [ base bytestring containers text ]; - libraryPkgconfigDepends = [ glib ]; - homepage = "https://github.com/haskell-gi/haskell-gi-base"; - description = "Foundation for libraries generated by haskell-gi"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib;}; - - "haskell-gi-base_0_20" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; @@ -84498,7 +82053,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi-base"; description = "Foundation for libraries generated by haskell-gi"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "haskell-google-trends" = callPackage @@ -84550,10 +82104,8 @@ self: { }: mkDerivation { pname = "haskell-import-graph"; - version = "1.0.0"; - sha256 = "af555336b7e734dae263e5f68b439d6c4234d7b2da493917fadfe132a7034dee"; - revision = "1"; - editedCabalFile = "4c2ba0b2c6d5649842b1f124e4183662cdc4db66810017775ce450cf84223d50"; + version = "1.0.1"; + sha256 = "c708c2d5fa7e48c205aeaf1661b07dc52ec4d6e459f3544585b71dbc63f3be92"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84668,30 +82220,6 @@ self: { }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;}; "haskell-names" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers - , data-lens-light, filemanip, filepath, haskell-src-exts, mtl - , pretty-show, tasty, tasty-golden, transformers - , traverse-with-class, uniplate - }: - mkDerivation { - pname = "haskell-names"; - version = "0.7.0"; - sha256 = "c0582b2a51526e24483d71f1669bba2ef340ae7014babb3a9a5b59296fc5faf2"; - libraryHaskellDepends = [ - aeson base bytestring containers data-lens-light filepath - haskell-src-exts mtl transformers traverse-with-class uniplate - ]; - testHaskellDepends = [ - base containers filemanip filepath haskell-src-exts mtl pretty-show - tasty tasty-golden traverse-with-class - ]; - homepage = "http://documentup.com/haskell-suite/haskell-names"; - description = "Name resolution library for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-names_0_8_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , data-lens-light, filemanip, filepath, haskell-src-exts, mtl , pretty-show, tasty, tasty-golden, transformers @@ -84765,25 +82293,6 @@ self: { }) {}; "haskell-packages" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , deepseq, directory, filepath, haskell-src-exts, hse-cpp, mtl - , optparse-applicative, tagged, transformers, transformers-compat - }: - mkDerivation { - pname = "haskell-packages"; - version = "0.4"; - sha256 = "2c9af5515ce210da304560d6a16b36fa056eefcb2ec609dc0b25c2002ba31021"; - libraryHaskellDepends = [ - aeson base bytestring Cabal containers deepseq directory filepath - haskell-src-exts hse-cpp mtl optparse-applicative tagged - transformers transformers-compat - ]; - homepage = "http://documentup.com/haskell-suite/haskell-packages"; - description = "Haskell suite library for package management and integration with Cabal"; - license = stdenv.lib.licenses.mit; - }) {}; - - "haskell-packages_0_5" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , deepseq, directory, filepath, haskell-src-exts, hse-cpp, mtl , optparse-applicative, tagged, transformers, transformers-compat @@ -84800,7 +82309,6 @@ self: { homepage = "http://documentup.com/haskell-suite/haskell-packages"; description = "Haskell suite library for package management and integration with Cabal"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-pdf-presenter" = callPackage @@ -84999,29 +82507,6 @@ self: { }) {}; "haskell-src-exts" = callPackage - ({ mkDerivation, array, base, containers, cpphs, directory - , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck - , syb, tasty, tasty-golden, tasty-smallcheck - }: - mkDerivation { - pname = "haskell-src-exts"; - version = "1.17.1"; - sha256 = "ba5c547720514515ad0b94eb8a3d7e22a0e2ad2d85b5e1d178e62c61615528bd"; - revision = "1"; - editedCabalFile = "c07248f2a7b4bee1c7777dc6e441e8d1f32a02fb596ea49f47074c68b3c9ea0b"; - libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; - libraryToolDepends = [ happy ]; - testHaskellDepends = [ - base containers directory filepath mtl pretty-show smallcheck syb - tasty tasty-golden tasty-smallcheck - ]; - doCheck = false; - homepage = "https://github.com/haskell-suite/haskell-src-exts"; - description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-src-exts_1_18_2" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck , tasty, tasty-golden, tasty-smallcheck @@ -85040,7 +82525,6 @@ self: { homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-exts_1_19_1" = callPackage @@ -85110,21 +82594,6 @@ self: { }) {}; "haskell-src-meta" = callPackage - ({ mkDerivation, base, haskell-src-exts, pretty, syb - , template-haskell, th-orphans - }: - mkDerivation { - pname = "haskell-src-meta"; - version = "0.6.0.14"; - sha256 = "769124392398695667c800225cd908cb455dadf54a9317870bd9384e0eeb20c9"; - libraryHaskellDepends = [ - base haskell-src-exts pretty syb template-haskell th-orphans - ]; - description = "Parse source to template-haskell abstract syntax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-src-meta_0_7_0_1" = callPackage ({ mkDerivation, base, haskell-src-exts, pretty, syb , template-haskell, th-orphans }: @@ -85137,7 +82606,6 @@ self: { ]; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-meta-mwotton" = callPackage @@ -85188,8 +82656,8 @@ self: { }: mkDerivation { pname = "haskell-tools-ast"; - version = "0.4.1.3"; - sha256 = "f456e74ada1c5ce4386a2b0e6a844c893b75dcdaaccac4dabc49977da8ae3405"; + version = "0.5.0.0"; + sha256 = "69f8feebf6ffbb942f7e0ca9b0e6a258a83f4acda13977e99b4568d36e9dee77"; libraryHaskellDepends = [ base ghc mtl references template-haskell uniplate ]; @@ -85260,8 +82728,8 @@ self: { }: mkDerivation { pname = "haskell-tools-backend-ghc"; - version = "0.4.1.3"; - sha256 = "590147059de94fc0224e86fd1cba144b32737dd9e9e3efa91d6389e99265642e"; + version = "0.5.0.0"; + sha256 = "eb8d8b2367020d851f83a2a9fccda813da6537a38c7065e92237f769e7bd2fe8"; libraryHaskellDepends = [ base bytestring containers ghc haskell-tools-ast mtl references safe split template-haskell transformers uniplate @@ -85275,13 +82743,13 @@ self: { "haskell-tools-cli" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , ghc, ghc-paths, haskell-tools-ast, haskell-tools-prettyprint - , haskell-tools-refactor, knob, mtl, references, split, tasty - , tasty-hunit + , haskell-tools-refactor, knob, mtl, process, references, split + , tasty, tasty-hunit }: mkDerivation { pname = "haskell-tools-cli"; - version = "0.4.1.3"; - sha256 = "e37721ca8bcbdc0e5eb2977a956b1e97c858a13f7d8c236c3a04e948e4ebe699"; + version = "0.5.0.0"; + sha256 = "08796a6d02d06c9cd68936436a452e82c90468e1420d3f02b3ed040f117d2c14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85289,7 +82757,7 @@ self: { haskell-tools-prettyprint haskell-tools-refactor mtl references split ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ base directory process split ]; testHaskellDepends = [ base bytestring directory filepath knob tasty tasty-hunit ]; @@ -85307,8 +82775,8 @@ self: { }: mkDerivation { pname = "haskell-tools-daemon"; - version = "0.4.1.3"; - sha256 = "0a10d80c3ed2bdc65010ef73b7d090544a086e4eba09b613f3045b23a141814a"; + version = "0.5.0.0"; + sha256 = "588ef66d492b16d6d76a34111dc43fc3243c4bff48d6f5aa2281c72ae365925a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85318,7 +82786,7 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - aeson base bytestring directory filepath HUnit network process + aeson base bytestring directory filepath ghc HUnit network process tasty tasty-hunit ]; homepage = "https://github.com/haskell-tools/haskell-tools"; @@ -85334,8 +82802,8 @@ self: { }: mkDerivation { pname = "haskell-tools-debug"; - version = "0.4.1.3"; - sha256 = "2e89fee8acdd91b92b6ce9f079e1f3c445c19f37ac0092310ed20ba51a8a677e"; + version = "0.5.0.0"; + sha256 = "b70796a99599cb051d2bbad5b02863245c8eae9732aa96ff3bc038e7b114dc27"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85359,8 +82827,8 @@ self: { }: mkDerivation { pname = "haskell-tools-demo"; - version = "0.4.1.3"; - sha256 = "d8ab6534f3f04cd2bfb3c636d88f008501b23cee15171a435f8aea464398ed20"; + version = "0.5.0.0"; + sha256 = "4b5dd31ee4a5342a49e07c8c48daccc98f7dd16afab819e370b944f45ec2618c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85386,8 +82854,8 @@ self: { }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "0.4.1.3"; - sha256 = "77fc5cab4b93e3e58022a23282776a667d0e90f357341f41ff72771919530490"; + version = "0.5.0.0"; + sha256 = "4690b95cd4e2d53547dd854d792dd1731c85470e97c1e0d6ed1df951b951367c"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references split uniplate ]; @@ -85401,13 +82869,14 @@ self: { ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-prettyprint - , haskell-tools-rewrite, mtl, references, split, tasty, tasty-hunit - , template-haskell, time, transformers, uniplate + , haskell-tools-rewrite, mtl, old-time, polyparse, references + , split, tasty, tasty-hunit, template-haskell, time, transformers + , uniplate }: mkDerivation { pname = "haskell-tools-refactor"; - version = "0.4.1.3"; - sha256 = "d732fb853cf0e066cec00f126030edd2e43abbde423affc3c8f2ceacab18cb82"; + version = "0.5.0.0"; + sha256 = "41dcc1a933623fd172776800473596d7d5fa84b68a96042361d474c76db35df8"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -85417,8 +82886,9 @@ self: { testHaskellDepends = [ base Cabal containers directory either filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-prettyprint haskell-tools-rewrite mtl references - split tasty tasty-hunit template-haskell time transformers uniplate + haskell-tools-prettyprint haskell-tools-rewrite mtl old-time + polyparse references split tasty tasty-hunit template-haskell time + transformers uniplate ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Refactoring Tool for Haskell"; @@ -85433,8 +82903,8 @@ self: { }: mkDerivation { pname = "haskell-tools-rewrite"; - version = "0.4.1.3"; - sha256 = "a92dafd6fd3511517edfc6517ba040130caaf0d24608270af69ae75bd84ff59b"; + version = "0.5.0.0"; + sha256 = "abbd76e8709b6fff25c6da010447ab5ad06381169fbf191470178eb8412dbc94"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl references @@ -86132,29 +83602,6 @@ self: { }) {}; "haskintex" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, directory - , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text - , transformers - }: - mkDerivation { - pname = "haskintex"; - version = "0.6.0.1"; - sha256 = "9b45463a0d77e8665cc82b656b6d9f8020c873d73f2dd9fe92fcb85a45e90f44"; - revision = "1"; - editedCabalFile = "8a16e2748e754c6fe0d7bd20186166b46819b12c6853c1275fda55e56d8ef8c7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers directory filepath - haskell-src-exts HaTeX hint parsec process text transformers - ]; - executableHaskellDepends = [ base ]; - homepage = "http://daniel-diaz.github.io/projects/haskintex"; - description = "Haskell Evaluation inside of LaTeX code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskintex_0_7_0_1" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text , transformers @@ -86173,7 +83620,6 @@ self: { homepage = "http://daniel-diaz.github.io/projects/haskintex"; description = "Haskell Evaluation inside of LaTeX code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskmon" = callPackage @@ -86652,14 +84098,14 @@ self: { , bytestring-tree-builder, contravariant, contravariant-extras , data-default-class, dlist, either, hashable, hashtables, loch-th , mtl, placeholders, postgresql-binary, postgresql-libpq - , profunctors, QuickCheck, quickcheck-instances, rebase, scientific - , semigroups, tasty, tasty-hunit, tasty-quickcheck + , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase + , scientific, semigroups, tasty, tasty-hunit, tasty-quickcheck , tasty-smallcheck, text, time, transformers, uuid, vector }: mkDerivation { pname = "hasql"; - version = "0.19.15.2"; - sha256 = "b025bd613d23444f18f1196ca51fb2bdbb4b10bf779c1db85685eeb755c8bb34"; + version = "0.19.16"; + sha256 = "b207195a7de0798f325b338b72059b9ef43546796401604b4a7a04a32be011c0"; libraryHaskellDepends = [ aeson attoparsec base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras @@ -86668,8 +84114,8 @@ self: { scientific semigroups text time transformers uuid vector ]; testHaskellDepends = [ - data-default-class QuickCheck quickcheck-instances rebase tasty - tasty-hunit tasty-quickcheck tasty-smallcheck + data-default-class QuickCheck quickcheck-instances rebase rerebase + tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; homepage = "https://github.com/nikita-volkov/hasql"; description = "An efficient PostgreSQL driver and a flexible mapping API"; @@ -86791,6 +84237,8 @@ self: { pname = "hasql-migration"; version = "0.1.3"; sha256 = "2d49e3b7a5ed775150abf2164795b10d087d2e1c714b0a8320f0c0094df068b3"; + revision = "1"; + editedCabalFile = "571db02447c6691e7307dd00ff2a6836ed3bacd1ec95b45f057e30e78b07da94"; libraryHaskellDepends = [ base base64-bytestring bytestring contravariant cryptohash data-default-class directory hasql hasql-transaction text time @@ -87067,23 +84515,6 @@ self: { }) {}; "hasty-hamiltonian" = callPackage - ({ mkDerivation, ad, base, lens, mcmc-types, mwc-probability, pipes - , primitive, transformers - }: - mkDerivation { - pname = "hasty-hamiltonian"; - version = "1.1.5"; - sha256 = "d3a62d1933ca6ebc2b53a7a620922809297350d33986904e69072c1e8bfa3fa6"; - libraryHaskellDepends = [ - base lens mcmc-types mwc-probability pipes primitive transformers - ]; - testHaskellDepends = [ ad base mwc-probability ]; - homepage = "http://github.com/jtobin/hasty-hamiltonian"; - description = "Speedy traversal through parameter space"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hasty-hamiltonian_1_3_0" = callPackage ({ mkDerivation, ad, base, kan-extensions, lens, mcmc-types , mwc-probability, pipes, primitive, transformers }: @@ -87099,7 +84530,6 @@ self: { homepage = "http://github.com/jtobin/hasty-hamiltonian"; description = "Speedy traversal through parameter space"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hat" = callPackage @@ -87266,6 +84696,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hax" = callPackage + ({ mkDerivation, aeson, array, base, blaze-html, blaze-markup + , boxes, bytestring, containers, Decimal, directory, filepath, mtl + , split, template-haskell, text, transformers + }: + mkDerivation { + pname = "hax"; + version = "0.0.2"; + sha256 = "0ed30e279a8519572333385e0d8ca707a96b98245d0885dc272ddd086fd9f241"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base blaze-html blaze-markup boxes bytestring + containers Decimal directory filepath mtl split template-haskell + text transformers + ]; + executableHaskellDepends = [ + aeson array base blaze-html blaze-markup boxes bytestring + containers Decimal directory filepath mtl split template-haskell + text transformers + ]; + homepage = "http://johannesgerer.com/hax"; + description = "Haskell cash-flow and tax simulation"; + license = stdenv.lib.licenses.mit; + }) {}; + "haxl" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty @@ -88409,8 +85865,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.9.5"; - sha256 = "fe9d461f8a24f134947c89832472463d65150c37b53cf53ea89fd199ef8d1b71"; + version = "0.9.7"; + sha256 = "594c2d210745a72559de6a6a5f3fa646bf400fd0bb990c8f29d3390d1a2d6d87"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq mtl network resource-pool scanner stm text time unordered-containers vector @@ -88585,8 +86041,8 @@ self: { pname = "heist"; version = "1.0.1.0"; sha256 = "fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb"; - revision = "3"; - editedCabalFile = "35bff91163943a30b86f87edf1873568e88b12ebe70a66d3f5fc146c6af4d84f"; + revision = "4"; + editedCabalFile = "d6925d28dee1606c73a16d86ce362e5e6faace458e1dff1fded52c0deac590eb"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -89339,8 +86795,8 @@ self: { }: mkDerivation { pname = "heterocephalus"; - version = "1.0.2.3"; - sha256 = "653de3568644936d8e011bb329efd763d3b9d9f03101b9cf6486c45532453046"; + version = "1.0.4.0"; + sha256 = "4a208830f15a3575f10c238bed8ff09827483eec94b8cc068c6907d2106f982a"; libraryHaskellDepends = [ base blaze-html blaze-markup containers dlist parsec shakespeare template-haskell text @@ -90119,8 +87575,8 @@ self: { }: mkDerivation { pname = "hgrev"; - version = "0.2.0"; - sha256 = "c92ae1487c35e619f725b13b16c0845b7fbabcdb8beaa5abb67b831d0ad912ef"; + version = "0.2.1"; + sha256 = "0bb7b8f2fbb23e94bfacaf171d6affa13093ce2045ceeb1af47b783b51d5874d"; libraryHaskellDepends = [ aeson base bytestring directory filepath process template-haskell ]; @@ -90345,10 +87801,8 @@ self: { }: mkDerivation { pname = "hierarchy"; - version = "0.3.1"; - sha256 = "4ff6dcb89691dbf20de993964ad32904508f5b6569af1e83eaaaf73a271c9c5f"; - revision = "1"; - editedCabalFile = "d5f57b7a5087193876ddccfb410a297bcc4d0babb0b7b8233a4bb591d6d0e5eb"; + version = "0.3.1.2"; + sha256 = "d0ac3d7099930278da265c1f4fd384e061636834243eb1cf935530bdf66d541d"; libraryHaskellDepends = [ base exceptions free mmorph monad-control mtl pipes semigroups transformers transformers-base transformers-compat @@ -90380,6 +87834,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hifi" = callPackage + ({ mkDerivation, base, directory, filepath, mustache, parsec + , process, text, unix + }: + mkDerivation { + pname = "hifi"; + version = "0.1.0.0"; + sha256 = "6afe6184c86e888a56452a1593830d8fb9514a74d943d9abec7fbc4164fe20de"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath mustache parsec process text unix + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://gitlab.com/gonz/hifi"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "highWaterMark" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -90434,25 +87909,60 @@ self: { }) {}; "highjson" = callPackage - ({ mkDerivation, attoparsec, base, buffer-builder, bytestring - , containers, hashable, hspec, hvect, QuickCheck, scientific, text - , unordered-containers, vector + ({ mkDerivation, aeson, base, hspec, hvect, lens, QuickCheck, text }: mkDerivation { pname = "highjson"; - version = "0.2.0.2"; - sha256 = "7fd64bb5206b6d16d420e34eb7f3fefc6d888be518f0dc635a77ed51d63f1f1f"; - libraryHaskellDepends = [ - attoparsec base buffer-builder bytestring containers hashable hvect - scientific text unordered-containers vector - ]; - testHaskellDepends = [ base hspec QuickCheck text ]; + version = "0.4.0.0"; + sha256 = "c3eb05ed1abd9dd59eedcd22bd60b326059d0c3dcaee2a9f8238b0ac08a26962"; + libraryHaskellDepends = [ aeson base hvect lens text ]; + testHaskellDepends = [ aeson base hspec lens QuickCheck text ]; homepage = "https://github.com/agrafix/highjson"; - description = "Very fast JSON serialisation and parsing library"; + description = "Spec based JSON parsing/serialisation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "highjson-swagger" = callPackage + ({ mkDerivation, aeson, base, bytestring, highjson, hspec, hvect + , insert-ordered-containers, lens, QuickCheck, swagger2, text + }: + mkDerivation { + pname = "highjson-swagger"; + version = "0.4.0.0"; + sha256 = "2df02d2fd764fd5386094de59e181314ba152bd87dc2905d9869fefd4cb87e1f"; + libraryHaskellDepends = [ + base highjson hvect insert-ordered-containers lens swagger2 text + ]; + testHaskellDepends = [ + aeson base bytestring highjson hspec lens QuickCheck swagger2 text + ]; + homepage = "https://github.com/agrafix/highjson"; + description = "Derive swagger instances from highjson specs"; + license = stdenv.lib.licenses.mit; + }) {}; + + "highjson-th" = callPackage + ({ mkDerivation, aeson, base, bytestring, highjson + , highjson-swagger, hspec, lens, QuickCheck, swagger2 + , template-haskell, text + }: + mkDerivation { + pname = "highjson-th"; + version = "0.4.0.0"; + sha256 = "f30c4937a9db6eb1cea8b9efef76855af3b4745e3a620798681b8cf3c73202c5"; + libraryHaskellDepends = [ + aeson base highjson highjson-swagger swagger2 template-haskell text + ]; + testHaskellDepends = [ + aeson base bytestring highjson highjson-swagger hspec lens + QuickCheck swagger2 text + ]; + homepage = "https://github.com/agrafix/highjson"; + description = "Template Haskell helpers for highjson specs"; + license = stdenv.lib.licenses.mit; + }) {}; + "highlight-versions" = callPackage ({ mkDerivation, ansi-terminal, base, Cabal, containers, hackage-db }: @@ -90506,8 +88016,8 @@ self: { }: mkDerivation { pname = "highlighting-kate"; - version = "0.6.3"; - sha256 = "71dab85c49b038053b90062ed882e486233cbaa2b762d017224d06482075840d"; + version = "0.6.4"; + sha256 = "d8b83385f5da2ea7aa59f28eb860fd7eba0d35a4c36192a5044ee7ea1e001baf"; configureFlags = [ "-fpcre-light" ]; libraryHaskellDepends = [ base blaze-html bytestring containers mtl parsec pcre-light @@ -90853,6 +88363,7 @@ self: { homepage = "https://github.com/LTI2000/hinterface"; description = "Haskell / Erlang interoperability library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hinvaders" = callPackage @@ -90890,33 +88401,13 @@ self: { }: mkDerivation { pname = "hip"; - version = "1.2.0.0"; - sha256 = "d72879134b56197e0abf21abd09b0198581cb0302574711ffbcfff6da17dd083"; + version = "1.5.2.0"; + sha256 = "4f5eecf455df1d5a0a577abfefd48e519be8f57f9c47ca2edf31dc0982b7dc46"; libraryHaskellDepends = [ base bytestring Chart Chart-diagrams colour deepseq directory filepath JuicyPixels netpbm primitive process repa temporary vector ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/lehins/hip"; - description = "Haskell Image Processing (HIP) Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hip_1_4_0_1" = callPackage - ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour - , deepseq, directory, filepath, hspec, JuicyPixels, netpbm - , primitive, process, QuickCheck, repa, temporary, vector - }: - mkDerivation { - pname = "hip"; - version = "1.4.0.1"; - sha256 = "960a4f964e5a7e82e5948b05da5a0b17122b50afabea86f451475b0c58a9a4c0"; - libraryHaskellDepends = [ - base bytestring Chart Chart-diagrams colour deepseq directory - filepath JuicyPixels netpbm primitive process repa temporary vector - ]; - testHaskellDepends = [ base hspec QuickCheck ]; + testHaskellDepends = [ base bytestring hspec QuickCheck ]; homepage = "https://github.com/lehins/hip"; description = "Haskell Image Processing (HIP) Library"; license = stdenv.lib.licenses.bsd3; @@ -91363,33 +88854,13 @@ self: { }) {}; "hjsonpointer" = callPackage - ({ mkDerivation, aeson, base, hspec, http-types, QuickCheck, text - , unordered-containers, vector - }: - mkDerivation { - pname = "hjsonpointer"; - version = "1.0.0.2"; - sha256 = "98e2675781d11e1c9eb903b6a7c35020137625e305efb0fcb8f7614f09e6e8f2"; - libraryHaskellDepends = [ - aeson base QuickCheck text unordered-containers vector - ]; - testHaskellDepends = [ - aeson base hspec http-types QuickCheck text unordered-containers - vector - ]; - homepage = "https://github.com/seagreen/hjsonpointer"; - description = "JSON Pointer library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hjsonpointer_1_1_0_1" = callPackage ({ mkDerivation, aeson, base, hashable, hspec, http-types , QuickCheck, semigroups, text, unordered-containers, vector }: mkDerivation { pname = "hjsonpointer"; - version = "1.1.0.1"; - sha256 = "ebdd6c5528da76fd59871ca14903576e2b5ca8a1327ec952ae0957ed6b37c2ed"; + version = "1.1.0.2"; + sha256 = "fe6826b2ede3ce7541e5c88bda78dd66cc76725f14b06533bb5ecadddcb2cc65"; libraryHaskellDepends = [ aeson base hashable QuickCheck semigroups text unordered-containers vector @@ -91401,37 +88872,9 @@ self: { homepage = "https://github.com/seagreen/hjsonpointer"; description = "JSON Pointer library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hjsonschema" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , directory, file-embed, filepath, hjsonpointer, http-client - , http-types, HUnit, pcre-heavy, profunctors, QuickCheck - , scientific, semigroups, tasty, tasty-hunit, tasty-quickcheck - , text, unordered-containers, vector, wai-app-static, warp - }: - mkDerivation { - pname = "hjsonschema"; - version = "1.1.0.1"; - sha256 = "52e85f98ace68a20ad1435b56c0d201a5cbb8c475dd3086aee860aa72da3824d"; - libraryHaskellDepends = [ - aeson base bytestring containers file-embed filepath hjsonpointer - http-client http-types pcre-heavy profunctors QuickCheck scientific - semigroups text unordered-containers vector - ]; - testHaskellDepends = [ - aeson async base bytestring directory filepath hjsonpointer HUnit - profunctors QuickCheck semigroups tasty tasty-hunit - tasty-quickcheck text unordered-containers vector wai-app-static - warp - ]; - homepage = "https://github.com/seagreen/hjsonschema"; - description = "JSON Schema library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hjsonschema_1_5_0_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, file-embed, filepath, hashable, hjsonpointer, hspec , http-client, http-types, pcre-heavy, profunctors, protolude @@ -91440,8 +88883,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "1.5.0.0"; - sha256 = "a8295fff702386bc03777c0a01455e4f13539795153a60b5b3f5bb24d188ff95"; + version = "1.5.0.1"; + sha256 = "1ac15c8f32621c50fa4b445a0f17ac7a58dc716867aed4f6e1bb7478d0e288a3"; libraryHaskellDepends = [ aeson base bytestring containers file-embed filepath hashable hjsonpointer http-client http-types pcre-heavy profunctors @@ -91456,7 +88899,6 @@ self: { homepage = "https://github.com/seagreen/hjsonschema"; description = "JSON Schema library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hkdf" = callPackage @@ -91568,6 +89010,8 @@ self: { pname = "hledger"; version = "1.1"; sha256 = "b254b2a3918e047ca031f6dfafc42dd5fcb4b859157fae2d019dcd95262408e5"; + revision = "1"; + editedCabalFile = "d33edead74698ee1e7f3e5f167bfd8e32664d520df69092f5ac48f0816939aaf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91664,8 +89108,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.1.3"; - sha256 = "ee0a1d448a761f471a777f7e7b66af11bd5955df3e5823970db5bf4602a8b350"; + version = "1.2"; + sha256 = "7ec0817c2c9c20c05c6496eca6264124139e7575e452ada5b1fd225c97533083"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91736,6 +89180,8 @@ self: { pname = "hledger-lib"; version = "1.1"; sha256 = "4142142fb92e6c1affc1420e3478449cf0d9d696ab05cc801338a562a5560556"; + revision = "1"; + editedCabalFile = "cf72c68e9c71bc059e7ea98e764837e649ec9ecda073ac936e5fb71e06115724"; libraryHaskellDepends = [ array base base-compat blaze-markup bytestring cmdargs containers csv data-default Decimal deepseq directory filepath hashtables @@ -91765,8 +89211,10 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.1.1"; - sha256 = "fea7b5bee2611dee3fac71bfdfcbd5bf80ec7396a45c67e804e880c6d6729d2d"; + version = "1.1.2"; + sha256 = "5cc85502297f3ccf31990ebbe60178ee9f90ea434e86756f39e2848f0ae788d1"; + revision = "2"; + editedCabalFile = "b8f09f1a5411bec106f6f507a5d71eea67685f6271c716e390b4f6513c7acddd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -91813,6 +89261,8 @@ self: { pname = "hledger-web"; version = "1.1"; sha256 = "da0c0c1096497737540efdc85cbb95cd01cbd48410491d8b2c26529b4151a2ca"; + revision = "1"; + editedCabalFile = "fbc15617f161701111b55e6d19f2fa0b4bac297c0db23194ca5c5d9d87a8301d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91892,8 +89342,8 @@ self: { ({ mkDerivation, base, bindings-DSL, git, openssl, process, zlib }: mkDerivation { pname = "hlibgit2"; - version = "0.18.0.15"; - sha256 = "1170c1f71b39d13699018c29688c005c7aa2d07d8bbbb9d383a9a85e5d4c5601"; + version = "0.18.0.16"; + sha256 = "199e4027faafe0a39d18ca3168923d44c57b386b960c72398df1c0fb7eff8e5e"; libraryHaskellDepends = [ base bindings-DSL zlib ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ base process ]; @@ -91924,8 +89374,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "1.9.35"; - sha256 = "5e6289dadc77a0862ee12ec09136059011fd779c96ff6ffeec899170a97d7a8a"; + version = "1.9.41"; + sha256 = "2d9299f7952af44b2f06a67af917859fd51e1056c7d405f0930769ea1e093fb4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91939,29 +89389,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hlint_1_9_39" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs - , directory, extra, filepath, haskell-src-exts, hscolour, process - , refact, transformers, uniplate - }: - mkDerivation { - pname = "hlint"; - version = "1.9.39"; - sha256 = "66cffc12e38c0dfbbab61219381c0af6b41a48462a71e3810612ff2bbdc0b38f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base cmdargs containers cpphs directory extra - filepath haskell-src-exts hscolour process refact transformers - uniplate - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/ndmitchell/hlint#readme"; - description = "Source code suggestions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hlogger" = callPackage ({ mkDerivation, base, old-locale, time }: mkDerivation { @@ -92067,26 +89494,6 @@ self: { }) {}; "hmatrix" = callPackage - ({ mkDerivation, array, base, binary, bytestring, deepseq - , openblasCompat, random, split, storable-complex, vector - }: - mkDerivation { - pname = "hmatrix"; - version = "0.17.0.2"; - sha256 = "28ed9558064917636db095ef76e10b59ae935e3ee68c96ff0d27f9e405ccfab9"; - configureFlags = [ "-fopenblas" ]; - libraryHaskellDepends = [ - array base binary bytestring deepseq random split storable-complex - vector - ]; - librarySystemDepends = [ openblasCompat ]; - preConfigure = "sed -i hmatrix.cabal -e 's@/usr/@/dont/hardcode/paths/@'"; - homepage = "https://github.com/albertoruiz/hmatrix"; - description = "Numeric Linear Algebra"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) openblasCompat;}; - - "hmatrix_0_18_0_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, deepseq , openblasCompat, random, split, storable-complex, vector }: @@ -92104,7 +89511,6 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Numeric Linear Algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openblasCompat;}; "hmatrix-banded" = callPackage @@ -92148,22 +89554,6 @@ self: { }) {inherit (pkgs) glpk;}; "hmatrix-gsl" = callPackage - ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector - }: - mkDerivation { - pname = "hmatrix-gsl"; - version = "0.17.0.0"; - sha256 = "fc50e9f80adee9f93874b20aae1a8009a1dcd94316784827618d5ad192e578c9"; - libraryHaskellDepends = [ - array base hmatrix process random vector - ]; - libraryPkgconfigDepends = [ gsl ]; - homepage = "https://github.com/albertoruiz/hmatrix"; - description = "Numerical computation"; - license = "GPL"; - }) {inherit (pkgs) gsl;}; - - "hmatrix-gsl_0_18_0_1" = callPackage ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector }: mkDerivation { @@ -92177,27 +89567,9 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Numerical computation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gsl;}; "hmatrix-gsl-stats" = callPackage - ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex - , vector - }: - mkDerivation { - pname = "hmatrix-gsl-stats"; - version = "0.4.1.4"; - sha256 = "98fe0e49be78a1ff7e5ca44ab086d57bafcf97b86bc249d940501a28dacffafa"; - libraryHaskellDepends = [ - base binary hmatrix storable-complex vector - ]; - libraryPkgconfigDepends = [ gsl ]; - homepage = "http://code.haskell.org/hmatrix-gsl-stats"; - description = "GSL Statistics interface"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) gsl;}; - - "hmatrix-gsl-stats_0_4_1_6" = callPackage ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex , vector }: @@ -92212,7 +89584,6 @@ self: { homepage = "http://code.haskell.org/hmatrix-gsl-stats"; description = "GSL Statistics interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gsl;}; "hmatrix-mmap" = callPackage @@ -92693,22 +90064,6 @@ self: { }) {}; "hoauth2" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types - , text - }: - mkDerivation { - pname = "hoauth2"; - version = "0.5.4.0"; - sha256 = "dc83b0cd5ee51b9c9b28ea04417341dbd146720f43ac73792b180e205ea4cdf9"; - libraryHaskellDepends = [ - aeson base bytestring http-conduit http-types text - ]; - homepage = "https://github.com/freizl/hoauth2"; - description = "Haskell OAuth2 authentication client"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hoauth2_0_5_7" = callPackage ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types , text, unordered-containers }: @@ -92723,6 +90078,23 @@ self: { homepage = "https://github.com/freizl/hoauth2"; description = "Haskell OAuth2 authentication client"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "hoauth2_0_5_8" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types + , text, unordered-containers + }: + mkDerivation { + pname = "hoauth2"; + version = "0.5.8"; + sha256 = "caacec1259455de9d1cb78c38fe8ca4dabc901e5b9fd8a9e7d17eaca0a820e60"; + libraryHaskellDepends = [ + aeson base bytestring http-conduit http-types text + unordered-containers + ]; + homepage = "https://github.com/freizl/hoauth2"; + description = "Haskell OAuth2 authentication client"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -92793,27 +90165,6 @@ self: { }) {}; "hocilib" = callPackage - ({ mkDerivation, base, bytestring, c2hs, containers, inline-c - , ocilib, tasty, tasty-hunit, template-haskell - }: - mkDerivation { - pname = "hocilib"; - version = "0.1.0"; - sha256 = "44354cbcfd324ce02786131fc3e0ffac29d4a8676854cac45e675e47cdc35e51"; - libraryHaskellDepends = [ - base containers inline-c template-haskell - ]; - librarySystemDepends = [ ocilib ]; - libraryToolDepends = [ c2hs ]; - testHaskellDepends = [ base bytestring tasty tasty-hunit ]; - testSystemDepends = [ ocilib ]; - homepage = "https://github.com/fpinsight/hocilib"; - description = "FFI binding to OCILIB"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {ocilib = null;}; - - "hocilib_0_2_0" = callPackage ({ mkDerivation, base, bytestring, c2hs, containers, inline-c , ocilib, tasty, tasty-hunit, template-haskell }: @@ -93089,28 +90440,6 @@ self: { }) {}; "homplexity" = callPackage - ({ mkDerivation, base, containers, cpphs, deepseq, directory - , filepath, happy, haskell-src-exts, hflags, template-haskell - , uniplate - }: - mkDerivation { - pname = "homplexity"; - version = "0.4.3.3"; - sha256 = "a536f540770c741a12387df2e6f68042f9644311e9077dbdd7d59a4551753609"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base containers cpphs deepseq directory filepath haskell-src-exts - hflags template-haskell uniplate - ]; - executableToolDepends = [ happy ]; - testHaskellDepends = [ base haskell-src-exts uniplate ]; - homepage = "https://github.com/mgajda/homplexity"; - description = "Haskell code quality tool"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "homplexity_0_4_3_4" = callPackage ({ mkDerivation, base, containers, cpphs, deepseq, directory , filepath, happy, haskell-src-exts, hflags, template-haskell , uniplate @@ -93130,7 +90459,6 @@ self: { homepage = "https://github.com/mgajda/homplexity"; description = "Haskell code quality tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "honi" = callPackage @@ -93848,6 +91176,8 @@ self: { pname = "horname"; version = "0.1.3.0"; sha256 = "e9a6cfb0ba87f063f04a7273d476b200905625ce60b00d87c8995332b1b7f218"; + revision = "1"; + editedCabalFile = "94e798feada4d4014ee1438672fe57e6181f1b9b64bc92858644037a77678f81"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93966,8 +91296,8 @@ self: { }: mkDerivation { pname = "hothasktags"; - version = "0.3.7"; - sha256 = "0fed99175f0b3b6e6852a17e2c46f12ee9463daff37894d9d0381409ff98c4e3"; + version = "0.3.8"; + sha256 = "07b00026a1b8e47719736ae6c64fe2396396c50c8367f82361e6fa4142dcf301"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93977,6 +91307,7 @@ self: { homepage = "http://github.com/luqui/hothasktags"; description = "Generates ctags for Haskell, incorporating import lists and qualified imports"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hotswap" = callPackage @@ -94146,36 +91477,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hpack_0_15_0" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers - , deepseq, directory, filepath, Glob, hspec, interpolate, mockery - , QuickCheck, temporary, text, unordered-containers, yaml - }: - mkDerivation { - pname = "hpack"; - version = "0.15.0"; - sha256 = "72a39a5d7d8dc2e94a37f75642f7e491ae9d560070b07c5c17e9ced6e3cbab63"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base-compat containers deepseq directory filepath Glob - text unordered-containers yaml - ]; - executableHaskellDepends = [ - aeson base base-compat containers deepseq directory filepath Glob - text unordered-containers yaml - ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat containers deepseq directory - filepath Glob hspec interpolate mockery QuickCheck temporary text - unordered-containers yaml - ]; - homepage = "https://github.com/sol/hpack#readme"; - description = "An alternative format for Haskell packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hpack" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , containers, deepseq, directory, filepath, Glob, hspec @@ -94184,8 +91485,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.16.0"; - sha256 = "2ec0d00aaaddfc18bc3c55b6455f7697524578dd9d0e3ea32849067293f167b9"; + version = "0.17.0"; + sha256 = "d2578aca1a302f5424c32a81eb15a41797e72d17c0c2eab7c236c513c4657464"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94481,8 +91782,8 @@ self: { }: mkDerivation { pname = "hpio"; - version = "0.8.0.5"; - sha256 = "7493096673b13301ebdcdbc8b5076b1af0422b6650418b9510d3536a72edcf0d"; + version = "0.8.0.6"; + sha256 = "3e46024f61f4dda52e5edafa3bbcab1d2dfe7f5f68a32c6f8480cecfd864cb94"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94851,24 +92152,6 @@ self: { }) {}; "hreader" = callPackage - ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl - , tagged, transformers-base - }: - mkDerivation { - pname = "hreader"; - version = "1.0.2"; - sha256 = "49e1e805966fab3f82ef2e1f2565b2a760b73026f392410b53df6c2c8b8f59d4"; - libraryHaskellDepends = [ - base exceptions hset mmorph monad-control mtl tagged - transformers-base - ]; - testHaskellDepends = [ base hset transformers-base ]; - homepage = "https://bitbucket.org/s9gf4ult/hreader"; - description = "Generalization of MonadReader and ReaderT using hset"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hreader_1_1_0" = callPackage ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl , tagged, transformers, transformers-base }: @@ -94884,7 +92167,6 @@ self: { homepage = "https://bitbucket.org/s9gf4ult/hreader"; description = "Generalization of MonadReader and ReaderT using hset"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hreader-lens" = callPackage @@ -94924,8 +92206,8 @@ self: { }: mkDerivation { pname = "hruby"; - version = "0.3.4.2"; - sha256 = "4e7afc76770d5a9f887f574c8ce69d8c23a39b9df369d7ca263fd88c73b59a28"; + version = "0.3.4.3"; + sha256 = "a1fe68e20ffeae12b12a0f156e58c020c4d2da85dcd773ae4350f7b79aacf9cc"; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific stm text unordered-containers vector @@ -96361,20 +93643,6 @@ self: { }) {}; "hsdns" = callPackage - ({ mkDerivation, adns, base, containers, network }: - mkDerivation { - pname = "hsdns"; - version = "1.6.1"; - sha256 = "64c1475d7625733c9fafe804ae809d459156f6a96a922adf99e5d8e02553c368"; - libraryHaskellDepends = [ base containers network ]; - librarySystemDepends = [ adns ]; - homepage = "http://github.com/peti/hsdns"; - description = "Asynchronous DNS Resolver"; - license = stdenv.lib.licenses.lgpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) adns;}; - - "hsdns_1_7" = callPackage ({ mkDerivation, adns, base, containers, network }: mkDerivation { pname = "hsdns"; @@ -96385,7 +93653,6 @@ self: { homepage = "http://github.com/peti/hsdns"; description = "Asynchronous DNS Resolver"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) adns;}; @@ -96407,19 +93674,6 @@ self: { }) {}; "hse-cpp" = callPackage - ({ mkDerivation, base, cpphs, haskell-src-exts }: - mkDerivation { - pname = "hse-cpp"; - version = "0.1"; - sha256 = "a075790dd132107b8005478179fcaf7e37a78c3011ca536ff0d95e0b437c2b38"; - revision = "1"; - editedCabalFile = "9ed587127e9760a075bf6ea478997e1a1fb9e500102bd883206aa843e7d92a4b"; - libraryHaskellDepends = [ base cpphs haskell-src-exts ]; - description = "Preprocess+parse haskell code"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hse-cpp_0_2" = callPackage ({ mkDerivation, base, cpphs, haskell-src-exts }: mkDerivation { pname = "hse-cpp"; @@ -96428,7 +93682,6 @@ self: { libraryHaskellDepends = [ base cpphs haskell-src-exts ]; description = "Preprocess+parse haskell code"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsebaysdk" = callPackage @@ -96542,6 +93795,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsexif_0_6_1_0" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit + , iconv, text, time + }: + mkDerivation { + pname = "hsexif"; + version = "0.6.1.0"; + sha256 = "868a46bcd841a2db36eebba803962f966c24c4a98b7581c9f329fd596bafab4f"; + libraryHaskellDepends = [ + base binary bytestring containers iconv text time + ]; + testHaskellDepends = [ + base binary bytestring containers hspec HUnit iconv text time + ]; + homepage = "https://github.com/emmanueltouzery/hsexif"; + description = "EXIF handling library in pure Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsfacter" = callPackage ({ mkDerivation, base, containers, language-puppet, text }: mkDerivation { @@ -96657,27 +93930,6 @@ self: { }) {}; "hsignal" = callPackage - ({ mkDerivation, array, base, binary, blas, bytestring, gsl - , hmatrix, hmatrix-gsl, hmatrix-gsl-stats, hstatistics, liblapack - , mtl, storable-complex, vector - }: - mkDerivation { - pname = "hsignal"; - version = "0.2.7.4"; - sha256 = "290436ca76d13a4435da0b33d20a69663d955abcf361661cf9835e7eedb4f53a"; - libraryHaskellDepends = [ - array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats - hstatistics mtl storable-complex vector - ]; - librarySystemDepends = [ blas liblapack ]; - libraryPkgconfigDepends = [ gsl ]; - homepage = "http://code.haskell.org/hsignal"; - description = "Signal processing and EEG data analysis"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) blas; inherit (pkgs) gsl; - inherit (pkgs) liblapack;}; - - "hsignal_0_2_7_5" = callPackage ({ mkDerivation, array, base, binary, blas, bytestring, gsl , hmatrix, hmatrix-gsl, hmatrix-gsl-stats, hstatistics, liblapack , mtl, storable-complex, vector @@ -96695,7 +93947,6 @@ self: { homepage = "http://code.haskell.org/hsignal"; description = "Signal processing and EEG data analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) blas; inherit (pkgs) gsl; inherit (pkgs) liblapack;}; @@ -96869,8 +94120,8 @@ self: { ({ mkDerivation, base, hslogger, mtl, template-haskell }: mkDerivation { pname = "hslogger-template"; - version = "2.0.3"; - sha256 = "b324e500ee3e05e653ff1ca427895195a53c56ee0c0bc1f2da5f7ad29f14afe0"; + version = "2.0.4"; + sha256 = "e8a251f7d50d1bd9a095062e9a8783f140b6f3a995e05257bccb0e36ccb7e7b9"; libraryHaskellDepends = [ base hslogger mtl template-haskell ]; description = "Automatic generation of hslogger functions"; license = stdenv.lib.licenses.publicDomain; @@ -96937,6 +94188,28 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_1;}; + "hslua-aeson" = callPackage + ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit + , ieee754, QuickCheck, quickcheck-instances, scientific, text + , unordered-containers, vector + }: + mkDerivation { + pname = "hslua-aeson"; + version = "0.1.0.0"; + sha256 = "62564714c0952da7f631f60ad502863376aad1963aa80d2365d5765f93872ff7"; + libraryHaskellDepends = [ + aeson base hashable hslua scientific text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base hashable hslua hspec HUnit ieee754 QuickCheck + quickcheck-instances scientific text unordered-containers vector + ]; + homepage = "https://github.com/tarleb/hslua-aeson#readme"; + description = "Glue between aeson and hslua"; + license = stdenv.lib.licenses.mit; + }) {}; + "hsmagick" = callPackage ({ mkDerivation, base, bytestring, bzip2, directory, filepath , freetype2, GraphicsMagick, jasper, lcms, libjpeg, libpng, libxml2 @@ -97147,29 +94420,33 @@ self: { "hsoz" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, byteable, bytestring, case-insensitive - , containers, cryptonite, data-default, either, errors, http-client - , http-conduit, http-types, HUnit, lens, lucid, memory, mtl - , network, QuickCheck, scientific, scotty, securemem, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, text, time - , transformers, uri-bytestring, vault, wai, warp, wreq + , containers, cryptonite, data-default, either, errors, exceptions + , hashable, http-client, http-conduit, http-types, HUnit, lens + , lucid, memory, mtl, network, optparse-applicative, QuickCheck + , scientific, scotty, securemem, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , uri-bytestring, vault, wai, warp }: mkDerivation { pname = "hsoz"; - version = "0.0.0.3"; - sha256 = "5aa1d06f0fe3f2f38354d12af1f6205c15894d74e5a32ed743a4ce6602573781"; + version = "0.0.0.4"; + sha256 = "a007f1ed9937208c613cbd854d103b09c54bdc35f972186d43adf0e3795dd058"; + revision = "1"; + editedCabalFile = "00802583e500dd540bb78ae2e03802dcb5965e3bc9338616d72149cbeea12073"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring byteable bytestring case-insensitive containers cryptonite data-default - either errors http-client http-types lens memory mtl network - scientific scotty securemem text time transformers uri-bytestring - vault wai warp + either errors exceptions hashable http-client http-types lens + memory mtl network scientific scotty securemem text time + transformers unordered-containers uri-bytestring vault wai warp ]; executableHaskellDepends = [ aeson base bytestring case-insensitive containers cryptonite - data-default http-client http-conduit http-types lens lucid scotty - text transformers uri-bytestring wai warp wreq + data-default http-client http-conduit http-types lens lucid + optparse-applicative scotty text time transformers uri-bytestring + wai warp ]; testHaskellDepends = [ aeson base bytestring data-default http-client http-types HUnit @@ -97260,38 +94537,14 @@ self: { }) {}; "hspec" = callPackage - ({ mkDerivation, base, directory, hspec-core, hspec-discover - , hspec-expectations, hspec-meta, HUnit, QuickCheck, stringbuilder - , transformers - }: - mkDerivation { - pname = "hspec"; - version = "2.2.4"; - sha256 = "724b0af9c871711f10a414d335a2ed0caabb94efb8576f94b43386b7f103c9b1"; - revision = "1"; - editedCabalFile = "eb22cb737adc3312b21699b6ac4137489590ada1ee9ee9ae21aae3c342b3880f"; - libraryHaskellDepends = [ - base hspec-core hspec-discover hspec-expectations HUnit QuickCheck - transformers - ]; - testHaskellDepends = [ - base directory hspec-core hspec-discover hspec-expectations - hspec-meta HUnit QuickCheck stringbuilder transformers - ]; - homepage = "http://hspec.github.io/"; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec_2_3_2" = callPackage ({ mkDerivation, base, call-stack, directory, hspec-core , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck , stringbuilder, transformers }: mkDerivation { pname = "hspec"; - version = "2.3.2"; - sha256 = "e852f69cd585cc945c2a9aa191ae6f8894f2e7e10685d60bfed29b521f032fb4"; + version = "2.4.1"; + sha256 = "c6d29aea545769b116e14ca7ca2c64d7e18649fc792adb98623b119d3a80f6da"; libraryHaskellDepends = [ base call-stack hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -97304,7 +94557,6 @@ self: { homepage = "http://hspec.github.io/"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-attoparsec" = callPackage @@ -97342,8 +94594,8 @@ self: { ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }: mkDerivation { pname = "hspec-contrib"; - version = "0.3.0"; - sha256 = "c4f62a0e23468716d735581ffa1899b4741c5ee43e696e40d7d03dd511f7da00"; + version = "0.4.0"; + sha256 = "6f9e2201ee176c723f91ee932b7fc8b677e0d54376f897f52c133c8ca9860c16"; libraryHaskellDepends = [ base hspec-core HUnit ]; testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ]; homepage = "http://hspec.github.io/"; @@ -97352,63 +94604,37 @@ self: { }) {}; "hspec-core" = callPackage - ({ mkDerivation, ansi-terminal, async, base, deepseq - , hspec-expectations, hspec-meta, HUnit, process, QuickCheck - , quickcheck-io, random, setenv, silently, tf-random, time - , transformers + ({ mkDerivation, ansi-terminal, array, async, base, call-stack + , deepseq, directory, filepath, hspec-expectations, hspec-meta + , HUnit, process, QuickCheck, quickcheck-io, random, setenv + , silently, temporary, tf-random, time, transformers }: mkDerivation { pname = "hspec-core"; - version = "2.2.4"; - sha256 = "328ac2525b9eb0fe4807d5ae10fe2d846220f9a8b5ac6b5d316e1bea9e2d0475"; - revision = "1"; - editedCabalFile = "9a0c9fc612eb71ee55ebcaacbce010b87ffef8a535ed6ee1f50d8bd952dc86c3"; + version = "2.4.1"; + sha256 = "b2ea5b6a37542fa138060085ee7bf82ab0ab130f2c287a57ae05a4f83ae437da"; libraryHaskellDepends = [ - ansi-terminal async base deepseq hspec-expectations HUnit - QuickCheck quickcheck-io random setenv tf-random time transformers + ansi-terminal array async base call-stack deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv tf-random time transformers ]; testHaskellDepends = [ - ansi-terminal async base deepseq hspec-expectations hspec-meta - HUnit process QuickCheck quickcheck-io random setenv silently - tf-random time transformers - ]; - homepage = "http://hspec.github.io/"; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-core_2_3_2" = callPackage - ({ mkDerivation, ansi-terminal, async, base, call-stack, deepseq - , hspec-expectations, hspec-meta, HUnit, process, QuickCheck - , quickcheck-io, random, setenv, silently, tf-random, time - , transformers - }: - mkDerivation { - pname = "hspec-core"; - version = "2.3.2"; - sha256 = "1c6d5d07475a4de72837b1739e0e94cfa2896e762af403d1978ee4df683541b9"; - libraryHaskellDepends = [ - ansi-terminal async base call-stack deepseq hspec-expectations - HUnit QuickCheck quickcheck-io random setenv tf-random time + ansi-terminal array async base call-stack deepseq directory + filepath hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently temporary tf-random time transformers ]; - testHaskellDepends = [ - ansi-terminal async base call-stack deepseq hspec-expectations - hspec-meta HUnit process QuickCheck quickcheck-io random setenv - silently tf-random time transformers - ]; homepage = "http://hspec.github.io/"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-discover" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; - version = "2.2.4"; - sha256 = "bb8ddb3c53d4c0cc3829c60d9b848aa19d843b19f22ef26355a12fb0d1e2e7af"; + version = "2.4.1"; + sha256 = "e0670831f06a8924779cc81d4eb706b35d3a7176cba6bee5df506de961e8d5f3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -97419,36 +94645,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-discover_2_3_2" = callPackage - ({ mkDerivation, base, directory, filepath, hspec-meta }: - mkDerivation { - pname = "hspec-discover"; - version = "2.3.2"; - sha256 = "fd36c9b91d417d0bb9041e0c2f148fa593dd752d4d62a8ca156fb3d8f88fe35f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ base directory filepath hspec-meta ]; - homepage = "http://hspec.github.io/"; - description = "Automatically discover and run Hspec tests"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hspec-expectations" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "hspec-expectations"; - version = "0.7.2"; - sha256 = "371a176b22ebdbc94b7bba55e0bda2296b44c11af01d20b23e4350ef7094a6f0"; - libraryHaskellDepends = [ base HUnit ]; - homepage = "https://github.com/sol/hspec-expectations#readme"; - description = "Catchy combinators for HUnit"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-expectations_0_8_2" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { pname = "hspec-expectations"; @@ -97459,7 +94656,6 @@ self: { homepage = "https://github.com/hspec/hspec-expectations#readme"; description = "Catchy combinators for HUnit"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-expectations-lens" = callPackage @@ -97523,7 +94719,6 @@ self: { homepage = "https://github.com/myfreeweb/hspec-expectations-pretty-diff#readme"; description = "Catchy combinators for HUnit"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-experimental" = callPackage @@ -97609,10 +94804,8 @@ self: { }: mkDerivation { pname = "hspec-megaparsec"; - version = "0.2.1"; - sha256 = "6474bc9a4d77cf68c4415bfa2d76da77ece418d6570429ca6c8b68eb7463de6b"; - revision = "1"; - editedCabalFile = "8d7144767ad65f8686ebcf3f6181e870a832dbc7613b53b13069ddf677ba86c9"; + version = "0.3.1"; + sha256 = "826f8169bc2ce9f056be8f2b1bb00039eb1a0114015b3db71509e3e0c871514d"; libraryHaskellDepends = [ base containers hspec-expectations megaparsec ]; @@ -97624,50 +94817,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hspec-megaparsec_0_3_0" = callPackage - ({ mkDerivation, base, containers, hspec, hspec-expectations - , megaparsec - }: - mkDerivation { - pname = "hspec-megaparsec"; - version = "0.3.0"; - sha256 = "00baf799a21404108f2861ad42649a014c283dafcbc454875e1f50eb9af3d2ed"; - revision = "1"; - editedCabalFile = "2f5da90f1a6d9efbbcbec8e8570bcbf30749d620b911e6b1fe6f466653203768"; - libraryHaskellDepends = [ - base containers hspec-expectations megaparsec - ]; - testHaskellDepends = [ - base containers hspec hspec-expectations megaparsec - ]; - homepage = "https://github.com/mrkkrp/hspec-megaparsec"; - description = "Utility functions for testing Megaparsec parsers with Hspec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hspec-meta" = callPackage - ({ mkDerivation, ansi-terminal, async, base, deepseq, directory - , filepath, hspec-expectations, HUnit, QuickCheck, quickcheck-io - , random, setenv, time, transformers - }: - mkDerivation { - pname = "hspec-meta"; - version = "2.2.1"; - sha256 = "aa7b54c33cad9842783035d1a5cddbbbc3d556c8b2c8f6d0e6bfd3177b9e37d4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal async base deepseq hspec-expectations HUnit - QuickCheck quickcheck-io random setenv time transformers - ]; - executableHaskellDepends = [ base directory filepath ]; - homepage = "http://hspec.github.io/"; - description = "A version of Hspec which is used to test Hspec itself"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-meta_2_3_2" = callPackage ({ mkDerivation, ansi-terminal, async, base, call-stack, deepseq , directory, filepath, hspec-expectations, HUnit, QuickCheck , quickcheck-io, random, setenv, time, transformers @@ -97690,7 +94840,6 @@ self: { homepage = "http://hspec.github.io/"; description = "A version of Hspec which is used to test Hspec itself"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-monad-control" = callPackage @@ -97728,22 +94877,6 @@ self: { }) {}; "hspec-setup" = callPackage - ({ mkDerivation, base, directory, filepath, process, projectroot }: - mkDerivation { - pname = "hspec-setup"; - version = "0.1.1.1"; - sha256 = "fd294bd10fc0fa1573e84d78ba7f6fd77e294efbaac419a5530e0818ece91109"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base directory filepath process projectroot - ]; - homepage = "https://github.com/yamadapc/haskell-hspec-setup"; - description = "Add an hspec test-suite in one command"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-setup_0_2_1_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, cryptohash , directory, directory-tree, filepath, haskell-src-exts, hspec , language-dockerfile, pretty, process, projectroot, QuickCheck @@ -97771,7 +94904,6 @@ self: { homepage = "https://github.com/yamadapc/haskell-hspec-setup"; description = "Add an hspec test-suite in one command"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-shouldbe" = callPackage @@ -97803,8 +94935,8 @@ self: { ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }: mkDerivation { pname = "hspec-smallcheck"; - version = "0.4.1"; - sha256 = "c5ddd014ad58679554d2726a4442a124d7a3a9fad04c928c610cdc46773fc0f5"; + version = "0.4.2"; + sha256 = "ba09d4b2eb1c6ff2d680aa09b36eb6c0b395cc258ae716b8d1db511073385ed3"; libraryHaskellDepends = [ base hspec-core smallcheck ]; testHaskellDepends = [ base hspec hspec-core QuickCheck smallcheck @@ -97907,30 +95039,6 @@ self: { }) {}; "hspec-wai" = callPackage - ({ mkDerivation, base, base-compat, bytestring, case-insensitive - , hspec, hspec-core, hspec-expectations, http-types, QuickCheck - , text, transformers, wai, wai-extra, with-location - }: - mkDerivation { - pname = "hspec-wai"; - version = "0.6.6"; - sha256 = "89a1753cd56b6f312a0af11b7f312c744c73a97d8ab3facfd87f8e4e3080b0e0"; - libraryHaskellDepends = [ - base base-compat bytestring case-insensitive hspec-core - hspec-expectations http-types QuickCheck text transformers wai - wai-extra with-location - ]; - testHaskellDepends = [ - base base-compat bytestring case-insensitive hspec hspec-core - hspec-expectations http-types QuickCheck text transformers wai - wai-extra with-location - ]; - homepage = "https://github.com/hspec/hspec-wai#readme"; - description = "Experimental Hspec support for testing WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-wai_0_8_0" = callPackage ({ mkDerivation, base, base-compat, bytestring, case-insensitive , hspec, hspec-core, hspec-expectations, http-types, QuickCheck , text, transformers, wai, wai-extra @@ -97952,28 +95060,9 @@ self: { homepage = "https://github.com/hspec/hspec-wai#readme"; description = "Experimental Hspec support for testing WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-wai-json" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring - , case-insensitive, hspec, hspec-wai, template-haskell - }: - mkDerivation { - pname = "hspec-wai-json"; - version = "0.6.1"; - sha256 = "303e0e67c217ead3ef64f3ac3870b6c9b14a4135df5e8b2c79ad73df5a347c69"; - libraryHaskellDepends = [ - aeson aeson-qq base bytestring case-insensitive hspec-wai - template-haskell - ]; - testHaskellDepends = [ base hspec hspec-wai ]; - homepage = "https://github.com/hspec/hspec-wai#readme"; - description = "Testing JSON APIs with hspec-wai"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-wai-json_0_8_0" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring , case-insensitive, hspec, hspec-wai, template-haskell }: @@ -97989,7 +95078,6 @@ self: { homepage = "https://github.com/hspec/hspec-wai#readme"; description = "Testing JSON APIs with hspec-wai"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-webdriver" = callPackage @@ -98029,8 +95117,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheckVariant }: mkDerivation { pname = "hspecVariant"; - version = "0.1.0.0"; - sha256 = "2ca22b48d9535b9099a38df0d26dc7bd694632e5ba0b50791450fdf540912d0c"; + version = "0.1.0.1"; + sha256 = "d54fcc1e543c718732088e6579401cba5b62e01f1b9021429e958e3e2ba2866e"; libraryHaskellDepends = [ base hspec QuickCheckVariant ]; homepage = "https://github.com/sanjorgek/hspecVariant"; description = "Spec for testing properties for variant types"; @@ -98043,8 +95131,8 @@ self: { }: mkDerivation { pname = "hspkcs11"; - version = "0.2"; - sha256 = "c66b9527f152d5ed29d5de18883905863a3b87fa177514ad0728cb56ae172f98"; + version = "0.3"; + sha256 = "c95ba5b7a560b0e1d2b1e11fec7dca72a253232ba9def3081b2313c8b103f7b1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98055,6 +95143,7 @@ self: { base bytestring cipher-aes cprng-aes crypto-api RSA testpack unix utf8-string ]; + executableToolDepends = [ c2hs ]; homepage = "https://github.com/denisenkom/hspkcs11"; description = "Wrapper for PKCS #11 interface"; license = stdenv.lib.licenses.mit; @@ -98460,8 +95549,8 @@ self: { }: mkDerivation { pname = "hstatistics"; - version = "0.2.5.4"; - sha256 = "e657ac9bb672b502d5dec0e8920679a5833be5bfe0a8a981b7eccc0a99a0e47b"; + version = "0.3"; + sha256 = "7af3f698d1bded8690b1ec05017ae05310fad1f2d25ec138fb72994b0812eeec"; libraryHaskellDepends = [ array base hmatrix hmatrix-gsl-stats random vector ]; @@ -98748,25 +95837,6 @@ self: { }) {}; "hsx2hs" = callPackage - ({ mkDerivation, base, bytestring, haskell-src-exts - , haskell-src-meta, mtl, template-haskell, utf8-string - }: - mkDerivation { - pname = "hsx2hs"; - version = "0.13.5"; - sha256 = "0dbaa29287ef82bfbe573f399a635aa109fe675e4dd91f3ee8c2cefd5593ed6e"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring haskell-src-exts haskell-src-meta mtl - template-haskell utf8-string - ]; - homepage = "https://github.com/seereason/hsx2hs"; - description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hsx2hs_0_14_0" = callPackage ({ mkDerivation, base, bytestring, haskell-src-exts , haskell-src-meta, mtl, template-haskell, utf8-string }: @@ -98783,7 +95853,6 @@ self: { homepage = "https://github.com/seereason/hsx2hs"; description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsyscall" = callPackage @@ -98834,8 +95903,8 @@ self: { ({ mkDerivation, base, bytestring, com_err, mtl, time, zephyr }: mkDerivation { pname = "hszephyr"; - version = "0.1"; - sha256 = "593b213b298bdda179bd97b013e4e7ad52ddab1ae9f18c7595710bdc58ccff51"; + version = "0.2"; + sha256 = "9175c7cdae7e37f86cd28b38c213b00c458b789758bb675e2012c2b68e91f418"; libraryHaskellDepends = [ base bytestring mtl time ]; librarySystemDepends = [ com_err zephyr ]; description = "Simple libzephyr bindings"; @@ -98971,6 +96040,8 @@ self: { pname = "html-conduit"; version = "1.2.1.1"; sha256 = "98c27470cbf99b12ca9705216567fc8aafffb843cd9c37762e8607da153aa8a8"; + revision = "1"; + editedCabalFile = "de32ca4d6df94a7c027a11db1b2e32ef1a7ccfe0565923f24528613ade821343"; libraryHaskellDepends = [ base bytestring conduit conduit-extra containers resourcet tagstream-conduit text transformers xml-conduit xml-types @@ -99005,8 +96076,8 @@ self: { }: mkDerivation { pname = "html-entities"; - version = "1.1.2"; - sha256 = "cb3fdaf2329b6af5b59bc36c6a6721b0fe4d53c1b30885c82faf7b11fcab34de"; + version = "1.1.3"; + sha256 = "6bb2ae9f6b65b5652854e78ece26d7c78e4c5eef6c7f5a75ee88e6730469bc1d"; libraryHaskellDepends = [ attoparsec base-prelude text unordered-containers ]; @@ -99285,26 +96356,6 @@ self: { }) {}; "http-api-data" = callPackage - ({ mkDerivation, base, bytestring, directory, doctest, filepath - , hspec, HUnit, QuickCheck, text, time, time-locale-compat - }: - mkDerivation { - pname = "http-api-data"; - version = "0.2.4"; - sha256 = "6bb90863343b17b9ce6ee8cfce9a41db0b4287343aa6cf0654a3ad5c5c5e6635"; - libraryHaskellDepends = [ - base bytestring text time time-locale-compat - ]; - testHaskellDepends = [ - base bytestring directory doctest filepath hspec HUnit QuickCheck - text time - ]; - homepage = "http://github.com/fizruk/http-api-data"; - description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-api-data_0_3_5" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , doctest, filepath, hashable, hspec, HUnit, QuickCheck , quickcheck-instances, text, time, time-locale-compat @@ -99326,7 +96377,6 @@ self: { homepage = "http://github.com/fizruk/http-api-data"; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-attoparsec" = callPackage @@ -99343,36 +96393,6 @@ self: { }) {}; "http-client" = callPackage - ({ mkDerivation, array, async, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, exceptions, filepath - , ghc-prim, hspec, http-types, mime-types, monad-control, network - , network-uri, random, streaming-commons, text, time, transformers - , zlib - }: - mkDerivation { - pname = "http-client"; - version = "0.4.31.2"; - sha256 = "16410148a9705677cdd89510192caf1abd3460db2a17ce0c2fafd7bd0c15d88b"; - libraryHaskellDepends = [ - array base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie data-default-class deepseq - exceptions filepath ghc-prim http-types mime-types network - network-uri random streaming-commons text time transformers - ]; - testHaskellDepends = [ - async base base64-bytestring blaze-builder bytestring - case-insensitive containers deepseq directory hspec http-types - monad-control network network-uri streaming-commons text time - transformers zlib - ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client_0_5_5" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -99399,7 +96419,6 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-auth" = callPackage @@ -99535,27 +96554,6 @@ self: { }) {}; "http-client-tls" = callPackage - ({ mkDerivation, base, bytestring, connection, data-default-class - , hspec, http-client, http-types, network, tls - }: - mkDerivation { - pname = "http-client-tls"; - version = "0.2.4.1"; - sha256 = "8dc85884e15cd32f59a47e11861d78566c6ccb202e8d317403b784278f628ba3"; - revision = "1"; - editedCabalFile = "26f1b0cf1b449df4fce7c4531444ff06ccfacae528d20c5470461ecc4058f56c"; - libraryHaskellDepends = [ - base bytestring connection data-default-class http-client network - tls - ]; - testHaskellDepends = [ base hspec http-client http-types ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "http-client backend using the connection package and tls library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client-tls_0_3_3_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, connection , cryptonite, data-default-class, exceptions, hspec, http-client , http-types, memory, network, tls, transformers @@ -99574,7 +96572,6 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "http-client backend using the connection package and tls library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-common" = callPackage @@ -99596,36 +96593,6 @@ self: { }) {}; "http-conduit" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring - , case-insensitive, conduit, conduit-extra, connection, cookie - , data-default-class, exceptions, hspec, http-client - , http-client-tls, http-types, HUnit, lifted-base, monad-control - , mtl, network, resourcet, streaming-commons, temporary, text, time - , transformers, utf8-string, wai, wai-conduit, warp, warp-tls - }: - mkDerivation { - pname = "http-conduit"; - version = "2.1.11"; - sha256 = "75df5c0515080a09b4cdc73a759523b10265a692ff50beb964766d4f8dcf0d7f"; - libraryHaskellDepends = [ - aeson base bytestring conduit conduit-extra data-default-class - exceptions http-client http-client-tls http-types lifted-base - monad-control mtl resourcet transformers - ]; - testHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive conduit - conduit-extra connection cookie data-default-class hspec - http-client http-types HUnit lifted-base network streaming-commons - temporary text time transformers utf8-string wai wai-conduit warp - warp-tls - ]; - doCheck = false; - homepage = "http://www.yesodweb.com/book/http-conduit"; - description = "HTTP client package with conduit interface and HTTPS support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-conduit_2_2_3" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, connection, cookie , data-default-class, exceptions, hspec, http-client @@ -99653,7 +96620,6 @@ self: { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-conduit-browser" = callPackage @@ -100212,8 +97178,8 @@ self: { }: mkDerivation { pname = "http2"; - version = "1.6.2"; - sha256 = "99e75ac0fa19276d276ec63bb94eefb2e952b0a374aea8f3d2c2408a634b6fe7"; + version = "1.6.3"; + sha256 = "61620eca0f57875a6a9bd24f9cc04c301b5c3c668bf98f85e9989aad5d069c43"; libraryHaskellDepends = [ array base bytestring bytestring-builder case-insensitive containers psqueues stm @@ -100223,7 +97189,8 @@ self: { case-insensitive containers directory doctest filepath Glob hex hspec psqueues stm text unordered-containers vector word8 ]; - description = "HTTP/2.0 library including frames and HPACK"; + homepage = "https://github.com/kazu-yamamoto/http2"; + description = "HTTP/2 library including frames, priority queues and HPACK"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -100735,6 +97702,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hurriyet" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, http-client + , http-client-tls, text + }: + mkDerivation { + pname = "hurriyet"; + version = "0.1.0.0"; + sha256 = "ed580d1bbb870e3c1a95d777ff83cde2120b8d9dde57700352080ce35ea7131e"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-client-tls text + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/yigitozkavci/hurriyet-haskell"; + description = "Haskell bindings for Hurriyet API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "husk-scheme" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, ghc-paths, haskeline, knob, mtl, parsec, process, time @@ -100843,13 +97828,13 @@ self: { }) {}; "hvect" = callPackage - ({ mkDerivation, base, HTF }: + ({ mkDerivation, base, hspec }: mkDerivation { pname = "hvect"; - version = "0.3.1.0"; - sha256 = "b9ba2408a3718b7a38b72cf7f81ce51ac9f0db63908969d386213c47b6526ab8"; + version = "0.4.0.0"; + sha256 = "cb50ef1a7f189f8c217a7d0d55b5568b2fa9bbe415b14ce114a93d2e1d5e30b6"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HTF ]; + testHaskellDepends = [ base hspec ]; homepage = "https://github.com/agrafix/hvect"; description = "Simple strict heterogeneous lists"; license = stdenv.lib.licenses.mit; @@ -100876,31 +97861,6 @@ self: { }) {}; "hw-bits" = callPackage - ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap - , parsec, QuickCheck, resourcet, safe, vector - }: - mkDerivation { - pname = "hw-bits"; - version = "0.1.0.1"; - sha256 = "7d20025de04db0e4639aded0ae6ad6b9252358a14626a1bfeb726dfbf084fd0e"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring hw-prim parsec safe vector - ]; - executableHaskellDepends = [ - base criterion mmap resourcet vector - ]; - testHaskellDepends = [ - base bytestring hspec hw-prim QuickCheck vector - ]; - homepage = "http://github.com/haskell-works/hw-bits#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hw-bits_0_5_0_0" = callPackage ({ mkDerivation, base, bytestring, hspec, hw-int, hw-prim , hw-string-parse, QuickCheck, safe, vector }: @@ -100921,27 +97881,6 @@ self: { }) {}; "hw-conduit" = callPackage - ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec - , hw-bits, resourcet, word8 - }: - mkDerivation { - pname = "hw-conduit"; - version = "0.0.0.11"; - sha256 = "e0e1193a901858d9bc5fccc51f99977a9bffd24993f9de6c1c3030aa0a1ed77b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring conduit hw-bits resourcet word8 - ]; - executableHaskellDepends = [ base criterion ]; - testHaskellDepends = [ base bytestring hspec ]; - homepage = "http://github.com/haskell-works/hw-conduit#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hw-conduit_0_1_0_0" = callPackage ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec , hw-bits, resourcet, word8 }: @@ -101094,6 +98033,61 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hw-kafka-client" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers + , either, hspec, monad-loops, rdkafka, regex-posix, temporary + , transformers, unix + }: + mkDerivation { + pname = "hw-kafka-client"; + version = "1.0.0"; + sha256 = "01722988ca762cfefcbb97944d408fb3f4463fe56a3697e7e3aba501962d3af0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bifunctors bytestring containers temporary transformers unix + ]; + librarySystemDepends = [ rdkafka ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ + base bifunctors bytestring containers temporary transformers unix + ]; + testHaskellDepends = [ + base bifunctors bytestring containers either hspec monad-loops + regex-posix + ]; + homepage = "https://github.com/haskell-works/hw-kafka-client"; + description = "Kafka bindings for Haskell"; + license = stdenv.lib.licenses.mit; + }) {inherit (pkgs) rdkafka;}; + + "hw-kafka-conduit" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, conduit + , conduit-extra, containers, exceptions, hspec, hw-kafka-client + , mtl, resourcet, transformers + }: + mkDerivation { + pname = "hw-kafka-conduit"; + version = "1.0.0"; + sha256 = "9b37eecd87f4e166a9cf8fec4dc2685aadb458028fae5d2adaea480e05826d1a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bifunctors bytestring conduit conduit-extra containers + exceptions hw-kafka-client mtl resourcet transformers + ]; + executableHaskellDepends = [ + base bifunctors bytestring conduit containers resourcet + ]; + testHaskellDepends = [ + base bifunctors bytestring conduit conduit-extra containers hspec + hw-kafka-client mtl resourcet transformers + ]; + homepage = "https://github.com/haskell-works/hw-kafka-client-conduit"; + description = "Conduit bindings for kafka-client"; + license = stdenv.lib.licenses.mit; + }) {}; + "hw-mquery" = callPackage ({ mkDerivation, ansi-wl-pprint, base, dlist, hspec, QuickCheck }: mkDerivation { @@ -101147,26 +98141,6 @@ self: { }) {}; "hw-prim" = callPackage - ({ mkDerivation, base, bytestring, deepseq, hspec, QuickCheck - , random, vector - }: - mkDerivation { - pname = "hw-prim"; - version = "0.1.0.3"; - sha256 = "f237844283733b85403e18d5243925946946395a2b7c2d731b7312f4a0293b84"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring deepseq random vector ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring hspec QuickCheck random vector - ]; - homepage = "http://github.com/haskell-works/hw-prim#readme"; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-prim_0_4_0_2" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: mkDerivation { pname = "hw-prim"; @@ -101177,30 +98151,9 @@ self: { homepage = "http://github.com/haskell-works/hw-prim#readme"; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-rankselect" = callPackage - ({ mkDerivation, base, hspec, hw-bits, hw-prim, QuickCheck, vector - }: - mkDerivation { - pname = "hw-rankselect"; - version = "0.3.0.0"; - sha256 = "c1b053a7b5752c55636bd95ad30678f0143aa0a3afc962ba2827187309782cfe"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base hw-bits hw-prim vector ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base hspec hw-bits hw-prim QuickCheck vector - ]; - homepage = "http://github.com/haskell-works/hw-rankselect#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hw-rankselect_0_8_0_0" = callPackage ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim , hw-rankselect-base, QuickCheck, vector }: @@ -101254,25 +98207,6 @@ self: { }) {}; "hw-succinct" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, conduit, containers - , hw-bits, hw-conduit, hw-parser, hw-prim, hw-rankselect - , mono-traversable, text, vector, word8 - }: - mkDerivation { - pname = "hw-succinct"; - version = "0.0.0.14"; - sha256 = "f3e2ec65f1d7e0baa7cda17442cdcd60635cd2693a38873361df9578b65ffbeb"; - libraryHaskellDepends = [ - attoparsec base bytestring conduit containers hw-bits hw-conduit - hw-parser hw-prim hw-rankselect mono-traversable text vector word8 - ]; - homepage = "http://github.com/haskell-works/hw-succinct#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hw-succinct_0_1_0_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit, containers , hw-balancedparens, hw-bits, hw-prim, hw-rankselect , hw-rankselect-base, mmap, mono-traversable, text, vector, word8 @@ -102622,6 +99556,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "icon-fonts" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "icon-fonts"; + version = "0.2.1.0"; + sha256 = "74fb7d6c38d772b2288a43c3418e46ff35759394ea397072d374d25d77ee0f44"; + libraryHaskellDepends = [ base ]; + description = "Package for handling icon fonts in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "iconv" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -102807,19 +99752,6 @@ self: { }) {}; "identicon" = callPackage - ({ mkDerivation, base, bytestring, hspec, JuicyPixels }: - mkDerivation { - pname = "identicon"; - version = "0.1.0"; - sha256 = "cc710ce81b969cd4a6a13b3ea46c72e5a5dd9805e8f437f5c54c9ba6b4abac93"; - libraryHaskellDepends = [ base bytestring JuicyPixels ]; - testHaskellDepends = [ base bytestring hspec JuicyPixels ]; - homepage = "https://github.com/mrkkrp/identicon"; - description = "Flexible generation of identicons"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "identicon_0_2_0" = callPackage ({ mkDerivation, base, bytestring, hspec, JuicyPixels }: mkDerivation { pname = "identicon"; @@ -102830,7 +99762,6 @@ self: { homepage = "https://github.com/mrkkrp/identicon"; description = "Flexible generation of identicons"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "identifiers" = callPackage @@ -102924,49 +99855,6 @@ self: { }) {}; "idris" = callPackage - ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal - , ansi-wl-pprint, array, async, base, base64-bytestring, binary - , blaze-html, blaze-markup, bytestring, cheapskate, containers - , deepseq, directory, filepath, fingertree, fsnotify, gmp - , haskeline, ieee754, libffi, mtl, network, optparse-applicative - , parsers, pretty, process, regex-tdfa, safe, split, tagged, tasty - , tasty-golden, tasty-rerun, terminal-size, text, time - , transformers, transformers-compat, trifecta, uniplate, unix - , unordered-containers, utf8-string, vector - , vector-binary-instances, zip-archive - }: - mkDerivation { - pname = "idris"; - version = "0.12.3"; - sha256 = "3a9f3d5aeb032b1d987402cf4ca54a2fbfc7b02d852a629f528943a5fe5b59c6"; - configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async - base base64-bytestring binary blaze-html blaze-markup bytestring - cheapskate containers deepseq directory filepath fingertree - fsnotify haskeline ieee754 libffi mtl network optparse-applicative - parsers pretty process regex-tdfa safe split terminal-size text - time transformers transformers-compat trifecta uniplate unix - unordered-containers utf8-string vector vector-binary-instances - zip-archive - ]; - librarySystemDepends = [ gmp ]; - executableHaskellDepends = [ - base directory filepath haskeline transformers - ]; - testHaskellDepends = [ - base bytestring containers directory filepath haskeline - optparse-applicative process tagged tasty tasty-golden tasty-rerun - time transformers - ]; - homepage = "http://www.idris-lang.org/"; - description = "Functional Programming Language with Dependent Types"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) gmp;}; - - "idris_0_99" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal , ansi-wl-pprint, array, async, base, base64-bytestring, binary , blaze-html, blaze-markup, bytestring, cheapskate, containers @@ -103007,7 +99895,6 @@ self: { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gmp;}; "ieee" = callPackage @@ -103049,8 +99936,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ieee754"; - version = "0.7.9"; - sha256 = "dc1860c545d7143ea8c7e53509ac535ca2932495f0f89b2801c960295cfcdd15"; + version = "0.8.0"; + sha256 = "0e2dff9c37f59acf5c64f978ec320005e9830f276f9f314e4bfed3f482289ad1"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/patperry/hs-ieee754"; description = "Utilities for dealing with IEEE floating point numbers"; @@ -103715,41 +100602,6 @@ self: { }) {}; "imm" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base - , bytestring, case-insensitive, chunked-data, comonad, compdata - , conduit, conduit-combinators, conduit-parse, connection - , containers, directory, dyre, exceptions, fast-logger, filepath - , free, hashable, HaskellNet, HaskellNet-SSL, http-client - , http-client-tls, http-types, mime-mail, mono-traversable - , monoid-subclasses, network, opml-conduit, optparse-applicative - , rainbow, rainbox, rss-conduit, text, time, timerep, tls - , transformers, uri-bytestring, xml, xml-conduit - }: - mkDerivation { - pname = "imm"; - version = "1.0.1.0"; - sha256 = "287a4815b43de90e89b27a356215e57d97c03ba4f929965b1a8ca5c4fe35658b"; - revision = "1"; - editedCabalFile = "b6f35aaba374bd580f6f40b4629047706562a9d677ff917a7b0dee1063817e25"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint atom-conduit base bytestring case-insensitive - chunked-data comonad compdata conduit conduit-combinators - conduit-parse connection containers directory dyre exceptions - fast-logger filepath free hashable HaskellNet HaskellNet-SSL - http-client http-client-tls http-types mime-mail mono-traversable - monoid-subclasses network opml-conduit optparse-applicative rainbow - rainbox rss-conduit text time timerep tls transformers - uri-bytestring xml xml-conduit - ]; - executableHaskellDepends = [ base free ]; - homepage = "https://github.com/k0ral/imm"; - description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; - license = "unknown"; - }) {}; - - "imm_1_1_0_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base , blaze-html, blaze-markup, bytestring, case-insensitive , chunked-data, comonad, conduit, conduit-combinators, connection @@ -103781,7 +100633,6 @@ self: { homepage = "https://github.com/k0ral/imm"; description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "immortal" = callPackage @@ -104218,18 +101069,6 @@ self: { }) {}; "indents" = callPackage - ({ mkDerivation, base, concatenative, mtl, parsec }: - mkDerivation { - pname = "indents"; - version = "0.3.3"; - sha256 = "b61f51ac894609cb5571cc3ded12db5de97185a8de236c69ec24c87457109f9a"; - libraryHaskellDepends = [ base concatenative mtl parsec ]; - homepage = "http://patch-tag.com/r/salazar/indents"; - description = "indentation sensitive parser-combinators for parsec"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "indents_0_4_0_0" = callPackage ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }: mkDerivation { pname = "indents"; @@ -104240,7 +101079,6 @@ self: { homepage = "http://github.com/jaspervdj/indents"; description = "indentation sensitive parser-combinators for parsec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "index-core" = callPackage @@ -104454,24 +101292,6 @@ self: { }) {}; "inflections" = callPackage - ({ mkDerivation, base, containers, HUnit, parsec, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - }: - mkDerivation { - pname = "inflections"; - version = "0.2.0.1"; - sha256 = "4bc856a2b409fbf874714f7bf50b9db4701242cf58e133bd31b1ae39fe8e2c35"; - libraryHaskellDepends = [ base containers parsec ]; - testHaskellDepends = [ - base containers HUnit parsec QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "https://github.com/stackbuilders/inflections-hs"; - description = "Inflections library for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "inflections_0_3_0_0" = callPackage ({ mkDerivation, base, exceptions, hspec, hspec-megaparsec , megaparsec, QuickCheck, text, unordered-containers }: @@ -104488,7 +101308,6 @@ self: { homepage = "https://github.com/stackbuilders/inflections-hs"; description = "Inflections library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inflist" = callPackage @@ -104639,30 +101458,6 @@ self: { }) {}; "inline-c" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring - , containers, cryptohash, directory, filepath, hashable, hspec, mtl - , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix - , template-haskell, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "inline-c"; - version = "0.5.5.9"; - sha256 = "2e48cae75fe1e4fd9f7c0ab4e7a4cbb4dcb9d2e9075d40adc33ac9038297fe22"; - libraryHaskellDepends = [ - ansi-wl-pprint base binary bytestring containers cryptohash - directory filepath hashable mtl parsec parsers QuickCheck - template-haskell transformers unordered-containers vector - ]; - testHaskellDepends = [ - ansi-wl-pprint base containers hashable hspec parsers QuickCheck - raw-strings-qq regex-posix template-haskell transformers - unordered-containers vector - ]; - description = "Write Haskell source files including C code inline. No FFI required."; - license = stdenv.lib.licenses.mit; - }) {}; - - "inline-c_0_5_6_1" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring , containers, cryptohash, directory, filepath, hashable, hspec, mtl , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix @@ -104684,7 +101479,6 @@ self: { ]; description = "Write Haskell source files including C code inline. No FFI required."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inline-c-cpp" = callPackage @@ -104788,31 +101582,6 @@ self: { }) {aether = null;}; "insert-ordered-containers" = callPackage - ({ mkDerivation, aeson, base, base-compat, hashable, lens - , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck - , text, transformers, unordered-containers - }: - mkDerivation { - pname = "insert-ordered-containers"; - version = "0.1.0.1"; - sha256 = "4905e5d128c19887a79b281150acb16cb3b043ab2c5a7788b0151ba7d46b900a"; - revision = "3"; - editedCabalFile = "c81fa69aa035ad468b45c812c16b80bc70020b05bf2d4a8298c90b4f772c98b1"; - libraryHaskellDepends = [ - aeson base base-compat hashable lens semigroupoids semigroups text - transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base base-compat hashable lens QuickCheck semigroupoids - semigroups tasty tasty-quickcheck text transformers - unordered-containers - ]; - homepage = "https://github.com/phadej/insert-ordered-containers#readme"; - description = "Associative containers retating insertion order for traversals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "insert-ordered-containers_0_2_0_0" = callPackage ({ mkDerivation, aeson, base, base-compat, hashable, lens , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck , text, transformers, unordered-containers @@ -104835,7 +101604,6 @@ self: { homepage = "https://github.com/phadej/insert-ordered-containers#readme"; description = "Associative containers retating insertion order for traversals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inserts" = callPackage @@ -104995,6 +101763,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "instapaper-sender" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default-class + , HaskellNet, HaskellNet-SSL, http-types, network, scotty, text + , wai, wai-extra + }: + mkDerivation { + pname = "instapaper-sender"; + version = "0.1.0.2"; + sha256 = "c14b27275628ae15c4d9c4f617a65cd5ff6be2a8e59a8e8d30da79e4ecb1c199"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring data-default-class HaskellNet HaskellNet-SSL + http-types network scotty text wai wai-extra + ]; + homepage = "https://github.com/spinda/instapaper-sender#readme"; + description = "Basic HTTP gateway to save articles to Instapaper"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "instinct" = callPackage ({ mkDerivation, base, containers, mersenne-random, vector }: mkDerivation { @@ -105059,8 +101847,8 @@ self: { }: mkDerivation { pname = "integer-logarithms"; - version = "1"; - sha256 = "9a34b7a9ea6cf0e760159913f41305f786fd027efce3c4e4fe700c2a46cf103c"; + version = "1.0.1"; + sha256 = "0f453f8eb8b19122eac37d04ea95e9da5f9f07eb9ad750c174c3522e7d3a784c"; libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -105454,8 +102242,34 @@ self: { }: mkDerivation { pname = "intro"; - version = "0.1.0.4"; - sha256 = "a8475b8a72bbd9ef8b712defc8206c3eac6dbb3917d52a57e4175b363acf1f84"; + version = "0.1.0.6"; + sha256 = "a3ebf5474aa99626287859c27669ffb2bcd0873204e1d9a6994f628742180bcd"; + libraryHaskellDepends = [ + base bifunctors binary bytestring containers deepseq dlist extra + hashable mtl safe string-conversions tagged text transformers + unordered-containers writer-cps-mtl + ]; + testHaskellDepends = [ + base bifunctors binary bytestring containers deepseq dlist extra + hashable lens mtl safe string-conversions tagged text transformers + unordered-containers writer-cps-mtl + ]; + homepage = "https://github.com/minad/intro#readme"; + description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "intro_0_1_0_8" = callPackage + ({ mkDerivation, base, bifunctors, binary, bytestring, containers + , deepseq, dlist, extra, hashable, lens, mtl, safe + , string-conversions, tagged, text, transformers + , unordered-containers, writer-cps-mtl + }: + mkDerivation { + pname = "intro"; + version = "0.1.0.8"; + sha256 = "09c570361dddf8c67572acffc7fd6c93bdfa1c8143d2f7eb9aec0ad5db4f21bf"; libraryHaskellDepends = [ base bifunctors binary bytestring containers deepseq dlist extra hashable mtl safe string-conversions tagged text transformers @@ -105528,6 +102342,7 @@ self: { homepage = "https://github.com/NorfairKing/introduction"; description = "A prelude for the tests of safe new projects"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intset" = callPackage @@ -105571,8 +102386,8 @@ self: { }: mkDerivation { pname = "invertible"; - version = "0.1.2"; - sha256 = "3ee47b2ba98ff687c4988a1b065be8791523f169a57c006c719c58bd368bd344"; + version = "0.2.0"; + sha256 = "3da08f518924925a547e954821eb96f15b4ecf47d541fa5770d38180963db19e"; libraryHaskellDepends = [ arrows base haskell-src-meta HList invariant lens partial-isomorphisms Piso semigroupoids template-haskell @@ -105839,6 +102654,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "iostring" = callPackage + ({ mkDerivation, base, bytestring, path, text }: + mkDerivation { + pname = "iostring"; + version = "0.0.0.0"; + sha256 = "d6865def561239a0e148d78c8e03a950308bcda45e70272ab6a64420d12a112f"; + libraryHaskellDepends = [ base bytestring path text ]; + homepage = "http://cs-syd.eu"; + description = "A class of strings that can be involved in IO"; + license = stdenv.lib.licenses.mit; + }) {}; + "iothread" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -105874,6 +102701,8 @@ self: { pname = "ip"; version = "0.8.7"; sha256 = "f33f12745defa0ac5aa72f8bfd1b48d905c6ece9a228c9a2209b2943c2f2c690"; + revision = "1"; + editedCabalFile = "53d0cca59537fcb2f837d6afcb3d9b0ac3df15a7cdbc4a06f97d696931698ebd"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -106654,11 +103483,13 @@ self: { }: mkDerivation { pname = "itemfield"; - version = "1.2.2.1"; - sha256 = "fe8bfe62a98a286f86f80f65cd3d5c09097fcc75eafda4281e8c19f999233b90"; + version = "1.2.5.0"; + sha256 = "161eaf7aba4d4b25db8e3095e579cbc486f39a5c335c5bd9711e996f58912f11"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base brick microlens text vty ]; + libraryHaskellDepends = [ + base brick data-default microlens text vty + ]; executableHaskellDepends = [ base brick data-default microlens microlens-th random text vty ]; @@ -107806,36 +104637,6 @@ self: { }) {}; "jose" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bifunctors, byteable, bytestring, cryptonite, data-default-class - , hspec, lens, memory, mtl, network-uri, QuickCheck - , quickcheck-instances, safe, semigroups, tasty, tasty-hspec - , tasty-quickcheck, template-haskell, text, time - , unordered-containers, vector, x509 - }: - mkDerivation { - pname = "jose"; - version = "0.4.0.3"; - sha256 = "742b8037e5cc9c427789196bd425594c3fb17768fb584c8434548415aa5e0f0a"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bifunctors byteable - bytestring cryptonite data-default-class lens memory mtl - network-uri QuickCheck quickcheck-instances safe semigroups - template-haskell text time unordered-containers vector x509 - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring bifunctors byteable - bytestring cryptonite data-default-class hspec lens memory mtl - network-uri QuickCheck quickcheck-instances safe semigroups tasty - tasty-hspec tasty-quickcheck template-haskell text time - unordered-containers vector x509 - ]; - homepage = "https://github.com/frasertweedale/hs-jose"; - description = "Javascript Object Signing and Encryption and JSON Web Token library"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "jose_0_5_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , byteable, bytestring, containers, cryptonite, hspec, lens, memory , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances @@ -107865,7 +104666,6 @@ self: { homepage = "https://github.com/frasertweedale/hs-jose"; description = "Javascript Object Signing and Encryption and JSON Web Token library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jose-jwt" = callPackage @@ -108138,8 +104938,8 @@ self: { }: mkDerivation { pname = "json-assertions"; - version = "1.0.8"; - sha256 = "d4e060ec54e264581e47d409e303dc3165c311dcfcd6127278c99b7a876ae259"; + version = "1.0.9"; + sha256 = "5a046e3559638d902adbf01d8ba99c3e3aef01e4c1ee26b5701ebdcd7a0f980b"; libraryHaskellDepends = [ aeson base indexed indexed-free lens lens-aeson text ]; @@ -108951,8 +105751,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.2.10"; - sha256 = "24f5eb0e48f6f05fe8ef41400891f3fd3ce2a7d4ac59822454c610a79a4ffad8"; + version = "0.2.11"; + sha256 = "ec2419917909588b5aaf88fef64fc0b7cb40d9da9e41a26763c53def58f8c506"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109590,31 +106390,6 @@ self: { }) {}; "kawhi" = callPackage - ({ mkDerivation, aeson, base, bytestring, exceptions, http-client - , http-conduit, http-types, mtl, safe, scientific, smallcheck - , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text - }: - mkDerivation { - pname = "kawhi"; - version = "0.0.1"; - sha256 = "bb7bb30129c065032d217834d9f991df63ddfa55ee14e4c45ef5ddf141839d6f"; - revision = "1"; - editedCabalFile = "624bf276517215fb85d51f9252dce93acfde800feaa6439d054f6037bc2f3cb3"; - libraryHaskellDepends = [ - aeson base bytestring exceptions http-client http-conduit - http-types mtl safe scientific text - ]; - testHaskellDepends = [ - aeson base bytestring exceptions http-client http-types mtl - scientific smallcheck tasty tasty-hunit tasty-quickcheck - tasty-smallcheck text - ]; - homepage = "https://github.com/hamsterdam/kawhi"; - description = "stats.NBA.com library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "kawhi_0_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions, http-client , http-conduit, http-types, mtl, safe, scientific, smallcheck , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text @@ -109635,7 +106410,6 @@ self: { homepage = "https://github.com/hamsterdam/kawhi"; description = "stats.NBA.com library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kazura-queue" = callPackage @@ -110229,7 +107003,7 @@ self: { }) {}; "keysafe" = callPackage - ({ mkDerivation, aeson, argon2, async, base, binary, bloomfilter + ({ mkDerivation, aeson, argon2, async, base, bloomfilter , bytestring, containers, deepseq, directory, disk-free-space , exceptions, fast-logger, filepath, http-client, lifted-base , MonadRandom, network, optparse-applicative, process, raaz, random @@ -110240,20 +107014,20 @@ self: { }: mkDerivation { pname = "keysafe"; - version = "0.20161107"; - sha256 = "ded1fd52ede4c574a4dd85ff60296f0e1bfe9b248857ee83025247790a03dfe7"; + version = "0.20170122"; + sha256 = "39349c641898e77e340d171263a9b2d860089a4ae7a6068a563e8e6647a1fd7e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson argon2 async base binary bloomfilter bytestring containers - deepseq directory disk-free-space exceptions fast-logger filepath + aeson argon2 async base bloomfilter bytestring containers deepseq + directory disk-free-space exceptions fast-logger filepath http-client lifted-base MonadRandom network optparse-applicative process raaz random random-shuffle readline SafeSemaphore secret-sharing servant servant-client servant-server socks split stm text time token-bucket transformers unbounded-delays unix unix-compat utf8-string wai warp zxcvbn-c ]; - homepage = "https://joeyh.name/code/keysafe/"; + homepage = "https://keysafe.branchable.com/"; description = "back up a secret key securely to the cloud"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -110874,8 +107648,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "labels"; - version = "0.1.2"; - sha256 = "d124f63d08ef1f80bff8094ce89261b84afada48bc1e851ed007ae4e257d2486"; + version = "0.3.0"; + sha256 = "2e7fa244c88e4de017440a617bc10c4899e3ade4422e435698923b24d84a1afb"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/chrisdone/labels#readme"; description = "Anonymous records via named tuples"; @@ -110971,8 +107745,8 @@ self: { }: mkDerivation { pname = "lackey"; - version = "0.4.1"; - sha256 = "940dcc73673241ea92044bc8f0af1c1b7004e4c09a8e0e018d018c521ae71347"; + version = "0.4.2"; + sha256 = "3a7f28b66e015a8aafe7af45cfe2da0fec32bdd2ff4f4634def64cce033878c9"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base servant tasty tasty-hspec text ]; homepage = "https://github.com/tfausak/lackey#readme"; @@ -111625,8 +108399,8 @@ self: { }: mkDerivation { pname = "lambdacube-gl"; - version = "0.5.2.0"; - sha256 = "6552d8dc5aa3d1639155d42890934aeaa19afe6c5feafee041199ad98cfbd165"; + version = "0.5.2.3"; + sha256 = "be33bde75e5753c134cba7dd2e98e8f31870bd0bfb3787659a3cf357c677dd2b"; libraryHaskellDepends = [ base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw vector vector-algorithms @@ -112417,8 +109191,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.1.1"; - sha256 = "e2fba21b6adb148896819687062378022393fc6b237d0c65ddb7196bc86ddd12"; + version = "1.3.5.1"; + sha256 = "4c33feba8e2b3654d25d7cb3d7a881b1f1228196db2d0335a0a83c995b5f19d4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112447,50 +109221,6 @@ self: { hydraPlatforms = [ "x86_64-linux" ]; }) {}; - "language-puppet_1_3_4_1" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, either, exceptions, filecache, formatting - , Glob, hashable, hruby, hslogger, hspec, hspec-megaparsec - , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec - , memory, mtl, operational, optparse-applicative, parallel-io - , parsec, pcre-utils, process, random, regex-pcre-builtin - , scientific, semigroups, servant, servant-client, split, stm - , strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "language-puppet"; - version = "1.3.4.1"; - sha256 = "41cfb18f96af7d30f4477c78b559d78b3bfa3fa385c1a06dd9177f221f0cce71"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring - case-insensitive containers cryptonite directory either exceptions - filecache formatting hashable hruby hslogger hspec http-api-data - http-client lens lens-aeson megaparsec memory mtl operational - parsec pcre-utils process random regex-pcre-builtin scientific - semigroups servant servant-client split stm strict-base-types text - time transformers unix unordered-containers vector yaml - ]; - executableHaskellDepends = [ - aeson base bytestring containers Glob hslogger http-client lens - megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin - servant-client strict-base-types text transformers - unordered-containers vector yaml - ]; - testHaskellDepends = [ - ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens - megaparsec mtl scientific strict-base-types temporary text - transformers unix unordered-containers vector - ]; - homepage = "http://lpuppet.banquise.net/"; - description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "language-python" = callPackage ({ mkDerivation, alex, array, base, containers, happy, monads-tf , pretty, transformers, utf8-string @@ -112632,28 +109362,6 @@ self: { }) {}; "language-thrift" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, containers, hspec - , hspec-discover, megaparsec, QuickCheck, scientific, semigroups - , text, transformers - }: - mkDerivation { - pname = "language-thrift"; - version = "0.9.0.2"; - sha256 = "a5c204193572f1272a9e1593f553df6d6471ea01a6432475fff0115b458bd740"; - libraryHaskellDepends = [ - ansi-wl-pprint base containers megaparsec scientific semigroups - text transformers - ]; - testHaskellDepends = [ - ansi-wl-pprint base containers hspec hspec-discover megaparsec - QuickCheck scientific semigroups text transformers - ]; - homepage = "https://github.com/abhinav/language-thrift#readme"; - description = "Parser and pretty printer for the Thrift IDL format"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "language-thrift_0_10_0_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, hspec , hspec-discover, megaparsec, QuickCheck, scientific, semigroups , text, transformers @@ -112673,7 +109381,6 @@ self: { homepage = "https://github.com/abhinav/language-thrift#readme"; description = "Parser and pretty printer for the Thrift IDL format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-typescript" = callPackage @@ -113439,22 +110146,21 @@ self: { }) {}; "legion" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, binary-conduit - , bytestring, canteven-http, conduit, conduit-extra, containers + ({ mkDerivation, aeson, base, binary, binary-conduit, bytestring + , canteven-http, conduit, conduit-extra, containers , data-default-class, data-dword, directory, exceptions, http-types - , monad-logger, network, Ranged-sets, scotty, scotty-resource, stm - , text, transformers, unix, uuid, wai, wai-extra, warp + , monad-logger, network, Ranged-sets, scotty, scotty-resource, text + , time, transformers, unix, uuid, wai, wai-extra, warp }: mkDerivation { pname = "legion"; - version = "0.8.0.3"; - sha256 = "eaa865b6ded7ecb0110298a61a5768fce49e3ef270e5a45db6a0cc2d2a7ba166"; + version = "0.9.0.0"; + sha256 = "a40c85edad14c4dca15d3d4ef6b3c240c5afb30a3798ab63acc43f6f1d5a08ce"; libraryHaskellDepends = [ - aeson attoparsec base binary binary-conduit bytestring - canteven-http conduit conduit-extra containers data-default-class - data-dword directory exceptions http-types monad-logger network - Ranged-sets scotty scotty-resource stm text transformers unix uuid - wai wai-extra warp + aeson base binary binary-conduit bytestring canteven-http conduit + conduit-extra containers data-default-class data-dword directory + exceptions http-types monad-logger network Ranged-sets scotty + scotty-resource text time transformers unix uuid wai wai-extra warp ]; homepage = "https://github.com/owensmurray/legion#readme"; description = "Distributed, stateful, homogeneous microservice framework"; @@ -113511,16 +110217,18 @@ self: { }) {}; "legion-extra" = callPackage - ({ mkDerivation, aeson, base, bytestring, canteven-log, containers - , data-default-class, legion, network, safe, split, yaml + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring + , canteven-log, conduit, containers, data-default-class, data-dword + , directory, legion, network, safe, split, stm, transformers, yaml }: mkDerivation { pname = "legion-extra"; - version = "0.1.0.6"; - sha256 = "e9471ff2b1d50596bbe86fd414e78bcd31aa78b867ac3439fddd58e21d24c0c5"; + version = "0.1.2.0"; + sha256 = "20619c18f0b4155fdef8a358338a987e41bc0ae3081990cdfcf3354cc4c67bec"; libraryHaskellDepends = [ - aeson base bytestring canteven-log containers data-default-class - legion network safe split yaml + aeson attoparsec base binary bytestring canteven-log conduit + containers data-default-class data-dword directory legion network + safe split stm transformers yaml ]; testHaskellDepends = [ base ]; homepage = "https://github.com/owensmurray/legion-extra#readme"; @@ -113631,39 +110339,6 @@ self: { }) {}; "lens" = callPackage - ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring - , comonad, containers, contravariant, distributive, exceptions - , filepath, free, ghc-prim, hashable, hlint, HUnit, kan-extensions - , mtl, parallel, profunctors, QuickCheck, reflection, semigroupoids - , semigroups, tagged, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2 - , test-framework-th, text, transformers, transformers-compat - , unordered-containers, vector, void - }: - mkDerivation { - pname = "lens"; - version = "4.14"; - sha256 = "70a3cd18ef352950b88d6cac449988b9320704b56dceda80e7de9f2907ee5f4b"; - revision = "1"; - editedCabalFile = "ec2f258fa783b324c6c9177b16b5432e757928b5efec042295c88306148059c4"; - libraryHaskellDepends = [ - array base base-orphans bifunctors bytestring comonad containers - contravariant distributive exceptions filepath free ghc-prim - hashable kan-extensions mtl parallel profunctors reflection - semigroupoids semigroups tagged template-haskell text transformers - transformers-compat unordered-containers vector void - ]; - testHaskellDepends = [ - base containers hlint HUnit mtl QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 test-framework-th - transformers - ]; - homepage = "http://github.com/ekmett/lens/"; - description = "Lenses, Folds and Traversals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lens_4_15_1" = callPackage ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring , comonad, containers, contravariant, deepseq, directory , distributive, doctest, exceptions, filepath, free @@ -113697,7 +110372,6 @@ self: { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-action" = callPackage @@ -113976,8 +110650,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.0.7.0"; - sha256 = "582a1191b8ac60a4a50fa9361a48f0fe58686ab94db7dbc13bee07e57a20e615"; + version = "1.0.8.0"; + sha256 = "108af2057f56b74a8a42e8f1bbb47e7af64cff612bb90f886e93f6118651154e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -114002,6 +110676,8 @@ self: { pname = "lenz"; version = "0.1"; sha256 = "98b3aef14ca16218ecd6643812e9df5dde5c60af6e2f56f98ec523ecc0917397"; + revision = "1"; + editedCabalFile = "48a9254ce289eedf5db423844732c4b5a42798d94b3c2e82b4b9770f87c97f07"; libraryHaskellDepends = [ base base-unicode-symbols transformers ]; description = "Van Laarhoven lenses"; license = "unknown"; @@ -115063,8 +111739,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.9.1"; - sha256 = "0f483e83079226f404d13c445a94c01dbfb5250159328016f023c900e9f3930d"; + version = "0.9.1.1"; + sha256 = "31ac44b834723c9b9d40a319135a712802f2690d700df283d0a380fcd8d48e40"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -115096,6 +111772,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lifted-base_0_2_3_10" = callPackage + ({ mkDerivation, base, HUnit, monad-control, test-framework + , test-framework-hunit, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "lifted-base"; + version = "0.2.3.10"; + sha256 = "e677e560b176c40da2478d2f27dbeadc79630b2295ea3828603e0de4784d24fc"; + libraryHaskellDepends = [ base monad-control transformers-base ]; + testHaskellDepends = [ + base HUnit monad-control test-framework test-framework-hunit + transformers transformers-base transformers-compat + ]; + homepage = "https://github.com/basvandijk/lifted-base"; + description = "lifted IO operations from the base library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lifted-protolude" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , exceptions, ghc-prim, lifted-async, lifted-base, mtl, safe, stm @@ -115316,25 +112012,6 @@ self: { }) {}; "line" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , cryptohash-sha256, http-types, lens, text, time, transformers - , wai, wreq - }: - mkDerivation { - pname = "line"; - version = "1.0.1.0"; - sha256 = "b356e813369b9ebf80ea71a79e658caabbc32645de8821eb878809afb0f1e1d5"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring cryptohash-sha256 - http-types lens text time transformers wai wreq - ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/noraesae/line"; - description = "Haskell SDK for the LINE API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "line_2_2_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text @@ -115356,7 +112033,6 @@ self: { homepage = "https://github.com/noraesae/line"; description = "Haskell SDK for the LINE API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "line-break" = callPackage @@ -117254,18 +113930,16 @@ self: { "log-domain" = callPackage ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq , directory, distributive, doctest, filepath, generic-deriving - , hashable, hashable-extras, safecopy, semigroupoids, semigroups - , simple-reflect, vector + , hashable, safecopy, semigroupoids, semigroups, simple-reflect + , vector }: mkDerivation { pname = "log-domain"; - version = "0.10.3.1"; - sha256 = "36f427506218358b20a2066d5fb38406816fabac18ca26c807a416a795643815"; - revision = "2"; - editedCabalFile = "d5c0d4af0c551eb4b014ce825c1ff6a92fa947225992a89ec9f4b67ece705c6f"; + version = "0.11"; + sha256 = "4750cd5b2b9b6317493c39c264f7a1fe68f50f8ef30ac1e1c6c42c35b78242cb"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable - hashable-extras safecopy semigroupoids semigroups vector + safecopy semigroupoids semigroups vector ]; testHaskellDepends = [ base directory doctest filepath generic-deriving semigroups @@ -117303,6 +113977,8 @@ self: { pname = "log-elasticsearch"; version = "0.7"; sha256 = "bf2326aa0c54972452543973cec3f03f68c6d0c6f9aed285696425da24122bb7"; + revision = "1"; + editedCabalFile = "b2bd9f57908bc61b3869fdde26babb546db01aa2378e93734514a87448e5b135"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring deepseq http-client log-base semigroups text text-show time @@ -117360,25 +114036,30 @@ self: { }) {}; "log-warper" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring - , data-default, directory, dlist, errors, exceptions, extra - , filepath, formatting, hashable, hslogger, lens, monad-control - , mtl, safecopy, text, text-format, time, transformers - , transformers-base, unordered-containers, yaml + ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring + , containers, data-default, directory, dlist, errors, exceptions + , extra, filepath, formatting, hashable, hslogger, hspec, HUnit + , lens, monad-control, monad-loops, mtl, QuickCheck, safecopy, text + , text-format, time, transformers, transformers-base, universum + , unordered-containers, yaml }: mkDerivation { pname = "log-warper"; - version = "0.2.3"; - sha256 = "217976f8e82b2efae445ad8316a654b250f8e4750a1e0b9a31b4e8d46b22aa84"; + version = "0.4.4"; + sha256 = "9a2cfcf95d0c88ae6471106f67314e81e2bd370fe092a4f21d9459f1f235dbea"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring data-default directory dlist + aeson ansi-terminal base bytestring containers directory dlist errors exceptions extra filepath formatting hashable hslogger lens - monad-control mtl safecopy text text-format time transformers - transformers-base unordered-containers yaml + monad-control monad-loops mtl safecopy text text-format time + transformers transformers-base universum unordered-containers yaml ]; executableHaskellDepends = [ base exceptions hslogger text ]; + testHaskellDepends = [ + async base data-default directory filepath hspec HUnit lens + QuickCheck universum unordered-containers + ]; homepage = "https://github.com/serokell/log-warper"; description = "Flexible, configurable, monadic and pretty logging"; license = stdenv.lib.licenses.mit; @@ -117495,8 +114176,8 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.1.1"; - sha256 = "4e1a6f746757ebf787820cbdb202b0b9ff206a44a24895d5500bec2ffc789fc5"; + version = "1.1.2"; + sha256 = "7a39a46028c456b024088fcc5995f7552abe21f6578019970cb079083180d12c"; libraryHaskellDepends = [ async base exceptions free monad-control mtl semigroups stm stm-delay text time transformers transformers-base wl-pprint-text @@ -117504,7 +114185,6 @@ self: { homepage = "https://github.com/ocharles/logging-effect"; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-facade" = callPackage @@ -118111,6 +114791,8 @@ self: { pname = "lrucaching"; version = "0.3.1"; sha256 = "2f287ea60d721f58474dc105dec953f98ce9a41dd1897647ef68a48605b132d6"; + revision = "1"; + editedCabalFile = "d6cfaad57c507189c9c63c24c96b551ce36f8bd035baceda4b9d187a98fef060"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -119009,10 +115691,8 @@ self: { }: mkDerivation { pname = "mackerel-client"; - version = "0.0.2"; - sha256 = "c0b9b1b074176b45771ae6b1bfb3bc41dacdb1c0ccfab675b06eceba037ddaf1"; - revision = "1"; - editedCabalFile = "e4fd64b142d46108e28cc52262779ae1096efefdb01ea6128f4a86161d880030"; + version = "0.0.3"; + sha256 = "aaa47cb30b2e727602de95d600446aba6094854bd772ac5be945b86cedbbc269"; libraryHaskellDepends = [ aeson base bytestring data-default directory filepath htoml http-client http-client-tls http-types parsec split text @@ -119077,8 +115757,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "0.1.0.2"; - sha256 = "8ce44a28bff7b1c22554719aa94adb529482745a2ddc0efd5e06bff4f77ad53c"; + version = "0.1.0.5"; + sha256 = "2fcb9eea46f6cd7d67164baaa82078b9c4f3a486ce9ff0abf225731e68066f7a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119092,6 +115772,7 @@ self: { homepage = "https://github.com/vmchale/madlang#readme"; description = "Randomized templating language DSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mage" = callPackage @@ -119225,8 +115906,8 @@ self: { }: mkDerivation { pname = "mailchimp"; - version = "0.1.0"; - sha256 = "dbbc4645a3322e11ce33059a4660dd837574f58530aaa459b4d99dc7b1b91fe2"; + version = "0.1.1"; + sha256 = "d6bdac26adc60ded7352010674a0b562f9b809e5c49954dd738d1cbfd6cb95d6"; libraryHaskellDepends = [ aeson attoparsec base bytestring http-client http-client-tls servant servant-client text transformers @@ -119927,10 +116608,8 @@ self: { }: mkDerivation { pname = "map-syntax"; - version = "0.2.0.1"; - sha256 = "f45f0e09da98dc749eae15f403e30674e874c57f81c4bdd8db818028a25b5c55"; - revision = "1"; - editedCabalFile = "98d6cd8739a862600633098d811286237e263dcb7edbc99557aaeea4cd108076"; + version = "0.2.0.2"; + sha256 = "b18f95a6369a600fda189c6f475606cbf5f5f1827f96ca3384f33ae76bda4d8a"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -120294,8 +116973,8 @@ self: { }: mkDerivation { pname = "marvin-interpolate"; - version = "0.4.0"; - sha256 = "cc7a97fe7e9d43065d59d21827e40e127b9adaf250715cd7dbfe0e8480bfa766"; + version = "1.0"; + sha256 = "bb80ab05ba25400c688af5f1ca1f0a02e07aa3a99115b1cf2d4f684caaa339ae"; libraryHaskellDepends = [ base haskell-src-meta mtl parsec template-haskell text ]; @@ -120573,6 +117252,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "matrix-market-attoparsec" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, directory + , exceptions, hspec, QuickCheck, scientific + }: + mkDerivation { + pname = "matrix-market-attoparsec"; + version = "0.1.0.3"; + sha256 = "e6c71b7405174df690d7617d1b295bc12b3e8be52b766fff79801f207fc93e20"; + libraryHaskellDepends = [ + attoparsec base bytestring exceptions scientific + ]; + testHaskellDepends = [ + base directory exceptions hspec QuickCheck + ]; + homepage = "https://github.com/ocramz/matrix-market-attoparsec"; + description = "Parsing and serialization functions for the NIST Matrix Market format"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "matrix-market-pure" = callPackage ({ mkDerivation, array, base, containers }: mkDerivation { @@ -120750,6 +117448,8 @@ self: { pname = "mcm"; version = "0.6.5.0"; sha256 = "35dd7823314ff88d64fc533429a188f455c9dc3dc55abe12f37d791fbf22c5ed"; + revision = "1"; + editedCabalFile = "f80a81b16f1133ff0d7ba1468633a76ffb28dde2b1b2edf6f14718856886d0aa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121088,62 +117788,35 @@ self: { }) {}; "mega-sdist" = callPackage - ({ mkDerivation, base, bytestring, conduit, containers, directory - , http-conduit, http-types, network, shelly, system-fileio - , system-filepath, tar, text, transformers, zlib-conduit + ({ mkDerivation, base, classy-prelude-conduit, conduit-extra + , directory, filepath, http-conduit, tar-conduit, typed-process + , yaml }: mkDerivation { pname = "mega-sdist"; - version = "0.2.10.4"; - sha256 = "8f5e7a5edb1c21a8a219867ec670b7def9b764ce0326caea0bf1ff84cfa10575"; + version = "0.3.0"; + sha256 = "afbfc37f2ebbf8bbe880297f784e81a63886dc14aacb2ed921d6c63c66abbf81"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring conduit containers directory http-conduit - http-types network shelly system-fileio system-filepath tar text - transformers zlib-conduit + base classy-prelude-conduit conduit-extra directory filepath + http-conduit tar-conduit typed-process yaml ]; homepage = "https://github.com/snoyberg/mega-sdist"; - description = "Handles uploading to Hackage from mega repos (deprecated)"; + description = "Handles uploading to Hackage from mega repos"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "megaparsec" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, exceptions - , HUnit, mtl, QuickCheck, scientific, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - , transformers - }: - mkDerivation { - pname = "megaparsec"; - version = "5.0.1"; - sha256 = "8bd9c4f4f1d92cf45577ceabd13f58e0a980848142fba1036fa37bcab4aa3b25"; - libraryHaskellDepends = [ - base bytestring containers deepseq exceptions mtl scientific text - transformers - ]; - testHaskellDepends = [ - base bytestring containers exceptions HUnit mtl QuickCheck - scientific test-framework test-framework-hunit - test-framework-quickcheck2 text transformers - ]; - homepage = "https://github.com/mrkkrp/megaparsec"; - description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "megaparsec_5_1_2" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, exceptions , hspec, hspec-expectations, mtl, QuickCheck, scientific, text , transformers }: mkDerivation { pname = "megaparsec"; - version = "5.1.2"; - sha256 = "ecb943979f8078a0f6e3bf8db2232d91cb1224768aa8ea0b8fc577af24b36ccd"; - revision = "1"; - editedCabalFile = "5286fd0b0f2edd01ca06e4cc1f814eedf81365c8b7b36cf3023128f75fadbc54"; + version = "5.2.0"; + sha256 = "c250a7ae2365e96df8f1061d28c7d04e5a1695395ea87055f36e3f3a57e90408"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions mtl QuickCheck scientific text transformers @@ -121155,7 +117828,6 @@ self: { homepage = "https://github.com/mrkkrp/megaparsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "meldable-heap" = callPackage @@ -121365,6 +118037,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memis" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, filemanip, filepath, http-types + , mime-types, process, process-extras, regex-compat + , regex-pcre-builtin, regex-tdfa, safe, simple, split, text + , transformers, unordered-containers, utf8-string, wai, wai-extra + , wai-middleware-static, warp + }: + mkDerivation { + pname = "memis"; + version = "0.1.1"; + sha256 = "c99e4caceadd34ccc8e7101a449f0744a1fc395cf3a547fa333564f632056602"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + filemanip filepath http-types mime-types process process-extras + regex-compat regex-pcre-builtin regex-tdfa safe simple split text + transformers unordered-containers utf8-string wai wai-extra + wai-middleware-static warp + ]; + homepage = "http://johannesgerer.com/memis"; + description = "Memis Efficient Manual Image Sorting"; + license = stdenv.lib.licenses.mit; + }) {}; + "memo-ptr" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -121421,21 +118119,6 @@ self: { }) {}; "memory" = callPackage - ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty - , tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "memory"; - version = "0.13"; - sha256 = "dc73602573eaed85b1887f07057151c7de63f559ef90a10297c363d9b120870a"; - libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; - testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; - homepage = "https://github.com/vincenthz/hs-memory"; - description = "memory and related abstraction stuff"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "memory_0_14_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty , tasty-hunit, tasty-quickcheck }: @@ -121448,7 +118131,6 @@ self: { homepage = "https://github.com/vincenthz/hs-memory"; description = "memory and related abstraction stuff"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memorypool" = callPackage @@ -121512,18 +118194,6 @@ self: { }) {}; "mersenne-random-pure64" = callPackage - ({ mkDerivation, base, old-time, random }: - mkDerivation { - pname = "mersenne-random-pure64"; - version = "0.2.0.5"; - sha256 = "3ca131d6c26fe8a086c40c6e79459149286c31083e0e110f7032aeba8038346e"; - libraryHaskellDepends = [ base old-time random ]; - homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/"; - description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mersenne-random-pure64_0_2_2_0" = callPackage ({ mkDerivation, base, random, time }: mkDerivation { pname = "mersenne-random-pure64"; @@ -121533,7 +118203,6 @@ self: { homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/"; description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "messagepack" = callPackage @@ -121698,28 +118367,6 @@ self: { }) {}; "metrics" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , lens, mtl, mwc-random, primitive, QuickCheck, text, time, unix - , unordered-containers, vector, vector-algorithms - }: - mkDerivation { - pname = "metrics"; - version = "0.3.0.2"; - sha256 = "0df2801b630fcfe5c4a1968ccc1571016fb4c9408dfc881c599ba6f872543c02"; - libraryHaskellDepends = [ - ansi-terminal base bytestring containers lens mtl mwc-random - primitive text time unix unordered-containers vector - vector-algorithms - ]; - testHaskellDepends = [ - async base lens mwc-random primitive QuickCheck unix - ]; - description = "High-performance application metric tracking"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "metrics_0_4_0_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , HUnit, lens, mwc-random, primitive, QuickCheck, text, time , transformers, transformers-base, unix-compat @@ -121907,29 +118554,6 @@ self: { }) {}; "microlens-aeson" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens - , scientific, tasty, tasty-hunit, text, unordered-containers - , vector - }: - mkDerivation { - pname = "microlens-aeson"; - version = "2.1.1.3"; - sha256 = "4e43bdbd0d258804ee4de0f78149dc93cfe1aaa2e1e235bc11b1965c94166731"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring microlens scientific text - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring microlens tasty tasty-hunit text - unordered-containers vector - ]; - homepage = "http://github.com/fosskers/microlens-aeson/"; - description = "Law-abiding lenses for Aeson, using microlens"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "microlens-aeson_2_2_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens , scientific, tasty, tasty-hunit, text, unordered-containers , vector @@ -122182,6 +118806,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "midi-simple" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, generic-random + , hspec, hspec-attoparsec, QuickCheck, tasty, tasty-hspec + , tasty-quickcheck + }: + mkDerivation { + pname = "midi-simple"; + version = "0.1.0.0"; + sha256 = "f680eed206f3623e01817794b9f7dd9a7c8fb6aa935648a3a5cb24119621849a"; + libraryHaskellDepends = [ attoparsec base bytestring ]; + testHaskellDepends = [ + attoparsec base bytestring generic-random hspec hspec-attoparsec + QuickCheck tasty tasty-hspec tasty-quickcheck + ]; + homepage = "https://github.com/tsahyt/midi-simple#readme"; + description = "A simple and fast library for working with MIDI messages"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "midi-util" = callPackage ({ mkDerivation, base, containers, event-list, midi, non-negative }: @@ -122285,8 +118928,8 @@ self: { }: mkDerivation { pname = "mighttpd2"; - version = "3.3.4"; - sha256 = "9a8dd3e2bf2a62f34695a8baf8b715223c3aa57de1c3b30d5a604d364ae1d4b4"; + version = "3.3.5"; + sha256 = "89e4e32bab7820b01e2b6e45cf70e406af1639aaf8534f769225efd89cc3730a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122309,23 +118952,6 @@ self: { }) {}; "mighty-metropolis" = callPackage - ({ mkDerivation, base, containers, mcmc-types, mwc-probability - , pipes, primitive, transformers - }: - mkDerivation { - pname = "mighty-metropolis"; - version = "1.0.4"; - sha256 = "6e670796298b3f47a7226c0ce51a97889395119e3de32e4722186af55d8092cf"; - libraryHaskellDepends = [ - base mcmc-types mwc-probability pipes primitive transformers - ]; - testHaskellDepends = [ base containers mwc-probability ]; - homepage = "http://github.com/jtobin/mighty-metropolis"; - description = "The Metropolis algorithm"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mighty-metropolis_1_2_0" = callPackage ({ mkDerivation, base, containers, kan-extensions, mcmc-types , mwc-probability, pipes, primitive, transformers }: @@ -122341,7 +118967,6 @@ self: { homepage = "http://github.com/jtobin/mighty-metropolis"; description = "The Metropolis algorithm"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mikmod" = callPackage @@ -122402,8 +119027,8 @@ self: { }: mkDerivation { pname = "milena"; - version = "0.5.0.1"; - sha256 = "2fe50795fe7a1826d1a24e66f5f31823cc83621de5137dd98196e2ce7420db10"; + version = "0.5.0.2"; + sha256 = "8e770eba91b0caddd5fb16b96f191ca7f4554689fc88f41261687a1af74f5c4b"; libraryHaskellDepends = [ base bytestring cereal containers digest lens lifted-base mtl murmur-hash network random resource-pool semigroups transformers @@ -122451,8 +119076,8 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.4.12"; - sha256 = "93e1caa9932bec12dc1b931db2f3ea9e2e2db9b8382b7babaf0a5e559936217c"; + version = "0.4.13"; + sha256 = "a089fd837b77b75eb36dc1749da422820d2658d0145a378e6de32f3b30b7a440"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring filepath process random text @@ -122659,6 +119284,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "minio-hs" = callPackage + ({ mkDerivation, async, base, bytestring, case-insensitive, conduit + , conduit-combinators, conduit-extra, containers, cryptonite + , cryptonite-conduit, data-default, directory, exceptions, filepath + , http-client, http-conduit, http-types, lifted-async, lifted-base + , memory, monad-control, protolude, QuickCheck, resourcet, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary, text + , time, transformers, transformers-base, xml-conduit + }: + mkDerivation { + pname = "minio-hs"; + version = "0.1.0"; + sha256 = "7138f31251268521dd35b143dd943f87f32c3f3b7606487b8f176e4561ddf908"; + libraryHaskellDepends = [ + async base bytestring case-insensitive conduit conduit-combinators + conduit-extra containers cryptonite cryptonite-conduit data-default + exceptions filepath http-client http-conduit http-types + lifted-async lifted-base memory monad-control protolude resourcet + text time transformers transformers-base xml-conduit + ]; + testHaskellDepends = [ + async base bytestring case-insensitive conduit conduit-combinators + conduit-extra containers cryptonite cryptonite-conduit data-default + directory exceptions filepath http-client http-conduit http-types + lifted-async lifted-base memory monad-control protolude QuickCheck + resourcet tasty tasty-hunit tasty-quickcheck tasty-smallcheck + temporary text time transformers transformers-base xml-conduit + ]; + homepage = "https://github.com/donatello/minio-hs#readme"; + description = "A Minio client library, compatible with S3 like services"; + license = stdenv.lib.licenses.asl20; + }) {}; + "minions" = callPackage ({ mkDerivation, ansi-terminal, base, MissingH, process, time }: mkDerivation { @@ -122824,6 +119482,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mintty" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "mintty"; + version = "0.1"; + sha256 = "956b346c89b12e683b957bf45eb0d09cae121fd247916de0386687f713ca0865"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/RyanGlScott/mintty"; + description = "A reliable way to detect the presence of a MinTTY console on Windows"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mios" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, vector }: mkDerivation { @@ -123102,15 +119772,13 @@ self: { }) {}; "modbus-tcp" = callPackage - ({ mkDerivation, base, bytestring, cereal, mtl, network - , transformers - }: + ({ mkDerivation, base, bytestring, cereal, mtl, transformers }: mkDerivation { pname = "modbus-tcp"; - version = "0.3"; - sha256 = "539d030348f403431f763bcc822bc5e8dd946ed28e353e2a877427409b3d7737"; + version = "0.4"; + sha256 = "eb77f105623bdf639d0f309eb7fecbc89512b9b0d2acb47ae8f2a589b270510f"; libraryHaskellDepends = [ - base bytestring cereal mtl network transformers + base bytestring cereal mtl transformers ]; homepage = "https://github.com/roelvandijk/modbus-tcp"; description = "Communicate with Modbus devices over TCP"; @@ -123155,31 +119823,6 @@ self: { }) {}; "modify-fasta" = callPackage - ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative - , pipes, pipes-text, regex-tdfa, regex-tdfa-text, split, text - , text-show - }: - mkDerivation { - pname = "modify-fasta"; - version = "0.8.2.1"; - sha256 = "5af7cddb753353ac1e16e15e5962e6a6c46eeb6a1d1ae38a8f014e20b04e61a0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers fasta regex-tdfa regex-tdfa-text split text - text-show - ]; - executableHaskellDepends = [ - base containers fasta mtl optparse-applicative pipes pipes-text - split text - ]; - homepage = "https://github.com/GregorySchwartz/modify-fasta"; - description = "Modify fasta (and CLIP) files in several optional ways"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "modify-fasta_0_8_2_3" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split , text, text-show @@ -123626,8 +120269,8 @@ self: { }: mkDerivation { pname = "monad-extras"; - version = "0.5.11"; - sha256 = "76972ce47148f8a60498a878394135cd4079bef79f79f12c9cd86d1766230467"; + version = "0.6.0"; + sha256 = "df33d7c51a97d16226b8160d9bc09686cb6f7b7bf5c54557381c6fe4a3c84f2c"; libraryHaskellDepends = [ base mmorph monad-control stm transformers transformers-base ]; @@ -123686,8 +120329,8 @@ self: { pname = "monad-http"; version = "0.1.0.0"; sha256 = "a333b087835aa4902d0814e76fe4f32a523092fd7b13526aad415160a8317192"; - revision = "3"; - editedCabalFile = "7d244f8a4ef132e7af6de7d70223548c34b99805e8e45edad6ab091a1e664ff6"; + revision = "4"; + editedCabalFile = "14c2dd1a2de592a520efe1b743d98b6ecdaf71cd56fde036628f8c8f759fbf03"; libraryHaskellDepends = [ base base-compat bytestring exceptions http-client http-client-tls http-types monad-logger monadcryptorandom MonadRandom mtl text @@ -123804,6 +120447,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_20_2" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, conduit + , conduit-extra, exceptions, fast-logger, lifted-base + , monad-control, monad-loops, mtl, resourcet, stm, stm-chans + , template-haskell, text, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.20.2"; + sha256 = "1f004999b282b3895cc0904053befb48b863efc2899a89e93195b4544cc9c737"; + libraryHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra exceptions + fast-logger lifted-base monad-control monad-loops mtl resourcet stm + stm-chans template-haskell text transformers transformers-base + transformers-compat + ]; + homepage = "https://github.com/kazu-yamamoto/logger"; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -123935,6 +120601,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "monad-metrics" = callPackage + ({ mkDerivation, base, clock, containers, ekg-core, microlens, mtl + , text, transformers + }: + mkDerivation { + pname = "monad-metrics"; + version = "0.1.0.2"; + sha256 = "a64e5f3aebe020c0f38892874f74b2b94ad84b319cee2e7ec092c5b2bd842276"; + libraryHaskellDepends = [ + base clock containers ekg-core microlens mtl text transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/sellerlabs/monad-metrics#readme"; + description = "A convenient wrapper around EKG metrics"; + license = stdenv.lib.licenses.mit; + }) {}; + "monad-open" = callPackage ({ mkDerivation, base, exceptions, mtl, transformers }: mkDerivation { @@ -124413,15 +121096,16 @@ self: { }) {}; "monadcryptorandom" = callPackage - ({ mkDerivation, base, bytestring, crypto-api, mtl, tagged - , transformers + ({ mkDerivation, base, bytestring, crypto-api, exceptions, mtl + , tagged, transformers, transformers-compat }: mkDerivation { pname = "monadcryptorandom"; - version = "0.7.0"; - sha256 = "67011973932bc58d5f1d0eedbbe8dca3c3160ea1dac04e82cf96bd6687515623"; + version = "0.7.1"; + sha256 = "85c37875743cd2357fba28d0bde3b06cd90f4f2d9770b8e0221e15258ac6b9e7"; libraryHaskellDepends = [ - base bytestring crypto-api mtl tagged transformers + base bytestring crypto-api exceptions mtl tagged transformers + transformers-compat ]; homepage = "https://github.com/TomMD/monadcryptorandom"; description = "A monad for using CryptoRandomGen"; @@ -124543,6 +121227,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "monadoid" = callPackage + ({ mkDerivation, base, monad-control, mtl, transformers-base }: + mkDerivation { + pname = "monadoid"; + version = "0.0.2"; + sha256 = "26c2e9fb0456dbec761c6d9723ad33cbb9fcd3a1318ff4197859d766e14ec877"; + libraryHaskellDepends = [ + base monad-control mtl transformers-base + ]; + description = "A monoid for monads"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monadplus" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -124633,6 +121330,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "monetdb-mapi" = callPackage + ({ mkDerivation, base, bindings-monetdb-mapi }: + mkDerivation { + pname = "monetdb-mapi"; + version = "0.1.0.0"; + sha256 = "b9e2b238b7442757e849fa61016251c42fc52d8950cc56fd3f008bbe7f02e76c"; + libraryHaskellDepends = [ base bindings-monetdb-mapi ]; + description = "Mid-level bindings for the MonetDB API (mapi)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "money" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -124770,10 +121478,8 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "1.0.1"; - sha256 = "a96d449eb00e062be003d314884fdb06b1e02e18e0d43e5008500ae7ef3de268"; - revision = "1"; - editedCabalFile = "023e5f7596dbfe73456063ed6aa336d2262da4717c267225c9a50c6e6045dc41"; + version = "1.0.1.1"; + sha256 = "3afa27672db118c215dca1233d7c0cdb9c3ba7f6e4fb4d56e9c75deebb3dde57"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -124787,15 +121493,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "mono-traversable_1_0_1_1" = callPackage + "mono-traversable_1_0_1_2" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable , hspec, HUnit, QuickCheck, semigroups, split, text, transformers , unordered-containers, vector, vector-algorithms }: mkDerivation { pname = "mono-traversable"; - version = "1.0.1.1"; - sha256 = "3afa27672db118c215dca1233d7c0cdb9c3ba7f6e4fb4d56e9c75deebb3dde57"; + version = "1.0.1.2"; + sha256 = "1875b0281b2956530c33d20cfdbc1d0e1d46d09d1f9623cff19c31b7a4d296ea"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -124888,26 +121594,6 @@ self: { }) {}; "monoid-subclasses" = callPackage - ({ mkDerivation, base, bytestring, containers, primes, QuickCheck - , quickcheck-instances, tasty, tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "monoid-subclasses"; - version = "0.4.2.1"; - sha256 = "4fe3360d06c09b66ba89c080337e2813ad225b1e6a28a580410930e882f5032a"; - libraryHaskellDepends = [ - base bytestring containers primes text vector - ]; - testHaskellDepends = [ - base bytestring containers primes QuickCheck quickcheck-instances - tasty tasty-quickcheck text vector - ]; - homepage = "https://github.com/blamario/monoid-subclasses/"; - description = "Subclasses of Monoid"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monoid-subclasses_0_4_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, primes, QuickCheck , quickcheck-instances, tasty, tasty-quickcheck, text, vector }: @@ -124925,7 +121611,6 @@ self: { homepage = "https://github.com/blamario/monoid-subclasses/"; description = "Subclasses of Monoid"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoid-transformer" = callPackage @@ -125130,6 +121815,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "more-extensible-effects" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "more-extensible-effects"; + version = "0.1.0.4"; + sha256 = "01b798127f9d19235b911d468d0380571251b1662233a9e608be962805a884ea"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/qzchenwl/more-extensible-effects#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "morfette" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, filepath, mtl, pretty, QuickCheck, text, utf8-string @@ -125190,34 +121887,6 @@ self: { }) {}; "morte" = callPackage - ({ mkDerivation, alex, array, base, binary, containers, deepseq - , Earley, http-client, http-client-tls, microlens, microlens-mtl - , mtl, optparse-applicative, pipes, QuickCheck, system-fileio - , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text - , text-format, transformers - }: - mkDerivation { - pname = "morte"; - version = "1.6.2"; - sha256 = "277ba41cc40236a8a02dd154d29108ddc9d8ca7706daa5fe3177189487363b5a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary containers deepseq Earley http-client - http-client-tls microlens microlens-mtl pipes system-fileio - system-filepath text text-format transformers - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ base optparse-applicative text ]; - testHaskellDepends = [ - base mtl QuickCheck system-filepath tasty tasty-hunit - tasty-quickcheck text transformers - ]; - description = "A bare-bones calculus of constructions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "morte_1_6_5" = callPackage ({ mkDerivation, alex, array, base, binary, containers, deepseq , Earley, http-client, http-client-tls, microlens, microlens-mtl , mtl, optparse-applicative, pipes, QuickCheck, system-fileio @@ -125243,7 +121912,6 @@ self: { ]; description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mosaico-lib" = callPackage @@ -126329,6 +122997,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "multivariant" = callPackage + ({ mkDerivation, base, containers, free, HUnit, invertible + , MonadRandom, profunctors, QuickCheck, semigroupoids, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "multivariant"; + version = "0.1.0.1"; + sha256 = "57278b97a88ecc9d8e2a4c58aee902393cf4a9dbaa500683568053ba60e06408"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers free HUnit invertible MonadRandom profunctors + QuickCheck semigroupoids tasty tasty-hunit tasty-quickcheck text + transformers + ]; + executableHaskellDepends = [ + base containers free HUnit invertible MonadRandom profunctors + QuickCheck semigroupoids tasty tasty-hunit tasty-quickcheck text + transformers + ]; + testHaskellDepends = [ + base containers free HUnit invertible MonadRandom profunctors + QuickCheck semigroupoids tasty tasty-hunit tasty-quickcheck text + transformers + ]; + homepage = "https://bitbucket.org/gltronred/multivariant#readme"; + description = "Multivariant assignments generation language"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "muon" = callPackage ({ mkDerivation, base, blaze-html, ConfigFile, directory, Glob , happstack-server, HStringTemplate, markdown, MissingH, process @@ -126909,18 +123609,6 @@ self: { }) {}; "mwc-probability" = callPackage - ({ mkDerivation, base, mwc-random, primitive, transformers }: - mkDerivation { - pname = "mwc-probability"; - version = "1.2.2"; - sha256 = "a54e9e9e51c7b67e0eb8244d584fcfc999ab7af00e5146ffdf3efed837d5915a"; - libraryHaskellDepends = [ base mwc-random primitive transformers ]; - homepage = "http://github.com/jtobin/mwc-probability"; - description = "Sampling function-based probability distributions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mwc-probability_1_3_0" = callPackage ({ mkDerivation, base, mwc-random, primitive, transformers }: mkDerivation { pname = "mwc-probability"; @@ -126930,7 +123618,6 @@ self: { homepage = "http://github.com/jtobin/mwc-probability"; description = "Sampling function-based probability distributions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mwc-random" = callPackage @@ -126961,6 +123648,48 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mxnet" = callPackage + ({ mkDerivation, base, c2hs, c2hs-extra, mxnet }: + mkDerivation { + pname = "mxnet"; + version = "0.1.0.1"; + sha256 = "9407f88beb3f0f472b3aa61ca9a16b0ae41c6b3eff6b1bb868d4787ad27bb10e"; + libraryHaskellDepends = [ base c2hs-extra ]; + librarySystemDepends = [ mxnet ]; + libraryToolDepends = [ c2hs ]; + homepage = "http://github.com/sighingnow/mxnet-haskell#readme"; + description = "MXNet interface in Haskell"; + license = stdenv.lib.licenses.mit; + }) {mxnet = null;}; + + "mxnet-examples" = callPackage + ({ mkDerivation, base, mxnet }: + mkDerivation { + pname = "mxnet-examples"; + version = "0.1.0.0"; + sha256 = "147cb175fd9b409dd11292b3ce3ab98359a69a4fbd6c42fdcd4a75b0c7e8f7bf"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base mxnet ]; + homepage = "http://github.com/sighingnow/mxnet-haskell#readme"; + description = "Examples for MXNet in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + + "mxnet-nnvm" = callPackage + ({ mkDerivation, base, c2hs, c2hs-extra, mxnet }: + mkDerivation { + pname = "mxnet-nnvm"; + version = "0.1.0.0"; + sha256 = "1e9e0b48a91789553befa80b8714365a63a9185809463a6127df715eb11f6561"; + libraryHaskellDepends = [ base c2hs-extra ]; + librarySystemDepends = [ mxnet ]; + libraryToolDepends = [ c2hs ]; + homepage = "http://github.com/sighingnow/mxnet-haskell#readme"; + description = "NNVM interface in Haskell"; + license = stdenv.lib.licenses.mit; + }) {mxnet = null;}; + "myTestlll" = callPackage ({ mkDerivation, ansi-terminal, array, arrows, base, bytestring , Cabal, CCA, containers, deepseq, Euterpea, ghc-prim, HCodecs @@ -127643,6 +124372,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nat-sized-numbers" = callPackage + ({ mkDerivation, base, doctest, QuickCheck, smallcheck }: + mkDerivation { + pname = "nat-sized-numbers"; + version = "0.1.0.0"; + sha256 = "64b862c8e64ccd3d71dc62723dc84817f9b1aeea45818d535cca60575de34144"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest QuickCheck smallcheck ]; + homepage = "https://github.com/oisdk/nat-sized-numbers#readme"; + description = "Variable-sized numbers from type-level nats"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nationstates" = callPackage ({ mkDerivation, base, bytestring, clock, containers, http-client , http-client-tls, http-types, multiset, tls, transformers, xml @@ -127754,23 +124497,6 @@ self: { }) {}; "natural-transformation" = callPackage - ({ mkDerivation, base, containers, quickcheck-instances, tasty - , tasty-quickcheck - }: - mkDerivation { - pname = "natural-transformation"; - version = "0.3.1"; - sha256 = "9b5a39f18790f33807298d47dc7098e2863ca874e8b3d2b419bf696f2ad09702"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base containers quickcheck-instances tasty tasty-quickcheck - ]; - homepage = "https://github.com/ku-fpg/natural-transformation"; - description = "A natural transformation package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "natural-transformation_0_4" = callPackage ({ mkDerivation, base, containers, quickcheck-instances, tasty , tasty-quickcheck }: @@ -127785,7 +124511,6 @@ self: { homepage = "https://github.com/ku-fpg/natural-transformation"; description = "A natural transformation package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "naturalcomp" = callPackage @@ -128776,10 +125501,8 @@ self: { ({ mkDerivation, base, bytestring, network, text, time, vector }: mkDerivation { pname = "network-carbon"; - version = "1.0.7"; - sha256 = "9cb794e29273aedf7f3fba7eed81a6a9f83791809095c22c11bf094a687dc9c0"; - revision = "1"; - editedCabalFile = "aed14a345bcd3d3ef50f393ffd360e8d2870aa0272926190565c39e7e4989c4b"; + version = "1.0.8"; + sha256 = "071b81db16f33edfb0dd11e918911f177b9584da27b3481c23a82a9d29f61d86"; libraryHaskellDepends = [ base bytestring network text time vector ]; @@ -130205,6 +126928,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "non-empty-zipper" = callPackage + ({ mkDerivation, base, checkers, QuickCheck }: + mkDerivation { + pname = "non-empty-zipper"; + version = "0.1.0.5"; + sha256 = "196e30fd12ce74458a62b8b61ea7c1f6cec4d5999f465d2ccb11b394c3ed77b4"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base checkers QuickCheck ]; + description = "The Zipper for NonEmpty"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "non-negative" = callPackage ({ mkDerivation, base, QuickCheck, utility-ht }: mkDerivation { @@ -130622,8 +127357,8 @@ self: { }: mkDerivation { pname = "ntrip-client"; - version = "0.1.4"; - sha256 = "e1c1dda1e00e2b195d0c326ccf0bc23f122c4337d68056a6fc66646ee05aec2f"; + version = "0.1.5"; + sha256 = "eb93158c19610209c4d5e89de75afe7aa70bf3871e0e0b3ee70418d1f0d1aee8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131326,36 +128061,6 @@ self: { }) {}; "octane" = callPackage - ({ mkDerivation, aeson, base, bimap, binary, binary-bits - , bytestring, containers, data-binary-ieee754, data-default-class - , deepseq, file-embed, http-client, http-client-tls - , overloaded-records, regex-compat, tasty, tasty-hspec - , tasty-quickcheck, text, unordered-containers, vector - }: - mkDerivation { - pname = "octane"; - version = "0.16.3"; - sha256 = "e62faeb9bec990995d507e7542ebde84edfb42cbae4b0369bfe4aadec05d91fe"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bimap binary binary-bits bytestring containers - data-binary-ieee754 data-default-class deepseq file-embed - overloaded-records regex-compat text unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base binary bytestring http-client http-client-tls - ]; - testHaskellDepends = [ - base binary binary-bits bytestring containers tasty tasty-hspec - tasty-quickcheck text - ]; - homepage = "https://github.com/tfausak/octane#readme"; - description = "Parse Rocket League replays"; - license = stdenv.lib.licenses.mit; - }) {}; - - "octane_0_18_2" = callPackage ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers , data-default-class, file-embed, http-client, http-client-tls , overloaded-records, rattletrap, text @@ -131376,7 +128081,6 @@ self: { homepage = "https://github.com/tfausak/octane#readme"; description = "Parse Rocket League replays"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "octohat" = callPackage @@ -131812,6 +128516,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "onama" = callPackage + ({ mkDerivation, base, containers, parsec, tagsoup }: + mkDerivation { + pname = "onama"; + version = "0.2.2.0"; + sha256 = "df85a43fa050f6d6afc6f56789fdf176da7b615019871b3a8f4f82c635f47626"; + libraryHaskellDepends = [ base containers parsec tagsoup ]; + description = "HTML-parsing primitives for Parsec"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "once" = callPackage ({ mkDerivation, base, containers, hashable, template-haskell , unordered-containers @@ -131829,15 +128544,16 @@ self: { }) {}; "one-liner" = callPackage - ({ mkDerivation, base, contravariant, ghc-prim, profunctors - , transformers + ({ mkDerivation, base, bifunctors, contravariant, ghc-prim + , profunctors, tagged, transformers }: mkDerivation { pname = "one-liner"; - version = "0.6"; - sha256 = "40b4ed5de04d7f32a1297c33eedc971abd0652c156cfb89172fbeccdeda1e17f"; + version = "0.8"; + sha256 = "83831911ce829082bff57e5596bbb23947a153cd5ad6dd90f02b3152faf22ea6"; libraryHaskellDepends = [ - base contravariant ghc-prim profunctors transformers + base bifunctors contravariant ghc-prim profunctors tagged + transformers ]; homepage = "https://github.com/sjoerdvisscher/one-liner"; description = "Constraint-based generics"; @@ -131935,8 +128651,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.5.2.2"; - sha256 = "e09e565314d59a420349f0a5295ee4f9ed7215d579741fcf06d376703dd3d102"; + version = "0.5.3.0"; + sha256 = "6ceda758d97c5b0b547182fb2c7a0379f0f5843e76f4bbd0baa81a171a763d73"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -132004,8 +128720,8 @@ self: { }: mkDerivation { pname = "opaleye-trans"; - version = "0.3.3"; - sha256 = "7bfa05fc152921a8ab7ec6cba18be66f2cffb5840648e9c7a88e98c77cbfd841"; + version = "0.3.4"; + sha256 = "84925620c5d596657a3d2467e0fbe297fad2876362da7f063d6b6034910d6e60"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132130,19 +128846,22 @@ self: { }) {}; "open-witness" = callPackage - ({ mkDerivation, base, hashable, random, template-haskell - , transformers, witness + ({ mkDerivation, base, constraints, hashable, mtl, random, tasty + , tasty-hunit, template-haskell, transformers, witness }: mkDerivation { pname = "open-witness"; - version = "0.3.1"; - sha256 = "f217e4585e706cef7ab7aa3419f56205a929c350dbeb6c868972d7c25e7b82cb"; + version = "0.4"; + sha256 = "5b5b934213b9a795bfed829613fbcb11faa20e12f403319c300921ed094acb20"; libraryHaskellDepends = [ - base hashable random template-haskell transformers witness + base constraints hashable random template-haskell transformers + witness ]; + testHaskellDepends = [ base mtl tasty tasty-hunit witness ]; homepage = "https://github.com/AshleyYakeley/open-witness"; description = "open witnesses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opencog-atomspace" = callPackage @@ -132799,37 +129518,6 @@ self: { }) {}; "opml-conduit" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, conduit - , conduit-combinators, conduit-parse, containers, data-default - , exceptions, foldl, hlint, lens-simple, mono-traversable - , monoid-subclasses, mtl, parsers, QuickCheck, quickcheck-instances - , resourcet, semigroups, tasty, tasty-hunit, tasty-quickcheck, text - , time, timerep, uri-bytestring, xml-conduit, xml-conduit-parse - , xml-types - }: - mkDerivation { - pname = "opml-conduit"; - version = "0.5.0.1"; - sha256 = "69c22270aa0f3a9c45dcf993e9de06982a780b5e035e343f257bf9d8fd8a2533"; - libraryHaskellDepends = [ - base case-insensitive conduit conduit-parse containers exceptions - foldl lens-simple mono-traversable monoid-subclasses parsers - semigroups text time timerep uri-bytestring xml-conduit - xml-conduit-parse xml-types - ]; - testHaskellDepends = [ - base bytestring conduit conduit-combinators conduit-parse - containers data-default exceptions hlint lens-simple - mono-traversable mtl parsers QuickCheck quickcheck-instances - resourcet semigroups tasty tasty-hunit tasty-quickcheck text time - uri-bytestring xml-conduit-parse - ]; - homepage = "https://github.com/k0ral/opml-conduit"; - description = "Streaming parser/renderer for the OPML 2.0 format."; - license = "unknown"; - }) {}; - - "opml-conduit_0_6_0_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, conduit , conduit-combinators, containers, data-default, hlint, lens-simple , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck @@ -132855,7 +129543,6 @@ self: { homepage = "https://github.com/k0ral/opml-conduit"; description = "Streaming parser/renderer for the OPML 2.0 format."; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opn" = callPackage @@ -133005,29 +129692,13 @@ self: { }) {}; "optparse-applicative" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, process, transformers - , transformers-compat - }: - mkDerivation { - pname = "optparse-applicative"; - version = "0.12.1.0"; - sha256 = "18b46d6d2c17e941bb02f84e980390f056795dce73ece946d71d3d4d002313d5"; - libraryHaskellDepends = [ - ansi-wl-pprint base process transformers transformers-compat - ]; - homepage = "https://github.com/pcapriotti/optparse-applicative"; - description = "Utilities and combinators for parsing command line options"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "optparse-applicative_0_13_0_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck , transformers, transformers-compat }: mkDerivation { pname = "optparse-applicative"; - version = "0.13.0.0"; - sha256 = "cec6b1d94d347898a25446fb8a6643399d8429cf326f221e38a02d849b2b0cac"; + version = "0.13.1.0"; + sha256 = "f1fcf9d7e78ddf14083a07d8fe1aa65d75c5102e0d44df981585bce54c5c2a2b"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; @@ -133035,7 +129706,6 @@ self: { homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-declarative" = callPackage @@ -133051,22 +129721,6 @@ self: { }) {}; "optparse-generic" = callPackage - ({ mkDerivation, base, bytestring, optparse-applicative - , system-filepath, text, time, transformers, void - }: - mkDerivation { - pname = "optparse-generic"; - version = "1.1.1"; - sha256 = "02938fa18d2d2aee9ccd69ed402771e01eff20da280be5a1ca1229e07929c611"; - libraryHaskellDepends = [ - base bytestring optparse-applicative system-filepath text time - transformers void - ]; - description = "Auto-generate a command-line parser for your datatype"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "optparse-generic_1_1_4" = callPackage ({ mkDerivation, base, bytestring, optparse-applicative, semigroups , system-filepath, text, time, transformers, void }: @@ -133080,7 +129734,6 @@ self: { ]; description = "Auto-generate a command-line parser for your datatype"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-helper" = callPackage @@ -133383,6 +130036,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "orgstat" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, colour + , containers, data-default, diagrams-lib, diagrams-svg, directory + , exceptions, filepath, formatting, hashable, hspec, HUnit, lens + , linear, log-warper, mtl, optparse-simple, orgmode-parse + , QuickCheck, quickcheck-text, text, time, transformers, turtle + , universum, yaml + }: + mkDerivation { + pname = "orgstat"; + version = "0.0.2"; + sha256 = "7187c2118b82f48f25306315160b3483e05a7638df53e5167fc519b8f8e4ff8d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring colour containers data-default + diagrams-lib diagrams-svg directory exceptions filepath formatting + hashable lens linear log-warper mtl optparse-simple orgmode-parse + text time turtle universum yaml + ]; + executableHaskellDepends = [ + base bytestring directory exceptions filepath formatting log-warper + optparse-simple universum + ]; + testHaskellDepends = [ + base colour hspec HUnit lens QuickCheck quickcheck-text text time + transformers universum + ]; + homepage = "https://github.com/volhovM/orgstat"; + description = "Statistics visualizer for org-mode"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "origami" = callPackage ({ mkDerivation, base, bifunctors, containers, HUnit, lens, mtl , pretty, template-haskell, test-framework, test-framework-hunit @@ -133584,8 +130270,8 @@ self: { }: mkDerivation { pname = "overload"; - version = "0.1.0.2"; - sha256 = "9880a0c4d5ffbfb6b681a785b581d1bac0fadcb677d0dc5edf6ea75bf01fa598"; + version = "0.1.0.3"; + sha256 = "d57d1c8af311c6a01bb83a4ecd5687ead614744ebed32b6d5ab46a0c7f4fa4d7"; libraryHaskellDepends = [ base simple-effects template-haskell th-expand-syns ]; @@ -133885,30 +130571,6 @@ self: { }) {}; "pagerduty" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bytestring - , bytestring-conversion, conduit, data-default-class, exceptions - , generics-sop, http-client, http-types, lens, lens-aeson, mmorph - , monad-control, mtl, template-haskell, text, time - , time-locale-compat, transformers, transformers-base - , transformers-compat, unordered-containers - }: - mkDerivation { - pname = "pagerduty"; - version = "0.0.7"; - sha256 = "5e46075a080cf6c6561977e3f0cdd53a32a627b3a193d58c61a05e628757fe9c"; - libraryHaskellDepends = [ - aeson base bifunctors bytestring bytestring-conversion conduit - data-default-class exceptions generics-sop http-client http-types - lens lens-aeson mmorph monad-control mtl template-haskell text time - time-locale-compat transformers transformers-base - transformers-compat unordered-containers - ]; - homepage = "http://github.com/brendanhay/pagerduty"; - description = "Client library for PagerDuty Integration and REST APIs"; - license = "unknown"; - }) {}; - - "pagerduty_0_0_8" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring , bytestring-conversion, conduit, data-default-class, exceptions , generics-sop, http-client, http-types, lens, lens-aeson, mmorph @@ -133930,7 +130592,6 @@ self: { homepage = "http://github.com/brendanhay/pagerduty"; description = "Client library for PagerDuty Integration and REST APIs"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pagination" = callPackage @@ -133962,6 +130623,18 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "paint" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "paint"; + version = "1.0.0"; + sha256 = "a4029057144e91384edfa6e6c56e90b2fe2f1e166201d73f9f8e02e265b6424f"; + libraryHaskellDepends = [ base text ]; + homepage = "https://github.com/lovasko/paint"; + description = "Colorization of text for command-line output"; + license = "unknown"; + }) {}; + "palette" = callPackage ({ mkDerivation, array, base, colour, containers }: mkDerivation { @@ -134023,73 +130696,22 @@ self: { }) {}; "pandoc" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base - , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , cmark, containers, data-default, deepseq, Diff, directory - , executable-path, extensible-exceptions, filemanip, filepath - , ghc-prim, haddock-library, highlighting-kate, hslua, HTTP - , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl - , network, network-uri, old-time, pandoc-types, parsec, process - , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , texmath, text, time, unordered-containers, vector, xml, yaml - , zip-archive, zlib - }: - mkDerivation { - pname = "pandoc"; - version = "1.17.1"; - sha256 = "5978baaf664ce254b508108a6be9d5a11a2c2ac61462ae85286be2ecdb010c86"; - revision = "1"; - editedCabalFile = "0ceaa11f58bcbaa0b3aa8babf7a92de818ff331f38193c8e42ee8bc174113681"; - configureFlags = [ "-fhttps" "-f-trypandoc" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array base base64-bytestring binary blaze-html blaze-markup - bytestring cmark containers data-default deepseq directory - extensible-exceptions filemanip filepath ghc-prim haddock-library - highlighting-kate hslua HTTP http-client http-client-tls http-types - JuicyPixels mtl network network-uri old-time pandoc-types parsec - process random scientific SHA syb tagsoup temporary texmath text - time unordered-containers vector xml yaml zip-archive zlib - ]; - executableHaskellDepends = [ - aeson base bytestring containers directory extensible-exceptions - filepath highlighting-kate HTTP network network-uri pandoc-types - text yaml - ]; - testHaskellDepends = [ - ansi-terminal base bytestring containers Diff directory - executable-path filepath highlighting-kate HUnit pandoc-types - process QuickCheck syb test-framework test-framework-hunit - test-framework-quickcheck2 text zip-archive - ]; - doCheck = false; - homepage = "http://pandoc.org"; - description = "Conversion between markup formats"; - license = "GPL"; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "pandoc_1_19_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , cmark, containers, data-default, deepseq, Diff, directory , doctemplates, executable-path, extensible-exceptions, filemanip - , filepath, ghc-prim, haddock-library, highlighting-kate, hslua - , HTTP, http-client, http-client-tls, http-types, HUnit - , JuicyPixels, mtl, network, network-uri, old-time, pandoc-types - , parsec, process, QuickCheck, random, scientific, SHA, syb - , tagsoup, temporary, test-framework, test-framework-hunit - , test-framework-quickcheck2, texmath, text, time, unix - , unordered-containers, vector, xml, yaml, zip-archive, zlib + , filepath, ghc-prim, haddock-library, hslua, HTTP, http-client + , http-client-tls, http-types, HUnit, JuicyPixels, mtl, network + , network-uri, old-time, pandoc-types, parsec, process, QuickCheck + , random, scientific, SHA, skylighting, syb, tagsoup, temporary + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , texmath, text, time, unix, unordered-containers, vector, xml + , yaml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "1.19.1"; - sha256 = "9d22db0a1536de0984f4a605f1a28649e68d540e6d892947d9644987ecc4172a"; - revision = "3"; - editedCabalFile = "fd4285e9e69d662c7dce04f9153d8b4c571cd0dbd8d7ea2708c2fc50a0ee2abc"; + version = "1.19.2.1"; + sha256 = "08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -134097,28 +130719,27 @@ self: { aeson array base base64-bytestring binary blaze-html blaze-markup bytestring cmark containers data-default deepseq directory doctemplates extensible-exceptions filemanip filepath ghc-prim - haddock-library highlighting-kate hslua HTTP http-client - http-client-tls http-types JuicyPixels mtl network network-uri - old-time pandoc-types parsec process random scientific SHA syb - tagsoup temporary texmath text time unordered-containers vector xml - yaml zip-archive zlib + haddock-library hslua HTTP http-client http-client-tls http-types + JuicyPixels mtl network network-uri old-time pandoc-types parsec + process random scientific SHA skylighting syb tagsoup temporary + texmath text time unordered-containers vector xml yaml zip-archive + zlib ]; executableHaskellDepends = [ aeson base bytestring containers directory extensible-exceptions - filepath highlighting-kate HTTP network network-uri pandoc-types - text unix yaml + filepath HTTP network network-uri pandoc-types skylighting text + unix yaml ]; testHaskellDepends = [ ansi-terminal base bytestring containers Diff directory - executable-path filepath highlighting-kate HUnit pandoc-types - process QuickCheck syb test-framework test-framework-hunit + executable-path filepath HUnit pandoc-types process QuickCheck + skylighting syb test-framework test-framework-hunit test-framework-quickcheck2 text zip-archive ]; doCheck = false; homepage = "http://pandoc.org"; description = "Conversion between markup formats"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -134131,10 +130752,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.10.3"; - sha256 = "2f6233ff91a9fb08edfb0ac2b4ec40729d87590a7c557d0452674dd3c7df4d58"; - revision = "1"; - editedCabalFile = "aacaeb9d3fbf64d0bf21ff2f7cd6becc58160c9bcf2923431fe78d19eaf1aeb3"; + version = "0.10.4"; + sha256 = "1dcfffe0dc26d0a1b5ef5688a09c1bb81231702169196e6faed8ddef360d848f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134148,7 +130767,7 @@ self: { pandoc-types syb text yaml ]; testHaskellDepends = [ - aeson base bytestring directory filepath pandoc pandoc-types + aeson base bytestring directory filepath mtl pandoc pandoc-types process temporary text yaml ]; doCheck = false; @@ -134157,13 +130776,47 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-citeproc_0_10_4_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hs-bibutils, mtl + , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 + , setenv, split, syb, tagsoup, temporary, text, time + , unordered-containers, vector, xml-conduit, yaml + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.10.4.1"; + sha256 = "6e6b0a89a831f9bfaa33dc0f3dff1792ee1626a5e66e1bd34da9447cd3c7de51"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 + setenv split syb tagsoup text time unordered-containers vector + xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring filepath pandoc + pandoc-types syb text yaml + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath mtl pandoc pandoc-types + process temporary text yaml + ]; + doCheck = false; + homepage = "https://github.com/jgm/pandoc-citeproc"; + description = "Supports using pandoc with citeproc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process }: mkDerivation { pname = "pandoc-citeproc-preamble"; - version = "1.2.2"; - sha256 = "ee496f052eea0ad9a881d8056025f04cd83ec9773d695e15220151c33890579c"; + version = "1.2.3"; + sha256 = "82c2d2c4af43dfa8e3eb71fceb20688e7f6a8f89956785207105b2e8bff8e5c6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -134175,31 +130828,30 @@ self: { }) {}; "pandoc-crossref" = callPackage - ({ mkDerivation, base, bytestring, containers, data-accessor + ({ mkDerivation, base, containers, data-accessor , data-accessor-template, data-accessor-transformers, data-default - , directory, filepath, hspec, mtl, pandoc, pandoc-types, process - , roman-numerals, syb, template-haskell, utility-ht, yaml + , directory, filepath, hspec, mtl, pandoc, pandoc-types + , roman-numerals, syb, template-haskell, utility-ht }: mkDerivation { pname = "pandoc-crossref"; - version = "0.2.4.1"; - sha256 = "2aa2266ac3916677c18bd9a88b99f32622c22c983abaed3598020913ca3912ed"; + version = "0.2.4.2"; + sha256 = "fe1121698b9b9804f8ccc43cbbb2e77e40948caa543b42e129bf4ce872a7cd3f"; + revision = "1"; + editedCabalFile = "32a7466f513eaacbe70d359813e5f9fbb6f3492f23019e6588d48bd58ed994c2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers data-accessor data-accessor-template + base containers data-accessor data-accessor-template data-accessor-transformers data-default mtl pandoc pandoc-types - roman-numerals syb template-haskell utility-ht yaml - ]; - executableHaskellDepends = [ - base bytestring containers data-default mtl pandoc pandoc-types - yaml + roman-numerals syb template-haskell utility-ht ]; + executableHaskellDepends = [ base pandoc pandoc-types ]; testHaskellDepends = [ - base bytestring containers data-accessor data-accessor-template + base containers data-accessor data-accessor-template data-accessor-transformers data-default directory filepath hspec - mtl pandoc pandoc-types process roman-numerals syb template-haskell - utility-ht yaml + mtl pandoc pandoc-types roman-numerals syb template-haskell + utility-ht ]; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; @@ -134334,22 +130986,6 @@ self: { }) {}; "pandoc-types" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , ghc-prim, syb - }: - mkDerivation { - pname = "pandoc-types"; - version = "1.16.1.1"; - sha256 = "f8feb3aef9adc16e7a81d4fd4548e5a142366c59a826272f9b04a9dddbfb9524"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq ghc-prim syb - ]; - homepage = "http://johnmacfarlane.net/pandoc"; - description = "Types for representing a structured document"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-types_1_17_0_5" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , ghc-prim, HUnit, QuickCheck, string-qq, syb, test-framework , test-framework-hunit, test-framework-quickcheck2 @@ -134368,7 +131004,6 @@ self: { homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-unlit" = callPackage @@ -135757,8 +132392,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.4.7.0"; - sha256 = "f0e1dafb87d6a09c9cc3dae0dfab740c7b387327c913e2512a4aae9feb5d4f3c"; + version = "0.5.0.0"; + sha256 = "74fe32c9b9dec0b57895f92037027093f6928b482bd147534f87fcb4c24cec3c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -135784,21 +132419,22 @@ self: { "patch-image" = callPackage ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda - , accelerate-fft, accelerate-io, accelerate-utility, base, Cabal - , filepath, gnuplot, hmatrix, JuicyPixels, utility-ht, vector + , accelerate-cufft, accelerate-fourier, accelerate-io + , accelerate-utility, base, Cabal, filepath, gnuplot, hmatrix + , JuicyPixels, utility-ht, vector }: mkDerivation { pname = "patch-image"; - version = "0.1.0.1"; - sha256 = "82cadcdd7aee8793777de191c2f0fe7702bf0e110b2b95031d88c4f9386d4353"; + version = "0.1.0.2"; + sha256 = "5dfe265b69765a8a9e2ef550da10a6a65c56fde23ad2124046bafe2c2ec95e35"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - accelerate accelerate-arithmetic accelerate-cuda accelerate-fft - accelerate-io accelerate-utility base Cabal filepath gnuplot - hmatrix JuicyPixels utility-ht vector + accelerate accelerate-arithmetic accelerate-cuda accelerate-cufft + accelerate-fourier accelerate-io accelerate-utility base Cabal + filepath gnuplot hmatrix JuicyPixels utility-ht vector ]; - homepage = "http://code.haskell.org/~thielema/patch-image/"; + homepage = "http://hub.darcs.net/thielema/patch-image/"; description = "Compose a big image from overlapping parts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -135826,21 +132462,18 @@ self: { "path" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions - , filepath, genvalidity, genvalidity-hspec, hspec, HUnit, mtl - , QuickCheck, template-haskell, validity + , filepath, hashable, hspec, HUnit, mtl, QuickCheck + , template-haskell }: mkDerivation { pname = "path"; - version = "0.5.11"; - sha256 = "bf0d9ea00271017893f59d5e136cb22116278220899609104d7906635286ac14"; - revision = "1"; - editedCabalFile = "a7cad89b8049cd067990a13713c27513b7c473182accfebae5eb2aa0a1d2c197"; + version = "0.5.12"; + sha256 = "52f0dae7e3d72d26fa62ff55de65b6697744dd0c5b96f48625cb00df1cf1055d"; libraryHaskellDepends = [ - aeson base deepseq exceptions filepath template-haskell + aeson base deepseq exceptions filepath hashable template-haskell ]; testHaskellDepends = [ - aeson base bytestring filepath genvalidity genvalidity-hspec hspec - HUnit mtl QuickCheck validity + aeson base bytestring filepath hspec HUnit mtl QuickCheck ]; description = "Support for well-typed paths"; license = stdenv.lib.licenses.bsd3; @@ -136913,41 +133546,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "persistent_2_2_4_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-html, blaze-markup, bytestring, conduit, containers - , exceptions, fast-logger, hspec, http-api-data, lifted-base - , monad-control, monad-logger, mtl, old-locale, path-pieces - , resource-pool, resourcet, scientific, silently, tagged - , template-haskell, text, time, transformers, transformers-base - , unordered-containers, vector - }: - mkDerivation { - pname = "persistent"; - version = "2.2.4.1"; - sha256 = "1473bdd952854d7f5fdb5896d2df07ef1ecf301c7fdb136054f49625329d50db"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html blaze-markup - bytestring conduit containers exceptions fast-logger http-api-data - lifted-base monad-control monad-logger mtl old-locale path-pieces - resource-pool resourcet scientific silently tagged template-haskell - text time transformers transformers-base unordered-containers - vector - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger hspec http-api-data lifted-base - monad-control monad-logger mtl old-locale path-pieces resource-pool - resourcet scientific tagged template-haskell text time transformers - unordered-containers vector - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Type-safe, multi-backend data serialization"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - "persistent" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers @@ -137312,29 +133910,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "persistent-sqlite_2_2_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , hspec, monad-control, monad-logger, old-locale, persistent - , persistent-template, resourcet, text, time, transformers - }: - mkDerivation { - pname = "persistent-sqlite"; - version = "2.2.1"; - sha256 = "bac71080bb25ad20b9116e42df463bbe230bacb2d963a5b101a501cff7fffc5e"; - libraryHaskellDepends = [ - aeson base bytestring conduit containers monad-control monad-logger - old-locale persistent resourcet text time transformers - ]; - testHaskellDepends = [ - base hspec persistent persistent-template time transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using sqlite3"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - "persistent-sqlite" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, monad-control, monad-logger, old-locale, persistent @@ -137360,31 +133935,6 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-template_2_1_8_1" = callPackage - ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers - , ghc-prim, hspec, http-api-data, monad-control, monad-logger - , path-pieces, persistent, QuickCheck, tagged, template-haskell - , text, transformers, unordered-containers - }: - mkDerivation { - pname = "persistent-template"; - version = "2.1.8.1"; - sha256 = "34911f40028357567717f6724abae4e6fc905567ffc8ba8ee5042e9680b2f168"; - libraryHaskellDepends = [ - aeson aeson-compat base bytestring containers ghc-prim - http-api-data monad-control monad-logger path-pieces persistent - tagged template-haskell text transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec persistent QuickCheck text transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Type-safe, non-relational, multi-backend persistence"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - "persistent-template" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger @@ -137649,23 +134199,22 @@ self: { "pgdl" = callPackage ({ mkDerivation, base, binary, brick, bytestring, Cabal, conduit - , conduit-extra, configurator, containers, data-default, directory + , conduit-extra, configurator, containers, directory , directory-listing-webpage-parser, filepath, http-conduit , http-types, microlens, process, resourcet, tagsoup, text, time , transformers, unix, vector, vty }: mkDerivation { pname = "pgdl"; - version = "10.6"; - sha256 = "f3b2c7b1871a0a906db45d963233e2cd124ac206526a37421552e6456d57d249"; + version = "10.7"; + sha256 = "e9e91142bff59bff5768af8c927c10133c68f1a8504115999b5623d6cd3bfe73"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base binary brick bytestring Cabal conduit conduit-extra - configurator containers data-default directory - directory-listing-webpage-parser filepath http-conduit http-types - microlens process resourcet tagsoup text time transformers unix - vector vty + configurator containers directory directory-listing-webpage-parser + filepath http-conduit http-types microlens process resourcet + tagsoup text time transformers unix vector vty ]; description = "browse directory listing webpages and download files from them"; license = stdenv.lib.licenses.publicDomain; @@ -137831,8 +134380,8 @@ self: { }: mkDerivation { pname = "phoityne"; - version = "0.0.4.0"; - sha256 = "ce5ff314971995fd37318a0858ce5fd8276a5f0b5f43f5110f80ae2f0e31b957"; + version = "0.0.5.0"; + sha256 = "c3b53f08c00ded7a382b752ffdf9c6cae6472f69e51f527e4b4180f58f4f5568"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -137841,7 +134390,7 @@ self: { MissingH mtl parsec process resourcet safe text transformers ]; testHaskellDepends = [ base hspec ]; - description = "ghci debug viewer with simple editor"; + description = "Deprecated - ghci debug viewer with simple editor"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -137853,8 +134402,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.11.0"; - sha256 = "d9d5e2b94ac48b2a7aaa50526b66dfe47de9c368147b64865c3dc2d65c17defb"; + version = "0.0.12.0"; + sha256 = "db6c64e67759c9133f12a70fa82df22c8f7d4ba4450b5317aa57f35a177976fb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -138110,12 +134659,12 @@ self: { ({ mkDerivation, base, cli, hmatrix, JuicyPixels, vector }: mkDerivation { pname = "picedit"; - version = "0.1.1.2"; - sha256 = "e56601b9a206f1d51de3d16abb20fe94a3fc1e5a775662108dd2d0d0d09dab58"; + version = "0.2.3.0"; + sha256 = "e8525d8ca1d4ab0995293948a05dda3eb57f2456603ba5467fef982d0296c12d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hmatrix JuicyPixels vector ]; - executableHaskellDepends = [ base cli ]; + executableHaskellDepends = [ base cli hmatrix ]; homepage = "https://github.com/mdibaiee/picedit#readme"; description = "simple image manipulation functions"; license = stdenv.lib.licenses.gpl3; @@ -138228,30 +134777,6 @@ self: { }) {}; "pinboard" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, either, hspec - , http-client, http-client-tls, http-types, mtl, network - , old-locale, profunctors, QuickCheck, random, semigroups, text - , time, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "pinboard"; - version = "0.9.6"; - sha256 = "1b999ac66e530a840b425a4656b8499eccf1928bb25dd059a09b9e14863347db"; - libraryHaskellDepends = [ - aeson base bytestring containers either http-client http-client-tls - http-types mtl network old-locale profunctors random text time - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers hspec mtl QuickCheck semigroups - text time transformers unordered-containers - ]; - homepage = "https://github.com/jonschoning/pinboard"; - description = "Access to the Pinboard API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pinboard_0_9_12_3" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , http-client, http-client-tls, http-types, monad-logger, mtl , network, profunctors, QuickCheck, random, safe-exceptions @@ -138260,8 +134785,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.9.12.3"; - sha256 = "b38931a4cd32bc6a43862c38116779af76c0b5b5eb6f117ba6b60ef3f717324b"; + version = "0.9.12.4"; + sha256 = "a64c3dab19bedbe341406a0897a323d9f7830f384856f01a8d0a2cf5ae591e99"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-client-tls http-types monad-logger mtl network profunctors random @@ -138275,7 +134800,6 @@ self: { homepage = "https://github.com/jonschoning/pinboard"; description = "Access to the Pinboard API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pinch" = callPackage @@ -138301,17 +134825,16 @@ self: { }) {}; "pinchot" = callPackage - ({ mkDerivation, base, containers, Earley, lens, ListLike - , non-empty-sequence, pretty-show, semigroups, template-haskell - , transformers + ({ mkDerivation, base, containers, Earley, lens, pretty-show + , semigroups, template-haskell, transformers }: mkDerivation { pname = "pinchot"; - version = "0.22.0.0"; - sha256 = "248a9e9108d5e12afd4da1aa5bc6bc8d2e732257da318c60bb225844edb88617"; + version = "0.24.0.0"; + sha256 = "b9769cdecb718c834d6fb04b62c08482f98cbb2a48c8a810ce83db96eff997e5"; libraryHaskellDepends = [ - base containers Earley lens ListLike non-empty-sequence pretty-show - semigroups template-haskell transformers + base containers Earley lens pretty-show semigroups template-haskell + transformers ]; homepage = "http://www.github.com/massysett/pinchot"; description = "Write grammars, not parsers"; @@ -138347,23 +134870,6 @@ self: { }) {}; "pipes" = callPackage - ({ mkDerivation, base, mmorph, mtl, QuickCheck, test-framework - , test-framework-quickcheck2, transformers - }: - mkDerivation { - pname = "pipes"; - version = "4.1.9"; - sha256 = "c2d5d08761bbb62dca03f81b3d99bb2f50a386c52c30b2abc8c3ca8aabdea3ea"; - libraryHaskellDepends = [ base mmorph mtl transformers ]; - testHaskellDepends = [ - base mtl QuickCheck test-framework test-framework-quickcheck2 - transformers - ]; - description = "Compositional pipelines"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes_4_3_2" = callPackage ({ mkDerivation, base, exceptions, mmorph, mtl, QuickCheck , test-framework, test-framework-quickcheck2, transformers }: @@ -138380,7 +134886,6 @@ self: { ]; description = "Compositional pipelines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-aeson" = callPackage @@ -138543,20 +135048,6 @@ self: { }) {inherit (pkgs) bzip2;}; "pipes-cacophony" = callPackage - ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }: - mkDerivation { - pname = "pipes-cacophony"; - version = "0.4.0"; - sha256 = "224ff8983cc61a92bc733cbdd2a9632b30858ef7a644203a346c0c9d18821ec0"; - libraryHaskellDepends = [ base bytestring cacophony pipes ]; - testHaskellDepends = [ base hlint ]; - homepage = "https://github.com/centromere/pipes-cacophony"; - description = "Pipes for Noise-secured network connections"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "pipes-cacophony_0_4_1" = callPackage ({ mkDerivation, base, bytestring, cacophony, hlint, memory, pipes }: mkDerivation { @@ -138577,8 +135068,8 @@ self: { }: mkDerivation { pname = "pipes-category"; - version = "0.2.0.0"; - sha256 = "bc8d268cc35a14ec5ef317e2dfd6551d76269e706477bccc03b7d884be779bf7"; + version = "0.2.0.1"; + sha256 = "9da046ca3b30115bad0d3ab447250675543c159c9a6e865d2ae863c61ead6679"; libraryHaskellDepends = [ base lens mtl pipes pipes-extras ]; testHaskellDepends = [ base hspec pipes transformers ]; homepage = "https://github.com/louispan/pipes-category#readme"; @@ -138814,10 +135305,8 @@ self: { }: mkDerivation { pname = "pipes-files"; - version = "0.1.1"; - sha256 = "a895f464790996ca19195fe605040520660087a36e8c6316fe6647bc23d516aa"; - revision = "1"; - editedCabalFile = "5ac3b0b50d526ba7e9018a8870d0df0e981c0365d1a0650bc84959dd1a80da83"; + version = "0.1.2"; + sha256 = "7c76760998925020f912d0da9f67938bfdb96858b63771bd5c2696b0de1a4531"; libraryHaskellDepends = [ attoparsec base bytestring directory exceptions filepath free hierarchy mmorph monad-control mtl pipes pipes-safe posix-paths @@ -138835,6 +135324,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pipes-fluid" = callPackage + ({ mkDerivation, async, base, constraints, hspec, lens + , lifted-async, mmorph, monad-control, mtl, pipes + , pipes-concurrency, pipes-misc, semigroups, stm, these + , transformers, transformers-base + }: + mkDerivation { + pname = "pipes-fluid"; + version = "0.5.0.3"; + sha256 = "0d2ef03e16992ef96a4f5d15f1c6d566c7ea7d65eb87e9c64be081d8a60b2b39"; + libraryHaskellDepends = [ + base constraints lens lifted-async monad-control pipes semigroups + stm these transformers transformers-base + ]; + testHaskellDepends = [ + async base constraints hspec lens lifted-async mmorph monad-control + mtl pipes pipes-concurrency pipes-misc stm transformers + ]; + homepage = "https://github.com/louispan/pipes-fluid#readme"; + description = "Reactively combines Producers so that a value is yielded as soon as possible"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-group" = callPackage ({ mkDerivation, base, doctest, free, lens-family-core, pipes , pipes-parse, transformers @@ -138886,10 +135398,8 @@ self: { ({ mkDerivation, base, containers, heaps, pipes }: mkDerivation { pname = "pipes-interleave"; - version = "1.1.0"; - sha256 = "bd083ec1cc9f35ee393763b18581835d8124b358480ae91c6473308af642d8c4"; - revision = "1"; - editedCabalFile = "d198f42613a501edcdd6f66ad1991b0ba0a2de01453b001e95b0627f87a5853c"; + version = "1.1.1"; + sha256 = "2758429d9da110fcd8037d2db301813c5635c28e89c01e91c709663d090aef50"; libraryHaskellDepends = [ base containers heaps pipes ]; homepage = "http://github.com/bgamari/pipes-interleave"; description = "Interleave and merge streams of elements"; @@ -138957,23 +135467,48 @@ self: { }) {}; "pipes-misc" = callPackage - ({ mkDerivation, base, hspec, lens, mtl, pipes, pipes-category - , pipes-concurrency, semigroups, stm, transformers + ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl + , pipes, pipes-category, pipes-concurrency, semigroups, stm + , transformers }: mkDerivation { pname = "pipes-misc"; - version = "0.2.0.0"; - sha256 = "d8c56177820ec3d4f7532f98f98026b2e8c9b618572d8fcd97fc4b7446c4e992"; + version = "0.2.3.0"; + sha256 = "15a45dcef5c4893c517632772991602b34dd128d59b9eb4fa9d37a6aa7d62d66"; libraryHaskellDepends = [ - base lens mtl pipes pipes-category pipes-concurrency semigroups stm - transformers + base clock Decimal lens mtl pipes pipes-category pipes-concurrency + semigroups stm transformers + ]; + testHaskellDepends = [ + base hspec lens mmorph pipes pipes-concurrency stm transformers ]; - testHaskellDepends = [ base hspec lens pipes transformers ]; homepage = "https://github.com/louispan/pipes-misc#readme"; description = "Miscellaneous utilities for pipes, required by glazier-tutorial"; license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-misc_0_2_4_0" = callPackage + ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl + , pipes, pipes-category, pipes-concurrency, semigroups, stm + , transformers + }: + mkDerivation { + pname = "pipes-misc"; + version = "0.2.4.0"; + sha256 = "5602e1cc4a726b62de393b0236db0ba1bbd2f847f8fc5ac30c5ee727fb40041b"; + libraryHaskellDepends = [ + base clock Decimal lens mtl pipes pipes-category pipes-concurrency + semigroups stm transformers + ]; + testHaskellDepends = [ + base hspec lens mmorph pipes pipes-concurrency stm transformers + ]; + homepage = "https://github.com/louispan/pipes-misc#readme"; + description = "Miscellaneous utilities for pipes, required by glazier-tutorial"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-mongodb" = callPackage ({ mkDerivation, base, monad-control, mongoDB, pipes, text }: mkDerivation { @@ -139083,8 +135618,8 @@ self: { }: mkDerivation { pname = "pipes-postgresql-simple"; - version = "0.1.2.0"; - sha256 = "81f11a44938d2ba1744f0ba82053a3a5aaaa0cfc716f5a4762ff4bde7415328a"; + version = "0.1.3.0"; + sha256 = "53de5231df1c0591e9dbd3b989a4075e45fa2a493adce060b53b8e741dbae688"; libraryHaskellDepends = [ async base bytestring exceptions mtl pipes pipes-concurrency pipes-safe postgresql-simple stm text transformers @@ -139145,18 +135680,23 @@ self: { }) {}; "pipes-s3" = callPackage - ({ mkDerivation, aws, base, bytestring, http-client - , http-client-tls, pipes, pipes-bytestring, pipes-safe, resourcet - , text, transformers + ({ mkDerivation, aws, base, bytestring, exceptions, http-client + , http-client-tls, http-types, pipes, pipes-bytestring, pipes-safe + , QuickCheck, resourcet, tasty, tasty-quickcheck, text + , transformers }: mkDerivation { pname = "pipes-s3"; - version = "0.1.0.0"; - sha256 = "a41869e5fa135c8abb3749474cb4c7e9fd572de201109de79176a4c09e33d813"; + version = "0.3.0.2"; + sha256 = "fd89bb1af54af172c2b4fb2c75782a1cbf8ff7778fbb40da1bc2d2e3ec2fa4e7"; libraryHaskellDepends = [ - aws base bytestring http-client http-client-tls pipes + aws base bytestring http-client http-client-tls http-types pipes pipes-bytestring pipes-safe resourcet text transformers ]; + testHaskellDepends = [ + base bytestring exceptions pipes pipes-bytestring pipes-safe + QuickCheck tasty tasty-quickcheck text + ]; homepage = "http://github.com/bgamari/pipes-s3"; description = "A simple interface for streaming data to and from Amazon S3"; license = stdenv.lib.licenses.bsd3; @@ -139164,24 +135704,6 @@ self: { }) {}; "pipes-safe" = callPackage - ({ mkDerivation, base, containers, exceptions, monad-control, mtl - , pipes, transformers, transformers-base - }: - mkDerivation { - pname = "pipes-safe"; - version = "2.2.4"; - sha256 = "502dca5ab38596c70917906ed979f917db52ed91b938d52d96dcb7c56735486e"; - revision = "1"; - editedCabalFile = "c91c8835d9ed03ad82795b877f080a06ed43557bacf5bce90121ca0e6d58e873"; - libraryHaskellDepends = [ - base containers exceptions monad-control mtl pipes transformers - transformers-base - ]; - description = "Safety for the pipes ecosystem"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-safe_2_2_5" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control, mtl , pipes, transformers, transformers-base }: @@ -139195,7 +135717,6 @@ self: { ]; description = "Safety for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-shell" = callPackage @@ -139481,28 +136002,6 @@ self: { }) {}; "pkcs10" = callPackage - ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base - , bytestring, cryptonite, pem, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, transformers, x509 - }: - mkDerivation { - pname = "pkcs10"; - version = "0.1.1.0"; - sha256 = "1d4665fa5a429e859535e132c507b1e1ec713de50d3e085de9731bbd1c9cbeec"; - libraryHaskellDepends = [ - asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem - x509 - ]; - testHaskellDepends = [ - asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem - QuickCheck tasty tasty-hunit tasty-quickcheck transformers x509 - ]; - homepage = "https://github.com/fcomb/pkcs10-hs#readme"; - description = "PKCS#10 library"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "pkcs10_0_2_0_0" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base , bytestring, cryptonite, pem, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, transformers, x509 @@ -139522,7 +136021,6 @@ self: { homepage = "https://github.com/fcomb/pkcs10-hs#readme"; description = "PKCS#10 library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pkcs7" = callPackage @@ -139663,8 +136161,8 @@ self: { }: mkDerivation { pname = "playlists"; - version = "0.4.0.0"; - sha256 = "38a4cb8370ced24a7ac198f16b509799993e9798ccfb9fc3448ee8e14bd71688"; + version = "0.4.1.0"; + sha256 = "707fca5b28fae465b30300d4a52c6e89a1e39ae886f9737121604b7c2f7b8c3a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139688,8 +136186,8 @@ self: { }: mkDerivation { pname = "playlists-http"; - version = "0.1.0.0"; - sha256 = "9f3360bd4adcf45c0bd85eecc717c8093f8d8c71adcf8cff5d961c6cea1c15e3"; + version = "0.1.1.0"; + sha256 = "2f5eaeba301115124529aeb72c8608838911209ab9a5830f705214c32dbb26cb"; libraryHaskellDepends = [ attoparsec base bytestring either exceptions http-client mtl playlists text @@ -140044,6 +136542,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pocket" = callPackage + ({ mkDerivation, aeson, base, http-client, http-client-tls, servant + , servant-client, text, transformers + }: + mkDerivation { + pname = "pocket"; + version = "0.2.0"; + sha256 = "5f9c76f99aacd6a9daf2075daf989af8387c76e411f91b36073ebca2d204d6b9"; + libraryHaskellDepends = [ + aeson base http-client http-client-tls servant servant-client text + transformers + ]; + homepage = "https://github.com/jpvillaisaza/pocket-haskell"; + description = "Bindings for the Pocket API"; + license = stdenv.lib.licenses.mit; + }) {}; + "pocket-dns" = callPackage ({ mkDerivation, aeson, base, bytestring, cabal-test-bin , data-default, dns, hspec, hspec-contrib, hspec-server @@ -140167,29 +136682,6 @@ self: { }) {}; "pointful" = callPackage - ({ mkDerivation, base, containers, haskell-src-exts, mtl, syb - , transformers - }: - mkDerivation { - pname = "pointful"; - version = "1.0.8"; - sha256 = "813152e920e7aad9d2ba2ab5d922deff9cd82ec156f981d16de4bc91320967ac"; - revision = "1"; - editedCabalFile = "b2038459d89251a94f3cc8709f5be0ce80c0cc1be72e2b65fca387efdd61d477"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers haskell-src-exts mtl syb transformers - ]; - executableHaskellDepends = [ - base containers haskell-src-exts mtl syb transformers - ]; - homepage = "http://github.com/23Skidoo/pointful"; - description = "Pointful refactoring tool"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pointful_1_0_9" = callPackage ({ mkDerivation, base, containers, haskell-src-exts-simple, mtl , syb, transformers }: @@ -140208,7 +136700,6 @@ self: { homepage = "http://github.com/23Skidoo/pointful"; description = "Pointful refactoring tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pointless-fun" = callPackage @@ -141113,31 +137604,58 @@ self: { "postgresql-binary" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, conversion, conversion-bytestring, conversion-text - , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq - , QuickCheck, quickcheck-instances, rebase, scientific, tasty + , foldl, json-ast, loch-th, placeholders, postgresql-libpq + , QuickCheck, quickcheck-instances, rerebase, scientific, tasty , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time , transformers, uuid, vector }: mkDerivation { pname = "postgresql-binary"; - version = "0.9.1.1"; - sha256 = "e9aeb3abc2e191ecde5f6112221fe0957364c72779dbcbe8eba6bc5c830ddac2"; + version = "0.9.2"; + sha256 = "ba9df352bbfc0ee3dff91ef1462f1a3d676e5bac3a45ff3af5d765b7365b1d47"; libraryHaskellDepends = [ aeson base base-prelude binary-parser bytestring foldl loch-th placeholders scientific text time transformers uuid vector ]; testHaskellDepends = [ - aeson base bytestring conversion conversion-bytestring - conversion-text either json-ast loch-th placeholders - postgresql-libpq QuickCheck quickcheck-instances rebase scientific - tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time - transformers uuid vector + aeson conversion conversion-bytestring conversion-text json-ast + loch-th placeholders postgresql-libpq QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + tasty-smallcheck ]; homepage = "https://github.com/nikita-volkov/postgresql-binary"; description = "Encoders and decoders for the PostgreSQL's binary format"; license = stdenv.lib.licenses.mit; }) {}; + "postgresql-binary_0_9_3" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, conversion, conversion-bytestring, conversion-text + , foldl, json-ast, loch-th, placeholders, postgresql-libpq + , QuickCheck, quickcheck-instances, rerebase, scientific, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time + , transformers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.9.3"; + sha256 = "fdc10a4ccc5c6927f39d89450395c5316448b5f4d763c6386d1b056cc9685d04"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring foldl loch-th + placeholders scientific text time transformers uuid vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + loch-th placeholders postgresql-libpq QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + homepage = "https://github.com/nikita-volkov/postgresql-binary"; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-config" = callPackage ({ mkDerivation, aeson, base, bytestring, monad-control, mtl , postgresql-simple, resource-pool, time @@ -141355,8 +137873,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-migration"; - version = "0.1.7.0"; - sha256 = "10347cc4c34cf0d98b08234ee0c1e05f9064be08769326147eccb1bd135bce93"; + version = "0.1.8.0"; + sha256 = "69d24f8f9dce302206562edc76afa2653d977770d6b223583da9126f2f6635fa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141373,6 +137891,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "postgresql-simple-migration_0_1_9_0" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash + , directory, hspec, postgresql-simple, text, time + }: + mkDerivation { + pname = "postgresql-simple-migration"; + version = "0.1.9.0"; + sha256 = "005d2f031ab8d889daaee5cffdb222dbe164267042829b88031166b66361726a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring bytestring cryptohash directory + postgresql-simple time + ]; + executableHaskellDepends = [ + base base64-bytestring bytestring cryptohash directory + postgresql-simple text time + ]; + testHaskellDepends = [ base bytestring hspec postgresql-simple ]; + homepage = "https://github.com/ameingast/postgresql-simple-migration"; + description = "PostgreSQL Schema Migrations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-simple-opts" = callPackage ({ mkDerivation, base, bytestring, hspec, markdown-unlit , optparse-applicative, optparse-generic, postgresql-simple @@ -141430,10 +137973,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-url"; - version = "0.1.0.1"; - sha256 = "cf165ec652e1192f392349e09e413a776921ddef71d95bac0d23e9f81cfbe8a0"; - revision = "7"; - editedCabalFile = "f4f8535e362cc496675fa36640cea043fbe46e99e2d3bc8ee449ebe6a293c8cc"; + version = "0.2.0.0"; + sha256 = "f7d85afe7dd047c63aa56cc67e8d28e1d18f33baff8ee447adc5bec427b6ea4c"; libraryHaskellDepends = [ base network-uri postgresql-simple split ]; @@ -141466,8 +138007,8 @@ self: { }: mkDerivation { pname = "postgresql-typed"; - version = "0.4.5"; - sha256 = "bc60941a88edb91045e1b18c6d94d8466ecaa3eb763facefa9c65d579a5576c4"; + version = "0.5.0"; + sha256 = "c6b93a05eff7b5a315dfe26abdd6885dd9290dec3096c3cc795c16bc1395f2ff"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers cryptonite haskell-src-meta HDBC memory network old-locale postgresql-binary @@ -141686,6 +138227,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "powerqueue" = callPackage + ({ mkDerivation, async, base, contravariant, hspec, stm }: + mkDerivation { + pname = "powerqueue"; + version = "0.1.0.0"; + sha256 = "91835dd0495cb47b5a589703e7904104e7001597f06039f87067192fcdb8254c"; + libraryHaskellDepends = [ async base contravariant ]; + testHaskellDepends = [ async base hspec stm ]; + homepage = "https://github.com/agrafix/powerqueue#readme"; + description = "A flexible job queue with exchangeable backends"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "powerqueue-levelmem" = callPackage + ({ mkDerivation, async, base, bytestring, cereal, dlist, filepath + , focus, hspec, leveldb, leveldb-haskell, list-t, powerqueue + , snappy, stm, stm-containers, temporary, unagi-chan + }: + mkDerivation { + pname = "powerqueue-levelmem"; + version = "0.1.0.0"; + sha256 = "b23d92c0b70b06e4168f03cdfedf7d38f12c85bcf493fb8874e66bd5ddc7ee76"; + libraryHaskellDepends = [ + async base bytestring cereal dlist filepath focus leveldb-haskell + list-t powerqueue stm stm-containers unagi-chan + ]; + testHaskellDepends = [ + async base cereal hspec powerqueue temporary + ]; + testSystemDepends = [ leveldb snappy ]; + homepage = "https://github.com/agrafix/powerqueue#readme"; + description = "A high performance in memory and LevelDB backend for powerqueue"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;}; + "ppm" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -141808,8 +138384,8 @@ self: { }: mkDerivation { pname = "preamble"; - version = "0.0.19"; - sha256 = "7946241c38661d637d83ad4a5bb624636c9b81770458a5c640be97523e1775d1"; + version = "0.0.21"; + sha256 = "7b5918a713a9d56c85bc36027541809ccf5a60706c0e74f0875fa059cbf8dc24"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142035,8 +138611,8 @@ self: { }: mkDerivation { pname = "preliminaries"; - version = "0.1.5.0"; - sha256 = "c4a861eeeb4695797efcdfa591de3f8304976ebe73a0ea8df448298bb9c44949"; + version = "0.1.6.0"; + sha256 = "fdb3e581040b08a2af9ddbbccb613dad0a3fdbc70367db7859dee130cc96636d"; libraryHaskellDepends = [ abstract-par base bifunctors classy-prelude-conduit data-default microlens-contra microlens-platform monad-par monad-parallel @@ -142268,12 +138844,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pretty_1_1_3_4" = callPackage + "pretty_1_1_3_5" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck }: mkDerivation { pname = "pretty"; - version = "1.1.3.4"; - sha256 = "a7a4af750533c563d2d422b8424849c11a834fefd1172a1b2ca0cbd4763be25d"; + version = "1.1.3.5"; + sha256 = "b0009d4d7915a7951ebf8519411319d65b110c2f68da7f176ec8fd98217a6f45"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base deepseq ghc-prim QuickCheck ]; homepage = "http://github.com/haskell/pretty"; @@ -142380,16 +138956,14 @@ self: { "pretty-simple" = callPackage ({ mkDerivation, ansi-terminal, base, containers, doctest, Glob - , lens, mono-traversable, mtl, parsec, semigroups, text - , transformers + , mtl, parsec, text, transformers }: mkDerivation { pname = "pretty-simple"; - version = "1.1.0.0"; - sha256 = "ebb343d0a26d88c4700a2b60d5185b8444e879cc7ed60b79eec157b004325aa8"; + version = "2.0.0.0"; + sha256 = "e64bfc73a962bba3f773e8e271d63e3e25924e1a6febbea7d3935d37ae856fbe"; libraryHaskellDepends = [ - ansi-terminal base containers lens mono-traversable mtl parsec - semigroups text transformers + ansi-terminal base containers mtl parsec text transformers ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/cdepillabout/pretty-simple"; @@ -142627,8 +139201,8 @@ self: { }: mkDerivation { pname = "printcess"; - version = "0.1.0.2"; - sha256 = "53907a189318381f5b6d77a15fa36eff274bc1f500f974dba060896d5d7e2418"; + version = "0.1.0.3"; + sha256 = "5f6c220f9e0251785c8b250df3636c2d012d2a670677df46dad64ca4949eb52a"; libraryHaskellDepends = [ base containers lens mtl transformers ]; testHaskellDepends = [ base containers hspec HUnit lens mtl QuickCheck transformers @@ -142800,14 +139374,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_4_3_0" = callPackage + "process_1_5_0_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.4.3.0"; - sha256 = "5473f4d20a19c3ba448ace7d4d01ec821ad531574c23934fd3c55627f5a7f0eb"; + version = "1.5.0.0"; + sha256 = "a87b228f52272ef20dd15260e40b3b4550205bac7d42ef0f0c0ad31d1f475c77"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -142837,22 +139411,6 @@ self: { }) {}; "process-extras" = callPackage - ({ mkDerivation, base, bytestring, deepseq, generic-deriving - , ListLike, process, text - }: - mkDerivation { - pname = "process-extras"; - version = "0.4.1.4"; - sha256 = "05cd949158ff605cb63fc86a2de1b51bfd8d27bf54b5fbe6427a1941e938cfc0"; - libraryHaskellDepends = [ - base bytestring deepseq generic-deriving ListLike process text - ]; - homepage = "https://github.com/seereason/process-extras"; - description = "Process extras"; - license = stdenv.lib.licenses.mit; - }) {}; - - "process-extras_0_7_1" = callPackage ({ mkDerivation, base, bytestring, data-default, deepseq , generic-deriving, HUnit, ListLike, mtl, process, text }: @@ -142868,7 +139426,6 @@ self: { homepage = "https://github.com/seereason/process-extras"; description = "Process extras"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "process-iterio" = callPackage @@ -143152,37 +139709,39 @@ self: { }) {}; "profiteur" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath - , text, unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, containers, filepath + , ghc-prof, js-jquery, scientific, text, unordered-containers + , vector }: mkDerivation { pname = "profiteur"; - version = "0.3.0.3"; - sha256 = "4f9929059826c24be4c4cbfae00cfea5985c20c4c2ddb03d56a47cd72c18e144"; + version = "0.4.2.0"; + sha256 = "eb1936c5b9db53695530ba6302fe6950dd8dc275628112b05b7902996f414b91"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson attoparsec base bytestring filepath text unordered-containers - vector + aeson base bytestring containers filepath ghc-prof js-jquery + scientific text unordered-containers vector ]; homepage = "http://github.com/jaspervdj/profiteur"; description = "Treemap visualiser for GHC prof files"; license = stdenv.lib.licenses.bsd3; }) {}; - "profiteur_0_4_1_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath - , js-jquery, text, unordered-containers, vector + "profiteur_0_4_2_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, filepath + , ghc-prof, js-jquery, scientific, text, unordered-containers + , vector }: mkDerivation { pname = "profiteur"; - version = "0.4.1.0"; - sha256 = "c9e67c15761d06df8088cdbdfaf56a31f3b7b4c169e5c50418c8cd3a29fd8ef7"; + version = "0.4.2.1"; + sha256 = "6b2af36243f15aa5396e0056159d9ad38422cce9eebafa59e6d439b2a8932916"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson attoparsec base bytestring filepath js-jquery text - unordered-containers vector + aeson base bytestring containers filepath ghc-prof js-jquery + scientific text unordered-containers vector ]; homepage = "http://github.com/jaspervdj/profiteur"; description = "Treemap visualiser for GHC prof files"; @@ -143543,8 +140102,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "3.2.3"; - sha256 = "078b51c15e4dbce6f55cd26eeb82ed6307e3c47661ab6518f421a1c95e60a11a"; + version = "3.3.0"; + sha256 = "dba271f7078786ba229c5dfe72caf4f03b92044506fab82e1a0ed24c555d9172"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143661,8 +140220,8 @@ self: { }: mkDerivation { pname = "proto-lens"; - version = "0.1.0.4"; - sha256 = "2d4d1fc8fea2aae5bec2da31f64cac3a9ed11608628fde9f549b46476d51000e"; + version = "0.1.0.5"; + sha256 = "d3096c4e089bc7a8e6221afde8afc0b02f8e67028e119f3be04906cf4fc67a6e"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class lens-family parsec pretty text transformers void @@ -143713,6 +140272,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proto-lens-descriptors" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , lens-family, proto-lens, text + }: + mkDerivation { + pname = "proto-lens-descriptors"; + version = "0.1.0.5"; + sha256 = "89e2eef7c99dc8ca669ad63dd4020a5d05133f92ddb148b1965ced523a6ad18a"; + libraryHaskellDepends = [ + base bytestring containers data-default-class lens-family + proto-lens text + ]; + description = "Protocol buffers for describing the definitions of messages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "proto-lens-optparse" = callPackage ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { @@ -143731,21 +140306,22 @@ self: { "proto-lens-protoc" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers , data-default-class, directory, filepath, haskell-src-exts - , lens-family, process, proto-lens, text + , lens-family, process, proto-lens, proto-lens-descriptors, text }: mkDerivation { pname = "proto-lens-protoc"; - version = "0.1.0.4"; - sha256 = "bb5f04069ae2fd5d7a429523434be7c1c5e2a279a49394bf27d4a212b35d3e62"; + version = "0.1.0.5"; + sha256 = "0efb5b62e2cccb3edc29b93c75aabcccc652992a01e8f5eae7bf7eae2078192e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring Cabal containers data-default-class directory - filepath haskell-src-exts lens-family process proto-lens text + filepath haskell-src-exts lens-family process proto-lens + proto-lens-descriptors text ]; executableHaskellDepends = [ base bytestring containers data-default-class filepath - haskell-src-exts lens-family proto-lens text + haskell-src-exts lens-family proto-lens proto-lens-descriptors text ]; description = "Protocol buffer compiler for the proto-lens library"; license = stdenv.lib.licenses.bsd3; @@ -143920,6 +140496,7 @@ self: { homepage = "https://github.com/pbogdan/protolude-lifted"; description = "Protolude with lifted-base and lifted-async"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proton-haskell" = callPackage @@ -144159,19 +140736,6 @@ self: { }) {}; "publicsuffix" = callPackage - ({ mkDerivation, base, filepath, hspec, template-haskell }: - mkDerivation { - pname = "publicsuffix"; - version = "0.20160716"; - sha256 = "19d7fd9990954284073323d9d22a892f1b600761e5353e9a0473d46591956956"; - libraryHaskellDepends = [ base filepath template-haskell ]; - testHaskellDepends = [ base hspec ]; - homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; - description = "The publicsuffix list exposed as proper Haskell types"; - license = stdenv.lib.licenses.mit; - }) {}; - - "publicsuffix_0_20170109" = callPackage ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; @@ -144182,7 +140746,6 @@ self: { homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; description = "The publicsuffix list exposed as proper Haskell types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "publicsuffixlist" = callPackage @@ -144421,8 +140984,8 @@ self: { ({ mkDerivation, base, containers, libpulseaudio, stm, unix }: mkDerivation { pname = "pulseaudio"; - version = "0.0.1.1"; - sha256 = "11696b8df21dc010b0792c3b7ded2ea683b4d379657eca39ace2a04fabaf36f0"; + version = "0.0.2.0"; + sha256 = "72cbacaf7c94bdaa27c9e0d299a00fe3f31e0cc0f9c2d6e7de9690b3154c078e"; libraryHaskellDepends = [ base containers stm unix ]; librarySystemDepends = [ libpulseaudio ]; description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api"; @@ -144605,59 +141168,12 @@ self: { }) {}; "purescript" = callPackage - ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal - , ansi-wl-pprint, base, base-compat, bower-json, boxes, bytestring - , clock, containers, directory, dlist, edit-distance, file-embed - , filepath, fsnotify, Glob, haskeline, hspec, hspec-discover - , http-client, http-types, HUnit, language-javascript, lifted-base - , monad-control, monad-logger, mtl, network, optparse-applicative - , parallel, parsec, pattern-arrows, pipes, pipes-http, process - , protolude, regex-tdfa, safe, semigroups, silently, sourcemap - , spdx, split, stm, syb, text, time, transformers - , transformers-base, transformers-compat, unordered-containers - , utf8-string, vector, wai, wai-websockets, warp, websockets - }: - mkDerivation { - pname = "purescript"; - version = "0.9.3"; - sha256 = "0e4628232508a37568103d3ffcce68355258af388bba1b0bb3847c1fb33b91e5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-better-errors ansi-terminal base base-compat bower-json - boxes bytestring clock containers directory dlist edit-distance - filepath fsnotify Glob haskeline http-client http-types - language-javascript lifted-base monad-control monad-logger mtl - parallel parsec pattern-arrows pipes pipes-http process protolude - regex-tdfa safe semigroups sourcemap spdx split stm syb text time - transformers transformers-base transformers-compat - unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base base-compat boxes - bytestring containers directory file-embed filepath Glob haskeline - http-types monad-logger mtl network optparse-applicative parsec - process protolude split stm text time transformers - transformers-compat utf8-string wai wai-websockets warp websockets - ]; - testHaskellDepends = [ - aeson aeson-better-errors base base-compat boxes bytestring - containers directory filepath Glob haskeline hspec hspec-discover - HUnit mtl optparse-applicative parsec process protolude silently - stm text time transformers transformers-compat utf8-string vector - ]; - doCheck = false; - homepage = "http://www.purescript.org/"; - description = "PureScript Programming Language Compiler"; - license = stdenv.lib.licenses.mit; - }) {}; - - "purescript_0_10_5" = callPackage ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty - , ansi-terminal, ansi-wl-pprint, base, base-compat, bower-json - , boxes, bytestring, clock, containers, data-ordlist, directory - , dlist, edit-distance, file-embed, filepath, foldl, fsnotify, Glob - , haskeline, hspec, hspec-discover, http-client, http-types, HUnit + , ansi-terminal, ansi-wl-pprint, base, base-compat, blaze-html + , bower-json, boxes, bytestring, cheapskate, clock, containers + , data-ordlist, deepseq, directory, dlist, edit-distance + , file-embed, filepath, foldl, fsnotify, Glob, haskeline, hspec + , hspec-discover, http-client, http-types, HUnit , language-javascript, lens, lifted-base, monad-control , monad-logger, mtl, network, optparse-applicative, parallel , parsec, pattern-arrows, pipes, pipes-http, process, protolude @@ -144669,19 +141185,20 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.10.5"; - sha256 = "0d36361819866efe703eb3ae37f597316098ec3ead6edc9236ea63d54bdc8916"; + version = "0.10.7"; + sha256 = "85dff2f4b6916e9d45b6a1b2674dc6c91c56ac6c1597f627d5f1cbee9d0b3a9d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-better-errors ansi-terminal base base-compat bower-json - boxes bytestring clock containers data-ordlist directory dlist - edit-distance filepath fsnotify Glob haskeline http-client - http-types language-javascript lens lifted-base monad-control - monad-logger mtl parallel parsec pattern-arrows pipes pipes-http - process protolude regex-tdfa safe scientific semigroups sourcemap - spdx split stm syb text time transformers transformers-base - transformers-compat unordered-containers utf8-string vector + aeson aeson-better-errors ansi-terminal base base-compat blaze-html + bower-json boxes bytestring cheapskate clock containers + data-ordlist deepseq directory dlist edit-distance filepath + fsnotify Glob haskeline http-client http-types language-javascript + lens lifted-base monad-control monad-logger mtl parallel parsec + pattern-arrows pipes pipes-http process protolude regex-tdfa safe + scientific semigroups sourcemap spdx split stm syb text time + transformers transformers-base transformers-compat + unordered-containers utf8-string vector ]; executableHaskellDepends = [ aeson aeson-pretty ansi-terminal ansi-wl-pprint base base-compat @@ -144694,15 +141211,14 @@ self: { testHaskellDepends = [ aeson aeson-better-errors base base-compat bower-json boxes bytestring containers directory filepath Glob haskeline hspec - hspec-discover HUnit mtl optparse-applicative parsec process - protolude silently stm text time transformers transformers-compat - utf8-string vector + hspec-discover HUnit lens monad-logger mtl optparse-applicative + parsec process protolude silently stm text time transformers + transformers-compat utf8-string vector ]; doCheck = false; homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "purescript-bridge" = callPackage @@ -144712,8 +141228,8 @@ self: { }: mkDerivation { pname = "purescript-bridge"; - version = "0.8.0.1"; - sha256 = "ab3cf87f637053e0378ca266166e5699ae4acfb5f404dae9ac4a793890124329"; + version = "0.10.0.0"; + sha256 = "6bfb056e3dc2f93a4bb5db20e1151f258145ae7a8c2a13a2e8478936b4ff37d3"; libraryHaskellDepends = [ base containers directory filepath generic-deriving lens mtl text transformers @@ -144726,15 +141242,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "purescript-bridge_0_9_0_0" = callPackage + "purescript-bridge_0_10_1_0" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, hspec, hspec-expectations-pretty-diff, lens , mtl, text, transformers }: mkDerivation { pname = "purescript-bridge"; - version = "0.9.0.0"; - sha256 = "ba7ed603c5cc92099b48388ce4caade457f6f51a8b3eaf87c665aea21d394f04"; + version = "0.10.1.0"; + sha256 = "1a5f92b77f01a214272aed6df3c0b47d28c8f7954c07b2d16f7cdd3f2c596223"; libraryHaskellDepends = [ base containers directory filepath generic-deriving lens mtl text transformers @@ -144889,6 +141405,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pusher-http-haskell_1_2_0_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptohash, hashable, hspec, http-client, http-types, QuickCheck + , text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "1.2.0.0"; + sha256 = "372de78c2efaf60512d22311ad38bd6e968e9e29de171517438c8b129a4b7371"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptohash hashable + http-client http-types text time transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec http-client http-types QuickCheck text + transformers unordered-containers + ]; + homepage = "https://github.com/pusher-community/pusher-http-haskell"; + description = "Haskell client library for the Pusher HTTP API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pusher-ws" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hashable, http-conduit, lens, lens-aeson, network, scientific @@ -145252,29 +141791,48 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) qhull;}; + "qif" = callPackage + ({ mkDerivation, attoparsec, base, microlens, microlens-th + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text, time + }: + mkDerivation { + pname = "qif"; + version = "1.1.1"; + sha256 = "f7fea15fbf6c290e44d75bb60ca2187009febcda88da87c931abb136f5f4d22d"; + libraryHaskellDepends = [ + attoparsec base microlens microlens-th text time + ]; + testHaskellDepends = [ + attoparsec base microlens QuickCheck tasty tasty-hunit + tasty-quickcheck text time + ]; + homepage = "https://github.com/acw/qif"; + description = "A simple QIF file format parser / printer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "qr-imager" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, directory - , haskell-qrencode, jose-jwt, JuicyPixels, lens, MissingH - , optparse-applicative, process, vector + , haskell-qrencode, hspec, jose-jwt, JuicyPixels, lens, libqrencode + , MissingH, optparse-applicative, process, vector }: mkDerivation { pname = "qr-imager"; - version = "0.2.1.2"; - sha256 = "0830675a25f49cdb3322304feb90e0779536fdbcea805e5ddca2328ae5a07c39"; - isLibrary = true; - isExecutable = true; + version = "1.0.0.1"; + sha256 = "ab437b12f05962d92a54a9dbaec62bb1df4cf688434b42ea3d3c958ee2a8278e"; libraryHaskellDepends = [ aeson base bytestring cryptonite directory haskell-qrencode jose-jwt JuicyPixels lens MissingH optparse-applicative process vector ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base process ]; + libraryPkgconfigDepends = [ libqrencode ]; + testHaskellDepends = [ base hspec ]; homepage = "https://github.com/vmchale/QRImager#readme"; description = "Library to generate QR codes from bytestrings and objects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) libqrencode;}; "qr-repa" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, directory @@ -145721,19 +142279,6 @@ self: { }) {}; "quickcheck-assertions" = callPackage - ({ mkDerivation, base, hspec, ieee754, QuickCheck }: - mkDerivation { - pname = "quickcheck-assertions"; - version = "0.2.0"; - sha256 = "600fbafab414f5fba7df40a10635aa407d3af8de3938a6c2866bf80f0952f740"; - libraryHaskellDepends = [ base ieee754 QuickCheck ]; - testHaskellDepends = [ base hspec ieee754 QuickCheck ]; - homepage = "https://github.com/s9gf4ult/quickcheck-assertions"; - description = "HUnit like assertions for QuickCheck"; - license = stdenv.lib.licenses.lgpl3; - }) {}; - - "quickcheck-assertions_0_3_0" = callPackage ({ mkDerivation, base, hspec, ieee754, pretty-show, QuickCheck }: mkDerivation { pname = "quickcheck-assertions"; @@ -145744,7 +142289,6 @@ self: { homepage = "https://github.com/s9gf4ult/quickcheck-assertions"; description = "HUnit like assertions for QuickCheck"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-combinators" = callPackage @@ -145933,17 +142477,20 @@ self: { }) {}; "quickcheck-special" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, scientific, text }: + ({ mkDerivation, base, bytestring, ieee754, QuickCheck, scientific + , text + }: mkDerivation { pname = "quickcheck-special"; - version = "0.1.0.2"; - sha256 = "3938d6992d9c269f0318cf247db4a9f472eb6f1e69d2e249fa8841ba92a19977"; + version = "0.1.0.3"; + sha256 = "8dbe5c2cdefb35880433902402110c1d9927b96d2363df8382fb6ee7e8d3e2f7"; libraryHaskellDepends = [ - base bytestring QuickCheck scientific text + base bytestring ieee754 QuickCheck scientific text ]; homepage = "https://github.com/minad/quickcheck-special#readme"; description = "Edge cases and special values for QuickCheck Arbitrary instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-string-random" = callPackage @@ -146751,6 +143298,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ramus" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, quickcheck-io }: + mkDerivation { + pname = "ramus"; + version = "0.1.2"; + sha256 = "dcddddc416e79c401604565b7297a945f814edeed056fb3b897eda5f4f0b794e"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck quickcheck-io ]; + homepage = "https://github.com/NickSeagull/ramus#readme"; + description = "Elm signal system for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "rand-vars" = callPackage ({ mkDerivation, array, base, IntervalMap, mtl, random }: mkDerivation { @@ -146788,6 +143348,8 @@ self: { pname = "random"; version = "1.1"; sha256 = "b718a41057e25a3a71df693ab0fe2263d492e759679b3c2fea6ea33b171d3a5a"; + revision = "1"; + editedCabalFile = "7b67624fd76ddf97c206de0801dc7e888097e9d572974be9b9ea6551d76965df"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base ]; description = "random number library"; @@ -147177,20 +143739,25 @@ self: { }) {}; "rasa" = callPackage - ({ mkDerivation, async, base, containers, data-default, lens, mtl - , text, text-lens, transformers, yi-rope + ({ mkDerivation, async, base, bifunctors, containers, data-default + , free, hspec, lens, mtl, pipes, pipes-concurrency, pipes-parse + , QuickCheck, quickcheck-instances, text, text-lens, transformers + , yi-rope }: mkDerivation { pname = "rasa"; - version = "0.1.7"; - sha256 = "e5d1ecdbcd350a2686ebcf45f2a7aa1922aa6909fe6bb79040a81963c8ddbbe3"; + version = "0.1.9"; + sha256 = "8dd969c39222963cf97033e13a141fbc9b1f075b8c7af6428ef72bef9439cf3c"; libraryHaskellDepends = [ - async base containers data-default lens mtl text text-lens - transformers yi-rope + async base bifunctors containers data-default free lens mtl pipes + pipes-concurrency pipes-parse text text-lens transformers yi-rope + ]; + testHaskellDepends = [ + base hspec lens QuickCheck quickcheck-instances text yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa#readme"; description = "A modular text editor"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.gpl3; }) {}; "rasa-example-config" = callPackage @@ -147200,8 +143767,8 @@ self: { }: mkDerivation { pname = "rasa-example-config"; - version = "0.1.2"; - sha256 = "e6d4eac030ba165eb446dacb7eef1fcd19673cd45d4656b5f9ff0f5c924f8db7"; + version = "0.1.3"; + sha256 = "471525573811177d6d5aaaeff5353ce154f1f44ccf1f29a865439d94b5ceca93"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -147211,7 +143778,7 @@ self: { ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Example user config for Rasa"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -147236,14 +143803,14 @@ self: { }: mkDerivation { pname = "rasa-ext-cmd"; - version = "0.1.1"; - sha256 = "8ba6c787802bf3f1a665d973052bfcfc1ee6ce4c883a867a900c41e0f5eab378"; + version = "0.1.2"; + sha256 = "f328cc06d7fca6ac2bb301aaa18b057b0404319dc0072963f27a90750644b3e9"; libraryHaskellDepends = [ base containers data-default lens rasa text ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for running commands"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.gpl3; }) {}; "rasa-ext-cursors" = callPackage @@ -147252,15 +143819,15 @@ self: { }: mkDerivation { pname = "rasa-ext-cursors"; - version = "0.1.4"; - sha256 = "549776d01b0e363780b3301bc6320bcad74ddcd47278b2cdfda07ab9291e022b"; + version = "0.1.5"; + sha256 = "81c949b85bf60cb814cedf0fd58d1082cc161ee820caacd86d8754e8dd9f2d93"; libraryHaskellDepends = [ base data-default lens mtl rasa rasa-ext-style text text-lens yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext adding cursor(s)"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.gpl3; }) {}; "rasa-ext-files" = callPackage @@ -147269,15 +143836,15 @@ self: { }: mkDerivation { pname = "rasa-ext-files"; - version = "0.1.2"; - sha256 = "a70077f9237d274b24a2d83bf87aaa12565cb33bcb9e94fce22e0377067e0016"; + version = "0.1.3"; + sha256 = "094f8127c8266a0f988661ada65d0ff08979025cb1939edff8199cdcfd0da06f"; libraryHaskellDepends = [ base data-default lens rasa rasa-ext-cmd rasa-ext-status-bar rasa-ext-views text yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for filesystem actions"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -147285,12 +143852,12 @@ self: { ({ mkDerivation, base, lens, mtl, rasa }: mkDerivation { pname = "rasa-ext-logger"; - version = "0.1.2"; - sha256 = "3f60b4a22f053f6fe33fbe6849146fc73c16695951008c3ed086b2c79a32f854"; + version = "0.1.3"; + sha256 = "8648adfd280b15ddfed693bb771745de6311bcfe3fb3066fa3ce89694a12eb5d"; libraryHaskellDepends = [ base lens mtl rasa ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for logging state/actions"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.gpl3; }) {}; "rasa-ext-slate" = callPackage @@ -147300,15 +143867,15 @@ self: { }: mkDerivation { pname = "rasa-ext-slate"; - version = "0.1.4"; - sha256 = "4c6bbfd12b4aa8bb69076925bf6d4143ea692e8b458ad6e22128d6dc9c351aaf"; + version = "0.1.6"; + sha256 = "0e11bf0c2e01faf5279dc8b4e2c19f4318d74bc29eb3652966b590b906c2cca8"; libraryHaskellDepends = [ base lens mtl rasa rasa-ext-logger rasa-ext-status-bar rasa-ext-style rasa-ext-views recursion-schemes text vty yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa extension for rendering to terminal with vty"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -147316,24 +143883,24 @@ self: { ({ mkDerivation, base, data-default, lens, rasa, yi-rope }: mkDerivation { pname = "rasa-ext-status-bar"; - version = "0.1.2"; - sha256 = "07c98db2eeb0f511b6d8104e706541817fc69405392c0576eac42cf48e8455f3"; + version = "0.1.3"; + sha256 = "28d156d4b91650b68d9c20ebe3ce0132be9ce15c71e5ce4a1f6656daf1902e3f"; libraryHaskellDepends = [ base data-default lens rasa yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for populating status-bar"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.gpl3; }) {}; "rasa-ext-style" = callPackage ({ mkDerivation, base, data-default, lens, rasa }: mkDerivation { pname = "rasa-ext-style"; - version = "0.1.3"; - sha256 = "4cf78443b2a2d4b41400d15d614c2767a9f0a94042df09fcb2209accc3c77327"; + version = "0.1.4"; + sha256 = "04e883526042bb7cda017b5d3404b08223fea5fd841c9913095337ab378717a5"; libraryHaskellDepends = [ base data-default lens rasa ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext managing rendering styles"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.gpl3; }) {}; "rasa-ext-views" = callPackage @@ -147342,33 +143909,34 @@ self: { }: mkDerivation { pname = "rasa-ext-views"; - version = "0.1.1"; - sha256 = "d7b234282b2d9f0127550645932b3df065f75ad4365662a8aa80b82472ff4580"; + version = "0.1.3"; + sha256 = "28413cc5643edb08b4095deaf973525a77496ce6d17df22915fa17daf2495691"; libraryHaskellDepends = [ base bifunctors data-default lens mtl rasa recursion-schemes ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext managing rendering views"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rasa-ext-vim" = callPackage - ({ mkDerivation, base, data-default, lens, mtl, rasa + ({ mkDerivation, base, data-default, hspec, lens, mtl, rasa , rasa-ext-cursors, rasa-ext-files, rasa-ext-status-bar , rasa-ext-views, text, text-lens, yi-rope }: mkDerivation { pname = "rasa-ext-vim"; - version = "0.1.3"; - sha256 = "9282689ed13d9dbd67c46a4c2071e5a57f7ac3723bff0477dd40d54fea7ad3cf"; + version = "0.1.5"; + sha256 = "bb90b7cf5c3e1a7cf212690e8ae1b58cb58a7ead5defa6e21bd6d0fd5136b9e6"; libraryHaskellDepends = [ base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files rasa-ext-status-bar rasa-ext-views text text-lens yi-rope ]; + testHaskellDepends = [ base hspec ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for vim bindings"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -147403,33 +143971,6 @@ self: { }) {}; "rasterific-svg" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, directory - , filepath, FontyFruity, JuicyPixels, lens, linear, mtl - , optparse-applicative, Rasterific, scientific, svg-tree, text - , transformers, vector - }: - mkDerivation { - pname = "rasterific-svg"; - version = "0.3.1.2"; - sha256 = "83c90ea97d73f05003de2a4622ed26754fa52cb94a3341feada477713332a789"; - revision = "1"; - editedCabalFile = "1a66db5d85478533f4d6702dd36b158f464f3a725a365bcb68fefed59edfa586"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers directory filepath FontyFruity - JuicyPixels lens linear mtl Rasterific scientific svg-tree text - transformers vector - ]; - executableHaskellDepends = [ - base directory filepath FontyFruity JuicyPixels - optparse-applicative Rasterific svg-tree - ]; - description = "SVG renderer based on Rasterific"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rasterific-svg_0_3_2_1" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, FontyFruity, JuicyPixels, lens, linear, mtl , optparse-applicative, primitive, Rasterific, scientific, svg-tree @@ -147452,7 +143993,6 @@ self: { ]; description = "SVG renderer based on Rasterific"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rate-limit" = callPackage @@ -147706,6 +144246,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rbpcp-api" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring, cereal + , haskoin-core, servant, string-conversions, text + }: + mkDerivation { + pname = "rbpcp-api"; + version = "0.1.0.0"; + sha256 = "16290f21dc85b53a4738753a7c827584bfd2455d1e0f0d11f78c2520448afd06"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cereal haskoin-core servant + string-conversions text + ]; + homepage = "http://paychandoc.runeks.me/"; + description = "RESTful Bitcoin Payment Channel Protocol Servant API description"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rbr" = callPackage ({ mkDerivation, base, bio, bytestring, containers }: mkDerivation { @@ -148272,6 +144830,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "read-io" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hspec }: + mkDerivation { + pname = "read-io"; + version = "0.0.0.1"; + sha256 = "5c3efb07e781f53b9053ba97927076801825cb49b2f012a9911f64cbc65937e6"; + libraryHaskellDepends = [ base containers directory filepath ]; + testHaskellDepends = [ base containers directory filepath hspec ]; + homepage = "https://github.com/zaidan/read-io#readme"; + description = "Read IO library"; + license = stdenv.lib.licenses.mit; + }) {}; + "readable" = callPackage ({ mkDerivation, base, bytestring, text }: mkDerivation { @@ -148413,8 +144984,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.0.6"; - sha256 = "dcf4217ab3f089a8934808af88d95e6d8e57bd57fac3cce54d8b048232abfa01"; + version = "1.0.8"; + sha256 = "84d3a1f8e0663fa1f19f963b1a385ef12b0dcb41f8400b0fdda55e7cd7cfb8bd"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring containers contravariant contravariant-extras deepseq dlist either fail hashable mtl @@ -149311,10 +145882,8 @@ self: { ({ mkDerivation, base, blaze-html, blaze-markup, reform, text }: mkDerivation { pname = "reform-blaze"; - version = "0.2.4.1"; - sha256 = "d4acf094d75cef125e9d587646b9bbb66ce927b43ed16c99738f11e80569678b"; - revision = "1"; - editedCabalFile = "abe598582e2e9627ce899e3fe47c1d495da157d0059115aca220beecee6a05f1"; + version = "0.2.4.3"; + sha256 = "11bcf127356bf5840a0947ea1058cbf1e08096ab0fc872aa5c1ec7d88e40b2e4"; libraryHaskellDepends = [ base blaze-html blaze-markup reform text ]; @@ -149327,8 +145896,8 @@ self: { ({ mkDerivation, base, blaze-markup, reform, shakespeare, text }: mkDerivation { pname = "reform-hamlet"; - version = "0.0.5.1"; - sha256 = "a0271fc7580463d3790f26e651836e0030178444987c9132b3c74dab249286f2"; + version = "0.0.5.3"; + sha256 = "512729389fc3eec118a8079486eb2319e1e8eaecdeecafdd6b36205373ce3466"; libraryHaskellDepends = [ base blaze-markup reform shakespeare text ]; @@ -149391,6 +145960,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "regex" = callPackage + ({ mkDerivation, array, base, bytestring, containers, directory + , hashable, heredoc, regex-base, regex-pcre-builtin, regex-tdfa + , regex-tdfa-text, shelly, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, template-haskell, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "regex"; + version = "0.0.0.2"; + sha256 = "200695e102f2a698939833c35c6862bfa93803a5f4e22fa7ad40e76999ed2396"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring containers hashable heredoc regex-base + regex-pcre-builtin regex-tdfa regex-tdfa-text smallcheck tasty + tasty-hunit tasty-smallcheck template-haskell text time + transformers unordered-containers + ]; + executableHaskellDepends = [ + array base bytestring containers directory hashable heredoc + regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text shelly + smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text + time transformers unordered-containers + ]; + testHaskellDepends = [ + array base bytestring containers directory hashable heredoc + regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text shelly + smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text + time transformers unordered-containers + ]; + homepage = "https://iconnect.github.io/regex"; + description = "A Regular Expression Toolkit for regex-base"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regex-applicative" = callPackage ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit , tasty-smallcheck, transformers @@ -150156,6 +146762,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relapse" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, containers, include-file, tasty, tasty-hspec, text + , vector + }: + mkDerivation { + pname = "relapse"; + version = "0.1.0.1"; + sha256 = "4e6e2bb0c4c420f184c9cc928659e3bbbbce0215f2681e7641a9a6f2eb31e631"; + libraryHaskellDepends = [ attoparsec base bytestring ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring containers include-file + tasty tasty-hspec text vector + ]; + homepage = "https://github.com/iostat/relapse#readme"; + description = "Sensible RLP encoding"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relation" = callPackage ({ mkDerivation, array, base, containers, groom }: mkDerivation { @@ -150195,8 +146821,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.8.3.2"; - sha256 = "20899f2fcf142e11036e6e6b7360c873e17ded7bb856616e9d40f92d0298d09b"; + version = "0.8.3.4"; + sha256 = "5c31665bf5cae82c06090e2d9b539f8001434db2888ab891755584b74b9560c2"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record sql-words template-haskell text th-reify-compat time @@ -150210,6 +146836,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query_0_8_3_5" = callPackage + ({ mkDerivation, array, base, bytestring, containers, dlist + , names-th, persistable-record, quickcheck-simple, sql-words + , template-haskell, text, th-reify-compat, time, time-locale-compat + , transformers + }: + mkDerivation { + pname = "relational-query"; + version = "0.8.3.5"; + sha256 = "473145c2bf23b03711a307b4dd6a22609606327e0c15f8f27f874ee783f7f1a6"; + libraryHaskellDepends = [ + array base bytestring containers dlist names-th persistable-record + sql-words template-haskell text th-reify-compat time + time-locale-compat transformers + ]; + testHaskellDepends = [ + base containers quickcheck-simple transformers + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Typeful, Modular, Relational, algebraic query engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-query-HDBC" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, relational-query @@ -150247,6 +146897,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-record_0_1_6_0" = callPackage + ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query + , relational-query-HDBC + }: + mkDerivation { + pname = "relational-record"; + version = "0.1.6.0"; + sha256 = "7f7b6ba0a9646e475b0092a062cbffd32f8cabb0d4da1f29e7c0672472afb115"; + libraryHaskellDepends = [ + base persistable-types-HDBC-pg relational-query + relational-query-HDBC + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Meta package of Relational Record"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-record-examples" = callPackage ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3 , persistable-record, relational-query, relational-query-HDBC @@ -150366,23 +147034,23 @@ self: { }) {}; "remarks" = callPackage - ({ mkDerivation, base, directory, filepath, GenericPretty, pretty - , tasty, tasty-golden, tasty-hunit + ({ mkDerivation, base, containers, directory, filepath + , GenericPretty, pretty, tasty, tasty-golden, tasty-hunit }: mkDerivation { pname = "remarks"; - version = "0.1.9"; - sha256 = "fe76db6ef442c2b7cf234a909e359651ac7dddc9c603c78d49f2094805a1542b"; + version = "0.1.12"; + sha256 = "3a36340fd00c3cd002dc1494508e1577004ea71a204e66785a1861d61356d087"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base GenericPretty pretty ]; + libraryHaskellDepends = [ base containers GenericPretty pretty ]; executableHaskellDepends = [ base directory filepath GenericPretty ]; testHaskellDepends = [ base GenericPretty tasty tasty-golden tasty-hunit ]; - homepage = "https://github.com/oleks/remarks#readme"; + homepage = "https://github.com/DIKU-EDU/remarks#readme"; description = "A DSL for marking student work"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -151162,24 +147830,25 @@ self: { ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.0.1.1"; - sha256 = "44b023de5749713d04d43342dc94ca6562fc0e827e53ac3a8f1e62500b60463b"; + version = "1.0.3"; + sha256 = "63532e72cd0febdff280930658ad345e28f38c736a5391d5a313015e9942ffbe"; libraryHaskellDepends = [ rebase ]; homepage = "https://github.com/nikita-volkov/rerebase"; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reroute" = callPackage - ({ mkDerivation, base, deepseq, hashable, hspec, hvect, mtl - , path-pieces, text, unordered-containers, vector + ({ mkDerivation, base, deepseq, hashable, hspec, http-api-data + , hvect, mtl, text, unordered-containers, vector }: mkDerivation { pname = "reroute"; - version = "0.4.0.1"; - sha256 = "d1c3636aa6d2895055721ff9290a595fff2ce3e9d917e9af7e36aafb71701f0e"; + version = "0.4.1.0"; + sha256 = "34a83f0d0240610b3e6867f02859d77a8255783e2225389bf025865d5d4c2508"; libraryHaskellDepends = [ - base deepseq hashable hvect mtl path-pieces text + base deepseq hashable http-api-data hvect mtl text unordered-containers ]; testHaskellDepends = [ @@ -151494,34 +148163,6 @@ self: { }) {}; "rest-gen" = callPackage - ({ mkDerivation, aeson, base, base-compat, blaze-html, Cabal - , code-builder, directory, fclabels, filepath, hashable - , haskell-src-exts, HStringTemplate, HUnit, hxt, json-schema - , pretty, process, rest-core, safe, scientific, semigroups, split - , test-framework, test-framework-hunit, text, uniplate - , unordered-containers, vector - }: - mkDerivation { - pname = "rest-gen"; - version = "0.19.0.3"; - sha256 = "9ed4224ed8de81c56000b6814724bfed46f4e7b8890fe5892d308b6edcab2e76"; - revision = "1"; - editedCabalFile = "d613ead87b1c5a0a7fee13c46dc42edf4c9e486277a14f1a3ce5314799963abd"; - libraryHaskellDepends = [ - aeson base base-compat blaze-html Cabal code-builder directory - fclabels filepath hashable haskell-src-exts HStringTemplate hxt - json-schema pretty process rest-core safe scientific semigroups - split text uniplate unordered-containers vector - ]; - testHaskellDepends = [ - base fclabels haskell-src-exts HUnit rest-core test-framework - test-framework-hunit - ]; - description = "Documentation and client generation from rest definition"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rest-gen_0_20_0_0" = callPackage ({ mkDerivation, aeson, base, base-compat, blaze-html, Cabal , code-builder, directory, fclabels, filepath, hashable , haskell-src-exts, HStringTemplate, HUnit, hxt, json-schema @@ -151547,7 +148188,6 @@ self: { ]; description = "Documentation and client generation from rest definition"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rest-happstack" = callPackage @@ -151721,28 +148361,6 @@ self: { }) {}; "rethinkdb" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , containers, data-default, doctest, mtl, network, scientific, text - , time, unordered-containers, utf8-string, vector - }: - mkDerivation { - pname = "rethinkdb"; - version = "2.2.0.7"; - sha256 = "ed74dd74333e5cd5fd99dfd84af8c6331fca04d1d04e241b533e2c2936078873"; - revision = "1"; - editedCabalFile = "87cbc3bf8f5d02043e4b7a93a85cc7cb5c0994bd17cee8e65210715e1272b705"; - libraryHaskellDepends = [ - aeson base base64-bytestring binary bytestring containers - data-default mtl network scientific text time unordered-containers - utf8-string vector - ]; - testHaskellDepends = [ base doctest ]; - homepage = "http://github.com/atnnn/haskell-rethinkdb"; - description = "A driver for RethinkDB 2.2"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "rethinkdb_2_2_0_8" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring , containers, data-default, doctest, mtl, network, scientific, text , time, unordered-containers, utf8-string, vector @@ -151760,7 +148378,6 @@ self: { homepage = "http://github.com/atnnn/haskell-rethinkdb"; description = "A driver for RethinkDB 2.2"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rethinkdb-client-driver" = callPackage @@ -151918,8 +148535,8 @@ self: { }: mkDerivation { pname = "reverse-geocoding"; - version = "0.2.4.0"; - sha256 = "07a70639586b92b557b922672685b353ff47fbbdb963196b0cd1d88020cf791d"; + version = "0.3.0.0"; + sha256 = "d29cd172aaccd01856a7fcf05995e1418a36d813f724fa5fdec566e829bb78b0"; libraryHaskellDepends = [ aeson base iso3166-country-codes lens lens-aeson text wreq ]; @@ -152970,21 +149587,6 @@ self: { }) {}; "rotating-log" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, time }: - mkDerivation { - pname = "rotating-log"; - version = "0.4"; - sha256 = "661a22b9f5b05d7dd8989f61f1d625862d57b18aa19fba7077746f05be77b451"; - libraryHaskellDepends = [ - base bytestring directory filepath time - ]; - testHaskellDepends = [ base bytestring directory filepath time ]; - homepage = "http://github.com/Soostone/rotating-log"; - description = "Size-limited, concurrent, automatically-rotating log writer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rotating-log_0_4_2" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, old-locale , time, time-locale-compat }: @@ -153002,7 +149604,6 @@ self: { homepage = "http://github.com/Soostone/rotating-log"; description = "Size-limited, concurrent, automatically-rotating log writer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roundRobin" = callPackage @@ -153308,33 +149909,6 @@ self: { }) {}; "rss-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , conduit-parse, containers, data-default, exceptions, foldl, hlint - , lens-simple, mono-traversable, parsers, QuickCheck - , quickcheck-instances, resourcet, safe, tasty, tasty-hunit - , tasty-quickcheck, text, time, timerep, uri-bytestring - , xml-conduit, xml-conduit-parse, xml-types - }: - mkDerivation { - pname = "rss-conduit"; - version = "0.2.0.2"; - sha256 = "304a2918743f7b65191ce8c4a57c94b1c3afb2692e5c79d6b0822a05be3294d1"; - libraryHaskellDepends = [ - base conduit conduit-parse containers exceptions foldl lens-simple - mono-traversable parsers safe text time timerep uri-bytestring - xml-conduit xml-conduit-parse xml-types - ]; - testHaskellDepends = [ - base bytestring conduit conduit-extra conduit-parse data-default - exceptions hlint lens-simple mono-traversable parsers QuickCheck - quickcheck-instances resourcet tasty tasty-hunit tasty-quickcheck - text time uri-bytestring xml-conduit xml-conduit-parse xml-types - ]; - description = "Streaming parser/renderer for the RSS 2.0 standard."; - license = "unknown"; - }) {}; - - "rss-conduit_0_3_0_0" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, containers, data-default, hlint, lens-simple , mono-traversable, QuickCheck, quickcheck-instances, resourcet @@ -153358,7 +149932,6 @@ self: { ]; description = "Streaming parser/renderer for the RSS 2.0 standard."; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rss2irc" = callPackage @@ -153784,17 +150357,32 @@ self: { }) {}; "safe" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "safe"; - version = "0.3.10"; - sha256 = "da724ad9cf4b424c4881a50439c3b13777f477e3301c068ce7d54e9031e14b9a"; + version = "0.3.13"; + sha256 = "4a75af71313ef98bb66fbb4f1416f6f1220cd37a2c8b1462ed8c5a982a264884"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base deepseq QuickCheck ]; homepage = "https://github.com/ndmitchell/safe#readme"; description = "Library of safe (exception free) functions"; license = stdenv.lib.licenses.bsd3; }) {}; + "safe_0_3_14" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck }: + mkDerivation { + pname = "safe"; + version = "0.3.14"; + sha256 = "db580cc748f6421e54a9a86a4cbf75c39cfc696880e31f972f99731737fdc88f"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base deepseq QuickCheck ]; + homepage = "https://github.com/ndmitchell/safe#readme"; + description = "Library of safe (exception free) functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safe-access" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -153823,6 +150411,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "safe-exceptions-checked" = callPackage + ({ mkDerivation, base, deepseq, hspec, safe-exceptions + , transformers + }: + mkDerivation { + pname = "safe-exceptions-checked"; + version = "0.1.0"; + sha256 = "d807552b828de308d80805f65ee41f3e25571506b10e6b28b0b81de4aec0ca3f"; + libraryHaskellDepends = [ + base deepseq safe-exceptions transformers + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/mitchellwrosen/safe-exceptions-checked#readme"; + description = "Safe, checked exceptions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "safe-failure" = callPackage ({ mkDerivation, base, failure }: mkDerivation { @@ -154279,30 +150884,13 @@ self: { }) {}; "sampling" = callPackage - ({ mkDerivation, base, foldl, mwc-random, primitive, vector }: - mkDerivation { - pname = "sampling"; - version = "0.2.0"; - sha256 = "0300849bb9b276455397df71fcf061e1db8563045af176f04a2ad31dd333295a"; - revision = "1"; - editedCabalFile = "705929c9a629db8150478fd996315889fb8e5ab16dd584bc969727d6cc7e25b1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base foldl mwc-random primitive vector ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/jtobin/sampling"; - description = "Sample values from collections"; - license = stdenv.lib.licenses.mit; - }) {}; - - "sampling_0_3_1" = callPackage ({ mkDerivation, base, containers, foldl, mwc-random, primitive , vector }: mkDerivation { pname = "sampling"; - version = "0.3.1"; - sha256 = "0bc2557dd64e4a933c9c6abab083e57b52508236c94d2151fd6890acc54e691b"; + version = "0.3.2"; + sha256 = "a66156e4600ffb15bde127a841251d49f2d0ff67a85e05961b91839b4769824e"; libraryHaskellDepends = [ base containers foldl mwc-random primitive vector ]; @@ -154310,7 +150898,6 @@ self: { homepage = "https://github.com/jtobin/sampling"; description = "Sample values from collections"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "samtools" = callPackage @@ -154649,8 +151236,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "2.1.5"; - sha256 = "dd1ac555546ded3c178780c157d86d1075bd8a41f777bafffb9c94f9ef8a4f17"; + version = "2.1.7"; + sha256 = "481f1bb36ecd467b2e60d2a97c6393384d78b96ece7afd644d96641ee51bb32e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154700,8 +151287,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "5.12"; - sha256 = "0c43caeb77fd6a3d6d4e8e71835da0ca5e207dcc2b0bf6ef07abb7dd5c3bd55f"; + version = "5.14"; + sha256 = "92dc71b96071162a47383c5f4833e8b78c2874009e671e2a6bc8de9707328e7e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154720,15 +151307,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sbv_5_14" = callPackage + "sbv_5_15" = callPackage ({ mkDerivation, array, async, base, base-compat, containers , crackNum, data-binary-ieee754, deepseq, directory, filepath, ghc , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb }: mkDerivation { pname = "sbv"; - version = "5.14"; - sha256 = "92dc71b96071162a47383c5f4833e8b78c2874009e671e2a6bc8de9707328e7e"; + version = "5.15"; + sha256 = "2364c29cb4cd20c8489e76689aa885072bf51faf2f60b208ec58be3d5ae5d719"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154843,40 +151430,37 @@ self: { }) {}; "scalpel" = callPackage - ({ mkDerivation, base, bytestring, containers, curl, data-default - , HUnit, regex-base, regex-tdfa, tagsoup, text + ({ mkDerivation, base, bytestring, curl, data-default, scalpel-core + , tagsoup, text }: mkDerivation { pname = "scalpel"; - version = "0.3.1"; - sha256 = "5db9046a506f40d713fb678e496b7fd9cfa21c453bd5e6f574720d57826a204f"; + version = "0.5.0"; + sha256 = "1635b45543cac398a5c0a54cb3bd6fffb7d11150ddbc55b3fbd92b7a6736632f"; libraryHaskellDepends = [ - base bytestring containers curl data-default regex-base regex-tdfa - tagsoup text + base bytestring curl data-default scalpel-core tagsoup text ]; - testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ]; homepage = "https://github.com/fimad/scalpel"; description = "A high level web scraping library for Haskell"; license = stdenv.lib.licenses.asl20; }) {}; - "scalpel_0_4_1" = callPackage - ({ mkDerivation, base, bytestring, containers, curl, data-default - , fail, HUnit, regex-base, regex-tdfa, tagsoup, text, vector + "scalpel-core" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default, fail + , HUnit, regex-base, regex-tdfa, tagsoup, text, vector }: mkDerivation { - pname = "scalpel"; - version = "0.4.1"; - sha256 = "463028b6f62fd02f07591433b842552f7e68a650dbe3869f96e5abbbf0c6a534"; + pname = "scalpel-core"; + version = "0.5.0"; + sha256 = "b24a0dbfa4ebfba9e20b08e2b2f9f39c27bd575e1652d1bab944ae2784e00dda"; libraryHaskellDepends = [ - base bytestring containers curl data-default fail regex-base - regex-tdfa tagsoup text vector + base bytestring containers data-default fail regex-base regex-tdfa + tagsoup text vector ]; testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ]; homepage = "https://github.com/fimad/scalpel"; description = "A high level web scraping library for Haskell"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scan" = callPackage @@ -155251,31 +151835,6 @@ self: { }) {}; "scientific" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , ghc-prim, hashable, integer-gmp, QuickCheck, smallcheck, tasty - , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck - , text, vector - }: - mkDerivation { - pname = "scientific"; - version = "0.3.4.9"; - sha256 = "108330662b0af9a04d7da55864211ce12008efe36614d897ba635e80670918a8"; - revision = "1"; - editedCabalFile = "833f5960e622c7346c3c02547538da037bcc4eececc00ba2ab9412eabdb71d61"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq ghc-prim hashable - integer-gmp text vector - ]; - testHaskellDepends = [ - base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml - tasty-hunit tasty-quickcheck tasty-smallcheck text - ]; - homepage = "https://github.com/basvandijk/scientific"; - description = "Numbers represented using scientific notation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "scientific_0_3_4_10" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq , ghc-prim, hashable, integer-gmp, integer-logarithms, QuickCheck , smallcheck, tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck @@ -155296,7 +151855,6 @@ self: { homepage = "https://github.com/basvandijk/scientific"; description = "Numbers represented using scientific notation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scion" = callPackage @@ -155781,8 +152339,8 @@ self: { }: mkDerivation { pname = "scroll"; - version = "1.20151219"; - sha256 = "4f91c20e645ee715c9d3549fffffcc58943bee4fb3ba2e622e0189ccb70dd050"; + version = "1.20170122"; + sha256 = "89b5636f8ff2e540892a1b6fb96d3c1bb7b287c13f24c94c143e99afdca38b38"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155905,14 +152463,14 @@ self: { }: mkDerivation { pname = "sdl2"; - version = "2.1.3"; - sha256 = "ce18963594fa21d658deb90d22e48cd17e499b2300db265a679bb2724cb28082"; + version = "2.2.0"; + sha256 = "5a3a83fad8936539a4ff1a4a845f2a30b859d2d62e1cda7ab1f39cb59378c484"; libraryHaskellDepends = [ base bytestring exceptions linear StateVar text transformers vector ]; librarySystemDepends = [ SDL2 ]; libraryPkgconfigDepends = [ SDL2 ]; - description = "Both high- and low-level bindings to the SDL library (version 2.0.2+)."; + description = "Both high- and low-level bindings to the SDL library (version 2.0.4+)."; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; @@ -156106,6 +152664,47 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "seakale" = callPackage + ({ mkDerivation, base, bytestring, free, mtl, text }: + mkDerivation { + pname = "seakale"; + version = "0.1.0.0"; + sha256 = "c1aebae23aaa611db361eb2327fba0d90b3559d5ab8702417696e80c6e6254ea"; + libraryHaskellDepends = [ base bytestring free mtl text ]; + description = "Pure SQL layer on top of other libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "seakale-postgresql" = callPackage + ({ mkDerivation, base, bytestring, free, mtl, postgresql-libpq + , seakale, time + }: + mkDerivation { + pname = "seakale-postgresql"; + version = "0.1.0.0"; + sha256 = "b8557deb006934cd605eabcf1a00c0c9ab4492490f140df22eef3e38a8d21752"; + libraryHaskellDepends = [ + base bytestring free mtl postgresql-libpq seakale time + ]; + description = "PostgreSQL backend for Seakale"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "seakale-tests" = callPackage + ({ mkDerivation, base, bytestring, free, mtl, recursion-schemes + , seakale + }: + mkDerivation { + pname = "seakale-tests"; + version = "0.1.0.0"; + sha256 = "bbd5c83a6335dca7f06bf8b7943e80bd3186530ff621d25b00b3a8a3950cec52"; + libraryHaskellDepends = [ + base bytestring free mtl recursion-schemes seakale + ]; + description = "Helpers to test code using Seakale"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "seal-module" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -156603,16 +153202,21 @@ self: { }) {}; "semiring-num" = callPackage - ({ mkDerivation, base, containers, doctest, smallcheck }: + ({ mkDerivation, base, containers, doctest, nat-sized-numbers + , QuickCheck, smallcheck, template-haskell + }: mkDerivation { pname = "semiring-num"; - version = "0.5.4.0"; - sha256 = "f96f42f4cb9bc0c34f4cc0e41178ad23c60fd4f5ff6f1059df5d352df54564e5"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base containers doctest smallcheck ]; + version = "1.1.0.1"; + sha256 = "49702af909207e5025b06ebb8f597e2334feeb7c040ffb774d8f6630ceac3678"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ + base containers doctest nat-sized-numbers QuickCheck smallcheck + ]; homepage = "https://github.com/oisdk/semiring-num"; description = "Basic semiring class and instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semiring-simple" = callPackage @@ -157187,32 +153791,6 @@ self: { }) {}; "servant" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , bytestring-conversion, case-insensitive, directory, doctest - , filemanip, filepath, hspec, http-api-data, http-media, http-types - , mmorph, mtl, network-uri, QuickCheck, quickcheck-instances - , string-conversions, text, url, vault - }: - mkDerivation { - pname = "servant"; - version = "0.8.1"; - sha256 = "2b5494ceb4d8123c7a92535d0cf109485e165dfc9cba9471b11127e04556d8c1"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat bytestring bytestring-conversion - case-insensitive http-api-data http-media http-types mmorph mtl - network-uri string-conversions text vault - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat bytestring directory doctest - filemanip filepath hspec QuickCheck quickcheck-instances - string-conversions text url - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "A family of combinators for defining webservices APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant_0_9_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , case-insensitive, directory, doctest, filemanip, filepath, hspec , http-api-data, http-media, http-types, mmorph, mtl, network-uri @@ -157238,6 +153816,33 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant_0_10" = callPackage + ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat + , bytestring, Cabal, case-insensitive, directory, doctest + , filemanip, filepath, hspec, http-api-data, http-media, http-types + , mmorph, mtl, natural-transformation, network-uri, QuickCheck + , quickcheck-instances, string-conversions, text, url, vault + }: + mkDerivation { + pname = "servant"; + version = "0.10"; + sha256 = "e1daa9ba2b759615341345a17a95833729ae3200af12dacec07507a95a4b331e"; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bytestring case-insensitive + http-api-data http-media http-types mmorph mtl + natural-transformation network-uri string-conversions text vault + ]; + testHaskellDepends = [ + aeson aeson-compat attoparsec base base-compat bytestring directory + doctest filemanip filepath hspec QuickCheck quickcheck-instances + string-conversions text url + ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "A family of combinators for defining webservices APIs"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -157302,7 +153907,6 @@ self: { homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "Authentication combinators for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-client" = callPackage @@ -157330,26 +153934,23 @@ self: { }) {}; "servant-auth-cookie" = callPackage - ({ mkDerivation, base, base-compat, base64-bytestring - , blaze-builder, blaze-html, blaze-markup, bytestring, cereal - , cookie, cryptonite, data-default, deepseq, exceptions, hspec - , http-api-data, http-media, http-types, memory, mtl, QuickCheck - , servant, servant-blaze, servant-server, tagged, text, time - , transformers, wai, warp + ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring + , cereal, cookie, cryptonite, data-default, deepseq, exceptions + , hspec, http-api-data, http-types, memory, mtl, QuickCheck + , servant, servant-server, tagged, time, transformers, wai }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.4.2.1"; - sha256 = "830df7c6d14345b6ff8e869354388f6242b75abe371265e5f1e414427a88fed3"; + version = "0.4.3.2"; + sha256 = "faf62ad020d449638c3059847f16af7d72bfa623d9f5a8ad375e2add9f2c2e3c"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring cereal cookie cryptonite data-default exceptions http-api-data http-types memory mtl servant servant-server tagged time transformers wai ]; testHaskellDepends = [ - base base-compat blaze-html blaze-markup bytestring cereal - cryptonite data-default deepseq hspec http-api-data http-media mtl - QuickCheck servant servant-blaze servant-server text time wai warp + base bytestring cereal cryptonite data-default deepseq hspec + QuickCheck servant-server time ]; description = "Authentication via encrypted cookies"; license = stdenv.lib.licenses.bsd3; @@ -157412,7 +154013,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-auth-server" = callPackage + "servant-auth-server_0_2_1_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder , bytestring, bytestring-conversion, case-insensitive, cookie , crypto-api, data-default-class, entropy, hspec, http-api-data @@ -157453,19 +154054,57 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-auth-server" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder + , bytestring, bytestring-conversion, case-insensitive, cookie + , crypto-api, data-default-class, entropy, hspec, http-api-data + , http-client, http-types, jose, lens, lens-aeson, markdown-unlit + , monad-time, mtl, QuickCheck, servant-auth, servant-server, text + , time, transformers, unordered-containers, wai, warp, wreq + }: + mkDerivation { + pname = "servant-auth-server"; + version = "0.2.2.0"; + sha256 = "ffec3373f25cabc2b182ea7226fff9e43a151c02e603780e5848a5ea03ee48b4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring + bytestring-conversion case-insensitive cookie crypto-api + data-default-class entropy http-api-data jose lens monad-time mtl + servant-auth servant-server text time unordered-containers wai + ]; + executableHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring + bytestring-conversion case-insensitive cookie crypto-api + data-default-class entropy http-api-data jose lens markdown-unlit + monad-time mtl servant-auth servant-server text time transformers + unordered-containers wai warp + ]; + testHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring + bytestring-conversion case-insensitive cookie crypto-api + data-default-class entropy hspec http-api-data http-client + http-types jose lens lens-aeson monad-time mtl QuickCheck + servant-auth servant-server text time unordered-containers wai warp + wreq + ]; + homepage = "http://github.com/plow-technologies/servant-auth#readme"; + description = "servant-server/servant-auth compatibility"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-auth-token" = callPackage ({ mkDerivation, aeson-injector, base, bytestring, containers, mtl - , persistent, persistent-postgresql, persistent-template , pwstore-fast, servant-auth-token-api, servant-server, text, time , transformers, uuid }: mkDerivation { pname = "servant-auth-token"; - version = "0.3.2.0"; - sha256 = "e15307d04c1011f118696c791d641d2a22844737d2484138147beb49f1abcae2"; + version = "0.4.1.0"; + sha256 = "4d2165bed0789e627cc716270491bf87863d5cda4c3041dfd10c0a297b22e3dc"; libraryHaskellDepends = [ - aeson-injector base bytestring containers mtl persistent - persistent-postgresql persistent-template pwstore-fast + aeson-injector base bytestring containers mtl pwstore-fast servant-auth-token-api servant-server text time transformers uuid ]; homepage = "https://github.com/ncrashed/servant-auth-token#readme"; @@ -157474,14 +154113,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-auth-token-acid" = callPackage + ({ mkDerivation, acid-state, aeson-injector, base, bytestring + , containers, ghc-prim, monad-control, mtl, safe, safecopy + , servant-auth-token, servant-auth-token-api, servant-server + , template-haskell, text, time, transformers, transformers-base + , uuid + }: + mkDerivation { + pname = "servant-auth-token-acid"; + version = "0.4.1.0"; + sha256 = "517d4e084cd0884ec1931f2fbe19039c7af16e14b86bf36aeddde844bdbc3354"; + libraryHaskellDepends = [ + acid-state aeson-injector base bytestring containers ghc-prim + monad-control mtl safe safecopy servant-auth-token + servant-auth-token-api servant-server template-haskell text time + transformers transformers-base uuid + ]; + homepage = "https://github.com/ncrashed/servant-auth-token#readme"; + description = "Acid-state backend for servant-auth-token server"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-auth-token-api" = callPackage ({ mkDerivation, aeson, aeson-injector, base, lens, raw-strings-qq , servant, servant-docs, servant-swagger, swagger2, text }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.3.2.0"; - sha256 = "f2fe6ed30518036c9866095521fc9212877e3760ea9a57fd40543d601b8c5e4e"; + version = "0.4.0.0"; + sha256 = "6a8ab7ae1f63d2aecca8c6d63f2b305238b010e5c2e19e4c7f51e01d6bb65526"; libraryHaskellDepends = [ aeson aeson-injector base lens raw-strings-qq servant servant-docs servant-swagger swagger2 text @@ -157492,14 +154153,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-auth-token-persistent" = callPackage + ({ mkDerivation, aeson-injector, base, bytestring, containers + , ghc-prim, monad-control, mtl, persistent, persistent-postgresql + , persistent-template, servant-auth-token, servant-auth-token-api + , servant-server, text, time, transformers, transformers-base, uuid + }: + mkDerivation { + pname = "servant-auth-token-persistent"; + version = "0.4.0.0"; + sha256 = "8b2a6cbc45e3f52ac5d12cd05c052373ca758599672b6086b3148e0dd5f9a075"; + libraryHaskellDepends = [ + aeson-injector base bytestring containers ghc-prim monad-control + mtl persistent persistent-postgresql persistent-template + servant-auth-token servant-auth-token-api servant-server text time + transformers transformers-base uuid + ]; + homepage = "https://github.com/ncrashed/servant-auth-token#readme"; + description = "Persistent backend for servant-auth-token server"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-blaze" = callPackage ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { pname = "servant-blaze"; version = "0.7.1"; sha256 = "90ed1c7a22b83bee344ef3896203f3699b7633bf986ffa064752c3596c072646"; - revision = "3"; - editedCabalFile = "9f4f41889ae9722c92c87cf84de89c3c00d48a37749797fa04a74fba7db5a5ef"; + revision = "4"; + editedCabalFile = "cae733c4dbe8faa35b4f8fdfc5984ef6c01c653c056c799f7fd225a54c9b9b9f"; libraryHaskellDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Blaze-html support for servant"; @@ -157512,8 +154194,8 @@ self: { pname = "servant-cassava"; version = "0.8"; sha256 = "5d9b85f7dc2fc42c7fe47bf92e4502e4ff5dde03724a6ee6ab20887524dce4fb"; - revision = "1"; - editedCabalFile = "56c74c61929917f3f9a662638f9759f92fed2ce0ef49b8fcc8090651f7f854b0"; + revision = "2"; + editedCabalFile = "4b6443d2de0087bed78cd5a0238b7483c5ef75dc72ecac43a45d47522134857a"; libraryHaskellDepends = [ base cassava http-media servant vector ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Servant CSV content-type for cassava"; @@ -157521,34 +154203,6 @@ self: { }) {}; "servant-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, deepseq, exceptions, hspec, http-api-data - , http-client, http-client-tls, http-media, http-types, HUnit - , network, network-uri, QuickCheck, safe, servant, servant-server - , string-conversions, text, transformers, transformers-compat, wai - , warp - }: - mkDerivation { - pname = "servant-client"; - version = "0.8.1"; - sha256 = "a007328f261e8d5596fee87cf541d0886bd1d644fb545fbb05fca683d8f8e33a"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring exceptions - http-api-data http-client http-client-tls http-media http-types - network-uri safe servant string-conversions text transformers - transformers-compat - ]; - testHaskellDepends = [ - aeson base bytestring deepseq hspec http-client http-media - http-types HUnit network QuickCheck servant servant-server text - transformers transformers-compat wai warp - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "automatical derivation of querying functions for servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-client_0_9_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat , base64-bytestring, bytestring, deepseq, exceptions, hspec , http-api-data, http-client, http-client-tls, http-media @@ -157576,6 +154230,37 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-client_0_10" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat + , base64-bytestring, bytestring, deepseq, exceptions, generics-sop + , hspec, http-api-data, http-client, http-client-tls, http-media + , http-types, HUnit, monad-control, mtl, network, network-uri + , QuickCheck, safe, semigroupoids, servant, servant-server + , string-conversions, text, transformers, transformers-base + , transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-client"; + version = "0.10"; + sha256 = "55e411ac7e38a5c1b77d8d3c2320369be36a7b7181e27bb5ac4fba308ef93eaa"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat base64-bytestring bytestring + exceptions generics-sop http-api-data http-client http-client-tls + http-media http-types monad-control mtl network-uri safe + semigroupoids servant string-conversions text transformers + transformers-base transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring deepseq generics-sop hspec + http-api-data http-client http-media http-types HUnit mtl network + QuickCheck servant servant-server text transformers + transformers-compat wai warp + ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "automatical derivation of querying functions for servant webservices"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -157636,36 +154321,6 @@ self: { }) {}; "servant-docs" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , bytestring-conversion, case-insensitive, control-monad-omega - , hashable, hspec, http-media, http-types, lens, servant - , string-conversions, text, unordered-containers - }: - mkDerivation { - pname = "servant-docs"; - version = "0.8.1"; - sha256 = "5a68ef0248da54fddf2fbba0a209a2bbba4144a576c681545b8019041645868d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring bytestring-conversion - case-insensitive control-monad-omega hashable http-media http-types - lens servant string-conversions text unordered-containers - ]; - executableHaskellDepends = [ - aeson base bytestring-conversion lens servant string-conversions - text - ]; - testHaskellDepends = [ - aeson base hspec lens servant string-conversions - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "generate API docs for your servant webservice"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "servant-docs_0_9_1_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , case-insensitive, control-monad-omega, hashable, hspec , http-media, http-types, lens, servant, string-conversions, text @@ -157691,6 +154346,34 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-docs_0_10" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring + , case-insensitive, control-monad-omega, hashable, hspec + , http-media, http-types, lens, servant, string-conversions, text + , unordered-containers + }: + mkDerivation { + pname = "servant-docs"; + version = "0.10"; + sha256 = "0a471acc5a292ed48be2c7f1a22e15c5685c1a1049f99834a56619d7c836603b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat bytestring case-insensitive + control-monad-omega hashable http-media http-types lens servant + string-conversions text unordered-containers + ]; + executableHaskellDepends = [ + aeson base lens servant string-conversions text + ]; + testHaskellDepends = [ + aeson base hspec lens servant string-conversions + ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "generate API docs for your servant webservice"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -157718,21 +154401,63 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-ekg" = callPackage + ({ mkDerivation, aeson, base, ekg, ekg-core, hspec, http-client + , http-types, process, servant, servant-client, servant-server + , text, time, transformers, unordered-containers, wai, warp + }: + mkDerivation { + pname = "servant-ekg"; + version = "0.2.0.0"; + sha256 = "02b54e60e87e5a6c9879fdd1f9a7924b1d16c667b81464d8f3b9ec1c7d693ab3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base ekg-core http-types servant text time unordered-containers wai + ]; + executableHaskellDepends = [ + aeson base ekg ekg-core process servant-server text wai warp + ]; + testHaskellDepends = [ + aeson base ekg ekg-core hspec http-client servant servant-client + servant-server text transformers unordered-containers wai warp + ]; + description = "Helpers for using ekg with servant"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-elm" = callPackage - ({ mkDerivation, aeson, base, data-default, Diff, directory - , elm-export, hspec, HUnit, interpolate, lens, mockery, process + ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens , servant, servant-foreign, text, wl-pprint-text }: mkDerivation { pname = "servant-elm"; - version = "0.3.0.0"; - sha256 = "fc502005a21cb91845c069366f60ddfa77deeb95cb6571bcd2df172e5285439b"; + version = "0.4.0.0"; + sha256 = "2421e8eb140d3848ba4713bc4fb0b8c0c804aef8ef361c0cba08d4df3f50c24b"; libraryHaskellDepends = [ base elm-export lens servant servant-foreign text wl-pprint-text ]; testHaskellDepends = [ - aeson base data-default Diff directory elm-export hspec HUnit - interpolate mockery process servant text + aeson base Diff elm-export hspec HUnit servant text + ]; + homepage = "http://github.com/mattjbray/servant-elm#readme"; + description = "Automatically derive Elm functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-elm_0_4_0_1" = callPackage + ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens + , servant, servant-foreign, text, wl-pprint-text + }: + mkDerivation { + pname = "servant-elm"; + version = "0.4.0.1"; + sha256 = "69b3a5dcbb680fc1e923d76afa8255987d4613e0d4387eb493de071c9842ffc5"; + libraryHaskellDepends = [ + base elm-export lens servant servant-foreign text wl-pprint-text + ]; + testHaskellDepends = [ + aeson base Diff elm-export hspec HUnit servant text ]; homepage = "http://github.com/mattjbray/servant-elm#readme"; description = "Automatically derive Elm functions to query servant webservices"; @@ -157768,22 +154493,22 @@ self: { ({ mkDerivation, base, hspec, http-types, lens, servant, text }: mkDerivation { pname = "servant-foreign"; - version = "0.8.1"; - sha256 = "dd70baa384b353912663b7845fb8698d20350eff389b19e6c6d45181ab7b3171"; + version = "0.9.1.1"; + sha256 = "da9baf46c97b3ef3009a69c8d1ca40e188409c0027490c9e173b9ebd3da7c9ca"; libraryHaskellDepends = [ base http-types lens servant text ]; testHaskellDepends = [ base hspec ]; description = "Helpers for generating clients for servant APIs in any programming language"; license = stdenv.lib.licenses.bsd3; }) {}; - "servant-foreign_0_9_1_1" = callPackage + "servant-foreign_0_10" = callPackage ({ mkDerivation, base, hspec, http-types, lens, servant, text }: mkDerivation { pname = "servant-foreign"; - version = "0.9.1.1"; - sha256 = "da9baf46c97b3ef3009a69c8d1ca40e188409c0027490c9e173b9ebd3da7c9ca"; + version = "0.10"; + sha256 = "14a589afcc36aac7023a552c07862fe72d35d04571a704d51fc7db17ae0c2f25"; libraryHaskellDepends = [ base http-types lens servant text ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base hspec servant ]; description = "Helpers for generating clients for servant APIs in any programming language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -157882,57 +154607,35 @@ self: { "servant-js" = callPackage ({ mkDerivation, base, base-compat, charset, hspec - , hspec-expectations, language-ecmascript, lens, servant - , servant-foreign, text + , hspec-expectations, language-ecmascript, lens, QuickCheck + , servant, servant-foreign, text }: mkDerivation { pname = "servant-js"; - version = "0.8.1"; - sha256 = "5f60d692953f9f5f1570c7fd6b1c8c524545e588b3f1c63669ef219dde8c0363"; + version = "0.9.1"; + sha256 = "bbc8a860d7b84f716fcff7337654115cf6b7ba756d9a325cc0b1124cf82ade27"; + revision = "2"; + editedCabalFile = "babc912d297dfde6d2f7ae019458ae5d5f363b5930566a7827df219746aad537"; libraryHaskellDepends = [ base base-compat charset lens servant servant-foreign text ]; testHaskellDepends = [ base base-compat hspec hspec-expectations language-ecmascript lens - servant text + QuickCheck servant text ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; }) {}; - "servant-js_0_9" = callPackage - ({ mkDerivation, base, base-compat, charset, hspec - , hspec-expectations, language-ecmascript, lens, servant - , servant-foreign, text - }: - mkDerivation { - pname = "servant-js"; - version = "0.9"; - sha256 = "7a4b5055029c327f6bb90b8283a655ab0f3cc2da426ee94ec1b5d8d4eade6c34"; - revision = "1"; - editedCabalFile = "5d19fb0f6529051622c12e8e55fa32123f36a5d1b45a229a822e2ea7c409df1b"; - libraryHaskellDepends = [ - base base-compat charset lens servant servant-foreign text - ]; - testHaskellDepends = [ - base base-compat hspec hspec-expectations language-ecmascript lens - servant text - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "Automatically derive javascript functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "servant-lucid" = callPackage ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { pname = "servant-lucid"; version = "0.7.1"; sha256 = "ec26ba7d159b09be10beacf6242f6ae1bd111e9c738bfbf3cf2f560f48e0fe40"; - revision = "3"; - editedCabalFile = "4bb81e61336f3e3a91d3c920937beeee49a178c53d391172c07bb847a68cdbe5"; + revision = "4"; + editedCabalFile = "ea04cd0d0f11bbe4ea55608a7a38013d9da6373f25b2cad1e03dfb2c5c83fe18"; libraryHaskellDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Servant support for lucid"; @@ -157989,6 +154692,53 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-mock_0_8_1_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, bytestring-conversion + , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server + , transformers, wai, warp + }: + mkDerivation { + pname = "servant-mock"; + version = "0.8.1.2"; + sha256 = "2a65e62112551633d7d9b1372129b043b0cc35e13960b8222f122d206931d117"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring http-types QuickCheck servant servant-server + transformers wai + ]; + executableHaskellDepends = [ + aeson base QuickCheck servant-server warp + ]; + testHaskellDepends = [ + aeson base bytestring-conversion hspec hspec-wai QuickCheck servant + servant-server wai + ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "Derive a mock server for free from your servant API types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "servant-named" = callPackage + ({ mkDerivation, base, hspec, hspec-wai, http-types, servant + , servant-server + }: + mkDerivation { + pname = "servant-named"; + version = "0.1.0.0"; + sha256 = "6bdcc503ca1603d7a2ad787fd57dc5e25a06bbf05530f89718ca1be832660436"; + revision = "2"; + editedCabalFile = "5a05b717a5676672ec5ce3815b1a702165b6828bd421605920a5a8b02ad3211b"; + libraryHaskellDepends = [ base servant ]; + testHaskellDepends = [ + base hspec hspec-wai http-types servant servant-server + ]; + homepage = "https://github.com/bemweitzman/servant-named#readme"; + description = "Add named endpoints to servant"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-pandoc" = callPackage ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types , servant-docs, text, unordered-containers @@ -158040,31 +154790,6 @@ self: { }) {}; "servant-purescript" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, http-types, lens, mainland-pretty, purescript-bridge - , servant, servant-foreign, servant-server, servant-subscriber - , text - }: - mkDerivation { - pname = "servant-purescript"; - version = "0.3.1.5"; - sha256 = "3bf4363b2154c7fb3e6da4eb9f5ef227c5e15d4cc6048342086d77426f74b9d5"; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath http-types lens - mainland-pretty purescript-bridge servant servant-foreign - servant-server servant-subscriber text - ]; - testHaskellDepends = [ - aeson base containers lens mainland-pretty purescript-bridge - servant servant-foreign servant-subscriber text - ]; - homepage = "https://github.com/eskimor/servant-purescript#readme"; - description = "Generate PureScript accessor functions for you servant API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "servant-purescript_0_6_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, http-types, lens, mainland-pretty, purescript-bridge , servant, servant-foreign, servant-server, servant-subscriber @@ -158089,6 +154814,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-pushbullet-client" = callPackage + ({ mkDerivation, aeson, base, http-api-data, http-client + , http-client-tls, microlens, microlens-th, scientific, servant + , servant-client, text, time, unordered-containers + }: + mkDerivation { + pname = "servant-pushbullet-client"; + version = "0.0.3.0"; + sha256 = "f6374498a3f6cfd59b8562cd506408dcbd6805cb107d2a756c1e3700aef09b9d"; + libraryHaskellDepends = [ + aeson base http-api-data http-client http-client-tls microlens + microlens-th scientific servant servant-client text time + unordered-containers + ]; + description = "Bindings to the Pushbullet API using servant-client"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-quickcheck" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring , case-insensitive, clock, data-default-class, hspec, hspec-core @@ -158172,41 +154915,6 @@ self: { }) {}; "servant-server" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat - , base64-bytestring, bytestring, bytestring-conversion, containers - , directory, doctest, exceptions, filemanip, filepath, hspec - , hspec-wai, http-api-data, http-types, mtl, network, network-uri - , parsec, QuickCheck, safe, servant, should-not-typecheck, split - , string-conversions, system-filepath, temporary, text - , transformers, transformers-compat, wai, wai-app-static, wai-extra - , warp, word8 - }: - mkDerivation { - pname = "servant-server"; - version = "0.8.1"; - sha256 = "2a662864df00ce431eb1a6d01245d65c1483847c6228c540e6374108fe84a2b2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base base-compat base64-bytestring bytestring - containers filepath http-api-data http-types mtl network - network-uri safe servant split string-conversions system-filepath - text transformers transformers-compat wai wai-app-static warp word8 - ]; - executableHaskellDepends = [ aeson base servant text wai warp ]; - testHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring - bytestring-conversion directory doctest exceptions filemanip - filepath hspec hspec-wai http-types mtl network parsec QuickCheck - safe servant should-not-typecheck string-conversions temporary text - transformers transformers-compat wai wai-extra warp - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "A family of combinators for defining webservices APIs and serving them"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-server_0_9_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat , base64-bytestring, bytestring, containers, directory, doctest , exceptions, filemanip, filepath, hspec, hspec-wai, http-api-data @@ -158240,6 +154948,43 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-server_0_10" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat + , base64-bytestring, bytestring, Cabal, containers, directory + , doctest, exceptions, filemanip, filepath, hspec, hspec-wai + , http-api-data, http-types, monad-control, mtl, network + , network-uri, parsec, QuickCheck, resourcet, safe, servant + , should-not-typecheck, split, string-conversions, system-filepath + , temporary, text, transformers, transformers-base + , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 + }: + mkDerivation { + pname = "servant-server"; + version = "0.10"; + sha256 = "99d14d23ea67832401b4bca7e5cb75b8c557e6dc7a8f38870c3b9d701179073d"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + aeson attoparsec base base-compat base64-bytestring bytestring + containers exceptions filepath http-api-data http-types + monad-control mtl network network-uri resourcet safe servant split + string-conversions system-filepath text transformers + transformers-base transformers-compat wai wai-app-static warp word8 + ]; + executableHaskellDepends = [ aeson base servant text wai warp ]; + testHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring directory + doctest exceptions filemanip filepath hspec hspec-wai http-types + mtl network parsec QuickCheck resourcet safe servant + should-not-typecheck string-conversions temporary text transformers + transformers-compat wai wai-extra warp + ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "A family of combinators for defining webservices APIs and serving them"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -158334,6 +155079,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-subscriber_0_6_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder + , bytestring, case-insensitive, containers, directory, filepath + , http-types, lens, lifted-base, monad-control, monad-logger + , network-uri, purescript-bridge, servant, servant-foreign + , servant-server, stm, text, time, transformers, wai + , wai-websockets, warp, websockets + }: + mkDerivation { + pname = "servant-subscriber"; + version = "0.6.0.0"; + sha256 = "1875445b8dde41e86dd962bd71848255a6ea25e54c21cd9cf046638c16ff405d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base blaze-builder bytestring + case-insensitive containers directory filepath http-types lens + lifted-base monad-control monad-logger network-uri servant + servant-foreign servant-server stm text time transformers wai + wai-websockets warp websockets + ]; + executableHaskellDepends = [ base purescript-bridge ]; + homepage = "http://github.com/eskimor/servant-subscriber#readme"; + description = "When REST is not enough ..."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-swagger" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, directory , doctest, filepath, hspec, http-media, insert-ordered-containers @@ -158360,6 +155133,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-swagger_1_1_2_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal + , cabal-doctest, directory, doctest, filepath, hspec, http-media + , insert-ordered-containers, lens, QuickCheck, servant, swagger2 + , text, time, unordered-containers + }: + mkDerivation { + pname = "servant-swagger"; + version = "1.1.2.1"; + sha256 = "302ab03af773ddb3b0a4949b62ca79b81c206a3838864c9ed35cb4e40360f961"; + revision = "1"; + editedCabalFile = "c0e7cf887989105cb5d7dea343a8f0586999680bd6272516a745e1cc01a017de"; + setupHaskellDepends = [ + base Cabal cabal-doctest directory filepath + ]; + libraryHaskellDepends = [ + aeson base bytestring hspec http-media insert-ordered-containers + lens QuickCheck servant swagger2 text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base directory doctest filepath hspec lens + QuickCheck servant swagger2 text time + ]; + homepage = "https://github.com/haskell-servant/servant-swagger"; + description = "Generate Swagger specification for your servant API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-swagger-ui" = callPackage ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring , directory, file-embed, filepath, http-media, lens, servant @@ -158369,10 +155171,8 @@ self: { }: mkDerivation { pname = "servant-swagger-ui"; - version = "0.2.1.2.2.8"; - sha256 = "21a25df5c3527a859a14ae2edf12116d8634e7be1587357f4545f31fc5acb3a4"; - revision = "1"; - editedCabalFile = "3ad40d23f60d1d80d877914691e7e4adbbd129cc62f411494f144f19b9d82ac8"; + version = "0.2.2.2.2.8"; + sha256 = "7dcfbc55eb6aab3ebb739e7a056107cbe0d0720c3e2e6f820afe52e7e84084fb"; libraryHaskellDepends = [ base blaze-markup bytestring directory file-embed filepath http-media servant servant-blaze servant-server servant-swagger @@ -158380,10 +155180,8 @@ self: { wai-app-static ]; testHaskellDepends = [ - aeson base base-compat blaze-markup bytestring directory file-embed - filepath http-media lens servant servant-blaze servant-server - servant-swagger swagger2 template-haskell text transformers - transformers-compat wai wai-app-static warp + aeson base base-compat lens servant servant-server servant-swagger + swagger2 text transformers transformers-compat wai warp ]; homepage = "https://github.com/phadej/servant-swagger-ui#readme"; description = "Servant swagger ui"; @@ -158399,8 +155197,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.0"; sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204"; - revision = "12"; - editedCabalFile = "a8bcb29afce01078d5f6b71503ad0d7d03356a9ebeffb4ec09719a324c314519"; + revision = "13"; + editedCabalFile = "dba651f8c89c721a27427895340c9cf6e118ad0f752ca3cd275295a601e58573"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -158861,8 +155659,8 @@ self: { }: mkDerivation { pname = "sexp-grammar"; - version = "1.2.2"; - sha256 = "250ea8894b7232e074040e50de1fa8e2e26183aeffa21c206ece5767dc725492"; + version = "1.2.3"; + sha256 = "6914a7ae01b736f1b32e2847d91a2accbe2be195cbb5c69d56668ef08872f580"; libraryHaskellDepends = [ array base bytestring containers mtl profunctors scientific semigroups split tagged template-haskell text transformers @@ -159129,40 +155927,6 @@ self: { }) {}; "shake" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, directory - , extra, filepath, hashable, js-flot, js-jquery, primitive, process - , QuickCheck, random, time, transformers, unix - , unordered-containers, utf8-string - }: - mkDerivation { - pname = "shake"; - version = "0.15.10"; - sha256 = "36331a3cf3e29578c3134e4ee6481dd932e7d40704f5c38703a0eb231ba433d0"; - revision = "1"; - editedCabalFile = "bb24876b00ef8cd3f8500ef729a01278e6e4ba9c7e12391cb76c2217ddc55563"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery process random time transformers unix - unordered-containers utf8-string - ]; - executableHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery primitive process random time transformers unix - unordered-containers utf8-string - ]; - testHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery process QuickCheck random time transformers unix - unordered-containers utf8-string - ]; - homepage = "http://shakebuild.com"; - description = "Build system library, like Make, but more accurate dependencies"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "shake_0_15_11" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, directory , extra, filepath, hashable, js-flot, js-jquery, primitive, process , QuickCheck, random, time, transformers, unix @@ -159192,7 +155956,6 @@ self: { homepage = "http://shakebuild.com"; description = "Build system library, like Make, but more accurate dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-cabal-build" = callPackage @@ -159830,10 +156593,10 @@ self: { }: mkDerivation { pname = "shikensu"; - version = "0.1.3"; - sha256 = "73d50978e7b6a0c1d1784ab607572411da44aafce58defe45938f2b427b85713"; + version = "0.2.1"; + sha256 = "3984671ee884f828df248aa5d9033ece376ecb30cb0f689a4a4aa10a93d697f8"; libraryHaskellDepends = [ - aeson base bytestring directory filepath flow Glob + aeson base bytestring directory filepath flow Glob text unordered-containers ]; testHaskellDepends = [ @@ -160437,8 +157200,8 @@ self: { }: mkDerivation { pname = "simple-conduit"; - version = "0.5.1"; - sha256 = "f997a94736b90abfd6abc08a56e59c02cd42ab549f35148c68ce40c11b03c7cb"; + version = "0.6.0"; + sha256 = "184446555a051992f1a7111af95e84c6cf4a89bdd97c68d354cf9100cb2414fe"; libraryHaskellDepends = [ base bifunctors bytestring chunked-data containers either exceptions filepath free lifted-async lifted-base mmorph @@ -160503,18 +157266,18 @@ self: { }) {}; "simple-effects" = callPackage - ({ mkDerivation, array, base, interlude-l, lens, list-t - , monad-control, mtl, transformers, transformers-base + ({ mkDerivation, array, base, exceptions, list-t, monad-control + , MonadRandom, mtl, text, transformers, transformers-base }: mkDerivation { pname = "simple-effects"; - version = "0.6.0.2"; - sha256 = "f8f887e433a4f68a506966b2d41f614cb39602f8bb3b802535f91c2391711a36"; + version = "0.7.0.1"; + sha256 = "be3d3ca1fbfc2aee432190f0e737b73478116493beb176216dcad0b1a8c0bc4d"; libraryHaskellDepends = [ - array base interlude-l lens list-t monad-control mtl transformers - transformers-base + array base exceptions list-t monad-control MonadRandom mtl text + transformers transformers-base ]; - testHaskellDepends = [ base interlude-l ]; + testHaskellDepends = [ base ]; homepage = "https://gitlab.com/LukaHorvat/simple-effects"; description = "A simple effect system that integrates with MTL"; license = stdenv.lib.licenses.bsd3; @@ -160633,24 +157396,6 @@ self: { }) {}; "simple-log" = callPackage - ({ mkDerivation, async, base, containers, deepseq, directory - , exceptions, filepath, mtl, SafeSemaphore, text, time - , transformers - }: - mkDerivation { - pname = "simple-log"; - version = "0.4.0"; - sha256 = "548c444505f70beb02b14b5b1e0c647acaa1879edc5699ef365ec516a9b55aa5"; - libraryHaskellDepends = [ - async base containers deepseq directory exceptions filepath mtl - SafeSemaphore text time transformers - ]; - homepage = "http://github.com/mvoidex/simple-log"; - description = "Simple log for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-log_0_5_1" = callPackage ({ mkDerivation, async, base, containers, deepseq, directory , exceptions, filepath, mtl, SafeSemaphore, text, time , transformers @@ -160666,7 +157411,6 @@ self: { homepage = "http://github.com/mvoidex/simple-log"; description = "Simple log for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-log-syslog" = callPackage @@ -161616,20 +158360,20 @@ self: { "skylighting" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring , case-insensitive, containers, Diff, directory, filepath, HUnit - , hxt, mtl, pretty-show, QuickCheck, regex-pcre-builtin, safe - , tasty, tasty-golden, tasty-hunit, text, utf8-string + , hxt, mtl, pretty-show, random, regex-pcre-builtin, safe, tasty + , tasty-golden, tasty-hunit, text, utf8-string }: mkDerivation { pname = "skylighting"; - version = "0.1.1"; - sha256 = "010c00a96fe61acb2650695633705a19ebda535822862887b94aadc31177945b"; + version = "0.1.1.5"; + sha256 = "0a4b666b2ccfeed35386bd364d663e919adc1815547e6360e83487253e33b13c"; libraryHaskellDepends = [ aeson base blaze-html bytestring case-insensitive containers directory filepath hxt mtl regex-pcre-builtin safe text utf8-string ]; testHaskellDepends = [ - aeson base bytestring Diff directory filepath HUnit pretty-show - QuickCheck tasty tasty-golden tasty-hunit text + aeson base bytestring containers Diff directory filepath HUnit + pretty-show random tasty tasty-golden tasty-hunit text ]; homepage = "https://github.com/jgm/skylighting"; description = "syntax highlighting library"; @@ -161702,8 +158446,8 @@ self: { }: mkDerivation { pname = "slack-api"; - version = "0.10"; - sha256 = "0b9b6688858b85d9c40a6cfd670658330671173ac309326936ff07c931afb452"; + version = "0.11"; + sha256 = "aa4c71bd6e877bca8d5e4cdb516c4049eb9068e287205985fd4305d78425d0c3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162172,24 +158916,6 @@ self: { }) {}; "smsaero" = callPackage - ({ mkDerivation, aeson, base, containers, http-api-data - , http-client, servant, servant-client, servant-docs, text, time - }: - mkDerivation { - pname = "smsaero"; - version = "0.6.2"; - sha256 = "32f2dcbde9d588e11cebba3149a5e3a9e915cb47e13de8a4466690a171d490ec"; - libraryHaskellDepends = [ - aeson base containers http-api-data http-client servant - servant-client servant-docs text time - ]; - homepage = "https://github.com/GetShopTV/smsaero"; - description = "SMSAero API and HTTP client based on servant library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "smsaero_0_7_1" = callPackage ({ mkDerivation, aeson, base, containers, http-api-data , http-client, servant, servant-client, servant-docs, text, time }: @@ -162452,12 +159178,16 @@ self: { }) {}; "snap-accept" = callPackage - ({ mkDerivation, base, http-media, snap-core }: + ({ mkDerivation, base, bytestring, case-insensitive, http-media + , snap-core + }: mkDerivation { pname = "snap-accept"; - version = "0.1.0"; - sha256 = "35387bd97314e8c24219cb2a9d4c6dece133847af14c67884cfeacad123e56a7"; - libraryHaskellDepends = [ base http-media snap-core ]; + version = "0.2.0"; + sha256 = "4e65ad212f3bfc867399fcf35dff4444fe47b014d01b4cd01cffc9163045c928"; + libraryHaskellDepends = [ + base bytestring case-insensitive http-media snap-core + ]; homepage = "http://github.com/zimothy/snap-accept"; description = "Accept header branching for the Snap web framework"; license = stdenv.lib.licenses.mit; @@ -162605,16 +159335,16 @@ self: { }) {}; "snap-error-collector" = callPackage - ({ mkDerivation, async, base, containers, monad-loops - , MonadCatchIO-transformers, snap, stm, time, transformers + ({ mkDerivation, async, base, containers, lifted-base, monad-loops + , snap, stm, time, transformers }: mkDerivation { pname = "snap-error-collector"; - version = "1.1.1"; - sha256 = "9dadb634f69f0a9549c951c18c24c176db7c1b8024594563c55dfe00e6d21cac"; + version = "1.1.2"; + sha256 = "8c313ebefaa89447d6193d3346d37d46e198279fe4eb7218228da03fb3ba485c"; libraryHaskellDepends = [ - async base containers monad-loops MonadCatchIO-transformers snap - stm time transformers + async base containers lifted-base monad-loops snap stm time + transformers ]; homepage = "http://github.com/ocharles/snap-error-collector"; description = "Collect errors in batches and dispatch them"; @@ -162627,20 +159357,20 @@ self: { , case-insensitive, configurator, containers, data-default , digestive-functors, digestive-functors-heist , digestive-functors-snap, directory-tree, filepath, heist, jmacro - , lens, mtl, pcre-light, QuickCheck, readable, safe, snap - , snap-core, tasty, tasty-hunit, tasty-quickcheck, text, time + , lens, map-syntax, mtl, pcre-light, QuickCheck, readable, safe + , snap, snap-core, tasty, tasty-hunit, tasty-quickcheck, text, time , transformers, wl-pprint-text, xmlhtml }: mkDerivation { pname = "snap-extras"; - version = "0.11.0.2"; - sha256 = "15e8ab812bf53b3f7ab0377e945b3e3448d5b8d4b89404751f83d51d722deb5e"; + version = "0.12.0.0"; + sha256 = "76ec979fa905a305392a545f24c6a33217e83aeedd0a8eec311623722b26e494"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html bytestring case-insensitive configurator containers data-default digestive-functors digestive-functors-heist digestive-functors-snap directory-tree - filepath heist jmacro lens mtl pcre-light readable safe snap - snap-core text time transformers wl-pprint-text xmlhtml + filepath heist jmacro lens map-syntax mtl pcre-light readable safe + snap snap-core text time transformers wl-pprint-text xmlhtml ]; testHaskellDepends = [ base bytestring containers QuickCheck snap-core tasty tasty-hunit @@ -163105,20 +159835,21 @@ self: { "snaplet-i18n" = callPackage ({ mkDerivation, base, bytestring, configurator, filepath, heist - , lens, mtl, snap, snap-loader-static, text, transformers, xmlhtml + , lens, map-syntax, mtl, snap, snap-loader-static, text + , transformers, xmlhtml }: mkDerivation { pname = "snaplet-i18n"; - version = "0.1.0"; - sha256 = "8933941904b222dd880b46a34af7c6612f47182e38b24022dbed6c6e505c4e3a"; + version = "0.2.0"; + sha256 = "811a12a9db93c5df0ab2d33a160eb49595cd25afd53b1ca553498d407bec55c3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base configurator filepath heist lens mtl snap snap-loader-static - text transformers xmlhtml + base configurator filepath heist lens map-syntax mtl snap + snap-loader-static text transformers xmlhtml ]; executableHaskellDepends = [ - base bytestring configurator filepath heist lens snap + base bytestring configurator filepath heist lens map-syntax snap snap-loader-static text transformers xmlhtml ]; homepage = "https://github.com/HaskellCNOrg/snaplet-i18n"; @@ -163679,12 +160410,12 @@ self: { ({ mkDerivation, array, base, binary, bytestring, snappy }: mkDerivation { pname = "snappy-framing"; - version = "0.1.0"; - sha256 = "62c960bbe61da6afb89a7e78dacab87e19e0f627f39c76c211f045a42d99ffd4"; + version = "0.1.1"; + sha256 = "f01b99cfa2e8d2c677e45e1852e0ae0a00034b8318e69d84b1857936c8c24be5"; libraryHaskellDepends = [ array base binary bytestring snappy ]; homepage = "https://github.com/kim/snappy-framing"; description = "Snappy Framing Format in Haskell"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; }) {}; "snappy-iteratee" = callPackage @@ -164016,19 +160747,6 @@ self: { }) {}; "socket" = callPackage - ({ mkDerivation, async, base, bytestring, tasty, tasty-hunit }: - mkDerivation { - pname = "socket"; - version = "0.6.1.0"; - sha256 = "c010f5b5c705483f52a8c1d45f07f57b49e8b61c07187bc3e50d658c72c409e6"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ async base bytestring tasty tasty-hunit ]; - homepage = "https://github.com/lpeterse/haskell-socket"; - description = "An extensible socket library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "socket_0_7_0_0" = callPackage ({ mkDerivation, async, base, bytestring, QuickCheck, tasty , tasty-hunit, tasty-quickcheck }: @@ -164043,7 +160761,6 @@ self: { homepage = "https://github.com/lpeterse/haskell-socket"; description = "An extensible socket library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socket-activation" = callPackage @@ -164064,8 +160781,8 @@ self: { }: mkDerivation { pname = "socket-io"; - version = "1.3.6"; - sha256 = "6ec1577c7f701253bc85a9df03379d77ae99c33d1db5ee4f7e6b06972701fb1a"; + version = "1.3.7"; + sha256 = "bbd92d2a6711e950e6bb2da8342a3e103c66638cad2207820c5cb6d8090fef0a"; libraryHaskellDepends = [ aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector @@ -164096,10 +160813,8 @@ self: { }: mkDerivation { pname = "socket-unix"; - version = "0.1.0.0"; - sha256 = "34c71e014e728a4c5f31fbb55ac0d46f049969a8860e2b8629369f4d83429f2d"; - revision = "1"; - editedCabalFile = "082468d0b01112a99fffa76d7ff1bbe1b0ebbf878b3364fecec64a73fed094a3"; + version = "0.1.1.0"; + sha256 = "7541dd005761c6d08f8a87fe8157e1cfde128437c3bb3b9a72f3052f799ebd0f"; libraryHaskellDepends = [ base bytestring socket ]; testHaskellDepends = [ async base bytestring socket tasty tasty-hunit unix @@ -164205,30 +160920,6 @@ self: { }) {}; "solga" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hashable - , hspec, hspec-wai, hspec-wai-json, http-types, QuickCheck - , resourcet, safe-exceptions, scientific, text - , unordered-containers, vector, wai, wai-extra - }: - mkDerivation { - pname = "solga"; - version = "0.1.0.1"; - sha256 = "4949717429b3698d619bca644fedb340b8f0eaac50e3e9b0b55007d9eb1db8ba"; - libraryHaskellDepends = [ - aeson base bytestring containers http-types resourcet - safe-exceptions text wai wai-extra - ]; - testHaskellDepends = [ - aeson base bytestring hashable hspec hspec-wai hspec-wai-json - http-types QuickCheck scientific text unordered-containers vector - wai wai-extra - ]; - homepage = "https://github.com/chpatrick/solga"; - description = "Simple typesafe web routing"; - license = stdenv.lib.licenses.mit; - }) {}; - - "solga_0_1_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hashable , hspec, hspec-wai, hspec-wai-json, http-types, QuickCheck , resourcet, safe-exceptions, scientific, text @@ -164250,7 +160941,6 @@ self: { homepage = "https://github.com/chpatrick/solga"; description = "Simple typesafe web routing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "solga-swagger" = callPackage @@ -164626,23 +161316,24 @@ self: { }) {}; "sparkle" = callPackage - ({ mkDerivation, base, binary, bytestring, distributed-closure - , filepath, jni, jvm, process, regex-tdfa, singletons, text, vector - , zip-archive + ({ mkDerivation, base, binary, bytestring, choice + , distributed-closure, filepath, jni, jvm, jvm-streaming, process + , regex-tdfa, singletons, streaming, text, vector, zip-archive }: mkDerivation { pname = "sparkle"; - version = "0.3"; - sha256 = "72b97e6fe8867bbaa797bb1416df14bbfd61e7bd1e1b0c9b9b2c97cc0e37b7d5"; + version = "0.4.0.2"; + sha256 = "778c4858a51480f685b7f48c3ffea76535dd690119414de1a5d03535c3e3cfaf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring distributed-closure jni jvm singletons text - vector + base binary bytestring choice distributed-closure jni jvm + jvm-streaming singletons streaming text vector ]; executableHaskellDepends = [ base bytestring filepath process regex-tdfa text zip-archive ]; + homepage = "http://github.com/tweag/sparkle#readme"; description = "Distributed Apache Spark applications in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -164715,6 +161406,29 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "sparse-linear-algebra_0_2_9_1" = callPackage + ({ mkDerivation, base, containers, criterion, exceptions, hspec + , mtl, mwc-random, primitive, QuickCheck, transformers, vector + , vector-algorithms, vector-space + }: + mkDerivation { + pname = "sparse-linear-algebra"; + version = "0.2.9.1"; + sha256 = "5210a7491d2cd6efb5c4cf7be53c10a8c4240b0653bd7d8bfbb5c5f86393a442"; + libraryHaskellDepends = [ + base containers exceptions mtl transformers vector + vector-algorithms vector-space + ]; + testHaskellDepends = [ + base containers criterion exceptions hspec mtl mwc-random primitive + QuickCheck vector-space + ]; + homepage = "https://github.com/ocramz/sparse-linear-algebra"; + description = "Sparse linear algebra in native Haskell"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sparsebit" = callPackage ({ mkDerivation, base, haskell98 }: mkDerivation { @@ -164926,23 +161640,6 @@ self: { }) {}; "speedy-slice" = callPackage - ({ mkDerivation, base, containers, lens, mcmc-types - , mwc-probability, pipes, primitive, transformers - }: - mkDerivation { - pname = "speedy-slice"; - version = "0.1.5"; - sha256 = "d072049b142e1df47a2a6b269dc7a9fc754a1ecd62ed5c6a6e8fb4122dd02441"; - libraryHaskellDepends = [ - base lens mcmc-types mwc-probability pipes primitive transformers - ]; - testHaskellDepends = [ base containers mwc-probability ]; - homepage = "http://github.com/jtobin/speedy-slice"; - description = "Speedy slice sampling"; - license = stdenv.lib.licenses.mit; - }) {}; - - "speedy-slice_0_3_0" = callPackage ({ mkDerivation, base, containers, kan-extensions, lens, mcmc-types , mwc-probability, pipes, primitive, transformers }: @@ -164958,7 +161655,6 @@ self: { homepage = "http://github.com/jtobin/speedy-slice"; description = "Speedy slice sampling"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spelling-suggest" = callPackage @@ -165478,8 +162174,8 @@ self: { }: mkDerivation { pname = "sproxy2"; - version = "1.93.0"; - sha256 = "162c72464a0e4d77201db79ed332d14832a8a145c19246aa64b7156360aadcc9"; + version = "1.94.1"; + sha256 = "be00dbeb5a81ecd38034ea549772eb3f3c94c8185a26c2f7de86c17084586e21"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -165889,6 +162585,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ssh-known-hosts" = callPackage + ({ mkDerivation, base, HUnit, iproute, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, unix + }: + mkDerivation { + pname = "ssh-known-hosts"; + version = "0.2.0.0"; + sha256 = "0a93cbeae395701ff1cd609c29aaa2b59d507304b91612a28193156faac210fe"; + libraryHaskellDepends = [ base iproute text ]; + testHaskellDepends = [ + base HUnit iproute QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 text unix + ]; + homepage = "http://hub.darcs.net/kquick/ssh-known-hosts"; + description = "Read and interpret the SSH known-hosts file"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sshd-lint" = callPackage ({ mkDerivation, base, containers, hspec, keyword-args , nagios-check, parsec @@ -166071,32 +162785,6 @@ self: { }) {}; "stache" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , directory, exceptions, file-embed, filepath, hspec - , hspec-megaparsec, megaparsec, mtl, template-haskell, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "stache"; - version = "0.1.8"; - sha256 = "a8617924e087b02c3afb3308a8a1102828e352dba7545648703e5d0c2c3c35b2"; - revision = "2"; - editedCabalFile = "293e587834fd528a8f1869027b1de5f3ea492597350688a86db36c18453757d9"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory exceptions - filepath megaparsec mtl template-haskell text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed hspec hspec-megaparsec - megaparsec text yaml - ]; - homepage = "https://github.com/stackbuilders/stache"; - description = "Mustache templates for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stache_0_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , directory, exceptions, file-embed, filepath, hspec , hspec-megaparsec, megaparsec, mtl, template-haskell, text @@ -166120,7 +162808,6 @@ self: { homepage = "https://github.com/stackbuilders/stache"; description = "Mustache templates for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack" = callPackage @@ -166149,6 +162836,8 @@ self: { pname = "stack"; version = "1.3.2"; sha256 = "488b9292ea605c92f6ebf79b233e8e374d857b21053051cb44b305dad8f0d3f7"; + revision = "2"; + editedCabalFile = "c15bab02b5aa26847ce94aab4bca3ac7bbd38e7e3c56039364f70bb107cb7968"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166405,54 +163094,8 @@ self: { }: mkDerivation { pname = "stackage-curator"; - version = "0.14.3"; - sha256 = "ce868f0bc6c385d23672421df9a8613c418e50e793a9ffbb16a2e0a4003ba8fa"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 async base - base16-bytestring blaze-html byteable bytestring Cabal - classy-prelude-conduit conduit conduit-extra containers cryptohash - cryptohash-conduit data-default-class directory exceptions filepath - hashable html-conduit http-client http-client-tls http-conduit - lucid mime-types monad-unlift monad-unlift-ref mono-traversable mtl - old-locale process resourcet safe semigroups stm store - streaming-commons syb system-fileio system-filepath tar temporary - text time transformers unix-compat unordered-containers utf8-string - vector xml-conduit xml-types yaml zlib - ]; - executableHaskellDepends = [ - aeson base http-client http-client-tls optparse-applicative - optparse-simple system-filepath text - ]; - testHaskellDepends = [ - base Cabal classy-prelude-conduit containers directory hspec - http-client http-client-tls QuickCheck text yaml - ]; - homepage = "https://github.com/fpco/stackage-curator"; - description = "Tools for curating Stackage bundles"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "stackage-curator_0_14_4_1" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async - , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal - , classy-prelude-conduit, conduit, conduit-extra, containers - , cryptohash, cryptohash-conduit, data-default-class, directory - , exceptions, filepath, hashable, hspec, html-conduit, http-client - , http-client-tls, http-conduit, lucid, mime-types, monad-unlift - , monad-unlift-ref, mono-traversable, mtl, old-locale - , optparse-applicative, optparse-simple, process, QuickCheck - , resourcet, safe, semigroups, stm, store, streaming-commons, syb - , system-fileio, system-filepath, tar, temporary, text, time - , transformers, unix-compat, unordered-containers, utf8-string - , vector, xml-conduit, xml-types, yaml, zlib - }: - mkDerivation { - pname = "stackage-curator"; - version = "0.14.4.1"; - sha256 = "37d3b9ac875d46d209efcaa9c6e0d1ab1edb421f1153292238582ee1aff66add"; + version = "0.14.5"; + sha256 = "11021c2eaf80f7090375c1947e75d441bf4e6131253fc6a7953b6e6ab6948c85"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166635,8 +163278,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "staf"; - version = "0.1.0.0"; - sha256 = "ce066d4b64771489176e72f081b8ec5ba62237ff1f12abe5f515884b0ce8a925"; + version = "1.0.0"; + sha256 = "7e7eaa611d5558984253eb1e291443cbca91c4c1593349b406fccd5418dc6230"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/lovasko/staf"; description = "Numerical statistics for Foldable containers"; @@ -167157,6 +163800,8 @@ self: { pname = "stb-image-redux"; version = "0.2.1.0"; sha256 = "c0e4a5d2bf6d99934430ffd068cb3d28003554c5c8beb84ce76dd487f191eb1d"; + revision = "2"; + editedCabalFile = "e2e25f22d0fedbe7c49b0c0db29511c4bbc03bcc4dd95ec18c840d6f060f9ac6"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base hspec vector ]; homepage = "https://github.com/sasinestro/stb-image-redux#readme"; @@ -167229,25 +163874,30 @@ self: { "steeloverseer" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring - , containers, directory, filepath, fsnotify, megaparsec, microlens - , mtl, optparse-applicative, process, regex-tdfa, semigroups, stm - , text, yaml + , containers, directory, filepath, fsnotify, hspec, mtl + , optparse-applicative, process, regex-tdfa, resourcet, semigroups + , stm, streaming, text, yaml }: mkDerivation { pname = "steeloverseer"; - version = "2.0.0.1"; - sha256 = "376994767ee8afacebf05f18ad0517bf1fa7557f5c44697c3f476a575d6ea334"; + version = "2.0.1.0"; + sha256 = "ddc06191f2273a0c0c684d54d5f2ece54748b91ec97b11c99c9b38efe7915a5a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal async base bytestring containers megaparsec - microlens mtl process regex-tdfa semigroups stm text yaml + aeson ansi-terminal async base bytestring containers fsnotify mtl + process regex-tdfa resourcet semigroups stm streaming text yaml ]; executableHaskellDepends = [ - base bytestring directory filepath fsnotify optparse-applicative - regex-tdfa semigroups yaml + async base bytestring directory filepath fsnotify mtl + optparse-applicative regex-tdfa resourcet semigroups stm streaming + text yaml ]; - homepage = "https://github.com/schell/steeloverseer"; + testHaskellDepends = [ + async base bytestring fsnotify hspec mtl regex-tdfa resourcet + semigroups stm streaming text yaml + ]; + homepage = "https://github.com/schell/steeloverseer#readme"; description = "A file watcher and development tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -167460,8 +164110,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "stm-extras"; - version = "0.1.0.0"; - sha256 = "ee0887d762a3d541ef74038b3f23f61b6081933da024d3309c9fa5faf0bf1a5f"; + version = "0.1.0.1"; + sha256 = "ffa81349733b1631c1bad5ce3e5d4bcd35eb76dee10e4790fa050d40cb98e9cd"; libraryHaskellDepends = [ base stm ]; homepage = "https://github.com/louispan/stm-extras#readme"; description = "Extra STM functions"; @@ -167723,8 +164373,8 @@ self: { ({ mkDerivation, base, clock, hspec, transformers }: mkDerivation { pname = "stopwatch"; - version = "0.1.0.3"; - sha256 = "0ddeaefab7989bd5fc5c5e45c769806630da7be0e699f36e4ada6e6d91c5026e"; + version = "0.1.0.4"; + sha256 = "b9f4c22f93359491c9fd20a0bd1ff9abd7e077aadfce1a213293e7e124b1b5c2"; libraryHaskellDepends = [ base clock transformers ]; testHaskellDepends = [ base clock hspec ]; homepage = "https://github.com/debug-ito/stopwatch"; @@ -167853,65 +164503,25 @@ self: { }) {}; "store" = callPackage - ({ mkDerivation, array, base, base-orphans, base64-bytestring - , bytestring, cereal, cereal-vector, conduit, containers, criterion - , cryptohash, deepseq, directory, fail, filepath, ghc-prim - , hashable, hspec, hspec-smallcheck, integer-gmp, lifted-base - , monad-control, mono-traversable, primitive, resourcet, safe - , semigroups, smallcheck, store-core, syb, template-haskell, text - , th-lift, th-lift-instances, th-orphans, th-reify-many + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bytestring, cereal, cereal-vector, conduit + , containers, contravariant, criterion, cryptohash, deepseq + , directory, filepath, free, ghc-prim, hashable, hspec + , hspec-smallcheck, integer-gmp, lifted-base, monad-control + , mono-traversable, network, primitive, resourcet, safe, semigroups + , smallcheck, store-core, streaming-commons, syb, template-haskell + , text, th-lift, th-lift-instances, th-orphans, th-reify-many , th-utilities, time, transformers, unordered-containers, vector , vector-binary-instances, void, weigh }: mkDerivation { pname = "store"; - version = "0.2.1.2"; - sha256 = "5accb9a9aa79fd5dbc315b398a926722dee424935271c9a6cb90aea84f3e1cad"; - libraryHaskellDepends = [ - array base base-orphans base64-bytestring bytestring conduit - containers cryptohash deepseq directory fail filepath ghc-prim - hashable hspec hspec-smallcheck integer-gmp lifted-base - monad-control mono-traversable primitive resourcet safe semigroups - smallcheck store-core syb template-haskell text th-lift - th-lift-instances th-orphans th-reify-many th-utilities time - transformers unordered-containers vector void - ]; - testHaskellDepends = [ - array base base-orphans base64-bytestring bytestring cereal - cereal-vector conduit containers criterion cryptohash deepseq - directory fail filepath ghc-prim hashable hspec hspec-smallcheck - integer-gmp lifted-base monad-control mono-traversable primitive - resourcet safe semigroups smallcheck store-core syb - template-haskell text th-lift th-lift-instances th-orphans - th-reify-many th-utilities time transformers unordered-containers - vector vector-binary-instances void weigh - ]; - homepage = "https://github.com/fpco/store#readme"; - description = "Fast binary serialization"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "store_0_3" = callPackage - ({ mkDerivation, array, async, base, base-orphans - , base64-bytestring, bytestring, cereal, cereal-vector, conduit - , containers, criterion, cryptohash, deepseq, directory, filepath - , free, ghc-prim, hashable, hspec, hspec-smallcheck, integer-gmp - , lifted-base, monad-control, mono-traversable, network, primitive - , resourcet, safe, semigroups, smallcheck, store-core - , streaming-commons, syb, template-haskell, text, th-lift - , th-lift-instances, th-orphans, th-reify-many, th-utilities, time - , transformers, unordered-containers, vector - , vector-binary-instances, void, weigh - }: - mkDerivation { - pname = "store"; - version = "0.3"; - sha256 = "bdefbf35d52ef36d33b57eed5f24761e33feb689ef38fba3eebcfab723491b5b"; + version = "0.3.1"; + sha256 = "ec1005ebaf7334f6e5166315f8406553c94cffa8e06bc1d60f372c0d46ceda90"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bytestring conduit - containers cryptohash deepseq directory filepath free ghc-prim - hashable hspec hspec-smallcheck integer-gmp lifted-base + containers contravariant cryptohash deepseq directory filepath free + ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base monad-control mono-traversable network primitive resourcet safe semigroups smallcheck store-core streaming-commons syb template-haskell text th-lift th-lift-instances th-orphans @@ -167920,14 +164530,14 @@ self: { ]; testHaskellDepends = [ array async base base-orphans base64-bytestring bytestring cereal - cereal-vector conduit containers criterion cryptohash deepseq - directory filepath free ghc-prim hashable hspec hspec-smallcheck - integer-gmp lifted-base monad-control mono-traversable network - primitive resourcet safe semigroups smallcheck store-core - streaming-commons syb template-haskell text th-lift - th-lift-instances th-orphans th-reify-many th-utilities time - transformers unordered-containers vector vector-binary-instances - void weigh + cereal-vector conduit containers contravariant criterion cryptohash + deepseq directory filepath free ghc-prim hashable hspec + hspec-smallcheck integer-gmp lifted-base monad-control + mono-traversable network primitive resourcet safe semigroups + smallcheck store-core streaming-commons syb template-haskell text + th-lift th-lift-instances th-orphans th-reify-many th-utilities + time transformers unordered-containers vector + vector-binary-instances void weigh ]; homepage = "https://github.com/fpco/store#readme"; description = "Fast binary serialization"; @@ -167936,22 +164546,6 @@ self: { }) {}; "store-core" = callPackage - ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text - , transformers - }: - mkDerivation { - pname = "store-core"; - version = "0.2.0.2"; - sha256 = "025f6d186f96329d1f0b76e2e2753e78852413896d19917856c096bf22e6420e"; - libraryHaskellDepends = [ - base bytestring fail ghc-prim primitive text transformers - ]; - homepage = "https://github.com/fpco/store#readme"; - description = "Fast and lightweight binary serialization"; - license = stdenv.lib.licenses.mit; - }) {}; - - "store-core_0_3" = callPackage ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text , transformers }: @@ -167965,7 +164559,6 @@ self: { homepage = "https://github.com/fpco/store#readme"; description = "Fast and lightweight binary serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "str" = callPackage @@ -167987,34 +164580,6 @@ self: { }) {}; "stratosphere" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , hlint, lens, tasty, tasty-hspec, template-haskell, text - , unordered-containers - }: - mkDerivation { - pname = "stratosphere"; - version = "0.1.6"; - sha256 = "16f6aefde00cb48105506b8f396f61d32947a36456a29a377da512d40b81aae1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring lens template-haskell text - unordered-containers - ]; - executableHaskellDepends = [ - aeson aeson-pretty base bytestring lens template-haskell text - unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring directory hlint lens tasty - tasty-hspec template-haskell text unordered-containers - ]; - homepage = "https://github.com/frontrowed/stratosphere#readme"; - description = "EDSL for AWS CloudFormation"; - license = stdenv.lib.licenses.mit; - }) {}; - - "stratosphere_0_4_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text , unordered-containers @@ -168034,7 +164599,6 @@ self: { homepage = "https://github.com/frontrowed/stratosphere#readme"; description = "EDSL for AWS CloudFormation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stratum-tool" = callPackage @@ -168208,23 +164772,6 @@ self: { }) {}; "streaming" = callPackage - ({ mkDerivation, base, exceptions, ghc-prim, mmorph, monad-control - , mtl, resourcet, time, transformers, transformers-base - }: - mkDerivation { - pname = "streaming"; - version = "0.1.4.3"; - sha256 = "c9ea0aa19a91717f0f988d0c2503e68a523b1d104facec841d0182425ec920c9"; - libraryHaskellDepends = [ - base exceptions ghc-prim mmorph monad-control mtl resourcet time - transformers transformers-base - ]; - homepage = "https://github.com/michaelt/streaming"; - description = "an elementary streaming prelude and general stream type"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "streaming_0_1_4_5" = callPackage ({ mkDerivation, base, containers, exceptions, ghc-prim, mmorph , monad-control, mtl, resourcet, time, transformers , transformers-base @@ -168240,32 +164787,9 @@ self: { homepage = "https://github.com/michaelt/streaming"; description = "an elementary streaming prelude and general stream type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-bytestring" = callPackage - ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl - , resourcet, smallcheck, streaming, tasty, tasty-smallcheck - , transformers, transformers-base - }: - mkDerivation { - pname = "streaming-bytestring"; - version = "0.1.4.5"; - sha256 = "e77047f4027ac7dc4128fdbf651c8a288dab34e580c944bd8eef23e5a236d84e"; - libraryHaskellDepends = [ - base bytestring deepseq exceptions mmorph mtl resourcet streaming - transformers transformers-base - ]; - testHaskellDepends = [ - base bytestring smallcheck streaming tasty tasty-smallcheck - transformers - ]; - homepage = "https://github.com/michaelt/streaming-bytestring"; - description = "effectful byte steams, or: bytestring io done right"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "streaming-bytestring_0_1_4_6" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl , resourcet, smallcheck, streaming, tasty, tasty-smallcheck , transformers, transformers-base @@ -168285,7 +164809,6 @@ self: { homepage = "https://github.com/michaelt/streaming-bytestring"; description = "effectful byte steams, or: bytestring io done right"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-commons" = callPackage @@ -168295,8 +164818,8 @@ self: { }: mkDerivation { pname = "streaming-commons"; - version = "0.1.16"; - sha256 = "17fdf509823e72996265de9260eaf58e33350e746dea058a36392c843ea8106e"; + version = "0.1.17"; + sha256 = "e50a38cb8b626ef2f031c195e22171ffce00e20cbe63e8c768887564a7f47da9"; libraryHaskellDepends = [ array async base blaze-builder bytestring directory network process random stm text transformers unix zlib @@ -168365,6 +164888,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streaming-postgresql-simple" = callPackage + ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq + , postgresql-simple, resourcet, safe-exceptions, streaming + , transformers + }: + mkDerivation { + pname = "streaming-postgresql-simple"; + version = "0.2.0.0"; + sha256 = "2e00588e1cf3c971972bfd009ba8976177e78b381ea8436a78d3e7127d6b5195"; + libraryHaskellDepends = [ + base bytestring exceptions postgresql-libpq postgresql-simple + resourcet safe-exceptions streaming transformers + ]; + description = "Stream postgresql-query results using the streaming library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streaming-utils" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client , http-client-tls, json-stream, mtl, network, network-simple, pipes @@ -168373,8 +164913,8 @@ self: { }: mkDerivation { pname = "streaming-utils"; - version = "0.1.4.6"; - sha256 = "fe061b466b47b227b871c40bbb55a90a9425341de32690328ce04adeb2067e51"; + version = "0.1.4.7"; + sha256 = "d75d3baaf5afa5a020a8a48830779835112047c4da1b708cfb3901ac6c068d48"; libraryHaskellDepends = [ aeson attoparsec base bytestring http-client http-client-tls json-stream mtl network network-simple pipes resourcet streaming @@ -168560,6 +165100,8 @@ self: { pname = "strict-identity"; version = "0.1.0.0"; sha256 = "218e8746098c246a5cf497e96eac6b4305495de18dc5f281598d79b54e8decbb"; + revision = "1"; + editedCabalFile = "dfbae3f135c13e0809e251df1c3f654eaa80c74d8cce3be4ca5c29f777fb6a53"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/cartazio/strict-identity"; description = "Strict Identity Monad, handy for writing fast code!"; @@ -168579,6 +165121,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "strict-writer" = callPackage + ({ mkDerivation, base, doctest, mtl }: + mkDerivation { + pname = "strict-writer"; + version = "0.4.0.0"; + sha256 = "bae1b58384f96a61eb491dc432d5fe6551fe2d5cfb0f0c3c736a819a12844caa"; + libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/oisdk/strict-writer"; + description = "A stricter writer, which uses StateT in order to avoid space leaks"; + license = stdenv.lib.licenses.mit; + }) {}; + "strictify" = callPackage ({ mkDerivation, base, directory, filepath, process, unix }: mkDerivation { @@ -168897,8 +165452,8 @@ self: { }: mkDerivation { pname = "stripe-core"; - version = "2.1.0"; - sha256 = "74d48a1db4244258b1850e2e657cb53fabe1d280638530a1f730e46538973ce5"; + version = "2.2.0"; + sha256 = "ca694e710f1670ea844e8f65ab483b9acb24e27dc26de1f8500b11d8f13af559"; libraryHaskellDepends = [ aeson base bytestring mtl text time transformers unordered-containers @@ -168912,8 +165467,8 @@ self: { ({ mkDerivation, base, stripe-core, stripe-http-streams }: mkDerivation { pname = "stripe-haskell"; - version = "2.1.0"; - sha256 = "83f88fe7c264ee30b7da8e0630f0efeee722677d745705cc2059ea9ba3d82775"; + version = "2.2.0"; + sha256 = "f69fe32fd135a802587339d5043411f030cb2e2627df739193252f3015e971a0"; libraryHaskellDepends = [ base stripe-core stripe-http-streams ]; homepage = "https://github.com/dmjio/stripe"; description = "Stripe API for Haskell"; @@ -168927,8 +165482,8 @@ self: { }: mkDerivation { pname = "stripe-http-streams"; - version = "2.1.0"; - sha256 = "053e696d1f2d671594bd0ffe70e473f54fb551bee0bdf040222e7a995174301e"; + version = "2.2.0"; + sha256 = "83b86304a51975625196dfac2db567e82e93ae437ef4fdd26204061c360ac07a"; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-streams io-streams stripe-core text @@ -168940,7 +165495,25 @@ self: { description = "Stripe API for Haskell - http-streams backend"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {stripe-tests = null;}; + }) {}; + + "stripe-tests" = callPackage + ({ mkDerivation, aeson, base, bytestring, free, hspec, hspec-core + , mtl, random, stripe-core, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "stripe-tests"; + version = "2.2.0"; + sha256 = "7a7c5771408807509ed5708ed7e9e6f7d10d8e6d39ecaf7a1fce0b61b73b4913"; + libraryHaskellDepends = [ + aeson base bytestring free hspec hspec-core mtl random stripe-core + text time transformers unordered-containers + ]; + homepage = "https://github.com/dmjio/stripe-haskell"; + description = "Tests for Stripe API bindings for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; "strips" = callPackage ({ mkDerivation, base, containers, hspec, mtl }: @@ -169056,7 +165629,7 @@ self: { homepage = "https://github.com/chrisdone/structured-haskell-mode"; description = "Structured editing Emacs mode for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "structured-mongoDB" = callPackage @@ -169173,8 +165746,8 @@ self: { }: mkDerivation { pname = "stylish-haskell"; - version = "0.6.1.0"; - sha256 = "eef85fe3940779e092c3a3ffa26c17ae6c96625a5fa606f0c816a37fce357b0d"; + version = "0.7.1.0"; + sha256 = "570a643ae6798995a43b0b357005e71c1529ed43ebafa2748fc97a236e0c01bc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169195,36 +165768,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stylish-haskell_0_6_5_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative - , strict, syb, test-framework, test-framework-hunit, yaml - }: - mkDerivation { - pname = "stylish-haskell"; - version = "0.6.5.0"; - sha256 = "aeee182f8b6a9492eedd12a45cd9a4abb677e95e1789ddd8681e699f27a5ea78"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts mtl syb yaml - ]; - executableHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts mtl optparse-applicative strict syb yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts HUnit mtl syb test-framework test-framework-hunit - yaml - ]; - homepage = "https://github.com/jaspervdj/stylish-haskell"; - description = "Haskell code prettifier"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stylized" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { @@ -169244,8 +165787,8 @@ self: { }: mkDerivation { pname = "styx"; - version = "1.1"; - sha256 = "b11402bde5b548b3f5cd2e1f501940e94c85628709aa0609e334bdf53e065144"; + version = "1.2"; + sha256 = "6b8d91a85a65e64758f3eb13c863253318b5477fc12644bb796533b8b0ed3131"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -169388,6 +165931,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "successors" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "successors"; + version = "0.1"; + sha256 = "636ec946d4622860363ff2480dcbf5148adb1d70bd044a716a068756354f6b56"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/nomeata/haskell-successors"; + description = "An applicative functor to manage successors"; + license = stdenv.lib.licenses.mit; + }) {}; + "suffix-array" = callPackage ({ mkDerivation, array, base, containers, tasty, tasty-hunit , tasty-quickcheck @@ -169771,23 +166326,6 @@ self: { }) {}; "svg-tree" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , JuicyPixels, lens, linear, mtl, scientific, text, transformers - , vector, xml - }: - mkDerivation { - pname = "svg-tree"; - version = "0.5.1.2"; - sha256 = "0c285cf21203555c7d7179e6c3924c0ba1b5e03ed42dacf596ff891317893da0"; - libraryHaskellDepends = [ - attoparsec base bytestring containers JuicyPixels lens linear mtl - scientific text transformers vector xml - ]; - description = "SVG file loader and serializer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "svg-tree_0_6" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , JuicyPixels, lens, linear, mtl, scientific, text, transformers , vector, xml @@ -169802,7 +166340,6 @@ self: { ]; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "svg2q" = callPackage @@ -169919,23 +166456,6 @@ self: { }) {}; "swagger" = callPackage - ({ mkDerivation, aeson, base, bytestring, tasty, tasty-hunit, text - , time, transformers - }: - mkDerivation { - pname = "swagger"; - version = "0.2.2"; - sha256 = "19ffcf443fd03a87258fb4b3225166315d0fd835a7539ea70d7992619329ecc2"; - libraryHaskellDepends = [ - aeson base bytestring text time transformers - ]; - testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; - description = "Implementation of swagger data model"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "swagger_0_3_0" = callPackage ({ mkDerivation, aeson, base, bytestring, tasty, tasty-hunit, text , time, transformers }: @@ -169977,7 +166497,6 @@ self: { homepage = "https://github.com/GetShopTV/swagger2"; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swapper" = callPackage @@ -170099,6 +166618,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sxml" = callPackage + ({ mkDerivation, base, containers, polyparse, text, xml-types }: + mkDerivation { + pname = "sxml"; + version = "0.1.0.0"; + sha256 = "ab37bccc87b50d14060ae65d63d0f0ee9eca73962d414f7ae1002a286dd7bd8b"; + libraryHaskellDepends = [ + base containers polyparse text xml-types + ]; + homepage = "http://blog.luigiscorner.com/"; + description = "A SXML-parser"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "syb" = callPackage ({ mkDerivation, base, containers, HUnit, mtl }: mkDerivation { @@ -171306,6 +167839,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tablize" = callPackage + ({ mkDerivation, attoparsec, base, comma, optparse-applicative + , tabl, text + }: + mkDerivation { + pname = "tablize"; + version = "1.0.0"; + sha256 = "8af235a39b9047f220e18c2987ee54c08f45e255fcfc13f8bac9ff2a744ba797"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base comma optparse-applicative tabl text + ]; + homepage = "https://github.com/lovasko/tablize"; + description = "Pretty-printing of CSV files"; + license = "unknown"; + }) {}; + "tabloid" = callPackage ({ mkDerivation, base, bytestring, containers, gtk, hint, parallel , process, regex-base, regex-posix @@ -172153,8 +168704,8 @@ self: { }: mkDerivation { pname = "tasty"; - version = "0.11.0.4"; - sha256 = "e0e248d50aaa098b2633d51a1c71f3da569ba5d6c0e77e0e39b6c9b7de97fd16"; + version = "0.11.1"; + sha256 = "ab9f83401ba8b99d05bc85e2447e32416da593684daae14647777db8bb5eabdc"; libraryHaskellDepends = [ ansi-terminal async base clock containers deepseq mtl optparse-applicative regex-tdfa stm tagged unbounded-delays @@ -172164,15 +168715,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_0_11_1" = callPackage + "tasty_0_11_2" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged , unbounded-delays }: mkDerivation { pname = "tasty"; - version = "0.11.1"; - sha256 = "ab9f83401ba8b99d05bc85e2447e32416da593684daae14647777db8bb5eabdc"; + version = "0.11.2"; + sha256 = "d26fbc4e5112af9ec3ca0a4a45d0f5edc5ae6675ffd72f922acb768062db675e"; libraryHaskellDepends = [ ansi-terminal async base clock containers deepseq mtl optparse-applicative regex-tdfa stm tagged unbounded-delays @@ -172201,6 +168752,50 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-auto" = callPackage + ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec + , tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-auto"; + version = "0.1.0.1"; + sha256 = "ec858ac5f1890af16c7a98ae866231e15ee3f46c374245bd89a9168b52a7d109"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath tasty tasty-hspec tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/minad/tasty-auto#readme"; + description = "Simple auto discovery for Tasty"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tasty-auto_0_1_0_2" = callPackage + ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec + , tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-auto"; + version = "0.1.0.2"; + sha256 = "d76076b780cce1a83b50b4602928d3756a5df72f4294e50b5f1499c5f6381a1c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath tasty tasty-hspec tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/minad/tasty-auto#readme"; + description = "Auto discovery for Tasty with support for ingredients and test tree generation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-dejafu" = callPackage ({ mkDerivation, base, dejafu, tagged, tasty }: mkDerivation { @@ -172311,10 +168906,8 @@ self: { }: mkDerivation { pname = "tasty-hspec"; - version = "1.1.3"; - sha256 = "3c597d948cad9c61355a56811533abbad130eb6e4068fd930ab5514c759bfe31"; - revision = "1"; - editedCabalFile = "01a77505da91de5d767129a556b345bf6b26265fa047a9f2b7cd8677adab1412"; + version = "1.1.3.1"; + sha256 = "8ac658b530202d84e34891a6274df1e8e08495a2e5d9d75a8e53a88d2ad85444"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck random tagged tasty tasty-quickcheck tasty-smallcheck @@ -172533,6 +169126,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-stats" = callPackage + ({ mkDerivation, base, containers, directory, process, stm, tagged + , tasty, time + }: + mkDerivation { + pname = "tasty-stats"; + version = "0.2.0.1"; + sha256 = "0957921fffb8ecc225694ab16812d329dbb3ab60c4905cd08bca6b087faa4311"; + libraryHaskellDepends = [ + base containers directory process stm tagged tasty time + ]; + homepage = "https://github.com/minad/tasty-stats#readme"; + description = "Collect statistics of your Tasty testsuite in a CSV file"; + license = stdenv.lib.licenses.mit; + }) {}; + "tasty-tap" = callPackage ({ mkDerivation, base, containers, directory, stm, tasty , tasty-golden, tasty-hunit @@ -172684,30 +169293,6 @@ self: { }) {}; "tcp-streams" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, HsOpenSSL - , HsOpenSSL-x509-system, HUnit, io-streams, network, openssl, pem - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, tls, x509, x509-store, x509-system - }: - mkDerivation { - pname = "tcp-streams"; - version = "0.4.0.0"; - sha256 = "e6ada5a4c34cb8653bd03c5db43229f8f954bc0eda60e8169b4fd1c4156a0824"; - libraryHaskellDepends = [ - base bytestring data-default-class HsOpenSSL HsOpenSSL-x509-system - io-streams network pem tls x509 x509-store x509-system - ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ - base bytestring HUnit io-streams network QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - description = "One stop solution for tcp client and server with tls support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) openssl;}; - - "tcp-streams_0_6_0_0" = callPackage ({ mkDerivation, base, bytestring, data-default-class, directory , HUnit, io-streams, network, pem, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, tls, x509 @@ -172851,8 +169436,8 @@ self: { }: mkDerivation { pname = "telegram-api"; - version = "0.5.2.0"; - sha256 = "17df43de078fb793454c13b8a1226525f8e1c189ef2162f147817f60229a8c32"; + version = "0.6.0.0"; + sha256 = "8e930edd4291c66e73ca8fcd30b642b66141a17b1c534aac092642c93311f7f2"; libraryHaskellDepends = [ aeson base bytestring http-api-data http-client http-media http-types mime-types mtl servant servant-client string-conversions @@ -173334,26 +169919,6 @@ self: { }) {}; "terminal-progress-bar" = callPackage - ({ mkDerivation, base, base-unicode-symbols, HUnit, stm, stm-chans - , test-framework, test-framework-hunit - }: - mkDerivation { - pname = "terminal-progress-bar"; - version = "0.0.1.4"; - sha256 = "a36b3a305c58def80aa01fc2df46f4c15ea411a4531dd1723784e839448cbb51"; - libraryHaskellDepends = [ - base base-unicode-symbols stm stm-chans - ]; - testHaskellDepends = [ - base base-unicode-symbols HUnit test-framework test-framework-hunit - ]; - homepage = "https://github.com/roelvandijk/terminal-progress-bar"; - description = "A simple progress bar in the terminal"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "terminal-progress-bar_0_1_1" = callPackage ({ mkDerivation, base, HUnit, stm, stm-chans, test-framework , test-framework-hunit }: @@ -173496,24 +170061,6 @@ self: { }) {}; "test-fixture" = callPackage - ({ mkDerivation, base, data-default, hspec, hspec-discover, mtl - , template-haskell, th-to-exp, transformers - }: - mkDerivation { - pname = "test-fixture"; - version = "0.4.2.0"; - sha256 = "4c07ffa83b70dd44cd5b4824629fa021e9971360e29ed05baa8708eb7954981a"; - libraryHaskellDepends = [ base data-default mtl template-haskell ]; - testHaskellDepends = [ - base hspec hspec-discover mtl template-haskell th-to-exp - transformers - ]; - homepage = "http://github.com/cjdev/test-fixture#readme"; - description = "Test monadic side-effects"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "test-fixture_0_5_0_0" = callPackage ({ mkDerivation, base, data-default, haskell-src-exts , haskell-src-meta, hspec, hspec-discover, mtl, template-haskell , th-orphans, th-to-exp, transformers @@ -173533,7 +170080,6 @@ self: { homepage = "http://github.com/cjdev/test-fixture#readme"; description = "Test monadic side-effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-framework" = callPackage @@ -174058,8 +170604,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.8.6.7"; - sha256 = "9e5fd9571a7257bdc8cfa6e0da077b16e867011a9f813065d68dd046bd358c88"; + version = "0.9.1"; + sha256 = "cafb98d25da63bdd76f75b29bf395c9e023cf46d753db9a1534e84879cb8697e"; libraryHaskellDepends = [ base containers mtl pandoc-types parsec syb xml ]; @@ -174072,28 +170618,6 @@ self: { license = "GPL"; }) {}; - "texmath_0_9" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, split, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.9"; - sha256 = "6ee9cda09fd38b27309abf50216ae2081543c0edf939f71cc3856feca24c5f2c"; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - homepage = "http://github.com/jgm/texmath"; - description = "Conversion between formats used to represent mathematics"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, temporary, test-framework @@ -174182,6 +170706,28 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "text-builder" = callPackage + ({ mkDerivation, base, base-prelude, bytestring + , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text + }: + mkDerivation { + pname = "text-builder"; + version = "0.4"; + sha256 = "0931b5988b5f86fbfe9055bb4d21fa1fceaaa8b1619aa951b53921ba2b8ce0b7"; + libraryHaskellDepends = [ + base base-prelude bytestring semigroups text + ]; + testHaskellDepends = [ + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + homepage = "https://github.com/nikita-volkov/text-builder"; + description = "An efficient strict text builder"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-conversions" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, errors, hspec, hspec-discover, text @@ -174374,13 +170920,13 @@ self: { ({ mkDerivation, base, extra, hspec, lens, text }: mkDerivation { pname = "text-lens"; - version = "0.1.0.0"; - sha256 = "e013ed9ba9385395e1eddc01c0da049f865ff020403e4af9671782b1b307cd2d"; + version = "0.1.1"; + sha256 = "d12962a6f4bea85e4661d57d7240ca4a3cce83c623999caa2296632fde1870d8"; libraryHaskellDepends = [ base extra lens text ]; testHaskellDepends = [ base hspec lens ]; homepage = "https://github.com/ChrisPenner/rasa"; description = "Lenses for operating over text"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; }) {}; "text-lips" = callPackage @@ -174454,19 +171000,6 @@ self: { }) {}; "text-metrics" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, text }: - mkDerivation { - pname = "text-metrics"; - version = "0.1.0"; - sha256 = "b7af083250d9debefa2ef85b53aeab2e90b4939705f5f14df8af5b173d679b4f"; - libraryHaskellDepends = [ base text ]; - testHaskellDepends = [ base hspec QuickCheck text ]; - homepage = "https://github.com/mrkkrp/text-metrics"; - description = "Calculate various string metrics efficiently"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-metrics_0_2_0" = callPackage ({ mkDerivation, base, hspec, QuickCheck, text }: mkDerivation { pname = "text-metrics"; @@ -174477,7 +171010,6 @@ self: { homepage = "https://github.com/mrkkrp/text-metrics"; description = "Calculate various string metrics efficiently"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-normal" = callPackage @@ -174613,37 +171145,6 @@ self: { }) {}; "text-show" = callPackage - ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors - , bytestring, bytestring-builder, containers, contravariant - , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec - , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups - , tagged, template-haskell, text, th-lift, transformers - , transformers-compat, void - }: - mkDerivation { - pname = "text-show"; - version = "3.4"; - sha256 = "ce8a7adcca87617766a4c988808ff41fee20a2c84ac5442d6f3d8c5cec55d7c7"; - libraryHaskellDepends = [ - array base base-compat bifunctors bytestring bytestring-builder - containers contravariant generic-deriving ghc-boot-th ghc-prim - integer-gmp nats semigroups tagged template-haskell text th-lift - transformers transformers-compat void - ]; - testHaskellDepends = [ - array base base-compat base-orphans bifunctors bytestring - bytestring-builder containers contravariant deriving-compat - generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats - QuickCheck quickcheck-instances semigroups tagged template-haskell - text th-lift transformers transformers-compat void - ]; - homepage = "https://github.com/RyanGlScott/text-show"; - description = "Efficient conversion of values into Text"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "text-show_3_4_1_1" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, contravariant , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec @@ -174675,40 +171176,6 @@ self: { }) {}; "text-show-instances" = callPackage - ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring - , containers, directory, generic-deriving, ghc-boot, ghc-prim - , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty - , QuickCheck, quickcheck-instances, random, semigroups, tagged - , template-haskell, terminfo, text, text-show, th-orphans, time - , transformers, transformers-compat, unix, unordered-containers - , vector, xhtml - }: - mkDerivation { - pname = "text-show-instances"; - version = "3.4"; - sha256 = "bf2e9e4a8ed01481024cce33a611daf52d733527e2ceb2ef2a576cf79ace6322"; - libraryHaskellDepends = [ - base base-compat bifunctors binary bytestring containers directory - ghc-boot haskeline hoopl hpc old-locale old-time pretty random - semigroups tagged template-haskell terminfo text text-show time - transformers transformers-compat unix unordered-containers vector - xhtml - ]; - testHaskellDepends = [ - base base-compat bifunctors binary bytestring containers directory - generic-deriving ghc-boot ghc-prim haskeline hoopl hpc hspec - old-locale old-time pretty QuickCheck quickcheck-instances random - semigroups tagged template-haskell terminfo text text-show - th-orphans time transformers transformers-compat unix - unordered-containers vector xhtml - ]; - homepage = "https://github.com/RyanGlScott/text-show-instances"; - description = "Additional instances for text-show"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "text-show-instances_3_5" = callPackage ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring , containers, directory, generic-deriving, ghc-boot-th, ghc-prim , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty @@ -174837,12 +171304,13 @@ self: { }) {}; "text-zipper" = callPackage - ({ mkDerivation, base, deepseq, text, vector }: + ({ mkDerivation, base, deepseq, hspec, QuickCheck, text, vector }: mkDerivation { pname = "text-zipper"; - version = "0.9"; - sha256 = "4601bf9bc703a85a5053f507474b8d0227c3391b4ce95ef0d22f9affa0dfd9b6"; + version = "0.10"; + sha256 = "c59a649757b4e7026c204bdebc08bcfe234f2dbcd252467a6cd8d71c0f38176e"; libraryHaskellDepends = [ base deepseq text vector ]; + testHaskellDepends = [ base hspec QuickCheck text ]; homepage = "https://github.com/jtdaugherty/text-zipper/"; description = "A text editor zipper library"; license = stdenv.lib.licenses.bsd3; @@ -175667,12 +172135,11 @@ self: { ({ mkDerivation, atomic-primops, base, containers }: mkDerivation { pname = "thread-local-storage"; - version = "0.1.0.4"; - sha256 = "3e87f35f3cabfedbd39810f33b7b167832aac008f4f458a2b2411349506b8239"; - revision = "1"; - editedCabalFile = "3bba7e8933033aa92c2767ccee383d84cc36a791773aff56d51ea95ecf12d90f"; + version = "0.1.1"; + sha256 = "11a0dfa77abf3d39e33529975aade945b0a6720143b3b134fd9460b0889845ca"; libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ atomic-primops base containers ]; + testHaskellDepends = [ atomic-primops base ]; + homepage = "https://github.com/rrnewton/thread-local-storage"; description = "Several options for thread-local-storage (TLS) in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -175810,8 +172277,8 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.7.0.0"; - sha256 = "287704d0943895b653381d2546acd3076b477d1ab4be78baaa88cbe816c7156e"; + version = "0.7.0.1"; + sha256 = "b5802dbb6c43304d613373f464d6fd16a4f219a5d289be003a28c2c46cae44c8"; libraryHaskellDepends = [ aeson async base bytestring containers data-default deepseq filepath hashable network-uri safe snap-core snap-server stm @@ -175824,21 +172291,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "threepenny-gui-contextmenu" = callPackage + ({ mkDerivation, base, threepenny-gui }: + mkDerivation { + pname = "threepenny-gui-contextmenu"; + version = "0.1.0.0"; + sha256 = "090fa5588d278aba7c46ba98ff6055512e2f04ac8dd1ee4faaebc79905d44252"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base threepenny-gui ]; + executableHaskellDepends = [ base threepenny-gui ]; + homepage = "https://github.com/barischj/threepenny-gui-contextmenu#readme"; + description = "Write simple nested context menus for threepenny-gui"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "thrift" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, containers - , ghc-prim, hashable, HTTP, network, network-uri, QuickCheck, split - , text, unordered-containers, vector + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , bytestring, containers, ghc-prim, hashable, hspec, HTTP, network + , network-uri, QuickCheck, split, text, unordered-containers + , vector }: mkDerivation { pname = "thrift"; - version = "0.9.3"; - sha256 = "dd2cfeec5f6a7142407ccc5d361afc6c45e5c50813e4246ed91137efc5cfbe9f"; - revision = "1"; - editedCabalFile = "13842801b74f89050d801a7a9b3b535b27046d3ae5bde986456aeeb46c236777"; + version = "0.10.0"; + sha256 = "6706e64419eee8579b9e9330d8c210211c87c86e02c19a3ca856db47cc8c7d07"; libraryHaskellDepends = [ - attoparsec base binary bytestring containers ghc-prim hashable HTTP - network network-uri QuickCheck split text unordered-containers - vector + attoparsec base base64-bytestring binary bytestring containers + ghc-prim hashable HTTP network network-uri QuickCheck split text + unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring hspec QuickCheck unordered-containers ]; homepage = "http://thrift.apache.org"; description = "Haskell bindings for the Apache Thrift RPC system"; @@ -175968,8 +172453,8 @@ self: { }: mkDerivation { pname = "tianbar"; - version = "1.2.4"; - sha256 = "f0b09681dcdad8ba282d8572227401008175b326998b20a1391b720a3087db00"; + version = "1.2.5"; + sha256 = "c18c29594d5ca7762246a531b7da920d98f04e4432a9f46d788a0ecaf80e83c6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176001,8 +172486,8 @@ self: { }: mkDerivation { pname = "tibetan-utils"; - version = "0.1.0.2"; - sha256 = "6afa74aaef0d2fa8ae42f840ab19100f747abc8ddef5e1ffd1186f0a0035182c"; + version = "0.1.1.0"; + sha256 = "008b976ca9b9bbd5ebe620e64bddccde31e0eed95ddcda20378cac96d3ca8115"; libraryHaskellDepends = [ base composition either megaparsec text text-show ]; @@ -176206,8 +172691,8 @@ self: { }: mkDerivation { pname = "tighttp"; - version = "0.0.0.9"; - sha256 = "8b73c5ae1f631621b3e67f9665e5b1dc886c60b16f608f3f929653c21dae1b96"; + version = "0.0.0.10"; + sha256 = "bf75164be06ef3de8c3b8bd8b915864b940ac8511ff0860fd5868553ed390160"; libraryHaskellDepends = [ base bytestring handle-like monads-tf old-locale papillon simple-pipe time @@ -176250,18 +172735,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "time_1_7_0_1" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck, test-framework - , test-framework-quickcheck2, unix + "time_1_8" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.7.0.1"; - sha256 = "2730197c3665a1e5af87475de7a57cf0dd8ddbd339167251b4a44cb3b61407ca"; + version = "1.8"; + sha256 = "38631adfbcd176a3f62fe3b14d9e03a44cc95e1971e4eeb7d46e1018e9e59aff"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ - base deepseq QuickCheck test-framework test-framework-quickcheck2 - unix + base deepseq QuickCheck tasty tasty-hunit tasty-quickcheck unix ]; homepage = "https://github.com/haskell/time"; description = "A time library"; @@ -177173,7 +173657,7 @@ self: { homepage = "https://github.com/peti/titlecase#readme"; description = "Convert English words to title case"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "tkhs" = callPackage @@ -177407,6 +173891,7 @@ self: { homepage = "https://github.com/vmchale/toboggan#readme"; description = "Twitter bot generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "todos" = callPackage @@ -178158,12 +174643,15 @@ self: { }) {}; "transformers-eff" = callPackage - ({ mkDerivation, base, free, mmorph, pipes, transformers }: + ({ mkDerivation, base, free, list-transformer, mmorph, transformers + }: mkDerivation { pname = "transformers-eff"; - version = "0.1.0.0"; - sha256 = "577f7ce07459239b1039d9f8c2935c02cc55bc585a5a4d21f5a81ac758f20037"; - libraryHaskellDepends = [ base free mmorph pipes transformers ]; + version = "0.2.0.0"; + sha256 = "16be6a4fcb355a9295b62853106c947ae690221eee140f779faee905d77e48d9"; + libraryHaskellDepends = [ + base free list-transformer mmorph transformers + ]; homepage = "https://github.com/ocharles/transformers-eff"; description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff"; license = stdenv.lib.licenses.bsd3; @@ -178406,17 +174894,6 @@ self: { }) {}; "tree-view" = callPackage - ({ mkDerivation, base, containers, mtl }: - mkDerivation { - pname = "tree-view"; - version = "0.4"; - sha256 = "f64de6b9461d125fa4755fc98b6921a7a53cb4f096f88692fe86dd68cde5fe57"; - libraryHaskellDepends = [ base containers mtl ]; - description = "Render trees as foldable HTML and Unicode art"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tree-view_0_5" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "tree-view"; @@ -178427,7 +174904,6 @@ self: { libraryHaskellDepends = [ base containers mtl ]; description = "Render trees as foldable HTML and Unicode art"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "treemap" = callPackage @@ -178436,8 +174912,8 @@ self: { }: mkDerivation { pname = "treemap"; - version = "1.20160814"; - sha256 = "95aa1f68710aaff75bbd71317f61fe6e47c4f20bdaabfb4be05514f6f841f97f"; + version = "2.0.0.20161218"; + sha256 = "709fb2c5f6da414f7c4e6ec66682dea7a63b595ab08e29ff5475273c60d4b0a3"; libraryHaskellDepends = [ base containers deepseq semigroups strict transformers ]; @@ -178592,8 +175068,8 @@ self: { }: mkDerivation { pname = "trifecta"; - version = "1.6.1"; - sha256 = "854c2892ffddfa5315206a1ff94b4814517933c496acf5b7ae09fdde72a28cf7"; + version = "1.6.2.1"; + sha256 = "bab3724de8ed4f5283deb99013debf2e223e9e2c3c975e7d9b9bd44a9b30fbe5"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html blaze-markup bytestring charset comonad containers deepseq @@ -178919,30 +175395,6 @@ self: { }) {}; "tttool" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , directory, executable-path, filepath, hashable, haskeline, HPDF - , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec - , process, random, split, spool, template-haskell, time, vector - , yaml, zlib - }: - mkDerivation { - pname = "tttool"; - version = "1.6.1.2"; - sha256 = "8f5f05c91ea4f50e43924618090f7806e0649dc83edd8c1af0e05d9032098384"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base binary bytestring containers directory executable-path - filepath hashable haskeline HPDF JuicyPixels mtl natural-sort - optparse-applicative parsec process random split spool - template-haskell time vector yaml zlib - ]; - homepage = "https://github.com/entropia/tip-toi-reveng"; - description = "Working with files for the Tiptoi® pen"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tttool_1_7_0_1" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , directory, executable-path, filepath, hashable, haskeline, HPDF , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec @@ -178964,7 +175416,6 @@ self: { homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tubes" = callPackage @@ -179219,26 +175670,6 @@ self: { }) {}; "turtle" = callPackage - ({ mkDerivation, async, base, clock, directory, doctest, foldl - , hostname, managed, optional-args, optparse-applicative, process - , stm, system-fileio, system-filepath, temporary, text, time - , transformers, unix - }: - mkDerivation { - pname = "turtle"; - version = "1.2.8"; - sha256 = "798e4047773877323eb35e610e709db70880d2913ff652ff676a97902a6fbb01"; - libraryHaskellDepends = [ - async base clock directory foldl hostname managed optional-args - optparse-applicative process stm system-fileio system-filepath - temporary text time transformers unix - ]; - testHaskellDepends = [ base doctest ]; - description = "Shell programming, Haskell-style"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "turtle_1_3_1" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , directory, doctest, foldl, hostname, managed, optional-args , optparse-applicative, process, stm, system-fileio @@ -179258,7 +175689,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "turtle-options" = callPackage @@ -180252,8 +176682,8 @@ self: { }: mkDerivation { pname = "type-natural"; - version = "0.7.1.2"; - sha256 = "c278c2660616179e61641d1d5356549946560ef2de66416b20d868f5fe1082e6"; + version = "0.7.1.3"; + sha256 = "56d3962fb5c7a9e858f75603e1dc8d73c8a8adea65a0097bdf5ef033b0529ee2"; libraryHaskellDepends = [ base constraints equational-reasoning ghc-typelits-natnormalise ghc-typelits-presburger monomorphic singletons template-haskell @@ -180336,19 +176766,6 @@ self: { }) {}; "type-spec" = callPackage - ({ mkDerivation, base, pretty, show-type }: - mkDerivation { - pname = "type-spec"; - version = "0.2.0.0"; - sha256 = "8203f98c53d9d533da9e20e6e3c74ed5d144fad2ee21f58d8b3addd78cd172fa"; - libraryHaskellDepends = [ base pretty show-type ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/sheyll/type-spec#readme"; - description = "Type Level Specification by Example"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "type-spec_0_3_0_1" = callPackage ({ mkDerivation, base, pretty }: mkDerivation { pname = "type-spec"; @@ -180359,7 +176776,6 @@ self: { homepage = "https://github.com/sheyll/type-spec#readme"; description = "Type Level Specification by Example"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-spine" = callPackage @@ -180754,8 +177170,8 @@ self: { }: mkDerivation { pname = "tz"; - version = "0.1.2.0"; - sha256 = "b501251a446d4fe544617eaa41e2442f283f8843dd57d52820d88a9e2ce04d70"; + version = "0.1.2.1"; + sha256 = "d187f59e0c1bb452a70cf734de09e0beefb86a6bcbb48f36fc5b32f11727c492"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -180777,8 +177193,8 @@ self: { }: mkDerivation { pname = "tzdata"; - version = "0.1.20160614.0"; - sha256 = "fb9b13398b66f05d863082f7c811fdd26d77e3a39a254abe8ea337a88a6fa27d"; + version = "0.1.20161123.0"; + sha256 = "cb99701d6b3ef7a286a9b15dd4fa3ed023917afeaebf4e90be7d9934464dccb6"; libraryHaskellDepends = [ base bytestring containers deepseq vector ]; @@ -181326,37 +177742,21 @@ self: { }) {}; "unfoldable" = callPackage - ({ mkDerivation, base, ghc-prim, QuickCheck, random, transformers + ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck + , random, transformers }: mkDerivation { pname = "unfoldable"; - version = "0.8.4"; - sha256 = "af86e863625d4ae45820d1942a49de00559e4d4ee25db20610859d0a19cc1683"; - libraryHaskellDepends = [ - base ghc-prim QuickCheck random transformers - ]; - homepage = "https://github.com/sjoerdvisscher/unfoldable"; - description = "Class of data structures that can be unfolded"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unfoldable_0_9_1" = callPackage - ({ mkDerivation, base, containers, ghc-prim, QuickCheck, random - , transformers - }: - mkDerivation { - pname = "unfoldable"; - version = "0.9.1"; - sha256 = "08e2565142d11f21242d631dfd78ad02da93fd6fa3e75af0df4c1024123db236"; + version = "0.9.2"; + sha256 = "9592ec5b6d021fe5c93bc2a047e4f9dddb4bc688bae546fb357e8cd4071b0e04"; revision = "1"; - editedCabalFile = "6b047ce80f7c2eab1edef56df078b25bd86bcb496f1c8f9962758a229324ef7c"; + editedCabalFile = "21e9b1499fe1d0232359616b81cb8cb4b7e4efdbca5550d5643118edb45be94d"; libraryHaskellDepends = [ - base containers ghc-prim QuickCheck random transformers + base containers ghc-prim one-liner QuickCheck random transformers ]; homepage = "https://github.com/sjoerdvisscher/unfoldable"; description = "Class of data structures that can be unfolded"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unfoldable-restricted" = callPackage @@ -181590,28 +177990,30 @@ self: { }) {}; "unicode-transforms" = callPackage - ({ mkDerivation, base, bytestring, split, text }: - mkDerivation { - pname = "unicode-transforms"; - version = "0.1.0.1"; - sha256 = "5fe607ec91e1cf25db1842e7409d4ed0e1bb6829409e846e010db25b2c75cb0b"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ base split text ]; - homepage = "http://github.com/harendra-kumar/unicode-transforms"; - description = "Unicode transforms (normalization NFC/NFD/NFKC/NFKD)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unicode-transforms_0_2_0" = callPackage ({ mkDerivation, base, bitarray, bytestring, deepseq , getopt-generics, QuickCheck, split, text }: mkDerivation { pname = "unicode-transforms"; - version = "0.2.0"; - sha256 = "3b27ca1ae8f0a906fbbefe1de819a80a01933610a4657ef6383db2590fdecb0e"; - revision = "1"; - editedCabalFile = "33480d6bb76758c9016397d10769d6ebf2db4004391961ad6dff05610a67d380"; + version = "0.2.1"; + sha256 = "1d8baa0de3c58685aa1e476961f7f3765395ba257d79258c66e86b06a87f3abc"; + libraryHaskellDepends = [ base bitarray bytestring text ]; + testHaskellDepends = [ + base deepseq getopt-generics QuickCheck split text + ]; + homepage = "http://github.com/harendra-kumar/unicode-transforms"; + description = "Unicode normalization"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "unicode-transforms_0_3_0" = callPackage + ({ mkDerivation, base, bitarray, bytestring, deepseq + , getopt-generics, QuickCheck, split, text + }: + mkDerivation { + pname = "unicode-transforms"; + version = "0.3.0"; + sha256 = "2dc25ead8d19598f6833a490ef1b1f29b9c1f987c8224fd99be6820535aa5245"; libraryHaskellDepends = [ base bitarray bytestring text ]; testHaskellDepends = [ base deepseq getopt-generics QuickCheck split text @@ -181763,6 +178165,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uniq-deep" = callPackage + ({ mkDerivation, base, bytestring, containers }: + mkDerivation { + pname = "uniq-deep"; + version = "1.1.0.0"; + sha256 = "f8953f91cbf90c5073ca90d4e9235dbe0a399ff811709d051b037a8a7db0d38e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base bytestring containers ]; + homepage = "https://github.com/ncaq/uniq-deep"; + description = "uniq-deep"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "unique" = callPackage ({ mkDerivation, base, ghc-prim, hashable }: mkDerivation { @@ -181935,6 +178351,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unitym" = callPackage + ({ mkDerivation, base, text, transformers }: + mkDerivation { + pname = "unitym"; + version = "0.1.0.2"; + sha256 = "5a22f2e26ba053af73d9c92d37fa41bae147f59ac49a4c412fb725e5c5d93b9b"; + libraryHaskellDepends = [ base text transformers ]; + homepage = "https://github.com/bhurt/unitym#readme"; + description = "A monad type class shared between web services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "unitym-servant" = callPackage + ({ mkDerivation, base, mtl, servant-server, text, transformers + , unitym + }: + mkDerivation { + pname = "unitym-servant"; + version = "0.1.0.0"; + sha256 = "3394f5c1568116c3ad3283cece89e2c2ece74b93c3a644e4b2ba481ceeb0acf0"; + libraryHaskellDepends = [ + base mtl servant-server text transformers unitym + ]; + homepage = "https://github.com/bhurt/unitym#readme"; + description = "Implementaation of unitym for Servant servers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "unitym-yesod" = callPackage + ({ mkDerivation, base, unitym, yesod }: + mkDerivation { + pname = "unitym-yesod"; + version = "0.1.0.2"; + sha256 = "dc0fef13cc5142c8bf9df62916f3284ab34dcc1dcca56efc9f05fbc1398ee0e1"; + libraryHaskellDepends = [ base unitym yesod ]; + homepage = "https://github.com/bhurt/unitym#readme"; + description = "Implementation of the unity monad for the Yesod framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "universal-binary" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -182070,8 +178526,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "0.2"; - sha256 = "e913282eb9952229d109544c1f4541d8fce503d6ab77e38dc50330423d91e665"; + version = "0.2.1"; + sha256 = "e5f8c58824cbf559fb3632ff5a00190870e254262a0f4db9dfde7bc2bc423d21"; libraryHaskellDepends = [ async base bytestring containers deepseq exceptions ghc-prim hashable microlens microlens-mtl mtl safe stm text text-format @@ -182580,6 +179036,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "update-repos" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , monad-parallel, process, QuickCheck, split, text + }: + mkDerivation { + pname = "update-repos"; + version = "0.0.1"; + sha256 = "5bdba9fecbeb9aee916fdb38a6c8586d9a389544700c50515e243ad51a7ab47b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory filepath monad-parallel process split + text + ]; + executableHaskellDepends = [ + base directory filepath monad-parallel split + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/pedrovgs/update-repos"; + description = "Update all your git repositories with just one command"; + license = stdenv.lib.licenses.asl20; + }) {}; + "uploadcare" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cryptohash , hex, http-conduit, http-types, old-locale, time @@ -183798,29 +180277,14 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "validity"; - version = "0.3.0.4"; - sha256 = "9ae590d34aeb41f096bd7432ff8c8cb07a4da010825c0190d4ef630ef6370f7f"; - revision = "1"; - editedCabalFile = "73bff6370f4e90101291fb3904f388ea57013a6a45997b273b578332149a8d19"; + version = "0.3.2.0"; + sha256 = "e6ac32bfc76284be81817098be5192d91aac84ff9985b26ecd41a0cded54729e"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity typeclass"; license = stdenv.lib.licenses.mit; }) {}; - "validity_0_3_1_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "validity"; - version = "0.3.1.1"; - sha256 = "c5ba39b30af35e275467bf016d9df71f3368abaaeb0d47c0cbbdbf78de627b0c"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/NorfairKing/validity#readme"; - description = "Validity typeclass"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "validity-bytestring" = callPackage ({ mkDerivation, base, bytestring, validity }: mkDerivation { @@ -183861,14 +180325,26 @@ self: { ({ mkDerivation, base, text, validity }: mkDerivation { pname = "validity-text"; - version = "0.1.0.1"; - sha256 = "ab92980b7e900db8cf8e11cf986a5a952d2306cbb4735e8bc810acf8ca5e2189"; + version = "0.1.1.0"; + sha256 = "43cf2ce6b53a406901cae0ac01d1e46a70e2c7eddac129e35f242bbb82bf7a02"; libraryHaskellDepends = [ base text validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for text"; license = stdenv.lib.licenses.mit; }) {}; + "validity-time" = callPackage + ({ mkDerivation, base, time, validity }: + mkDerivation { + pname = "validity-time"; + version = "0.0.0.0"; + sha256 = "4c061a1c238c846e2e6e9838355c9a340ffc6080fb9185b18fb3c8667178af3d"; + libraryHaskellDepends = [ base time validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for time"; + license = stdenv.lib.licenses.mit; + }) {}; + "value-supply" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -183972,22 +180448,6 @@ self: { }) {}; "varying" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, time, transformers }: - mkDerivation { - pname = "varying"; - version = "0.5.0.3"; - sha256 = "a1eff74bb76c4a6b6af64f4490621f3c8a24deec7d44032dfb90e02fc2c73039"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base transformers ]; - executableHaskellDepends = [ base time transformers ]; - testHaskellDepends = [ base hspec QuickCheck time transformers ]; - homepage = "https://github.com/schell/varying"; - description = "FRP through value streams and monadic splines"; - license = stdenv.lib.licenses.mit; - }) {}; - - "varying_0_7_0_3" = callPackage ({ mkDerivation, base, hspec, QuickCheck, time, transformers }: mkDerivation { pname = "varying"; @@ -184001,7 +180461,6 @@ self: { homepage = "https://github.com/schell/varying"; description = "FRP through value streams and monadic splines"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vault" = callPackage @@ -184184,8 +180643,8 @@ self: { }: mkDerivation { pname = "vcsgui"; - version = "0.2.1.1"; - sha256 = "76fa0af1c68195097059ea05e3bf7337dd94590d5f6d10109b33a2def474176b"; + version = "0.2.1.2"; + sha256 = "e58fc0156b8badcb5ee74c81e2c75a1f3e4a047d3154f356ba833e1cb58dc5e1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184517,22 +180976,6 @@ self: { }) {}; "vector-instances" = callPackage - ({ mkDerivation, base, comonad, keys, pointed, semigroupoids - , semigroups, vector - }: - mkDerivation { - pname = "vector-instances"; - version = "3.3.1"; - sha256 = "68c7f154fe4ad53e29433e150c8718b0e74b4cf4c45a79af89940fff83868c59"; - libraryHaskellDepends = [ - base comonad keys pointed semigroupoids semigroups vector - ]; - homepage = "http://github.com/ekmett/vector-instances"; - description = "Orphan Instances for 'Data.Vector'"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-instances_3_4" = callPackage ({ mkDerivation, base, comonad, hashable, keys, pointed , semigroupoids, semigroups, vector }: @@ -184546,7 +180989,6 @@ self: { homepage = "http://github.com/ekmett/vector-instances"; description = "Orphan Instances for 'Data.Vector'"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-instances-collections" = callPackage @@ -184608,8 +181050,8 @@ self: { ({ mkDerivation, base, deepseq, finite-typelits, vector }: mkDerivation { pname = "vector-sized"; - version = "0.5.0.0"; - sha256 = "55bb88f7201571b19b55f7ac1d1b2a880ad77b9178593bac84cad58c2dbce22b"; + version = "0.5.1.0"; + sha256 = "2116bd082413e6b3ceb2290ac7d3aa2affcbfc76c7bebe22fbbf58e562369ae5"; libraryHaskellDepends = [ base deepseq finite-typelits vector ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; @@ -184675,15 +181117,15 @@ self: { }: mkDerivation { pname = "vector-split"; - version = "1.0.0.0"; - sha256 = "fda8504ecf87abddaec1fee84d746ed6925e5076ea8f02bcea296a78821b2bdc"; + version = "1.0.0.2"; + sha256 = "b4aeeea50fec52e594b2d3c05aca3a112b2095d1e5238ced065cecf2d89bbd16"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base QuickCheck split tasty tasty-quickcheck vector ]; - homepage = "https://github.com/fhaust/vector-split#readme"; - description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/fhaust/vector-split"; + description = "Combinator library for splitting vectors"; + license = stdenv.lib.licenses.mit; }) {}; "vector-static" = callPackage @@ -184907,8 +181349,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0"; - sha256 = "6e518c06c289d01e82a8c7a360e0467ffba419781d4f394c7b8c608bc9303445"; + version = "0.0.0.1"; + sha256 = "2e899ac1bab582314e18bb89f95c2623c11bb15dae5c2cce48652251f8bcf7be"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -184919,6 +181361,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "viewprof_0_0_0_2" = callPackage + ({ mkDerivation, base, brick, containers, ghc-prof, lens + , scientific, text, vector, vector-algorithms, vty + }: + mkDerivation { + pname = "viewprof"; + version = "0.0.0.2"; + sha256 = "52962f9eca6970001b703fdb4948d375d3bf5521e803ac98ad7a60eb1d25bffb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick containers ghc-prof lens scientific text vector + vector-algorithms vty + ]; + homepage = "https://github.com/maoe/viewprof"; + description = "Text-based interactive GHC .prof viewer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "views" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -185440,77 +181902,39 @@ self: { "vty" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers - , data-default, deepseq, directory, filepath, hashable, HUnit - , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec - , QuickCheck, quickcheck-assertions, random, smallcheck, stm - , string-qq, terminfo, test-framework, test-framework-hunit + , deepseq, directory, filepath, hashable, HUnit, microlens + , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck + , quickcheck-assertions, random, smallcheck, stm, string-qq + , terminfo, test-framework, test-framework-hunit , test-framework-smallcheck, text, transformers, unix, utf8-string , vector }: mkDerivation { pname = "vty"; - version = "5.11.3"; - sha256 = "0ee3fc39e8e5219b551bfc26ee38e9342e38b028480dacc2e6ac87fab5380232"; + version = "5.15"; + sha256 = "03bf0fa5132c271248e0f721ad9fb3f5003dc93cff99776fcc7cb7920a85d7f7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-builder bytestring containers data-default deepseq - directory filepath hashable microlens microlens-mtl microlens-th - mtl parallel parsec stm terminfo text transformers unix utf8-string - vector + base blaze-builder bytestring containers deepseq directory filepath + hashable microlens microlens-mtl microlens-th mtl parallel parsec + stm terminfo text transformers unix utf8-string vector ]; executableHaskellDepends = [ - base containers data-default microlens microlens-mtl mtl + base containers microlens microlens-mtl mtl ]; testHaskellDepends = [ - base blaze-builder bytestring Cabal containers data-default deepseq - HUnit microlens microlens-mtl mtl QuickCheck quickcheck-assertions - random smallcheck stm string-qq terminfo test-framework + base blaze-builder bytestring Cabal containers deepseq HUnit + microlens microlens-mtl mtl QuickCheck quickcheck-assertions random + smallcheck stm string-qq terminfo test-framework test-framework-hunit test-framework-smallcheck text unix utf8-string vector ]; - homepage = "https://github.com/coreyoconnor/vty"; + homepage = "https://github.com/jtdaugherty/vty"; description = "A simple terminal UI library"; license = stdenv.lib.licenses.bsd3; }) {}; - "vty_5_14" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers - , data-default, deepseq, directory, filepath, hashable, HUnit - , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec - , QuickCheck, quickcheck-assertions, random, smallcheck, stm - , string-qq, terminfo, test-framework, test-framework-hunit - , test-framework-smallcheck, text, transformers, unix, utf8-string - , vector - }: - mkDerivation { - pname = "vty"; - version = "5.14"; - sha256 = "6f96be6c79c55850f09589b940bfebcc774adddf8a8258af2235320893c53912"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring containers data-default deepseq - directory filepath hashable microlens microlens-mtl microlens-th - mtl parallel parsec stm terminfo text transformers unix utf8-string - vector - ]; - executableHaskellDepends = [ - base containers data-default microlens microlens-mtl mtl - ]; - testHaskellDepends = [ - base blaze-builder bytestring Cabal containers data-default deepseq - HUnit microlens microlens-mtl mtl QuickCheck quickcheck-assertions - random smallcheck stm string-qq terminfo test-framework - test-framework-hunit test-framework-smallcheck text unix - utf8-string vector - ]; - homepage = "https://github.com/coreyoconnor/vty"; - description = "A simple terminal UI library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -185769,6 +182193,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-cli" = callPackage + ({ mkDerivation, ansi-terminal, base, http-types, monads-tf + , network, options, socket-activation, stm, streaming-commons, unix + , wai, wai-extra, warp, warp-tls + }: + mkDerivation { + pname = "wai-cli"; + version = "0.1.0"; + sha256 = "220d8b3eb52e7b045844be37682f09823a9730115f33ea718717896f74673007"; + libraryHaskellDepends = [ + ansi-terminal base http-types monads-tf network options + socket-activation stm streaming-commons unix wai wai-extra warp + warp-tls + ]; + homepage = "https://github.com/myfreeweb/wai-cli"; + description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "wai-conduit" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, conduit , http-types, transformers, wai @@ -185885,35 +182328,6 @@ self: { }) {}; "wai-extra" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, fast-logger, hspec - , http-types, HUnit, iproute, lifted-base, network, old-locale - , resourcet, streaming-commons, stringsearch, text, time - , transformers, unix, unix-compat, vault, void, wai, wai-logger - , word8, zlib - }: - mkDerivation { - pname = "wai-extra"; - version = "3.0.19"; - sha256 = "8002890c4aa4fc564a142982bc37f29c35caa76231697eb51c519a698482e3bf"; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie data-default-class deepseq - directory fast-logger http-types iproute lifted-base network - old-locale resourcet streaming-commons stringsearch text time - transformers unix unix-compat vault void wai wai-logger word8 zlib - ]; - testHaskellDepends = [ - base blaze-builder bytestring case-insensitive cookie fast-logger - hspec http-types HUnit resourcet text time transformers wai zlib - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "Provides some basic WAI handlers and middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-extra_3_0_19_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec @@ -185940,7 +182354,6 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-frontend-monadcgi" = callPackage @@ -186013,8 +182426,8 @@ self: { }: mkDerivation { pname = "wai-handler-launch"; - version = "3.0.2.1"; - sha256 = "84a466837e6df61be9ae03f8c0241bee374a0493f24f4bdc2a1e5f38ab705864"; + version = "3.0.2.2"; + sha256 = "9c94c4da533ebcbbd28cf3dfbeb44a5e953dbf73b53cab0179f16931fa102908"; libraryHaskellDepends = [ async base blaze-builder bytestring http-types process streaming-commons transformers wai warp @@ -186357,36 +182770,6 @@ self: { }) {}; "wai-middleware-content-type" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring - , clay, exceptions, hashable, hspec, hspec-wai, http-media - , http-types, lucid, mmorph, monad-control, monad-logger, mtl - , pandoc, pandoc-types, resourcet, shakespeare, tasty, tasty-hspec - , text, transformers, transformers-base, unordered-containers - , urlpath, wai, wai-transformers, warp - }: - mkDerivation { - pname = "wai-middleware-content-type"; - version = "0.4.1"; - sha256 = "99dcd8ae5da77650d31a1cd91d43d93c1a18687cd8947a3ea32cb1424229743e"; - libraryHaskellDepends = [ - aeson base blaze-builder blaze-html bytestring clay exceptions - hashable http-media http-types lucid mmorph monad-control - monad-logger mtl pandoc resourcet shakespeare text transformers - transformers-base unordered-containers urlpath wai wai-transformers - ]; - testHaskellDepends = [ - aeson base blaze-builder blaze-html bytestring clay exceptions - hashable hspec hspec-wai http-media http-types lucid mmorph - monad-control monad-logger mtl pandoc pandoc-types resourcet - shakespeare tasty tasty-hspec text transformers transformers-base - unordered-containers urlpath wai wai-transformers warp - ]; - description = "Route to different middlewares based on the incoming Accept header"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "wai-middleware-content-type_0_5_0_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring , clay, exceptions, hashable, hspec, hspec-wai, http-media , http-types, lucid, mmorph, monad-control, monad-logger, mtl @@ -186789,8 +183172,8 @@ self: { }: mkDerivation { pname = "wai-routes"; - version = "0.9.9"; - sha256 = "dea8b6b8163fe04bf0ffb9f5a81058eef2017591275735aba7ae448edf689cc9"; + version = "0.9.10"; + sha256 = "e872338221f64c5c1ac3e4421b2b31e3b32116b1eac0fba3f6adc73d3e255672"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive containers cookie data-default-class filepath http-types mime-types @@ -187169,8 +183552,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.2.9"; - sha256 = "e2789a51b302dde7ab4145b5a0be745e1bdaae108761f9664718fbccbd55ebca"; + version = "3.2.11"; + sha256 = "193e6cd899c09850819c09ae4a4368f569ee65559eef3f440be83b6c2b2cffac"; libraryHaskellDepends = [ array async auto-update base blaze-builder bytestring bytestring-builder case-insensitive containers ghc-prim hashable @@ -187236,8 +183619,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.2.2"; - sha256 = "9fc2a031ed5fd17c63479743869ed03fdf80f707a9ecfe4ff02939f4f7df091b"; + version = "3.2.3"; + sha256 = "f5c4c871fee62021a7b3b22d1f2af3543843a0c54632da6f7be9ef58e65fa292"; libraryHaskellDepends = [ base bytestring cryptonite data-default-class network streaming-commons tls wai warp @@ -187373,6 +183756,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wavefront_0_7_0_3" = callPackage + ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text + , transformers, vector + }: + mkDerivation { + pname = "wavefront"; + version = "0.7.0.3"; + sha256 = "7e6ee21fa04410c4c01f0b86fa0acdc3d4d64d3167614e2cb58ce7528bbd0d65"; + libraryHaskellDepends = [ + attoparsec base dlist filepath mtl text transformers vector + ]; + homepage = "https://github.com/phaazon/wavefront"; + description = "Wavefront OBJ loader"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wavefront-obj" = callPackage ({ mkDerivation, attoparsec, base, containers, hspec, linear, text , transformers @@ -187381,6 +183781,8 @@ self: { pname = "wavefront-obj"; version = "0.1.0.1"; sha256 = "f73744ebc9dd035686f089c368434bf6940bd0c9928258aa00b7258677c0e258"; + revision = "1"; + editedCabalFile = "cc24c326de34450af4b05b7955448c43eac411d657cf52c37014031ce2ba6388"; libraryHaskellDepends = [ attoparsec base containers linear text transformers ]; @@ -187708,8 +184110,8 @@ self: { }: mkDerivation { pname = "web-routes-th"; - version = "0.22.6"; - sha256 = "e67472973238f1a6ed31c909e1021311da00a47f9d1c4dd0279bd1fca43eb9fb"; + version = "0.22.6.1"; + sha256 = "249b47bbe00922a69533254dd07fa105e2e90d63676f273215fc9100cdaa21d2"; libraryHaskellDepends = [ base parsec split template-haskell text web-routes ]; @@ -187773,8 +184175,8 @@ self: { }: mkDerivation { pname = "web3"; - version = "0.5.2.1"; - sha256 = "816e5e766e16b3c6aee00eb70a6e967582a782ddca557533afca68a01a8bd2b9"; + version = "0.5.3.0"; + sha256 = "258d2344367d7ceb3c1a43acd99b05bb23afbc5c5476be4d341e3ca2f56ae91d"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptonite http-client http-client-tls memory template-haskell text @@ -188190,32 +184592,6 @@ self: { }) {}; "websockets" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , blaze-builder, bytestring, case-insensitive, containers, entropy - , HUnit, network, QuickCheck, random, SHA, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "websockets"; - version = "0.9.8.2"; - sha256 = "09ec17dfbf9f07da27575ce7853b0c80d87ad959c2b271f27be4c4e54615eca2"; - libraryHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy network random SHA text - ]; - testHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy HUnit network QuickCheck random - SHA test-framework test-framework-hunit test-framework-quickcheck2 - text - ]; - doCheck = false; - homepage = "http://jaspervdj.be/websockets"; - description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets_0_10_0_0" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, containers, entropy , HUnit, network, QuickCheck, random, SHA, test-framework @@ -188239,7 +184615,6 @@ self: { homepage = "http://jaspervdj.be/websockets"; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets-snap" = callPackage @@ -188329,6 +184704,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "weighted" = callPackage + ({ mkDerivation, base, mtl, semiring-num, transformers }: + mkDerivation { + pname = "weighted"; + version = "0.3.0.1"; + sha256 = "1a5d93717a03e573fcc3a691206954b5b4d59e46b42b580e1d92e7048ae13ff6"; + libraryHaskellDepends = [ base mtl semiring-num transformers ]; + homepage = "https://github.com/oisdk/weighted"; + description = "Writer monad which uses semiring constraint"; + license = stdenv.lib.licenses.mit; + }) {}; + "weighted-regexp" = callPackage ({ mkDerivation, array, base, happy }: mkDerivation { @@ -188569,6 +184956,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wide-word" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hspec + , QuickCheck + }: + mkDerivation { + pname = "wide-word"; + version = "0.1.0.2"; + sha256 = "c5fa2df76b8391b34f5671c6280bedecd56ee6600db260bd4942bc91cacb41fb"; + libraryHaskellDepends = [ base deepseq ghc-prim ]; + testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ]; + homepage = "https://github.com/erikd/wide-word"; + description = "Data types for large but fixed width signed and unsigned integers"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wigner-symbols" = callPackage ({ mkDerivation, base, bytestring, cryptonite }: mkDerivation { @@ -188584,14 +184987,14 @@ self: { "wikicfp-scraper" = callPackage ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec - , scalpel, text, time + , scalpel-core, text, time }: mkDerivation { pname = "wikicfp-scraper"; - version = "0.1.0.6"; - sha256 = "8da3d67ee089342a9057e08b350896f278d404466e771757412ddcf1117270eb"; + version = "0.1.0.8"; + sha256 = "645077540aadceb4de7b095462baa99967dd279203d7ed66a052562ac83b94a3"; libraryHaskellDepends = [ - attoparsec base bytestring scalpel text time + attoparsec base bytestring scalpel-core text time ]; testHaskellDepends = [ base bytestring filepath hspec time ]; homepage = "https://github.com/debug-ito/wikicfp-scraper"; @@ -188626,8 +185029,8 @@ self: { }: mkDerivation { pname = "wild-bind"; - version = "0.1.0.2"; - sha256 = "472a0bec3129e8b0ea60170e0535e602030e1d68c39bfd405c71b246c5211522"; + version = "0.1.0.3"; + sha256 = "f2f5764b9b33aee30d87646a849e6db063fde2b92c8bce0e08ebb94b6b9f737f"; libraryHaskellDepends = [ base containers text transformers ]; testHaskellDepends = [ base hspec microlens QuickCheck stm transformers @@ -188676,8 +185079,8 @@ self: { }: mkDerivation { pname = "wild-bind-x11"; - version = "0.1.0.4"; - sha256 = "62b6ca3f4b6fdc19dae22126ff831b2633bf2d5e24c0c5bedc2757ea9a59e45a"; + version = "0.1.0.6"; + sha256 = "1e144b2833acee00da55cab3b28b57bc5347186f761cb1d7375532cfca38e4b4"; libraryHaskellDepends = [ base containers fold-debounce stm text transformers wild-bind X11 ]; @@ -188804,21 +185207,20 @@ self: { }) {}; "wiringPi" = callPackage - ({ mkDerivation, base, wiringPi }: + ({ mkDerivation, base }: mkDerivation { pname = "wiringPi"; - version = "0.1.0.0"; - sha256 = "b38a690d3c0e05c892a04f212dcf729f784fb6f05e4ecff2933cd969da04b23f"; + version = "1.0"; + sha256 = "78449f9f48bab82bf8e268e0b858171e7539d7b9a61dd92c75a9ea7c1a7523d0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; - librarySystemDepends = [ wiringPi ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/ppelleti/hs-wiringPi"; description = "Access GPIO pins on Raspberry Pi via wiringPi library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {wiringPi = null;}; + }) {}; "with-location" = callPackage ({ mkDerivation, base, hspec }: @@ -188947,8 +185349,8 @@ self: { }: mkDerivation { pname = "wl-pprint-annotated"; - version = "0.0.1.3"; - sha256 = "f59627ca7e26bafee3954a0ce807243e93f38b229e7ecbb335d0e1fc32decae1"; + version = "0.0.1.4"; + sha256 = "0919c897b894771dd86877c41d6832bc11e4d3800efbebbcf59c10ce7ba848b0"; libraryHaskellDepends = [ base containers deepseq text ]; testHaskellDepends = [ base containers deepseq HUnit test-framework test-framework-hunit @@ -188978,17 +185380,15 @@ self: { }) {}; "wl-pprint-console" = callPackage - ({ mkDerivation, base, console-style, mtl, text + ({ mkDerivation, base, bytestring, colorful-monoids, text , wl-pprint-annotated }: mkDerivation { pname = "wl-pprint-console"; - version = "0.0.1.2"; - sha256 = "dbef55503890a3d60c318084f2e857feba4529d458a17629f4ad00f13084ab3a"; - revision = "2"; - editedCabalFile = "560613daa268b1755476619a69dc7d343a52513b6bf2789ba25523afe9708917"; + version = "0.1.0.1"; + sha256 = "a7c7f6aa14f78bf6a8aae1a629433872f8bfb377b1392f08047520cdcb3b70fc"; libraryHaskellDepends = [ - base console-style mtl text wl-pprint-annotated + base bytestring colorful-monoids text wl-pprint-annotated ]; homepage = "https://github.com/minad/wl-pprint-console#readme"; description = "Wadler/Leijen pretty printer supporting colorful console output"; @@ -189033,12 +185433,12 @@ self: { }) {}; "wl-pprint-text" = callPackage - ({ mkDerivation, base, text }: + ({ mkDerivation, base, base-compat, text }: mkDerivation { pname = "wl-pprint-text"; - version = "1.1.0.4"; - sha256 = "ff2d53814b7c66624a2ef3d8f79034273de5b7addb29c1ebad277057e3fff1f5"; - libraryHaskellDepends = [ base text ]; + version = "1.1.1.0"; + sha256 = "2960c8201c05d912a1df748a3ceeadc7525905ff1c371d7b4972f4011eca0acd"; + libraryHaskellDepends = [ base base-compat text ]; description = "A Wadler/Leijen Pretty Printer for Text values"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -189506,10 +185906,8 @@ self: { }: mkDerivation { pname = "wreq"; - version = "0.4.1.0"; - sha256 = "3b8409e2fb7670d7060fdaa780008eeecb08e9b65bdab9d9690d8d26e5cb8e6d"; - revision = "1"; - editedCabalFile = "415dee42256dec3b5dae7c18bd9bf610ebe55c053d371c8afb994c9525fafa36"; + version = "0.5.0.0"; + sha256 = "15e5787791148991d6055ad1269b9d9cb22db04e16b0bd1d266e2f00cec1f4d5"; libraryHaskellDepends = [ aeson attoparsec authenticate-oauth base base16-bytestring byteable bytestring case-insensitive containers cryptohash exceptions @@ -189523,7 +185921,7 @@ self: { http-client http-types HUnit lens lens-aeson network-info QuickCheck snap-core snap-server temporary test-framework test-framework-hunit test-framework-quickcheck2 text time - transformers unix-compat uuid vector + transformers unix-compat unordered-containers uuid vector ]; homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; @@ -189570,8 +185968,8 @@ self: { ({ mkDerivation, base, bytestring, text, utf8-string, wreq }: mkDerivation { pname = "wreq-stringless"; - version = "0.4.1.0"; - sha256 = "f2d80a50007a7f9666d67a3cfe15b8b459c53945c6b1add310d0733246fe41e2"; + version = "0.5.0.0"; + sha256 = "e58cb6e6c44b33df3507c1e5fc3f7cea2961a8244c3c6840a085327ce731b921"; libraryHaskellDepends = [ base bytestring text utf8-string wreq ]; homepage = "https://github.com/j-keck/wreq-stringless#readme"; description = "Simple wrapper to use wreq without Strings"; @@ -189659,21 +186057,6 @@ self: { }) {}; "writer-cps-mtl" = callPackage - ({ mkDerivation, base, mtl, transformers, writer-cps-transformers - }: - mkDerivation { - pname = "writer-cps-mtl"; - version = "0.1.1.1"; - sha256 = "db7f45ebceb3ecb166422c53d0a80a1c9bece8a958a3a9e4d15d75ada02bbf97"; - libraryHaskellDepends = [ - base mtl transformers writer-cps-transformers - ]; - homepage = "https://github.com/minad/writer-cps-mtl#readme"; - description = "MonadWriter orphan instances for writer-cps-transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "writer-cps-mtl_0_1_1_2" = callPackage ({ mkDerivation, base, mtl, transformers, writer-cps-transformers }: mkDerivation { @@ -189686,22 +186069,9 @@ self: { homepage = "https://github.com/minad/writer-cps-mtl#readme"; description = "MonadWriter orphan instances for writer-cps-transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "writer-cps-transformers" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "writer-cps-transformers"; - version = "0.1.1.0"; - sha256 = "0a8663fe10576b659955fc3f9f816c776cc3a2cd9620e907d0e9ca1a8e88c62e"; - libraryHaskellDepends = [ base transformers ]; - homepage = "https://github.com/minad/writer-cps-transformers#readme"; - description = "WriteT and RWST monad transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "writer-cps-transformers_0_1_1_2" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "writer-cps-transformers"; @@ -189711,7 +186081,6 @@ self: { homepage = "https://github.com/minad/writer-cps-transformers#readme"; description = "WriteT and RWST monad transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wsdl" = callPackage @@ -190278,8 +186647,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.5.0"; - sha256 = "e12cfb879cc022f80b3d05ab0dcbf080005b2d27eb0a07ea56d4481c3afb0879"; + version = "0.5.1"; + sha256 = "1d3d7b7a84067bf140b709fcb427b6e60cb22c6bf1456193a242d651de88b78d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190298,6 +186667,7 @@ self: { homepage = "http://github.com/tych0/xcffib"; description = "A cffi-based python binding for X"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xchat-plugin" = callPackage @@ -190715,36 +187085,8 @@ self: { }: mkDerivation { pname = "xlsx"; - version = "0.2.4"; - sha256 = "e0b424417fb04d885b78eccde94d10bd28be59184b0bbbedf321fc15a2f23d40"; - libraryHaskellDepends = [ - base base64-bytestring binary-search bytestring conduit containers - data-default errors extra filepath lens mtl mtl-compat network-uri - old-locale safe text time transformers vector xml-conduit - zip-archive zlib - ]; - testHaskellDepends = [ - base bytestring containers Diff groom lens mtl raw-strings-qq - smallcheck tasty tasty-hunit tasty-smallcheck time vector - xml-conduit - ]; - homepage = "https://github.com/qrilka/xlsx"; - description = "Simple and incomplete Excel file parser/writer"; - license = stdenv.lib.licenses.mit; - }) {}; - - "xlsx_0_4_1" = callPackage - ({ mkDerivation, base, base64-bytestring, binary-search, bytestring - , conduit, containers, data-default, Diff, errors, extra, filepath - , groom, lens, mtl, mtl-compat, network-uri, old-locale - , raw-strings-qq, safe, smallcheck, tasty, tasty-hunit - , tasty-smallcheck, text, time, transformers, vector, xml-conduit - , zip-archive, zlib - }: - mkDerivation { - pname = "xlsx"; - version = "0.4.1"; - sha256 = "014d7ecc815f452e86b199ef0715548d7221f1f0a5cfb59ec92ffa86918ef5c6"; + version = "0.4.2"; + sha256 = "cc4fa6267c36824637f36f3e10c6a8ef301402a1ccd81be1ebb036ef6b0cc3c8"; libraryHaskellDepends = [ base base64-bytestring binary-search bytestring conduit containers data-default errors extra filepath lens mtl mtl-compat network-uri @@ -190759,27 +187101,9 @@ self: { homepage = "https://github.com/qrilka/xlsx"; description = "Simple and incomplete Excel file parser/writer"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xlsx-tabular" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, data-default - , lens, text, xlsx - }: - mkDerivation { - pname = "xlsx-tabular"; - version = "0.1.0.1"; - sha256 = "29efb942a99bd0afe4ffda1856a51354b9ffa44253574b307f51bb2f05cf539a"; - libraryHaskellDepends = [ - aeson base bytestring containers data-default lens text xlsx - ]; - testHaskellDepends = [ base ]; - homepage = "http://github.com/kkazuo/xlsx-tabular#readme"; - description = "Xlsx table decode utility"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "xlsx-tabular_0_2_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , lens, text, xlsx }: @@ -190794,7 +187118,6 @@ self: { homepage = "https://github.com/kkazuo/xlsx-tabular"; description = "Xlsx table cell value extraction utility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xlsx-templater" = callPackage @@ -190871,8 +187194,8 @@ self: { }: mkDerivation { pname = "xml-conduit"; - version = "1.3.5"; - sha256 = "25635a066b6a17a0d6c038ddf974a48b6d455d8fa14989f99341703da344dc83"; + version = "1.4.0.3"; + sha256 = "b924632258a68fc31d5c14e00393f9c38bdfad8fb753010b8a6b5b417d99bbdf"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring conduit conduit-extra containers data-default deepseq monad-control @@ -190887,7 +187210,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "xml-conduit_1_4_0_2" = callPackage + "xml-conduit_1_4_0_4" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , data-default, deepseq, hspec, HUnit, monad-control, resourcet @@ -190895,8 +187218,8 @@ self: { }: mkDerivation { pname = "xml-conduit"; - version = "1.4.0.2"; - sha256 = "55f77ce489fd04a2602733a55e8b7487a565f9bbb877a7ce606f2fd6c1fbe318"; + version = "1.4.0.4"; + sha256 = "11058279d3f75a71b5731d26fc490f86fc1b7cc461053cd54aedde8f152d52fc"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring conduit conduit-extra containers data-default deepseq monad-control @@ -191026,27 +187349,6 @@ self: { }) {}; "xml-hamlet" = callPackage - ({ mkDerivation, base, containers, hspec, HUnit, parsec - , shakespeare, template-haskell, text, xml-conduit - }: - mkDerivation { - pname = "xml-hamlet"; - version = "0.4.0.12"; - sha256 = "0ff43b778e9e497b468dd123ab81fa8cfc84dcd0a6c8ab06b8fc27cf3e0669d2"; - libraryHaskellDepends = [ - base containers parsec shakespeare template-haskell text - xml-conduit - ]; - testHaskellDepends = [ - base containers hspec HUnit parsec shakespeare template-haskell - text xml-conduit - ]; - homepage = "http://www.yesodweb.com/"; - description = "Hamlet-style quasiquoter for XML content"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "xml-hamlet_0_4_1" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, parsec , shakespeare, template-haskell, text, xml-conduit }: @@ -191054,6 +187356,8 @@ self: { pname = "xml-hamlet"; version = "0.4.1"; sha256 = "7df390f59599a0b16831c3f2cbb13ad0bebb92faa4a350fc6ae613bfba4ec2bb"; + revision = "1"; + editedCabalFile = "5c9d521224d4f08f59a3dbbde041c4f0267da46528cfc6b24da052387ebd4033"; libraryHaskellDepends = [ base containers parsec shakespeare template-haskell text xml-conduit @@ -191065,7 +187369,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Hamlet-style quasiquoter for XML content"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-helpers" = callPackage @@ -191100,6 +187403,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xml-html-qq" = callPackage + ({ mkDerivation, base, blaze-markup, conduit, data-default, doctest + , from-sum, Glob, heterocephalus, html-conduit, resourcet, tasty + , tasty-hunit, template-haskell, text, th-lift, th-lift-instances + , xml-conduit + }: + mkDerivation { + pname = "xml-html-qq"; + version = "0.1.0.1"; + sha256 = "1a2ebb1f4ca58a4f442c470db6d3271e6b1069d41860f8683b5da9082329235a"; + libraryHaskellDepends = [ + base blaze-markup conduit data-default from-sum heterocephalus + html-conduit resourcet template-haskell text th-lift + th-lift-instances xml-conduit + ]; + testHaskellDepends = [ + base doctest Glob tasty tasty-hunit text xml-conduit + ]; + homepage = "https://github.com/cdepillabout/xml-html-qq"; + description = "Quasi-quoters for XML and HTML Documents"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xml-isogen" = callPackage ({ mkDerivation, base, dom-parser, lens, mtl, QuickCheck , semigroups, template-haskell, text, xml-conduit-writer @@ -191324,6 +187650,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xml-tydom-conduit" = callPackage + ({ mkDerivation, base, containers, QuickCheck, quickcheck-instances + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , time, xml-conduit, xml-tydom-core + }: + mkDerivation { + pname = "xml-tydom-conduit"; + version = "0.1.0.0"; + sha256 = "e591994b28dc0aa6464167d1e28ae47fdb2350285064356ff4c528cd4b9b6a5d"; + libraryHaskellDepends = [ + base containers template-haskell text time xml-conduit + xml-tydom-core + ]; + testHaskellDepends = [ + base QuickCheck quickcheck-instances tasty tasty-hunit + tasty-quickcheck text time xml-conduit + ]; + homepage = "https://github.com/lancelet/xml-tydom"; + description = "Typed XML encoding for an xml-conduit backend"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "xml-tydom-core" = callPackage + ({ mkDerivation, base, containers, mtl, QuickCheck, text }: + mkDerivation { + pname = "xml-tydom-core"; + version = "0.1.0.0"; + sha256 = "7424a0f322d93acc08282e85ca0ec168d9868c53902c7cf467b957cc1ce35b27"; + libraryHaskellDepends = [ base containers mtl QuickCheck text ]; + homepage = "https://github.com/lancelet/xml-tydom"; + description = "Typed XML encoding (core library)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xml-types" = callPackage ({ mkDerivation, base, deepseq, text }: mkDerivation { @@ -191426,8 +187786,8 @@ self: { pname = "xmlhtml"; version = "0.2.3.5"; sha256 = "e333a1c7afd5068b60b143457fea7325a34408cc65b3ac55f5b342eb0274b06d"; - revision = "2"; - editedCabalFile = "7ef4b85552808a9169da9c650ece3b9994a6c6106185a92e73aad50c5e98e6f1"; + revision = "3"; + editedCabalFile = "4b5e2c334e6fdcab94095ca5fa805a2353690d3a616733cec0febf2ba2991880"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring containers parsec text unordered-containers @@ -191532,8 +187892,8 @@ self: { }: mkDerivation { pname = "xmonad"; - version = "0.12"; - sha256 = "e8f649dbd4a8d5f75fdac9ceb5ee38b64fd351910ade81c188f5dd7bc21dfdd7"; + version = "0.13"; + sha256 = "f9f81b63569f18c777a939741024ec3ae34e4ec84015e5cc50f6622034a303ca"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191575,19 +187935,17 @@ self: { }) {}; "xmonad-contrib" = callPackage - ({ mkDerivation, base, containers, directory, extensible-exceptions - , filepath, mtl, old-locale, old-time, process, random, unix - , utf8-string, X11, X11-xft, xmonad + ({ mkDerivation, base, bytestring, containers, directory + , extensible-exceptions, filepath, mtl, old-locale, old-time + , process, random, unix, utf8-string, X11, X11-xft, xmonad }: mkDerivation { pname = "xmonad-contrib"; - version = "0.12"; - sha256 = "131d31c471ac02ece9c7e920497b4839a45df786a2096f56adb1f2de1221f311"; - revision = "2"; - editedCabalFile = "8a17b7fe46dc9d7435538a0db3997bcb2a125e71923ecd401024d84081a41807"; + version = "0.13"; + sha256 = "a760827fe5b1f99d783f52ccbb72b272d02d53daa26757363cde3ceba014476e"; libraryHaskellDepends = [ - base containers directory extensible-exceptions filepath mtl - old-locale old-time process random unix utf8-string X11 X11-xft + base bytestring containers directory extensible-exceptions filepath + mtl old-locale old-time process random unix utf8-string X11 X11-xft xmonad ]; homepage = "http://xmonad.org/"; @@ -191710,6 +188068,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xmonad-vanessa" = callPackage + ({ mkDerivation, base, containers, process, transformers, X11 + , xmonad, xmonad-contrib, xmonad-extras + }: + mkDerivation { + pname = "xmonad-vanessa"; + version = "0.1.0.3"; + sha256 = "2ec997506b554282bbbddf02d9bb72326637ce5c6cd5634604b93a7e6e2b9ffa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers process transformers X11 xmonad xmonad-contrib + xmonad-extras + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/vmchale/xmonad-vanessa#readme"; + description = "Custom xmonad, which uses stack and sets various defaults"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xmonad-wallpaper" = callPackage ({ mkDerivation, base, magic, mtl, random, unix, xmonad }: mkDerivation { @@ -192106,33 +188484,14 @@ self: { }) {}; "yahoo-finance-api" = callPackage - ({ mkDerivation, aeson, base, doctest, Glob, http-api-data - , http-client, lens, lens-aeson, mtl, servant, servant-client, text - , time, transformers - }: - mkDerivation { - pname = "yahoo-finance-api"; - version = "0.1.0.0"; - sha256 = "d7e8f52d8549fc2084698a520dcb17681e1917c2ca5ca63d3bda67522fdc5182"; - libraryHaskellDepends = [ - aeson base http-api-data http-client lens lens-aeson mtl servant - servant-client text time transformers - ]; - testHaskellDepends = [ base doctest Glob ]; - homepage = "https://github.com/cdepillabout/yahoo-finance-api"; - description = "Read quotes from Yahoo Finance API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yahoo-finance-api_0_2_0_0" = callPackage ({ mkDerivation, aeson, base, doctest, either, Glob, hspec , http-api-data, http-client, http-client-tls, mtl, safe, servant , servant-client, text, time, transformers, vector }: mkDerivation { pname = "yahoo-finance-api"; - version = "0.2.0.0"; - sha256 = "a2d01a542ca627abe791d95d7e38234f731a356aa9f6e2d0f81c7df050bff3c7"; + version = "0.2.0.1"; + sha256 = "329eea56d8a285877164e82110a3376a6b604fff2198d387def727d06979e496"; libraryHaskellDepends = [ aeson base either http-api-data http-client mtl servant servant-client text time transformers vector @@ -192144,7 +188503,6 @@ self: { homepage = "https://github.com/cdepillabout/yahoo-finance-api"; description = "Read quotes from Yahoo Finance API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yahoo-finance-conduit" = callPackage @@ -192240,8 +188598,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.8.21.1"; - sha256 = "f9f8e801a215c65cf5eff6e3aa384060e60232521630495d13573bf0677a0db2"; + version = "0.8.21.2"; + sha256 = "441cf712cd20ac6b0ded900562ca33770c8752702963ab267bff72b0657fef29"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -192771,8 +189129,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.4.15"; - sha256 = "a917b003c348aa4b3d8c673efb32e0ea0f9190affa86d435b9bea9f11ab85cfd"; + version = "1.4.16"; + sha256 = "a2c76409522ac276b92d31e13ffa94ae51194ffdb902a41f979d25181a5182d2"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup byteable bytestring conduit @@ -192914,32 +189272,6 @@ self: { }) {}; "yesod-auth-hashdb" = callPackage - ({ mkDerivation, base, basic-prelude, bytestring, containers - , cryptohash, hspec, http-conduit, http-types, monad-logger - , network-uri, persistent, persistent-sqlite, pwstore-fast - , resourcet, text, wai-extra, yesod, yesod-auth, yesod-core - , yesod-form, yesod-persistent, yesod-test - }: - mkDerivation { - pname = "yesod-auth-hashdb"; - version = "1.5.1.3"; - sha256 = "ea455c6cb2c60de6254860ed1b8d29f8e73154c24db3e2edbfc0090f728b051a"; - libraryHaskellDepends = [ - base bytestring cryptohash persistent pwstore-fast text yesod-auth - yesod-core yesod-form yesod-persistent - ]; - testHaskellDepends = [ - base basic-prelude bytestring containers hspec http-conduit - http-types monad-logger network-uri persistent-sqlite resourcet - text wai-extra yesod yesod-auth yesod-core yesod-test - ]; - homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; - description = "Authentication plugin for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "yesod-auth-hashdb_1_6_0_1" = callPackage ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers , hspec, http-conduit, http-types, monad-logger, network-uri , persistent, persistent-sqlite, pwstore-fast, resourcet, text @@ -193147,39 +189479,6 @@ self: { }) {}; "yesod-bin" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, bytestring, Cabal, conduit, conduit-extra - , containers, data-default-class, deepseq, directory, file-embed - , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit - , http-reverse-proxy, http-types, lifted-base, network - , optparse-applicative, parsec, process, project-template - , resourcet, shakespeare, split, streaming-commons, tar - , template-haskell, text, time, transformers, transformers-compat - , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls - , yaml, zlib - }: - mkDerivation { - pname = "yesod-bin"; - version = "1.4.18.7"; - sha256 = "ff75fc8bc7b37d6960436dab4a97697bc172d5092f5125b23791c8efdd01ed96"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder bytestring - Cabal conduit conduit-extra containers data-default-class deepseq - directory file-embed filepath fsnotify ghc ghc-paths http-client - http-conduit http-reverse-proxy http-types lifted-base network - optparse-applicative parsec process project-template resourcet - shakespeare split streaming-commons tar template-haskell text time - transformers transformers-compat unix-compat unordered-containers - wai wai-extra warp warp-tls yaml zlib - ]; - homepage = "http://www.yesodweb.com/"; - description = "The yesod helper executable"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-bin_1_5_1" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, bytestring, Cabal, conduit, conduit-extra , containers, data-default-class, deepseq, directory, file-embed @@ -193211,37 +189510,36 @@ self: { homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-bootstrap" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, conduit - , conduit-extra, containers, either, email-validate - , lens-family-core, lens-family-th, MonadRandom, mtl, persistent - , shakespeare, text, time, transformers, yaml, yesod-core - , yesod-form, yesod-markdown + ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types + , shakespeare, text, transformers, yesod-core, yesod-elements }: mkDerivation { pname = "yesod-bootstrap"; - version = "0.3"; - sha256 = "e40a9276089146ebfdf2a95b2bc3372b1dca7fb29d9d269b39dd3f4528d3ed01"; + version = "0.4"; + sha256 = "8c5dbaa3aff6b2ab67fa98654daf4a885e03e4f8a380b461f5f3333871a92a91"; libraryHaskellDepends = [ - base blaze-html blaze-markup conduit conduit-extra containers - either email-validate lens-family-core lens-family-th MonadRandom - mtl persistent shakespeare text time transformers yaml yesod-core - yesod-form yesod-markdown + base blaze-html blaze-markup bootstrap-types shakespeare text + transformers yesod-core yesod-elements ]; + homepage = "https://github.com/andrewthad/haskell-bootstrap"; description = "Bootstrap widgets for yesod"; license = stdenv.lib.licenses.mit; }) {}; "yesod-colonnade" = callPackage - ({ mkDerivation, base, colonnade, text, yesod-core }: + ({ mkDerivation, base, blaze-html, blaze-markup, colonnade, text + , yesod-core + }: mkDerivation { pname = "yesod-colonnade"; - version = "0.1"; - sha256 = "5e98908136715fadc3f46153bcc99c559affef85ed64bcde4bd2314e962dca79"; - libraryHaskellDepends = [ base colonnade text yesod-core ]; + version = "0.4"; + sha256 = "3cdb1f10dee36cdf4adebc5799fb108e4112065659051aed025ef4359b3509d7"; + libraryHaskellDepends = [ + base blaze-html blaze-markup colonnade text yesod-core + ]; homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Helper functions for using yesod with colonnade"; license = stdenv.lib.licenses.bsd3; @@ -193326,10 +189624,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.30"; - sha256 = "1136dbf0beacbb7ea18b73616e059aa85ec5fbbf0ecae88e7ff3ac8eb685f654"; - revision = "1"; - editedCabalFile = "34f11a73eab3b105720ffa017f48217bc3dc383347e36b7584e137e0462bd181"; + version = "1.4.31"; + sha256 = "9a2e4c39c9ce66c2881d5da6c9a621c07492c950d935231aa7e12ed3a008d7af"; libraryHaskellDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup byteable bytestring case-insensitive cereal clientsession conduit @@ -193577,8 +189873,8 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.4.9"; - sha256 = "bd53f12d97a89e93b15fc6b06e63fbe041301635508f933203596f349a74110d"; + version = "1.4.10"; + sha256 = "ddeb72988e1dffb1c3766c35941520aa6ff6a8b09d6bdeb453d9c75d11ad8e43"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup byteable bytestring containers data-default email-validate @@ -193777,8 +190073,8 @@ self: { }: mkDerivation { pname = "yesod-markdown"; - version = "0.11.2"; - sha256 = "28a1b1dbcc5a171ee88b8eb1850aef43cf17d03553b29116ca0934721c228ae3"; + version = "0.11.4"; + sha256 = "ea2e4c5506543922711ed169c90afe510ddf857276fdd5850e7481a2c181a916"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare texmath text xss-sanitize yesod-core yesod-form @@ -194504,24 +190800,6 @@ self: { }) {}; "yesod-websockets" = callPackage - ({ mkDerivation, async, base, conduit, enclosed-exceptions - , monad-control, transformers, wai, wai-websockets, websockets - , yesod-core - }: - mkDerivation { - pname = "yesod-websockets"; - version = "0.2.4.1"; - sha256 = "795b497217dece919d4034bc4dfa84632d900798d1be9a423ce57409378cbccf"; - libraryHaskellDepends = [ - async base conduit enclosed-exceptions monad-control transformers - wai wai-websockets websockets yesod-core - ]; - homepage = "https://github.com/yesodweb/yesod"; - description = "WebSockets support for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-websockets_0_2_5" = callPackage ({ mkDerivation, async, base, conduit, enclosed-exceptions , monad-control, transformers, wai, wai-websockets, websockets , yesod-core @@ -194537,7 +190815,6 @@ self: { homepage = "https://github.com/yesodweb/yesod"; description = "WebSockets support for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-websockets-extra" = callPackage @@ -194619,42 +190896,6 @@ self: { }) {}; "yi" = callPackage - ({ mkDerivation, array, base, binary, bytestring, Cabal, containers - , data-default, directory, dlist, dynamic-state, dyre, exceptions - , filepath, glib, gtk, hashable, Hclip, hint, HUnit, lens, mtl - , old-locale, oo-prototypes, pango, parsec, pointedlist, process - , QuickCheck, random, safe, semigroups, split, stm, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text, text-icu - , time, transformers-base, unix, unix-compat, unordered-containers - , vty, word-trie, xdg-basedir, yi-language, yi-rope - }: - mkDerivation { - pname = "yi"; - version = "0.12.6"; - sha256 = "886bbac8634a251d9872fbcc47350df3e84cf881e42cb7408d1a1e92614205d8"; - configureFlags = [ "-fpango" "-fvty" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring Cabal containers data-default - directory dlist dynamic-state dyre exceptions filepath glib gtk - hashable Hclip hint lens mtl old-locale oo-prototypes pango parsec - pointedlist process QuickCheck random safe semigroups split stm - template-haskell text text-icu time transformers-base unix - unix-compat unordered-containers vty word-trie xdg-basedir - yi-language yi-rope - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base directory filepath HUnit lens QuickCheck semigroups tasty - tasty-hunit tasty-quickcheck text yi-language yi-rope - ]; - homepage = "https://yi-editor.github.io"; - description = "The Haskell-Scriptable Editor"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi_0_13_5" = callPackage ({ mkDerivation, base, microlens-platform, mtl , optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty , yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell @@ -194675,7 +190916,6 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-contrib" = callPackage @@ -194784,24 +191024,6 @@ self: { }) {}; "yi-fuzzy-open" = callPackage - ({ mkDerivation, base, binary, containers, data-default, directory - , filepath, mtl, text, transformers-base, vector, yi, yi-language - , yi-rope - }: - mkDerivation { - pname = "yi-fuzzy-open"; - version = "0.1.0.1"; - sha256 = "92eda3ac60f57509716f8473c840d6a46b1be52f3713b27c1a5d0aa70978b02a"; - libraryHaskellDepends = [ - base binary containers data-default directory filepath mtl text - transformers-base vector yi yi-language yi-rope - ]; - homepage = "https://github.com/yi-editor/yi-fuzzy-open"; - description = "Fuzzy open plugin for Yi"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-fuzzy-open_0_13_5" = callPackage ({ mkDerivation, base, binary, containers, data-default, directory , filepath, mtl, text, transformers-base, vector, yi-core , yi-language, yi-rope @@ -194817,7 +191039,6 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Fuzzy open plugin for yi"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-gtk" = callPackage @@ -194916,32 +191137,6 @@ self: { }) {}; "yi-language" = callPackage - ({ mkDerivation, alex, array, base, binary, containers - , data-default, filepath, hashable, hspec, microlens-platform - , oo-prototypes, pointedlist, QuickCheck, regex-base, regex-tdfa - , template-haskell, transformers-base, unordered-containers - }: - mkDerivation { - pname = "yi-language"; - version = "0.2.1"; - sha256 = "58153110fa9fad0c873a8376e73bb21b9ebdbb32357d23b29e1bd6d901cffacd"; - libraryHaskellDepends = [ - array base binary containers data-default hashable - microlens-platform oo-prototypes pointedlist regex-base regex-tdfa - template-haskell transformers-base unordered-containers - ]; - libraryToolDepends = [ alex ]; - testHaskellDepends = [ - array base binary containers data-default filepath hashable hspec - microlens-platform pointedlist QuickCheck regex-base regex-tdfa - template-haskell transformers-base unordered-containers - ]; - homepage = "https://github.com/yi-editor/yi-language"; - description = "Collection of language-related Yi libraries"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-language_0_13_5" = callPackage ({ mkDerivation, alex, array, base, binary, containers , data-default, hashable, microlens-platform, oo-prototypes , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec @@ -194967,7 +191162,6 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Collection of language-related Yi libraries"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-misc-modes" = callPackage @@ -195051,26 +191245,6 @@ self: { }) {}; "yi-rope" = callPackage - ({ mkDerivation, base, binary, bytestring, charsetdetect-ae - , data-default, deepseq, fingertree, hspec, QuickCheck - , quickcheck-instances, text, text-icu - }: - mkDerivation { - pname = "yi-rope"; - version = "0.7.0.2"; - sha256 = "e05df2d905460723c62dba6f5201964504bf8214b3db9db11c1378dc0f08ca9d"; - libraryHaskellDepends = [ - base binary bytestring charsetdetect-ae data-default deepseq - fingertree text text-icu - ]; - testHaskellDepends = [ - base hspec QuickCheck quickcheck-instances text - ]; - description = "A rope data structure used by Yi"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-rope_0_8" = callPackage ({ mkDerivation, base, binary, bytestring, charsetdetect-ae , data-default, deepseq, fingertree, hspec, QuickCheck , quickcheck-instances, text, text-icu @@ -195088,7 +191262,6 @@ self: { ]; description = "A rope data structure used by Yi"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-snippet" = callPackage @@ -195795,8 +191968,8 @@ self: { }: mkDerivation { pname = "zip"; - version = "0.1.5"; - sha256 = "92ea1f4b28f89f77e065046095f0d7c1fedadef402ccd4f04ee09bac68556974"; + version = "0.1.7"; + sha256 = "8b7e4f597e926db852397bb2cbad04d05c718a222702076fbbdfcccb62679c9e"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest exceptions filepath mtl path @@ -196227,6 +192400,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "zstd" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, QuickCheck + , test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "zstd"; + version = "0.1.0.0"; + sha256 = "0875840799d987cf8f8dd5e0a7686978084b3088c07123e66f6f88561f474bff"; + libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + homepage = "https://github.com/facebookexperimental/hs-zstd"; + description = "Haskell bindings to the Zstandard compression algorithm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ztail" = callPackage ({ mkDerivation, array, base, bytestring, filepath, hinotify , process, regex-posix, time, unix, unordered-containers diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index a0b90962829..b6063f6ef97 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -40,14 +40,14 @@ let if !isGhcjs then "ghc" else "ghcjs"; - docLibGlob = + ghcDocLibDir = if !isGhcjs - then ''share/doc/ghc*/html/libraries'' - else ''doc/lib''; + then ghc.doc + ''/share/doc/ghc*/html/libraries'' + else ghc + ''/doc/lib''; # On GHCJS, use a stripped down version of GHC's prologue.txt prologue = if !isGhcjs - then "${ghc.doc}/${docLibGlob}/prologue.txt" + then "${ghcDocLibDir}/prologue.txt" else writeText "ghcjs-prologue.txt" '' This index includes documentation for many Haskell modules. ''; @@ -67,7 +67,7 @@ stdenv.mkDerivation { mkdir -p $out/share/doc/hoogle echo importing builtin packages - for docdir in ${ghc.doc}/${docLibGlob}/*; do + for docdir in ${ghcDocLibDir}/*; do name="$(basename $docdir)" ${opts isGhcjs ''docdir="$docdir/html"''} if [[ -d $docdir ]]; then diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 246a9f305db..cc9daf336b0 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -8,6 +8,9 @@ rec { overrideScope = scope: overrideCabal (drv.overrideScope scope) f; }; + doCoverage = drv: overrideCabal drv (drv: { doCoverage = true; }); + dontCoverage = drv: overrideCabal drv (drv: { doCoverage = false; }); + doHaddock = drv: overrideCabal drv (drv: { doHaddock = true; }); dontHaddock = drv: overrideCabal drv (drv: { doHaddock = false; }); @@ -50,8 +53,8 @@ rec { enableSharedLibraries = drv: overrideCabal drv (drv: { enableSharedLibraries = true; }); disableSharedLibraries = drv: overrideCabal drv (drv: { enableSharedLibraries = false; }); - enableSplitObjs = drv: overrideCabal drv (drv: { enableSplitObjs = true; }); - disableSplitObjs = drv: overrideCabal drv (drv: { enableSplitObjs = false; }); + enableDeadCodeElimination = drv: overrideCabal drv (drv: { enableDeadCodeElimination = true; }); + disableDeadCodeElimination = drv: overrideCabal drv (drv: { enableDeadCodeElimination = false; }); enableStaticLibraries = drv: overrideCabal drv (drv: { enableStaticLibraries = true; }); disableStaticLibraries = drv: overrideCabal drv (drv: { enableStaticLibraries = false; }); diff --git a/pkgs/development/haskell-modules/patches/xmonad-nix.patch b/pkgs/development/haskell-modules/patches/xmonad-nix.patch index cfce819747f..2a9ec4bfedf 100644 --- a/pkgs/development/haskell-modules/patches/xmonad-nix.patch +++ b/pkgs/development/haskell-modules/patches/xmonad-nix.patch @@ -1,31 +1,33 @@ +diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs +index 138d735..65b5a84 100644 --- a/src/XMonad/Core.hs +++ b/src/XMonad/Core.hs -@@ -48,6 +48,7 @@ import System.Posix.Types (ProcessID) +@@ -51,6 +51,7 @@ import System.Posix.Types (ProcessID) import System.Process import System.Directory import System.Exit +import System.Environment (lookupEnv) import Graphics.X11.Xlib - import Graphics.X11.Xlib.Extras (Event) + import Graphics.X11.Xlib.Extras (getWindowAttributes, WindowAttributes, Event) import Data.Typeable -@@ -463,6 +464,7 @@ recompile force = io $ do - err = base ++ ".errors" - src = base ++ ".hs" - lib = dir "lib" +@@ -571,6 +572,7 @@ recompile force = io $ do + lib = cfgdir "lib" + buildscript = cfgdir "build" + + ghc <- fromMaybe "ghc" <$> liftIO (lookupEnv "NIX_GHC") libTs <- mapM getModTime . Prelude.filter isSource =<< allFiles lib srcT <- getModTime src binT <- getModTime bin -@@ -471,7 +473,7 @@ recompile force = io $ do - -- temporarily disable SIGCHLD ignoring: - uninstallSignalHandlers - status <- bracket (openFile err WriteMode) hClose $ \h -> -- waitForProcess =<< runProcess "ghc" ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-main-is", "main", "-v0", "-o",binn] (Just dir) -+ waitForProcess =<< runProcess ghc ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-main-is", "main", "-v0", "-o",binn] (Just dir) - Nothing Nothing Nothing (Just h) +@@ -586,7 +588,7 @@ recompile force = io $ do + status <- bracket (openFile err WriteMode) hClose $ \errHandle -> + waitForProcess =<< if useBuildscript + then compileScript bin cfgdir buildscript errHandle +- else compileGHC bin cfgdir errHandle ++ else compileGHC ghc bin cfgdir errHandle -- re-enable SIGCHLD: -@@ -480,6 +482,7 @@ recompile force = io $ do + installSignalHandlers +@@ -594,6 +596,7 @@ recompile force = io $ do -- now, if it fails, run xmessage to let the user know: when (status /= ExitSuccess) $ do ghcErr <- readFile err @@ -33,12 +35,39 @@ let msg = unlines $ ["Error detected while loading xmonad configuration file: " ++ src] ++ lines (if null ghcErr then show status else ghcErr) -@@ -487,7 +490,7 @@ recompile force = io $ do +@@ -601,7 +604,7 @@ recompile force = io $ do -- nb, the ordering of printing, then forking, is crucial due to -- lazy evaluation hPutStrLn stderr msg -- forkProcess $ executeFile "xmessage" True ["-default", "okay", msg] Nothing -+ forkProcess $ executeFile xmessage True ["-default", "okay", msg] Nothing +- forkProcess $ executeFile "xmessage" True ["-default", "okay", replaceUnicode msg] Nothing ++ forkProcess $ executeFile xmessage True ["-default", "okay", replaceUnicode msg] Nothing return () return (status == ExitSuccess) else return True +@@ -619,16 +622,16 @@ recompile force = io $ do + '\8216' -> '`' -- ‘ + '\8217' -> '`' -- ’ + _ -> c +- compileGHC bin dir errHandle = +- runProcess "ghc" ["--make" +- , "xmonad.hs" +- , "-i" +- , "-ilib" +- , "-fforce-recomp" +- , "-main-is", "main" +- , "-v0" +- , "-o", bin +- ] (Just dir) Nothing Nothing Nothing (Just errHandle) ++ compileGHC ghc bin dir errHandle = ++ runProcess ghc ["--make" ++ , "xmonad.hs" ++ , "-i" ++ , "-ilib" ++ , "-fforce-recomp" ++ , "-main-is", "main" ++ , "-v0" ++ , "-o", bin ++ ] (Just dir) Nothing Nothing Nothing (Just errHandle) + compileScript bin dir script errHandle = + runProcess script [bin] (Just dir) Nothing Nothing Nothing (Just errHandle) + diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index c1e10445830..3dfb800afe1 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "clooj-${version}"; jar = fetchurl { - url = "http://www.mediafire.com/download/prkf64humftrmz3/clooj-${version}-standalone.jar"; + url = "http://download1492.mediafire.com/dptomdxrjaag/prkf64humftrmz3/clooj-0.4.4-standalone.jar"; sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation { homepage = https://github.com/arthuredelstein/clooj; license = stdenv.lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index 5db3f10fb07..c50a5fbab07 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { patches = [ ./cpp-4.5.patch ]; + outputs = [ "out" "dev" "info" ]; + setOutputFlags = false; # $dev gets into the library otherwise + # GCC 4.6 raises a number of set-but-unused warnings. configureFlags = [ "--disable-error-on-warning" ]; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 41ce9c659aa..6b4e6c2a728 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -14,6 +14,9 @@ sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p"; }; + outputs = [ "out" "dev" "info" ]; + setOutputFlags = false; # $dev gets into the library otherwise + nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool libunistring libffi ]; propagatedBuildInputs = [ gmp boehmgc ] @@ -46,7 +49,21 @@ # don't have "libgcc_s.so.1" on darwin LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; - configureFlags = [ "--with-libreadline-prefix" ]; + configureFlags = [ "--with-libreadline-prefix" ] + ++ stdenv.lib.optionals stdenv.isSunOS [ + # Make sure the right is found, and not the incompatible + # /usr/include/mp.h from OpenSolaris. See + # + # for details. + "--with-libgmp-prefix=${gmp.dev}" + + # Same for these (?). + "--with-libreadline-prefix=${readline.dev}" + "--with-libunistring-prefix=${libunistring}" + + # See below. + "--without-threads" + ]; postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" @@ -55,9 +72,11 @@ # why `--with-libunistring-prefix' and similar options coming from # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64. sed -i "$out/lib/pkgconfig/guile-2.0.pc" \ - -e 's|-lunistring|-L${libunistring}/lib -lunistring|g ; + -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ; s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ; - s|-lltdl|-L${libtool.lib}/lib -lltdl|g' + s|-lltdl|-L${libtool.lib}/lib -lltdl|g ; + s|includedir=$out|includedir=$dev|g + " ''; # make check doesn't work on darwin @@ -92,27 +111,6 @@ processing. ''; }; -} - -// - -(stdenv.lib.optionalAttrs stdenv.isSunOS { - # TODO: Move me above. - configureFlags = - [ - # Make sure the right is found, and not the incompatible - # /usr/include/mp.h from OpenSolaris. See - # - # for details. - "--with-libgmp-prefix=${gmp.dev}" - - # Same for these (?). - "--with-libreadline-prefix=${readline.dev}" - "--with-libunistring-prefix=${libunistring}" - - # See below. - "--without-threads" - ]; }) // @@ -121,4 +119,4 @@ # Work around . SHELL = "/bin/sh"; CONFIG_SHELL = "/bin/sh"; -})) +}) diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index 4ac9b647956..3bef4996a4c 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -1,20 +1,24 @@ { stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }: -stdenv.mkDerivation { - name = "jimtcl-0.76"; +let + makeSDLFlags = map (p: "-I${stdenv.lib.getDev p}/include/SDL"); + +in stdenv.mkDerivation rec { + name = "jimtcl-${version}"; + version = "0.77"; src = fetchFromGitHub { owner = "msteveb"; repo = "jimtcl"; - rev = "51f65c6d38fbf86e1f0b036ad336761fd2ab7fa0"; - sha256 = "00ldal1w9ysyfmx28xdcaz81vaazr1fqixxb2abk438yfpp1i9hq"; + rev = version; + sha256 = "06d9gdgvi6cwd6pjg3xig0kkjqm6kgq3am8yq1xnksyz2n09f0kp"; }; buildInputs = [ sqlite readline asciidoc SDL SDL_gfx ]; - NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ]; + NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_gfx ]; configureFlags = [ "--with-ext=oo" diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index ed5aa1e60de..04b574d4559 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -5,7 +5,7 @@ let pname = "love"; - version = "0.10.1"; + version = "0.10.2"; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "rude"; repo = "love"; rev = "${version}"; - sha256 = "10a2kkyx7x9jkcj9xrqgmvp0b6gbapjqjx9fib9f6a0nbz0xaswj"; + sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym"; }; buildInputs = [ diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 0a87d037454..c7663a11676 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, clang }: stdenv.mkDerivation rec { - name = "mujs-2016-11-30"; + name = "mujs-2017-01-24"; src = fetchgit { url = git://git.ghostscript.com/mujs.git; - rev = "a0ceaf5050faf419401fe1b83acfa950ec8a8a89"; - sha256 = "13abghhqrivaip4h0fav80i8hid220dj0ddc1xnhn6w9rbnrriyg"; + rev = "4006739a28367c708dea19aeb19b8a1a9326ce08"; + sha256 = "0wvjl8lkh0ga6fkmxgjqq77yagncbv1bdy6hpnxq31x3mkwn1s51"; }; buildInputs = [ clang ]; diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index ad585f085db..296176148c7 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, nix, git }: let - version = "4.1.5"; + version = "4.1.6"; in stdenv.mkDerivation { name = "nix-exec-${version}"; src = fetchurl { url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; - sha256 = "1npy1did5ysacshclpfxihgh5bc0i9jqmvgxi1fp8prhcdhall9m"; + sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar"; }; buildInputs = [ pkgconfig nix git ]; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index c261668edd2..116d4adf204 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -9,9 +9,10 @@ let generic = { version, sha256 }: - let php7 = lib.versionAtLeast version "7.0"; in + let php7 = lib.versionAtLeast version "7.0"; + mysqlHeaders = mysql.lib.dev or mysql; - composableDerivation.composableDerivation {} (fixed: { + in composableDerivation.composableDerivation {} (fixed: { inherit version; @@ -114,12 +115,12 @@ let mysql = { configureFlags = ["--with-mysql"]; - buildInputs = [ mysql.lib.dev ]; + buildInputs = [ mysqlHeaders ]; }; mysqli = { - configureFlags = ["--with-mysqli=${mysql.lib.dev}/bin/mysql_config"]; - buildInputs = [ mysql.lib.dev ]; + configureFlags = ["--with-mysqli=${mysqlHeaders}/bin/mysql_config"]; + buildInputs = [ mysqlHeaders ]; }; mysqli_embedded = { @@ -129,8 +130,8 @@ let }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql.lib.dev}"]; - buildInputs = [ mysql.lib.dev ]; + configureFlags = ["--with-pdo-mysql=${mysqlHeaders}"]; + buildInputs = [ mysqlHeaders ]; }; bcmath = { @@ -314,12 +315,12 @@ in { }; php70 = generic { - version = "7.0.15"; - sha256 = "1nbxwj4yx30k77qibhmnx0rvqhia1zbkwi5ps5nzm0sn6d3zkj58"; + version = "7.0.16"; + sha256 = "1awp6l5bs7qkvak9hgn1qbwkn6303mprslmgcfjyq3ywfmszbic3"; }; php71 = generic { - version = "7.1.1"; - sha256 = "1g3mqscxnsic9ypf641jhiyn95d4d1nz198539245v2lgffx74fp"; + version = "7.1.2"; + sha256 = "013hlvzjmp7ilckqf3851xwmj37xzq6afsqm67i4whv64d723wp0"; }; } diff --git a/pkgs/development/interpreters/python/build-python-package-flit.nix b/pkgs/development/interpreters/python/build-python-package-flit.nix index 8628c3df769..1beff0ebd83 100644 --- a/pkgs/development/interpreters/python/build-python-package-flit.nix +++ b/pkgs/development/interpreters/python/build-python-package-flit.nix @@ -1,6 +1,7 @@ # This function provides specific bits for building a flit-based Python package. -{ flit +{ python +, flit }: { ... } @ attrs: @@ -13,7 +14,9 @@ attrs // { runHook postBuild ''; - # Flit packages do not come with tests. - installCheckPhase = attrs.checkPhase or ":"; - doCheck = attrs.doCheck or false; -} \ No newline at end of file + # Flit packages, like setuptools packages, might have tests. + installCheckPhase = attrs.checkPhase or '' + ${python.interpreter} -m unittest discover + ''; + doCheck = attrs.doCheck or true; +} diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix index eab10372674..a09febb492b 100644 --- a/pkgs/development/interpreters/python/build-python-package-setuptools.nix +++ b/pkgs/development/interpreters/python/build-python-package-setuptools.nix @@ -49,7 +49,7 @@ in attrs // { export PATH="$tmp_path/bin:$PATH" export PYTHONPATH="$tmp_path/${python.sitePackages}:$PYTHONPATH" mkdir -p $tmp_path/${python.sitePackages} - ${bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path + ${bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path >&2 fi ${postShellHook} ''; diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index e15405e2981..b26bf1539cd 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -12,7 +12,7 @@ let setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python bootstrapped-pip; }; - flit-specific = import ./build-python-package-flit.nix { inherit flit; }; + flit-specific = import ./build-python-package-flit.nix { inherit python flit; }; wheel-specific = import ./build-python-package-wheel.nix { }; common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; }; in @@ -34,4 +34,4 @@ let else if format == "other" then {} else throw "Unsupported format ${format}"; -in mkPythonDerivation ( attrs // formatspecific ) \ No newline at end of file +in mkPythonDerivation ( attrs // formatspecific ) diff --git a/pkgs/development/interpreters/python/cpython/2.6/default.nix b/pkgs/development/interpreters/python/cpython/2.6/default.nix deleted file mode 100644 index 9a4c2d5b398..00000000000 --- a/pkgs/development/interpreters/python/cpython/2.6/default.nix +++ /dev/null @@ -1,228 +0,0 @@ -{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false -, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage -# For the Python package set -, pkgs, packageOverrides ? (self: super: {}) -}: - -assert zlibSupport -> zlib != null; - -with stdenv.lib; - -let - majorVersion = "2.6"; - minorVersion = "9"; - minorVersionSuffix = ""; - pythonVersion = majorVersion; - version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; - libPrefix = "python${majorVersion}"; - - src = fetchurl { - url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0hbfs2691b60c7arbysbzr0w9528d5pl8a4x7mq5psh6a2cvprya"; - }; - - patches = - [ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff. - ./search-path.patch - - # Python recompiles a Python if the mtime stored *in* the - # pyc/pyo file differs from the mtime of the source file. This - # doesn't work in Nix because Nix changes the mtime of files in - # the Nix store to 1. So treat that as a special case. - ./nix-store-mtime.patch - - # http://bugs.python.org/issue10013 - ./python2.6-fix-parallel-make.patch - ]; - - preConfigure = '' - # Purity. - for i in /usr /sw /opt /pkg; do - substituteInPlace ./setup.py --replace $i /no-such-path - done - '' + optionalString (stdenv ? cc && stdenv.cc.libc != null) '' - for i in Lib/plat-*/regen; do - substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/ - done - '' + optionalString stdenv.isCygwin '' - # On Cygwin, `make install' tries to read this Makefile. - mkdir -p $out/lib/python${majorVersion}/config - touch $out/lib/python${majorVersion}/config/Makefile - mkdir -p $out/include/python${majorVersion} - touch $out/include/python${majorVersion}/pyconfig.h - ''; - - configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4"; - - buildInputs = - optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ - [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ] - ++ optional zlibSupport zlib; - - mkPaths = paths: { - C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; - LIBRARY_PATH = makeLibraryPath paths; - }; - - # Build the basic Python interpreter without modules that have - # external dependencies. - python = stdenv.mkDerivation { - name = "python${if includeModules then "" else "-minimal"}-${version}"; - pythonVersion = majorVersion; - - inherit majorVersion version src patches buildInputs preConfigure - configureFlags; - - inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; - - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; - - setupHook = ./setup-hook.sh; - - postInstall = - '' - # needed for some packages, especially packages that backport - # functionality to 2.x from 3.x - for item in $out/lib/python${majorVersion}/test/*; do - if [[ "$item" != */test_support.py* ]]; then - rm -rf "$item" - fi - done - touch $out/lib/python${majorVersion}/test/__init__.py - ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb - ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} - mv $out/share/man/man1/{python.1,python2.6.1} - ln -s $out/share/man/man1/{python2.6.1,python.1} - - paxmark E $out/bin/python${majorVersion} - - # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 - echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py - - ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} - ''; - - passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; - in rec { - inherit libPrefix; - inherit zlibSupport; - isPy2 = true; - isPy26 = true; - buildEnv = callPackage ../../wrapper.nix { python = self; }; - withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; - pkgs = pythonPackages; - executable = libPrefix; - sitePackages = "lib/${libPrefix}/site-packages"; - interpreter = "${self}/bin/${executable}"; - }; - - enableParallelBuilding = true; - - meta = { - homepage = "http://python.org"; - description = "A high-level dynamically-typed programming language"; - longDescription = '' - Python is a remarkably powerful dynamic programming language that - is used in a wide variety of application domains. Some of its key - distinguishing features include: clear, readable syntax; strong - introspection capabilities; intuitive object orientation; natural - expression of procedural code; full modularity, supporting - hierarchical packages; exception-based error handling; and very - high level dynamic data types. - ''; - license = stdenv.lib.licenses.psfl; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ chaoflow domenkozar ]; - # If you want to use Python 2.6, remove "broken = true;" at your own - # risk. Python 2.6 has known security vulnerabilities is not receiving - # security updates as of October 2013. - broken = true; - }; - }; - - - # This function builds a Python module included in the main Python - # distribution in a separate derivation. - buildInternalPythonModule = - { moduleName - , internalName ? "_" + moduleName - , deps - }: - if includeModules then null else stdenv.mkDerivation rec { - name = "python-${moduleName}-${python.version}"; - - inherit src patches preConfigure configureFlags; - - buildInputs = [ python ] ++ deps; - - inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; - - buildPhase = - '' - substituteInPlace setup.py --replace 'self.extensions = extensions' \ - 'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]' - - python ./setup.py build_ext - [ -z "$(find build -name '*_failed.so' -print)" ] - ''; - - installPhase = - '' - dest=$out/lib/${python.libPrefix}/site-packages - mkdir -p $dest - cp -p $(find . -name "*.${if stdenv.isCygwin then "dll" else "so"}") $dest/ - ''; - }; - - - # The Python modules included in the main Python distribution, built - # as separate derivations. - modules = { - - bsddb = buildInternalPythonModule { - moduleName = "bsddb"; - deps = [ db ]; - }; - - crypt = buildInternalPythonModule { - moduleName = "crypt"; - internalName = "crypt"; - deps = optional (stdenv ? glibc) stdenv.glibc; - }; - - curses = buildInternalPythonModule { - moduleName = "curses"; - deps = [ ncurses ]; - }; - - curses_panel = buildInternalPythonModule { - moduleName = "curses_panel"; - deps = [ ncurses modules.curses ]; - }; - - gdbm = buildInternalPythonModule { - moduleName = "gdbm"; - internalName = "gdbm"; - deps = [ gdbm ]; - }; - - sqlite3 = buildInternalPythonModule { - moduleName = "sqlite3"; - deps = [ sqlite ]; - }; - - tkinter = buildInternalPythonModule { - moduleName = "tkinter"; - deps = [ tcl tk xlibsWrapper ]; - }; - - readline = buildInternalPythonModule { - moduleName = "readline"; - internalName = "readline"; - deps = [ readline ]; - }; - - }; - -in python // { inherit modules; } diff --git a/pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch b/pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch deleted file mode 100644 index 83f3fea1931..00000000000 --- a/pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' Python-2.7.1-orig/Python/import.c Python-2.7.1/Python/import.c ---- Python-2.7.1-orig/Python/import.c 2010-05-20 20:37:55.000000000 +0200 -+++ Python-2.7.1/Python/import.c 2011-01-04 15:55:11.000000000 +0100 -@@ -751,7 +751,7 @@ - return NULL; - } - pyc_mtime = PyMarshal_ReadLongFromFile(fp); -- if (pyc_mtime != mtime) { -+ if (pyc_mtime != mtime && mtime != 1) { - if (Py_VerboseFlag) - PySys_WriteStderr("# %s has bad mtime\n", cpathname); - fclose(fp); diff --git a/pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch b/pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch deleted file mode 100644 index c43e141f9af..00000000000 --- a/pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up Python-2.7/Makefile.pre.in.fix-parallel-make Python-2.7/Makefile.pre.in ---- Python-2.7/Makefile.pre.in.fix-parallel-make 2010-07-22 15:01:39.567996932 -0400 -+++ Python-2.7/Makefile.pre.in 2010-07-22 15:47:02.437998509 -0400 -@@ -207,6 +207,7 @@ SIGNAL_OBJS= @SIGNAL_OBJS@ - - ########################################################################## - # Grammar -+GRAMMAR_STAMP= $(srcdir)/grammar-stamp - GRAMMAR_H= $(srcdir)/Include/graminit.h - GRAMMAR_C= $(srcdir)/Python/graminit.c - GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar -@@ -530,10 +531,24 @@ Modules/getpath.o: $(srcdir)/Modules/get - Modules/python.o: $(srcdir)/Modules/python.c - $(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c - -+# GNU "make" interprets rules with two dependents as two copies of the rule. -+# -+# In a parallel build this can lead to pgen being run twice, once for each of -+# GRAMMAR_H and GRAMMAR_C, leading to race conditions in which the compiler -+# reads a partially-overwritten copy of one of these files, leading to syntax -+# errors (or linker errors if the fragment happens to be syntactically valid C) -+# -+# See http://www.gnu.org/software/hello/manual/automake/Multiple-Outputs.html -+# for more information -+# -+# Introduce ".grammar-stamp" as a contrived single output from PGEN to avoid -+# this: -+$(GRAMMAR_H) $(GRAMMAR_C): $(GRAMMAR_STAMP) - --$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) -+$(GRAMMAR_STAMP): $(PGEN) $(GRAMMAR_INPUT) - -@$(INSTALL) -d Include - -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) -+ touch $(GRAMMAR_STAMP) - - $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) diff --git a/pkgs/development/interpreters/python/cpython/2.6/search-path.patch b/pkgs/development/interpreters/python/cpython/2.6/search-path.patch deleted file mode 100644 index 2e7b7526c0c..00000000000 --- a/pkgs/development/interpreters/python/cpython/2.6/search-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -rc Python-2.4.4-orig/setup.py Python-2.4.4/setup.py -*** Python-2.4.4-orig/setup.py 2006-10-08 19:41:25.000000000 +0200 ---- Python-2.4.4/setup.py 2007-05-27 16:04:54.000000000 +0200 -*************** -*** 279,288 **** - # Check for AtheOS which has libraries in non-standard locations - if platform == 'atheos': - lib_dirs += ['/system/libs', '/atheos/autolnk/lib'] -- lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) - inc_dirs += ['/system/include', '/atheos/autolnk/include'] -- inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) - - # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) - if platform in ['osf1', 'unixware7', 'openunix8']: - lib_dirs += ['/usr/ccs/lib'] ---- 279,289 ---- - # Check for AtheOS which has libraries in non-standard locations - if platform == 'atheos': - lib_dirs += ['/system/libs', '/atheos/autolnk/lib'] - inc_dirs += ['/system/include', '/atheos/autolnk/include'] - -+ lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) -+ - # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) - if platform in ['osf1', 'unixware7', 'openunix8']: - lib_dirs += ['/usr/ccs/lib'] diff --git a/pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh b/pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh deleted file mode 100644 index 4caff9c9d84..00000000000 --- a/pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh +++ /dev/null @@ -1,15 +0,0 @@ -addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.6/site-packages -} - -toPythonPath() { - local paths="$1" - local result= - for i in $paths; do - p="$i/lib/python2.6/site-packages" - result="${result}${result:+:}$p" - done - echo $result -} - -envHooks+=(addPythonPath) diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index e081a60c6bc..66bdd2a4227 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -24,7 +24,7 @@ with stdenv.lib; let majorVersion = "3.4"; - minorVersion = "5"; + minorVersion = "6"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -45,7 +45,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "12l9klp778wklxmckhghniy5hklss8r26995pyd00qbllk4b2r7f"; + sha256 = "0h2z248hkf8x1ix1z8npkqs9cq62i322sl4rcjdkp7mawsxjhd7i"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 92f9d66ea52..6e0b7614c7c 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -24,7 +24,7 @@ with stdenv.lib; let majorVersion = "3.5"; - minorVersion = "2"; + minorVersion = "3"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -45,7 +45,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0h6a5fr7ram2s483lh0pnmc4ncijb8llnpfdxdcl5dxr01hza400"; + sha256 = "1c6v1n9nz4mlx9mw1125fxpmbrgniqdbbx9hnqx44maqazb2mzpf"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.6-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-html.nix deleted file mode 100644 index 2b41f122fa9..00000000000 --- a/pkgs/development/interpreters/python/cpython/docs/2.6-html.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python26-docs-html-2.6.8"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-html.tar.bz2; - sha256 = "09kznik9ahmnrqw9gkr7mjv3b3zr258f2fm27n12hrrwwsaszkni"; - }; - installPhase = '' - mkdir -p $out/share/doc/python26 - cp -R ./ $out/share/doc/python26/html - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix deleted file mode 100644 index ec031821a03..00000000000 --- a/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python26-docs-pdf-a4-2.6.8"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-pdf-a4.tar.bz2; - sha256 = "07k8n9zhd59s1yn8ahsizkaqnv969p0f2c2acxgxrxhhyy842pp8"; - }; - installPhase = '' - mkdir -p $out/share/doc/python26 - cp -R ./ $out/share/doc/python26/pdf-a4 - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix deleted file mode 100644 index 7cacf777834..00000000000 --- a/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python26-docs-pdf-letter-2.6.8"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-pdf-letter.tar.bz2; - sha256 = "01r87m8hb7f9ql4j9zcjcrr9150nsk23sj8cy02vygr83sc1ldmq"; - }; - installPhase = '' - mkdir -p $out/share/doc/python26 - cp -R ./ $out/share/doc/python26/pdf-letter - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/2.6-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-text.nix deleted file mode 100644 index eb394a3f3e2..00000000000 --- a/pkgs/development/interpreters/python/cpython/docs/2.6-text.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python26-docs-text-2.6.8"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-text.tar.bz2; - sha256 = "05wsdh6ilgkclgak09fq7fsx5kflkmqq8dyxi2rpydx289cw3a8c"; - }; - installPhase = '' - mkdir -p $out/share/doc/python26 - cp -R ./ $out/share/doc/python26/text - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/default.nix b/pkgs/development/interpreters/python/cpython/docs/default.nix index 8f5fc810fb7..89e60f961f6 100644 --- a/pkgs/development/interpreters/python/cpython/docs/default.nix +++ b/pkgs/development/interpreters/python/cpython/docs/default.nix @@ -10,9 +10,6 @@ pythonDocs = { python27 = import ./2.7-html.nix { inherit stdenv fetchurl lib; }; - python26 = import ./2.6-html.nix { - inherit stdenv fetchurl lib; - }; }; pdf_a4 = { recurseForDerivations = true; @@ -22,9 +19,6 @@ pythonDocs = { python27 = import ./2.7-pdf-a4.nix { inherit stdenv fetchurl lib; }; - python26 = import ./2.6-pdf-a4.nix { - inherit stdenv fetchurl lib; - }; }; pdf_letter = { recurseForDerivations = true; @@ -34,9 +28,6 @@ pythonDocs = { python27 = import ./2.7-pdf-letter.nix { inherit stdenv fetchurl lib; }; - python26 = import ./2.6-pdf-letter.nix { - inherit stdenv fetchurl lib; - }; }; text = { recurseForDerivations = true; @@ -46,8 +37,5 @@ pythonDocs = { python27 = import ./2.7-text.nix { inherit stdenv fetchurl lib; }; - python26 = import ./2.6-text.nix { - inherit stdenv fetchurl lib; - }; }; }; in pythonDocs diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index 163c3847db9..456a078874c 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -15,11 +15,9 @@ let version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "pypy${majorVersion}"; - pypy = stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { name = "pypy-${version}"; - pythonVersion = "2.7"; - - inherit majorVersion version; + inherit majorVersion version pythonVersion; src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; @@ -146,6 +144,4 @@ let platforms = platforms.linux; maintainers = with maintainers; [ domenkozar ]; }; - }; - -in pypy +} diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index c7472076814..2bf7ec5d2df 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -32,11 +32,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.7"; + version = "6.8"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "0v1nz07vzz0c7rwyz15kbagpl4l42n871vbwij4wrbk2lx22ksgy"; + sha256 = "1l9z1a0r5zydr50cklx9xjw3l0pwnf64i10xq7112fl1r89q3qgv"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 210570ad846..83e8f1d0030 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "rakudo-star-${version}"; - version = "2016.07"; + version = "2017.01"; src = fetchurl { url = "http://rakudo.org/downloads/star/${name}.tar.gz"; - sha256 = "0czx7w1chf108mpyps7k7nqq8cbsy1rbb87ajms9xj65l4ywg8ka"; + sha256 = "07zjqdzxm30pmjqwlnr669d75bsbimy09sk0dvgm0pnn3zr92fjq"; }; buildInputs = [ icu zlib gmp readline perl ] @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "http://www.rakudo.org"; license = licenses.artistic2; platforms = platforms.unix; - maintainers = [ maintainers.thoughtpolice maintainers.vrthra ]; + maintainers = with maintainers; [ thoughtpolice vrthra ]; }; } diff --git a/pkgs/development/interpreters/ruby/bitperfect-rdoc.patch b/pkgs/development/interpreters/ruby/bitperfect-rdoc.patch deleted file mode 100644 index d5fb9e4554f..00000000000 --- a/pkgs/development/interpreters/ruby/bitperfect-rdoc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -r -u orig/lib/rdoc/generator/template/darkfish/filepage.rhtml new/lib/rdoc/generator/template/darkfish/filepage.rhtml ---- orig/lib/rdoc/generator/template/darkfish/filepage.rhtml -+++ new/lib/rdoc/generator/template/darkfish/filepage.rhtml -@@ -88,9 +88,6 @@ - -
-
--
Last Modified
--
<%= file.last_modified %>
-- - <% if file.requires %> -
Requires
-
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index d5f3a6d3990..98be02da3b2 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -180,14 +180,6 @@ let ) args; in self; in { - ruby_1_9_3 = generic { - version = rubyVersion "1" "9" "3" "p551"; - sha256 = { - src = "1s2ibg3s2iflzdv7rfxi1qqkvdbn2dq8gxdn0nxrb77ls5ffanxv"; - git = "1r9xzzxmci2ajb34qb4y1w424mz878zdgzxkfp9w60agldxnb36s"; - }; - }; - ruby_2_0_0 = generic { version = rubyVersion "2" "0" "0" "p647"; sha256 = { diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index a3aeaf6a8ba..f1b82210aec 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,32 +1,6 @@ { patchSet, useRailsExpress, ops, patchLevel }: rec { - "1.9.3" = [ - ./ssl_v3.patch - ./rand-egd.patch - ./ruby19-parallel-install.patch - ./bitperfect-rdoc.patch - ] ++ ops useRailsExpress [ - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/01-fix-make-clean.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/02-zero-broken-tests.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/03-railsbench-gc.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/04-display-more-detailed-stack-trace.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/05-fork-support-for-gc-logging.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/06-track-live-dataset-size.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/07-webrick_204_304_keep_alive_fix.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/08-export-a-few-more-symbols-for-ruby-prof.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/09-thread-variables.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/10-faster-loading.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/11-falcon-st-opt.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/12-falcon-sparse-array.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/13-falcon-array-queue.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/14-railsbench-gc-fixes.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/15-show-full-backtrace-on-stack-overflow.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/16-configurable-fiber-stack-sizes.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/17-backport-psych-20.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/18-fix-missing-c-return-event.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/19-fix-process-daemon-call.patch" - ]; "2.0.0" = [ ./ssl_v3.patch ./rand-egd.patch diff --git a/pkgs/development/interpreters/ruby/ruby19-parallel-install.patch b/pkgs/development/interpreters/ruby/ruby19-parallel-install.patch deleted file mode 100644 index bb806350873..00000000000 --- a/pkgs/development/interpreters/ruby/ruby19-parallel-install.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: ruby-1.9.3-p392/lib/mkmf.rb -=================================================================== ---- ruby-1.9.3-p392.orig/lib/mkmf.rb -+++ ruby-1.9.3-p392/lib/mkmf.rb -@@ -2039,8 +2039,8 @@ static: $(STATIC_LIB)#{$extout ? " insta - end - for f in files - dest = "#{dir}/#{File.basename(f)}" -- mfile.print("install-rb#{sfx}: #{dest} #{dir}\n") -- mfile.print("#{dest}: #{f}\n") -+ mfile.print("install-rb#{sfx}: #{dest}\n") -+ mfile.print("#{dest}: #{f} #{timestamp_file(dir)}\n") - mfile.print("\t$(Q) $(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n") - if defined?($installed_list) and !$extout - mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n") diff --git a/pkgs/development/interpreters/ruby/ruby22-rand-egd.patch b/pkgs/development/interpreters/ruby/ruby22-rand-egd.patch deleted file mode 100644 index ebf2bf56fcf..00000000000 --- a/pkgs/development/interpreters/ruby/ruby22-rand-egd.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb -index e272cba..3a1fa71 100644 ---- a/ext/openssl/extconf.rb -+++ b/ext/openssl/extconf.rb -@@ -87,6 +87,7 @@ - have_func("PEM_def_callback") - have_func("PKCS5_PBKDF2_HMAC") - have_func("PKCS5_PBKDF2_HMAC_SHA1") -+have_func("RAND_egd") - have_func("X509V3_set_nconf") - have_func("X509V3_EXT_nconf_nid") - have_func("X509_CRL_add0_revoked") -diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c -index 29cbf8c..27466fe 100644 ---- a/ext/openssl/ossl_rand.c -+++ b/ext/openssl/ossl_rand.c -@@ -148,6 +148,7 @@ ossl_rand_pseudo_bytes(VALUE self, VALUE len) - return str; - } - -+#ifdef HAVE_RAND_EGD - /* - * call-seq: - * egd(filename) -> true -@@ -186,6 +187,7 @@ ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len) - } - return Qtrue; - } -+#endif /* HAVE_RAND_EGD */ - - /* - * call-seq: -@@ -219,8 +221,10 @@ Init_ossl_rand(void) - rb_define_module_function(mRandom, "write_random_file", ossl_rand_write_file, 1); - rb_define_module_function(mRandom, "random_bytes", ossl_rand_bytes, 1); - rb_define_module_function(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1); -+#ifdef HAVE_RAND_EGD - rb_define_module_function(mRandom, "egd", ossl_rand_egd, 1); - rb_define_module_function(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2); -+#endif /* HAVE_RAND_EGD */ - rb_define_module_function(mRandom, "status?", ossl_rand_status, 0); - } diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 3c5eef01db0..ed09ac7467d 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, autoconf213, fetchurl, pkgconfig, nspr, perl, python2, zip }: +{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }: stdenv.mkDerivation rec { name = "spidermonkey-${version}"; @@ -22,7 +22,13 @@ stdenv.mkDerivation rec { ${lib.optionalString stdenv.isArm "autoreconf --verbose --force"} ''; - patches = stdenv.lib.optionals stdenv.isArm [ + patches = [ + (fetchpatch { + name = "gcc6.patch"; + url = "https://anonscm.debian.org/cgit/collab-maint/mozjs.git/plain/debian/patches/fix-811665.patch?id=00b15c7841968ab4f7fec409a6b93fa5e1e1d32e"; + sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99"; + }) + ] ++ stdenv.lib.optionals stdenv.isArm [ # Explained below in configureFlags for ARM ./1.8.5-findvanilla.patch # Fix for hard float flags. diff --git a/pkgs/development/interpreters/spidermonkey/17.nix b/pkgs/development/interpreters/spidermonkey/17.nix index a2ecfb2ef97..33acb792f76 100644 --- a/pkgs/development/interpreters/spidermonkey/17.nix +++ b/pkgs/development/interpreters/spidermonkey/17.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { postPatch = '' # Fixes an issue with version detection under perl 5.22.x sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl + '' + stdenv.lib.optionalString stdenv.isAarch64 '' + patch -p1 -d ../.. < ${./aarch64-double-conversion.patch} + patch -p1 -d ../.. < ${./aarch64-48bit-va-fix.patch} ''; preConfigure = '' diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix index b4823817d4b..e2a4ad2e302 100644 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; - homepage = https://developer.mozilla.org/en/SpiderMonkey; + homepage = "https://developer.mozilla.org/en/SpiderMonkey"; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/development/interpreters/spidermonkey/aarch64-48bit-va-fix.patch b/pkgs/development/interpreters/spidermonkey/aarch64-48bit-va-fix.patch new file mode 100644 index 00000000000..8258a46b174 --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/aarch64-48bit-va-fix.patch @@ -0,0 +1,106 @@ +From a0c0f32299419359b44ac0f880c1ea9073ae51e1 Mon Sep 17 00:00:00 2001 +From: Zheng Xu +Date: Fri, 02 Sep 2016 17:40:05 +0800 +Subject: [PATCH] Bug 1143022 - Manually mmap on arm64 to ensure high 17 bits are clear. r=ehoogeveen + +There might be 48-bit VA on arm64 depending on kernel configuration. +Manually mmap heap memory to align with the assumption made by JS engine. + +Change-Id: Ic5d2b2fe4b758b3c87cc0688348af7e71a991146 +--- + +diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp +index 5b386a2..38101cf 100644 +--- a/js/src/gc/Memory.cpp ++++ b/js/src/gc/Memory.cpp +@@ -309,6 +309,75 @@ + #endif + } + ++static inline void * ++MapMemory(size_t length, int prot, int flags, int fd, off_t offset) ++{ ++#if defined(__ia64__) ++ /* ++ * The JS engine assumes that all allocated pointers have their high 17 bits clear, ++ * which ia64's mmap doesn't support directly. However, we can emulate it by passing ++ * mmap an "addr" parameter with those bits clear. The mmap will return that address, ++ * or the nearest available memory above that address, providing a near-guarantee ++ * that those bits are clear. If they are not, we return NULL below to indicate ++ * out-of-memory. ++ * ++ * The addr is chosen as 0x0000070000000000, which still allows about 120TB of virtual ++ * address space. ++ * ++ * See Bug 589735 for more information. ++ */ ++ void *region = mmap((void*)0x0000070000000000, length, prot, flags, fd, offset); ++ if (region == MAP_FAILED) ++ return MAP_FAILED; ++ /* ++ * If the allocated memory doesn't have its upper 17 bits clear, consider it ++ * as out of memory. ++ */ ++ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) { ++ JS_ALWAYS_TRUE(0 == munmap(region, length)); ++ return MAP_FAILED; ++ } ++ return region; ++#elif defined(__aarch64__) ++ /* ++ * There might be similar virtual address issue on arm64 which depends on ++ * hardware and kernel configurations. But the work around is slightly ++ * different due to the different mmap behavior. ++ * ++ * TODO: Merge with the above code block if this implementation works for ++ * ia64 and sparc64. ++ */ ++ const uintptr_t start = (uintptr_t)(0x0000070000000000UL); ++ const uintptr_t end = (uintptr_t)(0x0000800000000000UL); ++ const uintptr_t step = ChunkSize; ++ /* ++ * Optimization options if there are too many retries in practice: ++ * 1. Examine /proc/self/maps to find an available address. This file is ++ * not always available, however. In addition, even if we examine ++ * /proc/self/maps, we may still need to retry several times due to ++ * racing with other threads. ++ * 2. Use a global/static variable with lock to track the addresses we have ++ * allocated or tried. ++ */ ++ uintptr_t hint; ++ void* region = MAP_FAILED; ++ for (hint = start; region == MAP_FAILED && hint + length <= end; hint += step) { ++ region = mmap((void*)hint, length, prot, flags, fd, offset); ++ if (region != MAP_FAILED) { ++ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) { ++ if (munmap(region, length)) { ++ MOZ_ASSERT(errno == ENOMEM); ++ } ++ region = MAP_FAILED; ++ } ++ } ++ } ++ return region == MAP_FAILED ? NULL : region; ++#else ++ return mmap(NULL, length, prot, flags, fd, offset); ++#endif ++} ++ + void * + MapAlignedPages(size_t size, size_t alignment) + { +@@ -322,12 +391,12 @@ + + /* Special case: If we want page alignment, no further work is needed. */ + if (alignment == PageSize) { +- return mmap(NULL, size, prot, flags, -1, 0); ++ return MapMemory(size, prot, flags, -1, 0); + } + + /* Overallocate and unmap the region's edges. */ + size_t reqSize = Min(size + 2 * alignment, 2 * size); +- void *region = mmap(NULL, reqSize, prot, flags, -1, 0); ++ void *region = MapMemory(reqSize, prot, flags, -1, 0); + if (region == MAP_FAILED) + return NULL; + diff --git a/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch b/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch new file mode 100644 index 00000000000..bf41ce0a8a2 --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch @@ -0,0 +1,13 @@ +diff -ru mozjs17.0.0-orig/mfbt/double-conversion/utils.h mozjs17.0.0/mfbt/double-conversion/utils.h +--- mozjs17.0.0-orig/mfbt/double-conversion/utils.h 2013-02-11 17:33:28.000000000 -0500 ++++ mozjs17.0.0/mfbt/double-conversion/utils.h 2016-12-03 20:39:07.915042988 -0500 +@@ -58,7 +58,8 @@ + defined(__mips__) || defined(__powerpc__) || \ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ +- defined(_MIPS_ARCH_MIPS32R2) ++ defined(_MIPS_ARCH_MIPS32R2) || \ ++ defined(__AARCH64EL__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) + #if defined(_WIN32) diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index fb61233dfcb..8330dada4d3 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { # Workaround X11 bug to allow changing gamma # Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222 (fetchpatch { + name = "SDL_SetGamma.patch"; url = "http://pkgs.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d"; sha256 = "0x52s4328kilyq43i7psqkqg7chsfwh0aawr50j566nzd7j51dlv"; }) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index c25b0642637..719329bd528 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { name = "SDL2-${version}"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "http://www.libsdl.org/release/${name}.tar.gz"; - sha256 = "0jqp46mxxbh9lhpx1ih6sp93k752j2smhpc0ad0q4cb3px0famfs"; + sha256 = "11c75qj1qxmx67iwkvf9z4x69phk301pdn86zzr6jncnap7kh824"; }; outputs = [ "out" "dev" ]; @@ -52,6 +52,8 @@ stdenv.mkDerivation rec { # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 dontDisableStatic = true; + enableParallelBuilding = true; + # XXX: By default, SDL wants to dlopen() PulseAudio, in which case # we must arrange to add it to its RPATH; however, `patchelf' seems # to fail at doing this, hence `--disable-pulseaudio-shared'. @@ -62,6 +64,7 @@ stdenv.mkDerivation rec { }; postInstall = '' + moveToOutput lib/libSDL2main.a "$dev" rm $out/lib/*.a moveToOutput bin/sdl2-config "$dev" ''; diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index 7f5767d2818..8b7dddf0e15 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -1,29 +1,20 @@ -{ stdenv, fetchgit, zlib, curl, expat, fuse, openssl -, autoconf, automake, libtool, python +{ stdenv, fetchFromGitHub, zlib, curl, expat, fuse, openssl +, autoreconfHook, python }: stdenv.mkDerivation rec { - version = "3.7.6"; + version = "3.7.15"; name = "afflib-${version}"; - src = fetchgit { - url = "https://github.com/sshock/AFFLIBv3/"; - rev = "refs/tags/v${version}"; - sha256 = "08www22njllqz1j3jkmgn1p36sifxrjd6qlsa7ch4kqy4jaaka1k"; - name = "afflib-${version}-checkout"; + src = fetchFromGitHub { + owner = "sshock"; + repo = "AFFLIBv3"; + rev = "v${version}"; + sha256 = "0ckg49m15lz5cxg0k12z2ys6v4smjr6l8bbazrvsqlm649gwd2bw"; }; - buildInputs = [ zlib curl expat fuse openssl - libtool autoconf automake python - ]; + buildInputs = [ zlib curl expat fuse openssl autoreconfHook python ]; - preConfigure = '' - libtoolize -f - autoheader -f - aclocal - automake --add-missing -c - autoconf -f - ''; meta = { homepage = http://afflib.sourceforge.net/; diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index 24ba50387a4..eb2fa2927ca 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -1,14 +1,14 @@ { stdenv, agda, fetchFromGitHub, ghcWithPackages }: agda.mkDerivation (self: rec { - version = "0.12"; + version = "0.13"; name = "agda-stdlib-${version}"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "1n5hn3xa0bqyq8rjvfsfmh6z3l8rr4z3s7gyfmf3kiv9f235bnd2"; + sha256 = "156xbqvqjck9izz613v52ppwk8s1y0kv7xkjpcm16vys2c3bh0x5"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 62b5ddf8011..7f173b21156 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5-cpp }: +{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "7.200.2"; + version = "7.700.0"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1yvx75caks477jqwx5gspi6946jialddk00wdvg6dnh5wdi2xasm"; + sha256 = "152x274hd3f59xgd27k9d3ikwb3w62v1v5hpw4lp1yzdyy8980pr"; }; - buildInputs = [ cmake openblasCompat superlu hdf5-cpp ]; + buildInputs = [ cmake openblasCompat superlu hdf5 ]; cmakeFlags = [ "-DDETECT_HDF5=ON" ]; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = http://arma.sourceforge.net; license = licenses.mpl20; platforms = platforms.unix; - maintainers = [ maintainers.juliendehos ]; + maintainers = with maintainers; [ juliendehos knedlsepp ]; }; } diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index be61640553d..fc6b47e8a63 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -28,6 +28,15 @@ let in { + ca = buildDict { + shortName = "ca-2.1.5-1"; + fullName = "Catalan"; + src = fetchurl { + url = mirror://gnu/aspell/dict/ca/aspell6-ca-2.1.5-1.tar.bz2; + sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; + }; + }; + cs = buildDict { shortName = "cs-20040614-1"; fullName = "Czech"; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 518f89092ab..8864d710174 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,15 +1,24 @@ -{ stdenv, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom, qt4 }: +{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom +, withQt4 ? true, qt4 ? null +, withQt5 ? false, qt5 ? null }: + +# I haven't found an XOR operator in nix... +assert withQt4 || withQt5; +assert !(withQt4 && withQt5); stdenv.mkDerivation rec { - name = "suil-${version}"; - version = "0.8.2"; + pname = "suil"; + version = "0.8.4"; + name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1s3adyiw7sa5gfvm5wasa61qa23629kprxyv6w8hbxdiwp0hhxkq"; + url = "http://download.drobilla.net/${pname}-${version}.tar.bz2"; + sha256 = "1kji3lhha26qr6xm9j8ic5c40zbrrb5qnwm2qxzmsfxgmrz29wkf"; }; - buildInputs = [ gtk2 lv2 pkgconfig python qt4 serd sord sratom ]; + buildInputs = [ gtk2 lv2 pkgconfig python serd sord sratom ] + ++ (lib.optionals withQt4 [ qt4 ]) + ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); configurePhase = "python waf configure --prefix=$out"; @@ -21,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://drobilla.net/software/suil; description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index c76115000cb..78867881dc3 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind"; }; - patches = [ ./CVE-2015-7747.patch ]; + patches = [ ./CVE-2015-7747.patch ./gcc-6.patch ]; meta = with stdenv.lib; { description = "Library for reading and writing audio files in various formats"; diff --git a/pkgs/development/libraries/audiofile/gcc-6.patch b/pkgs/development/libraries/audiofile/gcc-6.patch new file mode 100644 index 00000000000..1a7edd5af9a --- /dev/null +++ b/pkgs/development/libraries/audiofile/gcc-6.patch @@ -0,0 +1,30 @@ +http://patchwork.ozlabs.org/patch/630200/ + +From 28cfdbbcb96a69087c3d21faf69b5eae7bcf6d69 Mon Sep 17 00:00:00 2001 +From: Hodorgasm +Date: Wed, 11 May 2016 21:42:07 -0400 +Subject: [PATCH] Cast to unsigned while left bit-shifting + +GCC-6 now treats the left bitwise-shift of a negative integer as nonconformant so explicitly cast to an unsigned int while bit-shifting. + +Downloaded from upstream PR: +https://github.com/mpruett/audiofile/pull/28 + +Signed-off-by: Bernd Kuhls +--- + libaudiofile/modules/SimpleModule.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libaudiofile/modules/SimpleModule.h b/libaudiofile/modules/SimpleModule.h +index 03c6c69..4014fb2 100644 +--- a/libaudiofile/modules/SimpleModule.h ++++ b/libaudiofile/modules/SimpleModule.h +@@ -123,7 +123,7 @@ struct signConverter + typedef typename IntTypes::UnsignedType UnsignedType; + + static const int kScaleBits = (Format + 1) * CHAR_BIT - 1; +- static const int kMinSignedValue = -1 << kScaleBits; ++ static const int kMinSignedValue = static_cast(static_cast(-1) << kScaleBits);; + + struct signedToUnsigned : public std::unary_function + { diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 54d490b77af..a47e740be95 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -5,15 +5,22 @@ customMemoryManagement ? true }: -stdenv.mkDerivation rec { +let + loaderVar = + if stdenv.isLinux + then "LD_LIBRARY_PATH" + else if stdenv.isDarwin + then "DYLD_LIBRARY_PATH" + else throw "Unsupported system!"; +in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.0.48"; + version = "1.0.60"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "1k73ir1w6457y9mdv2xnk8cr1y1xxhzzd4095rzvn2y7fr3zgz01"; + sha256 = "0k6jv70l4xhkf2rna6zaxkxgd7xh7cc1ghzska637h5d2v6h8nzk"; }; # FIXME: might be nice to put different APIs in different outputs @@ -29,11 +36,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Behold the escaping nightmare below on loaderVar o.O preBuild = '' # Ensure that the unit tests can find the *.so files. for i in testing-resources aws-cpp-sdk-*; do - export LD_LIBRARY_PATH=$(pwd)/$i:$LD_LIBRARY_PATH + export ${loaderVar}=$(pwd)/$i:''${${loaderVar}} done ''; diff --git a/pkgs/development/libraries/boost/1.63.nix b/pkgs/development/libraries/boost/1.63.nix new file mode 100644 index 00000000000..c4749bc3ee4 --- /dev/null +++ b/pkgs/development/libraries/boost/1.63.nix @@ -0,0 +1,12 @@ +{ stdenv, callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.63.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_63_0.tar.bz2"; + # SHA256 from http://www.boost.org/users/history/version_1_63_0.html + sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0"; + }; + +}) diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index f66e7befeb0..f2971cc47be 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix (args // { baseVersion = "1.10"; - revision = "14"; - sha256 = "072czy26vfjcqjww4qccsd29fzkb6mb8czamr4x76rdi9lwhpv8h"; + revision = "15"; + sha256 = "1zkhmggzxjla2iwaiyrx5161yxckrzszmy9yghjlpnhg8zyqzk60"; extraConfigureFlags = "--with-gnump"; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 090d03a1d14..021512a40e7 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -1,37 +1,28 @@ -{ stdenv, lib, cmake, fetchFromGitHub }: +{ stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { name = "catch-${version}"; - version = "1.5.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "philsquared"; repo = "Catch"; - rev = "v" + version; - sha256 = "1ag8siafg7fmb50qdqznryrg3lvv56f09nvqwqqn2rlk83zjnaw0"; + rev = "v." + version; + sha256 = "0harki6irc4mqipjc24zyy0jimidr5ng3ss29bnpzbbwhrnkyrgm"; }; buildInputs = [ cmake ]; - dontUseCmakeConfigure = true; + cmakeFlags = [ "-DUSE_CPP14=ON" ]; - buildPhase = '' - cmake -Hprojects/CMake -BBuild -DCMAKE_BUILD_TYPE=Release -DUSE_CPP11=ON - cd Build - make - cd .. - ''; - - installPhase = '' - mkdir -p $out - mv include $out/. - ''; + doCheck = true; + checkTarget = "test"; meta = with stdenv.lib; { description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; homepage = "http://catch-lib.net"; license = licenses.boost; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ edwtjo knedlsepp ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/cil-aterm/cil-aterm-1.3.6.patch b/pkgs/development/libraries/cil-aterm/cil-aterm-1.3.6.patch deleted file mode 100644 index 97891652853..00000000000 --- a/pkgs/development/libraries/cil-aterm/cil-aterm-1.3.6.patch +++ /dev/null @@ -1,600 +0,0 @@ -diff -urN cil-1.3.6-orig/bin/CilConfig.pm.in cil-1.3.6/bin/CilConfig.pm.in ---- cil-1.3.6-orig/bin/CilConfig.pm.in 2007-02-05 22:10:29.000000000 +0100 -+++ cil-1.3.6/bin/CilConfig.pm.in 2007-03-08 15:02:06.000000000 +0100 -@@ -1,6 +1,6 @@ - - $::archos = "@ARCHOS@"; - $::cc = "@CC@"; --$::cilhome = "@CILHOME@"; -+$::cilhome = "@prefix@"; - $::default_mode = "@DEFAULT_CIL_MODE@"; - -diff -urN cil-1.3.6-orig/Makefile.in cil-1.3.6/Makefile.in ---- cil-1.3.6-orig/Makefile.in 2007-02-05 22:10:29.000000000 +0100 -+++ cil-1.3.6/Makefile.in 2007-03-05 15:10:31.000000000 +0100 -@@ -85,6 +85,7 @@ - cfg liveness reachingdefs deadcodeelim availexps \ - availexpslv predabst\ - testcil \ -+ atermprinter \ - $(CILLY_FEATURES) \ - ciloptions feature_config - # ww: we don't want "main" in an external cil library (cil.cma), -@@ -626,6 +627,8 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+bindir = @prefix@/bin -+objdir = @prefix@/$(OBJDIR) - datarootdir = @datarootdir@ - libdir = @libdir@ - pkglibdir = $(libdir)/cil -@@ -645,6 +648,11 @@ - $(INSTALL_DATA) $(install_lib) $(DESTDIR)$(pkglibdir) - $(INSTALL) -d $(DESTDIR)$(pkgdatadir) - $(INSTALL_DATA) $(addprefix lib/, $(filter %.pm, $(DISTRIB_LIB))) $(DESTDIR)$(pkgdatadir) -+ $(INSTALL) -d $(bindir) -+ $(INSTALL) -d $(objdir) -+ $(INSTALL) bin/* $(bindir) -+ $(INSTALL_DATA) lib/* $(bindir) -+ $(INSTALL) $(OBJDIR)/*.exe $(objdir) - - cil.spec: cil.spec.in - ./config.status $@ -diff -urN cil-1.3.6-orig/ocamlutil/Makefile.ocaml cil-1.3.6/ocamlutil/Makefile.ocaml ---- cil-1.3.6-orig/ocamlutil/Makefile.ocaml 2007-02-05 22:10:29.000000000 +0100 -+++ cil-1.3.6/ocamlutil/Makefile.ocaml 2007-03-05 15:14:01.000000000 +0100 -@@ -192,20 +192,10 @@ - # $(AT) - put this before shell commands which are to be executed, - # and also printed in style 2 - # $(ECHO) - use in place of '@' for things not printed in either style --ifdef ECHOSTYLE_SCOTT -- # 'true' silently consumes its arguments, whereas 'echo' prints them -- NARRATIVE := true -- COMMAND := echo -- AT := -- ECHO := @ --else -- NARRATIVE := echo -- COMMAND := true -- # change these next two definitions to to echo everything, -- # or leave as @ to suppress echoing -- AT := @ -- ECHO := @ --endif -+NARRATIVE := true -+COMMAND := echo -+AT := -+ECHO := @ - - ifdef PREPROC - COMPILEFLAGS += -pp "$(PREPROC)$" -diff -urN cil-1.3.6-orig/src/ext/atermprinter.ml cil-1.3.6/src/ext/atermprinter.ml ---- cil-1.3.6-orig/src/ext/atermprinter.ml 1970-01-01 01:00:00.000000000 +0100 -+++ cil-1.3.6/src/ext/atermprinter.ml 2007-03-05 16:48:08.000000000 +0100 -@@ -0,0 +1,514 @@ -+open Cil -+open Pretty -+open List -+open String -+open Printf -+module S = String -+module E = Errormsg -+module H = Hashtbl -+module IH = Inthash -+ -+let outputfilename = ref "cil.aterm" -+let trace p = eprintf "%s" (p ^ "\n") ; flush stderr -+let invalidStmt = mkStmt (Instr []) -+let id = fun x -> x -+let compose f g x = (f (g x)) -+let (@) = compose -+let pSpace = text " " -+let foldl1 op ls = match ls with -+ | (x::xs) -> fold_left op x xs -+ | _ -> raise (Invalid_argument "foldl1 should not take an empty list") -+let pPacked d l r = l ++ d ++ r -+let pParens d = pPacked d (text "(") (text ")") -+let pBraced d = pPacked d (text "{") (text "}") -+let pSquared d = pPacked d (text "[") (text "]") -+let pSpaced d = pPacked d pSpace pSpace -+let pBool b = (pSpaced @ text @ S.capitalize @ string_of_bool) b -+let pInt64 i = text (Int64.to_string i) -+let pSeqSep sep xs = match xs with -+ | [] -> nil -+ | _ -> foldl1 (pPacked sep) xs -+let pCommaSep xs = pSeqSep (text ",") xs -+let pPair (a,b) = (pSpaced @ pParens @ pCommaSep) [a;b] -+let pTriplet (a,b,c) = (pSpaced @ pParens @ pCommaSep) [a;b;c] -+let pSemiColSep xs = pSeqSep (text ";") xs -+let pTriple f g h (a,b,c) = (f a, g b, h c) -+let pDouble f g (a,b) = (f a, g b) -+let pOption p m = match m with -+ | None -> text "None()" -+ | Some v -> text "Some" ++ pParens( p v ) -+let pSpParens = pSpaced @ pParens -+let pQuoted str = pPacked (text(escaped str)) (text "\"") (text "\"") -+let pList = pSpaced @ pSquared @ pCommaSep -+let pRecord = pSpaced @ pBraced @ pCommaSep -+ -+class atermPrinter : cilPrinter = -+object (self) -+ inherit defaultCilPrinterClass -+ -+ (* printing variable declarations; just store the varinfo *) -+ method pVDecl () (vinfo:varinfo) : doc = if !E.verboseFlag then trace "pVDecl" -+ ; self#pp_varinfo vinfo -+ (* printing variable uses; same as declarations; store the varinfo *) -+ method pVar (vinfo:varinfo) : doc = if !E.verboseFlag then trace "pVar" ; -+ self#pp_varinfo vinfo -+ -+ method pLval () ((lh, off):lval) : doc = if !E.verboseFlag then trace "pLvalue" ; -+ text "Lvalue" ++ (pParens @ pCommaSep) [ self#pp_lhost lh ; self#pOffset nil off ] -+ -+ (** we are not using the first argument which represents the base from which we are -+ offsetting, because we just want to generate a tree view of the CIL tree. For a tree view -+ this base case is not necessary **) -+ method pOffset (d:doc) (o:offset) : doc = if !E.verboseFlag then trace "pOffset" ; -+ match o with -+ | NoOffset -> text "Offset_NoOffset() " -+ | Field (finfo, off) -> text "Offset_Field" ++ (pParens @ pCommaSep) [ (self#pFieldDecl ()) finfo ; self#pOffset nil off ] -+ | Index (e, off) -> text "Offset_Index" ++ (pParens @ pCommaSep) [ self#pExp () e ; self#pOffset nil off ] -+ -+ (*** INSTRUCTIONS ***) -+ method pInstr () (i:instr) : doc = if !E.verboseFlag then trace "pInstr" ; -+ match i with -+ | Set (lv,e,l) -> text "Set" ++ (pParens @ pCommaSep) [ -+ self#pLval () lv ; -+ self#pExp () e ; -+ self#pp_location l ] -+ | Call (olv,e, elst, l) -> text "Call" ++ (pParens @ pCommaSep) [ -+ pOption (self#pLval ()) olv ; -+ self#pExp () e ; -+ pList (map (self#pExp ()) elst) ; -+ self#pp_location l] -+ | Asm (attr, slst1, outs, ins, slst2, l) -> text "Asm" ++ (pParens @ pCommaSep) [ -+ self#pAttrs () attr ; -+ (pList @ map pQuoted) slst1 ; -+ (pList @ ( map ( pTriplet -+ @ (pTriple (pOption (pQuoted)) (pQuoted) (self#pLval ())) -+ ) -+ ) ) outs ; -+ (pList @ ( map ( pTriplet -+ @ (pTriple (pOption (pQuoted)) (pQuoted) (self#pExp ())) -+ ) -+ ) ) ins ; -+ (pList @ map pQuoted) slst2 ; -+ self#pp_location l] -+ -+ -+ -+ (* a statement itself is just a record of info about the statement -+ the different kinds of statements can be found at pStmtKind *) -+ method pStmt () (s:stmt) : doc = if !E.verboseFlag then trace "pStmt" ; -+ self#pp_stmtinfo s -+ method dStmt (out:out_channel) (i:int) (s:stmt) : unit = fprint out i (self#pStmt () s) -+ -+ (* a block is just a record of info about the block of interest. -+ the real block is a stmtkind (see pStmtKind) *) -+ method dBlock (out:out_channel) (i:int) (b:block) : unit = fprint out i (self#pBlock () b) -+ method pBlock () (b:block) : doc = if !E.verboseFlag then trace "pBlock" ; -+ self#pp_blockinfo b -+ -+ (*** GLOBALS ***) -+ method pGlobal () (g:global) : doc = if !E.verboseFlag then trace "pGlobal" ; (* global (vars, types, etc.) *) -+ match g with -+ | GType (typ , l) -> text "GlobalType" ++ (pParens @ pCommaSep) [ self#pp_typeinfo typ ; self#pp_location l ] -+ | GCompTag (comp, l) -> text "GlobalCompTag" ++ (pParens @ pCommaSep) [ self#pp_compinfo comp ; self#pp_location l ] -+ | GCompTagDecl (comp, l) -> text "GlobalCompTagDecl" ++ (pParens @ pCommaSep) [ self#pp_compinfo comp ; self#pp_location l ] -+ | GEnumTag (enum, l) -> text "GlobalEnumTag" ++ (pParens @ pCommaSep) [ self#pp_enuminfo enum ; self#pp_location l ] -+ | GEnumTagDecl (enum, l) -> text "GlobalEnumTagDecl" ++ (pParens @ pCommaSep) [ self#pp_enuminfo enum ; self#pp_location l ] -+ | GVarDecl (vinf, l) -> text "GlobalVarDecl" ++ (pParens @ pCommaSep) [ self#pp_varinfo vinf ; self#pp_location l ] -+ | GVar (vinf, iinf, l) -> text "GlobalVar" ++ (pParens @ pCommaSep) [ self#pp_varinfo vinf ; self#pp_initinfo iinf ; self#pp_location l ] -+ | GFun (fdec, l) -> text "GlobalFun" ++ (pParens @ pCommaSep) [ self#pp_fundec fdec ; self#pp_location l ] -+ | GAsm (str , l) -> text "GlobalAsm" ++ (pParens @ pCommaSep) [ pQuoted str ; self#pp_location l ] -+ | GPragma (attr, l) -> text "GlobalPragma" ++ (pParens @ pCommaSep) [ (fun (doc1, bool1) -> doc1) (self#pAttr attr) -+ ; self#pp_location l -+ ] -+ | GText str -> text "GlobalText" ++ pParens( pQuoted str) -+ method dGlobal (out:out_channel) (g:global) : unit = fprint out 80 (self#pGlobal () g) -+ -+ (* a fielddecl is just a record containing info about the decl *) -+ method pFieldDecl () : fieldinfo -> doc = if !E.verboseFlag then trace "pFieldDecl" ; -+ self#pp_fieldinfo -+ -+ (*** TYPES ***) -+ method pType (nameOpt: doc option) (* Whether we are declaring a name or -+ * we are just printing a type *) -+ () (t:typ) = if !E.verboseFlag then trace "pType" ; (* use of some type *) -+ match t with -+ | TVoid attr -> text "TVoid" ++ pParens( self#pAttrs () attr) -+ | TInt (ikin, attr) -> text "TInt" ++ (pParens @ pCommaSep) [ self#pp_ikind ikin ; self#pAttrs () attr ] -+ | TFloat (fkin, attr) -> text "TFloat" ++ (pParens @ pCommaSep) [ self#pp_fkind fkin ; self#pAttrs () attr ] -+ | TPtr (t , attr) -> text "TPtr" ++ (pParens @ pCommaSep) [ self#pType None () t ; self#pAttrs () attr ] -+ | TArray (t, e, attr) -> text "TArray" ++ (pParens @ pCommaSep) [ self#pType None () t ; -+ pOption (self#pExp ()) e ; self#pAttrs () attr ] -+ | TFun (t, olst, b, attr) -> text "TFun" ++ (pParens @ pCommaSep) [ -+ self#pType None () t ; -+ pOption (pList @ (map ( pTriplet -+ @ (pTriple (pQuoted) (self#pType None ()) (self#pAttrs ())) -+ ) -+ ) -+ ) -+ olst ; -+ pBool b ; -+ self#pAttrs () attr] -+ | TNamed (tinfo, attr) -> text "TNamed" ++ (pParens @ pCommaSep) [ self#pp_typeinfo tinfo ; self#pAttrs () attr ] -+ | TComp (cinfo, attr) -> text "TComp" ++ (pParens @ pCommaSep) [ (text @ string_of_int) cinfo.ckey ; -+ self#pAttrs () attr] -+ | TEnum (einfo, attr) -> text "TEnum" ++ (pParens @ pCommaSep) [ self#pp_enuminfo einfo ; self#pAttrs () attr ] -+ | TBuiltin_va_list (attr) -> text "TBuiltin_va_list" ++ pParens( self#pAttrs () attr) -+ -+ (*** ATTRIBUTES ***) -+ method pAttr (Attr(an, args) : attribute) : (doc * bool) = if !E.verboseFlag then trace "pAttr" ; -+ ( text "Attr" ++ (pParens @ pCommaSep) [ pQuoted an ; pList (map (self#pAttrParam ()) args) ] -+ , false -+ ) -+ -+ method pAttrParam () (p:attrparam) : doc = if !E.verboseFlag then trace "pAttrParam" ; -+ match p with -+ | AInt (i) -> text "AInt" ++ pParens( pQuoted (string_of_int i)) -+ | AStr (s) -> text "AStr" ++ pParens( pQuoted s) -+ | ACons (s, args) -> text "ACons" ++ (pParens @ pCommaSep) [ pQuoted s ; pList (map (self#pAttrParam ()) args) ] -+ | ASizeOf (t) -> text "ASizeOf" ++ pParens( self#pType None () t) -+ | ASizeOfE (arg) -> text "ASizeOfE" ++ pParens( self#pAttrParam () arg) -+ | ASizeOfS (tsig) -> text "ASizeOfS" ++ pParens( self#pp_typsig tsig) -+ | AAlignOf (t) -> text "AAlignOf" ++ pParens( self#pType None () t) -+ | AAlignOfE (arg) -> text "AAlignOfE" ++ pParens( self#pAttrParam () arg) -+ | AAlignOfS (tsig) -> text "AAlignOfS" ++ pParens( self#pp_typsig tsig) -+ | AUnOp (uop, arg) -> text "AUnOp" ++ (pParens @ pCommaSep) [ self#pp_unop uop ; self#pAttrParam () arg ] -+ | ABinOp (bop, arg1, arg2) -> text "ABinOp" ++ (pParens @ pCommaSep) [ self#pp_binop bop -+ ; self#pAttrParam () arg1 -+ ; self#pAttrParam () arg2 ] -+ | ADot (arg, s) -> text "ADot" ++ (pParens @ pCommaSep) [ self#pAttrParam () arg ; pQuoted s] -+ | AStar (a1) -> text "AStar" ++ pParens( self#pAttrParam () a1 ) -+ | AAddrOf (a1) -> text "AAddrOf" ++ pParens( self#pAttrParam () a1 ) -+ | AIndex (a1, a2) -> text "AIndex" ++ (pParens @ pCommaSep) [ self#pAttrParam () a1 -+ ; self#pAttrParam () a2 ] -+ | AQuestion (a1, a2, a3) -> text "AQuestion" ++ (pParens @ pCommaSep) [ self#pAttrParam () a1 -+ ; self#pAttrParam () a2 -+ ; self#pAttrParam () a3 ] -+ -+ (* | AStar a1 -> -+ text "(*" ++ (self#pAttrPrec derefStarLevel () a1) ++ text ")" -+ | AAddrOf a1 -> text "& " ++ (self#pAttrPrec addrOfLevel () a1) -+ | AIndex (a1, a2) -> self#pAttrParam () a1 ++ text "[" ++ -+ self#pAttrParam () a2 ++ text "]" -+ | AQuestion (a1, a2, a3) -> -+ self#pAttrParam () a1 ++ text " ? " ++ -+ self#pAttrParam () a2 ++ text " : " ++ -+ self#pAttrParam () a3 -+*) -+ method pAttrs () (attr:attributes) : doc = if !E.verboseFlag then trace "pAttrs" ; -+ text "Attributes" ++ pParens( -+ pList (map (fst @ self#pAttr) attr) -+ ) -+ -+ (*** LABELS ***) -+ method pLabel () (l:label) : doc = if !E.verboseFlag then trace "pLabel" ; -+ match l with -+ | Label (s,l,b) -> text "Label" ++ (pParens @ pCommaSep) [ -+ pQuoted s ; -+ self#pp_location l ; -+ pBool b ] -+ | Case (e,l) -> text "Case" ++ (pParens @ pCommaSep) [ -+ self#pExp () e ; -+ self#pp_location l ] -+ | Default (l) -> text "Default" ++ pParens( self#pp_location l) -+ -+ (*** printing out locations as line directives is not necessary -+ because we are printing the tree structure and locations are -+ present everywhere ***) -+ method pLineDirective : ?forcefile:bool -> location -> doc = fun ?forcefile _ -> nil -+ -+ (*** STATEMENT KINDS ***) -+ method pStmtKind s () (sk:stmtkind) : doc = if !E.verboseFlag then trace "pStmtKind" ; -+ match sk with -+ | Instr (ilst) -> text "Instr" ++ pParens( pList (map (self#pInstr ()) ilst)) -+ | Return (oe, l) -> text "Return" ++ (pParens @ pCommaSep) [ pOption (self#pExp ()) oe ; self#pp_location l ] -+ | Goto (stmtref, l) -> text "Goto" ++ (pParens @ pCommaSep) [ self#pStmt () !stmtref ; self#pp_location l ] -+ | Break (l) -> text "Break" ++ pParens( self#pp_location l) -+ | Continue (l) -> text "Continue" ++ pParens( self#pp_location l) -+ | If (e, b1, b2, l) -> text "If" ++ (pParens @ pCommaSep) [ -+ self#pExp () e ; -+ self#pBlock () b1 ; -+ self#pBlock () b2 ; -+ self#pp_location l ] -+ | Switch (e,b,stlst,l) -> text "Switch" ++ (pParens @ pCommaSep) [ -+ self#pExp () e ; -+ self#pBlock () b ; -+ pList (map (self#pStmt ()) stlst) ; -+ self#pp_location l ] -+ | Loop (b,l,os1, os2) -> text "Loop" ++ (pParens @ pCommaSep) [ -+ self#pBlock () b ; -+ self#pp_location l ; -+ pOption (self#pStmt ()) os1 ; -+ pOption (self#pStmt ()) os2 ] -+ | Block (b) -> text "Block" ++ pParens( self#pBlock () b) -+ | TryFinally (b1,b2,l) -> text "TryFinally" ++ (pParens @ pCommaSep) [ -+ self#pBlock () b1 ; -+ self#pBlock () b2 ; -+ self#pp_location l ] -+ | TryExcept (b1, pr, b2, l) -> text "TryExcept" ++ (pParens @ pCommaSep) [ -+ self#pBlock () b1 ; -+ ( pPair -+ @ pDouble (pList @ map (self#pInstr ())) -+ (self#pExp ()) -+ ) pr ; -+ self#pBlock () b2 ; -+ self#pp_location l ] -+ -+ (*** EXPRESSIONS ***) -+ -+ method pExp () (e:exp) : doc = if !E.verboseFlag then trace "pExp" ; -+ match e with -+ | Const (c) -> text "Constant" ++ pParens( self#pp_constant c) -+ | Lval (lh,off) -> text "Lvalue" ++ (pParens @ pCommaSep) [self#pp_lhost lh ; self#pOffset nil off ] -+ | SizeOf (t) -> text "SizeOfType" ++ pParens( self#pType None () t) -+ | SizeOfE (e) -> text "SizeOfExp" ++ pParens( self#pExp () e) -+ | SizeOfStr (s) -> text "SizeOfString" ++ pParens( pQuoted s) -+ | AlignOf (t) -> text "AlignOfType" ++ pParens( self#pType None () t) -+ | AlignOfE (e) -> text "AlignOfExp" ++ pParens( self#pExp () e) -+ | UnOp (uop, e, t) -> text "UnOp" ++ (pParens @ pCommaSep) [ -+ self#pp_unop uop ; -+ self#pExp () e ; -+ self#pType None () t ] -+ | BinOp (bop, e1, e2, t) -> text "BinOp" ++ (pParens @ pCommaSep) [ -+ self#pp_binop bop ; -+ self#pExp () e1 ; -+ self#pExp () e2 ; -+ self#pType None () t ] -+ | CastE (t,e) -> text "Cast" ++ (pParens @ pCommaSep) [ self#pType None () t ; self#pExp () e] -+ | AddrOf (lv) -> text "AddressOf" ++ pParens( self#pLval () lv) -+ | StartOf (lv) -> text "StartOf" ++ pParens( self#pLval () lv) -+ -+ (*** INITIALIZERS ***) -+ method pInit () (i:init) : doc = if !E.verboseFlag then trace "pInit" ; -+ match i with -+ | SingleInit (e) -> text "SingleInit" ++ pParens( self#pExp () e) -+ | CompoundInit (t, oilst) -> text "CompoundInit" ++ (pParens @ pCommaSep) [ self#pType None () t ; -+ pList (map ( pPair -+ @ pDouble (self#pOffset nil) (self#pInit ()) -+ ) -+ oilst -+ ) ] -+ method dInit (out:out_channel) (i:int) (init1:init) : unit = fprint out i (self#pInit () init1) -+ -+ (*** auxiliary methods ***) -+ method private pp_storage (s:storage) : doc = -+ let tok = match s with -+ | NoStorage -> "NoStorage" -+ | Static -> "Static" -+ | Register -> "Register" -+ | Extern -> "Extern" -+ in text ("Storage_" ^ tok) -+ -+ method private pp_typeinfo (tinfo:typeinfo) : doc = if !E.verboseFlag then trace "pp_typeinfo" ; -+ text "Typeinfo" ++ (pParens @ pCommaSep) [ -+ pQuoted tinfo.tname ; -+ self#pType None () tinfo.ttype ; -+ pBool tinfo.treferenced ] -+ -+ method private pp_fieldinfo (finfo:fieldinfo) : doc = if !E.verboseFlag then trace "pp_fieldinfo" ; -+ text "Fieldinfo" ++ (pParens @ pCommaSep) [ -+ pQuoted finfo.fname ; -+ self#pType None () finfo.ftype ; -+ pOption (pQuoted @ string_of_int) finfo.fbitfield ; -+ self#pAttrs () finfo.fattr ; -+ self#pp_location finfo.floc ] -+ -+ method private pp_compinfo (cinfo:compinfo) : doc = if !E.verboseFlag then trace "pp_compinfo" ; -+ text "Compinfo" ++ (pParens @ pCommaSep) [ -+ pBool cinfo.cstruct ; -+ pQuoted cinfo.cname ; -+ text (string_of_int cinfo.ckey) ; -+ pList (map (self#pFieldDecl ()) cinfo.cfields) ; -+ self#pAttrs () cinfo.cattr ; -+ pBool cinfo.cdefined ; -+ pBool cinfo.creferenced ] -+ -+ method private pp_enuminfo (einfo:enuminfo) : doc = if !E.verboseFlag then trace "pp_enuminfo" ; -+ text "Enuminfo" ++ (pParens @ pCommaSep) [ -+ pQuoted einfo.ename ; -+ pList (map ( pTriplet -+ @ (pTriple pQuoted (self#pExp ()) self#pp_location) -+ ) -+ einfo.eitems) ; -+ self#pAttrs () einfo.eattr ; -+ pBool einfo.ereferenced ] -+ -+ method private pp_location (loc:location) : doc = if !E.verboseFlag then trace "pp_location" ; -+ text "Location" ++ (pParens @ pCommaSep) [ -+ text (string_of_int loc.line) ; -+ pQuoted loc.file ; -+ text (string_of_int loc.byte) ] -+ -+ method private pp_varinfo (vinfo:varinfo) : doc = if !E.verboseFlag then trace "pp_varinfo" ; -+ text "Varinfo" ++ (pParens @ pCommaSep) [ -+ pQuoted vinfo.vname ; -+ self#pType None () vinfo.vtype ; -+ self#pAttrs () vinfo.vattr ; -+ self#pp_storage vinfo.vstorage ; -+ pBool vinfo.vglob ; -+ pBool vinfo.vinline ; -+ self#pp_location vinfo.vdecl ; -+ text (string_of_int vinfo.vid) ; -+ pBool vinfo.vaddrof ; -+ pBool vinfo.vreferenced ] -+ -+ method private pp_initinfo (iinfo:initinfo) : doc = if !E.verboseFlag then trace "pp_initinfo" ; -+ text "Initinfo" ++ pParens( -+ pOption (self#pInit ()) iinfo.init) -+ -+ method private pp_fundec (fdec:fundec) : doc = if !E.verboseFlag then trace "pp_fundec" ; -+ text "Fundec" ++ (pParens @ pCommaSep) [ -+ self#pp_varinfo fdec.svar ; -+ pList (map self#pp_varinfo fdec.sformals) ; -+ pList (map self#pp_varinfo fdec.slocals) ; -+ text (string_of_int fdec.smaxid) ; -+ self#pBlock () fdec.sbody ; -+ pOption (pSpParens @ text @ string_of_int) fdec.smaxstmtid ; -+ pList (map (self#pStmt ()) fdec.sallstmts) ] -+ -+ method private pp_ikind (ikin:ikind) : doc = -+ let tok = match ikin with -+ | IChar -> "IChar" -+ | ISChar -> "ISChar" -+ | IUChar -> "IUChar" -+ | IInt -> "IInt" -+ | IUInt -> "IUInt" -+ | IShort -> "IShort" -+ | IUShort -> "IUShort" -+ | ILong -> "ILong" -+ | IULong -> "IULong" -+ | ILongLong -> "ILongLong" -+ | IULongLong -> "IULongLong" -+ in text ("Ikind_" ^ tok) -+ -+ method private pp_fkind (fkin:fkind) : doc = -+ let tok = match fkin with -+ | FFloat -> "FFloat" -+ | FDouble -> "FDouble" -+ | FLongDouble -> "FLongDouble" -+ in text ("Fkind_" ^ tok) -+ -+ method private pp_typsig (tsig:typsig) : doc = if !E.verboseFlag then trace "pp_typsig" ; -+ match tsig with -+ | TSArray (tsig2, oe, attr) -> text "TSArray" ++ (pParens @ pCommaSep) [ -+ self#pp_typsig tsig2 ; -+ pOption pInt64 oe ; -+ self#pAttrs () attr ] -+ | TSPtr (tsig2, attr) -> text "TSPtr" ++ (pParens @ pCommaSep) [ -+ self#pp_typsig tsig2 ; -+ self#pAttrs () attr ] -+ | TSComp (b, s, attr) -> text "TSComp" ++ (pParens @ pCommaSep) [ -+ pBool b ; -+ pQuoted s ; -+ self#pAttrs () attr ] -+ | TSFun (tsig2, tsiglst, b, attr) -> text "TSFun" ++ (pParens @ pCommaSep) [ -+ self#pp_typsig tsig2 ; -+ pList (map self#pp_typsig tsiglst) ; -+ pBool b ; -+ self#pAttrs () attr ] -+ | TSEnum (s, attr) -> text "TSEnum" ++ (pParens @ pCommaSep) [ -+ pQuoted s ; -+ self#pAttrs () attr ] -+ | TSBase (t) -> text "TSBase" ++ pParens( self#pType None () t) -+ -+ -+ method private pp_unop (uop:unop) : doc = -+ let tok = match uop with -+ | Neg -> "Neg" -+ | BNot -> "BNot" -+ | LNot -> "LNot" -+ in text ("UnOp_" ^ tok) -+ -+ method private pp_binop (bop:binop) : doc = -+ let tok = match bop with -+ | PlusA -> "PlusA" -+ | PlusPI -> "PlusPI" -+ | IndexPI -> "IndexPI" -+ | MinusA -> "MinusA" -+ | MinusPI -> "MinusPI" -+ | MinusPP -> "MinusPP" -+ | Mult -> "Mult" -+ | Div -> "Div" -+ | Mod -> "Mod" -+ | Shiftlt -> "Shiftlt" -+ | Shiftrt -> "Shiftrt" -+ | Lt -> "Lt" -+ | Gt -> "Gt" -+ | Le -> "Le" -+ | Ge -> "Ge" -+ | Eq -> "Eq" -+ | Ne -> "Ne" -+ | BAnd -> "BAnd" -+ | BXor -> "BXor" -+ | BOr -> "BOr" -+ | LAnd -> "LAnd" -+ | LOr -> "LOr" -+ in text ("BinOp_" ^ tok ) -+ -+ method private pp_constant (c:constant) : doc = if !E.verboseFlag then trace "pp_constant" ; -+ match c with -+ | CInt64 (i, ikin, os) -> text "CInt64" ++ (pParens @ pCommaSep) [ -+ pQuoted (Int64.to_string i) ; -+ self#pp_ikind ikin ; -+ pOption pQuoted os ] -+ | CStr (s) -> text "CStr" ++ pParens( pQuoted s) -+ | CWStr (ilist) -> text "CWStr" ++ pParens( pList (map ( text @ Int64.to_string) ilist)) -+ | CChr (c) -> text "CChr" ++ pParens( text "\"" ++ text (Char.escaped c) ++ text "\"") -+ | CReal (f, fkin, os) -> text "CReal" ++ (pParens @ pCommaSep) [ pQuoted (sprintf "%f0" f) ; -+ self#pp_fkind fkin ; -+ pOption pQuoted os ] -+ | CEnum(_, s, ei) -> text "CEnum" ++ pParens( pQuoted s) -+ -+ method private pp_lhost (lh:lhost) : doc = if !E.verboseFlag then trace "pp_lhost" ; -+ match lh with -+ | Var (vinfo) -> text "Var" ++ pParens( self#pp_varinfo vinfo) -+ | Mem (e) -> text "Mem" ++ pParens( self#pExp () e) -+ -+ method private pp_blockinfo (b:block) : doc = if !E.verboseFlag then trace "pp_blockinfo" ; -+ text "Block" ++ (pParens @ pCommaSep) [ -+ self#pAttrs () b.battrs ; -+ pList (map (self#pStmt ()) b.bstmts) ] -+ -+ method private pp_stmtinfo (sinfo:stmt) : doc = if !E.verboseFlag then trace "pp_stmtinfo" ; -+ text "Stmt" ++ (pParens @ pCommaSep) [ -+ pList (map (self#pLabel ()) sinfo.labels) ; -+ self#pStmtKind invalidStmt () sinfo.skind ; -+ text (string_of_int sinfo.sid) ; -+ pList (map self#pp_stmtinfo sinfo.succs) ; -+ pList (map self#pp_stmtinfo sinfo.preds) ] -+end -+ -+let ppFile (f:file) (pp:cilPrinter) : doc = if !E.verboseFlag then trace "ppFile" ; -+ text "File" ++ (pParens @ pCommaSep) [ -+ pQuoted f.fileName ; -+ pList (map (pp#pGlobal ()) f.globals) ] -+ -+(* we need a different more flexible mapGlobals -+ we only visit globals and not global init; -+ use mapGlobinits *) -+let mapGlobals2 (fl: file) -+ (doone: global -> 'a) : 'a list = -+ List.map doone fl.globals -+ -+(* We redefine dumpFile because we don't want a header in our -+ file telling us it was generated with CIL blabla *) -+let dumpFile (pp: cilPrinter) (out : out_channel) file = -+ printDepth := 99999; -+ Pretty.fastMode := true; -+ if !E.verboseFlag then ignore (E.log "printing file %s\n" file.fileName); -+ let file_doc = ppFile file pp in -+ fprint out 80 file_doc; -+ flush out -+ -+let feature : featureDescr = -+ { fd_name = "printaterm"; -+ fd_enabled = ref false; -+ fd_description = "printing the current CIL AST to an ATerm"; -+ fd_extraopt = [("--atermfile", Arg.String (fun s -> outputfilename := s), "=: writes the ATerm to ");]; -+ fd_doit = (function (f: file) -> -+ let channel = open_out !outputfilename in -+ let printer = new atermPrinter -+ in dumpFile printer channel f -+ ; close_out channel -+ ); -+ fd_post_check = false; -+ } -diff -urN cil-1.3.6-orig/src/main.ml cil-1.3.6/src/main.ml ---- cil-1.3.6-orig/src/main.ml 2007-02-05 22:10:29.000000000 +0100 -+++ cil-1.3.6/src/main.ml 2007-03-05 15:14:54.000000000 +0100 -@@ -105,6 +105,7 @@ - Logcalls.feature; - Ptranal.feature; - Liveness.feature; -+ Atermprinter.feature; - ] - @ Feature_config.features - diff --git a/pkgs/development/libraries/cil-aterm/default.nix b/pkgs/development/libraries/cil-aterm/default.nix deleted file mode 100644 index 62d69f943af..00000000000 --- a/pkgs/development/libraries/cil-aterm/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, fetchurl, ocaml, perl }: - -stdenv.mkDerivation { - name = "cil-aterm-1.3.6"; - src = fetchurl { - url = mirror://sourceforge/cil/cil-1.3.6.tar.gz; - md5 = "112dfbabdd0e1280800d62ba4449ab45"; - }; - patches = [./cil-aterm-1.3.6.patch]; - buildInputs = [ ocaml perl ]; - inherit ocaml perl; - meta.broken = true; -} diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/3.x.nix similarity index 100% rename from pkgs/development/libraries/czmq/default.nix rename to pkgs/development/libraries/czmq/3.x.nix diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix new file mode 100644 index 00000000000..dd957d07340 --- /dev/null +++ b/pkgs/development/libraries/czmq/4.x.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, zeromq }: + +stdenv.mkDerivation rec { + version = "4.0.2"; + name = "czmq-${version}"; + + src = fetchurl { + url = "https://github.com/zeromq/czmq/releases/download/v${version}/${name}.tar.gz"; + sha256 = "12gbh57xnz2v82x1g80gv4bwapmyzl00lbin5ix3swyac8i7m340"; + }; + + # Needs to be propagated for the .pc file to work + propagatedBuildInputs = [ zeromq ]; + + meta = with stdenv.lib; { + homepage = "http://czmq.zeromq.org/"; + description = "High-level C Binding for ZeroMQ"; + license = licenses.mpl20; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/db/clang-4.8.patch b/pkgs/development/libraries/db/clang-4.8.patch index bbb77891497..aa46b8500b5 100644 --- a/pkgs/development/libraries/db/clang-4.8.patch +++ b/pkgs/development/libraries/db/clang-4.8.patch @@ -38,19 +38,6 @@ index 0034dcc..160c8ea 100644 #else #define atomic_inc(env, p) __atomic_inc(env, p) #define atomic_dec(env, p) __atomic_dec(env, p) -diff --git a/dbinc/db.in b/dbinc/db.in -index 9fc6712..7428e0a 100644 ---- a/dbinc/db.in -+++ b/dbinc/db.in -@@ -2413,7 +2413,7 @@ typedef struct { - #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a) - #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@ - #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a) --#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) -+#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) - - /******************************************************* - * Hsearch historic interface. diff --git a/mp/mp_fget.c b/mp/mp_fget.c index 5fdee5a..0b75f57 100644 --- a/mp/mp_fget.c diff --git a/pkgs/development/libraries/db/clang-5.3.patch b/pkgs/development/libraries/db/clang-5.3.patch index 1cfb13ca8e6..caf19ffeb92 100644 --- a/pkgs/development/libraries/db/clang-5.3.patch +++ b/pkgs/development/libraries/db/clang-5.3.patch @@ -38,19 +38,6 @@ index 6a858f7..9f338dc 100644 #else #define atomic_inc(env, p) __atomic_inc(env, p) #define atomic_dec(env, p) __atomic_dec(env, p) -diff --git a/src/dbinc/db.in b/src/dbinc/db.in -index 92ac822..f80428e 100644 ---- a/src/dbinc/db.in -+++ b/src/dbinc/db.in -@@ -2782,7 +2782,7 @@ typedef struct { - #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a) - #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@ - #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a) --#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) -+#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) - - /******************************************************* - * Hsearch historic interface. diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c index 16de695..d0dcc29 100644 --- a/src/mp/mp_fget.c diff --git a/pkgs/development/libraries/db/clang-6.0.patch b/pkgs/development/libraries/db/clang-6.0.patch index 5c1e8f506c4..a411e60dc39 100644 --- a/pkgs/development/libraries/db/clang-6.0.patch +++ b/pkgs/development/libraries/db/clang-6.0.patch @@ -20,19 +20,6 @@ index e4420aa..4799b5f 100644 #else #define atomic_inc(env, p) __atomic_inc_int(env, p) #define atomic_dec(env, p) __atomic_dec_int(env, p) -diff --git a/src/dbinc/db.in b/src/dbinc/db.in -index 3c2ad9b..3e46f02 100644 ---- a/src/dbinc/db.in -+++ b/src/dbinc/db.in -@@ -2999,7 +2999,7 @@ typedef struct { - #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a) - #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@ - #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a) --#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) -+#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) - - /******************************************************* - * Hsearch historic interface. diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c index 59fe9fe..fa4ced7 100644 --- a/src/mp/mp_fget.c diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index a6f9c676bba..c3204555901 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl , cxxSupport ? true , compat185 ? true +, dbmSupport ? false # Options from inherited versions , version, sha256 @@ -19,12 +20,13 @@ stdenv.mkDerivation (rec { patches = extraPatches; - configureFlags = [ - (if cxxSupport then "--enable-cxx" else "--disable-cxx") - (if compat185 then "--enable-compat185" else "--disable-compat185") - "--enable-dbm" - (stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic") - ]; + configureFlags = + [ + (if cxxSupport then "--enable-cxx" else "--disable-cxx") + (if compat185 then "--enable-compat185" else "--disable-compat185") + ] + ++ stdenv.lib.optional dbmSupport "--enable-dbm" + ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; preConfigure = '' cd build_unix diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 509e7dd00c8..49b71ff9974 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -9,8 +9,9 @@ let version = "1.10.14"; sha256 = "10x0wvv2ly4lyyfd42k4xw0ar5qdbi9cksw3l5fcwf1y6mq8y8r3"; -self = stdenv.mkDerivation { +self = stdenv.mkDerivation { name = "dbus-${version}"; + inherit version; src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; @@ -49,9 +50,8 @@ self = stdenv.mkDerivation { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemduserunitdir=$(out)/etc/systemd/user" "--enable-user-session" - # this package installs nothing into those dirs and they create a dependency - "--datadir=/run/current-system/sw/share" - "--libexecdir=$(out)/libexec" # we don't need dbus-daemon-launch-helper + "--datadir=/etc" + "--libexecdir=$(out)/libexec" ] ++ lib.optional (!x11Support) "--without-x"; # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11 @@ -64,7 +64,12 @@ self = stdenv.mkDerivation { doCheck = true; - installFlags = "sysconfdir=$(out)/etc datadir=$(out)/share"; + installFlags = [ "sysconfdir=$(out)/etc" "datadir=$(out)/share" ]; + + postInstall = '' + mkdir -p $doc/share/xml/dbus + cp doc/*.dtd $doc/share/xml/dbus + ''; # it's executed from $lib by absolute path postFixup = '' diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix new file mode 100644 index 00000000000..7e35a9162c8 --- /dev/null +++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -0,0 +1,27 @@ +{ runCommand, libxslt, dbus, serviceDirectories ? [], suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper" }: + +/* DBus has two configuration parsers -- normal and "trivial", which is used + * for suid helper. Unfortunately the latter doesn't support + * directive. That means that we can't just place our configuration to + * *-local.conf -- it needs to be in the main configuration file. + */ +runCommand "dbus-1" + { + buildInputs = [ libxslt ]; + inherit serviceDirectories suidHelper; + } + '' + mkdir -p $out + + xsltproc \ + --stringparam serviceDirectories "$serviceDirectories" \ + --stringparam suidHelper "$suidHelper" \ + --path ${dbus.doc}/share/xml/dbus \ + ${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \ + > $out/system.conf + xsltproc \ + --stringparam serviceDirectories "$serviceDirectories" \ + --path ${dbus.doc}/share/xml/dbus \ + ${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \ + > $out/session.conf + '' diff --git a/pkgs/development/libraries/dbus/make-session-conf.xsl b/pkgs/development/libraries/dbus/make-session-conf.xsl new file mode 100644 index 00000000000..bc73369af94 --- /dev/null +++ b/pkgs/development/libraries/dbus/make-session-conf.xsl @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + /share/dbus-1/services + /etc/dbus-1/session.d + + + + + diff --git a/pkgs/development/libraries/dbus/make-system-conf.xsl b/pkgs/development/libraries/dbus/make-system-conf.xsl new file mode 100644 index 00000000000..3d8b823437d --- /dev/null +++ b/pkgs/development/libraries/dbus/make-system-conf.xsl @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + /share/dbus-1/system-services + /etc/dbus-1/system.d + + + + + diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix index ac94e077b9a..7b42ead14bd 100644 --- a/pkgs/development/libraries/dirac/default.nix +++ b/pkgs/development/libraries/dirac/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { patches = [ ./dirac-1.0.2.patch ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + postInstall = '' # keep only necessary binaries find $out/bin \( -name '*RGB*' -or -name '*YUV*' -or -name create_dirac_testfile.pl \) -delete diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 12c21693a79..43a5eb2103d 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "fdk-aac-${version}"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz"; - sha256 = "1aqmzxri23q83wfmwbbashs27mq1mapvfirz5r9i7jkphrwgw42r"; + sha256 = "1msdkcf559agmpycd4bk0scm2s2h9jyzbnnw1yrfarxlcwm5jr11"; }; configureFlags = [ ] diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index f4621216a09..090881107ce 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -4,7 +4,7 @@ */ , gplLicensing ? true # GPL: fdkaac,openssl,frei0r,cdio,samba,utvideo,vidstab,x265,x265,xavs,avid,zvbi,x11grab , version3Licensing ? true # (L)GPL3: opencore-amrnb,opencore-amrwb,samba,vo-aacenc,vo-amrwbenc -, nonfreeLicensing ? false # NONFREE: openssl,fdkaac,faac,aacplus,blackmagic-design-desktop-video +, nonfreeLicensing ? false # NONFREE: openssl,fdkaac,blackmagic-design-desktop-video /* * Build options */ @@ -12,7 +12,6 @@ , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime (disable to compile natively) , grayBuild ? true # Full grayscale support , swscaleAlphaBuild ? true # Alpha channel support in swscale -, incompatibleLibavAbiBuild ? false # Incompatible Libav fork ABI , hardcodedTablesBuild ? true # Hardcode decode tables instead of runtime generation , safeBitstreamReaderBuild ? true # Buffer boundary checking in bitreaders , memalignHackBuild ? false # Emulate memalign @@ -49,14 +48,12 @@ /* * External libraries options */ -#, aacplusExtlib ? false, aacplus ? null # AAC+ encoder , alsaLib ? null # Alsa in/output support #, avisynth ? null # Support for reading AviSynth scripts , bzip2 ? null , celt ? null # CELT decoder #, crystalhd ? null # Broadcom CrystalHD hardware acceleration #, decklinkExtlib ? false, blackmagic-design-desktop-video ? null # Blackmagic Design DeckLink I/O support -, faacExtlib ? false, faac ? null # AAC encoder , fdkaacExtlib ? false, fdk_aac ? null # Fraunhofer FDK AAC de/encoder #, flite ? null # Flite (voice synthesis) support , fontconfig ? null # Needed for drawtext filter @@ -220,11 +217,9 @@ assert swscaleLibrary -> avutilLibrary; /* * External libraries */ -#assert aacplusExtlib -> nonfreeLicensing; #assert decklinkExtlib -> blackmagic-design-desktop-video != null # && !isCygwin && multithreadBuild # POSIX threads required # && nonfreeLicensing; -assert faacExtlib -> faac != null && nonfreeLicensing; assert fdkaacExtlib -> fdk_aac != null && nonfreeLicensing; assert gnutls != null -> !opensslExtlib; assert libxcbshmExtlib -> libxcb != null; @@ -237,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "3.1.3"; + version = "3.2.2"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "08l8290gipm632dhrqndnphdpkc5ncqc1j3hxdx46r1a3q3mqmzq"; + sha256 = "1z7d5y5crhsl5fm74236rdwbkd4jj5frx1l4iizjfym1w4gvs09z"; }; patchPhase = ''patchShebangs . @@ -267,7 +262,6 @@ stdenv.mkDerivation rec { (enableFeature runtimeCpuDetectBuild "runtime-cpudetect") (enableFeature grayBuild "gray") (enableFeature swscaleAlphaBuild "swscale-alpha") - (enableFeature incompatibleLibavAbiBuild "incompatible-libav-abi") (enableFeature hardcodedTablesBuild "hardcoded-tables") (enableFeature safeBitstreamReaderBuild "safe-bitstream-reader") (enableFeature memalignHackBuild "memalign-hack") @@ -314,13 +308,11 @@ stdenv.mkDerivation rec { /* * External libraries */ - #(enableFeature aacplus "libaacplus") #(enableFeature avisynth "avisynth") (enableFeature (bzip2 != null) "bzlib") (enableFeature (celt != null) "libcelt") #(enableFeature crystalhd "crystalhd") #(enableFeature decklinkExtlib "decklink") - (enableFeature faacExtlib "libfaac") (enableFeature (fdkaacExtlib && gplLicensing) "libfdk-aac") #(enableFeature (flite != null) "libflite") "--disable-libflite" # Force disable until a solution is found @@ -412,11 +404,11 @@ stdenv.mkDerivation rec { samba SDL soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optional openglExtlib mesa ++ optionals x11grabExtlib [ libXext libXfixes ] - ++ optionals nonfreeLicensing [ faac fdk_aac openssl ] + ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optionals nvenc [ nvidia-video-sdk ] - ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation + ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration ]; # Build qt-faststart executable @@ -471,11 +463,11 @@ stdenv.mkDerivation rec { description = "A complete, cross-platform solution to record, convert and stream audio and video"; homepage = https://www.ffmpeg.org/; longDescription = '' - FFmpeg is the leading multimedia framework, able to decode, encode, transcode, - mux, demux, stream, filter and play pretty much anything that humans and machines - have created. It supports the most obscure ancient formats up to the cutting edge. - No matter if they were designed by some standards committee, the community or - a corporation. + FFmpeg is the leading multimedia framework, able to decode, encode, transcode, + mux, demux, stream, filter and play pretty much anything that humans and machines + have created. It supports the most obscure ancient formats up to the cutting edge. + No matter if they were designed by some standards committee, the community or + a corporation. ''; license = ( if nonfreeLicensing then diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix index 04336c9ee4d..5e5fef5cd83 100644 --- a/pkgs/development/libraries/ffmpeg/2.8.nix +++ b/pkgs/development/libraries/ffmpeg/2.8.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "${branch}.8"; + version = "${branch}.11"; branch = "2.8"; - sha256 = "19h6xmlcb933hgpfd40mjwkral8v389v25sx660a3p7aiyalh25p"; + sha256 = "0cldkzcbvsnb7mxz3kwpa0mnb44wmlc0qyl01wwi2qznn7vf11wr"; }) diff --git a/pkgs/development/libraries/ffmpeg/3.1.nix b/pkgs/development/libraries/ffmpeg/3.1.nix index fb14ca47598..8e79d1ad0e1 100644 --- a/pkgs/development/libraries/ffmpeg/3.1.nix +++ b/pkgs/development/libraries/ffmpeg/3.1.nix @@ -5,9 +5,9 @@ }@args: callPackage ./generic.nix (args // rec { - version = "${branch}.4"; + version = "${branch}.7"; branch = "3.1"; - sha256 = "1ynb1f0py5jb6hs78ypynpwc3jlqrw51vl8y1wnd44nwlisxz6bw"; + sha256 = "0ldf484r3waslv0sjx3vcwlkfgh28bd1wqcj26snfhav7zkf10kl"; darwinFrameworks = [ Cocoa CoreMedia ]; patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch; }) diff --git a/pkgs/development/libraries/ffmpeg/3.2.nix b/pkgs/development/libraries/ffmpeg/3.2.nix index 7587ca7c3ca..17ed6fb0e4b 100644 --- a/pkgs/development/libraries/ffmpeg/3.2.nix +++ b/pkgs/development/libraries/ffmpeg/3.2.nix @@ -5,9 +5,9 @@ }@args: callPackage ./generic.nix (args // rec { - version = "${branch}.2"; + version = "${branch}.4"; branch = "3.2"; - sha256 = "0srn788i4k5827sl8vmds6133vjy9ygsmgzwn40n3l5qs5b9l4hb"; + sha256 = "194n8hwmz2rpgh2rz8bc3mnxjyj3jh090mqp7k76msg9la9kbyn0"; darwinFrameworks = [ Cocoa CoreMedia ]; patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch; }) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 1e070ca2599..1e8d7ce543f 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2016.11.21.00"; + version = "2016.12.19.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "1f7j73avj00mmzz8wyh9rl1k9i0cvk77d0nf9c80vzr2zfk9f31x"; + sha256 = "1q5nh84sxkdi4x0gwr0x7bgk33pq6071vxz5vnjkznwywhgw2hnn"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix index 39d63a8bd69..2c9a893284b 100644 --- a/pkgs/development/libraries/freealut/default.nix +++ b/pkgs/development/libraries/freealut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openal }: +{ stdenv, darwin, fetchurl, openal }: stdenv.mkDerivation rec { name = "freealut-1.1.0"; @@ -8,12 +8,15 @@ stdenv.mkDerivation rec { sha256 = "0kzlil6112x2429nw6mycmif8y6bxr2cwjcvp18vh6s7g63ymlb0"; }; - buildInputs = [ openal ]; + buildInputs = [ openal + ] ++ stdenv.lib.optional stdenv.isDarwin + darwin.apple_sdk.frameworks.OpenAL + ; meta = { homepage = "http://openal.org/"; description = "Free implementation of OpenAL's ALUT standard"; license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 42105c7022c..6ee7670fc29 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,11 +1,15 @@ -{stdenv, fetchurl, unzip, darwin}: +{ stdenv, fetchurl, unzip, darwin }: + stdenv.mkDerivation { name = "freeimage-3.17.0"; + src = fetchurl { url = mirror://sourceforge/freeimage/FreeImage3170.zip; sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v"; }; + buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; + prePatch = if stdenv.isDarwin then '' sed -e 's/gcc-4.0/clang/g' \ @@ -38,6 +42,8 @@ stdenv.mkDerivation { preInstall = "mkdir -p $out/include $out/lib"; postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip install"; + NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + meta = { description = "Open Source library for accessing popular graphics image file formats"; homepage = http://freeimage.sourceforge.net/; diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 724888b3b82..c87e344ae55 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { name = "gd-${version}"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { url = "https://github.com/libgd/libgd/releases/download/${name}/libgd-${version}.tar.xz"; - sha256 = "0g3xz8jpz1pl2zzmssglrpa9nxiaa7rmcmvgpbrjz8k9cyynqsvl"; + sha256 = "1rp4v7n1dq38b92kl7gkvpvqqkw7nvdfnz6d5kip5klkxfki6zqk"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 1245381efcd..6ac8a134b1f 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -3,14 +3,14 @@ let ver_maj = "2.36"; - ver_min = "3"; + ver_min = "4"; in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "5223138f7d31afc6b356a049930304ec0abd6ac1113a5d3d1dba5cd4a4d639ec"; + sha256 = "0b19901c3eb0596141d2d48ddb9dac79ad1524bdf59366af58ab38fcb9ee7463"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index d63a1bb7572..de7111f6be3 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,24 +1,17 @@ -{ composableDerivation, fetchurl, python }: +{ stdenv, fetchurl, fetchpatch, python }: -let inherit (composableDerivation) edf; in - -composableDerivation.composableDerivation {} rec { - - flags = - # python and ruby untested - edf { name = "python"; enable = { buildInputs = [ python ]; }; }; - # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else []) - # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };} - - name = "geos-3.5.0"; +stdenv.mkDerivation rec { + name = "geos-3.6.1"; src = fetchurl { url = "http://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "49982b23bcfa64a53333dab136b82e25354edeb806e5a2e2f5b8aa98b1d0ae02"; + sha256 = "1icz31kd5sml2kdxhjznvmv33zfr6nig9l0i6bdcz9q9g8x4wbja"; }; enableParallelBuilding = true; + buildInputs = [ python ]; + meta = { description = "C++ port of the Java Topology Suite (JTS)"; homepage = http://geos.refractions.net/; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 89bd7e918fd..02c87cf709a 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "glew-1.13.0"; + name = "glew-2.0.0"; src = fetchurl { url = "mirror://sourceforge/glew/${name}.tgz"; - sha256 = "1iwb2a6wfhkzv6fa7zx2gz1lkwa0iwnd9ka1im5vdc44xm4dq9da"; + sha256 = "0r37fg2s1f0jrvwh6c8cz5x6v4wqmhq42qm15cs9qs349q5c6wn5"; }; outputs = [ "bin" "out" "dev" "doc" ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { mkdir -pv $out/share/doc/glew mkdir -p $out/lib/pkgconfig cp glew*.pc $out/lib/pkgconfig - cp -r README.txt LICENSE.txt doc $out/share/doc/glew + cp -r README.md LICENSE.txt doc $out/share/doc/glew rm $out/lib/*.a ''; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 4e03293fdf9..32c1b364737 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation ({ "--enable-kernel=2.6.32" ] ++ lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls") - (if cross.float == "soft" then "--without-fp" else "--with-fp") + (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") ] ++ lib.optionals (cross != null && cross.platform ? kernelMajor && cross.platform.kernelMajor == "2.6") [ diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index d4ff7d9603f..03f8ff3bc76 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "glpk-4.56"; + name = "glpk-4.61"; src = fetchurl { url = "mirror://gnu/glpk/${name}.tar.gz"; - sha256 = "0syzix6qvpn0fzp08c84c8snansf1cam5vd0dk2w91mz2c85d18h"; + sha256 = "1adbvwiaqrv9pql9ry3lhn2vfsxnff2vh4fs477d90kpfx0xwrlq"; }; doCheck = true; diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix index 8796a5f6740..e908c9b5b13 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror, gobjectIntrospection }: stdenv.mkDerivation rec { - name = "gmime-2.6.20"; + name = "gmime-2.6.23"; src = fetchurl { url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz"; - sha256 = "0rfzbgsh8ira5p76kdghygl5i3fvmmx4wbw5rp7f8ajc4vxp18g0"; + sha256 = "0slzlzcr3h8jikpz5a5amqd0csqh2m40gdk910ws2hnaf5m6hjbi"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix new file mode 100644 index 00000000000..b46523071c7 --- /dev/null +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl }: + +let + rev = "6a82322dd05cdc57b4cd9f7effdf1e2fd6f7482b"; + + # Don't use fetchgit as this is needed during Aarch64 bootstrapping + configGuess = fetchurl { + url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; + sha256 = "1yj9yi94h7z4z6jzickddv64ksz1aq5kj0c7krgzjn8xf8p3avmh"; + }; + configSub = fetchurl { + url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; + sha256 = "1qsqdpla6icbzskkk7v3zxrpzlpqlc94ny9hyy5wh5lm5rwwfvb7"; + }; +in +stdenv.mkDerivation rec { + name = "gnu-config-${version}"; + version = "2016-12-31"; + + buildCommand = '' + mkdir -p $out + cp ${configGuess} $out/config.guess + cp ${configSub} $out/config.sub + ''; + + meta = with stdenv.lib; { + description = "Attempt to guess a canonical system name"; + homepage = http://savannah.gnu.org/projects/config; + license = licenses.gpl3; + # In addition to GPLv3: + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that + # program. + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index d679d88e91d..c6240c40578 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pciutils }: +{ stdenv, fetchurl, pciutils }: with stdenv.lib; stdenv.mkDerivation rec { name = "gnu-efi-${version}"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2"; - sha256 = "1bzq5czw5dxlvpgs9ij2iz7q6krwhja87vc982r6vffcqcl0982i"; + sha256 = "08hb2gpzcj5p743wcagm0j2m4gh100xv12llpbjc13zi2icwv3xx"; }; buildInputs = [ pciutils ]; diff --git a/pkgs/development/libraries/gnutls/3.3.nix b/pkgs/development/libraries/gnutls/3.3.nix deleted file mode 100644 index 56829193060..00000000000 --- a/pkgs/development/libraries/gnutls/3.3.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "3.3.26"; - - src = fetchurl { - url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.xz"; - sha256 = "1n90qyz54hhnmf4fmap6zdyv7nihz6mrbqgxhd46h7aqdcmqhzba"; - }; -}) diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix index 7d58bfcd67f..a5076b9d498 100644 --- a/pkgs/development/libraries/gnutls/3.5.nix +++ b/pkgs/development/libraries/gnutls/3.5.nix @@ -1,11 +1,11 @@ { callPackage, fetchurl, libunistring, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.5.8"; + version = "3.5.9"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; - sha256 = "1zyl2z63s68hx1dpxqx0lykmlf3rwrzlrf44sq3h7dvjmr1z55qf"; + sha256 = "0l9971841jsfdcvcyhas17sk5rsby6x5vvwcmmj4x3zi9q60zcc2"; }; buildInputs = [ libunistring ]; diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 67a969b1178..74737eb2389 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ] + buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen ] ++ lib.optional doCheck nettools ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (tpmSupport && stdenv.isLinux) trousers @@ -47,6 +47,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; + propagatedBuildInputs = [ nettle ]; + inherit doCheck; # Fixup broken libtool and pkgconfig files diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 8acc773a46c..307fde4e5c2 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -9,11 +9,11 @@ let gpgProgram = if useGnupg1 then "gpg" else "gpg2"; in stdenv.mkDerivation rec { - name = "gpgme-1.7.0"; + name = "gpgme-1.8.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "0j6capvv6lcr6p763lr2ygzkzkj5lqm7fnbfc1xaygib1znmzxbi"; + sha256 = "0csx3qnycwm0n90ql6gs65if5xi4gqyzzy21fxs2xqicghjrfq2r"; }; outputs = [ "out" "dev" "info" ]; @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gnupg ]; configureFlags = [ - "--with-gpg=${gpgStorePath}/bin/${gpgProgram}" "--enable-fixed-path=${gpgStorePath}/bin" ]; diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix index bf1d29dae0e..89abd93180d 100644 --- a/pkgs/development/libraries/gsoap/default.nix +++ b/pkgs/development/libraries/gsoap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gsoap-${version}"; - version = "2.8.37"; + version = "2.8.42"; src = fetchurl { url = "mirror://sourceforge/project/gsoap2/gsoap-2.8/gsoap_${version}.zip"; - sha256 = "1nvf5hgwff1agqdzbn3qc5569jzm14qkwqws0673z6hv2l3lijx3"; + sha256 = "0fav4lhdibwggkf495pggmqna632jxkh6q2mi32b9hsn883pg5m7"; }; buildInputs = [ unzip m4 bison flex openssl zlib ]; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 7479c153af2..f0e88551169 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -14,7 +14,7 @@ let inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.10.2"; + name = "gst-plugins-bad-1.10.3"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "0fisnnfpp3s8pbm6hjrfi4wjpq2da8c6w3ns9pjcg7590f9wm587"; + sha256 = "1rwla1p57yzygb68z2xk5l5kvqzj5w3nxq0davkwk139zd8r6294"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index c3e8f3c65a1..ecb431091ad 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.10.2"; + name = "gst-plugins-base-1.10.3"; meta = { description = "Base plugins and helper libraries"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "086yjwmp4fykcqkj6zqhwrk2z49981kl8x545vz2wvblrc7x9h7v"; + sha256 = "040pifl4cgsqqz2si4s1y5khj3zwm39w21siagxwp805swbrcag6"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 8b27fa7ad3b..72a519ab34f 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.10.2"; + name = "gstreamer-1.10.3"; meta = { description = "Open source multimedia framework"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "0rcd4ya4k99x6ngm9v78as7ql0rqibkwshc13lb4rjdszs0qw3hm"; + sha256 = "0gdnxg5igbhnpjhrzp31w1ww95j805byqd6mj3x29wli54dxrfc5"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 3118caffb11..76cffa89dbc 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -27,4 +27,6 @@ rec { }; gst-validate = callPackage ./validate { inherit gst-plugins-base; }; + + # note: gst-python is in ./python/default.nix - called under pythonPackages } diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index a45c190b020..ab3a0c00e03 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.10.2"; + name = "gstreamer-editing-services-1.10.3"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "0hx7bwj8li88qq09slvdxlnfq76hr35nyjvd4ixrz5gmkpmrl5fv"; + sha256 = "0ax3qbi1m4wcii03ysln3lm8nhw3fr2rd35ndfy4mr4vg2nm5gxw"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index fbf67fb34f5..c0d017fcaea 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -10,7 +10,7 @@ let inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-good-1.10.2"; + name = "gst-plugins-good-1.10.3"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "04rksbhjj2yz32g523cfabwqn2s3byd94dpbxghxr0p9ridk53qr"; + sha256 = "0mar8ss8bvpz699ql4kgndvna8qsv7kj372py4435ffl6hzfj1sf"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 447b679898a..32000bb89a0 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -9,7 +9,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.10.2"; + name = "gst-libav-1.10.3"; meta = { homepage = "http://gstreamer.freedesktop.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "0g778j7w4vpbhwjzyrzpajvr26nxm6vqby84v8g1w1hz44v71pd3"; + sha256 = "1aajayv63ardkbmcg7pnh2d87r067325a5wzinwihaw6n5jw2sws"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index 880b5d734d4..7db887e36be 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -6,14 +6,14 @@ let inherit (pythonPackages) python pygobject3; in stdenv.mkDerivation rec { - name = "gst-python-1.10.2"; + name = "gst-python-1.10.3"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-python/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "1sljnqkxf2ix6yzghrapw5irl0rbp8aa8w2hggk7i6d9js10ls71"; + sha256 = "bdfa2d06dfe0ce68f638b04fed6890db506416c1dcf1279e83458269d719a4e8"; }; patches = [ ./different-path-with-pygobject.patch ]; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 981a05b4f1f..7220acf2d4d 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.10.2"; + name = "gst-plugins-ugly-1.10.3"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "17gc2zd3v6spmm2d6912sqfcyyv5f2ghdhq31f5kx5mw5r6ds0zk"; + sha256 = "1lkb8kznc9wxmhbp7k67b50y27nz8jp2x2flb91xzydz7b89f5f9"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index f136df099bf..ec882a2863a 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gst-vaapi-${version}"; - version = "1.10.2"; + version = "1.10.3"; src = fetchurl { url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; - sha256 = "1abzaj9kczap1xmalgzid1k3gqcn1ghnn76cn2kclc1gbfwd4ccy"; + sha256 = "07ing6z7n0ylz5vknk3d2lw54a6szd6m8hqc3px6lahmd832ga6f"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index a05bbd3e9a2..6677926eaa9 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gst-validate-1.10.2"; + name = "gst-validate-1.10.3"; meta = { description = "Integration testing infrastructure for the GStreamer framework"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "1mwyk3b19aq78mjhmrpc7qqs9flrykrn1j763g5wx546swc489xy"; + sha256 = "00icav26pj81cxdykf86rp3jw6lb178ydrqhcck43i94jdb4hsxy"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 64f5a1e3bdd..bf63c9425ae 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -13,7 +13,7 @@ with stdenv.lib; let ver_maj = "3.22"; - ver_min = "6"; + ver_min = "7"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "eba75a216a117f4391beb2971ba20ff8a1823f109893f0ab6c2eac2210ea172f"; + sha256 = "a3a27564bfb1679ebbc75c37cd2bcd6e727c8bdfbcd3984d29305bf9ee60d432"; }; outputs = [ "out" "dev" ]; @@ -63,6 +63,8 @@ stdenv.mkDerivation rec { postInstall = optionalString (!stdenv.isDarwin) '' substituteInPlace "$out/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la" \ --replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib' + # The updater is needed for nixos env and it's tiny. + moveToOutput bin/gtk-update-icon-cache "$out" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gtkmozembed-sharp/builder.sh b/pkgs/development/libraries/gtkmozembed-sharp/builder.sh deleted file mode 100644 index 4b8f757540b..00000000000 --- a/pkgs/development/libraries/gtkmozembed-sharp/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -genericBuild - -# !!! hack -export ALL_INPUTS="$out $pkgs" - -find $out -name "*.dll.config" | while read configFile; do - echo "modifying config file $configFile" - $monoDLLFixer "$configFile" -done diff --git a/pkgs/development/libraries/gtkmozembed-sharp/default.nix b/pkgs/development/libraries/gtkmozembed-sharp/default.nix deleted file mode 100644 index 52fc4b26e6d..00000000000 --- a/pkgs/development/libraries/gtkmozembed-sharp/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, pkgconfig, mono, gtksharp, gtk2, monoDLLFixer}: - -stdenv.mkDerivation { - name = "gtkmozembed-sharp-0.7-pre41601"; - - builder = ./builder.sh; - src = fetchurl { - url = http://tarballs.nixos.org/gtkmozembed-sharp-0.7-pre41601.tar.bz2; - md5 = "34aac139377296791acf3af9b5dc27ed"; - }; - - buildInputs = [ - pkgconfig mono gtksharp gtk2 - ]; - - inherit monoDLLFixer; - - meta = { - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 185780e3716..3ea70fd4990 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, python, swig, gd, libxml2, tcl, libusb, pkgconfig, +{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb, pkgconfig, boost, libtool, perlPackages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0ppp6fc2h9d8p30j2s9wlqd620kmnny4wd8fc3jxd6gxwi4lbjm2"; }; - buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python swig gd libxml2 + buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2 tcl libusb pkgconfig boost libtool ]; configureFlags = [ "--with-perl-binding" "--with-python-binding" diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index ec9b4510168..43861e9e195 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.4.1"; + version = "1.4.2"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "85a27fab639a1d651737dcb6b69e4101e3fd09522fdfdcb793df810b5cb315bd"; + sha256 = "1cxpkhrjd20fwfysyxmi9rjvvggxlbzlyrs39p1dw3q0mg7ls8wg"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 0189ecda77f..e5cb99aa44a 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -40,22 +40,6 @@ let ''; }; - mkDictFromRedIRIS = - { shortName, shortDescription, dictFileName, src }: - mkDict rec { - inherit src dictFileName; - version = "0.7"; - name = "hunspell-dict-${shortName}-rediris-${version}"; - readmeFile = "README.txt"; - meta = with stdenv.lib; { - description = "Hunspell dictionary for ${shortDescription} from RedIRIS"; - homepage = https://forja.rediris.es/projects/rla-es/; - license = with licenses; [ gpl3 lgpl3 mpl11 ]; - maintainers = with maintainers; [ renzo ]; - platforms = platforms.all; - }; - }; - mkDictFromDicollecte = { shortName, shortDescription, longDescription, dictFileName }: mkDict rec { @@ -152,218 +136,6 @@ in { }; }; - /* SPANISH */ - - es-any = mkDictFromRedIRIS { - shortName = "es-any"; - shortDescription = "Spanish (any variant)"; - dictFileName = "es_ANY"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2933/es_ANY.oxt; - md5 = "e3d4b38f280e7376178529db2ece982b"; - }; - }; - - es-ar = mkDictFromRedIRIS { - shortName = "es-ar"; - shortDescription = "Spanish (Argentina)"; - dictFileName = "es_AR"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2953/es_AR.oxt; - md5 = "68ee8f4ebc89a1fa461045d4dbb9b7be"; - }; - }; - - es-bo = mkDictFromRedIRIS { - shortName = "es-bo"; - shortDescription = "Spanish (Bolivia)"; - dictFileName = "es_BO"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2952/es_BO.oxt; - md5 = "1ebf11b6094e0bfece8e95cc34e7a409"; - }; - }; - - es-cl = mkDictFromRedIRIS { - shortName = "es-cl"; - shortDescription = "Spanish (Chile)"; - dictFileName = "es_CL"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2951/es_CL.oxt; - md5 = "092a388101350b77af4fd789668582bd"; - }; - }; - - es-co = mkDictFromRedIRIS { - shortName = "es-co"; - shortDescription = "Spanish (Colombia)"; - dictFileName = "es_CO"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2950/es_CO.oxt; - md5 = "fc440fd9fc55ca2dfb9bfa34a1e63864"; - }; - }; - - es-cr = mkDictFromRedIRIS { - shortName = "es-cr"; - shortDescription = "Spanish (Costra Rica)"; - dictFileName = "es_CR"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2949/es_CR.oxt; - md5 = "7510fd0f4eb3c6e65523a8d0960f77dd"; - }; - }; - - es-cu = mkDictFromRedIRIS { - shortName = "es-cu"; - shortDescription = "Spanish (Cuba)"; - dictFileName = "es_CU"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2948/es_CU.oxt; - md5 = "0ab4b9638f58ddd3d95d1265918ff39e"; - }; - }; - - es-do = mkDictFromRedIRIS { - shortName = "es-do"; - shortDescription = "Spanish (Dominican Republic)"; - dictFileName = "es_DO"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2947/es_DO.oxt; - md5 = "24a20fd4d887693afef539e6f1a3b58e"; - }; - }; - - es-ec = mkDictFromRedIRIS { - shortName = "es-ec"; - shortDescription = "Spanish (Ecuador)"; - dictFileName = "es_EC"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2946/es_EC.oxt; - md5 = "5d7343a246323ceda58cfbbf1428e279"; - }; - }; - - es-es = mkDictFromRedIRIS { - shortName = "es-es"; - shortDescription = "Spanish (Spain)"; - dictFileName = "es_ES"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2945/es_ES.oxt; - md5 = "59dd45e6785ed644adbbd73f4f126182"; - }; - }; - - es-gt = mkDictFromRedIRIS { - shortName = "es-gt"; - shortDescription = "Spanish (Guatemala)"; - dictFileName = "es_GT"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2944/es_GT.oxt; - md5 = "b1a9be80687e3117c67ac46aad6b8d66"; - }; - }; - - es-hn = mkDictFromRedIRIS { - shortName = "es-hn"; - shortDescription = "Spanish (Honduras)"; - dictFileName = "es_HN"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2943/es_HN.oxt; - md5 = "d0db5bebd6925738b524de9709950f22"; - }; - }; - - es-mx = mkDictFromRedIRIS { - shortName = "es-mx"; - shortDescription = "Spanish (Mexico)"; - dictFileName = "es_MX"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2942/es_MX.oxt; - md5 = "0de780714f84955112f38f35fb63a894"; - }; - }; - - es-ni = mkDictFromRedIRIS { - shortName = "es-ni"; - shortDescription = "Spanish (Nicaragua)"; - dictFileName = "es_NI"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2941/es_NI.oxt; - md5 = "d259d7be17c34df76c7de40c80720a39"; - }; - }; - - es-pa = mkDictFromRedIRIS { - shortName = "es-pa"; - shortDescription = "Spanish (Panama)"; - dictFileName = "es_PA"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2940/es_PA.oxt; - md5 = "085fbdbed6a2e248630c801881563b7a"; - }; - }; - - es-pe = mkDictFromRedIRIS { - shortName = "es-pe"; - shortDescription = "Spanish (Peru)"; - dictFileName = "es_PE"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2939/es_PE.oxt; - md5 = "f4673063246888995d4eaa2d4a24ee3d"; - }; - }; - - es-pr = mkDictFromRedIRIS { - shortName = "es-pr"; - shortDescription = "Spanish (Puerto Rico)"; - dictFileName = "es_PR"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2938/es_PR.oxt; - md5 = "e67bcf891ba9eeaeb57a60ec8e57f1ac"; - }; - }; - - es-py = mkDictFromRedIRIS { - shortName = "es-py"; - shortDescription = "Spanish (Paraguay)"; - dictFileName = "es_PY"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2937/es_PY.oxt; - md5 = "ba98e3197c81db4c572def2c5cca942d"; - }; - }; - - es-sv = mkDictFromRedIRIS { - shortName = "es-sv"; - shortDescription = "Spanish (El Salvador)"; - dictFileName = "es_SV"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2936/es_SV.oxt; - md5 = "c68ca9d188cb23c88cdd34a069c5a013"; - }; - }; - - es-uy = mkDictFromRedIRIS { - shortName = "es-uy"; - shortDescription = "Spanish (Uruguay)"; - dictFileName = "es_UY"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2935/es_UY.oxt; - md5 = "aeb9d39e4d17e9c904c1f3567178aad6"; - }; - }; - - es-ve = mkDictFromRedIRIS { - shortName = "es-ve"; - shortDescription = "Spanish (Venezuela)"; - dictFileName = "es_VE"; - src = fetchurl { - url = http://forja.rediris.es/frs/download.php/2934/es_VE.oxt; - md5 = "8afa9619aede2d9708e799e0f5d0fcab"; - }; - }; - /* FRENCH */ fr-any = mkDictFromDicollecte { @@ -416,7 +188,7 @@ in { shortDescription = "Hunspell dictionary for 'Italian (Italy)' from Linguistico"; src = fetchurl { url = mirror://sourceforge/linguistico/italiano_2_4_2007_09_01.zip; - md5 = "e7fbd9e2dfb25ea3288cdb918e1e1260"; + sha256 = "0m9frz75fx456bczknay5i446gdcp1smm48lc0qfwzhz0j3zcdrd"; }; }; } diff --git a/pkgs/development/libraries/java/jjtraveler/default.nix b/pkgs/development/libraries/java/jjtraveler/default.nix deleted file mode 100644 index b9dc1d68860..00000000000 --- a/pkgs/development/libraries/java/jjtraveler/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, jdk}: - -stdenv.mkDerivation { - name = "jjtraveler-0.4.3"; - src = fetchurl { - url = http://www.cwi.nl/projects/MetaEnv/jjtraveler/JJTraveler-0.4.3.tar.gz; - md5 = "35bf801ee61f042513ae88247fe1bf1d"; - }; - buildInputs = [stdenv jdk]; - - meta = { - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix index d6e26a02d67..6f6534cee3e 100644 --- a/pkgs/development/libraries/java/lucene/default.nix +++ b/pkgs/development/libraries/java/lucene/default.nix @@ -1,12 +1,14 @@ {stdenv, fetchurl} : -stdenv.mkDerivation { - name = "lucene-1.4.1"; +stdenv.mkDerivation rec { + name = "lucene-${version}"; + version = "1.4.3"; + builder = ./builder.sh; src = fetchurl { - url = http://cvs.apache.org/dist/jakarta/lucene/v1.4.1/lucene-1.4.1.tar.gz; - md5 = "656a6f40f5b8f7d2e19453436848bfe8"; + url = "https://archive.apache.org/dist/jakarta/lucene/${name}.tar.gz"; + sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh"; }; meta = { diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix index 5681200c4fa..551375d33bd 100644 --- a/pkgs/development/libraries/java/mockobjects/default.nix +++ b/pkgs/development/libraries/java/mockobjects/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/mockobjects/mockobjects-bin-0.09.tar; - md5 = "a0e11423bd5fcbb6ea65753643ea8852"; + sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz"; }; meta = { diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index 123379d788d..45df4876be1 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -1,15 +1,23 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "jbig2dec-0.11"; + name = "jbig2dec-0.13"; src = fetchurl { - url = "mirror://sourceforge/jbig2dec/${name}.tar.xz"; - sha256 = "1xddc30garsg5j8p348cz5l8vn8j7723c0sykv0kc1w5ihaghsq1"; + url = "http://downloads.ghostscript.com/public/jbig2dec/${name}.tar.gz"; + sha256 = "04akiwab8iy5iy34razcvh9mcja9wy737civ3sbjxk4j143s1b2s"; }; + patches = + [ (fetchpatch { + url = "http://git.ghostscript.com/?p=jbig2dec.git;a=patch;h=e698d5c11d27212aa1098bc5b1673a3378563092"; + sha256 = "1fc8xm1z98xj2zkcl0zj7dpjjsbz3vn61b59jnkhcyzy3iiczv7f"; + name = "CVE-2016-9601.patch"; + }) + ]; + meta = { - homepage = http://jbig2dec.sourceforge.net/; + homepage = https://www.ghostscript.com/jbig2dec.html; description = "Decoder implementation of the JBIG2 image compression format"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/jsoncpp/1.6.5/default.nix b/pkgs/development/libraries/jsoncpp/1.6.5/default.nix deleted file mode 100644 index 00dffdbc3ce..00000000000 --- a/pkgs/development/libraries/jsoncpp/1.6.5/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, python }: - -stdenv.mkDerivation rec { - name = "jsoncpp-${version}"; - version = "1.6.5"; - - src = fetchFromGitHub { - owner = "open-source-parsers"; - repo = "jsoncpp"; - rev = version; - sha256 = "08y54n4v3q18ik8iv8zyziava3x130ilzf1l3qli3vjwf6l42fm0"; - }; - - /* During darwin bootstrap, we have a cp that doesn't understand the - * --reflink=auto flag, which is used in the default unpackPhase for dirs - */ - unpackPhase = '' - cp -a ${src} ${src.name} - chmod -R +w ${src.name} - export sourceRoot=${src.name} - ''; - - # Hack to be able to run the test, broken because we use - # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install - preBuild = '' - export LD_LIBRARY_PATH="`pwd`/src/lib_json:$LD_LIBRARY_PATH" - ''; - - nativeBuildInputs = [ cmake python ]; - - CXXFLAGS = "-Wno-shift-negative-value"; - - cmakeFlags = [ - "-DJSONCPP_LIB_BUILD_SHARED=ON" - "-DJSONCPP_LIB_BUILD_STATIC=OFF" - "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" - ]; - - meta = { - inherit version; - homepage = https://github.com/open-source-parsers/jsoncpp; - description = "A simple API to manipulate JSON data in C++"; - maintainers = with stdenv.lib.maintainers; [ ttuegel cpages ]; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.mit; - branch = "1.6"; - }; -} diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 5c4c4a693df..18ea6370634 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -1,34 +1,49 @@ { stdenv -, fetchgit +, fetchFromGitHub , cmake , python }: stdenv.mkDerivation rec { name = "jsoncpp-${version}"; - version = "1.7.2"; + version = "1.8.0"; - src = fetchgit { - url = https://github.com/open-source-parsers/jsoncpp.git; - sha256 = "04w4cfmvyv52rpqhc370ln8rhlsrr515778bixhgafqbp3p4x34k"; - rev = "c8054483f82afc3b4db7efe4e5dc034721649ec8"; + src = fetchFromGitHub { + owner = "open-source-parsers"; + repo = "jsoncpp"; + rev = version; + sha256 = "1lg22zrjnl10x1bw0wfz72xd2kfbzynyggk8vdwd89mp1g8xjl9d"; }; - configurePhase = '' - mkdir -p Build - pushd Build + /* During darwin bootstrap, we have a cp that doesn't understand the + * --reflink=auto flag, which is used in the default unpackPhase for dirs + */ + unpackPhase = '' + cp -a ${src} ${src.name} + chmod -R +w ${src.name} + export sourceRoot=${src.name} + ''; - mkdir -p $out - cmake .. -DCMAKE_INSTALL_PREFIX=$out \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=Release - ''; + # Hack to be able to run the test, broken because we use + # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install + preBuild = if stdenv.isDarwin then '' + export DYLD_LIBRARY_PATH="`pwd`/src/lib_json:$DYLD_LIBRARY_PATH" + '' else '' + export LD_LIBRARY_PATH="`pwd`/src/lib_json:$LD_LIBRARY_PATH" + ''; - buildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_STATIC_LIBS=OFF" + ]; meta = with stdenv.lib; { + inherit version; homepage = https://github.com/open-source-parsers/jsoncpp; description = "A C++ library for interacting with JSON."; + maintainers = with maintainers; [ ttuegel cpages ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 93a8d62ed1d..ee7614bbcf1 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -1,11 +1,26 @@ /* +# New packages + +READ THIS FIRST + +This module is for official packages in KDE Frameworks 5. All available packages +are listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see +below). + +IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. + +Many of the packages released upstream are not yet built in Nixpkgs due to lack +of demand. To add a Nixpkgs build for an upstream package, copy one of the +existing packages here and modify it as necessary. + # Updates -1. Update the URL in `maintainers/scripts/generate-kde-frameworks.sh` and - run that script from the top of the Nixpkgs tree. -2. Check that the new packages build correctly. -3. Commit the changes and open a pull request. +1. Update the URL in `./fetch.sh`. +2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks` + from the top of the Nixpkgs tree. +3. Invoke `nix-build -A kde5` and ensure that everything builds. +4. Commit the changes and open a pull request. */ diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 9c8d06b14c6..263f811ebc6 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/frameworks/5.30/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/frameworks/5.31/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch index fbecf9433f6..e3bfc2ebe6b 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch @@ -7,7 +7,7 @@ Index: kinit-5.24.0/src/start_kdeinit/start_kdeinit_wrapper.c #include -#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" -+#define EXECUTE "/var/setuid-wrappers/start_kdeinit" ++#define EXECUTE "/run/wrappers/bin/start_kdeinit" #if KDEINIT_OOM_PROTECT diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch index 5fa1c3fe79b..c1c9efde7f7 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch +++ b/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch @@ -1,11 +1,11 @@ -Index: kpackage-5.30.0/src/kpackage/package.cpp -=================================================================== ---- kpackage-5.30.0.orig/src/kpackage/package.cpp -+++ kpackage-5.30.0/src/kpackage/package.cpp +diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp +index 5aec9fd..b15c933 100644 +--- a/src/kpackage/package.cpp ++++ b/src/kpackage/package.cpp @@ -820,7 +820,7 @@ PackagePrivate::PackagePrivate() : QSharedData(), - fallbackPackage(0), - metadata(0), + fallbackPackage(nullptr), + metadata(nullptr), - externalPaths(false), + externalPaths(true), valid(false), diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 0783c3bd9ed..f879005da1d 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,595 +3,595 @@ { attica = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/attica-5.30.0.tar.xz"; - sha256 = "1v8y6dx5qcqrs1dlybmc3lx05qsra0111qf7kzlq8azljdy20i2v"; - name = "attica-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/attica-5.31.0.tar.xz"; + sha256 = "0gfqxaqvw05rdgjqs2cn5bgnmijcsl16myf919fdc75xkdpg1h56"; + name = "attica-5.31.0.tar.xz"; }; }; baloo = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/baloo-5.30.0.tar.xz"; - sha256 = "022frn2f5mw71496r2i70q3z9diq6d5386nh8aymvii0l84c0mm9"; - name = "baloo-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/baloo-5.31.0.tar.xz"; + sha256 = "0n3cwq7g9zik3xjp895vl1j62b538rg6zcsm2x4h2nnq3njrnfbz"; + name = "baloo-5.31.0.tar.xz"; }; }; bluez-qt = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/bluez-qt-5.30.0.tar.xz"; - sha256 = "1asf2hcljzhca9pmh42fz25nnp05xxf4yab4r13wwwdzk4ms0x6f"; - name = "bluez-qt-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/bluez-qt-5.31.0.tar.xz"; + sha256 = "12g9jc6b8f03dka5sbjf19g536y8d1xvzkrwp2m0w98zcd0q33jl"; + name = "bluez-qt-5.31.0.tar.xz"; }; }; breeze-icons = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/breeze-icons-5.30.0.tar.xz"; - sha256 = "0n8705sly52sp4lsikr8xs671ch23ykk8xg3ksb9na700v837rak"; - name = "breeze-icons-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/breeze-icons-5.31.0.tar.xz"; + sha256 = "1ylask25jrwyk53c81jy73k9i8cylnab3a42yyrf3f25qbvhr845"; + name = "breeze-icons-5.31.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/extra-cmake-modules-5.30.0.tar.xz"; - sha256 = "0v59f76ghqckg857559sb4vla1d6pza4hj5bai8dnd712isn9abx"; - name = "extra-cmake-modules-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/extra-cmake-modules-5.31.0.tar.xz"; + sha256 = "1srdvjgn72687r48f0x32vn7q5czvk9k1w1393bcws2l0icil9w4"; + name = "extra-cmake-modules-5.31.0.tar.xz"; }; }; frameworkintegration = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/frameworkintegration-5.30.0.tar.xz"; - sha256 = "1a9zqd96jn9p8niqz0jwclfl1np1ryszdz8q02s9cwy35zia1dfk"; - name = "frameworkintegration-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/frameworkintegration-5.31.0.tar.xz"; + sha256 = "1wfiny11fm0k6w1ly7ca7xj3f7a1mn3b1gpvlcpaqbrib6b3dgcj"; + name = "frameworkintegration-5.31.0.tar.xz"; }; }; kactivities = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kactivities-5.30.0.tar.xz"; - sha256 = "0njq8jc9vqag3h6ryjiraib44sgrd66fswnldl0w0n2kvgf948qv"; - name = "kactivities-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kactivities-5.31.0.tar.xz"; + sha256 = "1v33pkjwjjp6lrqhch7l66xyyvln1pgbs0wbgi8q9c024s92jqqz"; + name = "kactivities-5.31.0.tar.xz"; }; }; kactivities-stats = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kactivities-stats-5.30.0.tar.xz"; - sha256 = "116mcnadlqidx90hllpwkxrmhwapnvmak5rzmqngnzkdvrpicl6r"; - name = "kactivities-stats-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kactivities-stats-5.31.0.tar.xz"; + sha256 = "1ngydmby0dzf802bjszhn3qsc0vgrhc0ya511x7jc9h49mgbp2jy"; + name = "kactivities-stats-5.31.0.tar.xz"; }; }; kapidox = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kapidox-5.30.0.tar.xz"; - sha256 = "08qpbmgw8cb4ygs4m3y9529dwsyn7nrln5rkfmbfkvfjlfry7njf"; - name = "kapidox-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kapidox-5.31.0.tar.xz"; + sha256 = "1lnqcgmxdy8l0qzn2jb9kww2lg1a33izw0hy78fkm7drg67g26za"; + name = "kapidox-5.31.0.tar.xz"; }; }; karchive = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/karchive-5.30.0.tar.xz"; - sha256 = "0f0zax2hihiq504nr3m5vap0ssmx5hvnc3rxk006zgvwgr1mvcqq"; - name = "karchive-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/karchive-5.31.0.tar.xz"; + sha256 = "1yafkgd5q9j1y3shivh5jayc4pss1skzyf3f1rmzl4psn2r6rsay"; + name = "karchive-5.31.0.tar.xz"; }; }; kauth = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kauth-5.30.0.tar.xz"; - sha256 = "0qf0wkkiaykcl79q0rsfmg7h7v342ycz9s6xr841qqs9w17dns3c"; - name = "kauth-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kauth-5.31.0.tar.xz"; + sha256 = "0y4gc3n8d36wrpdmgq2jif82lkqr3xhb7v8lgg6kgaxb1d7fi2r8"; + name = "kauth-5.31.0.tar.xz"; }; }; kbookmarks = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kbookmarks-5.30.0.tar.xz"; - sha256 = "0cibgw032n9n92fp78w04qw851lp3bfkd1rnyqvz7biypx4cz82z"; - name = "kbookmarks-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kbookmarks-5.31.0.tar.xz"; + sha256 = "0xdrx3gr291gkrfj360pw3aax0mz0zhhvjw7c4fcp35m0sqg1kvp"; + name = "kbookmarks-5.31.0.tar.xz"; }; }; kcmutils = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kcmutils-5.30.0.tar.xz"; - sha256 = "12x32jwf8gb77l5brj169ahrgdlsmn0zrzmjfp7f4dfykfnbfws9"; - name = "kcmutils-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kcmutils-5.31.0.tar.xz"; + sha256 = "00ngh556sxswrfhhy5vkfi8sk5jbb0srvx4np49xwpmh5xb6qzk9"; + name = "kcmutils-5.31.0.tar.xz"; }; }; kcodecs = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kcodecs-5.30.0.tar.xz"; - sha256 = "1via1xv4qswlyasyppi3q3a76bl5hk5ji34k63bp06p029ar7dkf"; - name = "kcodecs-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kcodecs-5.31.0.tar.xz"; + sha256 = "1nyn4b61ymbxv1xnbq3z79dbvapsy6jg51w52l0gnqkiy2zlbz13"; + name = "kcodecs-5.31.0.tar.xz"; }; }; kcompletion = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kcompletion-5.30.0.tar.xz"; - sha256 = "1205xq2r550lb4v39h3g1sr8cgsysfkkxkk5scp4d92vawlbsrx6"; - name = "kcompletion-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kcompletion-5.31.0.tar.xz"; + sha256 = "0jx1lsz1fh8h20a5ixdv9q5yx6r5r7jr8hi68v7b66anmpnh2m3g"; + name = "kcompletion-5.31.0.tar.xz"; }; }; kconfig = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kconfig-5.30.0.tar.xz"; - sha256 = "1p23q7ykkrsj847m244v1wjcg7b85rh7shc8lkn290cydk5kr6m2"; - name = "kconfig-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kconfig-5.31.0.tar.xz"; + sha256 = "1z9jf5rizdj7c7x918zmdv4v01glpl3z44mrx7yfp2cqnjniwhxi"; + name = "kconfig-5.31.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kconfigwidgets-5.30.0.tar.xz"; - sha256 = "15ir4qr4hzr8ia9g8c13fnn2szhs07wys54nialbj0dggx9qa782"; - name = "kconfigwidgets-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kconfigwidgets-5.31.0.tar.xz"; + sha256 = "19y3s5qcb3mzw8xiyp57zb2sjclcmxzj3xp0iwzs41r4lqmlwajs"; + name = "kconfigwidgets-5.31.0.tar.xz"; }; }; kcoreaddons = { - version = "5.30.1"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kcoreaddons-5.30.1.tar.xz"; - sha256 = "0w1yqcvd97jhm3w2x7mmayrifb1swda8lmzzmlz41crsq909ilnd"; - name = "kcoreaddons-5.30.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kcoreaddons-5.31.0.tar.xz"; + sha256 = "0175vgii8l5yx1bbbjljblkkq03nqfhb3v7in2657glag6imcb7m"; + name = "kcoreaddons-5.31.0.tar.xz"; }; }; kcrash = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kcrash-5.30.0.tar.xz"; - sha256 = "0hmcg81iahd2bvcm57yk7mdy6lnrsrzl7z6cv8lxpj9xw0ajd8h4"; - name = "kcrash-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kcrash-5.31.0.tar.xz"; + sha256 = "0mj6dahalwks39d881nvmrd3rqm2aid06iq6s8p2grhnncf6cd4j"; + name = "kcrash-5.31.0.tar.xz"; }; }; kdbusaddons = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kdbusaddons-5.30.0.tar.xz"; - sha256 = "1ql5xjxfq8y0bmagq2zw44rilyrm1cmkjsfcfrjy0d2adhl23w7p"; - name = "kdbusaddons-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kdbusaddons-5.31.0.tar.xz"; + sha256 = "1dv9yzicd2d1k0qjgjbryks0f6s0v76hr0csdb7j22nwn9pb4cfk"; + name = "kdbusaddons-5.31.0.tar.xz"; }; }; kdeclarative = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kdeclarative-5.30.0.tar.xz"; - sha256 = "0898mxh7izxn9d4iyv8gsxrjl2wms4m6mr69qd4bfygd8z8hqp46"; - name = "kdeclarative-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kdeclarative-5.31.0.tar.xz"; + sha256 = "0hw3rkmlw6j056b3wvhpaj778xfxajcqidpf5x3nyfjmqjvxsgw1"; + name = "kdeclarative-5.31.0.tar.xz"; }; }; kded = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kded-5.30.0.tar.xz"; - sha256 = "1sqmnxii0i3m65cacjxasm99pq2cvfymbalak8r0mip8g8fdarrd"; - name = "kded-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kded-5.31.0.tar.xz"; + sha256 = "0zsikbzi8i8bmlpa4kgdpcpsifkwwclsfdgafd7yf5svc4hyyl51"; + name = "kded-5.31.0.tar.xz"; }; }; kdelibs4support = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/portingAids/kdelibs4support-5.30.0.tar.xz"; - sha256 = "0fkg5bk1p91iq1na67h02wdqnq71ln8g22r6sc7rva54w5ilnwxm"; - name = "kdelibs4support-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/portingAids/kdelibs4support-5.31.0.tar.xz"; + sha256 = "1yh4lr56mnwsbc0gysj1c58w1r62dlxxds16xnp5j0lyir7wx0pl"; + name = "kdelibs4support-5.31.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kdesignerplugin-5.30.0.tar.xz"; - sha256 = "0hf7209zd398v4m3aa99yva1bbphzlyn0x9i5ydalwvwykmvjvdz"; - name = "kdesignerplugin-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kdesignerplugin-5.31.0.tar.xz"; + sha256 = "1g510f8dfvaddcq5hrvsaiwayp2hzkdryzn62zff29ipd7qpcd2x"; + name = "kdesignerplugin-5.31.0.tar.xz"; }; }; kdesu = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kdesu-5.30.0.tar.xz"; - sha256 = "1cnl6pap4399s7l9ggi23f5b6mscfddsgwra4d2qy1093y0nb8mk"; - name = "kdesu-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kdesu-5.31.0.tar.xz"; + sha256 = "0mzvvr3zz28pgp42i3f54g5k3wplvjdg41d8jb9k6m5qcj8aryax"; + name = "kdesu-5.31.0.tar.xz"; }; }; kdewebkit = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kdewebkit-5.30.0.tar.xz"; - sha256 = "1rq3ypsw2svvzfxjd6gj231phhnw19fwyr5qkcsik4076h6ycwvk"; - name = "kdewebkit-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kdewebkit-5.31.0.tar.xz"; + sha256 = "0x9v8i37apbik2krxr9n2pgq5xmcgjlhzflbrwwqaq30c2l8aid0"; + name = "kdewebkit-5.31.0.tar.xz"; }; }; kdnssd = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kdnssd-5.30.0.tar.xz"; - sha256 = "1if1gaykgad5vg32p0impx4vwjaxd77r34gajg1kiywan6jpq6d8"; - name = "kdnssd-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kdnssd-5.31.0.tar.xz"; + sha256 = "1bbk9qsvx49zbjvdg0xi9s2x51f331n8wnyd320j3ay0mp4yq2kk"; + name = "kdnssd-5.31.0.tar.xz"; }; }; kdoctools = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kdoctools-5.30.0.tar.xz"; - sha256 = "14i7ffmlwqhbq7gp5k8wajvg7x65nwxr5p1qqgxhmpmranyickvy"; - name = "kdoctools-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kdoctools-5.31.0.tar.xz"; + sha256 = "1m7l4bk5h75mcrgislp4rc7fj1szv1ij30y5yizncg2c3aq2czxk"; + name = "kdoctools-5.31.0.tar.xz"; }; }; kemoticons = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kemoticons-5.30.0.tar.xz"; - sha256 = "0h3a9xs110l1d2wyp8dfkaf3fnpc0wvfdacpgbnihk1xvccmq4nl"; - name = "kemoticons-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kemoticons-5.31.0.tar.xz"; + sha256 = "0zvps3jrx02dzy82mwf5l7dirpnj616081yhkp2m0xw3qa3i16xk"; + name = "kemoticons-5.31.0.tar.xz"; }; }; kfilemetadata = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kfilemetadata-5.30.0.tar.xz"; - sha256 = "1m07hj5nnb81wraylhh36f2k82zqxz5g766wwcn12pd8v0r99ilh"; - name = "kfilemetadata-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kfilemetadata-5.31.0.tar.xz"; + sha256 = "123cin3fhai85zzz5hfr6h87cjrqvsyl9i809j7q0fshjx8c9wpd"; + name = "kfilemetadata-5.31.0.tar.xz"; }; }; kglobalaccel = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kglobalaccel-5.30.0.tar.xz"; - sha256 = "123c7sqwj4davrwrgwy16qag8ss205pk9af4jc9sky74h531fdm1"; - name = "kglobalaccel-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kglobalaccel-5.31.0.tar.xz"; + sha256 = "1l7phfk17z9rrdlcjz97zyyqlj9pps0gdpphrfqrz1fyx5ifybmc"; + name = "kglobalaccel-5.31.0.tar.xz"; }; }; kguiaddons = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kguiaddons-5.30.0.tar.xz"; - sha256 = "0kn0ia6ciafng227lrrdslmxhh30426wywarxvihlcqfzrgmnpzm"; - name = "kguiaddons-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kguiaddons-5.31.0.tar.xz"; + sha256 = "0bvjnbsskps2pfh0y72klxfanm54c0iflll5awaps750flb3bbp3"; + name = "kguiaddons-5.31.0.tar.xz"; }; }; khtml = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/portingAids/khtml-5.30.0.tar.xz"; - sha256 = "1z4pj3cr8bzbl80bi1z87lsg1adr9hbm60wf3811wdma2d4w4bbh"; - name = "khtml-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/portingAids/khtml-5.31.0.tar.xz"; + sha256 = "19pf3ir3r8igrx3h90sn383kxmyjdxgmwaw66p6vjb83243dy57h"; + name = "khtml-5.31.0.tar.xz"; }; }; ki18n = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/ki18n-5.30.0.tar.xz"; - sha256 = "1wvjrmpsypfhivk3hfpb9lm09d0w2c9lc4mxvbyfkibhan1x1lid"; - name = "ki18n-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/ki18n-5.31.0.tar.xz"; + sha256 = "1q496i4a3kq2bfxpfnz6bfxk2shfdshrxcf253ab58l76l3jcy9g"; + name = "ki18n-5.31.0.tar.xz"; }; }; kiconthemes = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kiconthemes-5.30.0.tar.xz"; - sha256 = "0sixqg2fvm9m14xbn3dmsk564i9ig3zn6zf5ww10hnqd1wcd4sg9"; - name = "kiconthemes-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kiconthemes-5.31.0.tar.xz"; + sha256 = "0kangszmlhzbwvvplnxk2i938xl8j8jpd8kpf2n9skxkqfd19qr5"; + name = "kiconthemes-5.31.0.tar.xz"; }; }; kidletime = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kidletime-5.30.0.tar.xz"; - sha256 = "1vbjvwy5ihz5id2484d2hn5a81p85vz3mvwpcjbypkd3y5mqcrq6"; - name = "kidletime-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kidletime-5.31.0.tar.xz"; + sha256 = "03ajdhxv2jdggqhy02s6xgbaf4pa2chj0f6d5kgz9r0wx6kxmh25"; + name = "kidletime-5.31.0.tar.xz"; }; }; kimageformats = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kimageformats-5.30.0.tar.xz"; - sha256 = "057a9gallq1j3a51ijyp47x82hmn8vssxb74jchlf90jjnyq4g2i"; - name = "kimageformats-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kimageformats-5.31.0.tar.xz"; + sha256 = "17cz2xmmm5g55kndq983vy6cg7adpbiw7ahn0lpvviinnsf53s12"; + name = "kimageformats-5.31.0.tar.xz"; }; }; kinit = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kinit-5.30.0.tar.xz"; - sha256 = "047vxnq4ypl70vspq800k00cj2cjqd6hx46yp11m33np03106rj2"; - name = "kinit-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kinit-5.31.0.tar.xz"; + sha256 = "082kq25163x40bq12x84ccrk3zrzmn5xpb5m4zgi06zcvzb8rl9l"; + name = "kinit-5.31.0.tar.xz"; }; }; kio = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kio-5.30.0.tar.xz"; - sha256 = "0finbv7kcaz81bsj6yv6pxwxcjrwkj5mmkxhg0pa5j77jn1nhnm1"; - name = "kio-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kio-5.31.0.tar.xz"; + sha256 = "1rry7v9g2430hkz44b4xjcbs3lr64srs8822a52vx1w69jpkn5s9"; + name = "kio-5.31.0.tar.xz"; }; }; kitemmodels = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kitemmodels-5.30.0.tar.xz"; - sha256 = "1yf2bfzxqgw75p5bi7byg9rbbiclhqayybiyd8cq3d8b8ws4bfdf"; - name = "kitemmodels-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kitemmodels-5.31.0.tar.xz"; + sha256 = "0zb9cm5v3ylqhg8l5sp3jskghm5izzihha5ik09y7fabl52cd6v5"; + name = "kitemmodels-5.31.0.tar.xz"; }; }; kitemviews = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kitemviews-5.30.0.tar.xz"; - sha256 = "0fx4sdrflp2h0y6ixdnbaxd8l5cham4lx0f36y7dfz6jlk56d12y"; - name = "kitemviews-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kitemviews-5.31.0.tar.xz"; + sha256 = "04r4pd5rkdgbszyg7l050r53f38skhh2p2mi3xkz4ckci132srlv"; + name = "kitemviews-5.31.0.tar.xz"; }; }; kjobwidgets = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kjobwidgets-5.30.0.tar.xz"; - sha256 = "0ilzl1sm9fx7cx03nh5y2y656jfssp7b46xiawgnasvc94ysl9hf"; - name = "kjobwidgets-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kjobwidgets-5.31.0.tar.xz"; + sha256 = "16grnlccmqcs84gpz62s1iz5amdwsprr76gd0q845bd49crgacfa"; + name = "kjobwidgets-5.31.0.tar.xz"; }; }; kjs = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/portingAids/kjs-5.30.0.tar.xz"; - sha256 = "0yh7n0q1vbx8nd6j25jys6hd24m3knn44n6xc09pwnr3mn0shvih"; - name = "kjs-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/portingAids/kjs-5.31.0.tar.xz"; + sha256 = "027n2ivh5kfmrm06xgcryxm14hbxyf83cx6rbc34093kk905ghg1"; + name = "kjs-5.31.0.tar.xz"; }; }; kjsembed = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/portingAids/kjsembed-5.30.0.tar.xz"; - sha256 = "0ixd56krz66psxk9h8dzd5jr693kh9xx4303zicws85014ba33q5"; - name = "kjsembed-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/portingAids/kjsembed-5.31.0.tar.xz"; + sha256 = "1mss7lahczvwhmybxnbcynqwa56gjrxiyq79fcicybp7h7rvqw14"; + name = "kjsembed-5.31.0.tar.xz"; }; }; kmediaplayer = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/portingAids/kmediaplayer-5.30.0.tar.xz"; - sha256 = "0bir4g7bfhjdrs2skhr7jclc3f7frmfm6p8n2q10ag9in8h5hwd8"; - name = "kmediaplayer-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/portingAids/kmediaplayer-5.31.0.tar.xz"; + sha256 = "0vxzw5grw53bxp0nvwmiqyw9sbpglhrnfg4d1ldlg4a1gibfijx4"; + name = "kmediaplayer-5.31.0.tar.xz"; }; }; knewstuff = { - version = "5.30.1"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/knewstuff-5.30.1.tar.xz"; - sha256 = "1vsaprynq6dazg64zmj6j1wd8g4aw6pzz3208nqgjjwk5kw8zh0h"; - name = "knewstuff-5.30.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/knewstuff-5.31.0.tar.xz"; + sha256 = "06qrgzfxrpmckyjq21ajvw08n5f5bdyqqgrnrbr1cjsfcx7xwdfl"; + name = "knewstuff-5.31.0.tar.xz"; }; }; knotifications = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/knotifications-5.30.0.tar.xz"; - sha256 = "199jh1gizdwc1xz97khac9m6bdg38n5hr5c96pq7sk7b2rdr49ks"; - name = "knotifications-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/knotifications-5.31.0.tar.xz"; + sha256 = "0nz5dkzgkv4mzcsg2mn9zzcqh484cyh5n1y8sx1831r808jd2wly"; + name = "knotifications-5.31.0.tar.xz"; }; }; knotifyconfig = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/knotifyconfig-5.30.0.tar.xz"; - sha256 = "04l5hjdd0376y9ygmrz8a49w8hxnb01y0fi13spvkmx8dhal0fmq"; - name = "knotifyconfig-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/knotifyconfig-5.31.0.tar.xz"; + sha256 = "1zdzfqqd32ykd5ibrkssl3p47v704jxs16br1rhrr32ymv4qcbpi"; + name = "knotifyconfig-5.31.0.tar.xz"; }; }; kpackage = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kpackage-5.30.0.tar.xz"; - sha256 = "1j1vwna5w67wqsdfl5s83gx7vizj5qnsl6nck7ny055yzzwb2gna"; - name = "kpackage-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kpackage-5.31.0.tar.xz"; + sha256 = "1hg8f2i10wcs31xhvw40dwgbgfrwx93w5bi5wlbrw55jcs040dfr"; + name = "kpackage-5.31.0.tar.xz"; }; }; kparts = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kparts-5.30.0.tar.xz"; - sha256 = "1sgqylynq35d6xir99kgqial3p0pf0lcaqagl2vh1qandipmcp8g"; - name = "kparts-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kparts-5.31.0.tar.xz"; + sha256 = "093g5zsdqqyx9z69afsmgyszd807pv3wpzwn37x1glg399dsv7fa"; + name = "kparts-5.31.0.tar.xz"; }; }; kpeople = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kpeople-5.30.0.tar.xz"; - sha256 = "1h72fwr6121w0cfhaci32s4510kwinjah9ynfhjl998mg00k42hj"; - name = "kpeople-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kpeople-5.31.0.tar.xz"; + sha256 = "1f71c2q8a9m463ghpq50gbhkvf5szkvvfwbamlrwwygpb89fzfjy"; + name = "kpeople-5.31.0.tar.xz"; }; }; kplotting = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kplotting-5.30.0.tar.xz"; - sha256 = "00wrz16m4blh130713fk0q3gzpsx33zs6wnd4ghwhaakmqydn2gh"; - name = "kplotting-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kplotting-5.31.0.tar.xz"; + sha256 = "15yv1rh1vlxhv77j50inq9kkwalhs2r1mjba82fnxy8z569i66cm"; + name = "kplotting-5.31.0.tar.xz"; }; }; kpty = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kpty-5.30.0.tar.xz"; - sha256 = "0dna8a0n7lg22522khxq0vxn76g484198p80hzvysnkl218fav60"; - name = "kpty-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kpty-5.31.0.tar.xz"; + sha256 = "0hfs1gdi1fqaaki5aa9b93j4pl33g4s82yxpbyc0h9k2891aq196"; + name = "kpty-5.31.0.tar.xz"; }; }; kross = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/portingAids/kross-5.30.0.tar.xz"; - sha256 = "1bqfznfrr87c88ffs7hj0iqcv8vgzrz57l31zpij3cgiy09q7axz"; - name = "kross-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/portingAids/kross-5.31.0.tar.xz"; + sha256 = "0lc9ijn60bw0y9nrlva2fd0hf0b4x6488jjmymrnrc8zzjnigyqp"; + name = "kross-5.31.0.tar.xz"; }; }; krunner = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/krunner-5.30.0.tar.xz"; - sha256 = "1smkanc14nlsdrg31skzb9y7f0fahyf09iq1h2xfla4kvgk811qz"; - name = "krunner-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/krunner-5.31.0.tar.xz"; + sha256 = "0xqayhd179387m02arxdcl1lgk8f2h0fxlzyigy6ja6wylbwphrw"; + name = "krunner-5.31.0.tar.xz"; }; }; kservice = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kservice-5.30.0.tar.xz"; - sha256 = "1jcb938m3kllmrzmwz21zjlhrx0r6dmyrglsf0zbjs2cg9hwww0l"; - name = "kservice-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kservice-5.31.0.tar.xz"; + sha256 = "0hjlcnypg96np88hgfvqd8g5z4cxgi4a0j5mnlfx65jrzpv5hsjg"; + name = "kservice-5.31.0.tar.xz"; }; }; ktexteditor = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/ktexteditor-5.30.0.tar.xz"; - sha256 = "0bhbcqfkmpy95p3w66xxnhi4h7h3k3k362fhsrl38rc83r9agnns"; - name = "ktexteditor-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/ktexteditor-5.31.0.tar.xz"; + sha256 = "099axcwl8z4npvcrirycc82zg7sf9ac3yxrwpsp0f337gdl1qvln"; + name = "ktexteditor-5.31.0.tar.xz"; }; }; ktextwidgets = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/ktextwidgets-5.30.0.tar.xz"; - sha256 = "1fpqjig6wzb1gycvak9h4p48c623fkzj2lxvf0p3vmb6b0yxr1jw"; - name = "ktextwidgets-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/ktextwidgets-5.31.0.tar.xz"; + sha256 = "0n0v42b4bq1f6f120bjhr69qwgnvwlhnnqsh75nl9jvv8g3lyspy"; + name = "ktextwidgets-5.31.0.tar.xz"; }; }; kunitconversion = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kunitconversion-5.30.0.tar.xz"; - sha256 = "0fjkl355dwcgd4a39212qwmmbj37nfhmw3ik2bxg3gxg07a4yra5"; - name = "kunitconversion-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kunitconversion-5.31.0.tar.xz"; + sha256 = "190d2v3bv7ccg2wqjmd6p46d4zz59r1mf86l2wkqw212rr59pafx"; + name = "kunitconversion-5.31.0.tar.xz"; }; }; kwallet = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kwallet-5.30.0.tar.xz"; - sha256 = "1nnc0gcn7w5jmmzs4zr4qlrhn3ns9x42f2dfcwc5vi281gghl54k"; - name = "kwallet-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kwallet-5.31.0.tar.xz"; + sha256 = "0r7n49ii8y1ygc7ncysjif4mrmsd9jq4yfm251m7lrp82drza26n"; + name = "kwallet-5.31.0.tar.xz"; }; }; kwayland = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kwayland-5.30.0.tar.xz"; - sha256 = "0sc2mdiazql2012qadbqjm4wxmhhanbba9r9qjxqx2li14ax6yci"; - name = "kwayland-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kwayland-5.31.0.tar.xz"; + sha256 = "0f134spj1vz3f43bdrb93kr54s50x4a9xvkfhl3inlxmglbk3h8b"; + name = "kwayland-5.31.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kwidgetsaddons-5.30.0.tar.xz"; - sha256 = "0jn2iw46cwfqh550rrb37yfznr4lrlsj8bh8v21xhgm3afm25hrl"; - name = "kwidgetsaddons-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kwidgetsaddons-5.31.0.tar.xz"; + sha256 = "0yrhss1x8q4nanpq2gbzqjds9s7hjl3zzkwnd8hahh9fyg8w9815"; + name = "kwidgetsaddons-5.31.0.tar.xz"; }; }; kwindowsystem = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kwindowsystem-5.30.0.tar.xz"; - sha256 = "0sz1wyawah03ygx3kh1x6wy1y1gp9f5h6296yy1mxy4qz4jp1b10"; - name = "kwindowsystem-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kwindowsystem-5.31.0.tar.xz"; + sha256 = "0jzhsdfzzhxfgjqd4pl98ckbbqfwkv6qy5szh82078gxc2rf1wna"; + name = "kwindowsystem-5.31.0.tar.xz"; }; }; kxmlgui = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kxmlgui-5.30.0.tar.xz"; - sha256 = "005cn74h0rjvjsmfzrn3pai0jrgczj3y6h50g07rgmynmrcnygys"; - name = "kxmlgui-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kxmlgui-5.31.0.tar.xz"; + sha256 = "1rnznapp1vflg66k0jk8n8v9zci20bs0v88hci3rf0qfd5cmgnzr"; + name = "kxmlgui-5.31.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/kxmlrpcclient-5.30.0.tar.xz"; - sha256 = "18azc85vfng9gnjf09yhvg5g4432dy5ia9hk54jk9ibmy7kaqlqq"; - name = "kxmlrpcclient-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/kxmlrpcclient-5.31.0.tar.xz"; + sha256 = "1lrv1qxbfm1ss2hb171p9s3f3iwn8zfrsipin0gvfwnjrldi4fkb"; + name = "kxmlrpcclient-5.31.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/modemmanager-qt-5.30.0.tar.xz"; - sha256 = "1qh39nd3lwdb8z58brqf0k48k5n3xx9wdi4kak2wg7vwmqwwammf"; - name = "modemmanager-qt-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/modemmanager-qt-5.31.0.tar.xz"; + sha256 = "0s2dfz9zvn6f9xpzs412iniipaai5zs9m06lpxss0w1nq5ig856r"; + name = "modemmanager-qt-5.31.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/networkmanager-qt-5.30.0.tar.xz"; - sha256 = "1scxcqrwxjwdzg2j3r6wz3bk23h7v9dil8n892ykfrpxa4cidgzi"; - name = "networkmanager-qt-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/networkmanager-qt-5.31.0.tar.xz"; + sha256 = "18wbmd4nsgwzqlp254k1ahy8iyydx59fshb3wci5sgxnsn435np4"; + name = "networkmanager-qt-5.31.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/oxygen-icons5-5.30.0.tar.xz"; - sha256 = "1b1kfgk2vgr85kbgvx8fwpyib5yvdkz07vi6p1s8a61cabcymkhl"; - name = "oxygen-icons5-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/oxygen-icons5-5.31.0.tar.xz"; + sha256 = "0ka4zll8v8wahqg50vpm9mrxlyh9244y0yrprbwxzl9xpx113ppi"; + name = "oxygen-icons5-5.31.0.tar.xz"; }; }; plasma-framework = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/plasma-framework-5.30.0.tar.xz"; - sha256 = "1qdyc0li07sns71gdyw31jhzhnghcvzc0r0y4y8f157nyz23pw70"; - name = "plasma-framework-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/plasma-framework-5.31.0.tar.xz"; + sha256 = "0hq3d96d9xhx6wqrrhnyygwajg69vfxbjc8dlpf5nwc3kqv2wim2"; + name = "plasma-framework-5.31.0.tar.xz"; }; }; prison = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/prison-5.30.0.tar.xz"; - sha256 = "15vlz67qv1pm87hlnyak2jbdw87xw3jx3vaqwjfn07hbzlh8dmpc"; - name = "prison-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/prison-5.31.0.tar.xz"; + sha256 = "0qaqj5gazby4fdq9yii67cmr04i007blhl27h9c5p169khh9ck2s"; + name = "prison-5.31.0.tar.xz"; }; }; solid = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/solid-5.30.0.tar.xz"; - sha256 = "10rfsp39s8d8zgz02f4biyh9n7hbwxkib5r6g3cldbbf0ch3inmh"; - name = "solid-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/solid-5.31.0.tar.xz"; + sha256 = "05rgzdzwbnmnvzkf4gz3z5i1ggwyd21y0yli7shas4i8l29kjd7m"; + name = "solid-5.31.0.tar.xz"; }; }; sonnet = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/sonnet-5.30.0.tar.xz"; - sha256 = "1i4i59vjq16mmqjfyr5hc7afnc5w2h54iz4rmqi0wdfk37cl5zcr"; - name = "sonnet-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/sonnet-5.31.0.tar.xz"; + sha256 = "16vzdhppb2w5vyfr332bcvw4dyw9cz4apxain28d43p0ir03xxz3"; + name = "sonnet-5.31.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/syntax-highlighting-5.30.0.tar.xz"; - sha256 = "0iipg1khc27a3cgysk6qpj5lf846z3n29gj2yas36lgr8n6ddm53"; - name = "syntax-highlighting-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/syntax-highlighting-5.31.0.tar.xz"; + sha256 = "0igd6jpbck94gl8gs5a5dgj2cxbv370prnk22037clqry6y38v1a"; + name = "syntax-highlighting-5.31.0.tar.xz"; }; }; threadweaver = { - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.30/threadweaver-5.30.0.tar.xz"; - sha256 = "12zirga9qyjrizwxja2n5mh7kxgdb7xyl2d3makdjpnjk5kry8by"; - name = "threadweaver-5.30.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.31/threadweaver-5.31.0.tar.xz"; + sha256 = "0wsdv135mxpka0rfg9zwhnzp0svfkvd4idyj38rgipxbada0hb7f"; + name = "threadweaver-5.31.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 3ee35e5bf57..89e2762e3cc 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { sha256 = "03q6y428rg723c9fj1vidzjw46w1vf8z0h95lkvz1l9jw571j739"; }; + patches = [ + (fetchurl { + url = "https://github.com/libarchive/libarchive/commit/98dcbbf0bf4854bf987557e55e55fff7abbf3ea9.patch"; + sha256 = "1934krf5imc9rq1av6immpsfn77pglanhz1csq8j22h9ab87n5z6"; + }) + ]; + outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 7bf969b78da..6d81a284040 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,8 +26,8 @@ with { inherit (stdenv.lib) optional optionals hasPrefix; }; let result = { - libav_0_8 = libavFun "0.8.19" "c79350d6fa071fcd66448ffc713fe3b9754876a8"; - libav_11 = libavFun "11.8" "y18hmrzy7jqq7h9ys54nrr4s49mkzsfh"; + libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f"; + libav_11 = libavFun "11.8" "d0e93f6b229ae46c49d13ec183b13cfee70a51f0"; libav_12 = libavFun "12" "4ecde7274621c82a6882b7614d907b28de25cc4e"; }; diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 94b483e1f5d..7811eff6fe2 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform }: -let version = "3.0.1"; in +let version = "3.1.0"; in stdenv.mkDerivation { name = "libcec-${version}"; src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; - sha256 = "0gi5gq8pz6vfdx80pimx23d5g243zzgmc7s8wpb686csjk470dky"; + sha256 = "08gr4rhx7qh8ajkry9j0sqw11i74y802dla1wg4l4gxhl4hrs409"; }; buildInputs = [ cmake pkgconfig udev libcec_platform ]; diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index 6db2656c9f4..d21f1b1404e 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cmake }: -let version = "1.0.10"; in +let version = "2.0.1"; in stdenv.mkDerivation { - name = "libcec-${version}"; + name = "p8-platform-${version}"; src = fetchurl { - url = "https://github.com/Pulse-Eight/platform/archive/${version}.tar.gz"; - sha256 = "1kdmi9b62nky4jrb5519ddnw5n7s7m6qyj7rzhg399f0n6f278vb"; + url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz"; + sha256 = "1kslq24p2zams92kc247qcczbxb2n89ykk9jfyiilmwh7qklazp9"; }; nativeBuildInputs = [ cmake ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Platform library for libcec and Kodi addons"; homepage = "https://github.com/Pulse-Eight/platform"; - repositories.git = "https://github.com/Pulse-Eight/libcec.git"; + repositories.git = "https://github.com/Pulse-Eight/platform.git"; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.titanous ]; diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index de3f51752b9..289fa20335a 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, llvm, clang }: +{ stdenv, fetchFromGitHub, python2, llvm, clang }: stdenv.mkDerivation { name = "libclc-2015-08-07"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "10n9qk1dild9yjkjjkzpmp9zid3ysdgvqrad554azcf755frch7g"; }; - buildInputs = [ python llvm clang ]; + buildInputs = [ python2 llvm clang ]; postPatch = '' sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; configurePhase = '' - python2 ./configure.py --prefix=$out + ${python2.interpreter} ./configure.py --prefix=$out ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix index d2c202b970a..cdaeb4969ae 100644 --- a/pkgs/development/libraries/libctemplate/default.nix +++ b/pkgs/development/libraries/libctemplate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { name = "ctemplate-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0mi5g2xlws10z1g4x0cj6kd1r673kkav35pgzyqxa1w47xnwprcr"; }; - buildInputs = [ python ]; + buildInputs = [ python2 ]; postPatch = '' patchShebangs . diff --git a/pkgs/development/libraries/libdivecomputer/subsurface.nix b/pkgs/development/libraries/libdivecomputer/subsurface.nix deleted file mode 100644 index 5840ea2ef85..00000000000 --- a/pkgs/development/libraries/libdivecomputer/subsurface.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchgit, autoreconfHook }: - -stdenv.mkDerivation rec { - name = "libdivecomputer-${version}"; - version = "ssrf-0.5.0"; - - src = fetchgit { - url = "git://subsurface-divelog.org/libdc"; - rev = "534dd2f34b8271b2a1cac0e3151bfdc81da40e47"; - branchName = "Subsurface-branch"; - sha256 = "0iw9pczmwqlfjlgrik79b2pd4lmipxhjzj60ysk8qzl3axadjycp"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://www.libdivecomputer.org; - description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; - maintainers = [ maintainers.mguentner ]; - license = licenses.lgpl21; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 38d072bc450..3dfbdd7040f 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }: stdenv.mkDerivation rec { - name = "libdrm-2.4.74"; + name = "libdrm-2.4.75"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "d80dd5a76c401f4c8756dcccd999c63d7e0a3bad258d96a829055cfd86ef840b"; + sha256 = "2d5a500eef412cc287d12268eed79d571e262d4957a2ec9258073f305985054f"; }; outputs = [ "out" "dev" ]; @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { preConfigure = stdenv.lib.optionalString stdenv.isDarwin "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; - configureFlags = [ "--enable-freedreno" "--disable-valgrind" ] + configureFlags = [ "--disable-valgrind" ] + ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] ++ stdenv.lib.optional stdenv.isDarwin "-C"; crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ]; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 48853b63c79..a0e72f2b561 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,30 +1,51 @@ { stdenv, fetchurl, libelf }: -stdenv.mkDerivation rec { - name = "libdwarf-20161124"; - +let + version = "20161124"; src = fetchurl { - url = "http://www.prevanders.net/${name}.tar.gz"; + url = "http://www.prevanders.net/libdwarf-${version}.tar.gz"; sha512 = "38e480bce5ae8273fd585ec1d8ba94dc3e865a0ef3fcfcf38b5d92fa1ce41f8b" + "8c95a7cf8a6e69e7c6f638a3cc56ebbfb37b6317047309725fa17e7929096799"; }; - - configureFlags = [ "--enable-shared" "--disable-nonshared" ]; - - preConfigure = '' - cd libdwarf - ''; - buildInputs = [ libelf ]; - - installPhase = '' - mkdir -p $out/lib $out/include - cp libdwarf.so.1 $out/lib - ln -s libdwarf.so.1 $out/lib/libdwarf.so - cp libdwarf.h dwarf.h $out/include - ''; - meta = { homepage = https://www.prevanders.net/dwarf.html; platforms = stdenv.lib.platforms.linux; }; + +in rec { + libdwarf = stdenv.mkDerivation rec { + name = "libdwarf-${version}"; + + configureFlags = [ "--enable-shared" "--disable-nonshared" ]; + + preConfigure = '' + cd libdwarf + ''; + buildInputs = [ libelf ]; + + installPhase = '' + mkdir -p $out/lib $out/include + cp libdwarf.so.1 $out/lib + ln -s libdwarf.so.1 $out/lib/libdwarf.so + cp libdwarf.h dwarf.h $out/include + ''; + + inherit meta src; + }; + + dwarfdump = stdenv.mkDerivation rec { + name = "dwarfdump-${version}"; + + preConfigure = '' + cd dwarfdump + ''; + + buildInputs = [ libelf libdwarf ]; + + installPhase = '' + install -m755 -D dwarfdump $out/bin/dwarfdump + ''; + + inherit meta src; + }; } diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix index 02195dede93..1e374b8ad1f 100644 --- a/pkgs/development/libraries/libe-book/default.nix +++ b/pkgs/development/libraries/libe-book/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; meta = { inherit (s) version; description = ''Library for import of reflowable e-book formats''; diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index 16ee2151faa..c620254aacd 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { makeFlagsArray+=(PREFIX="$out" LIBDIRNAME=/lib) ''; + # Work around "libfaketime.c:513:7: error: nonnull argument 'buf' compared to NULL [-Werror=nonnull-compare]". + NIX_CFLAGS_COMPILE = "-Wno-nonnull-compare"; + meta = with stdenv.lib; { description = "Report faked system time to programs without having to change the system-wide time"; homepage = http://www.code-wizards.com/projects/libfaketime/; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 32eb4e04f03..2b30dacb58f 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk2, intltool, menu-cache, pango, pkgconfig, vala_0_23 +{ stdenv, fetchurl, glib, gtk2, intltool, menu-cache, pango, pkgconfig, vala_0_34 , extraOnly ? false }: let inherit (stdenv.lib) optional; @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { name = if extraOnly then "libfm-extra-${version}" else "libfm-${version}"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; - sha256 = "0bsh4p7h2glhxf1cc1lvbxyb4qy0y1zsnl9izf7vrldkikrgc13q"; + sha256 = "0nlvfwh09gbq8bkbvwnw6iqr918rrs9gc9ljb9pjspyg408bn1n7"; }; - buildInputs = [ glib gtk2 intltool pango pkgconfig vala_0_23 ] + buildInputs = [ glib gtk2 intltool pango pkgconfig vala_0_34 ] ++ optional (!extraOnly) menu-cache; configureFlags = optional extraOnly "--with-extra-only"; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index f0525789896..fc2c859a5f8 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { name = "libgcrypt-${version}"; - version = "1.7.5"; + version = "1.7.6"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "0078pbzm6nlgvnwlylshsg707ifcmfpnpbvhlhqbpwpfic9a9zni"; + sha256 = "1g05prhgqw4ryd0w433q8nhds0h93kf47hfjagi2r7dghkpaysk2"; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 25c5a6d683d..f84cc677d16 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isDarwin Carbon; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so + ''; + meta = { platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 0de84b1141d..e96ef7329a2 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -57,8 +57,8 @@ stdenv.mkDerivation rec { # Fix some binary paths sed -i -e 's|/usr/bin/xauth|${xauth}/bin/xauth|g' libgksu/gksu-run-helper.c libgksu/libgksu.c - sed -i -e 's|/usr/bin/sudo|/var/setuid-wrappers/sudo|g' libgksu/libgksu.c - sed -i -e 's|/bin/su\([^d]\)|/var/setuid-wrappers/su\1|g' libgksu/libgksu.c + sed -i -e 's|/usr/bin/sudo|/run/wrappers/bin/sudo|g' libgksu/libgksu.c + sed -i -e 's|/bin/su\([^d]\)|/run/wrappers/bin/su\1|g' libgksu/libgksu.c touch NEWS README ''; diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix new file mode 100644 index 00000000000..07d63c66b78 --- /dev/null +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchFromGitHub, autoreconfHook, python2, pkgconfig, mesa_noglu, libX11, libXext, glproto }: + +# Git version is needed for EGL and GLES handling. + +stdenv.mkDerivation rec { + name = "libglvnd-2016-12-22"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "libglvnd"; + rev = "dc16f8c337703ad141f83583a4004fcf42e07766"; + sha256 = "1dbwf1216np77xf1kx3ci3y7hfa1p4vgrrzg71gw36hqxf36vg5f"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig python2 ]; + buildInputs = [ libX11 libXext glproto ]; + + NIX_CFLAGS_COMPILE = [ + "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" + "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${mesa_noglu.driverLink}/share/glvnd/egl_vendor.d\"" + ]; + + outputs = [ "out" "dev" ]; + + meta = with stdenv.lib; { + description = "The GL Vendor-Neutral Dispatch library"; + homepage = "https://github.com/NVIDIA/libglvnd"; + license = licenses.bsd2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index d81a59a5c62..afa064881a6 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libgpg-error-${version}"; - version = "1.24"; + version = "1.26"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "0h75sf1ngr750c3fjfn4583q7wz40qm63jhg8vjfdrbx936f2s4j"; + sha256 = "0sgfia0syq78k1c9h10rkhc1nfv5v097icrprlx2x4qn074wnjsc"; }; postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure"; diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 6a7b747f7f9..c498871956a 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "gphoto"; repo = "libgphoto2"; rev = "${meta.tag}"; - sha256 = "01nirw0xb8fjjv0jz88bmddv26bgg82w1wg65q51iblmy9z8azfh"; + sha256 = "0chwnw3d2d1k8g4xidzkpy9f3ci30yz7yvxq1mipp2rbndl1y2am"; }; patches = []; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.11"; - tag = "libgphoto2-2_5_11-release"; + version = "2.5.12"; + tag = "libgphoto2-2_5_12-release"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix new file mode 100644 index 00000000000..ea26f480cd1 --- /dev/null +++ b/pkgs/development/libraries/libidn2/default.nix @@ -0,0 +1,38 @@ +{ fetchurl, stdenv, libiconv, libunistring, help2man }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "libidn2-0.16"; + + src = fetchurl { + url = "https://alpha.gnu.org/gnu/libidn/${name}.tar.gz"; + sha256 = "13v8kh4d5nfkymai88zlw3h7k4x9khrpdpv97waf4ah8ykzrxb9g"; + }; + + outputs = [ "bin" "dev" "out" "info" "devdoc" ]; + + patches = optional stdenv.isDarwin ./fix-error-darwin.patch; + + buildInputs = [ libunistring ] + ++ optionals stdenv.isDarwin [ libiconv help2man ]; + + meta = { + homepage = "https://www.gnu.org/software/libidn/#libidn2"; + description = "Free software implementation of IDNA2008 and TR46"; + + longDescription = '' + Libidn2 is believed to be a complete IDNA2008 and TR46 implementation, + but has yet to be as extensively used as the IDNA2003 Libidn library. + + The installed C library libidn2 is dual-licensed under LGPLv3+|GPLv2+, + while the rest of the package is GPLv3+. See the file COPYING for + detailed information. + ''; + + repositories.git = https://gitlab.com/jas/libidn2; + license = with stdenv.lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ]; + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/development/libraries/libidn2/fix-error-darwin.patch b/pkgs/development/libraries/libidn2/fix-error-darwin.patch new file mode 100644 index 00000000000..db3edd6e4a0 --- /dev/null +++ b/pkgs/development/libraries/libidn2/fix-error-darwin.patch @@ -0,0 +1,31 @@ +diff --git a/src/idn2.c b/src/idn2.c +index 6abbc72..804f0f2 100644 +--- a/src/idn2.c ++++ b/src/idn2.c +@@ -31,7 +31,6 @@ + #include + + /* Gnulib headers. */ +-#include "error.h" + #include "gettext.h" + #define _(String) dgettext (PACKAGE, String) + #include "progname.h" +@@ -161,9 +160,7 @@ process_input (char *readbuf, int flags) + free (output); + } + else +- error (EXIT_FAILURE, 0, "%s: %s", +- args_info.register_given ? "register" : "lookup", +- idn2_strerror (rc)); ++ perror (idn2_strerror (rc)); + } + + int +@@ -222,7 +219,7 @@ main (int argc, char *argv[]) + } + + if (ferror (stdin)) +- error (EXIT_FAILURE, errno, "%s", _("input error")); ++ perror (_("input error")); + + cmdline_parser_free (&args_info); diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index cfc31c120b4..cef9cc0af6b 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, fetchpatch, python, pkgconfig, usbmuxd, glib, libgcrypt, +{ stdenv, fetchurl, fetchpatch, python2, pkgconfig, usbmuxd, glib, libgcrypt, libtasn1, libplist, readline, libusbmuxd, openssl }: stdenv.mkDerivation rec { name = "libimobiledevice-1.2.0"; - nativeBuildInputs = [ python libplist.swig pkgconfig ]; + nativeBuildInputs = [ python2 libplist.swig pkgconfig ]; buildInputs = [ readline ]; propagatedBuildInputs = [ libusbmuxd glib libgcrypt libtasn1 libplist openssl ]; diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index d9e438da131..dbc5c1e2ae9 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libivykis-${version}"; - version = "0.40"; + version = "0.41"; src = fetchurl { url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz"; - sha256 = "1rn32dijv0pn9y2mbdg1n7al4h4i5pwwhhihr9pyakwyb6qgmqxj"; + sha256 = "1igk3svf36i5xgb6ipc507xpj6zjm4xi9j1j2cdqaachllwlb4rc"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libjpeg/62.nix b/pkgs/development/libraries/libjpeg/62.nix deleted file mode 100644 index 3ae8cfac39c..00000000000 --- a/pkgs/development/libraries/libjpeg/62.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchurl, libtool, static ? false, ...}: - -stdenv.mkDerivation { - name = "libjpeg-6b"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://www.ijg.org/files/jpegsrc.v6b.tar.gz; - sha256 = "0pg34z6rbkk5kvdz6wirf7g4mdqn5z8x97iaw17m15lr3qjfrhvm"; - }; - - inherit libtool; - - configureFlags = "--enable-shared ${if static then " --enable-static" else ""}"; - - # Required for building of dynamic libraries on Darwin. - patches = [ - (fetchurl { - url = http://svn.macports.org/repository/macports/trunk/dports/graphics/jpeg/files/patch-ltconfig; - md5 = "e6725fa4a09aa1de4ca75343fd0f61d5"; - }) - (fetchurl { - url = http://svn.macports.org/repository/macports/trunk/dports/graphics/jpeg/files/patch-ltmain.sh; - #md5 = "489986ad8e7a93aef036766b25f321d5"; - md5 = "092a12aeb0c386dd7dae059109d950ba"; - }) - ]; - - meta = { - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libmarble-ssrf/default.nix b/pkgs/development/libraries/libmarble-ssrf/default.nix deleted file mode 100644 index 1d6c5413439..00000000000 --- a/pkgs/development/libraries/libmarble-ssrf/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchgit, doxygen, pkgconfig, cmake, qtbase, qtscript, qtquick1 }: - -stdenv.mkDerivation rec { - name = "libmarble-ssrf-${version}"; - version = "2016-11-09"; - - src = fetchgit { - sha256 = "1dm2hdk6y36ls7pxbzkqmyc46hdy2cd5f6pkxa6nfrbhvk5f31zd"; - url = "git://git.subsurface-divelog.org/marble"; - rev = "4325da93b7516abb6f93a1417adc10593dacd794"; - }; - - buildInputs = [ qtbase qtscript qtquick1 ]; - nativeBuildInputs = [ doxygen pkgconfig cmake ]; - - enableParallelBuilding = true; - - preConfigure = '' - cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Release \ - -DQTONLY=TRUE -DQT5BUILD=ON \ - -DBUILD_MARBLE_TESTS=NO \ - -DWITH_DESIGNER_PLUGIN=NO \ - -DBUILD_MARBLE_APPS=NO" - ''; - - meta = with stdenv.lib; { - description = "Qt library for a slippy map with patches from the Subsurface project"; - homepage = "http://subsurface-divelog.org"; - license = licenses.lgpl21; - maintainers = [ maintainers.mguentner ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index 7336e7d757a..467d707adee 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, guile, autoconf, flex, fetchpatch }: +{ stdenv, fetchurl, pkgconfig, guile, autoconf, flex, fetchpatch }: stdenv.mkDerivation rec { version = "1.1.11"; name = "libmatheval-${version}"; - nativeBuildInputs = [ autoconf flex ]; + nativeBuildInputs = [ pkgconfig autoconf flex ]; buildInputs = [ guile ]; src = fetchurl { diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index b53c8da3f54..c38d5c82570 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig }: stdenv.mkDerivation rec { - name = "libmicrohttpd-0.9.50"; + name = "libmicrohttpd-0.9.52"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "1mzbqr6sqisppz88mh73bbh5sw57g8l87qvhcjdx5pmbd183idni"; + sha256 = "1smgxw6jv81yybg86bzr4c2sn7a31apf8q4zz0kpch9xfrp7yyal"; }; outputs = [ "out" "dev" "devdoc" "info" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/libmicrohttpd/; - maintainers = [ maintainers.eelco maintainers.vrthra ]; + maintainers = with maintainers; [ eelco vrthra fpletz ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libmsgpack/0.5-CMake.patch b/pkgs/development/libraries/libmsgpack/0.5-CMake.patch deleted file mode 100644 index 84377962d7f..00000000000 --- a/pkgs/development/libraries/libmsgpack/0.5-CMake.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -r 791a4edd7e1d CMakeLists.txt ---- a/CMakeLists.txt Sun Oct 05 13:14:14 2014 +0100 -+++ b/CMakeLists.txt Sun Oct 05 13:20:12 2014 +0100 -@@ -157,8 +157,9 @@ - - INSTALL (TARGETS msgpack msgpack-static DESTINATION lib) - INSTALL (DIRECTORY src/msgpack DESTINATION include) -+INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/src/msgpack/version.h DESTINATION include/msgpack) - INSTALL (FILES src/msgpack.h src/msgpack.hpp DESTINATION include) --INSTALL (FILES msgpack.pc DESTINATION lib/pkgconfig) -+INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION lib/pkgconfig) - - # Doxygen - FIND_PACKAGE (Doxygen) diff --git a/pkgs/development/libraries/libmsgpack/0.5.nix b/pkgs/development/libraries/libmsgpack/0.5.nix deleted file mode 100644 index 4f14dcd8b13..00000000000 --- a/pkgs/development/libraries/libmsgpack/0.5.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ callPackage, fetchFromGitHub, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "0.5.9"; - - src = fetchFromGitHub { - owner = "msgpack"; - repo = "msgpack-c"; - rev = "cpp-${version}"; - sha256 = "19cmlxfr0sc2b08a1mq9plk9fj5l1i20f69j4pvbhlnah3xqfdjs"; - }; - - patches = [ ./0.5-CMake.patch ]; -}) diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index a52e25e7cf2..b833945d511 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.9"; + version="0.3.10"; name="${baseName}-${version}"; - hash="185jnp7b7s550xpz3bhaii275qw5yd3j29zijkd2rr8h2p9s9z7p"; - url="https://heanet.dl.sourceforge.net/project/libmwaw/libmwaw/libmwaw-0.3.9/libmwaw-0.3.9.tar.xz"; - sha256="185jnp7b7s550xpz3bhaii275qw5yd3j29zijkd2rr8h2p9s9z7p"; + hash="087j6kx03ggvqwpl944nnf75qkvi9bag8b0z59phg66gbz0s0imj"; + url="https://netcologne.dl.sourceforge.net/project/libmwaw/libmwaw/libmwaw-0.3.10/libmwaw-0.3.10.tar.xz"; + sha256="087j6kx03ggvqwpl944nnf75qkvi9bag8b0z59phg66gbz0s0imj"; }; buildInputs = [ boost pkgconfig cppunit zlib libwpg libwpd librevenge diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 75cca9a028e..a94bf28cd97 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libnetfilter_conntrack-${version}"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2"; - sha256 = "0fnpja3g8s38cp7ipija5pvhfgna1gybn0z2bl276nk08fppv7gw"; + sha256 = "1svzyf3rq9nbrcw1jsricgyhh7x1am8iqn6kjr6mzrw42810ik7g"; }; buildInputs = [ libmnl ]; diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index 89cf3e544e5..150ece2a627 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb }: +{ stdenv, fetchurl, libusb, readline }: stdenv.mkDerivation rec { name = "libnfc-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0wj0iwwcpmpalyk61aa7yc6i4p9hgdajkrgnlswgk0vnwbc78pll"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb readline ]; meta = with stdenv.lib; { description = "Open source library libnfc for Near Field Communication"; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index a043d36ff4d..074c1a9dfd2 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,20 +1,21 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "libnftnl-1.0.6"; + name = "libnftnl-1.0.7"; src = fetchurl { url = "http://netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; - sha256 = "0zmh190c7212zvzjsn5lm6pf399r4arq7dliiqq6grd174m96fxd"; + sha256 = "10irjrylcfkbp11617yr19vpfhgl54w0kw02jhj0i1abqv5nxdlv"; }; - buildInputs = [ pkgconfig libmnl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmnl ]; meta = with stdenv.lib; { description = "A userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem"; homepage = http://netfilter.org/projects/libnftnl; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ wkennington fpletz ]; }; } diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index 83903002c97..435f593b597 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses ? null, perl ? null }: stdenv.mkDerivation rec { - name = "liboping-1.8.0"; + name = "liboping-1.9.0"; src = fetchurl { url = "http://verplant.org/liboping/files/${name}.tar.bz2"; - sha256 = "1nsvlsvapc64h0anip2hz5ydbgk3an94xqiaa9kivcw1r6193jqx"; + sha256 = "0c1mdx9ixqypayhm617jjv9kr6y60nh3mnryafjzv23bnn41vfs4"; }; buildInputs = [ ncurses perl ]; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index d23d123a99c..14567c0daf4 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, flex, bison }: stdenv.mkDerivation rec { - name = "libpcap-1.7.4"; - + name = "libpcap-1.8.1"; + src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1c28ykkizd7jqgzrfkg7ivqjlqs9p6lygp26bsw2i0z8hwhi3lvs"; + sha256 = "07jlhc66z76dipj4j5v3dig8x6h3k6cb36kmnmpsixf3zmlvqgb7"; }; - + nativeBuildInputs = [ flex bison ]; - + # We need to force the autodetection because detection doesn't # work in pure build enviroments. configureFlags = @@ -22,16 +22,17 @@ stdenv.mkDerivation rec { ''; preInstall = ''mkdir -p $out/bin''; - + crossAttrs = { # Stripping hurts in static libraries dontStrip = true; configureFlags = configureFlags ++ [ "ac_cv_linux_vers=2" ]; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.tcpdump.org; description = "Packet Capture Library"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index be77b383cd9..c35c7e1bc0f 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,31 +1,31 @@ { stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu -, libxslt, pkgconfig, python }: +, libxslt, pkgconfig, python2 }: let - listVersion = "2016-06-30"; + listVersion = "2017-02-03"; listSources = fetchFromGitHub { - sha256 = "1fx7g36dcckckz860f0ady8lsg3m6a5c9pgb39a3dn28xfvd21jw"; - rev = "aa87d27940595ed4a61e726c7dd06860d87fabb6"; + sha256 = "0fhc86pjv50hxj3xf9r4mh0zzvdzqp5lac20caaxq1hlvdzavaa3"; + rev = "37e30d13801eaad3383b122c11d8091c7ac21040"; repo = "list"; owner = "publicsuffix"; }; - libVersion = "0.15.0"; + libVersion = "0.17.0"; in stdenv.mkDerivation rec { name = "libpsl-${version}"; version = "${libVersion}-list-${listVersion}"; src = fetchFromGitHub { - sha256 = "1n8vg8pslpgin84ygb0s0nqfljml32l5bv5fyc8ysnpbdsj6gxkb"; + sha256 = "08dbl6ihnlf0kj4c9pdpjv9mmw7p676pzh1q184wl32csra5pzdd"; rev = "libpsl-${libVersion}"; repo = "libpsl"; owner = "rockdaboot"; }; buildInputs = [ icu libxslt ]; - nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig python ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig python2 ]; postPatch = '' substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index fedc5287b49..10979abdeab 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,13 +2,20 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.17.1"; + version = "0.17.2"; src = fetchurl { url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "18fygk896gxbx47nh2rn5jp4skisgkl6pdfjqb7h0zn39hd6b6g5"; + sha256 = "0p6imxpsfn82i0i9w27fnzq6q6gwzvb9f7sygqqakv36fqnc9c4j"; }; + patches = + [ (fetchurl { + url = https://anonscm.debian.org/cgit/pkg-phototools/libraw.git/plain/debian/patches/0001-Fix_gcc6_narrowing_conversion.patch?id=d890937aaca6359df45a66b35e547c94ca564823; + sha256 = "1lcg5l0wmwiyzhhm67c1c7hy8py6ihxfmicnhrwpi3i6f16vq29w"; + }) + ]; + outputs = [ "out" "lib" "dev" "doc" ]; buildInputs = [ jasper ]; diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix deleted file mode 100644 index aa584115689..00000000000 --- a/pkgs/development/libraries/libressl/2.3.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "libressl-${version}"; - version = "2.3.9"; - - src = fetchurl { - url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1z4nh45zdh1gllhgbvlgd2vk4srhbaswyn82l3dzcfmi9rk17zx6"; - }; - - enableParallelBuilding = true; - - outputs = [ "bin" "dev" "out" "man" ]; - - meta = with stdenv.lib; { - description = "Free TLS/SSL implementation"; - homepage = "http://www.libressl.org"; - platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; - }; -} diff --git a/pkgs/development/libraries/libressl/2.4.nix b/pkgs/development/libraries/libressl/2.4.nix index a0d8511e2b8..c5642635b0f 100644 --- a/pkgs/development/libraries/libressl/2.4.nix +++ b/pkgs/development/libraries/libressl/2.4.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1ldzxqc0bds9mwnirrckhx42y3k0v5cx997nnbfa2gkk6ilszkvg"; + sha256 = "0is3zqjcxxncycq44m3if6s5hiq31kpq85pxdnpm3sdfb3iw806k"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libressl/2.5.nix b/pkgs/development/libraries/libressl/2.5.nix index 51925ee108e..0a3e0d97f84 100644 --- a/pkgs/development/libraries/libressl/2.5.nix +++ b/pkgs/development/libraries/libressl/2.5.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1bkfvapi4z826slycmicvs7hwgk4l82gd8w6nqvznldbammvyll6"; + sha256 = "1kc709scgd76vk7fld4jnb4wb5lxdv1cj8zsgyjb33xp4jlf06pp"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libsigsegv/aarch64.patch b/pkgs/development/libraries/libsigsegv/aarch64.patch new file mode 100644 index 00000000000..7bb48a230ce --- /dev/null +++ b/pkgs/development/libraries/libsigsegv/aarch64.patch @@ -0,0 +1,12 @@ +diff --git a/configure b/configure +index 6c4e868..0298e19 100755 +--- a/configure ++++ b/configure +@@ -14501,6 +14501,7 @@ else + + case "$host_cpu" in + a29k | \ ++ aarch64* | \ + alpha* | \ + arc | \ + arm* | strongarm* | xscale* | \ diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index be3cbe39a30..3353fbf9e8d 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -8,6 +8,12 @@ stdenv.mkDerivation rec { sha256 = "16hrs8k3nmc7a8jam5j1fpspd6sdpkamskvsdpcw6m29vnis8q44"; }; + # Based on https://github.com/davidgfnet/buildroot-Os/blob/69fe6065b9dd1cb4dcc0a4b554e42cc2e5bd0d60/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch + # but applied directly to configure since we can't use autoreconf while bootstrapping. + patches = if stdenv.isAarch64 || stdenv.cross.arch or "" == "aarch64" + then [ ./aarch64.patch ] + else null; # TODO: change to lib.optional on next mass rebuild + # https://github.com/NixOS/nixpkgs/issues/6028 doCheck = false; diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index b57247b8fa2..9d4b62eb97a 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - version = "1.6.1"; + version = "1.7.3"; name = "libsixel-${version}"; src = fetchFromGitHub { repo = "libsixel"; - rev = "ef4374f80385edc48e0844cf324d7ef757688e44"; + rev = "v${version}"; owner = "saitoha"; - sha256 = "08m5q2ppk235bzbwff1wg874vr1bh4080qdj26l39v8lw1xzlqcp"; + sha256 = "1hzmypzzigmxl07vgc52wp4dgxkhya3gfk4yzaaxc8s630r6ixs8"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 0c1c92a0f6f..025a2ee37ff 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { - name = "libssh-0.7.3"; + name = "libssh-0.7.4"; src = fetchurl { - url = "https://red.libssh.org/attachments/download/195/${name}.tar.xz"; - sha256 = "165g49i4kmm3bfsjm0n8hm21kadv79g9yjqyq09138jxanz4dvr6"; + url = "https://red.libssh.org/attachments/download/210/${name}.tar.xz"; + sha256 = "03bcp9ksqp0s1pmwfmzhcknvkxay5k0mjzzxp3rjlifbng1vxq9r"; }; postPatch = '' diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 150e7455c03..3b74406d7bf 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -5,16 +5,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "681a4d9a0d259f2125713f2e5766c5809f151b3a1392fd91390f780b4b8f5a02"; + sha256 = "00jsix5hny0g768zv4hk78dib7w0qmk5fbizf4jj37r51nd4s6k8"; }; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - # Warning causes build to fail on darwin since 4.9, - # check if this can be removed in the next release. - CFLAGS = "-Wno-sign-compare"; - buildInputs = [ perl texinfo ]; doCheck = true; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix new file mode 100644 index 00000000000..3a00408c7ca --- /dev/null +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack +, libvpx, check, libconfig, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libtoxcore-${version}"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "TokTok"; + repo = "c-toxcore"; + rev = "v${version}"; + sha256 = "0a00gjar6ibaqa2cm81867nk7chsd141v360268v7ym2mxwa0ya6"; + }; + + cmakeFlags = [ + "-DBUILD_NTOX=ON" + "-DDHT_BOOTSTRAP=ON" + "-DBOOTSTRAP_DAEMON=ON" + ]; + + buildInputs = [ + libsodium libmsgpack ncurses + ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + libopus + libvpx + ]; + nativeBuildInputs = [ cmake pkgconfig ]; + checkInputs = [ check ]; + + checkPhase = "ctest"; + + # for some reason the tests are not running - it says "No tests found!!" + doCheck = true; + + meta = with stdenv.lib; { + description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api.nix similarity index 98% rename from pkgs/development/libraries/libtoxcore/new-api/default.nix rename to pkgs/development/libraries/libtoxcore/new-api.nix index b88f4f6a74e..8d0a467c82a 100644 --- a/pkgs/development/libraries/libtoxcore/new-api/default.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -2,7 +2,7 @@ , libvpx, check, libconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "tox-core-dev-20160727"; + name = "tox-core-new-20160727"; src = fetchFromGitHub { owner = "irungentoo"; diff --git a/pkgs/development/libraries/libtoxcore/old-api/default.nix b/pkgs/development/libraries/libtoxcore/old-api.nix similarity index 94% rename from pkgs/development/libraries/libtoxcore/old-api/default.nix rename to pkgs/development/libraries/libtoxcore/old-api.nix index 2fb5e93eab9..5757e94559a 100644 --- a/pkgs/development/libraries/libtoxcore/old-api/default.nix +++ b/pkgs/development/libraries/libtoxcore/old-api.nix @@ -4,9 +4,9 @@ let version = "4c220e336330213b151a0c20307d0a1fce04ac9e"; date = "20150126"; -in -stdenv.mkDerivation rec { - name = "tox-core-${date}-${builtins.substring 0 7 version}"; + +in stdenv.mkDerivation rec { + name = "tox-core-old-${date}-${builtins.substring 0 7 version}"; src = fetchFromGitHub { owner = "irungentoo"; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 6ed29a8abc3..419a14551ba 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, xz }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, xz }: stdenv.mkDerivation rec { name = "libunwind-1.1"; @@ -8,13 +8,18 @@ stdenv.mkDerivation rec { sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx"; }; + buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; + patches = [ ./libunwind-1.1-lzma.patch ./cve-2015-3239.patch # https://lists.nongnu.org/archive/html/libunwind-devel/2014-04/msg00000.html (fetchpatch { url = "https://raw.githubusercontent.com/dropbox/pyston/1b2e676417b0f5f17526ece0ed840aa88c744145/libunwind_patches/0001-Change-the-RBP-validation-heuristic-to-allow-size-0-.patch"; sha256 = "1a0fsgfxmgd218nscswx7pgyb7rcn2gh6566252xhfvzhgn5i4ha"; }) - ]; + ] ++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch { + url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/77709d1c6d5c39e23c1535b1bd584be1455f2551/extra/libunwind/libunwind-aarch64.patch"; + sha256 = "1mpjs8izq9wxiaf5rl4gzaxrkz0s51f9qz5qc5dj72pr84mw50w8"; + }); postPatch = '' sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 29765f07066..3b92aff72a5 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.8.6"; + version = "0.9.3"; name = "liburcu-${version}"; src = fetchurl { url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "08dbfkdj4pm9s3q56nwa1vzldkf1jav61g2r4xq7mfhlw2yd79di"; + sha256 = "01j0xp3f0w147yfyzybkjvb7i67i7prsvnkssgvgwry9lvk35khv"; }; + nativeBuildInputs = stdenv.lib.optional doCheck perl; + + preCheck = "patchShebangs tests/unit"; + doCheck = true; + meta = with stdenv.lib; { description = "Userspace RCU (read-copy-update) library"; homepage = http://lttng.org/urcu; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 8cba1a38b5b..031ac781651 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "libva-${version}"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha256 = "04rczbnbi70y1ziy9ab59szi3glk9q35hshlws0bcj2ndbqirmjx"; + sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 6bd0ec52f27..0018e38a9f9 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -6,11 +6,11 @@ let inherit (pythonPackages) python pygobject2; in stdenv.mkDerivation rec { - name = "libvirt-glib-0.2.3"; + name = "libvirt-glib-1.0.0"; src = fetchurl { url = "http://libvirt.org/sources/glib/${name}.tar.gz"; - sha256 = "1pahj8qa7k2307sd57rwqwq1hijya02v0sxk91hl3cw48niimcf3"; + sha256 = "0iwa5sdbii52pjpdm5j37f67sdmf0kpcky4liwhy1nf43k85i4fa"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 658a2e37883..5fcdd153c99 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -9,11 +9,11 @@ # if you update, also bump pythonPackages.libvirt or it will break stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "2.5.0"; + version = "3.0.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "07nbh6zhaxx5i1s1acnppf8rzkzb2ppgv35jw7grbbnnpzpzz7c1"; + sha256 = "0php6wxjcilpir0miwg06yd2ha25zi9fv2apvvgv5c8k1svjd7cx"; }; patches = [ ./build-on-bsd.patch ]; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 7d37393d433..7efff3412a3 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -44,8 +44,6 @@ let inherit (stdenv.lib) enableFeature optional optionals; in -assert isi686 || isx86_64 || isArm || isMips; # Requires ARM with floating point support - assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport; /* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors. @@ -59,13 +57,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { name = "libvpx-${version}"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "webmproject"; repo = "libvpx"; rev = "v${version}"; - sha256 = "19ill4c7dak5f8m4pdbas87zknw3a34sca8a4i952q0l0jnif0np"; + sha256 = "10fs7xilf2bsj5bqw206lb5r5dgl84p5m6nibiirk28lmjx1i3l0"; }; patchPhase = ''patchShebangs .''; @@ -91,7 +89,6 @@ stdenv.mkDerivation rec { (enableFeature gcovSupport "gcov") # Required to build shared libraries (enableFeature (!isCygwin) "pic") - (enableFeature (isi686 || isx86_64) "use-x86inc") (enableFeature optimizationsSupport "optimizations") (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect") (enableFeature thumbSupport "thumb") diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 80354b10f3b..d44a8c973fd 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,8 +1,11 @@ -{ stdenv, lib, fetchurl, zlib, xz, python2, findXMLCatalogs, libiconv, fetchpatch -, pythonSupport ? (! stdenv ? cross) }: +{ stdenv, lib, fetchurl, fetchpatch +, zlib, xz, python2, findXMLCatalogs, libiconv +, pythonSupport ? (! stdenv ? cross) +, icuSupport ? false, icu ? null }: let python = python2; + in stdenv.mkDerivation rec { name = "libxml2-${version}"; version = "2.9.4"; @@ -14,19 +17,13 @@ in stdenv.mkDerivation rec { patches = [ (fetchpatch { - name = "CVE-2016-4658.patch"; - url = "https://git.gnome.org/browse/libxml2/patch/?id=c1d1f7121194036608bf555f08d3062a36fd344b"; - sha256 = "0q7i5qgwgzp2x4r820mqq3nx69bgkd7n0v00j28wa6hndbfaaxmb"; + # Contains fixes for CVE-2016-{4658,5131} and other bugs. + name = "misc.patch"; + url = "https://git.gnome.org/browse/libxml2/patch/?id=e905f081&id2=v2.9.4"; + sha256 = "14rnzilspmh92bcpwbd6kqikj36gx78al42ilgpqgl1609krb5m5"; }) ]; - # https://bugzilla.gnome.org/show_bug.cgi?id=766834#c5 - postPatch = "patch -R < " + fetchpatch { - name = "schemas-validity.patch"; - url = "https://git.gnome.org/browse/libxml2/patch/?id=f6599c5164"; - sha256 = "0i7a0nhxwkxx6dkm8917qn0bsfn1av6ghg2f4dxanxi4bn4b1jjn"; - }; - outputs = [ "bin" "dev" "out" "doc" ] ++ lib.optional pythonSupport "py"; propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; @@ -37,9 +34,11 @@ in stdenv.mkDerivation rec { # RUNPATH for that, leading to undefined references for its users. ++ lib.optional stdenv.isFreeBSD xz; - propagatedBuildInputs = [ zlib findXMLCatalogs ]; + propagatedBuildInputs = [ zlib findXMLCatalogs ] ++ lib.optional icuSupport icu; - configureFlags = lib.optional pythonSupport "--with-python=${python}" + configureFlags = + lib.optional pythonSupport "--with-python=${python}" + ++ lib.optional icuSupport "--with-icu" ++ [ "--exec_prefix=$dev" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix new file mode 100644 index 00000000000..f4b7aaf3fe2 --- /dev/null +++ b/pkgs/development/libraries/libzmf/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkgconfig, cppunit}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "libzmf"; + version = "0.0.1"; + + src = fetchurl { + url = "http://dev-www.libreoffice.org/src/libzmf/${name}.tar.xz"; + sha256 = "0yp5l1b90xim506zmr3ljkn3qkvbc7qk3dnwq1snxdpr57m37xga"; + }; + + buildInputs = [boost icu libpng librevenge zlib cppunit]; + nativeBuildInputs = [doxygen pkgconfig]; + configureFlags = " --disable-werror "; + + meta = { + inherit version; + description = ''A library that parses the file format of Zoner Callisto/Draw documents''; + license = stdenv.lib.licenses.mpl20; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libzmf"; + downloadPage = "http://dev-www.libreoffice.org/src/libzmf/"; + updateWalker = true; + }; +} diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix deleted file mode 100644 index 9c4affd9032..00000000000 --- a/pkgs/development/libraries/libzrtpcpp/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, cmake, openssl, pkgconfig, ccrtp }: - -stdenv.mkDerivation rec { - name = "libzrtpcpp-2.3.4"; - - src = fetchurl { - url = "mirror://gnu/ccrtp/${name}.tar.gz"; - sha256 = "020hfyrh8qdwkqdg1r1n65wdzj5i01ba9dzjghbm9lbz93gd9r83"; - }; - - # We disallow 'lib64', or pkgconfig will not find it. - prePatch = '' - sed -i s/lib64/lib/ CMakeLists.txt - ''; - - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ openssl ccrtp ]; - - meta = { - description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"; - homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 80019d52f4f..ec3e9997690 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -1,25 +1,47 @@ -{ stdenv, fetchzip }: +{ stdenv, fetchFromGitHub }: let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "lmdb-${version}"; - version = "0.9.18"; + version = "0.9.19"; - src = fetchzip { - url = "https://github.com/LMDB/lmdb/archive/LMDB_${version}.tar.gz"; - sha256 = "01j384kxg36kym060pybr5p6mjw0xv33bqbb8arncdkdq57xk8wg"; + src = fetchFromGitHub { + owner = "LMDB"; + repo = "lmdb"; + rev = "LMDB_${version}"; + sha256 = "04qx803jdmhkcam748fn0az3cyzvj91lw28kcvwfyq0al7pmjkfs"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; - makeFlags = ["prefix=$(out)"] - ++ optional stdenv.cc.isClang "CC=clang"; + outputs = [ "bin" "out" "dev" ]; + + makeFlags = [ "prefix=$(out)" "CC=cc" ]; doCheck = true; checkPhase = "make test"; - preInstall = '' - mkdir -p $out/{man/man1,bin,lib,include} + postInstall = '' + moveToOutput bin "$bin" + moveToOutput "lib/*.a" REMOVE # until someone needs it + '' + + # fix bogus library name + + stdenv.lib.optionalString stdenv.isDarwin '' + mv "$out"/lib/liblmdb.{so,dylib} + '' + + # add lmdb.pc (dynamic only) + + '' + mkdir -p "$dev/lib/pkgconfig" + cat > "$dev/lib/pkgconfig/lmdb.pc" <dllName); -+ if ((library == NULL) && -+ !rindex(mod->dllName, PR_GetDirectorySeparator())) { +diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/pk11wrap/pk11load.c nss/lib/pk11wrap/pk11load.c +--- nss/lib/pk11wrap/pk11load.c 2017-01-04 15:24:24.000000000 +0100 ++++ nss/lib/pk11wrap/pk11load.c 2017-01-24 14:45:06.883485652 +0100 +@@ -440,6 +440,13 @@ + * unload the library if anything goes wrong from here on out... + */ + library = PR_LoadLibrary(mod->dllName); ++ if ((library == NULL) && ++ !rindex(mod->dllName, PR_GetDirectorySeparator())) { + library = PORT_LoadLibraryFromOrigin(my_shlib_name, -+ (PRFuncPtr) &softoken_LoadDSO, -+ mod->dllName); -+ } ++ (PRFuncPtr) &softoken_LoadDSO, ++ mod->dllName); ++ } + - mod->library = (void *)library; + mod->library = (void *)library; - if (library == NULL) { -diff -ru -x '*~' nss-3.27.1-orig/nss/lib/util/secload.c nss-3.27.1/nss/lib/util/secload.c ---- nss-3.27.1-orig/nss/lib/util/secload.c 2016-10-03 16:55:58.000000000 +0200 -+++ nss-3.27.1/nss/lib/util/secload.c 2016-11-15 16:29:50.482259746 +0100 + if (library == NULL) { +diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/util/secload.c nss/lib/util/secload.c +--- nss/lib/util/secload.c 2017-01-04 15:24:24.000000000 +0100 ++++ nss/lib/util/secload.c 2017-01-24 14:43:31.030420852 +0100 @@ -70,9 +70,14 @@ /* Remove the trailing filename from referencePath and add the new one */ diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 72f57dff1ce..8621d60ca96 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.27.2"; + version = "3.28.1"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_27_2_RTM/src/${name}.tar.gz"; - sha256 = "dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524"; + url = "mirror://mozilla/security/nss/releases/NSS_3_28_1_RTM/src/${name}.tar.gz"; + sha256 = "58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad"; }; buildInputs = [ nspr perl zlib sqlite ]; @@ -23,11 +23,21 @@ in stdenv.mkDerivation rec { ''; patches = - [ ./nss-3.21-gentoo-fixups.patch + [ # Install a nss.pc (pkgconfig) file and nss-config script + # Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672 + (fetchurl { + name = "nss-3.28-gentoo-fixups.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/" + + "dev-libs/nss/files/nss-3.28-gentoo-fixups.patch" + + "?id=05c31f8cca591b3ce8219e4def7c26c7b1b130d6"; + sha256 = "0z58axd1n7vq4kdp5mrb3dsg6di39a1g40s3shl6n2dzs14c1y2q"; + }) # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch ./85_security_load.patch ]; + patchFlags = "-p0"; + postPatch = '' # Fix up the patch from Gentoo. sed -i \ diff --git a/pkgs/development/libraries/nss/nss-3.21-gentoo-fixups.patch b/pkgs/development/libraries/nss/nss-3.21-gentoo-fixups.patch deleted file mode 100644 index 33819821c19..00000000000 --- a/pkgs/development/libraries/nss/nss-3.21-gentoo-fixups.patch +++ /dev/null @@ -1,243 +0,0 @@ -diff -urN a/nss/config/Makefile b/nss/config/Makefile ---- a/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ b/nss/config/Makefile 2015-11-15 10:42:46.249578304 -0600 -@@ -0,0 +1,40 @@ -+CORE_DEPTH = .. -+DEPTH = .. -+ -+include $(CORE_DEPTH)/coreconf/config.mk -+ -+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'` -+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'` -+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'` -+PREFIX = /usr -+ -+all: export libs -+ -+export: -+ # Create the nss.pc file -+ mkdir -p $(DIST)/lib/pkgconfig -+ sed -e "s,@prefix@,$(PREFIX)," \ -+ -e "s,@exec_prefix@,\$${prefix}," \ -+ -e "s,@libdir@,\$${prefix}/lib64," \ -+ -e "s,@includedir@,\$${prefix}/include/nss," \ -+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ -+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ -+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ -+ nss.pc.in > nss.pc -+ chmod 0644 nss.pc -+ ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig -+ -+ # Create the nss-config script -+ mkdir -p $(DIST)/bin -+ sed -e "s,@prefix@,$(PREFIX)," \ -+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ -+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ -+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ -+ nss-config.in > nss-config -+ chmod 0755 nss-config -+ ln -sf ../../../config/nss-config $(DIST)/bin -+ -+libs: -+ -+dummy: all export libs -+ -diff -urN a/nss/config/nss-config.in b/nss/config/nss-config.in ---- a/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 -+++ b/nss/config/nss-config.in 2015-11-15 10:42:46.250578304 -0600 -@@ -0,0 +1,145 @@ -+#!/bin/sh -+ -+prefix=@prefix@ -+ -+major_version=@NSS_MAJOR_VERSION@ -+minor_version=@NSS_MINOR_VERSION@ -+patch_version=@NSS_PATCH_VERSION@ -+ -+usage() -+{ -+ cat <&2 -+fi -+ -+lib_ssl=yes -+lib_smime=yes -+lib_nss=yes -+lib_nssutil=yes -+ -+while test $# -gt 0; do -+ case "$1" in -+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; -+ *) optarg= ;; -+ esac -+ -+ case $1 in -+ --prefix=*) -+ prefix=$optarg -+ ;; -+ --prefix) -+ echo_prefix=yes -+ ;; -+ --exec-prefix=*) -+ exec_prefix=$optarg -+ ;; -+ --exec-prefix) -+ echo_exec_prefix=yes -+ ;; -+ --includedir=*) -+ includedir=$optarg -+ ;; -+ --includedir) -+ echo_includedir=yes -+ ;; -+ --libdir=*) -+ libdir=$optarg -+ ;; -+ --libdir) -+ echo_libdir=yes -+ ;; -+ --version) -+ echo ${major_version}.${minor_version}.${patch_version} -+ ;; -+ --cflags) -+ echo_cflags=yes -+ ;; -+ --libs) -+ echo_libs=yes -+ ;; -+ ssl) -+ lib_ssl=yes -+ ;; -+ smime) -+ lib_smime=yes -+ ;; -+ nss) -+ lib_nss=yes -+ ;; -+ nssutil) -+ lib_nssutil=yes -+ ;; -+ *) -+ usage 1 1>&2 -+ ;; -+ esac -+ shift -+done -+ -+# Set variables that may be dependent upon other variables -+if test -z "$exec_prefix"; then -+ exec_prefix=`pkg-config --variable=exec_prefix nss` -+fi -+if test -z "$includedir"; then -+ includedir=`pkg-config --variable=includedir nss` -+fi -+if test -z "$libdir"; then -+ libdir=`pkg-config --variable=libdir nss` -+fi -+ -+if test "$echo_prefix" = "yes"; then -+ echo $prefix -+fi -+ -+if test "$echo_exec_prefix" = "yes"; then -+ echo $exec_prefix -+fi -+ -+if test "$echo_includedir" = "yes"; then -+ echo $includedir -+fi -+ -+if test "$echo_libdir" = "yes"; then -+ echo $libdir -+fi -+ -+if test "$echo_cflags" = "yes"; then -+ echo -I$includedir -+fi -+ -+if test "$echo_libs" = "yes"; then -+ libdirs="" -+ if test -n "$lib_ssl"; then -+ libdirs="$libdirs -lssl${major_version}" -+ fi -+ if test -n "$lib_smime"; then -+ libdirs="$libdirs -lsmime${major_version}" -+ fi -+ if test -n "$lib_nss"; then -+ libdirs="$libdirs -lnss${major_version}" -+ fi -+ if test -n "$lib_nssutil"; then -+ libdirs="$libdirs -lnssutil${major_version}" -+ fi -+ echo $libdirs -+fi -+ -diff -urN a/nss/config/nss.pc.in b/nss/config/nss.pc.in ---- a/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 -+++ b/nss/config/nss.pc.in 2015-11-15 10:42:46.251578304 -0600 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: NSS -+Description: Network Security Services -+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ -+Requires: nspr >= 4.8 -+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 -+Cflags: -I${includedir} -+ -diff -urN a/nss/Makefile b/nss/Makefile ---- a/nss/Makefile 2015-11-15 09:25:06.410786060 -0600 -+++ b/nss/Makefile 2015-11-15 10:42:46.252578304 -0600 -@@ -46,7 +46,7 @@ - # (7) Execute "local" rules. (OPTIONAL). # - ####################################################################### - --nss_build_all: build_nspr all -+nss_build_all: all - - nss_clean_all: clobber_nspr clobber - -@@ -115,12 +115,6 @@ - --with-dist-prefix='$(NSPR_PREFIX)' \ - --with-dist-includedir='$(NSPR_PREFIX)/include' - --build_nspr: $(NSPR_CONFIG_STATUS) -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) -- --clobber_nspr: $(NSPR_CONFIG_STATUS) -- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber -- - build_docs: - $(MAKE) -C $(CORE_DEPTH)/doc - -diff -urN a/nss/manifest.mn b/nss/manifest.mn ---- a/nss/manifest.mn 2015-11-15 09:25:06.411786060 -0600 -+++ b/nss/manifest.mn 2015-11-15 10:43:15.633576994 -0600 -@@ -10,4 +10,4 @@ - - RELEASE = nss - --DIRS = coreconf lib cmd external_tests -+DIRS = coreconf lib cmd config diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix new file mode 100644 index 00000000000..db4a8229064 --- /dev/null +++ b/pkgs/development/libraries/olm/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "olm-${version}"; + version = "2.2.1"; + + meta = { + description = "Implements double cryptographic ratchet and Megolm ratchet"; + license = stdenv.lib.licenses.asl20; + homepage = "https://matrix.org/git/olm/about"; + }; + + src = fetchurl { + url = "https://matrix.org/git/olm/snapshot/${name}.tar.gz"; + sha256 = "1spgsjmsw8afm2hg1mrq9c7cli3p17wl0ns7qbzn0h6ksh193709"; + }; + + doCheck = true; + checkTarget = "test"; + + installFlags = "PREFIX=$(out)"; +} diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 978b28aaa48..af0456c0162 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,81 +1,103 @@ -{ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, cmake, pkgconfig, unzip -, zlib -, enableIpp ? false -, enableContrib ? false -, enablePython ? false, pythonPackages -, enableGtk2 ? false, gtk2 -, enableGtk3 ? false, gtk3 -, enableJPEG ? true, libjpeg -, enablePNG ? true, libpng -, enableTIFF ? true, libtiff -, enableWebP ? true, libwebp -, enableEXR ? true, openexr, ilmbase -, enableJPEG2K ? true, jasper -, enableFfmpeg ? false, ffmpeg +{ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, cmake, pkgconfig, unzip, zlib + +, enableJPEG ? true, libjpeg +, enablePNG ? true, libpng +, enableTIFF ? true, libtiff +, enableWebP ? true, libwebp +, enableEXR ? true, openexr, ilmbase +, enableJPEG2K ? true, jasper + +, enableIpp ? false +, enableContrib ? false, protobuf3_1 +, enablePython ? false, pythonPackages +, enableGtk2 ? false, gtk2 +, enableGtk3 ? false, gtk3 +, enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 -, enableEigen ? false, eigen -, enableCuda ? false, cudatoolkit, gcc5 +, enableEigen ? false, eigen +, enableCuda ? false, cudatoolkit, gcc5 }: let - version = "3.1.0"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "opencv"; + repo = "opencv"; + rev = version; + sha256 = "0f59g0dvhp5xg1xa3r4lp351a7x0k03i77ylgcf69ns3y47qd16p"; + }; contribSrc = fetchFromGitHub { - owner = "Itseez"; - repo = "opencv_contrib"; - rev = version; - sha256 = "153yx62f34gl3zd6vgxv0fj3wccwmq78lnawlda1f6xhrclg9bax"; + owner = "opencv"; + repo = "opencv_contrib"; + rev = version; + sha256 = "1lynpbxz1jay3ya5y45zac5v8c6ifgk4ssn8d1chfdk3spi691jj"; + }; + + vggFiles = fetchFromGitHub { + owner = "opencv"; + repo = "opencv_3rdparty"; + rev = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"; + sha256 = "0r9fam8dplyqqsd3qgpnnfgf9l7lj44di19rxwbm8mxiw0rlcdvy"; + }; + + bootdescFiles = fetchFromGitHub { + owner = "opencv"; + repo = "opencv_3rdparty"; + rev = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"; + sha256 = "13yig1xhvgghvxspxmdidss5lqiikpjr0ddm83jsi0k85j92sn62"; }; opencvFlag = name: enabled: "-DWITH_${name}=${if enabled then "ON" else "OFF"}"; - in stdenv.mkDerivation rec { name = "opencv-${version}"; - inherit version; + inherit version src; - src = fetchFromGitHub { - owner = "Itseez"; - repo = "opencv"; - rev = version; - sha256 = "1l0w12czavgs0wzw1c594g358ilvfg2fn32cn8z7pv84zxj4g429"; - }; + postUnpack = + (lib.optionalString enableContrib '' + cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" - patches = - lib.optionals enableCuda [ - (fetchpatch { # Patch for CUDA 8 compatibility - url = "https://github.com/opencv/opencv/commit/10896129b39655e19e4e7c529153cb5c2191a1db.patch"; - sha256 = "0jka3kxxywgs3prqqgym5kav6p73rrblwj50k1nf3fvfpk194ah1"; - }) - (fetchpatch { # Patch to add CUDA Compute Capability compilation targets up to 6.0 - url = "https://github.com/opencv/opencv/commit/d76f258aebdf63f979a205cabe6d3e81700a7cd8.patch"; - sha256 = "00b3msfgrcw7laij6qafn4b18c1dl96xxpzwx05wxzrjldqb6kqg"; - }) - ] - ++ lib.optional enablePython (fetchpatch { # Patch to fix FlannBasedMatcher under python - url = "https://github.com/opencv/opencv/commit/05cfe28612fd8dc8fb0ccb876df945c7b435dd26.patch"; - sha256 = "0niza5lybr1ljzdkyiapr16laa468168qinpy5qn00yimnaygpm6"; - }); + for name in vgg_generated_48.i \ + vgg_generated_64.i \ + vgg_generated_80.i \ + vgg_generated_120.i; do + ln -s "${vggFiles}/$name" "$NIX_BUILD_TOP/opencv_contrib/xfeatures2d/src/$name" + done + for name in boostdesc_bgm.i \ + boostdesc_bgm_bi.i \ + boostdesc_bgm_hd.i \ + boostdesc_binboost_064.i \ + boostdesc_binboost_128.i \ + boostdesc_binboost_256.i \ + boostdesc_lbgm.i; do + ln -s "${bootdescFiles}/$name" "$NIX_BUILD_TOP/opencv_contrib/xfeatures2d/src/$name" + done + ''); preConfigure = - let ippicvVersion = "20151201"; - ippicvPlatform = if stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux" then "linux" - else throw "ICV is not available for this platform (or not yet supported by this package)"; - ippicvHash = if ippicvPlatform == "linux" then "1nph0w0pdcxwhdb5lxkb8whpwd9ylvwl97hn0k425amg80z86cs3" - else throw "ippicvHash: impossible"; - - ippicvName = "ippicv_${ippicvPlatform}_${ippicvVersion}.tgz"; - ippicvArchive = "3rdparty/ippicv/downloads/linux-${ippicvHash}/${ippicvName}"; - ippicv = fetchurl { - url = "https://github.com/Itseez/opencv_3rdparty/raw/ippicv/master_${ippicvVersion}/ippicv/${ippicvName}"; - sha256 = ippicvHash; - }; - in lib.optionalString enableIpp - '' - mkdir -p $(dirname ${ippicvArchive}) - ln -s ${ippicv} ${ippicvArchive} - ''; + (let version = "20151201"; + md5 = "808b791a6eac9ed78d32a7666804320e"; + sha256 = "1nph0w0pdcxwhdb5lxkb8whpwd9ylvwl97hn0k425amg80z86cs3"; + rev = "81a676001ca8075ada498583e4166079e5744668"; + platform = if stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux" then "linux" + else throw "ICV is not available for this platform (or not yet supported by this package)"; + name = "ippicv_${platform}_${version}.tgz"; + ippicv = fetchurl { + url = "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${rev}/ippicv/${name}"; + inherit sha256; + }; + dir = "3rdparty/ippicv/downloads/${platform}-${md5}"; + in lib.optionalString enableIpp '' + mkdir -p "${dir}" + ln -s "${ippicv}" "${dir}/${name}" + '' + ) + + (lib.optionalString enableContrib '' + cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/opencv_contrib") + ''); buildInputs = [ zlib ] @@ -91,7 +113,8 @@ stdenv.mkDerivation rec { ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen - ++ lib.optional enableCuda [ cudatoolkit gcc5 ] + ++ lib.optionals enableCuda [ cudatoolkit gcc5 ] + ++ lib.optional enableContrib protobuf3_1 ; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; @@ -110,8 +133,8 @@ stdenv.mkDerivation rec { (opencvFlag "OPENEXR" enableEXR) (opencvFlag "CUDA" enableCuda) (opencvFlag "CUBLAS" enableCuda) - ] ++ lib.optionals enableContrib [ "-DOPENCV_EXTRA_MODULES_PATH=${contribSrc}/modules" ] - ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ]; + ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ] + ++ lib.optional enableContrib "-DBUILD_PROTOBUF=off"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index cd4a696b1d9..2591a43f1d4 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl +{ stdenv, fetchurl, buildPackages, perl , withCryptodev ? false, cryptodevHeaders , enableSSL2 ? false }: @@ -25,8 +25,8 @@ let (versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem"))) ./darwin-arch.patch; - outputs = [ "bin" "dev" "out" "man" ]; - setOutputFlags = false; + outputs = [ "bin" "dev" "out" "man" ]; + setOutputFlags = false; nativeBuildInputs = [ perl ]; buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; @@ -50,7 +50,7 @@ let postConfigure = if makeDepend then "make depend" else null; - makeFlags = [ "MANDIR=$(man)/share/man" ]; + makeFlags = [ "MANDIR=$(man)/share/man" ]; # Parallel building is broken in OpenSSL. enableParallelBuilding = false; @@ -76,7 +76,7 @@ let postFixup = '' # Check to make sure the main output doesn't depend on perl - if grep -r '${perl}' $out; then + if grep -r '${buildPackages.perl}' $out; then echo "Found an erroneous dependency on perl ^^^" >&2 exit 1 fi @@ -109,24 +109,19 @@ let in { - openssl_1_0_1 = common { - version = "1.0.1u"; - sha256 = "0fb7y9pwbd76pgzd7xzqfrzibmc0vf03sl07f34z5dhm2b5b84j3"; - }; - openssl_1_0_2 = common { - version = "1.0.2j"; - sha256 = "0cf4ar97ijfc7mg35zdgpad6x8ivkdx9qii6mz35khi1ps9g5bz7"; + version = "1.0.2k"; + sha256 = "1h6qi35w6hv6rd73p4cdgdzg732pdrfgpp37cgwz1v9a3z37ffbb"; }; openssl_1_1_0 = common { - version = "1.1.0c"; - sha256 = "1xfn5ydl14myd9wgxm4nxy5a42cpp1g12ijf3g9m4mz0l90n8hzw"; + version = "1.1.0e"; + sha256 = "0k47sdd9gs6yxfv6ldlgpld2lyzrkcv9kz4cf88ck04xjwc8dgjp"; }; openssl_1_0_2-steam = common { - version = "1.0.2j"; - sha256 = "0cf4ar97ijfc7mg35zdgpad6x8ivkdx9qii6mz35khi1ps9g5bz7"; + version = "1.0.2k"; + sha256 = "1h6qi35w6hv6rd73p4cdgdzg732pdrfgpp37cgwz1v9a3z37ffbb"; configureFlags = [ "no-engine" ]; makeDepend = true; patches = [ ./openssl-fix-cpuid_setup.patch ]; diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 9094eca26e5..f59c538856c 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pkcs11-helper-${version}"; - version = "1.11"; + version = "1.21"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${name}"; - sha256 = "1bfsmy9w2qf7avvs3rsc1ycqczzzw0j2wsqkd2fj4dc1fqzigq2q"; + sha256 = "17a2cssycl7fh44xikmhszigx57vvn0h2sjsnmsy3772kfj796b1"; }; buildInputs = [ pkgconfig openssl autoreconfHook ]; diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 0b67ce16331..d7569c017a7 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig -, openssl, libpng, lua5 }: +, gcc5, openssl, libpng, lua5, pkgconfig, libidn, expat }: stdenv.mkDerivation rec { - name = "podofo-0.9.3"; + name = "podofo-0.9.5"; src = fetchurl { url = "mirror://sourceforge/podofo/${name}.tar.gz"; - sha256 = "1n12lbq9x15vqn7dc0hsccp56l5jdff1xrhvlfqlbklxx0qiw9pc"; + sha256 = "012kgfx5j5n6w4zkc1d290d2cwjk60jhzsjlr2x19g3yi75q2jc5"; }; - propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ]; - nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ]; + nativeBuildInputs = [ cmake gcc5 pkgconfig ]; buildInputs = [ lua5 stdenv.cc.libc ]; crossAttrs = { @@ -19,15 +19,6 @@ stdenv.mkDerivation rec { lua5.crossDrv stdenv.ccCross.libc ]; }; - # fix finding freetype-2.5 - preConfigure = '' - substituteInPlace ./CMakeLists.txt \ - --replace FREETYPE_INCLUDE_DIR FREETYPE_INCLUDE_DIRS \ - --replace 'FIND_PACKAGE(FREETYPE' 'FIND_PACKAGE(Freetype' - - rm ./cmake/modules/Find{FREETYPE,ZLIB,PkgConfig}.cmake - ''; - cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF"; meta = { diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index ff67ff8a1bb..27482743d2c 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -5,7 +5,7 @@ let system = "/var/run/current-system/sw"; - setuid = "/var/setuid-wrappers"; #TODO: from config.security.wrapperDir; + setuid = "/run/wrappers/bin"; #TODO: from config.security.wrapperDir; foolVars = { SYSCONF = "/etc"; diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 1886038dff3..44a66409d45 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -5,7 +5,7 @@ args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, p ### NixOS - usage: ================== - services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }).v_2_2_1 ]; + services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }).v_2_3_1 ]; ### important Postgis implementation details: @@ -84,9 +84,9 @@ let in rec { - v_2_2_1 = pgDerivationBaseNewer.merge ( fix : { - version = "2.2.1"; - sha256 = "02gsi1cm63kf0r7881444lrkzdjqhhpz9a5zav3al0q24nq01r8g"; + v_2_3_1 = pgDerivationBaseNewer.merge ( fix : { + version = "2.3.1"; + sha256 = "0xd21h2k6x3i1b3z6pgm3pmkfpxm6irxd5wbx68acjndjgd6p3ac"; sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; builtInputs = [gdal json_c pkgconfig]; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index bc9178f6367..b92aa49a092 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "proj-4.9.2"; + name = "proj-4.9.3"; src = fetchurl { - url = http://download.osgeo.org/proj/proj-4.9.2.tar.gz; - sha256 = "15kpcmz3qjxfrs6vq48mgyvb4vxscmwgkzrdcn71a60wxp8rmgv0"; + url = http://download.osgeo.org/proj/proj-4.9.3.tar.gz; + sha256 = "1xw5f427xk9p2nbsj04j6m5zyjlyd66sbvl2bkg8hd1kx8pm9139"; }; - doCheck = true; + doCheck = stdenv.is64bit; meta = with stdenv.lib; { description = "Cartographic Projections Library"; diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix index f80acf462b8..4e77e7f1fbe 100644 --- a/pkgs/development/libraries/protobuf/3.0.nix +++ b/pkgs/development/libraries/protobuf/3.0.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.0.0"; - sha256 = "05qkcl96lkdama848m7q3nzzzdckjc158iiyvgmln0zi232xx7g7"; + version = "3.0.2"; + sha256 = "16wmr1fgdqpf84fkq90cxvccfsxx7h0q0wzqkbg8vdjmka412g09"; } diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index f74aea9dbd5..44ecdcb2f65 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { doCheck = true; + NIX_CFLAGS_COMPILE = with stdenv.lib; + # gcc before 6 doesn't know this option + optionalString (hasPrefix "gcc-6" stdenv.cc.cc.name) "-Wno-error=misleading-indentation"; + meta = { description = "Google's data interchange format"; longDescription = diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 431fd432ecb..6a951fddb79 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, cmake, pkgconfig, qt }: stdenv.mkDerivation rec { - name = "qca-2.1.1"; + name = "qca-${version}"; + version = "2.1.3"; src = fetchurl { - url = "http://download.kde.org/stable/qca/2.1.1/src/qca-2.1.1.tar.xz"; - sha256 = "10z9icq28fww4qbzwra8d9z55ywbv74qk68nhiqfrydm21wkxplm"; + url = "http://download.kde.org/stable/qca/${version}/src/qca-${version}.tar.xz"; + sha256 = "0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -13,8 +14,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ ./libressl.patch ]; - meta = with stdenv.lib; { description = "Qt Cryptographic Architecture"; license = "LGPL"; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 91a8899f4d1..8c8e311a93e 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -80,12 +80,19 @@ stdenv.mkDerivation rec { gtk = gtk2.out; gdk_pixbuf = gdk_pixbuf.out; }) - ++ [(fetchpatch { + ++ [ + (fetchpatch { name = "fix-medium-font.patch"; url = "http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/plain/debian/patches/" + "kubuntu_39_fix_medium_font.diff?id=21b342d71c19e6d68b649947f913410fe6129ea4"; sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j"; - })]; + }) + (fetchpatch { + name = "qt4-gcc6.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; + sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; + }) + ]; preConfigure = '' export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" @@ -145,8 +152,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - NIX_CFLAGS_COMPILE = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) - "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include" + NIX_CFLAGS_COMPILE = + optionalString stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin + + optionalString (stdenv.isFreeBSD || stdenv.isDarwin) + " -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include" + optionalString stdenv.isDarwin " -I${libcxx}/include/c++/v1"; NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix index 96b6cca75aa..13b8296dc0e 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix @@ -37,6 +37,9 @@ qtSubmodule { sed -i -e 's,\(static QString processPath\),\1 = QLatin1String("'$out'/libexec/QtWebEngineProcess"),' src/core/web_engine_library_info.cpp sed -i -e 's,\(static QString potentialLocalesPath =\).*,\1 QLatin1String("'$out'/translations/qtwebengine_locales");,' src/core/web_engine_library_info.cpp + # fix default SSL bundle location + sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c + configureFlags+="\ -plugindir $out/lib/qt5/plugins \ -importdir $out/lib/qt5/imports \ diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix index e7cb8c0ec62..ec3f9061f79 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix @@ -31,7 +31,10 @@ qtSubmodule { --replace /bin/echo ${coreutils}/bin/echo substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \ --replace /bin/echo ${coreutils}/bin/echo - + + # fix default SSL bundle location + sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c + configureFlags+="\ -plugindir $out/lib/qt5/plugins \ -importdir $out/lib/qt5/imports \ diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix index b2b7121d51d..fad68fbd745 100644 --- a/pkgs/development/libraries/qt-5/qt-env.nix +++ b/pkgs/development/libraries/qt-5/qt-env.nix @@ -1,28 +1,22 @@ -{ lib, runCommand, lndir, qtbase }: name: paths: +{ lib, buildEnv, qtbase }: name: paths: -runCommand name { qtbase = qtbase.dev; paths = lib.chooseDevOutputs paths; } '' +buildEnv { + inherit name; + paths = [ qtbase ] ++ paths; -mkdir -p "$out/bin" "$out/mkspecs" "$out/include" "$out/lib" "$out/share" + pathsToLink = [ "/bin" "/mkspecs" "/include" "/lib" "/share" ]; + extraOutputsToInstall = [ "dev" ]; -cp "$qtbase/bin/qmake" "$out/bin" -cat >"$out/bin/qt.conf" <"$out/bin/qt.conf" < + #include "MPEGaudio.h" + + static const unsigned int +@@ -550,11 +551,11 @@ htd33[ 31][2]={{ 16, 1},{ 8, 1},{ 4, + + const HUFFMANCODETABLE MPEGaudio::ht[HTN]= + { +- { 0, 0-1, 0-1, 0, 0, htd33}, ++ { 0, UINT_MAX, UINT_MAX, 0, 0, htd33}, + { 1, 2-1, 2-1, 0, 7,htd01}, + { 2, 3-1, 3-1, 0, 17,htd02}, + { 3, 3-1, 3-1, 0, 17,htd03}, +- { 4, 0-1, 0-1, 0, 0, htd33}, ++ { 4, UINT_MAX, UINT_MAX, 0, 0, htd33}, + { 5, 4-1, 4-1, 0, 31,htd05}, + { 6, 4-1, 4-1, 0, 31,htd06}, + { 7, 6-1, 6-1, 0, 71,htd07}, +@@ -564,7 +565,7 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN + {11, 8-1, 8-1, 0,127,htd11}, + {12, 8-1, 8-1, 0,127,htd12}, + {13,16-1,16-1, 0,511,htd13}, +- {14, 0-1, 0-1, 0, 0, htd33}, ++ {14, UINT_MAX, UINT_MAX, 0, 0, htd33}, + {15,16-1,16-1, 0,511,htd15}, + {16,16-1,16-1, 1,511,htd16}, + {17,16-1,16-1, 2,511,htd16}, diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index dc87c939278..9ec7d651ccb 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-fft=gpl-fftw3" - ]; + ] ++ stdenv.lib.optional stdenv.isAarch64 "--disable-neon"; meta = with stdenv.lib; { hompage = http://www.speex.org/; diff --git a/pkgs/development/libraries/spice/0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch b/pkgs/development/libraries/spice/0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch new file mode 100644 index 00000000000..8098f568e21 --- /dev/null +++ b/pkgs/development/libraries/spice/0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch @@ -0,0 +1,56 @@ +From 75e8685740199537bfefcbd9996ec3ff9f6342e6 Mon Sep 17 00:00:00 2001 +From: Graham Christensen +Date: Wed, 8 Feb 2017 21:58:43 -0500 +Subject: [PATCH] Adapting the following patch, from + http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0003-main-channel-Prevent-overflow-reading-messages-from-.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d + +> From: Frediano Ziglio +> Date: Tue, 29 Nov 2016 16:46:56 +0000 +> Subject: [spice-server 3/3] main-channel: Prevent overflow reading messages +> from client +> +> Caller is supposed the function return a buffer able to store +> size bytes. +> +> Signed-off-by: Frediano Ziglio +> Acked-by: Christophe Fergeau +> --- +> server/main-channel.c | 3 +++ +> 1 file changed, 3 insertions(+) +> +> diff --git a/server/main-channel.c b/server/main-channel.c +> index 24dd448..1124506 100644 +> --- a/server/main-channel.c +> +++ b/server/main-channel.c +> @@ -258,6 +258,9 @@ static uint8_t *main_channel_alloc_msg_rcv_buf(RedChannelClient *rcc, +> +> if (type == SPICE_MSGC_MAIN_AGENT_DATA) { +> return reds_get_agent_data_buffer(red_channel_get_server(channel), mcc, size); +> + } else if (size > sizeof(main_chan->recv_buf)) { +> + /* message too large, caller will log a message and close the connection */ +> + return NULL; +> } else { +> return main_chan->recv_buf; +> } +> -- +> 2.9.3 +> --- + server/main_channel.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/server/main_channel.c b/server/main_channel.c +index 0ecc9df..1fc3915 100644 +--- a/server/main_channel.c ++++ b/server/main_channel.c +@@ -1026,6 +1026,9 @@ static uint8_t *main_channel_alloc_msg_rcv_buf(RedChannelClient *rcc, + + if (type == SPICE_MSGC_MAIN_AGENT_DATA) { + return reds_get_agent_data_buffer(mcc, size); ++ } else if (size > sizeof(main_chan->recv_buf)) { ++ /* message too large, caller will log a message and close the connection */ ++ return NULL; + } else { + return main_chan->recv_buf; + } +-- +2.10.0 diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index c0145f4f776..61952c3b323 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib, openssl -, libXrandr, libXfixes, libXext, libXrender, libXinerama, libjpeg, zlib -, spice_protocol, python, pyparsing, glib, cyrus_sasl, lz4 }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, pixman, celt, alsaLib +, openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama +, libjpeg, zlib, spice_protocol, python, pyparsing, glib, cyrus_sasl +, lz4 }: with stdenv.lib; @@ -12,6 +13,22 @@ stdenv.mkDerivation rec { sha256 = "0za03i77j8i3g5l2np2j7vy8cqsdbkm9wbv4hjnaqq9xhz2sa0gr"; }; + patches = [ + (fetchpatch { + name = "0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch"; + url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; + sha256 = "11x5566lx5zyl7f39glwsgpzkxb7hpcshx8va5ab3imrns07130q"; + }) + (fetchpatch { + name = "0002-Prevent-integer-overflows-in-capability-checks.patch"; + url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0002-Prevent-integer-overflows-in-capability-checks.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; + sha256 = "1r1bhq98w93cvvrlrz6jwdfsy261xl3xqs0ppchaa2igyxvxv5z5"; + }) + # Originally from http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0003-main-channel-Prevent-overflow-reading-messages-from-.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d + # but main-channel.c was renamed to main_channel.c + ./0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch + ]; + buildInputs = [ pixman celt alsaLib openssl libjpeg zlib libXrandr libXfixes libXrender libXext libXinerama python pyparsing glib cyrus_sasl lz4 ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 8161d3bfa1f..6e86780446c 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.15.2"; + name = "sqlite-3.16.2"; src = fetchurl { - url = "http://sqlite.org/2016/sqlite-autoconf-3150200.tar.gz"; - sha256 = "0j9i1zrwxc7dfd6xr3xagal3incrlalsrk96havnas1qp5im1cq7"; + url = "http://sqlite.org/2017/sqlite-autoconf-3160200.tar.gz"; + sha256 = "059n4s9qd35qpbd4g29y9ay99a6f68ad7k65g430rxb6jcz0rk35"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index c6f3d68ebd6..8a76e886b4f 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -13,6 +13,7 @@ let { name = "CVE-2011-0764.diff"; sha256 = "1j0y3f38im7srpqjg9jvx8as6sxkz8gw7hglcxnxl9qylx8mr2jh"; } { name = "CVE-2011-1552_1553_1554.patch"; sha256 = "16cyq6jhyhh8912j8hapx9pq4rzxk36ljlkxlnyi7i3wr8iz1dir"; } { name = "CVE-2010-2642.patch"; sha256 = "175zvyr9v1xs22k2svgxqjcpz5nihfa7j46hn9nzvkqcrhm5m9y8"; } + # this ^ also fixes CVE-2011-5244 ]; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index dc0504454f6..29c96bea421 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tcltls-${version}"; - version = "1.6"; + version = "1.6.7"; src = fetchurl { url = "mirror://sourceforge/tls/tls${version}-src.tar.gz"; - sha256 = "adec50143a9ad634a671d24f7c7bbf2455487eb5f12d290f41797c32a98b93f3"; + sha256 = "1f53sfcnrridjl5ayrq1xrqkahs8khf8c3d0m2brndbhahzdw6ai"; }; buildInputs = [ tcl openssl ]; diff --git a/pkgs/development/libraries/torch/default.nix b/pkgs/development/libraries/torch/default.nix index 1b1a100350c..d4c61890afb 100644 --- a/pkgs/development/libraries/torch/default.nix +++ b/pkgs/development/libraries/torch/default.nix @@ -10,7 +10,14 @@ stdenv.mkDerivation rec{ libjpeg zeromq3 ncurses openssl libpng readline pkgconfig zlib libX11 which ]; - src = fetchgit (stdenv.lib.importJSON ./src.json); + + src = fetchgit { + url = "https://github.com/torch/distro"; + rev = "8b6a834f8c8755f6f5f84ef9d8da9cfc79c5ce1f"; + sha256 = "120hnz82d7izinsmv5smyqww71dhpix23pm43s522dfcglpql8xy"; + fetchSubmodules = true; + }; + buildPhase = '' cd .. export PREFIX=$out diff --git a/pkgs/development/libraries/torch/src.json b/pkgs/development/libraries/torch/src.json deleted file mode 100644 index 37c7a20ce54..00000000000 --- a/pkgs/development/libraries/torch/src.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "url": "https://github.com/torch/distro", - "rev": "8b6a834f8c8755f6f5f84ef9d8da9cfc79c5ce1f", - "sha256": "120hnz82d7izinsmv5smyqww71dhpix23pm43s522dfcglpql8xy", - "fetchSubmodules": true -} diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 6105db73bc7..94223378151 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Project for mocking web service APIs which use HTTP or HTTPS"; homepage = https://gitlab.com/groups/uhttpmock/; license = licenses.lgpl21; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index e3a7124720b..df68b86519b 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libva-intel-driver-1.7.2"; + name = "libva-intel-driver-1.7.3"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; - sha256 = "1g371q9p31i57fkidjp2akvrbaadpyx3bwmg5kn72sc2mbv7p7h9"; + sha256 = "0dzryi9x873p9gikzcb9wzwqv2j3wssm0b85ws63vqjszpckgbbn"; }; patchPhase = '' diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index cfa2c3fa1f2..ae43307cf31 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,35 +1,40 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, - glibc, zimg, imagemagick, libass, tesseract, yasm, - python3 + glibc, zimg, imagemagick, libass, yasm, python3, + ocrSupport ? false, tesseract }: +assert ocrSupport -> tesseract != null; + +with stdenv.lib; + stdenv.mkDerivation rec { name = "vapoursynth-${version}"; - version = "R35"; + version = "R36"; src = fetchFromGitHub { - owner = "vapoursynth"; - repo = "vapoursynth"; - rev = "dcab1529d445776a5575859aea655e613c23c8bc"; - sha256 = "0nhpqws91b19lql2alc5pxgzfgh1wjrws0kyvir41jhfxhhjaqpi"; + owner = "vapoursynth"; + repo = "vapoursynth"; + rev = version; + sha256 = "10yiccj7yd4bd3a6k15xahb5y3ymcagyaqavh0wal2rwzfck9k8c"; }; buildInputs = [ pkgconfig autoreconfHook zimg imagemagick libass glibc tesseract yasm (python3.withPackages (ps: with ps; [ sphinx cython ])) - ]; + ] ++ optional ocrSupport tesseract; configureFlags = [ "--enable-imwri" "--disable-static" + (optionalString (!ocrSupport) "--disable-ocr") ]; - meta = with stdenv.lib; { + meta = { description = "A video processing framework with the future in mind"; - homepage = http://www.vapoursynth.com/; - license = licenses.lgpl21; - platforms = platforms.unix; + homepage = http://www.vapoursynth.com/; + license = licenses.lgpl21; + platforms = platforms.unix; maintainers = with maintainers; [ rnhmjoj ]; }; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 731bd81cb6f..46994a495eb 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3, - python3Packages, glslang, spirv-tools, x11, libxcb, wayland }: + python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr, + libXext, wayland }: let - version = "1.0.26.0"; + version = "1.0.39.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-LoaderAndValidationLayers"; rev = "sdk-${version}"; - sha256 = "157m746hc76xrxd3qq0f44f5dy7pjbz8cx74ykqrlbc7rmpjpk58"; + sha256 = "0y9zzrnjjjza2kkf5jfsdqhn98md6rsq0hb7jg62z2dipzky7zdp"; }; in @@ -15,23 +16,13 @@ stdenv.mkDerivation rec { name = "vulkan-loader-${version}"; inherit version src; - prePatch = '' - if [ "$(cat '${src}/spirv-tools_revision')" != '${spirv-tools.src.rev}' ] \ - || [ "$(cat '${src}/spirv-headers_revision')" != '${spirv-tools.headers.rev}' ] \ - || [ "$(cat '${src}/glslang_revision')" != '${glslang.src.rev}' ] - then - echo "Version mismatch, aborting!" - false - fi - ''; - buildInputs = [ cmake pkgconfig git python3 python3Packages.lxml - glslang spirv-tools x11 libxcb wayland + glslang spirv-tools x11 libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; cmakeFlags = [ - "-DBUILD_WSI_WAYLAND_SUPPORT=ON" # XLIB/XCB supported by default + "-DBUILD_WSI_MIR_SUPPORT=OFF" ]; patches = [ ./use-xdg-paths.patch ]; @@ -40,7 +31,7 @@ stdenv.mkDerivation rec { preConfigure = '' checkRev() { - [ "$2" = $(cat "$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "$1_revision") && exit 1) + [ "$2" = $(cat "external_revisions/$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "external_revisions/$1_revision") && exit 1) } checkRev spirv-tools "${spirv-tools.src.rev}" checkRev spirv-headers "${spirv-tools.headers.rev}" @@ -58,7 +49,8 @@ stdenv.mkDerivation rec { mkdir -p $dev/include cp -rv ../include $dev/ mkdir -p $demos/bin - cp demos/smoketest demos/tri demos/cube demos/*.spv demos/*.ppm $demos/bin + cp demos/*.spv demos/*.ppm $demos/bin + find demos -type f -executable -not -name vulkaninfo -exec cp {} $demos/bin \; ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch b/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch index 1ae0f20889f..eb7869cd73c 100644 --- a/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch +++ b/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch @@ -1,142 +1,322 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27ab6e5..e59256e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -256,17 +256,10 @@ if(NOT WIN32) + include(GNUInstallDirs) + + add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}") +- add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}") +- + # Make sure /etc is searched by the loader +- if (NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc")) ++ if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc")) + add_definitions(-DEXTRASYSCONFDIR="/etc") + endif() +- +- # Make sure /usr/share is searched by the loader +- if (NOT (CMAKE_INSTALL_FULL_DATADIR STREQUAL "/usr/share")) +- add_definitions(-DEXTRADATADIR="/usr/share") +- endif() + endif() + + if(UNIX) diff --git a/loader/loader.c b/loader/loader.c -index a950ea1..9462d05 100644 +index 24758f4..af7cc85 100644 --- a/loader/loader.c +++ b/loader/loader.c -@@ -2671,6 +2671,94 @@ static VkResult loader_get_manifest_files( - } +@@ -2909,7 +2909,7 @@ static VkResult + loader_get_manifest_files(const struct loader_instance *inst, + const char *env_override, const char *source_override, + bool is_layer, bool warn_if_not_present, +- const char *location, const char *home_location, ++ const char *location, const char *relative_location, + struct loader_manifest_files *out_files) { + const char * override = NULL; + char *override_getenv = NULL; +@@ -2941,9 +2941,9 @@ loader_get_manifest_files(const struct loader_instance *inst, } + #if !defined(_WIN32) +- if (location == NULL && home_location == NULL) { ++ if (location == NULL && relative_location == NULL) { + #else +- home_location = NULL; ++ relative_location = NULL; + if (location == NULL) { + #endif + loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, +@@ -2962,16 +2962,89 @@ loader_get_manifest_files(const struct loader_instance *inst, + // Make a copy of the input we are using so it is not modified + // Also handle getting the location(s) from registry on Windows + if (override == NULL) { +- loc = loader_stack_alloc(strlen(location) + 1); ++ size_t loc_size = strlen(location) + 1; +#if !defined(_WIN32) -+ if (home_location && override == NULL) { -+ char *xdgconfdirs = secure_getenv("XDG_CONFIG_DIRS"); -+ char *xdgdatadirs = secure_getenv("XDG_DATA_DIRS"); -+ char *cur, *src = loc; -+ size_t src_size = strlen(src), rel_size = strlen(home_location); -+ size_t size = 0; -+ -+ if (src_size > 0) -+ size += src_size + 1; -+ -+ if (xdgconfdirs == NULL) ++ const char *xdgconfdirs = secure_getenv("XDG_CONFIG_DIRS"); ++ const char *xdgdatadirs = secure_getenv("XDG_DATA_DIRS"); ++ if (xdgconfdirs == NULL || xdgconfdirs[0] == '\0') + xdgconfdirs = "/etc/xdg"; -+ if (xdgdatadirs == NULL) ++ if (xdgdatadirs == NULL || xdgdatadirs[0] == '\0') + xdgdatadirs = "/usr/local/share:/usr/share"; -+ -+ for (char *x = xdgconfdirs; *x; ++x) -+ if (*x == PATH_SEPERATOR) size += rel_size; -+ size += strlen(xdgconfdirs) + rel_size + 1; -+ for (char *x = xdgdatadirs; *x; ++x) -+ if (*x == PATH_SEPERATOR) size += rel_size; -+ size += strlen(xdgdatadirs) + rel_size + 1; -+ -+#if defined(LOCALPREFIX) -+ size += strlen(LOCALPREFIX "/" SYSCONFDIR) + rel_size + 1; -+ size += strlen(LOCALPREFIX "/" DATADIR) + rel_size + 1; ++ const size_t rel_size = strlen(relative_location); ++ // Leave space for trailing separators ++ loc_size += strlen(xdgconfdirs) + strlen(xdgdatadirs) + 2*rel_size + 2; ++ for (const char *x = xdgconfdirs; *x; ++x) ++ if (*x == PATH_SEPARATOR) loc_size += rel_size; ++ for (const char *x = xdgdatadirs; *x; ++x) ++ if (*x == PATH_SEPARATOR) loc_size += rel_size; ++ loc_size += strlen(SYSCONFDIR) + rel_size + 1; ++#ifdef EXTRASYSCONFDIR ++ loc_size += strlen(EXTRASYSCONFDIR) + rel_size + 1; +#endif ++#endif ++ loc = loader_stack_alloc(loc_size); + if (loc == NULL) { + loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, + "loader_get_manifest_files: Failed to allocate " + "%d bytes for manifest file location.", +- strlen(location)); ++ loc_size); + res = VK_ERROR_OUT_OF_HOST_MEMORY; + goto out; + } +- strcpy(loc, location); ++ char *loc_write = loc; ++#if !defined(_WIN32) ++ const char *loc_read; + -+ loc = cur = loader_stack_alloc(size); -+ if (cur == NULL) { -+ loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, -+ "Out of memory can't get manifest files"); -+ res = VK_ERROR_OUT_OF_HOST_MEMORY; -+ goto out; -+ } -+ -+ if (src_size > 0) { -+ memcpy(cur, src, src_size); -+ cur += src_size; -+ *cur++ = PATH_SEPERATOR; -+ } -+ -+ src = xdgconfdirs; -+ for (char *x = src;; ++x) { -+ if (*x == PATH_SEPERATOR || *x == 0) { -+ size_t s = x - src; -+ memcpy(cur, src, s); cur += s; -+ memcpy(cur, home_location, rel_size); cur += rel_size; -+ *cur++ = PATH_SEPERATOR; ++ loc_read = &xdgconfdirs[0]; ++ for (const char *x = loc_read;; ++x) { ++ if (*x == PATH_SEPARATOR || *x == '\0') { ++ const size_t s = x - loc_read; ++ memcpy(loc_write, loc_read, s); ++ loc_write += s; ++ memcpy(loc_write, relative_location, rel_size); ++ loc_write += rel_size; ++ *loc_write++ = PATH_SEPARATOR; + if (*x == 0) + break; -+ src = ++x; ++ loc_read = ++x; + } + } + -+#if defined(LOCALPREFIX) -+ strcpy(cur, LOCALPREFIX "/" SYSCONFDIR); -+ cur += strlen(cur); -+ memcpy(cur, home_location, rel_size); cur += rel_size; -+ *cur++ = PATH_SEPERATOR; ++ memcpy(loc_write, SYSCONFDIR, strlen(SYSCONFDIR)); ++ loc_write += strlen(SYSCONFDIR); ++ memcpy(loc_write, relative_location, rel_size); ++ loc_write += rel_size; ++ *loc_write++ = PATH_SEPARATOR; ++ ++#ifdef EXTRASYSCONFDIR ++ memcpy(loc_write, EXTRASYSCONFDIR, strlen(EXTRASYSCONFDIR)); ++ loc_write += strlen(EXTRASYSCONFDIR); ++ memcpy(loc_write, relative_location, rel_size); ++ loc_write += rel_size; ++ *loc_write++ = PATH_SEPARATOR; +#endif + -+ src = xdgdatadirs; -+ for (char *x = src;; ++x) { -+ if (*x == PATH_SEPERATOR || *x == 0) { -+ size_t s = x - src; -+ memcpy(cur, src, s); cur += s; -+ memcpy(cur, home_location, rel_size); cur += rel_size; -+ *cur++ = PATH_SEPERATOR; ++ loc_read = &xdgdatadirs[0]; ++ for (const char *x = loc_read;; ++x) { ++ if (*x == PATH_SEPARATOR || *x == '\0') { ++ const size_t s = x - loc_read; ++ memcpy(loc_write, loc_read, s); ++ loc_write += s; ++ memcpy(loc_write, relative_location, rel_size); ++ loc_write += rel_size; ++ *loc_write++ = PATH_SEPARATOR; + if (*x == 0) + break; -+ src = ++x; ++ loc_read = ++x; + } + } -+ -+#if defined(LOCALPREFIX) -+ strcpy(cur, LOCALPREFIX "/" DATADIR); -+ cur += strlen(cur); -+ memcpy(cur, home_location, rel_size); cur += rel_size; -+ *cur++ = PATH_SEPERATOR; ++ --loc_write; ++ *loc_write = '\0'; ++#else ++ memcpy(loc_write, location, loc_size); ++ loc[loc_size-1] = '\0'; +#endif + -+ loc[size - 1] = 0; -+ assert(cur == loc + size); -+ list_is_dirs = true; -+ } -+#endif -+ - // Print out the paths being searched if debugging is enabled - loader_log(inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0, - "Searching the following paths for manifest files: %s\n", loc); + #if defined(_WIN32) + VkResult reg_result = loaderGetRegistryFiles(inst, loc, ®); + if (VK_SUCCESS != reg_result || NULL == reg) { +@@ -3122,14 +3195,14 @@ loader_get_manifest_files(const struct loader_instance *inst, + } + file = next_file; + #if !defined(_WIN32) +- if (home_location != NULL && ++ if (relative_location != NULL && + (next_file == NULL || *next_file == '\0') && override == NULL) { + char *xdgdatahome = secure_getenv("XDG_DATA_HOME"); + size_t len; + if (xdgdatahome != NULL) { + + char *home_loc = loader_stack_alloc(strlen(xdgdatahome) + 2 + +- strlen(home_location)); ++ strlen(relative_location)); + if (home_loc == NULL) { + loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, + "loader_get_manifest_files: Failed to allocate " +@@ -3139,15 +3212,15 @@ loader_get_manifest_files(const struct loader_instance *inst, + } + strcpy(home_loc, xdgdatahome); + // Add directory separator if needed +- if (home_location[0] != DIRECTORY_SYMBOL) { ++ if (relative_location[0] != DIRECTORY_SYMBOL) { + len = strlen(home_loc); + home_loc[len] = DIRECTORY_SYMBOL; + home_loc[len + 1] = '\0'; + } +- strcat(home_loc, home_location); ++ strcat(home_loc, relative_location); + file = home_loc; + next_file = loader_get_next_path(file); +- home_location = NULL; ++ relative_location = NULL; + + loader_log( + inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0, +@@ -3160,7 +3233,7 @@ loader_get_manifest_files(const struct loader_instance *inst, + char *home = secure_getenv("HOME"); + if (home != NULL) { + char *home_loc = loader_stack_alloc(strlen(home) + 16 + +- strlen(home_location)); ++ strlen(relative_location)); + if (home_loc == NULL) { + loader_log( + inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, +@@ -3178,15 +3251,15 @@ loader_get_manifest_files(const struct loader_instance *inst, + } + strcat(home_loc, ".local/share"); + +- if (home_location[0] != DIRECTORY_SYMBOL) { ++ if (relative_location[0] != DIRECTORY_SYMBOL) { + len = strlen(home_loc); + home_loc[len] = DIRECTORY_SYMBOL; + home_loc[len + 1] = '\0'; + } +- strcat(home_loc, home_location); ++ strcat(home_loc, relative_location); + file = home_loc; + next_file = loader_get_next_path(file); +- home_location = NULL; ++ relative_location = NULL; + + loader_log( + inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0, +@@ -3263,7 +3336,7 @@ VkResult loader_icd_scan(const struct loader_instance *inst, + // Get a list of manifest files for ICDs + res = loader_get_manifest_files(inst, "VK_ICD_FILENAMES", NULL, false, true, + DEFAULT_VK_DRIVERS_INFO, +- HOME_VK_DRIVERS_INFO, &manifest_files); ++ RELATIVE_VK_DRIVERS_INFO, &manifest_files); + if (VK_SUCCESS != res || manifest_files.count == 0) { + goto out; + } +@@ -3490,7 +3563,7 @@ void loader_layer_scan(const struct loader_instance *inst, + if (VK_SUCCESS != + loader_get_manifest_files(inst, LAYERS_PATH_ENV, LAYERS_SOURCE_PATH, + true, true, DEFAULT_VK_ELAYERS_INFO, +- HOME_VK_ELAYERS_INFO, &manifest_files[0])) { ++ RELATIVE_VK_ELAYERS_INFO, &manifest_files[0])) { + goto out; + } + +@@ -3499,7 +3572,7 @@ void loader_layer_scan(const struct loader_instance *inst, + // overridden by LAYERS_PATH_ENV + if (VK_SUCCESS != loader_get_manifest_files(inst, NULL, NULL, true, false, + DEFAULT_VK_ILAYERS_INFO, +- HOME_VK_ILAYERS_INFO, ++ RELATIVE_VK_ILAYERS_INFO, + &manifest_files[1])) { + goto out; + } +@@ -3569,7 +3642,7 @@ void loader_implicit_layer_scan(const struct loader_instance *inst, + // overridden by LAYERS_PATH_ENV + VkResult res = loader_get_manifest_files( + inst, NULL, NULL, true, false, DEFAULT_VK_ILAYERS_INFO, +- HOME_VK_ILAYERS_INFO, &manifest_files); ++ RELATIVE_VK_ILAYERS_INFO, &manifest_files); + if (VK_SUCCESS != res || manifest_files.count == 0) { + return; + } diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h -index 3a02640..70a2652 100644 +index dc4ac10..50a7966 100644 --- a/loader/vk_loader_platform.h +++ b/loader/vk_loader_platform.h -@@ -57,35 +57,10 @@ +@@ -57,47 +57,9 @@ #define VULKAN_ILAYERCONF_DIR "implicit_layer.d" #define VULKAN_LAYER_DIR "layer" --#if defined(LOCALPREFIX) --#define LOCAL_DRIVERS_INFO \ -- LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" \ -- LOCALPREFIX "/" DATADIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" --#define LOCAL_ELAYERS_INFO \ -- LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" \ -- LOCALPREFIX "/" DATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" --#define LOCAL_ILAYERS_INFO \ -- LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" \ -- LOCALPREFIX "/" DATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" +-#if defined(EXTRASYSCONFDIR) +-#define EXTRA_DRIVERS_SYSCONFDIR_INFO ":" \ +- EXTRASYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR +-#define EXTRA_ELAYERS_SYSCONFDIR_INFO ":" \ +- EXTRASYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR +-#define EXTRA_ILAYERS_SYSCONFDIR_INFO ":" \ +- EXTRASYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR -#else --#define LOCAL_DRIVERS_INFO --#define LOCAL_ELAYERS_INFO --#define LOCAL_ILAYERS_INFO +-#define EXTRA_DRIVERS_SYSCONFDIR_INFO +-#define EXTRA_ELAYERS_SYSCONFDIR_INFO +-#define EXTRA_ILAYERS_SYSCONFDIR_INFO +-#endif +- +-#if defined(EXTRADATADIR) +-#define EXTRA_DRIVERS_DATADIR_INFO ":" \ +- EXTRADATADIR VULKAN_DIR VULKAN_ICDCONF_DIR +-#define EXTRA_ELAYERS_DATADIR_INFO ":" \ +- EXTRADATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR +-#define EXTRA_ILAYERS_DATADIR_INFO ":" \ +- EXTRADATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR +-#else +-#define EXTRA_DRIVERS_DATADIR_INFO +-#define EXTRA_ELAYERS_DATADIR_INFO +-#define EXTRA_ILAYERS_DATADIR_INFO -#endif - -#define DEFAULT_VK_DRIVERS_INFO \ -- LOCAL_DRIVERS_INFO \ -- "/" SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" \ -- "/usr/" DATADIR VULKAN_DIR VULKAN_ICDCONF_DIR -+#define DEFAULT_VK_DRIVERS_INFO "" - #define DEFAULT_VK_DRIVERS_PATH "" +- SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" \ +- DATADIR VULKAN_DIR VULKAN_ICDCONF_DIR \ +- EXTRA_DRIVERS_SYSCONFDIR_INFO \ +- EXTRA_DRIVERS_DATADIR_INFO -#define DEFAULT_VK_ELAYERS_INFO \ -- LOCAL_ELAYERS_INFO \ -- "/" SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" \ -- "/usr/" DATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR +- SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" \ +- DATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR \ +- EXTRA_ELAYERS_SYSCONFDIR_INFO \ +- EXTRA_ELAYERS_DATADIR_INFO -#define DEFAULT_VK_ILAYERS_INFO \ -- LOCAL_ILAYERS_INFO \ -- "/" SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" \ -- "/usr/" DATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR +- SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" \ +- DATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR \ +- EXTRA_ILAYERS_SYSCONFDIR_INFO \ +- EXTRA_ILAYERS_DATADIR_INFO ++#define DEFAULT_VK_DRIVERS_INFO "" +#define DEFAULT_VK_ELAYERS_INFO "" +#define DEFAULT_VK_ILAYERS_INFO "" - #define DEFAULT_VK_LAYERS_PATH "" - #if !defined(LAYERS_SOURCE_PATH) + + #define DEFAULT_VK_DRIVERS_PATH "" + #if !defined(DEFAULT_VK_LAYERS_PATH) +@@ -109,9 +71,9 @@ + #endif + #define LAYERS_PATH_ENV "VK_LAYER_PATH" + +-#define HOME_VK_DRIVERS_INFO VULKAN_DIR VULKAN_ICDCONF_DIR +-#define HOME_VK_ELAYERS_INFO VULKAN_DIR VULKAN_ELAYERCONF_DIR +-#define HOME_VK_ILAYERS_INFO VULKAN_DIR VULKAN_ILAYERCONF_DIR ++#define RELATIVE_VK_DRIVERS_INFO VULKAN_DIR VULKAN_ICDCONF_DIR ++#define RELATIVE_VK_ELAYERS_INFO VULKAN_DIR VULKAN_ELAYERCONF_DIR ++#define RELATIVE_VK_ILAYERS_INFO VULKAN_DIR VULKAN_ILAYERCONF_DIR + + // C99: + #define PRINTF_SIZE_T_SPECIFIER "%zu" +@@ -251,9 +213,9 @@ loader_platform_thread_cond_broadcast(loader_platform_thread_cond *pCond) { #define LAYERS_SOURCE_PATH NULL + #endif + #define LAYERS_PATH_ENV "VK_LAYER_PATH" +-#define HOME_VK_DRIVERS_INFO "" +-#define HOME_VK_ELAYERS_INFO "" +-#define HOME_VK_ILAYERS_INFO "" ++#define RELATIVE_VK_DRIVERS_INFO "" ++#define RELATIVE_VK_ELAYERS_INFO "" ++#define RELATIVE_VK_ILAYERS_INFO "" + #define PRINTF_SIZE_T_SPECIFIER "%Iu" + + // File IO diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index efe64581893..29a27e53f22 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "wavpack-${version}"; - version = "4.80.0"; + version = "5.1.0"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.wavpack.com/${name}.tar.bz2"; - sha256 = "1sbbwvqixg87h02avg0d5r64mpjz8cmhcc6j3s9wmlbvbykjw63r"; + sha256 = "0i19c6krc0p9krwrqy9s5xahaafigqzxcn31piidmlaqadyn4f8r"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index e644b5728ed..836a4527b50 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1"; }; - configureFlags = "--with-scanner --disable-documentation"; + configureFlags = [ "--with-scanner" "--disable-documentation" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/webkitgtk/2.12.nix b/pkgs/development/libraries/webkitgtk/2.12.nix deleted file mode 100644 index 04ab4d96773..00000000000 --- a/pkgs/development/libraries/webkitgtk/2.12.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake -, pkgconfig, gettext, gobjectIntrospection, libnotify -, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core -, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs -, enableGeoLocation ? true, geoclue2, sqlite -, gst-plugins-base -}: - -assert enableGeoLocation -> geoclue2 != null; - -with stdenv.lib; -stdenv.mkDerivation rec { - name = "webkitgtk-${version}"; - version = "2.12.5"; - - meta = { - description = "Web content rendering engine, GTK+ port"; - homepage = "http://webkitgtk.org/"; - license = licenses.bsd2; - platforms = platforms.linux; - hydraPlatforms = []; - maintainers = with maintainers; [ koral ]; - }; - - preConfigure = "patchShebangs Tools"; - - src = fetchurl { - url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0h0wig413399wws6l88mn1nnjbqb42vb55yvz8az39b4p1a7h53b"; - }; - - patches = [ ./finding-harfbuzz-icu.patch ]; - - cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" ]; - - # XXX: WebKit2 missing include path for gst-plugins-base. - # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 - NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"; - - nativeBuildInputs = [ - cmake perl python2 ruby bison gperf sqlite - pkgconfig gettext gobjectIntrospection - ]; - - buildInputs = [ - gtk2 wayland libwebp enchant libnotify - libxml2 libsecret libxslt harfbuzz libpthreadstubs - gst-plugins-base libxkbcommon epoxy at_spi2_core - ] ++ optional enableGeoLocation geoclue2 - ++ (with xlibs; [ libXdmcp libXt libXtst ]); - - propagatedBuildInputs = [ - libsoup gtk3 - ]; - - enableParallelBuilding = true; -} diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix index 2af7133bf2b..99a41ec0c18 100644 --- a/pkgs/development/libraries/webkitgtk/2.14.nix +++ b/pkgs/development/libraries/webkitgtk/2.14.nix @@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.14.3"; + version = "2.14.5"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0v0hkvggxi38cdb3v672qwr0m0y3x2rmnwh8j3q28869li8d9shb"; + sha256 = "17rnjs7yl198bkghzcc2cgh30sb5i03irb6wag3xchwv7b1z3a1w"; }; # see if we can clean this up.... diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index c4530da5453..6b9aa458735 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { + optionalString withMesa "${mesa.out}/lib "; # Work around a bug in configure. - NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" ]; + NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ]; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix index 5c45b29ec5c..ed937272514 100644 --- a/pkgs/development/libraries/wxGTK-3.0/default.nix +++ b/pkgs/development/libraries/wxGTK-3.0/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto -, gstreamer, gst_plugins_base, GConf, setfile +{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm +, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, setfile , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true , withWebKit ? false, webkitgtk2 ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null @@ -33,6 +33,11 @@ stdenv.mkDerivation { propagatedBuildInputs = optional stdenv.isDarwin AGL; + patches = [ (fetchpatch { + url = "https://raw.githubusercontent.com/jessehager/MINGW-packages/af6ece963d8157dd3fbc710bcc190647c4924c63/mingw-w64-wxwidgets/wxWidgets-3.0.2-gcc6-abs.patch"; + sha256 = "0100pg0z7i6cjyysf2k3330pmqmdaxgc9hz6kxnfvc31dynjcq3h"; + }) ]; + configureFlags = [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl" (if compat24 then "--enable-compat24" else "--disable-compat24") diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index b4c0a51f6dd..468ab25fb11 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -2,14 +2,14 @@ , openssl, makeWrapper }: let - version = "1.2.20"; + version = "1.2.23"; in stdenv.mkDerivation rec { name = "xmlsec-${version}"; src = fetchurl { url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "01bkbv2y3x8d1sf4dcln1x3y2jyj391s3208d9a2ndhglly5j89j"; + sha256 = "17qfw5crkqn4v6xbkjxrjvcccfc00dy053892wrwv54qdk8n7m21"; }; buildInputs = [ makeWrapper libxml2 gnutls libxslt pkgconfig libgcrypt libtool openssl ]; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index ab95f4ec3f3..4352e7f05c2 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "zeromq-${version}"; - version = "4.2.0"; + version = "4.2.2"; src = fetchurl { url = "https://github.com/zeromq/libzmq/releases/download/v${version}/${name}.tar.gz"; - sha256 = "05y1s0938x5w838z79b4f9w6bspz9anldjx9dzvk32cpxvq3pf2k"; + sha256 = "0syzwsiqblimfjb32fr6hswhdvp3cmbk0pgm7ayxaigmkv5g88sv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index d1d0735e46d..7fb14de7951 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation rec{ name = "zimg-${version}"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { - owner = "sekrit-twc"; - repo = "zimg"; - rev = "9cbe9b0de66a690bdd142bae0e656e27c1f50ade"; - sha256 = "1qj5fr8ghgnyfjzdvgkvplicqsgyp05g3pvsdrg9yivvx32291hp"; + owner = "sekrit-twc"; + repo = "zimg"; + rev = "v${version}"; + sha256 = "11pk8a5manr751jhy0xrql57jzab57lwqjxbpd8kvm9m8b51icwq"; }; buildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { description = "Scaling, colorspace conversion and dithering library"; - homepage = https://github.com/sekrit-twc/zimg; - license = licenses.wtfpl; - platforms = platforms.linux; # check upstream issue #52 + homepage = https://github.com/sekrit-twc/zimg; + license = licenses.wtfpl; + platforms = platforms.linux; # check upstream issue #52 maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index dca6483dc84..5d96299380e 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, static ? false }: -let version = "1.2.10"; in +let version = "1.2.11"; in stdenv.mkDerivation rec { name = "zlib-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { [ "http://www.zlib.net/fossils/${name}.tar.gz" # stable archive path "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz" ]; - sha256 = "05w0jwsqib44jz5jazh7cqz311z4g7znnzn6w6v8g1z4iilryzld"; + sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"; }; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index 278690f3a1c..7e05dfa585a 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="asdf"; - version="3.1.7"; + version="3.2.0"; name="${baseName}-${version}"; - hash="16x065q6adidbdr77axsxz4f8c818szfz0b9sw1a4c89y82ylsnn"; - url="http://common-lisp.net/project/asdf/archives/asdf-3.1.7.tar.gz"; - sha256="16x065q6adidbdr77axsxz4f8c818szfz0b9sw1a4c89y82ylsnn"; + hash="0ns4hh5f0anfgvy4q68wsylgwfin82kb1k2p53h29cf8jiil0p9a"; + url="http://common-lisp.net/project/asdf/archives/asdf-3.2.0.tar.gz"; + sha256="0ns4hh5f0anfgvy4q68wsylgwfin82kb1k2p53h29cf8jiil0p9a"; }; buildInputs = [ texinfo texLive perl @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; - sourceRoot = "."; + buildPhase = '' make build/asdf.lisp make -C doc asdf.info asdf.html diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 6887c8ff60d..537e754d57a 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -19,14 +19,14 @@ let lispPackages = rec { clx = buildLispPackage rec { baseName = "clx"; - version = "git-20150117"; + version = "git-20170201"; description = "An implementation of the X Window System protocol in Lisp"; deps = []; # Source type: git src = pkgs.fetchgit { url = ''https://github.com/sharplispers/clx''; - sha256 = "ada6cf450c22d1ed297e5575f832bee8e4b61d602ffa9a145ae2fab7cd80f3b6"; - rev = ''0a3bea0fab66058e9394973e23954c43083d96e2''; + sha256 = "08jw4d2sx49kq1xw44s3fvyq94wm1if4v1jbf1137fvlkzw1pf5m"; + rev = ''c6d2446a10abd9eade2c52342b9662c9dd8579dc''; name = "clx-git-checkout-${version}"; }; }; diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index cafe329c076..cf699c34e2b 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,7 +1,7 @@ {stdenv, androidsdk, titaniumsdk, titanium, alloy, xcodewrapper, jdk, python, nodejs, which, xcodeBaseDir}: { name, src, target, androidPlatformVersions ? [ "23" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null -, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "9.2" +, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "10.2" , enableWirelessDistribution ? false, installURL ? null }: @@ -99,6 +99,7 @@ stdenv.mkDerivation { security default-keychain -s $keychainName security unlock-keychain -p "" $keychainName security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A + security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}") # Ensure that the requested provisioning profile can be found @@ -130,7 +131,7 @@ stdenv.mkDerivation { fi # Do the actual build - titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName --device-family universal --ios-version ${iosVersion} --output-dir $out + titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName-db --device-family universal --ios-version ${iosVersion} --output-dir $out # Remove our generated keychain ${deleteKeychain} diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index ae7a16984b8..6ca4c441e64 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "5.2.3.GA"}: +{pkgs, pkgs_i686, xcodeVersion ? "8.2.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "6.0.2.GA"}: rec { androidenv = pkgs.androidenv; @@ -11,6 +11,7 @@ rec { titaniumsdk = let titaniumSdkFile = if tiVersion == "5.1.2.GA" then ./titaniumsdk-5.1.nix else if tiVersion == "5.2.3.GA" then ./titaniumsdk-5.2.nix + else if tiVersion == "6.0.2.GA" then ./titaniumsdk-6.0.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { @@ -19,7 +20,7 @@ rec { buildApp = import ./build-app.nix { inherit (pkgs) stdenv python which jdk nodejs; - inherit (pkgs.nodePackages) titanium alloy; + inherit (pkgs.nodePackages_4_x) titanium alloy; inherit (androidenv) androidsdk; inherit (xcodeenv) xcodewrapper; inherit titaniumsdk xcodeBaseDir; diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index ffeefdbbbcf..3c5d3a018ec 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -1,10 +1,10 @@ { nixpkgs ? , systems ? [ "x86_64-linux" "x86_64-darwin" ] -, xcodeVersion ? "7.2" +, xcodeVersion ? "8.2.1" , xcodeBaseDir ? "/Applications/Xcode.app" -, tiVersion ? "5.1.2.GA" +, tiVersion ? "6.0.2.GA" , rename ? false -, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "9.2" +, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "10.2" , enableWirelessDistribution ? false, installURL ? null }: diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index 60b96548da4..4abf650ebee 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -8,8 +8,8 @@ assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioning let src = fetchgit { url = https://github.com/appcelerator/KitchenSink.git; - rev = "6e9f509069fafdebfa78e15b2d14f20a27a485cc"; - sha256 = "049cf0d9y0ivhsi35slx621z0wry4lqf76hw0ksb315i2713v347"; + rev = "ec9edebf35030f61368000a8a9071dd7a0773884"; + sha256 = "1j41w4nhcbl40x550pjgabqrach80f9dybv7ya32771wnw2000iy"; }; # Rename the bundle id to something else diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix index 15a86e338de..5bdd0fd63c5 100644 --- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix @@ -3,5 +3,5 @@ xcodeenv.simulateApp { name = "simulate-${kitchensink.name}"; inherit bundleId; - app = "${kitchensink}/build/iphone/build/Debug-iphonesimulator"; + app = "${kitchensink}/build/iphone/build/Products/Debug-iphonesimulator"; } diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix new file mode 100644 index 00000000000..fdaaff39453 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: + +stdenv.mkDerivation { + name = "mobilesdk-6.0.2.GA"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = http://builds.appcelerator.com/mobile/6_0_X/mobilesdk-6.0.2.v20170123140026-linux.zip; + sha256 = "1yjhr4fgjnxfxzwmgw71yynrfzhsjqj2cirjr5rd14zlp4q9751q"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://builds.appcelerator.com/mobile/6_0_X/mobilesdk-6.0.2.v20170123140026-osx.zip; + sha256 = "1ijd1wp56ygy238xpcffy112akim208wbv5zm901dvych83ibw1c"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + (yes y | unzip $src) || true + + # Rename ugly version number + cd mobilesdk/* + mv * 6.0.2.GA + cd * + + # Patch some executables + + ${if stdenv.system == "i686-linux" then + '' + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 + '' + else if stdenv.system == "x86_64-linux" then + '' + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 + '' + else ""} + ''; +} diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index b2e6f84bb00..bbbe1728ee5 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -1,12 +1,11 @@ {stdenv, xcodewrapper}: { name , src -, sdkVersion ? "6.1" +, sdkVersion ? "10.2" , target ? null , configuration ? null , scheme ? null , sdk ? null -, arch ? null , xcodeFlags ? "" , release ? false , codeSignIdentity ? null @@ -35,11 +34,6 @@ let if release then "Release" else "Debug" else configuration; - _arch = if arch == null - then - if release then "armv7" else "x86_64" - else arch; - _sdk = if sdk == null then if release then "iphoneos" + sdkVersion else "iphonesimulator" + sdkVersion @@ -68,6 +62,9 @@ stdenv.mkDerivation { # Import the certificate into the keychain security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A + # Grant the codesign utility permissions to read from the keychain + security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName + # Determine provisioning ID PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}") @@ -83,7 +80,7 @@ stdenv.mkDerivation { ''} # Do the building - xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} -arch ${_arch} ONLY_ACTIVE_ARCH=NO VALID_ARCHS="${_arch}" CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""} + xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${stdenv.lib.optionalString release '' ${stdenv.lib.optionalString generateIPA '' diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix index d7e35142be4..afe430df383 100644 --- a/pkgs/development/mobile/xcodeenv/default.nix +++ b/pkgs/development/mobile/xcodeenv/default.nix @@ -1,4 +1,4 @@ -{stdenv, version ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app"}: +{stdenv, version ? "8.2.1", xcodeBaseDir ? "/Applications/Xcode.app"}: rec { xcodewrapper = import ./xcodewrapper.nix { diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index ecfdbe2a6e3..5f71b599408 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { # Copy the app and restore the write permissions appTmpDir=$(mktemp -d -t appTmpDir) - cp -r "$(echo ${app}/*.app)" $appTmpDir + cp -r "$(echo ${app}/*.app)" "$appTmpDir" chmod -R 755 "$(echo $appTmpDir/*.app)" # Wait for the simulator to start @@ -33,7 +33,7 @@ stdenv.mkDerivation { read # Install the app - xcrun simctl install $udid "$(echo $appTmpDir/*.app)" + xcrun simctl install "$udid" "$(echo $appTmpDir/*.app)" # Remove the app tempdir rm -Rf $appTmpDir @@ -45,4 +45,3 @@ stdenv.mkDerivation { chmod +x $out/bin/run-test-simulator ''; } - diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix index 26b0197b2e1..38afe86c5aa 100644 --- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation { ln -s /usr/bin/xcode-select ln -s /usr/bin/security ln -s /usr/bin/codesign + ln -s /usr/bin/xcrun ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild" - ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcrun" ln -s "${xcodeBaseDir}/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator" cd .. diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 8e6aeac9683..27664385b61 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -45,4 +45,12 @@ nodePackages // { done ''; }); + + ios-deploy = nodePackages.ios-deploy.override (oldAttrs: { + preRebuild = '' + tmp=$(mktemp -d) + ln -s /usr/bin/xcodebuild $tmp + export PATH="$PATH:$tmp" + ''; + }); } diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index 8f5d178e734..ceebd52b61c 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -400,13 +400,13 @@ let sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; }; }; - "azure-arm-cdn-1.0.0" = { + "azure-arm-cdn-1.0.2" = { name = "azure-arm-cdn"; packageName = "azure-arm-cdn"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.0.tgz"; - sha1 = "a400b0234734eb8f7a52f5b800dd05b4f1b69f85"; + url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.2.tgz"; + sha1 = "35eed81c93fb1b2fe1236b432c821a61bce6be96"; }; }; "azure-arm-commerce-0.2.0" = { @@ -418,13 +418,13 @@ let sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd"; }; }; - "azure-arm-compute-0.19.1" = { + "azure-arm-compute-0.20.0" = { name = "azure-arm-compute"; packageName = "azure-arm-compute"; - version = "0.19.1"; + version = "0.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.1.tgz"; - sha1 = "04bd00758cfcc6fac616a4cf336bbdf83ab1decd"; + url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.20.0.tgz"; + sha1 = "f6d81c1e6093f4abae2d153a7b856963f5085e32"; }; }; "azure-arm-datalake-analytics-1.0.1-preview" = { @@ -535,13 +535,13 @@ let sha1 = "6972dd9844a0d12376d74014b541c49247caa37d"; }; }; - "azure-arm-rediscache-0.2.1" = { + "azure-arm-rediscache-0.2.3" = { name = "azure-arm-rediscache"; packageName = "azure-arm-rediscache"; - version = "0.2.1"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.1.tgz"; - sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02"; + url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.3.tgz"; + sha1 = "b6898abe8b4c3e1b2ec5be82689ef212bc2b1a06"; }; }; "azure-arm-devtestlabs-0.1.0" = { @@ -724,13 +724,13 @@ let sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb"; }; }; - "azure-servicefabric-0.1.4" = { + "azure-servicefabric-0.1.5" = { name = "azure-servicefabric"; packageName = "azure-servicefabric"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.4.tgz"; - sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e"; + url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.5.tgz"; + sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6"; }; }; "applicationinsights-0.16.0" = { @@ -868,22 +868,22 @@ let sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82"; }; }; - "ms-rest-1.15.2" = { + "ms-rest-1.15.4" = { name = "ms-rest"; packageName = "ms-rest"; - version = "1.15.2"; + version = "1.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.2.tgz"; - sha1 = "882f7d22bd2360505f03b0cbfdd19a8f71e012ff"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.4.tgz"; + sha1 = "7af7038fe843fd89d407fec346320db6b010ef8c"; }; }; - "ms-rest-azure-1.15.2" = { + "ms-rest-azure-1.15.4" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "1.15.2"; + version = "1.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.2.tgz"; - sha1 = "8375437c2199d8d4bc001d2308b5fc1c1fcf3d83"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.4.tgz"; + sha1 = "ea89bce23c6ddd4593db1e86f6557cc6374e3492"; }; }; "node-forge-0.6.23" = { @@ -1435,24 +1435,6 @@ let sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; }; }; - "uuid-2.0.1" = { - name = "uuid"; - packageName = "uuid"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"; - sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac"; - }; - }; - "azure-arm-resource-1.4.4-preview" = { - name = "azure-arm-resource"; - packageName = "azure-arm-resource"; - version = "1.4.4-preview"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.4-preview.tgz"; - sha1 = "557696d45a89d8320c1aa0916297024b71b73fe2"; - }; - }; "debug-0.7.4" = { name = "debug"; packageName = "debug"; @@ -1705,13 +1687,13 @@ let sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; }; }; - "aws4-1.5.0" = { + "aws4-1.6.0" = { name = "aws4"; packageName = "aws4"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz"; - sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; + sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; }; }; "bl-1.1.2" = { @@ -2173,13 +2155,13 @@ let sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; }; }; - "jsbn-0.1.0" = { + "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; - sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; "tweetnacl-0.14.5" = { @@ -2209,13 +2191,13 @@ let sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; }; }; - "bcrypt-pbkdf-1.0.0" = { + "bcrypt-pbkdf-1.0.1" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"; - sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; + sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; "mime-db-1.26.0" = { @@ -2398,13 +2380,13 @@ let sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; }; - "sax-1.2.1" = { + "sax-1.2.2" = { name = "sax"; packageName = "sax"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; - sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz"; + sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828"; }; }; "mute-stream-0.0.7" = { @@ -2848,13 +2830,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.1.5" = { + "hosted-git-info-2.2.0" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.1.5"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz"; - sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz"; + sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5"; }; }; "is-builtin-module-1.0.0" = { @@ -3127,13 +3109,13 @@ let sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; }; }; - "debug-2.6.0" = { + "debug-2.6.1" = { name = "debug"; packageName = "debug"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; - sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; + url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; + sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; }; }; "ms-0.7.2" = { @@ -3208,13 +3190,13 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "buffer-4.9.1" = { + "buffer-5.0.5" = { name = "buffer"; packageName = "buffer"; - version = "4.9.1"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; - sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz"; + sha1 = "35c9393244a90aff83581063d16f0882cecc9418"; }; }; "cached-path-relative-1.0.0" = { @@ -3802,13 +3784,13 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "elliptic-6.3.2" = { + "elliptic-6.3.3" = { name = "elliptic"; packageName = "elliptic"; - version = "6.3.2"; + version = "6.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz"; - sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz"; + sha1 = "5482d9646d54bcb89fd7d994fc9e2e9568876e3f"; }; }; "parse-asn1-5.0.0" = { @@ -3820,13 +3802,13 @@ let sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; }; }; - "brorand-1.0.6" = { + "brorand-1.0.7" = { name = "brorand"; packageName = "brorand"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz"; - sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.0.7.tgz"; + sha1 = "6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc"; }; }; "hash.js-1.0.3" = { @@ -4081,6 +4063,15 @@ let sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395"; }; }; + "array-shuffle-1.0.1" = { + name = "array-shuffle"; + packageName = "array-shuffle"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-shuffle/-/array-shuffle-1.0.1.tgz"; + sha1 = "7ea4882a356b4bca5f545e0b6e52eaf6d971557a"; + }; + }; "castv2-client-1.2.0" = { name = "castv2-client"; packageName = "castv2-client"; @@ -4117,13 +4108,13 @@ let sha1 = "e74befcd1a62ae7a5e5fbfbfa6f5d2bacd962bdd"; }; }; - "fs-extended-0.2.1" = { - name = "fs-extended"; - packageName = "fs-extended"; - version = "0.2.1"; + "diveSync-0.3.0" = { + name = "diveSync"; + packageName = "diveSync"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extended/-/fs-extended-0.2.1.tgz"; - sha1 = "3910358127e9c72c8296c30142c7763b5f5e2d3a"; + url = "https://registry.npmjs.org/diveSync/-/diveSync-0.3.0.tgz"; + sha1 = "d9980493ae33beec36f4fec6f171ff218130cc12"; }; }; "got-1.2.2" = { @@ -4243,6 +4234,15 @@ let sha1 = "17be93eaae3f3b779359c795b419705a8817e868"; }; }; + "xspfr-0.3.1" = { + name = "xspfr"; + packageName = "xspfr"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xspfr/-/xspfr-0.3.1.tgz"; + sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; + }; + }; "castv2-0.1.9" = { name = "castv2"; packageName = "castv2"; @@ -4441,6 +4441,15 @@ let sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78"; }; }; + "append-0.1.1" = { + name = "append"; + packageName = "append"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/append/-/append-0.1.1.tgz"; + sha1 = "7e5dd327747078d877286fbb624b1e8f4d2b396b"; + }; + }; "object-assign-1.0.0" = { name = "object-assign"; packageName = "object-assign"; @@ -4936,13 +4945,13 @@ let sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854"; }; }; - "random-access-file-1.4.0" = { + "random-access-file-1.5.0" = { name = "random-access-file"; packageName = "random-access-file"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.4.0.tgz"; - sha1 = "40972acb4d3d6f023522d08f3b2046c6d1ae5767"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.5.0.tgz"; + sha1 = "dc1b137e5922c203cc6bc8b58564be68d5269a17"; }; }; "run-parallel-1.1.6" = { @@ -4954,13 +4963,13 @@ let sha1 = "29003c9a2163e01e2d2dfc90575f2c6c1d61a039"; }; }; - "thunky-1.0.1" = { + "thunky-1.0.2" = { name = "thunky"; packageName = "thunky"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/thunky/-/thunky-1.0.1.tgz"; - sha1 = "3db1525aac0367b67bd2e532d2773e7c40be2e68"; + url = "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz"; + sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; }; }; "ip-1.1.4" = { @@ -5161,13 +5170,13 @@ let sha1 = "58cccb244f563326ba893bf5c06a35f644846daa"; }; }; - "k-rpc-socket-1.6.1" = { + "k-rpc-socket-1.6.2" = { name = "k-rpc-socket"; packageName = "k-rpc-socket"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.1.tgz"; - sha1 = "bf67128f89f0c62a19cec5afc3003c280111c78e"; + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.2.tgz"; + sha1 = "5c9e9f34a058f43ffe6512354d98957a41694f21"; }; }; "bencode-0.8.0" = { @@ -5206,22 +5215,22 @@ let sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; }; }; - "simple-peer-6.2.1" = { + "simple-peer-6.2.2" = { name = "simple-peer"; packageName = "simple-peer"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.1.tgz"; - sha1 = "0d6bf982afb32cca2fabbb969dee4fceaceb99fb"; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.2.tgz"; + sha1 = "9ea1a6e2c2e3656d04eac2a7b612e148f0d370ba"; }; }; - "simple-websocket-4.2.0" = { + "simple-websocket-4.3.0" = { name = "simple-websocket"; packageName = "simple-websocket"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.2.0.tgz"; - sha1 = "2517742a7dafc8d44fd4e093184b6718c817f2bf"; + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.0.tgz"; + sha1 = "062990cc94709388c31fc978dfc2a790b1b3e6ea"; }; }; "string2compact-1.2.2" = { @@ -5260,6 +5269,24 @@ let sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; }; }; + "ws-2.0.3" = { + name = "ws"; + packageName = "ws"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-2.0.3.tgz"; + sha1 = "532fd499c3f7d7d720e543f1f807106cfc57d9cb"; + }; + }; + "ultron-1.1.0" = { + name = "ultron"; + packageName = "ultron"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz"; + sha1 = "b07a2e6a541a815fc6a34ccd4533baec307ca864"; + }; + }; "addr-to-ip-port-1.4.2" = { name = "addr-to-ip-port"; packageName = "addr-to-ip-port"; @@ -5566,22 +5593,22 @@ let sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5"; }; }; - "cordova-common-1.5.1" = { + "cordova-common-2.0.0" = { name = "cordova-common"; packageName = "cordova-common"; - version = "1.5.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-1.5.1.tgz"; - sha1 = "6770de0d6200ad6f94a1abe8939b5bd9ece139e3"; + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.0.0.tgz"; + sha1 = "125097eb4b50b7353cec226ed21649192293ae97"; }; }; - "cordova-lib-6.4.0" = { + "cordova-lib-6.5.0" = { name = "cordova-lib"; packageName = "cordova-lib"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.4.0.tgz"; - sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33"; + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.5.0.tgz"; + sha1 = "f7630a04c29d6cdee980190b1d93fb1536ac453f"; }; }; "insight-0.8.4" = { @@ -5656,13 +5683,13 @@ let sha1 = "e244b9185b8175473bff6079324905115f83dc7c"; }; }; - "elementtree-0.1.6" = { + "elementtree-0.1.7" = { name = "elementtree"; packageName = "elementtree"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz"; - sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; + url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz"; + sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; }; }; "glob-5.0.15" = { @@ -5728,13 +5755,13 @@ let sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51"; }; }; - "sax-0.3.5" = { + "sax-1.1.4" = { name = "sax"; packageName = "sax"; - version = "0.3.5"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; - sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; + url = "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz"; + sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; }; }; "base64-js-0.0.8" = { @@ -5764,31 +5791,31 @@ let sha1 = "03aa1a5fe5b4cac604e3b967bc4c7ceacf957030"; }; }; - "cordova-fetch-1.0.1" = { - name = "cordova-fetch"; - packageName = "cordova-fetch"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.0.1.tgz"; - sha1 = "3122ed3dca8e83eae0345f83f3a8cc33680bf769"; - }; - }; - "cordova-create-1.0.1" = { + "cordova-create-1.0.2" = { name = "cordova-create"; packageName = "cordova-create"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.0.1.tgz"; - sha1 = "f1810401807ceec436ece27241180a83c97f8212"; + url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.0.2.tgz"; + sha1 = "cb9bba9817c62a645bacb6e00da8cc50936a0fa5"; }; }; - "cordova-js-4.2.0" = { + "cordova-fetch-1.0.2" = { + name = "cordova-fetch"; + packageName = "cordova-fetch"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.0.2.tgz"; + sha1 = "b8f4903f39fe613888062552a96995413af16d35"; + }; + }; + "cordova-js-4.2.1" = { name = "cordova-js"; packageName = "cordova-js"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.0.tgz"; - sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980"; + url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.1.tgz"; + sha1 = "01ca186e14e63b01cb6d24e469750e481a038355"; }; }; "cordova-serve-1.0.1" = { @@ -5809,6 +5836,15 @@ let sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe"; }; }; + "elementtree-0.1.6" = { + name = "elementtree"; + packageName = "elementtree"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz"; + sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; + }; + }; "init-package-json-1.9.4" = { name = "init-package-json"; packageName = "init-package-json"; @@ -5908,13 +5944,13 @@ let sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; }; }; - "xcode-0.8.9" = { + "xcode-0.9.1" = { name = "xcode"; packageName = "xcode"; - version = "0.8.9"; + version = "0.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/xcode/-/xcode-0.8.9.tgz"; - sha1 = "ec6765f70e9dccccc9f6e9a5b9b4e7e814b4cf35"; + url = "https://registry.npmjs.org/xcode/-/xcode-0.9.1.tgz"; + sha1 = "5b4e71b71b03573ff0cdb48439103e8107da0f95"; }; }; "browserify-transform-tools-1.5.3" = { @@ -5953,6 +5989,15 @@ let sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; }; }; + "cordova-app-hello-world-3.11.0" = { + name = "cordova-app-hello-world"; + packageName = "cordova-app-hello-world"; + version = "3.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.11.0.tgz"; + sha1 = "9214feb9dd713ca481a1cbabceeca60966c1c0cf"; + }; + }; "dependency-ls-1.0.0" = { name = "dependency-ls"; packageName = "dependency-ls"; @@ -5998,31 +6043,22 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "cordova-app-hello-world-3.11.0" = { - name = "cordova-app-hello-world"; - packageName = "cordova-app-hello-world"; - version = "3.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.11.0.tgz"; - sha1 = "9214feb9dd713ca481a1cbabceeca60966c1c0cf"; - }; - }; - "browserify-13.1.0" = { + "browserify-13.3.0" = { name = "browserify"; packageName = "browserify"; - version = "13.1.0"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.1.0.tgz"; - sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae"; + url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; + sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; }; }; - "assert-1.3.0" = { - name = "assert"; - packageName = "assert"; - version = "1.3.0"; + "buffer-4.9.1" = { + name = "buffer"; + packageName = "buffer"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"; - sha1 = "03939a622582a812cc202320a0b9a56c9b815849"; + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; + sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; "compression-1.6.2" = { @@ -6034,13 +6070,13 @@ let sha1 = "cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"; }; }; - "express-4.14.0" = { + "express-4.14.1" = { name = "express"; packageName = "express"; - version = "4.14.0"; + version = "4.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz"; - sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66"; + url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz"; + sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33"; }; }; "accepts-1.3.3" = { @@ -6124,13 +6160,13 @@ let sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; }; }; - "content-disposition-0.5.1" = { + "content-disposition-0.5.2" = { name = "content-disposition"; packageName = "content-disposition"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz"; - sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b"; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; + sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; }; }; "content-type-1.0.2" = { @@ -6196,13 +6232,13 @@ let sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; }; }; - "finalhandler-0.5.0" = { + "finalhandler-0.5.1" = { name = "finalhandler"; packageName = "finalhandler"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"; - sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; + sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; }; }; "fresh-0.3.0" = { @@ -6277,22 +6313,22 @@ let sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b"; }; }; - "send-0.14.1" = { + "send-0.14.2" = { name = "send"; packageName = "send"; - version = "0.14.1"; + version = "0.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz"; - sha1 = "a954984325392f51532a7760760e459598c89f7a"; + url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz"; + sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef"; }; }; - "serve-static-1.11.1" = { + "serve-static-1.11.2" = { name = "serve-static"; packageName = "serve-static"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.1.tgz"; - sha1 = "d6cce7693505f733c759de57befc1af76c0f0805"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz"; + sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7"; }; }; "type-is-1.6.14" = { @@ -6385,6 +6421,15 @@ let sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4"; }; }; + "sax-0.3.5" = { + name = "sax"; + packageName = "sax"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; + sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; + }; + }; "npm-package-arg-4.2.0" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -6637,6 +6682,15 @@ let sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; }; }; + "hosted-git-info-2.1.5" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz"; + sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b"; + }; + }; "lockfile-1.0.3" = { name = "lockfile"; packageName = "lockfile"; @@ -8024,13 +8078,13 @@ let sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; }; }; - "nan-2.5.0" = { + "nan-2.5.1" = { name = "nan"; packageName = "nan"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; - sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; + url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"; + sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2"; }; }; "jsonparse-0.0.6" = { @@ -8069,13 +8123,13 @@ let sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66"; }; }; - "faye-websocket-0.11.0" = { + "faye-websocket-0.11.1" = { name = "faye-websocket"; packageName = "faye-websocket"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.0.tgz"; - sha1 = "d9ccf0e789e7db725d74bc4877d23aa42972ac50"; + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz"; + sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"; }; }; "eventemitter3-0.1.6" = { @@ -8990,13 +9044,13 @@ let sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; }; }; - "espree-3.3.2" = { + "espree-3.4.0" = { name = "espree"; packageName = "espree"; - version = "3.3.2"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.3.2.tgz"; - sha1 = "dbf3fadeb4ecb4d4778303e50103b3d36c88b89c"; + url = "https://registry.npmjs.org/espree/-/espree-3.4.0.tgz"; + sha1 = "41656fa5628e042878025ef467e78f125cb86e1d"; }; }; "estraverse-4.2.0" = { @@ -9035,13 +9089,13 @@ let sha1 = "8859936af0038741263053b39d0e76ca241e4034"; }; }; - "ignore-3.2.0" = { + "ignore-3.2.2" = { name = "ignore"; packageName = "ignore"; - version = "3.2.0"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.2.0.tgz"; - sha1 = "8d88f03c3002a0ac52114db25d2c673b0bf1e435"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.2.2.tgz"; + sha1 = "1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410"; }; }; "inquirer-0.12.0" = { @@ -9062,13 +9116,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.7.0" = { + "js-yaml-3.8.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.7.0"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; - sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz"; + sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628"; }; }; "json-stable-stringify-1.0.1" = { @@ -9152,13 +9206,13 @@ let sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; }; }; - "js-tokens-3.0.0" = { + "js-tokens-3.0.1" = { name = "js-tokens"; packageName = "js-tokens"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.0.tgz"; - sha1 = "a2f2a969caae142fb3cd56228358c89366957bd1"; + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz"; + sha1 = "08e9f132484a2c45a30907e9dc4d5567b7f114d7"; }; }; "es6-map-0.1.4" = { @@ -9368,13 +9422,13 @@ let sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; }; }; - "esprima-2.7.3" = { + "esprima-3.1.3" = { name = "esprima"; packageName = "esprima"; - version = "2.7.3"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; - sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; }; }; "prelude-ls-1.1.2" = { @@ -9449,22 +9503,22 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-4.10.4" = { + "ajv-4.11.3" = { name = "ajv"; packageName = "ajv"; - version = "4.10.4"; + version = "4.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.10.4.tgz"; - sha1 = "c0974dd00b3464984892d6010aa9c2c945933254"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.3.tgz"; + sha1 = "ce30bdb90d1254f762c75af915fb3a63e7183d22"; }; }; - "ajv-keywords-1.5.0" = { + "ajv-keywords-1.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.0.tgz"; - sha1 = "c11e6859eafff83e0dafc416929472eca946aa2c"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz"; + sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; }; }; "slice-ansi-0.0.4" = { @@ -10007,13 +10061,13 @@ let sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; }; }; - "node-pre-gyp-0.6.32" = { + "node-pre-gyp-0.6.33" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.32"; + version = "0.6.33"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz"; - sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz"; + sha1 = "640ac55198f6a925972e0c16c4ac26a034d5ecc9"; }; }; "npmlog-4.0.2" = { @@ -10043,13 +10097,13 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; - "gauge-2.7.2" = { + "gauge-2.7.3" = { name = "gauge"; packageName = "gauge"; - version = "2.7.2"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz"; - sha1 = "15cecc31b02d05345a5d6b0e171cdb3ad2307774"; + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.3.tgz"; + sha1 = "1c23855f962f17b3ad3d0dc7443f304542edfe09"; }; }; "set-blocking-2.0.0" = { @@ -10061,13 +10115,13 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "aproba-1.0.4" = { + "aproba-1.1.1" = { name = "aproba"; packageName = "aproba"; - version = "1.0.4"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz"; - sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0"; + url = "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz"; + sha1 = "95d3600f07710aa0e9298c726ad5ecf2eacbabab"; }; }; "wide-align-1.1.0" = { @@ -10206,13 +10260,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.12.2" = { + "coffee-script-1.12.3" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.2"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz"; - sha1 = "0d4cbdee183f650da95419570c4929d08ef91376"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz"; + sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db"; }; }; "jade-1.11.0" = { @@ -11430,6 +11484,15 @@ let sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; }; }; + "esprima-2.7.3" = { + name = "esprima"; + packageName = "esprima"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; + sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; + }; + }; "handlebars-4.0.6" = { name = "handlebars"; packageName = "handlebars"; @@ -11502,13 +11565,13 @@ let sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3"; }; }; - "body-parser-1.16.0" = { + "body-parser-1.16.1" = { name = "body-parser"; packageName = "body-parser"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.0.tgz"; - sha1 = "924a5e472c6229fb9d69b85a20d5f2532dec788b"; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.1.tgz"; + sha1 = "51540d045adfa7a0c6995a014bb6b1ed9b802329"; }; }; "combine-lists-1.0.1" = { @@ -11619,13 +11682,13 @@ let sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120"; }; }; - "useragent-2.1.11" = { + "useragent-2.1.12" = { name = "useragent"; packageName = "useragent"; - version = "2.1.11"; + version = "2.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.1.11.tgz"; - sha1 = "6a026e6a6c619b46ca7a0b2fdef6c1ac3da8ca29"; + url = "https://registry.npmjs.org/useragent/-/useragent-2.1.12.tgz"; + sha1 = "aa7da6cdc48bdc37ba86790871a7321d64edbaa2"; }; }; "bytes-2.4.0" = { @@ -11655,6 +11718,15 @@ let sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; }; }; + "finalhandler-0.5.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"; + sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7"; + }; + }; "custom-event-1.0.1" = { name = "custom-event"; packageName = "custom-event"; @@ -12807,6 +12879,78 @@ let sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; }; }; + "browser-stdout-1.3.0" = { + name = "browser-stdout"; + packageName = "browser-stdout"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; + sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; + }; + }; + "diff-1.4.0" = { + name = "diff"; + packageName = "diff"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; + sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; + }; + }; + "glob-7.0.5" = { + name = "glob"; + packageName = "glob"; + version = "7.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz"; + sha1 = "b4202a69099bbb4d292a7c1b95b6682b67ebdc95"; + }; + }; + "growl-1.9.2" = { + name = "growl"; + packageName = "growl"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz"; + sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f"; + }; + }; + "lodash.create-3.1.1" = { + name = "lodash.create"; + packageName = "lodash.create"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz"; + sha1 = "d7f2849f0dbda7e04682bb8cd72ab022461debe7"; + }; + }; + "supports-color-3.1.2" = { + name = "supports-color"; + packageName = "supports-color"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; + sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; + }; + }; + "lodash._baseassign-3.2.0" = { + name = "lodash._baseassign"; + packageName = "lodash._baseassign"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"; + sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e"; + }; + }; + "lodash._basecreate-3.0.3" = { + name = "lodash._basecreate"; + packageName = "lodash._basecreate"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz"; + sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821"; + }; + }; "optparse-1.0.5" = { name = "optparse"; packageName = "optparse"; @@ -13212,15 +13356,6 @@ let sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"; }; }; - "lodash._baseassign-3.2.0" = { - name = "lodash._baseassign"; - packageName = "lodash._baseassign"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"; - sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e"; - }; - }; "lodash._createassigner-3.1.1" = { name = "lodash._createassigner"; packageName = "lodash._createassigner"; @@ -13302,6 +13437,15 @@ let sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2"; }; }; + "express-4.14.0" = { + name = "express"; + packageName = "express"; + version = "4.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz"; + sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66"; + }; + }; "follow-redirects-1.2.1" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -13338,6 +13482,15 @@ let sha1 = "fddd8b491502c48967a62963bc722ff897cddea0"; }; }; + "js-yaml-3.7.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; + sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + }; + }; "jsonata-1.0.10" = { name = "jsonata"; packageName = "jsonata"; @@ -13419,13 +13572,13 @@ let sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; }; }; - "node-red-node-email-0.1.15" = { + "node-red-node-email-0.1.16" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.15"; + version = "0.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.15.tgz"; - sha1 = "7a528596d3b693a077b1ee293300299855537142"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.16.tgz"; + sha1 = "ede78397c857d28e6785f2f1425e7d89d3b1ed38"; }; }; "node-red-node-twitter-0.1.9" = { @@ -13608,6 +13761,24 @@ let sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f"; }; }; + "content-disposition-0.5.1" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz"; + sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b"; + }; + }; + "send-0.14.1" = { + name = "send"; + packageName = "send"; + version = "0.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz"; + sha1 = "a954984325392f51532a7760760e459598c89f7a"; + }; + }; "retry-0.6.1" = { name = "retry"; packageName = "retry"; @@ -13770,13 +13941,13 @@ let sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc"; }; }; - "mailparser-0.6.1" = { + "mailparser-0.6.2" = { name = "mailparser"; packageName = "mailparser"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.1.tgz"; - sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3"; + url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.2.tgz"; + sha1 = "03c486039bdf4df6cd3b6adcaaac4107dfdbc068"; }; }; "imap-0.8.19" = { @@ -13896,13 +14067,13 @@ let sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; }; }; - "mimelib-0.2.19" = { + "mimelib-0.3.0" = { name = "mimelib"; packageName = "mimelib"; - version = "0.2.19"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mimelib/-/mimelib-0.2.19.tgz"; - sha1 = "37ec90a6ac7d00954851d0b2c31618f0a49da0ee"; + url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.0.tgz"; + sha1 = "4b16d4b435403daf692bc227890c7165ff3de894"; }; }; "encoding-0.1.12" = { @@ -13923,6 +14094,15 @@ let sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6"; }; }; + "addressparser-1.0.1" = { + name = "addressparser"; + packageName = "addressparser"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz"; + sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; + }; + }; "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; @@ -13950,6 +14130,24 @@ let sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971"; }; }; + "nan-2.5.0" = { + name = "nan"; + packageName = "nan"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; + sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; + }; + }; + "node-pre-gyp-0.6.32" = { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.6.32"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz"; + sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"; + }; + }; "mongoose-3.6.7" = { name = "mongoose"; packageName = "mongoose"; @@ -14454,15 +14652,6 @@ let sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6"; }; }; - "addressparser-1.0.1" = { - name = "addressparser"; - packageName = "addressparser"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz"; - sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; - }; - }; "nodemailer-fetch-1.6.0" = { name = "nodemailer-fetch"; packageName = "nodemailer-fetch"; @@ -14544,13 +14733,13 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; - "JSONStream-1.2.1" = { - name = "JSONStream"; - packageName = "JSONStream"; - version = "1.2.1"; + "aproba-1.0.4" = { + name = "aproba"; + packageName = "aproba"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz"; - sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9"; + url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz"; + sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0"; }; }; "fstream-npm-1.2.0" = { @@ -14607,13 +14796,22 @@ let sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; - "mississippi-1.2.0" = { + "mississippi-1.3.0" = { name = "mississippi"; packageName = "mississippi"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz"; - sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; + url = "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz"; + sha1 = "d201583eb12327e3c5c1642a404a9cacf94e34f5"; + }; + }; + "node-gyp-3.5.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; + sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; }; }; "nopt-4.0.1" = { @@ -14688,15 +14886,6 @@ let sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; }; }; - "write-file-atomic-1.2.0" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz"; - sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"; - }; - }; "lodash._baseindexof-3.1.0" = { name = "lodash._baseindexof"; packageName = "lodash._baseindexof"; @@ -14751,6 +14940,15 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; + "parallel-transform-1.1.0" = { + name = "parallel-transform"; + packageName = "parallel-transform"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz"; + sha1 = "d410f065b05da23081fcd10f28854c29bda33b06"; + }; + }; "stream-each-1.2.0" = { name = "stream-each"; packageName = "stream-each"; @@ -14760,6 +14958,15 @@ let sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991"; }; }; + "cyclist-0.2.2" = { + name = "cyclist"; + packageName = "cyclist"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz"; + sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; + }; + }; "stream-iterate-1.2.0" = { name = "stream-iterate"; packageName = "stream-iterate"; @@ -15057,6 +15264,15 @@ let sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; }; }; + "write-file-atomic-1.2.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz"; + sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"; + }; + }; "form-data-2.0.0" = { name = "form-data"; packageName = "form-data"; @@ -15238,22 +15454,13 @@ let sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; }; }; - "diff-1.4.0" = { - name = "diff"; - packageName = "diff"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; - sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; - }; - }; - "domino-1.0.27" = { + "domino-1.0.28" = { name = "domino"; packageName = "domino"; - version = "1.0.27"; + version = "1.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/domino/-/domino-1.0.27.tgz"; - sha1 = "26bc01f739707505c51456af7f59e3373369475d"; + url = "https://registry.npmjs.org/domino/-/domino-1.0.28.tgz"; + sha1 = "9ce3f6a9221a2c3288984b14ea191cd27b392f87"; }; }; "express-handlebars-3.0.0" = { @@ -15265,15 +15472,6 @@ let sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f"; }; }; - "finalhandler-0.5.1" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; - sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; - }; - }; "gelf-stream-0.2.4" = { name = "gelf-stream"; packageName = "gelf-stream"; @@ -15321,13 +15519,13 @@ let sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; }; }; - "service-runner-2.1.13" = { + "service-runner-2.1.15" = { name = "service-runner"; packageName = "service-runner"; - version = "2.1.13"; + version = "2.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz"; - sha1 = "e8ff78b93230d7d831ea3ed5587aa2292b829ceb"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.15.tgz"; + sha1 = "8b3d05729def7a0ce211e0483d9d907f13febbfb"; }; }; "simplediff-0.1.1" = { @@ -15456,13 +15654,13 @@ let sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03"; }; }; - "yargs-5.0.0" = { + "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; - version = "5.0.0"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz"; - sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e"; + url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; + sha1 = "782ec21ef403345f830a808ca3d513af56065208"; }; }; "dtrace-provider-0.8.0" = { @@ -15525,8 +15723,8 @@ let version = "1.3.6"; src = fetchgit { url = "https://github.com/gwicke/kad.git"; - rev = "f35971036f43814043245da82b12d035b7bbfd16"; - sha256 = "9529b2615547db37851d15b39155c608d6b8d0641366d14cce728824b6135a35"; + rev = "936c91652d757ea6f9dd30e44698afb0daaa1d17"; + sha256 = "69b2ef001b9f4161dad34f5305a5895cfa9f98f124689277293fd544d06f9251"; }; }; "clarinet-0.11.0" = { @@ -15592,6 +15790,15 @@ let sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; }; }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + }; "get-caller-file-1.0.2" = { name = "get-caller-file"; packageName = "get-caller-file"; @@ -15601,15 +15808,6 @@ let sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; }; }; - "lodash.assign-4.2.0" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; - sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; - }; - }; "require-directory-2.1.1" = { name = "require-directory"; packageName = "require-directory"; @@ -15637,6 +15835,24 @@ let sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; }; }; + "yargs-parser-4.2.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; + sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; + }; + }; + "lodash.assign-4.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; + }; + }; "window-size-0.2.0" = { name = "window-size"; packageName = "window-size"; @@ -15646,24 +15862,6 @@ let sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; }; }; - "yargs-parser-3.2.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz"; - sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f"; - }; - }; - "camelcase-3.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; - sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; - }; - }; "yargs-parser-2.4.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -16600,40 +16798,31 @@ let sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a"; }; }; - "private-0.1.6" = { + "private-0.1.7" = { name = "private"; packageName = "private"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/private/-/private-0.1.6.tgz"; - sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1"; + url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz"; + sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; }; }; - "recast-0.11.20" = { + "recast-0.11.21" = { name = "recast"; packageName = "recast"; - version = "0.11.20"; + version = "0.11.21"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.11.20.tgz"; - sha1 = "2cb9bec269c03b36d0598118a936cd0a293ca3f3"; + url = "https://registry.npmjs.org/recast/-/recast-0.11.21.tgz"; + sha1 = "4e83081c6359ecb2e526d14f4138879333f20ac9"; }; }; - "ast-types-0.9.4" = { + "ast-types-0.9.5" = { name = "ast-types"; packageName = "ast-types"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.4.tgz"; - sha1 = "410d1f81890aeb8e0a38621558ba5869ae53c91b"; - }; - }; - "esprima-3.1.3" = { - name = "esprima"; - packageName = "esprima"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; - sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.5.tgz"; + sha1 = "1a660a09945dbceb1f9c9cbb715002617424e04a"; }; }; "base62-0.1.1" = { @@ -16916,13 +17105,13 @@ let sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; }; }; - "express-5.0.0-alpha.2" = { + "express-5.0.0-alpha.3" = { name = "express"; packageName = "express"; - version = "5.0.0-alpha.2"; + version = "5.0.0-alpha.3"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.2.tgz"; - sha1 = "fd54177f657b6a4c4540727702edd1cbaa3a6ac5"; + url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.3.tgz"; + sha1 = "19d63b931bf0f64c42725952ef0602c381fe64db"; }; }; "express-json5-0.1.0" = { @@ -17006,58 +17195,13 @@ let sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332"; }; }; - "array-flatten-1.1.0" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.0.tgz"; - sha1 = "ac3efac717b0e7bbdc778ce0bde7381ac6604393"; - }; - }; - "path-is-absolute-1.0.0" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; - sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; - }; - }; - "path-to-regexp-0.1.6" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.6.tgz"; - sha1 = "f01fd5734047b6bfbc5f208c6135a33d7af09c36"; - }; - }; - "router-1.1.4" = { + "router-1.1.5" = { name = "router"; packageName = "router"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/router/-/router-1.1.4.tgz"; - sha1 = "5d449dde9d6e0ad5c3f53369064baf7798834a97"; - }; - }; - "array-flatten-2.0.0" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.0.0.tgz"; - sha1 = "24dd98b38b9194b59b2087ba40c21384d6b8a8dc"; - }; - }; - "setprototypeof-1.0.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.0.tgz"; - sha1 = "d5fafca01e1174d0079bd1bf881f09c8a339794c"; + url = "https://registry.npmjs.org/router/-/router-1.1.5.tgz"; + sha1 = "c9c6935201b30ac1f227ada6af86e8cea6515387"; }; }; "raw-body-1.3.4" = { @@ -17339,22 +17483,22 @@ let sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66"; }; }; - "csv-parse-1.1.10" = { + "csv-parse-1.2.0" = { name = "csv-parse"; packageName = "csv-parse"; - version = "1.1.10"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.10.tgz"; - sha1 = "767340d0d1f26d05434c798b7132222c669189de"; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.0.tgz"; + sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425"; }; }; - "stream-transform-0.1.1" = { + "stream-transform-0.1.2" = { name = "stream-transform"; packageName = "stream-transform"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.1.tgz"; - sha1 = "0a54a2b81eea88da55a50df2441cb63edc101c71"; + url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.2.tgz"; + sha1 = "7d8e6b4e03ac4781778f8c79517501bfb0762a9f"; }; }; "csv-stringify-0.0.8" = { @@ -17510,15 +17654,6 @@ let sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3"; }; }; - "js-yaml-3.6.1" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; - sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; - }; - }; "whet.extend-0.9.9" = { name = "whet.extend"; packageName = "whet.extend"; @@ -17528,13 +17663,13 @@ let sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1"; }; }; - "csso-2.2.1" = { + "csso-2.3.1" = { name = "csso"; packageName = "csso"; - version = "2.2.1"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-2.2.1.tgz"; - sha1 = "51fbb5347e50e81e6ed51668a48490ae6fe2afe2"; + url = "https://registry.npmjs.org/csso/-/csso-2.3.1.tgz"; + sha1 = "4f8d91a156f2f1c2aebb40b8fb1b5eb83d94d3b9"; }; }; "clap-1.1.2" = { @@ -17546,6 +17681,42 @@ let sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed"; }; }; + "enhanced-resolve-2.3.0" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz"; + sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359"; + }; + }; + "resolve-from-2.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz"; + sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57"; + }; + }; + "tapable-0.2.6" = { + name = "tapable"; + packageName = "tapable"; + version = "0.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz"; + sha1 = "206be8e188860b514425375e6f1ae89bfb01fd8d"; + }; + }; + "memory-fs-0.3.0" = { + name = "memory-fs"; + packageName = "memory-fs"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz"; + sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; + }; + }; "async-2.1.2" = { name = "async"; packageName = "async"; @@ -17843,13 +18014,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "raven-1.1.1" = { + "raven-1.1.2" = { name = "raven"; packageName = "raven"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-1.1.1.tgz"; - sha1 = "8837af64baa29ec32fc1cd8223255645ce3c9a42"; + url = "https://registry.npmjs.org/raven/-/raven-1.1.2.tgz"; + sha1 = "a5eb3db71f2fc3015a20145bcaf28015e7ae0718"; }; }; "signals-1.0.0" = { @@ -17879,15 +18050,6 @@ let sha1 = "0b48420d978c01804cf0230b648861598225a119"; }; }; - "yargs-6.6.0" = { - name = "yargs"; - packageName = "yargs"; - version = "6.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; - sha1 = "782ec21ef403345f830a808ca3d513af56065208"; - }; - }; "color-convert-1.9.0" = { name = "color-convert"; packageName = "color-convert"; @@ -18095,13 +18257,13 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; - "node-gyp-3.5.0" = { - name = "node-gyp"; - packageName = "node-gyp"; - version = "3.5.0"; + "mississippi-1.2.0" = { + name = "mississippi"; + packageName = "mississippi"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; - sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; + url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz"; + sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; }; }; "lsmod-1.0.0" = { @@ -18131,15 +18293,6 @@ let sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae"; }; }; - "yargs-parser-4.2.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; - sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; - }; - }; "kew-0.1.7" = { name = "kew"; packageName = "kew"; @@ -18185,22 +18338,49 @@ let sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }; }; - "enhanced-resolve-0.9.1" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "0.9.1"; + "acorn-4.0.11" = { + name = "acorn"; + packageName = "acorn"; + version = "4.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz"; - sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e"; + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"; + sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0"; }; }; - "interpret-0.6.6" = { - name = "interpret"; - packageName = "interpret"; - version = "0.6.6"; + "acorn-dynamic-import-2.0.1" = { + name = "acorn-dynamic-import"; + packageName = "acorn-dynamic-import"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz"; - sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"; + url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz"; + sha1 = "23f671eb6e650dab277fef477c321b1178a8cca2"; + }; + }; + "enhanced-resolve-3.1.0" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz"; + sha1 = "9f4b626f577245edcf4b2ad83d86e17f4f421dec"; + }; + }; + "json-loader-0.5.4" = { + name = "json-loader"; + packageName = "json-loader"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz"; + sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de"; + }; + }; + "loader-runner-2.3.0" = { + name = "loader-runner"; + packageName = "loader-runner"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz"; + sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2"; }; }; "loader-utils-0.2.16" = { @@ -18212,58 +18392,40 @@ let sha1 = "f08632066ed8282835dff88dfb52704765adee6d"; }; }; - "memory-fs-0.3.0" = { + "memory-fs-0.4.1" = { name = "memory-fs"; packageName = "memory-fs"; - version = "0.3.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz"; - sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"; + sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; }; }; - "node-libs-browser-0.7.0" = { + "node-libs-browser-2.0.0" = { name = "node-libs-browser"; packageName = "node-libs-browser"; - version = "0.7.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz"; - sha1 = "3e272c0819e308935e26674408d7af0e1491b83b"; + url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz"; + sha1 = "a3a59ec97024985b46e958379646f96c4b616646"; }; }; - "tapable-0.1.10" = { - name = "tapable"; - packageName = "tapable"; - version = "0.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz"; - sha1 = "29c35707c2b70e50d07482b5d202e8ed446dafd4"; - }; - }; - "watchpack-0.2.9" = { + "watchpack-1.2.0" = { name = "watchpack"; packageName = "watchpack"; - version = "0.2.9"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz"; - sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b"; + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.2.0.tgz"; + sha1 = "15d4620f1e7471f13fcb551d5c030d2c3eb42dbb"; }; }; - "webpack-core-0.6.9" = { - name = "webpack-core"; - packageName = "webpack-core"; - version = "0.6.9"; + "webpack-sources-0.1.4" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz"; - sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2"; - }; - }; - "memory-fs-0.2.0" = { - name = "memory-fs"; - packageName = "memory-fs"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz"; - sha1 = "f2bb25368bc121e391c2520de92969caee0a0290"; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.4.tgz"; + sha1 = "ccc2c817e08e5fa393239412690bb481821393cd"; }; }; "big.js-3.1.3" = { @@ -18293,15 +18455,6 @@ let sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; }; }; - "crypto-browserify-3.3.0" = { - name = "crypto-browserify"; - packageName = "crypto-browserify"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz"; - sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c"; - }; - }; "os-browserify-0.2.1" = { name = "os-browserify"; packageName = "os-browserify"; @@ -18320,42 +18473,6 @@ let sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86"; }; }; - "pbkdf2-compat-2.0.1" = { - name = "pbkdf2-compat"; - packageName = "pbkdf2-compat"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz"; - sha1 = "b6e0c8fa99494d94e0511575802a59a5c142f288"; - }; - }; - "ripemd160-0.2.0" = { - name = "ripemd160"; - packageName = "ripemd160"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz"; - sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce"; - }; - }; - "sha.js-2.2.6" = { - name = "sha.js"; - packageName = "sha.js"; - version = "2.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz"; - sha1 = "17ddeddc5f722fb66501658895461977867315ba"; - }; - }; - "browserify-aes-0.4.0" = { - name = "browserify-aes"; - packageName = "browserify-aes"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz"; - sha1 = "067149b668df31c4b58533e02d01e806d8608e2c"; - }; - }; "setimmediate-1.0.5" = { name = "setimmediate"; packageName = "setimmediate"; @@ -18524,10 +18641,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.5"; + version = "1.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.5.tgz"; - sha1 = "78be031931f4b9012f6085e1544069c56dcba233"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.6.tgz"; + sha1 = "550505b1a9133189e98276952ad845b8cbcfdc9e"; }; dependencies = [ sources."colors-0.6.0-1" @@ -18628,10 +18745,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.8"; + version = "0.10.9"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.8.tgz"; - sha1 = "23622b6e536a6cdcb4be7a804884ef8b4d4985bc"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.9.tgz"; + sha1 = "f3f795f069c91fe7335d55f4199fc66c860496df"; }; dependencies = [ (sources."adal-node-0.1.21" // { @@ -18669,9 +18786,9 @@ in ]; }) sources."azure-arm-authorization-2.0.0" - sources."azure-arm-cdn-1.0.0" + sources."azure-arm-cdn-1.0.2" sources."azure-arm-commerce-0.2.0" - sources."azure-arm-compute-0.19.1" + sources."azure-arm-compute-0.20.0" sources."azure-arm-datalake-analytics-1.0.1-preview" sources."azure-arm-datalake-store-1.0.1-preview" sources."azure-arm-hdinsight-0.2.2" @@ -18684,7 +18801,7 @@ in sources."azure-arm-trafficmanager-0.10.5" sources."azure-arm-dns-0.11.1" sources."azure-arm-website-0.11.4" - sources."azure-arm-rediscache-0.2.1" + sources."azure-arm-rediscache-0.2.3" sources."azure-arm-devtestlabs-0.1.0" sources."azure-graph-1.1.1" sources."azure-gallery-2.0.0-pre.18" @@ -18740,7 +18857,7 @@ in }) sources."azure-arm-batch-0.3.0" sources."azure-batch-0.5.2" - sources."azure-servicefabric-0.1.4" + sources."azure-servicefabric-0.1.5" sources."applicationinsights-0.16.0" (sources."caller-id-0.1.0" // { dependencies = [ @@ -18798,16 +18915,14 @@ in ]; }) sources."moment-2.17.1" - (sources."ms-rest-1.15.2" // { + (sources."ms-rest-1.15.4" // { dependencies = [ sources."duplexer-0.1.1" ]; }) - (sources."ms-rest-azure-1.15.2" // { + (sources."ms-rest-azure-1.15.4" // { dependencies = [ sources."async-0.2.7" - sources."uuid-2.0.1" - sources."azure-arm-resource-1.4.4-preview" ]; }) sources."node-forge-0.6.23" @@ -18890,7 +19005,7 @@ in (sources."request-2.74.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" (sources."bl-1.1.2" // { dependencies = [ (sources."readable-stream-2.0.6" // { @@ -18989,11 +19104,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -19092,7 +19207,7 @@ in sources."wordwrap-0.0.2" (sources."xml2js-0.1.14" // { dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" ]; }) sources."xmlbuilder-0.4.3" @@ -19230,7 +19345,7 @@ in sources."minimist-1.2.0" (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -19390,7 +19505,7 @@ in (sources."promised-temp-0.1.0" // { dependencies = [ sources."q-1.4.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -19447,10 +19562,10 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "13.3.0"; + version = "14.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; - sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; + url = "https://registry.npmjs.org/browserify/-/browserify-14.0.0.tgz"; + sha1 = "67e6cfe7acb2fb1a1908e8a763452306de0bcf38"; }; dependencies = [ (sources."JSONStream-1.3.0" // { @@ -19483,11 +19598,10 @@ in sources."pako-0.2.9" ]; }) - (sources."buffer-4.9.1" // { + (sources."buffer-5.0.5" // { dependencies = [ sources."base64-js-1.2.0" sources."ieee754-1.1.8" - sources."isarray-1.0.0" ]; }) sources."cached-path-relative-1.0.0" @@ -19537,9 +19651,9 @@ in dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."elliptic-6.3.2" // { + (sources."elliptic-6.3.3" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.0.7" sources."hash.js-1.0.3" ]; }) @@ -19564,9 +19678,9 @@ in (sources."create-ecdh-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" - (sources."elliptic-6.3.2" // { + (sources."elliptic-6.3.3" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.0.7" sources."hash.js-1.0.3" ]; }) @@ -19585,7 +19699,7 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.0.7" ]; }) ]; @@ -19782,13 +19896,14 @@ in castnow = nodeEnv.buildNodePackage { name = "castnow"; packageName = "castnow"; - version = "0.4.17"; + version = "0.4.18"; src = fetchurl { - url = "https://registry.npmjs.org/castnow/-/castnow-0.4.17.tgz"; - sha1 = "7d9ce3c5605b5aa74ae5348c826443374d5863a8"; + url = "https://registry.npmjs.org/castnow/-/castnow-0.4.18.tgz"; + sha1 = "4ffd81c55f381a5aa10c637607683a196830bdd8"; }; dependencies = [ sources."array-loop-1.0.0" + sources."array-shuffle-1.0.1" (sources."castv2-client-1.2.0" // { dependencies = [ (sources."castv2-0.1.9" // { @@ -19858,12 +19973,16 @@ in ]; }) sources."debounced-seeker-1.0.0" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; }) - sources."fs-extended-0.2.1" + (sources."diveSync-0.3.0" // { + dependencies = [ + sources."append-0.1.1" + ]; + }) (sources."got-1.2.2" // { dependencies = [ sources."object-assign-1.0.0" @@ -19892,7 +20011,7 @@ in sources."map-obj-1.0.1" (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -20126,14 +20245,14 @@ in sources."minimist-0.0.8" ]; }) - (sources."random-access-file-1.4.0" // { + (sources."random-access-file-1.5.0" // { dependencies = [ sources."inherits-2.0.3" ]; }) sources."randombytes-2.0.3" sources."run-parallel-1.1.6" - sources."thunky-1.0.1" + sources."thunky-1.0.2" ]; }) sources."hat-0.0.3" @@ -20243,7 +20362,7 @@ in sources."randombytes-2.0.3" ]; }) - (sources."k-rpc-socket-1.6.1" // { + (sources."k-rpc-socket-1.6.2" // { dependencies = [ sources."bencode-0.11.0" ]; @@ -20276,7 +20395,7 @@ in sources."unzip-response-2.0.1" ]; }) - (sources."simple-peer-6.2.1" // { + (sources."simple-peer-6.2.2" // { dependencies = [ sources."get-browser-rtc-1.0.2" sources."randombytes-2.0.3" @@ -20292,7 +20411,7 @@ in }) ]; }) - (sources."simple-websocket-4.2.0" // { + (sources."simple-websocket-4.3.0" // { dependencies = [ (sources."readable-stream-2.2.2" // { dependencies = [ @@ -20304,6 +20423,11 @@ in sources."util-deprecate-1.0.2" ]; }) + (sources."ws-2.0.3" // { + dependencies = [ + sources."ultron-1.1.0" + ]; + }) ]; }) (sources."string2compact-1.2.2" // { @@ -20453,7 +20577,7 @@ in sources."stream-transcoder-0.0.5" (sources."xml2js-0.4.17" // { dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" (sources."xmlbuilder-4.2.1" // { dependencies = [ sources."lodash-4.17.4" @@ -20461,6 +20585,11 @@ in }) ]; }) + (sources."xspfr-0.3.1" // { + dependencies = [ + sources."underscore-1.6.0" + ]; + }) sources."xtend-4.0.1" ]; buildInputs = globalBuildInputs; @@ -20474,10 +20603,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.2"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz"; - sha1 = "0d4cbdee183f650da95419570c4929d08ef91376"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz"; + sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db"; }; buildInputs = globalBuildInputs; meta = { @@ -20490,13 +20619,13 @@ in cordova = nodeEnv.buildNodePackage { name = "cordova"; packageName = "cordova"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova/-/cordova-6.4.0.tgz"; - sha1 = "3fd9e8b9ad77a6a93ec76947704de21ac2991776"; + url = "https://registry.npmjs.org/cordova/-/cordova-6.5.0.tgz"; + sha1 = "e6ec81b17dd50c17c40b4b87330f7ced38fb0b47"; }; dependencies = [ - (sources."cordova-common-1.5.1" // { + (sources."cordova-common-2.0.0" // { dependencies = [ sources."ansi-0.3.1" (sources."bplist-parser-0.1.1" // { @@ -20505,9 +20634,9 @@ in ]; }) sources."cordova-registry-mapper-1.1.15" - (sources."elementtree-0.1.6" // { + (sources."elementtree-0.1.7" // { dependencies = [ - sources."sax-0.3.5" + sources."sax-1.1.4" ]; }) (sources."glob-5.0.15" // { @@ -20561,7 +20690,7 @@ in sources."unorm-1.4.1" ]; }) - (sources."cordova-lib-6.4.0" // { + (sources."cordova-lib-6.5.0" // { dependencies = [ (sources."aliasify-1.9.0" // { dependencies = [ @@ -20580,7 +20709,12 @@ in }) ]; }) - (sources."cordova-fetch-1.0.1" // { + (sources."cordova-create-1.0.2" // { + dependencies = [ + sources."cordova-app-hello-world-3.11.0" + ]; + }) + (sources."cordova-fetch-1.0.2" // { dependencies = [ sources."dependency-ls-1.0.0" sources."is-url-1.2.2" @@ -20624,14 +20758,9 @@ in }) ]; }) - (sources."cordova-create-1.0.1" // { + (sources."cordova-js-4.2.1" // { dependencies = [ - sources."cordova-app-hello-world-3.11.0" - ]; - }) - (sources."cordova-js-4.2.0" // { - dependencies = [ - (sources."browserify-13.1.0" // { + (sources."browserify-13.3.0" // { dependencies = [ (sources."JSONStream-1.3.0" // { dependencies = [ @@ -20639,7 +20768,7 @@ in sources."through-2.3.8" ]; }) - sources."assert-1.3.0" + sources."assert-1.4.1" (sources."browser-pack-6.0.2" // { dependencies = [ (sources."combine-source-map-0.7.2" // { @@ -20670,6 +20799,7 @@ in sources."isarray-1.0.0" ]; }) + sources."cached-path-relative-1.0.0" (sources."concat-stream-1.5.2" // { dependencies = [ sources."typedarray-0.0.6" @@ -20716,9 +20846,9 @@ in dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."elliptic-6.3.2" // { + (sources."elliptic-6.3.3" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.0.7" sources."hash.js-1.0.3" ]; }) @@ -20743,9 +20873,9 @@ in (sources."create-ecdh-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" - (sources."elliptic-6.3.2" // { + (sources."elliptic-6.3.3" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.0.7" sources."hash.js-1.0.3" ]; }) @@ -20764,7 +20894,7 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.0.7" ]; }) ]; @@ -20800,6 +20930,32 @@ in sources."domain-browser-1.1.7" sources."duplexer2-0.1.4" sources."events-1.1.1" + (sources."glob-7.1.1" // { + dependencies = [ + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.6" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.1" + ]; + }) (sources."has-1.0.1" // { dependencies = [ sources."function-bind-1.1.0" @@ -20838,7 +20994,6 @@ in }) (sources."module-deps-4.0.8" // { dependencies = [ - sources."cached-path-relative-1.0.0" (sources."detective-4.3.2" // { dependencies = [ sources."acorn-3.3.0" @@ -20975,7 +21130,7 @@ in sources."vary-1.1.0" ]; }) - (sources."express-4.14.0" // { + (sources."express-4.14.1" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ @@ -20988,7 +21143,7 @@ in ]; }) sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" @@ -21001,7 +21156,7 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - (sources."finalhandler-0.5.0" // { + (sources."finalhandler-0.5.1" // { dependencies = [ sources."statuses-1.3.1" sources."unpipe-1.0.0" @@ -21025,7 +21180,7 @@ in }) sources."qs-6.2.0" sources."range-parser-1.2.0" - (sources."send-0.14.1" // { + (sources."send-0.14.2" // { dependencies = [ sources."destroy-1.0.4" (sources."http-errors-1.5.1" // { @@ -21035,11 +21190,11 @@ in ]; }) sources."mime-1.3.4" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."statuses-1.3.1" ]; }) - sources."serve-static-1.11.1" + sources."serve-static-1.11.2" (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" @@ -21123,7 +21278,7 @@ in }) (sources."npm-package-arg-4.2.0" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."semver-5.3.0" ]; }) @@ -21142,7 +21297,7 @@ in }) (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -21265,7 +21420,7 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -21384,7 +21539,7 @@ in (sources."request-2.74.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" (sources."bl-1.1.2" // { dependencies = [ (sources."readable-stream-2.0.6" // { @@ -21473,11 +21628,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -21657,7 +21812,7 @@ in }) sources."unorm-1.3.3" sources."valid-identifier-0.0.1" - (sources."xcode-0.8.9" // { + (sources."xcode-0.9.1" // { dependencies = [ sources."node-uuid-1.4.7" sources."pegjs-0.9.0" @@ -21792,7 +21947,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -21856,11 +22011,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -22170,7 +22325,7 @@ in (sources."hiredis-0.4.1" // { dependencies = [ sources."bindings-1.2.1" - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) (sources."json-rpc2-0.8.1" // { @@ -22187,7 +22342,7 @@ in sources."better-curry-1.6.0" ]; }) - (sources."faye-websocket-0.11.0" // { + (sources."faye-websocket-0.11.1" // { dependencies = [ (sources."websocket-driver-0.6.5" // { dependencies = [ @@ -22289,7 +22444,7 @@ in sources."component-emitter-1.1.2" sources."methods-1.0.1" sources."cookiejar-2.0.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -22643,10 +22798,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.0.2.tgz"; - sha1 = "0f010dbd6e26db0270abd88e3e5403062eb4f7a4"; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.1.0.tgz"; + sha1 = "4bec1f64f7931b84884306fb5b37a0d269d81e8d"; }; dependencies = [ (sources."JSONStream-1.3.0" // { @@ -22660,8 +22815,9 @@ in sources."lodash-4.17.4" ]; }) - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."awscred-1.2.0" + sources."ini-1.3.4" (sources."optimist-0.6.1" // { dependencies = [ sources."wordwrap-0.0.3" @@ -22751,11 +22907,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -22923,7 +23079,7 @@ in sources."minimist-1.2.0" (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -23034,15 +23190,15 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.13.1"; + version = "3.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.13.1.tgz"; - sha1 = "564d2646b5efded85df96985332edd91a23bff25"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.15.0.tgz"; + sha1 = "bdcc6a6c5ffe08160e7b93c066695362a91e30f2"; }; dependencies = [ (sources."babel-code-frame-6.22.0" // { dependencies = [ - sources."js-tokens-3.0.0" + sources."js-tokens-3.0.1" ]; }) (sources."chalk-1.1.3" // { @@ -23078,7 +23234,7 @@ in }) ]; }) - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -23116,7 +23272,7 @@ in }) ]; }) - (sources."espree-3.3.2" // { + (sources."espree-3.4.0" // { dependencies = [ sources."acorn-4.0.4" (sources."acorn-jsx-3.0.1" // { @@ -23195,7 +23351,7 @@ in ]; }) sources."globals-9.14.0" - sources."ignore-3.2.0" + sources."ignore-3.2.2" sources."imurmurhash-0.1.4" (sources."inquirer-0.12.0" // { dependencies = [ @@ -23270,14 +23426,14 @@ in sources."tryit-1.0.3" ]; }) - (sources."js-yaml-3.7.0" // { + (sources."js-yaml-3.8.1" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; }) - sources."esprima-2.7.3" + sources."esprima-3.1.3" ]; }) (sources."json-stable-stringify-1.0.1" // { @@ -23334,12 +23490,12 @@ in sources."strip-json-comments-2.0.1" (sources."table-3.8.3" // { dependencies = [ - (sources."ajv-4.10.4" // { + (sources."ajv-4.11.3" // { dependencies = [ sources."co-4.6.0" ]; }) - sources."ajv-keywords-1.5.0" + sources."ajv-keywords-1.5.1" sources."slice-ansi-0.0.4" (sources."string-width-2.0.0" // { dependencies = [ @@ -23599,8 +23755,8 @@ in }) (sources."fsevents-1.0.17" // { dependencies = [ - sources."nan-2.5.0" - (sources."node-pre-gyp-0.6.32" // { + sources."nan-2.5.1" + (sources."node-pre-gyp-0.6.33" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -23630,10 +23786,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -23669,7 +23824,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -23750,11 +23905,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -24074,7 +24229,7 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.12.2" + sources."coffee-script-1.12.3" (sources."jade-1.11.0" // { dependencies = [ sources."character-parser-1.2.1" @@ -24214,7 +24369,7 @@ in }) (sources."xml2js-0.4.17" // { dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" (sources."xmlbuilder-4.2.1" // { dependencies = [ sources."lodash-4.17.4" @@ -24224,7 +24379,7 @@ in }) (sources."msgpack-1.0.2" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) ]; @@ -24814,6 +24969,22 @@ in }; production = true; }; + ios-deploy = nodeEnv.buildNodePackage { + name = "ios-deploy"; + packageName = "ios-deploy"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ios-deploy/-/ios-deploy-1.9.1.tgz"; + sha1 = "e7dec9508bb464a1f2d546bb07fada41d2708e66"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "launch iOS apps iOS devices from the command line (Xcode 7)"; + homepage = "https://github.com/phonegap/ios-deploy#readme"; + license = "GPLv3"; + }; + production = true; + }; istanbul = nodeEnv.buildNodePackage { name = "istanbul"; packageName = "istanbul"; @@ -24932,13 +25103,14 @@ in }) ]; }) - (sources."js-yaml-3.7.0" // { + (sources."js-yaml-3.8.1" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; }) + sources."esprima-3.1.3" ]; }) (sources."mkdirp-0.5.1" // { @@ -25108,10 +25280,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.7.0"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; - sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz"; + sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628"; }; dependencies = [ (sources."argparse-1.0.9" // { @@ -25119,7 +25291,7 @@ in sources."sprintf-js-1.0.3" ]; }) - sources."esprima-2.7.3" + sources."esprima-3.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -25132,18 +25304,18 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.4.0.tgz"; - sha1 = "bf5edbccabb8579cb68ae699871f3e79608ec94b"; + url = "https://registry.npmjs.org/karma/-/karma-1.4.1.tgz"; + sha1 = "41981a71d54237606b0a3ea8c58c90773f41650e"; }; dependencies = [ sources."bluebird-3.4.7" - (sources."body-parser-1.16.0" // { + (sources."body-parser-1.16.1" // { dependencies = [ sources."bytes-2.4.0" sources."content-type-1.0.2" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -25286,8 +25458,8 @@ in }) (sources."fsevents-1.0.17" // { dependencies = [ - sources."nan-2.5.0" - (sources."node-pre-gyp-0.6.32" // { + sources."nan-2.5.1" + (sources."node-pre-gyp-0.6.33" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -25317,10 +25489,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -25356,7 +25527,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -25437,11 +25608,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -25746,7 +25917,7 @@ in sources."os-tmpdir-1.0.2" ]; }) - (sources."useragent-2.1.11" // { + (sources."useragent-2.1.12" // { dependencies = [ sources."lru-cache-2.2.4" ]; @@ -26056,7 +26227,7 @@ in sources."connect-restreamer-1.0.3" (sources."xml2js-0.4.17" // { dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" (sources."xmlbuilder-4.2.1" // { dependencies = [ sources."lodash-4.17.4" @@ -26372,6 +26543,94 @@ in }; production = true; }; + mocha = nodeEnv.buildNodePackage { + name = "mocha"; + packageName = "mocha"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz"; + sha1 = "7dc4f45e5088075171a68896814e6ae9eb7a85e3"; + }; + dependencies = [ + sources."browser-stdout-1.3.0" + (sources."commander-2.9.0" // { + dependencies = [ + sources."graceful-readlink-1.0.1" + ]; + }) + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + sources."diff-1.4.0" + sources."escape-string-regexp-1.0.5" + (sources."glob-7.0.5" // { + dependencies = [ + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.6" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.3" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.1" + ]; + }) + sources."growl-1.9.2" + sources."json3-3.3.2" + (sources."lodash.create-3.1.1" // { + dependencies = [ + (sources."lodash._baseassign-3.2.0" // { + dependencies = [ + sources."lodash._basecopy-3.0.1" + (sources."lodash.keys-3.1.2" // { + dependencies = [ + sources."lodash._getnative-3.9.1" + sources."lodash.isarguments-3.1.0" + sources."lodash.isarray-3.0.4" + ]; + }) + ]; + }) + sources."lodash._basecreate-3.0.3" + sources."lodash._isiterateecall-3.0.9" + ]; + }) + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + (sources."supports-color-3.1.2" // { + dependencies = [ + sources."has-flag-1.0.0" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + description = "simple, flexible, fun test framework"; + homepage = https://mochajs.org/; + license = "MIT"; + }; + production = true; + }; nijs = nodeEnv.buildNodePackage { name = "nijs"; packageName = "nijs"; @@ -26430,7 +26689,7 @@ in }) (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -26450,7 +26709,7 @@ in }) (sources."npm-package-arg-4.2.0" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" ]; }) (sources."once-1.4.0" // { @@ -26461,7 +26720,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -26542,11 +26801,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -26620,7 +26879,7 @@ in sources."console-control-strings-1.1.0" (sources."gauge-2.6.0" // { dependencies = [ - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" @@ -26837,10 +27096,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -26874,7 +27132,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -26955,11 +27213,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -27087,7 +27345,7 @@ in sources."map-obj-1.0.1" (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -27196,12 +27454,12 @@ in }) ]; }) - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; }) - (sources."express-4.14.0" // { + (sources."express-4.14.1" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ @@ -27214,7 +27472,7 @@ in ]; }) sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" @@ -27227,7 +27485,7 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - (sources."finalhandler-0.5.0" // { + (sources."finalhandler-0.5.1" // { dependencies = [ sources."statuses-1.3.1" sources."unpipe-1.0.0" @@ -27251,7 +27509,7 @@ in }) sources."qs-6.2.0" sources."range-parser-1.2.0" - (sources."send-0.14.1" // { + (sources."send-0.14.2" // { dependencies = [ sources."destroy-1.0.4" (sources."http-errors-1.5.1" // { @@ -27261,11 +27519,11 @@ in ]; }) sources."mime-1.3.4" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."statuses-1.3.1" ]; }) - sources."serve-static-1.11.1" + sources."serve-static-1.11.2" (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" @@ -27330,8 +27588,8 @@ in }) (sources."v8-debug-0.7.7" // { dependencies = [ - sources."nan-2.5.0" - (sources."node-pre-gyp-0.6.32" // { + sources."nan-2.5.1" + (sources."node-pre-gyp-0.6.33" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -27362,10 +27620,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -27393,7 +27650,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -27474,11 +27731,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -27598,8 +27855,8 @@ in }) (sources."v8-profiler-5.6.5" // { dependencies = [ - sources."nan-2.5.0" - (sources."node-pre-gyp-0.6.32" // { + sources."nan-2.5.1" + (sources."node-pre-gyp-0.6.33" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -27630,10 +27887,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -27661,7 +27917,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -27742,11 +27998,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -27928,10 +28184,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.32"; + version = "0.6.33"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz"; - sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz"; + sha1 = "640ac55198f6a925972e0c16c4ac26a034d5ecc9"; }; dependencies = [ (sources."mkdirp-0.5.1" // { @@ -27963,10 +28219,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -28002,7 +28257,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -28083,11 +28338,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -28327,8 +28582,8 @@ in }) (sources."fsevents-1.0.17" // { dependencies = [ - sources."nan-2.5.0" - (sources."node-pre-gyp-0.6.32" // { + sources."nan-2.5.1" + (sources."node-pre-gyp-0.6.33" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -28358,10 +28613,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -28397,7 +28651,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -28478,11 +28732,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -28574,7 +28828,7 @@ in }) ]; }) - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -28810,10 +29064,10 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.16.1"; + version = "0.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.16.1.tgz"; - sha1 = "eff4162e6e08ef7e2ae9b17ad99571876f7d895d"; + url = "https://registry.npmjs.org/node-red/-/node-red-0.16.2.tgz"; + sha1 = "3f77d608f1b0e89907af3f31e2c3eb8844a2b17b"; }; dependencies = [ sources."basic-auth-1.1.0" @@ -28995,7 +29249,24 @@ in sources."statuses-1.3.1" ]; }) - sources."serve-static-1.11.1" + (sources."serve-static-1.11.2" // { + dependencies = [ + (sources."send-0.14.2" // { + dependencies = [ + sources."destroy-1.0.4" + (sources."http-errors-1.5.1" // { + dependencies = [ + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + ]; + }) + sources."mime-1.3.4" + sources."ms-0.7.2" + sources."statuses-1.3.1" + ]; + }) + ]; + }) (sources."type-is-1.6.14" // { dependencies = [ (sources."mime-types-2.1.14" // { @@ -29011,7 +29282,7 @@ in }) (sources."follow-redirects-1.2.1" // { dependencies = [ - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -29301,7 +29572,7 @@ in dependencies = [ sources."uid2-0.0.3" sources."utils-merge-1.0.0" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -29393,7 +29664,7 @@ in }) (sources."xml2js-0.4.17" // { dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" (sources."xmlbuilder-4.2.1" // { dependencies = [ sources."lodash-4.17.4" @@ -29421,7 +29692,7 @@ in (sources."request-2.74.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" (sources."bl-1.1.2" // { dependencies = [ (sources."readable-stream-2.0.6" // { @@ -29520,11 +29791,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -29550,7 +29821,7 @@ in }) ]; }) - (sources."node-red-node-email-0.1.15" // { + (sources."node-red-node-email-0.1.16" // { dependencies = [ (sources."nodemailer-1.11.0" // { dependencies = [ @@ -29570,7 +29841,7 @@ in sources."libqp-1.1.0" (sources."needle-0.10.0" // { dependencies = [ - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -29584,7 +29855,7 @@ in }) (sources."needle-0.11.0" // { dependencies = [ - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -29616,11 +29887,11 @@ in }) ]; }) - (sources."mailparser-0.6.1" // { + (sources."mailparser-0.6.2" // { dependencies = [ - (sources."mimelib-0.2.19" // { + (sources."mimelib-0.3.0" // { dependencies = [ - sources."addressparser-0.3.2" + sources."addressparser-1.0.1" ]; }) (sources."encoding-0.1.12" // { @@ -29658,7 +29929,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -29739,11 +30010,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -29800,10 +30071,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -29839,7 +30109,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -29920,11 +30190,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -30104,7 +30374,7 @@ in ]; }) sources."cookie-signature-1.0.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -30117,7 +30387,7 @@ in (sources."config-0.4.15" // { dependencies = [ sources."js-yaml-0.3.7" - sources."coffee-script-1.12.2" + sources."coffee-script-1.12.3" (sources."vows-0.8.1" // { dependencies = [ sources."eyes-0.1.8" @@ -30244,19 +30514,20 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.1.1.tgz"; - sha1 = "76d8f1f32a87619f000e0e25a0e6be90561484d4"; + url = "https://registry.npmjs.org/npm/-/npm-4.2.0.tgz"; + sha1 = "d4eeb6791b996fe3085535d749338d1fe48df13a"; }; dependencies = [ - (sources."JSONStream-1.2.1" // { + (sources."JSONStream-1.3.0" // { dependencies = [ sources."jsonparse-1.3.0" sources."through-2.3.8" ]; }) sources."abbrev-1.0.9" + sources."ansi-regex-2.1.1" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" sources."aproba-1.0.4" @@ -30359,7 +30630,7 @@ in sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" - (sources."mississippi-1.2.0" // { + (sources."mississippi-1.3.0" // { dependencies = [ (sources."concat-stream-1.6.0" // { dependencies = [ @@ -30383,6 +30654,11 @@ in }) sources."flush-write-stream-1.0.2" sources."from2-2.3.0" + (sources."parallel-transform-1.1.0" // { + dependencies = [ + sources."cyclist-0.2.2" + ]; + }) sources."pump-1.0.2" sources."pumpify-1.3.5" (sources."stream-each-1.2.0" // { @@ -30402,7 +30678,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."node-gyp-3.4.0" // { + (sources."node-gyp-3.5.0" // { dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ @@ -30415,58 +30691,6 @@ in ]; }) sources."nopt-3.0.6" - (sources."npmlog-3.1.2" // { - dependencies = [ - (sources."are-we-there-yet-1.1.2" // { - dependencies = [ - sources."delegates-1.0.0" - ]; - }) - sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { - dependencies = [ - sources."has-color-0.1.7" - sources."object-assign-4.1.1" - sources."signal-exit-3.0.2" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - sources."wide-align-1.1.0" - ]; - }) - sources."set-blocking-2.0.0" - ]; - }) - (sources."path-array-1.0.1" // { - dependencies = [ - (sources."array-index-1.0.0" // { - dependencies = [ - (sources."debug-2.6.0" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - (sources."es6-symbol-3.1.0" // { - dependencies = [ - sources."d-0.1.1" - (sources."es5-ext-0.10.12" // { - dependencies = [ - sources."es6-iterator-2.0.0" - ]; - }) - ]; - }) - ]; - }) - ]; - }) ]; }) sources."nopt-4.0.1" @@ -30501,9 +30725,8 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."supports-color-0.2.0" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { @@ -30581,7 +30804,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -30653,11 +30876,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -30734,8 +30957,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-1.2.0" - sources."ansi-regex-2.1.1" + sources."write-file-atomic-1.3.1" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -30786,7 +31008,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -30867,11 +31089,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -30953,10 +31175,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -31087,7 +31308,7 @@ in ]; }) sources."findit-1.2.0" - sources."coffee-script-1.12.2" + sources."coffee-script-1.12.3" ]; buildInputs = globalBuildInputs; meta = { @@ -31099,10 +31320,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.8.9"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.9.tgz"; - sha1 = "c084b087a08ecf9292352e2cd591de903f8129c3"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.2.tgz"; + sha1 = "9614c58ec84d31702a85881c844c3fb93611a585"; }; dependencies = [ sources."bluebird-3.4.7" @@ -31308,7 +31529,7 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -31400,9 +31621,8 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."supports-color-0.2.0" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { @@ -31475,7 +31695,7 @@ in (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" (sources."bl-1.1.2" // { dependencies = [ (sources."readable-stream-2.0.6" // { @@ -31547,11 +31767,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -31820,11 +32040,11 @@ in sources."is-arguments-1.0.2" ]; }) - (sources."body-parser-1.16.0" // { + (sources."body-parser-1.16.1" // { dependencies = [ sources."bytes-2.4.0" sources."content-type-1.0.2" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -31911,9 +32131,9 @@ in sources."content-type-git+https://github.com/wikimedia/content-type.git#master" sources."core-js-2.4.1" sources."diff-1.4.0" - sources."domino-1.0.27" + sources."domino-1.0.28" sources."entities-1.1.1" - (sources."express-4.14.0" // { + (sources."express-4.14.1" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ @@ -31925,7 +32145,7 @@ in ]; }) sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" @@ -31938,12 +32158,6 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - (sources."finalhandler-0.5.0" // { - dependencies = [ - sources."statuses-1.3.1" - sources."unpipe-1.0.0" - ]; - }) sources."fresh-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" @@ -31962,7 +32176,7 @@ in }) sources."qs-6.2.0" sources."range-parser-1.2.0" - (sources."send-0.14.1" // { + (sources."send-0.14.2" // { dependencies = [ sources."destroy-1.0.4" (sources."http-errors-1.5.1" // { @@ -31972,11 +32186,11 @@ in ]; }) sources."mime-1.3.4" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."statuses-1.3.1" ]; }) - sources."serve-static-1.11.1" + sources."serve-static-1.11.2" (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" @@ -32126,14 +32340,14 @@ in sources."gelfling-0.2.0" ]; }) - (sources."js-yaml-3.7.0" // { + (sources."js-yaml-3.8.1" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; }) - sources."esprima-2.7.3" + sources."esprima-3.1.3" ]; }) sources."mediawiki-title-0.5.6" @@ -32144,7 +32358,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -32225,11 +32439,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -32263,14 +32477,14 @@ in sources."parseurl-1.3.1" ]; }) - (sources."service-runner-2.1.13" // { + (sources."service-runner-2.1.15" // { dependencies = [ sources."bluebird-3.4.7" (sources."bunyan-1.8.5" // { dependencies = [ (sources."dtrace-provider-0.8.0" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) (sources."mv-2.1.1" // { @@ -32363,8 +32577,9 @@ in }) ]; }) - (sources."yargs-5.0.0" // { + (sources."yargs-6.6.0" // { dependencies = [ + sources."camelcase-3.0.0" (sources."cliui-3.2.0" // { dependencies = [ (sources."strip-ansi-3.0.1" // { @@ -32377,7 +32592,6 @@ in }) sources."decamelize-1.2.0" sources."get-caller-file-1.0.2" - sources."lodash.assign-4.2.0" (sources."os-locale-1.4.0" // { dependencies = [ (sources."lcid-1.0.0" // { @@ -32428,7 +32642,7 @@ in }) (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -32480,13 +32694,8 @@ in ]; }) sources."which-module-1.0.0" - sources."window-size-0.2.0" sources."y18n-3.2.1" - (sources."yargs-parser-3.2.0" // { - dependencies = [ - sources."camelcase-3.0.0" - ]; - }) + sources."yargs-parser-4.2.1" ]; }) ]; @@ -32557,7 +32766,7 @@ in }) (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -32790,7 +32999,7 @@ in sources."map-obj-1.0.1" (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -33082,9 +33291,9 @@ in sources."minimist-0.0.8" ]; }) - (sources."random-access-file-1.4.0" // { + (sources."random-access-file-1.5.0" // { dependencies = [ - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -33094,7 +33303,7 @@ in }) sources."randombytes-2.0.3" sources."run-parallel-1.1.6" - sources."thunky-1.0.1" + sources."thunky-1.0.2" ]; }) sources."hat-0.0.3" @@ -33204,7 +33413,7 @@ in sources."randombytes-2.0.3" ]; }) - (sources."k-rpc-socket-1.6.1" // { + (sources."k-rpc-socket-1.6.2" // { dependencies = [ sources."bencode-0.11.0" ]; @@ -33238,7 +33447,7 @@ in sources."unzip-response-2.0.1" ]; }) - (sources."simple-peer-6.2.1" // { + (sources."simple-peer-6.2.2" // { dependencies = [ sources."get-browser-rtc-1.0.2" sources."randombytes-2.0.3" @@ -33254,7 +33463,7 @@ in }) ]; }) - (sources."simple-websocket-4.2.0" // { + (sources."simple-websocket-4.3.0" // { dependencies = [ (sources."readable-stream-2.2.2" // { dependencies = [ @@ -33266,6 +33475,11 @@ in sources."util-deprecate-1.0.2" ]; }) + (sources."ws-2.0.3" // { + dependencies = [ + sources."ultron-1.1.0" + ]; + }) ]; }) (sources."string2compact-1.2.2" // { @@ -33283,7 +33497,7 @@ in }) ]; }) - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -33310,10 +33524,10 @@ in peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; packageName = "peerflix-server"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.2.tgz"; - sha1 = "92d39be205b36a0986001a1d9ea34e3927937ab6"; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.3.tgz"; + sha1 = "1f3c2b81188de82482f64cf89d015f5428e4c4e5"; }; dependencies = [ (sources."connect-multiparty-1.2.5" // { @@ -33657,7 +33871,7 @@ in sources."addr-to-ip-port-1.4.2" sources."bencode-0.7.0" sources."buffer-equal-0.0.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -33694,7 +33908,7 @@ in sources."bencode-0.6.0" sources."bn.js-1.3.0" sources."buffer-equal-0.0.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -34004,11 +34218,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -34150,11 +34364,11 @@ in sources."minimist-0.0.8" ]; }) - sources."private-0.1.6" + sources."private-0.1.7" sources."q-1.4.1" - (sources."recast-0.11.20" // { + (sources."recast-0.11.21" // { dependencies = [ - sources."ast-types-0.9.4" + sources."ast-types-0.9.5" sources."esprima-3.1.3" sources."source-map-0.5.6" ]; @@ -34194,7 +34408,7 @@ in dependencies = [ (sources."xml2js-0.2.4" // { dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" ]; }) sources."xmlbuilder-0.4.2" @@ -34250,7 +34464,7 @@ in ]; }) sources."cookie-signature-1.0.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -34282,7 +34496,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -34363,11 +34577,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -34396,7 +34610,7 @@ in }) (sources."xml2js-0.4.17" // { dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" (sources."xmlbuilder-4.2.1" // { dependencies = [ sources."lodash-4.17.4" @@ -34447,38 +34661,40 @@ in sha1 = "36bf5209356facbf6cef18fa32274d116043ed24"; }; dependencies = [ - (sources."express-5.0.0-alpha.2" // { + (sources."express-5.0.0-alpha.3" // { dependencies = [ - (sources."accepts-1.2.13" // { + (sources."accepts-1.3.3" // { dependencies = [ (sources."mime-types-2.1.14" // { dependencies = [ sources."mime-db-1.26.0" ]; }) - sources."negotiator-0.5.3" + sources."negotiator-0.6.1" ]; }) - sources."array-flatten-1.1.0" - sources."content-disposition-0.5.0" + sources."array-flatten-2.1.1" + sources."content-disposition-0.5.2" sources."content-type-1.0.2" - sources."cookie-0.1.3" + sources."cookie-0.3.1" sources."cookie-signature-1.0.6" (sources."debug-2.2.0" // { dependencies = [ sources."ms-0.7.1" ]; }) - sources."depd-1.0.1" - sources."escape-html-1.0.2" + sources."depd-1.1.0" + sources."encodeurl-1.0.1" + sources."escape-html-1.0.3" sources."etag-1.7.0" - (sources."finalhandler-0.4.0" // { + (sources."finalhandler-0.5.1" // { dependencies = [ + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) sources."fresh-0.3.0" - sources."merge-descriptors-1.0.0" + sources."merge-descriptors-1.0.1" sources."methods-1.1.2" (sources."on-finished-2.3.0" // { dependencies = [ @@ -34486,55 +34702,30 @@ in ]; }) sources."parseurl-1.3.1" - sources."path-is-absolute-1.0.0" - sources."path-to-regexp-0.1.6" - (sources."proxy-addr-1.0.10" // { + sources."path-is-absolute-1.0.1" + sources."path-to-regexp-0.1.7" + (sources."proxy-addr-1.1.3" // { dependencies = [ sources."forwarded-0.1.0" - sources."ipaddr.js-1.0.5" + sources."ipaddr.js-1.2.0" ]; }) - sources."qs-4.0.0" - sources."range-parser-1.0.3" - (sources."router-1.1.4" // { + sources."qs-6.2.0" + sources."range-parser-1.2.0" + (sources."router-1.1.5" // { dependencies = [ - sources."array-flatten-2.0.0" - sources."path-to-regexp-0.1.7" - sources."setprototypeof-1.0.0" + sources."setprototypeof-1.0.2" ]; }) - (sources."send-0.13.0" // { + (sources."send-0.14.2" // { dependencies = [ - sources."destroy-1.0.3" - (sources."http-errors-1.3.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) + sources."destroy-1.0.4" sources."mime-1.3.4" - sources."ms-0.7.1" - sources."statuses-1.2.1" - ]; - }) - (sources."serve-static-1.10.3" // { - dependencies = [ - sources."escape-html-1.0.3" - (sources."send-0.13.2" // { - dependencies = [ - sources."depd-1.1.0" - sources."destroy-1.0.4" - (sources."http-errors-1.3.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - sources."mime-1.3.4" - sources."ms-0.7.1" - sources."statuses-1.2.1" - ]; - }) + sources."ms-0.7.2" + sources."statuses-1.3.1" ]; }) + sources."serve-static-1.11.2" (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" @@ -34545,8 +34736,8 @@ in }) ]; }) - sources."vary-1.0.1" sources."utils-merge-1.0.0" + sources."vary-1.1.0" ]; }) (sources."express-json5-0.1.0" // { @@ -34559,11 +34750,11 @@ in }) ]; }) - (sources."body-parser-1.16.0" // { + (sources."body-parser-1.16.1" // { dependencies = [ sources."bytes-2.4.0" sources."content-type-1.0.2" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -34625,14 +34816,14 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."js-yaml-3.7.0" // { + (sources."js-yaml-3.8.1" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; }) - sources."esprima-2.7.3" + sources."esprima-3.1.3" ]; }) (sources."cookies-0.6.2" // { @@ -34644,7 +34835,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -34720,11 +34911,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -34762,7 +34953,7 @@ in dependencies = [ (sources."dtrace-provider-0.8.0" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) (sources."mv-2.1.1" // { @@ -34905,12 +35096,12 @@ in }) (sources."fs-ext-0.5.0" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) (sources."crypt3-0.2.0" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) ]; @@ -34928,13 +35119,17 @@ in sloc = nodeEnv.buildNodePackage { name = "sloc"; packageName = "sloc"; - version = "0.1.11"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sloc/-/sloc-0.1.11.tgz"; - sha1 = "341f94d44fe9b977c9e2109b134aa92f6394d411"; + url = "https://registry.npmjs.org/sloc/-/sloc-0.2.0.tgz"; + sha1 = "b42d3da1a442a489f454c32c628e8ebf0007875c"; }; dependencies = [ - sources."async-1.5.2" + (sources."async-2.1.4" // { + dependencies = [ + sources."lodash-4.17.4" + ]; + }) (sources."cli-table-0.3.1" // { dependencies = [ sources."colors-1.0.3" @@ -35007,8 +35202,8 @@ in (sources."csv-0.4.6" // { dependencies = [ sources."csv-generate-0.0.6" - sources."csv-parse-1.1.10" - sources."stream-transform-0.1.1" + sources."csv-parse-1.2.0" + sources."stream-transform-0.1.2" sources."csv-stringify-0.0.8" ]; }) @@ -35052,7 +35247,7 @@ in }) (sources."dtrace-provider-0.6.0" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) ]; @@ -35061,7 +35256,7 @@ in dependencies = [ (sources."dtrace-provider-0.6.0" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) (sources."mv-2.1.1" // { @@ -35146,7 +35341,7 @@ in dependencies = [ sources."asn1-0.2.3" sources."assert-plus-0.2.0" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -35214,7 +35409,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -35264,19 +35459,19 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-0.7.1.tgz"; - sha1 = "287320fed972cb097e72c2bb1685f96fe08f8034"; + url = "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz"; + sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5"; }; dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" (sources."coa-1.0.1" // { dependencies = [ sources."q-1.4.1" ]; }) - (sources."js-yaml-3.6.1" // { + (sources."js-yaml-3.7.0" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -35293,7 +35488,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."csso-2.2.1" // { + (sources."csso-2.3.1" // { dependencies = [ (sources."clap-1.1.2" // { dependencies = [ @@ -35328,6 +35523,70 @@ in }; production = true; }; + tern = nodeEnv.buildNodePackage { + name = "tern"; + packageName = "tern"; + version = "0.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tern/-/tern-0.20.0.tgz"; + sha1 = "5058e1ae15a121a1f421500ced0c852c11e6fb34"; + }; + dependencies = [ + sources."acorn-3.3.0" + (sources."enhanced-resolve-2.3.0" // { + dependencies = [ + sources."tapable-0.2.6" + (sources."memory-fs-0.3.0" // { + dependencies = [ + (sources."errno-0.1.4" // { + dependencies = [ + sources."prr-0.0.0" + ]; + }) + (sources."readable-stream-2.2.2" // { + dependencies = [ + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."inherits-2.0.3" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + sources."graceful-fs-4.1.11" + sources."object-assign-4.1.1" + ]; + }) + (sources."glob-3.2.11" // { + dependencies = [ + sources."inherits-2.0.3" + (sources."minimatch-0.3.0" // { + dependencies = [ + sources."lru-cache-2.7.3" + sources."sigmund-1.0.1" + ]; + }) + ]; + }) + (sources."minimatch-0.2.14" // { + dependencies = [ + sources."lru-cache-2.7.3" + sources."sigmund-1.0.1" + ]; + }) + sources."resolve-from-2.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A JavaScript code analyzer for deep, cross-editor language support"; + homepage = "https://github.com/ternjs/tern#readme"; + license = "MIT"; + }; + production = true; + }; titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; @@ -35379,7 +35638,7 @@ in (sources."request-2.69.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" (sources."bl-1.0.3" // { dependencies = [ (sources."readable-stream-2.0.6" // { @@ -35478,11 +35737,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -35560,7 +35819,7 @@ in (sources."request-2.78.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -35641,11 +35900,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -35702,10 +35961,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz"; - sha1 = "6fe9479e00e01855247cea216e7561bafcdbcd4a"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.1.6.tgz"; + sha1 = "40c7e6e9e5da7961b7718b55505f9cac9487a607"; }; buildInputs = globalBuildInputs; meta = { @@ -35782,10 +36041,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.0.1"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.0.1.tgz"; - sha1 = "83b852a8811f4c8f1446fd4f53b19a541c327418"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.7.tgz"; + sha1 = "eb4ba66b38ec553396fe21ec338181b88c72bf4b"; }; dependencies = [ sources."async-2.1.4" @@ -35874,7 +36133,7 @@ in sources."whatwg-fetch-2.0.2" ]; }) - (sources."express-4.14.0" // { + (sources."express-4.14.1" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ @@ -35887,7 +36146,7 @@ in ]; }) sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" @@ -35900,7 +36159,7 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - (sources."finalhandler-0.5.0" // { + (sources."finalhandler-0.5.1" // { dependencies = [ sources."statuses-1.3.1" sources."unpipe-1.0.0" @@ -35924,7 +36183,7 @@ in }) sources."qs-6.2.0" sources."range-parser-1.2.0" - (sources."send-0.14.1" // { + (sources."send-0.14.2" // { dependencies = [ sources."destroy-1.0.4" (sources."http-errors-1.5.1" // { @@ -35934,7 +36193,7 @@ in ]; }) sources."mime-1.3.4" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."statuses-1.3.1" ]; }) @@ -36099,7 +36358,7 @@ in ]; }) sources."hasher-1.2.0" - sources."ignore-3.2.0" + sources."ignore-3.2.2" (sources."keen.io-0.1.3" // { dependencies = [ sources."underscore-1.5.2" @@ -36300,9 +36559,8 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."supports-color-0.2.0" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { @@ -36379,7 +36637,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -36451,11 +36709,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -36574,7 +36832,7 @@ in sources."graceful-fs-4.1.11" (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -36594,7 +36852,7 @@ in }) (sources."npm-package-arg-4.2.0" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" ]; }) (sources."once-1.4.0" // { @@ -36605,7 +36863,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -36686,11 +36944,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -36736,10 +36994,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -36780,7 +37037,7 @@ in sources."passport-strategy-1.0.0" ]; }) - (sources."raven-1.1.1" // { + (sources."raven-1.1.2" // { dependencies = [ sources."cookie-0.3.1" sources."json-stringify-safe-5.0.1" @@ -36829,14 +37086,18 @@ in ]; }) sources."semver-5.3.0" - (sources."serve-static-1.11.1" // { + (sources."serve-static-1.11.2" // { dependencies = [ sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."parseurl-1.3.1" - (sources."send-0.14.1" // { + (sources."send-0.14.2" // { dependencies = [ - sources."debug-2.2.0" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) sources."depd-1.1.0" sources."destroy-1.0.4" sources."etag-1.7.0" @@ -36848,7 +37109,7 @@ in ]; }) sources."mime-1.3.4" - sources."ms-0.7.1" + sources."ms-0.7.2" (sources."on-finished-2.3.0" // { dependencies = [ sources."ee-first-1.1.1" @@ -36993,7 +37254,7 @@ in sources."component-emitter-1.1.2" sources."methods-1.0.1" sources."cookiejar-2.0.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -37101,7 +37362,7 @@ in }) (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -37342,11 +37603,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -37448,22 +37709,39 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "1.14.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-1.14.0.tgz"; - sha1 = "54f1ffb92051a328a5b2057d6ae33c289462c823"; + url = "https://registry.npmjs.org/webpack/-/webpack-2.2.1.tgz"; + sha1 = "7bb1d72ae2087dd1a4af526afec15eed17dda475"; }; dependencies = [ - sources."acorn-3.3.0" - sources."async-1.5.2" - sources."clone-1.0.2" - (sources."enhanced-resolve-0.9.1" // { + sources."acorn-4.0.11" + sources."acorn-dynamic-import-2.0.1" + (sources."ajv-4.11.3" // { dependencies = [ - sources."memory-fs-0.2.0" - sources."graceful-fs-4.1.11" + sources."co-4.6.0" + (sources."json-stable-stringify-1.0.1" // { + dependencies = [ + sources."jsonify-0.0.0" + ]; + }) ]; }) - sources."interpret-0.6.6" + sources."ajv-keywords-1.5.1" + (sources."async-2.1.4" // { + dependencies = [ + sources."lodash-4.17.4" + ]; + }) + (sources."enhanced-resolve-3.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + sources."object-assign-4.1.1" + ]; + }) + sources."interpret-1.0.1" + sources."json-loader-0.5.4" + sources."loader-runner-2.3.0" (sources."loader-utils-0.2.16" // { dependencies = [ sources."big.js-3.1.3" @@ -37472,7 +37750,7 @@ in sources."object-assign-4.1.1" ]; }) - (sources."memory-fs-0.3.0" // { + (sources."memory-fs-0.4.1" // { dependencies = [ (sources."errno-0.1.4" // { dependencies = [ @@ -37497,7 +37775,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."node-libs-browser-0.7.0" // { + (sources."node-libs-browser-2.0.0" // { dependencies = [ sources."assert-1.4.1" (sources."browserify-zlib-0.1.4" // { @@ -37518,16 +37796,111 @@ in ]; }) sources."constants-browserify-1.0.0" - (sources."crypto-browserify-3.3.0" // { + (sources."crypto-browserify-3.11.0" // { dependencies = [ - sources."pbkdf2-compat-2.0.1" - sources."ripemd160-0.2.0" - sources."sha.js-2.2.6" - (sources."browserify-aes-0.4.0" // { + (sources."browserify-cipher-1.0.0" // { dependencies = [ - sources."inherits-2.0.3" + (sources."browserify-aes-1.0.6" // { + dependencies = [ + sources."buffer-xor-1.0.3" + sources."cipher-base-1.0.3" + ]; + }) + (sources."browserify-des-1.0.0" // { + dependencies = [ + sources."cipher-base-1.0.3" + (sources."des.js-1.0.0" // { + dependencies = [ + sources."minimalistic-assert-1.0.0" + ]; + }) + ]; + }) + sources."evp_bytestokey-1.0.0" ]; }) + (sources."browserify-sign-4.0.0" // { + dependencies = [ + sources."bn.js-4.11.6" + sources."browserify-rsa-4.0.1" + (sources."elliptic-6.3.3" // { + dependencies = [ + sources."brorand-1.0.7" + sources."hash.js-1.0.3" + ]; + }) + (sources."parse-asn1-5.0.0" // { + dependencies = [ + (sources."asn1.js-4.9.1" // { + dependencies = [ + sources."minimalistic-assert-1.0.0" + ]; + }) + (sources."browserify-aes-1.0.6" // { + dependencies = [ + sources."buffer-xor-1.0.3" + sources."cipher-base-1.0.3" + ]; + }) + sources."evp_bytestokey-1.0.0" + ]; + }) + ]; + }) + (sources."create-ecdh-4.0.0" // { + dependencies = [ + sources."bn.js-4.11.6" + (sources."elliptic-6.3.3" // { + dependencies = [ + sources."brorand-1.0.7" + sources."hash.js-1.0.3" + ]; + }) + ]; + }) + (sources."create-hash-1.1.2" // { + dependencies = [ + sources."cipher-base-1.0.3" + sources."ripemd160-1.0.1" + sources."sha.js-2.4.8" + ]; + }) + sources."create-hmac-1.1.4" + (sources."diffie-hellman-5.0.2" // { + dependencies = [ + sources."bn.js-4.11.6" + (sources."miller-rabin-4.0.0" // { + dependencies = [ + sources."brorand-1.0.7" + ]; + }) + ]; + }) + sources."inherits-2.0.3" + sources."pbkdf2-3.0.9" + (sources."public-encrypt-4.0.0" // { + dependencies = [ + sources."bn.js-4.11.6" + sources."browserify-rsa-4.0.1" + (sources."parse-asn1-5.0.0" // { + dependencies = [ + (sources."asn1.js-4.9.1" // { + dependencies = [ + sources."minimalistic-assert-1.0.0" + ]; + }) + (sources."browserify-aes-1.0.6" // { + dependencies = [ + sources."buffer-xor-1.0.3" + sources."cipher-base-1.0.3" + ]; + }) + sources."evp_bytestokey-1.0.0" + ]; + }) + ]; + }) + sources."randombytes-2.0.3" ]; }) sources."domain-browser-1.1.7" @@ -37586,22 +37959,16 @@ in }) ]; }) - (sources."optimist-0.6.1" // { - dependencies = [ - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - ]; - }) + sources."source-map-0.5.6" (sources."supports-color-3.2.3" // { dependencies = [ sources."has-flag-1.0.0" ]; }) - sources."tapable-0.1.10" + sources."tapable-0.2.6" (sources."uglify-js-2.7.5" // { dependencies = [ sources."async-0.2.10" - sources."source-map-0.5.6" sources."uglify-to-browserify-1.0.2" (sources."yargs-3.10.0" // { dependencies = [ @@ -37648,9 +38015,8 @@ in }) ]; }) - (sources."watchpack-0.2.9" // { + (sources."watchpack-1.2.0" // { dependencies = [ - sources."async-0.9.2" (sources."chokidar-1.6.1" // { dependencies = [ (sources."anymatch-1.3.0" // { @@ -37767,8 +38133,8 @@ in }) (sources."fsevents-1.0.17" // { dependencies = [ - sources."nan-2.5.0" - (sources."node-pre-gyp-0.6.32" // { + sources."nan-2.5.1" + (sources."node-pre-gyp-0.6.33" // { dependencies = [ (sources."nopt-3.0.6" // { dependencies = [ @@ -37793,10 +38159,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -37832,7 +38197,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -37913,11 +38278,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -38027,20 +38392,137 @@ in sources."graceful-fs-4.1.11" ]; }) - (sources."webpack-core-0.6.9" // { + (sources."webpack-sources-0.1.4" // { dependencies = [ - (sources."source-map-0.4.4" // { + sources."source-list-map-0.1.8" + ]; + }) + (sources."yargs-6.6.0" // { + dependencies = [ + sources."camelcase-3.0.0" + (sources."cliui-3.2.0" // { dependencies = [ - sources."amdefine-1.0.1" + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."wrap-ansi-2.1.0" ]; }) - sources."source-list-map-0.1.8" + sources."decamelize-1.2.0" + sources."get-caller-file-1.0.2" + (sources."os-locale-1.4.0" // { + dependencies = [ + (sources."lcid-1.0.0" // { + dependencies = [ + sources."invert-kv-1.0.0" + ]; + }) + ]; + }) + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + (sources."find-up-1.1.2" // { + dependencies = [ + sources."path-exists-2.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."read-pkg-1.1.0" // { + dependencies = [ + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.0" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."strip-bom-2.0.0" // { + dependencies = [ + sources."is-utf8-0.2.1" + ]; + }) + ]; + }) + (sources."normalize-package-data-2.3.5" // { + dependencies = [ + sources."hosted-git-info-2.2.0" + (sources."is-builtin-module-1.0.0" // { + dependencies = [ + sources."builtin-modules-1.1.1" + ]; + }) + sources."semver-5.3.0" + (sources."validate-npm-package-license-3.0.1" // { + dependencies = [ + (sources."spdx-correct-1.0.2" // { + dependencies = [ + sources."spdx-license-ids-1.2.2" + ]; + }) + sources."spdx-expression-parse-1.0.4" + ]; + }) + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-2.0.0" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + ]; + }) + sources."which-module-1.0.0" + sources."y18n-3.2.1" + sources."yargs-parser-4.2.1" ]; }) ]; buildInputs = globalBuildInputs; meta = { - description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff."; + description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff."; homepage = https://github.com/webpack/webpack; license = "MIT"; }; @@ -38107,7 +38589,7 @@ in ]; }) sources."death-1.1.0" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -38206,7 +38688,7 @@ in dependencies = [ (sources."loose-envify-1.3.1" // { dependencies = [ - sources."js-tokens-3.0.0" + sources."js-tokens-3.0.1" ]; }) ]; @@ -38301,10 +38783,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -38366,7 +38847,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -38425,11 +38906,11 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 7de48f6c175..fd7a6ed52fc 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -400,13 +400,13 @@ let sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; }; }; - "azure-arm-cdn-1.0.0" = { + "azure-arm-cdn-1.0.2" = { name = "azure-arm-cdn"; packageName = "azure-arm-cdn"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.0.tgz"; - sha1 = "a400b0234734eb8f7a52f5b800dd05b4f1b69f85"; + url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.2.tgz"; + sha1 = "35eed81c93fb1b2fe1236b432c821a61bce6be96"; }; }; "azure-arm-commerce-0.2.0" = { @@ -418,13 +418,13 @@ let sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd"; }; }; - "azure-arm-compute-0.19.1" = { + "azure-arm-compute-0.20.0" = { name = "azure-arm-compute"; packageName = "azure-arm-compute"; - version = "0.19.1"; + version = "0.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.1.tgz"; - sha1 = "04bd00758cfcc6fac616a4cf336bbdf83ab1decd"; + url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.20.0.tgz"; + sha1 = "f6d81c1e6093f4abae2d153a7b856963f5085e32"; }; }; "azure-arm-datalake-analytics-1.0.1-preview" = { @@ -535,13 +535,13 @@ let sha1 = "6972dd9844a0d12376d74014b541c49247caa37d"; }; }; - "azure-arm-rediscache-0.2.1" = { + "azure-arm-rediscache-0.2.3" = { name = "azure-arm-rediscache"; packageName = "azure-arm-rediscache"; - version = "0.2.1"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.1.tgz"; - sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02"; + url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.3.tgz"; + sha1 = "b6898abe8b4c3e1b2ec5be82689ef212bc2b1a06"; }; }; "azure-arm-devtestlabs-0.1.0" = { @@ -724,13 +724,13 @@ let sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb"; }; }; - "azure-servicefabric-0.1.4" = { + "azure-servicefabric-0.1.5" = { name = "azure-servicefabric"; packageName = "azure-servicefabric"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.4.tgz"; - sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e"; + url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.5.tgz"; + sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6"; }; }; "applicationinsights-0.16.0" = { @@ -868,22 +868,22 @@ let sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82"; }; }; - "ms-rest-1.15.2" = { + "ms-rest-1.15.4" = { name = "ms-rest"; packageName = "ms-rest"; - version = "1.15.2"; + version = "1.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.2.tgz"; - sha1 = "882f7d22bd2360505f03b0cbfdd19a8f71e012ff"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.4.tgz"; + sha1 = "7af7038fe843fd89d407fec346320db6b010ef8c"; }; }; - "ms-rest-azure-1.15.2" = { + "ms-rest-azure-1.15.4" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "1.15.2"; + version = "1.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.2.tgz"; - sha1 = "8375437c2199d8d4bc001d2308b5fc1c1fcf3d83"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.4.tgz"; + sha1 = "ea89bce23c6ddd4593db1e86f6557cc6374e3492"; }; }; "node-forge-0.6.23" = { @@ -1435,24 +1435,6 @@ let sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; }; }; - "uuid-2.0.1" = { - name = "uuid"; - packageName = "uuid"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"; - sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac"; - }; - }; - "azure-arm-resource-1.4.4-preview" = { - name = "azure-arm-resource"; - packageName = "azure-arm-resource"; - version = "1.4.4-preview"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.4-preview.tgz"; - sha1 = "557696d45a89d8320c1aa0916297024b71b73fe2"; - }; - }; "debug-0.7.4" = { name = "debug"; packageName = "debug"; @@ -1705,13 +1687,13 @@ let sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; }; }; - "aws4-1.5.0" = { + "aws4-1.6.0" = { name = "aws4"; packageName = "aws4"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz"; - sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; + sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; }; }; "bl-1.1.2" = { @@ -2173,13 +2155,13 @@ let sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; }; }; - "jsbn-0.1.0" = { + "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; - sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; "tweetnacl-0.14.5" = { @@ -2209,13 +2191,13 @@ let sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; }; }; - "bcrypt-pbkdf-1.0.0" = { + "bcrypt-pbkdf-1.0.1" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"; - sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; + sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; "mime-db-1.26.0" = { @@ -2830,13 +2812,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.1.5" = { + "hosted-git-info-2.2.0" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.1.5"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz"; - sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz"; + sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5"; }; }; "is-builtin-module-1.0.0" = { @@ -3109,13 +3091,13 @@ let sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; }; }; - "debug-2.6.0" = { + "debug-2.6.1" = { name = "debug"; packageName = "debug"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; - sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; + url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; + sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; }; }; "ms-0.7.2" = { @@ -3190,13 +3172,13 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "buffer-4.9.1" = { + "buffer-5.0.5" = { name = "buffer"; packageName = "buffer"; - version = "4.9.1"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; - sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz"; + sha1 = "35c9393244a90aff83581063d16f0882cecc9418"; }; }; "cached-path-relative-1.0.0" = { @@ -3784,13 +3766,13 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "elliptic-6.3.2" = { + "elliptic-6.3.3" = { name = "elliptic"; packageName = "elliptic"; - version = "6.3.2"; + version = "6.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz"; - sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz"; + sha1 = "5482d9646d54bcb89fd7d994fc9e2e9568876e3f"; }; }; "parse-asn1-5.0.0" = { @@ -3802,13 +3784,13 @@ let sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; }; }; - "brorand-1.0.6" = { + "brorand-1.0.7" = { name = "brorand"; packageName = "brorand"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz"; - sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.0.7.tgz"; + sha1 = "6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc"; }; }; "hash.js-1.0.3" = { @@ -4063,6 +4045,15 @@ let sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395"; }; }; + "array-shuffle-1.0.1" = { + name = "array-shuffle"; + packageName = "array-shuffle"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-shuffle/-/array-shuffle-1.0.1.tgz"; + sha1 = "7ea4882a356b4bca5f545e0b6e52eaf6d971557a"; + }; + }; "castv2-client-1.2.0" = { name = "castv2-client"; packageName = "castv2-client"; @@ -4099,13 +4090,13 @@ let sha1 = "e74befcd1a62ae7a5e5fbfbfa6f5d2bacd962bdd"; }; }; - "fs-extended-0.2.1" = { - name = "fs-extended"; - packageName = "fs-extended"; - version = "0.2.1"; + "diveSync-0.3.0" = { + name = "diveSync"; + packageName = "diveSync"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extended/-/fs-extended-0.2.1.tgz"; - sha1 = "3910358127e9c72c8296c30142c7763b5f5e2d3a"; + url = "https://registry.npmjs.org/diveSync/-/diveSync-0.3.0.tgz"; + sha1 = "d9980493ae33beec36f4fec6f171ff218130cc12"; }; }; "got-1.2.2" = { @@ -4225,6 +4216,15 @@ let sha1 = "17be93eaae3f3b779359c795b419705a8817e868"; }; }; + "xspfr-0.3.1" = { + name = "xspfr"; + packageName = "xspfr"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xspfr/-/xspfr-0.3.1.tgz"; + sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; + }; + }; "castv2-0.1.9" = { name = "castv2"; packageName = "castv2"; @@ -4423,6 +4423,15 @@ let sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78"; }; }; + "append-0.1.1" = { + name = "append"; + packageName = "append"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/append/-/append-0.1.1.tgz"; + sha1 = "7e5dd327747078d877286fbb624b1e8f4d2b396b"; + }; + }; "object-assign-1.0.0" = { name = "object-assign"; packageName = "object-assign"; @@ -4918,13 +4927,13 @@ let sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854"; }; }; - "random-access-file-1.4.0" = { + "random-access-file-1.5.0" = { name = "random-access-file"; packageName = "random-access-file"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.4.0.tgz"; - sha1 = "40972acb4d3d6f023522d08f3b2046c6d1ae5767"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.5.0.tgz"; + sha1 = "dc1b137e5922c203cc6bc8b58564be68d5269a17"; }; }; "run-parallel-1.1.6" = { @@ -4936,13 +4945,13 @@ let sha1 = "29003c9a2163e01e2d2dfc90575f2c6c1d61a039"; }; }; - "thunky-1.0.1" = { + "thunky-1.0.2" = { name = "thunky"; packageName = "thunky"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/thunky/-/thunky-1.0.1.tgz"; - sha1 = "3db1525aac0367b67bd2e532d2773e7c40be2e68"; + url = "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz"; + sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; }; }; "ip-1.1.4" = { @@ -5143,13 +5152,13 @@ let sha1 = "58cccb244f563326ba893bf5c06a35f644846daa"; }; }; - "k-rpc-socket-1.6.1" = { + "k-rpc-socket-1.6.2" = { name = "k-rpc-socket"; packageName = "k-rpc-socket"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.1.tgz"; - sha1 = "bf67128f89f0c62a19cec5afc3003c280111c78e"; + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.2.tgz"; + sha1 = "5c9e9f34a058f43ffe6512354d98957a41694f21"; }; }; "bencode-0.8.0" = { @@ -5188,22 +5197,22 @@ let sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; }; }; - "simple-peer-6.2.1" = { + "simple-peer-6.2.2" = { name = "simple-peer"; packageName = "simple-peer"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.1.tgz"; - sha1 = "0d6bf982afb32cca2fabbb969dee4fceaceb99fb"; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.2.tgz"; + sha1 = "9ea1a6e2c2e3656d04eac2a7b612e148f0d370ba"; }; }; - "simple-websocket-4.2.0" = { + "simple-websocket-4.3.0" = { name = "simple-websocket"; packageName = "simple-websocket"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.2.0.tgz"; - sha1 = "2517742a7dafc8d44fd4e093184b6718c817f2bf"; + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.0.tgz"; + sha1 = "062990cc94709388c31fc978dfc2a790b1b3e6ea"; }; }; "string2compact-1.2.2" = { @@ -5242,6 +5251,24 @@ let sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; }; }; + "ws-2.0.3" = { + name = "ws"; + packageName = "ws"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-2.0.3.tgz"; + sha1 = "532fd499c3f7d7d720e543f1f807106cfc57d9cb"; + }; + }; + "ultron-1.1.0" = { + name = "ultron"; + packageName = "ultron"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz"; + sha1 = "b07a2e6a541a815fc6a34ccd4533baec307ca864"; + }; + }; "addr-to-ip-port-1.4.2" = { name = "addr-to-ip-port"; packageName = "addr-to-ip-port"; @@ -5539,13 +5566,13 @@ let sha1 = "f6e0579c8214d33a08109fd6e2e5c1dbc70463fc"; }; }; - "sax-1.2.1" = { + "sax-1.2.2" = { name = "sax"; packageName = "sax"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; - sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz"; + sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828"; }; }; "xmlbuilder-4.2.1" = { @@ -5557,22 +5584,22 @@ let sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5"; }; }; - "cordova-common-1.5.1" = { + "cordova-common-2.0.0" = { name = "cordova-common"; packageName = "cordova-common"; - version = "1.5.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-1.5.1.tgz"; - sha1 = "6770de0d6200ad6f94a1abe8939b5bd9ece139e3"; + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.0.0.tgz"; + sha1 = "125097eb4b50b7353cec226ed21649192293ae97"; }; }; - "cordova-lib-6.4.0" = { + "cordova-lib-6.5.0" = { name = "cordova-lib"; packageName = "cordova-lib"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.4.0.tgz"; - sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33"; + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.5.0.tgz"; + sha1 = "f7630a04c29d6cdee980190b1d93fb1536ac453f"; }; }; "insight-0.8.4" = { @@ -5647,13 +5674,13 @@ let sha1 = "e244b9185b8175473bff6079324905115f83dc7c"; }; }; - "elementtree-0.1.6" = { + "elementtree-0.1.7" = { name = "elementtree"; packageName = "elementtree"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz"; - sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; + url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz"; + sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; }; }; "glob-5.0.15" = { @@ -5719,13 +5746,13 @@ let sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51"; }; }; - "sax-0.3.5" = { + "sax-1.1.4" = { name = "sax"; packageName = "sax"; - version = "0.3.5"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; - sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; + url = "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz"; + sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; }; }; "base64-js-0.0.8" = { @@ -5755,31 +5782,31 @@ let sha1 = "03aa1a5fe5b4cac604e3b967bc4c7ceacf957030"; }; }; - "cordova-fetch-1.0.1" = { - name = "cordova-fetch"; - packageName = "cordova-fetch"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.0.1.tgz"; - sha1 = "3122ed3dca8e83eae0345f83f3a8cc33680bf769"; - }; - }; - "cordova-create-1.0.1" = { + "cordova-create-1.0.2" = { name = "cordova-create"; packageName = "cordova-create"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.0.1.tgz"; - sha1 = "f1810401807ceec436ece27241180a83c97f8212"; + url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.0.2.tgz"; + sha1 = "cb9bba9817c62a645bacb6e00da8cc50936a0fa5"; }; }; - "cordova-js-4.2.0" = { + "cordova-fetch-1.0.2" = { + name = "cordova-fetch"; + packageName = "cordova-fetch"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.0.2.tgz"; + sha1 = "b8f4903f39fe613888062552a96995413af16d35"; + }; + }; + "cordova-js-4.2.1" = { name = "cordova-js"; packageName = "cordova-js"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.0.tgz"; - sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980"; + url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.1.tgz"; + sha1 = "01ca186e14e63b01cb6d24e469750e481a038355"; }; }; "cordova-serve-1.0.1" = { @@ -5800,6 +5827,15 @@ let sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe"; }; }; + "elementtree-0.1.6" = { + name = "elementtree"; + packageName = "elementtree"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz"; + sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; + }; + }; "init-package-json-1.9.4" = { name = "init-package-json"; packageName = "init-package-json"; @@ -5899,13 +5935,13 @@ let sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; }; }; - "xcode-0.8.9" = { + "xcode-0.9.1" = { name = "xcode"; packageName = "xcode"; - version = "0.8.9"; + version = "0.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/xcode/-/xcode-0.8.9.tgz"; - sha1 = "ec6765f70e9dccccc9f6e9a5b9b4e7e814b4cf35"; + url = "https://registry.npmjs.org/xcode/-/xcode-0.9.1.tgz"; + sha1 = "5b4e71b71b03573ff0cdb48439103e8107da0f95"; }; }; "browserify-transform-tools-1.5.3" = { @@ -5944,6 +5980,15 @@ let sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; }; }; + "cordova-app-hello-world-3.11.0" = { + name = "cordova-app-hello-world"; + packageName = "cordova-app-hello-world"; + version = "3.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.11.0.tgz"; + sha1 = "9214feb9dd713ca481a1cbabceeca60966c1c0cf"; + }; + }; "dependency-ls-1.0.0" = { name = "dependency-ls"; packageName = "dependency-ls"; @@ -5989,31 +6034,22 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "cordova-app-hello-world-3.11.0" = { - name = "cordova-app-hello-world"; - packageName = "cordova-app-hello-world"; - version = "3.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.11.0.tgz"; - sha1 = "9214feb9dd713ca481a1cbabceeca60966c1c0cf"; - }; - }; - "browserify-13.1.0" = { + "browserify-13.3.0" = { name = "browserify"; packageName = "browserify"; - version = "13.1.0"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.1.0.tgz"; - sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae"; + url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; + sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; }; }; - "assert-1.3.0" = { - name = "assert"; - packageName = "assert"; - version = "1.3.0"; + "buffer-4.9.1" = { + name = "buffer"; + packageName = "buffer"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"; - sha1 = "03939a622582a812cc202320a0b9a56c9b815849"; + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; + sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; "compression-1.6.2" = { @@ -6025,13 +6061,13 @@ let sha1 = "cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"; }; }; - "express-4.14.0" = { + "express-4.14.1" = { name = "express"; packageName = "express"; - version = "4.14.0"; + version = "4.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz"; - sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66"; + url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz"; + sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33"; }; }; "accepts-1.3.3" = { @@ -6115,13 +6151,13 @@ let sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; }; }; - "content-disposition-0.5.1" = { + "content-disposition-0.5.2" = { name = "content-disposition"; packageName = "content-disposition"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz"; - sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b"; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; + sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; }; }; "content-type-1.0.2" = { @@ -6187,13 +6223,13 @@ let sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; }; }; - "finalhandler-0.5.0" = { + "finalhandler-0.5.1" = { name = "finalhandler"; packageName = "finalhandler"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"; - sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; + sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; }; }; "fresh-0.3.0" = { @@ -6268,22 +6304,22 @@ let sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b"; }; }; - "send-0.14.1" = { + "send-0.14.2" = { name = "send"; packageName = "send"; - version = "0.14.1"; + version = "0.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz"; - sha1 = "a954984325392f51532a7760760e459598c89f7a"; + url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz"; + sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef"; }; }; - "serve-static-1.11.1" = { + "serve-static-1.11.2" = { name = "serve-static"; packageName = "serve-static"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.1.tgz"; - sha1 = "d6cce7693505f733c759de57befc1af76c0f0805"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz"; + sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7"; }; }; "type-is-1.6.14" = { @@ -6376,6 +6412,15 @@ let sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4"; }; }; + "sax-0.3.5" = { + name = "sax"; + packageName = "sax"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; + sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; + }; + }; "npm-package-arg-4.2.0" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -6628,6 +6673,15 @@ let sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; }; }; + "hosted-git-info-2.1.5" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz"; + sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b"; + }; + }; "lockfile-1.0.3" = { name = "lockfile"; packageName = "lockfile"; @@ -8015,13 +8069,13 @@ let sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; }; }; - "nan-2.5.0" = { + "nan-2.5.1" = { name = "nan"; packageName = "nan"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; - sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; + url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"; + sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2"; }; }; "jsonparse-0.0.6" = { @@ -8060,13 +8114,13 @@ let sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66"; }; }; - "faye-websocket-0.11.0" = { + "faye-websocket-0.11.1" = { name = "faye-websocket"; packageName = "faye-websocket"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.0.tgz"; - sha1 = "d9ccf0e789e7db725d74bc4877d23aa42972ac50"; + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz"; + sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"; }; }; "eventemitter3-0.1.6" = { @@ -8981,13 +9035,13 @@ let sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; }; }; - "espree-3.3.2" = { + "espree-3.4.0" = { name = "espree"; packageName = "espree"; - version = "3.3.2"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.3.2.tgz"; - sha1 = "dbf3fadeb4ecb4d4778303e50103b3d36c88b89c"; + url = "https://registry.npmjs.org/espree/-/espree-3.4.0.tgz"; + sha1 = "41656fa5628e042878025ef467e78f125cb86e1d"; }; }; "estraverse-4.2.0" = { @@ -9026,13 +9080,13 @@ let sha1 = "8859936af0038741263053b39d0e76ca241e4034"; }; }; - "ignore-3.2.0" = { + "ignore-3.2.2" = { name = "ignore"; packageName = "ignore"; - version = "3.2.0"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.2.0.tgz"; - sha1 = "8d88f03c3002a0ac52114db25d2c673b0bf1e435"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.2.2.tgz"; + sha1 = "1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410"; }; }; "inquirer-0.12.0" = { @@ -9053,13 +9107,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.7.0" = { + "js-yaml-3.8.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.7.0"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; - sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz"; + sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628"; }; }; "json-stable-stringify-1.0.1" = { @@ -9143,13 +9197,13 @@ let sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; }; }; - "js-tokens-3.0.0" = { + "js-tokens-3.0.1" = { name = "js-tokens"; packageName = "js-tokens"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.0.tgz"; - sha1 = "a2f2a969caae142fb3cd56228358c89366957bd1"; + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz"; + sha1 = "08e9f132484a2c45a30907e9dc4d5567b7f114d7"; }; }; "es6-map-0.1.4" = { @@ -9359,13 +9413,13 @@ let sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; }; }; - "esprima-2.7.3" = { + "esprima-3.1.3" = { name = "esprima"; packageName = "esprima"; - version = "2.7.3"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; - sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; }; }; "prelude-ls-1.1.2" = { @@ -9440,22 +9494,22 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-4.10.4" = { + "ajv-4.11.3" = { name = "ajv"; packageName = "ajv"; - version = "4.10.4"; + version = "4.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.10.4.tgz"; - sha1 = "c0974dd00b3464984892d6010aa9c2c945933254"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.3.tgz"; + sha1 = "ce30bdb90d1254f762c75af915fb3a63e7183d22"; }; }; - "ajv-keywords-1.5.0" = { + "ajv-keywords-1.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.0.tgz"; - sha1 = "c11e6859eafff83e0dafc416929472eca946aa2c"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz"; + sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; }; }; "slice-ansi-0.0.4" = { @@ -9998,13 +10052,13 @@ let sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; }; }; - "node-pre-gyp-0.6.32" = { + "node-pre-gyp-0.6.33" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.32"; + version = "0.6.33"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz"; - sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz"; + sha1 = "640ac55198f6a925972e0c16c4ac26a034d5ecc9"; }; }; "npmlog-4.0.2" = { @@ -10034,13 +10088,13 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; - "gauge-2.7.2" = { + "gauge-2.7.3" = { name = "gauge"; packageName = "gauge"; - version = "2.7.2"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz"; - sha1 = "15cecc31b02d05345a5d6b0e171cdb3ad2307774"; + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.3.tgz"; + sha1 = "1c23855f962f17b3ad3d0dc7443f304542edfe09"; }; }; "set-blocking-2.0.0" = { @@ -10052,13 +10106,13 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "aproba-1.0.4" = { + "aproba-1.1.1" = { name = "aproba"; packageName = "aproba"; - version = "1.0.4"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz"; - sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0"; + url = "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz"; + sha1 = "95d3600f07710aa0e9298c726ad5ecf2eacbabab"; }; }; "wide-align-1.1.0" = { @@ -10197,13 +10251,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.12.2" = { + "coffee-script-1.12.3" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.2"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz"; - sha1 = "0d4cbdee183f650da95419570c4929d08ef91376"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz"; + sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db"; }; }; "jade-1.11.0" = { @@ -11421,6 +11475,15 @@ let sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; }; }; + "esprima-2.7.3" = { + name = "esprima"; + packageName = "esprima"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; + sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; + }; + }; "handlebars-4.0.6" = { name = "handlebars"; packageName = "handlebars"; @@ -11493,13 +11556,13 @@ let sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3"; }; }; - "body-parser-1.16.0" = { + "body-parser-1.16.1" = { name = "body-parser"; packageName = "body-parser"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.0.tgz"; - sha1 = "924a5e472c6229fb9d69b85a20d5f2532dec788b"; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.1.tgz"; + sha1 = "51540d045adfa7a0c6995a014bb6b1ed9b802329"; }; }; "combine-lists-1.0.1" = { @@ -11610,13 +11673,13 @@ let sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120"; }; }; - "useragent-2.1.11" = { + "useragent-2.1.12" = { name = "useragent"; packageName = "useragent"; - version = "2.1.11"; + version = "2.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.1.11.tgz"; - sha1 = "6a026e6a6c619b46ca7a0b2fdef6c1ac3da8ca29"; + url = "https://registry.npmjs.org/useragent/-/useragent-2.1.12.tgz"; + sha1 = "aa7da6cdc48bdc37ba86790871a7321d64edbaa2"; }; }; "bytes-2.4.0" = { @@ -11646,6 +11709,15 @@ let sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; }; }; + "finalhandler-0.5.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"; + sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7"; + }; + }; "custom-event-1.0.1" = { name = "custom-event"; packageName = "custom-event"; @@ -12798,6 +12870,78 @@ let sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; }; }; + "browser-stdout-1.3.0" = { + name = "browser-stdout"; + packageName = "browser-stdout"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; + sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; + }; + }; + "diff-1.4.0" = { + name = "diff"; + packageName = "diff"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; + sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; + }; + }; + "glob-7.0.5" = { + name = "glob"; + packageName = "glob"; + version = "7.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz"; + sha1 = "b4202a69099bbb4d292a7c1b95b6682b67ebdc95"; + }; + }; + "growl-1.9.2" = { + name = "growl"; + packageName = "growl"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz"; + sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f"; + }; + }; + "lodash.create-3.1.1" = { + name = "lodash.create"; + packageName = "lodash.create"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz"; + sha1 = "d7f2849f0dbda7e04682bb8cd72ab022461debe7"; + }; + }; + "supports-color-3.1.2" = { + name = "supports-color"; + packageName = "supports-color"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; + sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; + }; + }; + "lodash._baseassign-3.2.0" = { + name = "lodash._baseassign"; + packageName = "lodash._baseassign"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"; + sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e"; + }; + }; + "lodash._basecreate-3.0.3" = { + name = "lodash._basecreate"; + packageName = "lodash._basecreate"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz"; + sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821"; + }; + }; "optparse-1.0.5" = { name = "optparse"; packageName = "optparse"; @@ -13203,15 +13347,6 @@ let sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"; }; }; - "lodash._baseassign-3.2.0" = { - name = "lodash._baseassign"; - packageName = "lodash._baseassign"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"; - sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e"; - }; - }; "lodash._createassigner-3.1.1" = { name = "lodash._createassigner"; packageName = "lodash._createassigner"; @@ -13302,6 +13437,15 @@ let sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2"; }; }; + "express-4.14.0" = { + name = "express"; + packageName = "express"; + version = "4.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz"; + sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66"; + }; + }; "follow-redirects-1.2.1" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -13338,6 +13482,15 @@ let sha1 = "fddd8b491502c48967a62963bc722ff897cddea0"; }; }; + "js-yaml-3.7.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; + sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + }; + }; "jsonata-1.0.10" = { name = "jsonata"; packageName = "jsonata"; @@ -13419,13 +13572,13 @@ let sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; }; }; - "node-red-node-email-0.1.15" = { + "node-red-node-email-0.1.16" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.15"; + version = "0.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.15.tgz"; - sha1 = "7a528596d3b693a077b1ee293300299855537142"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.16.tgz"; + sha1 = "ede78397c857d28e6785f2f1425e7d89d3b1ed38"; }; }; "node-red-node-twitter-0.1.9" = { @@ -13608,6 +13761,24 @@ let sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f"; }; }; + "content-disposition-0.5.1" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz"; + sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b"; + }; + }; + "send-0.14.1" = { + name = "send"; + packageName = "send"; + version = "0.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz"; + sha1 = "a954984325392f51532a7760760e459598c89f7a"; + }; + }; "retry-0.6.1" = { name = "retry"; packageName = "retry"; @@ -13770,13 +13941,13 @@ let sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc"; }; }; - "mailparser-0.6.1" = { + "mailparser-0.6.2" = { name = "mailparser"; packageName = "mailparser"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.1.tgz"; - sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3"; + url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.2.tgz"; + sha1 = "03c486039bdf4df6cd3b6adcaaac4107dfdbc068"; }; }; "imap-0.8.19" = { @@ -13896,13 +14067,13 @@ let sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; }; }; - "mimelib-0.2.19" = { + "mimelib-0.3.0" = { name = "mimelib"; packageName = "mimelib"; - version = "0.2.19"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mimelib/-/mimelib-0.2.19.tgz"; - sha1 = "37ec90a6ac7d00954851d0b2c31618f0a49da0ee"; + url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.0.tgz"; + sha1 = "4b16d4b435403daf692bc227890c7165ff3de894"; }; }; "encoding-0.1.12" = { @@ -13923,6 +14094,15 @@ let sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6"; }; }; + "addressparser-1.0.1" = { + name = "addressparser"; + packageName = "addressparser"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz"; + sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; + }; + }; "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; @@ -13950,6 +14130,24 @@ let sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971"; }; }; + "nan-2.5.0" = { + name = "nan"; + packageName = "nan"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; + sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; + }; + }; + "node-pre-gyp-0.6.32" = { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.6.32"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz"; + sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"; + }; + }; "mongoose-3.6.7" = { name = "mongoose"; packageName = "mongoose"; @@ -14454,15 +14652,6 @@ let sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6"; }; }; - "addressparser-1.0.1" = { - name = "addressparser"; - packageName = "addressparser"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz"; - sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; - }; - }; "nodemailer-fetch-1.6.0" = { name = "nodemailer-fetch"; packageName = "nodemailer-fetch"; @@ -14544,13 +14733,13 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; - "JSONStream-1.2.1" = { - name = "JSONStream"; - packageName = "JSONStream"; - version = "1.2.1"; + "aproba-1.0.4" = { + name = "aproba"; + packageName = "aproba"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz"; - sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9"; + url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz"; + sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0"; }; }; "fstream-npm-1.2.0" = { @@ -14607,13 +14796,22 @@ let sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; - "mississippi-1.2.0" = { + "mississippi-1.3.0" = { name = "mississippi"; packageName = "mississippi"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz"; - sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; + url = "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz"; + sha1 = "d201583eb12327e3c5c1642a404a9cacf94e34f5"; + }; + }; + "node-gyp-3.5.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; + sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; }; }; "nopt-4.0.1" = { @@ -14688,15 +14886,6 @@ let sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; }; }; - "write-file-atomic-1.2.0" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz"; - sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"; - }; - }; "lodash._baseindexof-3.1.0" = { name = "lodash._baseindexof"; packageName = "lodash._baseindexof"; @@ -14751,6 +14940,15 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; + "parallel-transform-1.1.0" = { + name = "parallel-transform"; + packageName = "parallel-transform"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz"; + sha1 = "d410f065b05da23081fcd10f28854c29bda33b06"; + }; + }; "stream-each-1.2.0" = { name = "stream-each"; packageName = "stream-each"; @@ -14760,6 +14958,15 @@ let sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991"; }; }; + "cyclist-0.2.2" = { + name = "cyclist"; + packageName = "cyclist"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz"; + sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; + }; + }; "stream-iterate-1.2.0" = { name = "stream-iterate"; packageName = "stream-iterate"; @@ -15057,6 +15264,15 @@ let sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; }; }; + "write-file-atomic-1.2.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz"; + sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"; + }; + }; "form-data-2.0.0" = { name = "form-data"; packageName = "form-data"; @@ -15238,22 +15454,13 @@ let sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; }; }; - "diff-1.4.0" = { - name = "diff"; - packageName = "diff"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; - sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; - }; - }; - "domino-1.0.27" = { + "domino-1.0.28" = { name = "domino"; packageName = "domino"; - version = "1.0.27"; + version = "1.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/domino/-/domino-1.0.27.tgz"; - sha1 = "26bc01f739707505c51456af7f59e3373369475d"; + url = "https://registry.npmjs.org/domino/-/domino-1.0.28.tgz"; + sha1 = "9ce3f6a9221a2c3288984b14ea191cd27b392f87"; }; }; "express-handlebars-3.0.0" = { @@ -15265,15 +15472,6 @@ let sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f"; }; }; - "finalhandler-0.5.1" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; - sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; - }; - }; "gelf-stream-0.2.4" = { name = "gelf-stream"; packageName = "gelf-stream"; @@ -15321,13 +15519,13 @@ let sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; }; }; - "service-runner-2.1.13" = { + "service-runner-2.1.15" = { name = "service-runner"; packageName = "service-runner"; - version = "2.1.13"; + version = "2.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz"; - sha1 = "e8ff78b93230d7d831ea3ed5587aa2292b829ceb"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.15.tgz"; + sha1 = "8b3d05729def7a0ce211e0483d9d907f13febbfb"; }; }; "simplediff-0.1.1" = { @@ -15456,13 +15654,13 @@ let sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03"; }; }; - "yargs-5.0.0" = { + "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; - version = "5.0.0"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz"; - sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e"; + url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; + sha1 = "782ec21ef403345f830a808ca3d513af56065208"; }; }; "dtrace-provider-0.8.0" = { @@ -15525,8 +15723,8 @@ let version = "1.3.6"; src = fetchgit { url = "https://github.com/gwicke/kad.git"; - rev = "f35971036f43814043245da82b12d035b7bbfd16"; - sha256 = "9529b2615547db37851d15b39155c608d6b8d0641366d14cce728824b6135a35"; + rev = "936c91652d757ea6f9dd30e44698afb0daaa1d17"; + sha256 = "69b2ef001b9f4161dad34f5305a5895cfa9f98f124689277293fd544d06f9251"; }; }; "clarinet-0.11.0" = { @@ -15592,6 +15790,15 @@ let sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; }; }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + }; "get-caller-file-1.0.2" = { name = "get-caller-file"; packageName = "get-caller-file"; @@ -15601,15 +15808,6 @@ let sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; }; }; - "lodash.assign-4.2.0" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; - sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; - }; - }; "require-directory-2.1.1" = { name = "require-directory"; packageName = "require-directory"; @@ -15637,6 +15835,24 @@ let sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; }; }; + "yargs-parser-4.2.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; + sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; + }; + }; + "lodash.assign-4.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; + }; + }; "window-size-0.2.0" = { name = "window-size"; packageName = "window-size"; @@ -15646,24 +15862,6 @@ let sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; }; }; - "yargs-parser-3.2.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz"; - sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f"; - }; - }; - "camelcase-3.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; - sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; - }; - }; "yargs-parser-2.4.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -16600,40 +16798,31 @@ let sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a"; }; }; - "private-0.1.6" = { + "private-0.1.7" = { name = "private"; packageName = "private"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/private/-/private-0.1.6.tgz"; - sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1"; + url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz"; + sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; }; }; - "recast-0.11.20" = { + "recast-0.11.21" = { name = "recast"; packageName = "recast"; - version = "0.11.20"; + version = "0.11.21"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.11.20.tgz"; - sha1 = "2cb9bec269c03b36d0598118a936cd0a293ca3f3"; + url = "https://registry.npmjs.org/recast/-/recast-0.11.21.tgz"; + sha1 = "4e83081c6359ecb2e526d14f4138879333f20ac9"; }; }; - "ast-types-0.9.4" = { + "ast-types-0.9.5" = { name = "ast-types"; packageName = "ast-types"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.4.tgz"; - sha1 = "410d1f81890aeb8e0a38621558ba5869ae53c91b"; - }; - }; - "esprima-3.1.3" = { - name = "esprima"; - packageName = "esprima"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; - sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.5.tgz"; + sha1 = "1a660a09945dbceb1f9c9cbb715002617424e04a"; }; }; "base62-0.1.1" = { @@ -16916,13 +17105,13 @@ let sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; }; }; - "express-5.0.0-alpha.2" = { + "express-5.0.0-alpha.3" = { name = "express"; packageName = "express"; - version = "5.0.0-alpha.2"; + version = "5.0.0-alpha.3"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.2.tgz"; - sha1 = "fd54177f657b6a4c4540727702edd1cbaa3a6ac5"; + url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.3.tgz"; + sha1 = "19d63b931bf0f64c42725952ef0602c381fe64db"; }; }; "express-json5-0.1.0" = { @@ -17006,58 +17195,13 @@ let sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332"; }; }; - "array-flatten-1.1.0" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.0.tgz"; - sha1 = "ac3efac717b0e7bbdc778ce0bde7381ac6604393"; - }; - }; - "path-is-absolute-1.0.0" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; - sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; - }; - }; - "path-to-regexp-0.1.6" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.6.tgz"; - sha1 = "f01fd5734047b6bfbc5f208c6135a33d7af09c36"; - }; - }; - "router-1.1.4" = { + "router-1.1.5" = { name = "router"; packageName = "router"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/router/-/router-1.1.4.tgz"; - sha1 = "5d449dde9d6e0ad5c3f53369064baf7798834a97"; - }; - }; - "array-flatten-2.0.0" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.0.0.tgz"; - sha1 = "24dd98b38b9194b59b2087ba40c21384d6b8a8dc"; - }; - }; - "setprototypeof-1.0.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.0.tgz"; - sha1 = "d5fafca01e1174d0079bd1bf881f09c8a339794c"; + url = "https://registry.npmjs.org/router/-/router-1.1.5.tgz"; + sha1 = "c9c6935201b30ac1f227ada6af86e8cea6515387"; }; }; "raw-body-1.3.4" = { @@ -17339,22 +17483,22 @@ let sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66"; }; }; - "csv-parse-1.1.10" = { + "csv-parse-1.2.0" = { name = "csv-parse"; packageName = "csv-parse"; - version = "1.1.10"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.10.tgz"; - sha1 = "767340d0d1f26d05434c798b7132222c669189de"; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.0.tgz"; + sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425"; }; }; - "stream-transform-0.1.1" = { + "stream-transform-0.1.2" = { name = "stream-transform"; packageName = "stream-transform"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.1.tgz"; - sha1 = "0a54a2b81eea88da55a50df2441cb63edc101c71"; + url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.2.tgz"; + sha1 = "7d8e6b4e03ac4781778f8c79517501bfb0762a9f"; }; }; "csv-stringify-0.0.8" = { @@ -17510,15 +17654,6 @@ let sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3"; }; }; - "js-yaml-3.6.1" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; - sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; - }; - }; "whet.extend-0.9.9" = { name = "whet.extend"; packageName = "whet.extend"; @@ -17528,13 +17663,13 @@ let sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1"; }; }; - "csso-2.2.1" = { + "csso-2.3.1" = { name = "csso"; packageName = "csso"; - version = "2.2.1"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-2.2.1.tgz"; - sha1 = "51fbb5347e50e81e6ed51668a48490ae6fe2afe2"; + url = "https://registry.npmjs.org/csso/-/csso-2.3.1.tgz"; + sha1 = "4f8d91a156f2f1c2aebb40b8fb1b5eb83d94d3b9"; }; }; "clap-1.1.2" = { @@ -17546,6 +17681,42 @@ let sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed"; }; }; + "enhanced-resolve-2.3.0" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz"; + sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359"; + }; + }; + "resolve-from-2.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz"; + sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57"; + }; + }; + "tapable-0.2.6" = { + name = "tapable"; + packageName = "tapable"; + version = "0.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz"; + sha1 = "206be8e188860b514425375e6f1ae89bfb01fd8d"; + }; + }; + "memory-fs-0.3.0" = { + name = "memory-fs"; + packageName = "memory-fs"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz"; + sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; + }; + }; "async-2.1.2" = { name = "async"; packageName = "async"; @@ -17843,13 +18014,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "raven-1.1.1" = { + "raven-1.1.2" = { name = "raven"; packageName = "raven"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-1.1.1.tgz"; - sha1 = "8837af64baa29ec32fc1cd8223255645ce3c9a42"; + url = "https://registry.npmjs.org/raven/-/raven-1.1.2.tgz"; + sha1 = "a5eb3db71f2fc3015a20145bcaf28015e7ae0718"; }; }; "signals-1.0.0" = { @@ -17879,15 +18050,6 @@ let sha1 = "0b48420d978c01804cf0230b648861598225a119"; }; }; - "yargs-6.6.0" = { - name = "yargs"; - packageName = "yargs"; - version = "6.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; - sha1 = "782ec21ef403345f830a808ca3d513af56065208"; - }; - }; "color-convert-1.9.0" = { name = "color-convert"; packageName = "color-convert"; @@ -18095,13 +18257,13 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; - "node-gyp-3.5.0" = { - name = "node-gyp"; - packageName = "node-gyp"; - version = "3.5.0"; + "mississippi-1.2.0" = { + name = "mississippi"; + packageName = "mississippi"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; - sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; + url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz"; + sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; }; }; "lsmod-1.0.0" = { @@ -18131,15 +18293,6 @@ let sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae"; }; }; - "yargs-parser-4.2.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; - sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; - }; - }; "kew-0.1.7" = { name = "kew"; packageName = "kew"; @@ -18185,22 +18338,49 @@ let sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }; }; - "enhanced-resolve-0.9.1" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "0.9.1"; + "acorn-4.0.11" = { + name = "acorn"; + packageName = "acorn"; + version = "4.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz"; - sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e"; + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"; + sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0"; }; }; - "interpret-0.6.6" = { - name = "interpret"; - packageName = "interpret"; - version = "0.6.6"; + "acorn-dynamic-import-2.0.1" = { + name = "acorn-dynamic-import"; + packageName = "acorn-dynamic-import"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz"; - sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"; + url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz"; + sha1 = "23f671eb6e650dab277fef477c321b1178a8cca2"; + }; + }; + "enhanced-resolve-3.1.0" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz"; + sha1 = "9f4b626f577245edcf4b2ad83d86e17f4f421dec"; + }; + }; + "json-loader-0.5.4" = { + name = "json-loader"; + packageName = "json-loader"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz"; + sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de"; + }; + }; + "loader-runner-2.3.0" = { + name = "loader-runner"; + packageName = "loader-runner"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz"; + sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2"; }; }; "loader-utils-0.2.16" = { @@ -18212,58 +18392,40 @@ let sha1 = "f08632066ed8282835dff88dfb52704765adee6d"; }; }; - "memory-fs-0.3.0" = { + "memory-fs-0.4.1" = { name = "memory-fs"; packageName = "memory-fs"; - version = "0.3.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz"; - sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"; + sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; }; }; - "node-libs-browser-0.7.0" = { + "node-libs-browser-2.0.0" = { name = "node-libs-browser"; packageName = "node-libs-browser"; - version = "0.7.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz"; - sha1 = "3e272c0819e308935e26674408d7af0e1491b83b"; + url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz"; + sha1 = "a3a59ec97024985b46e958379646f96c4b616646"; }; }; - "tapable-0.1.10" = { - name = "tapable"; - packageName = "tapable"; - version = "0.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz"; - sha1 = "29c35707c2b70e50d07482b5d202e8ed446dafd4"; - }; - }; - "watchpack-0.2.9" = { + "watchpack-1.2.0" = { name = "watchpack"; packageName = "watchpack"; - version = "0.2.9"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz"; - sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b"; + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.2.0.tgz"; + sha1 = "15d4620f1e7471f13fcb551d5c030d2c3eb42dbb"; }; }; - "webpack-core-0.6.9" = { - name = "webpack-core"; - packageName = "webpack-core"; - version = "0.6.9"; + "webpack-sources-0.1.4" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz"; - sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2"; - }; - }; - "memory-fs-0.2.0" = { - name = "memory-fs"; - packageName = "memory-fs"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz"; - sha1 = "f2bb25368bc121e391c2520de92969caee0a0290"; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.4.tgz"; + sha1 = "ccc2c817e08e5fa393239412690bb481821393cd"; }; }; "big.js-3.1.3" = { @@ -18293,15 +18455,6 @@ let sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; }; }; - "crypto-browserify-3.3.0" = { - name = "crypto-browserify"; - packageName = "crypto-browserify"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz"; - sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c"; - }; - }; "os-browserify-0.2.1" = { name = "os-browserify"; packageName = "os-browserify"; @@ -18320,42 +18473,6 @@ let sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86"; }; }; - "pbkdf2-compat-2.0.1" = { - name = "pbkdf2-compat"; - packageName = "pbkdf2-compat"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz"; - sha1 = "b6e0c8fa99494d94e0511575802a59a5c142f288"; - }; - }; - "ripemd160-0.2.0" = { - name = "ripemd160"; - packageName = "ripemd160"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz"; - sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce"; - }; - }; - "sha.js-2.2.6" = { - name = "sha.js"; - packageName = "sha.js"; - version = "2.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz"; - sha1 = "17ddeddc5f722fb66501658895461977867315ba"; - }; - }; - "browserify-aes-0.4.0" = { - name = "browserify-aes"; - packageName = "browserify-aes"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz"; - sha1 = "067149b668df31c4b58533e02d01e806d8608e2c"; - }; - }; "setimmediate-1.0.5" = { name = "setimmediate"; packageName = "setimmediate"; @@ -18524,10 +18641,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.5"; + version = "1.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.5.tgz"; - sha1 = "78be031931f4b9012f6085e1544069c56dcba233"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.6.tgz"; + sha1 = "550505b1a9133189e98276952ad845b8cbcfdc9e"; }; dependencies = [ sources."colors-0.6.0-1" @@ -18592,10 +18709,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.8"; + version = "0.10.9"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.8.tgz"; - sha1 = "23622b6e536a6cdcb4be7a804884ef8b4d4985bc"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.9.tgz"; + sha1 = "f3f795f069c91fe7335d55f4199fc66c860496df"; }; dependencies = [ sources."adal-node-0.1.21" @@ -18607,9 +18724,9 @@ in ]; }) sources."azure-arm-authorization-2.0.0" - sources."azure-arm-cdn-1.0.0" + sources."azure-arm-cdn-1.0.2" sources."azure-arm-commerce-0.2.0" - sources."azure-arm-compute-0.19.1" + sources."azure-arm-compute-0.20.0" sources."azure-arm-datalake-analytics-1.0.1-preview" sources."azure-arm-datalake-store-1.0.1-preview" sources."azure-arm-hdinsight-0.2.2" @@ -18622,7 +18739,7 @@ in sources."azure-arm-trafficmanager-0.10.5" sources."azure-arm-dns-0.11.1" sources."azure-arm-website-0.11.4" - sources."azure-arm-rediscache-0.2.1" + sources."azure-arm-rediscache-0.2.3" sources."azure-arm-devtestlabs-0.1.0" sources."azure-graph-1.1.1" sources."azure-gallery-2.0.0-pre.18" @@ -18657,7 +18774,7 @@ in }) sources."azure-arm-batch-0.3.0" sources."azure-batch-0.5.2" - sources."azure-servicefabric-0.1.4" + sources."azure-servicefabric-0.1.5" sources."applicationinsights-0.16.0" sources."caller-id-0.1.0" sources."colors-1.1.2" @@ -18678,12 +18795,10 @@ in ]; }) sources."moment-2.17.1" - sources."ms-rest-1.15.2" - (sources."ms-rest-azure-1.15.2" // { + sources."ms-rest-1.15.4" + (sources."ms-rest-azure-1.15.4" // { dependencies = [ sources."async-0.2.7" - sources."uuid-2.0.1" - sources."azure-arm-resource-1.4.4-preview" ]; }) sources."node-forge-0.6.23" @@ -18805,7 +18920,7 @@ in sources."cycle-1.0.3" sources."isstream-0.1.2" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" (sources."bl-1.1.2" // { dependencies = [ sources."readable-stream-2.0.6" @@ -18877,11 +18992,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."ctype-0.5.2" @@ -19005,7 +19120,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -19065,7 +19180,7 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."q-1.4.1" - sources."debug-2.6.0" + sources."debug-2.6.1" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -19085,10 +19200,10 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "13.3.0"; + version = "14.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; - sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; + url = "https://registry.npmjs.org/browserify/-/browserify-14.0.0.tgz"; + sha1 = "67e6cfe7acb2fb1a1908e8a763452306de0bcf38"; }; dependencies = [ sources."JSONStream-1.3.0" @@ -19100,7 +19215,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."buffer-4.9.1" + sources."buffer-5.0.5" sources."cached-path-relative-1.0.0" (sources."concat-stream-1.5.2" // { dependencies = [ @@ -19173,9 +19288,9 @@ in sources."pako-0.2.9" sources."base64-js-1.2.0" sources."ieee754-1.1.8" - sources."isarray-1.0.0" sources."typedarray-0.0.6" sources."core-util-is-1.0.2" + sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" sources."date-now-0.1.4" @@ -19197,9 +19312,9 @@ in sources."minimalistic-assert-1.0.0" sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - sources."elliptic-6.3.2" + sources."elliptic-6.3.3" sources."parse-asn1-5.0.0" - sources."brorand-1.0.6" + sources."brorand-1.0.7" sources."hash.js-1.0.3" sources."asn1.js-4.9.1" sources."ripemd160-1.0.1" @@ -19250,19 +19365,20 @@ in castnow = nodeEnv.buildNodePackage { name = "castnow"; packageName = "castnow"; - version = "0.4.17"; + version = "0.4.18"; src = fetchurl { - url = "https://registry.npmjs.org/castnow/-/castnow-0.4.17.tgz"; - sha1 = "7d9ce3c5605b5aa74ae5348c826443374d5863a8"; + url = "https://registry.npmjs.org/castnow/-/castnow-0.4.18.tgz"; + sha1 = "4ffd81c55f381a5aa10c637607683a196830bdd8"; }; dependencies = [ sources."array-loop-1.0.0" + sources."array-shuffle-1.0.1" sources."castv2-client-1.2.0" sources."chalk-1.0.0" sources."chromecast-player-0.2.3" sources."debounced-seeker-1.0.0" - sources."debug-2.6.0" - sources."fs-extended-0.2.1" + sources."debug-2.6.1" + sources."diveSync-0.3.0" sources."got-1.2.2" sources."internal-ip-1.2.0" sources."keypress-0.2.1" @@ -19303,6 +19419,7 @@ in sources."lodash-4.17.4" ]; }) + sources."xspfr-0.3.1" sources."xtend-4.0.1" sources."castv2-0.1.9" sources."protobufjs-3.8.2" @@ -19330,6 +19447,7 @@ in sources."wrap-fn-0.1.5" sources."co-3.1.0" sources."ms-0.7.2" + sources."append-0.1.1" sources."object-assign-1.0.0" (sources."meow-3.7.0" // { dependencies = [ @@ -19348,7 +19466,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -19462,7 +19580,7 @@ in (sources."fs-chunk-store-1.6.4" // { dependencies = [ sources."mkdirp-0.5.1" - sources."thunky-1.0.1" + sources."thunky-1.0.2" sources."minimist-0.0.8" ]; }) @@ -19474,10 +19592,10 @@ in sources."rimraf-2.5.4" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.0" - (sources."random-access-file-1.4.0" // { + (sources."random-access-file-1.5.0" // { dependencies = [ sources."mkdirp-0.5.1" - sources."thunky-1.0.1" + sources."thunky-1.0.2" sources."minimist-0.0.8" ]; }) @@ -19527,33 +19645,38 @@ in }) sources."lru-2.0.1" sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.6.1" + sources."k-rpc-socket-1.6.2" sources."bn.js-4.11.6" sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" - (sources."simple-peer-6.2.1" // { + (sources."simple-peer-6.2.2" // { dependencies = [ sources."readable-stream-2.2.2" sources."isarray-1.0.0" ]; }) - (sources."simple-websocket-4.2.0" // { + (sources."simple-websocket-4.3.0" // { dependencies = [ sources."readable-stream-2.2.2" + sources."ws-2.0.3" sources."isarray-1.0.0" ]; }) sources."string2compact-1.2.2" - sources."ws-1.1.1" + (sources."ws-1.1.1" // { + dependencies = [ + sources."ultron-1.0.2" + ]; + }) sources."ipaddr.js-1.2.0" sources."get-browser-rtc-1.0.2" sources."buffer-shims-1.0.0" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" + sources."ultron-1.1.0" sources."addr-to-ip-port-1.4.2" sources."options-0.0.6" - sources."ultron-1.0.2" sources."pad-0.0.5" sources."single-line-log-0.4.1" (sources."request-2.16.6" // { @@ -19595,7 +19718,8 @@ in sources."commander-2.9.0" sources."typedarray-0.0.6" sources."graceful-readlink-1.0.1" - sources."sax-1.2.1" + sources."sax-1.2.2" + sources."underscore-1.6.0" ]; buildInputs = globalBuildInputs; meta = { @@ -19608,10 +19732,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.2"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz"; - sha1 = "0d4cbdee183f650da95419570c4929d08ef91376"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz"; + sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db"; }; buildInputs = globalBuildInputs; meta = { @@ -19624,24 +19748,26 @@ in cordova = nodeEnv.buildNodePackage { name = "cordova"; packageName = "cordova"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova/-/cordova-6.4.0.tgz"; - sha1 = "3fd9e8b9ad77a6a93ec76947704de21ac2991776"; + url = "https://registry.npmjs.org/cordova/-/cordova-6.5.0.tgz"; + sha1 = "e6ec81b17dd50c17c40b4b87330f7ced38fb0b47"; }; dependencies = [ - (sources."cordova-common-1.5.1" // { + (sources."cordova-common-2.0.0" // { dependencies = [ sources."q-1.4.1" sources."underscore-1.8.3" ]; }) - (sources."cordova-lib-6.4.0" // { + (sources."cordova-lib-6.5.0" // { dependencies = [ + sources."elementtree-0.1.6" sources."nopt-3.0.6" sources."semver-4.3.6" sources."shelljs-0.3.0" sources."unorm-1.3.3" + sources."sax-0.3.5" ]; }) (sources."insight-0.8.4" // { @@ -19658,7 +19784,7 @@ in sources."ansi-0.3.1" sources."bplist-parser-0.1.1" sources."cordova-registry-mapper-1.1.15" - sources."elementtree-0.1.6" + sources."elementtree-0.1.7" sources."glob-5.0.15" sources."minimatch-3.0.3" sources."osenv-0.1.4" @@ -19667,7 +19793,7 @@ in sources."shelljs-0.5.3" sources."unorm-1.4.1" sources."big-integer-1.6.17" - sources."sax-0.3.5" + sources."sax-1.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."once-1.4.0" @@ -19684,19 +19810,19 @@ in sources."util-deprecate-1.0.2" sources."lodash-3.10.1" sources."aliasify-1.9.0" - (sources."cordova-fetch-1.0.1" // { + (sources."cordova-create-1.0.2" // { + dependencies = [ + sources."shelljs-0.3.0" + ]; + }) + (sources."cordova-fetch-1.0.2" // { dependencies = [ sources."q-1.4.1" sources."shelljs-0.7.6" sources."glob-7.1.1" ]; }) - (sources."cordova-create-1.0.1" // { - dependencies = [ - sources."shelljs-0.3.0" - ]; - }) - sources."cordova-js-4.2.0" + sources."cordova-js-4.2.1" (sources."cordova-serve-1.0.1" // { dependencies = [ sources."q-1.4.1" @@ -19715,6 +19841,7 @@ in (sources."npm-2.15.11" // { dependencies = [ sources."glob-7.0.6" + sources."hosted-git-info-2.1.5" sources."nopt-3.0.6" sources."npm-package-arg-4.1.1" sources."readable-stream-2.1.5" @@ -19754,7 +19881,7 @@ in }) sources."tar-1.0.2" sources."valid-identifier-0.0.1" - sources."xcode-0.8.9" + sources."xcode-0.9.1" sources."browserify-transform-tools-1.5.3" sources."falafel-1.2.0" sources."through-2.3.8" @@ -19762,6 +19889,7 @@ in sources."foreach-2.0.5" sources."isarray-0.0.1" sources."object-keys-1.0.11" + sources."cordova-app-hello-world-3.11.0" (sources."dependency-ls-1.0.0" // { dependencies = [ sources."q-1.4.1" @@ -19772,10 +19900,13 @@ in sources."rechoir-0.6.2" sources."fs.realpath-1.0.0" sources."resolve-1.2.0" - sources."cordova-app-hello-world-3.11.0" - sources."browserify-13.1.0" + (sources."browserify-13.3.0" // { + dependencies = [ + sources."glob-7.1.1" + ]; + }) sources."JSONStream-1.3.0" - sources."assert-1.3.0" + sources."assert-1.4.1" sources."browser-pack-6.0.2" (sources."browser-resolve-1.11.2" // { dependencies = [ @@ -19789,6 +19920,7 @@ in sources."isarray-1.0.0" ]; }) + sources."cached-path-relative-1.0.0" (sources."concat-stream-1.5.2" // { dependencies = [ sources."readable-stream-2.0.6" @@ -19878,9 +20010,9 @@ in sources."minimalistic-assert-1.0.0" sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - sources."elliptic-6.3.2" + sources."elliptic-6.3.3" sources."parse-asn1-5.0.0" - sources."brorand-1.0.6" + sources."brorand-1.0.7" sources."hash.js-1.0.3" sources."asn1.js-4.9.1" sources."ripemd160-1.0.1" @@ -19891,7 +20023,6 @@ in sources."lexical-scope-1.2.0" sources."astw-2.0.0" sources."stream-splicer-2.0.0" - sources."cached-path-relative-1.0.0" (sources."detective-4.3.2" // { dependencies = [ sources."acorn-3.3.0" @@ -19912,7 +20043,7 @@ in sources."indexof-0.0.1" sources."chalk-1.1.3" sources."compression-1.6.2" - sources."express-4.14.0" + sources."express-4.14.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -19930,7 +20061,7 @@ in sources."mime-db-1.26.0" sources."ms-0.7.1" sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" @@ -19938,7 +20069,7 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - sources."finalhandler-0.5.0" + sources."finalhandler-0.5.1" sources."fresh-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" @@ -19948,8 +20079,12 @@ in sources."proxy-addr-1.1.3" sources."qs-6.2.0" sources."range-parser-1.2.0" - sources."send-0.14.1" - sources."serve-static-1.11.1" + (sources."send-0.14.2" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) + sources."serve-static-1.11.2" sources."type-is-1.6.14" sources."utils-merge-1.0.0" sources."statuses-1.3.1" @@ -19972,7 +20107,7 @@ in }) sources."validate-npm-package-license-3.0.1" sources."validate-npm-package-name-2.2.2" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."mute-stream-0.0.7" sources."json-parse-helpfulerror-1.0.3" sources."normalize-package-data-2.3.5" @@ -20063,7 +20198,7 @@ in sources."es5-ext-0.10.12" sources."es6-iterator-2.0.0" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -20116,11 +20251,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."are-we-there-yet-1.1.2" sources."gauge-1.2.7" sources."delegates-1.0.0" @@ -20332,10 +20467,10 @@ in sources."destroy-1.0.3" sources."mime-1.2.11" sources."bindings-1.2.1" - sources."nan-2.5.0" + sources."nan-2.5.1" sources."jsonparse-0.0.6" sources."es5class-2.3.1" - sources."faye-websocket-0.11.0" + sources."faye-websocket-0.11.1" sources."eventemitter3-0.1.6" sources."better-curry-1.6.0" sources."websocket-driver-0.6.5" @@ -20534,16 +20669,17 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.0.2.tgz"; - sha1 = "0f010dbd6e26db0270abd88e3e5403062eb4f7a4"; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.1.0.tgz"; + sha1 = "4bec1f64f7931b84884306fb5b37a0d269d81e8d"; }; dependencies = [ sources."JSONStream-1.3.0" sources."async-2.1.4" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."awscred-1.2.0" + sources."ini-1.3.4" sources."optimist-0.6.1" sources."request-2.79.0" sources."jsonparse-1.3.0" @@ -20614,11 +20750,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.26.0" sources."punycode-1.4.1" ]; @@ -20702,7 +20838,7 @@ in sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -20740,30 +20876,30 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.13.1"; + version = "3.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.13.1.tgz"; - sha1 = "564d2646b5efded85df96985332edd91a23bff25"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.15.0.tgz"; + sha1 = "bdcc6a6c5ffe08160e7b93c066695362a91e30f2"; }; dependencies = [ sources."babel-code-frame-6.22.0" sources."chalk-1.1.3" sources."concat-stream-1.6.0" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."doctrine-1.5.0" sources."escope-3.6.0" - sources."espree-3.3.2" + sources."espree-3.4.0" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" sources."glob-7.1.1" sources."globals-9.14.0" - sources."ignore-3.2.0" + sources."ignore-3.2.2" sources."imurmurhash-0.1.4" sources."inquirer-0.12.0" sources."is-my-json-valid-2.15.0" sources."is-resolvable-1.0.0" - sources."js-yaml-3.7.0" + sources."js-yaml-3.8.1" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.4" @@ -20785,7 +20921,7 @@ in }) sources."text-table-0.2.0" sources."user-home-2.0.0" - sources."js-tokens-3.0.0" + sources."js-tokens-3.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -20870,7 +21006,7 @@ in sources."is-property-1.0.2" sources."tryit-1.0.3" sources."argparse-1.0.9" - sources."esprima-2.7.3" + sources."esprima-3.1.3" sources."sprintf-js-1.0.3" sources."jsonify-0.0.0" sources."prelude-ls-1.1.2" @@ -20885,8 +21021,8 @@ in sources."interpret-1.0.1" sources."rechoir-0.6.2" sources."resolve-1.2.0" - sources."ajv-4.10.4" - sources."ajv-keywords-1.5.0" + sources."ajv-4.11.3" + sources."ajv-keywords-1.5.1" sources."slice-ansi-0.0.4" sources."co-4.6.0" sources."os-homedir-1.0.2" @@ -21057,8 +21193,8 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."nan-2.5.0" - sources."node-pre-gyp-0.6.32" + sources."nan-2.5.1" + sources."node-pre-gyp-0.6.33" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -21084,15 +21220,14 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ sources."object-assign-4.1.1" ]; }) sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -21106,7 +21241,7 @@ in sources."ini-1.3.4" sources."strip-json-comments-1.0.4" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -21127,17 +21262,14 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -21170,11 +21302,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."glob-7.1.1" @@ -21279,7 +21411,7 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.12.2" + sources."coffee-script-1.12.3" sources."jade-1.11.0" (sources."q-2.0.3" // { dependencies = [ @@ -21352,10 +21484,10 @@ in sources."acorn-globals-1.0.9" sources."pop-iterate-1.0.1" sources."weak-map-1.0.5" - sources."sax-1.2.1" + sources."sax-1.2.2" sources."xmlbuilder-4.2.1" sources."lodash-4.17.4" - sources."nan-2.5.0" + sources."nan-2.5.1" ]; buildInputs = globalBuildInputs; meta = { @@ -21669,6 +21801,22 @@ in }; production = true; }; + ios-deploy = nodeEnv.buildNodePackage { + name = "ios-deploy"; + packageName = "ios-deploy"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ios-deploy/-/ios-deploy-1.9.1.tgz"; + sha1 = "e7dec9508bb464a1f2d546bb07fada41d2708e66"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "launch iOS apps iOS devices from the command line (Xcode 7)"; + homepage = "https://github.com/phonegap/ios-deploy#readme"; + license = "GPLv3"; + }; + production = true; + }; istanbul = nodeEnv.buildNodePackage { name = "istanbul"; packageName = "istanbul"; @@ -21688,7 +21836,11 @@ in sources."source-map-0.4.4" ]; }) - sources."js-yaml-3.7.0" + (sources."js-yaml-3.8.1" // { + dependencies = [ + sources."esprima-3.1.3" + ]; + }) (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -21864,14 +22016,14 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.7.0"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; - sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz"; + sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628"; }; dependencies = [ sources."argparse-1.0.9" - sources."esprima-2.7.3" + sources."esprima-3.1.3" sources."sprintf-js-1.0.3" ]; buildInputs = globalBuildInputs; @@ -21885,14 +22037,14 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.4.0.tgz"; - sha1 = "bf5edbccabb8579cb68ae699871f3e79608ec94b"; + url = "https://registry.npmjs.org/karma/-/karma-1.4.1.tgz"; + sha1 = "41981a71d54237606b0a3ea8c58c90773f41650e"; }; dependencies = [ sources."bluebird-3.4.7" - sources."body-parser-1.16.0" + sources."body-parser-1.16.1" sources."chokidar-1.6.1" sources."colors-1.1.2" (sources."combine-lists-1.0.1" // { @@ -21944,10 +22096,10 @@ in }) sources."source-map-0.5.6" sources."tmp-0.0.28" - sources."useragent-2.1.11" + sources."useragent-2.1.12" sources."bytes-2.4.0" sources."content-type-1.0.2" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."depd-1.1.0" sources."http-errors-1.5.1" sources."iconv-lite-0.4.15" @@ -22013,8 +22165,8 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."nan-2.5.0" - sources."node-pre-gyp-0.6.32" + sources."nan-2.5.1" + sources."node-pre-gyp-0.6.33" sources."mkdirp-0.5.1" sources."nopt-3.0.6" sources."npmlog-4.0.2" @@ -22041,11 +22193,10 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.2" + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -22060,7 +22211,7 @@ in sources."ini-1.3.4" sources."strip-json-comments-1.0.4" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -22079,17 +22230,14 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -22122,11 +22270,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."block-stream-0.0.9" sources."fstream-1.0.10" @@ -22376,7 +22524,7 @@ in sources."oauth-0.9.15" sources."passport-oauth2-1.4.0" sources."uid2-0.0.3" - sources."sax-1.2.1" + sources."sax-1.2.2" sources."xmlbuilder-4.2.1" sources."lodash-4.17.4" ]; @@ -22552,6 +22700,57 @@ in }; production = true; }; + mocha = nodeEnv.buildNodePackage { + name = "mocha"; + packageName = "mocha"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz"; + sha1 = "7dc4f45e5088075171a68896814e6ae9eb7a85e3"; + }; + dependencies = [ + sources."browser-stdout-1.3.0" + sources."commander-2.9.0" + sources."debug-2.2.0" + sources."diff-1.4.0" + sources."escape-string-regexp-1.0.5" + sources."glob-7.0.5" + sources."growl-1.9.2" + sources."json3-3.3.2" + sources."lodash.create-3.1.1" + sources."mkdirp-0.5.1" + sources."supports-color-3.1.2" + sources."graceful-readlink-1.0.1" + sources."ms-0.7.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."lodash._baseassign-3.2.0" + sources."lodash._basecreate-3.0.3" + sources."lodash._isiterateecall-3.0.9" + sources."lodash._basecopy-3.0.1" + sources."lodash.keys-3.1.2" + sources."lodash._getnative-3.9.1" + sources."lodash.isarguments-3.1.0" + sources."lodash.isarray-3.0.4" + sources."minimist-0.0.8" + sources."has-flag-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "simple, flexible, fun test framework"; + homepage = https://mochajs.org/; + license = "MIT"; + }; + production = true; + }; nijs = nodeEnv.buildNodePackage { name = "nijs"; packageName = "nijs"; @@ -22626,7 +22825,7 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."minimist-0.0.8" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -22635,7 +22834,7 @@ in sources."spdx-license-ids-1.2.2" sources."wrappy-1.0.2" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -22698,11 +22897,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."glob-7.1.1" @@ -22718,7 +22917,7 @@ in sources."gauge-2.6.0" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" @@ -22793,7 +22992,7 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.2" + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."readable-stream-2.2.2" @@ -22803,8 +23002,7 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -22818,7 +23016,7 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -22839,17 +23037,14 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -22882,11 +23077,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" @@ -22911,8 +23106,8 @@ in dependencies = [ sources."async-0.9.2" sources."biased-opener-0.2.8" - sources."debug-2.6.0" - (sources."express-4.14.0" // { + sources."debug-2.6.1" + (sources."express-4.14.1" // { dependencies = [ sources."debug-2.2.0" sources."ms-0.7.1" @@ -22978,7 +23173,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -23008,7 +23203,7 @@ in sources."ms-0.7.2" sources."accepts-1.3.3" sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" @@ -23016,7 +23211,7 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - (sources."finalhandler-0.5.0" // { + (sources."finalhandler-0.5.1" // { dependencies = [ sources."debug-2.2.0" sources."ms-0.7.1" @@ -23031,13 +23226,16 @@ in sources."proxy-addr-1.1.3" sources."qs-6.2.0" sources."range-parser-1.2.0" - (sources."send-0.14.1" // { + (sources."send-0.14.2" // { dependencies = [ - sources."debug-2.2.0" - sources."ms-0.7.1" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) ]; }) - sources."serve-static-1.11.1" + sources."serve-static-1.11.2" sources."type-is-1.6.14" sources."utils-merge-1.0.0" sources."vary-1.1.0" @@ -23066,8 +23264,8 @@ in sources."ini-1.3.4" sources."strip-json-comments-1.0.4" sources."truncate-1.0.5" - sources."nan-2.5.0" - (sources."node-pre-gyp-0.6.32" // { + sources."nan-2.5.1" + (sources."node-pre-gyp-0.6.33" // { dependencies = [ sources."rimraf-2.5.4" sources."semver-5.3.0" @@ -23095,7 +23293,7 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.2" + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."readable-stream-2.2.2" @@ -23104,8 +23302,7 @@ in sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" @@ -23114,7 +23311,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."ansi-regex-2.1.1" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -23133,16 +23330,13 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -23173,11 +23367,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."fs.realpath-1.0.0" sources."block-stream-0.0.9" @@ -23205,10 +23399,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.32"; + version = "0.6.33"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz"; - sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz"; + sha1 = "640ac55198f6a925972e0c16c4ac26a034d5ecc9"; }; dependencies = [ sources."mkdirp-0.5.1" @@ -23233,7 +23427,7 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.2" + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."readable-stream-2.2.2" @@ -23244,8 +23438,7 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -23260,7 +23453,7 @@ in sources."ini-1.3.4" sources."strip-json-comments-1.0.4" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -23281,17 +23474,14 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -23324,11 +23514,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."glob-7.1.1" @@ -23367,7 +23557,7 @@ in }; dependencies = [ sources."chokidar-1.6.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -23435,8 +23625,8 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."nan-2.5.0" - sources."node-pre-gyp-0.6.32" + sources."nan-2.5.1" + sources."node-pre-gyp-0.6.33" sources."mkdirp-0.5.1" sources."nopt-3.0.6" sources."npmlog-4.0.2" @@ -23460,11 +23650,10 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.2" + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -23479,7 +23668,7 @@ in sources."ini-1.3.4" sources."strip-json-comments-1.0.4" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -23500,17 +23689,14 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -23543,11 +23729,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."glob-7.1.1" @@ -23634,10 +23820,10 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.16.1"; + version = "0.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.16.1.tgz"; - sha1 = "eff4162e6e08ef7e2ae9b17ad99571876f7d895d"; + url = "https://registry.npmjs.org/node-red/-/node-red-0.16.2.tgz"; + sha1 = "3f77d608f1b0e89907af3f31e2c3eb8844a2b17b"; }; dependencies = [ sources."basic-auth-1.1.0" @@ -23655,7 +23841,7 @@ in sources."express-4.14.0" (sources."follow-redirects-1.2.1" // { dependencies = [ - sources."debug-2.6.0" + sources."debug-2.6.1" sources."ms-0.7.2" ]; }) @@ -23691,7 +23877,7 @@ in sources."ws-1.1.1" sources."xml2js-0.4.17" sources."node-red-node-feedparser-0.1.7" - sources."node-red-node-email-0.1.15" + sources."node-red-node-email-0.1.16" (sources."node-red-node-twitter-0.1.9" // { dependencies = [ sources."request-2.79.0" @@ -23771,7 +23957,12 @@ in sources."proxy-addr-1.1.3" sources."range-parser-1.2.0" sources."send-0.14.1" - sources."serve-static-1.11.1" + (sources."serve-static-1.11.2" // { + dependencies = [ + sources."send-0.14.2" + sources."ms-0.7.2" + ]; + }) sources."utils-merge-1.0.0" sources."negotiator-0.6.1" sources."forwarded-0.1.0" @@ -23910,7 +24101,7 @@ in sources."longest-1.0.1" sources."options-0.0.6" sources."ultron-1.0.2" - sources."sax-1.2.1" + sources."sax-1.2.2" sources."xmlbuilder-4.2.1" sources."lodash-4.17.4" (sources."feedparser-1.1.3" // { @@ -23929,7 +24120,7 @@ in sources."addressparser-0.1.3" sources."array-indexofobject-0.0.1" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" @@ -23990,15 +24181,15 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."nodemailer-1.11.0" sources."poplib-0.1.7" - sources."mailparser-0.6.1" + sources."mailparser-0.6.2" (sources."imap-0.8.19" // { dependencies = [ sources."readable-stream-1.1.14" @@ -24029,9 +24220,9 @@ in sources."minimist-0.0.10" ]; }) - (sources."mimelib-0.2.19" // { + (sources."mimelib-0.3.0" // { dependencies = [ - sources."addressparser-0.3.2" + sources."addressparser-1.0.1" ]; }) sources."encoding-0.1.12" @@ -24070,14 +24261,10 @@ in }) sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { - dependencies = [ - sources."supports-color-0.2.0" - ]; - }) + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -24157,7 +24344,7 @@ in sources."methods-0.0.1" sources."send-0.1.0" sources."cookie-signature-1.0.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -24167,7 +24354,7 @@ in sources."bytes-0.2.0" sources."pause-0.0.1" sources."mime-1.2.6" - sources."coffee-script-1.12.2" + sources."coffee-script-1.12.3" sources."vows-0.8.1" sources."eyes-0.1.8" sources."diff-1.0.8" @@ -24232,14 +24419,15 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.1.1.tgz"; - sha1 = "76d8f1f32a87619f000e0e25a0e6be90561484d4"; + url = "https://registry.npmjs.org/npm/-/npm-4.2.0.tgz"; + sha1 = "d4eeb6791b996fe3085535d749338d1fe48df13a"; }; dependencies = [ - sources."JSONStream-1.2.1" + sources."JSONStream-1.3.0" sources."abbrev-1.0.9" + sources."ansi-regex-2.1.1" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" sources."aproba-1.0.4" @@ -24274,12 +24462,11 @@ in sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" - sources."mississippi-1.2.0" + sources."mississippi-1.3.0" sources."mkdirp-0.5.1" - (sources."node-gyp-3.4.0" // { + (sources."node-gyp-3.5.0" // { dependencies = [ sources."nopt-3.0.6" - sources."npmlog-3.1.2" ]; }) sources."nopt-4.0.1" @@ -24290,11 +24477,7 @@ in sources."npm-package-arg-4.2.0" sources."npm-registry-client-7.4.5" sources."npm-user-validate-0.1.5" - (sources."npmlog-4.0.2" // { - dependencies = [ - sources."gauge-2.7.2" - ]; - }) + sources."npmlog-4.0.2" sources."once-1.4.0" sources."opener-1.4.2" sources."osenv-0.1.4" @@ -24335,8 +24518,7 @@ in sources."validate-npm-package-name-2.2.2" sources."which-1.2.12" sources."wrappy-1.0.2" - sources."write-file-atomic-1.2.0" - sources."ansi-regex-2.1.1" + sources."write-file-atomic-1.3.1" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -24377,21 +24559,23 @@ in }) sources."flush-write-stream-1.0.2" sources."from2-2.3.0" + sources."parallel-transform-1.1.0" sources."pump-1.0.2" sources."pumpify-1.3.5" sources."stream-each-1.2.0" sources."through2-2.0.3" sources."typedarray-0.0.6" sources."stream-shift-1.0.0" + sources."cyclist-0.2.2" sources."xtend-4.0.1" sources."minimist-0.0.8" - sources."path-array-1.0.1" + sources."is-builtin-module-1.0.0" + sources."builtin-modules-1.1.1" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."has-color-0.1.7" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -24399,16 +24583,6 @@ in sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."array-index-1.0.0" - sources."debug-2.6.0" - sources."es6-symbol-3.1.0" - sources."ms-0.7.2" - sources."d-0.1.1" - sources."es5-ext-0.10.12" - sources."es6-iterator-2.0.0" - sources."is-builtin-module-1.0.0" - sources."builtin-modules-1.1.1" - sources."supports-color-0.2.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."mute-stream-0.0.7" @@ -24422,7 +24596,7 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -24442,17 +24616,14 @@ in sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -24484,11 +24655,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."stream-iterate-1.2.0" @@ -24545,7 +24716,7 @@ in }) sources."fs.extra-1.3.2" sources."findit-1.2.0" - sources."coffee-script-1.12.2" + sources."coffee-script-1.12.3" sources."underscore-1.4.4" sources."underscore.string-2.3.3" sources."request-2.79.0" @@ -24558,7 +24729,7 @@ in sources."couch-login-0.1.20" sources."npmlog-4.0.2" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -24621,11 +24792,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."glob-7.1.1" @@ -24641,11 +24812,7 @@ in sources."concat-map-0.0.1" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { - dependencies = [ - sources."supports-color-0.2.0" - ]; - }) + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."readable-stream-2.2.2" @@ -24655,7 +24822,7 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -24703,10 +24870,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.8.9"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.9.tgz"; - sha1 = "c084b087a08ecf9292352e2cd591de903f8129c3"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.2.tgz"; + sha1 = "9614c58ec84d31702a85881c844c3fb93611a585"; }; dependencies = [ sources."bluebird-3.4.7" @@ -24798,8 +24965,7 @@ in sources."npm-user-validate-0.1.5" (sources."npmlog-4.0.2" // { dependencies = [ - sources."gauge-2.7.2" - sources."supports-color-0.2.0" + sources."gauge-2.7.3" ]; }) sources."once-1.4.0" @@ -24873,7 +25039,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."array-index-1.0.0" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."es6-symbol-3.1.0" sources."ms-0.7.2" sources."d-0.1.1" @@ -24898,7 +25064,7 @@ in sources."mute-stream-0.0.7" sources."util-extend-1.0.3" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" (sources."bl-1.1.2" // { dependencies = [ sources."readable-stream-2.0.6" @@ -24955,11 +25121,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" @@ -25033,7 +25199,7 @@ in dependencies = [ sources."async-0.9.2" sources."babybird-0.0.1" - (sources."body-parser-1.16.0" // { + (sources."body-parser-1.16.1" // { dependencies = [ sources."content-type-1.0.2" ]; @@ -25049,13 +25215,12 @@ in sources."content-type-git+https://github.com/wikimedia/content-type.git#master" sources."core-js-2.4.1" sources."diff-1.4.0" - sources."domino-1.0.27" + sources."domino-1.0.28" sources."entities-1.1.1" - (sources."express-4.14.0" // { + (sources."express-4.14.1" // { dependencies = [ sources."content-type-1.0.2" sources."debug-2.2.0" - sources."finalhandler-0.5.0" sources."qs-6.2.0" sources."ms-0.7.1" ]; @@ -25068,7 +25233,7 @@ in ]; }) sources."gelf-stream-0.2.4" - sources."js-yaml-3.7.0" + sources."js-yaml-3.8.1" sources."mediawiki-title-0.5.6" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."node-uuid-1.4.7" @@ -25081,13 +25246,13 @@ in }) sources."semver-5.3.0" sources."serve-favicon-2.3.2" - (sources."service-runner-2.1.13" // { + (sources."service-runner-2.1.15" // { dependencies = [ sources."gelf-stream-1.1.1" - sources."yargs-5.0.0" + sources."yargs-6.6.0" sources."gelfling-0.3.1" + sources."camelcase-3.0.0" sources."cliui-3.2.0" - sources."window-size-0.2.0" ]; }) sources."simplediff-0.1.1" @@ -25102,7 +25267,7 @@ in sources."asap-2.0.5" sources."is-arguments-1.0.2" sources."bytes-2.4.0" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."depd-1.1.0" sources."http-errors-1.5.1" sources."iconv-lite-0.4.15" @@ -25131,7 +25296,7 @@ in sources."isarray-0.0.1" sources."string_decoder-0.10.31" sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."encodeurl-1.0.1" @@ -25144,13 +25309,16 @@ in sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.3" sources."range-parser-1.2.0" - (sources."send-0.14.1" // { + (sources."send-0.14.2" // { dependencies = [ - sources."debug-2.2.0" - sources."ms-0.7.1" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) ]; }) - sources."serve-static-1.11.1" + sources."serve-static-1.11.2" sources."utils-merge-1.0.0" sources."forwarded-0.1.0" sources."ipaddr.js-1.2.0" @@ -25208,10 +25376,10 @@ in sources."foreach-2.0.5" sources."gelfling-0.2.0" sources."argparse-1.0.9" - sources."esprima-2.7.3" + sources."esprima-3.1.3" sources."sprintf-js-1.0.3" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -25272,11 +25440,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."bluebird-3.4.7" sources."bunyan-1.8.5" @@ -25292,7 +25460,7 @@ in sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" sources."moment-2.17.1" - sources."nan-2.5.0" + sources."nan-2.5.1" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -25336,7 +25504,6 @@ in ]; }) sources."get-caller-file-1.0.2" - sources."lodash.assign-4.2.0" sources."os-locale-1.4.0" sources."read-pkg-up-1.0.1" sources."require-directory-2.1.1" @@ -25345,7 +25512,7 @@ in sources."string-width-1.0.2" sources."which-module-1.0.0" sources."y18n-3.2.1" - (sources."yargs-parser-3.2.0" // { + (sources."yargs-parser-4.2.1" // { dependencies = [ sources."camelcase-3.0.0" ]; @@ -25365,7 +25532,7 @@ in sources."error-ex-1.3.0" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -25375,6 +25542,7 @@ in sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" + sources."lodash.assign-4.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -25500,7 +25668,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -25570,7 +25738,7 @@ in (sources."fs-chunk-store-1.6.4" // { dependencies = [ sources."mkdirp-0.5.1" - sources."thunky-1.0.1" + sources."thunky-1.0.2" sources."minimist-0.0.8" ]; }) @@ -25582,16 +25750,16 @@ in sources."rimraf-2.5.4" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.0" - (sources."random-access-file-1.4.0" // { + (sources."random-access-file-1.5.0" // { dependencies = [ sources."mkdirp-0.5.1" - sources."thunky-1.0.1" + sources."thunky-1.0.2" sources."minimist-0.0.8" ]; }) sources."randombytes-2.0.3" sources."run-parallel-1.1.6" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."ms-0.7.2" sources."flatten-0.0.1" sources."fifo-0.1.4" @@ -25633,20 +25801,28 @@ in }) sources."lru-2.0.1" sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.6.1" + sources."k-rpc-socket-1.6.2" sources."bn.js-4.11.6" sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" - sources."simple-peer-6.2.1" - sources."simple-websocket-4.2.0" + sources."simple-peer-6.2.2" + (sources."simple-websocket-4.3.0" // { + dependencies = [ + sources."ws-2.0.3" + ]; + }) sources."string2compact-1.2.2" - sources."ws-1.1.1" + (sources."ws-1.1.1" // { + dependencies = [ + sources."ultron-1.0.2" + ]; + }) sources."ipaddr.js-1.2.0" sources."get-browser-rtc-1.0.2" + sources."ultron-1.1.0" sources."addr-to-ip-port-1.4.2" sources."options-0.0.6" - sources."ultron-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -25659,10 +25835,10 @@ in peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; packageName = "peerflix-server"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.2.tgz"; - sha1 = "92d39be205b36a0986001a1d9ea34e3927937ab6"; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.3.tgz"; + sha1 = "1f3c2b81188de82482f64cf89d015f5428e4c4e5"; }; dependencies = [ sources."connect-multiparty-1.2.5" @@ -25881,13 +26057,13 @@ in sources."bitfield-0.1.0" (sources."bittorrent-dht-3.2.6" // { dependencies = [ - sources."debug-2.6.0" + sources."debug-2.6.1" ]; }) (sources."bittorrent-tracker-2.12.1" // { dependencies = [ sources."bencode-0.6.0" - sources."debug-2.6.0" + sources."debug-2.6.1" ]; }) sources."bncode-0.5.3" @@ -26041,11 +26217,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" @@ -26098,9 +26274,9 @@ in sources."graceful-fs-4.1.11" sources."iconv-lite-0.4.15" sources."mkdirp-0.5.1" - sources."private-0.1.6" + sources."private-0.1.7" sources."q-1.4.1" - sources."recast-0.11.20" + sources."recast-0.11.21" sources."graceful-readlink-1.0.1" sources."acorn-3.3.0" sources."defined-1.0.0" @@ -26114,7 +26290,7 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."minimist-0.0.8" - sources."ast-types-0.9.4" + sources."ast-types-0.9.5" sources."esprima-3.1.3" sources."source-map-0.5.6" sources."base62-0.1.1" @@ -26163,7 +26339,7 @@ in sources."crypto-0.0.3" sources."xml2js-0.2.4" sources."xmlbuilder-0.4.2" - sources."sax-1.2.1" + sources."sax-1.2.2" sources."coffee-script-1.6.3" sources."node-uuid-1.4.1" (sources."connect-2.11.0" // { @@ -26179,7 +26355,7 @@ in sources."methods-0.1.0" sources."send-0.1.4" sources."cookie-signature-1.0.1" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."qs-0.6.5" sources."bytes-0.2.1" sources."pause-0.0.1" @@ -26209,7 +26385,7 @@ in sources."formidable-1.0.11" sources."crc-0.2.0" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -26274,11 +26450,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."events.node-0.4.9" @@ -26313,13 +26489,12 @@ in sha1 = "36bf5209356facbf6cef18fa32274d116043ed24"; }; dependencies = [ - sources."express-5.0.0-alpha.2" + sources."express-5.0.0-alpha.3" sources."express-json5-0.1.0" - (sources."body-parser-1.16.0" // { + (sources."body-parser-1.16.1" // { dependencies = [ sources."bytes-2.4.0" - sources."debug-2.6.0" - sources."depd-1.1.0" + sources."debug-2.6.1" sources."iconv-lite-0.4.15" sources."qs-6.2.1" sources."raw-body-2.2.0" @@ -26328,19 +26503,12 @@ in }) (sources."compression-1.6.2" // { dependencies = [ - sources."accepts-1.3.3" sources."bytes-2.3.0" - sources."vary-1.1.0" - sources."negotiator-0.6.1" ]; }) sources."commander-2.9.0" - sources."js-yaml-3.7.0" - (sources."cookies-0.6.2" // { - dependencies = [ - sources."depd-1.1.0" - ]; - }) + sources."js-yaml-3.8.1" + sources."cookies-0.6.2" (sources."request-2.79.0" // { dependencies = [ sources."qs-6.3.0" @@ -26359,12 +26527,7 @@ in sources."JSONStream-1.3.0" sources."mkdirp-0.5.1" sources."sinopia-htpasswd-0.4.5" - (sources."http-errors-1.5.1" // { - dependencies = [ - sources."setprototypeof-1.0.2" - sources."statuses-1.3.1" - ]; - }) + sources."http-errors-1.5.1" (sources."readable-stream-1.1.14" // { dependencies = [ sources."isarray-0.0.1" @@ -26372,63 +26535,50 @@ in }) sources."fs-ext-0.5.0" sources."crypt3-0.2.0" - sources."accepts-1.2.13" - sources."array-flatten-1.1.0" - sources."content-disposition-0.5.0" + sources."accepts-1.3.3" + sources."array-flatten-2.1.1" + sources."content-disposition-0.5.2" sources."content-type-1.0.2" - sources."cookie-0.1.3" + sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."debug-2.2.0" - sources."depd-1.0.1" - sources."escape-html-1.0.2" + sources."depd-1.1.0" + sources."encodeurl-1.0.1" + sources."escape-html-1.0.3" sources."etag-1.7.0" - sources."finalhandler-0.4.0" + sources."finalhandler-0.5.1" sources."fresh-0.3.0" - sources."merge-descriptors-1.0.0" + sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" sources."parseurl-1.3.1" - sources."path-is-absolute-1.0.0" - sources."path-to-regexp-0.1.6" - sources."proxy-addr-1.0.10" - sources."qs-4.0.0" - sources."range-parser-1.0.3" - (sources."router-1.1.4" // { + sources."path-is-absolute-1.0.1" + sources."path-to-regexp-0.1.7" + sources."proxy-addr-1.1.3" + sources."qs-6.2.0" + sources."range-parser-1.2.0" + sources."router-1.1.5" + (sources."send-0.14.2" // { dependencies = [ - sources."array-flatten-2.0.0" - sources."path-to-regexp-0.1.7" - ]; - }) - (sources."send-0.13.0" // { - dependencies = [ - sources."http-errors-1.3.1" - ]; - }) - (sources."serve-static-1.10.3" // { - dependencies = [ - sources."escape-html-1.0.3" - sources."send-0.13.2" - sources."depd-1.1.0" - sources."destroy-1.0.4" - sources."http-errors-1.3.1" + sources."ms-0.7.2" ]; }) + sources."serve-static-1.11.2" sources."type-is-1.6.14" - sources."vary-1.0.1" sources."utils-merge-1.0.0" + sources."vary-1.1.0" sources."mime-types-2.1.14" - sources."negotiator-0.5.3" + sources."negotiator-0.6.1" sources."mime-db-1.26.0" sources."ms-0.7.1" + sources."statuses-1.3.1" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.0.5" - sources."setprototypeof-1.0.0" - sources."destroy-1.0.3" + sources."ipaddr.js-1.2.0" + sources."setprototypeof-1.0.2" + sources."destroy-1.0.4" sources."mime-1.3.4" - sources."statuses-1.2.1" - sources."inherits-2.0.3" sources."media-typer-0.3.0" sources."raw-body-1.3.4" sources."bytes-1.0.0" @@ -26437,11 +26587,11 @@ in sources."on-headers-1.0.1" sources."graceful-readlink-1.0.1" sources."argparse-1.0.9" - sources."esprima-2.7.3" + sources."esprima-3.1.3" sources."sprintf-js-1.0.3" sources."keygrip-1.0.1" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -26500,11 +26650,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" @@ -26512,7 +26662,7 @@ in sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" sources."moment-2.17.1" - sources."nan-2.5.0" + sources."nan-2.5.1" sources."ncp-2.0.0" sources."rimraf-2.4.5" (sources."glob-6.0.4" // { @@ -26521,6 +26671,7 @@ in ]; }) sources."inflight-1.0.6" + sources."inherits-2.0.3" sources."once-1.4.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -26579,16 +26730,17 @@ in sloc = nodeEnv.buildNodePackage { name = "sloc"; packageName = "sloc"; - version = "0.1.11"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sloc/-/sloc-0.1.11.tgz"; - sha1 = "341f94d44fe9b977c9e2109b134aa92f6394d411"; + url = "https://registry.npmjs.org/sloc/-/sloc-0.2.0.tgz"; + sha1 = "b42d3da1a442a489f454c32c628e8ebf0007875c"; }; dependencies = [ - sources."async-1.5.2" + sources."async-2.1.4" sources."cli-table-0.3.1" sources."commander-2.9.0" sources."readdirp-2.1.0" + sources."lodash-4.17.4" sources."colors-1.0.3" sources."graceful-readlink-1.0.1" sources."graceful-fs-4.1.11" @@ -26694,15 +26846,15 @@ in sources."dtrace-provider-0.6.0" sources."precond-0.2.3" sources."csv-generate-0.0.6" - sources."csv-parse-1.1.10" - sources."stream-transform-0.1.1" + sources."csv-parse-1.2.0" + sources."stream-transform-0.1.2" sources."csv-stringify-0.0.8" sources."asn1-0.1.11" sources."ctype-0.5.3" sources."wrappy-1.0.2" sources."extsprintf-1.2.0" sources."core-util-is-1.0.2" - sources."nan-2.5.0" + sources."nan-2.5.1" sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" sources."mkdirp-0.5.1" @@ -26742,7 +26894,7 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -26765,7 +26917,7 @@ in dependencies = [ sources."css-parse-1.7.0" sources."mkdirp-0.5.1" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."sax-0.5.8" sources."glob-7.0.6" sources."source-map-0.1.43" @@ -26794,19 +26946,19 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-0.7.1.tgz"; - sha1 = "287320fed972cb097e72c2bb1685f96fe08f8034"; + url = "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz"; + sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5"; }; dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" sources."coa-1.0.1" - sources."js-yaml-3.6.1" + sources."js-yaml-3.7.0" sources."colors-1.1.2" sources."whet.extend-0.9.9" sources."mkdirp-0.5.1" - sources."csso-2.2.1" + sources."csso-2.3.1" sources."q-1.4.1" sources."argparse-1.0.9" sources."esprima-2.7.3" @@ -26830,6 +26982,49 @@ in }; production = true; }; + tern = nodeEnv.buildNodePackage { + name = "tern"; + packageName = "tern"; + version = "0.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tern/-/tern-0.20.0.tgz"; + sha1 = "5058e1ae15a121a1f421500ced0c852c11e6fb34"; + }; + dependencies = [ + sources."acorn-3.3.0" + sources."enhanced-resolve-2.3.0" + (sources."glob-3.2.11" // { + dependencies = [ + sources."minimatch-0.3.0" + ]; + }) + sources."minimatch-0.2.14" + sources."resolve-from-2.0.0" + sources."tapable-0.2.6" + sources."memory-fs-0.3.0" + sources."graceful-fs-4.1.11" + sources."object-assign-4.1.1" + sources."errno-0.1.4" + sources."readable-stream-2.2.2" + sources."prr-0.0.0" + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."inherits-2.0.3" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."lru-cache-2.7.3" + sources."sigmund-1.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A JavaScript code analyzer for deep, cross-editor language support"; + homepage = "https://github.com/ternjs/tern#readme"; + license = "MIT"; + }; + production = true; + }; titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; @@ -26893,7 +27088,7 @@ in sources."wordwrap-0.0.3" sources."minimist-0.0.10" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."bl-1.0.3" sources."caseless-0.11.0" sources."combined-stream-1.0.5" @@ -26962,11 +27157,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.26.0" sources."uglify-to-browserify-1.0.2" sources."yargs-3.10.0" @@ -27006,10 +27201,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz"; - sha1 = "6fe9479e00e01855247cea216e7561bafcdbcd4a"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.1.6.tgz"; + sha1 = "40c7e6e9e5da7961b7718b55505f9cac9487a607"; }; buildInputs = globalBuildInputs; meta = { @@ -27057,10 +27252,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.0.1"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.0.1.tgz"; - sha1 = "83b852a8811f4c8f1446fd4f53b19a541c327418"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.7.tgz"; + sha1 = "eb4ba66b38ec553396fe21ec338181b88c72bf4b"; }; dependencies = [ sources."async-2.1.4" @@ -27071,12 +27266,12 @@ in sources."cookie-parser-1.4.3" sources."crossroads-0.12.2" sources."diff2html-2.0.12" - sources."express-4.14.0" + sources."express-4.14.1" sources."express-session-1.14.2" sources."forever-monitor-1.1.0" sources."getmac-1.2.1" sources."hasher-1.2.0" - sources."ignore-3.2.0" + sources."ignore-3.2.2" sources."keen.io-0.1.3" sources."knockout-3.4.1" sources."lodash-4.17.4" @@ -27128,7 +27323,7 @@ in sources."os-homedir-1.0.2" sources."passport-0.3.2" sources."passport-local-1.0.0" - (sources."raven-1.1.1" // { + (sources."raven-1.1.2" // { dependencies = [ sources."json-stringify-safe-5.0.1" sources."uuid-3.0.0" @@ -27141,7 +27336,7 @@ in }) sources."rimraf-2.5.4" sources."semver-5.3.0" - sources."serve-static-1.11.1" + sources."serve-static-1.11.2" sources."signals-1.0.0" sources."snapsvg-0.4.0" (sources."socket.io-1.7.2" // { @@ -27213,11 +27408,11 @@ in sources."abbrev-1.0.9" sources."accepts-1.3.3" sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - sources."finalhandler-0.5.0" + sources."finalhandler-0.5.1" sources."fresh-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" @@ -27225,7 +27420,11 @@ in sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.3" sources."range-parser-1.2.0" - sources."send-0.14.1" + (sources."send-0.14.2" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) sources."utils-merge-1.0.0" sources."vary-1.1.0" sources."negotiator-0.6.1" @@ -27461,10 +27660,9 @@ in sources."builtin-modules-1.1.1" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.2" + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."supports-color-0.2.0" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -27484,7 +27682,7 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."extend-3.0.0" sources."har-validator-2.0.6" @@ -27494,17 +27692,14 @@ in sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -27532,11 +27727,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."stream-iterate-1.2.0" sources."block-stream-0.0.9" @@ -27770,11 +27965,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" @@ -27811,48 +28006,51 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "1.14.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-1.14.0.tgz"; - sha1 = "54f1ffb92051a328a5b2057d6ae33c289462c823"; + url = "https://registry.npmjs.org/webpack/-/webpack-2.2.1.tgz"; + sha1 = "7bb1d72ae2087dd1a4af526afec15eed17dda475"; }; dependencies = [ - sources."acorn-3.3.0" - sources."async-1.5.2" - sources."clone-1.0.2" - (sources."enhanced-resolve-0.9.1" // { - dependencies = [ - sources."memory-fs-0.2.0" - ]; - }) - sources."interpret-0.6.6" + sources."acorn-4.0.11" + sources."acorn-dynamic-import-2.0.1" + sources."ajv-4.11.3" + sources."ajv-keywords-1.5.1" + sources."async-2.1.4" + sources."enhanced-resolve-3.1.0" + sources."interpret-1.0.1" + sources."json-loader-0.5.4" + sources."loader-runner-2.3.0" sources."loader-utils-0.2.16" - sources."memory-fs-0.3.0" + sources."memory-fs-0.4.1" sources."mkdirp-0.5.1" - sources."node-libs-browser-0.7.0" - sources."optimist-0.6.1" + sources."node-libs-browser-2.0.0" + sources."source-map-0.5.6" sources."supports-color-3.2.3" - sources."tapable-0.1.10" + sources."tapable-0.2.6" (sources."uglify-js-2.7.5" // { dependencies = [ sources."async-0.2.10" + sources."yargs-3.10.0" ]; }) - (sources."watchpack-0.2.9" // { + sources."watchpack-1.2.0" + sources."webpack-sources-0.1.4" + (sources."yargs-6.6.0" // { dependencies = [ - sources."async-0.9.2" - ]; - }) - (sources."webpack-core-0.6.9" // { - dependencies = [ - sources."source-map-0.4.4" + sources."camelcase-3.0.0" + sources."cliui-3.2.0" ]; }) + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" + sources."lodash-4.17.4" sources."graceful-fs-4.1.11" + sources."object-assign-4.1.1" sources."big.js-3.1.3" sources."emojis-list-2.1.0" sources."json5-0.5.1" - sources."object-assign-4.1.1" sources."errno-0.1.4" sources."readable-stream-2.2.2" sources."prr-0.0.0" @@ -27869,7 +28067,7 @@ in sources."buffer-4.9.1" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" - sources."crypto-browserify-3.3.0" + sources."crypto-browserify-3.11.0" sources."domain-browser-1.1.7" sources."events-1.1.1" sources."https-browserify-0.0.1" @@ -27897,31 +28095,47 @@ in sources."base64-js-1.2.0" sources."ieee754-1.1.8" sources."date-now-0.1.4" - sources."pbkdf2-compat-2.0.1" - sources."ripemd160-0.2.0" - sources."sha.js-2.2.6" - sources."browserify-aes-0.4.0" + sources."browserify-cipher-1.0.0" + sources."browserify-sign-4.0.0" + sources."create-ecdh-4.0.0" + sources."create-hash-1.1.2" + sources."create-hmac-1.1.4" + sources."diffie-hellman-5.0.2" + sources."pbkdf2-3.0.9" + sources."public-encrypt-4.0.0" + sources."randombytes-2.0.3" + sources."browserify-aes-1.0.6" + sources."browserify-des-1.0.0" + sources."evp_bytestokey-1.0.0" + sources."buffer-xor-1.0.3" + sources."cipher-base-1.0.3" + sources."des.js-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."bn.js-4.11.6" + sources."browserify-rsa-4.0.1" + sources."elliptic-6.3.3" + sources."parse-asn1-5.0.0" + sources."brorand-1.0.7" + sources."hash.js-1.0.3" + sources."asn1.js-4.9.1" + sources."ripemd160-1.0.1" + sources."sha.js-2.4.8" + sources."miller-rabin-4.0.0" sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" sources."xtend-4.0.1" sources."setimmediate-1.0.5" sources."querystring-0.2.0" sources."indexof-0.0.1" - sources."wordwrap-0.0.3" sources."has-flag-1.0.0" - sources."source-map-0.5.6" sources."uglify-to-browserify-1.0.2" - sources."yargs-3.10.0" sources."camelcase-1.2.1" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) + sources."cliui-2.1.0" sources."decamelize-1.2.0" sources."window-size-0.1.0" sources."center-align-0.1.3" sources."right-align-0.1.3" + sources."wordwrap-0.0.2" sources."align-text-0.1.4" sources."lazy-cache-1.0.4" sources."kind-of-3.1.0" @@ -27972,8 +28186,8 @@ in sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."nan-2.5.0" - sources."node-pre-gyp-0.6.32" + sources."nan-2.5.1" + sources."node-pre-gyp-0.6.33" sources."nopt-3.0.6" sources."npmlog-4.0.2" (sources."rc-1.1.6" // { @@ -27994,14 +28208,10 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { - dependencies = [ - sources."supports-color-0.2.0" - ]; - }) + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -28015,7 +28225,7 @@ in sources."ini-1.3.4" sources."strip-json-comments-1.0.4" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -28078,11 +28288,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.26.0" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -28096,11 +28306,44 @@ in sources."uid-number-0.0.6" sources."ms-0.7.1" sources."source-list-map-0.1.8" - sources."amdefine-1.0.1" + sources."get-caller-file-1.0.2" + sources."os-locale-1.4.0" + sources."read-pkg-up-1.0.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."which-module-1.0.0" + sources."y18n-3.2.1" + (sources."yargs-parser-4.2.1" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) + sources."wrap-ansi-2.1.0" + sources."lcid-1.0.0" + sources."invert-kv-1.0.0" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."load-json-file-1.1.0" + sources."normalize-package-data-2.3.5" + sources."path-type-1.1.0" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.0" + sources."is-arrayish-0.2.1" + sources."is-utf8-0.2.1" + sources."hosted-git-info-2.2.0" + sources."is-builtin-module-1.0.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" ]; buildInputs = globalBuildInputs; meta = { - description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff."; + description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff."; homepage = https://github.com/webpack/webpack; license = "MIT"; }; @@ -28138,7 +28381,7 @@ in sources."cmd-shim-2.0.2" sources."commander-2.9.0" sources."death-1.1.0" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."defaults-1.0.3" sources."detect-indent-4.0.0" sources."diff-2.2.3" @@ -28216,7 +28459,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."loose-envify-1.3.1" - sources."js-tokens-3.0.0" + sources."js-tokens-3.0.1" sources."builtin-modules-1.1.1" sources."ci-info-1.0.0" sources."currently-unhandled-0.4.1" @@ -28241,14 +28484,10 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { - dependencies = [ - sources."supports-color-0.2.0" - ]; - }) + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."wide-align-1.1.0" sources."os-homedir-1.0.2" @@ -28256,7 +28495,7 @@ in sources."retry-0.10.1" sources."is-finite-1.0.2" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" @@ -28307,11 +28546,11 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.26.0" sources."punycode-1.4.1" sources."is-utf8-0.2.1" diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 8c1c9515926..5f48cb9b02e 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -22,6 +22,7 @@ , "gulp" , "hipache" , "htmlhint" +, "ios-deploy" , "istanbul" , "jayschema" , "jshint" @@ -32,6 +33,7 @@ , { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" } , "lcov-result-merger" , "meat" +, "mocha" , "nijs" , "node2nix" , "node-gyp" @@ -55,6 +57,7 @@ , "smartdc" , "stylus" , "svgo" +, "tern" , "titanium" , "typescript" , "uglify-js" diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix new file mode 100644 index 00000000000..56509ab5786 --- /dev/null +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, ocaml, cstruct, result, findlib, ocaml_oasis }: + +stdenv.mkDerivation rec { + version = "0.3.0"; + name = "ocaml-angstrom-${version}"; + + src = fetchFromGitHub { + owner = "inhabitedtype"; + repo = "angstrom"; + rev = "${version}"; + sha256 = "1x9pvy5vw98ns4pspj7i10pmgqyngn4v4cdlz5pbvwbrpwpn090q"; + }; + + createFindlibDestdir = true; + + buildInputs = [ ocaml ocaml_oasis findlib ]; + propagatedBuildInputs = [ result cstruct ]; + + meta = { + homepage = https://github.com/inhabitedtype/angstrom; + description = "OCaml parser combinators built for speed and memory efficiency"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix new file mode 100644 index 00000000000..0e73c6a73d3 --- /dev/null +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-apron-${version}"; + version = "20160125"; + src = fetchzip { + url = "http://apron.gforge.inria.fr/apron-${version}.tar.gz"; + sha256 = "1a7b7b9wsd0gdvm41lgg6ayb85wxc2a3ggcrghy4qiphs4b9v4m4"; + }; + + buildInputs = [ perl gmp mpfr ppl ocaml findlib camlidl ]; + propagatedBuildInputs = [ mlgmpidl ]; + + prefixKey = "-prefix "; + createFindlibDestdir = true; + + meta = { + license = stdenv.lib.licenses.lgpl21; + homepage = http://apron.cri.ensmp.fr/library/; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + description = "Numerical abstract domain library"; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 5a22e37d821..99f101010f3 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri, fieldslib_p4 +{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri_p4, fieldslib_p4 , sexplib_p4, conduit , stringext, base64, magic-mime, ounit, alcotest , asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" , lwt ? null, async_p4 ? null, async_ssl_p4 ? null @@ -17,7 +17,7 @@ buildOcaml rec { buildInputs = [ alcotest cmdliner conduit magic-mime ounit lwt ] ++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ]; - propagatedBuildInputs = [ re stringext uri fieldslib_p4 sexplib_p4 base64 ]; + propagatedBuildInputs = [ re stringext uri_p4 fieldslib_p4 sexplib_p4 base64 ]; buildFlags = "PREFIX=$(out)"; diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index afe44ea0a7f..22c74d7f92e 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri, cstruct, ipaddr +{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr , asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" , async_p4 ? null, async_ssl_p4 ? null, lwt ? null }: @@ -12,7 +12,7 @@ buildOcaml rec { sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1"; }; - propagatedBuildInputs = [ sexplib_p4 stringext uri cstruct ipaddr ]; + propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr ]; buildInputs = stdenv.lib.optional (lwt != null) lwt ++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4 ++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4; diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix new file mode 100644 index 00000000000..eaf07818aeb --- /dev/null +++ b/pkgs/development/ocaml-modules/cow/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib +, ocamlbuild, topkg, opam +, uri, xmlm, omd, ezjsonm }: + +stdenv.mkDerivation rec { + version = "2.2.0"; + name = "ocaml-cow-${version}"; + + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-cow"; + rev = "v${version}"; + sha256 = "0snhabg7rfrrcq2ksr3qghiawd61cw3y4kp6rl7vs87j4cnk3kr2"; + }; + + createFindlibDestdir = true; + + buildInputs = [ ocaml opam ocamlbuild findlib topkg ]; + propagatedBuildInputs = [ xmlm uri ezjsonm omd ]; + + inherit (topkg) buildPhase installPhase; + + meta = with stdenv.lib; { + description = "Caml on the Web"; + longDescription = '' + Caml on the Web (COW) is a set of parsers and syntax extensions to let you manipulate HTML, CSS, XML, JSON and Markdown directly from OCaml code. + ''; + license = licenses.isc; + maintainers = [ maintainers.sternenseemann ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix new file mode 100644 index 00000000000..4fd75e7aac5 --- /dev/null +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, ocaml, findlib, ncurses }: + +stdenv.mkDerivation rec { + name = "ocaml-curses-${version}"; + version = "1.0.3"; + + src = fetchurl { + url = "http://ocaml.phauna.org/distfiles/ocaml-curses-${version}.ogunden1.tar.gz"; + sha256 = "0fxya4blx4zcp9hy8gxxm2z7aas7hfvwnjdlj9pmh0s5gijpwsll"; + }; + + propagatedBuildInputs = [ ncurses ]; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + postPatch = '' + substituteInPlace curses.ml --replace "pp gcc" "pp $CC" + ''; + + buildPhase = "make all opt"; + + meta = with stdenv.lib; { + description = "OCaml Bindings to curses/ncurses"; + homepage = https://opam.ocaml.org/packages/curses/curses.1.0.3/; + license = licenses.gpl2; + maintainers = [ maintainers.volth ]; + platforms = ocaml.meta.platforms or []; + }; +} diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix new file mode 100644 index 00000000000..26876cad8c8 --- /dev/null +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-dolmen-${version}"; + version = "0.2"; + src = fetchFromGitHub { + owner = "Gbury"; + repo = "dolmen"; + rev = "v${version}"; + sha256 = "1b9mf8p6mic0n76acx8x82hhgm2n40sdv0jri95im65l52223saf"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + propagatedBuildInputs = [ menhir ]; + + makeFlags = "-C src"; + + createFindlibDestdir = true; + + meta = { + description = "An OCaml library providing clean and flexible parsers for input languages"; + license = stdenv.lib.licenses.bsd2; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index 4d63b0c3f95..44d8ce393fb 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib_p4, lwt }: +{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib, lwt }: -let version = "0.4.1"; in +let version = "0.4.3"; in stdenv.mkDerivation { name = "ocaml-ezjsonm-${version}"; src = fetchzip { url = "https://github.com/mirage/ezjsonm/archive/${version}.tar.gz"; - sha256 = "0cfjh8awajvw6kkmxr65dvri4k6h29pynxvk76a8c2lkixpsc095"; + sha256 = "1y6p3ga6vj1wx5dyns7hjgd0qgrrn2hnn323a7y5didgci5pybls"; }; - buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ jsonm hex sexplib_p4 lwt ]; + buildInputs = [ ocaml findlib lwt ]; + propagatedBuildInputs = [ jsonm hex sexplib ]; createFindlibDestdir = true; configureFlags = "--enable-lwt"; diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 224f3537a2e..8ead12427fd 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: stdenv.mkDerivation rec { - name = "gapi-ocaml-0.2.10"; + name = "gapi-ocaml-0.3.1"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1601/${name}.tar.gz"; - sha256 = "0kg4j7dhr7jynpy8x53bflqjf78jyl14j414l6px34xz7c9qx5fl"; + url = "https://forge.ocamlcore.org/frs/download.php/1665/${name}.tar.gz"; + sha256 = "1fn563k9mpqp61909l5bzddnkyn04bk106vrcr7qiim1d2i6cf8i"; }; buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ]; diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix new file mode 100644 index 00000000000..ab0b6c8579b --- /dev/null +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam +, topkg, result, lwt, cmdliner, fmt }: +let + pname = "logs"; + webpage = "http://erratique.ch/software/${pname}"; +in + +assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; + +stdenv.mkDerivation rec { + name = "ocaml-${pname}-${version}"; + version = "0.6.2"; + + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + sha256 = "1khbn7jqpid83zn8rvyh1x1sirls7zc878zj4fz985m5xlsfy853"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib ocamlbuild opam topkg fmt cmdliner lwt ]; + propagatedBuildInputs = [ result ]; + + buildPhase = '' + ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build \ + --with-js_of_ocaml false + ''; + + inherit (topkg) installPhase; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + description = "Logging infrastructure for OCaml"; + homepage = "${webpage}"; + inherit (ocaml.meta) platforms; + maintainers = [ maintainers.sternenseemann ]; + license = licenses.isc; + }; +} diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 9592e9a68d8..e7e29c73a6b 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild -, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20161115" else "20140422" +, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170101" else "20140422" }@args: let sha256 = if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d" - else if version == "20161115" then "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k" + else if version == "20170101" then "0ika46i9gn3sjvspa62fb5dnr20k783vg5fj30649q0ialv6yscr" else throw ("menhir: unknown version " ++ version); in diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix new file mode 100644 index 00000000000..7e12abe386b --- /dev/null +++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, camlidl, gmp, mpfr }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-mlgmpidl-${version}"; + version = "1.2.4"; + src = fetchFromGitHub { + owner = "nberth"; + repo = "mlgmpidl"; + rev = version; + sha256 = "09f9rk2bavhb7cdwjpibjf8bcjk59z85ac9dr8nvks1s842dp65s"; + }; + + buildInputs = [ gmp mpfr ocaml findlib camlidl ]; + + configurePhase = '' + cp Makefile.config.model Makefile.config + sed -i Makefile.config \ + -e 's|^MLGMPIDL_PREFIX.*$|MLGMPIDL_PREFIX = $out|' \ + -e 's|^GMP_PREFIX.*$|GMP_PREFIX = ${gmp.dev}|' \ + -e 's|^MPFR_PREFIX.*$|MPFR_PREFIX = ${mpfr.dev}|' \ + -e 's|^CAMLIDL_DIR.*$|CAMLIDL_DIR = ${camlidl}/lib/ocaml/${ocaml.version}/site-lib/camlidl|' + echo HAS_NATIVE_PLUGINS = 1 >> Makefile.config + sed -i Makefile \ + -e 's|^ /bin/rm | rm |' + ''; + + createFindlibDestdir = true; + + meta = { + description = "OCaml interface to the GMP library"; + homepage = https://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/; + license = stdenv.lib.licenses.lgpl21; + inherit (ocaml.meta) platforms; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix new file mode 100644 index 00000000000..a26109bd4f9 --- /dev/null +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, js_of_ocaml +, jsooSupport ? !(stdenv.lib.versionAtLeast ocaml.version "4.04") +}: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-mtime-0.8.3"; + + src = fetchurl { + url = http://erratique.ch/software/mtime/releases/mtime-0.8.3.tbz; + sha256 = "1hfx4ny2dkw6jf3jppz0640dafl5xgn8r2si9kpwzhmibal8qrah"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib ocamlbuild opam ] + ++ stdenv.lib.optional jsooSupport js_of_ocaml; + + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true jsoo=${if jsooSupport then "true" else "false"}"; + + installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; + + meta = { + description = "Monotonic wall-clock time for OCaml"; + homepage = http://erratique.ch/software/mtime; + inherit (ocaml.meta) platforms; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix new file mode 100644 index 00000000000..d8a874a7e2f --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, ocaml, findlib, camlp4, ounit, gettext, fileutils, camomile }: + +stdenv.mkDerivation rec { + name = "ocaml-gettext-${version}"; + version = "0.3.5"; + + src = fetchurl { + url = "https://forge.ocamlcore.org/frs/download.php/1433/ocaml-gettext-${version}.tar.gz"; + sha256 = "0s625h7y9xxqvzk4bnw45k4wvl4fn8gblv56bp47il0lgsx8956i"; + }; + + propagatedBuildInputs = [ gettext fileutils camomile ]; + + buildInputs = [ ocaml findlib camlp4 ounit ]; + + postPatch = stdenv.lib.optionalString (camlp4 != null) '' + substituteInPlace test/test.ml --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" + substituteInPlace ocaml-gettext/OCamlGettext.ml --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" + substituteInPlace ocaml-gettext/Makefile --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" + substituteInPlace ocaml-gettext/Makefile --replace "unix.cma" "" + substituteInPlace libgettext-ocaml/Makefile --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" + substituteInPlace libgettext-ocaml/Makefile --replace "\$(shell ocamlc -where)" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib" + ''; + + configureFlags = [ "--disable-doc" ]; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + description = "OCaml Bindings to gettext"; + homepage = https://forge.ocamlcore.org/projects/ocaml-gettext; + license = licenses.gpl2; + maintainers = [ maintainers.volth ]; + platforms = ocaml.meta.platforms or []; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix new file mode 100644 index 00000000000..439beaa24ff --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, libvirt, ocaml, findlib }: + +stdenv.mkDerivation rec { + name = "ocaml-libvirt-${version}"; + version = "0.6.1.4"; + + src = fetchurl { + url = "http://libvirt.org/sources/ocaml/ocaml-libvirt-${version}.tar.gz"; + sha256 = "06q2y36ckb34n179bwczxkl82y3wrba65xb2acg8i04jpiyxadjd"; + }; + + propagatedBuildInputs = [ libvirt ]; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + buildPhase = if stdenv.cc.isClang then "make all opt CPPFLAGS=-Wno-error" else "make all opt"; + + installPhase = "make install-opt"; + + meta = with stdenv.lib; { + description = "OCaml bindings for libvirt"; + homepage = https://libvirt.org/ocaml/; + license = licenses.gpl2; + maintainers = [ maintainers.volth ]; + platforms = ocaml.meta.platforms or []; + }; +} diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index d2d66994604..65344561795 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchzip, ocaml, findlib, oasis, ocaml_optcomp, camlp4 }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4 }: -let version = "0.7"; in +let version = "0.7.1"; in stdenv.mkDerivation { name = "ocsigen-deriving-${version}"; src = fetchzip { url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz"; - sha256 = "05z606gly1iyan292x3mflg3zasgg68n8i2mivz0zbshx2hz2jbw"; + sha256 = "0gg3nr3iic4rwqrcc0qvfm9x0x57zclvdsnpy0z8rv2fl5isbzms"; }; - buildInputs = [ ocaml findlib oasis ocaml_optcomp camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild oasis ocaml_optcomp camlp4 ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index 7afbf3a4b40..8953373954a 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "ocaml-optcomp-1.6"; src = fetchurl { url = https://github.com/diml/optcomp/archive/1.6.tar.gz; - md5 = "d3587244dba1b8b10f24d0b60a8c700d"; - }; + sha256 = "0hhhb2gisah1h22zlg5iszbgqxdd7x85cwd57bd4mfkx9l7dh8jh"; + }; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 33bf180cd7f..62aa97de5fa 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -1,19 +1,25 @@ { stdenv, fetchFromGitHub, ocaml, findlib }: -let - version = - if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.03" then "5.0+4.03.0" else "5.0+4.02.0"; +let param = { + "4.02.3" = { + version = "5.0+4.02.0"; + sha256 = "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8"; }; + "4.03.0" = { + version = "5.0+4.03.0"; + sha256 = "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg"; }; + "4.04.0" = { + version = "unstable-20161114"; + rev = "49c08e2e4ea8fef88692cd1dcc1b38a9133f17ac"; + sha256 = "0ywzfkf5brj33nwh49k9if8x8v433ral25f3nbklfc9vqr06zrfl"; }; +}."${ocaml.version}"; in stdenv.mkDerivation { - name = "ocaml-ppx_tools-${version}"; + name = "ocaml${ocaml.version}-ppx_tools-${param.version}"; src = fetchFromGitHub { owner = "alainfrisch"; repo = "ppx_tools"; - rev = version; - sha256 = if version == "5.0+4.03.0" - then "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg" - else "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8" - ; + rev = if param ? rev then param.rev else param.version; + inherit (param) sha256; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/spacetime_lib/default.nix b/pkgs/development/ocaml-modules/spacetime_lib/default.nix new file mode 100644 index 00000000000..c12e47968ef --- /dev/null +++ b/pkgs/development/ocaml-modules/spacetime_lib/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, owee }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-spacetime_lib-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "lpw25"; + repo = "spacetime_lib"; + rev = version; + sha256 = "1g91y6wl3z18jhaz2q03wn54zj6xk1qcjidr1nc6nq9a8906lcq5"; + }; + + buildInputs = [ ocaml findlib ]; + + propagatedBuildInputs = [ owee ]; + + createFindlibDestdir = true; + + meta = { + description = "An OCaml library providing some simple operations for handling OCaml “spacetime” profiles"; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index a6335274f73..c7d991504ec 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -1,19 +1,32 @@ -{ stdenv, fetchzip, ocaml, findlib, re, sexplib_p4, stringext, ounit }: +{ stdenv, fetchzip, ocaml, findlib, re, stringext, ounit +, sexplib, ppx_sexp_conv +, legacyVersion ? false +, sexplib_p4 +}: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; +assert stdenv.lib.versionAtLeast ocaml.version "4"; -let version = "1.9.1"; in +with + if legacyVersion + then { + version = "1.9.1"; + sha256 = "0v3jxqgyi4kj92r3x83rszfpnvvzy9lyb913basch4q64yka3w85"; + } else { + version = "1.9.2"; + sha256 = "137pg8j654x7r0d1664iy2zp3l82nki1kkh921lwdrwc5qqdl6jx"; + }; stdenv.mkDerivation { - name = "ocaml-uri-${version}"; + name = "ocaml${ocaml.version}-uri-${version}"; src = fetchzip { url = "https://github.com/mirage/ocaml-uri/archive/v${version}.tar.gz"; - sha256 = "0v3jxqgyi4kj92r3x83rszfpnvvzy9lyb913basch4q64yka3w85"; + inherit sha256; }; - buildInputs = [ ocaml findlib ounit ]; - propagatedBuildInputs = [ re sexplib_p4 stringext ]; + buildInputs = [ ocaml findlib ounit ] + ++ stdenv.lib.optional (!legacyVersion) ppx_sexp_conv; + propagatedBuildInputs = [ re (if legacyVersion then sexplib_p4 else sexplib) stringext ]; configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; buildPhase = '' diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index aa6047c7901..cb7878ac731 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opam, topkg +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg , uchar, result, gg, uutf, otfm, js_of_ocaml, pdfBackend ? true, # depends on uutf and otfm htmlcBackend ? true # depends on js_of_ocaml @@ -17,14 +17,14 @@ assert versionAtLeast ocaml.version "4.02.0"; stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; + name = "ocaml${ocaml.version}-${pname}-${version}"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; sha256 = "1czd2fq85hy24w5pllarsq4pvbx9rda5zdikxfxdng8s9kff2h3f"; }; - buildInputs = [ ocaml findlib opam topkg ]; + buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; propagatedBuildInputs = [ uchar result gg ] ++ optionals pdfBackend [ uutf otfm ] diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 6e6722a804f..02004061b83 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ''; homepage = http://pharo.org; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + maintainers = [ ]; platforms = pharo-vm.meta.platforms; }; } diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 8265e1dc776..1eeb5dc3151 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ''; homepage = http://pharo.org; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + maintainers = [ ]; # Pharo VM sources are packaged separately for darwin (OS X) platforms = with stdenv.lib; intersectLists diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index 46d25334260..aba42e3981c 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/pkgs/development/pharo/vm/share.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { description = "Shared files for Pharo"; homepage = http://pharo.org; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix new file mode 100644 index 00000000000..1233b94dccd --- /dev/null +++ b/pkgs/development/python-modules/aenum/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "aenum"; + version = "1.4.7"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bvn2k53nz99fiwql5fkl0fh7xjw8ama9qzdjp36609mpk05ikl8"; + }; + + meta = { + description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants"; + maintainer = with stdenv.lib.maintainers; [ vrthra ]; + license = with stdenv.lib.licenses; [ bsd3 ]; + homepage = https://bitbucket.org/stoneleaf/aenum; + }; +} diff --git a/pkgs/development/python-modules/ansible/2.1.nix b/pkgs/development/python-modules/ansible/2.1.nix new file mode 100644 index 00000000000..077bfa198aa --- /dev/null +++ b/pkgs/development/python-modules/ansible/2.1.nix @@ -0,0 +1,61 @@ +{ lib +, fetchurl +, buildPythonPackage +, pycrypto +, paramiko +, jinja2 +, pyyaml +, httplib2 +, boto +, six +, netaddr +, dns +, windowsSupport ? false +, pywinrm ? null +}: + +let + jinja = jinja2.override rec { + pname = "Jinja2"; + version = "2.8.1"; + name = "${pname}-${version}"; + src = fetchurl { + url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; + sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891"; + }; + }; + +in buildPythonPackage rec { + pname = "ansible"; + version = "2.1.4.0"; + name = "${pname}-${version}"; + + + src = fetchurl { + url = "http://releases.ansible.com/ansible/${name}.tar.gz"; + sha256 = "05nc68900qrzqp88970j2lmyvclgrjki66xavcpzyzamaqrh7wg9"; + }; + + prePatch = '' + sed -i "s,/usr/,$out," lib/ansible/constants.py + ''; + + doCheck = false; + dontStrip = true; + dontPatchELF = true; + dontPatchShebangs = false; + + propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2 + boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm; + + meta = { + homepage = "http://www.ansible.com"; + description = "A simple automation tool"; + license = with lib.licenses; [ gpl3] ; + maintainers = with lib.maintainers; [ + jgeerds + joamaki + ]; + platforms = with lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/python-modules/ansible/2.2.nix b/pkgs/development/python-modules/ansible/2.2.nix new file mode 100644 index 00000000000..d62c1e74822 --- /dev/null +++ b/pkgs/development/python-modules/ansible/2.2.nix @@ -0,0 +1,62 @@ +{ lib +, fetchurl +, buildPythonPackage +, pycrypto +, paramiko +, jinja2 +, pyyaml +, httplib2 +, boto +, six +, netaddr +, dns +, windowsSupport ? false +, pywinrm ? null +}: + +let + # Shouldn't be needed anymore in next version + # https://github.com/NixOS/nixpkgs/pull/22345#commitcomment-20718521 + jinja = (jinja2.override rec { + pname = "Jinja2"; + version = "2.8.1"; + name = "${pname}-${version}"; + src = fetchurl { + url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; + sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891"; + }; + }); +in buildPythonPackage rec { + pname = "ansible"; + version = "2.2.1.0"; + name = "${pname}-${version}"; + + + src = fetchurl { + url = "http://releases.ansible.com/ansible/${name}.tar.gz"; + sha256 = "0gz9i30pdmkchi936ijy873k8di6fmf3v5rv551hxyf0hjkjx8b3"; + }; + + prePatch = '' + sed -i "s,/usr/,$out," lib/ansible/constants.py + ''; + + doCheck = false; + dontStrip = true; + dontPatchELF = true; + dontPatchShebangs = false; + + propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2 + boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm; + + meta = { + homepage = "http://www.ansible.com"; + description = "A simple automation tool"; + license = with lib.licenses; [ gpl3] ; + maintainers = with lib.maintainers; [ + jgeerds + joamaki + ]; + platforms = with lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/python-modules/django_guardian.nix b/pkgs/development/python-modules/django_guardian.nix new file mode 100644 index 00000000000..c9217955213 --- /dev/null +++ b/pkgs/development/python-modules/django_guardian.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, python, fetchurl +, django_environ, mock, django, six +, pytest, pytestrunner, pytestdjango, setuptools_scm +}: +buildPythonPackage rec { + name = "django-guardian-${version}"; + version = "1.4.6"; + + src = fetchurl { + url = "mirror://pypi/d/django-guardian/${name}.tar.gz"; + sha256 = "1r3xj0ik0hh6dfak4kjndxk5v73x95nfbppgr394nhnmiayv4zc5"; + }; + + buildInputs = [ pytest pytestrunner pytestdjango django_environ mock setuptools_scm ]; + propagatedBuildInputs = [ django six ]; + + checkPhase = '' + ${python.interpreter} nix_run_setup.py test --addopts="--ignore build" + ''; + + meta = with stdenv.lib; { + description = "Per object permissions for Django"; + homepage = https://github.com/django-guardian/django-guardian; + licenses = [ licenses.mit licenses.bsd2 ]; + }; +} diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker.nix new file mode 100644 index 00000000000..12c9aac4c23 --- /dev/null +++ b/pkgs/development/python-modules/docker.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, fetchurl +, six, requests2, websocket_client +, ipaddress, backports_ssl_match_hostname, docker_pycreds +}: +buildPythonPackage rec { + name = "docker-${version}"; + version = "2.0.2"; + + src = fetchurl { + url = "mirror://pypi/d/docker/${name}.tar.gz"; + sha256 = "1m16n2r8is1gxwmyr6163na2jdyzsnhhk2qj12l7rzm1sr9nhx7z"; + }; + + propagatedBuildInputs = [ + six + requests2 + websocket_client + ipaddress + backports_ssl_match_hostname + docker_pycreds + ]; + + # Flake8 version conflict + doCheck = false; + + meta = with stdenv.lib; { + description = "An API client for docker written in Python"; + homepage = https://github.com/docker/docker-py; + license = licenses.asl20; + maintainers = with maintainers; [ + jgeerds + ]; + }; +} diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix new file mode 100644 index 00000000000..c21b69e1643 --- /dev/null +++ b/pkgs/development/python-modules/docker_compose.nix @@ -0,0 +1,48 @@ +{ stdenv, buildPythonApplication, fetchurl, pythonOlder +, mock, pytest, nose +, pyyaml, backports_ssl_match_hostname, colorama, docopt +, dockerpty, docker, ipaddress, jsonschema, requests2 +, six, texttable, websocket_client, cached-property +, enum34, functools32 +}: +buildPythonApplication rec { + version = "1.10.0"; + name = "docker-compose-${version}"; + + src = fetchurl { + url = "mirror://pypi/d/docker-compose/${name}.tar.gz"; + sha256 = "023y2yhkvglaq07d78i89g2p8h040d71il8nfbyg2f9fkffigx9z"; + }; + + # lots of networking and other fails + doCheck = false; + buildInputs = [ mock pytest nose ]; + propagatedBuildInputs = [ + pyyaml backports_ssl_match_hostname colorama dockerpty docker + ipaddress jsonschema requests2 six texttable websocket_client + docopt cached-property + ] ++ + stdenv.lib.optional (pythonOlder "3.4") enum34 ++ + stdenv.lib.optional (pythonOlder "3.2") functools32; + + patchPhase = '' + # Remove upper bound on requires, see also + # https://github.com/docker/compose/issues/4431 + sed -i "s/, < .*',$/',/" setup.py + ''; + + postInstall = '' + mkdir -p $out/share/bash-completion/completions/ + cp contrib/completion/bash/docker-compose $out/share/bash-completion/completions/docker-compose + ''; + + meta = with stdenv.lib; { + homepage = "https://docs.docker.com/compose/"; + description = "Multi-container orchestration for Docker"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ + jgeerds + ]; + }; +} diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix new file mode 100644 index 00000000000..f313f6ab5c4 --- /dev/null +++ b/pkgs/development/python-modules/hypothesis.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, python +, isPy27, enum34 +, doCheck ? true, pytest, flake8, flaky +}: +buildPythonPackage rec { + # http://hypothesis.readthedocs.org/en/latest/packaging.html + + # Hypothesis has optional dependencies on the following libraries + # pytz fake_factory django numpy pytest + # If you need these, you can just add them to your environment. + + name = "hypothesis-${version}"; + version = "3.6.0"; + + # Upstream prefers github tarballs + src = fetchFromGitHub { + owner = "HypothesisWorks"; + repo = "hypothesis"; + rev = "${version}"; + sha256 = "0a3r4c8sr9jn7sv419vdzrzfc9sp7zf105f1lgyiwyzi3cgyvcvg"; + }; + + buildInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ]; + propagatedBuildInputs = stdenv.lib.optionals isPy27 [ enum34 ]; + + inherit doCheck; + + # https://github.com/DRMacIver/hypothesis/issues/300 + checkPhase = '' + ${python.interpreter} -m pytest tests/cover + ''; + + meta = with stdenv.lib; { + description = "A Python library for property based testing"; + homepage = https://github.com/DRMacIver/hypothesis; + license = licenses.mpl20; + }; +} diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix new file mode 100644 index 00000000000..b8565a8b758 --- /dev/null +++ b/pkgs/development/python-modules/incremental/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "incremental"; + version = "16.10.1"; + + src = fetchurl { + url = "mirror://pypi/i/${pname}/${name}.tar.gz"; + sha256 = "0hh382gsj5lfl3fsabblk2djngl4n5yy90xakinasyn41rr6pb8l"; + }; + + meta = with stdenv.lib; { + homepage = http://github.com/twisted/treq; + description = "Incremental is a small library that versions your Python projects"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix new file mode 100644 index 00000000000..65c72ca9831 --- /dev/null +++ b/pkgs/development/python-modules/keras/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, pytestcov +, pytestpep8 +, pytest_xdist +, six +, Theano +, pyyaml +}: + +buildPythonPackage rec { + pname = "Keras"; + version = "1.2.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bby93sffjadrxnx9j9nn2lq0ygsgqjp16260c6lz77b6r1qrcfj"; + }; + + checkInputs = [ + pytest + pytestcov + pytestpep8 + pytest_xdist + ]; + + propagatedBuildInputs = [ + six Theano pyyaml + ]; + + # Couldn't get tests working + doCheck = false; + + meta = with stdenv.lib; { + description = "Deep Learning library for Theano and TensorFlow"; + homepage = "https://keras.io"; + license = licenses.mit; + maintainers = with maintainers; [ NikolaMandic ]; + }; +} diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix new file mode 100644 index 00000000000..e7c67819ed7 --- /dev/null +++ b/pkgs/development/python-modules/leather/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage, six }: + +buildPythonPackage rec { + pname = "leather"; + version = "0.3.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "125r372q7bwcajfdysp7w5zh5wccwxf1mkhqawl8h518nl1icv87"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + homepage = "http://leather.rtfd.io"; + description = "Python charting library"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ vrthra ]; + }; +} diff --git a/pkgs/development/python-modules/libasyncns.nix b/pkgs/development/python-modules/libasyncns.nix new file mode 100644 index 00000000000..de0d6ea610d --- /dev/null +++ b/pkgs/development/python-modules/libasyncns.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchurl +, libasyncns, pkgconfig }: + +buildPythonPackage rec { + name = "libasyncns-python-${version}"; + version = "0.7.1"; + + src = fetchurl { + url = "https://launchpad.net/libasyncns-python/trunk/${version}/+download/libasyncns-python-${version}.tar.bz2"; + sha256 = "1q4l71b2h9q756x4pjynp6kczr2d8c1jvbdp982hf7xzv7w5gxqg"; + }; + + buildInputs = [ libasyncns ]; + nativeBuildInputs = [ pkgconfig ]; + doCheck = false; # requires network access + + meta = with stdenv.lib; { + description = "libasyncns-python is a python binding for the asynchronous name service query library"; + license = licenses.lgpl21; + maintainers = [ maintainers.mic92 ]; + homepage = https://launchpad.net/libasyncns-python; + }; +} diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 65d5c95114d..1da50341750 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llvmlite"; name = "${pname}-${version}"; - version = "0.14.0"; + version = "0.15.0"; disabled = isPyPy; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "1ybgsmvamj0i51dvrn268ziczpm63y2h4sgagf6fkgkpydrr01g8"; + sha256 = "c855835537eda61f3a0d19aedc44f006d5084a2d322aee8ffa87aa06bb800dc4"; }; propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; @@ -47,4 +47,4 @@ buildPythonPackage rec { license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 5ba813deba6..b917575e239 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, python, buildPythonPackage, pycairo , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado -, freetype, libpng, pkgconfig, mock, pytz, pygobject3 +, freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32 , enableGhostscript ? false, ghostscript ? null, gtk3 , enableGtk2 ? false, pygtk ? null, gobjectIntrospection , enableGtk3 ? false, cairo , enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null -, Cocoa, Foundation, CoreData, cf-private, libobjc, libcxx +, enableQt ? false, pyqt4 +, libcxx +, Cocoa }: assert enableGhostscript -> ghostscript != null; @@ -15,14 +17,15 @@ assert enableTk -> (tcl != null) && (tkinter != null) && (libX11 != null) ; +assert enableQt -> pyqt4 != null; buildPythonPackage rec { name = "matplotlib-${version}"; - version = "1.5.3"; + version = "2.0.0"; src = fetchurl { url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; - sha256 = "1g7bhr6v3wdxyx29rfxgf57l9w19s79cdlpyi0h4y0c5ywwxr9d0"; + sha256 = "04zqymd5dw6lxvfbxf1sycdnibjk5qky5rfsn6wb46lwha2hkkrn"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; @@ -31,16 +34,17 @@ buildPythonPackage rec { buildInputs = [ python which sphinx stdenv ] ++ stdenv.lib.optional enableGhostscript ghostscript - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation CoreData - cf-private libobjc ]; + ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = - [ cycler dateutil nose numpy pyparsing tornado freetype - libpng pkgconfig mock pytz + [ cycler dateutil nose numpy pyparsing tornado freetype + libpng pkgconfig mock pytz ] ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ] - ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]; + ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] + ++ stdenv.lib.optionals enableQt [ pyqt4 ] + ++ stdenv.lib.optionals (builtins.hasAttr "isPy2" python) [ functools32 subprocess32 ]; patches = [ ./basedirlist.patch ] ++ @@ -64,8 +68,8 @@ buildPythonPackage rec { ${python.interpreter} tests.py ''; - # The entry point for running tests, tests.py, is not included in the release. - # https://github.com/matplotlib/matplotlib/issues/6017 + # Test data is not included in the distribution (the `tests` folder + # is missing) doCheck = false; prePatch = '' diff --git a/pkgs/development/python-modules/netcdf4.nix b/pkgs/development/python-modules/netcdf4.nix new file mode 100644 index 00000000000..979a741e1ab --- /dev/null +++ b/pkgs/development/python-modules/netcdf4.nix @@ -0,0 +1,36 @@ +{ stdenv, buildPythonPackage, fetchurl, isPyPy +, numpy, zlib, netcdf, hdf5, curl, libjpeg +}: +buildPythonPackage rec { + name = "netCDF4-${version}"; + version = "1.2.7"; + + disabled = isPyPy; + + src = fetchurl { + url = "mirror://pypi/n/netCDF4/${name}.tar.gz"; + sha256 = "1fllizmnpw0zkzzm4j9pgamarlzfn3kmv9zrm0w65q1y31h9ni0c"; + }; + + propagatedBuildInputs = [ + numpy + zlib + netcdf + hdf5 + curl + libjpeg + ]; + + # Variables used to configure the build process + USE_NCCONFIG="0"; + HDF5_DIR="${hdf5}"; + NETCDF4_DIR="${netcdf}"; + CURL_DIR="${curl.dev}"; + JPEG_DIR="${libjpeg.dev}"; + + meta = with stdenv.lib; { + description = "Interface to netCDF library (versions 3 and 4)"; + homepage = https://pypi.python.org/pypi/netCDF4; + license = licenses.free; # Mix of license (all MIT* like) + }; +} diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 1feb9e009e2..422fee39641 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.29.0"; + version = "0.30.1"; name = "numba-${version}"; src = fetchurl { url = "mirror://pypi/n/numba/${name}.tar.gz"; - sha256 = "00ae294f3fb3a99e8f0a9f568213cebed26675bacc9c6f8d2e025b6d564e460d"; + sha256 = "66e6254b3002f448fd212c5df4c8a69964dff9b9f315fb733e3c95e7e2b6c8fd"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; @@ -28,8 +28,7 @@ buildPythonPackage rec { # Copy test script into $out and run the test suite. checkPhase = '' - cp runtests.py $out/${python.sitePackages}/numba/runtests.py - ${python.interpreter} $out/${python.sitePackages}/numba/runtests.py + python -m numba.runtests ''; # ImportError: cannot import name '_typeconv' doCheck = false; @@ -40,4 +39,4 @@ buildPythonPackage rec { description = "Compiling Python code using LLVM"; maintainers = with stdenv.lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pep257.nix b/pkgs/development/python-modules/pep257.nix new file mode 100644 index 00000000000..f185019b0f7 --- /dev/null +++ b/pkgs/development/python-modules/pep257.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchurl, pytest, mock }: +buildPythonPackage rec { + name = "pep257-${version}"; + version = "0.7.0"; + + src = fetchurl { + url = "https://github.com/GreenSteam/pep257/archive/${version}.tar.gz"; + sha256 = "1ldpgil0kaf6wz5gvl9xdx35a62vc6bmgi3wbh9320dj5v2qk4wh"; + }; + + buildInputs = [ pytest mock ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/GreenSteam/pep257/; + description = "Python docstring style checker"; + longDescription = "Static analysis tool for checking compliance with Python PEP 257."; + lecense = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/poezio/fix_plugins_imports.patch b/pkgs/development/python-modules/poezio/fix_plugins_imports.patch deleted file mode 100644 index 821b9c41588..00000000000 --- a/pkgs/development/python-modules/poezio/fix_plugins_imports.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -Nur poezio-0.10.orig/plugins/canat.py poezio-0.10/plugins/canat.py ---- poezio-0.10.orig/plugins/canat.py 2016-08-21 14:56:35.000000000 +0200 -+++ poezio-0.10/plugins/canat.py 2016-11-16 14:32:21.565445266 +0100 -@@ -34,9 +34,9 @@ - - - """ --from plugin import BasePlugin --import tabs --from decorators import command_args_parser -+from poezio.plugin import BasePlugin -+import poezio.tabs -+from poezio.decorators import command_args_parser - - def move(text, step, spacing): - new_text = text + (" " * spacing) -diff -Nur poezio-0.10.orig/plugins/corrections_diff.py poezio-0.10/plugins/corrections_diff.py ---- poezio-0.10.orig/plugins/corrections_diff.py 2016-08-21 14:56:35.000000000 +0200 -+++ poezio-0.10/plugins/corrections_diff.py 2016-11-16 14:30:53.992684959 +0100 -@@ -22,11 +22,11 @@ - - - """ --from plugin import BasePlugin -+from poezio.plugin import BasePlugin - import difflib -+import collections - from functools import wraps --import tabs --from config import config -+from poezio.config import config - - shim_message_fields = ('txt nick_color time str_time nickname user identifier' - ' highlight me old_message revisions jid ack') -@@ -61,10 +61,6 @@ - rev -= 1 - return ''.join(acc) - --Message.__repr__ = repr_message --Message.__str__ = repr_message -- -- - - def corrections_enabled(func): - @wraps(func) -diff -Nur poezio-0.10.orig/plugins/coucou.py poezio-0.10/plugins/coucou.py ---- poezio-0.10.orig/plugins/coucou.py 2016-08-21 14:56:35.000000000 +0200 -+++ poezio-0.10/plugins/coucou.py 2016-11-16 14:25:37.101337668 +0100 -@@ -1,4 +1,4 @@ --from plugin import BasePlugin -+from poezio.plugin import BasePlugin - import tracemalloc - import cProfile, pstats, io - -diff -Nur poezio-0.10.orig/plugins/flood.py poezio-0.10/plugins/flood.py ---- poezio-0.10.orig/plugins/flood.py 2016-08-21 14:56:35.000000000 +0200 -+++ poezio-0.10/plugins/flood.py 2016-11-16 14:32:56.452155220 +0100 -@@ -1,6 +1,6 @@ --from plugin import BasePlugin --import tabs --import multiuserchat as muc -+from poezio.plugin import BasePlugin -+import poezio.tabs -+import poezio.multiuserchat as muc - - class Plugin(BasePlugin): - def init(self): -diff -Nur poezio-0.10.orig/plugins/invisible.py poezio-0.10/plugins/invisible.py ---- poezio-0.10.orig/plugins/invisible.py 2016-08-21 14:56:35.000000000 +0200 -+++ poezio-0.10/plugins/invisible.py 2016-11-16 14:31:31.743288152 +0100 -@@ -20,8 +20,7 @@ - .. _XEP-0186: https://xmpp.org/extensions/xep-0186.html - """ - --from plugin import BasePlugin --import tabs -+from poezio.plugin import BasePlugin - - class Plugin(BasePlugin): - def init(self): diff --git a/pkgs/development/python-modules/poezio/make_default_config_writable.patch b/pkgs/development/python-modules/poezio/make_default_config_writable.patch deleted file mode 100644 index 03d732e256c..00000000000 --- a/pkgs/development/python-modules/poezio/make_default_config_writable.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruN a/src/config.py b/src/config.py ---- a/src/config.py 2015-07-31 19:35:37.000000000 +0000 -+++ b/src/config.py 2015-08-03 09:23:34.322098081 +0000 -@@ -14,6 +14,7 @@ - - import logging.config - import os -+import stat - import sys - import pkg_resources - -@@ -563,6 +564,13 @@ - copy2(default, options.filename) - elif path.isfile(other): - copy2(other, options.filename) -+ -+ # Inside the nixstore, the reference file is readonly, so is the copy. -+ # Make it writable by the user who just created it. -+ if os.path.exists(options.filename): -+ os.chmod(options.filename, -+ os.stat(options.filename).st_mode | stat.S_IWUSR) -+ - global firstrun - firstrun = True - diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 3edf7e6e170..84da1cf9ebf 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit, dbus_libs +{ lib, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs , lndir, makeWrapper, qmakeHook }: let @@ -22,7 +22,7 @@ in mkPythonDerivation { buildInputs = [ pkgconfig makeWrapper lndir - qtbase qtsvg qtwebkit dbus_libs qmakeHook + qtbase qtsvg qtwebkit qtwebengine dbus_libs qmakeHook ]; propagatedBuildInputs = [ sip ]; diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 7fb7b7f5e68..91bfa97cb97 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -1,11 +1,11 @@ {stdenv, buildPythonPackage, fetchurl}: buildPythonPackage rec { - name = "pyroute2-0.4.12"; + name = "pyroute2-0.4.13"; src = fetchurl { url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; - sha256 = "0csp6y38pgswhn46rivdgrlqw99dpjzwa0g32h6iiaj12n2f9qlq"; + sha256 = "0f8a1ihxc1r78m6dqwhks2vdp4vwwbw72mbv88v70qmkb0pxgwwk"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pytest-pep257.nix b/pkgs/development/python-modules/pytest-pep257.nix new file mode 100644 index 00000000000..7ce63ebc7a6 --- /dev/null +++ b/pkgs/development/python-modules/pytest-pep257.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchurl, pytest, pep257 }: +buildPythonPackage rec { + name = "pytest-pep257-${version}"; + version = "0.0.5"; + + src = fetchurl { + url = "mirror://pypi/p/pytest-pep257/${name}.tar.gz"; + sha256 = "082v3d5k4331x53za51kl8zxsndsw1pcyf1xdfpb2gjdjrhixb8w"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ pep257 ]; + + meta = with stdenv.lib; { + homepage = https://github.com/anderslime/pytest-pep257; + description = "py.test plugin for PEP257"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pytest/2_7.nix b/pkgs/development/python-modules/pytest/2_7.nix new file mode 100644 index 00000000000..adaa640fdbe --- /dev/null +++ b/pkgs/development/python-modules/pytest/2_7.nix @@ -0,0 +1,28 @@ +{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }: +buildPythonPackage rec { + name = "pytest-2.7.3"; + + src = fetchurl { + url = "mirror://pypi/p/pytest/${name}.tar.gz"; + sha256 = "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm"; + }; + + # Disabled temporarily because of Hydra issue with namespaces + doCheck = false; + + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; + + propagatedBuildInputs = [ py ] + ++ (stdenv.lib.optional isPy26 argparse) + ++ stdenv.lib.optional + pkgs.config.pythonPackages.pytest.selenium or false + selenium; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ domenkozar lovek323 madjar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pytest/2_8.nix b/pkgs/development/python-modules/pytest/2_8.nix new file mode 100644 index 00000000000..6232ccaf700 --- /dev/null +++ b/pkgs/development/python-modules/pytest/2_8.nix @@ -0,0 +1,28 @@ +{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }: +buildPythonPackage rec { + name = "pytest-2.8.7"; + + src = fetchurl { + url = "mirror://pypi/p/pytest/${name}.tar.gz"; + sha256 = "1bwb06g64x2gky8x5hcrfpg6r351xwvafimnhm5qxq7wajz8ck7w"; + }; + + # Disabled temporarily because of Hydra issue with namespaces + doCheck = false; + + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; + + propagatedBuildInputs = [ py ] + ++ (stdenv.lib.optional isPy26 argparse) + ++ stdenv.lib.optional + pkgs.config.pythonPackages.pytest.selenium or false + selenium; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ domenkozar lovek323 madjar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pytest/2_9.nix b/pkgs/development/python-modules/pytest/2_9.nix new file mode 100644 index 00000000000..3ca7120dd92 --- /dev/null +++ b/pkgs/development/python-modules/pytest/2_9.nix @@ -0,0 +1,28 @@ +{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }: +buildPythonPackage rec { + name = "pytest-2.9.2"; + + src = fetchurl { + url = "mirror://pypi/p/pytest/${name}.tar.gz"; + sha256 = "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j"; + }; + + # Disabled temporarily because of Hydra issue with namespaces + doCheck = false; + + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; + + propagatedBuildInputs = [ py ] + ++ (stdenv.lib.optional isPy26 argparse) + ++ stdenv.lib.optional + pkgs.config.pythonPackages.pytest.selenium or false + selenium; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ domenkozar lovek323 madjar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix new file mode 100644 index 00000000000..d3fea5a3b43 --- /dev/null +++ b/pkgs/development/python-modules/pytest/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py }: +buildPythonPackage rec { + name = "pytest-${version}"; + version = "3.0.6"; + + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; + + src = fetchurl { + url = "mirror://pypi/p/pytest/${name}.tar.gz"; + sha256 = "0h6rfp7y7c5mqwfm9fy5fq4l9idnp160c82ylcfjg251y6lk8d34"; + }; + + buildInputs = [ hypothesis ]; + propagatedBuildInputs = [ py ] + ++ (stdenv.lib.optional isPy26 argparse); + + meta = with stdenv.lib; { + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pytestdjango.nix b/pkgs/development/python-modules/pytestdjango.nix new file mode 100644 index 00000000000..5a8dd85f4bd --- /dev/null +++ b/pkgs/development/python-modules/pytestdjango.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchurl +, pytest, django, setuptools_scm +}: +buildPythonPackage rec { + name = "pytest-django-${version}"; + version = "3.1.2"; + + src = fetchurl { + url = "mirror://pypi/p/pytest-django/${name}.tar.gz"; + sha256 = "02932m2sr8x22m4az8syr8g835g4ak77varrnw71n6xakmdcr303"; + }; + + buildInputs = [ pytest setuptools_scm ]; + propagatedBuildInputs = [ django ]; + + meta = with stdenv.lib; { + description = "py.test plugin for testing of Django applications"; + homepage = http://pytest-django.readthedocs.org/en/latest/; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix new file mode 100644 index 00000000000..8f3b2ef74b2 --- /dev/null +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -0,0 +1,38 @@ +{ buildPythonPackage, fetchurl, glibcLocales, mock, pytest, botocore, + testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, + service-identity, parsel, pydispatcher, cssselect, lib }: +buildPythonPackage rec { + name = "Scrapy-${version}"; + version = "1.3.1"; + + buildInputs = [ glibcLocales mock pytest botocore testfixtures pillow ]; + propagatedBuildInputs = [ + six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher + ]; + + # Scrapy is usually installed via pip where copying all + # permissions makes sense. In Nix the files copied are owned by + # root and readonly. As a consequence scrapy can't edit the + # project templates. + patches = [ ./permissions-fix.patch ]; + + LC_ALL="en_US.UTF-8"; + + checkPhase = '' + py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py + # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3 + ''; + + src = fetchurl { + url = "mirror://pypi/S/Scrapy/${name}.tar.gz"; + sha256 = "0s5qkxwfq842maxjd2j82ldp4dyb70kla3z5rr56z0p7ig53cbvk"; + }; + + meta = with lib; { + description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; + homepage = "http://scrapy.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ drewkett ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/scrapy/permissions-fix.patch b/pkgs/development/python-modules/scrapy/permissions-fix.patch new file mode 100644 index 00000000000..5ea5269c799 --- /dev/null +++ b/pkgs/development/python-modules/scrapy/permissions-fix.patch @@ -0,0 +1,28 @@ +diff --git a/scrapy/commands/startproject.py b/scrapy/commands/startproject.py +index 5941066..89f8edb 100644 +--- a/scrapy/commands/startproject.py ++++ b/scrapy/commands/startproject.py +@@ -4,7 +4,7 @@ import os + import string + from importlib import import_module + from os.path import join, exists, abspath +-from shutil import ignore_patterns, move, copy2, copystat ++from shutil import ignore_patterns, move, copyfile, copystat + + import scrapy + from scrapy.commands import ScrapyCommand +@@ -76,8 +76,7 @@ class Command(ScrapyCommand): + if os.path.isdir(srcname): + self._copytree(srcname, dstname) + else: +- copy2(srcname, dstname) +- copystat(src, dst) ++ copyfile(srcname, dstname) + + def run(self, args, opts): + if len(args) not in (1, 2): +@@ -118,4 +117,3 @@ class Command(ScrapyCommand): + _templates_base_dir = self.settings['TEMPLATES_DIR'] or \ + join(scrapy.__path__[0], 'templates') + return join(_templates_base_dir, 'project') +- diff --git a/pkgs/development/python-modules/searx.patch b/pkgs/development/python-modules/searx.patch deleted file mode 100644 index 1fd7dcbde6d..00000000000 --- a/pkgs/development/python-modules/searx.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/requirements.txt b/requirements.txt -index 0d2f61b..46481b3 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,12 +1,12 @@ - certifi==2016.2.28 --flask==0.11.1 --flask-babel==0.11.1 --lxml==3.6.0 --ndg-httpsclient==0.4.1 -+flask==0.* -+flask-babel==0.* -+lxml==3.* -+ndg-httpsclient==0.4.* - pyasn1==0.1.9 - pyasn1-modules==0.0.8 --pygments==2.1.3 -+pygments==2.* --pyopenssl==0.15.1 -+pyopenssl==16.* --python-dateutil==2.5.3 -+python-dateutil==2.* --pyyaml==3.11 -+pyyaml==3.* --requests[socks]==2.10.0 -+requests[socks]==2.* diff --git a/pkgs/development/python-modules/tensorflow/cuda.nix b/pkgs/development/python-modules/tensorflow/cuda.nix new file mode 100644 index 00000000000..05a4cc3e4c1 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/cuda.nix @@ -0,0 +1,52 @@ +{ stdenv +, fetchurl +, buildPythonPackage +, swig +, numpy +, six +, protobuf3_0 +, cudatoolkit75 +, cudnn5_cudatoolkit75 +, gcc49 +, zlib +, linuxPackages +, mock +}: + +buildPythonPackage rec { + pname = "tensorflow"; + version = "0.11.0rc0"; + name = "${pname}-${version}"; + format = "wheel"; + + src = fetchurl { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-${version}-cp27-none-linux_x86_64.whl"; + sha256 = "1r8zlz95sw7bnjzg5zdbpa9dj8wmp8cvvgyl9sv3amsscagnnfj5"; + }; + + buildInputs = [ swig ]; + propagatedBuildInputs = [ numpy six protobuf3_0 cudatoolkit75 cudnn5_cudatoolkit75 gcc49 mock ]; + + # Note that we need to run *after* the fixup phase because the + # libraries are loaded at runtime. If we run in preFixup then + # patchelf --shrink-rpath will remove the cuda libraries. + postFixup = let + rpath = stdenv.lib.makeLibraryPath [ + gcc49.cc.lib + zlib cudatoolkit75 + cudnn5_cudatoolkit75 + linuxPackages.nvidia_x11 + ]; + in '' + find $out -name '*.so' -exec patchelf --set-rpath "${rpath}" {} \; + ''; + + doCheck = false; + + meta = with stdenv.lib; { + description = "TensorFlow helps the tensors flow (no gpu support)"; + homepage = http://tensorflow.org; + license = licenses.asl20; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix new file mode 100644 index 00000000000..f8bc35eb568 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchurl +, buildPythonPackage +, numpy +, six +, protobuf3_0_0b2 +, swig +, mock +, gcc +, zlib +}: + +# tensorflow is built from a downloaded wheel, because the upstream +# project's build system is an arcane beast based on +# bazel. Untangling it and building the wheel from source is an open +# problem. + +buildPythonPackage rec { + pname = "tensorflow"; + version = "0.10.0"; + name = "${pname}-${version}"; + format = "wheel"; + + src = fetchurl { + url = if stdenv.isDarwin then + "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-py2-none-any.whl" else + "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl"; + sha256 = if stdenv.isDarwin then + "1gjybh3j3rn34bzhsxsfdbqgsr4jh50qyx2wqywvcb24fkvy40j9" else + "0g05pa4z6kdy0giz7hjgjgwf4zzr5l8cf1zh247ymixlikn3fnpx"; + }; + + propagatedBuildInputs = [ numpy six protobuf3_0_0b2 swig mock]; + + preFixup = '' + RPATH="${stdenv.lib.makeLibraryPath [ gcc.cc.lib zlib ]}" + find $out -name '*.so' -exec patchelf --set-rpath "$RPATH" {} \; + ''; + + doCheck = false; + + meta = with stdenv.lib; { + description = "TensorFlow helps the tensors flow (no gpu support)"; + homepage = http://tensorflow.org; + license = licenses.asl20; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix new file mode 100644 index 00000000000..37f9e3324c7 --- /dev/null +++ b/pkgs/development/python-modules/treq/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, buildPythonPackage, service-identity, requests2, + six, mock, twisted, incremental, coreutils, gnumake, pep8, sphinx, + openssl, pyopenssl }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "treq"; + version = "16.12.0"; + + src = fetchurl { + url = "mirror://pypi/t/${pname}/${name}.tar.gz"; + sha256 = "1aci3f3rmb5mdf4s6s4k4kghmnyy784cxgi3pz99m5jp274fs25h"; + }; + + buildInputs = [ + pep8 + mock + ]; + + propagatedBuildInputs = [ + service-identity + requests2 + twisted + incremental + sphinx + six + openssl + pyopenssl + ]; + + checkPhase = '' + ${pep8}/bin/pep8 --ignore=E902 treq + trial treq + ''; + + doCheck = false; + # Failure: twisted.web._newclient.RequestTransmissionFailed: [] + + postBuild = '' + ${coreutils}/bin/mkdir -pv treq + ${coreutils}/bin/echo "${version}" | ${coreutils}/bin/tee treq/_version + cd docs && ${gnumake}/bin/make html && cd .. + ''; + + meta = with stdenv.lib; { + homepage = http://github.com/twisted/treq; + description = "A requests-like API built on top of twisted.web's Agent"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index 8dc99955af3..defdc920d6e 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -1,8 +1,11 @@ { fetchurl , lib +, stdenv +, darwin , openglSupport ? true , libX11 , wxGTK +, wxmac , pkgconfig , buildPythonPackage , pyopengl @@ -27,15 +30,27 @@ buildPythonPackage rec { hardeningDisable = [ "format" ]; - propagatedBuildInputs = [ pkgconfig wxGTK (wxGTK.gtk) libX11 ] ++ lib.optional openglSupport pyopengl; - preConfigure = "cd wxPython"; + propagatedBuildInputs = [ pkgconfig ] + ++ (lib.optional openglSupport pyopengl) + ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK (wxGTK.gtk) libX11 ]) + ++ (lib.optionals stdenv.isDarwin [ wxmac darwin.apple_sdk.frameworks.Cocoa ]) + ; + preConfigure = '' + cd wxPython + # remove wxPython's darwin hack that interference with python-2.7-distutils-C++.patch + substituteInPlace config.py \ + --replace "distutils.unixccompiler.UnixCCompiler = MyUnixCCompiler" "" + # this check is supposed to only return false on older systems running non-framework python + substituteInPlace src/osx_cocoa/_core_wrap.cpp \ + --replace "return wxPyTestDisplayAvailable();" "return true;" + ''; - NIX_LDFLAGS = "-lX11 -lgdk-x11-2.0"; + NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lX11 -lgdk-x11-2.0"; buildPhase = ""; installPhase = '' - ${python.interpreter} setup.py install WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out + ${python.interpreter} setup.py install WXPORT=${if stdenv.isDarwin then "osx_cocoa" else "gtk2"} NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out wrapPythonPrograms ''; diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 1461e6232e6..ea7e7d0fb8e 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let baseVersion = "4.2"; - revision = "0"; + revision = "1"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz"; - sha256 = "0yzj1i6hkzl9w1g8d5vidz7z6amwpj8p3cfibn9slf1sphxph18f"; + sha256 = "0f2slaf579q2anflf524lbhmpwrwy3hzjfxzs10n44r7s7yc4dr5"; }; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md index e384b375460..cb962e138c5 100644 --- a/pkgs/development/r-modules/README.md +++ b/pkgs/development/r-modules/README.md @@ -4,7 +4,7 @@ R packages ## Installation Define an environment for R that contains all the libraries that you'd like to -use by adding the following snippet to your $HOME/.nixpkgs/config.nix file: +use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file: ```nix { @@ -53,6 +53,37 @@ in with pkgs; { and then run `nix-shell .` to be dropped into a shell with those packages available. +## RStudio + +RStudio by default will not use the libraries installed like above. +You must override its R version with your custom R environment, and +set `useRPackages` to `true`, like below: + +```nix +{ + packageOverrides = super: let self = super.pkgs; in + { + + rEnv = super.rWrapper.override { + packages = with self.rPackages; [ + devtools + ggplot2 + reshape2 + yaml + optparse + ]; + }; + rstudioEnv = super.rstudio.override { + R = rEnv; + useRPackages = true; + }; + }; +} +``` + +Then like above, `nix-env -f "" -iA rstudioEnv` will install +this into your user profile. + ## Updating the package set ```bash diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix index 3b9a9b18450..25c76506027 100644 --- a/pkgs/development/r-modules/wrapper.nix +++ b/pkgs/development/r-modules/wrapper.nix @@ -1,12 +1,19 @@ { stdenv, R, makeWrapper, recommendedPackages, packages }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = R.name + "-wrapper"; buildInputs = [makeWrapper R] ++ recommendedPackages ++ packages; unpackPhase = ":"; + # This filename is used in 'installPhase', but needs to be + # referenced elsewhere. This will be relative to this package's + # path. + passthru = { + fixLibsR = "fix_libs.R"; + }; + installPhase = '' mkdir -p $out/bin cd ${R}/bin @@ -14,6 +21,17 @@ stdenv.mkDerivation { makeWrapper ${R}/bin/$exe $out/bin/$exe \ --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" done + # RStudio (and perhaps other packages) overrides the R_LIBS_SITE + # which the wrapper above applies, and as a result packages + # installed in the wrapper (as in the method described in + # https://nixos.org/nixpkgs/manual/#r-packages) aren't visible. + # The below turns R_LIBS_SITE into some R startup code which can + # correct this. + echo "# Autogenerated by wrapper.nix from R_LIBS_SITE" > $out/${passthru.fixLibsR} + echo -n ".libPaths(c(.libPaths(), \"" >> $out/${passthru.fixLibsR} + echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/${passthru.fixLibsR} + echo -n "\"))" >> $out/${passthru.fixLibsR} + echo >> $out/${passthru.fixLibsR} ''; meta = { diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 1b4fa285142..f3737afdb22 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "1.13.7"; - sha256 = "1avvvdzw0k5k2m5n79b96nkmdfd0sjamc676fz7asz4prz2wiw59"; + version = "1.14.4"; + sha256 = "1hafmb7p41pm40a2z7f4x5zpgrb72xvgwlvkxnflmzqkvq2prkfv"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 74c15adc483..049ea51b8f9 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ammonite-repl-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { - url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${version}"; - sha256 = "0xwy05yfqr1dfypka9wnm60wm0q60kmckzxfp5x79aib94f5ds51"; + url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/2.12-${version}"; + sha256 = "0fgwqdvk0nljd6xm16r8qdhjcp7ix4vx91w5ab856hllf4911120"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index d6164ef2e4e..c1cb4412b9c 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.37.1"; + version = "0.39.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1n3pc3nfh7bcaard7y2fy7hjq4k6777wp9xv50r3zg4454mgbmsy"; + sha256 = "05a0kvhlakm7c7n19npg77rj52cz6282290126sfn0qq2059zhli"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index fc817a8e391..14efe29442b 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -1,6 +1,11 @@ -{ stdenv, fetchurl, ncurses, ocamlPackages, graphviz +{ stdenv, fetchurl, makeWrapper, ncurses, ocamlPackages, graphviz , ltl2ba, coq, alt-ergo, why3 }: +let + mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"; + ocamlpath = "${mkocamlpath ocamlPackages.apron}:${mkocamlpath ocamlPackages.mlgmpidl}"; +in + stdenv.mkDerivation rec { name = "frama-c-${version}"; version = "20160501"; @@ -16,9 +21,11 @@ stdenv.mkDerivation rec { sha256 = "1335bhq9v3h46m8aba2c5myi9ghm87q41in0m15xvdrwq5big1jg"; }; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = with ocamlPackages; [ ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph - lablgtk coq graphviz zarith why3 zarith + lablgtk coq graphviz zarith why3 apron camlp4 ]; @@ -38,20 +45,26 @@ stdenv.mkDerivation rec { FRAMAC=$out/bin/frama-c ./configure --prefix=$out make make install + for p in $out/bin/frama-c{,-gui}; + do + wrapProgram $p --prefix OCAMLPATH ':' ${ocamlpath} + done ''; - # Enter frama-c directory before patching prePatch = ''cd frama*''; + patches = [ ./dynamic.diff ]; postPatch = '' # strip absolute paths to /usr/bin - for file in ./configure ./share/Makefile.common ./src/*/configure; do + for file in ./configure ./share/Makefile.common ./src/*/configure; do #*/ substituteInPlace $file --replace '/usr/bin/' "" done substituteInPlace ./src/plugins/aorai/aorai_register.ml --replace '"ltl2ba' '"${ltl2ba}/bin/ltl2ba' cd ../why* + + substituteInPlace ./Makefile.in --replace '-warn-error A' '-warn-error A-3' substituteInPlace ./frama-c-plugin/Makefile --replace 'shell frama-c' "shell $out/bin/frama-c" substituteInPlace ./jc/jc_make.ml --replace ' why-dp ' " $out/bin/why-dp " substituteInPlace ./jc/jc_make.ml --replace "?= why@\n" "?= $out/bin/why@\n" diff --git a/pkgs/development/tools/analysis/frama-c/dynamic.diff b/pkgs/development/tools/analysis/frama-c/dynamic.diff new file mode 100644 index 00000000000..7ab2b32de1e --- /dev/null +++ b/pkgs/development/tools/analysis/frama-c/dynamic.diff @@ -0,0 +1,12 @@ +--- a/src/kernel_services/plugin_entry_points/dynamic.ml 2016-05-30 16:15:22.000000000 +0200 ++++ b/src/kernel_services/plugin_entry_points/dynamic.ml 2016-10-13 18:25:31.000000000 +0200 +@@ -287,7 +287,8 @@ + (List.fold_right (add_dir ~user:false) Config.plugin_dir []) ; + let pkgs = ref [] in + List.iter (scan_directory pkgs) !load_path ; +- let findlib_path = String.concat ":" !load_path in ++ let findlib_path = String.concat ":" (!load_path @ ++ try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in + Klog.debug ~dkey "setting findlib path to %s" findlib_path; + Findlib.init ~env_ocamlpath:findlib_path (); + load_packages (List.rev !pkgs) ; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 11ba86724e6..27d7cb30658 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python2Packages, which, procps, gdb }: stdenv.mkDerivation rec { - version = "4.4.0"; + version = "4.5.0"; name = "rr-${version}"; src = fetchFromGitHub { owner = "mozilla"; repo = "rr"; rev = version; - sha256 = "1ijzs5lwscg0k5ch1bljiqqh35rzai75xcgghgkjbz86ynmf62rd"; + sha256 = "114g1yhpjfyxcn0fkvnfi03lhrs11pj0a1945j2j8z90hx4dwba8"; }; postPatch = '' diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 9d97b0f9f31..4f87bcd1589 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -2,30 +2,25 @@ stdenv.mkDerivation rec { name = "apktool-${version}"; - version = "1.5.2"; + version = "2.2.2"; src = fetchurl { - url = "https://android-apktool.googlecode.com/files/apktool${version}.tar.bz2"; - sha1 = "2dd828cf79467730c7406aa918f1da1bd21aaec8"; + url = "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar"; + sha256 = "1a94jw0ml08xdwls1q9v5p1zak5qrbw2zyychnm5vch8znyws411"; }; - unpackCmd = '' - tar -xvf $src || true - cd apktool* - ''; + phases = [ "installPhase" ]; - phases = [ "unpackPhase" "installPhase" ]; - - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; sourceRoot = "."; installPhase = '' - install -D apktool.jar "$out/libexec/apktool/apktool.jar" + install -D ${src} "$out/libexec/apktool/apktool.jar" mkdir -p "$out/bin" makeWrapper "${jre}/bin/java" "$out/bin/apktool" \ --add-flags "-jar $out/libexec/apktool/apktool.jar" \ - --prefix PATH : "${buildTools}/build-tools/android-4.3/" + --prefix PATH : "${buildTools}/build-tools/25.0.1/" ''; meta = with stdenv.lib; { @@ -33,7 +28,7 @@ stdenv.mkDerivation rec { homepage = https://code.google.com/p/android-apktool/; license = licenses.asl20; maintainers = with maintainers; [ offline ]; - platforms = with platforms; unix; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 5d57c9b4579..7b98ce7898a 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, buildFHSUserEnv, writeScript, jdk, zip, unzip, +{ stdenv, fetchurl, buildFHSUserEnv, writeScript, jdk, zip, unzip, which, makeWrapper, binutils }: let - version = "0.3.2"; + version = "0.4.4"; meta = with stdenv.lib; { homepage = http://github.com/bazelbuild/bazel/; @@ -22,14 +22,16 @@ let }; bazelBinary = stdenv.mkDerivation rec { + name = "bazel-${version}"; - src = fetchFromGitHub { - owner = "bazelbuild"; - repo = "bazel"; - rev = version; - sha256 = "085cjz0qhm4a12jmhkjd9w3ic4a67035j01q111h387iklvgn6xg"; + src = fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; + sha256 = "1fwfahkqi680zyxmdriqj603lpacyh6cg6ff25bn9bkilbfj2anm"; }; + + sourceRoot = "."; + patches = [ ./java_stub_template.patch ]; packagesNotFromEnv = [ diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 8e85c645e2e..427ff705840 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,21 +1,13 @@ -{ stdenv, - lib, - pythonPackages, - fetchurl, - coreutils, - openssh, - buildbot-worker, - plugins ? [], - enableLocalWorker ? false -}: +{ stdenv, lib, fetchurl, coreutils, openssh, buildbot-worker, makeWrapper, + pythonPackages, gnused, plugins ? [] }: pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.0.post1"; + version = "0.9.3"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "18rnsp691cnmbymlch6czx3mrcmifmf6dk97h9nslgfkkyf25n5g"; + sha256 = "1yw7knk5dcvwms14vqwlp89flhjf8567l17s9cq7vydh760nmg62"; }; buildInputs = with pythonPackages; [ @@ -31,7 +23,11 @@ pythonPackages.buildPythonApplication (rec { pylint astroid pyflakes - ] ++ lib.optionals (enableLocalWorker) [openssh]; + openssh + buildbot-worker + makeWrapper + treq + ]; propagatedBuildInputs = with pythonPackages; [ @@ -39,7 +35,6 @@ pythonPackages.buildPythonApplication (rec { twisted jinja2 zope_interface - future sqlalchemy sqlalchemy_migrate future @@ -61,32 +56,21 @@ pythonPackages.buildPythonApplication (rec { ramlfications sphinx-jinja - ] ++ plugins ++ - lib.optionals (enableLocalWorker) [buildbot-worker]; - - preInstall = '' - # writes out a file that can't be read properly - sed -i.bak -e '69,84d' buildbot/test/unit/test_www_config.py - ''; + ] ++ plugins; postPatch = '' - # re-hardcode path to tail - sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py + ${gnused}/bin/sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py ''; postFixup = '' - mv -v $out/bin/buildbot $out/bin/.wrapped-buildbot - echo "#!/bin/sh" > $out/bin/buildbot - echo "export PYTHONPATH=$PYTHONPATH" >> $out/bin/buildbot - echo "exec $out/bin/.wrapped-buildbot \"\$@\"" >> $out/bin/buildbot - chmod -c 555 $out/bin/buildbot + makeWrapper $out/bin/.buildbot-wrapped $out/bin/buildbot --set PYTHONPATH "$PYTHONPATH" ''; meta = with stdenv.lib; { homepage = http://buildbot.net/; description = "Continuous integration system that automates the build/test cycle"; maintainers = with maintainers; [ nand0p ryansydnor ]; - platforms = platforms.all; + platforms = platforms.linux; license = licenses.gpl2; }; }) diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 2875f6942a9..f2fdd1535bf 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -4,11 +4,11 @@ let buildbot-pkg = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "0.9.0.post1"; + version = "0.9.3"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0frmnc73dsyc9mjnrnpm4vdrwb7c63gc6maq6xvlp486v7sdhjbi"; + sha256 = "02949cvmghyh313i1hmplwxp3nzq789kk85xjx2ir82cpr1d6h6j"; }; propagatedBuildInputs = with pythonPackages; [ setuptools ]; @@ -26,14 +26,15 @@ in { www = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot_www"; - version = "0.9.0.post1"; + version = "0.9.3"; # NOTE: wheel is used due to buildbot circular dependency format = "wheel"; - src = fetchurl { - url = "https://pypi.python.org/packages/02/d0/fc56ee27a09498638a47dcc5637ee5412ab7a67bfb4b3ff47e041f3d7b66/${name}-py2-none-any.whl"; - sha256 = "14ghch67k6090736n89l401swz7r9hnk2zlmdb59niq8lg7dyg9q"; + src = pythonPackages.fetchPypi { + inherit pname version format; + python = "py2"; + sha256 = "0yggg6mcykcnv41srl2sp2zwx2r38vb6a8jgxh1a4825mspm2jf7"; }; meta = with stdenv.lib; { @@ -48,14 +49,14 @@ in { console-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-console-view"; - version = "0.9.0.post1"; + version = "0.9.3"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0dc7rb7mrpva5gj7l57i96a78d6yj28pkkj9hfim1955z9dgn58l"; + sha256 = "1rkzakm05x72nvdivc5bc3gab3nyasdfvlwnwril90jj9q1b92dk"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; meta = with stdenv.lib; { homepage = http://buildbot.net/; @@ -69,14 +70,14 @@ in { waterfall-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-waterfall-view"; - version = "0.9.0.post1"; + version = "0.9.3"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0x9vvw15zzgj4w3qcxh8r10rb36ni0qh1215y7wbawh5lggnjm0g"; + sha256 = "033x2cs0znhk1j0lw067nmjw2m7yy1fdq5qch0sx50jnpjiq6g6g"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; meta = with stdenv.lib; { homepage = http://buildbot.net/; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 7d7ecc1c52d..861ed647c5d 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -1,18 +1,22 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, gnused, coreutils, pythonPackages }: pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "0.9.0.post1"; + version = "0.9.3"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "1f8ij3y62r9z7qv92x21rg9h9whhakkwv59rgniq09j64ggjz8lx"; + sha256 = "176kp04g4c7gj15f73wppraqrirbfclyx214gcz966019niikcsp"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; propagatedBuildInputs = with pythonPackages; [ twisted future ]; + postPatch = '' + ${gnused}/bin/sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot_worker/scripts/logwatcher.py + ''; + meta = with stdenv.lib; { homepage = http://buildbot.net/; description = "Buildbot Worker Daemon"; diff --git a/pkgs/development/tools/build-managers/drake/Gemfile b/pkgs/development/tools/build-managers/drake/Gemfile new file mode 100644 index 00000000000..ddb13a65c16 --- /dev/null +++ b/pkgs/development/tools/build-managers/drake/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'drake' diff --git a/pkgs/development/tools/build-managers/drake/Gemfile.lock b/pkgs/development/tools/build-managers/drake/Gemfile.lock new file mode 100644 index 00000000000..cf8900a30ee --- /dev/null +++ b/pkgs/development/tools/build-managers/drake/Gemfile.lock @@ -0,0 +1,15 @@ +GEM + remote: https://rubygems.org/ + specs: + comp_tree (1.1.3) + drake (0.9.2.0.3.1) + comp_tree (>= 1.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + drake + +BUNDLED WITH + 1.13.7 diff --git a/pkgs/development/tools/build-managers/drake/default.nix b/pkgs/development/tools/build-managers/drake/default.nix new file mode 100644 index 00000000000..15a88b1fc31 --- /dev/null +++ b/pkgs/development/tools/build-managers/drake/default.nix @@ -0,0 +1,18 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv { + name = "drake-0.9.2.0.3.1"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "A branch of Rake supporting automatic parallelizing of tasks"; + homepage = http://quix.github.io/rake/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/development/tools/build-managers/drake/gemset.nix b/pkgs/development/tools/build-managers/drake/gemset.nix new file mode 100644 index 00000000000..fd5a6f06a2a --- /dev/null +++ b/pkgs/development/tools/build-managers/drake/gemset.nix @@ -0,0 +1,18 @@ +{ + comp_tree = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dj9lkfxcczn67l1j12dcxswrfxxd1zgxa344zk6vqs2gwwhy9m9"; + type = "gem"; + }; + version = "1.1.3"; + }; + drake = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09gkmdshwdmdnkdxi03dv4rk1dip0wdv6dx14wscrmi0jyk86yag"; + type = "gem"; + }; + version = "0.9.2.0.3.1"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index 8e85c63cb6e..79e391a8589 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, lib, python, which }: let - version = "0.5.5"; + version = "0.6.0"; src = fetchFromGitHub { - sha256 = "12yv0j333z6jkaaal8my3jx3k4ml9hq8ldis5zfvr8179d4xah7q"; + sha256 = "053xnx39jh9kn9l572z4k0q7bbxjpisf1fm9aq27ybj2ha1rh6wr"; rev = "version-${version}"; repo = "gup"; owner = "timbertson"; diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 39a39f949a5..1e5fb8458e5 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.6.1"; + version = "2.7.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "1ndirl36gbba12cs5vw22k2zrbpqdmnpi1gciwqb1zbib2s1akg8"; + sha256 = "0rmshl4xchf3blwvar4q9dpxm9xznn3yzas4vwxqiq3yhapgqkn0"; }; jarsrc = fetchurl { # NOTE: This is actually a .jar, Github has issues url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip"; - sha256 = "1533msarx6gb3xc2sp2nmspllnqy7anpnv9a0ifl0psxm3xph06p"; + sha256 = "0ivwb1qlxs1hyical0fjgavm9wfkw3f10sk67p5g2p5lpf4pxp1d"; }; JARNAME = "${name}-standalone.jar"; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 1338201b996..7c8c71b2969 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "1.9.0"; + version = "1.10.4"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "12hcpvc0j6g200qhz12gfsslngbqx4sifrikr05vh2av17hba25s"; + sha256 = "0csaacghcdnkrpxiwsg8166nmdpnddf77c619i558vj0wdglq45k"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "1hqwhg94g514g0ad4h0h7wh7k5clm9i7whzr6c30i8yb00ga628s"; + sha256 = "1lsdp4v92v406qiwr435ym4f3zbc1vq6ipwrp7li640frhr2jqpk"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "1b30daxnpn1psy3vds1m4mnbl2hmvr2bc0zrd3nn9xm3xacm3dqj"; + sha256 = "0r8f1m9f544ikcknvq1500kfjxbikgqlv7wdayfpazvj6s1zlswg"; }; buildInputs = [ go-bindata ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 6a752d08cff..3196b6728e0 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.33"; + version = "2.44"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "1x1m4d7r128v6i0gpa4z07db6vdw1x9ik0p4a8gsnj6g15fzkdzy"; + sha256 = "01v9p0p27czwsk7ljv1879b5qcrhgy7zan6dj8klr9rci1id8x0d"; }; buildCommand = '' diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 338f3323d94..8290b57d41b 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, qt4, sqlite, cmake }: stdenv.mkDerivation rec { - version = "3.8.0"; + version = "3.9.1"; name = "sqlitebrowser-${version}"; src = fetchFromGitHub { repo = "sqlitebrowser"; owner = "sqlitebrowser"; rev = "v${version}"; - sha256 = "009yaamf6f654dl796f1gmj3rb34d55w87snsfgk33gpy6x19ccp"; + sha256 = "1s7f2d7wx2i68x60z7wdws3il6m83k5n5w5wyjvr0mz0mih0s150"; }; buildInputs = [ qt4 sqlite cmake ]; diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix new file mode 100644 index 00000000000..afac17e121a --- /dev/null +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -0,0 +1,69 @@ +# To enable specific database drivers, override this derivation and pass the +# driver packages in the drivers argument (e.g. mysql_jdbc, postgresql_jdbc). +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip +, jre +, drivers ? [] +}: +let + version = "3.7.1"; +in stdenv.mkDerivation rec { + name = "squirrel-sql-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; + sha256 = "1v141ply57k5krwbnnmz4mbs9hs8rbys0bkjz69gvxlqjizyiq23"; + }; + + buildInputs = [ + jre makeWrapper stdenv unzip + ]; + + unpackPhase = '' + unzip ${src} + ''; + + buildPhase = '' + cd squirrelsql-${version}-standard + chmod +x squirrel-sql.sh + ''; + + installPhase = '' + mkdir -p $out/share/squirrel-sql + cp -r . $out/share/squirrel-sql + + mkdir -p $out/bin + cp="" + for pkg in ${builtins.concatStringsSep " " drivers}; do + if test -n "$cp"; then + cp="$cp:" + fi + cp="$cp"$(echo $pkg/share/java/*.jar | tr ' ' :) + done + makeWrapper $out/share/squirrel-sql/squirrel-sql.sh $out/bin/squirrel-sql \ + --set CLASSPATH "$cp" \ + --set JAVA_HOME "${jre}" + + mkdir -p $out/share/icons/hicolor/32x32/apps + ln -s $out/share/squirrel-sql/icons/acorn.png \ + $out/share/icons/hicolor/32x32/apps/squirrel-sql.png + ln -s ${desktopItem}/share/applications $out/share + ''; + + desktopItem = makeDesktopItem { + name = "squirrel-sql"; + exec = "squirrel-sql"; + comment = meta.description; + desktopName = "SQuirreL SQL"; + genericName = "SQL Client"; + categories = "Development;"; + icon = "squirrel-sql"; + }; + + meta = { + description = "Universal SQL Client"; + homepage = http://squirrel-sql.sourceforge.net/; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ khumba ]; + }; +} diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix index 4f853e900b3..bd83a63e5d6 100644 --- a/pkgs/development/tools/glide/default.nix +++ b/pkgs/development/tools/glide/default.nix @@ -6,6 +6,11 @@ buildGoPackage rec { goPackagePath = "github.com/Masterminds/glide"; + buildFlagsArray = '' + -ldflags= + -X main.version=${version} + ''; + src = fetchFromGitHub { rev = "v${version}"; owner = "Masterminds"; diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index a1564859e84..030693714f0 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -9,12 +9,11 @@ stdenv.mkDerivation rec { # Note: Glib support is optional, but it's quite useful (e.g., it's # used by Guile-GNOME). - buildInputs = [ guile pkgconfig glib ] - ++ stdenv.lib.optional doCheck guile_lib; + buildInputs = [ guile pkgconfig glib guile_lib ]; propagatedBuildInputs = [ libffi ]; - doCheck = !stdenv.isFreeBSD; # XXX: 00-socket.test hangs + doCheck = true; meta = { description = "G-Wrap, a wrapper generator for Guile"; diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index e78c7a7ff9a..f9c43ee841b 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -1,74 +1,56 @@ -{ stdenv, fetchurl, bash, buildFHSUserEnv, makeWrapper, writeTextFile +{ stdenv, lib, fetchurl, makeWrapper, buildGoPackage, fetchFromGitHub , nodejs-6_x, postgresql, ruby }: with stdenv.lib; let - version = "3.43.12"; - bin_ver = "5.4.7-8dc2c80"; + cli = buildGoPackage rec { + name = "cli-${version}"; + version = "5.6.14"; - arch = { - "x86_64-linux" = "linux-amd64"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + goPackagePath = "github.com/heroku/cli"; - sha256 = { - "x86_64-linux" = "0iqjxkdw53dvy54ahmr9yijlxrp5nbikh9z7iss93z753cgxdl06"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - - fhsEnv = buildFHSUserEnv { - name = "heroku-fhs-env"; + src = fetchFromGitHub { + owner = "heroku"; + repo = "cli"; + rev = "v${version}"; + sha256 = "11jccham1vkmh5284l6i30na4a4y7b1jhi2ci2z2wwx8m3gkypq9"; + }; }; - heroku = stdenv.mkDerivation rec { - inherit version; - name = "heroku"; - - meta = { - homepage = "https://toolbelt.heroku.com"; - description = "Everything you need to get started using Heroku"; - maintainers = with maintainers; [ aflatter mirdhyn ]; - license = licenses.mit; - platforms = with platforms; unix; - }; - - src = fetchurl { - url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz"; - sha256 = "1z7z8sl2hkrc8rdvx3h00fbcrxs827xlfp6fji0ap97a6jc0v9x4"; - }; - - bin = fetchurl { - url = "https://cli-assets.heroku.com/branches/stable/${bin_ver}/heroku-v${bin_ver}-${arch}.tar.gz"; - inherit sha256; - }; - - installPhase = '' - cli=$out/share/heroku/cli - mkdir -p $cli - - tar xzf $src -C $out --strip-components=1 - tar xzf $bin -C $cli --strip-components=1 - - wrapProgram $out/bin/heroku \ - --set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node \ - --set XDG_DATA_HOME $out/share \ - --set XDG_DATA_DIRS $out/share - - # When https://github.com/NixOS/patchelf/issues/66 is fixed, reinstate this and dump the fhsuserenv - #patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - # $cli/bin/heroku - ''; - - buildInputs = [ fhsEnv ruby postgresql makeWrapper ]; - - doUnpack = false; - }; - -in writeTextFile { +in stdenv.mkDerivation rec { name = "heroku-${version}"; - destination = "/bin/heroku"; - executable = true; - text = '' - #!${bash}/bin/bash -e - ${fhsEnv}/bin/heroku-fhs-env ${heroku}/bin/heroku + version = "3.43.16"; + + meta = { + homepage = "https://toolbelt.heroku.com"; + description = "Everything you need to get started using Heroku"; + maintainers = with maintainers; [ aflatter mirdhyn peterhoeg ]; + license = licenses.mit; + platforms = with platforms; unix; + }; + + binPath = lib.makeBinPath [ postgresql ruby ]; + + buildInputs = [ makeWrapper ]; + + doUnpack = false; + + src = fetchurl { + url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz"; + sha256 = "08pai3cjaj7wshhyjcmkvyr1qxv5ab980whcm406798ng8f91hn7"; + }; + + installPhase = '' + mkdir -p $out + + tar xzf $src -C $out --strip-components=1 + install -Dm755 ${cli}/bin/cli $out/share/heroku/cli/bin/heroku + + wrapProgram $out/bin/heroku \ + --set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node \ + --set XDG_DATA_HOME $out/share \ + --set XDG_DATA_DIRS $out/share \ + --prefix PATH : ${binPath} ''; } diff --git a/pkgs/development/tools/java/jclasslib/default.nix b/pkgs/development/tools/java/jclasslib/default.nix index cb3f6164b02..1d8ae80572a 100644 --- a/pkgs/development/tools/java/jclasslib/default.nix +++ b/pkgs/development/tools/java/jclasslib/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = mirror://sourceforge/jclasslib/jclasslib_unix_2_0.tar.gz; - md5 = "31d91bb03fee23410689d2f1c4c439b1"; + sha256 = "1y2fbg5h2p3fwcp7h5n1qib7x9svyrilq3i58vm6vany1xzg7nx5"; }; inherit jre xpf ant; diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix new file mode 100644 index 00000000000..4c0ca97ad50 --- /dev/null +++ b/pkgs/development/tools/misc/bashdb/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "bashdb-4.4-0.92"; + + src = fetchurl { + url = "mirror://sourceforge/bashdb/${name}.tar.bz2"; + sha256 = "6a8c2655e04339b954731a0cb0d9910e2878e45b2fc08fe469b93e4f2dbaaf92"; + }; + + meta = { + description = "Bash script debugger"; + homepage = http://bashdb.sourceforge.net/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 4c32255e875..6ac9f3febc4 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -32,9 +32,18 @@ stdenv.mkDerivation rec { # This is needed, for instance, so that running "ldd" on a binary that is # PaX-marked to disable mprotect doesn't fail with permission denied. ./pt-pax-flags.patch + + # Bfd looks in BINDIR/../lib for some plugins that don't + # exist. This is pointless (since users can't install plugins + # there) and causes a cycle between the lib and bin outputs, so + # get rid of it. + ./no-plugins.patch ]; - outputs = [ "out" "info" ] ++ (optional (cross == null) "dev"); + outputs = [ "out" ] + ++ optional (cross == null && !stdenv.isDarwin) "lib" # problems in Darwin stdenv + ++ [ "info" ] + ++ optional (cross == null) "dev"; nativeBuildInputs = [ bison ]; buildInputs = [ zlib ]; diff --git a/pkgs/development/tools/misc/binutils/no-plugins.patch b/pkgs/development/tools/misc/binutils/no-plugins.patch new file mode 100644 index 00000000000..9624b7976b7 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/no-plugins.patch @@ -0,0 +1,19 @@ +diff -ru binutils-2.27-orig/bfd/plugin.c binutils-2.27/bfd/plugin.c +--- binutils-2.27-orig/bfd/plugin.c 2016-10-14 17:46:30.791315555 +0200 ++++ binutils-2.27/bfd/plugin.c 2016-10-14 17:46:38.583298765 +0200 +@@ -333,6 +333,7 @@ + if (plugin_program_name == NULL) + return found; + ++#if 0 + plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL); + p = make_relative_prefix (plugin_program_name, + BINDIR, +@@ -364,6 +365,7 @@ + free (p); + if (d) + closedir (d); ++#endif + + return found; + } diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix new file mode 100644 index 00000000000..d768f68576c --- /dev/null +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, cmake, makeWrapper +, llvm, clang-unwrapped +, flex +, zlib +, perl, ExporterLite, FileWhich, GetoptTabular, RegexpCommon, TermReadKey +, utillinux +}: + +assert stdenv.isLinux -> (utillinux != null); + +stdenv.mkDerivation rec { + name = "creduce-${version}"; + version = "2.6.0"; + + src = fetchurl { + url = "http://embed.cs.utah.edu/creduce/${name}.tar.gz"; + sha256 = "0pf5q0n8vkdcr1wrkxn2jzxv0xkrir13bwmqfw3jpbm3dh2c3b6d"; + }; + + buildInputs = [ + # Ensure stdenv's CC is on PATH before clang-unwrapped + stdenv.cc + # Actual deps: + cmake makeWrapper + llvm clang-unwrapped + flex zlib + perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey + ]; + + # On Linux, c-reduce's preferred way to reason about + # the cpu architecture/topology is to use 'lscpu', + # so let's make sure it knows where to find it: + patchPhase = stdenv.lib.optionalString stdenv.isLinux '' + substituteInPlace creduce/creduce_utils.pm --replace \ + lscpu ${utillinux}/bin/lscpu + ''; + + + enableParallelBuilding = true; + + postInstall = '' + wrapProgram $out/bin/creduce --prefix PERL5LIB : "$PERL5LIB" + ''; + + meta = with stdenv.lib; { + description = "A C program reducer"; + homepage = "https://embed.cs.utah.edu/creduce"; + # Officially, the license is: https://github.com/csmith-project/creduce/blob/master/COPYING + license = licenses.ncsa; + longDescription = '' + C-Reduce is a tool that takes a large C or C++ program that has a + property of interest (such as triggering a compiler bug) and + automatically produces a much smaller C/C++ program that has the same + property. It is intended for use by people who discover and report + bugs in compilers and other tools that process C/C++ code. + ''; + maintainers = [ maintainers.dtzWill ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index da0447c49da..f39d15bc7be 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -12,7 +12,7 @@ let - basename = "gdb-7.12"; + basename = "gdb-7.12.1"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "152g2qa8337cxif3lkvabjcxfd9jphfb2mza8f1p2c4bjk2z6kw3"; + sha256 = "11ii260h1sd7v0bs3cz6d5l8gqxxgldry0md60ncjgixjw5nh1s6"; }; nativeBuildInputs = [ pkgconfig texinfo perl ] diff --git a/pkgs/development/tools/misc/grafana/default.nix b/pkgs/development/tools/misc/grafana/default.nix deleted file mode 100644 index fc98d9703ef..00000000000 --- a/pkgs/development/tools/misc/grafana/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, unzip, conf ? null }: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "grafana-${version}"; - version = "1.9.1"; - - src = fetchurl { - url = "http://grafanarel.s3.amazonaws.com/${name}.zip"; - sha256 = "1zyzsbspxrzaf2kk6fysp6c3y025s6nd75rc2p9qq9q95dv8fj23"; - }; - - buildInputs = [ unzip ]; - - phases = ["unpackPhase" "installPhase"]; - installPhase = '' - mkdir -p $out && cp -R * $out - ${optionalString (conf!=null) ''cp ${conf} $out/config.js''} - ''; - - meta = { - description = "A Graphite & InfluxDB Dashboard and Graph Editor"; - homepage = http://grafana.org/; - license = licenses.asl20; - - maintainers = [ maintainers.offline ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index dbd53c65050..0906492ad10 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -61,15 +61,15 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2016-12-09"; + version = "2017-02-03"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "de55303197d997c4fc5503b52b1321ae9528583d"; - sha256 = "0nimqsbpjxfwha6d5gp6a7jh50i83z1llmx30da4bscsic8z1xly"; + rev = "a366f362e197476615a813e2cc904b60db28e65f"; + sha256 = "0q7bywh59aqgpgj9ca2xscszxal9c3c90bs7sb4cfg7w8g6m69hf"; }; buildInputs = diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 37e5ae6f710..774734a895c 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, ncurses }: +let dialect = with stdenv.lib; last (splitString "-" stdenv.system); in + stdenv.mkDerivation rec { name = "lsof-${version}"; version = "4.89"; @@ -24,20 +26,19 @@ stdenv.mkDerivation rec { }; unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; - + patches = [ ./dfile.patch ]; - configurePhase = '' - # Stop build scripts from searching global include paths - export LSOF_INCLUDE=${stdenv.cc.libc}/include - ./Configure -n ${if stdenv.isDarwin then "darwin" else "linux"} - ''; - + # Stop build scripts from searching global include paths + LSOF_INCLUDE = "${stdenv.cc.libc}/include"; + configurePhase = "./Configure -n ${dialect}"; preBuild = '' sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;' -e 's/-lcurses/-lncurses/' + for filepath in $(find dialects/${dialect} -type f); do + sed -i "s,/usr/include,$LSOF_INCLUDE,g" $filepath + done ''; - installPhase = '' mkdir -p $out/bin $out/man/man8 cp lsof.8 $out/man/man8/ @@ -53,6 +54,6 @@ stdenv.mkDerivation rec { from it). ''; maintainers = [ stdenv.lib.maintainers.mornfall ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index fa77890655e..c2268ba8da2 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -1,11 +1,22 @@ { fetchurl, stdenv, jre, ctags, makeWrapper, coreutils, git }: stdenv.mkDerivation rec { - name = "opengrok-0.12.1"; + name = "opengrok-${version}"; + version = "0.12.5"; + # 0.12.5 is the latest distributed as a .tar.gz file. + # Newer are distribued as .zip so a source build is required. + + # if builded from source + #src = fetchurl { + # url = "https://github.com/OpenGrok/OpenGrok/archive/${version}.tar.gz"; + # sha256 = "01r7ipnj915rnyxyqrnmjfagkip23q5lx9g787qb7qrnbvgfi118"; + #}; + + # binary distribution src = fetchurl { - url = "http://java.net/projects/opengrok/downloads/download/${name}.tar.gz"; - sha256 = "0ihaqgf1z2gsjmy2q96m0s07dpnh92j3ss3myiqjdsh9957fwg79"; + url = https://github.com/OpenGrok/OpenGrok/files/213268/opengrok-0.12.1.5.tar.gz; + sha256 = "c3ce079f6ed1526c475cb4b9a7aa901f75507318c93b436d6c14eba4098e4ead"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index ea52fff64cc..3349213a741 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "openocd-${version}"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2"; - sha256 = "0hzlnm19c4b35vsxs6ik94xbigv3ykdgr8gzrdir6sqmkan44w43"; + sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk"; }; buildInputs = [ libftdi libusb1 pkgconfig hidapi ]; @@ -26,7 +26,12 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p "$out/etc/udev/rules.d" - ln -s "$out/share/openocd/contrib/99-openocd.rules" "$out/etc/udev/rules.d/99-openocd.rules" + rules="$out/share/openocd/contrib/60-openocd.rules" + if [ ! -f "$rules" ]; then + echo "$rules is missing, must update the Nix file." + exit 1 + fi + ln -s "$rules" "$out/etc/udev/rules.d/" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index e52795bf5cd..de13f6709b2 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -1,30 +1,33 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, libusb1 }: +{ stdenv, fetchurl, cmake, libusb1 }: -# IMPORTANT: You need permissions to access the stlink usb devices. Here are -# example udev rules for stlink v1 and v2 so you don't need to have root -# permissions (copied from /49-stlink*.rules): -# -# SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3744", MODE:="0666", SYMLINK+="stlinkv1_%n" -# SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0666", SYMLINK+="stlinkv2_%n" +# IMPORTANT: You need permissions to access the stlink usb devices. +# Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix let - version = "1.1.0"; + version = "1.3.0"; in stdenv.mkDerivation { name = "stlink-${version}"; src = fetchurl { url = "https://github.com/texane/stlink/archive/${version}.tar.gz"; - sha256 = "0b38a32ids9dpnz5h892l279fz8y1zzqk1qsnyhl1nm03p7xzi1s"; + sha256 = "3e8cba21744d2c38a0557f6835a05189e1b98202931bb0183d22efc462c893dd"; }; - buildInputs = [ autoconf automake libtool pkgconfig libusb1 ]; - preConfigure = "./autogen.sh"; + buildInputs = [ cmake libusb1 ]; + patchPhase = '' + sed -i 's@/etc/udev/rules.d@$ENV{out}/etc/udev/rules.d@' CMakeLists.txt + sed -i 's@/etc/modprobe.d@$ENV{out}/etc/modprobe.d@' CMakeLists.txt + ''; + preInstall = '' + mkdir -p $out/etc/udev/rules.d + mkdir -p $out/etc/modprobe.d + ''; meta = with stdenv.lib; { description = "In-circuit debug and programming for ST-Link devices"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = [ maintainers.bjornfor maintainers.rongcuid ]; }; } diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 5152067efa1..d0e05dd35f8 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "4.14"; + version = "4.15"; src = fetchurl { url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "0bvicjkqk3c09zyxgkakymiqr3618sa2dfpd9f3fdp23n8853vav"; + sha256 = "1a9wb2nzfqgwazd0yrlbk48awlfn898n1bdayvdxj7qlssac1kf0"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index e73d77f772d..c8747e66e39 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4 , re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find -, cohttp, conduit, magic-mime, uri, tzdata +, cohttp, conduit, magic-mime, tzdata }: assert stdenv.lib.versionOlder "4.02" ocaml.version; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { }; - buildInputs = [ ocaml findlib camlp4 conduit magic-mime ]; + buildInputs = [ ocaml findlib camlp4 ]; propagatedBuildInputs = [ core_p4 async_p4 async_unix_p4 async_extra_p4 sexplib_p4 async_shell core_extended_p4 - async_find cohttp uri re2_p4 ]; + async_find cohttp conduit magic-mime re2_p4 ]; createFindlibDestdir = true; dontStrip = true; diff --git a/pkgs/misc/vim-plugins/patches/youcompleteme/2-ycm-cmake.patch b/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch similarity index 90% rename from pkgs/misc/vim-plugins/patches/youcompleteme/2-ycm-cmake.patch rename to pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch index a1c4b1b39a4..baa907b2126 100644 --- a/pkgs/misc/vim-plugins/patches/youcompleteme/2-ycm-cmake.patch +++ b/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch @@ -1,5 +1,7 @@ ---- ./third_party/ycmd/cpp/ycm/CMakeLists.txt -+++ ./third_party/ycmd/cpp/ycm/CMakeLists.txt +diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt +index 2074c58e..9ecd6e57 100644 +--- a/cpp/ycm/CMakeLists.txt ++++ b/cpp/ycm/CMakeLists.txt @@ -335,7 +335,7 @@ COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$" ) @@ -33,4 +35,3 @@ + # endif() endif() endif() - diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 57b4fe99b2f..9ac227ac006 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -1,40 +1,84 @@ -{ stdenv, fetchgit, cmake, llvmPackages, boost, python2Packages +{ stdenv, lib, fetchgit, cmake, llvmPackages, boost, python +, gocode ? null +, godef ? null +, rustracerd ? null +, Cocoa ? null }: -let - inherit (python2Packages) python mkPythonDerivation waitress frozendict bottle; -in mkPythonDerivation rec { - name = "ycmd-2016-01-12"; - namePrefix = ""; +stdenv.mkDerivation rec { + name = "ycmd-${version}"; + version = "2017-02-03"; src = fetchgit { url = "git://github.com/Valloric/ycmd.git"; - rev = "f982f6251c5ff85e3abe6e862aad8bcd19e85ece"; - sha256 = "1g0hivv3wla7z5dgnkcn3ny38p089pjfj36nx6k29zmprgmjinyr"; + rev = "ec7a154f8fe50c071ecd0ac6841de8a50ce92f5d"; + sha256 = "0rzxgqqqmmrv9r4k2ji074iprhw6sb0jkvh84wvi45yfyphsh0xi"; }; - buildInputs = [ cmake boost ]; - - propagatedBuildInputs = [ waitress frozendict bottle ]; + buildInputs = [ cmake boost ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; buildPhase = '' export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} ${python.interpreter} build.py --clang-completer --system-boost ''; + patches = [ ./2-ycm-cmake.patch ]; + configurePhase = ":"; + # remove the tests + # + # make __main__.py executable and add shebang + # + # copy over third-party libs + # note: if we switch to using our packaged libs, we'll need to symlink them + # into the same spots, as YouCompleteMe (the vim plugin) expects those paths + # to be available + # + # symlink completion backends where ycmd expects them installPhase = '' - mkdir -p $out/lib/ycmd/third_party $out/bin - cp -r ycmd/ CORE_VERSION libclang.so.* ycm_client_support.so ycm_core.so $out/lib/ycmd/ + rm -rf ycmd/tests + + chmod +x ycmd/__main__.py + sed -i "1i #!${python.interpreter}\ + " ycmd/__main__.py + + mkdir -p $out/lib/ycmd + cp -r ycmd/ CORE_VERSION libclang.so.* ycm_core.so $out/lib/ycmd/ + + mkdir -p $out/bin ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd + + mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release} + + cp -r third_party/JediHTTP $out/lib/ycmd/third_party + for p in waitress frozendict bottle python-future argparse requests; do + cp -r third_party/$p $out/lib/ycmd/third_party + done + + '' + lib.optionalString (gocode != null) '' + ln -s ${gocode}/bin/gocode $out/lib/ycmd/third_party/gocode + '' + lib.optionalString (godef != null) '' + ln -s ${godef}/bin/godef $out/lib/ycmd/third_party/godef + '' + lib.optionalString (rustracerd != null) '' + ln -s ${rustracerd}/bin/racerd $out/lib/ycmd/third_party/racerd/target/release + ''; + + # fixup the argv[0] and replace __file__ with the corresponding path so + # python won't be thrown off by argv[0] + postFixup = '' + substituteInPlace $out/lib/ycmd/ycmd/__main__.py \ + --replace $out/lib/ycmd/ycmd/__main__.py \ + $out/bin/ycmd \ + --replace __file__ \ + "'$out/lib/ycmd/ycmd/__main__.py'" ''; meta = with stdenv.lib; { description = "A code-completion and comprehension server"; homepage = https://github.com/Valloric/ycmd; license = licenses.gpl3; - maintainers = with maintainers; [ rasendubi ]; + maintainers = with maintainers; [ rasendubi cstrahan ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 9ff9b05b5ed..84e57e267c2 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -2,12 +2,14 @@ stdenv.mkDerivation rec { name = "yodl-${version}"; - version = "3.08.01"; + version = "3.08.02"; - buildInputs = [ perl icmake ]; + nativeBuildInputs = [ icmake ]; + + buildInputs = [ perl ]; src = fetchFromGitHub { - sha256 = "0sks4phdy8qf6lmbjardrk0gl4v7crr4vjdgwpkkc8d5lzvcx7j5"; + sha256 = "0z4pjrl4bq03fxc50c9h0bnc90vqn5c2dy830mjyzjrn1ms3i003"; rev = version; repo = "yodl"; owner = "fbb-git"; diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index feedd883548..780862b6727 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl substituteInPlace config/Makefile --replace CPP=/lib/cpp CPP=${stdenv.cc}/bin/cpp + substituteInPlace config/Makefile --replace "OCAMLC=ocamlc -g" "OCAMLC=ocamlc -g -warn-error -31" mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/caml ''; diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 1e1d2eb68ea..a257a88287c 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -7,6 +7,9 @@ let param = { "4.03.0" = { version = "4.03+1"; sha256 = "1f2ndch6f1m4fgnxsjb94qbpwjnjgdlya6pard44y6n0dqxi1wsq"; }; + "4.04.0" = { + version = "4.04+1"; + sha256 = "1ad7rygqjxrc1im95gw9lp8q83nhdaf383f2808f1p63yl42xm7k"; }; }."${ocaml.version}"; in diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index d88dd9eb896..81cd2caf7ee 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4 +{ stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild , cmdliner, tyxml, reactivedata, cppo, which, base64, uchar }: @@ -16,7 +16,7 @@ stdenv.mkDerivation { }."${version}"; }; - buildInputs = [ ocaml findlib menhir ocsigen_deriving + buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild cmdliner reactivedata cppo which base64 ] ++ stdenv.lib.optional (stdenv.lib.versionAtLeast ocaml.version "4.02") tyxml; propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ] diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index 53152898fd6..93d96005d35 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "omake-${version}"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { url = "http://download.camlcity.org/download/${name}.tar.gz"; - sha256 = "093ansbppms90hiqvzar2a46fj8gm9iwnf8gn38s6piyp70lrbsj"; + sha256 = "1znnlkpz89hk44byvnl1pr92ym6hwfyyw2qm9clq446r6l2z4m64"; }; buildInputs = [ ocaml ncurses ]; diff --git a/pkgs/development/tools/parsing/antlr/default.nix b/pkgs/development/tools/parsing/antlr/default.nix deleted file mode 100644 index e866f61f25a..00000000000 --- a/pkgs/development/tools/parsing/antlr/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl, jre}: - -stdenv.mkDerivation { - name = "antlr-3.0b3"; - builder = ./builder.sh; - src = fetchurl { - url = http://www.antlr.org/download/antlr-3.0b3.tar.gz; - md5 = "6a7e70ccece8149b735cc3aaa24241cc"; - }; - inherit jre; - - meta = with stdenv.lib; { - description = "Powerful parser generator"; - longDescription = '' - ANTLR (ANother Tool for Language Recognition) is a powerful parser - generator for reading, processing, executing, or translating structured - text or binary files. It's widely used to build languages, tools, and - frameworks. From a grammar, ANTLR generates a parser that can build and - walk parse trees. - ''; - homepage = http://www.antlr.org/; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 05546da67f0..0fe243e8aaf 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -20,6 +20,8 @@ let configureFlags = [ "--with-colm=${colm}" ]; + NIX_CFLAGS_COMPILE = "-std=gnu++98"; + doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix new file mode 100644 index 00000000000..378073d16c0 --- /dev/null +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, zlib, boost162, libunwind, + elfutils, qt5, kde5, sparsehash }: + +stdenv.mkDerivation rec { + name = "heaptrack-${version}"; + version = "2017-02-14"; + + src = fetchFromGitHub { + owner = "KDE"; + repo = "heaptrack"; + rev = "2469003b3172874e1df7e1f81c56e469b80febdb"; + sha256 = "0dqchd2r4khv9gzj4n0qjii2nqygkj5jclkji8jbvivx5qwsqznc"; + }; + + buildInputs = [ cmake zlib boost162 libunwind elfutils sparsehash + qt5.ecm qt5.qtbase kde5.kio kde5.kitemmodels + kde5.threadweaver kde5.kconfigwidgets kde5.kcoreaddons ]; + + meta = with stdenv.lib; { + description = "Heap memory profiler for Linux"; + homepage = https://github.com/KDE/heaptrack; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index b7872780245..a16bdbc539a 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,11 +1,11 @@ { fetchgit, pkgconfig, gettext, runCommand, makeWrapper -, elfutils, kernel, gnumake }: +, elfutils, kernel, gnumake, python2, pythonPackages, binutils }: let ## fetchgit info url = git://sourceware.org/git/systemtap.git; - rev = "a10bdceb7c9a7dc52c759288dd2e555afcc5184a"; - sha256 = "1kllzfnh4ksis0673rma5psglahl6rvy0xs5v05qkqn6kl7irmg1"; - version = "2016-09-16"; + rev = "276ed27a3cc64531542ab73bb36bb04784e79bbc"; + sha256 = "11967dx3cjs96v3ncfljw0h7blsgg9wm8g9z2270q9a90988g2c2"; + version = "2017-02-04"; inherit (kernel) stdenv; inherit (stdenv) lib; @@ -14,7 +14,13 @@ let stapBuild = stdenv.mkDerivation { name = "systemtap-${version}"; src = fetchgit { inherit url rev sha256; }; - buildInputs = [ elfutils pkgconfig gettext ]; + buildInputs = [ elfutils pkgconfig gettext python2 pythonPackages.setuptools ]; + # FIXME: Workaround for bug in kbuild, where quoted -I"/foo" flags would get mangled in out-of-tree kbuild dirs + postPatch = '' + substituteInPlace buildrun.cxx --replace \ + 'o << "EXTRA_CFLAGS += -I\"" << s.runtime_path << "\"" << endl;' \ + 'o << "EXTRA_CFLAGS += -I" << s.runtime_path << endl;' + ''; enableParallelBuilding = true; }; @@ -48,5 +54,5 @@ in runCommand "systemtap-${kernel.version}-${version}" { rm $out/bin/stap makeWrapper $stapBuild/bin/stap $out/bin/stap \ --add-flags "-r $kernelBuildDir" \ - --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc elfutils gnumake ]} + --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc binutils elfutils gnumake ]} '' diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix index 1b5a2ca674f..e174184835a 100644 --- a/pkgs/development/tools/pydb/default.nix +++ b/pkgs/development/tools/pydb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, emacs }: +{ stdenv, fetchurl, python2, emacs }: stdenv.mkDerivation { name = "pydb-1.26"; @@ -8,14 +8,14 @@ stdenv.mkDerivation { sha256 = "1wlkz1hd5d4gkzhkjkzcm650c1lchj28hj36jx96mklglm41h4q1"; }; - buildInputs = [ python emacs /* emacs is optional */ ]; + buildInputs = [ python2 emacs /* emacs is optional */ ]; preConfigure = '' p="$(toPythonPath $out)" - configureFlags="$configureFlags --with-python=${python}/bin/python --with-site-packages=$p" + configureFlags="$configureFlags --with-python=${python2.interpreter} --with-site-packages=$p" ''; - meta = { + meta = { description = "Python debugger with GDB-like commands and Emacs bindings"; homepage = http://bashdb.sourceforge.net/pydb/; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/development/tools/rhc/Gemfile b/pkgs/development/tools/rhc/Gemfile index ad167c7422f..a780461e254 100644 --- a/pkgs/development/tools/rhc/Gemfile +++ b/pkgs/development/tools/rhc/Gemfile @@ -1,2 +1,4 @@ source 'https://rubygems.org' + +gem 'archive-tar-minitar', '>= 0.5.2.1', github: 'peterhoeg/archive-tar-minitar' gem 'rhc' diff --git a/pkgs/development/tools/rhc/Gemfile.lock b/pkgs/development/tools/rhc/Gemfile.lock index 83fa877550d..004c293b965 100644 --- a/pkgs/development/tools/rhc/Gemfile.lock +++ b/pkgs/development/tools/rhc/Gemfile.lock @@ -1,27 +1,31 @@ +GIT + remote: git://github.com/peterhoeg/archive-tar-minitar.git + revision: dae32ca550a87dba32597115ae18805db4782ebe + specs: + archive-tar-minitar (0.5.2.1) + GEM remote: https://rubygems.org/ specs: - archive-tar-minitar (0.5.2) commander (4.2.1) highline (~> 1.6.11) highline (1.6.21) httpclient (2.6.0.1) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.9.2) - net-ssh-gateway (1.2.0) - net-ssh (>= 2.6.5) + net-ssh (4.0.1) + net-ssh-gateway (2.0.0) + net-ssh (>= 4.0.0) net-ssh-multi (1.2.1) net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) open4 (1.3.4) - rhc (1.36.4) + rhc (1.38.7) archive-tar-minitar commander (>= 4.0, < 4.3.0) highline (~> 1.6.11) - httpclient (>= 2.4.0) + httpclient (>= 2.4.0, < 2.7.0) net-scp (>= 1.1.2) - net-ssh (>= 2.0.11, < 2.9.3) net-ssh-multi (>= 1.2.0) open4 @@ -29,7 +33,8 @@ PLATFORMS ruby DEPENDENCIES + archive-tar-minitar (>= 0.5.2.1)! rhc BUNDLED WITH - 1.10.5 + 1.13.6 diff --git a/pkgs/development/tools/rhc/default.nix b/pkgs/development/tools/rhc/default.nix index e6b342dd7b6..da8a8e2e77d 100644 --- a/pkgs/development/tools/rhc/default.nix +++ b/pkgs/development/tools/rhc/default.nix @@ -1,10 +1,24 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby_2_2, stdenv, makeWrapper }: -bundlerEnv { - name = "rhc-1.36.4"; +stdenv.mkDerivation rec { + name = "rhc-1.38.7"; - inherit ruby; - gemdir = ./.; + env = bundlerEnv { + name = "rhc-1.38.7-gems"; + + ruby = ruby_2_2; + + gemdir = ./.; + }; + + buildInputs = [ makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/rhc $out/bin/rhc + ''; meta = with lib; { homepage = https://github.com/openshift/rhc; diff --git a/pkgs/development/tools/rhc/gemset.nix b/pkgs/development/tools/rhc/gemset.nix index 6b273396890..933a7dc95af 100644 --- a/pkgs/development/tools/rhc/gemset.nix +++ b/pkgs/development/tools/rhc/gemset.nix @@ -1,95 +1,84 @@ { - "archive-tar-minitar" = { - version = "0.5.2"; + archive-tar-minitar = { source = { - type = "gem"; - sha256 = "1j666713r3cc3wb0042x0wcmq2v11vwwy5pcaayy5f0lnd26iqig"; + fetchSubmodules = false; + rev = "dae32ca550a87dba32597115ae18805db4782ebe"; + sha256 = "0fvxacbcb52fm5dis451kdd7dv74z8p6nm4vnfqf7jg2aghcxdkd"; + type = "git"; + url = "git://github.com/peterhoeg/archive-tar-minitar.git"; }; + version = "0.5.2.1"; }; - "commander" = { - version = "4.2.1"; + commander = { source = { - type = "gem"; + remotes = ["https://rubygems.org"]; sha256 = "1zwfhswnbhwv0zzj2b3s0qvpqijbbnmh7zvq6v0274rqbxyf1jwc"; - }; - dependencies = [ - "highline" - ]; - }; - "highline" = { - version = "1.6.21"; - source = { type = "gem"; + }; + version = "4.2.1"; + }; + highline = { + source = { + remotes = ["https://rubygems.org"]; sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1"; - }; - }; - "httpclient" = { - version = "2.6.0.1"; - source = { type = "gem"; + }; + version = "1.6.21"; + }; + httpclient = { + source = { + remotes = ["https://rubygems.org"]; sha256 = "0haz4s9xnzr73mkfpgabspj43bhfm9znmpmgdk74n6gih1xlrx1l"; - }; - }; - "net-scp" = { - version = "1.2.1"; - source = { type = "gem"; + }; + version = "2.6.0.1"; + }; + net-scp = { + source = { + remotes = ["https://rubygems.org"]; sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; - }; - dependencies = [ - "net-ssh" - ]; - }; - "net-ssh" = { - version = "2.9.2"; - source = { type = "gem"; - sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r"; }; - }; - "net-ssh-gateway" = { - version = "1.2.0"; - source = { - type = "gem"; - sha256 = "1nqkj4wnj26r81rp3g4jqk7bkd2nqzjil3c9xqwchi0fsbwv2niy"; - }; - dependencies = [ - "net-ssh" - ]; - }; - "net-ssh-multi" = { version = "1.2.1"; + }; + net-ssh = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "02xj3pcpqr32nlak0vsx71gd5z65jl3q1hwi2x157vabw1kgjanq"; type = "gem"; + }; + version = "4.0.1"; + }; + net-ssh-gateway = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l3v761y32aw0n8lm0c0m42lr4ay8cq6q4sc5yc68b9fwlfvb70x"; + type = "gem"; + }; + version = "2.0.0"; + }; + net-ssh-multi = { + source = { + remotes = ["https://rubygems.org"]; sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71"; - }; - dependencies = [ - "net-ssh" - "net-ssh-gateway" - ]; - }; - "open4" = { - version = "1.3.4"; - source = { type = "gem"; + }; + version = "1.2.1"; + }; + open4 = { + source = { + remotes = ["https://rubygems.org"]; sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1"; - }; - }; - "rhc" = { - version = "1.36.4"; - source = { type = "gem"; - sha256 = "1dkg39x3y3sxq71md5c8akq4y7ynjwcdy8ysm6d1k9b2rj0s5wdb"; }; - dependencies = [ - "archive-tar-minitar" - "commander" - "highline" - "httpclient" - "net-scp" - "net-ssh" - "net-ssh-multi" - "open4" - ]; + version = "1.3.4"; + }; + rhc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yaq42szq81ph44q7ckzml9yrhz1pkjfik77rxvfzlf90l1g2ibk"; + type = "gem"; + }; + version = "1.38.7"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index ffaae16b742..a44ba43051a 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -4,15 +4,15 @@ with rustPlatform; buildRustPackage rec { name = "racer-${version}"; - version = "1.2.10"; + version = "2.0.5"; src = fetchFromGitHub { owner = "phildawes"; repo = "racer"; - rev = "e5ffe9efc1d10d4a7d66944b4c0939b7c575530e"; - sha256 = "1cvgd6gcwb82p387h4wl8wz07z64is8jrihmf2z84vxmlrasmprm"; + rev = "93eac5cd633c937a05d4138559afe6fb054c7c28"; + sha256 = "0smp5dv0f5bymficrg0dz8h9x4lhklrz6f31fbcy0vhg8l70di2n"; }; - depsSha256 = "1d44q7hfxijn40q7y6xawgd3c91i90fmd1dyx7i2v9as29js5694"; + depsSha256 = "1qq2fpjg1wfb7z2s8p4i2aw9swcpqsp9m5jmhbyvwnd281ag4z6a"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index e5d275ec1f5..95f014cc2d7 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "racerd-${version}"; - version = "2016-08-23"; + version = "2016-12-24"; src = fetchgit { url = "git://github.com/jwilm/racerd.git"; - rev = "5d685ed26ba812a1afe892a8c0d12eb6abbeeb3d"; - sha256 = "1ww96nc00l8p28rnln31n92x0mp2p5jnaqh2nwc8xi3r559p1y5i"; + rev = "dc090ea11d550cd513416d21227d558dbfd2fcb6"; + sha256 = "0jfryb1b32m6bn620gd7y670cfipaswj1cppzkybm4xg6abqh07b"; }; doCheck = false; - depsSha256 = "13vkabr6bbl2nairxpn3lhqxcr3larasjk03r4hzrn7ff7sy40h2"; + depsSha256 = "1vv6fyisi11bcajxkq3ihpl59yh504xmnsr222zj15hmivn0jwf2"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 9372b448cc7..ad2d01cc572 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "rustfmt-${version}"; - version = "0.6.3"; + version = "0.7.1"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rustfmt"; - rev = "61ab06a92eae355ed6447d85d3c416fb65e96bdb"; - sha256 = "0fa16ycbvhyxs1b278q8jizrx9z0gis0ysjwk8fjws0282xsyvbk"; + rev = "907134c2d10c0f11608dc4820b023f8040ad655a"; + sha256 = "1sn590x6x93wjzkb78akqjim734hxynck3gmp8fx7gcrk5cch9mc"; }; - depsSha256 = "1qg04nzba30fqswjf97wf0slai6lhrsy0bfv648sqnrf50virx5h"; + depsSha256 = "1djpzgchl93radi52m89sjk2nbl9f4y15pwn4x78lqas0jlc6nlr"; meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 534f358e531..af7854b33dc 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, jre }: stdenv.mkDerivation rec { - version = "0.4.10"; + version = "0.5.6"; baseName = "scalafmt"; name = "${baseName}-${version}"; src = fetchurl { url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz"; - sha256 = "0igz95zy69pasvj4vya71akhwlc0233m7kwrn66rali1wxs2kcsz"; + sha256 = "17fwli6jlsh4q7nqgqmqmhb368hpmj1yg9fdsybk8yq57hb24bwq"; }; unpackPhase = "tar xvzf $src"; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 4693e547716..9bc9bf9c0e4 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -8,14 +8,14 @@ spirv_sources = { tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "923a4596b44831a07060df45caacb522613730c9"; - sha256 = "0hmgng2sv34amfsag3ya09prnv1w535djwlzfn8h2vh430vgawxa"; + rev = "37422e9dba1a3a8cb8028b779dd546d43add6ef8"; + sha256 = "0sp2p4wg902clq0fr94vj19vyv43cq333jjxr0mjzay8dw2h4yzk"; }; headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "33d41376d378761ed3a4c791fc4b647761897f26"; - sha256 = "1s103bpi3g6hhq453qa4jbabfkyxxpf9vn213j8k4vm26lsi8hs2"; + rev = "c470b68225a04965bf87d35e143ae92f831e8110"; + sha256 = "18jgcpmm0ixp6314r5w144l3wayxjkmwqgx8dk5jgyw36dammkwd"; }; }; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { name = "spirv-tools-${version}"; - version = "2016-07-18"; + version = "2016-12-19"; src = spirv_sources.tools; patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers''; diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index b2c96beeeb3..73cb902ae69 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -94,7 +94,7 @@ in stdenv.mkDerivation rec { unitydir="$out/opt/Unity/Editor" mkdir -p $unitydir mv Editor/* $unitydir - ln -sf /var/setuid-wrappers/${chromium.sandboxExecutableName} $unitydir/chrome-sandbox + ln -sf /run/wrappers/bin/${chromium.sandboxExecutableName} $unitydir/chrome-sandbox mkdir -p $out/share/applications sed "/^Exec=/c\Exec=$out/bin/unity-editor" \ diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 39c7ca77f8f..659c831bbe3 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -117,7 +117,8 @@ in stdenv.mkDerivation rec { mkdir -p "$out" cp -r opt "$out" cp -r usr/bin "$out" - wrapProgram "$out/bin/vagrant" --prefix LD_LIBRARY_PATH : "$out/opt/vagrant/embedded/lib" + wrapProgram "$out/bin/vagrant" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxml2 libxslt ]}" \ + --prefix LD_LIBRARY_PATH : "$out/opt/vagrant/embedded/lib" ''; preFixup = '' diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix index 7d4e61c8799..3fd92dfeba4 100644 --- a/pkgs/development/tools/valadoc/default.nix +++ b/pkgs/development/tools/valadoc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchgit, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobjectIntrospection, expat}: stdenv.mkDerivation rec { - version = "2016-10-09"; + version = "2016-11-11"; name = "valadoc-unstable-${version}"; src = fetchgit { url = "git://git.gnome.org/valadoc"; - rev = "37756970379d1363453562e9f2af2c354d172fb4"; - sha256 = "1s9sf6f0srh5sqqikswnb3bgwv5s1r9bd4n10hs2lzfmh7z227qb"; + rev = "8080b626db9c16ac9a0a9802677b4f6ab0d36d4e"; + sha256 = "1y00yls4wgxggzfagm3hcmzkpskfbs3m52pjgl71lg4p85kv6msv"; }; nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobjectIntrospection ]; diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 30d509a5e5e..c52f2553e3d 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,33 +1,44 @@ -{ stdenv, lib, writeText, writeScript, fetchurl, php }: +{ stdenv, lib, fetchurl, php }: let - version = "1.0.0"; - name = "wp-cli-${version}"; + version = "1.1.0"; - phpIni = writeText "wp-cli-php.ini" '' - [Phar] - phar.readonly = Off - ''; + bin = "bin/wp"; + ini = "etc/php/wp-cli.ini"; + phar = "share/wp-cli/wp-cli.phar"; - wpBin = writeScript "wp" '' - #! ${stdenv.shell} -e - exec ${php}/bin/php \ - -c ${phpIni} \ - -f ${src} "$@" - ''; - - src = fetchurl { - url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "06a80fz9na9arjdpmnislwr0121kkg11kxfqmac0axa9vkv9fjcp"; + completion = fetchurl { + url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; + sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24"; }; in stdenv.mkDerivation rec { + name = "wp-cli-${version}"; - inherit name src; + src = fetchurl { + url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; + sha256 = "08b2lzc8fa9f5xldbdza6x3lg6jsp3wfwpyy187gxqw5pmqp11xc"; + }; buildCommand = '' - mkdir -p $out/bin - ln -s ${wpBin} $out/bin/wp + mkdir -p $out/bin $out/etc/php + + cat <<_EOF > $out/${bin} + #! ${stdenv.shell} -eu + exec ${lib.getBin php}/bin/php \\ + -c $out/${ini} \\ + -f $out/${phar} "\$@" + _EOF + chmod 755 $out/${bin} + + cat <<_EOF > $out/${ini} + [Phar] + phar.readonly = Off + _EOF + chmod 644 $out/${ini} + + install -Dm644 ${src} $out/${phar} + install -Dm644 ${completion} $out/share/bash-completion/completions/wp ''; meta = with stdenv.lib; { diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index b91ec8df687..5fb122aefa8 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -10,12 +10,10 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "6.9.1"; + version = "6.9.5"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "0a87vzb33xdg8w0xi3c605hfav3c9m4ylab1436whz3p0l9qvp8b"; + sha256 = "1cxnsprv2sy2djskx6yfw14f578s1fwzvmvnw7rh75djajix3znp"; }; - }) - diff --git a/pkgs/games/amoeba/data.nix b/pkgs/games/amoeba/data.nix new file mode 100644 index 00000000000..b5c7f4b730b --- /dev/null +++ b/pkgs/games/amoeba/data.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "amoeba-data-${version}"; + version = "1.1"; + + src = fetchurl { + url = "http://http.debian.net/debian/pool/non-free/a/amoeba-data/amoeba-data_${version}.orig.tar.gz"; + sha256 = "1bgclr1v63n14bj9nwzm5zxg48nm0cla9bq1rbd5ylxra18k0jbg"; + }; + + installPhase = '' + mkdir -p $out/share/amoeba + cp demo.dat $out/share/amoeba/ + ''; + + meta = with stdenv.lib; { + description = "Fast-paced, polished OpenGL demonstration by Excess (data files)"; + homepage = https://packages.qa.debian.org/a/amoeba-data.html; + license = licenses.unfree; + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix new file mode 100644 index 00000000000..4e5f85f7d5a --- /dev/null +++ b/pkgs/games/amoeba/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, mesa_glu, pkgconfig }: + +stdenv.mkDerivation rec { + name = "amoeba-${version}-${debver}"; + version = "1.1"; + debver = "29.1"; + + srcs = [ + (fetchurl { + url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${version}.orig.tar.gz"; + sha256 = "1hyycw4r36ryka2gab9vzkgs8gq4gqhk08vn29cwak95w0rahgim"; + }) + (fetchurl { + url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${version}-${debver}.debian.tar.xz"; + sha256 = "1xgi2sqzq97w6hd3dcyq6cka8xmp6nr25qymzhk52cwqh7qb75p3"; + }) + ]; + sourceRoot = "amoeba-1.1.orig"; + + prePatch = '' + patches="${./include-string-h.patch} $(echo ../debian/patches/*.diff)" + ''; + postPatch = '' + sed -i packer/pakfile.cpp -e 's|/usr/share/amoeba|${amoeba-data}/share/amoeba|' + sed -i main/linux-config/linux-config.cpp -e 's|libgdk-x11-2.0.so.0|${gtk2}/lib/&|' + sed -i main/linux-config/linux-config.cpp -e 's|libgtk-x11-2.0.so.0|${gtk2}/lib/&|' + ''; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib expat freetype gtk2 libvorbis mesa_glu ]; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1/ + cp amoeba $out/bin/ + cp ../debian/amoeba.1 $out/share/man/man1/ + ''; + + meta = with stdenv.lib; { + description = "Fast-paced, polished OpenGL demonstration by Excess"; + homepage = https://packages.qa.debian.org/a/amoeba.html; + license = licenses.gpl2; # Engine is GPLv2, data files in amoeba-data nonfree + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/amoeba/include-string-h.patch b/pkgs/games/amoeba/include-string-h.patch new file mode 100644 index 00000000000..828cab88d98 --- /dev/null +++ b/pkgs/games/amoeba/include-string-h.patch @@ -0,0 +1,12 @@ +diff --git a/image/png_image.cpp b/image/png_image.cpp +index 37875fc..1531d6f 100644 +--- a/image/png_image.cpp ++++ b/image/png_image.cpp +@@ -4,6 +4,7 @@ + + #include + #include ++#include + + #include + #include "png_image.h" diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 62b5bc8e6dd..99f2b71b449 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -1,10 +1,10 @@ { stdenv, autoreconfHook, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }: stdenv.mkDerivation rec { - name = "chocolate-doom-2.2.1"; + name = "chocolate-doom-2.3.0"; src = fetchurl { url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz"; - sha256 = "140xnz0vc14ypy30l6yxbb9s972g2ffwd4lbic54zp6ayd9414ma"; + sha256 = "0i57smxmbhxj0wgvxq845ba9zsn5nx5wmzkl71rdchyd4q5jmida"; }; buildInputs = [ autoreconfHook pkgconfig SDL SDL_mixer SDL_net ]; patchPhase = '' diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index dc84b18547b..b6259c033af 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.19.1"; + version = "0.19.3"; src = fetchFromGitHub { owner = "crawl-ref"; repo = "crawl-ref"; rev = version; - sha256 = "02iklz5q5h7h27gw86ws8wk5gz1fg86jclkar05nd7zxxgiwsk96"; + sha256 = "1qn6r5pg568pk8zgp2ijn04h4brvw675q4nxkkvzyf76ljbpzif7"; }; patches = [ ./crawl_purify.patch ]; diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index e3efd84f0fb..4bae8e1d58a 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -1,33 +1,38 @@ -{stdenv, fetchurl, unzip, cmake, SDL, mesa, zlib, libjpeg, libogg, libvorbis +{ stdenv, fetchFromGitHub, cmake, SDL2, mesa, zlib, libjpeg, libogg, libvorbis , openal, curl }: stdenv.mkDerivation rec { - hash = "92a41322f4aa8bd45395d8088721c9a2bf43c79b"; - name = "dhewm3-20130113-${hash}"; - src = fetchurl { - url = "https://github.com/dhewm/dhewm3/zipball/${hash}"; - sha256 = "0c17k60xhimpqi1xi9s1l7jbc97pqjnk4lgwyjb0agc3dkr73zwd"; + name = "dhewm3-${version}"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "dhewm"; + repo = "dhewm3"; + rev = version; + sha256 = "1s64xr1ir4d2z01fhldy577b0x80nd1k6my7y1hxp57lggr8dy5y"; }; # Add mesa linking patchPhase = '' - sed -i 's/\ Makefile.local echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local echo "USE_CURL = 1" >> Makefile.local echo "USE_CURL_DLOPEN = 0" >> Makefile.local ''; + installPhase = '' destDir="$out/opt/urbanterror" mkdir -p "$destDir" @@ -28,7 +33,7 @@ stdenv.mkDerivation rec { "$destDir/Quake3-UrT" cp -v build/release-linux-*/Quake3-UrT-Ded.* \ "$destDir/Quake3-UrT-Ded" - cp -rv ../UrbanTerror42/q3ut4 "$destDir" + cp -rv ../UrbanTerror43/q3ut4 "$destDir" cat << EOF > "$out/bin/urbanterror" #! ${stdenv.shell} cd "$destDir" @@ -42,11 +47,15 @@ stdenv.mkDerivation rec { EOF chmod +x "$out/bin/urbanterror-ded" ''; + postFixup = '' p=$out/opt/urbanterror/Quake3-UrT cur_rpath=$(patchelf --print-rpath $p) patchelf --set-rpath $cur_rpath:${mesa}/lib $p ''; + + hardeningDisable = [ "format" ]; + meta = with stdenv.lib; { description = "A multiplayer tactical FPS on top of Quake 3 engine"; longDescription = '' diff --git a/pkgs/games/warmux/gcc-fix.patch b/pkgs/games/warmux/gcc-fix.patch index 1ac476b92a3..913b912af7d 100644 --- a/pkgs/games/warmux/gcc-fix.patch +++ b/pkgs/games/warmux/gcc-fix.patch @@ -34,3 +34,18 @@ Author: Felix Geyer #include #include #include + +Description: Fix conversion error in gcc 6. +Author: Robin Gloster + +--- warmux-11.04.1.orig/src/interface/weapon_menu.cpp 2017-01-19 23:06:32.401035923 +0100 ++++ warmux-11.04.1/src/interface/weapon_menu.cpp 2017-01-19 23:07:14.245866593 +0100 +@@ -391,7 +391,7 @@ + Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly) + { + if (!show) +- return false; ++ return nullptr; + const std::vector& items = poly->GetItem(); + WeaponMenuItem * tmp; + Interface::GetInstance()->SetCurrentOverflyWeapon(NULL); diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 9f2dfbab2ec..ef0e4640c39 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation rec { license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; + broken = true; # Depends on a specific old libjpeg version }; } diff --git a/pkgs/games/widelands/bincmake.patch b/pkgs/games/widelands/bincmake.patch new file mode 100644 index 00000000000..ed6a9912522 --- /dev/null +++ b/pkgs/games/widelands/bincmake.patch @@ -0,0 +1,21 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,6 +25,8 @@ + # Packagers (or people using make install) have to set this variable to an absolute path. + wl_set_if_unset(WL_INSTALL_DATADIR "./data") + ++wl_set_if_unset(WL_INSTALL_BINARY "./bin") ++ + if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7) + message(FATAL_ERROR "Widelands needs GCC >= 4.7 to compile.") + +--- a/cmake/WlFunctions.cmake ++++ b/cmake/WlFunctions.cmake +@@ -276,5 +276,5 @@ + + #Quoting the CMake documentation on DESTINATION: + #"If a relative path is given it is interpreted relative to the value of CMAKE_INSTALL_PREFIX" +- install(TARGETS ${NAME} DESTINATION "." COMPONENT ExecutableFiles) ++ install(TARGETS ${NAME} DESTINATION ${WL_INSTALL_BINARY} COMPONENT ExecutableFiles) + endfunction() diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index b6008bd7e76..94fd23cd8cb 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, cmake, python, gettext -, boost, libpng, zlib, glew, lua -, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, SDL_gfx +, boost, libpng, zlib, glew, lua, doxygen, icu +, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf, SDL2_gfx }: -stdenv.mkDerivation { - name = "widelands-18"; +stdenv.mkDerivation rec { + name = "widelands-${version}"; + version = "19"; meta = with stdenv.lib; { description = "RTS with multiple-goods economy"; @@ -20,27 +21,39 @@ stdenv.mkDerivation { hydraPlatforms = []; }; + patches = [ + ./bincmake.patch + ]; src = fetchurl { - url = "https://launchpad.net/widelands/build18/build-18/+download/" - + "widelands-build18-src.tar.bz2"; - sha256 = "1qvx1cwkf61iwq0qkngvg460dsxqsfvk36qc7jf7mzwkiwbxkzvd"; + url = "https://launchpad.net/widelands/build${version}/build${version}/+download/" + + "widelands-build${version}-src.tar.bz2"; + sha256 = "19h1gina7k1ai2mn2fd75lxm8iz8wrs6dz6dchdvg8i8d39gj4g5"; }; preConfigure = '' cmakeFlags=" - -DWL_INSTALL_PREFIX=$out - -DWL_INSTALL_BINDIR=bin - -DWL_INSTALL_DATADIR=share/widelands + -DWL_INSTALL_BASEDIR=$out + -DWL_INSTALL_DATADIR=$out/share/widelands + -DWL_INSTALL_BINARY=$out/bin " ''; nativeBuildInputs = [ cmake python gettext ]; buildInputs = [ - boost libpng zlib glew lua - SDL SDL_image SDL_mixer SDL_net SDL_ttf SDL_gfx + boost libpng zlib glew lua doxygen icu + SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf ]; + prePatch = '' + substituteInPlace ./debian/widelands.desktop --replace "/usr/share/games/widelands/data/" "$out/share/widelands/" + ''; + + postInstall = '' + mkdir -p "$out/share/applications/" + cp -v "../debian/widelands.desktop" "$out/share/applications/" + ''; + enableParallelBuilding = true; } diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix new file mode 100644 index 00000000000..e3453628ba9 --- /dev/null +++ b/pkgs/games/zdoom/zdbsp.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, cmake, unzip, zlib }: + +stdenv.mkDerivation rec { + name = "zdbsp-${version}"; + version = "1.19"; + + src = fetchurl { + url = "https://zdoom.org/files/utils/zdbsp/zdbsp-${version}-src.zip"; + sha256 = "0j82q7g7hgvnahk6gdyhmn9880mqii3b4agqc98f5xaj3kxmd2dr"; + }; + + nativeBuildInputs = [cmake unzip]; + buildInputs = [zlib]; + sourceRoot = "."; + enableParallelBuilding = true; + installPhase = '' + install -Dm755 zdbsp $out/bin/zdbsp + ''; + + meta = with stdenv.lib; { + description = "ZDoom's internal node builder for DOOM maps"; + homepage = "https://zdoom.org/wiki/ZDBSP"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ertes]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix new file mode 100644 index 00000000000..b2801c7ae67 --- /dev/null +++ b/pkgs/misc/cups/drivers/dymo/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchurl, cups, ... }: + +stdenv.mkDerivation rec { + name = "cups-dymo-${version}"; + version = "1.4.0.5"; + + # exposed version and 'real' version may differ + # in this case the download states '1.4.0' but the real version is '1.4.0.5' + # this has the potential to break future builds + dl-name = "dymo-cups-drivers-1.4.0"; + + src = fetchurl { + url = "http://download.dymo.com/dymo/Software/Download%20Drivers/Linux/Download/${dl-name}.tar.gz"; + sha256 = "0wagsrz3q7yrkzb5ws0m5faq68rqnqfap9p98sgk5jl6x7krf1y6"; + }; + + buildInputs = [ cups ]; + makeFlags = [ "cupsfilterdir=$(out)/lib/cups/filter" "cupsmodeldir=$(out)/share/cups/model" ]; + + meta = { + description = "CUPS Linux drivers and SDK for DYMO printers"; + homepage = "http://www.dymo.com/"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ makefu ]; + }; +} diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix new file mode 100644 index 00000000000..4b8378368a3 --- /dev/null +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -0,0 +1,33 @@ +{ expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg +, mesa, openal, pkgconfig, sfml, stdenv, zlib +}: + +stdenv.mkDerivation rec { + name = "attract-mode-${version}"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "mickelson"; + repo = "attract"; + rev = "v${version}"; + sha256 = "1arkfj0q3n1qbq5jwmal0kixxph8lnmv3g9bli36inab4r8zzmp8"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + patchPhase = '' + sed -i "s|prefix=/usr/local|prefix=$out|" Makefile + ''; + + buildInputs = [ + expat ffmpeg fontconfig freetype libarchive libjpeg mesa openal sfml zlib + ]; + + meta = with stdenv.lib; { + description = "A frontend for arcade cabinets and media PCs"; + homepage = http://attractmode.org; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hrdinka ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index c9651fd0614..e39e5285039 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,12 +1,12 @@ -{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3, gdk_pixbuf, librsvg }: +{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3, gdk_pixbuf, librsvg, intltool }: let pkg = import ./base.nix { - version = "3.0.0"; + version = "3.0.1"; pkgName = "image-analyzer"; - pkgSha256 = "1rb3f7c08dxc02zrwrkfvq7qlzlmm0kd2ah1fhxj6ajiyshi8q4v"; + pkgSha256 = "19x5hx991pl55ddm2wjd2ylm2hiz9yvzgrwmpnsqr9zqc4lja682"; }; in callPackage pkg { buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper - gnome3.defaultIconTheme gdk_pixbuf librsvg ]; + gnome3.defaultIconTheme gdk_pixbuf librsvg intltool ]; drvParams = { postFixup = '' wrapProgram $out/bin/image-analyzer \ diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/misc/emulators/cdemu/client.nix index 1cea479fb7b..3a5850e10e9 100644 --- a/pkgs/misc/emulators/cdemu/client.nix +++ b/pkgs/misc/emulators/cdemu/client.nix @@ -1,8 +1,8 @@ { callPackage, pythonPackages, intltool, makeWrapper }: let pkg = import ./base.nix { - version = "3.0.1"; + version = "3.0.3"; pkgName = "cdemu-client"; - pkgSha256 = "1kg5m7npdxli93vihhp033hgkvikw5b6fm0qwgvlvdjby7njyyyg"; + pkgSha256 = "1bfj7bc10z20isdg0h8sfdvnwbn6c49494mrmq6jwrfbqvby25x9"; }; in callPackage pkg { buildInputs = [ pythonPackages.python pythonPackages.dbus-python intltool makeWrapper ]; diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/misc/emulators/cdemu/daemon.nix index 47a967fb52e..ef58ff7f58f 100644 --- a/pkgs/misc/emulators/cdemu/daemon.nix +++ b/pkgs/misc/emulators/cdemu/daemon.nix @@ -1,8 +1,8 @@ { callPackage, glib, libao }: let pkg = import ./base.nix { - version = "3.0.3"; + version = "3.0.5"; pkgName = "cdemu-daemon"; - pkgSha256 = "00gi3x03l019nyqfxkph1rsldd7fwg0r0x95spwv5py5wyiqvp3m"; + pkgSha256 = "1cc0yxf1y5dxinv7md1cqhdjsbqb69v9jygrdq5c20mrkqaajz1i"; }; in callPackage pkg { buildInputs = [ glib libao (callPackage ./libmirage.nix {}) ]; diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index 04930a5e573..835a690eb69 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -1,9 +1,9 @@ { callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3, gdk_pixbuf, librsvg }: let pkg = import ./base.nix { - version = "3.0.1"; + version = "3.0.2"; pkgName = "gcdemu"; - pkgSha256 = "1dlng1bvhns7f0ff5p89npsm2nznfqnaspr0alfh4fl0f11cvnfr"; + pkgSha256 = "1kmcr2a0inaddx8wrjh3l1v5ymgwv3r6nv2w05lia51r1yzvb44p"; }; inherit (pythonPackages) python pygobject3; in callPackage pkg { diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix index 5e83ef7bbbf..c9ba589cf2a 100644 --- a/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/pkgs/misc/emulators/cdemu/libmirage.nix @@ -1,8 +1,8 @@ { callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate }: let pkg = import ./base.nix { - version = "3.0.4"; + version = "3.0.5"; pkgName = "libmirage"; - pkgSha256 = "0grzdacl8hlj20amq88r98h8pd039ww0g4hl1a8lhly11h7kf1fc"; + pkgSha256 = "01wfxlyviank7k3p27grl1r40rzm744rr80zr9lcjk3y8i5g8ni2"; }; in callPackage pkg { buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate ]; diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 3435efbae8b..c1692e1b9a8 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "vhba-${version}"; - version = "20140928"; + version = "20161009"; src = fetchurl { url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2"; - sha256 = "18jmpg2kpx87f32b8aprr1pxla9dlhf901rkj1sp3ammf94nxxa5"; + sha256 = "1n9k3z8hppnl5b5vrn41b69wqwdpml6pm0rgc8vq3jqwss5js1nd"; }; makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/misc/emulators/gxemul/default.nix index ba1b63855e3..ea2d6bbfecc 100644 --- a/pkgs/misc/emulators/gxemul/default.nix +++ b/pkgs/misc/emulators/gxemul/default.nix @@ -1,12 +1,8 @@ -{ stdenv, composableDerivation, fetchurl }: +{ stdenv, fetchurl }: -let edf = composableDerivation.edf; - version = "0.6.0.1"; - name = "gxemul-${version}"; -in - -composableDerivation.composableDerivation {} { - inherit name; +stdenv.mkDerivation rec { + name = "gxemul-${version}"; + version = "0.6.0.1"; src = fetchurl { url = "http://gxemul.sourceforge.net/src/${name}.tar.gz"; @@ -15,21 +11,14 @@ composableDerivation.composableDerivation {} { configurePhase = "./configure"; - installPhase = "mkdir -p \$out/bin; cp gxemul \$out/bin;"; - - mergeAttrBy = { installPhase = a : b : "${a}\n${b}"; }; - - flags = { - doc = { installPhase = "mkdir -p \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; }; - demos = { installPhase = "mkdir -p \$out/share/${name}; cp -r demos \$out/share/${name};"; }; - man = { installPhase = "cp -r ./man \$out/;";}; - }; - - cfg = { - docSupport = true; - demosSupport = true; - manSupport = true; - }; + installPhase = '' + mkdir -p $out/bin; + mkdir -p $out/share/${name}; + cp gxemul $out/bin; + cp -r doc $out/share/${name}; + cp -r demos $out/share/${name}; + cp -r ./man $out/; + ''; meta = { license = stdenv.lib.licenses.bsd3; @@ -45,5 +34,4 @@ composableDerivation.composableDerivation {} { ''; homepage = http://gxemul.sourceforge.net/; }; - } diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 7724d3d8d1b..e4e84220812 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "mgba-${version}"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "1ysxyy888qdwjbgsh3xdzsx8f3a5yd1gqx54xvndpv9v3zqgr2jf"; + sha256 = "1cpxiwzbywnjs3lrqa3bc9bj68plypx0br3lssd6p68c4wh01fyp"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 259a6007975..50f73d6f4e6 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -170,6 +170,28 @@ in buildPhase = "make"; }; + mednafen-saturn = (mkLibRetroCore rec { + core = "mednafen-saturn"; + src = fetchRetro { + repo = "beetle-saturn-libretro"; + rev = "bb5d0c126feb25cf980f5cc1fc57d6a5a6f6e7ab"; + sha256 = "0bnsdy27378b71y6aa65k4jxxy2xw6ky2ici3z53hkky2jnnjq0b"; + }; + description = "Port of Mednafen's Saturn core to libretro"; + }).override { + buildPhase = "make"; + }; + + mgba = mkLibRetroCore rec { + core = "mgba"; + src = fetchRetro { + repo = core; + rev = "4000128339b535896615c994cafcd777637573f4"; + sha256 = "1yar78rvgfqx7jdna9chkmmbnpcf7k9ckbzj506f7k7m7zv819fn"; + }; + description = "Port of mGBA to libretro"; + }; + mupen64plus = (mkLibRetroCore rec { core = "mupen64plus"; src = fetchRetro { @@ -248,6 +270,19 @@ in buildPhase = "make"; }; + reicast = (mkLibRetroCore rec { + core = "reicast"; + src = fetchRetro { + repo = core + "-emulator"; + rev = "ed47c72cf2e124d9d753285fd61d12ea8e071d0d"; + sha256 = "05dw7qjnprf1lw3ps0sb7sp73hsh1a27rxbwjqd26j85zr84g3r9"; + }; + description = "Reicast libretro port"; + extraBuildInputs = [ mesa ]; + }).override { + buildPhase = "make"; + }; + scummvm = (mkLibRetroCore rec { core = "scummvm"; src = fetchRetro { diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 6a87ff395b3..e8409a631c3 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -6,34 +6,11 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "1.8.6"; - url = "https://dl.winehq.org/wine/source/1.8/wine-${version}.tar.bz2"; - sha256 = "1lq6770pkv3342ss2ih18s2hw6i1srbcfg3mljwalqrvxfb7hydi"; + version = "2.0"; + url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.bz2"; + sha256 = "1ik6q0h3ph3jizmp7bxhf6kcm1pzrdrn2m0yf2x86slv2aigamlp"; ## see http://wiki.winehq.org/Gecko - gecko32 = fetchurl rec { - version = "2.40"; - url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi"; - sha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s"; - }; - gecko64 = fetchurl rec { - version = "2.40"; - url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi"; - sha256 = "0c4jikfzb4g7fyzp0jcz9fk2rpdl1v8nkif4dxcj28nrwy48kqn3"; - }; - ## see http://wiki.winehq.org/Mono - mono = fetchurl rec { - version = "4.6.3"; - url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; - sha256 = "1f98xwgv665zb9cwc5zphcdbffyh3sm26h62hzca6zlcwy5fi0zq"; - }; - }; - - unstable = fetchurl rec { - version = "2.0-rc3"; - url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.bz2"; - sha256 = "0sq8li7p30h2a5bbpv27vxpzihr8h890qm78nq21fnh0zflg8x8y"; - inherit (stable) mono; gecko32 = fetchurl rec { version = "2.47"; url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi"; @@ -44,19 +21,33 @@ in rec { url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi"; sha256 = "0zaagqsji6zaag92fqwlasjs8v9hwjci5c2agn9m7a8fwljylrf5"; }; + + ## see http://wiki.winehq.org/Mono + mono = fetchurl rec { + version = "4.6.4"; + url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; + sha256 = "0lj1rhp9s8aaxd6764mfvnyswwalafaanz80vxg3badrfy0xbdwi"; + }; + }; + + unstable = fetchurl rec { + version = "2.1"; + url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; + sha256 = "0vhykmypv8zqdma7nfwv40klwaywcslam6cmipr3vjci6vvapfdz"; + inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "1nk8s54nrlws0d8wpyj1vv2z0l2jansn990xw73v15wzwc3j9p6l"; + sha256 = "1r3mpdyhq3nmbqgj99bgrhx202k5c046bl8fhi5hr1x0adybb9hs"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; }; winetricks = fetchFromGitHub rec { - version = "20170101"; - sha256 = "0c2aam68x3nlvc6f4r6rnfw6y3a86644zb0qirwkmh3p04mpdl39"; + version = "20170207"; + sha256 = "1zmx041rxxawkv3ifsdjbmshp654bib75n5hll0g1f205arbahzw"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 22a148398c5..285a5b4ee49 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -92,6 +92,10 @@ stdenv.mkDerivation rec { mv "$out/share/ghostscript/${version}"/{doc,examples} "$doc/share/ghostscript/${version}/" ln -s "${fonts}" "$out/share/ghostscript/fonts" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + for file in $out/lib/*.dylib* ; do + install_name_tool -id "$file" $file + done ''; preFixup = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index a4e4e408fec..a38c9b76410 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper -, bash, libsamplerate, libsndfile, readline, gcc +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, python2Packages, makeWrapper +, bash, libsamplerate, libsndfile, readline # Optional Dependencies , dbus ? null, libffado ? null, alsaLib ? null @@ -34,11 +34,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig python makeWrapper ]; - buildInputs = [ gcc - python - - libsamplerate libsndfile readline - + buildInputs = [ python libsamplerate libsndfile readline optDbus optPythonDBus optLibffado optAlsaLib optLibopus ]; @@ -46,7 +42,13 @@ stdenv.mkDerivation rec { substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash ''; - patches = [ ./jack-gcc5.patch ]; + patches = [ + ./jack-gcc5.patch + (fetchpatch { + url = "https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645.patch"; + sha256 = "0vywakbmlskvs9ginij9ilk39wjyzg7w6cf1qxp11hb0hj69fir5"; + }) + ]; configurePhase = '' python waf configure --prefix=$out \ diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh index 816c1b8a711..1688d2f158f 100644 --- a/pkgs/misc/my-env/loadenv.sh +++ b/pkgs/misc/my-env/loadenv.sh @@ -10,7 +10,6 @@ PATH="$PATH:$OLDPATH" export PS1="\n@name@:[\u@\h:\w]\$ " export NIX_MYENV_NAME="@name@" export buildInputs -export NIX_STRIP_DEBUG=0 export TZ="$OLDTZ" export http_proxy="$OLD_http_proxy" export ftp_proxy="$OLD_ftp_proxy" diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 27e26d6d5df..72fb7b41c69 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,22 +1,44 @@ -{stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xorg}: +{ stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl +, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, mesa +, glee }: stdenv.mkDerivation rec { - name = "electricsheep-2.6.8"; - - src = fetchurl { - url = "http://electricsheep.org/${name}.tar.gz"; - sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5"; + name = "${pname}-${version}"; + pname = "electricsheep"; + version = "2.7b33-2017-02-04"; + + src = fetchFromGitHub { + owner = "scottdraves"; + repo = pname; + rev = "12420cd40dfad8c32fb70b88f3d680d84f795c63"; + sha256 = "1zqry25h6p0y0rg2h8xxda007hx1xdvsgzmjg13xkc8l4zsp5wah"; }; - buildInputs = [pkgconfig expat zlib libpng libjpeg xorg.xlibsWrapper xorg.libXv]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - preInstall = '' - installFlags=GNOME_DATADIR=$out - mkdir -p $out/control-center/screensavers + buildInputs = [ + wxGTK30 libav lua5_1 curl libpng xorg.libXrender + flam3 libgtop boost tinyxml freeglut mesa glee + ]; + + preAutoreconf = '' + cd client_generic + sed -i '/ACX_PTHREAD/d' configure.ac ''; - meta = { + configureFlags = [ + "CPPFLAGS=-I${glee}/include/GL" + ]; + + preBuild = '' + sed -i "s|/usr|$out|" Makefile + ''; + + meta = with stdenv.lib; { description = "Electric Sheep, a distributed screen saver for evolving artificial organisms"; homepage = http://electricsheep.org/; + maintainers = with maintainers; [ nand0p fpletz ]; + platforms = platforms.linux; + license = licenses.gpl1; }; } diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix index fe48bb14d40..5db712f818e 100644 --- a/pkgs/misc/themes/vertex/default.nix +++ b/pkgs/misc/themes/vertex/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "theme-vertex"; - version = "20161009"; + version = "20170128"; src = fetchFromGitHub { owner = "horst3180"; repo = "vertex-theme"; - rev = "c861918a7fccf6d0768d45d790a19a13bb23485e"; - sha256 = "13abgl18m04sj44gqipxbagpan4jqral65w59rgnhb6ldxgnhg33"; + rev = version; + sha256 = "0c9mhrs95ahz37djrv176vn41ywvj26ilwmnr1h9171giv6hid98"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 597866a80ab..f0ec5f483d4 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bc, dtc }: +{ stdenv, fetchurl, bc, dtc, python2 }: let buildUBoot = { targetPlatforms @@ -17,7 +17,7 @@ let sha256 = "1wpc51jm3zyibgcr78jng2yksqvrya76bxgsr4pcyjrsz5sm2hkc"; }; - nativeBuildInputs = [ bc dtc ]; + nativeBuildInputs = [ bc dtc python2 ]; hardeningDisable = [ "all" ]; @@ -34,6 +34,7 @@ let runHook postInstall ''; + enableParallelBuilding = true; dontStrip = true; crossAttrs = { @@ -100,12 +101,18 @@ in rec { filesToInstall = ["u-boot.bin"]; }; - ubootRaspberryPi3 = buildUBoot rec { + ubootRaspberryPi3_32bit = buildUBoot rec { defconfig = "rpi_3_32b_defconfig"; targetPlatforms = ["armv7l-linux"]; filesToInstall = ["u-boot.bin"]; }; + ubootRaspberryPi3_64bit = buildUBoot rec { + defconfig = "rpi_3_defconfig"; + targetPlatforms = ["aarch64-linux"]; + filesToInstall = ["u-boot.bin"]; + }; + ubootWandboard = buildUBoot rec { defconfig = "wandboard_defconfig"; targetPlatforms = ["armv7l-linux"]; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 560aa3ff079..953957c7c12 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -3,6 +3,7 @@ , which, fetchgit, llvmPackages , xkb_switch, rustracerd, fzf , python3, boost, icu +, ycmd , Cocoa ? null }: @@ -123,11 +124,11 @@ rec { }; CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "CheckAttach-2015-06-22"; + name = "CheckAttach-2017-02-12"; src = fetchgit { url = "git://github.com/chrisbra/CheckAttach"; - rev = "a1d86be7e69b25b41ce1a7fe2d2844330f783b68"; - sha256 = "0scshz5vc5j2lhjj5is4y392xarwsdh4z3y7kyibq3d7fmszksgn"; + rev = "17e8e37e348a93f2a2104f07f1224c9c8798f85e"; + sha256 = "0i8y0h840bpj5s0vf603ghjnpfyds5q7y8c4p8a58qzw20i2v88g"; }; dependencies = []; @@ -178,11 +179,11 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2016-12-23"; + name = "Syntastic-2017-02-07"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "78c0d21a9b0329766732ca2743a848af1c49e791"; - sha256 = "1n744grp4ajn4zfra5kfg97sj8rjkqcw1sgx2jbj5qq8l3p5ghad"; + rev = "53a3db5e3bfbafb660ebbdbc8210e3b30cb60c10"; + sha256 = "0kinqr5azlcs01q8czynxvbjswfdjh30xww26a8lf2h9750qzyhi"; }; dependencies = []; @@ -200,22 +201,22 @@ rec { }; Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar-2017-01-03"; + name = "Tagbar-2017-02-12"; src = fetchgit { url = "git://github.com/majutsushi/tagbar"; - rev = "18b536ce43f1be88be380e5f3b7cd0fd930b4908"; - sha256 = "0k4c5f3qvszn3a9ndkcl984w832vk2g4hfwl4nkvy9bwqg7q89ya"; + rev = "9d051c1e2d9f3dc88d3ae00485e55934b06d42f7"; + sha256 = "055n6armj80vmyv9kc8jhd84wl6nrr8qf7fj6b5vxp221y86wf3x"; }; dependencies = []; }; The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter-2016-12-15"; + name = "The_NERD_Commenter-2017-01-22"; src = fetchgit { url = "git://github.com/scrooloose/nerdcommenter"; - rev = "18cfe815501c8264844223a944eb388285b48caa"; - sha256 = "05dg5v1pal5ly8shc4rlnqip5zsdx9901h4336a2k81lss269wd4"; + rev = "607253203dc2fc1798dbe2ea9a3471db9c12e005"; + sha256 = "1z7rg52153vm5vj5xpvqny0aikvlr7nk9nfkrwnfxcs4jq8i752d"; }; dependencies = []; @@ -233,11 +234,11 @@ rec { }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2016-12-16"; + name = "UltiSnips-2017-01-20"; src = fetchgit { url = "git://github.com/SirVer/ultisnips"; - rev = "f974e0317f549c7cf54fa231ee0501206aed6882"; - sha256 = "0kvpgdkfc70phj2zf6lcblxb25hliiaz2cwg61bq7ip06sbk0fq0"; + rev = "5352d98f212e273b3e8b1d84efdbe2d6a6d557e9"; + sha256 = "0d27823qnfd9qcj2a2x77slsw725jfa9s40ilw4qp9ab03bma1ci"; }; dependencies = []; @@ -308,11 +309,11 @@ rec { }; ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-py-matcher-2016-09-02"; + name = "ctrlp-py-matcher-2017-01-05"; src = fetchgit { url = "git://github.com/FelikZ/ctrlp-py-matcher"; - rev = "3624f3a085681f787f1f9b7a8a24d4bed395acf1"; - sha256 = "1126gphnhfvba5xzvqj4s582k61xsvi5hn86zag42v14v5csgw9d"; + rev = "a0710a4937ab9dc10bc0a8b56b41fcc88534147c"; + sha256 = "198y8998sx2maarn2vawx8hqldsfbnn4i6rlg56qw6brsrssssx2"; }; dependencies = []; @@ -329,17 +330,6 @@ rec { }; - delimitMate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "delimitMate-2016-07-19"; - src = fetchgit { - url = "git://github.com/Raimondi/delimitMate"; - rev = "b5719054beebe0135c94f4711a06dc7588041f09"; - sha256 = "03nmkiq138w6kq4s3mh4yyr6bjvqwj8hg6qlji1ng4vnzb0638q3"; - }; - dependencies = []; - - }; - extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "extradite-2015-09-22"; src = fetchgit { @@ -352,11 +342,11 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2016-11-13"; + name = "fugitive-2017-02-10"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "b754bc2031f21a532c083dd0d072ba373bbe3a37"; - sha256 = "1sig8dl3m1dw5zjxdsp00n1cacmcwdvas3iz04zk88v6xsm8rj22"; + rev = "f44845e4408aae03e018e98afb7fbf0c2ee87dd5"; + sha256 = "1rd6iqg1q8wchsypm0mg75mfc93y871xsx6cl733771w83zi91hq"; }; dependencies = []; @@ -374,22 +364,22 @@ rec { }; vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-auto-save-2016-09-12"; + name = "vim-auto-save-2017-01-16"; src = fetchgit { url = "git://github.com/907th/vim-auto-save"; - rev = "28300c8a7b8cea137c065a48fd9bcc2348f08707"; - sha256 = "0n3xbp8vf3xsh6y6f855q313scldqm9593bhxydyszy1parvxwb5"; + rev = "8301d9a7bb60151f8b07b3be1a9b66a7c8aa81c5"; + sha256 = "1yp117kfgrg5hsgm48k9ahh6pgirl1nx2z9k36ixpg80cj2wyj2y"; }; dependencies = []; }; vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2016-12-13"; + name = "vim-autoformat-2017-02-06"; src = fetchgit { url = "git://github.com/Chiel92/vim-autoformat"; - rev = "3715e166a5aa006353ca5bfad2386767676fe848"; - sha256 = "0ki41pdrl5y4fry3xqn4sdx48zvvd3gc59qzs1nssvn9zp0k9il5"; + rev = "56170ff0d3c4e7b9acf0d373425ae2b2f047036e"; + sha256 = "0q4jz79jn6w9nkfvy9dk41d2krccx6pn91lm51987j9viijb6kyq"; }; dependencies = []; @@ -406,12 +396,34 @@ rec { }; + tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tsuquyomi-2017-01-31"; + src = fetchgit { + url = "git://github.com/Quramy/tsuquyomi"; + rev = "201d84d37ac9077855942dc9c6e6e235e285f20f"; + sha256 = "1rcibh4clxw8sq2n8072i4x52msvfxim9r9rwqi264jm31s81yyx"; + }; + dependencies = []; + + }; + + delimitMate = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "delimitMate-2016-07-19"; + src = fetchgit { + url = "git://github.com/Raimondi/delimitMate"; + rev = "b5719054beebe0135c94f4711a06dc7588041f09"; + sha256 = "03nmkiq138w6kq4s3mh4yyr6bjvqwj8hg6qlji1ng4vnzb0638q3"; + }; + dependencies = []; + + }; + deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2017-01-04"; + name = "deoplete-nvim-2017-02-09"; src = fetchgit { url = "git://github.com/Shougo/deoplete.nvim"; - rev = "90569837af21ad0438448582b34d8418b745ffeb"; - sha256 = "1qkzvgvjg397zaj1i56ld9i0gf2w9y5x2if5gbmag56nhxcwfw32"; + rev = "2e9fd874b7d974a03df8af10a090e2601b16c7f0"; + sha256 = "1zj80jxsnff2s16wkim56sxks7p2nj5dv073v30nbscbxacq6hvp"; }; dependencies = []; @@ -440,22 +452,22 @@ rec { }; vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-css-color-2016-10-11"; + name = "vim-css-color-2017-02-09"; src = fetchgit { url = "git://github.com/ap/vim-css-color"; - rev = "27903efc1b5330230d5c8c336c26ac7a8ac2e5dc"; - sha256 = "0kr9xf2y001d42x7fam50qbd09fb3rr374qv8m2p5z2d9c21par1"; + rev = "2411b84298eb6db034001f35ce7cc32c36f9b43b"; + sha256 = "1igqshk7wkh1wgihnmxnlh84fb98fm9lm8lfyjpcz6x8rg5vpmwc"; }; dependencies = []; }; clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2017-01-03"; + name = "clighter8-2017-02-12"; src = fetchgit { url = "git://github.com/bbchung/clighter8"; - rev = "89d70129ab5437c749041094fa71da97c95bda3f"; - sha256 = "147i6rhz6ri86k6p0sim72vpsc5f6y8dvwxn7am6vyi21avy4zrz"; + rev = "357a0292438dfad356ce52c94f96840063fad80d"; + sha256 = "0rd5ikq7ln0n2a1alhjzcjhqdfa5m5laylsg24xl1py32lcqayak"; }; dependencies = []; preFixup = '' @@ -465,11 +477,11 @@ rec { }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2017-01-04"; + name = "neomake-2017-02-12"; src = fetchgit { url = "git://github.com/benekastah/neomake"; - rev = "9794f6caef063ba1283bb728ac3befda477935f3"; - sha256 = "11rpc98nv9viyv82j5y4l29jc62bmd2rddp90a6740p8dx5gvx5q"; + rev = "375684a1c81ffe24a8e2dfb1e92d164498f38653"; + sha256 = "1yhkh94fpnwk335s6xd17jl5w6mrzj8vz9aw3g39gf5m4lwlqn8w"; }; dependencies = []; @@ -487,33 +499,33 @@ rec { }; vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tmux-navigator-2016-09-03"; + name = "vim-tmux-navigator-2017-01-28"; src = fetchgit { url = "git://github.com/christoomey/vim-tmux-navigator"; - rev = "e79d4c0c24c43d3ada283b1f5a1b8fa6cf820a70"; - sha256 = "1p4kb8ja86pa3l9jh8yfjvdvdik4fwnpbpl34npjwbga52pawn65"; + rev = "34f8fbf1d4ebaa1bf1db6715b17a197eaffe1ad8"; + sha256 = "074isx0kksl7kc72n1n8ywqcx5vj7ndz01jaih14nwqpqshv2zgx"; }; dependencies = []; }; spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "spacevim-2016-12-02"; + name = "spacevim-2017-01-22"; src = fetchgit { url = "git://github.com/ctjhoa/spacevim"; - rev = "9bb2a04b14964a7db1d4131e1af1ed8bd31e910b"; - sha256 = "0hq6g8czi73hgpkpigi177kp49dslh8xny3j7wjl03bjxsq9fkmk"; + rev = "bd6ebf63a9a6742823d3d090f992fabe500240c5"; + sha256 = "10rwqsnd9k255anppj27xjqlcfj91k8jy7c377jk7hqbn5h7dmzn"; }; dependencies = []; }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2016-11-29"; + name = "ctrlp-vim-2017-01-13"; src = fetchgit { url = "git://github.com/ctrlpvim/ctrlp.vim"; - rev = "2868678a987834563bbc384763135462c2423eb8"; - sha256 = "0s98nqj22i4x79mqspjkz6b6rpg8hf79iblv4md2ivzlj7ffccx3"; + rev = "7fa89fec125ce60a341f7c37dd769a8a31c49359"; + sha256 = "12x1bkipvqbz2jczl80rj6yd61hq18g3g2cx2r1yk19f6n8nfjvc"; }; dependencies = []; @@ -530,19 +542,30 @@ rec { }; - vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jade-2016-10-31"; + vim-scala = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-scala-2016-08-02"; src = fetchgit { - url = "git://github.com/digitaltoad/vim-jade"; - rev = "cc1bddc890f4856aa0511fdfd7c55d2e66f688b5"; - sha256 = "1d5rbaslvr14lcdffrxp0ycsm2nzvq5zyjk0x0nzwhzvvs4fqi40"; + url = "git://github.com/derekwyatt/vim-scala"; + rev = "a6a350f7c632d0e640b57f9dcc7e123409a7bcd7"; + sha256 = "108c5h02vcb3pnr3si8dhwq3mv2pj5d83mj1ljxdk9595xv8j2rp"; }; dependencies = []; }; - dracula = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "dracula-2016-09-21"; + vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-jade-2017-02-01"; + src = fetchgit { + url = "git://github.com/digitaltoad/vim-jade"; + rev = "eb8c6b23b86fdc93cd2a34217adfe5f6b2d7d05d"; + sha256 = "1y325pq8r4njx6mz5y2hk0j6dpkbw9f6cxp0n2hdfp4xj9qgx9v1"; + }; + dependencies = []; + + }; + + vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-2016-09-21"; src = fetchgit { url = "git://github.com/dracula/vim"; rev = "926dfbab01128322f6326bdd10de2856b1fa3232"; @@ -585,23 +608,34 @@ rec { }; + vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-elixir-2017-01-24"; + src = fetchgit { + url = "git://github.com/elixir-lang/vim-elixir"; + rev = "9cbb3ee3865c594ed017f8118a80b355cd7e238f"; + sha256 = "14mlnjpmgfal4vai2k8jjmhszwgyhnf3v75rssj05n47qnzlddk4"; + }; + dependencies = []; + + }; + elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "elm-vim-2016-11-26"; + name = "elm-vim-2017-01-13"; src = fetchgit { url = "git://github.com/elmcast/elm-vim"; - rev = "16a9a380a514e23c02d4bd7374112aa2dac1f3a4"; - sha256 = "1mjccw7yx8hrn4vriickzag9z5g3xzqd6qh6w3xkw0nfh8mx2sgn"; + rev = "0c1fbfdf12f165681b8134ed2cae2c148105ac40"; + sha256 = "0l871hzg55ysns5h6v7xq63lwf4135m3xggm2s4q2pmzizivk0x2"; }; dependencies = []; }; vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2016-11-08"; + name = "vim-localvimrc-2017-02-07"; src = fetchgit { url = "git://github.com/embear/vim-localvimrc"; - rev = "9f6de2ddfea2a397bc3e5335779bc93a8260ff99"; - sha256 = "0ks8x7zjqnbm06y3niidj9h0ccqky29b2vpdkvs1vwnli10bg6sh"; + rev = "775ea57b9f433bdaf83c42c26d51137e1e7b3b98"; + sha256 = "094jmnfzl1girjwhpg4kq48lrdcfrx4x1baq1n8rjlm2zln2sbdx"; }; dependencies = []; @@ -630,11 +664,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2017-01-01"; + name = "vim-go-2017-02-02"; src = fetchgit { url = "git://github.com/fatih/vim-go"; - rev = "d7c628ff228c2e6a4d4d5808f198471a775cf8b5"; - sha256 = "1375qz8id08d10p6i7ppvk3khq778996bx1n7qarz6vx6kb19zcn"; + rev = "1425decf6d4e1b313955cefe08c859d07c2c2822"; + sha256 = "1pql4m5iiajqk6qfb3nahlf2q2ixp425lg5bni16rk78r173wqvl"; }; dependencies = []; @@ -652,11 +686,11 @@ rec { }; floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "floobits-neovim-2016-10-07"; + name = "floobits-neovim-2017-02-08"; src = fetchgit { url = "git://github.com/floobits/floobits-neovim"; - rev = "85d3493d05ac1d7f5606d40fbe619df16af917bc"; - sha256 = "16c12dgk60mmhyijfk4f33k8i48r1hpjlnxlvdk5kymv7b2xq0fa"; + rev = "9755412fcd68cfc76a36aa000682a84d96013650"; + sha256 = "1mn6kikygk86xblxg8kklkrrxagil4az76z0mzid847g4jw4hfd1"; }; dependencies = []; @@ -685,55 +719,55 @@ rec { }; vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsdoc-2016-10-30"; + name = "vim-jsdoc-2017-02-11"; src = fetchgit { url = "git://github.com/heavenshell/vim-jsdoc"; - rev = "45c7c7cef440a29f7bf24436640413e3d5d578ff"; - sha256 = "0kr4p01pyrz9w7yfh50gsz6n60qvnqxsr1055hvsyx36nzw6l3za"; + rev = "cd8f084c3b4bd198620d45a007cee6b009b57b35"; + sha256 = "0a2d9jwxjws8l7y89yn7xl07r5yh7r7987a8hfalvz12qmdmff1j"; }; dependencies = []; }; vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-leader-guide-2016-11-06"; + name = "vim-leader-guide-2017-02-12"; src = fetchgit { url = "git://github.com/hecal3/vim-leader-guide"; - rev = "b1dd2667cb74147c06853c39530984fbc629eb48"; - sha256 = "0xacamv3dcnkdh9xclvw76fp20rxgqb1m3068l582c6g5p7lj0yi"; + rev = "b545f700ae13e5b6c3e8c1d6e9796305690ba2da"; + sha256 = "0d1d8w1kp0h4j5hgh2ighvn6l00rq714fwxbswx07l5r931prwy1"; }; dependencies = []; }; idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "idris-vim-2016-07-29"; + name = "idris-vim-2017-01-27"; src = fetchgit { url = "git://github.com/idris-hackers/idris-vim"; - rev = "7ef7a2ed9135d69a0dea6b571a20ddf2b0bf7a90"; - sha256 = "0py7vyg38yn6bl7pwyyhylpqp14smqjzbfj7rjzjfnlq33v7ysij"; + rev = "c9b8066730fd8e62cf20eecf0e2c60f225ff12c8"; + sha256 = "0nkr2qwykl57xky3dpz40m5gy7s1kjfsgb1kzj7z9jqm6a41m2bb"; }; dependencies = []; }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2016-12-06"; + name = "calendar-vim-2017-02-09"; src = fetchgit { url = "git://github.com/itchyny/calendar.vim"; - rev = "6cf60f08a42c8b22ea3ae191a89e1faa4fdd3dae"; - sha256 = "172xgsmzwpy890bg813d89wz210lfdhckvispdl45l15armdy99y"; + rev = "e6fef6c6f7bdab98026cd2fa1a3900ce2bd0b852"; + sha256 = "0330vjkd54mx22qyxbgrxnz2k2ybm6izvi5wl6qm5p39dkqwg8ip"; }; dependencies = []; }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2016-12-03"; + name = "lightline-vim-2017-02-12"; src = fetchgit { url = "git://github.com/itchyny/lightline.vim"; - rev = "059888ab650fa192dd441e52bd9f41f08b247529"; - sha256 = "1pa627jjmrhlfbd8yms8lvfgnm0gj9xkr29jkq122icfl6hv3fwx"; + rev = "a63a00d548fd20457a4f31d31fb9c8fe8a7ebc2a"; + sha256 = "13fpf1rdaswz5c3wgpc1jjrzw47jhm896q5z0dc82lrfwsggp5a5"; }; dependencies = []; @@ -750,17 +784,6 @@ rec { }; - typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "typescript-vim-2016-08-10"; - src = fetchgit { - url = "git://github.com/leafgarland/typescript-vim"; - rev = "7e25a901af7cd993498cc9ecfc833ca2ac21db7a"; - sha256 = "0n5lrn741ar6wkvsi86kf7hgdjdwq34sn3ppzcddhvic5hayrkyk"; - }; - dependencies = []; - - }; - vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-ipython-2015-06-23"; src = fetchgit { @@ -784,22 +807,22 @@ rec { }; vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-orgmode-2016-11-12"; + name = "vim-orgmode-2017-01-31"; src = fetchgit { url = "git://github.com/jceb/vim-orgmode"; - rev = "67a693c37bac75ba163d35b9972efd0c7e0deb71"; - sha256 = "1rdcyfdyq4lbfh9ya63kf05aqcr9g6q7r4ngzn1fgy7pmqdpk7vf"; + rev = "37fc5db4d167ca0def23febcb06d984ab72015be"; + sha256 = "19cyd7l7xf9yhrx2k735hksd40hxy8izj30l1bl3a8v01lwv088x"; }; dependencies = []; }; vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-buffergator-2016-10-19"; + name = "vim-buffergator-2017-02-05"; src = fetchgit { url = "git://github.com/jeetsukumaran/vim-buffergator"; - rev = "c07d16dd3df10bbb5adc3e9b009e341bfa1f673e"; - sha256 = "0bj70lkqizfzmaxwrxcqv1151kx37v2v57aaqy4vcnfn04wq3h95"; + rev = "04dfbc0c78b0a29b340a99d0ff36ecf8f16e017d"; + sha256 = "1z13qqmvzismz7f6ss2pk956adnqh14df8qrlzk9rgplknm4w6k7"; }; dependencies = []; @@ -817,22 +840,22 @@ rec { }; auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "auto-pairs-2016-11-21"; + name = "auto-pairs-2017-01-26"; src = fetchgit { url = "git://github.com/jiangmiao/auto-pairs"; - rev = "84518168107c34fb540ee4f8cde743ceaf682bae"; - sha256 = "104mahfn956vb98psfml0b4x1yhwn8w6af3hkym3fdxy4ksh4fj4"; + rev = "e915d857fe927309ef0090e830f892204b750c43"; + sha256 = "11scssclvrri1lix3bbx2xrrznjihvd2g4c5d5xqv1ab14yrs6q4"; }; dependencies = []; }; vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nerdtree-tabs-2016-09-19"; + name = "vim-nerdtree-tabs-2017-02-12"; src = fetchgit { url = "git://github.com/jistr/vim-nerdtree-tabs"; - rev = "5a91230193fea7f9c8d792cb5c635998d868337d"; - sha256 = "08g587bnd8n61nj44ghjadwqpbbqya4hig56afna6rhs341zwlpm"; + rev = "de6a60909e71790baf5d46f863643379ec19bc4c"; + sha256 = "1h9r9c9b788b6fz56s12ih85zyf1vv0bzrl7k54vl4cncryyw37y"; }; dependencies = []; @@ -872,11 +895,11 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2016-12-25"; + name = "fzf-vim-2017-02-08"; src = fetchgit { url = "git://github.com/junegunn/fzf.vim"; - rev = "2066643243eddf2ed1f5d3a1a5485d6ff71851a4"; - sha256 = "0svw41n4x1j7s9l7qh5s0mk2s5ibdfq4pzdiknvfb342na6xi2b5"; + rev = "dade777e6dad6a318630d7ce26b9761761522c40"; + sha256 = "0yixz5nr6c6719yfcpci21fhx6kk6wa0213zlkipj8aij2y6ygfy"; }; dependencies = []; @@ -894,11 +917,11 @@ rec { }; vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-peekaboo-2016-08-05"; + name = "vim-peekaboo-2017-01-13"; src = fetchgit { url = "git://github.com/junegunn/vim-peekaboo"; - rev = "9c8415c022ab24ce51af13aa43255d5a7c7ef670"; - sha256 = "10c8j4wcg7g3i3vyvlcc21j0a3xmbl5ii5fl5k27iy2icf5rm018"; + rev = "9de6fd70ad20cbf568664c06d673c69e2f622287"; + sha256 = "0b5bfvwzy5l8g8s5z1h60c0y3phw2x0gyh1516sdlaq0nmvg2dky"; }; dependencies = []; @@ -926,6 +949,17 @@ rec { }; + typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "typescript-vim-2016-08-10"; + src = fetchgit { + url = "git://github.com/leafgarland/typescript-vim"; + rev = "7e25a901af7cd993498cc9ecfc833ca2ac21db7a"; + sha256 = "0n5lrn741ar6wkvsi86kf7hgdjdwq34sn3ppzcddhvic5hayrkyk"; + }; + dependencies = []; + + }; + vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-jinja-2016-11-16"; src = fetchgit { @@ -938,11 +972,11 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2017-01-03"; + name = "vimtex-2017-02-09"; src = fetchgit { url = "git://github.com/lervag/vimtex"; - rev = "4c76e8f74025c6c753167f23a6be0bcfc1e39af7"; - sha256 = "1syl4wyffn59i43q6kcy3hz5kzwmp0wj4xmwsahg81fxq4wzdz3n"; + rev = "de61b31cf89b6fd4653dc812d779abcf21ed33d0"; + sha256 = "0cg0l4jm9zfmg7nx0zha5cpv9c9szyj7fmfs19v1r7bzc3dvi492"; }; dependencies = []; @@ -959,6 +993,17 @@ rec { }; + vim-lawrencium = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-lawrencium-2017-01-10"; + src = fetchgit { + url = "git://github.com/ludovicchabant/vim-lawrencium"; + rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f"; + sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab"; + }; + dependencies = []; + + }; + rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "rainbow-2016-10-28"; src = fetchgit { @@ -985,12 +1030,23 @@ rec { buildInputs = [ xkb_switch ]; }; + vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-highlightedyank-2017-01-04"; + src = fetchgit { + url = "git://github.com/machakann/vim-highlightedyank"; + rev = "17327fd1072ac15a30f596a2fc0b6cef122e0640"; + sha256 = "08rc1br8npvkxxh3jn9hmn4yh4nlxy04c8nwyrnpndhw05kca33a"; + }; + dependencies = []; + + }; + vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2017-01-02"; + name = "vim-startify-2017-02-04"; src = fetchgit { url = "git://github.com/mhinz/vim-startify"; - rev = "c26fcfcd17cfa64e051c8aa97f78894d91a21604"; - sha256 = "0rcvh612qvcsbf0bagq44dk2hbarhcc2v9a8n7lc5f7rsgdhxp7w"; + rev = "5e9e6a48c992d9255a3be2f96765c9bb80faae97"; + sha256 = "1gnpg59i81hwhqva5grjd4f5lnjaclwwra58sgv30mrxkjg4d741"; }; dependencies = []; @@ -1041,22 +1097,22 @@ rec { }; haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "haskell-vim-2016-12-29"; + name = "haskell-vim-2017-02-08"; src = fetchgit { url = "git://github.com/neovimhaskell/haskell-vim"; - rev = "434f5903556e2bea99d433d48adb681cb4967d27"; - sha256 = "0lwclld3yqh4mf0bqqaxvqsfqsjq8q5pl27q1byqrr9x3ngjx5zz"; + rev = "c07c2b63f393252412b9c65726f2693bcacef71b"; + sha256 = "09xcsh3411l1wj7w0cwalcpd26rdw4k9idd2mclywrzlrlfddl9b"; }; dependencies = []; }; cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "cpsm-2016-09-21"; + name = "cpsm-2017-02-12"; src = fetchgit { url = "git://github.com/nixprime/cpsm"; - rev = "565ab53a66fa52c46d80adf6981b07f4bdffcb1d"; - sha256 = "125gcnqrg2276sp715q924cxwjxwsv3j4m0n1zj17w9srnpn4r1k"; + rev = "8e61bf3e30868c57ad7cf1fe4315b2352d61467c"; + sha256 = "0qcc10dx48wyvcgz9q3nid9l1wxvl9m97608s289lj4zps8iqpcs"; }; dependencies = []; buildInputs = [ @@ -1096,22 +1152,22 @@ rec { }; vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-markdown-2016-05-19"; + name = "vim-markdown-2017-02-02"; src = fetchgit { url = "git://github.com/plasticboy/vim-markdown"; - rev = "a3169545f330ec8080244c3ad755bb2211eca8a0"; - sha256 = "1ycqx280xpc5gvfx8rrnmkqlv8q8g51hgiryx6yvd9a8ci805cx1"; + rev = "d6d59eef6f604b6430fd6adade9e18364666232b"; + sha256 = "1p2ygvlg9abi4v52v9jh0aj76ll490w5d0gfsds33gy88hzl4js6"; }; dependencies = []; }; vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-racer-2017-01-04"; + name = "vim-racer-2017-02-08"; src = fetchgit { url = "git://github.com/racer-rust/vim-racer"; - rev = "3bd56cc87518c1bf02b681d586447366ae8e815a"; - sha256 = "0wq2iwgb7wpg62r68f9j5g3kycyap8sks735p9mcsq63rrqmw6l4"; + rev = "34f806e26fcd9271b0de5d34aab7f4e8ac13050e"; + sha256 = "07wmf40f7wvcb4wqdx6qqwhvbgaaawa2vxb6y1b28njzc05b01cd"; }; dependencies = []; @@ -1129,11 +1185,11 @@ rec { }; vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grammarous-2017-01-03"; + name = "vim-grammarous-2017-02-12"; src = fetchgit { url = "git://github.com/rhysd/vim-grammarous"; - rev = "33f9b3a0f8d6fb01e3c565948bd6185f5079d732"; - sha256 = "0l4qbd5phqqxdz1g7xz20p2fql1x2ccsv6v7sgal8bvk6b5f8dk0"; + rev = "3e096ed4d5b702167470f771ba2a40b31949dddf"; + sha256 = "0lxfy6gilcpjjypgpmw37hy3gk27bf51vggjkkrh3270xwxkmqj0"; }; dependencies = []; @@ -1151,66 +1207,77 @@ rec { }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2016-12-24"; + name = "neoformat-2017-02-11"; src = fetchgit { url = "git://github.com/sbdchd/neoformat"; - rev = "a0460e8ef4e48d8d1ee9c377546820a6164fee16"; - sha256 = "0jlvvc1ijpkadjqix6gr17y8gnfc0rhjqzbg08biw8jpks4fh44p"; + rev = "21117552efdc3fa8bac0d6977a30ba247c20e67b"; + sha256 = "09mrfbzpqi0kk39f9k76nmwq2b5pr0pvrdak9p13774kxm76gwvm"; }; dependencies = []; }; vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-polyglot-2016-12-20"; + name = "vim-polyglot-2017-02-02"; src = fetchgit { url = "git://github.com/sheerun/vim-polyglot"; - rev = "e404a658b1647fad396a954776eda0bdabf8353c"; - sha256 = "11q4k3yj1spxzhxjcwnild4njqmafznm179scvcw8lci8sm8w3hm"; + rev = "fbeb019a8516939bd904983ddc341e65c2ea19cb"; + sha256 = "1b645k07spg95lm6x7dq222v86lxsgnsvdcgy1srh9vx11lhvyny"; + }; + dependencies = []; + + }; + + neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neco-vim-2017-01-16"; + src = fetchgit { + url = "git://github.com/shougo/neco-vim"; + rev = "d28e1ea78f90d72636895dbd758de6b35aae2dfa"; + sha256 = "1qsyicxykl350zz86j7k6k9rflcf5nwrc5jbk9135zs5i8g1lqf3"; }; dependencies = []; }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2017-01-01"; + name = "neocomplete-vim-2017-01-08"; src = fetchgit { url = "git://github.com/shougo/neocomplete.vim"; - rev = "7904f0ff33ce667dfb203e812b783bf443c983cf"; - sha256 = "1gxvmzmlk8ga45vs8c24in92k6i9z3vxpmcpqpjjc40f4l8hqyds"; + rev = "9617d825c0d4acdb18aec903e9c1c0443058d18b"; + sha256 = "0a6mhh0ylzgjddlnwqaa5zq4abpv2dhhw7wv7w9lmwa82w31j5ya"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2016-11-05"; + name = "neosnippet-snippets-2017-01-24"; src = fetchgit { url = "git://github.com/shougo/neosnippet-snippets"; - rev = "4431bf176650696d5a8dd93814812afd0d06212c"; - sha256 = "0fbwzlvdbrmia97pyzgyffbqrimp2dxjn6cc45ia1kqgnhwdk4pd"; + rev = "8e2b1c0cab9ed9a832b3743dbb65e9966a64331a"; + sha256 = "151wpvbj6jb9jdkbhj3b77f5sq7y328spvwfbqyj1y32rg4ifmc6"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2017-01-02"; + name = "neosnippet-vim-2017-02-09"; src = fetchgit { url = "git://github.com/shougo/neosnippet.vim"; - rev = "65af2b9bcad50ba1543b38a8dd30df1aee2142ce"; - sha256 = "107xb0pvqc4ivqpz5i7z8xfk26577y3jsxzvm86bizbxc2wi92m9"; + rev = "db828325268ca28c17674bd876b40be895daa27e"; + sha256 = "1l3zxxj90341slf0k6hprjgjy4slsajbc95v4l46bchcsyxsrh3i"; }; dependencies = []; }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2016-12-14"; + name = "unite-vim-2017-02-10"; src = fetchgit { url = "git://github.com/shougo/unite.vim"; - rev = "be09b0e5784c4c4c13aefae4f16313696c6f51de"; - sha256 = "1nd09llf9v09acyizdmwgjkkdg1b14f8d02b5h3bgidv753dbx64"; + rev = "97e634117ff05d3c867d625940da5c7947cebf63"; + sha256 = "1qc7k5n7whw5z78czhi363fbllj9znz1gqlps096aiwhapfv3m1z"; }; dependencies = []; @@ -1256,6 +1323,17 @@ rec { }; + alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "alchemist-vim-2017-01-24"; + src = fetchgit { + url = "git://github.com/slashmili/alchemist.vim"; + rev = "c22d4883b7e2bfed78b70b557d816bf0491d7dd4"; + sha256 = "0iv91mfj3lxc41xb8sxhl9mby5dllzyvw8508igrj5lvyrd1ikkf"; + }; + dependencies = []; + + }; + vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-hardtime-2016-12-19"; src = fetchgit { @@ -1290,11 +1368,11 @@ rec { }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2016-12-14"; + name = "vim-quickrun-2017-01-22"; src = fetchgit { url = "git://github.com/thinca/vim-quickrun"; - rev = "f968a467781f0f3c788768b95487d80efa6ceb28"; - sha256 = "0kd6qi7zqahrgr3y773x3q885ww41ladgl10lx0r1x2yjr5y8nv4"; + rev = "95da1f83c4a1988a3808492e2b2e169ed408d3e2"; + sha256 = "0j3jg06flspb36v5hj7pljaljncv5160zw01s3v1605d1q8b43mv"; }; dependencies = []; @@ -1367,39 +1445,20 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2017-01-04"; + name = "youcompleteme-2017-02-11"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "3fde57b029f760baedeaf7c0c880326e32f5c4d9"; - sha256 = "1bilzzv02ksqv6m44alp32s61scxqqj5cxx1klr70mhm81k2ksb9"; + rev = "1d1a4f4cff04ed32ab924dda20666e67eabdefb4"; + sha256 = "12xz019jrvr6wgjbp0w052awpmhwbpkwy6j7v0f0ldx242rv9sr8"; }; dependencies = []; - buildInputs = [ - python go cmake - ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; - - propagatedBuildInputs = stdenv.lib.optional (!stdenv.isDarwin) rustracerd; - - patches = [ - ./patches/youcompleteme/2-ycm-cmake.patch - ]; - - # YCM requires path to external libclang 3.9 - # For explicit use and as env variable for ../third_party/ycmd/build.py - EXTRA_CMAKE_ARGS="-DEXTERNAL_LIBCLANG_PATH=${llvmPackages.clang.cc}/lib/libclang.${if stdenv.isDarwin then "dylib" else "so"}"; - buildPhase = '' - patchShebangs . substituteInPlace plugin/youcompleteme.vim \ - --replace "'ycm_path_to_python_interpreter', '''" "'ycm_path_to_python_interpreter', '${python}/bin/python'" + --replace "'ycm_path_to_python_interpreter', '''" \ + "'ycm_path_to_python_interpreter', '${python}/bin/python'" - mkdir build - pushd build - cmake -G "Unix Makefiles" . ../third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON \ - $EXTRA_CMAKE_ARGS - make ycm_core -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} - ${python}/bin/python ../third_party/ycmd/build.py --gocode-completer --clang-completer - popd + rm -r third_party/ycmd + ln -s ${ycmd}/lib/ycmd third_party ''; meta = { @@ -1412,22 +1471,22 @@ rec { }; vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2016-12-09"; + name = "vim-airline-themes-2016-12-31"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline-themes"; - rev = "2a97d9ee410d7b9980a7741fc6e705d53eea23c2"; - sha256 = "1crqpryfvamjqw8wqn6nlfqbflgwcfxqf4jk3j58rjxssl0vrfbc"; + rev = "6026eb78bf362cb3aa875aff8487f65728d0f7d8"; + sha256 = "13ijkavh1r0935cn2rjsfbdd1q3ka8bi26kw0bdkrqlrqxwvpss8"; }; dependencies = []; }; vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2016-12-16"; + name = "vim-pandoc-2017-02-07"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc"; - rev = "56b0940954c98c9a089948e1cbbafd2e6e7369e7"; - sha256 = "0yn4cc3i71vxickvwz4g94fc39pgg9phqdz7sc6kf6xran6p0jdy"; + rev = "32ebfb105cf86b191b72e6c9aaf8d6230d05684c"; + sha256 = "0k79bj9lb65w5nxsb226bf3r0ppqh9p9g8yigbs0qgfx8aidwnsw"; }; dependencies = []; @@ -1445,11 +1504,11 @@ rec { }; vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-syntax-2016-11-05"; + name = "vim-pandoc-syntax-2017-01-19"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc-syntax"; - rev = "c76442ccbdd7889184683dc1d39c16c612c2c19f"; - sha256 = "1ad60ls4xrbf01sjprksrx2j9x2y4m6gd7hq3p9ygrcmcxw64khm"; + rev = "89341527b2bde3fbd473f5677e1df09072c319b5"; + sha256 = "106h40vbcgap4jqqwcc6k01q65ss8r99594g6144kacnk0jixg52"; }; dependencies = []; @@ -1544,22 +1603,22 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2016-11-01"; + name = "vim-wakatime-2017-02-08"; src = fetchgit { url = "git://github.com/wakatime/vim-wakatime"; - rev = "5fb34105de863ca90f3f8568b85fa017a42568af"; - sha256 = "1flsdmf60fp8z0k080qfzdcpcb761zrj5qa3np2y9w24wbff9m5p"; + rev = "3d343f656521ef0521a3277b81e4cd9af8be671a"; + sha256 = "0xr6q39a20121kkscjpz1bly9j0z3lbzwj34gl3msba91mv1glb1"; }; dependencies = []; buildInputs = [ python ]; }; command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "command-t-2016-10-27"; + name = "command-t-2017-01-08"; src = fetchgit { url = "git://github.com/wincent/command-t"; - rev = "d2467c84af8a1f1a2d0366127550d0a241dd2548"; - sha256 = "1r81a0wlj9aqx0s11h6ddkdwbahxbg1l425jdyrwvxwd973nwkj6"; + rev = "ce9daf8d792c945d32d0bf8878149eaa8aee2b81"; + sha256 = "13ylc9bwf5qxsc8i62ppbcr446m35iyp243293ahn7xdrlnv2f9g"; }; dependencies = []; buildInputs = [ perl ruby ]; @@ -1583,14 +1642,14 @@ rec { }; deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-go-2016-12-22"; + name = "deoplete-go-2017-02-10"; src = fetchgit { url = "git://github.com/zchee/deoplete-go"; - rev = "3762a44995559277ea6b0bbcd3242dc5250d438e"; - sha256 = "16hdp7gq3mxddwbi4qbpqknc67yfr8xr52v198189jgnwajs3c6x"; + rev = "85a9c1847aa76e13e0e6e59e9694927281f3f15a"; + sha256 = "0i0hfkr7xnm8v8rz2788xvz65yrwhw6i2sin17hymkfwscjdds86"; }; dependencies = []; - buildInputs = [ python3 ]; + buildInputs = [ python3 ]; buildPhase = '' pushd ./rplugin/python3/deoplete/ujson python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build @@ -1600,11 +1659,11 @@ rec { }; deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2016-12-01"; + name = "deoplete-jedi-2017-01-16"; src = fetchgit { url = "git://github.com/zchee/deoplete-jedi"; - rev = "13c69a4baefdcf3be4288d82b9a75405fff06838"; - sha256 = "15w53k5mxrpj6qaybxgyvmbxizkk6r06hsmw9hff8aig4xd3dw74"; + rev = "6240de812f06263524f46379ad08a0d3d539730f"; + sha256 = "00hn00dv7klywqv14zhicsa0gd9iiv5va155ayr6mpj74p9lp2a1"; }; dependencies = []; @@ -1743,11 +1802,11 @@ rec { }; table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode-2016-09-28"; + name = "table-mode-2017-01-05"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "441c30c35aec9d5c2de1d58a77a7d22aa8d93b06"; - sha256 = "04fdd2hgrcrgqqflzlvv7j9c53m8f2divi075p75g6grkxxyninv"; + rev = "30a3eba81628fdd099adc6dfdec8aa627c4783f7"; + sha256 = "0pw3mvrx3iyyj5xz05gixhvnrqxpl274cv04449mxm50q32zvmhr"; }; dependencies = []; @@ -1785,17 +1844,6 @@ rec { }; - tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tsuquyomi-2017-01-02"; - src = fetchgit { - url = "git://github.com/Quramy/tsuquyomi"; - rev = "473aa2703950816748329acca56c069df7339c96"; - sha256 = "0h5gbhs4gsvyjsin2wvdlbrr6ykpcmipmpwpf39595j1dlqnab59"; - }; - dependencies = []; - - }; - undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "undotree-2016-07-19"; src = fetchgit { @@ -1973,11 +2021,11 @@ rec { }; vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-sql-2014-01-18"; + name = "vim-addon-sql-2017-02-11"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-sql"; - rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b"; - sha256 = "15l2201jkfml08znvkkpy7fm3wn87n91zgd9ysrf5h73amjx9y2w"; + rev = "048a139af36829fce670c8ff80d3aad927557ee6"; + sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3"; }; dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; @@ -2017,11 +2065,11 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2016-12-29"; + name = "vim-airline-2017-02-11"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline"; - rev = "a2431f2adb23a003abdfe5294861bbd69de52e52"; - sha256 = "1qd5f133rg3pqdm889zg0hxhrmgzd71maz6jif4a4hjbghi61wjs"; + rev = "b66c1ef07005fad6a70957b90d4f47bb932e33e2"; + sha256 = "0y8adl6dl7c501na2k2j38cs200ykm6pjva19xshiv0h2f916l2b"; }; dependencies = []; @@ -2039,11 +2087,11 @@ rec { }; vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align-2016-03-06"; + name = "vim-easy-align-2017-02-08"; src = fetchgit { url = "git://github.com/junegunn/vim-easy-align"; - rev = "0cb6b98fc155717b0a56c110551ac57d1d951ddb"; - sha256 = "10j1fz7si7xqqs4p7h66jd0xzr116cv3xjyac9p20fc0yyyg1wbh"; + rev = "3b395bd5bafbdfb1f93190fa3f259b7ad2e40eb9"; + sha256 = "0nqvzxr2i9jsyx1qhspf636q0j4b0d8y98yqhxklcpq18ap442zp"; }; dependencies = []; @@ -2061,11 +2109,11 @@ rec { }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2016-12-23"; + name = "vim-gitgutter-2017-02-06"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "7b81a8a22607f073b76b106e2d5e63cc936b0d25"; - sha256 = "19v2akrhhfb9zy7mvljjwvi7lqrnviw88gxh4xmpy82vghiwdrfs"; + rev = "5d1a0bfa1bd2b8d8a77fff09d13394e5abbc6143"; + sha256 = "19iz6k1wb8jy51lpr8pwp3fy80ww4sw6n6mp56lw59n8227gffc1"; }; dependencies = []; @@ -2093,17 +2141,6 @@ rec { }; - vim-misc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-misc-2015-05-21"; - src = fetchgit { - url = "git://github.com/xolox/vim-misc"; - rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b"; - sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi"; - }; - dependencies = []; - - }; - vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-multiple-cursors-2016-06-03"; src = fetchgit { @@ -2127,22 +2164,22 @@ rec { }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2016-12-31"; + name = "vim-signify-2017-02-10"; src = fetchgit { url = "git://github.com/mhinz/vim-signify"; - rev = "32d8797d887b0980514cdf7f11c9c1379d597e57"; - sha256 = "1jhb6pljqbz8mlcc4zfjqzhyyp4yz5b6h7s0224m7vm4xvsphq8y"; + rev = "a2c28f654087735a276ec7c1f558b782db5488a5"; + sha256 = "0zhm26d5s68gcj1lmw866m0gcfss46mr4z79zggiara83x5abbxp"; }; dependencies = []; }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2016-12-27"; + name = "vim-snippets-2017-02-07"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "e24d33f96a95332dde0edaa7e7e3e7a64244de56"; - sha256 = "1clba2x05klqab5ifkg19cxm22ibx6ycdfdn71clglk96wli1h0f"; + rev = "b8c340daf084f243a487f8853a0984504909dfda"; + sha256 = "1173hck15aijhvh00rjdsyiv21ax6hp9h7w2yph514zi9mhzgg8q"; }; dependencies = []; @@ -2171,11 +2208,11 @@ rec { }; vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2016-12-18"; + name = "vimwiki-2017-01-30"; src = fetchgit { url = "git://github.com/vimwiki/vimwiki"; - rev = "3a8743700581923c6fd2684510dad48a8b2b8c64"; - sha256 = "19b27h0zsmi1xphzf1qhmry11gca4j1mh0mli12yvkr9v61rnj6b"; + rev = "be79f68a9292cbe53d330cb37fd18d835e8f74d4"; + sha256 = "0n43vaxh90v5wbgqld61bwlhzr11s0c72dgrp0cirj7ri7xajq8z"; }; dependencies = []; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index cd22f63d562..f9e79a8019b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -36,10 +36,12 @@ "github:ctjhoa/spacevim" "github:ctrlpvim/ctrlp.vim" "github:derekelkins/agda-vim" +"github:derekwyatt/vim-scala" "github:digitaltoad/vim-jade" "github:dracula/vim" "github:eagletmt/neco-ghc" "github:eikenb/acp" +"github:elixir-lang/vim-elixir" "github:elmcast/elm-vim" "github:embear/vim-localvimrc" "github:enomsg/vim-haskellConcealPlus" @@ -72,8 +74,10 @@ "github:lepture/vim-jinja" "github:lervag/vimtex" "github:lokaltog/vim-easymotion" +"github:ludovicchabant/vim-lawrencium" "github:luochen1990/rainbow" "github:lyokha/vim-xkbswitch" +"github:machakann/vim-highlightedyank" "github:mhinz/vim-startify" "github:mkasa/lushtags" "github:mpickering/hlint-refactor-vim" @@ -89,6 +93,7 @@ "github:rust-lang/rust.vim" "github:sbdchd/neoformat" "github:sheerun/vim-polyglot" +"github:shougo/neco-vim" "github:shougo/neocomplete.vim" "github:shougo/neosnippet-snippets" "github:shougo/neosnippet.vim" @@ -96,6 +101,7 @@ "github:shougo/vimproc.vim" "github:shougo/vimshell.vim" "github:sjl/gundo.vim" +"github:slashmili/alchemist.vim" "github:takac/vim-hardtime" "github:terryma/vim-expand-region" "github:tex/vimpreviewpandoc" diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 5110897e32a..d714b290a90 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -65,8 +65,8 @@ See vimHelpTags sample code below. CONTRIBUTING AND CUSTOMIZING ============================ -The example file pkgs/misc/vim-plugins/default.nix provides both: -* manually mantained plugins +The example file pkgs/misc/vim-plugins/default.nix provides both: +* manually mantained plugins * plugins created by VAM's nix#ExportPluginsForNix implementation I highly recommend to lookup vim plugin attribute names at the [vim-pi] project @@ -105,7 +105,7 @@ Then ":source %" it. nix#ExportPluginsForNix is provided by ./vim2nix -A buffer will open containing the plugin derivation lines as well list +A buffer will open containing the plugin derivation lines as well list fitting the vimrcConfig.vam.pluginDictionaries option. Thus the most simple usage would be: @@ -125,7 +125,7 @@ Thus the most simple usage would be: vimrcConfig.vam.knownPlugins = vimPlugins; vimrcConfig.vam.pluginDictionaries = [ # the plugin list form ~/.vim-scripts turned into nix format added to - # the buffer created by the nix#ExportPluginsForNix + # the buffer created by the nix#ExportPluginsForNix ]; } @@ -262,13 +262,14 @@ let in writeText "vimrc" '' " minimal setup, generated by NIX set nocompatible - filetype indent plugin on | syn on ${vamImpl} ${pathogenImpl} ${vundleImpl} ${neobundleImpl} + filetype indent plugin on | syn on + ${customRC} ''; @@ -366,6 +367,8 @@ rec { ''; })); + vim_with_vim2nix = vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; }; + buildVimPluginFrom2Nix = a: buildVimPlugin ({ buildPhase = ":"; configurePhase =":"; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme index 8da267837fb..d61fdff0f08 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme @@ -1,29 +1,10 @@ - buildInputs = [ - python go cmake - ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; - - propagatedBuildInputs = stdenv.lib.optional (!stdenv.isDarwin) rustracerd; - - patches = [ - ./patches/youcompleteme/2-ycm-cmake.patch - ]; - - # YCM requires path to external libclang 3.9 - # For explicit use and as env variable for ../third_party/ycmd/build.py - EXTRA_CMAKE_ARGS="-DEXTERNAL_LIBCLANG_PATH=${llvmPackages.clang.cc}/lib/libclang.${if stdenv.isDarwin then "dylib" else "so"}"; - buildPhase = '' - patchShebangs . substituteInPlace plugin/youcompleteme.vim \ - --replace "'ycm_path_to_python_interpreter', '''" "'ycm_path_to_python_interpreter', '${python}/bin/python'" + --replace "'ycm_path_to_python_interpreter', '''" \ + "'ycm_path_to_python_interpreter', '${python}/bin/python'" - mkdir build - pushd build - cmake -G "Unix Makefiles" . ../third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON \ - $EXTRA_CMAKE_ARGS - make ycm_core -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} - ${python}/bin/python ../third_party/ycmd/build.py --gocode-completer --clang-completer - popd + rm -r third_party/ycmd + ln -s ${ycmd}/lib/ycmd third_party ''; meta = { diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 4108bc60c27..29a0658d438 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -196,7 +196,7 @@ let Csu = applePackage "Csu" "osx-10.11.6" "0yh5mslyx28xzpv8qww14infkylvc1ssi57imhi471fs91sisagj" {}; dtrace = applePackage "dtrace" "osx-10.11.6" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wc0" {}; dyld = applePackage "dyld" "osx-10.11.6" "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {}; - eap8021x = applePackage "eap8021x" "osx-10.11.6" "15bbgjhi8l7hbib41gqcldzbf3hf6105jbwc745hp1gmrscw4zch" {}; + eap8021x = applePackage "eap8021x" "osx-10.11.6" "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {}; IOKit = applePackage "IOKit" "osx-10.11.6" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; }; launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {}; libauto = applePackage "libauto" "osx-10.9.5" "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {}; @@ -212,7 +212,7 @@ let libiconv = applePackage "libiconv" "osx-10.11.6" "11h6lfajydri4widis62q8scyz7z8l6msqyx40ly4ahsdlbl0981" {}; Libinfo = applePackage "Libinfo" "osx-10.11.6" "0qjgkd4y8sjvwjzv5wwyzkb61pg8wwg95bkp721dgzv119dqhr8x" {}; Libm = applePackage "Libm" "osx-10.7.4" "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {}; - Libnotify = applePackage "Libnotify" "osx-10.11.6" "14rhhfzb75r9jf3kyj8fzd01n09n7km1fsdj3dzl3lkkp1sir78m" {}; + Libnotify = applePackage "Libnotify" "osx-10.11.6" "0zbcyxlcfhf91jxczhd5bq9qfgvg494gwwp3l7q5ayb2qdihzr8b" {}; libpthread = applePackage "libpthread" "osx-10.11.6" "1kbw738cmr9pa7pz1igmajs307clfq7gv2vm1sqdzhcnnjxbl28w" {}; libresolv = applePackage "libresolv" "osx-10.11.6" "09flfdi3dlzq0yap32sxidacpc4nn4va7z12a6viip21ix2xb2gf" {}; Libsystem = applePackage "Libsystem" "osx-10.11.6" "1nfkmbqml587v2s1d1y2s2v8nmr577jvk51y6vqrfvsrhdhc2w94" {}; diff --git a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix new file mode 100644 index 00000000000..d23328d362e --- /dev/null +++ b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix @@ -0,0 +1,14 @@ +{ runCommand, cctools }: +{ haskellPackages, src, deps ? p : [], name }: let + inherit (haskellPackages) ghc ghcWithPackages; + with-env = ghcWithPackages deps; + crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; + ghcName = "${crossPrefix}ghc"; +in runCommand name { buildInputs = [ with-env cctools ]; } '' + mkdir -p $out/lib + mkdir -p $out/include + ${ghcName} ${src} -staticlib -outputdir . -o $out/lib/${name}.a -stubdir $out/include + for file in ${ghc}/lib/${ghcName}-${ghc.version}/include/*; do + ln -sv $file $out/include + done +'' diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix index 01753a5300b..7de7d291289 100644 --- a/pkgs/os-specific/darwin/ios-cross/default.nix +++ b/pkgs/os-specific/darwin/ios-cross/default.nix @@ -45,7 +45,7 @@ ''; }; in { - cc = runCommand "${prefix}-cc" {} '' + cc = runCommand "${prefix}-cc" { passthru = { inherit sdkType sdkVer sdk; }; } '' mkdir -p $out/bin ln -sv ${wrapper}/bin/clang $out/bin/${prefix}-cc mkdir -p $out/nix-support diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix new file mode 100644 index 00000000000..0e5d466e16a --- /dev/null +++ b/pkgs/os-specific/darwin/khd/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, Carbon, Cocoa }: + +stdenv.mkDerivation rec { + name = "khd-${version}"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "koekeishiya"; + repo = "khd"; + rev = "v${version}"; + sha256 = "02v2bq095h1ylx700kayakg7f9p43vrz6p9ry3g7lq37s6apgm8h"; + }; + + buildInputs = [ Carbon Cocoa ]; + + prePatch = '' + substituteInPlace makefile \ + --replace g++ clang++ + ''; + + buildPhase = '' + make install + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/khd $out/bin/khd + + mkdir -p $out/Library/LaunchDaemons + cp ${./org.nixos.khd.plist} $out/Library/LaunchDaemons/org.nixos.khd.plist + substituteInPlace $out/Library/LaunchDaemons/org.nixos.khd.plist --subst-var out + ''; + + meta = with stdenv.lib; { + description = "A simple modal hototkey daemon for OSX"; + homepage = https://github.com/koekeishiya/khd; + downloadPage = https://github.com/koekeishiya/khd/releases; + platforms = platforms.darwin; + maintainers = with maintainers; [ lnl7 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/os-specific/darwin/khd/org.nixos.khd.plist b/pkgs/os-specific/darwin/khd/org.nixos.khd.plist new file mode 100644 index 00000000000..3c0aaa81eb6 --- /dev/null +++ b/pkgs/os-specific/darwin/khd/org.nixos.khd.plist @@ -0,0 +1,33 @@ + + + + + Label + org.nixos.khd + ProgramArguments + + @out@/bin/khd + + KeepAlive + + ProcessType + Interactive + EnvironmentVariables + + PATH + @out@/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin + + Sockets + + Listeners + + SockServiceName + 3021 + SockType + dgram + SockFamily + IPv4 + + + + diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/os-specific/darwin/kwm/default.nix new file mode 100644 index 00000000000..ac231f2dfe3 --- /dev/null +++ b/pkgs/os-specific/darwin/kwm/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + name = "kwm-${version}"; + version = "4.0.4"; + + src = fetchzip { + stripRoot = false; + url = "https://github.com/koekeishiya/kwm/releases/download/v${version}/Kwm-${version}.zip"; + sha256 = "07rf4ichq511w8qmvd6s602s7xcyjhjp73d5c615sj82cxvgirwc"; + }; + + # TODO: Build this properly once we have swiftc. + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp kwmc $out/bin/kwmc + cp kwm overlaylib.dylib $out + + mkdir -p $out/Library/LaunchDaemons + cp ${./org.nixos.kwm.plist} $out/Library/LaunchDaemons/org.nixos.kwm.plist + substituteInPlace $out/Library/LaunchDaemons/org.nixos.kwm.plist --subst-var out + ''; + + meta = with stdenv.lib; { + description = "Tiling window manager with focus follows mouse for OSX"; + homepage = https://github.com/koekeishiya/kwm; + downloadPage = https://github.com/koekeishiya/kwm/releases; + platforms = platforms.darwin; + maintainers = with maintainers; [ lnl7 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist b/pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist new file mode 100644 index 00000000000..eafce2ab4a4 --- /dev/null +++ b/pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist @@ -0,0 +1,26 @@ + + + + + Label + org.nixos.kwm + ProgramArguments + + @out@/kwm + + KeepAlive + + Sockets + + Listeners + + SockServiceName + 3020 + SockType + dgram + SockFamily + IPv4 + + + + diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 457b670319e..247c73e468d 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -3,7 +3,8 @@ args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool , texinfo, glibcCross, hurdPartedCross, libuuid, samba , gccCrossStageStatic, gccCrossStageFinal -, forceNativeDrv, forceSystem, newScope, platform, config, crossSystem +, forcedNativePackages, forceSystem, newScope, platform, config +, targetPlatform, buildPlatform , overrides ? {} }: with args; @@ -12,25 +13,25 @@ let callPackage = newScope gnu; gnu = { - hurdCross = forceNativeDrv (callPackage ./hurd { + hurdCross = forcedNativePackages.callPackage ./hurd { inherit fetchgit stdenv autoconf libtool texinfo glibcCross hurdPartedCross; inherit (gnu) machHeaders mig; libuuid = libuuid.crossDrv; automake = automake111x; headersOnly = false; - cross = assert crossSystem != null; crossSystem; + cross = assert targetPlatform != buildPlatform; targetPlatform; gccCross = gccCrossStageFinal; - }); + }; - hurdCrossIntermediate = forceNativeDrv (callPackage ./hurd { + hurdCrossIntermediate = forcedNativePackages.callPackage ./hurd { inherit fetchgit stdenv autoconf libtool texinfo glibcCross; inherit (gnu) machHeaders mig; hurdPartedCross = null; libuuid = null; automake = automake111x; headersOnly = false; - cross = assert crossSystem != null; crossSystem; + cross = assert targetPlatform != buildPlatform; targetPlatform; # The "final" GCC needs glibc and the Hurd libraries (libpthread in # particular) so we first need an intermediate Hurd built with the @@ -42,7 +43,7 @@ let # libshouldbeinlibc. buildTarget = "libihash libstore libshouldbeinlibc"; installTarget = "libihash-install libstore-install libshouldbeinlibc-install"; - }); + }; hurdHeaders = callPackage ./hurd { automake = automake111x; @@ -58,13 +59,13 @@ let hurd = null; }; - libpthreadCross = forceNativeDrv (callPackage ./libpthread { + libpthreadCross = forcedNativePackages.callPackage ./libpthread { inherit fetchgit stdenv autoconf automake libtool glibcCross; inherit (gnu) machHeaders hurdHeaders; hurd = gnu.hurdCrossIntermediate; gccCross = gccCrossStageStatic; - cross = assert crossSystem != null; crossSystem; - }); + cross = assert targetPlatform != buildPlatform; targetPlatform; + }; # In theory GNU Mach doesn't have to be cross-compiled. However, since it # has to be built for i586 (it doesn't work on x86_64), one needs a cross diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index cbfa2e1b030..7cf2bc4f975 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -30,9 +30,9 @@ let in stdenv.mkDerivation rec { - version = "16.50"; + version = "16.60"; pname = "amdgpu-pro"; - build = "${version}-362463"; + build = "${version}-379184"; libCompatDir = "/run/lib/${libArch}"; @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://www2.ati.com/drivers/linux/ubuntu/amdgpu-pro-${build}.tar.xz"; - sha256 = "1wl8mabk9g7s43bdarzl2i5crp8rl1advnb5mw3p3821sqzh2nd9"; + sha256 = "1g90sryxw8y4abjgviibq34v3hr82ijgbaiqnxgafrf7g9s5m2yq"; curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMD-Radeon-GPU-PRO-Linux-Beta-Driver%e2%80%93Release-Notes.aspx"; }; @@ -58,18 +58,10 @@ in stdenv.mkDerivation rec { ''; modulePatches = [ - ./patches/0001-Fix-kernel-module-install-location.patch - ./patches/0002-Add-Gentoo-as-build-option.patch - ./patches/0003-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch - ./patches/0004-Change-seq_printf-format-for-64-bit-context.patch - ./patches/0005-Fix-vblank-calls.patch - ./patches/0006-Fix-crtc_gamma-functions-for-4.8.0.patch - ./patches/0007-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch - ./patches/0008-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch - ./patches/0009-Remove-dependency-on-System.map.patch - ./patches/0010-disable-dal-by-default.patch - ./patches/0011-kcl-fixes-for-16.50-linux-4.8.patch - ./patches/0012-use-kernel-fence_array-in-4.8.patch + ./patches/0001-disable-firmware-copy.patch + ./patches/0002-linux-4.9-fixes.patch + ./patches/0003-Change-seq_printf-format-for-64-bit-context.patch + ./patches/0004-fix-warnings-for-Werror.patch ]; patchPhase = optionalString (!libsOnly) '' @@ -83,12 +75,23 @@ in stdenv.mkDerivation rec { ''; preBuild = optionalString (!libsOnly) '' - makeFlags="$makeFlags M=$(pwd)/usr/src/amdgpu-pro-${build}" + pushd usr/src/amdgpu-pro-${build} + makeFlags="$makeFlags M=$(pwd)" + patchShebangs pre-build.sh + ./pre-build.sh ${kernel.version} + popd ''; - postBuild = optionalString (!libsOnly) '' - xz usr/src/amdgpu-pro-${build}/amd/amdgpu/amdgpu.ko - ''; + modules = [ + "amd/amdgpu/amdgpu.ko" + "amd/amdkcl/amdkcl.ko" + "ttm/amdttm.ko" + ]; + + postBuild = optionalString (!libsOnly) + (concatMapStrings (m: "xz usr/src/amdgpu-pro-${build}/${m}\n") modules); + + NIX_CFLAGS_COMPILE = "-Werror"; makeFlags = optionalString (!libsOnly) "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build modules"; @@ -123,10 +126,10 @@ in stdenv.mkDerivation rec { '' + '' popd - '' + optionalString (!libsOnly) '' - mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko.xz - cp usr/src/amdgpu-pro-${build}/amd/amdgpu/amdgpu.ko.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko.xz - '' + '' + '' + optionalString (!libsOnly) + (concatMapStrings (m: + "install -Dm444 usr/src/amdgpu-pro-${build}/${m}.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/${m}.xz\n") modules) + + '' mv $out/etc/vulkan $out/share interpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" libPath="$out/lib:$out/lib/gbm:$depLibPath" diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Fix-kernel-module-install-location.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Fix-kernel-module-install-location.patch deleted file mode 100644 index 5af823a9394..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Fix-kernel-module-install-location.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e787277fd4f43399de2da355b08e478c2a58d589 Mon Sep 17 00:00:00 2001 -From: "Luke A. Guest" -Date: Sun, 25 Sep 2016 15:31:13 +0100 -Subject: [PATCH 01/11] Fix kernel module install location - ---- - dkms.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dkms.conf b/dkms.conf -index 7f11158..2f080e2 100644 ---- a/dkms.conf -+++ b/dkms.conf -@@ -2,7 +2,7 @@ PACKAGE_NAME="amdgpu-pro" - PACKAGE_VERSION="16.50-362463" - BUILT_MODULE_NAME[0]="amdgpu" - BUILT_MODULE_LOCATION[0]="amd/amdgpu" --DEST_MODULE_LOCATION[0]="/updates" -+DEST_MODULE_LOCATION[0]="/kernel/drivers/gpu/drm/amd/amdgpu" - AUTOINSTALL="yes" - PRE_BUILD="pre-build.sh $kernelver" - --- -2.11.0 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch new file mode 100644 index 00000000000..6803cf03289 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch @@ -0,0 +1,25 @@ +From ad3f6de6d16ea8ee76635dd39875eeab39def6e9 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Sat, 28 Jan 2017 16:57:26 -0400 +Subject: [PATCH 1/4] disable firmware copy + +--- + pre-build.sh | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/pre-build.sh b/pre-build.sh +index 25e718f..e3cd009 100755 +--- a/pre-build.sh ++++ b/pre-build.sh +@@ -35,8 +35,3 @@ find ttm -name '*.c' -exec grep EXPORT_SYMBOL {} + \ + | sort -u \ + | awk -F'[()]' '{print "#define "$2" amd"$2" //"$0}'\ + > include/rename_symbol.h +- +-FW_DIR="/lib/firmware/$KERNELVER" +-mkdir -p $FW_DIR +-cp -ar /usr/src/amdgpu-pro-16.60-379184/firmware/radeon $FW_DIR +-cp -ar /usr/src/amdgpu-pro-16.60-379184/firmware/amdgpu $FW_DIR +-- +2.11.0 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Add-Gentoo-as-build-option.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Add-Gentoo-as-build-option.patch deleted file mode 100644 index be627992c06..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Add-Gentoo-as-build-option.patch +++ /dev/null @@ -1,30 +0,0 @@ -From da51551f671be3282b6f69ef76e495b169a5dc3f Mon Sep 17 00:00:00 2001 -From: "Luke A. Guest" -Date: Sun, 25 Sep 2016 15:31:49 +0100 -Subject: [PATCH 02/11] Add Gentoo as build option - ---- - amd/backport/Makefile | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/amd/backport/Makefile b/amd/backport/Makefile -index a6ab7fe..ff9339d 100644 ---- a/amd/backport/Makefile -+++ b/amd/backport/Makefile -@@ -22,8 +22,13 @@ else ifeq ("sled",$(OS_NAME)) - ccflags-y += -DOS_NAME_SLE - else ifeq ("sles",$(OS_NAME)) - ccflags-y += -DOS_NAME_SLE -+else ifeq ("gentoo",$(OS_NAME)) -+ccflags-y += -DOS_NAME_GENTOO -+# We don't have a version inside /etc/os-release. -+OS_VERSION = "0.0" - else - ccflags-y += -DOS_NAME_UNKNOWN -+OS_VERSION = "0.0" - endif - - ccflags-y += \ --- -2.11.0 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch new file mode 100644 index 00000000000..86dbea29e08 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch @@ -0,0 +1,97 @@ +From 52e47be93c7a492730477f590e5eb42e035018bd Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Sun, 29 Jan 2017 18:23:47 -0400 +Subject: [PATCH 2/4] linux-4.9 fixes + +--- + amd/amdgpu/amdgpu_connectors.c | 8 ++++++++ + amd/amdgpu/amdgpu_ttm.c | 4 ++++ + amd/display/amdgpu_dm/amdgpu_dm_types.c | 8 ++++++++ + include/kcl/kcl_mm.h | 4 +++- + 4 files changed, 23 insertions(+), 1 deletion(-) + +diff --git a/amd/amdgpu/amdgpu_connectors.c b/amd/amdgpu/amdgpu_connectors.c +index 1b51981..4b43379 100644 +--- a/amd/amdgpu/amdgpu_connectors.c ++++ b/amd/amdgpu/amdgpu_connectors.c +@@ -168,12 +168,20 @@ int amdgpu_connector_get_monitor_bpc(struct drm_connector *connector) + } + + /* Any defined maximum tmds clock limit we must not exceed? */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) ++ if (connector->display_info.max_tmds_clock > 0) { ++#else + if (connector->max_tmds_clock > 0) { ++#endif + /* mode_clock is clock in kHz for mode to be modeset on this connector */ + mode_clock = amdgpu_connector->pixelclock_for_modeset; + + /* Maximum allowable input clock in kHz */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) ++ max_tmds_clock = connector->display_info.max_tmds_clock * 1000; ++#else + max_tmds_clock = connector->max_tmds_clock * 1000; ++#endif + + DRM_DEBUG("%s: hdmi mode dotclock %d kHz, max tmds input clock %d kHz.\n", + connector->name, mode_clock, max_tmds_clock); +diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c +index 447529d..252bab4 100644 +--- a/amd/amdgpu/amdgpu_ttm.c ++++ b/amd/amdgpu/amdgpu_ttm.c +@@ -255,7 +255,11 @@ static int amdgpu_verify_access(struct ttm_buffer_object *bo, struct file *filp) + + if (amdgpu_ttm_tt_get_usermm(bo->ttm)) + return -EPERM; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) ++ return drm_vma_node_verify_access(&abo->gem_base.vma_node, filp->private_data); ++#else + return drm_vma_node_verify_access(&abo->gem_base.vma_node, filp); ++#endif + } + + static void amdgpu_move_null(struct ttm_buffer_object *bo, +diff --git a/amd/display/amdgpu_dm/amdgpu_dm_types.c b/amd/display/amdgpu_dm/amdgpu_dm_types.c +index be7aafb..5e11f26 100644 +--- a/amd/display/amdgpu_dm/amdgpu_dm_types.c ++++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c +@@ -1692,6 +1692,10 @@ static int dm_plane_helper_prepare_fb( + struct drm_plane *plane, + struct drm_framebuffer *fb, + const struct drm_plane_state *new_state) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) ++static int dm_plane_helper_prepare_fb( ++ struct drm_plane *plane, ++ struct drm_plane_state *new_state) + #else + static int dm_plane_helper_prepare_fb( + struct drm_plane *plane, +@@ -1735,6 +1739,10 @@ static void dm_plane_helper_cleanup_fb( + struct drm_plane *plane, + struct drm_framebuffer *fb, + const struct drm_plane_state *old_state) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) ++static void dm_plane_helper_cleanup_fb( ++ struct drm_plane *plane, ++ struct drm_plane_state *old_state) + #else + static void dm_plane_helper_cleanup_fb( + struct drm_plane *plane, +diff --git a/include/kcl/kcl_mm.h b/include/kcl/kcl_mm.h +index a18936d..f068195 100644 +--- a/include/kcl/kcl_mm.h ++++ b/include/kcl/kcl_mm.h +@@ -8,7 +8,9 @@ static inline int kcl_get_user_pages(struct task_struct *tsk, struct mm_struct * + int write, int force, struct page **pages, + struct vm_area_struct **vmas) + { +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) ++ return get_user_pages(start, nr_pages, write ? FOLL_WRITE : 0, pages, vmas); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) + return get_user_pages(start, nr_pages, write, force, pages, vmas); + #else + return get_user_pages(tsk, mm, start, nr_pages, +-- +2.11.0 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Change-seq_printf-format-for-64-bit-context.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch similarity index 72% rename from pkgs/os-specific/linux/amdgpu-pro/patches/0004-Change-seq_printf-format-for-64-bit-context.patch rename to pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch index 925a92e2a7e..6856b9ae092 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Change-seq_printf-format-for-64-bit-context.patch +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch @@ -1,17 +1,17 @@ -From 084b2915e6876d8fdb913938569c0ce7ffef65bc Mon Sep 17 00:00:00 2001 +From cc490c71a98b6bbe390fcf777fbe0360d01bf4ca Mon Sep 17 00:00:00 2001 From: "Luke A. Guest" Date: Sun, 25 Sep 2016 16:46:39 +0100 -Subject: [PATCH 04/11] Change seq_printf format for 64 bit context +Subject: [PATCH 3/4] Change seq_printf format for 64 bit context --- amd/amdgpu/amdgpu_sa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c -index 052f745..5886b9a 100644 +index c43f582..8c4b9f7 100644 --- a/amd/amdgpu/amdgpu_sa.c +++ b/amd/amdgpu/amdgpu_sa.c -@@ -428,7 +428,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager, +@@ -427,7 +427,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager, soffset, eoffset, eoffset - soffset); if (i->fence) diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch deleted file mode 100644 index ae5b62b1d23..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 999a30883f34c4603c3b747a58a89d4924583769 Mon Sep 17 00:00:00 2001 -From: "Luke A. Guest" -Date: Sun, 25 Sep 2016 15:46:58 +0100 -Subject: [PATCH 03/11] Remove extra parameter from ttm_bo_reserve for 4.7.0 - ---- - amd/backport/include/kcl/kcl_ttm.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h -index 6e5a170..52cdbc8 100644 ---- a/amd/backport/include/kcl/kcl_ttm.h -+++ b/amd/backport/include/kcl/kcl_ttm.h -@@ -113,7 +113,11 @@ static inline int kcl_ttm_bo_reserve(struct ttm_buffer_object *bo, - struct ww_acquire_ctx *ticket) - { - #if defined(BUILD_AS_DKMS) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) -+ return ttm_bo_reserve(bo, interruptible, no_wait, ticket); -+#else - return ttm_bo_reserve(bo, interruptible, no_wait, false, ticket); -+#endif - #else - return ttm_bo_reserve(bo, interruptible, no_wait, ticket); - #endif --- -2.11.0 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch new file mode 100644 index 00000000000..d226504c4e4 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch @@ -0,0 +1,74 @@ +From 9970f3107aed7b2b1ff1c5f29129b62cec99980d Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Mon, 6 Feb 2017 22:13:49 -0400 +Subject: [PATCH 4/4] fix warnings for Werror + +--- + amd/amdgpu/amdgpu_kms.c | 2 +- + amd/amdgpu/amdgpu_ttm.c | 2 ++ + amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- + amd/display/amdgpu_dm/amdgpu_dm_types.c | 2 +- + 4 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/amd/amdgpu/amdgpu_kms.c b/amd/amdgpu/amdgpu_kms.c +index b7b51ae..bc884f6 100644 +--- a/amd/amdgpu/amdgpu_kms.c ++++ b/amd/amdgpu/amdgpu_kms.c +@@ -591,7 +591,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file + + bios = adev->bios + bios_offset; + return copy_to_user(out, bios, +- min((size_t)size, bios_size - bios_offset)) ++ min(size, bios_size - bios_offset)) + ? -EFAULT : 0; + } + default: +diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c +index 252bab4..90f3655 100644 +--- a/amd/amdgpu/amdgpu_ttm.c ++++ b/amd/amdgpu/amdgpu_ttm.c +@@ -1083,6 +1083,7 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, + return flags; + } + ++#if 0 + static void amdgpu_ttm_lru_removal(struct ttm_buffer_object *tbo) + { + struct amdgpu_device *adev = amdgpu_ttm_adev(tbo->bdev); +@@ -1132,6 +1133,7 @@ static struct list_head *amdgpu_ttm_swap_lru_tail(struct ttm_buffer_object *tbo) + + return res; + } ++#endif + + static struct ttm_bo_driver amdgpu_bo_driver = { + .ttm_tt_create = &amdgpu_ttm_tt_create, +diff --git a/amd/display/amdgpu_dm/amdgpu_dm.c b/amd/display/amdgpu_dm/amdgpu_dm.c +index 3dcb619..5700861 100644 +--- a/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -121,7 +121,7 @@ static bool dm_check_soft_reset(void *handle) + + static int dm_soft_reset(void *handle) + { +- struct amdgpu_device *adev = (struct amdgpu_device *)handle; ++ /* struct amdgpu_device *adev = (struct amdgpu_device *)handle; */ + + /* XXX todo */ + return 0; +diff --git a/amd/display/amdgpu_dm/amdgpu_dm_types.c b/amd/display/amdgpu_dm/amdgpu_dm_types.c +index 5e11f26..7039542 100644 +--- a/amd/display/amdgpu_dm/amdgpu_dm_types.c ++++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c +@@ -913,7 +913,7 @@ static void decide_crtc_timing_for_drm_display_mode( + } + + static struct dc_target *create_target_for_sink( +- const struct amdgpu_connector *aconnector, ++ struct amdgpu_connector *aconnector, + const struct drm_display_mode *drm_mode, + const struct dm_connector_state *dm_state) + { +-- +2.11.0 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Fix-vblank-calls.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Fix-vblank-calls.patch deleted file mode 100644 index 99b54aca2ab..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Fix-vblank-calls.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 1884ef3a813f3dac0029c7539654ba978635d5d3 Mon Sep 17 00:00:00 2001 -From: "Luke A. Guest" -Date: Sun, 25 Sep 2016 16:49:09 +0100 -Subject: [PATCH 05/11] Fix vblank calls - ---- - amd/amdgpu/amdgpu_display.c | 8 ++++++++ - amd/amdgpu/dce_v10_0.c | 4 ++++ - amd/amdgpu/dce_v11_0.c | 4 ++++ - amd/amdgpu/dce_v8_0.c | 4 ++++ - amd/amdgpu/dce_virtual.c | 8 ++++++++ - amd/dal/amdgpu_dm/amdgpu_dm.c | 4 ++++ - 6 files changed, 32 insertions(+) - -diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c -index 8425b1d..d6cd383 100644 ---- a/amd/amdgpu/amdgpu_display.c -+++ b/amd/amdgpu/amdgpu_display.c -@@ -268,7 +268,11 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc, - - work->base = base; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ r = drm_crtc_vblank_get(crtc); -+#else - r = drm_vblank_get(crtc->dev, amdgpu_crtc->crtc_id); -+#endif - if (r) { - DRM_ERROR("failed to get vblank before flip\n"); - goto pflip_cleanup; -@@ -296,7 +300,11 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc, - return 0; - - vblank_cleanup: -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ drm_crtc_vblank_put(&amdgpu_crtc->base); -+#else - drm_vblank_put(crtc->dev, amdgpu_crtc->crtc_id); -+#endif - - pflip_cleanup: - if (unlikely(amdgpu_bo_reserve(new_abo, false) != 0)) { -diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c -index 650d193..b1880ac 100644 ---- a/amd/amdgpu/dce_v10_0.c -+++ b/amd/amdgpu/dce_v10_0.c -@@ -3342,7 +3342,11 @@ static int dce_v10_0_pageflip_irq(struct amdgpu_device *adev, - - spin_unlock_irqrestore(&adev->ddev->event_lock, flags); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ drm_crtc_vblank_put(&amdgpu_crtc->base); -+#else - drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id); -+#endif - schedule_work(&works->unpin_work); - - return 0; -diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c -index ca03d8e..b654b64 100644 ---- a/amd/amdgpu/dce_v11_0.c -+++ b/amd/amdgpu/dce_v11_0.c -@@ -3391,7 +3391,11 @@ static int dce_v11_0_pageflip_irq(struct amdgpu_device *adev, - - spin_unlock_irqrestore(&adev->ddev->event_lock, flags); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ drm_crtc_vblank_put(&amdgpu_crtc->base); -+#else - drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id); -+#endif - schedule_work(&works->unpin_work); - - return 0; -diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c -index 8e4dff7..b598caa 100644 ---- a/amd/amdgpu/dce_v8_0.c -+++ b/amd/amdgpu/dce_v8_0.c -@@ -3252,7 +3252,11 @@ static int dce_v8_0_pageflip_irq(struct amdgpu_device *adev, - - spin_unlock_irqrestore(&adev->ddev->event_lock, flags); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ drm_crtc_vblank_put(&amdgpu_crtc->base); -+#else - drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id); -+#endif - schedule_work(&works->unpin_work); - - return 0; -diff --git a/amd/amdgpu/dce_virtual.c b/amd/amdgpu/dce_virtual.c -index 0c6e873..36e2094 100644 ---- a/amd/amdgpu/dce_virtual.c -+++ b/amd/amdgpu/dce_virtual.c -@@ -746,11 +746,19 @@ static int dce_virtual_pageflip_irq(struct amdgpu_device *adev, - - /* wakeup usersapce */ - if (works->event) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event); -+#else - drm_send_vblank_event(adev->ddev, crtc_id, works->event); -+#endif - - spin_unlock_irqrestore(&adev->ddev->event_lock, flags); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ drm_crtc_vblank_put(&amdgpu_crtc->base); -+#else - drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id); -+#endif - schedule_work(&works->unpin_work); - - return 0; -diff --git a/amd/dal/amdgpu_dm/amdgpu_dm.c b/amd/dal/amdgpu_dm/amdgpu_dm.c -index c5fcf5a..e9892d8 100644 ---- a/amd/dal/amdgpu_dm/amdgpu_dm.c -+++ b/amd/dal/amdgpu_dm/amdgpu_dm.c -@@ -213,10 +213,14 @@ static void dm_pflip_high_irq(void *interrupt_params) - - /* wakeup usersapce */ - if(works->event) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event); -+#else - drm_send_vblank_event( - adev->ddev, - amdgpu_crtc->crtc_id, - works->event); -+#endif - - spin_unlock_irqrestore(&adev->ddev->event_lock, flags); - --- -2.11.0 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Fix-crtc_gamma-functions-for-4.8.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Fix-crtc_gamma-functions-for-4.8.0.patch deleted file mode 100644 index 566b7039bb3..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Fix-crtc_gamma-functions-for-4.8.0.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 12660ae02838f99c0784194908f7a189bc2ab0ae Mon Sep 17 00:00:00 2001 -From: "Luke A. Guest" -Date: Sun, 25 Sep 2016 16:56:47 +0100 -Subject: [PATCH 06/11] Fix crtc_gamma functions for 4.8.0 - ---- - amd/amdgpu/dce_v10_0.c | 19 +++++++++++++++++++ - amd/amdgpu/dce_v11_0.c | 19 +++++++++++++++++++ - amd/amdgpu/dce_v8_0.c | 19 +++++++++++++++++++ - amd/dal/amdgpu_dm/amdgpu_dm_types.c | 12 ++++++++++++ - 4 files changed, 69 insertions(+) - -diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c -index b1880ac..53746fa 100644 ---- a/amd/amdgpu/dce_v10_0.c -+++ b/amd/amdgpu/dce_v10_0.c -@@ -2627,6 +2627,24 @@ static void dce_v10_0_cursor_reset(struct drm_crtc *crtc) - } - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+static int dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, -+ u16 *blue, uint32_t size) -+{ -+ struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc); -+ int i; -+ -+ /* userspace palettes are always correct as is */ -+ for (i = 0; i < size; i++) { -+ amdgpu_crtc->lut_r[i] = red[i] >> 6; -+ amdgpu_crtc->lut_g[i] = green[i] >> 6; -+ amdgpu_crtc->lut_b[i] = blue[i] >> 6; -+ } -+ dce_v10_0_crtc_load_lut(crtc); -+ -+ return 0; -+} -+#else - static void dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, - u16 *blue, uint32_t start, uint32_t size) - { -@@ -2641,6 +2659,7 @@ static void dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green - } - dce_v10_0_crtc_load_lut(crtc); - } -+#endif - - static void dce_v10_0_crtc_destroy(struct drm_crtc *crtc) - { -diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c -index b654b64..3edd66d 100644 ---- a/amd/amdgpu/dce_v11_0.c -+++ b/amd/amdgpu/dce_v11_0.c -@@ -2643,6 +2643,24 @@ static void dce_v11_0_cursor_reset(struct drm_crtc *crtc) - } - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+static int dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, -+ u16 *blue, uint32_t size) -+{ -+ struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc); -+ int i; -+ -+ /* userspace palettes are always correct as is */ -+ for (i = 0; i < size; i++) { -+ amdgpu_crtc->lut_r[i] = red[i] >> 6; -+ amdgpu_crtc->lut_g[i] = green[i] >> 6; -+ amdgpu_crtc->lut_b[i] = blue[i] >> 6; -+ } -+ dce_v11_0_crtc_load_lut(crtc); -+ -+ return 0; -+} -+#else - static void dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, - u16 *blue, uint32_t start, uint32_t size) - { -@@ -2657,6 +2675,7 @@ static void dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green - } - dce_v11_0_crtc_load_lut(crtc); - } -+#endif - - static void dce_v11_0_crtc_destroy(struct drm_crtc *crtc) - { -diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c -index b598caa..d203894 100644 ---- a/amd/amdgpu/dce_v8_0.c -+++ b/amd/amdgpu/dce_v8_0.c -@@ -2478,6 +2478,24 @@ static void dce_v8_0_cursor_reset(struct drm_crtc *crtc) - } - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+static int dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, -+ u16 *blue, uint32_t size) -+{ -+ struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc); -+ int i; -+ -+ /* userspace palettes are always correct as is */ -+ for (i = 0; i < size; i++) { -+ amdgpu_crtc->lut_r[i] = red[i] >> 6; -+ amdgpu_crtc->lut_g[i] = green[i] >> 6; -+ amdgpu_crtc->lut_b[i] = blue[i] >> 6; -+ } -+ dce_v8_0_crtc_load_lut(crtc); -+ -+ return 0; -+} -+#else - static void dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, - u16 *blue, uint32_t start, uint32_t size) - { -@@ -2492,6 +2510,7 @@ static void dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, - } - dce_v8_0_crtc_load_lut(crtc); - } -+#endif - - static void dce_v8_0_crtc_destroy(struct drm_crtc *crtc) - { -diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c -index edc8e86..32755a9 100644 ---- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c -+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c -@@ -998,6 +998,13 @@ void amdgpu_dm_crtc_destroy(struct drm_crtc *crtc) - kfree(crtc); - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+static int amdgpu_dm_atomic_crtc_gamma_set(struct drm_crtc *crtc, -+ u16 *red, -+ u16 *green, -+ u16 *blue, -+ uint32_t size) -+#else - static void amdgpu_dm_atomic_crtc_gamma_set( - struct drm_crtc *crtc, - u16 *red, -@@ -1005,6 +1012,7 @@ static void amdgpu_dm_atomic_crtc_gamma_set( - u16 *blue, - uint32_t start, - uint32_t size) -+#endif - { - struct drm_device *dev = crtc->dev; - struct drm_property *prop = dev->mode_config.prop_crtc_id; -@@ -1012,6 +1020,10 @@ static void amdgpu_dm_atomic_crtc_gamma_set( - crtc->state->mode.private_flags |= AMDGPU_CRTC_MODE_PRIVATE_FLAGS_GAMMASET; - - drm_atomic_helper_crtc_set_property(crtc, prop, 0); -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ return 0; -+#endif - } - - static int dm_crtc_funcs_atomic_set_property( --- -2.11.0 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch deleted file mode 100644 index 197fdd32b10..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7a5d45874b1e2bbbff2d2410f38203b5b0ae67c4 Mon Sep 17 00:00:00 2001 -From: "Luke A. Guest" -Date: Sun, 25 Sep 2016 17:00:32 +0100 -Subject: [PATCH 07/11] Fix drm_atomic_helper_swap_state for 4.8.0 - ---- - amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c -index 32755a9..60ca073 100644 ---- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c -+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c -@@ -2528,7 +2528,11 @@ int amdgpu_dm_atomic_commit( - * the software side now. - */ - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ drm_atomic_helper_swap_state(state, true); -+#else - drm_atomic_helper_swap_state(dev, state); -+#endif - - /* - * From this point state become old state really. New state is --- -2.11.0 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch deleted file mode 100644 index 8674c3537e8..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 7c536e8b9f73926014c0622eb101f2cf174b507b Mon Sep 17 00:00:00 2001 -From: "Luke A. Guest" -Date: Sun, 25 Sep 2016 19:19:45 +0100 -Subject: [PATCH 08/11] Add extra flag to ttm_bo_move_ttm for >=4.8.0-rc2 - ---- - amd/amdgpu/amdgpu_ttm.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c -index 89760f8..d102224 100644 ---- a/amd/amdgpu/amdgpu_ttm.c -+++ b/amd/amdgpu/amdgpu_ttm.c -@@ -428,7 +428,11 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, - if (unlikely(r)) { - goto out_cleanup; - } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ r = ttm_bo_move_ttm(bo, true, interruptible, no_wait_gpu, new_mem); -+#else - r = ttm_bo_move_ttm(bo, true, no_wait_gpu, new_mem); -+#endif - out_cleanup: - ttm_bo_mem_put(bo, &tmp_mem); - return r; -@@ -461,7 +465,11 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, - if (unlikely(r)) { - return r; - } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ r = ttm_bo_move_ttm(bo, true, interruptible, no_wait_gpu, &tmp_mem); -+#else - r = ttm_bo_move_ttm(bo, true, no_wait_gpu, &tmp_mem); -+#endif - if (unlikely(r)) { - goto out_cleanup; - } --- -2.11.0 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Remove-dependency-on-System.map.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Remove-dependency-on-System.map.patch deleted file mode 100644 index 52c5f7f4593..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Remove-dependency-on-System.map.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 4d645984264e449d6a4507af033b26daed952eac Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Wed, 26 Oct 2016 22:26:39 -0300 -Subject: [PATCH 09/11] Remove dependency on System.map - ---- - amd/backport/Makefile | 1 - - amd/backport/kcl_fence.c | 10 ++++++++-- - amd/backport/symbols | 7 ------- - 3 files changed, 8 insertions(+), 10 deletions(-) - delete mode 100644 amd/backport/symbols - -diff --git a/amd/backport/Makefile b/amd/backport/Makefile -index ff9339d..3f2d9ea 100644 ---- a/amd/backport/Makefile -+++ b/amd/backport/Makefile -@@ -64,7 +64,6 @@ ccflags-y += -DOS_NAME_RHEL_7_3 - endif - endif - --BACKPORT_OBJS = symbols.o - endif - - BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o amdgpu_kcl.o kcl_fence_array.o kcl_kthread.o -diff --git a/amd/backport/kcl_fence.c b/amd/backport/kcl_fence.c -index 54ad819..39f6d61 100644 ---- a/amd/backport/kcl_fence.c -+++ b/amd/backport/kcl_fence.c -@@ -52,8 +52,14 @@ struct default_wait_cb { - struct task_struct *task; - }; - --extern void --(*fence_default_wait_cb)(struct fence *fence, struct fence_cb *cb); -+static void -+fence_default_wait_cb(struct fence *fence, struct fence_cb *cb) -+{ -+ struct default_wait_cb *wait = -+ container_of(cb, struct default_wait_cb, base); -+ -+ wake_up_process(wait->task); -+} - - signed long - _kcl_fence_wait_any_timeout(struct fence **fences, uint32_t count, -diff --git a/amd/backport/symbols b/amd/backport/symbols -deleted file mode 100644 -index 68cae63..0000000 ---- a/amd/backport/symbols -+++ /dev/null -@@ -1,7 +0,0 @@ --SYMS="" -- --SYMS+="fence_default_wait_cb" -- --if version_lt 2.6.33; then -- SYMS+=" kallsyms_lookup_name" --fi --- -2.11.0 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-disable-dal-by-default.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0010-disable-dal-by-default.patch deleted file mode 100644 index e69e5c58319..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-disable-dal-by-default.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5ab8e5e36634391a5c440bf78463226b2074485e Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Thu, 25 Aug 2016 22:17:06 -0300 -Subject: [PATCH 10/11] disable dal by default - ---- - amd/amdgpu/amdgpu_drv.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/amd/amdgpu/amdgpu_drv.c b/amd/amdgpu/amdgpu_drv.c -index d6b3f35..4477865 100755 ---- a/amd/amdgpu/amdgpu_drv.c -+++ b/amd/amdgpu/amdgpu_drv.c -@@ -88,7 +88,7 @@ int amdgpu_vm_fault_stop = 0; - int amdgpu_vm_debug = 0; - int amdgpu_vram_page_split = -1; - int amdgpu_exp_hw_support = 0; --int amdgpu_dal = -1; -+int amdgpu_dal = 0; - int amdgpu_sched_jobs = 32; - int amdgpu_sched_hw_submission = 2; - int amdgpu_powerplay = -1; --- -2.11.0 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0011-kcl-fixes-for-16.50-linux-4.8.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0011-kcl-fixes-for-16.50-linux-4.8.patch deleted file mode 100644 index 0cf3ad262f6..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0011-kcl-fixes-for-16.50-linux-4.8.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 156445f6eda047ee5a5d6e4bde36c3e9ccbbd7d9 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Thu, 29 Dec 2016 14:20:06 -0400 -Subject: [PATCH 11/11] kcl fixes for 16.50 + linux-4.8 - ---- - amd/amdgpu/dce_v6_0.c | 5 +++-- - amd/amdgpu/dce_virtual.c | 5 +++-- - amd/backport/include/kcl/kcl_drm.h | 12 ++++++++++++ - amd/backport/include/kcl/kcl_ttm.h | 2 +- - amd/backport/kcl_drm.c | 4 ++++ - 5 files changed, 23 insertions(+), 5 deletions(-) - -diff --git a/amd/amdgpu/dce_v6_0.c b/amd/amdgpu/dce_v6_0.c -index fd3eeb0..1f1874c 100644 ---- a/amd/amdgpu/dce_v6_0.c -+++ b/amd/amdgpu/dce_v6_0.c -@@ -1946,9 +1946,9 @@ static void dce_v6_0_cursor_reset(struct drm_crtc *crtc) - } - } - --static void dce_v6_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, -- u16 *blue, uint32_t start, uint32_t size) -+static kcl_crtc_gamma_set_callback(dce_v6_0_crtc_gamma_set) - { -+ kcl_crtc_gamma_set_pre - struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc); - int end = (start + size > 256) ? 256 : start + size, i; - -@@ -1959,6 +1959,7 @@ static void dce_v6_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, - amdgpu_crtc->lut_b[i] = blue[i] >> 6; - } - dce_v6_0_crtc_load_lut(crtc); -+ kcl_crtc_gamma_set_suf - } - - static void dce_v6_0_crtc_destroy(struct drm_crtc *crtc) -diff --git a/amd/amdgpu/dce_virtual.c b/amd/amdgpu/dce_virtual.c -index 36e2094..11b98e2 100644 ---- a/amd/amdgpu/dce_virtual.c -+++ b/amd/amdgpu/dce_virtual.c -@@ -152,9 +152,9 @@ static void dce_virtual_bandwidth_update(struct amdgpu_device *adev) - return; - } - --static void dce_virtual_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, -- u16 *blue, uint32_t start, uint32_t size) -+static kcl_crtc_gamma_set_callback(dce_virtual_crtc_gamma_set) - { -+ kcl_crtc_gamma_set_pre - struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc); - int end = (start + size > 256) ? 256 : start + size, i; - -@@ -164,6 +164,7 @@ static void dce_virtual_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *gre - amdgpu_crtc->lut_g[i] = green[i] >> 6; - amdgpu_crtc->lut_b[i] = blue[i] >> 6; - } -+ kcl_crtc_gamma_set_suf - } - - static void dce_virtual_crtc_destroy(struct drm_crtc *crtc) -diff --git a/amd/backport/include/kcl/kcl_drm.h b/amd/backport/include/kcl/kcl_drm.h -index 95bf640..61c38b1 100644 ---- a/amd/backport/include/kcl/kcl_drm.h -+++ b/amd/backport/include/kcl/kcl_drm.h -@@ -206,4 +206,16 @@ int drm_atomic_helper_resume(struct drm_device *dev, - - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+#define kcl_crtc_gamma_set_callback(n) int n(struct drm_crtc *crtc, \ -+ u16 *red, u16 *green, u16 *blue, uint32_t size) -+#define kcl_crtc_gamma_set_pre uint32_t start = 0; -+#define kcl_crtc_gamma_set_suf return 0; -+#else -+#define kcl_crtc_gamma_set_callback(n) void n(struct drm_crtc *crtc, \ -+ u16 *red, u16 *green, u16 *blue, uint32_t start, uint32_t size) -+#define kcl_crtc_gamma_set_pre -+#define kcl_crtc_gamma_set_suf -+#endif -+ - #endif /* AMDGPU_BACKPORT_KCL_DRM_H */ -diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h -index 52cdbc8..cdda0b5 100644 ---- a/amd/backport/include/kcl/kcl_ttm.h -+++ b/amd/backport/include/kcl/kcl_ttm.h -@@ -152,7 +152,7 @@ static inline int kcl_ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, - bool evict, bool no_wait_gpu, - struct ttm_mem_reg *new_mem) - { --#if defined(BUILD_AS_DKMS) -+#if defined(BUILD_AS_DKMS) && (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) - return ttm_bo_move_accel_cleanup(bo, fence, - evict, no_wait_gpu, new_mem); - #else -diff --git a/amd/backport/kcl_drm.c b/amd/backport/kcl_drm.c -index 27d4aaa..a083c87 100644 ---- a/amd/backport/kcl_drm.c -+++ b/amd/backport/kcl_drm.c -@@ -178,7 +178,11 @@ static inline struct drm_plane_state * - _kcl_drm_atomic_get_existing_plane_state(struct drm_atomic_state *state, - struct drm_plane *plane) - { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ return drm_atomic_get_existing_plane_state(state, plane); -+#else - return state->plane_states[drm_plane_index(plane)]; -+#endif - } - - void --- -2.11.0 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0012-use-kernel-fence_array-in-4.8.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0012-use-kernel-fence_array-in-4.8.patch deleted file mode 100644 index 07ce868c29d..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0012-use-kernel-fence_array-in-4.8.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 73e77e056427e2042b8d84933c02db92e17cf233 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Thu, 29 Dec 2016 14:49:18 -0400 -Subject: [PATCH] use kernel fence_array in 4.8+ - ---- - amd/backport/include/kcl/kcl_fence_array.h | 10 ++++++++-- - amd/backport/kcl_fence_array.c | 2 +- - 2 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/amd/backport/include/kcl/kcl_fence_array.h b/amd/backport/include/kcl/kcl_fence_array.h -index bb4401e..0d9f344 100644 ---- a/amd/backport/include/kcl/kcl_fence_array.h -+++ b/amd/backport/include/kcl/kcl_fence_array.h -@@ -19,11 +19,15 @@ - * more details. - */ - --#ifndef __LINUX_FENCE_ARRAY_H --#define __LINUX_FENCE_ARRAY_H -+#ifndef __KCL_FENCE_ARRAY_H -+#define __KCL_FENCE_ARRAY_H - - #include - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0) -+#include -+#else -+ - /** - * struct fence_array_cb - callback helper for fence array - * @cb: fence callback structure for signaling -@@ -72,4 +76,6 @@ struct fence_array *fence_array_create(int num_fences, struct fence **fences, - u64 context, unsigned seqno, - bool signal_on_any); - -+#endif -+ - #endif /* __LINUX_FENCE_ARRAY_H */ -diff --git a/amd/backport/kcl_fence_array.c b/amd/backport/kcl_fence_array.c -index d7ee15c..1865444 100644 ---- a/amd/backport/kcl_fence_array.c -+++ b/amd/backport/kcl_fence_array.c -@@ -21,7 +21,7 @@ - #include - #include - --#if defined(BUILD_AS_DKMS) -+#if defined(BUILD_AS_DKMS) && LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0) - static void fence_array_cb_func(struct fence *f, struct fence_cb *cb); - - static const char *fence_array_get_driver_name(struct fence *fence) --- -2.11.0 - diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 926675f0163..0d62f99e1e7 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20170109"; + version = "20170208"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "1fxr6iyb70swmmp46xvx8iz9h6xj7x6q9yfdsl958zd63j8sjzjr"; + sha256 = "0bqwb2xwwihyj8sw084qpyi8d4xx9sn7jlza6hfc57qnj4dha76w"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 395850384d1..d9e6ec3cf62 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -80,7 +80,10 @@ stdenv.mkDerivation rec { ./patches/kernel-4.6-page_cache_release-put_page.patch ] ++ optionals ( kernel != null && (lib.versionAtLeast kernel.version "4.7") ) - [ ./patches/4.7-arch-cpu_has_pge-v2.patch ]; + [ ./patches/4.7-arch-cpu_has_pge-v2.patch ] + ++ optionals ( kernel != null && + (lib.versionAtLeast kernel.version "4.9") ) + [ ./patches/4.9-get_user_pages.patch ]; buildInputs = [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM diff --git a/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch b/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch new file mode 100644 index 00000000000..8a6c42cdb1f --- /dev/null +++ b/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch @@ -0,0 +1,28 @@ +commit b3e4353fc68a6a024dcb95e2d61aa0afd7370233 +Author: Matt McHenry +Date: Fri Feb 3 20:19:41 2017 + + patch for 4.9 only + +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index 4ce095f..3b591e1 100755 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -3224,7 +3224,7 @@ int ATI_API_CALL KCL_LockUserPages(unsigned long vaddr, unsigned long* page_list + int ret; + + down_read(¤t->mm->mmap_sem); +- ret = get_user_pages(vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL); ++ ret = get_user_pages(vaddr, page_cnt, 1, (struct page **)page_list, NULL); + up_read(¤t->mm->mmap_sem); + + return ret; +@@ -3242,7 +3242,7 @@ int ATI_API_CALL KCL_LockReadOnlyUserPages(unsigned long vaddr, unsigned long* p + int ret; + + down_read(¤t->mm->mmap_sem); +- ret = get_user_pages(vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL); ++ ret = get_user_pages(vaddr, page_cnt, 0, (struct page **)page_list, NULL); + up_read(¤t->mm->mmap_sem); + + return ret; diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index d2d2c4a3988..a3c08b1b785 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -13,17 +13,17 @@ in stdenv.mkDerivation { }; preConfigure = '' - configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH --with-openldap=${openldap} --with-sasl=${cyrus_sasl}" + configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH" export sssldir="${sssd}/lib/sssd/modules" export HAVE_SSS_AUTOFS=1 - export MOUNT=${lib.getBin utillinux}/bin/mount - export MOUNT_NFS=${lib.getBin nfs-utils}/bin/mount.nfs - export UMOUNT=${lib.getBin utillinux}/bin/umount - export MODPROBE=${lib.getBin utillinux}/bin/modprobe - export E2FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext2 - export E3FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext3 - export E4FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext4 + export MOUNT=${utillinux}/bin/mount + export MOUNT_NFS=${nfs-utils}/bin/mount.nfs + export UMOUNT=${utillinux}/bin/umount + export MODPROBE=${utillinux}/bin/modprobe + export E2FSCK=${e2fsprogs}/bin/fsck.ext2 + export E3FSCK=${e2fsprogs}/bin/fsck.ext3 + export E4FSCK=${e2fsprogs}/bin/fsck.ext4 ''; installPhase = '' @@ -37,7 +37,6 @@ in stdenv.mkDerivation { nativeBuildInputs = [ flex bison ]; meta = { - inherit version; description = "Kernel-based automounter"; homepage = http://www.linux-consulting.com/Amd_AutoFS/autofs.html; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 9943a1de6d4..d0a875516fa 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -5,8 +5,8 @@ assert stdenv.isLinux; let inherit (pythonPackages) python; - pythonpath = "${pythonPackages.dbus}/lib/${python.libPrefix}/site-packages:" - + "${pythonPackages.pygobject}/lib/${python.libPrefix}/site-packages"; + pythonpath = "${pythonPackages.dbus-python}/lib/${python.libPrefix}/site-packages:" + + "${pythonPackages.pygobject2}/lib/${python.libPrefix}/site-packages"; in stdenv.mkDerivation rec { name = "bluez-4.101"; diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index 84f1abcca36..28efa6fcea8 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "btfs-${version}"; - version = "2.12"; + version = "2.13"; src = fetchFromGitHub { - owner = "johang"; - repo = "btfs"; - rev = "daeb2fd43795f0bb9a4861279b6064b35186ff25"; - sha256 = "1apvf1gp5973s4wlzwndxp711yd9pj9zf2ypdssfxv2a3rihly2b"; + owner = "johang"; + repo = "btfs"; + rev = "v${version}"; + sha256 = "1nd021xbxrikd8p0w9816xjwlrs9m1nc6954q23qxfw2jbmszlk2"; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/busybox/busybox-in-store.patch b/pkgs/os-specific/linux/busybox/busybox-in-store.patch index d3111efbdc4..0de7348c44f 100644 --- a/pkgs/os-specific/linux/busybox/busybox-in-store.patch +++ b/pkgs/os-specific/linux/busybox/busybox-in-store.patch @@ -12,3 +12,12 @@ stdenv bootstrap. exit(busybox_main(argv)); # endif # if NUM_APPLETS > 0 +@@ -981,7 +981,7 @@ int main(int argc UNUSED_PARAM, char **argv) + + lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv)); + # if !ENABLE_BUSYBOX +- if (argv[1] && is_prefixed_with(bb_basename(argv[0]), "busybox")) ++ if (argv[1] && strstr(bb_basename(argv[0]), "busybox") != 0) + argv++; + # endif + applet_name = argv[0]; diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index f0988759bc4..ea09050fc60 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -1,18 +1,20 @@ { fetchurl, stdenv, flex, bison, pkgconfig, libmnl, libnfnetlink , libnetfilter_conntrack, libnetfilter_queue, libnetfilter_cttimeout -, libnetfilter_cthelper }: +, libnetfilter_cthelper, systemd }: stdenv.mkDerivation rec { name = "conntrack-tools-${version}"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "http://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2"; - sha256 = "0mrzrzp6y41pmxc6ixc4fkgz6layrpwsmzb522adzzkc6mhcqg5g"; + sha256 = "0v5spmlcw5n6va8z34f82vcpynadb0b54pnjazgpadf0qkyg9jmp"; }; - buildInputs = [ libmnl libnfnetlink libnetfilter_conntrack libnetfilter_queue - libnetfilter_cttimeout libnetfilter_cthelper ]; + buildInputs = [ + libmnl libnfnetlink libnetfilter_conntrack libnetfilter_queue + libnetfilter_cttimeout libnetfilter_cthelper systemd + ]; nativeBuildInputs = [ flex bison pkgconfig ]; meta = with stdenv.lib; { @@ -20,6 +22,6 @@ stdenv.mkDerivation rec { description = "Connection tracking userspace tools"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx ]; + maintainers = with maintainers; [ nckx fpletz ]; }; } diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 49eab1fe254..de27d7b0d83 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "eventstat-${version}"; - version = "0.03.02"; + version = "0.03.03"; src = fetchzip { url = "http://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; - sha256 = "1bwv0m9pk9l0jfibvsfjggc5pp9lyyrsfr10h6jm6kf1v6r6hf5s"; + sha256 = "02pg46f3x7v1c1vvqzfjqq0wjb2bzmfkd6a8xp06cg9zvidn6jpb"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix new file mode 100644 index 00000000000..dcdafbcc8f9 --- /dev/null +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + name = "exfat-nofuse-${version}-${kernel.version}"; + version = "2017-01-03"; + + src = fetchFromGitHub { + owner = "dorimanx"; + repo = "exfat-nofuse"; + rev = "8d291f5"; + sha256 = "0lg1mykglayswli2aliw8chsbr4g629v9chki5975avh43jn47w9"; + }; + + hardeningDisable = [ "pic" ]; + + makeFlags = [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + install -m644 -b -D exfat.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/exfat/exfat.ko + ''; + + meta = { + description = "exfat kernel module"; + homepage = https://github.com/dorimanx/exfat-nofuse; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ makefu ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index 59f93e836c4..ad3c145cd8a 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses}: +{stdenv, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}: let s = # Generated upstream information rec { @@ -9,7 +9,7 @@ let url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz"; sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; }; - buildInputs = [gpm freetype fontconfig pkgconfig ncurses]; + buildInputs = [gpm freetype fontconfig pkgconfig ncurses libx86]; in stdenv.mkDerivation { inherit (s) name version; @@ -24,6 +24,10 @@ stdenv.mkDerivation { export HOME=$PWD; export NIX_LDFLAGS="$NIX_LDFLAGS -lfreetype" ''; + preBuild = '' + mkdir -p "$out/share/terminfo" + tic -a -v2 -o"$out/share/terminfo" terminfo/fbterm + ''; meta = { inherit (s) version; description = "Framebuffer terminal emulator"; diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 74486843b92..27acc8f1c28 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.44.4"; + version="0.9.44.8"; name="${baseName}-${version}"; - hash="03y1xc70w5xr6jynmj305fmgniz2cq21q85s5q7dnda8ap6s4w1d"; - url="https://netcologne.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.4.tar.xz"; - sha256="03y1xc70w5xr6jynmj305fmgniz2cq21q85s5q7dnda8ap6s4w1d"; + hash="0w87n5qzvylbjipaf45sw65gg4rpqcbi32zw9cs1jbfvf4bikzmr"; + url="https://netix.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.8.tar.xz"; + sha256="0w87n5qzvylbjipaf45sw65gg4rpqcbi32zw9cs1jbfvf4bikzmr"; }; buildInputs = [ which diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 8e0f807e08e..dcc52de7fe7 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2016-07-12"; + version = "2017-02-06"; # This repo is built by merging the latest versions of # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { # the usual set of firmware. firmware/linux-firmware usually lags kernel releases # so iwlwifi cards will fail to load on newly released kernels. src = fetchFromGitHub { - owner = "wkennington"; + owner = "fpletz"; repo = "linux-firmware"; - rev = "cccb6a0da98372bd66787710249727ad6b0aaf72"; - sha256 = "1c7h8i37nbyy37zqhybxd3y6aqabfv4nrdkjg789w67mdnn6hka0"; + rev = version; + sha256 = "1r5ph97rqp8asw8kx65izb3p934669n2na20yfwplbsk76c9i82v"; }; preInstall = '' diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 1c1b11f1ef4..03281d2ee3a 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Firmware for the Raspberry Pi board"; homepage = https://github.com/raspberrypi; license = licenses.unfree; - platforms = [ "armv6l-linux" "armv7l-linux" ]; + platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; maintainers = with maintainers; [ viric tavyc ]; }; } diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index 5708ed7c4df..35638e7dabd 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "fnotifystat-${version}"; - version = "0.01.14"; + version = "0.01.16"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; - sha256 = "1cc3w94v8b4nfpkgr33gfzxpwaf43brqyc0fla9p70gk3hxjqzi5"; + sha256 = "1k9nc7a4r7c2l7vrlcrfxj9rsdb04amiqcsnxm5kpshncry38nl5"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index a0478af912c..f8d0eab835b 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "forkstat-${version}"; - version = "0.01.14"; + version = "0.01.16"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.gz"; - sha256 = "0yj3mhf9b2nm8fnz4vf2fqdd8417g30p2sgv3ilq3zwy4hbg9bav"; + sha256 = "0g65basrs569y42zhgjq9sdyz62km8xy55yfilmyxa43ckb3xmlw"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 34b6aa1378c..b36d13a0b1d 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, utillinux +{ stdenv, fetchFromGitHub, fetchpatch, utillinux , autoconf, automake, libtool, gettext }: stdenv.mkDerivation rec { @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { buildInputs = [ utillinux autoconf automake libtool gettext ]; + patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch { + url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; + sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa"; + }); + preConfigure = '' export MOUNT_FUSE_PATH=$out/sbin @@ -23,7 +28,7 @@ stdenv.mkDerivation rec { # Ensure that FUSE calls the setuid wrapper, not # $out/bin/fusermount. It falls back to calling fusermount in # $PATH, so it should also work on non-NixOS systems. - export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/var/setuid-wrappers\"" + export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/run/wrappers/bin\"" sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 63fd1711721..0fef297ea5f 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,23 +1,15 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libnl, openssl, sqlite ? null }: +{ stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }: with stdenv.lib; stdenv.mkDerivation rec { name = "hostapd-${version}"; - version = "2.5"; + version = "2.6"; src = fetchurl { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; - sha256 = "0jn77r39ysshkzihv5rjbdajqazci59v2yab4rn05my09najs9wf"; + sha256 = "0z8ilypad82q3l6q6kbv6hczvhjn8k63j8051x5yqfyjq686nlh1"; }; - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/voidlinux/void-packages/a7bcbc258ba9884bccde831c0ae2069cade99e41/srcpkgs/wpa_supplicant/patches/patch-src_crypto_tls_openssl_c"; - sha256 = "1ifa2i54a7ijsha197dyldal3m4q5i05ih2sk15f5a5ybb6x7vmp"; - addPrefixes = true; - }) - ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libnl openssl sqlite ]; diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix new file mode 100644 index 00000000000..688cfbb8df5 --- /dev/null +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }: + +stdenv.mkDerivation rec { + version = "r4.0-59481"; + name = "intel-ocl-${version}"; + + src = fetchzip { + url = "https://software.intel.com/sites/default/files/managed/48/96/SRB4_linux64.zip"; + sha256 = "1q69g28i6l7p13hnsk82g2qhdf2chwh4f0wvzac6xml67hna3v34"; + stripRoot = false; + }; + + buildInputs = [ rpmextract ]; + + sourceRoot = "."; + + libPath = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc.lib + ncurses5 + numactl + zlib + ]; + + postUnpack = '' + # Extract the RPMs contained within the source ZIP. + rpmextract SRB4_linux64.zip/intel-opencl-${version}.x86_64.rpm + rpmextract SRB4_linux64.zip/intel-opencl-cpu-${version}.x86_64.rpm + ''; + + patchPhase = '' + # Remove libOpenCL.so, since we use ocl-icd's libOpenCL.so instead and this would cause a clash. + rm opt/intel/opencl/libOpenCL.so* + + # Patch shared libraries. + for lib in opt/intel/opencl/*.so; do + patchelf --set-rpath "${libPath}:$out/lib/intel-ocl" $lib || true + done + ''; + + buildPhase = '' + # Create ICD file, which just contains the path of the corresponding shared library. + echo "$out/lib/intel-ocl/libintelocl.so" > intel.icd + ''; + + installPhase = '' + install -D -m 0755 opt/intel/opencl/*.so* -t $out/lib/intel-ocl + install -D -m 0644 opt/intel/opencl/*.{o,rtl,bin} -t $out/lib/intel-ocl + install -D -m 0644 opt/intel/opencl/{LICENSE,NOTICES} -t $out/share/doc/intel-ocl + install -D -m 0644 intel.icd -t $out/etc/OpenCL/vendors + ''; + + dontStrip = true; + + meta = { + description = "Official OpenCL runtime for Intel CPUs"; + homepage = https://software.intel.com/en-us/articles/opencl-drivers; + license = stdenv.lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = [ stdenv.lib.maintainers.kierdavis ]; + }; +} diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 8c815029661..ee1d21ddf2b 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,17 +1,18 @@ -{stdenv, fetchurl, bison, flex, libnetfilter_conntrack, libnftnl, libmnl}: +{ stdenv, fetchurl, bison, flex, pkgconfig +, libnetfilter_conntrack, libnftnl, libmnl }: stdenv.mkDerivation rec { name = "iptables-${version}"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; - sha256 = "0q0w1x4aijid8wj7dg1ny9fqwll483f1sqw7kvkskd8q1c52mdsb"; + sha256 = "1x8c9y340x79djsq54bc1674ryv59jfphrk4f88i7qbvbnyxghhg"; }; - nativeBuildInputs = [bison flex]; + nativeBuildInputs = [ bison flex pkgconfig ]; - buildInputs = [libnetfilter_conntrack libnftnl libmnl]; + buildInputs = [ libnetfilter_conntrack libnftnl libmnl ]; preConfigure = '' export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl" @@ -22,10 +23,13 @@ stdenv.mkDerivation rec { --enable-shared ''; - meta = { + outputs = [ "out" "dev" ]; + + meta = with stdenv.lib; { description = "A program to configure the Linux IP packet filtering ruleset"; homepage = http://www.netfilter.org/projects/iptables/index.html; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + maintainers = with maintainers; [ fpletz ]; downloadPage = "http://www.netfilter.org/projects/iptables/files/"; updateWalker = true; inherit version; diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index bad64a20cac..0700191e7a8 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -9,16 +9,16 @@ let then "jfbview" else "jfbpdf"; binaries = if imageSupport - then [ "jfbview" "jpdfcat" "jpdfgrep" ] # all require imlib2 - else [ "jfbpdf" ]; # does not + then [ "jfbview" "jpdfcat" "jpdfgrep" ] # all require imlib2 + else [ "jfbpdf" ]; # does not in stdenv.mkDerivation rec { name = "${package}-${version}"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { - sha256 = "1vd2ndl4ar2bzqf0k11qid6gvma59qg62imsa81mgczsqw7kvbx6"; + sha256 = "18iyvisslqp5ibhix00j4y7q8fmf2a79chflimc78xf52x4m2p5q"; rev = version; repo = "JFBView"; owner = "jichu4n"; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 44e4ebe1748..40c49509fd0 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -45,7 +45,7 @@ with stdenv.lib; # Bump the maximum number of CPUs to support systems like EC2 x1.* # instances and Xeon Phi. - ${optionalString (stdenv.system == "x86_64-linux") '' + ${optionalString (stdenv.system == "x86_64-linux" || stdenv.system == "aarch64-linux") '' NR_CPUS 384 ''} diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 3e6bd51cc47..8ab879f7b00 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.104"; + version = "3.10.105"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "04kc64zdpg8h8655m825lbny3fwvqhmh3mg9h564i2irnll35lp3"; + sha256 = "1739mikbyfx1zfmra16lnprca3pcvcplqss4x1jzdqmvkh9cqnqw"; }; kernelPatches = args.kernelPatches; @@ -14,6 +14,5 @@ import ./generic.nix (args // rec { features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; }) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 95ca51a972e..a0d08980719 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.69"; + version = "3.12.70"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1pzghmj0j2shms4n3knryigy73qssskd6awbgk6mmyg42wypbcmm"; + sha256 = "07l6wjhlii2qlki447d702fi1ycyd85iq750xjmsnnz9xrilw7sc"; }; kernelPatches = args.kernelPatches; @@ -14,6 +14,5 @@ import ./generic.nix (args // rec { features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; }) diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix deleted file mode 100644 index 5ecfdefa97d..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.18.47"; - extraMeta.branch = "3.18"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1d9gcr08i6jlm4h6gxmhkq3hjm2ysd1587wffj10ky7y6428dpdi"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index fd171eae001..9c7354024ad 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -14,6 +14,5 @@ import ./generic.nix (args // rec { features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 0eb87a8dd9e..0aac9b43f1e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.44"; + version = "4.4.50"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0j779p83w4i9vj7l23rx1ihymplgy44pjh53lf55napj0ckwzggs"; + sha256 = "1dqnhajciy9vgcx4lz5mngc21j5w73fzpivxx6kn7pqbpfjlr574"; }; kernelPatches = args.kernelPatches; @@ -14,6 +14,5 @@ import ./generic.nix (args // rec { features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 54c67901f50..09f0fd72eee 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.5"; + version = "4.9.11"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "fcf5c43efcc9540815dae8f4d4f73c04dca9a6906c762cbee1242fdd908cf5a7"; + sha256 = "1czj88bj27yaiikf88kz131ayivcqhkq9d5r863w1s3qj04c2bsi"; }; kernelPatches = args.kernelPatches; @@ -14,6 +14,5 @@ import ./generic.nix (args // rec { features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix index 72d7cd1fba0..c8e189dcbfc 100644 --- a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix @@ -16,7 +16,6 @@ import ./generic.nix (args // rec { features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; features.chromiumos = true; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix index 4be81409ee1..b80c9acd659 100644 --- a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix @@ -16,9 +16,8 @@ import ./generic.nix (args // rec { features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; features.chromiumos = true; - + extraMeta.hydraPlatforms = []; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index 8a71a771c4f..c185442c772 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.16"; - extraMeta.branch = "4.8"; + version = "4.9.11"; + extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1aml6vhsfpvm8rsadraff7qj0ivgd9aw75k2q65drz4iby1pqb9h"; + sha512 = "3lh2nrkq3254diqdjry857gmh39ijxxhd7h8563jdzv9i8awv564zajpdcr6bjpf5swyicjsylifym2b5ww41b0fp6z4pkns9mmppny"; }; kernelPatches = args.kernelPatches; @@ -14,6 +14,5 @@ import ./generic.nix (args // rec { features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index a037343751c..e533670014b 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -46,6 +46,5 @@ import ./generic.nix (args // rec { features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index f41c53da5a6..e50a6c80232 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -17,7 +17,6 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { features.iwlwifi = true; features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; extraMeta.hydraPlatforms = []; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 8f18febdf0d..e3a4206f1ca 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,19 +1,18 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.10-rc4"; - modDirVersion = "4.10.0-rc4"; + version = "4.10-rc7"; + modDirVersion = "4.10.0-rc7"; extraMeta.branch = "4.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0rsi9iw8ag3lcy4yjrr6ipf7zpm3f206anv5xzkn2mi1r4vfndvp"; + sha256 = "01jq4bxb8jcnawhsklc9aa2ba9sg7k5g97jp0slpbi8xw71dripl"; }; features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 5f890b9b9fe..83020ad35a2 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -120,7 +120,7 @@ let # Some image types need special install targets (e.g. uImage is installed with make uinstall) installTargets = [ (if platform.kernelTarget == "uImage" then "uinstall" else - if platform.kernelTarget == "zImage" then "zinstall" else + if platform.kernelTarget == "zImage" || platform.kernelTarget == "Image.gz" then "zinstall" else "install") ]; postInstall = '' diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 42a6e0d037b..824d685378c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -18,7 +18,7 @@ let }; }; - grsecPatch = { grbranch ? "test", grver ? "3.1", kver, grrev, sha256 }: rec { + grsecPatch = { grbranch ? "test", grver ? "3.1", kver, grrev, sha512 }: rec { name = "grsecurity-${grver}-${kver}-${grrev}"; # Pass these along to allow the caller to determine compatibility @@ -30,9 +30,9 @@ let # When updating versions/hashes, ALWAYS use the official # version; we use this mirror only because upstream removes # source files immediately upon releasing a new version ... - "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${name}.patch" + "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${kver}/${name}.patch" ]; - inherit sha256; + inherit sha512; }; features.grsecurity = true; @@ -95,9 +95,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.16"; - grrev = "201701062021"; - sha256 = "0ivl9dpbyf0f7ywgh8kbzdf0za10yrh6s8plqk9vnns3dhgcnvnq"; + { kver = "4.9.11"; + grrev = "201702181444"; + sha512 = "22yfq0w2hdhn0mhw0m2knm368f69z0qsf7vsfid7sw4m9ylmxfwzlnl92vfz15vldfl10hk78y59dcf8nv6jljh8gb5ycv4q61qlph6"; }; # This patch relaxes grsec constraints on the location of usermode helpers, @@ -174,14 +174,4 @@ rec { sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p"; }; }; - - p9_caching_4_4 = rec - { name = "9p-caching.patch"; - patch = fetchpatch { - inherit name; - url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch; - sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2"; - }; - }; - } diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 9e572498457..fa4ac3b513d 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -30,7 +30,13 @@ stdenv.mkDerivation { # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. - NIX_CFLAGS_COMPILE = "-Wno-error=cpp -Wno-error=bool-compare -Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations" + ] + # gcc before 6 doesn't know these options + ++ stdenv.lib.optionals (hasPrefix "gcc-6" stdenv.cc.cc.name) [ + "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation" + ]; installFlags = "install install-man ASCIIDOC8=1"; diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index d1eb38df6da..2aba3ef9112 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -1,23 +1,26 @@ { stdenv, fetchurl, gnumake, file }: stdenv.mkDerivation rec { - name = "keyutils-1.5.9"; + name = "keyutils-${version}"; + version = "1.5.9"; src = fetchurl { url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2"; sha256 = "1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd"; }; - buildInputs = [ file ]; + outputs = [ "out" "lib" "dev" ]; - patchPhase = '' - sed -i -e "s, /usr/bin/make, ${gnumake}/bin/make," \ - -e "s, /usr, ," \ - -e "s,\$(LNS) \$(LIBDIR)/\$(SONAME),\$(LNS) \$(SONAME)," \ - Makefile - ''; - - installPhase = "make install DESTDIR=$out"; + installFlags = [ + "ETCDIR=$(out)/etc" + "BINDIR=$(out)/bin" + "SBINDIR=$(out)/sbin" + "SHAREDIR=$(out)/share/keyutils" + "MANDIR=$(out)/share/man" + "INCLUDEDIR=$(dev)/include" + "LIBDIR=$(lib)/lib" + "USRLIBDIR=$(lib)/lib" + ]; meta = with stdenv.lib; { homepage = http://people.redhat.com/dhowells/keyutils/; diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix new file mode 100644 index 00000000000..0b707ef7239 --- /dev/null +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, libdrm, libX11, mesa_noglu, pkgconfig }: + +stdenv.mkDerivation rec { + name = "kmscube-2016-09-19"; + + src = fetchFromGitHub { + owner = "robclark"; + repo = "kmscube"; + rev = "8c6a20901f95e1b465bbca127f9d47fcfb8762e6"; + sha256 = "045pf4q3g5b54cdbxppn1dxpcn81h630vmhrixz1d5bcl822nhwj"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libdrm libX11 mesa_noglu ]; + + meta = with stdenv.lib; { + description = "Example OpenGL app using KMS/GBM"; + homepage = "https://github.com/robclark/kmscube"; + license = licenses.mit; + maintainers = with maintainers; [ dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 481d134b461..4bf243c4f03 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig }: -let version = "3.2.28"; in +let version = "3.2.29"; in stdenv.mkDerivation { name = "libnl-${version}"; src = fetchFromGitHub { - sha256 = "02cm57z4h7rhjlxza07zhk02924acfz6m5gbmm5lbkkp6qh81328"; - rev = "libnl3_2_28"; + sha256 = "0y8fcb1bfbdvxgckq5p6l4jzx0kvv3g11svy6d5v3i6zy9kkq8wh"; + rev = "libnl3_2_29"; repo = "libnl"; owner = "thom311"; }; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 5af100eacb2..9645a2d16b5 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid, enable_dmeventd ? false }: +{ stdenv, fetchurl, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid +, thin-provisioning-tools, enable_dmeventd ? false }: let version = "2.02.140"; @@ -22,7 +23,7 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libudev libuuid ]; + buildInputs = [ libudev libuuid thin-provisioning-tools ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 3c413ca2426..ccee2a18a90 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -12,11 +12,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "0ynddnfirh9pmy7ijg300jrgzdhjzm07fsmvdw71mb2x0p82qabw"; + sha256 = "0paz0lgb9dzpgahysad1cr6gz54l6xyhqdx6dzw2kh3fy1sw028w"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/mdadm/4.nix b/pkgs/os-specific/linux/mdadm/4.nix index d929668a26a..05d98de0b23 100644 --- a/pkgs/os-specific/linux/mdadm/4.nix +++ b/pkgs/os-specific/linux/mdadm/4.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e 's@/lib/udev@''${out}/lib/udev@' \ -e 's@ -Werror @ @' \ - -e 's@/usr/sbin/sendmail@/var/setuid-wrappers/sendmail@' -i Makefile + -e 's@/usr/sbin/sendmail@/run/wrappers/bin/sendmail@' -i Makefile ''; meta = { diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 3fa7e2ba8d1..e0109791ef2 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e 's@/lib/udev@''${out}/lib/udev@' \ -e 's@ -Werror @ @' \ - -e 's@/usr/sbin/sendmail@/var/setuid-wrappers/sendmail@' -i Makefile + -e 's@/usr/sbin/sendmail@/run/wrappers/bin/sendmail@' -i Makefile ''; meta = { diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index dd12a18dc82..54d6dbcb1ca 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--enable-static" - "--disable-gcc-wrapper" ]; patches = [ diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix new file mode 100644 index 00000000000..f09e9543c48 --- /dev/null +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchurl, kernel, alsaLib }: + +# The Magewell Pro Capture drivers are not supported for kernels older than 3.2 +assert stdenv.lib.versionAtLeast kernel.version "3.2.0"; + +# this package currently only supports x86 and x86_64, as I have no ARM device to test on +assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux"); + +let + bits = + if stdenv.is64bit then "64" + else "32"; + + libpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc alsaLib ]; + +in +stdenv.mkDerivation rec { + name = "mwprocapture-1.2.${version}-${kernel.version}"; + version = "3269"; + + src = fetchurl { + url = "http://www.magewell.com/files/ProCaptureForLinux_${version}.tar.gz"; + sha256 = "0i1y50mf559flhxgaxy2gdpa7dvpp12ix9xfzgxa61rc135x0im4"; + }; + + preConfigure = + '' + cd ./src + export INSTALL_MOD_PATH="$out" + ''; + + hardeningDisable = [ "pic" "format" ]; + + makeFlags = [ + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + postInstall = '' + cd ../ + mkdir -p $out/bin + cp bin/mwcap-control_${bits} $out/bin/mwcap-control + cp bin/mwcap-info_${bits} $out/bin/mwcap-info + mkdir -p $out/lib/udev/rules.d + # source has a filename typo + cp scripts/10-procatpure-event-dev.rules $out/lib/udev/rules.d/10-procapture-event-dev.rules + cp -r src/res $out + + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + --set-rpath "${libpath}" \ + "$out"/bin/mwcap-control + + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + --set-rpath "${libpath}" \ + "$out"/bin/mwcap-info + ''; + + meta = with stdenv.lib; { + homepage = http://www.magewell.com/; + description = "Linux driver for the Magewell Pro Capture family"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ MP2E ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 504d3790d86..81ce7babba1 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,48 +1,69 @@ -{ fetchurl, stdenv, tcp_wrappers, utillinux, libcap, libtirpc, libevent, libnfsidmap -, lvm2, e2fsprogs, python, sqlite +{ stdenv, fetchurl, lib, pkgconfig, utillinux, libcap, libtirpc, libevent, libnfsidmap +, sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers }: -stdenv.mkDerivation rec { - name = "nfs-utils-1.3.3"; +let + statdPath = lib.makeBinPath [ systemd utillinux coreutils ]; + +in stdenv.mkDerivation rec { + name = "nfs-utils-${version}"; + version = "2.1.1"; src = fetchurl { url = "mirror://sourceforge/nfs/${name}.tar.bz2"; - sha256 = "1svn27j5c873nixm46l111g7cgyaj5zd51ahfq8mx5v9m3vh93py"; + sha256 = "02dvxphndpm8vpqqnl0zvij97dq9vsq2a179pzrjcv2i91ll2a0a"; }; - buildInputs = - [ tcp_wrappers utillinux libcap libtirpc libevent libnfsidmap - lvm2 e2fsprogs python sqlite - ]; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + libtirpc libcap libevent libnfsidmap sqlite lvm2 + libuuid keyutils kerberos tcp_wrappers + ]; + + enableParallelBuilding = true; - # FIXME: Add the dependencies needed for NFSv4 and TI-RPC. configureFlags = - [ "--disable-gss" + [ "--enable-gss" "--with-statedir=/var/lib/nfs" - "--with-tirpcinclude=${libtirpc}/include/tirpc" + "--with-krb5=${kerberos}" + "--with-systemd=$(out)/etc/systemd/system" + "--enable-libmount-mount" ] - ++ stdenv.lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen"; + ++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen"; - patchPhase = + postPatch = '' - for i in "tests/"*.sh - do - sed -i "$i" -e's|/bin/bash|/bin/sh|g' - chmod +x "$i" - done - sed -i s,/usr/sbin,$out/sbin, utils/statd/statd.c + patchShebangs tests + sed -i "s,/usr/sbin,$out/bin,g" utils/statd/statd.c + sed -i "s,^PATH=.*,PATH=$out/bin:${statdPath}," utils/statd/start-statd + + configureFlags="--with-start-statd=$out/bin/start-statd $configureFlags" ''; - preBuild = + makeFlags = [ + "sbindir=$(out)/bin" + "generator_dir=$(out)/etc/systemd/system-generators" + ]; + + installFlags = [ + "statedir=$(TMPDIR)" + "statdpath=$(TMPDIR)" + ]; + + postInstall = '' - makeFlags="sbindir=$out/sbin" - installFlags="statedir=$TMPDIR statdpath=$TMPDIR" # hack to make `make install' work + # Not used on NixOS + sed -i \ + -e "s,/sbin/modprobe,${kmod}/bin/modprobe,g" \ + -e "s,/usr/sbin,$out/bin,g" \ + $out/etc/systemd/system/* ''; # One test fails on mips. doCheck = !stdenv.isMips; - meta = { + meta = with stdenv.lib; { description = "Linux user-space NFS utilities"; longDescription = '' @@ -51,10 +72,9 @@ stdenv.mkDerivation rec { daemons. ''; - homepage = http://nfs.sourceforge.net/; - license = stdenv.lib.licenses.gpl2; - - platforms = stdenv.lib.platforms.linux; - maintainers = [ ]; + homepage = "https://sourceforge.net/projects/nfs/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 3557c1f05af..c06de7ea6f2 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -2,11 +2,11 @@ , flex, bison, libmnl, libnftnl, gmp, readline }: stdenv.mkDerivation rec { - name = "nftables-0.6"; + name = "nftables-0.7"; src = fetchurl { url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2"; - sha256 = "0bbcrn9nz75daic8bq7rspvcw3ck7l82vqcvkyyg4mhwbxjn5pny"; + sha256 = "0hzdqigdx4i6jbpxbdyq4zy4p4waqn8l6vvz7685ikh1v0wr4qzy"; }; configureFlags = [ @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; - buildInputs = [ pkgconfig docbook2x flex bison libmnl libnftnl gmp readline ]; + nativeBuildInputs = [ pkgconfig docbook2x flex bison ]; + buildInputs = [ libmnl libnftnl gmp readline ]; meta = with stdenv.lib; { description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework"; diff --git a/pkgs/os-specific/linux/nvidia-x11/beta.nix b/pkgs/os-specific/linux/nvidia-x11/beta.nix deleted file mode 100644 index 6fd5fb6c0b6..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/beta.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences -, # Whether to build the libraries only (i.e. not the kernel module or - # nvidia-settings). Used to support 32-bit binaries on 64-bit - # Linux. - libsOnly ? false -}: - -with stdenv.lib; - -assert (!libsOnly) -> kernel != null; - -let - - versionNumber = "349.12"; - - # Policy: use the highest stable version as the default (on our master). - inherit (stdenv.lib) makeLibraryPath; - -in - -stdenv.mkDerivation { - name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; - - builder = ./builder.sh; - - src = - if stdenv.system == "i686-linux" then - fetchurl { - url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0x9zfw66nxv98zpkdkymlyqzspksk850bhfmza7g7pba4yba085h"; - } - else if stdenv.system == "x86_64-linux" then - fetchurl { - url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "19mfkigzffxsik3h4bsjsl481q410h804fz3rdc7chs86q4bg9h3"; - } - else throw "nvidia-x11 does not support platform ${stdenv.system}"; - - inherit versionNumber libsOnly; - - kernel = if libsOnly then null else kernel.dev; - - hardeningDisable = [ "pic" "format" ]; - - dontStrip = true; - - glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; - cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; - openclPath = makeLibraryPath [zlib]; - allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; - - gtkPath = optionalString (!libsOnly) (makeLibraryPath - [ gtk atk pango glib gdk_pixbuf cairo ] ); - programPath = makeLibraryPath [ xorg.libXv ]; - - buildInputs = [ perl nukeReferences ]; - - disallowedReferences = if libsOnly then [] else [ kernel.dev ]; - - meta = with stdenv.lib.meta; { - homepage = http://www.nvidia.com/object/unix.html; - description = "X.org driver and kernel module for NVIDIA graphics cards"; - license = licenses.unfreeRedistributable; - platforms = platforms.linux; - maintainers = [ maintainers.vcunat ]; - }; -} diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh deleted file mode 100755 index fe826783141..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh +++ /dev/null @@ -1,104 +0,0 @@ -source $stdenv/setup - -dontPatchELF=1 # must keep libXv, $out in RPATH - - -unpackFile() { - sh $src -x -} - - -buildPhase() { - if test -z "$libsOnly"; then - # Create the module. - echo "Building linux driver against kernel: $kernel"; - cd kernel - kernelVersion=$(cd $kernel/lib/modules && ls) - sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) - sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) - unset src # used by the nv makefile - make SYSSRC=$sysSrc SYSOUT=$sysOut module - cd .. - fi -} - - -installPhase() { - - # Install libGL and friends. - mkdir -p $out/lib/vendors - - for f in \ - libcuda libGL libnvcuvid libnvidia-cfg libnvidia-compiler \ - libnvidia-glcore libnvidia-ml libnvidia-opencl \ - libnvidia-tls libOpenCL libnvidia-tls libvdpau_nvidia - do - cp -prd $f.* $out/lib/ - ln -snf $f.so.$versionNumber $out/lib/$f.so - ln -snf $f.so.$versionNumber $out/lib/$f.so.1 - done - - cp -p nvidia.icd $out/lib/vendors/ - cp -prd tls $out/lib/ - cp -prd libOpenCL.so.1.0.0 $out/lib/ - ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so - ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so.1 - - patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* - patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* - patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* - - if test -z "$libsOnly"; then - - # Install the kernel module. - mkdir -p $out/lib/modules/$kernelVersion/misc - cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc - - # Install the X driver. - mkdir -p $out/lib/xorg/modules - cp -p libnvidia-wfb.* $out/lib/xorg/modules/ - mkdir -p $out/lib/xorg/modules/drivers - cp -p nvidia_drv.so $out/lib/xorg/modules/drivers - mkdir -p $out/lib/xorg/modules/extensions - cp -p libglx.so.* $out/lib/xorg/modules/extensions - - ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1 - ln -snf libglx.so.$versionNumber $out/lib/xorg/modules/extensions/libglx.so - - patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* - - # Install the programs. - mkdir -p $out/bin - - for i in nvidia-settings nvidia-xconfig; do - cp $i $out/bin/$i - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $out/lib:$programPath:$glPath $out/bin/$i - done - - # Header files etc. - mkdir -p $out/include/nvidia - cp -p *.h $out/include/nvidia - - mkdir -p $out/share/man/man1 - cp -p *.1.gz $out/share/man/man1 - - mkdir -p $out/share/applications - cp -p *.desktop $out/share/applications - - mkdir -p $out/share/pixmaps - cp -p nvidia-settings.png $out/share/pixmaps - - # Patch the `nvidia-settings.desktop' file. - substituteInPlace $out/share/applications/nvidia-settings.desktop \ - --replace '__UTILS_PATH__' $out/bin \ - --replace '__PIXMAP_PATH__' $out/share/pixmaps - - # Move VDPAU libraries to their place - mkdir "$out"/lib/vdpau - mv "$out"/lib/libvdpau* "$out"/lib/vdpau - fi -} - - -genericBuild diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh deleted file mode 100755 index 899f12daf6b..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh +++ /dev/null @@ -1,120 +0,0 @@ -source $stdenv/setup - -dontPatchELF=1 # must keep libXv, $out in RPATH - - -unpackFile() { - skip=$(sed 's/^skip=//; t; d' $src) - tail -n +$skip $src | xz -d | tar xvf - - sourceRoot=. -} - - -buildPhase() { - if test -z "$libsOnly"; then - # Create the module. - echo "Building linux driver against kernel: $kernel"; - cd kernel - kernelVersion=$(cd $kernel/lib/modules && ls) - sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) - sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) - unset src # used by the nv makefile - make SYSSRC=$sysSrc SYSOUT=$sysOut module - cd uvm - make SYSSRC=$sysSrc SYSOUT=$sysOut module - cd .. - cd .. - fi -} - - -installPhase() { - - if test -z "$libsOnly"; then - # Install the kernel module. - mkdir -p $out/lib/modules/$kernelVersion/misc - cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc - cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc - - # Install the X driver. - mkdir -p $out/lib/xorg/modules - cp -p libnvidia-wfb.* $out/lib/xorg/modules/ - mkdir -p $out/lib/xorg/modules/drivers - cp -p nvidia_drv.so $out/lib/xorg/modules/drivers - mkdir -p $out/lib/xorg/modules/extensions - cp -p libglx.so.* $out/lib/xorg/modules/extensions - - #patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* - - # Install the programs. - mkdir -p $out/bin - - for i in nvidia-settings nvidia-smi; do - cp $i $out/bin/$i - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $out/lib:$programPath:$glPath $out/bin/$i - done - - # Header files etc. - mkdir -p $out/include/nvidia - cp -p *.h $out/include/nvidia - - mkdir -p $out/share/man/man1 - cp -p *.1.gz $out/share/man/man1 - rm $out/share/man/man1/nvidia-xconfig.1.gz - - mkdir -p $out/share/applications - cp -p *.desktop $out/share/applications - - mkdir -p $out/share/pixmaps - cp -p nvidia-settings.png $out/share/pixmaps - - # Patch the `nvidia-settings.desktop' file. - substituteInPlace $out/share/applications/nvidia-settings.desktop \ - --replace '__UTILS_PATH__' $out/bin \ - --replace '__PIXMAP_PATH__' $out/share/pixmaps - - # Test a bit. - $out/bin/nvidia-settings --version - fi - - - # Install libGL and friends. - mkdir -p "$out/lib/vendors" - cp -p nvidia.icd $out/lib/vendors/ - - cp -prd *.so.* tls "$out/lib/" - rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately - - for libname in `find "$out/lib/" -name '*.so.*'` - do - # I'm lazy to differentiate needed libs per-library, as the closure is the same. - # Unfortunately --shrink-rpath would strip too much. - patchelf --set-rpath "$out/lib:$allLibPath" "$libname" - - libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` - - # nvidia's EGL stack seems to expect libGLESv2.so.2 to be available - if [ $(basename "$libname_short") == "libGLESv2.so" ]; then - ln -srnf "$libname" "$libname_short.2" - fi - - ln -srnf "$libname" "$libname_short" - ln -srnf "$libname" "$libname_short.1" - done - - #patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* - #patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* - #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* - #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* - - # We distribute these separately in `libvdpau` - rm "$out"/lib/libvdpau{.*,_trace.*} - - # Move VDPAU libraries to their place - mkdir "$out"/lib/vdpau - mv "$out"/lib/libvdpau* "$out"/lib/vdpau -} - - -genericBuild diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 32502bb7b6c..24a2e2cf06f 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -1,17 +1,19 @@ source $stdenv/setup -dontPatchELF=1 # must keep libXv, $out in RPATH - - -unpackFile() { +unpackManually() { skip=$(sed 's/^skip=//; t; d' $src) tail -n +$skip $src | xz -d | tar xvf - sourceRoot=. } +unpackFile() { + sh $src -x || unpackManually +} + + buildPhase() { - if test -z "$libsOnly"; then + if [ -n "$bin" ]; then # Create the module. echo "Building linux driver against kernel: $kernel"; cd kernel @@ -19,48 +21,68 @@ buildPhase() { sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile - make SYSSRC=$sysSrc SYSOUT=$sysOut module + make SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES cd .. fi } - + installPhase() { # Install libGL and friends. - mkdir -p "$out/etc/OpenCL/vendors" - cp -p nvidia.icd $out/etc/OpenCL/vendors/ - mkdir -p "$out/lib" cp -prd *.so.* tls "$out/lib/" - rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately + rm $out/lib/lib{glx,nvidia-wfb}.so.* # handled separately + rm -f $out/lib/libnvidia-gtk* # built from source + if [ "$useGLVND" = "1" ]; then + # Pre-built libglvnd + rm $out/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.* + fi + # Use ocl-icd instead + rm $out/lib/libOpenCL.so* + # Move VDPAU libraries to their place + mkdir $out/lib/vdpau + mv $out/lib/libvdpau* $out/lib/vdpau - rm $out/lib/libGL.so.1.* # GLVND - rm $out/lib/libOpenCL.so* # ocl-icd is used instead - - if test -z "$libsOnly"; then - # Install the X drivers. - mkdir -p $out/lib/xorg/modules - cp -p libnvidia-wfb.* $out/lib/xorg/modules/ - mkdir -p $out/lib/xorg/modules/drivers - cp -p nvidia_drv.so $out/lib/xorg/modules/drivers - mkdir -p $out/lib/xorg/modules/extensions - cp -p libglx.so.* $out/lib/xorg/modules/extensions - - # Install the kernel module. - mkdir -p $out/lib/modules/$kernelVersion/misc - for i in $(find ./kernel -name '*.ko'); do - nuke-refs $i - cp $i $out/lib/modules/$kernelVersion/misc/ - done + # Install ICDs. + install -Dm644 nvidia.icd $out/etc/OpenCL/vendors/nvidia.icd + if [ -e nvidia_icd.json ]; then + install -Dm644 nvidia_icd.json $out/share/vulkan/icd.d/nvidia.json + fi + if [ "$useGLVND" = "1" ]; then + install -Dm644 10_nvidia.json $out/share/glvnd/egl_vendor.d/nvidia.json fi - # All libs except GUI-only are in $out now, so fixup them. - for libname in `find "$out/lib/" -name '*.so.*'` + if [ -n "$bin" ]; then + # Install the X drivers. + mkdir -p $bin/lib/xorg/modules + cp -p libnvidia-wfb.* $bin/lib/xorg/modules/ + mkdir -p $bin/lib/xorg/modules/drivers + cp -p nvidia_drv.so $bin/lib/xorg/modules/drivers + mkdir -p $bin/lib/xorg/modules/extensions + cp -p libglx.so.* $bin/lib/xorg/modules/extensions + + # Install the kernel module. + mkdir -p $bin/lib/modules/$kernelVersion/misc + for i in $(find ./kernel -name '*.ko'); do + nuke-refs $i + cp $i $bin/lib/modules/$kernelVersion/misc/ + done + + # Install application profiles. + if [ "$useProfiles" = "1" ]; then + mkdir -p $bin/share/nvidia + cp nvidia-application-profiles-*-rc $bin/share/nvidia/nvidia-application-profiles-rc + cp nvidia-application-profiles-*-key-documentation $bin/share/nvidia/nvidia-application-profiles-key-documentation + fi + fi + + # All libs except GUI-only are installed now, so fixup them. + for libname in `find "$out/lib/" -name '*.so.*'` `find "$bin/lib/" -name '*.so.*'` do # I'm lazy to differentiate needed libs per-library, as the closure is the same. # Unfortunately --shrink-rpath would strip too much. - patchelf --set-rpath "$out/lib:$allLibPath" "$libname" + patchelf --set-rpath "$out/lib:$libPath" "$libname" libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` @@ -68,7 +90,7 @@ installPhase() { ln -srnf "$libname" "$libname_short" fi - if [[ $libname_short =~ libEGL.so || $libname_short =~ libEGL_nvidia.so ]]; then + if [[ $libname_short =~ libEGL.so || $libname_short =~ libEGL_nvidia.so || $libname_short =~ libGLX.so || $libname_short =~ libGLX_nvidia.so ]]; then major=0 else major=1 @@ -79,55 +101,23 @@ installPhase() { fi done - #patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* - #patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* - #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* - #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* - - if test -z "$libsOnly"; then - # Install headers and /share files etc. - mkdir -p $out/include/nvidia - cp -p *.h $out/include/nvidia - - mkdir -p $out/share/man/man1 - cp -p *.1.gz $out/share/man/man1 - rm $out/share/man/man1/nvidia-xconfig.1.gz - - mkdir -p $out/share/applications - cp -p *.desktop $out/share/applications - - mkdir -p $out/share/pixmaps - cp -p nvidia-settings.png $out/share/pixmaps - - # Patch the `nvidia-settings.desktop' file. - substituteInPlace $out/share/applications/nvidia-settings.desktop \ - --replace '__UTILS_PATH__' $out/bin \ - --replace '__PIXMAP_PATH__' $out/share/pixmaps - + if [ -n "$bin" ]; then + # Install /share files. + mkdir -p $bin/share/man/man1 + cp -p *.1.gz $bin/share/man/man1 + rm -f $bin/share/man/man1/{nvidia-xconfig,nvidia-settings,nvidia-persistenced}.1.gz # Install the programs. - mkdir -p $out/bin - - for i in nvidia-settings nvidia-smi; do - cp $i $out/bin/$i - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $out/lib:$programPath:$glPath $out/bin/$i + for i in nvidia-cuda-mps-control nvidia-cuda-mps-server nvidia-smi nvidia-debugdump; do + if [ -e "$i" ]; then + install -Dm755 $i $bin/bin/$i + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $out/lib:$libPath $bin/bin/$i + fi done - - patchelf --set-rpath $glPath:$gtkPath $out/lib/libnvidia-gtk2.so.*.* - - # Test a bit. - $out/bin/nvidia-settings --version - else - rm $out/lib/libnvidia-gtk2.* + # FIXME: needs PATH and other fixes + # install -Dm755 nvidia-bug-report.sh $bin/bin/nvidia-bug-report.sh fi - - # For simplicity and dependency reduction, don't support the gtk3 interface. - rm $out/lib/libnvidia-gtk3.* - - # Move VDPAU libraries to their place - mkdir "$out"/lib/vdpau - mv "$out"/lib/libvdpau* "$out"/lib/vdpau } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 967a98d9566..5e26fef6e19 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,74 +1,44 @@ -{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk2, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences -, # Whether to build the libraries only (i.e. not the kernel module or - # nvidia-settings). Used to support 32-bit binaries on 64-bit - # Linux. - libsOnly ? false -}: - -with stdenv.lib; - -assert (!libsOnly) -> kernel != null; +{ callPackage }: let - - versionNumber = "375.26"; - - # Policy: use the highest stable version as the default (on our master). - inherit (stdenv.lib) makeLibraryPath; - - nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; - + generic = args: callPackage (import ./generic.nix args) { }; in - -stdenv.mkDerivation { - name = "nvidia-x11-${versionNumber}${nameSuffix}"; - - builder = ./builder.sh; - - src = - if stdenv.system == "i686-linux" then - fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0yv19rkz2wzzj0fygfjb1mh21iy769kff3yg2kzk8bsiwnmcyybw"; - } - else if stdenv.system == "x86_64-linux" then - fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}.run"; - sha256 = "1kqy9ayja3g5znj2hzx8pklz8qi0b0l9da7c3ldg3hlxf31v4hjg"; - } - else throw "nvidia-x11 does not support platform ${stdenv.system}"; - - inherit versionNumber libsOnly; - inherit (stdenv) system; - - kernel = if libsOnly then null else kernel.dev; - - hardeningDisable = [ "pic" "format" ]; - - dontStrip = true; - - glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; - cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; - openclPath = makeLibraryPath [zlib]; - allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; - - gtkPath = optionalString (!libsOnly) (makeLibraryPath - [ gtk2 atk pango glib gdk_pixbuf cairo ] ); - programPath = makeLibraryPath [ xorg.libXv ]; - - - - buildInputs = [ perl nukeReferences ]; - - disallowedReferences = if libsOnly then [] else [ kernel.dev ]; - - meta = with stdenv.lib.meta; { - homepage = http://www.nvidia.com/object/unix.html; - description = "X.org driver and kernel module for NVIDIA graphics cards"; - license = licenses.unfreeRedistributable; - platforms = platforms.linux; - maintainers = [ maintainers.vcunat ]; - priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" +{ + # Policy: use the highest stable version as the default (on our master). + stable = generic { + version = "375.26"; + sha256_32bit = "0yv19rkz2wzzj0fygfjb1mh21iy769kff3yg2kzk8bsiwnmcyybw"; + sha256_64bit = "1kqy9ayja3g5znj2hzx8pklz8qi0b0l9da7c3ldg3hlxf31v4hjg"; + settingsSha256 = "1s8zf5cfhx8m05fvws0gh1q0wy5zyyg2j510zlwp4hk35y7dic5y"; + persistencedSha256 = "15r6rbzyk4yaqkpkqs8j00zc7jbhgp8naskv93dwjyw0lnj0wgky"; }; + + beta = generic { + version = "378.09"; + sha256_32bit = "0a1vwvsqi89pn29c9aii53xq8292dxf68sr8lxzx4bpqjqmsbapy"; + sha256_64bit = "018qqg9zlpwd2cad99vbn18rnrrkrqybs7q65h8dmxirkx4pcvh8"; + settingsSha256 = "1fjkpqmzdzk46p1chzxqvbj3cpqcwwx4qmv33yjq7z2a5zab9z8v"; + persistencedSha256 = "1svaa5a0zz0r8qy6pg9lnhy5zmffvw0h120h46qqd01pkb4yv5lc"; + }; + + legacy_340 = generic { + version = "340.101"; + sha256_32bit = "0qmhkvxj6h63sayys9gldpafw5skpv8nsm2gxxb3pxcv7nfdlpjz"; + sha256_64bit = "02k8j0xzxp2y4vay0kf982q382ny1i4g1kai93f2h5sak6sq3kyj"; + settingsSha256 = "1mavbhff24n0jn154af152fp04njd505scdlxdm850h1ycb2i3g9"; + persistencedSha256 = "1396bmmg9b1z805dzljgi2f219ji84wfnnifdbk32dpd5mrywjk0"; + useGLVND = false; + }; + + legacy_304 = generic { + version = "304.134"; + sha256_32bit = "178wx0a2pmdnaypa9pq6jh0ii0i8ykz1sh1liad9zfriy4d8kxw4"; + sha256_64bit = "0pydw7nr4d2dply38kwvjbghsbilbp2q0mas4nfq5ad050d2c550"; + settingsSha256 = "0q92xw4fr9p5nbhj1plynm50d32881861daxfwrisywszqijhmlf"; + persistencedSha256 = null; + useGLVND = false; + useProfiles = false; + }; + + legacy_173 = callPackage ./legacy173.nix { }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix new file mode 100644 index 00000000000..9e39a6df09c --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -0,0 +1,82 @@ +{ version +, sha256_32bit +, sha256_64bit +, settingsSha256 +, persistencedSha256 +, useGLVND ? true +, useProfiles ? true +, preferGtk2 ? false +}: + +{ stdenv, callPackage, callPackage_i686, buildEnv, fetchurl +, kernel ? null, xorg, zlib, perl, nukeReferences +, # Whether to build the libraries only (i.e. not the kernel module or + # nvidia-settings). Used to support 32-bit binaries on 64-bit + # Linux. + libsOnly ? false +}: + +with stdenv.lib; + +assert (!libsOnly) -> kernel != null; + +let + nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; + pkgSuffix = optionalString (versionOlder version "304") "-pkg0"; + + self = stdenv.mkDerivation { + name = "nvidia-x11-${version}${nameSuffix}"; + + builder = ./builder.sh; + + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "http://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"; + sha256 = sha256_32bit; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"; + sha256 = sha256_64bit; + } + else throw "nvidia-x11 does not support platform ${stdenv.system}"; + + inherit version useGLVND useProfiles; + inherit (stdenv) system; + + outputs = [ "out" ] ++ optional (!libsOnly) "bin"; + outputDev = if libsOnly then null else "bin"; + + kernel = if libsOnly then null else kernel.dev; + + hardeningDisable = [ "pic" "format" ]; + + dontStrip = true; + dontPatchELF = true; + + libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib stdenv.cc.cc ]; + + nativeBuildInputs = [ perl nukeReferences ]; + + disallowedReferences = optional (!libsOnly) [ kernel.dev ]; + + passthru = { + settings = callPackage (import ./settings.nix self settingsSha256) { + withGtk2 = preferGtk2; + withGtk3 = !preferGtk2; + }; + persistenced = if persistencedSha256 == null then null else callPackage (import ./persistenced.nix self persistencedSha256) { }; + }; + + meta = with stdenv.lib; { + homepage = http://www.nvidia.com/object/unix.html; + description = "X.org driver and kernel module for NVIDIA graphics cards"; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = [ maintainers.vcunat ]; + priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" + }; + }; + +in self diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index d1f6d36a6a7..6e5b412a9b8 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -38,6 +38,13 @@ stdenv.mkDerivation { programPath = stdenv.lib.makeLibraryPath [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ]; + passthru = { + settings = null; + persistenced = null; + useGLVND = false; + useProfiles = false; + }; + meta = { homepage = http://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for Legacy NVIDIA graphics cards"; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix deleted file mode 100644 index a6728f40cda..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk2, atk, pango, glib, gdk_pixbuf -, # Whether to build the libraries only (i.e. not the kernel module or - # nvidia-settings). Used to support 32-bit binaries on 64-bit - # Linux. - libsOnly ? false -}: - -with stdenv.lib; - -let versionNumber = "304.134"; in - -stdenv.mkDerivation { - name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; - - builder = ./builder-legacy304.sh; - - src = - if stdenv.system == "i686-linux" then - fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "178wx0a2pmdnaypa9pq6jh0ii0i8ykz1sh1liad9zfriy4d8kxw4"; - } - else if stdenv.system == "x86_64-linux" then - fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0hy4q1v4y7q2jq2j963mwpjhjksqhaiing3xcla861r8rmjkf8a2"; - } - else throw "nvidia-x11 does not support platform ${stdenv.system}"; - - inherit versionNumber libsOnly; - - kernel = if libsOnly then null else kernel.dev; - - hardeningDisable = [ "pic" "format" ]; - - dontStrip = true; - - glPath = stdenv.lib.makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; - - cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc]; - - programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath - [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ] ); - - buildInputs = [ perl ]; - - meta = { - homepage = http://www.nvidia.com/object/unix.html; - description = "X.org driver and kernel module for NVIDIA graphics cards"; - license = stdenv.lib.licenses.unfree; - }; -} diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix deleted file mode 100644 index 5707fc4a1eb..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk2, atk, pango, glib, gdk_pixbuf -, # Whether to build the libraries only (i.e. not the kernel module or - # nvidia-settings). Used to support 32-bit binaries on 64-bit - # Linux. - libsOnly ? false -}: - -with stdenv.lib; - -assert (!libsOnly) -> kernel != null; - -let - - versionNumber = "340.101"; - /* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them. - Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs, - will be included in 340.* legacy releases through the end of 2019. - */ - inherit (stdenv.lib) makeLibraryPath; -in - -stdenv.mkDerivation { - name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; - - builder = ./builder-legacy340.sh; - - src = - if stdenv.system == "i686-linux" then - fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0qmhkvxj6h63sayys9gldpafw5skpv8nsm2gxxb3pxcv7nfdlpjz"; - } - else if stdenv.system == "x86_64-linux" then - fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0ln7fxm78zrzrjk3j5ychi5xxlgkzg2m7anw8nklr3d17c3jxxjy"; - } - else throw "nvidia-x11 does not support platform ${stdenv.system}"; - - inherit versionNumber libsOnly; - - kernel = if libsOnly then null else kernel.dev; - - hardeningDisable = [ "pic" "format" ]; - - dontStrip = true; - - glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; - cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; - openclPath = makeLibraryPath [zlib]; - allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; - - programPath = optionalString (!libsOnly) (makeLibraryPath - [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ] ); - - buildInputs = [ perl ]; - - meta = with stdenv.lib.meta; { - homepage = http://www.nvidia.com/object/unix.html; - description = "X.org driver and kernel module for NVIDIA graphics cards"; - license = licenses.unfreeRedistributable; - platforms = platforms.linux; - maintainers = [ maintainers.vcunat ]; - priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" - }; -} diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix new file mode 100644 index 00000000000..bc79e0efe63 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -0,0 +1,30 @@ +nvidia_x11: sha256: + +{ stdenv, lib, fetchurl, m4 }: + +stdenv.mkDerivation rec { + name = "nvidia-persistenced-${nvidia_x11.version}"; + inherit (nvidia_x11) version; + + src = fetchurl { + url = "ftp://download.nvidia.com/XFree86/nvidia-persistenced/${name}.tar.bz2"; + inherit sha256; + }; + + nativeBuildInputs = [ m4 ]; + + installFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-persistenced):${nvidia_x11}/lib" \ + $out/bin/nvidia-persistenced + ''; + + meta = with stdenv.lib; { + homepage = "http://www.nvidia.com/object/unix.html"; + description = "Settings application for NVIDIA graphics cards"; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix new file mode 100644 index 00000000000..f8999744164 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -0,0 +1,62 @@ +nvidia_x11: sha256: + +{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, gtk3, libXv, libXrandr, libvdpau +, librsvg, wrapGAppsHook +, withGtk2 ? false, withGtk3 ? true +}: + +stdenv.mkDerivation rec { + name = "nvidia-settings-${nvidia_x11.version}"; + inherit (nvidia_x11) version; + + src = fetchurl { + url = "ftp://download.nvidia.com/XFree86/nvidia-settings/${name}.tar.bz2"; + inherit sha256; + }; + + nativeBuildInputs = [ pkgconfig m4 ]; + + buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 ] + ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; + + NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ]; + + makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; + installFlags = [ "PREFIX=$(out)" ]; + + postPatch = lib.optionalString nvidia_x11.useProfiles '' + sed -i 's,/usr/share/nvidia/,${nvidia_x11.bin}/share/nvidia/,g' src/gtk+-2.x/ctkappprofile.c + ''; + + preBuild = '' + if [ -e src/libXNVCtrl/libXNVCtrl.a ]; then + ( cd src/libXNVCtrl + make + ) + fi + ''; + + postInstall = '' + ${lib.optionalString (!withGtk2) '' + rm -f $out/lib/libnvidia-gtk2.so.* + ''} + ${lib.optionalString (!withGtk3) '' + rm -f $out/lib/libnvidia-gtk3.so.* + ''} + ''; + + binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings"; + + postFixup = '' + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib" \ + $out/bin/$binaryName + ''; + + meta = with stdenv.lib; { + homepage = "http://www.nvidia.com/object/unix.html"; + description = "Settings application for NVIDIA graphics cards"; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index 49100fc5a44..bb4ee5e9877 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -1,17 +1,18 @@ { stdenv, openssl, fetchFromGitHub }: + stdenv.mkDerivation rec { name = "open-isns-${version}"; - version = "0.95"; + version = "0.97"; src = fetchFromGitHub { owner = "gonzoleeman"; repo = "open-isns"; rev = "v${version}"; - sha256 = "1c2x3yf9806gbjsw4xi805rfhyxk353a3whqvpccz8dwas6jajwh"; + sha256 = "17aichjgkwjfp9dx1piw7dw8ddz1bgm5mk3laid2zvjks1h739k3"; }; propagatedBuildInputs = [ openssl ]; - outputs = ["out" "lib" ]; + outputs = [ "out" "lib" ]; outputInclude = "lib"; installFlags = "etcdir=$(out)/etc vardir=$(out)/var/lib/isns"; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index d84c6224eeb..5189b84ff7e 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { postInstall = '' mv -v $out/sbin/unix_chkpwd{,.orig} - ln -sv /var/setuid-wrappers/unix_chkpwd $out/sbin/unix_chkpwd + ln -sv /run/wrappers/bin/unix_chkpwd $out/sbin/unix_chkpwd ''; /* rm -rf $out/etc mkdir -p $modules/lib diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index db6f04674a0..9ce1ef6ae53 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -1,19 +1,13 @@ { stdenv, fetchurl, pam, openssl, perl }: stdenv.mkDerivation rec { - name = "pam_ssh_agent_auth-0.9.5"; + name = "pam_ssh_agent_auth-0.10.3"; src = fetchurl { url = "mirror://sourceforge/pamsshagentauth/${name}.tar.bz2"; - sha256 = "1aihfyj17nvqhf0d5i0dg2lsly3r24xjyx0sfqpf60s0libkp4y0"; + sha256 = "0qx78x7nvqdscyp04hfijl4rgyf64xy03prr28hipvgasrcd6lrw"; }; - patches = - [ # Allow multiple colon-separated authorized keys files to be - # specified in the file= option. - ./multiple-key-files.patch - ]; - buildInputs = [ pam openssl perl ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch b/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch deleted file mode 100644 index dc97b7d54f7..00000000000 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch +++ /dev/null @@ -1,338 +0,0 @@ -diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.c pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.c ---- pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.c 2012-06-28 01:47:49.000000000 +0000 -+++ pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.c 2012-12-17 19:29:16.014226336 +0000 -@@ -69,14 +69,14 @@ - return cookie; - } - --int -+const char * - pamsshagentauth_find_authorized_keys(uid_t uid) - { - Identity *id; - Key *key; - AuthenticationConnection *ac; - char *comment; -- uint8_t retval = 0; -+ const char *key_file = 0; - - OpenSSL_add_all_digests(); - session_id2 = pamsshagentauth_session_id2_gen(); -@@ -90,13 +90,11 @@ - id->key = key; - id->filename = comment; - id->ac = ac; -- if(userauth_pubkey_from_id(id)) { -- retval = 1; -- } -+ key_file = userauth_pubkey_from_id(id); - pamsshagentauth_xfree(id->filename); - pamsshagentauth_key_free(id->key); - pamsshagentauth_xfree(id); -- if(retval == 1) -+ if(key_file) - break; - } - } -@@ -107,5 +105,5 @@ - } - pamsshagentauth_xfree(session_id2); - EVP_cleanup(); -- return retval; -+ return key_file; - } -diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.h pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.h ---- pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.h 2012-06-28 01:47:49.000000000 +0000 -+++ pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.h 2012-12-17 19:28:57.454334806 +0000 -@@ -31,6 +31,6 @@ - #ifndef _ITERATE_SSH_AGENT_KEYS_H - #define _ITERATE_SSH_AGENT_KEYS_H - --int pamsshagentauth_find_authorized_keys(uid_t); -+const char * pamsshagentauth_find_authorized_keys(uid_t); - - #endif -diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.c pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.c ---- pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.c 2012-06-28 01:47:49.000000000 +0000 -+++ pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.c 2012-12-17 19:30:24.013830673 +0000 -@@ -60,7 +60,6 @@ - - #define strncasecmp_literal(A,B) strncasecmp( A, B, sizeof(B) - 1) - --char *authorized_keys_file = NULL; - uint8_t allow_user_owned_authorized_keys_file = 0; - - #if ! HAVE___PROGNAME || HAVE_BUNDLE -@@ -161,15 +160,13 @@ - goto cleanexit; - } - -- if(authorized_keys_file_input && user) { -- /* -- * user is the name of the target-user, and so must be used for validating the authorized_keys file -- */ -- parse_authorized_key_file(user, authorized_keys_file_input); -- } else { -- pamsshagentauth_verbose("Using default file=/etc/security/authorized_keys"); -- authorized_keys_file = pamsshagentauth_xstrdup("/etc/security/authorized_keys"); -- } -+ if (!authorized_keys_file_input || !user) -+ authorized_keys_file_input = "/etc/security/authorized_keys"; -+ -+ /* -+ * user is the name of the target-user, and so must be used for validating the authorized_keys file -+ */ -+ parse_authorized_key_files(user, authorized_keys_file_input); - - /* - * PAM_USER and PAM_RUSER do not necessarily have to get set by the calling application, and we may be unable to divine the latter. -@@ -177,16 +174,17 @@ - */ - - if(user && strlen(ruser) > 0) { -- pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file); -+ pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input); - - /* - * this pw_uid is used to validate the SSH_AUTH_SOCK, and so must be the uid of the ruser invoking the program, not the target-user - */ -- if(pamsshagentauth_find_authorized_keys(getpwnam(ruser)->pw_uid)) { -- pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, authorized_keys_file); -+ const char *key_file; -+ if((key_file = pamsshagentauth_find_authorized_keys(getpwnam(ruser)->pw_uid))) { -+ pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, key_file); - retval = PAM_SUCCESS; - } else { -- pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file); -+ pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input); - } - } else { - pamsshagentauth_logit("No %s specified, cannot continue with this form of authentication", (user) ? "ruser" : "user" ); -@@ -198,7 +196,7 @@ - free(__progname); - #endif - -- free(authorized_keys_file); -+ free_authorized_key_files(); - - return retval; - } -diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.pod pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.pod ---- pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.pod 2012-06-28 01:47:49.000000000 +0000 -+++ pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.pod 2012-12-17 19:52:35.968965448 +0000 -@@ -26,7 +26,7 @@ - - =item file= - --Specify the path to the authorized_keys file(s) you would like to use for authentication. Subject to tilde and % EXPANSIONS (below) -+Specify the path(s) to the authorized_keys file(s) you would like to use for authentication. Subject to tilde and % EXPANSIONS (below). Paths are separated using colons. - - =item allow_user_owned_authorized_keys_file - -diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.c pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.c ---- pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.c 2012-06-28 01:47:49.000000000 +0000 -+++ pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.c 2012-12-17 19:32:20.830157313 +0000 -@@ -79,66 +79,96 @@ - - #include "identity.h" - #include "pam_user_key_allowed2.h" -+#include "pam_user_authorized_keys.h" - --extern char *authorized_keys_file; -+#define MAX_AUTHORIZED_KEY_FILES 16 -+ -+char *authorized_keys_files[MAX_AUTHORIZED_KEY_FILES]; -+unsigned int nr_authorized_keys_files = 0; - extern uint8_t allow_user_owned_authorized_keys_file; - uid_t authorized_keys_file_allowed_owner_uid; - - void --parse_authorized_key_file(const char *user, const char *authorized_keys_file_input) -+parse_authorized_key_files(const char *user, const char *authorized_keys_file_input) - { -- char fqdn[HOST_NAME_MAX] = ""; -+ const char *pos = authorized_keys_file_input; - char hostname[HOST_NAME_MAX] = ""; -- char auth_keys_file_buf[4096] = ""; -- char *slash_ptr = NULL; -- char owner_uname[128] = ""; -- size_t owner_uname_len = 0; -- -- /* -- * temporary copy, so that both tilde expansion and percent expansion both get to apply to the path -- */ -- strncat(auth_keys_file_buf, authorized_keys_file_input, sizeof(auth_keys_file_buf) - 1); -+ char fqdn[HOST_NAME_MAX] = ""; -+ -+#if HAVE_GETHOSTNAME -+ *hostname = '\0'; -+ gethostname(fqdn, HOST_NAME_MAX); -+ strncat(hostname, fqdn, strcspn(fqdn,".")); -+#endif - -- if(allow_user_owned_authorized_keys_file) -- authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid; -+ while (pos) { -+ const char *colon = strchr(pos, ':'); -+ char auth_keys_file_buf[4096] = ""; -+ char *slash_ptr = NULL; -+ char owner_uname[128] = ""; -+ size_t owner_uname_len = 0; -+ -+ strncat(auth_keys_file_buf, pos, sizeof(auth_keys_file_buf) - 1); -+ if (colon) { -+ auth_keys_file_buf[colon - pos] = 0; -+ pos = colon + 1; -+ } else { -+ pos = 0; -+ } - -- if(*auth_keys_file_buf == '~') { -- if(*(auth_keys_file_buf+1) == '/') { -+ if(allow_user_owned_authorized_keys_file) - authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid; -+ -+ if(*auth_keys_file_buf == '~') { -+ if(*(auth_keys_file_buf+1) == '/') { -+ authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid; -+ } -+ else { -+ slash_ptr = strchr(auth_keys_file_buf,'/'); -+ if(!slash_ptr) -+ pamsshagentauth_fatal("cannot expand tilde in path without a `/'"); -+ -+ owner_uname_len = slash_ptr - auth_keys_file_buf - 1; -+ if(owner_uname_len > (sizeof(owner_uname) - 1) ) -+ pamsshagentauth_fatal("Username too long"); -+ -+ strncat(owner_uname, auth_keys_file_buf + 1, owner_uname_len); -+ if(!authorized_keys_file_allowed_owner_uid) -+ authorized_keys_file_allowed_owner_uid = getpwnam(owner_uname)->pw_uid; -+ } -+ char *tmp = pamsshagentauth_tilde_expand_filename(auth_keys_file_buf, authorized_keys_file_allowed_owner_uid); -+ strncpy(auth_keys_file_buf, tmp, sizeof(auth_keys_file_buf) - 1 ); -+ pamsshagentauth_xfree(tmp); - } -- else { -- slash_ptr = strchr(auth_keys_file_buf,'/'); -- if(!slash_ptr) -- pamsshagentauth_fatal("cannot expand tilde in path without a `/'"); -- -- owner_uname_len = slash_ptr - auth_keys_file_buf - 1; -- if(owner_uname_len > (sizeof(owner_uname) - 1) ) -- pamsshagentauth_fatal("Username too long"); -- -- strncat(owner_uname, auth_keys_file_buf + 1, owner_uname_len); -- if(!authorized_keys_file_allowed_owner_uid) -- authorized_keys_file_allowed_owner_uid = getpwnam(owner_uname)->pw_uid; -+ -+ if(strstr(auth_keys_file_buf, "%h")) { -+ authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid; - } -- authorized_keys_file = pamsshagentauth_tilde_expand_filename(auth_keys_file_buf, authorized_keys_file_allowed_owner_uid); -- strncpy(auth_keys_file_buf, authorized_keys_file, sizeof(auth_keys_file_buf) - 1 ); -- pamsshagentauth_xfree(authorized_keys_file) /* when we percent_expand later, we'd step on this, so free it immediately */; -- } - -- if(strstr(auth_keys_file_buf, "%h")) { -- authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid; -+ if (nr_authorized_keys_files >= MAX_AUTHORIZED_KEY_FILES) -+ pamsshagentauth_fatal("Too many authorized key files"); -+ authorized_keys_files[nr_authorized_keys_files++] = -+ pamsshagentauth_percent_expand(auth_keys_file_buf, "h", getpwnam(user)->pw_dir, "H", hostname, "f", fqdn, "u", user, NULL); - } -+} - --#if HAVE_GETHOSTNAME -- *hostname = '\0'; -- gethostname(fqdn, HOST_NAME_MAX); -- strncat(hostname, fqdn, strcspn(fqdn,".")); --#endif -- authorized_keys_file = pamsshagentauth_percent_expand(auth_keys_file_buf, "h", getpwnam(user)->pw_dir, "H", hostname, "f", fqdn, "u", user, NULL); -+void -+free_authorized_key_files() -+{ -+ unsigned int n; -+ for (n = 0; n < nr_authorized_keys_files; n++) -+ free(authorized_keys_files[n]); -+ nr_authorized_keys_files = 0; - } - --int -+const char * - pam_user_key_allowed(Key * key) - { -- return pam_user_key_allowed2(getpwuid(authorized_keys_file_allowed_owner_uid), key, authorized_keys_file) -- || pam_user_key_allowed2(getpwuid(0), key, authorized_keys_file); -+ unsigned int n; -+ for (n = 0; n < nr_authorized_keys_files; n++) { -+ if (pam_user_key_allowed2(getpwuid(authorized_keys_file_allowed_owner_uid), key, authorized_keys_files[n]) -+ || pam_user_key_allowed2(getpwuid(0), key, authorized_keys_files[n])) -+ return authorized_keys_files[n]; -+ } -+ return 0; - } -diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.h pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.h ---- pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.h 2010-01-13 02:17:01.000000000 +0000 -+++ pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.h 2012-12-17 19:24:34.477894517 +0000 -@@ -28,11 +28,12 @@ - */ - - --#ifndef _PAM_USER_KEY_ALLOWED_H --#define _PAM_USER_KEY_ALLOWED_H -+#ifndef _PAM_USER_AUTHORIZED_KEYS_H -+#define _PAM_USER_AUTHORIZED_KEYS_H - - #include "identity.h" --int pam_user_key_allowed(Key *); --void parse_authorized_key_file(const char *, const char *); -+const char * pam_user_key_allowed(Key *); -+void parse_authorized_key_files(const char *, const char *); -+void free_authorized_key_files(); - - #endif -diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.c pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.c ---- pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.c 2012-06-28 01:47:49.000000000 +0000 -+++ pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.c 2012-12-17 19:27:30.813843933 +0000 -@@ -51,7 +51,7 @@ - extern u_char *session_id2; - extern uint8_t session_id_len; - --int -+const char * - userauth_pubkey_from_id(Identity * id) - { - Buffer b = { 0 }; -@@ -59,11 +59,12 @@ - u_char *pkblob = NULL, *sig = NULL; - u_int blen = 0, slen = 0; - int authenticated = 0; -+ const char *key_file; - - pkalg = (char *) key_ssh_name(id->key); - - /* first test if this key is even allowed */ -- if(! pam_user_key_allowed(id->key)) -+ if(!(key_file = pam_user_key_allowed(id->key))) - goto user_auth_clean_exit; - - if(pamsshagentauth_key_to_blob(id->key, &pkblob, &blen) == 0) -@@ -96,5 +97,5 @@ - if(pkblob != NULL) - pamsshagentauth_xfree(pkblob); - CRYPTO_cleanup_all_ex_data(); -- return authenticated; -+ return authenticated ? key_file : 0; - } -diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.h pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.h ---- pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.h 2010-01-13 02:17:01.000000000 +0000 -+++ pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.h 2012-12-17 19:25:54.893412987 +0000 -@@ -32,6 +32,6 @@ - #define _USERAUTH_PUBKEY_FROM_ID_H - - #include --int userauth_pubkey_from_id(Identity *); -+const char * userauth_pubkey_from_id(Identity *); - - #endif diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 1e4373f286c..956492ba747 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "1.1.7"; + version = "1.2.2"; src = fetchurl { url = "https://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "045dxgl4kkmq6205iw6fqyx3565gd607p3xpad5l9scdi3qdp6xv"; + sha512 = "26f7lqr1s2iywj8qfbf24sm18bl6f7cwsf77nxwwvgij1z88gvh6yx3gp65zap92l0xjdp8kwq9y96xld39p86zd9dmkm447czykbvb"; }; makeFlags = [ diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 9604a67ddd9..69abdbec5d2 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "powerstat-${version}"; - version = "0.02.10"; + version = "0.02.11"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz"; - sha256 = "11n2k20h27j7m8j0l524w23xlkjhapsb3ml1qpx1si7gf0pkglcl"; + sha256 = "0iid3b3284sf89pfp68i1k5mwmr31bqjzasb8clm2sa45ivafx52"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index e99d7d86bfb..8c91dc43666 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pam ? null, glibcCross ? null }: +{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, libxslt, libxml2 +, docbook_xml_dtd_412, docbook_xsl, gnome_doc_utils, flex, bison +, pam ? null, glibcCross ? null }: let @@ -15,14 +17,20 @@ let in stdenv.mkDerivation rec { - name = "shadow-4.2.1"; + name = "shadow-${version}"; + version = "4.4"; - src = fetchurl { - url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.xz"; - sha256 = "0h9x1zdbq0pqmygmc1x459jraiqw4gqz8849v268crk78z8r621v"; + src = fetchFromGitHub { + owner = "shadow-maint"; + repo = "shadow"; + rev = "${version}"; + sha256 = "005qk3n86chc8mlg86qhrns2kpl52n5f3las3m5s6266xij3qwka"; }; buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; + nativeBuildInputs = [autoreconfHook libxslt libxml2 + docbook_xml_dtd_412 docbook_xsl gnome_doc_utils flex bison + ]; patches = [ ./keep-path.patch dots_in_usernames ]; @@ -33,8 +41,15 @@ stdenv.mkDerivation rec { preConfigure = '' export ac_cv_func_setpgrp_void=yes export shadow_cv_logdir=/var/log + ( + head -n -1 "${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" + tail -n +3 "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml" + ) > xmlcatalog + configureFlags="$configureFlags --with-xml-catalog=$PWD/xmlcatalog "; ''; + configureFlags = " --enable-man "; + preBuild = assert glibc != null; '' substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix index a38c819bc6f..9a244c6ed8f 100644 --- a/pkgs/os-specific/linux/smemstat/default.nix +++ b/pkgs/os-specific/linux/smemstat/default.nix @@ -1,12 +1,13 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, ncurses }: stdenv.mkDerivation rec { name = "smemstat-${version}"; - version = "0.01.14"; + version = "0.01.16"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.gz"; - sha256 = "0qkpbg0n40d8m9jzf3ylpdp65zzs344zbjn8khha4plbwg00ijrw"; + sha256 = "14n3s6ibm9bq58drvpiasqn11ci6mrwswfpcbpbsimx6fh2j4bi3"; }; + buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' mv $out/usr/* $out diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index f4f39451220..8e0bb935730 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -62,8 +62,8 @@ in assert buildKernel -> kernel != null; { splStable = common { - version = "0.6.5.8"; - sha256 = "000yvaccqlkrq15sdz0734fp3lkmx58182cdcfpm4869i0q7rf0s"; + version = "0.6.5.9"; + sha256 = "15qpx2nhprmk14jgb7yqp9dvfb6i3hhhspi77kvian171b0a6112"; }; splUnstable = common { version = "0.7.0-rc3"; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 312ac0c281a..ea49f9e4029 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -6,25 +6,24 @@ nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson }: let - name = "sssd-${version}"; - version = "1.14.2"; - docbookFiles = "${pkgs.docbook_xml_xslt}/share/xml/docbook-xsl/catalog.xml:${pkgs.docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml"; in -stdenv.mkDerivation { - inherit name; - inherit version; +stdenv.mkDerivation rec { + name = "sssd-${version}"; + version = "1.14.2"; src = fetchurl { url = "https://fedorahosted.org/released/sssd/${name}.tar.gz"; sha1 = "167b2216c536035175ff041d0449e0a874c68601"; }; + # Something is looking for instead of + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; + preConfigure = '' export SGML_CATALOG_FILES="${docbookFiles}" export PYTHONPATH=${ldap}/lib/python2.7/site-packages export PATH=$PATH:${pkgs.openldap}/libexec - export CPATH=${pkgs.libxml2.dev}/include/libxml2 configureFlagsArray=( --prefix=$out @@ -82,6 +81,7 @@ stdenv.mkDerivation { description = "System Security Services Daemon"; homepage = https://fedorahosted.org/sssd/; license = licenses.gpl3; + platforms = platforms.linux; maintainers = [ maintainers.e-user ]; }; } diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix index 658137a569e..a5c69e1d876 100644 --- a/pkgs/os-specific/linux/syscall_limiter/default.nix +++ b/pkgs/os-specific/linux/syscall_limiter/default.nix @@ -6,16 +6,14 @@ }: stdenv.mkDerivation rec { - name = "syscall_limiter-${version}"; - version = "${date}-${stdenv.lib.strings.substring 0 7 rev}"; - date = "20160105"; - rev = "b02c0316a2aaff496f712f1467e20337006655cc"; + name = "syscall_limiter-${version}"; + version = "20170123"; src = fetchFromGitHub { - owner = "vi"; - repo = "syscall_limiter"; - inherit rev; - sha256 = "14q5k5c8hk7gnxhgwaamwbibasb3pwj6jnqsxa1bdp16n6jdajxd"; + owner = "vi"; + repo = "syscall_limiter"; + rev = "481c8c883f2e1260ebc83b352b63bf61a930a341"; + sha256 = "0z5arj1kq1xczgrbw1b8m9kicbv3vs9bd32wvgfr4r6ndingsp5m"; }; configurePhase = ""; @@ -35,9 +33,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Start Linux programs with only selected syscalls enabled"; - homepage = https://github.com/vi/syscall_limiter; - license = licenses.mit; + homepage = https://github.com/vi/syscall_limiter; + license = licenses.mit; maintainers = with maintainers; [ obadz ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index abe1388e9a5..343e4e80955 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -2,14 +2,14 @@ let inherit (stdenv.lib) optional optionalString; baseName = "sysdig"; - version = "0.13.0"; + version = "0.14.0"; in stdenv.mkDerivation { name = "${baseName}-${version}"; src = fetchurl { url = "https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "0ghxj473v471nnry8h9accxpwwjp8nbzkgw8dniqld0ixx678pia"; + sha256 = "14wy4p1q8rk3q4s8vczfhkk20z3kz8wvyxpi8qx0xc7px7z5da76"; }; buildInputs = [ @@ -19,12 +19,6 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; patches = [ - # patch for linux >= 4.9.1 - # is included in the next release - (fetchpatch { - url = "https://github.com/draios/sysdig/commit/68823ffd3a76f88ad34c3d0d9f6fdf1ada0eae43.patch"; - sha256 = "02vgyd70mwrk6mcdkacaahk49irm6vxzqb7dfickk6k32lh3m44k"; - }) ]; postPatch = '' diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 8939f854870..db474f688e5 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -4,30 +4,21 @@ , kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp , iptables, gnu-efi , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 -, enableKDbus ? false }: assert stdenv.isLinux; stdenv.mkDerivation rec { - version = "231"; + version = "232"; name = "systemd-${version}"; src = fetchFromGitHub { - owner = "NixOS"; + owner = "nixos"; repo = "systemd"; - rev = "3b11791d323cf2d0e00a156967021e1ae9119de2"; - sha256 = "1xzldwd6407jdg6z36smd49d961nmqykpay969i4xfdldcgyjdv0"; + rev = "c110fc3504d7a2fa944575b347814f7e97d3c5a0"; + sha256 = "19carch1adad70nifbqdx649kj5m8pgpiq27hh05ig38yrbmb2vz"; }; - patches = [ - # Fixes tty issues, see #18158. Remove when upgrading to systemd 232. - (fetchpatch { - url = "https://github.com/systemd/systemd/commit/bd64d82c1c0e3fe2a5f9b3dd9132d62834f50b2d.patch"; - sha256 = "1gc9fxdlnfmjhbi77xfwcb5mkhryjsdi0rmbh2lq2qq737iyqqwm"; - }) - ]; - outputs = [ "out" "lib" "man" "dev" ]; buildInputs = @@ -53,7 +44,6 @@ stdenv.mkDerivation rec { "--with-dbussystemservicedir=$(out)/share/dbus-1/system-services" "--with-dbussessionservicedir=$(out)/share/dbus-1/services" "--with-tty-gid=3" # tty in NixOS has gid 3 - "--enable-compat-libs" # get rid of this eventually "--disable-tests" "--enable-lz4" @@ -80,7 +70,7 @@ stdenv.mkDerivation rec { "--with-sysvinit-path=" "--with-sysvrcnd-path=" "--with-rc-local-script-path-stop=/etc/halt.local" - ] ++ (if enableKDbus then [ "--enable-kdbus" ] else [ "--disable-kdbus" ]); + ]; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index eb50fc0abce..850fbe9f449 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -1,40 +1,32 @@ { fetchurl, stdenv }: -stdenv.mkDerivation { - name = "tcp-wrappers-7.6"; +let + vanillaVersion = "7.6.q"; + patchLevel = "26"; +in stdenv.mkDerivation rec { + name = "tcp-wrappers-${version}"; + version = "${vanillaVersion}-${patchLevel}"; src = fetchurl { - url = mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs.orig.tar.gz; - sha256 = "0k68ziinx6biwar5lcb9jvv0rp6b3vmj6861n75bvrz4w1piwkdp"; + url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${vanillaVersion}.orig.tar.gz"; + sha256 = "0p9ilj4v96q32klavx0phw9va21fjp8vpk11nbh6v2ppxnnxfhwm"; }; - patches = [ - (fetchurl { - url = mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs-13.diff.gz; - sha256 = "071ir20rh8ckhgrc0y99wgnlbqjgkprf0qwbv84lqw5i6qajbcnh"; - }) - ]; + debian = fetchurl { + url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${version}.debian.tar.xz"; + sha256 = "1dcdhi9lwzv7g19ggwxms2msq9fy14rl09rjqb10hwv0jix7z8j8"; + }; prePatch = '' - cd upstream/tarballs - tar xzvf * - cd tcp_wrappers_7.6 + tar -xaf $debian + patches="$(cat debian/patches/series | sed 's,^,debian/patches/,') $patches" ''; - postPatch = '' - for patch in debian/patches/*; do - echo "applying Debian patch \`$(basename $patch)'..." - patch --batch -p1 < $patch - done - ''; - - buildPhase = '' - make REAL_DAEMON_DIR="$out/sbin" linux - ''; + makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ]; installPhase = '' - mkdir -p "$out/sbin" - cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/sbin" + mkdir -p "$out/bin" + cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/bin" mkdir -p "$out/lib" cp -v shared/lib*.so* "$out/lib" @@ -42,7 +34,6 @@ stdenv.mkDerivation { mkdir -p "$out/include" cp -v *.h "$out/include" - mkdir -p "$out/man" for i in 3 5 8; do mkdir -p "$out/man/man$i" diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 272b1368dec..765305d0fda 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -1,12 +1,17 @@ -{ stdenv, fetchurl, kernel, writeScript, coreutils, gnugrep, jq, curl +{ stdenv, lib, fetchFromGitHub, kernel, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts }: -let - data = stdenv.lib.importJSON ./update.json; -in stdenv.mkDerivation rec { - name = "tp_smapi-${data.version}-${kernel.version}"; +stdenv.mkDerivation rec { + name = "tp_smapi-${version}-${kernel.version}"; + version = "0.42"; - src = fetchurl { inherit (data) url sha256; }; + src = fetchFromGitHub { + owner = "evgeni"; + repo = "tp_smapi"; + rev = "tp-smapi/${version}"; + sha256 = "12lnig90lrmkmqwl386q7ssqs9p0jikqhwl2wsmcmii1gn92hzfy"; + name = "tp-smapi-${version}"; + }; hardeningDisable = [ "pic" ]; @@ -25,7 +30,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.updateScript = import ./update.nix { - inherit writeScript coreutils gnugrep jq curl; + inherit lib writeScript coreutils gnugrep jq curl common-updater-scripts; }; meta = { diff --git a/pkgs/os-specific/linux/tp_smapi/update.json b/pkgs/os-specific/linux/tp_smapi/update.json deleted file mode 100644 index 15e9801e7f2..00000000000 --- a/pkgs/os-specific/linux/tp_smapi/update.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "0.42", - "url": "https://github.com/evgeni/tp_smapi/archive/tp-smapi/0.42.tar.gz", - "sha256": "cd28bf6ee21b2c27b88d947cb0bfcb19648c7daa5d350115403dbcad05849381" -} diff --git a/pkgs/os-specific/linux/tp_smapi/update.nix b/pkgs/os-specific/linux/tp_smapi/update.nix index 0c97d18472c..94eb44b744c 100644 --- a/pkgs/os-specific/linux/tp_smapi/update.nix +++ b/pkgs/os-specific/linux/tp_smapi/update.nix @@ -1,23 +1,10 @@ -{ writeScript, coreutils, gnugrep, jq, curl -}: +{ lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts }: writeScript "update-tp_smapi" '' -PATH=${coreutils}/bin:${gnugrep}/bin:${jq}/bin:${curl}/bin +PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq ]} -pushd pkgs/os-specific/linux/tp_smapi - -tmpfile=`mktemp` tags=`curl -s https://api.github.com/repos/evgeni/tp_smapi/tags` latest_tag=`echo $tags | jq -r '.[] | .name' | grep -oP "^tp-smapi/\K.*" | sort --version-sort | tail -1` -sha256=`curl -sL "https://github.com/evgeni/tp_smapi/archive/tp-smapi/$latest_tag.tar.gz" | sha256sum | cut -d" " -f1` -cat > update.json < stdenv.lib.versionAtLeast kernel.version "3.18"; let name = "wireguard-${version}"; - version = "0.0.20170115"; + version = "0.0.20170214"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1s7zypgbwyf3mkh9any413p0awpny0dxix8d1plsrm52k539ypvy"; + sha256 = "1e4ee213d2a5ac672c952c59e9c64d6d7d5dc3e21c003aee30d75208237e8bf5"; }; meta = with stdenv.lib; { homepage = https://www.wireguard.io/; downloadPage = https://git.zx2c4.com/WireGuard/refs/; - description = "Fast, modern, secure VPN tunnel"; + description = "A prerelease of an experimental VPN tunnel which is not to be depended upon for security"; maintainers = with maintainers; [ ericsagnes ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 7fda9b884d8..602031bab73 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -123,12 +123,12 @@ in # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.9"; + incompatibleKernelVersion = "4.10"; - version = "0.6.5.8"; + version = "0.6.5.9"; # this package should point to the latest release. - sha256 = "0qccz1832p3i80qlrrrypypspb9sy9hmpgcfx9vmhnqmkf0yri4a"; + sha256 = "1m8q39j13k46fn0pw3adq87c20rpkg28llxgv2a90994p4127xh0"; extraPatches = [ (fetchpatch { url = "https://github.com/Mic92/zfs/compare/zfs-0.6.5.8...nixos-zfs-0.6.5.8.patch"; diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index c03ec8eb7f9..adbf156730e 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, python, boost, libuuid, ruby }: +{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby }: stdenv.mkDerivation rec { name = "qpid-cpp-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "07ibwvw5lm7xabv32zai5x03r7l9mxm0zk7h9lbfkzmav0f41w0w"; }; - buildInputs = [ cmake python boost libuuid ruby ]; + buildInputs = [ cmake python2 boost libuuid ruby ]; # the subdir managementgen wants to install python stuff in ${python} and # the installation tries to create some folders in /var diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 62814b351b6..f96f3cc2d14 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, erlang, python, libxml2, libxslt, xmlto -, docbook_xml_dtd_45, docbook_xsl, zip, unzip +, docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync , AppKit, Carbon, Cocoa }: @@ -7,15 +7,15 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.5.8"; + version = "3.6.6"; src = fetchurl { - url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_8/rabbitmq-server-3.5.8.tar.gz"; - sha256 = "0f373zxz15smb0jvfdfsbb924fl2qmp1z2jy3y50gv6b3xsdyqmr"; + url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_6_6/rabbitmq-server-3.6.6.tar.xz"; + sha256 = "13mpnyfxd026w525rsnkcw0f8bcrkbzl7k9g8pnqmm3zyny8jmir"; }; buildInputs = - [ erlang python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip ] + [ erlang python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; preBuild = @@ -24,15 +24,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; - installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man DOC_INSTALL_DIR=$(out)/share/doc"; - - preInstall = - '' - sed -i \ - -e 's|SYS_PREFIX=|SYS_PREFIX=''${SYS_PREFIX-''${HOME}/.rabbitmq/${version}}|' \ - -e 's|CONF_ENV_FILE=''${SYS_PREFIX}\(.*\)|CONF_ENV_FILE=\1|' \ - scripts/rabbitmq-defaults - ''; + installFlags = "PREFIX=$(out) RMQ_ERLAPP_DIR=$(out)"; + installTargets = "install install-man"; postInstall = '' diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index b6f4fef0f05..2d3a74e18aa 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -3,17 +3,17 @@ let versionMap = { - "0.8" = { kafkaVersion = "0.8.2.1"; + "0.8" = { kafkaVersion = "0.8.2.2"; scalaVersion = "2.10"; - sha256 = "1klri23fjxbzv7rmi05vcqqfpy7dzi1spn2084y1dxsi1ypfkvc9"; + sha256 = "1azccf1k0nr8y1sfpjgqf9swyp87ypvgva68ci4kczwcx1z9d89v"; }; "0.9" = { kafkaVersion = "0.9.0.1"; scalaVersion = "2.11"; sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v"; }; - "0.10" = { kafkaVersion = "0.10.1.0"; + "0.10" = { kafkaVersion = "0.10.1.1"; scalaVersion = "2.11"; - sha256 = "144k6bqg8q8f3x3nk05hvaaad8xa32qjifg785i15j69cnp355bd"; + sha256 = "0a89dyvisa5vilfa0h0ljrb00l5n9h730yxy1058z7a2g43q0h0m"; }; }; in diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 2433750ce45..0c9f72f66d5 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -1,76 +1,113 @@ -{ stdenv, pkgs, fetchurl, fetchgit, +{ stdenv, pkgs, lib, fetchurl, fetchgit, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux, dmidecode, libuuid, binutils, newt, - lua, + lua, speex, srtp, wget, curl, subversionClient }: -stdenv.mkDerivation rec { - name = "asterisk-${version}"; - version = "14.1.2"; - src = fetchurl { - url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz"; - sha256 = "0w9s4334rwvpyxm169grmnb4k9yq0l2al73dyh4cb8769qcs0ij8"; +let + common = {version, sha256, externals}: stdenv.mkDerivation rec { + inherit version; + name = "asterisk-${version}"; + + buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua speex srtp wget curl subversionClient ]; + + patches = [ + # We want the Makefile to install the default /var skeleton + # under ${out}/var but we also want to use /var at runtime. + # This patch changes the runtime behavior to look for state + # directories in /var rather than ${out}/var. + ./runtime-vardirs.patch + ]; + + src = fetchurl { + url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz"; + inherit sha256; + }; + + # The default libdir is $PREFIX/usr/lib, which causes problems when paths + # compiled into Asterisk expect ${out}/usr/lib rather than ${out}/lib. + + # Copy in externals to avoid them being downloaded; + # they have to be copied, because the modification date is checked. + # If you are getting a permission denied error on this dir, + # you're likely missing an automatically downloaded dependency + preConfigure = '' + mkdir externals_cache + '' + lib.concatStringsSep "\n" + (lib.mapAttrsToList (dst: src: "cp ${src} ${dst}") externals) + '' + + chmod -w externals_cache + ''; + configureFlags = [ + "--libdir=\${out}/lib" + "--with-lua=${lua}/lib" + "--with-pjproject-bundled" + "--with-externals-cache=$(PWD)/externals_cache" + ]; + + preBuild = '' + make menuselect.makeopts + substituteInPlace menuselect.makeopts --replace 'format_mp3 ' "" + ./contrib/scripts/get_mp3_source.sh + ''; + + postInstall = '' + # Install sample configuration files for this version of Asterisk + make samples + ''; + + meta = with stdenv.lib; { + description = "Software implementation of a telephone private branch exchange (PBX)"; + homepage = http://www.asterisk.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ auntie DerTim1 yorickvp ]; + }; }; - # Note that these sounds are included with the release tarball. They are - # provided here verbatim for the convenience of anyone wanting to build - # Asterisk from other sources. - coreSounds = fetchurl { - url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz; - sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd"; + pjproject-255 = fetchurl { + url = http://www.pjsip.org/release/2.5.5/pjproject-2.5.5.tar.bz2; + sha256 = "1wq8lpfcd4dfrbl7bgy2yzgp3ldjzq5430fqkhcqad0xfrxj0fdb"; }; - mohSounds = fetchurl { - url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz; - sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538"; + +in +{ + + asterisk-lts = common { + version = "13.13.1"; + sha256 = "0yh097rrp1i681qclvwyh7l1gg2i5wx5pjrcvwpbj6g949mc98vd"; + externals = { + "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; + }; }; - # TODO: Sounds for other languages could be added here - buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua srtp wget curl subversionClient ]; - - patches = [ - # Disable downloading of sound files (we will fetch them - # ourselves if needed). - ./disable-download.patch - - # We want the Makefile to install the default /var skeleton - # under ${out}/var but we also want to use /var at runtime. - # This patch changes the runtime behavior to look for state - # directories in /var rather than ${out}/var. - ./runtime-vardirs.patch - ]; - - # Use the following preConfigure section when building Asterisk from sources - # other than the release tarball. - # preConfigure = '' - # ln -s ${coreSounds} sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz - # ln -s ${mohSounds} sounds/asterisk-moh-opsound-wav-2.03.tar.gz - #''; - - # The default libdir is $PREFIX/usr/lib, which causes problems when paths - # compiled into Asterisk expect ${out}/usr/lib rather than ${out}/lib. - configureFlags = [ - "--libdir=\${out}/lib" - "--with-lua=${lua}/lib" - "--with-pjproject-bundled" - ]; - - preBuild = '' - make menuselect.makeopts - substituteInPlace menuselect.makeopts --replace 'format_mp3 ' "" - ./contrib/scripts/get_mp3_source.sh - ''; - - postInstall = '' - # Install sample configuration files for this version of Asterisk - make samples - ''; - - meta = with stdenv.lib; { - description = "Software implementation of a telephone private branch exchange (PBX)"; - homepage = http://www.asterisk.org/; - license = licenses.gpl2; - maintainers = with maintainers; [ auntie DerTim1 ]; + asterisk-stable = common { + version = "14.2.1"; + sha256 = "193yhyjn0fwrd7hsmr3qwcx3k2pc6cq70v1mnfdwidix4cqm32xj"; + externals = { + "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; + }; }; + + # asterisk-git = common { + # version = "15-pre"; + # sha256 = "..."; + # externals = { + # "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; + # Note that these sounds are included with the release tarball. They are + # provided here verbatim for the convenience of anyone wanting to build + # Asterisk from other sources. Include in externals. + # "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl { + # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz; + # sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd"; + # }; + # "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl { + # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz; + # sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538"; + # }; + # TODO: Sounds for other languages could be added here + # } + # }.overrideDerivation (_: {src = fetchgit {...}}) + } diff --git a/pkgs/servers/asterisk/disable-download.patch b/pkgs/servers/asterisk/disable-download.patch deleted file mode 100644 index 670886bfe3c..00000000000 --- a/pkgs/servers/asterisk/disable-download.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN asterisk-14.1.2/sounds/Makefile asterisk-14.1.2-patched/sounds/Makefile ---- asterisk-14.1.2/sounds/Makefile 2016-11-10 20:43:02.000000000 +0100 -+++ asterisk-14.1.2-patched/sounds/Makefile 2016-11-16 10:08:46.591615147 +0100 -@@ -90,7 +90,7 @@ - ) && touch "$(1)$(if $(3),/$(3),)/$$@"; \ - fi - --asterisk-$(2)$(if $(3),-$(3),)-%.tar.gz: have_download -+asterisk-$(2)$(if $(3),-$(3),)-%.tar.gz: - ifneq ($(SOUNDS_CACHE_DIR),) - $(CMD_PREFIX) \ - if test ! -f "$(1)$(if $(3),/$(3),)/.$$(subst .tar.gz,,$$@)"; then \ diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index bf0b40e1d7b..add92f68876 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.9.2"; + version = "0.9.5"; goPackagePath = "github.com/mholt/caddy"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "1nmimyykbjfnwbrka50z15d11z0fc6abpkr0cjbj678d5r9wpz33"; + sha256 = "0z1qjmlxrsiccrl5cb0j4c48ksng4xgp5bgy11gswrijvymsbq2r"; }; buildFlagsArray = '' diff --git a/pkgs/servers/caddy/deps.nix b/pkgs/servers/caddy/deps.nix index d7c974ecb16..49ae8fa09e8 100644 --- a/pkgs/servers/caddy/deps.nix +++ b/pkgs/servers/caddy/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/dustin/go-humanize"; - rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8"; - sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k"; + rev = "7a41df006ff9af79a29f0ffa9c5f21fbe6314a2d"; + sha256 = "0055ir369kz63x9ay0fxqpx2xby8digja6ffbc35vsqjnzfwws18"; }; } { @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "2d1e4548da234d9cb742cc3628556fef86aafbac"; - sha256 = "0n7af8pjjmg5rhb3104lyvn966l1p4dfblmy3g9b0plsmnzrz6g5"; + rev = "0674c7c7968d9fac5f0f678325161ec31df406af"; + sha256 = "0ql8bsxcc0rjli5cxb0jf22jaq18bd6s4pja7razir3a9zcyn3km"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-syslog"; - rev = "315de0c1920b18b942603ffdc2229e2af4803c17"; - sha256 = "1z0kinqp8hbl7hw856jhx41ys97rc6hflcgwrkfyxj5fdx60xis6"; + rev = "b609c7d9de4658cded34a7336b90886c56f9dbdb"; + sha256 = "1k0dqkizj4vwgdsb7x7fzmcgz9079sczhpn9whd0r3xcnqs7pkkb"; }; } { @@ -59,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/lucas-clemente/aes12"; - rev = "8ee5b5610baca43b60ecfad586b3c40d92a96e0c"; - sha256 = "1lnzrr7f6cyb10gqji6433fvwi8zid0k019m694xyppv4pzgrc93"; + rev = "25700e67be5c860bcc999137275b9ef8b65932bd"; + sha256 = "08zbfy5n6ki6fjaihk7y686dwksdglds9c8f1klkldvjbg8mw4vp"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/lucas-clemente/quic-go"; - rev = "8f7a96dfafd8b03eae5679702a837ed5bdf91327"; - sha256 = "12qc7y8v3g16q3klh852f3v4yvbcp6h8am1q98ds2c1zay9jl50n"; + rev = "86e02c4d2c459b70073cd5c39468e8a5a22db45a"; + sha256 = "16qrkcwllx88f6623ps5p5h62168xs6mcwybbw8862pvb0zkndz0"; }; } { @@ -90,22 +90,13 @@ sha256 = "033099nv0y9pbv0v292x6g0mvwr2w02jf4vvpwx6sjpwbla4xjxd"; }; } - { - goPackagePath = "github.com/mholt/caddy"; - fetch = { - type = "git"; - url = "https://github.com/mholt/caddy"; - rev = "73916ccc3069de4720a77b6b817b0bb77bda6b44"; - sha256 = "1nmimyykbjfnwbrka50z15d11z0fc6abpkr0cjbj678d5r9wpz33"; - }; - } { goPackagePath = "github.com/miekg/dns"; fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "db96a2b759cdef4f11a34506a42eb8d1290c598e"; - sha256 = "0h5n4psd0p7q55jadgsgz2a1aj791yanrfj76avalh6aawvdpcm6"; + rev = "ca336a1f95a6b89be9c250df26c7a41742eb4a6f"; + sha256 = "03yh1zszhspmmq0v22ckw96q8ds2a5s3nd0c6r3p3n165w28z434"; }; } { @@ -131,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "35eb537633d9950afc8ae7bdf0edb6134584e9fc"; - sha256 = "1hwi1nq5kkpcci7lf4fwhs8jj0mf6xcbdz1vgijpfyyd0zr6mphc"; + rev = "5f33e7b7878355cd2b7e6b8eefc48a5472c69f70"; + sha256 = "0d7faqxrxvh8hwc1r8gbasgmr8x5blxvzciwspir2yafjfbqy87k"; }; } { @@ -149,8 +140,8 @@ fetch = { type = "git"; url = "https://github.com/xenolf/lego"; - rev = "82ac43327b01319544c050d5d78a4edeff9565d2"; - sha256 = "0zs1l4dm0srkx78a7rqq1g8g4yn84c07177zbaa286jqpzgijahi"; + rev = "f5d538caab6dc0c167d4e32990c79bbf9eff578c"; + sha256 = "026sjqinb0j4ddfh3rwhhh7a1yjkfdmdr4yflba5syp1hrjf1f37"; }; } { @@ -158,8 +149,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "6ab629be5e31660579425a738ba8870beb5b7404"; - sha256 = "1pk98j3wcxkns9whgazhid3if0dnaf57hmq0h6byq75aj9xbncxj"; + rev = "41d678d1df78cd0410143162dff954e6dc09300f"; + sha256 = "1gcw2850nghsfi3m98ibsxs8bwqzhdjsgiznrr9ymarzn58v3357"; }; } { @@ -167,8 +158,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "f4fe4abe3c785295ddf81c7f1823bcd3bad391b6"; - sha256 = "0l50x533pj0sj3gnr30zxgm51y4x5a5fwc515zj93iy1z0pyf9cn"; + rev = "f2499483f923065a842d38eb4c7f1927e6fc6e6d"; + sha256 = "0q1ps8igfczfafk39hkp8gs57s6qxjvf2c48hiq00p873agz0x7s"; }; } { @@ -176,8 +167,8 @@ fetch = { type = "git"; url = "https://gopkg.in/natefinch/lumberjack.v2"; - rev = "514cbda263a734ae8caac038dadf05f8f3f9f738"; - sha256 = "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82"; + rev = "dd45e6a67c53f673bb49ca8a001fd3a63ceb640e"; + sha256 = "1fla2mzbwl1lxa9na3xhjmcszn8kiw051xq7i9xzbazzpgf0csg0"; }; } { @@ -185,8 +176,8 @@ fetch = { type = "git"; url = "https://gopkg.in/square/go-jose.v1"; - rev = "139276ceb5afbf13e636c44e9382f0ca75c12ba3"; - sha256 = "1f46qka0xzzkbsg01r9c9fi9zlzai7h83mp9hlwg9m5s73h8gzwj"; + rev = "aa2e30fdd1fe9dd3394119af66451ae790d50e0d"; + sha256 = "0drajyadd6c4m5qv0jxcv748qczg8sgxz28nva1jn39f234m02is"; }; } { @@ -194,8 +185,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "31c299268d302dd0aa9a0dcf765a3d58971ac83f"; - sha256 = "14jkpa8g0s448n2x5qdi05m59ncsdscby1wy2p089zxl9nqavm8h"; + rev = "14227de293ca979cf205cd88769fe71ed96a97e2"; + sha256 = "038hnrjcnjygyi3qidfrkpkakis82qg381sr495d2s40g2dwlzah"; }; } ] diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index f0501fa57d6..41a0bea1cdd 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "consul-${version}"; - version = "0.7.0"; + version = "0.7.5"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul"; @@ -11,9 +11,17 @@ buildGoPackage rec { owner = "hashicorp"; repo = "consul"; inherit rev; - sha256 = "04h5y5vixjh9np9lsrk02ypbqwcq855h7l1jlnl1vmfq3sfqjds7"; + sha256 = "0zh4j5p0v41v7i6v084dgsdchx1azjs2mjb3dlfdv671rsnwi54z"; }; # Keep consul.ui for backward compatability passthru.ui = consul-ui; + + meta = with stdenv.lib; { + description = "Tool for service discovery, monitoring and configuration"; + homepage = "https://www.consul.io/"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.mpl20; + maintainers = with maintainers; [ pradeepchhetri ]; + }; } diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index fb8c9da5f8e..2f8bdd06bf1 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchurl, openssl, libtool, perl, libxml2 , libseccomp ? null }: -let version = "9.10.4-P5"; in +let version = "9.10.4-P6"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "1sqg7wg05h66vdjc8j215r04f8pg7lphkb93nsqxvzhk6r0ppi49"; + sha256 = "0rgffdm0h6dks0np4h9q4kd8nyb3azrdxw2skqnjzd8ws78vzpx1"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libtool perl libxml2 ] ++ stdenv.lib.optional stdenv.isLinux libseccomp; + STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase + configureFlags = [ "--localstatedir=/var" "--with-libtool" diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 9ecd6fe0b9d..94d5ee9f5c7 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,28 +1,38 @@ { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn -, systemd, nettle, libedit }: +, systemd, nettle, libedit, zlib, libiconv, fetchpatch +}: + +with { inherit (stdenv.lib) optional optionals; }; # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "0y9nhp9lfmxv4iy1xg7l4lfxv4168qhag26wwg0dbi0zjpkd790b"; + sha256 = "c064ddf99bf5fc24dd3c6a3a523394760357e204c8b69f0e691e49bc0d9b704c"; }; outputs = [ "bin" "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gnutls jansson liburcu lmdb libcap_ng libidn - systemd nettle libedit + gnutls jansson liburcu libidn + nettle libedit + libiconv # without sphinx &al. for developer documentation - ]; + ] + # Use embedded lmdb there for now, as detection is broken on Darwin somehow. + ++ optionals stdenv.isLinux [ libcap_ng systemd lmdb ] + ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls + + # Not ideal but seems to work on Linux. + configureFlags = optional stdenv.isLinux "--with-lmdb=${stdenv.lib.getLib lmdb}"; enableParallelBuilding = true; - CFLAGS = [ "-DNDEBUG" ]; + CFLAGS = [ "-O2" "-DNDEBUG" ]; #doCheck = true; problems in combination with dynamic linking diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix new file mode 100644 index 00000000000..323b0b50000 --- /dev/null +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -0,0 +1,69 @@ +{ stdenv, fetchurl, pkgconfig, utillinux, hexdump, which +, knot-dns, luajit, libuv, lmdb +, cmocka, systemd, hiredis, libmemcached +, gnutls, nettle +, luajitPackages, makeWrapper +}: + +let + inherit (stdenv.lib) optional; +in +stdenv.mkDerivation rec { + name = "knot-resolver-${version}"; + version = "1.2.2"; + + src = fetchurl { + url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; + sha256 = "89ab2ac8058b297c1f73f1c12e0f16d6e160aa86363e99ffa590bee7fe307931"; + }; + + outputs = [ "out" "dev" ]; + + configurePhase = ":"; + + nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ]; + + buildInputs = [ knot-dns luajit libuv gnutls ] + ++ optional stdenv.isLinux lmdb # system lmdb causes some problems on Darwin + ## optional dependencies + ++ optional doInstallCheck cmocka + ++ optional stdenv.isLinux systemd # socket activation + ++ [ + nettle # DNS cookies + hiredis libmemcached # additional cache backends + # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + CFLAGS = [ "-O2" "-DNDEBUG" ]; + + enableParallelBuilding = true; + + doInstallCheck = true; + installCheckTarget = "check"; + preInstallCheck = '' + export LD_LIBRARY_PATH="$out/lib" + ''; + + # optional: to allow auto-bootstrapping root trust anchor via https + postInstall = with luajitPackages; '' + wrapProgram "$out/sbin/kresd" \ + --set LUA_PATH '${ + stdenv.lib.concatStringsSep ";" + (map getLuaPath [ luasec luasocket ]) + }' \ + --set LUA_CPATH '${ + stdenv.lib.concatStringsSep ";" + (map getLuaCPath [ luasec luasocket ]) + }' + ''; + + meta = with stdenv.lib; { + description = "Caching validating DNS resolver, from .cz domain registry"; + homepage = https://knot-resolver.cz; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = [ maintainers.vcunat /* upstream developer */ ]; + }; +} + diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 603709b31ce..89845fff9c6 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -13,11 +13,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.13"; + name = "nsd-4.1.14"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "1bwiabj1m7h14ppsa2azw017dqkqjgdl9gmj6ghjg80146xd8p64"; + sha256 = "bdfc61c5f3bf11febd8f4776eef1d4f2d95ed70f12f11d4eeee943c186ffd802"; }; buildInputs = [ libevent openssl ]; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix new file mode 100644 index 00000000000..70deadb74e1 --- /dev/null +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, boost +, openssl, systemd, lua, luajit, protobuf +, enableLua ? false +, enableProtoBuf ? false +}: + +assert enableLua -> lua != null && luajit != null; +assert enableProtoBuf -> protobuf != null; + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "pdns-recursor-${version}"; + version = "4.0.4"; + + src = fetchurl { + url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; + sha256 = "0k8y9zxj2lz4rq782vgzr28yd43q0hwlnvszwq0k9l6c967pff13"; + }; + + buildInputs = [ + boost openssl pkgconfig systemd + ] ++ optional enableLua [ lua luajit ] + ++ optional enableProtoBuf protobuf; + + configureFlags = [ + "--enable-reproducible" + "--with-systemd" + ]; + + meta = { + description = "A recursive DNS server"; + homepage = http://www.powerdns.com/; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ rnhmjoj ]; + }; +} diff --git a/pkgs/servers/dnschain/default.nix b/pkgs/servers/dnschain/default.nix index b1714101856..52cccae50c5 100644 --- a/pkgs/servers/dnschain/default.nix +++ b/pkgs/servers/dnschain/default.nix @@ -1,11 +1,51 @@ -{ stdenv, nodePackages }: - -# to update dnschain, run npm2nix package.json package.nix, and -# then add "coffee-script" manually as a dependecy for "dnschain" -# in package.nix. +{ stdenv, fetchFromGitHub, callPackage, makeWrapper, openssl }: let - np = nodePackages.override { generated = ./package.nix; self = np; }; -in + nodePackages = callPackage (import ../../top-level/node-packages.nix) { + self = nodePackages; + generated = ./package.nix; + }; -np.dnschain +in nodePackages.buildNodePackage rec { + name = "dnschain-${version}"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "okTurtles"; + repo = "dnschain"; + rev = "a8d477f9ad33d7790f94ffc563e2205823e62515"; + sha256 = "0j5glbxf0fxnxl4l1lysb3a619b18rk0l1ks57wd255llc2mw7zy"; + }; + + deps = with nodePackages; [ + by-spec."bluebird"."2.9.9" + by-spec."bottleneck"."1.5.x" + by-spec."event-stream"."3.2.2" + by-spec."express"."4.11.2" + by-spec."hiredis"."0.4.1" + by-spec."json-rpc2"."0.8.1" + by-spec."lodash"."3.1.0" + by-spec."native-dns"."git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" + by-spec."native-dns-packet"."0.1.1" + by-spec."nconf"."0.7.1" + by-spec."properties"."1.2.1" + by-spec."redis"."0.12.x" + by-spec."string"."2.0.1" + by-spec."winston"."0.8.0" + by-spec."superagent"."0.21.0" + ]; + + buildInputs = [ makeWrapper nodePackages.coffee-script ]; + postInstall = '' + wrapProgram $out/bin/dnschain --suffix PATH : ${openssl.bin}/bin + ''; + + meta = with stdenv.lib; { + description = "A blockchain-based DNS + HTTP server"; + homepage = https://okturtles.com/; + license = licenses.mpl20; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/servers/dnschain/package.nix b/pkgs/servers/dnschain/package.nix index 8077cb0f01f..600f5a94684 100644 --- a/pkgs/servers/dnschain/package.nix +++ b/pkgs/servers/dnschain/package.nix @@ -1,3 +1,4 @@ + { self, fetchurl, fetchgit ? null, lib }: { @@ -8,12 +9,12 @@ version = "1.2.13"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz"; + url = "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz"; name = "accepts-1.2.13.tgz"; sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; }; deps = { - "mime-types-2.1.6" = self.by-version."mime-types"."2.1.6"; + "mime-types-2.1.14" = self.by-version."mime-types"."2.1.14"; "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3"; }; optionalDependencies = { @@ -22,6 +23,25 @@ os = [ ]; cpu = [ ]; }; + by-spec."assert-plus"."^1.0.0" = + self.by-version."assert-plus"."1.0.0"; + by-version."assert-plus"."1.0.0" = self.buildNodePackage { + name = "assert-plus-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + name = "assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."async"."0.2.x" = self.by-version."async"."0.2.10"; by-version."async"."0.2.10" = self.buildNodePackage { @@ -29,7 +49,7 @@ version = "0.2.10"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; + url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; name = "async-0.2.10.tgz"; sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; }; @@ -48,7 +68,7 @@ version = "0.9.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz"; + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; name = "async-0.9.2.tgz"; sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; }; @@ -67,7 +87,7 @@ version = "1.6.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/better-curry/-/better-curry-1.6.0.tgz"; + url = "https://registry.npmjs.org/better-curry/-/better-curry-1.6.0.tgz"; name = "better-curry-1.6.0.tgz"; sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869"; }; @@ -86,7 +106,7 @@ version = "0.0.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz"; + url = "https://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz"; name = "binaryheap-0.0.3.tgz"; sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6"; }; @@ -105,7 +125,7 @@ version = "1.2.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; name = "bindings-1.2.1.tgz"; sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; }; @@ -124,7 +144,7 @@ version = "2.9.9"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; + url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; name = "bluebird-2.9.9.tgz"; sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3"; }; @@ -143,7 +163,7 @@ version = "1.5.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz"; + url = "https://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz"; name = "bottleneck-1.5.3.tgz"; sha1 = "55fa64920d9670087d44150404525d59f9511c20"; }; @@ -162,12 +182,12 @@ version = "0.0.12"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz"; + url = "https://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz"; name = "buffercursor-0.0.12.tgz"; sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; }; deps = { - "verror-1.6.0" = self.by-version."verror"."1.6.0"; + "verror-1.9.0" = self.by-version."verror"."1.9.0"; }; optionalDependencies = { }; @@ -178,15 +198,15 @@ by-spec."buffercursor".">= 0.0.5" = self.by-version."buffercursor"."0.0.12"; by-spec."coffee-script"."*" = - self.by-version."coffee-script"."1.10.0"; - by-version."coffee-script"."1.10.0" = self.buildNodePackage { - name = "coffee-script-1.10.0"; - version = "1.10.0"; + self.by-version."coffee-script"."1.12.2"; + by-version."coffee-script"."1.12.2" = self.buildNodePackage { + name = "coffee-script-1.12.2"; + version = "1.12.2"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"; - name = "coffee-script-1.10.0.tgz"; - sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz"; + name = "coffee-script-1.12.2.tgz"; + sha1 = "0d4cbdee183f650da95419570c4929d08ef91376"; }; deps = { }; @@ -196,7 +216,7 @@ os = [ ]; cpu = [ ]; }; - "coffee-script" = self.by-version."coffee-script"."1.10.0"; + "coffee-script" = self.by-version."coffee-script"."1.12.2"; by-spec."colors"."0.6.x" = self.by-version."colors"."0.6.2"; by-version."colors"."0.6.2" = self.buildNodePackage { @@ -204,7 +224,7 @@ version = "0.6.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; name = "colors-0.6.2.tgz"; sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; }; @@ -223,7 +243,7 @@ version = "0.0.7"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; name = "combined-stream-0.0.7.tgz"; sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }; @@ -243,7 +263,7 @@ version = "1.1.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; name = "component-emitter-1.1.2.tgz"; sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; }; @@ -262,7 +282,7 @@ version = "0.5.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; name = "content-disposition-0.5.0.tgz"; sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; }; @@ -281,7 +301,7 @@ version = "0.1.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; + url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; name = "cookie-0.1.2.tgz"; sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; }; @@ -300,7 +320,7 @@ version = "1.0.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; name = "cookie-signature-1.0.5.tgz"; sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9"; }; @@ -319,7 +339,7 @@ version = "2.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; name = "cookiejar-2.0.1.tgz"; sha1 = "3d12752f6adf68a892f332433492bd5812bb668f"; }; @@ -331,16 +351,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."core-util-is"."~1.0.0" = - self.by-version."core-util-is"."1.0.1"; - by-version."core-util-is"."1.0.1" = self.buildNodePackage { - name = "core-util-is-1.0.1"; - version = "1.0.1"; + by-spec."core-util-is"."1.0.2" = + self.by-version."core-util-is"."1.0.2"; + by-version."core-util-is"."1.0.2" = self.buildNodePackage { + name = "core-util-is-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"; - name = "core-util-is-1.0.1.tgz"; - sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538"; + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + name = "core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; deps = { }; @@ -350,6 +370,8 @@ os = [ ]; cpu = [ ]; }; + by-spec."core-util-is"."~1.0.0" = + self.by-version."core-util-is"."1.0.2"; by-spec."crc"."3.2.1" = self.by-version."crc"."3.2.1"; by-version."crc"."3.2.1" = self.buildNodePackage { @@ -357,7 +379,7 @@ version = "3.2.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; + url = "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; name = "crc-3.2.1.tgz"; sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; }; @@ -376,7 +398,7 @@ version = "1.0.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; name = "cycle-1.0.3.tgz"; sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; }; @@ -395,7 +417,7 @@ version = "1.0.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; + url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; name = "debug-1.0.4.tgz"; sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; }; @@ -409,18 +431,18 @@ cpu = [ ]; }; by-spec."debug"."2" = - self.by-version."debug"."2.2.0"; - by-version."debug"."2.2.0" = self.buildNodePackage { - name = "debug-2.2.0"; - version = "2.2.0"; + self.by-version."debug"."2.6.0"; + by-version."debug"."2.6.0" = self.buildNodePackage { + name = "debug-2.6.0"; + version = "2.6.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - name = "debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; + name = "debug-2.6.0.tgz"; + sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; }; deps = { - "ms-0.7.1" = self.by-version."ms"."0.7.1"; + "ms-0.7.2" = self.by-version."ms"."0.7.2"; }; optionalDependencies = { }; @@ -435,7 +457,7 @@ version = "2.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; + url = "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; name = "debug-2.1.3.tgz"; sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e"; }; @@ -455,7 +477,7 @@ version = "0.0.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; name = "delayed-stream-0.0.5.tgz"; sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; }; @@ -474,7 +496,7 @@ version = "1.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; + url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; name = "depd-1.0.1.tgz"; sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; }; @@ -493,7 +515,7 @@ version = "1.0.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; name = "destroy-1.0.3.tgz"; sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; }; @@ -505,42 +527,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."dnschain"."*" = - self.by-version."dnschain"."0.5.3"; - by-version."dnschain"."0.5.3" = self.buildNodePackage { - name = "dnschain-0.5.3"; - version = "0.5.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/dnschain/-/dnschain-0.5.3.tgz"; - name = "dnschain-0.5.3.tgz"; - sha1 = "9b21d9ac5e203295f372ac37df470e9f0854c470"; - }; - deps = { - "bluebird-2.9.9" = self.by-version."bluebird"."2.9.9"; - "bottleneck-1.5.3" = self.by-version."bottleneck"."1.5.3"; - "event-stream-3.2.2" = self.by-version."event-stream"."3.2.2"; - "express-4.11.2" = self.by-version."express"."4.11.2"; - "hiredis-0.4.1" = self.by-version."hiredis"."0.4.1"; - "json-rpc2-0.8.1" = self.by-version."json-rpc2"."0.8.1"; - "lodash-3.1.0" = self.by-version."lodash"."3.1.0"; - "native-dns-0.6.1" = self.by-version."native-dns"."0.6.1"; - "native-dns-packet-0.1.1" = self.by-version."native-dns-packet"."0.1.1"; - "nconf-0.7.1" = self.by-version."nconf"."0.7.1"; - "properties-1.2.1" = self.by-version."properties"."1.2.1"; - "redis-0.12.1" = self.by-version."redis"."0.12.1"; - "string-2.0.1" = self.by-version."string"."2.0.1"; - "winston-0.8.0" = self.by-version."winston"."0.8.0"; - "superagent-0.21.0" = self.by-version."superagent"."0.21.0"; - "coffee-script-1.10.0" = self.by-version."coffee-script"."1.10.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "dnschain" = self.by-version."dnschain"."0.5.3"; by-spec."duplexer"."~0.1.1" = self.by-version."duplexer"."0.1.1"; by-version."duplexer"."0.1.1" = self.buildNodePackage { @@ -548,7 +534,7 @@ version = "0.1.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; + url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; name = "duplexer-0.1.1.tgz"; sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; }; @@ -567,7 +553,7 @@ version = "1.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; name = "ee-first-1.1.0.tgz"; sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; }; @@ -586,7 +572,7 @@ version = "2.3.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/es5class/-/es5class-2.3.1.tgz"; + url = "https://registry.npmjs.org/es5class/-/es5class-2.3.1.tgz"; name = "es5class-2.3.1.tgz"; sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66"; }; @@ -606,7 +592,7 @@ version = "1.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; name = "escape-html-1.0.1.tgz"; sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; }; @@ -625,7 +611,7 @@ version = "1.5.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; + url = "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; name = "etag-1.5.1.tgz"; sha1 = "54c50de04ee42695562925ac566588291be7e9ea"; }; @@ -645,7 +631,7 @@ version = "3.2.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz"; + url = "https://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz"; name = "event-stream-3.2.2.tgz"; sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d"; }; @@ -671,7 +657,7 @@ version = "0.1.6"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz"; name = "eventemitter3-0.1.6.tgz"; sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; }; @@ -690,7 +676,7 @@ version = "4.11.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.11.2.tgz"; + url = "https://registry.npmjs.org/express/-/express-4.11.2.tgz"; name = "express-4.11.2.tgz"; sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148"; }; @@ -705,13 +691,13 @@ "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "methods-1.1.1" = self.by-version."methods"."1.1.1"; + "methods-1.1.2" = self.by-version."methods"."1.1.2"; "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1"; "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; - "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8"; + "proxy-addr-1.0.10" = self.by-version."proxy-addr"."1.0.10"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; - "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3"; "send-0.11.1" = self.by-version."send"."0.11.1"; "serve-static-1.8.1" = self.by-version."serve-static"."1.8.1"; "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; @@ -733,7 +719,7 @@ version = "1.2.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; + url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; name = "extend-1.2.1.tgz"; sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; }; @@ -745,16 +731,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."extsprintf"."1.2.0" = - self.by-version."extsprintf"."1.2.0"; - by-version."extsprintf"."1.2.0" = self.buildNodePackage { - name = "extsprintf-1.2.0"; - version = "1.2.0"; + by-spec."extsprintf"."^1.2.0" = + self.by-version."extsprintf"."1.3.0"; + by-version."extsprintf"."1.3.0" = self.buildNodePackage { + name = "extsprintf-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz"; - name = "extsprintf-1.2.0.tgz"; - sha1 = "5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529"; + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + name = "extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; deps = { }; @@ -771,7 +757,7 @@ version = "0.1.8"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; name = "eyes-0.1.8.tgz"; sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; }; @@ -784,18 +770,18 @@ cpu = [ ]; }; by-spec."faye-websocket"."0.x.x" = - self.by-version."faye-websocket"."0.10.0"; - by-version."faye-websocket"."0.10.0" = self.buildNodePackage { - name = "faye-websocket-0.10.0"; - version = "0.10.0"; + self.by-version."faye-websocket"."0.11.0"; + by-version."faye-websocket"."0.11.0" = self.buildNodePackage { + name = "faye-websocket-0.11.0"; + version = "0.11.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; - name = "faye-websocket-0.10.0.tgz"; - sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.0.tgz"; + name = "faye-websocket-0.11.0.tgz"; + sha1 = "d9ccf0e789e7db725d74bc4877d23aa42972ac50"; }; deps = { - "websocket-driver-0.6.2" = self.by-version."websocket-driver"."0.6.2"; + "websocket-driver-0.6.5" = self.by-version."websocket-driver"."0.6.5"; }; optionalDependencies = { }; @@ -810,7 +796,7 @@ version = "0.3.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz"; name = "finalhandler-0.3.3.tgz"; sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426"; }; @@ -832,7 +818,7 @@ version = "0.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; + url = "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; name = "form-data-0.1.3.tgz"; sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; }; @@ -854,7 +840,7 @@ version = "1.0.14"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; + url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; name = "formidable-1.0.14.tgz"; sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; }; @@ -873,7 +859,7 @@ version = "0.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; name = "forwarded-0.1.0.tgz"; sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; }; @@ -892,7 +878,7 @@ version = "0.2.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; + url = "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; name = "fresh-0.2.4.tgz"; sha1 = "3582499206c9723714190edd74b4604feb4a614c"; }; @@ -911,7 +897,7 @@ version = "0.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/from/-/from-0.1.3.tgz"; + url = "https://registry.npmjs.org/from/-/from-0.1.3.tgz"; name = "from-0.1.3.tgz"; sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc"; }; @@ -930,13 +916,13 @@ version = "0.4.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/hiredis/-/hiredis-0.4.1.tgz"; + url = "https://registry.npmjs.org/hiredis/-/hiredis-0.4.1.tgz"; name = "hiredis-0.4.1.tgz"; sha1 = "aab4dcfd0fc4cbdb219d268005f2335a3c639e8f"; }; deps = { "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; - "nan-2.0.8" = self.by-version."nan"."2.0.8"; + "nan-2.5.0" = self.by-version."nan"."2.5.0"; }; optionalDependencies = { }; @@ -945,15 +931,15 @@ cpu = [ ]; }; by-spec."inherits"."~2.0.1" = - self.by-version."inherits"."2.0.1"; - by-version."inherits"."2.0.1" = self.buildNodePackage { - name = "inherits-2.0.1"; - version = "2.0.1"; + self.by-version."inherits"."2.0.3"; + by-version."inherits"."2.0.3" = self.buildNodePackage { + name = "inherits-2.0.3"; + version = "2.0.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - name = "inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + name = "inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; deps = { }; @@ -970,7 +956,7 @@ version = "1.3.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; + url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; name = "ini-1.3.4.tgz"; sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; }; @@ -982,16 +968,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."ipaddr.js"."1.0.1" = - self.by-version."ipaddr.js"."1.0.1"; - by-version."ipaddr.js"."1.0.1" = self.buildNodePackage { - name = "ipaddr.js-1.0.1"; - version = "1.0.1"; + by-spec."ipaddr.js"."1.0.5" = + self.by-version."ipaddr.js"."1.0.5"; + by-version."ipaddr.js"."1.0.5" = self.buildNodePackage { + name = "ipaddr.js-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz"; - name = "ipaddr.js-1.0.1.tgz"; - sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz"; + name = "ipaddr.js-1.0.5.tgz"; + sha1 = "5fa78cf301b825c78abc3042d812723049ea23c7"; }; deps = { }; @@ -1002,15 +988,15 @@ cpu = [ ]; }; by-spec."ipaddr.js".">= 0.1.1" = - self.by-version."ipaddr.js"."1.0.3"; - by-version."ipaddr.js"."1.0.3" = self.buildNodePackage { - name = "ipaddr.js-1.0.3"; - version = "1.0.3"; + self.by-version."ipaddr.js"."1.2.0"; + by-version."ipaddr.js"."1.2.0" = self.buildNodePackage { + name = "ipaddr.js-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.3.tgz"; - name = "ipaddr.js-1.0.3.tgz"; - sha1 = "2a9df7be73ea92aadb0d7f377497decd8e6d01bb"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.2.0.tgz"; + name = "ipaddr.js-1.2.0.tgz"; + sha1 = "8aba49c9192799585bdd643e0ccb50e8ae777ba4"; }; deps = { }; @@ -1027,7 +1013,7 @@ version = "0.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; name = "isarray-0.0.1.tgz"; sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; }; @@ -1046,7 +1032,7 @@ version = "0.8.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/json-rpc2/-/json-rpc2-0.8.1.tgz"; + url = "https://registry.npmjs.org/json-rpc2/-/json-rpc2-0.8.1.tgz"; name = "json-rpc2-0.8.1.tgz"; sha1 = "efe8c9834605b556c488d1ed7bcf24ee381eeeb2"; }; @@ -1055,7 +1041,7 @@ "debug-1.0.4" = self.by-version."debug"."1.0.4"; "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; "es5class-2.3.1" = self.by-version."es5class"."2.3.1"; - "faye-websocket-0.10.0" = self.by-version."faye-websocket"."0.10.0"; + "faye-websocket-0.11.0" = self.by-version."faye-websocket"."0.11.0"; "eventemitter3-0.1.6" = self.by-version."eventemitter3"."0.1.6"; }; optionalDependencies = { @@ -1071,7 +1057,7 @@ version = "0.0.6"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/jsonparse/-/jsonparse-0.0.6.tgz"; + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.6.tgz"; name = "jsonparse-0.0.6.tgz"; sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e"; }; @@ -1090,7 +1076,7 @@ version = "2.4.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; + url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; name = "lodash-2.4.2.tgz"; sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; }; @@ -1109,7 +1095,7 @@ version = "3.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz"; + url = "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz"; name = "lodash-3.1.0.tgz"; sha1 = "d41b8b33530cb3be088853208ad30092d2c27961"; }; @@ -1128,7 +1114,7 @@ version = "0.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; + url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; name = "map-stream-0.1.0.tgz"; sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; }; @@ -1147,7 +1133,7 @@ version = "0.3.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; name = "media-typer-0.3.0.tgz"; sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; @@ -1166,7 +1152,7 @@ version = "0.0.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; name = "merge-descriptors-0.0.2.tgz"; sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; }; @@ -1185,7 +1171,7 @@ version = "1.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; + url = "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; name = "methods-1.0.1.tgz"; sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; }; @@ -1198,15 +1184,15 @@ cpu = [ ]; }; by-spec."methods"."~1.1.1" = - self.by-version."methods"."1.1.1"; - by-version."methods"."1.1.1" = self.buildNodePackage { - name = "methods-1.1.1"; - version = "1.1.1"; + self.by-version."methods"."1.1.2"; + by-version."methods"."1.1.2" = self.buildNodePackage { + name = "methods-1.1.2"; + version = "1.1.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz"; - name = "methods-1.1.1.tgz"; - sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a"; + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + name = "methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; deps = { }; @@ -1223,7 +1209,7 @@ version = "1.2.11"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; name = "mime-1.2.11.tgz"; sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; }; @@ -1244,7 +1230,7 @@ version = "1.12.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; name = "mime-db-1.12.0.tgz"; sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; }; @@ -1256,16 +1242,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."mime-db"."~1.18.0" = - self.by-version."mime-db"."1.18.0"; - by-version."mime-db"."1.18.0" = self.buildNodePackage { - name = "mime-db-1.18.0"; - version = "1.18.0"; + by-spec."mime-db"."~1.26.0" = + self.by-version."mime-db"."1.26.0"; + by-version."mime-db"."1.26.0" = self.buildNodePackage { + name = "mime-db-1.26.0"; + version = "1.26.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.18.0.tgz"; - name = "mime-db-1.18.0.tgz"; - sha1 = "5317e28224c08af1d484f60973dd386ba8f389e0"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"; + name = "mime-db-1.26.0.tgz"; + sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff"; }; deps = { }; @@ -1282,7 +1268,7 @@ version = "2.0.14"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; name = "mime-types-2.0.14.tgz"; sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; }; @@ -1296,18 +1282,18 @@ cpu = [ ]; }; by-spec."mime-types"."~2.1.6" = - self.by-version."mime-types"."2.1.6"; - by-version."mime-types"."2.1.6" = self.buildNodePackage { - name = "mime-types-2.1.6"; - version = "2.1.6"; + self.by-version."mime-types"."2.1.14"; + by-version."mime-types"."2.1.14" = self.buildNodePackage { + name = "mime-types-2.1.14"; + version = "2.1.14"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.6.tgz"; - name = "mime-types-2.1.6.tgz"; - sha1 = "949f8788411864ddc70948a0f21c43f29d25667c"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"; + name = "mime-types-2.1.14.tgz"; + sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"; }; deps = { - "mime-db-1.18.0" = self.by-version."mime-db"."1.18.0"; + "mime-db-1.26.0" = self.by-version."mime-db"."1.26.0"; }; optionalDependencies = { }; @@ -1322,7 +1308,7 @@ version = "0.0.10"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; name = "minimist-0.0.10.tgz"; sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; }; @@ -1341,7 +1327,7 @@ version = "0.6.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; + url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; name = "ms-0.6.2.tgz"; sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; }; @@ -1360,7 +1346,7 @@ version = "0.7.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; + url = "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; name = "ms-0.7.0.tgz"; sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; }; @@ -1372,16 +1358,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."ms"."0.7.1" = - self.by-version."ms"."0.7.1"; - by-version."ms"."0.7.1" = self.buildNodePackage { - name = "ms-0.7.1"; - version = "0.7.1"; + by-spec."ms"."0.7.2" = + self.by-version."ms"."0.7.2"; + by-version."ms"."0.7.2" = self.buildNodePackage { + name = "ms-0.7.2"; + version = "0.7.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - name = "ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + name = "ms-0.7.2.tgz"; + sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; }; deps = { }; @@ -1392,15 +1378,15 @@ cpu = [ ]; }; by-spec."nan"."^2.0.5" = - self.by-version."nan"."2.0.8"; - by-version."nan"."2.0.8" = self.buildNodePackage { - name = "nan-2.0.8"; - version = "2.0.8"; + self.by-version."nan"."2.5.0"; + by-version."nan"."2.5.0" = self.buildNodePackage { + name = "nan-2.5.0"; + version = "2.5.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-2.0.8.tgz"; - name = "nan-2.0.8.tgz"; - sha1 = "c15fd99dd4cc323d1c2f94ac426313680e606392"; + url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; + name = "nan-2.5.0.tgz"; + sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; }; deps = { }; @@ -1422,7 +1408,7 @@ sha256 = "9c3faf4d39fda7bb6dd52a82036625f37ed442d5e948d295acb2f055dd367080"; }; deps = { - "ipaddr.js-1.0.3" = self.by-version."ipaddr.js"."1.0.3"; + "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0"; "native-dns-cache-0.0.2" = self.by-version."native-dns-cache"."0.0.2"; "native-dns-packet-0.0.4" = self.by-version."native-dns-packet"."0.0.4"; }; @@ -1460,13 +1446,13 @@ version = "0.1.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz"; + url = "https://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz"; name = "native-dns-packet-0.1.1.tgz"; sha1 = "97da90570b8438a00194701ce24d011fd3cc109a"; }; deps = { "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12"; - "ipaddr.js-1.0.3" = self.by-version."ipaddr.js"."1.0.3"; + "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0"; }; optionalDependencies = { }; @@ -1487,7 +1473,7 @@ }; deps = { "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12"; - "ipaddr.js-1.0.3" = self.by-version."ipaddr.js"."1.0.3"; + "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0"; }; optionalDependencies = { }; @@ -1508,7 +1494,7 @@ }; deps = { "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12"; - "ipaddr.js-1.0.3" = self.by-version."ipaddr.js"."1.0.3"; + "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0"; }; optionalDependencies = { }; @@ -1523,7 +1509,7 @@ version = "0.7.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz"; + url = "https://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz"; name = "nconf-0.7.1.tgz"; sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b"; }; @@ -1545,7 +1531,7 @@ version = "0.5.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; name = "negotiator-0.5.3.tgz"; sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; }; @@ -1564,7 +1550,7 @@ version = "2.2.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; name = "on-finished-2.2.1.tgz"; sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; }; @@ -1584,7 +1570,7 @@ version = "0.6.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; name = "optimist-0.6.1.tgz"; sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; }; @@ -1599,15 +1585,15 @@ cpu = [ ]; }; by-spec."parseurl"."~1.3.0" = - self.by-version."parseurl"."1.3.0"; - by-version."parseurl"."1.3.0" = self.buildNodePackage { - name = "parseurl-1.3.0"; - version = "1.3.0"; + self.by-version."parseurl"."1.3.1"; + by-version."parseurl"."1.3.1" = self.buildNodePackage { + name = "parseurl-1.3.1"; + version = "1.3.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"; - name = "parseurl-1.3.0.tgz"; - sha1 = "b58046db4223e145afa76009e61bac87cc2281b3"; + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz"; + name = "parseurl-1.3.1.tgz"; + sha1 = "c8ab8c9223ba34888aa64a297b28853bec18da56"; }; deps = { }; @@ -1624,7 +1610,7 @@ version = "0.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; name = "path-to-regexp-0.1.3.tgz"; sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb"; }; @@ -1643,7 +1629,7 @@ version = "0.0.11"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; + url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; name = "pause-stream-0.0.11.tgz"; sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; }; @@ -1657,15 +1643,15 @@ cpu = [ ]; }; by-spec."pkginfo"."0.3.x" = - self.by-version."pkginfo"."0.3.0"; - by-version."pkginfo"."0.3.0" = self.buildNodePackage { - name = "pkginfo-0.3.0"; - version = "0.3.0"; + self.by-version."pkginfo"."0.3.1"; + by-version."pkginfo"."0.3.1" = self.buildNodePackage { + name = "pkginfo-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; - name = "pkginfo-0.3.0.tgz"; - sha1 = "726411401039fe9b009eea86614295d5f3a54276"; + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; + name = "pkginfo-0.3.1.tgz"; + sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; }; deps = { }; @@ -1682,7 +1668,7 @@ version = "1.2.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/properties/-/properties-1.2.1.tgz"; + url = "https://registry.npmjs.org/properties/-/properties-1.2.1.tgz"; name = "properties-1.2.1.tgz"; sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; }; @@ -1695,19 +1681,19 @@ cpu = [ ]; }; by-spec."proxy-addr"."~1.0.6" = - self.by-version."proxy-addr"."1.0.8"; - by-version."proxy-addr"."1.0.8" = self.buildNodePackage { - name = "proxy-addr-1.0.8"; - version = "1.0.8"; + self.by-version."proxy-addr"."1.0.10"; + by-version."proxy-addr"."1.0.10" = self.buildNodePackage { + name = "proxy-addr-1.0.10"; + version = "1.0.10"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz"; - name = "proxy-addr-1.0.8.tgz"; - sha1 = "db54ec878bcc1053d57646609219b3715678bafe"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz"; + name = "proxy-addr-1.0.10.tgz"; + sha1 = "0d40a82f801fc355567d2ecb65efe3f077f121c5"; }; deps = { "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0"; - "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1"; + "ipaddr.js-1.0.5" = self.by-version."ipaddr.js"."1.0.5"; }; optionalDependencies = { }; @@ -1722,7 +1708,7 @@ version = "1.2.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-1.2.0.tgz"; + url = "https://registry.npmjs.org/qs/-/qs-1.2.0.tgz"; name = "qs-1.2.0.tgz"; sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee"; }; @@ -1741,7 +1727,7 @@ version = "2.3.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; + url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; name = "qs-2.3.3.tgz"; sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; }; @@ -1754,15 +1740,15 @@ cpu = [ ]; }; by-spec."range-parser"."~1.0.2" = - self.by-version."range-parser"."1.0.2"; - by-version."range-parser"."1.0.2" = self.buildNodePackage { - name = "range-parser-1.0.2"; - version = "1.0.2"; + self.by-version."range-parser"."1.0.3"; + by-version."range-parser"."1.0.3" = self.buildNodePackage { + name = "range-parser-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"; - name = "range-parser-1.0.2.tgz"; - sha1 = "06a12a42e5131ba8e457cd892044867f2344e549"; + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; + name = "range-parser-1.0.3.tgz"; + sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; }; deps = { }; @@ -1779,15 +1765,15 @@ version = "1.0.27-1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; name = "readable-stream-1.0.27-1.tgz"; sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; }; deps = { - "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; + "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2"; "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "inherits-2.0.3" = self.by-version."inherits"."2.0.3"; }; optionalDependencies = { }; @@ -1802,7 +1788,7 @@ version = "0.12.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/redis/-/redis-0.12.1.tgz"; + url = "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"; name = "redis-0.12.1.tgz"; sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e"; }; @@ -1821,7 +1807,7 @@ version = "1.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; + url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; name = "reduce-component-1.0.1.tgz"; sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; }; @@ -1840,7 +1826,7 @@ version = "0.11.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.11.1.tgz"; + url = "https://registry.npmjs.org/send/-/send-0.11.1.tgz"; name = "send-0.11.1.tgz"; sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5"; }; @@ -1854,7 +1840,7 @@ "mime-1.2.11" = self.by-version."mime"."1.2.11"; "ms-0.7.0" = self.by-version."ms"."0.7.0"; "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3"; }; optionalDependencies = { }; @@ -1869,13 +1855,13 @@ version = "1.8.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz"; name = "serve-static-1.8.1.tgz"; sha1 = "08fabd39999f050fc311443f46d5888a77ecfc7c"; }; deps = { "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1"; "send-0.11.1" = self.by-version."send"."0.11.1"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; @@ -1892,7 +1878,7 @@ version = "0.3.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/split/-/split-0.3.3.tgz"; + url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz"; name = "split-0.3.3.tgz"; sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; }; @@ -1912,7 +1898,7 @@ version = "0.0.9"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; + url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; name = "stack-trace-0.0.9.tgz"; sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; }; @@ -1931,7 +1917,7 @@ version = "0.0.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; + url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; name = "stream-combiner-0.0.4.tgz"; sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; }; @@ -1951,7 +1937,7 @@ version = "2.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/string/-/string-2.0.1.tgz"; + url = "https://registry.npmjs.org/string/-/string-2.0.1.tgz"; name = "string-2.0.1.tgz"; sha1 = "ef1473b3e11cb8158671856556959b9aff5fd759"; }; @@ -1970,7 +1956,7 @@ version = "0.10.31"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; name = "string_decoder-0.10.31.tgz"; sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; }; @@ -1989,7 +1975,7 @@ version = "0.21.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz"; + url = "https://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz"; name = "superagent-0.21.0.tgz"; sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87"; }; @@ -2000,7 +1986,7 @@ "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; "methods-1.0.1" = self.by-version."methods"."1.0.1"; "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "debug-2.6.0" = self.by-version."debug"."2.6.0"; "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1"; "extend-1.2.1" = self.by-version."extend"."1.2.1"; "form-data-0.1.3" = self.by-version."form-data"."0.1.3"; @@ -2019,7 +2005,7 @@ version = "2.3.8"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/through/-/through-2.3.8.tgz"; + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; name = "through-2.3.8.tgz"; sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; @@ -2042,7 +2028,7 @@ version = "1.5.7"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz"; + url = "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz"; name = "type-is-1.5.7.tgz"; sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90"; }; @@ -2063,7 +2049,7 @@ version = "1.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; name = "utils-merge-1.0.0.tgz"; sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; }; @@ -2082,7 +2068,7 @@ version = "1.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; + url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; name = "vary-1.0.1.tgz"; sha1 = "99e4981566a286118dfb2b817357df7993376d10"; }; @@ -2095,18 +2081,20 @@ cpu = [ ]; }; by-spec."verror"."^1.4.0" = - self.by-version."verror"."1.6.0"; - by-version."verror"."1.6.0" = self.buildNodePackage { - name = "verror-1.6.0"; - version = "1.6.0"; + self.by-version."verror"."1.9.0"; + by-version."verror"."1.9.0" = self.buildNodePackage { + name = "verror-1.9.0"; + version = "1.9.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/verror/-/verror-1.6.0.tgz"; - name = "verror-1.6.0.tgz"; - sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5"; + url = "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz"; + name = "verror-1.9.0.tgz"; + sha1 = "107a8a2d14c33586fc4bb830057cd2d19ae2a6ee"; }; deps = { - "extsprintf-1.2.0" = self.by-version."extsprintf"."1.2.0"; + "assert-plus-1.0.0" = self.by-version."assert-plus"."1.0.0"; + "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2"; + "extsprintf-1.3.0" = self.by-version."extsprintf"."1.3.0"; }; optionalDependencies = { }; @@ -2115,15 +2103,15 @@ cpu = [ ]; }; by-spec."websocket-driver".">=0.5.1" = - self.by-version."websocket-driver"."0.6.2"; - by-version."websocket-driver"."0.6.2" = self.buildNodePackage { - name = "websocket-driver-0.6.2"; - version = "0.6.2"; + self.by-version."websocket-driver"."0.6.5"; + by-version."websocket-driver"."0.6.5" = self.buildNodePackage { + name = "websocket-driver-0.6.5"; + version = "0.6.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.2.tgz"; - name = "websocket-driver-0.6.2.tgz"; - sha1 = "8281dba3e299e5bd7a42b65d4577a8928c26f898"; + url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; + name = "websocket-driver-0.6.5.tgz"; + sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; }; deps = { "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1"; @@ -2141,7 +2129,7 @@ version = "0.1.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; + url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; name = "websocket-extensions-0.1.1.tgz"; sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; }; @@ -2160,7 +2148,7 @@ version = "0.8.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; + url = "https://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; name = "winston-0.8.0.tgz"; sha1 = "61d0830fa699706212206b0a2b5ca69a93043668"; }; @@ -2169,7 +2157,7 @@ "colors-0.6.2" = self.by-version."colors"."0.6.2"; "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; + "pkginfo-0.3.1" = self.by-version."pkginfo"."0.3.1"; "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; }; optionalDependencies = { @@ -2185,7 +2173,7 @@ version = "0.0.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; name = "wordwrap-0.0.3.tgz"; sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; }; diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 3813baa6420..9fc0a303ad0 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -1,33 +1,36 @@ -{ stdenv, fetchurl, pkgs, makeWrapper, mono, ffmpeg, ... }: +{ stdenv, fetchurl, pkgs, unzip, sqlite, makeWrapper, mono46, ffmpeg, ... }: stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.0.8500"; + version = "3.1.5"; src = fetchurl { - url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz"; - sha256 = "0vm2yvwyhswsp31g48qdzm17c4p7c25vyiy1029hgy8nd5qy4shc"; + url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; + sha256 = "0s0m456rxdrj58zbaby6mdgc1ndc3zx2c07n94hn3hdlgralgwaa"; }; buildInputs = with pkgs; [ + unzip makeWrapper ]; propagatedBuildInputs = with pkgs; [ - mono + mono46 sqlite ]; + # Need to set sourceRoot as unpacker will complain about multiple directory output + sourceRoot = "."; + buildPhase = '' - xbuild /p:Configuration="Release Mono" /p:Platform="Any CPU" /t:build MediaBrowser.Mono.sln - substituteInPlace MediaBrowser.Server.Mono/bin/Release\ Mono/System.Data.SQLite.dll.config --replace libsqlite3.so ${pkgs.sqlite.out}/lib/libsqlite3.so - substituteInPlace MediaBrowser.Server.Mono/bin/Release\ Mono/MediaBrowser.Server.Mono.exe.config --replace ProgramData-Server "/var/lib/emby/ProgramData-Server" + substituteInPlace SQLitePCLRaw.provider.sqlite3.dll.config --replace libsqlite3.so ${sqlite.out}/lib/libsqlite3.so + substituteInPlace MediaBrowser.Server.Mono.exe.config --replace ProgramData-Server "/var/lib/emby/ProgramData-Server" ''; installPhase = '' mkdir -p $out/bin - cp -r MediaBrowser.Server.Mono/bin/Release\ Mono/* $out/bin/ + cp -r * $out/bin - makeWrapper "${mono}/bin/mono" $out/bin/MediaBrowser.Server.Mono \ + makeWrapper "${mono46}/bin/mono" $out/bin/MediaBrowser.Server.Mono \ --add-flags "$out/bin/MediaBrowser.Server.Mono.exe -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" ''; diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index 17a50506fa9..5ce680e3646 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "apache-felix-2.0.5"; +stdenv.mkDerivation rec { + name = "apache-felix-${version}"; + version = "5.6.1"; src = fetchurl { - url = http://apache.xl-mirror.nl/felix/org.apache.felix.main.distribution-2.0.5.tar.gz; - sha256 = "14nva0q1b45kmmalcls5yx97syd4vn3vcp8gywck1098qhidi66g"; + url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz"; + sha256 = "0kis26iajzdid162j4i7g558q09x4hn9z7pqqys6ipb0fj84hz1x"; }; buildCommand = '' @@ -15,7 +16,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { description = "An OSGi gateway"; - homepage = http://felix.apache.org; + homepage = https://felix.apache.org; license = licenses.asl20; maintainers = [ maintainers.sander ]; }; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index cbafe16623e..117fa8782c9 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -2,9 +2,9 @@ , openssl , linkOpenssl? true , openldap -, withLdap ? false +, withLdap ? true , sqlite -, withSqlite ? false +, withSqlite ? true , libpcap , withPcap ? true , libcap @@ -40,9 +40,16 @@ assert withCollectd -> collectd != null; with stdenv.lib; stdenv.mkDerivation rec { name = "freeradius-${version}"; - version = "3.0.11"; + version = "3.0.12"; - buildInputs = [ autoreconfHook openssl talloc finger_bsd perl ] + src = fetchurl { + url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; + sha256 = "182xnb9pdsivlyfm471l90m37q9i04h7jadhkgm0ivvzrzpzcnja"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ openssl talloc finger_bsd perl ] ++ optional withLdap openldap ++ optional withSqlite sqlite ++ optional withPcap libpcap @@ -54,8 +61,6 @@ stdenv.mkDerivation rec { ++ optional withYubikey libyubikey ++ optional withCollectd collectd; - # NOTE: are the --with-{lib}-lib-dir and --with-{lib}-include-dir necessary with buildInputs ? - configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" @@ -70,11 +75,6 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - src = fetchurl { - url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - sha256 = "0naxw9b060rbp4409904j6nr2zwl6wbjrbq1839xrwhmaf8p4yxr"; - }; - meta = with stdenv.lib; { homepage = http://freeradius.org/; description = "A modular, high performance free RADIUS suite"; diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix deleted file mode 100644 index 8cab241f85c..00000000000 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, openssl, perl, zlib -, sslSupport, proxySupport ? true -, apr, aprutil, pcre -, ldapSupport ? true, openldap -, # Multi-processing module to use. This is built into the server and - # cannot be selected at runtime. - mpm ? "prefork" -}: - -assert sslSupport -> openssl != null; -assert ldapSupport -> aprutil.ldapSupport && openldap != null; -assert mpm == "prefork" || mpm == "worker" || mpm == "event"; - -stdenv.mkDerivation rec { - version = "2.2.31"; - name = "apache-httpd-${version}"; - - src = fetchurl { - url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "1b165zi7jrrlz5wmyy3b34lcs3dl4g0dymfb0qxwdnimylcrsbzk"; - }; - - # FIXME: -dev depends on -doc - outputs = [ "out" "dev" "doc" ]; - setOutputFlags = false; # it would move $out/modules, etc. - - propagatedBuildInputs = [ apr ]; # otherwise mod_* fail to find includes often - buildInputs = [ pkgconfig perl aprutil pcre zlib ] ++ - stdenv.lib.optional sslSupport openssl; - - # Required for ‘pthread_cancel’. - NIX_LDFLAGS = (if stdenv.isDarwin then "" else "-lgcc_s"); - - patchPhase = '' - sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" - ''; - - preConfigure = '' - configureFlags="$configureFlags --includedir=$dev/include" - ''; - configureFlags = '' - --with-z=${zlib.dev} - --with-pcre=${pcre.dev} - --enable-mods-shared=all - --enable-authn-alias - ${if proxySupport then "--enable-proxy" else ""} - ${if sslSupport then "--enable-ssl --with-ssl=${openssl.dev}" else ""} - ${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""} - --with-mpm=${mpm} - --enable-cache - --enable-disk-cache - --enable-file-cache - --enable-mem-cache - --docdir=$(doc)/share/doc - ''; - - enableParallelBuilding = true; - - stripDebugList = "lib modules bin"; - - postInstall = '' - mkdir -p $doc/share/doc/httpd - mv $out/manual $doc/share/doc/httpd - mkdir -p $dev/bin - mv $out/bin/apxs $dev/bin/apxs - ''; - - passthru = { - inherit apr aprutil sslSupport proxySupport; - }; - - meta = { - description = "Apache HTTPD, the world's most popular web server"; - branch = "2.2"; - homepage = http://httpd.apache.org/; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; - }; -} diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index 06f12820a10..80cbf12d2a6 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, apacheHttpd_2_2, apr, avahi }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, apacheHttpd, apr, avahi }: stdenv.mkDerivation rec { name = "mod_dnssd-0.6"; @@ -10,7 +10,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-lynx" ]; - buildInputs = [ pkgconfig apacheHttpd_2_2 avahi apr ]; + buildInputs = [ pkgconfig apacheHttpd avahi apr ]; + + patches = [ (fetchpatch { + url = "http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/mod-dnssd/vivid/download/package-import%40ubuntu.com-20130530193334-kqebiy78q534or5k/portforapache2.4.pat-20130530222510-7tlw5btqchd04edb-3/port-for-apache2.4.patch"; + sha256 = "1hgcxwy1q8fsxfqyg95w8m45zbvxzskf1jxd87ljj57l7x1wwp4r"; + }) ]; installPhase = '' mkdir -p $out/modules @@ -25,4 +30,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lethalman ]; }; } - diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 0e688b0c0c4..a9f3d74e99c 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.11.8"; - sha256 = "0d3bcrgj2ykky2yk06y0ihv6832s30mqzcfwq8a560brbmqz7bjk"; + version = "1.11.10"; + sha256 = "0gak6pcsn1m8fsz0g95z4b72nn12ivy35vlxrmagfcvnn2mkr2vp"; }) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index 8d91f4e4b9b..efbcada6230 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.10.2"; - sha256 = "1hk5szkwns6s0xsvd0aiy392sqbvk3wdl480bpxf55m3hx4sqi8h"; + version = "1.10.3"; + sha256 = "146xd566l1wkhzxqhmd01vj7c0yhsap1qkiwfg5mki6ach9hy0km"; }) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 909b26f162b..12d6f8996ad 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -30,34 +30,27 @@ let }); in { - - tomcat6 = common { - versionMajor = "6"; - versionMinor = "0.48"; - sha256 = "1w4jf28g8p25fmijixw6b02iqlagy2rvr57y3n90hvz341kb0bbc"; - }; - tomcat7 = common { versionMajor = "7"; - versionMinor = "0.73"; - sha256 = "11gaiy56q7pik06sdypr80sl3g6k41s171wqqwlhxffmsxm4v08f"; + versionMinor = "0.75"; + sha256 = "0w5adsy4792qkf3ws46f539lrdbpz7lghy79s6b04c9yqaxjz6ni"; }; tomcat8 = common { versionMajor = "8"; - versionMinor = "0.39"; - sha256 = "16hyypdawby66qa8y66sfprcf78wjy319a0gsi4jgfqfywcsm4s0"; + versionMinor = "0.41"; + sha256 = "1mvnf6m29y3p40vvi9mgghrddlmgwcrcvfwrf9vbama78fsh8wm5"; }; tomcat85 = common { versionMajor = "8"; - versionMinor = "5.9"; - sha256 = "1dy8bf18jwyi6p7ayb96gbhd4iyfq4d37s3qxnlll8vklfx388np"; + versionMinor = "5.11"; + sha256 = "0i1xvgpj4l4agc8vxrnfm127w4mc33pyl8963pwpklqpdk4shcjn"; }; tomcatUnstable = common { versionMajor = "9"; - versionMinor = "0.0.M15"; - sha256 = "1spbq5vh2dplp83ki3fbbwl0klxq36s4rwkpcjdnwjxjymg9k432"; + versionMinor = "0.0.M17"; + sha256 = "1ilvka2062m7412bj2fsdwvfxbrjyj9qxcia40hhv22prvkxw3cg"; }; } diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix index 3562ea1e129..d070a9f1740 100644 --- a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix +++ b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix @@ -1,10 +1,10 @@ -{ stdenv, tomcat6, mysql_jdbc }: +{ stdenv, mysql_jdbc }: stdenv.mkDerivation { name = "tomcat-mysql-jdbc"; builder = ./builder.sh; buildInputs = [ mysql_jdbc ]; - + inherit mysql_jdbc; meta = { diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix index 113b297787b..ae3347c9671 100644 --- a/pkgs/servers/inginious/default.nix +++ b/pkgs/servers/inginious/default.nix @@ -4,14 +4,14 @@ with lib; let pythonPackages = python2Packages; - docker_1_7_2 = pythonPackages.docker.override rec { + docker_1_7_2 = pythonPackages.docker.overrideAttrs (oldAttrs: rec { name = "docker-py-1.7.2"; src = pkgs.fetchurl { url = "mirror://pypi/d/docker-py/${name}.tar.gz"; sha256 = "0k6hm3vmqh1d3wr9rryyif5n4rzvcffdlb1k4jvzp7g4996d3ccm"; }; - }; + }); webpy-custom = pythonPackages.web.override { name = "web.py-INGI"; diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index 82ed92084df..a0b59d332a3 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -30,7 +30,7 @@ buildGoPackage rec { -e 's|/bin/chown|${coreutils}/bin/chown|' \ -e 's|/bin/date|${coreutils}/bin/date|' \ -e 's|/sbin/poweroff|${systemd}/sbin/poweroff|' \ - -e 's|/usr/bin/sudo|/var/setuid-wrappers/sudo|' \ + -e 's|/usr/bin/sudo|/run/wrappers/bin/sudo|' \ -e 's|/sbin/cryptsetup|${cryptsetup}/bin/cryptsetup|' ''; } diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index 1f11f1526f9..82a571ca77c 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib }: -stdenv.mkDerivation { - name = "ircd-hybrid-8.2.2"; +stdenv.mkDerivation rec { + name = "ircd-hybrid-8.2.21"; src = fetchurl { - url = mirror://sourceforge/ircd-hybrid/ircd-hybrid-8.2.2.tgz; - sha256 = "0k9w2mxgi03cpnmagshcr5v6qjgnmyidf966b50dd6yn1fgqcibm"; + url = "mirror://sourceforge/ircd-hybrid/${name}.tgz"; + sha256 = "19cgrgmmz1c72x4gxpd39f9ckm4j9cp1gpgvlkk73d3v13znfzy3"; }; buildInputs = [ openssl zlib ]; @@ -18,5 +18,6 @@ stdenv.mkDerivation { meta = { description = "An IPv6-capable IRC server"; platforms = stdenv.lib.platforms.unix; + homepage = "http://www.ircd-hybrid.org/"; }; } diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix index ebc7e7c3128..4dd57b17fed 100644 --- a/pkgs/servers/irc/ngircd/default.nix +++ b/pkgs/servers/irc/ngircd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, openssl, pam, libiconv }: stdenv.mkDerivation rec { - name = "ngircd-21"; + name = "ngircd-24"; src = fetchurl { url = "http://ngircd.barton.de/pub/ngircd/${name}.tar.xz"; - sha256 = "19llx54zy6hc8k7kcs1f234qc20mqpnlnb30c663c42jxq5x6xii"; + sha256 = "020h9d1awyxqr0l42x1fhs47q7cmm17fdxzjish8p2kq23ma0gqp"; }; configureFlags = [ diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 6ba60ff1772..3b104232673 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -2,14 +2,14 @@ , db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages }: let - version = "1.3.5.4"; + version = "1.3.5.15"; in stdenv.mkDerivation rec { name = "389-ds-base-${version}"; src = fetchurl { url = "http://directory.fedoraproject.org/binaries/${name}.tar.bz2"; - sha256 = "1f1r4wky8x39jdabnd277f6m0snnzh9f0wvsr8x4rnvkckjphbx8"; + sha256 = "1z17nnr4axndjyp413kyxb6iwdfky7nlsjhlc0klvdi2ai983p91"; }; buildInputs = [ @@ -20,13 +20,6 @@ stdenv.mkDerivation rec { # TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump patches = [ ./perl-path.patch - # https://fedorahosted.org/389/ticket/48354 - (fetchpatch { - name = "389-ds-base-CVE-2016-5416.patch"; - url = "https://fedorahosted.org/389/changeset/3c2cd48b7d2cb0579f7de6d460bcd0c9bb1157bd/?format=diff&new=3c2cd48b7d2cb0579f7de6d460bcd0c9bb1157bd"; - addPrefixes = true; - sha256 = "1kv3a3di1cihkaf8xdbb5mzvhm4c3frx8rc5mji8xgjyj9ni6xja"; - }) ]; preConfigure = '' @@ -46,7 +39,7 @@ stdenv.mkDerivation rec { "--with-sasl=${cyrus_sasl.dev}" "--with-netsnmp=${net_snmp}" ]; - + preInstall = '' # The makefile doesn't create this directory for whatever reason mkdir -p $out/lib/dirsrv diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix index 3ecb00b64fc..395f3ded7fd 100644 --- a/pkgs/servers/mail/petidomo/default.nix +++ b/pkgs/servers/mail/petidomo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, sendmailPath ? "/var/setuid-wrappers/sendmail" }: +{ stdenv, fetchurl, flex, bison, sendmailPath ? "/run/wrappers/bin/sendmail" }: stdenv.mkDerivation rec { name = "petidomo-4.3"; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 692227b5094..6283bed96c3 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -6,13 +6,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "vstakhov"; repo = "rspamd"; rev = version; - sha256 = "19hy9qr9lv17br2algig95d64zzdyly7n6c3z8fanwcpk35sgrhr"; + sha256 = "1wrqi8vsd61rc48x2gyhc0xrir9pr372lpkyhwgx1rpxzdxsdwh9"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index fd74ffe54c3..587ec52c421 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,26 +11,26 @@ let }; matrix-synapse-ldap3 = pythonPackages.buildPythonApplication rec { name = "matrix-synapse-ldap3-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = "matrix-synapse-ldap3"; - rev = "564eb3f109ce7f1082c47d5f8efaa792d90467f1"; - sha256 = "1mkjlvy7a3rq405m59ihkh1wq7pa4l03fp8hgwwyjnbmz25bqmbk"; + rev = "v${version}"; + sha256 = "16pivz1lhs1c3z84rxxy8khyvn0hqxwxaz552br1y9ri0maa0aq8"; }; propagatedBuildInputs = with pythonPackages; [ service-identity ldap3 twisted ]; }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.18.7-rc2"; + version = "0.19.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "13rx77xfcci7q8xpxxgnh84h6md53akjcy9glwn20vm9vpka3vvj"; + sha256 = "1jjfa3vigghnk201zkhp97mh25cx17gic0cjn0fgn7yxs83wrh5c"; }; patches = [ ./matrix-synapse.patch ]; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 977df396755..477338a3317 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mattermost-${version}"; - version = "3.3.0"; + version = "3.6.2"; src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz"; - sha256 = "16mp75hv4lzkj99lj18c5vyqsmk9kqk5r81hirq41fgb6bdqx509"; + sha256 = "1wf8xvy8njmhym45dwag6mdwhfgzg5xccvhyv7c68rz5h57vfgsb"; }; installPhase = '' diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index f3b20add96d..d830af19bdc 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "matterircd-${version}"; - version = "0.9.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "1sh34vwi8ycmdsgpzqwa7gcjzb0rn46aig6n40hxy6q1lk2l6m3c"; + sha256 = "0yxqlckir50kdlbi36kak5ncfzl6sh811hzicdar5yzanzcip8ja"; }; goPackagePath = "github.com/42vim/matterircd"; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index e7b6fff1b66..bc2bbb13c44 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "minio-${shortVersion}"; - shortVersion = "20161213"; - longVersion = "2016-12-13T17:19:42Z"; + shortVersion = "20170125"; + longVersion = "2017-01-25T03-14-52Z"; src = fetchurl { url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; - sha256 = "1x23arrah54q2zqhgpyag531mimvs0wx6ap0hdrn4mygy5dahrqs"; + sha256 = "0yh8fdgl50sza182kl4jly0apf0dw0ya954ky6j8a8hmdcmk6wzk"; }; buildInputs = [ go ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index f2ce7822b8a..6c7b7ff001a 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.1.1"; - ts = "1484211277"; + version = "4.1.2"; + ts = "1486989747"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -10,12 +10,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "028s8fq8akv509kqw49865qpccxmhskaxcm51nn3c0i7vask2ivs"; + sha256 = "0x2knb2lrs6sbj3svcjn70p46fzdy71gh8fgi801g1l0yp9s5yrg"; }; srcStatic = fetchurl { url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-${ts}.linux-x64.tar.gz"; - sha256 = "1srscjlm9m08z7shydhkl4wnhv19by7pqfd7qvbvz2v3d5slqiji"; + sha256 = "1i7n1a2xn65flwy2zqs3kqg1ch51653r52qn3gfh5hp92k81q4dq"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 25ff8ed25fc..3e4e778e238 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, makeWrapper, which, coreutils, rrdtool, perl, perlPackages +{ stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perl, perlPackages , python, ruby, jre, nettools }: stdenv.mkDerivation rec { - version = "2.0.29"; + version = "2.0.30"; name = "munin-${version}"; - src = fetchurl { - url = "https://github.com/munin-monitoring/munin/archive/${version}.tar.gz"; - sha256 = "1zpv0p10iyx49z1hsqvlkk6hh46hp9dhbrdyx103hgx7p3xnxfnv"; + src = fetchFromGitHub { + owner = "munin-monitoring"; + repo = "munin"; + rev = version; + sha256 = "1sxsdfq9a5d8b13jigr06gs7n4m3c95645sfyyl49bkfy0n5cxrg"; }; buildInputs = [ diff --git a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix index 306dee0ec62..1ea6f88084d 100644 --- a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix +++ b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, openssh }: +{ stdenv, fetchurl, openssh, openssl }: stdenv.mkDerivation rec { name = "nagios-plugins-${version}"; - version = "2.1.4"; + version = "2.2.0"; src = fetchurl { url = "http://nagios-plugins.org/download/${name}.tar.gz"; - sha256 = "146hrpcwciz0niqsv4k5yvkhaggs9mr5v02xnnxp5yp0xpdbama3"; + sha256 = "074yia04py5y07sbgkvri10dv8nf41kqq1x6kmwqcix5vvm9qyy3"; }; # !!! Awful hack. Grrr... this of course only works on NixOS. @@ -16,15 +16,15 @@ stdenv.mkDerivation rec { # configured on the build machine). preConfigure= " configureFlagsArray=( - --with-ping-command='/var/setuid-wrappers/ping -n -U -w %d -c %d %s' - --with-ping6-command='/var/setuid-wrappers/ping6 -n -U -w %d -c %d %s' + --with-ping-command='/run/wrappers/bin/ping -n -U -w %d -c %d %s' + --with-ping6-command='/run/wrappers/bin/ping6 -n -U -w %d -c %d %s' ) "; postInstall = "ln -s libexec $out/bin"; # !!! make openssh a runtime dependency only - buildInputs = [ openssh ]; + buildInputs = [ openssh openssl ]; meta = { description = "Official plugins for Nagios"; diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix new file mode 100644 index 00000000000..db58c7e14e5 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "bind_exporter-${version}"; + version = "20161221-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "4e1717c7cd5f31c47d0c37274464cbaabdd462ba"; + + goPackagePath = "github.com/digitalocean/bind_exporter"; + + src = fetchFromGitHub { + inherit rev; + owner = "digitalocean"; + repo = "bind_exporter"; + sha256 = "1nd6pc1z627w4x55vd42zfhlqxxjmfsa9lyn0g6qq19k4l85v1qm"; + }; + + meta = with stdenv.lib; { + description = "Prometheus exporter for bind9 server"; + homepage = https://github.com/digitalocean/bind_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ rtreffer ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index a5fc6e4d94e..5d7a75b2013 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "prometheus-${version}"; - version = "1.4.1"; + version = "1.5.2"; rev = "v${version}"; goPackagePath = "github.com/prometheus/prometheus"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "05yd3y1b0406qdmx7p27pya9kzcrv66069z1y8dqwj3bf9c7csnm"; + sha256 = "1b24nx6gmx2c7fj92p2byla3i0zs6xwymxqji00gvgpxr8bsfhn1"; }; docheck = true; @@ -36,7 +36,7 @@ buildGoPackage rec { description = "Service monitoring system and time series database"; homepage = http://prometheus.io; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 5d653474961..64585de51ff 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { name = "riemann-${version}"; - version = "0.2.9"; + version = "0.2.12"; src = fetchurl { - url = "http://aphyr.com/riemann/${name}.tar.bz2"; - sha256 = "10zz92sg9ak8g7xsfc05p4kic6hzwj7nqpkjgsd8f7f3slvfjqw3"; + url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2"; + sha256 = "1x57gi301rg6faxm4q5scq9dpp0v9nqiwjpsgigdb8whmjr1zwkr"; }; + nativeBuildInputs = [ makeWrapper ]; + phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - sed -i 's#lib/riemann.jar#$out/share/java/riemann.jar#' bin/riemann + substituteInPlace bin/riemann --replace '$top/lib/riemann.jar' "$out/share/java/riemann.jar" mkdir -p $out/share/java $out/bin $out/etc mv lib/riemann.jar $out/share/java/ mv bin/riemann $out/bin/ mv etc/riemann.config $out/etc/ + + wrapProgram "$out/bin/riemann" --prefix PATH : "${jre}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 996c839acff..1412f76c25a 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.1.2"; + version = "1.2.1"; goPackagePath = "github.com/influxdata/telegraf"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "0dgrbdyz261j28wcq636125ha4xmfgh4y9shlg8m1y6jqdqd2zf2"; + sha256 = "0vfx87a9shhwyqrbdf1jc32jkg0ych8bd0p222v2rcd83l75r0kh"; }; goDeps = ./. + builtins.toPath "/deps-${version}.nix"; diff --git a/pkgs/servers/monitoring/telegraf/deps-1.1.2.nix b/pkgs/servers/monitoring/telegraf/deps-1.2.1.nix similarity index 97% rename from pkgs/servers/monitoring/telegraf/deps-1.1.2.nix rename to pkgs/servers/monitoring/telegraf/deps-1.2.1.nix index b62ae44dbc9..a866881e53d 100644 --- a/pkgs/servers/monitoring/telegraf/deps-1.1.2.nix +++ b/pkgs/servers/monitoring/telegraf/deps-1.2.1.nix @@ -198,15 +198,6 @@ sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn"; }; } - { - goPackagePath = "github.com/gonuts/go-shellquote"; - fetch = { - type = "git"; - url = "https://github.com/gonuts/go-shellquote"; - rev = "e842a11b24c6abfb3dd27af69a17f482e4b483c2"; - sha256 = "19lbz7wl241bsyzsv2ai40b2vnj8c9nl107b6jf9gid3i6h0xydg"; - }; - } { goPackagePath = "github.com/gorilla/context"; fetch = { @@ -306,6 +297,15 @@ sha256 = "1g10qisgywfqj135yyiq63pnbjgr201gz929ydlgyzqq6yk3bn3h"; }; } + { + goPackagePath = "github.com/kballard/go-shellquote"; + fetch = { + type = "git"; + url = "https://github.com/kballard/go-shellquote"; + rev = "d8ec1a69a250a17bb0e419c386eac1f3711dc142"; + sha256 = "1a57hm0zwyi70am670s0pkglnkk1ilddnmfxz1ba7innpkf5z6s7"; + }; + } { goPackagePath = "github.com/klauspost/crc32"; fetch = { @@ -446,8 +446,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "4d0c402af66c78735c5ccf820dc2ca7de5e4ff08"; - sha256 = "1wkp7chzpz6brq2y0k2mvsf0iaknns279wfsjn5gm6gvih49lqni"; + rev = "1516eb9ddc5e61ba58874047a98f8b44b5e585e8"; + sha256 = "1pnl1g2l1y5vmnraq97rbm0nirprqvfzxsp6h4xacn1429jdl5bv"; }; } { @@ -491,8 +491,8 @@ fetch = { type = "git"; url = "https://github.com/wvanbergen/kafka"; - rev = "46f9a1cf3f670edec492029fadded9c2d9e18866"; - sha256 = "1czmbilprffdbwnrq4wcllaqknbq91l6p0ni6b55fkaggnwck694"; + rev = "bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee"; + sha256 = "0x86gnkpsr6gsc6mk2312ay8yqrzscvvdra2knhvwgaws6rzvj2l"; }; } { diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index c07ca6a8342..e2ec4a7617d 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, systemd, boost, darwin , alsaSupport ? true, alsaLib +, avahiSupport ? true, avahi, dbus , flacSupport ? true, flac , vorbisSupport ? true, libvorbis , madSupport ? true, libmad @@ -26,23 +27,29 @@ , soundcloudSupport ? true, yajl }: +assert avahiSupport -> avahi != null && dbus != null; + let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.20"; - minor = ""; + minor = "4"; in stdenv.mkDerivation rec { name = "mpd-${major}${if minor == "" then "" else "." + minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; - sha256 = "068nxsfkp2ppcjh3fmcbapkiwnjpvkii73bfydpw4bf2yphdvsa8"; + sha256 = "0a4psqsf71vc6hfgyv55jclsx8yb7lf4w840qlq6cq8j3hsjaavi"; }; + patches = [ ./i386.patch ]; + buildInputs = [ pkgconfig glib boost ] ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit ++ opt stdenv.isLinux systemd ++ opt (stdenv.isLinux && alsaSupport) alsaLib + ++ opt avahiSupport avahi + ++ opt avahiSupport dbus ++ opt flacSupport flac ++ opt vorbisSupport libvorbis # using libmad to decode mp3 files on darwin is causing a segfault -- there @@ -99,6 +106,7 @@ in stdenv.mkDerivation rec { (mkFlag opusSupport "opus") (mkFlag soundcloudSupport "soundcloud") "--enable-debug" + "--with-zeroconf=avahi" ] ++ opt stdenv.isLinux "--with-systemdsystemunitdir=$(out)/etc/systemd/system"; @@ -111,7 +119,7 @@ in stdenv.mkDerivation rec { description = "A flexible, powerful daemon for playing music"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; license = licenses.gpl2; - maintainers = with maintainers; [ astsmtl fuuzetsu ehmry ]; + maintainers = with maintainers; [ astsmtl fuuzetsu ehmry fpletz ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/servers/mpd/i386.patch b/pkgs/servers/mpd/i386.patch new file mode 100644 index 00000000000..dca8ea88a8b --- /dev/null +++ b/pkgs/servers/mpd/i386.patch @@ -0,0 +1,14 @@ +diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx +index 6986453..167fc07 100644 +--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx ++++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx +@@ -20,8 +20,8 @@ + /* necessary because libavutil/common.h uses UINT64_C */ + #define __STDC_CONSTANT_MACROS + +-#include "lib/ffmpeg/Time.hxx" + #include "config.h" ++#include "lib/ffmpeg/Time.hxx" + #include "FfmpegDecoderPlugin.hxx" + #include "lib/ffmpeg/Domain.hxx" + #include "lib/ffmpeg/Error.hxx" diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 59f2b4ac5cf..d87aefd37fb 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "3.2.5"; + version = "3.2.8"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "05ak12xfkcinky6wvhy77knzd95m4vlshwka6jrdcjfqxyqww2c5"; + sha256 = "0b28d0fpkvf4m186gr2k53f1cqkccxzspmb959swrrhq7p177cv1"; }; buildInputs = [ lua ]; diff --git a/pkgs/servers/nosql/riak/2.1.1.nix b/pkgs/servers/nosql/riak/2.1.1.nix index b66e99f0afb..b18650fbbca 100644 --- a/pkgs/servers/nosql/riak/2.1.1.nix +++ b/pkgs/servers/nosql/riak/2.1.1.nix @@ -1,22 +1,22 @@ { stdenv, lib, fetchurl, unzip, erlangR16, which, pam, coreutils }: let - solrName = "solr-4.7.0-yz-1.tgz"; - yokozunaJarName = "yokozuna-2.jar"; + solrName = "solr-4.10.4-yz-2.tgz"; + yokozunaJarName = "yokozuna-3.jar"; yzMonitorJarName = "yz_monitor-1.jar"; srcs = { riak = fetchurl { - url = "http://s3.amazonaws.com/downloads.basho.com/riak/2.1/2.1.1/riak-2.1.1.tar.gz"; - sha256 = "1bm5j3zknz82mkyh5zgaap73awflh4mkibdvdz164235mdxlwhdm"; + url = "http://s3.amazonaws.com/downloads.basho.com/riak/2.2/2.2.0/riak-2.2.0.tar.gz"; + sha256 = "0kl28bpyzajcllybili46jfr1schl45w5ysii187jr0ssgls2c9p"; }; solr = fetchurl { url = "http://s3.amazonaws.com/files.basho.com/solr/${solrName}"; - sha256 = "0brml3lb3xk26rmi05rrzpxrw92alfi9gi7p7537ny9lqg3808qp"; + sha256 = "0fy5slnldn628gmr2kilyx606ph0iykf7pz6j0xjcc3wqvrixa2a"; }; yokozunaJar = fetchurl { url = "http://s3.amazonaws.com/files.basho.com/yokozuna/${yokozunaJarName}"; - sha256 = "0xzfy181qxv27pc4f5xd0szn8vls5743273awr5rwv3608gkspj2"; + sha256 = "17n6m100fz8affdcxsn4niw2lrpnswgfnd6aszgzipffwbg7v8v5"; }; yzMonitorJar = fetchurl { url = "http://s3.amazonaws.com/files.basho.com/yokozuna/${yzMonitorJarName}"; @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { - name = "riak-2.1.1"; + name = "riak-2.2.0"; buildInputs = [ which unzip erlangR16 pam diff --git a/pkgs/servers/portmap/default.nix b/pkgs/servers/portmap/default.nix deleted file mode 100644 index e53690ebc11..00000000000 --- a/pkgs/servers/portmap/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ fetchurl, stdenv, lib, tcp_wrappers -, daemonUser ? false, daemonUID ? false, daemonGID ? false }: - -assert daemonUser -> (!daemonUID && !daemonGID); - -stdenv.mkDerivation rec { - name = "portmap-6.0"; - - src = fetchurl { - url = "http://neil.brown.name/portmap/${name}.tgz"; - sha256 = "1pj13ll4mbfwjwpn3fbg03qq9im6v2i8fcpa3ffp4viykz9j1j02"; - }; - - patches = [ ./reuse-socket.patch ]; - - postPatch = '' - substituteInPlace "Makefile" --replace "/usr/share" "" \ - --replace "install -o root -g root" "install" - ''; - - makeFlags = - lib.optional (daemonUser != false) "RPCUSER=\"${daemonUser}\"" - ++ lib.optional (daemonUID != false) "DAEMON_UID=${toString daemonUID}" - ++ lib.optional (daemonGID != false) "DAEMON_GID=${toString daemonGID}"; - - buildInputs = [ tcp_wrappers ]; - - installPhase = '' - mkdir -p "$out/sbin" "$out/man/man8" - make install BASEDIR=$out - ''; - - meta = { - description = "ONC RPC portmapper"; - longDescription = '' - Portmap is part of the ONC RPC software collection implementing - remote procedure calls (RPCs) between computer programs. It is - widely used by NFS and NIS, among others. - ''; - - homepage = http://neil.brown.name/portmap/; - license = "BSD"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/servers/portmap/reuse-socket.patch b/pkgs/servers/portmap/reuse-socket.patch deleted file mode 100644 index 7d1a0ca0952..00000000000 --- a/pkgs/servers/portmap/reuse-socket.patch +++ /dev/null @@ -1,38 +0,0 @@ -Set SO_REUSEADDR to ensure that portmap can restart properly. - -https://bugs.launchpad.net/ubuntu/+source/portmap/+bug/688550 - -=================================================================== ---- portmap-6.0.0.orig/portmap.c 2011-03-16 20:43:26.000000000 +0100 -+++ portmap-6.0.0/portmap.c 2011-03-17 07:30:17.000000000 +0100 -@@ -142,9 +142,9 @@ - * loopback interface address. - */ - -+static int on = 1; - #ifdef LOOPBACK_SETUNSET - static SVCXPRT *ludpxprt, *ltcpxprt; --static int on = 1; - #ifndef INADDR_LOOPBACK - #define INADDR_LOOPBACK ntohl(inet_addr("127.0.0.1")) - #endif -@@ -399,9 +399,7 @@ - syslog(LOG_ERR, "cannot create udp socket: %m"); - exit(1); - } --#ifdef LOOPBACK_SETUNSET - setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof on); --#endif - - memset((char *) &addr, 0, sizeof(addr)); - addr.sin_addr.s_addr = 0; -@@ -434,9 +432,7 @@ - syslog(LOG_ERR, "cannot create tcp socket: %m"); - exit(1); - } --#ifdef LOOPBACK_SETUNSET - setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof on); --#endif - if (bind(sock, (struct sockaddr *)&addr, len) != 0) { - syslog(LOG_ERR, "cannot bind tcp: %m"); - exit(1); diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 09be8c7c587..680c9dfcb60 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook -, json_c, libsndfile, libtool +, libsndfile, libtool , xorg, libcap, alsaLib, glib , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "9.0"; + version = "10.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "11j682g2mn723sz3bh4i44ggq29z053zcggy0glzn63zh9mxdly3"; + sha256 = "0mrg8qvpwm4ifarzphl3749p7p050kdx1l6mvsaj03czvqj6h653"; }; patches = [ ./caps-fix.patch ] @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isLinux [ libcap ]; buildInputs = - [ json_c libsndfile speexdsp fftwFloat ] + [ libsndfile speexdsp fftwFloat ] ++ lib.optionals stdenv.isLinux [ glib dbus ] ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ] ++ lib.optionals (!libOnly) ( diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index 45c195c2cb2..b60212dea01 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, libcap, libnl, readline, net_snmp, less, perl, texinfo }: +{ stdenv, fetchurl, libcap, libnl, readline, net_snmp, less, perl, texinfo, + pkgconfig, c-ares }: stdenv.mkDerivation rec { name = "quagga-${version}"; - version = "1.0.20161017"; + version = "1.2.0"; src = fetchurl { url = "mirror://savannah/quagga/${name}.tar.gz"; - sha256 = "0629f7bkyh0a3n90kkr202g2i44id09qzkl05y8z66blvd6p49lg"; + sha256 = "1qyw675hrs3f67zprdbyw91wldmyihv97ibn1f99ypcp6x6n8hqh"; }; buildInputs = - [ readline net_snmp ] + [ readline net_snmp c-ares ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap libnl ]; - nativeBuildInputs = [ perl texinfo ]; + nativeBuildInputs = [ pkgconfig perl texinfo ]; configureFlags = [ "--sysconfdir=/etc/quagga" diff --git a/pkgs/servers/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch b/pkgs/servers/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch deleted file mode 100644 index 16b763ef0de..00000000000 --- a/pkgs/servers/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Mon, 2 Nov 2015 17:05:18 -0500 -Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly - -In the latest libtirpc version to access the xp_auth -one must use the SVC_XP_AUTH macro. To be backwards -compatible a couple ifdefs were added to use the -macro when it exists. - -Upstream-Status: Backport - -Signed-off-by: Steve Dickson -Signed-off-by: Maxin B. John ---- - src/rpcb_svc_com.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c -index 4ae93f1..22d6c84 100644 ---- a/src/rpcb_svc_com.c -+++ b/src/rpcb_svc_com.c -@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt) - a.rmt_localvers = fi->versnum; - - xprt_set_caller(xprt, fi); -+#if defined(SVC_XP_AUTH) -+ SVC_XP_AUTH(xprt) = svc_auth_none; -+#else - xprt->xp_auth = &svc_auth_none; -+#endif - svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a); -+#if !defined(SVC_XP_AUTH) - SVCAUTH_DESTROY(xprt->xp_auth); - xprt->xp_auth = NULL; -+#endif -+ - done: - if (buffer) - free(buffer); --- -2.4.0 - diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 744763c43f1..cc5d7795e05 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -1,28 +1,27 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, libtirpc +{ fetchurl, stdenv, pkgconfig, libtirpc , useSystemd ? true, systemd }: -let version = "0.2.3"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "rpcbind-${version}"; + version = "0.2.4"; src = fetchurl { url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2"; - sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq"; + sha256 = "0rjc867mdacag4yqvs827wqhkh27135rp9asj06ixhf71m9rljh7"; }; patches = [ ./sunrpc.patch - ./0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch - (fetchpatch { - url = "https://sources.debian.net/data/main/r/rpcbind/0.2.3-0.5/debian/patches/CVE-2015-7236.patch"; - sha256 = "1wsv5j8f5djzxr11n4027x107cam1avmx9w34g6l5d9s61j763wq"; - }) ]; buildInputs = [ libtirpc ] ++ stdenv.lib.optional useSystemd systemd; - configureFlags = stdenv.lib.optional (!useSystemd) "--with-systemdsystemunitdir=no"; + configureFlags = [ + "--with-systemdsystemunitdir=${if useSystemd then "$(out)/etc/systemd/system" else "no"}" + "--enable-warmstarts" + "--with-rpcuser=rpc" + ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 616d898b33f..f685d8b24d6 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -1,15 +1,18 @@ -{stdenv, fetchurl, python2, par2cmdline, unzip, unrar, p7zip, makeWrapper}: +{stdenv, fetchFromGitHub, python2, par2cmdline, unzip, unrar, p7zip, makeWrapper}: let - pythonEnv = python2.withPackages(ps: with ps; [ pyopenssl cheetah yenc ]); + pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc ]); path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "1.1.0"; - name = "sabnzbd-${version}"; + version = "1.2.0"; + pname = "sabnzbd"; + name = "${pname}-${version}"; - src = fetchurl { - url = "https://github.com/sabnzbd/sabnzbd/archive/${version}.tar.gz"; - sha256 = "16srhknmjx5x2zsg1m0w9bipcv9b3b96bvb27fkf4dc2aswwcsc7"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "1g1zf0zrlqgparg6hws6agpr414dw2q4xq9l8nh720rn6m7fv4vb"; }; buildInputs = [ pythonEnv makeWrapper ]; diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix index 35b6ee92cdc..30beec7b873 100644 --- a/pkgs/servers/search/elasticsearch/2.x.nix +++ b/pkgs/servers/search/elasticsearch/2.x.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1qjq04sfqb35pf2xpvr8j5p27chfxpjp8ymrp1h5bfk5rbk9444q"; }; - patches = [ ./es-home-2.x.patch ]; + patches = [ ./es-home-2.x.patch ./es-classpath-2.x.patch ]; buildInputs = [ makeWrapper jre ] ++ (if (!stdenv.isDarwin) then [utillinux] else [getopt]); @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { # don't want to have binary with name plugin mv $out/bin/plugin $out/bin/elasticsearch-plugin - wrapProgram $out/bin/elasticsearch ${if (!stdenv.isDarwin) + wrapProgram $out/bin/elasticsearch \ + --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*" \ + ${if (!stdenv.isDarwin) then ''--prefix PATH : "${utillinux}/bin/"'' else ''--prefix PATH : "${getopt}/bin"''} \ --set JAVA_HOME "${jre}" diff --git a/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch b/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch new file mode 100644 index 00000000000..46a3f0be71b --- /dev/null +++ b/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch @@ -0,0 +1,38 @@ +diff -rupN a/bin/elasticsearch b/bin/elasticsearch +--- a/bin/elasticsearch 2017-02-08 18:32:28.000298543 -0500 ++++ b/bin/elasticsearch 2017-02-08 19:10:45.692916675 -0500 +@@ -81,12 +81,7 @@ ES_HOME=`cd "$ES_HOME"; pwd` + # If an include wasn't specified in the environment, then search for one... + if [ "x$ES_INCLUDE" = "x" ]; then + # Locations (in order) to use when searching for an include file. +- for include in /usr/share/elasticsearch/elasticsearch.in.sh \ +- /usr/local/share/elasticsearch/elasticsearch.in.sh \ +- /opt/elasticsearch/elasticsearch.in.sh \ +- ~/.elasticsearch.in.sh \ +- "$ES_HOME/bin/elasticsearch.in.sh" \ +- "`dirname "$0"`"/elasticsearch.in.sh; do ++ for include in "`dirname "$0"`"/elasticsearch.in.sh; do + if [ -r "$include" ]; then + . "$include" + break +diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh +--- a/bin/elasticsearch.in.sh 2017-02-08 18:32:28.000298543 -0500 ++++ b/bin/elasticsearch.in.sh 2017-02-08 18:33:46.816634599 -0500 +@@ -1,17 +1,5 @@ + #!/bin/sh + +-# check in case a user was using this mechanism +-if [ "x$ES_CLASSPATH" != "x" ]; then +- cat >&2 << EOF +-Error: Don't modify the classpath with ES_CLASSPATH. Best is to add +-additional elements via the plugin mechanism, or if code must really be +-added to the main classpath, add jars to lib/ (unsupported). +-EOF +- exit 1 +-fi +- +-ES_CLASSPATH="$ES_HOME/lib/elasticsearch-2.4.4.jar:$ES_HOME/lib/*" +- + if [ "x$ES_MIN_MEM" = "x" ]; then + ES_MIN_MEM=256m + fi diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 8dce24948fe..e71c570f736 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,46 +1,42 @@ { stdenv, fetchurl, mecab, kytea, libedit, pkgconfig , suggestSupport ? false, zeromq, libevent, libmsgpack -, lz4Support ? false, lz4 +, lz4Support ? false, lz4 , zlibSupport ? false, zlib }: stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "6.1.1"; + version = "7.0.0"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "03h65gycy0j2q4n5h62x3sw76ibdywdvmiciys5a7ppxb2mncabz"; + sha256 = "0c3vzw2ias0xpz1hwywlib1qqfjvvzwj1zggswd5l2cj87f1krfd"; }; - buildInputs = with stdenv.lib; [ pkgconfig mecab kytea libedit ] ++ - optional lz4Support lz4 ++ - optional zlibSupport zlib ++ - optional suggestSupport [ zeromq libevent libmsgpack ]; + buildInputs = with stdenv.lib; + [ pkgconfig mecab kytea libedit ] + ++ optional lz4Support lz4 + ++ optional zlibSupport zlib + ++ optionals suggestSupport [ zeromq libevent libmsgpack ]; - configureFlags = with stdenv.lib; '' - ${optionalString zlibSupport "--with-zlib"} - ${optionalString lz4Support "--with-lz4"} - ''; - - doInstallCheck = true; + configureFlags = with stdenv.lib; + optional zlibSupport "--with-zlib" + ++ optional lz4Support "--with-lz4"; + doInstallCheck = true; installCheckPhase = "$out/bin/groonga --version"; meta = with stdenv.lib; { - homepage = http://groonga.org/; + homepage = http://groonga.org/; description = "An open-source fulltext search engine and column store"; - + license = licenses.lgpl21; + maintainers = [ maintainers.ericsagnes ]; + platforms = platforms.linux; longDescription = '' Groonga is an open-source fulltext search engine and column store. It lets you write high-performance applications that requires fulltext search. ''; - - license = licenses.lgpl21; - - maintainers = [ maintainers.ericsagnes ]; - platforms = platforms.linux; }; } diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 44c766d35d0..23daa99b3bc 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -1,17 +1,24 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "serf-${version}"; - version = "20150515-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "668982d8f90f5eff4a766583c1286393c1d27f68"; + version = "0.8.1"; + rev = "v${version}"; goPackagePath = "github.com/hashicorp/serf"; - src = fetchgit { + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "serf"; inherit rev; - url = "https://github.com/hashicorp/serf"; - sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk"; + sha256 = "1arakjvhyasrk52vhxas2ghlrby3i3wj59r7sjrkbpln2cdbqnlx"; }; - goDeps = ./deps.nix; + meta = with stdenv.lib; { + description = "Tool for service orchestration and management"; + homepage = "https://www.serf.io/"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.mpl20; + maintainers = with maintainers; [ pradeepchhetri ]; + }; } diff --git a/pkgs/servers/serf/deps.nix b/pkgs/servers/serf/deps.nix deleted file mode 100644 index bc5b960d147..00000000000 --- a/pkgs/servers/serf/deps.nix +++ /dev/null @@ -1,137 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; - sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; - }; - } - { - goPackagePath = "github.com/armon/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-metrics"; - rev = "b2d95e5291cdbc26997d1301a5e467ecbb240e25"; - sha256 = "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449"; - sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"; - }; - } - { - goPackagePath = "github.com/hashicorp/logutils"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/logutils"; - rev = "0dc08b1671f34c4250ce212759ebd880f743d883"; - sha256 = "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r"; - }; - } - { - goPackagePath = "github.com/armon/go-radix"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-radix"; - rev = "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93"; - sha256 = "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-syslog"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-syslog"; - rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba"; - sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"; - }; - } - { - goPackagePath = "github.com/hashicorp/memberlist"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/memberlist"; - rev = "6025015f2dc659ca2c735112d37e753bda6e329d"; - sha256 = "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "281073eb9eb092240d33ef253c404f1cca550309"; - sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; - }; - } - { - goPackagePath = "github.com/armon/circbuf"; - fetch = { - type = "git"; - url = "https://github.com/armon/circbuf"; - rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf"; - sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s"; - }; - } - { - goPackagePath = "github.com/hashicorp/mdns"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/mdns"; - rev = "2b439d37011456df8ff83a70ffd1cd6046410113"; - sha256 = "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96"; - }; - } - { - goPackagePath = "github.com/mitchellh/cli"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/cli"; - rev = "8102d0ed5ea2709ade1243798785888175f6e415"; - sha256 = "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2"; - }; - } - { - goPackagePath = "github.com/ryanuber/columnize"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/columnize"; - rev = "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a"; - sha256 = "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-msgpack"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6"; - sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"; - }; - } - { - goPackagePath = "github.com/hashicorp/go.net"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go.net"; - rev = "104dcad90073cd8d1e6828b2af19185b60cf3e29"; - sha256 = "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf"; - }; - } -] diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index ac8c3a1b1c9..5c9737660c4 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,19 +1,19 @@ { fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline -, openssl, perl, sqlite, libjpeg, libzrtpcpp, speex, pcre +, openssl, perl, sqlite, libjpeg, speex, pcre , ldns, libedit, yasm, which, lua, libopus, libsndfile }: stdenv.mkDerivation rec { - name = "freeswitch-1.6.9"; + name = "freeswitch-1.6.15"; src = fetchurl { url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2"; - sha256 = "0g0x4m8rb2ybpxwrszb4w37rb10v9fbszm7l2skjakf4dx0gw5i7"; + sha256 = "071g7229shr9srwzspx29fcx3ccj3rwakkydpc4vdf1q3lldd2ld"; }; postPatch = "patchShebangs libs/libvpx/build/make/rtcd.pl"; buildInputs = [ - ncurses curl pkgconfig gnutls readline openssl perl libjpeg - sqlite libzrtpcpp pcre speex ldns libedit yasm which lua libopus + openssl ncurses curl pkgconfig gnutls readline perl libjpeg + sqlite pcre speex ldns libedit yasm which lua libopus libsndfile ]; diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix index 9149f050655..1d3b04565c8 100644 --- a/pkgs/servers/sks/default.nix +++ b/pkgs/servers/sks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, ocaml, zlib, db48, perl }: +{ stdenv, fetchFromBitbucket, ocaml, zlib, db48, perl, camlp4 }: stdenv.mkDerivation rec { name = "sks-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm"; }; - buildInputs = [ ocaml zlib db48 perl ]; + buildInputs = [ ocaml zlib db48 perl camlp4 ]; makeFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ]; preConfigure = '' diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index f50a97afd20..4f64afe3d92 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,11 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.1.19"; + version = "10.1.21"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "108s4mimdbmgmmn5pcr9a405j70cyny9adzv49s75lg22krp74sv"; + sha256 = "144lcm5awcf0k6a7saqfr4p2kg8r5wbdhdm4cmn2m8hyg1an70as"; }; prePatch = '' @@ -161,4 +161,3 @@ everything = stdenv.mkDerivation (common // { }); in mariadb - diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index d5ffd5361e4..a94d8d101d2 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -89,33 +89,33 @@ in { }; postgresql92 = common { - version = "9.2.19"; + version = "9.2.20"; psqlSchema = "9.2"; - sha256 = "1bfvx1h1baxp40y4xi88974p43vazz13mwc0h8scq3sr9wxdfa8x"; + sha256 = "09lgvl996py3mciybnlv0hycfwfxr41n0wksb2jvxjh0hjpbv2hb"; }; postgresql93 = common { - version = "9.3.15"; + version = "9.3.16"; psqlSchema = "9.3"; - sha256 = "0kswvs4rzcmjz12hhyi61w5x2wh4dxskar8v7rgajfm98qabmz59"; + sha256 = "0wv8qsi0amdhcl1qvkvas3lm37w6zsi818f5fxm6n0ngr155wpw4"; }; postgresql94 = common { - version = "9.4.10"; + version = "9.4.11"; psqlSchema = "9.4"; - sha256 = "1kvfhalf3rs59887b5qa14zp85zcnsc6pislrs0wd08rxn5nfqbh"; + sha256 = "08wxrk8wdhnz0756dsa8jkj0pqanjfpw7w715lyv10618p853sz3"; }; postgresql95 = common { - version = "9.5.5"; + version = "9.5.6"; psqlSchema = "9.5"; - sha256 = "157kf6mdazmxfmd11f0akya2xcz6sfgprn7yqc26dpklps855ih2"; + sha256 = "0bz1b9r249ffjfvldaiah2g78ccwq30ddh8hdvlq61z26inmz7mv"; }; postgresql96 = common { - version = "9.6.1"; + version = "9.6.2"; psqlSchema = "9.6"; - sha256 = "1k8zwnabsl8f7vlp3azm4lrklkb9jkaxmihqf0mc27ql9451w475"; + sha256 = "1jahzqqw5inyvmacic2ihhj5f8z50lapci2fwws91h719ccbb1q1"; }; } diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix new file mode 100644 index 00000000000..edd99aa9a69 --- /dev/null +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, postgresql, libmsgpack, groonga }: + +stdenv.mkDerivation rec { + name = "pgroonga-${version}"; + version = "1.1.9"; + + src = fetchurl { + url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz"; + sha256 = "07afgwll8nxfb7ziw3qrvw0ryjjw3994vj2f6alrjwpg7ynb46ag"; + }; + + buildInputs = [ postgresql pkgconfig libmsgpack groonga ]; + + makeFlags = [ "HAVE_MSGPACK=1" ]; + + installPhase = '' + mkdir -p $out/bin + install -D pgroonga.so -t $out/lib/ + install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "A PostgreSQL extension to use Groonga as the index"; + longDescription = "PGroonga is a PostgreSQL extension to use Groonga as the index. PostgreSQL supports full text search against languages that use only alphabet and digit. It means that PostgreSQL doesn't support full text search against Japanese, Chinese and so on. You can use super fast full text search feature against all languages by installing PGroonga into your PostgreSQL."; + homepage = https://pgroonga.github.io/; + license = licenses.postgresql; + maintainers = with maintainers; [ DerTim1 ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix new file mode 100644 index 00000000000..d434fa98e09 --- /dev/null +++ b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, pkgconfig, postgresql }: + +stdenv.mkDerivation rec { + name = "tsearch-extras-${version}"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "zulip"; + repo = "tsearch_extras"; + rev = version; + sha256 = "1ivg9zn7f1ks31ixxwywifwhzxn6py8s5ky1djyxnb0s60zckfjg"; + }; + + nativebuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql ]; + + installPhase = '' + mkdir -p $out/bin + install -D tsearch_extras.so -t $out/lib/ + install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Provides a few PostgreSQL functions for a lower-level data full text search"; + homepage = https://github.com/zulip/tsearch_extras/; + license = licenses.postgresql; + maintainers = with maintainers; [ DerTim1 ]; + }; +} diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix new file mode 100644 index 00000000000..52fcad7ff95 --- /dev/null +++ b/pkgs/servers/squid/4.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap +, expat, libxml2, openssl }: + +stdenv.mkDerivation rec { + name = "squid-4.0.17"; + + src = fetchurl { + url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz"; + sha256 = "1713fqw59r3d892p5hpbkhmfcaw6jzfnngfn5f4h46sx963k87wb"; + }; + + buildInputs = [ + perl openldap pam db cyrus_sasl libcap expat libxml2 openssl + ]; + + configureFlags = [ + "--enable-ipv6" + "--disable-strict-error-checking" + "--disable-arch-native" + "--with-openssl" + "--enable-ssl-crtd" + "--enable-linux-netfilter" + "--enable-storeio=ufs,aufs,diskd,rock" + "--enable-removal-policies=lru,heap" + "--enable-delay-pools" + "--enable-x-accelerator-vary" + ]; + + meta = with stdenv.lib; { + description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; + homepage = "http://www.squid-cache.org"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ fpletz raskin ]; + }; +} diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix new file mode 100644 index 00000000000..0fad00e882d --- /dev/null +++ b/pkgs/servers/trezord/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchgit, curl, cmake, boost, gcc5, protobuf, pkgconfig, jsoncpp +, libusb1, libmicrohttpd +}: + +let + version = "1.2.0"; +in + +stdenv.mkDerivation rec { + name = "trezord-${version}"; + + src = fetchgit { + url = "https://github.com/trezor/trezord"; + rev = "refs/tags/v${version}"; + sha256 = "1606j5cfngryk4q21yiga1zvc3zpx4q8vqn6ljrvr679hpvlwni4"; + }; + + meta = with stdenv.lib; { + description = "TREZOR Bridge daemon for TREZOR bitcoin hardware wallet"; + homepage = https://mytrezor.com; + license = licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ canndrew jb55 ]; + platforms = platforms.linux; + }; + + patches = [ ./dynamic-link.patch ]; + + nativeBuildInputs = [ + cmake + gcc5 + pkgconfig + ]; + + buildInputs = [ + curl + boost + protobuf + libusb1 + libmicrohttpd + jsoncpp + ]; + + LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ curl ]}"; + cmakeFlags="-DJSONCPP_LIBRARY='${jsoncpp}/lib/libjsoncpp.so'"; + + installPhase = '' + mkdir -p $out/bin + cp trezord $out/bin + ''; +} + diff --git a/pkgs/servers/trezord/dynamic-link.patch b/pkgs/servers/trezord/dynamic-link.patch new file mode 100644 index 00000000000..0f1f448a3f7 --- /dev/null +++ b/pkgs/servers/trezord/dynamic-link.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7c0e2cf..0e3f4ac 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,13 +59,6 @@ target_link_libraries(trezord ${OS_LIBRARIES}) + find_package(CURL REQUIRED) + find_package(libmicrohttpd REQUIRED) + +-# add static libs +-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +- set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") +- set(BUILD_SHARED_LIBS off) +- set(Boost_USE_STATIC_LIBS on) +- set(CMAKE_FIND_STATIC FIRST) +-endif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + find_package(Boost 1.53.0 REQUIRED + regex thread system unit_test_framework program_options chrono) + find_package(Protobuf 2.5.0 REQUIRED) diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 32dcb98b20e..22cc5646f8b 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,16 +2,14 @@ stdenv.mkDerivation rec { name = "uftp-${version}"; - version = "4.9.2"; + version = "4.9.3"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "0pra2sm8rdscyqkagi2v99az1vxbcch47wkdnz9wv4qg1x5phpmr"; + sha256 = "13y7k6g6jksnllw0mwgzw4dqczh5c5hvq3zlqin7q98m0fpib4ly"; }; - buildInputs = [ - openssl - ]; + buildInputs = [ openssl ]; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index fb333176801..fc5a744ad46 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,25 +1,30 @@ -{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, python -, pythonPackages }: +{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit +, python, pythonPackages }: stdenv.mkDerivation rec { - version = "4.0.3"; + version = "5.0.0"; name = "varnish-${version}"; src = fetchurl { url = "http://repo.varnish-cache.org/source/${name}.tar.gz"; - sha256 = "01l2iypajkdanxpbvzfxm6vs4jay4dgw7lmchqidnivz15sa3fcl"; + sha256 = "0jizha1mwqk42zmkrh80y07vfl78mg1d9pp5w83qla4xn9ras0ai"; }; - buildInputs = [ pcre libxslt groff ncurses pkgconfig readline python - pythonPackages.docutils]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + pcre libxslt groff ncurses readline python libedit + pythonPackages.docutils + ]; buildFlags = "localstatedir=/var/spool"; - meta = { + outputs = [ "out" "dev" "man" ]; + + meta = with stdenv.lib; { description = "Web application accelerator also known as a caching HTTP reverse proxy"; homepage = "https://www.varnish-cache.org"; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ garbas fpletz ]; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/web-apps/frab/Gemfile b/pkgs/servers/web-apps/frab/Gemfile new file mode 100644 index 00000000000..098b8f3d7d7 --- /dev/null +++ b/pkgs/servers/web-apps/frab/Gemfile @@ -0,0 +1,88 @@ +source 'https://rubygems.org' + +if ENV['CUSTOM_RUBY_VERSION'] + ruby ENV['CUSTOM_RUBY_VERSION'] # i.e.: '2.3' +end + +gem 'rails', '~> 4.2' + +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.1.0' + +gem 'mysql2', group: :mysql +gem 'pg', group: :postgresql +gem 'sqlite3', group: :sqlite3 + +# Use Puma as the app server +gem 'puma' + +# Capistrano for deployment +group :capistrano do + gem 'airbrussh' + gem 'capistrano', '~> 3.4.0', require: false + gem 'capistrano-rails', require: false + gem 'capistrano-bundler', require: false + gem 'capistrano-rvm', require: false + gem 'capistrano3-puma', require: false +end + +# Use jquery as the JavaScript library +gem 'jquery-rails' +gem 'jquery-migrate-rails' +gem 'jquery-ui-rails' + +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.0' + +gem 'activeresource' +gem 'acts_as_commentable' +gem 'bcrypt' +gem 'cancancan' +gem 'cocoon' +gem 'dotenv-rails' +gem 'haml' +gem 'localized_language_select', github: 'frab/localized_language_select', branch: 'master' +gem 'nokogiri' +gem 'paperclip', '~> 4.1' +gem 'paper_trail' +gem 'prawn', '< 1.0' +gem 'prawn_rails' +gem 'ransack' +gem 'ri_cal' +gem 'roust' +gem 'rqrcode' +#gem 'roust', :git => 'git@github.com:bulletproofnetworks/roust.git' +gem 'simple_form' +gem 'sucker_punch' +gem 'transitions', require: ['transitions', 'active_record/transitions'] +gem 'will_paginate' + +group :production do + gem 'exception_notification' +end + +group :development, :test do + gem 'bullet' + gem 'pry-rails' + gem 'pry-byebug' + gem 'letter_opener' + gem 'faker' +end + +group :test do + gem 'database_cleaner' + gem 'factory_girl_rails', '~> 4.0' + gem 'shoulda' +end + +group :doc do + gem 'redcarpet' # documentation + gem 'github-markdown' # documentation + gem 'yard' # documentation + # gem 'rails-erd' # graph + # gem 'ruby-graphviz', require: 'graphviz' # Optional: only required for graphing +end diff --git a/pkgs/servers/web-apps/frab/Gemfile.lock b/pkgs/servers/web-apps/frab/Gemfile.lock new file mode 100644 index 00000000000..530c54ebd89 --- /dev/null +++ b/pkgs/servers/web-apps/frab/Gemfile.lock @@ -0,0 +1,329 @@ +GIT + remote: git://github.com/frab/localized_language_select.git + revision: 85df6b97789de6e29c630808b630e56a1b76f80c + branch: master + specs: + localized_language_select (0.3.0) + rails (>= 4.1.0) + +GEM + remote: https://rubygems.org/ + specs: + actionmailer (4.2.7.1) + actionpack (= 4.2.7.1) + actionview (= 4.2.7.1) + activejob (= 4.2.7.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.7.1) + actionview (= 4.2.7.1) + activesupport (= 4.2.7.1) + 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.7.1) + activesupport (= 4.2.7.1) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.7.1) + activesupport (= 4.2.7.1) + globalid (>= 0.3.0) + activemodel (4.2.7.1) + activesupport (= 4.2.7.1) + builder (~> 3.1) + activerecord (4.2.7.1) + activemodel (= 4.2.7.1) + activesupport (= 4.2.7.1) + arel (~> 6.0) + activeresource (4.1.0) + activemodel (~> 4.0) + activesupport (~> 4.0) + rails-observers (~> 0.1.2) + activesupport (4.2.7.1) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + acts_as_commentable (4.0.2) + addressable (2.4.0) + airbrussh (1.1.1) + sshkit (>= 1.6.1, != 1.7.0) + arel (6.0.3) + bcrypt (3.1.11) + builder (3.2.2) + bullet (5.4.0) + activesupport (>= 3.0.0) + uniform_notifier (~> 1.10.0) + byebug (9.0.5) + cancancan (1.15.0) + capistrano (3.4.1) + i18n + rake (>= 10.0.0) + sshkit (~> 1.3) + capistrano-bundler (1.1.4) + capistrano (~> 3.1) + sshkit (~> 1.2) + capistrano-rails (1.1.8) + capistrano (~> 3.1) + capistrano-bundler (~> 1.1) + capistrano-rvm (0.1.2) + capistrano (~> 3.0) + sshkit (~> 1.2) + capistrano3-puma (1.2.1) + capistrano (~> 3.0) + puma (>= 2.6) + chunky_png (1.3.7) + climate_control (0.0.3) + activesupport (>= 3.0) + cocaine (0.5.8) + climate_control (>= 0.0.3, < 1.0) + cocoon (1.2.9) + coderay (1.1.1) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + concurrent-ruby (1.0.2) + database_cleaner (1.5.3) + dotenv (2.1.1) + dotenv-rails (2.1.1) + dotenv (= 2.1.1) + railties (>= 4.0, < 5.1) + erubis (2.7.0) + exception_notification (4.2.1) + actionmailer (>= 4.0, < 6) + activesupport (>= 4.0, < 6) + execjs (2.7.0) + factory_girl (4.7.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.7.0) + factory_girl (~> 4.7.0) + railties (>= 3.0.0) + faker (1.6.6) + i18n (~> 0.5) + github-markdown (0.6.9) + globalid (0.3.7) + activesupport (>= 4.1.0) + haml (4.0.7) + tilt + httparty (0.14.0) + multi_xml (>= 0.5.2) + i18n (0.7.0) + jbuilder (2.6.0) + activesupport (>= 3.0.0, < 5.1) + multi_json (~> 1.2) + jquery-migrate-rails (1.2.1) + jquery-rails (4.2.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-ui-rails (5.0.5) + railties (>= 3.2.16) + json (1.8.3) + launchy (2.4.3) + addressable (~> 2.3) + letter_opener (1.4.1) + launchy (~> 2.2) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.4) + mime-types (>= 1.16, < 4) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mimemagic (0.3.0) + mini_portile2 (2.1.0) + minitest (5.9.1) + multi_json (1.12.1) + multi_xml (0.5.5) + mysql2 (0.4.4) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-ssh (3.2.0) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) + pkg-config (~> 1.1.7) + paper_trail (5.2.2) + activerecord (>= 3.0, < 6.0) + request_store (~> 1.1) + paperclip (4.3.7) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + cocaine (~> 0.5.5) + mime-types + mimemagic (= 0.3.0) + pdf-core (0.1.6) + pg (0.19.0) + pkg-config (1.1.7) + polyamorous (1.3.1) + activerecord (>= 3.0) + prawn (0.15.0) + pdf-core (~> 0.1.3) + ttfunk (~> 1.1.0) + prawn_rails (0.0.11) + prawn (>= 0.11.1) + railties (>= 3.0.0) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-byebug (3.4.0) + byebug (~> 9.0) + pry (~> 0.10) + pry-rails (0.3.4) + pry (>= 0.9.10) + puma (3.6.0) + rack (1.6.4) + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.7.1) + actionmailer (= 4.2.7.1) + actionpack (= 4.2.7.1) + actionview (= 4.2.7.1) + activejob (= 4.2.7.1) + activemodel (= 4.2.7.1) + activerecord (= 4.2.7.1) + activesupport (= 4.2.7.1) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.7.1) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + rails-observers (0.1.2) + activemodel (~> 4.0) + railties (4.2.7.1) + actionpack (= 4.2.7.1) + activesupport (= 4.2.7.1) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (11.3.0) + ransack (1.8.2) + actionpack (>= 3.0) + activerecord (>= 3.0) + activesupport (>= 3.0) + i18n + polyamorous (~> 1.3) + redcarpet (3.3.4) + request_store (1.3.1) + ri_cal (0.8.8) + roust (1.8.9) + activesupport (>= 4.0.10) + httparty (>= 0.13.1) + mail (>= 2.5.4) + rqrcode (0.10.1) + chunky_png (~> 1.0) + sass (3.4.22) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + shoulda (3.5.0) + shoulda-context (~> 1.0, >= 1.0.1) + shoulda-matchers (>= 1.4.1, < 3.0) + shoulda-context (1.2.1) + shoulda-matchers (2.8.0) + activesupport (>= 3.0.0) + simple_form (3.3.1) + actionpack (> 4, < 5.1) + activemodel (> 4, < 5.1) + slop (3.6.0) + sprockets (3.7.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.11) + sshkit (1.11.3) + net-scp (>= 1.1.2) + net-ssh (>= 2.8.0) + sucker_punch (2.0.2) + concurrent-ruby (~> 1.0.0) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.5) + transitions (1.2.0) + ttfunk (1.1.1) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (3.0.2) + execjs (>= 0.3.0, < 3) + uniform_notifier (1.10.0) + will_paginate (3.1.3) + yard (0.9.5) + +PLATFORMS + ruby + +DEPENDENCIES + activeresource + acts_as_commentable + airbrussh + bcrypt + bullet + cancancan + capistrano (~> 3.4.0) + capistrano-bundler + capistrano-rails + capistrano-rvm + capistrano3-puma + cocoon + coffee-rails (~> 4.1.0) + database_cleaner + dotenv-rails + exception_notification + factory_girl_rails (~> 4.0) + faker + github-markdown + haml + jbuilder (~> 2.0) + jquery-migrate-rails + jquery-rails + jquery-ui-rails + letter_opener + localized_language_select! + mysql2 + nokogiri + paper_trail + paperclip (~> 4.1) + pg + prawn (< 1.0) + prawn_rails + pry-byebug + pry-rails + puma + rails (~> 4.2) + ransack + redcarpet + ri_cal + roust + rqrcode + sass-rails (~> 5.0) + shoulda + simple_form + sqlite3 + sucker_punch + transitions + uglifier (>= 1.3.0) + will_paginate + yard + +BUNDLED WITH + 1.13.1 diff --git a/pkgs/servers/web-apps/frab/default.nix b/pkgs/servers/web-apps/frab/default.nix new file mode 100644 index 00000000000..8ee6afaa849 --- /dev/null +++ b/pkgs/servers/web-apps/frab/default.nix @@ -0,0 +1,46 @@ +{ stdenv, bundlerEnv, fetchFromGitHub, ruby, nodejs }: + +let + env = bundlerEnv { + name = "frab"; + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; + +in + +stdenv.mkDerivation rec { + name = "frab-2016-12-28"; + + src = fetchFromGitHub { + owner = "frab"; + repo = "frab"; + rev = "e4bbcfd1a9db7f89f53a8702c236d9628bafb72c"; + sha256 = "04pzmif8jxjww3fdf2zbg3k7cm49vxc9hhf4xhmvdmvywgin6fqp"; + }; + + buildInputs = [ env nodejs ]; + + buildPhase = '' + cp config/database.yml.template config/database.yml + cp .env.development .env.production + bundler exec rake assets:precompile RAILS_ENV=production + rm .env.production + ''; + + installPhase = '' + mkdir -p $out/share + cp -r . $out/share/frab + + ln -sf /run/frab/database.yml $out/share/frab/config/database.yml + rm -rf $out/share/frab/tmp $out/share/frab/public/system + ln -sf /run/frab/system $out/share/frab/public/system + ln -sf /tmp $out/share/frab/tmp + ''; + + passthru = { + inherit env ruby; + }; +} diff --git a/pkgs/servers/web-apps/frab/gemset.nix b/pkgs/servers/web-apps/frab/gemset.nix new file mode 100644 index 00000000000..9f881579f42 --- /dev/null +++ b/pkgs/servers/web-apps/frab/gemset.nix @@ -0,0 +1,932 @@ +{ + actionmailer = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lw1pss1mrjm7x7qcg9pvxv55rz3d994yf3mwmlfg1y12fxq00n3"; + type = "gem"; + }; + version = "4.2.7.1"; + }; + actionpack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ray5bvlmkimjax011zsw0mz9llfkqrfm7q1avjlp4i0kpcz8zlh"; + type = "gem"; + }; + version = "4.2.7.1"; + }; + actionview = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11m2x5nlbqrw79fh6h7m444lrka7wwy32b0dvgqg7ilbzih43k0c"; + type = "gem"; + }; + version = "4.2.7.1"; + }; + activejob = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ish5wd8nvmj7f6x1i22aw5ycizy5n1z1c7f3kyxmqwhw7lb0gaz"; + type = "gem"; + }; + version = "4.2.7.1"; + }; + activemodel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0acz0mbmahsc9mn41275fpfnrqwig5k09m3xhz3455kv90fn79v5"; + type = "gem"; + }; + version = "4.2.7.1"; + }; + activerecord = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lk8l6i9p7qfl0pg261v5yph0w0sc0vysrdzc6bm5i5rxgi68flj"; + type = "gem"; + }; + version = "4.2.7.1"; + }; + activeresource = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nr5is20cx18s7vg8bdrdc996s2abl3h7fsi1q6mqsrzw7nrv2fa"; + type = "gem"; + }; + version = "4.1.0"; + }; + activesupport = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gds12k7nxrcc09b727a458ndidy1nfcllj9x22jcaj7pppvq6r4"; + type = "gem"; + }; + version = "4.2.7.1"; + }; + acts_as_commentable = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p4bwyqmm4ybcscn292aixschdzvns2dpl8a7w4zm0rqy2619cc9"; + type = "gem"; + }; + version = "4.0.2"; + }; + addressable = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs"; + type = "gem"; + }; + version = "2.4.0"; + }; + airbrussh = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pv22d2kjdbsg9q45jca3f5gsylr2r1wfpn58g58xj4s4q4r95nx"; + type = "gem"; + }; + version = "1.1.1"; + }; + arel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk"; + type = "gem"; + }; + version = "6.0.3"; + }; + bcrypt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d254sdhdj6mzak3fb5x3jam8b94pvl1srladvs53j05a89j5z50"; + type = "gem"; + }; + version = "3.1.11"; + }; + builder = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; + type = "gem"; + }; + version = "3.2.2"; + }; + bullet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06pba7bdjnazbl0yhhvlina08nkawnm76zihkaam4k7fm0yrq1k0"; + type = "gem"; + }; + version = "5.4.0"; + }; + byebug = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18sdnscwwm76i2kbcib2ckwfwpq8b1dbfr97gdcx3j1x547yqv9x"; + type = "gem"; + }; + version = "9.0.5"; + }; + cancancan = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05kb459laaw339n7mas37v4k83nwz228bfpaghgybza347341x85"; + type = "gem"; + }; + version = "1.15.0"; + }; + capistrano = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f73w6gpml0ickmwky1cn6d8392q075zy10a323f3vmyvxyhr0jb"; + type = "gem"; + }; + version = "3.4.1"; + }; + capistrano-bundler = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f4iikm7pn0li2lj6p53wl0d6y7svn0h76z9c6c582mmwxa9c72p"; + type = "gem"; + }; + version = "1.1.4"; + }; + capistrano-rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03lzihrq72rwcqq7jiqak79wy0xbdnymn5gxj0bfgfjlg5kpgssw"; + type = "gem"; + }; + version = "1.1.8"; + }; + capistrano-rvm = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15sy8zcal041yy5kb7fcdqnxvndgdhg3w1kvb5dk7hfjk3ypznsa"; + type = "gem"; + }; + version = "0.1.2"; + }; + capistrano3-puma = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ynz1arnr07kcl0vsaa1znhp2ywhhs4fwndnkw8sasr9bydksln8"; + type = "gem"; + }; + version = "1.2.1"; + }; + chunky_png = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p1zy4gyfp7rapr2yxcljkw6qh0chkwf356i387b3fg85cwdj4xh"; + type = "gem"; + }; + version = "1.3.7"; + }; + climate_control = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0krknwk6b8lwv1j9kjbxib6kf5zh4pxkf3y2vcyycx5d6nci1s55"; + type = "gem"; + }; + version = "0.0.3"; + }; + cocaine = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01kk5xd7lspbkdvn6nyj0y51zhvia3z6r4nalbdcqw5fbsywwi7d"; + type = "gem"; + }; + version = "0.5.8"; + }; + cocoon = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gzznkrs6qy31v85cvdqyn5wd3vwlciwibf9clmd6gi4dns21pmv"; + type = "gem"; + }; + version = "1.2.9"; + }; + coderay = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x6z923iwr1hi04k6kz5a6llrixflz8h5sskl9mhaaxy9jx2x93r"; + type = "gem"; + }; + version = "1.1.1"; + }; + coffee-rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mv1kaw3z4ry6cm51w8pfrbby40gqwxanrqyqr0nvs8j1bscc1gw"; + type = "gem"; + }; + version = "4.1.1"; + }; + coffee-script = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; + type = "gem"; + }; + version = "2.4.1"; + }; + coffee-script-source = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k4fg39rrkl3bpgchfj94fbl9s4ysaz16w8dkqncf2vyf79l3qz0"; + type = "gem"; + }; + version = "1.10.0"; + }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kb4sav7yli12pjr8lscv8z49g52a5xzpfg3z9h8clzw6z74qjsw"; + type = "gem"; + }; + version = "1.0.2"; + }; + database_cleaner = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fx6zmqznklmkbjl6f713jyl11d4g9q220rcl86m2jp82r8kfwjj"; + type = "gem"; + }; + version = "1.5.3"; + }; + dotenv = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p6zz0xzb15vq8jphpw2fh6m4dianw7s76ci8vj9x3zxayrn4lfm"; + type = "gem"; + }; + version = "2.1.1"; + }; + dotenv-rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17s6c0yqaz01xd5wywjscbvv0pa3grak2lhwby91j84qm6h95vxz"; + type = "gem"; + }; + version = "2.1.1"; + }; + erubis = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + type = "gem"; + }; + version = "2.7.0"; + }; + exception_notification = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vclsr0rjfy1khvqyj67lgpa0v14nb542vvjkyaswn367nnmijhw"; + type = "gem"; + }; + version = "4.2.1"; + }; + execjs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1"; + type = "gem"; + }; + version = "2.7.0"; + }; + factory_girl = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xzl4z9z390fsnyxp10c9if2n46zan3n6zwwpfnwc33crv4s410i"; + type = "gem"; + }; + version = "4.7.0"; + }; + factory_girl_rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hzpirb33xdqaz44i1mbcfv0icjrghhgaz747llcfsflljd4pa4r"; + type = "gem"; + }; + version = "4.7.0"; + }; + faker = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09amnh5d0m3q2gpb0vr9spbfa8l2nc0kl3s79y6sx7a16hrl4vvc"; + type = "gem"; + }; + version = "1.6.6"; + }; + github-markdown = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nax4fyyhz9xmi7q6mmc6d1h8hc0cxda9d7q5z0pba88mj00s9fj"; + type = "gem"; + }; + version = "0.6.9"; + }; + globalid = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11plkgyl3w9k4y2scc1igvpgwyz4fnmsr63h2q4j8wkb48nlnhak"; + type = "gem"; + }; + version = "0.3.7"; + }; + haml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p"; + type = "gem"; + }; + version = "4.0.7"; + }; + httparty = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1msa213hclsv14ijh49i1wggf9avhnj2j4xr58m9jx6fixlbggw6"; + type = "gem"; + }; + version = "0.14.0"; + }; + i18n = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; + type = "gem"; + }; + version = "0.7.0"; + }; + jbuilder = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jbh1296imd0arc9nl1m71yfd7kg505p8srr1ijpsqv4hhbz5qci"; + type = "gem"; + }; + version = "2.6.0"; + }; + jquery-migrate-rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pcfs339wki4ax4imb4qi2xb04bbj6j4xvn8x3yn6yf95frrvch6"; + type = "gem"; + }; + version = "1.2.1"; + }; + jquery-rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0prqyixv7j2qlq67qdr3miwcyvi27b9a82j51gbpb6vcl0ig2rik"; + type = "gem"; + }; + version = "4.2.1"; + }; + jquery-ui-rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gfygrv4bjpjd2c377lw7xzk1b77rxjyy3w6wl4bq1gkqvyrkx77"; + type = "gem"; + }; + version = "5.0.5"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + type = "gem"; + }; + version = "1.8.3"; + }; + launchy = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; + type = "gem"; + }; + version = "2.4.3"; + }; + letter_opener = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pcrdbxvp2x5six8fqn8gf09bn9rd3jga76ds205yph5m8fsda21"; + type = "gem"; + }; + version = "1.4.1"; + }; + localized_language_select = { + source = { + fetchSubmodules = false; + rev = "85df6b97789de6e29c630808b630e56a1b76f80c"; + sha256 = "1b2pd8120nrl3s3idpgdzhrjkn9g5sxnkx4j671fjiyhadlr0q5j"; + type = "git"; + url = "git://github.com/frab/localized_language_select.git"; + }; + version = "0.3.0"; + }; + loofah = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8"; + type = "gem"; + }; + version = "2.0.3"; + }; + mail = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c9vqfy0na9b5096i5i4qvrvhwamjnmajhgqi3kdsdfl8l6agmkp"; + type = "gem"; + }; + version = "2.6.4"; + }; + method_source = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2"; + type = "gem"; + }; + version = "0.8.2"; + }; + mime-types = { + 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"; + }; + mimemagic = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "101lq4bnjs7ywdcicpw3vbz9amg5gbb4va1626fybd2hawgdx8d9"; + type = "gem"; + }; + version = "0.3.0"; + }; + mini_portile2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb"; + type = "gem"; + }; + version = "2.1.0"; + }; + minitest = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0300naf4ilpd9sf0k8si9h9sclkizaschn8bpnri5fqmvm9ybdbq"; + type = "gem"; + }; + version = "5.9.1"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + type = "gem"; + }; + version = "1.12.1"; + }; + multi_xml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i8r7dsz4z79z3j023l8swan7qpbgxbwwz11g38y2vjqjk16v4q8"; + type = "gem"; + }; + version = "0.5.5"; + }; + mysql2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v537b7865f4z610rljy8prwmq1yhk3zalp9mcbxn7aqb3g75pra"; + type = "gem"; + }; + version = "0.4.4"; + }; + net-scp = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; + type = "gem"; + }; + version = "1.2.1"; + }; + net-ssh = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11djaq0h3bzzy61dca3l84rrs91702hha4vgg387gviipgz7f3yy"; + type = "gem"; + }; + version = "3.2.0"; + }; + nokogiri = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv"; + type = "gem"; + }; + version = "1.6.7.2"; + }; + paper_trail = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w3y2h1w0kml2fmzx4sdcrhnbj273npwrs0cx91xdgy2qfjj6hmr"; + type = "gem"; + }; + version = "5.2.2"; + }; + paperclip = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r8krh5xg790845wzlc2r7l0jwskw4c4wk9xh4bpprqykwaghg0r"; + type = "gem"; + }; + version = "4.3.7"; + }; + pdf-core = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x121sznmhfmjnk0rzpp6djxgi28afpc8avnhn3kzlmpc87r7fyi"; + type = "gem"; + }; + version = "0.1.6"; + }; + pg = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bplv27d0f8vwdj51967498pl1cjxq19hhcj4hdjr4h3s72l2z4j"; + type = "gem"; + }; + version = "0.19.0"; + }; + pkg-config = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lljiqnm0b4z6iy87lzapwrdfa6ps63x2z5zbs038iig8dqx2g0z"; + type = "gem"; + }; + version = "1.1.7"; + }; + polyamorous = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1501y9l81b2lwb93fkycq8dr1bi6qcdhia3qv4fddnmrdihkl3pv"; + type = "gem"; + }; + version = "1.3.1"; + }; + prawn = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04pxzfmmy8a6bv3zvh1mmyy5zi4bj994kq1v6qnlq2xlhvg4cxjc"; + type = "gem"; + }; + version = "0.15.0"; + }; + prawn_rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19m1pv2rsl3rf9rni78l8137dy2sq1r2443biv19wi9nis2pvgdg"; + type = "gem"; + }; + version = "0.0.11"; + }; + pry = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05xbzyin63aj2prrv8fbq2d5df2mid93m81hz5bvf2v4hnzs42ar"; + type = "gem"; + }; + version = "0.10.4"; + }; + pry-byebug = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pvc94kgxd33p6iz41ghyadq8zfbjhkk07nvz2mbh3yhrc8w7gmw"; + type = "gem"; + }; + version = "3.4.0"; + }; + pry-rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a2iinvabis2xmv0z7z7jmh7bbkkngxj2qixfdg5m6qj9x8k1kx6"; + type = "gem"; + }; + version = "0.3.4"; + }; + puma = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rmcny3jr1jj01f9fqijwmikj212a5iql7ghifklm77x4a8pp399"; + type = "gem"; + }; + version = "3.6.0"; + }; + rack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; + type = "gem"; + }; + version = "1.6.4"; + }; + rack-test = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; + type = "gem"; + }; + version = "0.6.3"; + }; + rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1avd16ir7qx23dcnz1b3cafq1lja6rq0w222bs658p9n33rbw54l"; + type = "gem"; + }; + version = "4.2.7.1"; + }; + rails-deprecated_sanitizer = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj"; + type = "gem"; + }; + version = "1.0.3"; + }; + rails-dom-testing = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v8jl6803mbqpxh4hn0szj081q1a3ap0nb8ni0qswi7z4la844v8"; + type = "gem"; + }; + version = "1.0.7"; + }; + rails-html-sanitizer = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7"; + type = "gem"; + }; + version = "1.0.3"; + }; + rails-observers = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lsw19jzmvipvrfy2z04hi7r29dvkfc43h43vs67x6lsj9rxwwcy"; + type = "gem"; + }; + version = "0.1.2"; + }; + railties = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04rz7cn64zzvq7lnhc9zqmaqmqkq84q25v0ym9lcw75j1cj1mrq4"; + type = "gem"; + }; + version = "4.2.7.1"; + }; + rake = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cnjmbcyhm4hacpjn337mg1pnaw6hj09f74clwgh6znx8wam9xla"; + type = "gem"; + }; + version = "11.3.0"; + }; + ransack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cya3wygwjhj8rckckkl387bmva4nyfvqcl0qhp9hk3zv8y6wxjc"; + type = "gem"; + }; + version = "1.8.2"; + }; + redcarpet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04v85p0bnpf1c7w4n0yr03s35yimxh0idgdrrybl9y13zbw5kgvg"; + type = "gem"; + }; + version = "3.3.4"; + }; + request_store = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1va9x0b3ww4chcfqlmi8b14db39di1mwa7qrjbh7ma0lhndvs2zv"; + type = "gem"; + }; + version = "1.3.1"; + }; + ri_cal = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1flga63anfpfpdwz6lpm3icpdqmvjq757hihfaw63rlkwq4pf390"; + type = "gem"; + }; + version = "0.8.8"; + }; + roust = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zdnwxxh34psv0iybcdnk9w4dpgpr07j3w1fvigkpccgz5vs82qk"; + type = "gem"; + }; + version = "1.8.9"; + }; + rqrcode = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h1pnnydgs032psakvg3l779w3ghbn08ajhhhw19hpmnfhrs8k0a"; + type = "gem"; + }; + version = "0.10.1"; + }; + sass = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy"; + type = "gem"; + }; + version = "3.4.22"; + }; + sass-rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iji20hb8crncz14piss1b29bfb6l89sz3ai5fny3iw39vnxkdcb"; + type = "gem"; + }; + version = "5.0.6"; + }; + shoulda = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0csmf15a7mcinfq54lfa4arp0f4b2jmwva55m0p94hdf3pxnjymy"; + type = "gem"; + }; + version = "3.5.0"; + }; + shoulda-context = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06wv2ika5zrbxn0m3qxwk0zkbspxids3zmlq3xxays5qmvl1qb55"; + type = "gem"; + }; + version = "1.2.1"; + }; + shoulda-matchers = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d3ryqcsk1n9y35bx5wxnqbgw4m8b3c79isazdjnnbg8crdp72d0"; + type = "gem"; + }; + version = "2.8.0"; + }; + simple_form = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ii3rkkbj5cc10f5rdiny18ncdh36kijr25cah0ybbr7kigh3v3b"; + type = "gem"; + }; + version = "3.3.1"; + }; + slop = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; + type = "gem"; + }; + version = "3.6.0"; + }; + sprockets = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jzsfiladswnzbrwqfiaj1xip68y58rwx0lpmj907vvq47k87gj1"; + type = "gem"; + }; + version = "3.7.0"; + }; + sprockets-rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zr9vk2vn44wcn4265hhnnnsciwlmqzqc6bnx78if1xcssxj6x44"; + type = "gem"; + }; + version = "3.2.0"; + }; + sqlite3 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19r06wglnm6479ffj9dl0fa4p5j2wi6dj7k6k3d0rbx7036cv3ny"; + type = "gem"; + }; + version = "1.3.11"; + }; + sshkit = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wpqvr2dyxwp3shwh0221i1ahyg8vd2hyilmjvdi026l00gk2j4l"; + type = "gem"; + }; + version = "1.11.3"; + }; + sucker_punch = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l8b53mlzl568kdl4la8kcjjcnawmbl0q6hq9c3kkyippa5c0x55"; + type = "gem"; + }; + version = "2.0.2"; + }; + thor = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; + type = "gem"; + }; + version = "0.19.1"; + }; + thread_safe = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr"; + type = "gem"; + }; + version = "0.3.5"; + }; + tilt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lgk8bfx24959yq1cn55php3321wddw947mgj07bxfnwyipy9hqf"; + type = "gem"; + }; + version = "2.0.5"; + }; + transitions = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11byymi45s4pxbhj195277r16dyhxkqc2jwf7snbhan23izzay2c"; + type = "gem"; + }; + version = "1.2.0"; + }; + ttfunk = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jvgqhp0i6v9d7davwdn20skgi508yd0xcf1h4p9f5dlslmpnkhj"; + type = "gem"; + }; + version = "1.1.1"; + }; + tzinfo = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; + type = "gem"; + }; + version = "1.2.2"; + }; + uglifier = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f30s1631k03x4wm7xyc79g92pppzvyysa773zsaq2kcry1pmifc"; + type = "gem"; + }; + version = "3.0.2"; + }; + uniform_notifier = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jha0l7x602g5rvah960xl9r0f3q25gslj39i0x1vai8i5z6zr1l"; + type = "gem"; + }; + version = "1.10.0"; + }; + will_paginate = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xlls78hkkmk33q1rb84rgg2xr39g06a1z1239nq59c825g83k01"; + type = "gem"; + }; + version = "3.1.3"; + }; + yard = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gjl0sh7h0a9s67pllagw8192kscljg4y8nddfrqhji4g21yvcas"; + type = "gem"; + }; + version = "0.9.5"; + }; +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix new file mode 100644 index 00000000000..369fecda47a --- /dev/null +++ b/pkgs/servers/web-apps/shaarli/material-theme.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "shaarli-material-${version}"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "kalvn"; + repo = "Shaarli-Material"; + rev = "v${version}"; + sha256 = "0ivq35183r5vyzvf47sgxwdxllmvhd5w9w75xgyp3kbw2na4yrmr"; + }; + + patchPhase = '' + for f in material/*.html + do + substituteInPlace $f \ + --replace '.min.css"' '.min.css#"' \ + --replace '.min.js"' '.min.js#"' \ + --replace '.png"' '.png#"' + done + ''; + + installPhase = '' + mv material/ $out + ''; + + meta = with stdenv.lib; { + description = "A theme base on Google's Material Design for Shaarli, the superfast delicious clone"; + license = licenses.mit; + homepage = https://github.com/kalvn/Shaarli-Material; + maintainers = with maintainers; [ schneefux ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d5a3bea67a6..96f348e92b3 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -812,11 +812,11 @@ let }) // {inherit fontconfig freetype libX11 xproto libXrender ;}; libXi = (mkDerivation "libXi" { - name = "libXi-1.7.8"; + name = "libXi-1.7.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2; - sha256 = "1fr7mi4nbcxsa88qin9g2ipmzh595ydxy9qnabzl270laf6zmwnq"; + url = mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2; + sha256 = "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2"; }; buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -856,11 +856,11 @@ let }) // {inherit printproto libX11 libXau libXext xextproto ;}; libXpm = (mkDerivation "libXpm" { - name = "libXpm-3.5.11"; + name = "libXpm-3.5.12"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2; - sha256 = "07041q4k8m4nirzl7lrqn8by2zylx0xvh6n0za301qqs3njszgf5"; + url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2; + sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx"; }; buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1120,11 +1120,11 @@ let }) // {inherit libfontenc freetype xproto zlib ;}; presentproto = (mkDerivation "presentproto" { - name = "presentproto-1.0"; + name = "presentproto-1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/presentproto-1.0.tar.bz2; - sha256 = "1kir51aqg9cwazs14ivcldcn3mzadqgykc9cg87rm40zf947sb41"; + url = mirror://xorg/individual/proto/presentproto-1.1.tar.bz2; + sha256 = "1f96dlgfwhsd0834z8ydjzjnb0cwha5r6lxgia4say4zhsl276zn"; }; buildInputs = [pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1241,11 +1241,11 @@ let }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;}; utilmacros = (mkDerivation "utilmacros" { - name = "util-macros-1.19.0"; + name = "util-macros-1.19.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2; - sha256 = "1fnhpryf55l0yqajxn0cxan3kvsjzi67nlanz8clwqzf54cb2d98"; + url = mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2; + sha256 = "19h6wflpmh7xxqr6lk5z8pds6r9r0dn7ijbvaacymx2q0m05km0q"; }; buildInputs = [pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1285,11 +1285,11 @@ let }) // {inherit libX11 libXext libXft libXmu xproto libXrender ;}; xauth = (mkDerivation "xauth" { - name = "xauth-1.0.9"; + name = "xauth-1.0.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xauth-1.0.9.tar.bz2; - sha256 = "13y2invb0894b1in03jbglximbz6v31y2kr4yjjgica8xciibkjn"; + url = mirror://xorg/individual/app/xauth-1.0.10.tar.bz2; + sha256 = "0kgwz9rmxjfdvi2syf8g0ms5rr5cgyqx4n0n1m960kyz7k745zjs"; }; buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1571,11 +1571,11 @@ let }) // {inherit ;}; xf86inputevdev = (mkDerivation "xf86inputevdev" { - name = "xf86-input-evdev-2.10.3"; + name = "xf86-input-evdev-2.10.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2; - sha256 = "18ijnclnylrr7vkvflalkw4bqfily3scg6baczjjgycdpsj1p8js"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2; + sha256 = "03dphgwjaxxyys8axc1kyysp6xvy9bjxicsdrhi2jvdgbchadnly"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1604,11 +1604,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.19.1"; + name = "xf86-input-libinput-0.23.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2; - sha256 = "0381rnahg8mbzcisify092jyjycxzswpqg7dnqldrwjadx0ckwf7"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2; + sha256 = "1p596v3kbmjpdz3kz8z19bnd79l860f1pbwjvma7bz7qx3gynlqb"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1714,11 +1714,11 @@ let }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videochips = (mkDerivation "xf86videochips" { - name = "xf86-video-chips-1.2.6"; + name = "xf86-video-chips-1.2.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2; - sha256 = "073bcdsvvsg19mb963sa5v7x2zs19y0q6javmgpiwfaqkz7zbblr"; + url = mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2; + sha256 = "0n4zypmbkjzkw36cjy2braaivhvj60np6w80lcs9mfpabs66ia3f"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1736,11 +1736,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videodummy = (mkDerivation "xf86videodummy" { - name = "xf86-video-dummy-0.3.7"; + name = "xf86-video-dummy-0.3.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2; - sha256 = "1046p64xap69vlsmsz5rjv0djc970yhvq44fmllmas0mqp5lzy2n"; + url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2; + sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1780,11 +1780,11 @@ let }) // {inherit xextproto xorgserver xproto ;}; xf86videoglint = (mkDerivation "xf86videoglint" { - name = "xf86-video-glint-1.2.8"; + name = "xf86-video-glint-1.2.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2; - sha256 = "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5"; + url = mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2; + sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; }; buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1802,22 +1802,22 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoi740 = (mkDerivation "xf86videoi740" { - name = "xf86-video-i740-1.3.5"; + name = "xf86-video-i740-1.3.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2; - sha256 = "0973zzmdsvlmplcax1c91is7v78lcwy6d9mwp11npgqzl782vq0w"; + url = mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2; + sha256 = "0c8nl0yyyw08n4zd6sgw9p3a858wpgf6raczjd70gf47lncms389"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (mkDerivation "xf86videointel" { - name = "xf86-video-intel-2016-09-08"; + name = "xf86-video-intel-2017-02-05"; builder = ./builder.sh; src = fetchurl { - url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/15c5ff12459a034b552c787047d1af6d61047cd6.tar.gz; - sha256 = "0nggdll6i5qddv9r2imip4hf6aw1nmfxjqg3i6gcbwmqp2w3f003"; + url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/e4fe79cf0d9a05ee3f3a027148ef0aeb2b1b34e1.tar.gz; + sha256 = "1hzfz5m9iclxk55531nqmyn25a50ggibl1qb80l6742k25k211cr"; }; buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1836,11 +1836,11 @@ let }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videomga = (mkDerivation "xf86videomga" { - name = "xf86-video-mga-1.6.4"; + name = "xf86-video-mga-1.6.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2; - sha256 = "0kyl8w99arviv27pc349zsy2vinnm7mdpy34vr9nzisicw5nkij8"; + url = mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2; + sha256 = "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1880,11 +1880,11 @@ let }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videonv = (mkDerivation "xf86videonv" { - name = "xf86-video-nv-2.1.20"; + name = "xf86-video-nv-2.1.21"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2; - sha256 = "1gqh1khc4zalip5hh2nksgs7i3piqq18nncgmsx9qvzi05azd5c3"; + url = mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2; + sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1902,22 +1902,22 @@ let }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; xf86videoqxl = (mkDerivation "xf86videoqxl" { - name = "xf86-video-qxl-0.1.3"; + name = "xf86-video-qxl-0.1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2; - sha256 = "1368dd5mihn3s098n7wa3fpjkp8pnamabfjjipkqs9zyrcvncy3m"; + url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2; + sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; xf86videor128 = (mkDerivation "xf86videor128" { - name = "xf86-video-r128-6.10.0"; + name = "xf86-video-r128-6.10.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-r128-6.10.0.tar.bz2; - sha256 = "0g9m1n5184h05mq14vb6k288zm6g81a9m048id00l8v8f6h33mc0"; + url = mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2; + sha256 = "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1946,38 +1946,49 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videosavage = (mkDerivation "xf86videosavage" { - name = "xf86-video-savage-2.3.8"; + name = "xf86-video-savage-2.3.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-savage-2.3.8.tar.bz2; - sha256 = "0qzshncynjdmyhavhqw4x5ha3gwbygi0zbsy158fpg1jcnla9kpx"; + url = mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2; + sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videosiliconmotion = (mkDerivation "xf86videosiliconmotion" { - name = "xf86-video-siliconmotion-1.7.8"; + name = "xf86-video-siliconmotion-1.7.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.8.tar.bz2; - sha256 = "1sqv0y31mi4zmh9yaxqpzg7p8y2z01j6qys433hb8n4yznllkm79"; + url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2; + sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; }; buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;}; xf86videosis = (mkDerivation "xf86videosis" { - name = "xf86-video-sis-0.10.8"; + name = "xf86-video-sis-0.10.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-sis-0.10.8.tar.bz2; - sha256 = "1znkqwdyd6am23xbsfjzamq125j5rrylg5mzqky4scv9gxbz5wy8"; + url = mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2; + sha256 = "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;}; + xf86videosisusb = (mkDerivation "xf86videosisusb" { + name = "xf86-video-sisusb-0.9.7"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2; + sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; + }; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; + meta.platforms = stdenv.lib.platforms.unix; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; + xf86videosuncg6 = (mkDerivation "xf86videosuncg6" { name = "xf86-video-suncg6-1.1.2"; builder = ./builder.sh; @@ -2000,12 +2011,23 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; - xf86videotdfx = (mkDerivation "xf86videotdfx" { - name = "xf86-video-tdfx-1.4.6"; + xf86videosunleo = (mkDerivation "xf86videosunleo" { + name = "xf86-video-sunleo-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.6.tar.bz2; - sha256 = "0dvdrhyn1iv6rr85v1c52s1gl0j1qrxgv7x0r7qn3ba0gj38i2is"; + url = mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2; + sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; + }; + buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; + meta.platforms = stdenv.lib.platforms.unix; + }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; + + xf86videotdfx = (mkDerivation "xf86videotdfx" { + name = "xf86-video-tdfx-1.4.7"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2; + sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2023,11 +2045,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videotrident = (mkDerivation "xf86videotrident" { - name = "xf86-video-trident-1.3.7"; + name = "xf86-video-trident-1.3.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2; - sha256 = "1bhkwic2acq9za4yz4bwj338cwv5mdrgr2qmgkhlj3bscbg1imgc"; + url = mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2; + sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2232,11 +2254,11 @@ let }) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (mkDerivation "xkeyboardconfig" { - name = "xkeyboard-config-2.19"; + name = "xkeyboard-config-2.20"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.19.tar.bz2; - sha256 = "09sqyi430bbg13pp8j0j60p9p9xn2lpqx38xw1lyv77bp63d3pw3"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2; + sha256 = "0d619g4r0w1f6q5qmaqjnsc0956gi02fqgpisqffzqy4acjwggyi"; }; buildInputs = [pkgconfig libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2342,15 +2364,15 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.18.4"; + name = "xorg-server-1.19.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2; - sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; + url = mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2; + sha256 = "1yx7cnlhl14hsdq5lg0740s4nxqxkmaav38x428llv1zkprjrbkr"; }; - buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; + }) // {inherit dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { name = "xorg-sgml-doctools-1.11"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 889dd58c01b..0afbb21ea22 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -235,6 +235,11 @@ in }; libXpm = attrs: attrs // { + name = "libXpm-3.5.12"; + src = args.fetchurl { + url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2; + sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx"; + }; outputs = [ "bin" "dev" "out" ]; # tiny man in $bin patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; }; @@ -333,7 +338,6 @@ in xf86videoark = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videogeode = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videoglide = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; - xf86videoglint = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videoi128 = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videonewport = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videoopenchrome = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; @@ -350,13 +354,6 @@ in NIX_CFLAGS_COMPILE = "-I${xorg.xorgserver.dev or xorg.xorgserver}/include/xorg"; }; - xf86videonv = attrs: attrs // { - patches = [( args.fetchpatch { - url = http://cgit.freedesktop.org/xorg/driver/xf86-video-nv/patch/?id=fc78fe98222b0204b8a2872a529763d6fe5048da; - sha256 = "0i2ddgqwj6cfnk8f4r73kkq3cna7hfnz7k3xj3ifx5v8mfiva6gw"; - })]; - }; - xf86videovmware = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker }; @@ -393,10 +390,11 @@ in }; xorgserver = with xorg; attrs_passed: - # exchange attrs if fglrxCompat is set + # exchange attrs if abiCompat is set let - attrs = if !args.fglrxCompat then attrs_passed else - with args; { + attrs = with args; + if (args.abiCompat == null) then attrs_passed + else if (args.abiCompat == "1.17") then { name = "xorg-server-1.17.4"; builder = ./builder.sh; src = fetchurl { @@ -405,7 +403,16 @@ in }; buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }; + } else if (args.abiCompat == "1.18") then { + name = "xorg-server-1.18.4"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2; + sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; + }; + buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + } else throw "unsupported xorg abiCompat: ${args.abiCompat}"; in attrs // (let @@ -421,6 +428,7 @@ in damageproto xcmiscproto bigreqsproto inputproto xextproto randrproto renderproto presentproto dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto + libXfont2 ]; # fix_segfault: https://bugs.freedesktop.org/show_bug.cgi?id=91316 commonPatches = [ ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index c0d2065a9ff..3247d3e7b15 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -6,7 +6,7 @@ mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2 mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2 mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2 -mirror://xorg/individual/proto/presentproto-1.0.tar.bz2 +mirror://xorg/individual/proto/presentproto-1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2 @@ -71,11 +71,11 @@ mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 -mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2 +mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2 -mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2 +mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2 mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2 mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2 mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 @@ -100,11 +100,11 @@ mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2 mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 mirror://xorg/individual/app/twm-1.0.9.tar.bz2 -mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2 +mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2 mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 -mirror://xorg/individual/app/xauth-1.0.9.tar.bz2 +mirror://xorg/individual/app/xauth-1.0.10.tar.bz2 mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2 @@ -119,10 +119,10 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 @@ -132,34 +132,36 @@ mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2 -mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 -mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 +mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2 +mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 +mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2 -mirror://xorg/individual/driver/xf86-video-r128-6.10.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 -mirror://xorg/individual/driver/xf86-video-savage-2.3.8.tar.bz2 -mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.8.tar.bz2 -mirror://xorg/individual/driver/xf86-video-sis-0.10.8.tar.bz2 +mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-tdfx-1.4.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2 @@ -175,7 +177,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.19.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 @@ -183,7 +185,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index ee4b5695c7c..513e4ceee62 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,5 +1,5 @@ -{ stdenv, wayland, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }: +{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }: with stdenv.lib; @@ -7,7 +7,7 @@ overrideDerivation xorgserver (oldAttrs: { name = "xwayland-${xorgserver.version}"; propagatedNativeBuildInputs = oldAttrs.propagatedNativeBuildInputs - ++ [wayland epoxy libxslt makeWrapper libunwind]; + ++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind]; configureFlags = [ "--disable-docs" "--disable-devel-docs" diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 0357c8c17f1..585144f74ed 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, substituteAll, xterm, makeWrapper, ruby , openssl, quartz-wm, fontconfig, xlsfonts, xfontsel -, ttf_bitstream_vera, freefont_ttf, liberation_ttf_binary +, ttf_bitstream_vera, freefont_ttf, liberation_ttf , shell ? "${bashInteractive}/bin/bash" }: @@ -64,7 +64,7 @@ let xorg.fontbhlucidatypewriter75dpi ttf_bitstream_vera freefont_ttf - liberation_ttf_binary + liberation_ttf xorg.fontbh100dpi xorg.fontmiscmisc xorg.fontcursormisc diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 5f850a09ded..b898abc9778 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -23,12 +23,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; in stdenv.mkDerivation rec { - version = "16.09"; + version = "17.01"; name = "ejabberd-${version}"; src = fetchurl { url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "054gzf4df466a6pyh4w476hxald6637nayy44hvaf31iycxani3v"; + sha256 = "02y9f1zxqvqrhapfay3avkys0llpyjsag6rpz5vfig01zqjqzyky"; }; nativeBuildInputs = [ fakegit ]; @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "12dj1k5pfxc5rw4qjzqf3848190i559h3f9s1dwzpfpkdgjd38vf"; + outputHash = "0flybfhq6qv1ihsjfg9p7191bffip7gpizg29wdbf1x6qgxhpz5r"; }; configureFlags = diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index 7cf95ca7e9e..4eecfa41810 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre, makeWrapper, bash }: stdenv.mkDerivation rec { - name = "zookeeper-3.4.6"; + name = "zookeeper-3.4.9"; src = fetchurl { url = "mirror://apache/zookeeper/${name}/${name}.tar.gz"; - sha256 = "01b3938547cd620dc4c93efe07c0360411f4a66962a70500b163b59014046994"; + sha256 = "0dgmja1lm7qn92x2xfmz5qj2k6sj2f6yzyj3a55r7iv1590l1wz7"; }; buildInputs = [ makeWrapper jre ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = "http://zookeeper.apache.org"; description = "Apache Zookeeper"; license = licenses.asl20; - maintainers = with maintainers; [ nathan-gs cstrahan ]; + maintainers = with maintainers; [ nathan-gs cstrahan pradeepchhetri ]; platforms = platforms.unix; }; } diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index ad4cc3d09d7..3ac1ca2172d 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -2,15 +2,19 @@ stdenv.mkDerivation rec { name = "bash-completion-${version}"; - version = "2.4"; + version = "2.5"; src = fetchurl { url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz"; - sha256 = "1xlhd09sb2w3bw8qaypxgkr0782w082mcbx8zf7yzjgy0996pxy0"; + sha256 = "1kwmii1z1ljx5i4z702ynsr8jgrq64bj9w9hl3n2aa2kcl659fdh"; }; doCheck = true; + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i -e 's/readlink -f/readlink/g' bash_completion completions/* + ''; + meta = with stdenv.lib; { homepage = https://github.com/scop/bash-completion; description = "Programmable completion for the bash shell"; diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/shells/dgsh/default.nix new file mode 100644 index 00000000000..51319aef90a --- /dev/null +++ b/pkgs/shells/dgsh/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, + libtool, check, bison, git, gperf, + perl, texinfo, help2man, gettext, ncurses +}: + +stdenv.mkDerivation rec { + name = "dgsh-unstable-${version}"; + version = "2017-02-05"; + + src = fetchFromGitHub { + owner = "dspinellis"; + repo = "dgsh"; + rev = "bc4fc2e8009c069ee4df5140c32a2fc15d0acdec"; + sha256 = "0k3hmnarz56wphw45mabn5zcc427l5p77jldh1qqy89pxqy1wnql"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ autoconf automake pkgconfig libtool check + bison git gettext gperf perl texinfo help2man ncurses + ]; + + configurePhase = '' + cp -r ./unix-tools/coreutils/gnulib gnulib + perl -pi -e \ + 's#./bootstrap #./bootstrap --no-bootstrap-sync --skip-po --no-git --gnulib-srcdir='$PWD/gnulib' #g' \ + unix-tools/Makefile + find . -name \*.diff | xargs rm -f + rm -rf unix-tools/*/gnulib + patchShebangs unix-tools/diffutils/man/help2man + export RSYNC=true # set to rsync binary, eventhough it is not used. + make PREFIX=$out config + ''; + + meta = with stdenv.lib; { + description = "The Directed Graph Shell"; + homepage = http://www.dmst.aueb.gr/dds/sw/dgsh; + license = with licenses; asl20; + maintainers = with maintainers; [ vrthra ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 884f34dcf02..7dc6029acb4 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "elvish-${version}"; - version = "0.1"; + version = "0.5"; goPackagePath = "github.com/elves/elvish"; src = fetchFromGitHub { repo = "elvish"; owner = "elves"; - rev = "4125c2bb927330b0100b354817dd4ad252118ba6"; - sha256 = "1xwhjbw0y6j5xy19hz39456l0v6vjg2icd7c1jx4h1cydk3yn39f"; + rev = version; + sha256 = "1dk5f8a2wpgd5cw45ippvx46fxk0yap64skfpzpiqz8bkbnrwbz6"; }; goDeps = ./deps.nix; @@ -20,6 +20,6 @@ buildGoPackage rec { homepage = https://github.com/elves/elvish; license = licenses.bsd2; maintainers = with maintainers; [ vrthra ]; - platforms = with platforms; [ linux ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index 037d1e1ec99..789ddaf4d9b 100644 --- a/pkgs/shells/es/default.nix +++ b/pkgs/shells/es/default.nix @@ -1,34 +1,28 @@ -{ stdenv, fetchgit, readline, yacc, autoconf, automake, libtool }: +{ stdenv, fetchurl, readline, yacc }: let - version = "git-2015-04-11"; + version = "0.9.1"; in stdenv.mkDerivation { name = "es-${version}"; - src = fetchgit { - url = "git://github.com/wryun/es-shell"; - rev = "fdf29d5296ce3a0ef96d2b5952cff07878753975"; - sha256 = "12faa9b5ffwydgwyjp57zr19sqap2ma3crj6wd2rx1hv30dkll7p"; + src = fetchurl { + url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz"; + sha256 = "1fplzxc6lncz2lv2fyr2ig23rgg5j96rm2bbl1rs28mik771zd5h"; }; - buildInputs = [ readline yacc libtool autoconf automake ]; - - preConfigure = - '' - aclocal - autoconf - libtoolize -qi - ''; - - configureFlags="--with-readline --prefix=$(out) --bindir=$(out)/bin --mandir=$(out)/man"; - - preInstall = '' - mkdir -p $out/bin - mkdir -p $out/man/man1 + # The distribution tarball does not have a single top-level directory. + preUnpack = '' + mkdir $name + cd $name + sourceRoot=. ''; + buildInputs = [ readline yacc ]; + + configureFlags = [ "--with-readline" ]; + meta = with stdenv.lib; { description = "Es is an extensible shell"; longDescription = @@ -40,7 +34,7 @@ stdenv.mkDerivation { ''; homepage = http://wryun.github.io/es-shell/; license = licenses.publicDomain; - maintainers = [ maintainers.sjmackenzie ]; + maintainers = with maintainers; [ sjmackenzie ttuegel ]; platforms = platforms.all; }; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index f4da2f6fcda..5bdf295cc6e 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "fish-${version}"; - version = "2.3.1"; + version = "2.5.0"; patches = [ ./etc_config.patch ]; src = fetchurl { url = "http://fishshell.com/files/${version}/${name}.tar.gz"; - sha256 = "0r46p64lg6da3v6chsa4gisvl04kd3rpy60yih8r870kbp9wm2ij"; + sha256 = "19djav128nkhjxgfhwhc32i5y9d9c3karbh5yg67kqrdranyvh7q"; }; buildInputs = [ ncurses libiconv pcre2 ]; diff --git a/pkgs/shells/tcsh/avoid-gcc5-wrong-optimisation.patch b/pkgs/shells/tcsh/avoid-gcc5-wrong-optimisation.patch deleted file mode 100644 index b35d29680af..00000000000 --- a/pkgs/shells/tcsh/avoid-gcc5-wrong-optimisation.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: christos -Date: Thu, 28 May 2015 11:47:03 +0000 -Subject: [PATCH] avoid gcc-5 optimization malloc + memset = calloc (Fridolin -Pokorny) - ---- -tc.alloc.c | 5 ++++- -1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/tc.alloc.c b/tc.alloc.c -index b9aec63..c1cb330 100644 ---- a/tc.alloc.c -+++ b/tc.alloc.c -@@ -348,10 +348,13 @@ calloc(size_t i, size_t j) - { - #ifndef lint - char *cp; -+ volatile size_t k; - - i *= j; - cp = xmalloc(i); -- memset(cp, 0, i); -+ /* Stop gcc 5.x from optimizing malloc+memset = calloc */ -+ k = i; -+ memset(cp, 0, k); - - return ((memalign_t) cp); - #else diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 02702510014..da76e2c3027 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -3,19 +3,17 @@ stdenv.mkDerivation rec { name = "tcsh-${version}"; - version = "6.19.00"; - + version = "6.20.00"; + src = fetchurl { - urls = [ - "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${name}.tar.gz" - "ftp://ftp.astron.com/pub/tcsh/${name}.tar.gz" - "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${name}.tar.gz" - ]; - sha256 = "0jaw51382pqyb6d1kgfg8ir0wd3p5qr2bmg8svcmjhlyp3h73qhj"; + urls = [ + "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${name}.tar.gz" + "ftp://ftp.astron.com/pub/tcsh/${name}.tar.gz" + "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${name}.tar.gz" + ]; + sha256 = "17ggxkkn5skl0v1x0j6hbv5l0sgnidfzwv16992sqkdm983fg7dq"; }; - patches = [ ./avoid-gcc5-wrong-optimisation.patch ./tcsh.glibc-2.24.patch ]; - buildInputs = [ ncurses ]; meta = with stdenv.lib;{ diff --git a/pkgs/shells/tcsh/tcsh.glibc-2.24.patch b/pkgs/shells/tcsh/tcsh.glibc-2.24.patch deleted file mode 100644 index 267d89c8f1b..00000000000 --- a/pkgs/shells/tcsh/tcsh.glibc-2.24.patch +++ /dev/null @@ -1,21 +0,0 @@ -Proposed patch from Debian bug tracker by Aurelien Jarno - -diff --git a/sh.proc.c b/sh.proc.c -index ad07250..5c68409 100644 ---- a/sh.proc.c -+++ b/sh.proc.c -@@ -47,11 +47,11 @@ RCSID("$tcsh$") - # define HZ 16 - #endif /* aiws */ - --#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) --# if !defined(__ANDROID__) -+#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GLIBC__) -+# if !defined(__ANDROID__) && !defined(__GLIBC__) - # define BSDWAIT - # endif --#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */ -+#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || gnu-linux */ - #ifndef WTERMSIG - # define WTERMSIG(w) (((union wait *) &(w))->w_termsig) - # ifndef BSDWAIT diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 11f9a43c035..3ffe1ab15d9 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -56,69 +56,60 @@ rec { # Return a modified stdenv that adds a cross compiler to the # builds. - makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv // - { mkDerivation = {name ? "", buildInputs ? [], nativeBuildInputs ? [], - propagatedBuildInputs ? [], propagatedNativeBuildInputs ? [], - selfNativeBuildInput ? false, ...}@args: let + makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv // { - # *BuildInputs exists temporarily as another name for - # *HostInputs. + mkDerivation = + { name ? "", buildInputs ? [], nativeBuildInputs ? [] + , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? [] + , selfNativeBuildInput ? false, ... + } @ args: - # In nixpkgs, sometimes 'null' gets in as a buildInputs element, - # and we handle that through isAttrs. - getNativeDrv = drv: drv.nativeDrv or drv; - getCrossDrv = drv: drv.crossDrv or drv; - nativeBuildInputsDrvs = map getNativeDrv nativeBuildInputs; - buildInputsDrvs = map getCrossDrv buildInputs; - propagatedBuildInputsDrvs = map getCrossDrv propagatedBuildInputs; - propagatedNativeBuildInputsDrvs = map getNativeDrv propagatedNativeBuildInputs; + let + # *BuildInputs exists temporarily as another name for + # *HostInputs. - # The base stdenv already knows that nativeBuildInputs and - # buildInputs should be built with the usual gcc-wrapper - # And the same for propagatedBuildInputs. - nativeDrv = stdenv.mkDerivation args; + # The base stdenv already knows that nativeBuildInputs and + # buildInputs should be built with the usual gcc-wrapper + # And the same for propagatedBuildInputs. + nativeDrv = stdenv.mkDerivation args; - # Temporary expression until the cross_renaming, to handle the - # case of pkgconfig given as buildInput, but to be used as - # nativeBuildInput. - hostAsNativeDrv = drv: - builtins.unsafeDiscardStringContext drv.nativeDrv.drvPath - == builtins.unsafeDiscardStringContext drv.crossDrv.drvPath; - buildInputsNotNull = stdenv.lib.filter - (drv: builtins.isAttrs drv && drv ? nativeDrv) buildInputs; - nativeInputsFromBuildInputs = stdenv.lib.filter hostAsNativeDrv buildInputsNotNull; + # Temporary expression until the cross_renaming, to handle the + # case of pkgconfig given as buildInput, but to be used as + # nativeBuildInput. + hostAsNativeDrv = drv: + builtins.unsafeDiscardStringContext drv.nativeDrv.drvPath + == builtins.unsafeDiscardStringContext drv.crossDrv.drvPath; + buildInputsNotNull = stdenv.lib.filter + (drv: builtins.isAttrs drv && drv ? nativeDrv) buildInputs; + nativeInputsFromBuildInputs = stdenv.lib.filter hostAsNativeDrv buildInputsNotNull; + in + stdenv.mkDerivation (args // { + name = name + "-" + cross.config; + nativeBuildInputs = nativeBuildInputs + ++ nativeInputsFromBuildInputs + ++ [ gccCross binutilsCross ] + ++ stdenv.lib.optional selfNativeBuildInput nativeDrv + # without proper `file` command, libtool sometimes fails + # to recognize 64-bit DLLs + ++ stdenv.lib.optional (cross.config == "x86_64-w64-mingw32") pkgs.file + ++ stdenv.lib.optional (cross.config == "aarch64-linux-gnu") pkgs.updateAutotoolsGnuConfigScriptsHook + ; - # We should overwrite the input attributes in crossDrv, to overwrite - # the defaults for only-native builds in the base stdenv - crossDrv = if cross == null then nativeDrv else - stdenv.mkDerivation (args // { - name = name + "-" + cross.config; - nativeBuildInputs = nativeBuildInputsDrvs - ++ nativeInputsFromBuildInputs - ++ [ gccCross binutilsCross ] - ++ stdenv.lib.optional selfNativeBuildInput nativeDrv - # without proper `file` command, libtool sometimes fails - # to recognize 64-bit DLLs - ++ stdenv.lib.optional (cross.config == "x86_64-w64-mingw32") pkgs.file - ; + # Cross-linking dynamic libraries, every buildInput should + # be propagated because ld needs the -rpath-link to find + # any library needed to link the program dynamically at + # loader time. ld(1) explains it. + buildInputs = []; + propagatedBuildInputs = propagatedBuildInputs ++ buildInputs; + propagatedNativeBuildInputs = propagatedNativeBuildInputs; - # Cross-linking dynamic libraries, every buildInput should - # be propagated because ld needs the -rpath-link to find - # any library needed to link the program dynamically at - # loader time. ld(1) explains it. - buildInputs = []; - propagatedBuildInputs = propagatedBuildInputsDrvs ++ buildInputsDrvs; - propagatedNativeBuildInputs = propagatedNativeBuildInputsDrvs; + crossConfig = cross.config; + } // args.crossAttrs or {}); - crossConfig = cross.config; - } // args.crossAttrs or {}); - in nativeDrv // { - inherit crossDrv nativeDrv; - }; - } // { - inherit cross gccCross binutilsCross; - ccCross = gccCross; - }; + inherit gccCross binutilsCross; + ccCross = gccCross; + + }; /* Modify a stdenv so that the specified attributes are added to @@ -192,7 +183,7 @@ rec { This adapter can be defined on the defaultStdenv definition. You can use it by patching the all-packages.nix file or by using the override - feature of ~/.nixpkgs/config.nix . + feature of ~/.config/nixpkgs/config.nix . */ validateLicenses = licensePred: stdenv: stdenv // { mkDerivation = args: diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix index 11ca8e1440e..2c82d12da95 100644 --- a/pkgs/stdenv/booter.nix +++ b/pkgs/stdenv/booter.nix @@ -57,12 +57,17 @@ stageFuns: let # debugging purposes. folder = stageFun: finalSoFar: let args = stageFun finalSoFar; - stdenv = args.stdenv // { - # For debugging - __bootPackages = finalSoFar; + args' = args // { + stdenv = args.stdenv // { + # For debugging + __bootPackages = finalSoFar; + }; }; - args' = args // { inherit stdenv; }; in - (if args.__raw or false then lib.id else allPackages) args'; + if args.__raw or false + then args' + else allPackages ((builtins.removeAttrs args' ["selfBuild"]) // { + buildPackages = if args.selfBuild or true then null else finalSoFar; + }); in lib.lists.fold folder {} withAllowCustomOverrides diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 16f41671b76..e322d465520 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -1,10 +1,10 @@ { lib -, system, platform, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays }: let bootStages = import ../. { - inherit lib system platform overlays; + inherit lib localSystem overlays; crossSystem = null; # Ignore custom stdenvs when cross compiling for compatability config = builtins.removeAttrs config [ "replaceStdenv" ]; @@ -12,25 +12,27 @@ let in bootStages ++ [ - # Build Packages. - # - # For now, this is just used to build the native stdenv. Eventually, it - # should be used to build compilers and other such tools targeting the cross - # platform. Then, `forceNativeDrv` can be removed. + # Build Packages (vanillaPackages: { - inherit system platform crossSystem config overlays; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = crossSystem; + inherit config overlays; + selfBuild = false; # It's OK to change the built-time dependencies allowCustomOverrides = true; stdenv = vanillaPackages.stdenv // { - # Needed elsewhere as a hacky way to pass the target - cross = crossSystem; overrides = _: _: {}; }; }) - # Run packages + # Run Packages (buildPackages: { - inherit system platform crossSystem config overlays; + buildPlatform = localSystem; + hostPlatform = crossSystem; + targetPlatform = crossSystem; + inherit config overlays; + selfBuild = false; stdenv = if crossSystem.useiOSCross or false then let inherit (buildPackages.darwin.ios-cross { diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index d7e9bf53bed..d5dc977b37a 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -1,12 +1,12 @@ { lib -, system, platform, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays }: assert crossSystem == null; let bootStages = import ../. { - inherit lib system platform crossSystem overlays; + inherit lib localSystem crossSystem overlays; # Remove config.replaceStdenv to ensure termination. config = builtins.removeAttrs config [ "replaceStdenv" ]; }; @@ -15,7 +15,10 @@ in bootStages ++ [ # Additional stage, built using custom stdenv (vanillaPackages: { - inherit system platform crossSystem config overlays; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config overlays; stdenv = config.replaceStdenv { pkgs = vanillaPackages; }; }) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index e3a87ea078f..e647c81890e 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1,11 +1,12 @@ { lib -, system, platform, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools , bootstrapFiles ? let fetch = { file, sha256, executable ? true }: import { url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/33f59c9d11b8d5014dfd18cc11a425f6393c884a/${file}"; - inherit sha256 system executable; + inherit (localSystem) system; + inherit sha256 executable; }; in { sh = fetch { file = "sh"; sha256 = "1rx4kg6358xdj05z0m139a0zn4f4zfmq4n4vimlmnwyfiyn4x7wk"; }; bzip2 = fetch { file = "bzip2"; sha256 = "104qnhzk79vkbp2yi0kci6lszgfppvrwk3rgxhry842ly1xz2r7l"; }; @@ -18,6 +19,8 @@ assert crossSystem == null; let + inherit (localSystem) system platform; + libSystemProfile = '' (import "${./standard-sandbox.sb}") ''; @@ -98,7 +101,10 @@ in rec { }; in { - inherit system platform crossSystem config overlays; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config overlays; stdenv = thisStdenv; }; @@ -316,7 +322,10 @@ in rec { stage3 stage4 (prevStage: { - inherit system crossSystem platform config overlays; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config overlays; stdenv = stdenvDarwin prevStage; }) ]; diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index f60ffec4b56..098caca0d89 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -7,7 +7,7 @@ { # Args just for stdenvs' usage lib # Args to pass on to the pkgset builder, too -, system, platform, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays } @ args: let @@ -44,6 +44,7 @@ in "armv5tel-linux" = stagesLinux; "armv6l-linux" = stagesLinux; "armv7l-linux" = stagesLinux; + "aarch64-linux" = stagesLinux; "mips64el-linux" = stagesLinux; "powerpc-linux" = /* stagesLinux */ stagesNative; "x86_64-darwin" = stagesDarwin; @@ -51,4 +52,4 @@ in "i686-cygwin" = stagesNative; "x86_64-cygwin" = stagesNative; "x86_64-freebsd" = stagesFreeBSD; - }.${system} or stagesNative + }.${localSystem.system} or stagesNative diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 2cb059deb34..b926c6bdd90 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -1,8 +1,9 @@ { lib -, system, platform, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays }: assert crossSystem == null; +let inherit (localSystem) system; in [ @@ -58,7 +59,10 @@ assert crossSystem == null; }) (prevStage: { - inherit system crossSystem platform config overlays; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config overlays; stdenv = import ../generic { name = "stdenv-freebsd-boot-3"; inherit system config; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 32e0d894818..34ba2fd8dd9 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -115,7 +115,19 @@ let , sandboxProfile ? "" , propagatedSandboxProfile ? "" , ... } @ attrs: - let + let # Rename argumemnts to avoid cycles + buildInputs__ = buildInputs; + nativeBuildInputs__ = nativeBuildInputs; + propagatedBuildInputs__ = propagatedBuildInputs; + propagatedNativeBuildInputs__ = propagatedNativeBuildInputs; + in let + getNativeDrv = drv: drv.nativeDrv or drv; + getCrossDrv = drv: drv.crossDrv or drv; + nativeBuildInputs = map getNativeDrv nativeBuildInputs__; + buildInputs = map getCrossDrv buildInputs__; + propagatedBuildInputs = map getCrossDrv propagatedBuildInputs__; + propagatedNativeBuildInputs = map getNativeDrv propagatedNativeBuildInputs__; + in let pos' = if pos != null then pos @@ -141,7 +153,7 @@ let b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add { allow${up reason} = true; } - to ~/.nixpkgs/config.nix. + to ~/.config/nixpkgs/config.nix. '')); # Check if a derivation is valid, that is whether it passes checks for @@ -299,6 +311,7 @@ let || system == "armv5tel-linux" || system == "armv6l-linux" || system == "armv7l-linux" + || system == "aarch64-linux" || system == "mips64el-linux"; isGNU = system == "i686-gnu"; # GNU/Hurd isGlibc = isGNU # useful for `stdenvNative' @@ -330,12 +343,14 @@ let || system == "x86_64-openbsd" || system == "x86_64-cygwin" || system == "x86_64-solaris" + || system == "aarch64-linux" || system == "mips64el-linux"; isMips = system == "mips-linux" || system == "mips64el-linux"; isArm = system == "armv5tel-linux" || system == "armv6l-linux" || system == "armv7l-linux"; + isAarch64 = system == "aarch64-linux"; isBigEndian = system == "powerpc-linux"; # Whether we should run paxctl to pax-mark binaries. diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64.nix new file mode 100644 index 00000000000..4e9c17da2d9 --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-files/aarch64.nix @@ -0,0 +1,11 @@ +{ + busybox = import { + url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-2017-01-27-264d42b9c/busybox; + sha256 = "12qcml1l67skpjhfjwy7gr10nc86gqcwjmz9ggp7knss8gq8pv7f"; + executable = true; + }; + bootstrapTools = import { + url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-2017-01-27-264d42b9c/bootstrap-tools.tar.xz; + sha256 = "13h7lgkjyxrmfkx5k1w6rj3j4iqrk28pqagiwqcg8izrydy318bi"; + }; +} diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 12da007f2a7..fe685a1e77c 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -4,21 +4,24 @@ # compiler and linker that do not search in default locations, # ensuring purity of components produced by it. { lib -, system, platform, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays -, bootstrapFiles ? - if system == "i686-linux" then import ./bootstrap-files/i686.nix - else if system == "x86_64-linux" then import ./bootstrap-files/x86_64.nix - else if system == "armv5tel-linux" then import ./bootstrap-files/armv5tel.nix - else if system == "armv6l-linux" then import ./bootstrap-files/armv6l.nix - else if system == "armv7l-linux" then import ./bootstrap-files/armv7l.nix - else if system == "mips64el-linux" then import ./bootstrap-files/loongson2f.nix - else abort "unsupported platform for the pure Linux stdenv" +, bootstrapFiles ? { # switch + "i686-linux" = import ./bootstrap-files/i686.nix; + "x86_64-linux" = import ./bootstrap-files/x86_64.nix; + "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix; + "armv6l-linux" = import ./bootstrap-files/armv6l.nix; + "armv7l-linux" = import ./bootstrap-files/armv7l.nix; + "aarch64-linux" = import ./bootstrap-files/aarch64.nix; + "mips64el-linux" = import ./bootstrap-files/loongson2f.nix; + }.${localSystem.system} + or (abort "unsupported platform for the pure Linux stdenv") }: assert crossSystem == null; let + inherit (localSystem) system platform; commonPreHook = '' @@ -91,7 +94,10 @@ let }; in { - inherit system platform crossSystem config overlays; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config overlays; stdenv = thisStdenv; }; @@ -208,7 +214,9 @@ in isl = isl_0_14; }; }; - extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ]; + extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ + # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. + lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook; }) @@ -235,7 +243,9 @@ in shell = self.bash + "/bin/bash"; }; }; - extraBuildInputs = [ prevStage.patchelf prevStage.xz ]; + extraBuildInputs = [ prevStage.patchelf prevStage.xz ] ++ + # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. + lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook; }) # Construct the final stdenv. It uses the Glibc and GCC, and adds @@ -246,7 +256,10 @@ in # dependency (`nix-store -qR') on bootstrapTools or the first # binutils built. (prevStage: { - inherit system crossSystem platform config overlays; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config overlays; stdenv = import ../generic rec { inherit system config; @@ -260,7 +273,9 @@ in initialPath = ((import ../common-path.nix) {pkgs = prevStage;}); - extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ]; + extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ + # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. + lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook; cc = prevStage.gcc; @@ -279,7 +294,7 @@ in [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl paxctl zlib pcre linuxHeaders ed gcc gcc.cc libsigsegv - ]; + ] ++ lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook; */ overrides = self: super: { diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 9f4a4517627..1a762bd87c7 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -50,53 +50,66 @@ let }; }; + aarch64-multiplatform-crossSystem = { + crossSystem = rec { + config = "aarch64-linux-gnu"; + bigEndian = false; + arch = "aarch64"; + withTLS = true; + libc = "glibc"; + platform = pkgsNoParams.platforms.aarch64-multiplatform; + inherit (platform) gcc; + }; + }; + selectedCrossSystem = if toolsArch == "armv5tel" then sheevaplugCrossSystem else if toolsArch == "armv6l" then raspberrypiCrossSystem else - if toolsArch == "armv7l" then armv7l-hf-multiplatform-crossSystem else null; + if toolsArch == "armv7l" then armv7l-hf-multiplatform-crossSystem else + if toolsArch == "aarch64" then aarch64-multiplatform-crossSystem else null; pkgs = pkgsFun ({inherit system;} // selectedCrossSystem); - inherit (pkgs) stdenv nukeReferences cpio binutilsCross; + inherit (pkgs.buildPackages) stdenv nukeReferences cpio binutilsCross; - glibc = pkgs.libcCross; - bash = pkgs.bash.crossDrv; - findutils = pkgs.findutils.crossDrv; - diffutils = pkgs.diffutils.crossDrv; - gnused = pkgs.gnused.crossDrv; - gnugrep = pkgs.gnugrep.crossDrv; - gawk = pkgs.gawk.crossDrv; - gzip = pkgs.gzip.crossDrv; - bzip2 = pkgs.bzip2.crossDrv; - gnumake = pkgs.gnumake.crossDrv; - patch = pkgs.patch.crossDrv; - patchelf = pkgs.patchelf.crossDrv; - gcc = pkgs.gcc.cc.crossDrv; - gmpxx = pkgs.gmpxx.crossDrv; - mpfr = pkgs.mpfr.crossDrv; - zlib = pkgs.zlib.crossDrv; - libmpc = pkgs.libmpc.crossDrv; - binutils = pkgs.binutils.crossDrv; - libelf = pkgs.libelf.crossDrv; + glibc = pkgs.buildPackages.libcCross; + bash = pkgs.bash; + findutils = pkgs.findutils; + diffutils = pkgs.diffutils; + gnused = pkgs.gnused; + gnugrep = pkgs.gnugrep; + gawk = pkgs.gawk; + gzip = pkgs.gzip; + bzip2 = pkgs.bzip2; + gnumake = pkgs.gnumake; + patch = pkgs.patch; + patchelf = pkgs.patchelf; + gcc = pkgs.gcc.cc; + gmpxx = pkgs.gmpxx; + mpfr = pkgs.mpfr; + zlib = pkgs.zlib; + libmpc = pkgs.libmpc; + binutils = pkgs.binutils; + libelf = pkgs.libelf; # Keep these versions in sync with the versions used in the current GCC! - isl = pkgs.isl_0_14.crossDrv; + isl = pkgs.isl_0_14; in rec { - coreutilsMinimal = (pkgs.coreutils.override (args: { + coreutilsMinimal = pkgs.coreutils.override (args: { # We want coreutils without ACL/attr support. aclSupport = false; attrSupport = false; # Our tooling currently can't handle scripts in bin/, only ELFs and symlinks. singleBinary = "symlinks"; - })).crossDrv; + }); - tarMinimal = (pkgs.gnutar.override { acl = null; }).crossDrv; + tarMinimal = pkgs.gnutar.override { acl = null; }; - busyboxMinimal = (pkgs.busybox.override { + busyboxMinimal = pkgs.busybox.override { useMusl = true; enableStatic = true; enableMinimal = true; @@ -109,13 +122,13 @@ rec { CONFIG_TAR y CONFIG_UNXZ y ''; - }).crossDrv; + }; build = stdenv.mkDerivation { name = "stdenv-bootstrap-tools-cross"; - crossConfig = stdenv.cross.config; + crossConfig = pkgs.hostPlatform.config; buildInputs = [nukeReferences cpio binutilsCross]; @@ -173,7 +186,7 @@ rec { cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin - cp -d ${gnugrep.pcre.crossDrv.out}/lib/libpcre*.so* $out/lib # needed by grep + cp -d ${gnugrep.pcre.out}/lib/libpcre*.so* $out/lib # needed by grep # Copy what we need of GCC. cp -d ${gcc.out}/bin/gcc $out/bin @@ -216,7 +229,7 @@ rec { for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils.out}/bin/$i $out/bin done - cp -d ${binutils.out}/lib/lib*.so* $out/lib + cp -d ${binutils.lib}/lib/lib*.so* $out/lib chmod -R u+w $out @@ -264,4 +277,5 @@ rec { armv5tel = buildFor "armv5tel"; armv6l = buildFor "armv6l"; armv7l = buildFor "armv7l"; + aarch64 = buildFor "aarch64"; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index d31253075c9..42015a79a3e 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -126,7 +126,7 @@ rec { for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils.out}/bin/$i $out/bin done - cp -d ${binutils.out}/lib/lib*.so* $out/lib + cp -d ${binutils.lib}/lib/lib*.so* $out/lib chmod -R u+w $out @@ -170,8 +170,9 @@ rec { }; bootstrapFiles = { - busybox = "${build}/on-server/busybox"; - bootstrapTools = "${build}/on-server/bootstrap-tools.tar.xz"; + # Make them their own store paths to test that busybox still works when the binary is named /nix/store/HASH-busybox + busybox = runCommand "busybox" {} "cp ${build}/on-server/busybox $out"; + bootstrapTools = runCommand "bootstrap-tools.tar.xz" {} "cp ${build}/on-server/bootstrap-tools.tar.xz $out"; }; bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 4028638009e..f5c0976bf93 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -1,10 +1,11 @@ { lib -, system, platform, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays }: assert crossSystem == null; let + inherit (localSystem) system platform; shell = if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash" @@ -134,7 +135,10 @@ in # First build a stdenv based only on tools outside the store. (prevStage: { - inherit system crossSystem platform config overlays; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config overlays; stdenv = makeStdenv { inherit (prevStage) cc fetchurl; } // { inherit (prevStage) fetchurl; }; @@ -143,7 +147,10 @@ in # Using that, build a stdenv that adds the ‘xz’ command (which most systems # don't have, so we mustn't rely on the native environment providing it). (prevStage: { - inherit system crossSystem platform config overlays; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config overlays; stdenv = makeStdenv { inherit (prevStage.stdenv) cc fetchurl; extraPath = [ prevStage.xz ]; diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index a5f0a18464c..9aece3ce829 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -9,9 +9,9 @@ assert crossSystem == null; bootStages ++ [ (prevStage: let inherit (prevStage) stdenv; - inherit (stdenv) system platform; in { - inherit system platform crossSystem config; + inherit (prevStage) buildPlatform hostPlatform targetPlatform; + inherit config overlays; stdenv = import ../generic rec { inherit config; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index eac44efdf27..7b725bfeb57 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -19,12 +19,13 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper , glib, libbsd , libX11, libXext, xorgserver, xkbcomp, kmod, xf86videonouveau -, nvidia_x11, virtualgl, primusLib +, nvidia_x11, virtualgl, libglvnd, primusLib , automake111x, autoconf # The below should only be non-null in a x86_64 system. On a i686 # system the above nvidia_x11 and virtualgl will be the i686 packages. # TODO: Confusing. Perhaps use "SubArch" instead of i686? , nvidia_x11_i686 ? null +, libglvnd_i686 ? null , primusLib_i686 ? null , useDisplayDevice ? false , extraNvidiaDeviceOptions ? "" @@ -40,7 +41,10 @@ let primusLibs = lib.makeLibraryPath ([primus] ++ lib.optional (primusLib_i686 != null) primus_i686); - nvidia_x11s = [nvidia_x11] ++ lib.optional (nvidia_x11_i686 != null) nvidia_x11_i686; + nvidia_x11s = [ nvidia_x11 ] + ++ lib.optional nvidia_x11.useGLVND libglvnd + ++ lib.optionals (nvidia_x11_i686 != null) + ([ nvidia_x11_i686 ] ++ lib.optional nvidia_x11_i686.useGLVND libglvnd_i686); nvidiaLibs = lib.makeLibraryPath nvidia_x11s; @@ -120,7 +124,7 @@ in stdenv.mkDerivation rec { #"CONF_PRIMUS_LD_PATH=${primusLibs}" ] ++ lib.optionals useNvidia [ "CONF_LDPATH_NVIDIA=${nvidiaLibs}" - "CONF_MODPATH_NVIDIA=${nvidia_x11}/lib/xorg/modules" + "CONF_MODPATH_NVIDIA=${nvidia_x11.bin}/lib/xorg/modules" ]; CFLAGS = [ diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index 88589a05878..229e228e405 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -5,6 +5,8 @@ # Other distributions do the same. { stdenv , stdenv_i686 +, lib +, bumblebee , primusLib , writeScriptBin , primusLib_i686 ? null @@ -18,7 +20,7 @@ let primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; }; primus_i686 = if useNvidia then primusLib_i686_ else primusLib_i686_.override { nvidia_x11 = null; }; - ldPath = stdenv.lib.makeLibraryPath ([primus] ++ stdenv.lib.optional (primusLib_i686 != null) primus_i686); + ldPath = lib.makeLibraryPath ([ primus primus.glvnd ] ++ lib.optionals (primusLib_i686 != null) [ primus_i686 primus_i686.glvnd ]); in writeScriptBin "primusrun" '' #!${stdenv.shell} diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index fccd01eaead..f3119a1a147 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -1,10 +1,16 @@ -{ stdenv, fetchFromGitHub -, xlibsWrapper, mesa +{ stdenv, fetchFromGitHub, fetchpatch +, libX11, mesa_noglu , nvidia_x11 ? null -, libX11 +, libglvnd }: -stdenv.mkDerivation { +let + aPackage = + if nvidia_x11 == null then mesa_noglu + else if nvidia_x11.useGLVND then libglvnd + else nvidia_x11; + +in stdenv.mkDerivation { name = "primus-lib-2015-04-28"; src = fetchFromGitHub { @@ -14,18 +20,28 @@ stdenv.mkDerivation { sha256 = "118jm57ccawskb8vjq3a9dpa2gh72nxzvx2zk7zknpy0arrdznj1"; }; - buildInputs = [ libX11 mesa ]; + patches = [ + # Bump buffer size for long library paths. + (fetchpatch { + url = "https://github.com/abbradar/primus/commit/2f429e232581c556df4f4bf210aee8a0c99c60b7.patch"; + sha256 = "1da6ynz7r7x98495i329sf821308j1rpy8prcdraqahz7p4c89nc"; + }) + ]; + + buildInputs = [ libX11 mesa_noglu ]; makeFlags = [ "LIBDIR=$(out)/lib" - "PRIMUS_libGLa=${if nvidia_x11 == null then mesa else nvidia_x11}/lib/libGL.so" - "PRIMUS_libGLd=${mesa}/lib/libGL.so" - "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so" + "PRIMUS_libGLa=${aPackage}/lib/libGL.so" + "PRIMUS_libGLd=${mesa_noglu}/lib/libGL.so" + "PRIMUS_LOAD_GLOBAL=${mesa_noglu}/lib/libglapi.so" ]; installPhase = '' ln -s $out/lib/libGL.so.1 $out/lib/libGL.so ''; + passthru.glvnd = if nvidia_x11 != null && nvidia_x11.useGLVND then nvidia_x11 else null; + meta = with stdenv.lib; { description = "Low-overhead client-side GPU offloading"; homepage = "https://github.com/amonakov/primus"; diff --git a/pkgs/tools/X11/wmutils-opt/default.nix b/pkgs/tools/X11/wmutils-opt/default.nix new file mode 100644 index 00000000000..c01aa8dc75f --- /dev/null +++ b/pkgs/tools/X11/wmutils-opt/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libxcb }: + +stdenv.mkDerivation rec { + name = "wmutils-opt-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "wmutils"; + repo = "opt"; + rev = "v${version}"; + sha256 = "0gd05qsir1lnzfrbnfh08qwsryz7arwj20f886nqh41m87yqaljz"; + }; + + buildInputs = [ libxcb ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Optional addons to wmutils"; + homepage = https://github.com/wmutils/opt; + license = licenses.isc; + maintainers = with maintainers; [ vifino ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index a8c249116c0..2d319cccf20 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { configureFlags="--mandir=$out/share/man" substituteInPlace x11vnc/unixpw.c \ - --replace '"/bin/su"' '"/var/setuid-wrappers/su"' \ + --replace '"/bin/su"' '"/run/wrappers/bin/su"' \ --replace '"/bin/true"' '"${coreutils}/bin/true"' - sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/var/setuid-wrappers/su|g' x11vnc/ssltools.h + sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' x11vnc/ssltools.h ''; meta = { diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 0d63c190b05..1c23593bd14 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, guile }: +{ stdenv, fetchurl, pkgconfig, libX11, guile }: let version = "1.8.6"; in stdenv.mkDerivation { @@ -8,6 +8,7 @@ stdenv.mkDerivation { sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 guile ]; meta = { diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix index 3d228fedfb7..238b8c7b2b2 100644 --- a/pkgs/tools/X11/xchainkeys/default.nix +++ b/pkgs/tools/X11/xchainkeys/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "xchainkeys-0.11"; src = fetchurl { - url = "https://xchainkeys.googlecode.com/files/${name}.tar.gz"; + url = "http://henning-bekel.de/download/xchainkeys/${name}.tar.gz"; sha256 = "1rpqs7h5krral08vqxwb0imy33z17v5llvrg5hy8hkl2ap7ya0mn"; }; buildInputs = [ libX11 ]; meta = { - homepage = "https://code.google.com/p/xchainkeys/"; + homepage = "http://henning-bekel.de/xchainkeys/"; description = "A standalone X11 program to create chained key bindings"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix index 8ff147faacc..9ac6ed17f66 100644 --- a/pkgs/tools/admin/certbot/default.nix +++ b/pkgs/tools/admin/certbot/default.nix @@ -4,13 +4,13 @@ python2Packages.buildPythonApplication rec { name = "certbot-${version}"; - version = "0.9.3"; + version = "0.11.1"; src = fetchFromGitHub { owner = "certbot"; repo = "certbot"; rev = "v${version}"; - sha256 = "03yfr8vlq62l0h14qk03flrkbvbv9mc5cf6rmh37naj8jwpl8cic"; + sha256 = "0f8s6wzj69gnqld6iaskmmwyg5zy5v3zwhp1n1izxixm0vhkzgrq"; }; propagatedBuildInputs = with python2Packages; [ @@ -31,7 +31,7 @@ python2Packages.buildPythonApplication rec { buildInputs = [ dialog ] ++ (with python2Packages; [ nose mock gnureadline ]); patchPhase = '' - substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail" + substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail" substituteInPlace certbot/util.py --replace "sw_vers" "/usr/bin/sw_vers" ''; diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix index 6bd915e7050..4860311fa73 100644 --- a/pkgs/tools/admin/dehydrated/default.nix +++ b/pkgs/tools/admin/dehydrated/default.nix @@ -1,7 +1,7 @@ { stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }: let pkgName = "dehydrated"; - version = "0.3.1"; + version = "0.4.0"; in stdenv.mkDerivation rec { name = pkgName + "-" + version; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "lukas2511"; repo = "dehydrated"; rev = "v${version}"; - sha256 = "0prg940ykbsfb4w48bc03j5abycg8v7f9rg9x3kcva37y8ml0jsp"; + sha256 = "0nxs6l5i6409dzgiyjn8cnzjcblwj4rqcpxxb766vcvb8d4kqwby"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index dd8aada62fe..acc440b34ed 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -3,7 +3,7 @@ with python27Packages; # other systems not supported yet -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; +assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin"; stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; sha256 = "1z2v4bg743qkdlmyyy0z2j5s0g10vbc1643gxrhyz491sk6sp616"; } + else if stdenv.system == "x86_64-darwin" then + fetchurl { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz"; + sha256 = "efbe2074da5a544c09b6bf87a8ca045dc429ac38dfcd5380561987769491d5ba"; + } else fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; @@ -58,6 +63,6 @@ stdenv.mkDerivation rec { license = licenses.free; homepage = "https://cloud.google.com/sdk/"; maintainers = with maintainers; [stephenmw zimbatm]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index b6185631551..da269049b2c 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -8,11 +8,11 @@ let inherit (pythonPackages) pygobject3 python; in stdenv.mkDerivation rec { name = "gtk-vnc-${version}"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "mirror://gnome/sources/gtk-vnc/0.6/${name}.tar.xz"; - sha256 = "9559348805e64d130dae569fee466930175dbe150d2649bb868b5c095f130433"; + url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.strings.substring 0 3 version}/${name}.tar.xz"; + sha256 = "0gj8dpy3sj4dp810gy67spzh5f0jd8aqg69clcwqjcskj1yawbiw"; }; buildInputs = [ diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix new file mode 100644 index 00000000000..27891614f4b --- /dev/null +++ b/pkgs/tools/admin/intecture/agent.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform +, openssl, zeromq, czmq, pkgconfig, cmake, zlib }: + +with rustPlatform; + +buildRustPackage rec { + name = "intecture-agent-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "intecture"; + repo = "agent"; + rev = version; + sha256 = "0b59ij9c7hv2p4jx96f3acbygw27wiv8cfzzg6sg73l6k244k6l6"; + }; + + depsSha256 = "1f94j54pg94f2x2lmmyj8dlki8plq6vnppmf3hzk3kd0rp7fzban"; + + buildInputs = [ openssl zeromq czmq zlib ]; + + nativeBuildInputs = [ pkgconfig cmake ]; + + meta = with lib; { + description = "Authentication client/server for Intecture components"; + homepage = https://intecture.io; + license = licenses.mpl20; + maintainers = [ maintainers.rushmorem ]; + }; +} diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix new file mode 100644 index 00000000000..88ef137d841 --- /dev/null +++ b/pkgs/tools/admin/intecture/auth.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform +, openssl, zeromq, czmq, pkgconfig, cmake, zlib }: + +with rustPlatform; + +buildRustPackage rec { + name = "intecture-auth-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "intecture"; + repo = "auth"; + rev = version; + sha256 = "1p3jahha8k139f22ijg050cl8akfzxda4gzvijpqv869hmhc70py"; + }; + + depsSha256 = "0mki57yzb29y9fhh16xvpi5gfp6c14r5q3f45f3v8sdj95rjahz1"; + + buildInputs = [ openssl zeromq czmq zlib ]; + + nativeBuildInputs = [ pkgconfig cmake ]; + + meta = with lib; { + description = "Authentication client/server for Intecture components"; + homepage = https://intecture.io; + license = licenses.mpl20; + maintainers = [ maintainers.rushmorem ]; + }; +} diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix new file mode 100644 index 00000000000..0f530f636d7 --- /dev/null +++ b/pkgs/tools/admin/intecture/cli.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform +, openssl, zeromq, czmq, pkgconfig, cmake, zlib }: + +with rustPlatform; + +buildRustPackage rec { + name = "intecture-cli-${version}"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "intecture"; + repo = "cli"; + rev = version; + sha256 = "0f5pyrlkxzz4kdfzwambxzqr48g3n06f1pv163h06ggssqa51wbc"; + }; + + depsSha256 = "0f3rhjs5addppva4cjx3ngpa5gz2i2n46hyc3zd4l7lhh8gaggix"; + + buildInputs = [ openssl zeromq czmq zlib ]; + + nativeBuildInputs = [ pkgconfig cmake ]; + + # Needed for tests + USER = "$(whoami)"; + + meta = with lib; { + description = "A developer friendly, language agnostic configuration management tool for server systems"; + homepage = https://intecture.io; + license = licenses.mpl20; + maintainers = [ maintainers.rushmorem ]; + }; +} diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 3386ed86a2a..786e3f64cda 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -8,11 +8,11 @@ python2Packages.buildPythonApplication rec { name = "salt-${version}"; - version = "2016.3.3"; + version = "2016.11.2"; src = fetchurl { url = "mirror://pypi/s/salt/${name}.tar.gz"; - sha256 = "1djjglnh6203y8dirziz5w6zh2lgszxp8ivi86nb7fgijj2h61jr"; + sha256 = "0hrss5x47cr7ffyjl8jlkhf9j88lqvg7c33rjc5bimck8b7x7hzm"; }; propagatedBuildInputs = with python2Packages; [ diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 901ec06ea65..60d2b2bcd11 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, xorg +{ stdenv, fetchFromGitHub, xorg , autoconf, automake, cvs, libtool, nasm, pixman, xkeyboard_config , fontDirectories, libgcrypt, gnutls, pam, flex, bison, gettext , cmake, libjpeg_turbo, fltk, nettle, libiconv, libtasn1 @@ -7,13 +7,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.7.0"; + version = "1.8.0pre20170211"; name = "tigervnc-${version}"; - src = fetchgit { - url = "https://github.com/TigerVNC/tigervnc/"; - sha256 = "1b6n2gq6078x8dwz471a68jrkgpcxmbiivmlsakr42vrndm7niz3"; - rev = "e25272fc74ef09987ccaa33b9bf1736397c76fdf"; + src = fetchFromGitHub { + owner = "TigerVNC"; + repo = "tigervnc"; + sha256 = "10bs6394ya953gmak8g2d3n133vyfrryq9zq6dc27g8s6lw0mrbh"; + rev = "b6c46a1a99a402d5d17b1afafc4784ce0958d6ec"; }; inherit fontDirectories; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { dontUseCmakeBuildDir = true; postBuild = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast" export CXXFLAGS="$CXXFLAGS -fpermissive" # Build Xvnc tar xf ${xorg.xorgserver.src} diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index 208b4c2b38b..80149fa98dd 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }: +{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }: stdenv.mkDerivation rec { name = "acoustid-fingerprinter-${version}"; @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${(builtins.parseDrvName taglib.name).version}" ]; + patches = [ (fetchpatch { + url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/632e87969c3a5562a5d4842b03613267ba6236b2/raw"; + sha256 = "15hm9knrpqn3yqrwyjz4zh2aypwbcycd0c5svrsy1fb2h2rh05jk"; + }) ]; + meta = with stdenv.lib; { homepage = "http://acoustid.org/fingerprinter"; description = "Audio fingerprinting tool using chromaprint"; diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 8b5427ed626..c50805c578f 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -2,13 +2,14 @@ , gnome3, avahi, gtk3, libnotify, libpulseaudio, xlibsWrapper}: stdenv.mkDerivation rec { - name = "pasystray-0.5.2"; + name = "pasystray-${version}"; + version = "0.6.0"; src = fetchFromGitHub { owner = "christophgysin"; repo = "pasystray"; - rev = "6709fc1e9f792baf4f7b4507a887d5876b2cfa70"; - sha256 = "1z21wassdiwfnlcrkpdqh8ylblpd1xxjxcmib5mwix9va2lykdfv"; + rev = name; + sha256 = "0k13s7pmz5ks3kli8pwhzd47hcjwv46gd2fgk7i4fbkfwf3z279h"; }; buildInputs = [ autoconf automake makeWrapper pkgconfig @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { description = "PulseAudio system tray"; homepage = "https://github.com/christophgysin/pasystray"; license = licenses.lgpl21Plus; - maintainers = [ maintainers.exlevan ]; + maintainers = with maintainers; [ exlevan kamilchm ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index ef7299966a7..06c44aa2cd9 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "obnam-${version}"; - version = "1.20.2"; + version = "1.21"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz"; - sha256 = "0r8gngjir9pinj5vp2aq326g74wnhv075n8y9i0hgc5cfvckjjmq"; + sha256 = "0qlipsq50hca71zc0dp1mg9zs12qm0sbblw7qfzl0hj6mk2rv1by"; }; buildInputs = [ pythonPackages.sphinx attr ]; @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; meta = { - homepage = http://liw.fi/obnam/; + homepage = http://obnam.org; description = "Backup program supporting deduplication, compression and encryption"; maintainers = [ stdenv.lib.maintainers.rickynils ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index 95823bedad6..0f95a26c940 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap ''; - buildInputs = [ openssl zlib e2fsprogs ]; + buildInputs = [ openssl zlib ] ++ stdenv.lib.optional stdenv.isLinux e2fsprogs ; meta = { description = "Online backups for the truly paranoid"; homepage = "http://www.tarsnap.com/"; license = "tarsnap"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ thoughtpolice roconnor ]; }; } diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 1c1085ff814..508fc781069 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3 , obex_data_server, xdg_utils, libnotify, dconf, gsettings_desktop_schemas, dnsmasq, dhcp -, hicolor_icon_theme , withPulseAudio ? true, libpulseaudio }: +, hicolor_icon_theme, librsvg +, withPulseAudio ? true, libpulseaudio }: let binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ]; @@ -16,7 +17,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython ]; - buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf + buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf librsvg gsettings_desktop_schemas hicolor_icon_theme ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix new file mode 100644 index 00000000000..a65f2d47d8f --- /dev/null +++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "cdi2iso-${version}"; + version = "0.1"; + + src = fetchurl { + url = "mirror://sourceforge/cdi2iso.berlios/${name}-src.tar.gz"; + sha256 = "0fj2fxhpr26z649m0ph71378c41ljflpyk89g87x8r1mc4rbq3kh"; + }; + + installPhase = '' + mkdir -p $out/bin/ + cp cdi2iso $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "A very simple utility for converting DiscJuggler images to the standard ISO-9660 format"; + homepage = https://sourceforge.net/projects/cdi2iso.berlios; + license = licenses.gpl2; + maintainers = with maintainers; [ hrdinka ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index eac4af0ec5f..92180216671 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -1,25 +1,19 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake }: # ?TODO: there's also python lib in there stdenv.mkDerivation rec { name = "brotli-${version}"; - version = "0.3.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v" + version; - sha256 = "1ijwr8fbrajp4gh8x6lrrpf8gymm0i6w06s97rv294q5dcszn299"; + sha256 = "0wjypkzhbv30x30j2z8ba45r6nm4k98hsa4i42kqx03vzarsr2l4"; }; - preConfigure = "cd tools"; - - # Debian installs "brotli" instead of "bro" but let's keep upstream choice for now. - installPhase = '' - mkdir -p "$out/bin" - mv ./bro "$out/bin/" - ''; + buildInputs = [ cmake ]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index d966175f50d..dba6e6fc337 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.1.1"; + version = "1.1.3"; src = fetchFromGitHub { - sha256 = "18snd1jiz0j6r1yk4vkgqmil2gbzwxgmcv2chvpnc5i93pp18hri"; + sha256 = "1d46hs6pyq55izcmnk7hzvbl8iyxh7bp7qchc7rl8ay396ax2sd5"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix new file mode 100644 index 00000000000..2cd1e8162c6 --- /dev/null +++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, rustPlatform, lzo, zlib }: + +with rustPlatform; + +buildRustPackage rec { + name = "btrfs-dedupe-${version}"; + version = "1.1.0"; + + + src = fetchurl { + url = "https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe/repository/archive.tar.bz2?ref=72c6a301d20f935827b994db210bf0a1e121273a"; + sha256 = "0qy1g4crhfgs2f5cmrsjv6qscg3r66gb8n6sxhimm9ksivhjyyjp"; + }; + + depsSha256 = "04jlz7nzsmg86i73w75i8rmlbk635xrg8m1dfac8h17dwb29yj6a"; + + buildInputs = [ lzo zlib ]; + + meta = with stdenv.lib; { + homepage = "https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe"; + description = "BTRFS deduplication utility"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ ikervagyok ]; + }; +} diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 8ff10039449..c44c92efae0 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.43.3"; + name = "e2fsprogs-1.43.4"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "09wrn60rlqdgjkmm09yv32zxdjba2pd4ya3704bhywyln2xz33nf"; + sha256 = "a648a90a513f1b25113c7f981af978b8a19f832b3a32bd10707af3ff682ba66d"; }; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 5f56b52ea26..e81c3768b25 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -6,11 +6,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.9.0"; + version="3.9.1"; name="${baseName}-${version}"; - hash="057vq4f93f1g9sh1sfbqhccsprxrbhwwm898322x25sb8mscc5xl"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.9/3.9.0/glusterfs-3.9.0.tar.gz"; - sha256="057vq4f93f1g9sh1sfbqhccsprxrbhwwm898322x25sb8mscc5xl"; + hash="02p3i1zr0i2fhjhz64wvhdn0z7b6b3hkiqz1bkyhracncspxnvw9"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.9/3.9.1/glusterfs-3.9.1.tar.gz"; + sha256="02p3i1zr0i2fhjhz64wvhdn0z7b6b3hkiqz1bkyhracncspxnvw9"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python2 ncurses readline diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix index 7ce48d28803..88922d9ce94 100644 --- a/pkgs/tools/filesystems/hubicfuse/default.nix +++ b/pkgs/tools/filesystems/hubicfuse/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, curl, openssl, fuse, libxml2, json_c, file }: +{ stdenv, fetchFromGitHub, pkgconfig, curl, openssl, fuse, libxml2, json_c, file }: stdenv.mkDerivation rec { name = "hubicfuse-${version}"; - version = "2.1.0"; + version = "3.0.0"; - src = fetchurl { - url = https://github.com/TurboGit/hubicfuse/archive/v2.1.0.tar.gz; - sha256 = "1mnijcwac6k3f6xknvdrsbmkkizpwbayqkb5l6jic15ymxv1fs7d"; + src = fetchFromGitHub { + owner = "TurboGit"; + repo = "hubicfuse"; + rev = "v${version}"; + sha256 = "1y4n63bk9vd6n1l5psjb9xm9h042kw4yh2ni33z7agixkanajv1s"; }; buildInputs = [ pkgconfig curl openssl fuse libxml2 json_c file ]; @@ -21,5 +23,6 @@ stdenv.mkDerivation rec { description = "FUSE-based filesystem to access hubic cloud storage"; platforms = platforms.linux; license = licenses.mit; + maintainers = [ maintainers.jpierre03 ]; }; } diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index d5c5456515c..01d9b81d038 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, utillinux, libuuid +{stdenv, fetchurl, fetchpatch, utillinux, libuuid , crypto ? false, libgcrypt, gnutls, pkgconfig}: stdenv.mkDerivation rec { @@ -14,6 +14,13 @@ stdenv.mkDerivation rec { sha256 = "180y5y09h30ryf2vim8j30a2npwz1iv9ly5yjmh3wjdkwh2jrdyp"; }; + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/n/ntfs-3g/1:2016.2.22AR.1-4/debian/patches/0003-CVE-2017-0358.patch"; + sha256 = "0hd05q9q06r18k8pmppvch1sslzqln5fvqj51d5r72g4mnpavpj3"; + }) + ]; + patchPhase = '' substituteInPlace src/Makefile.in --replace /sbin '@sbindir@' substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@' @@ -45,4 +52,3 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; # and (lib)fuse-lite under LGPL2+ }; } - diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index d7e9c02d1ab..cc31a668059 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub , autoreconfHook, pkgconfig , fuse, curl, expat }: - + stdenv.mkDerivation rec { name = "s3backer-${version}"; - version = "1.4.2"; - + version = "1.4.3"; + src = fetchFromGitHub { - sha256 = "0b9vmykrfpzs9is31pqb8xvgjraghnax1ph2jkbib1ya0vhxm8dj"; + sha256 = "0fhkha5kap8dji3iy48cbszhq83b2anssscgjj9d5dsl5dj57zak"; rev = version; repo = "s3backer"; owner = "archiecobbs"; diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index edc8dd00f3e..051d2732100 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -1,11 +1,13 @@ {stdenv, fetchurl, autoconf, automake, pkgconfig, curl, openssl, libxml2, fuse}: stdenv.mkDerivation { - name = "s3fs-fuse-1.79"; + name = "s3fs-fuse-1.80"; + src = fetchurl { - url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.79.tar.gz; - sha256 = "0rmzkngzq040g020pv75qqx3jy34vdxzqvxz29k6q8yfb3wpkhb1"; + url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.80.tar.gz; + sha256 = "0ddx5khlyyrxm4s8is4gqbczmrcivj11hmkk9s893r3kpp4q30yy"; }; + preConfigure = "./autogen.sh"; buildInputs = [ autoconf automake pkgconfig curl openssl libxml2 fuse ]; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 2d73a268038..483c73d149b 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -2,17 +2,18 @@ , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, mesa_glu, mesa_noglu, ncurses, readline, gsl, libsigsegv , python, zlib, perl, texLive, texinfo, xz +, darwin }: let s = # Generated upstream information rec { baseName="asymptote"; - version="2.38"; + version="2.39"; name="${baseName}-${version}"; - hash="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9"; - url="mirror://sourceforge/project/asymptote/2.38/asymptote-2.38.src.tgz"; - sha256="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9"; + hash="187q81yw06x4gv2spfn0hcs1064ym3a8l6mdgawymfhqd60yhrs3"; + url="https://netcologne.dl.sourceforge.net/project/asymptote/2.39/asymptote-2.39.src.tgz"; + sha256="187q81yw06x4gv2spfn0hcs1064ym3a8l6mdgawymfhqd60yhrs3"; }; buildInputs = [ ghostscriptX imagemagick fftw @@ -20,6 +21,8 @@ let python zlib perl texLive texinfo xz ] ++ stdenv.lib.optionals stdenv.isLinux [ freeglut mesa_glu mesa_noglu mesa_noglu.osmesa ] + ++ stdenv.lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]) ; in stdenv.mkDerivation { diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 00cc5e385fe..2a0796699fb 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , boost, freeglut, glew, gsl, lcms2, libpng, libtiff, mesa, vigra -, help2man, pkgconfig, perl, tetex }: +, help2man, pkgconfig, perl, texlive }: stdenv.mkDerivation rec { name = "enblend-enfuse-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff mesa vigra ]; - nativeBuildInputs = [ help2man perl pkgconfig tetex ]; + nativeBuildInputs = [ help2man perl pkgconfig texlive.combined.scheme-small ]; preConfigure = '' patchShebangs src/embrace diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix new file mode 100644 index 00000000000..f4e0faffb0e --- /dev/null +++ b/pkgs/tools/graphics/flam3/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchFromGitHub, zlib, libpng, libxml2, libjpeg }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "flam3"; + version = "3.1.1-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "e0801543538451234d7a8a240ba3b417cbda5b21"; + + src = fetchFromGitHub { + inherit rev; + owner = "scottdraves"; + repo = "${pname}"; + sha256 = "18iyj16k0sn3fs52fj23lj31xi4avlddhbib6kk309576nlxp17w"; + }; + + buildInputs = [ zlib libpng libxml2 libjpeg ]; + + meta = with stdenv.lib; { + description = "Cosmic recursive fractal flames"; + homepage = http://flam3.com/; + maintainers = maintainers.nand0p; + platforms = platforms.linux; + license = licenses.cc-by-nc-sa-20; + }; +} diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix new file mode 100644 index 00000000000..bdfecb9de73 --- /dev/null +++ b/pkgs/tools/graphics/glee/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchgit, cmake, mesa, xorg }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "glee"; + rev = "f727ec7463d514b6279981d12833f2e11d62b33d"; + version = "20170205-${stdenv.lib.strings.substring 0 7 rev}"; + + src = fetchgit { + inherit rev; + url = "https://git.code.sf.net/p/${pname}/${pname}"; + sha256 = "13mf3s7nvmj26vr2wbcg08l4xxqsc1ha41sx3bfghvq8c5qpk2ph"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ mesa xorg.libX11 ]; + + configureScript = '' + cmake + ''; + + preInstall = '' + sed -i 's/readme/Readme/' cmake_install.cmake + ''; + + meta = with stdenv.lib; { + description = "GL Easy Extension Library"; + homepage = https://sourceforge.net/p/glee/glee/; + maintainers = with maintainers; [ nand0p ]; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index ccee4f21314..edcfc67ee29 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gmic-${version}"; - version = "1.7.8"; + version = "1.7.9"; src = fetchurl { url = "http://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "1921s0n2frj8q95l8lm8was64cypnychgcgcavx9q8qljzbk4brs"; + sha256 = "0cvi5kmcrrg5pm774ligyy33fasgsfp3mr6ingjzd99rn4710bqm"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 7fafc5218e9..1f1dd363233 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -1,13 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2 +{ lib, stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2 , makeWrapper, libtiff , enableX11 ? false, libX11 }: stdenv.mkDerivation rec { - name = "netpbm-10.70.00"; + # Determine version and revision from: + # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced + name = "netpbm-10.77.02"; - src = fetchurl { - url = "mirror://gentoo/distfiles/${name}.tar.xz"; - sha256 = "14vxmzbwsy4rzrqjnzr4cvz1s0amacq69faps3v1j1kr05lcns0j"; + src = fetchsvn { + url = "svn://svn.code.sf.net/p/netpbm/code/advanced"; + rev = 2883; + sha256 = "1lxa5gasmqrwgihkk8ij7vb9kgdw3d5mp25kydkrf6x4wibg1w5f"; }; postPatch = /* CVE-2005-2471, from Arch */ '' diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index c6bde4c5b0c..219bfdf8c14 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 93fc901aacf..170dfdac2b6 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkgconfig, darwin, lib , zlib, ghostscript, imagemagick, plotutils, gd -, libjpeg, libwebp +, libjpeg, libwebp, libiconv }: stdenv.mkDerivation rec { @@ -13,13 +13,16 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ]; + buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + libiconv ApplicationServices + ]); meta = with stdenv.lib; { description = "Translates PostScript and PDF graphics into other vector formats"; homepage = https://sourceforge.net/projects/pstoedit/; license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index 577c0a33b3e..f3d2cbca651 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -3,7 +3,7 @@ }: let - version = "1.9.0"; + version = "1.9.1"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/potassco/aspcud/${version}/aspcud-${version}-source.tar.gz"; - sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373"; + sha256 = "09sqbshwrqz2fvlkz73mns5i3m70fh8mvwhz8450izy5lsligsg0"; }; buildInputs = [ boost clasp cmake gringo re2c ]; diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix index 058fa4881e8..02caf6e33f9 100644 --- a/pkgs/tools/misc/autorevision/default.nix +++ b/pkgs/tools/misc/autorevision/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, asciidoc, libxml2, docbook_xml_dtd_45, libxslt -, docbook_xsl, diffutils, coreutils, gnugrep +, docbook_xsl, diffutils, coreutils, gnugrep, gnused }: stdenv.mkDerivation rec { name = "autorevision-${version}"; - version = "1.14"; + version = "1.20"; src = fetchurl { url = "https://github.com/Autorevision/autorevision/releases/download/v%2F${version}/autorevision-${version}.tgz"; - sha256 = "0h0ig922am9qd0nbri3i6p4k789mv5iavxzxwylclg0mfgx43qd2"; + sha256 = "1xlp7wn2vv17rp848ai272sifi6fmwdr6dg4im53hrf32j3gzlhy"; }; buildInputs = [ @@ -18,9 +18,11 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=$(out)" ]; postInstall = '' - sed -e "s|cmp|${diffutils}/bin/cmp|" \ - -e "s|cat|${coreutils}/bin/cat|" \ - -e "s|grep|${gnugrep}/bin/grep|" \ + sed -e "s|\|${diffutils}/bin/cmp|g" \ + -e "s|\|${coreutils}/bin/cat|g" \ + -e "s|\|${gnugrep}/bin/grep|g" \ + -e "s|\|${gnused}/bin/sed|g" \ + -e "s|\|${coreutils}/bin/tee|g" \ -i "$out/bin/autorevision" ''; diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index eb0a0d2b60b..05fbe9b5632 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { version = "1.3.1"; src = fetchurl { - url = "https://mutineer.org/file.php?id=284ebee21bde256fd0daeae91242c2b73d9cf1df&p=bandwidth"; - name = "${name}.tar.gz"; + url = "http://zsmith.co/archives/${name}.tar.gz"; sha256 = "13a0mxrkybpwiynv4cj8wsy8zl5xir5xi1a03fzam5gw815dj4am"; }; diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index e61f99d2bbf..bf1377419a5 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.152"; + version = "1.158"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "1hk5g0zhj78p74z0hdx3v29s5bpx0npabwdawaigwwxrrj03q9mw"; + sha256 = "12zaj7hi5gzdh9r7rcyqnkwik1ljw1qzj6j7rw80bgw6fn611rs9"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/colord-kde/0.5.nix b/pkgs/tools/misc/colord-kde/0.5.nix index 9df8ace38f6..0c8e9d6bcee 100644 --- a/pkgs/tools/misc/colord-kde/0.5.nix +++ b/pkgs/tools/misc/colord-kde/0.5.nix @@ -1,16 +1,17 @@ -{ stdenv, lib, fetchgit +{ stdenv, lib, fetchurl , extra-cmake-modules, ki18n , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils , kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem , kitemviews, lcms2, libXrandr, qtx11extras }: -stdenv.mkDerivation { - name = "colord-kde-0.5.0.20160224"; - src = fetchgit { - url = "git://anongit.kde.org/colord-kde"; - rev = "3729d1348c57902b74283bc8280ffb5561b221db"; - sha256 = "03ww8nskgxl38dwkbb39by18gxvrcm6w2zg9s7q05i76rpl6kkkw"; +stdenv.mkDerivation rec { + name = "colord-kde-${version}"; + version = "0.5.0"; + + src = fetchurl { + url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz"; + sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c"; }; nativeBuildInputs = [ extra-cmake-modules ki18n ]; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 9e66c6ba918..2c435881f8c 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, xz, gmp ? null +{ lib, stdenv, buildPackages, fetchurl, perl, xz, gmp ? null , aclSupport ? false, acl ? null , attrSupport ? false, attr ? null , selinuxSupport? false, libselinux ? null, libsepol ? null @@ -12,104 +12,101 @@ assert selinuxSupport -> libselinux != null && libsepol != null; with lib; -let - self = stdenv.mkDerivation rec { - name = "coreutils-8.26"; +stdenv.mkDerivation rec { + name = "coreutils-8.26"; - src = fetchurl { - url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "13lspazc7xkviy93qz7ks9jv4sldvgmwpq36ghrbrqpq93br8phm"; - }; + src = fetchurl { + url = "mirror://gnu/coreutils/${name}.tar.xz"; + sha256 = "13lspazc7xkviy93qz7ks9jv4sldvgmwpq36ghrbrqpq93br8phm"; + }; - # FIXME needs gcc 4.9 in bootstrap tools - hardeningDisable = [ "stackprotector" ]; + # FIXME needs gcc 4.9 in bootstrap tools + hardeningDisable = [ "stackprotector" ]; - patches = optional stdenv.isCygwin ./coreutils-8.23-4.cygwin.patch; + patches = optional stdenv.isCygwin ./coreutils-8.23-4.cygwin.patch; - # The test tends to fail on btrfs and maybe other unusual filesystems. - postPatch = optionalString (!stdenv.isDarwin) '' - sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh - sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh - sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh - sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh + # The test tends to fail on btrfs and maybe other unusual filesystems. + postPatch = optionalString (!stdenv.isDarwin) '' + sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh + sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh + sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh + sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh + ''; + + outputs = [ "out" "info" ]; + + nativeBuildInputs = [ perl xz.bin ]; + configureFlags = + optional (singleBinary != false) + ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") + ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no" + ++ optional withPrefix "--program-prefix=g"; + + buildInputs = [ gmp ] + ++ optional aclSupport acl + ++ optional attrSupport attr + ++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ] # due to patch + ++ optionals selinuxSupport [ libselinux libsepol ]; + + crossAttrs = { + buildInputs = [ gmp.crossDrv ] + ++ optional aclSupport acl.crossDrv + ++ optional attrSupport attr.crossDrv + ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ] + ++ optional (stdenv.ccCross.libc ? libiconv) + stdenv.ccCross.libc.libiconv.crossDrv; + + # Prevents attempts of running 'help2man' on cross-built binaries. + PERL = "missing"; + + # Works around a bug with 8.26: + # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop. + preInstall = '' + sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${buildPackages.coreutils}/bin/install -c|' ''; - outputs = [ "out" "info" ]; + postInstall = '' + rm $out/share/man/man1/* + cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1 + ''; - nativeBuildInputs = [ perl xz.bin ]; - configureFlags = - optional (singleBinary != false) - ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") - ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no" - ++ optional withPrefix "--program-prefix=g"; - - buildInputs = [ gmp ] - ++ optional aclSupport acl - ++ optional attrSupport attr - ++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ] # due to patch - ++ optionals selinuxSupport [ libselinux libsepol ]; - - crossAttrs = { - buildInputs = [ gmp.crossDrv ] - ++ optional aclSupport acl.crossDrv - ++ optional attrSupport attr.crossDrv - ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ] - ++ optional (stdenv.ccCross.libc ? libiconv) - stdenv.ccCross.libc.libiconv.crossDrv; - - # Prevents attempts of running 'help2man' on cross-built binaries. - PERL = "missing"; - - # Works around a bug with 8.26: - # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop. - preInstall = '' - sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${self}/bin/install -c|' - ''; - - postInstall = '' - rm $out/share/man/man1/* - cp ${self}/share/man/man1/* $out/share/man/man1 - ''; - - # Needed for fstatfs() - # I don't know why it is not properly detected cross building with glibc. - configureFlags = [ "fu_cv_sys_stat_statfs2_bsize=yes" ]; - doCheck = false; - }; - - # The tests are known broken on Cygwin - # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), - # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), - # and {Open,Free}BSD. - # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 - doCheck = stdenv ? glibc && builtins.storeDir == "/nix/store"; - - # Saw random failures like ‘help2man: can't get '--help' info from - # man/sha512sum.td/sha512sum’. - enableParallelBuilding = false; - - NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; - FORCE_UNSAFE_CONFIGURE = optionalString stdenv.isSunOS "1"; - - makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; - - meta = { - homepage = http://www.gnu.org/software/coreutils/; - description = "The basic file, shell and text manipulation utilities of the GNU operating system"; - - longDescription = '' - The GNU Core Utilities are the basic file, shell and text - manipulation utilities of the GNU operating system. These are - the core utilities which are expected to exist on every - operating system. - ''; - - license = licenses.gpl3Plus; - - platforms = platforms.all; - - maintainers = [ maintainers.eelco ]; - }; + # Needed for fstatfs() + # I don't know why it is not properly detected cross building with glibc. + configureFlags = [ "fu_cv_sys_stat_statfs2_bsize=yes" ]; + doCheck = false; }; -in - self + + # The tests are known broken on Cygwin + # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), + # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), + # and {Open,Free}BSD. + # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 + doCheck = stdenv ? glibc && builtins.storeDir == "/nix/store"; + + # Saw random failures like ‘help2man: can't get '--help' info from + # man/sha512sum.td/sha512sum’. + enableParallelBuilding = false; + + NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; + FORCE_UNSAFE_CONFIGURE = optionalString stdenv.isSunOS "1"; + + makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; + + meta = { + homepage = http://www.gnu.org/software/coreutils/; + description = "The basic file, shell and text manipulation utilities of the GNU operating system"; + + longDescription = '' + The GNU Core Utilities are the basic file, shell and text + manipulation utilities of the GNU operating system. These are + the core utilities which are expected to exist on every + operating system. + ''; + + license = licenses.gpl3Plus; + + platforms = platforms.all; + + maintainers = [ maintainers.eelco ]; + }; +} diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix new file mode 100644 index 00000000000..40d729d063d --- /dev/null +++ b/pkgs/tools/misc/dateutils/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "0.4.1"; + name = "dateutils-${version}"; + + src =fetchurl { + url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz"; + sha256 = "0y2jsmvilljbid14lzmk3kgvasn4h7hr6y3wwbr3lkgwfn4y9k3c"; + }; + + meta = with stdenv.lib; { + description = "A bunch of tools that revolve around fiddling with dates and times in the command line"; + homepage = http://www.fresse.org/dateutils/; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.paperdigits ]; + }; +} diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 2fe9ec2fbe7..cbc7a2e7e46 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -2,7 +2,7 @@ , FileDesktopEntry, libxslt, docbook_xsl, makeWrapper , python3Packages , perlPackages, curl, gnupg, diffutils -, sendmailPath ? "/var/setuid-wrappers/sendmail" +, sendmailPath ? "/run/wrappers/bin/sendmail" }: let diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix index 547e3fb49eb..e5daee11b59 100644 --- a/pkgs/tools/misc/ding-libs/default.nix +++ b/pkgs/tools/misc/ding-libs/default.nix @@ -1,26 +1,23 @@ -{ stdenv, fetchurl, glibc, doxygen, check }: +{ stdenv, fetchurl, check }: -let - name = "ding-libs"; +stdenv.mkDerivation rec { + name = "ding-libs-${version}"; version = "0.6.0"; -in stdenv.mkDerivation { - inherit name; - inherit version; src = fetchurl { - url = "https://fedorahosted.org/released/${name}/${name}-${version}.tar.gz"; + url = "https://fedorahosted.org/released/ding-libs/ding-libs-${version}.tar.gz"; sha1 = "c8ec86cb93a26e013a13b12a7b0b3fbc1bca16c1"; }; enableParallelBuilding = true; - buildInputs = [ glibc doxygen check ]; + buildInputs = [ check ]; - buildFlags = "docs"; doCheck = true; meta = { description = "'D is not GLib' utility libraries"; homepage = https://fedorahosted.org/sssd/; + platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ e-user ]; license = [ stdenv.lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ]; }; diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix new file mode 100644 index 00000000000..e1024d70bce --- /dev/null +++ b/pkgs/tools/misc/diskscan/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, ncurses, zlib }: + +stdenv.mkDerivation rec { + name = "diskscan-${version}"; + version = "0.19"; + + src = fetchFromGitHub { + owner = "baruch"; + repo = "diskscan"; + rev = "${version}"; + sha256 = "0yqpaxfahbjr8hr9xw7nngncwigy7yncdwnyp5wy9s9wdp8mrjra"; + }; + + buildInputs = [ ncurses zlib ]; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = https://github.com/baruch/diskscan; + description = "Scan HDD/SSD for failed and near failed sectors"; + platforms = with platforms; linux; + maintainers = with maintainers; [ peterhoeg ]; + inherit version; + }; +} diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 1271aa8c986..086c72bdbb2 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { sha256 = "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y"; }; - nativeBuildInputs = [ coreutils ]; + patches = [ ./memory-leak.patch ]; + + buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort doCheck = !stdenv.isDarwin; diff --git a/pkgs/tools/misc/findutils/memory-leak.patch b/pkgs/tools/misc/findutils/memory-leak.patch new file mode 100644 index 00000000000..56f65f85622 --- /dev/null +++ b/pkgs/tools/misc/findutils/memory-leak.patch @@ -0,0 +1,21 @@ +http://git.savannah.gnu.org/cgit/findutils.git/patch/?id=c1556892a +diff --git a/find/fstype.c b/find/fstype.c +index 535f920..a0ac8bc 100644 +--- a/find/fstype.c ++++ b/find/fstype.c +@@ -75,14 +75,7 @@ free_file_system_list (struct mount_entry *p) + while (p) + { + struct mount_entry *pnext = p->me_next; +- +- free (p->me_devname); +- free (p->me_mountdir); +- +- if (p->me_type_malloced) +- free (p->me_type); +- p->me_next = NULL; +- free (p); ++ free_mount_entry (p); + p = pnext; + } + } diff --git a/pkgs/tools/misc/fluentd/Gemfile b/pkgs/tools/misc/fluentd/Gemfile index 8c9dd3aa0a0..2c4fbc84963 100644 --- a/pkgs/tools/misc/fluentd/Gemfile +++ b/pkgs/tools/misc/fluentd/Gemfile @@ -3,3 +3,12 @@ source "https://rubygems.org" gem 'fluentd' gem 'fluent-plugin-elasticsearch' gem 'fluent-plugin-record-reformer' +gem 'fluent-plugin-s3' +gem 'fluent-plugin-kinesis' +gem 'fluent-plugin-kafka' +gem 'fluent-plugin-elasticsearch' +gem 'fluent-plugin-scribe' +gem 'fluent-plugin-mongo' +gem 'fluent-plugin-webhdfs' +gem 'fluent-plugin-rewrite-tag-filter' + diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock index 581fa6e169a..2f9485d9577 100644 --- a/pkgs/tools/misc/fluentd/Gemfile.lock +++ b/pkgs/tools/misc/fluentd/Gemfile.lock @@ -1,58 +1,136 @@ GEM remote: https://rubygems.org/ specs: - cool.io (1.4.4) - elasticsearch (1.0.17) - elasticsearch-api (= 1.0.17) - elasticsearch-transport (= 1.0.17) - elasticsearch-api (1.0.17) + activesupport (5.0.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) + aws-sdk (2.7.0) + aws-sdk-resources (= 2.7.0) + aws-sdk-core (2.7.0) + aws-sigv4 (~> 1.0) + jmespath (~> 1.0) + aws-sdk-resources (2.7.0) + aws-sdk-core (= 2.7.0) + aws-sigv4 (1.0.0) + bson (1.12.5) + bzip2-ffi (1.0.0) + ffi (~> 1.0) + concurrent-ruby (1.0.4) + cool.io (1.4.5) + elasticsearch (1.0.18) + elasticsearch-api (= 1.0.18) + elasticsearch-transport (= 1.0.18) + elasticsearch-api (1.0.18) multi_json - elasticsearch-transport (1.0.17) + elasticsearch-transport (1.0.18) faraday multi_json - excon (0.49.0) - faraday (0.9.2) + excon (0.54.0) + faraday (0.11.0) multipart-post (>= 1.2, < 3) - fluent-plugin-elasticsearch (1.5.0) - elasticsearch + ffi (1.9.17) + fluent-mixin-config-placeholders (0.4.0) + fluentd + uuidtools (>= 2.1.5) + fluent-mixin-plaintextformatter (0.2.6) + fluentd + ltsv + fluent-plugin-elasticsearch (1.9.2) + elasticsearch (< 1.1) excon fluentd (>= 0.10.43) - fluent-plugin-record-reformer (0.8.1) + fluent-plugin-kafka (0.5.0) + fluentd (>= 0.10.58, < 2) + ltsv + ruby-kafka (= 0.3.16.beta2) + fluent-plugin-kinesis (1.1.2) + aws-sdk (~> 2) + concurrent-ruby (~> 1) + fluentd (>= 0.10.58, < 2) + os (>= 0.9.6) + protobuf (>= 3.5.5) + fluent-plugin-mongo (0.7.16) + fluentd (>= 0.10.58, < 2) + mongo (~> 1.9) + fluent-plugin-record-reformer (0.8.2) fluentd - fluentd (0.14.0) - cool.io (>= 1.4.3, < 2.0.0) + fluent-plugin-rewrite-tag-filter (1.5.5) + fluentd + fluent-plugin-s3 (0.8.0) + aws-sdk (>= 2.3.22, < 3) + fluentd (>= 0.10.58, < 2) + fluent-plugin-scribe (0.10.14) + fluentd + thrift (~> 0.8.0) + fluent-plugin-webhdfs (0.5.2) + bzip2-ffi + fluent-mixin-config-placeholders (>= 0.3.0) + fluent-mixin-plaintextformatter (>= 0.2.1) + fluentd (>= 0.10.59) + webhdfs (>= 0.6.0) + fluentd (0.14.11) + cool.io (~> 1.4.5) http_parser.rb (>= 0.5.1, < 0.7.0) - json (>= 1.4.3) - msgpack (>= 0.7.0) - serverengine (>= 1.6.4) + msgpack (>= 0.7.0, < 2.0.0) + serverengine (>= 2.0.4, < 3.0.0) sigdump (~> 0.2.2) - strptime (>= 0.1.7) - tzinfo (>= 1.0.0) - tzinfo-data (>= 1.0.0) + strptime (~> 0.1.7) + tzinfo (~> 1.0) + tzinfo-data (~> 1.0) yajl-ruby (~> 1.0) http_parser.rb (0.6.0) - json (1.8.3) - msgpack (0.7.6) + i18n (0.7.0) + jmespath (1.3.1) + ltsv (0.1.0) + middleware (0.1.0) + minitest (5.10.1) + mongo (1.12.5) + bson (= 1.12.5) + msgpack (1.0.2) multi_json (1.12.1) multipart-post (2.0.0) - serverengine (1.6.4) + os (0.9.6) + protobuf (3.6.12) + activesupport (>= 3.2) + middleware + thor + thread_safe + public_suffix (2.0.5) + ruby-kafka (0.3.16.beta2) + serverengine (2.0.4) sigdump (~> 0.2.2) sigdump (0.2.4) - strptime (0.1.8) + strptime (0.1.9) + thor (0.19.4) thread_safe (0.3.5) + thrift (0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) - tzinfo-data (1.2016.4) + tzinfo-data (1.2016.10) tzinfo (>= 1.0.0) - yajl-ruby (1.2.1) + uuidtools (2.1.5) + webhdfs (0.8.0) + addressable + yajl-ruby (1.3.0) PLATFORMS ruby DEPENDENCIES fluent-plugin-elasticsearch + fluent-plugin-kafka + fluent-plugin-kinesis + fluent-plugin-mongo fluent-plugin-record-reformer + fluent-plugin-rewrite-tag-filter + fluent-plugin-s3 + fluent-plugin-scribe + fluent-plugin-webhdfs fluentd BUNDLED WITH - 1.11.2 + 1.12.5 diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix index e6b03fadfd3..1c508e7b58e 100644 --- a/pkgs/tools/misc/fluentd/gemset.nix +++ b/pkgs/tools/misc/fluentd/gemset.nix @@ -1,75 +1,227 @@ { + activesupport = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08bnl0nr9csjgkgz6xf8dyg7rccinmfrmn235z3bfaz8ihz15d1d"; + type = "gem"; + }; + version = "5.0.1"; + }; + addressable = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw"; + type = "gem"; + }; + version = "2.5.0"; + }; + aws-sdk = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19s7ialas1yrc54g50yfa37z7m8dq4gqbf8dvlfg8qmpdijjxy3l"; + type = "gem"; + }; + version = "2.7.0"; + }; + aws-sdk-core = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a9sgff43s3zhpcmisk1bp6vvlpawa617svfhz84xwa6lmik9sp4"; + type = "gem"; + }; + version = "2.7.0"; + }; + aws-sdk-resources = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b5z25n4bgzwkzmzx2q6ik2y74jinyphmrh38lnrn9im6pmmvy3w"; + type = "gem"; + }; + version = "2.7.0"; + }; + aws-sigv4 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz"; + type = "gem"; + }; + version = "1.0.0"; + }; + bson = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12zcsfr72hr0w1qyxv1iz587nzganpclvimyx5y02gg1hij8hz6b"; + type = "gem"; + }; + version = "1.12.5"; + }; + bzip2-ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y5jlcz1vb0v3rbmsbbrarfglcmzdhr5jhlfc5wjnhz2zpybsz3y"; + type = "gem"; + }; + version = "1.0.0"; + }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0p7ji1h1l407kci9w4b4yspzd58ssmlx7p91npx55kw08836dlpb"; + type = "gem"; + }; + version = "1.0.4"; + }; "cool.io" = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0ycc8qdvpba8bf6da8nsna34md86mk527j4qizxh059vqm3521sb"; + sha256 = "1x5fkyjdjwk68sg7fwxhx2k3hzxkkm6frnd2yix7brxdh06fp0k1"; type = "gem"; }; - version = "1.4.4"; + version = "1.4.5"; }; elasticsearch = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1g7vax396l68w5mrrfbsaly39zkc4rrvljz9717mxyn82m5f66w5"; + sha256 = "1wdy17i56b4m7akp7yavnr8vhfhyz720waphmixq05dj21b11hl0"; type = "gem"; }; - version = "1.0.17"; + version = "1.0.18"; }; elasticsearch-api = { source = { remotes = ["https://rubygems.org"]; - sha256 = "08bb63raz381fmspijwjc4ksvrrgavmwrymjms1b9mg4qkic87jx"; + sha256 = "1v6nb3ajz5rack3p4b4nz37hs0zb9x738h2ms8cc4plp6wqh1w5s"; type = "gem"; }; - version = "1.0.17"; + version = "1.0.18"; }; elasticsearch-transport = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07r798g3lnzr3zabk2ks2j5jnxdga23bc8wrr7mcqzn8q0yv82bz"; + sha256 = "0smfrz8nq49hgf67y5ayxa9i4rmmi0q4m51l0h499ykq4cvcwv6i"; type = "gem"; }; - version = "1.0.17"; + version = "1.0.18"; }; excon = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jmdgc4lhlbxccpg79a32vn3qngqipcaaq8bxa0ivfw5mvz0zc0z"; + sha256 = "0j4b6s90v84r4wrhbg4rzjfjg9sfisq50fjd3hh9p6yrkm86wbd3"; type = "gem"; }; - version = "0.49.0"; + version = "0.54.0"; }; faraday = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6"; + sha256 = "18p1csdivgwmshfw3mb698a3bn0yrykg30khk5qxjf6n168g91jr"; type = "gem"; }; - version = "0.9.2"; + version = "0.11.0"; + }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07hnyr47mndsjfanzh348wm3fxjx9nx68mdb3cpsdvfqrxnz97s7"; + type = "gem"; + }; + version = "1.9.17"; + }; + fluent-mixin-config-placeholders = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14b4lqy91jgpky6g7h0vyfy2rr1qavmjzzgnmhwajfzxgw9y2jvi"; + type = "gem"; + }; + version = "0.4.0"; + }; + fluent-mixin-plaintextformatter = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gliangfr07060ya9sawkyfx2vz7vdygys65f83czawhckvvm75n"; + type = "gem"; + }; + version = "0.2.6"; }; fluent-plugin-elasticsearch = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1kgv62s51y9x98qk0b6wrg4a73jfbhw50vg5z36hr0bh9rh2rq4y"; + sha256 = "0q0v8jxpwrkh1z5qh0chwrssz93nldka4jwfn32hlqhnmb99q8i1"; type = "gem"; }; - version = "1.5.0"; + version = "1.9.2"; + }; + fluent-plugin-kafka = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sd025xsl1cnjs11wasg0di2k02rx9ifaj49n28ak363df6vsqgf"; + type = "gem"; + }; + version = "0.5.0"; + }; + fluent-plugin-kinesis = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "119ngswi9q0p5hh5ldan9pzrgd1lfsbkr5f56hy1k4gfss4kmq27"; + type = "gem"; + }; + version = "1.1.2"; + }; + fluent-plugin-mongo = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x7n8cknqh956yx3c9hv2g535x4kcixmnxw3fvcspjbqprrd1s91"; + type = "gem"; + }; + version = "0.7.16"; }; fluent-plugin-record-reformer = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ca09msvcdgrjv0xdjxh0nhxx8crp3h9nz5qw90c75s5hss2ws9b"; + sha256 = "1q2pws1mqp6pkb00ix6wjkxklckqb4wcbp79lpyk0b644bk9hqzb"; type = "gem"; }; - version = "0.8.1"; + version = "0.8.2"; + }; + fluent-plugin-rewrite-tag-filter = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1avxvvmfm7bl7fpa2p73295kydh1nbsgdvsr7bsyrb77z1s1m86z"; + type = "gem"; + }; + version = "1.5.5"; + }; + fluent-plugin-s3 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nxvk5n76pw4r37lv8vfl1cd0yjxnlj5wlwyk8f1lvp9ma5zlzmg"; + type = "gem"; + }; + version = "0.8.0"; + }; + fluent-plugin-scribe = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00m19w7p22adq0yx1h7h2h4ckw9kh5j458a8lawgmbazw2dz0zxi"; + type = "gem"; + }; + version = "0.10.14"; + }; + fluent-plugin-webhdfs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kb9cgrgvh61pqqzv2csnibmp2jwh4hyjyvrh2npkk59k3jp54ad"; + type = "gem"; + }; + version = "0.5.2"; }; fluentd = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1v6c8g6fv9s710lrl0jy9ihbb8af37gvw3klk7csr5whp1mhwb8f"; + sha256 = "0w1bg3nrn6gwhyp8xlpbs9rcajkddnvw6jhn7kvzydp70g2aydhz"; type = "gem"; }; - version = "0.14.0"; + version = "0.14.11"; }; "http_parser.rb" = { source = { @@ -78,21 +230,61 @@ }; version = "0.6.0"; }; - json = { + i18n = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; type = "gem"; }; - version = "1.8.3"; + version = "0.7.0"; + }; + jmespath = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y"; + type = "gem"; + }; + version = "1.3.1"; + }; + ltsv = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1alfq3g0mih4w86736ybnzqmknphm2z95c9q0wl765i4lrmxng11"; + type = "gem"; + }; + version = "0.1.0"; + }; + middleware = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0703nkf2v371wqr41c04x5qid7ww45cxqv3hnlg07if3b3xrm9xl"; + type = "gem"; + }; + version = "0.1.0"; + }; + minitest = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yk2m8sp0p5m1niawa3ncg157a4i0594cg7z91rzjxv963rzrwab"; + type = "gem"; + }; + version = "5.10.1"; + }; + mongo = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0658pn2hbyfvbnpp3wdh3irin0wpikm6y2qbhnx07w54jbkmgh5p"; + type = "gem"; + }; + version = "1.12.5"; }; msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1fn2riiaygiyvmr0glgm1vx995np3jb2hjf5i0j78vncd2wbwdw5"; + sha256 = "1fb2my91j08plsbbry5kilsrh7slmzgbbf6f55zy6xk28p9036lg"; type = "gem"; }; - version = "0.7.6"; + version = "1.0.2"; }; multi_json = { source = { @@ -109,13 +301,45 @@ }; version = "2.0.0"; }; + os = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz"; + type = "gem"; + }; + version = "0.9.6"; + }; + protobuf = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cvkfp7574dr6wqpgafl3pg9niqfri3dh2fxb2f8qaapcgfgcaq6"; + type = "gem"; + }; + version = "3.6.12"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + type = "gem"; + }; + version = "2.0.5"; + }; + ruby-kafka = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "112avql9nf0hq07zvh47fyx7na721bj4zfpf43ip471l6k2ksrf5"; + type = "gem"; + }; + version = "0.3.16.beta2"; + }; serverengine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "16sy6yissv8h2vla5ba4msqzsjy0cm0x8q2llssx3kl3bwysrbrp"; + sha256 = "0f08kbiqg9yp5fxdw5blsrnq383a9g4n830g1ypppb7ddv61sbmi"; type = "gem"; }; - version = "1.6.4"; + version = "2.0.4"; }; sigdump = { source = { @@ -128,10 +352,18 @@ strptime = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0lkadizgdls9ya4sbf3bg5i1z6g2kxfw1r5ja0wkc9711zxjilx2"; + sha256 = "1avbl1fj4y5qx9ywkxpcjjxxpjj6h7r1dqlnddhk5wqg6ypq8lsb"; type = "gem"; }; - version = "0.1.8"; + version = "0.1.9"; + }; + thor = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns"; + type = "gem"; + }; + version = "0.19.4"; }; thread_safe = { source = { @@ -140,6 +372,14 @@ }; version = "0.3.5"; }; + thrift = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0aj23ndh5n5yqcvp4c12y7vl5wvxpl66zncf6n6ax2zvb6ig44cv"; + type = "gem"; + }; + version = "0.8.0"; + }; tzinfo = { dependencies = ["thread_safe"]; source = { @@ -151,16 +391,33 @@ tzinfo-data = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1bxfljd5i7g89s7jc5l4a3ddykfsvvp0gm02805r1q77ahn1gp33"; + sha256 = "01nr50alfm1fyzlcbzvfbpnsq37yb3h676f9n3z0iyp4s4766psf"; type = "gem"; }; - version = "1.2016.4"; + version = "1.2016.10"; + }; + uuidtools = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g"; + type = "gem"; + }; + version = "2.1.5"; + }; + webhdfs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gs6xb9dz9bp5xc38yplfy48jcgj7jrj0zg0vgi7ydkxnkzkhbf2"; + type = "gem"; + }; + version = "0.8.0"; }; yajl-ruby = { source = { - sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf"; + remotes = ["https://rubygems.org"]; + sha256 = "0sah2lpvpsh555dcnhgcqylinjj5544md9dh1a0a13da0qv1p57i"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; } \ No newline at end of file diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index da5817c8850..84b074de6cc 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.15.9"; + version = "0.16.4"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "0r099mk9r6f52qqhx0ifb1xa8f2isqvyza80z9mcpi5zkd96174l"; + sha256 = "0kq4j6q1xk17ryzzcb8s6l2zqsjkk75lrwalias9gwcriqs6k6yn"; }; outputs = [ "bin" "out" "man" ]; @@ -33,13 +33,6 @@ buildGoPackage rec { ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name} ''; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - # fixes cycle between $out and $bin - # otool -l shows that the binary includes an LC_RPATH to $out/lib - # it seems safe to remove that since but the directory does not exist. - install_name_tool -delete_rpath $out/lib $bin/bin/fzf - ''; - meta = with stdenv.lib; { homepage = https://github.com/junegunn/fzf; description = "A command-line fuzzy finder written in Go"; diff --git a/pkgs/tools/misc/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix index 651c76e361f..170761078c9 100644 --- a/pkgs/tools/misc/fzf/deps.nix +++ b/pkgs/tools/misc/fzf/deps.nix @@ -23,8 +23,17 @@ fetch = { type = "git"; url = "https://github.com/junegunn/go-shellwords"; - rev = "35d512af75e283aae4ca1fc3d44b159ed66189a4"; - sha256 = "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7"; + rev = "33bd8f1ebe16d6e5eb688cc885749a63059e9167"; + sha256 = "0xcymw0fm0ir8d9swh1bkpknnqgx5ijjsj433z4d9riy8h8ywpw8"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "854ae91cdcbf914b499b1d7641d07859f3653481"; + sha256 = "19hj2nv2awc6zhpiapv8xv2yjdwfpxhvx5wnr99if6kg0y1ybsa7"; }; } ] diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 377d6faefa0..e57c98bf51b 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -49,6 +49,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "stackprotector" "pic" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; # generated code redefines yyfree + preConfigure = '' for i in "tests/util/"*.in do diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index fabefb81031..d9e4ae3a638 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -6,13 +6,13 @@ let arch = else abort "Unknown architecture"; in stdenv.mkDerivation rec { name = "grub4dos-${version}"; - version = "0.4.6a-2016-11-09"; + version = "0.4.6a-2016-12-24"; src = fetchFromGitHub { owner = "chenall"; repo = "grub4dos"; - rev = "4cdcd3c1aa4907e7775aa8816ca9cf0175b78bcd"; - sha256 = "17y5wsiqcb2qk1vr8n1wlhcsj668735hj8l759n8aiydw408bl55"; + rev = "ca0371bb1e2365bfe4e44031a3b8b59e8c58ce0d"; + sha256 = "0a9m7n5la3dmbfx6n5iqlfbm607r1mww0wkimn29mlsc30d8aamr"; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix index 50d75de69cc..2a4de41332e 100644 --- a/pkgs/tools/misc/hakuneko/default.nix +++ b/pkgs/tools/misc/hakuneko/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hakuneko-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "mirror://sourceforge/hakuneko/hakuneko_${version}_src.tar.gz"; - sha256 = "d7e066e3157445f273ccf14172c05077759da036ffe700a28a409fde862b69a7"; + sha256 = "76a63fa05e91b082cb5a70a8abacef005354e99978ff8b1369f7aa0af7615d52"; }; preConfigure = '' diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index 1d75db59289..4fb71b688c3 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, zlib, libusb1, cmake, qt5, enableGUI ? false }: -let version = "1.4.1-34-g7ebee1e"; in +let version = "1.4.1-37-gb6fe7f8"; in stdenv.mkDerivation { name = "heimdall-${version}"; @@ -13,20 +13,22 @@ stdenv.mkDerivation { }; buildInputs = [ zlib libusb1 cmake ]; - patchPhase = stdenv.lib.optional (!enableGUI) '' - sed -i '/heimdall-frontend/d' CMakeLists.txt - ''; - enableParallelBuilding = true; + cmakeFlags = [ + "-DBUILD_TYPE=Release" + "-DDISABLE_FRONTEND=${if enableGUI then "OFF" else "ON"}" + ] ++ stdenv.lib.optionals enableGUI [ "-DQt5Widgets_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Widgets" "-DQt5Gui_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Gui" "-DQt5Core_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Core" - "-DBUILD_TYPE=Release" ]; preConfigure = '' # Give ownership of the Galaxy S USB device to the logged in user. substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"' + + # Fix version string reported by the executable. + sed -i -e 's/version = "v.*"/version = "v${version}"/' heimdall/source/Interface.cpp ''; installPhase = '' @@ -36,6 +38,8 @@ stdenv.mkDerivation { cp ../heimdall/60-heimdall.rules $out/lib/udev/rules.d ''; + enableParallelBuilding = true; + meta = { homepage = "http://www.glassechidna.com.au/products/heimdall/"; description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices"; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index 0b26dbc06e2..7ffab069779 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication rec { name = "i3minator-${version}"; @@ -9,8 +9,13 @@ pythonPackages.buildPythonApplication rec { sha256 = "11dn062788kwfs8k2ry4v8zr2gn40r6lsw770s9g2gvhl5n469dw"; }; + LC_ALL = "en_US.UTF-8"; + buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ pythonPackages.pyyaml pythonPackages.i3-py ]; + # No tests + doCheck = false; + meta = with stdenv.lib; { description = "i3 project manager similar to tmuxinator"; longDescription = '' diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index 37399a1a418..598d0126623 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -6,13 +6,13 @@ let pname = "kronometer"; - version = "2.1.0"; + version = "2.1.3"; unwrapped = kdeDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1nh7y4c13rscy55f5n8s2v8jij27b55rwkxh9g8r0p7mdwmw8vri"; + sha256 = "1z06gvaacm3d3a9smlmgg2vf0jdab5kqxx24r6v7iprqzgdpsn4i"; }; meta = with lib; { diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 80b8457f07f..c54f8ebec0d 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,17 +2,16 @@ buildGoPackage rec { name = "lf-unstable-${version}"; - version = "2016-10-02"; - - goPackagePath = "github.com/gokcehan/lf"; + version = "2017-02-04"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; - rev = "7a851f6c720380a6b9f715542906a56334e7e98b"; # nightly - sha256 = "0hdxcibly3algz0hgy65xr3dxchf4aarpxdgxsgc67m1knizksjr"; + rev = "c55c4bf254d59c4e943d5559cd6e062652751e36"; # nightly + sha256 = "0jq85pfhpzdplv083mxbys7pp8igcvhp4daa9dh0yn4xbd8x821d"; }; + goPackagePath = "github.com/gokcehan/lf"; goDeps = ./deps.nix; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index ebd11853291..d3aff8de33c 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "b6acae516ace002cb8105a89024544a1480655a5"; # master - sha256 = "0zf95qdd5bif9rw03hqk87x7d905p373bvsj0bl4gi16spqjbdil"; + rev = "abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8"; # master + sha256 = "156i8apkga8b3272kjhapyqwspgcfkrr9kpqwc5lii43k4swghpv"; }; } { @@ -13,8 +13,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "d6bea18f789704b5f83375793155289da36a3c7f"; # v0.0.1 - sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; # v0.0.2 + sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; }; } ] diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index aff329e04b6..2333a6576e4 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { name = "mimeo-${version}"; - version = "2016.11"; + version = "2017.2.9"; src = fetchurl { url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; - sha256 = "1yygdxqnkh506fknxsp9xa3rnxn0901dzqc7c7qjjj80lk6xnfxb"; + sha256 = "1xbhz08aanix4bibz5jla58cmi6rnf946pf64wb0ka3s8jx0l5a0"; }; buildInputs = [ file desktop_file_utils ]; diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix index 6dbd0bcc439..4aef6114c57 100644 --- a/pkgs/tools/misc/mlocate/default.nix +++ b/pkgs/tools/misc/mlocate/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, config }: -stdenv.mkDerivation rec { +let + dbfile = stdenv.lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; +in stdenv.mkDerivation rec { name = "mlocate-${version}"; version = "0.26"; @@ -10,6 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ]; + makeFlags = [ "dbfile=${dbfile}" ]; meta = with stdenv.lib; { description = "Merging locate is an utility to index and quickly search for files"; diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 0e992f49c7a..2ecaae6a33f 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "neofetch-${version}"; - version = "2.0.2"; + version = "3.0.1"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "15fpm6nflf6w0c758xizfifvvxrkmcc2hpzrnfw6fcngfqcvajmd"; + sha256 = "0ccdgyn9m7vbrmjlsxdwv7cagsdg8hy8x4n1mx334pkqvl820jjn"; }; patchPhase = '' diff --git a/pkgs/tools/misc/nginx-config-formatter/default.nix b/pkgs/tools/misc/nginx-config-formatter/default.nix new file mode 100644 index 00000000000..37218f84868 --- /dev/null +++ b/pkgs/tools/misc/nginx-config-formatter/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, python3 }: + +stdenv.mkDerivation rec { + version = "2016-06-16"; + name = "nginx-config-formatter-${version}"; + + src = fetchFromGitHub { + owner = "1connect"; + repo = "nginx-config-formatter"; + rev = "fe5c77d2a503644bebee2caaa8b222c201c0603d"; + sha256 = "0akpkbq5136k1i1z1ls6yksis35hbr70k8vd10laqwvr1jj41bga"; + }; + + buildInputs = [ python3 ]; + + doCheck = true; + checkPhase = '' + python3 $src/test_nginxfmt.py + ''; + + installPhase = '' + mkdir -p $out/bin + install -m 0755 $src/nginxfmt.py $out/bin/nginxfmt + ''; + + meta = with stdenv.lib; { + description = "nginx config file formatter"; + maintainers = with maintainers; [ Baughn ]; + license = licenses.asl20; + homepage = https://github.com/1connect/nginx-config-formatter; + }; +} diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index 8d2f15734c5..87659802e50 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, makeWrapper, +{ stdenv, fetchurl, makeWrapper, systemd, # udevadm -busybox, +busybox, coreutils, # os-prober desn't seem to work with pure busybox devicemapper, # lvs # optional dependencies @@ -11,11 +11,11 @@ ntfs3g ? null }: stdenv.mkDerivation rec { - version = "1.65"; + version = "1.73"; name = "os-prober-${version}"; src = fetchurl { url = "mirror://debian/pool/main/o/os-prober/os-prober_${version}.tar.xz"; - sha256 = "c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84"; + sha256 = "1prssbwdgj5c33zhl3ldgaxk7lab9qvs4zhyrhag88wiivirb0sq"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 99a933b3243..842616793a3 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20161222"; + name = "parallel-20170122"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1chgr3csyc7hbq2wq4jnwnbsr3ix8rzsk2lf4vdnvkjpd6dvw517"; + sha256 = "19maf889vj1c4zakqwap58f44hgypyb5mzzwfsliir9gvvcq6zj1"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix index 82b831207a9..db68fab75ab 100644 --- a/pkgs/tools/misc/rcm/default.nix +++ b/pkgs/tools/misc/rcm/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "rcm-1.3.0"; +stdenv.mkDerivation rec { + name = "rcm-${version}"; + version = "1.3.1"; src = fetchurl { - url = https://thoughtbot.github.io/rcm/dist/rcm-1.3.0.tar.gz; - sha256 = "ddcf638b367b0361d8e063c29fd573dbe1712d1b83e8d5b3a868e4aa45ffc847"; + url = "https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz"; + sha256 = "9c8f92dba63ab9cb8a6b3d0ccf7ed8edf3f0fb388b044584d74778145fae7f8f"; }; - + patches = [ ./fix-rcmlib-path.patch ]; postPatch = '' diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index eb8e17a8693..54e5a3ab17e 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }: stdenv.mkDerivation rec { - name = "riemann-c-client-${version}"; - - version = "1.7.0"; + pname = "riemann-c-client"; + version = "1.9.1"; + name = "${pname}-${version}"; src = fetchFromGitHub { owner = "algernon"; repo = "riemann-c-client"; - rev = "54f4a656793d6c5ca0bf1ff2388693fb6b2b82a7"; - sha256 = "0jc2bbw7sp2gr4cswx78srs0p1kp81prcarq4ivqpfw4bmzg6xg4"; + rev = "${name}"; + sha256 = "1j3wgf9xigsv6ckmv82gjj4wavi7xjn2zvj1f63fzbaa1rv7pf3s"; }; buildInputs = [ autoreconfHook pkgconfig file protobufc ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/algernon/riemann-c-client; description = "A C client library for the Riemann monitoring system"; license = licenses.gpl3; - maintainers = [ maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils pradeepchhetri ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 3bf704ca68e..7ef6d2ce7ed 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb1, qt4, qmake4Hook }: +{ stdenv, fetchurl, libusb1, qt5 }: stdenv.mkDerivation rec { name = "rockbox-utility-${version}"; @@ -9,16 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0k3ycga3b0jnj13whwiip2l0gx32l50pnbh7kfima87nq65aaa5w"; }; - buildInputs = [ libusb1 qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ libusb1 ] ++ (with qt5; [ qtbase qttools ]); + nativeBuildInputs = [ qt5.qmakeHook ]; preConfigure = '' cd rbutil/rbutilqt ''; installPhase = '' - mkdir -p $out/bin - cp RockboxUtility $out/bin + install -Dm755 RockboxUtility $out/bin/RockboxUtility ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 2db91549104..de4c97731ef 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -2,14 +2,18 @@ , tcl-8_5 }: stdenv.mkDerivation rec { - name = "rrdtool-1.5.5"; + name = "rrdtool-1.6.0"; + src = fetchurl { url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; - sha256 = "1xm6ikzx8iaa6r7v292k8s7srkzhnifamp1szkimgmh5ki26sa1s"; + sha256 = "1msj1qsy3sdmx2g2rngp9a9qv50hz0ih7yx6nkx2b21drn4qx56d"; }; - buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ] + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ gettext perl libxml2 pango cairo groff ] ++ stdenv.lib.optional stdenv.isDarwin tcl-8_5; - + postInstall = '' # for munin and rrdtool support mkdir -p $out/lib/perl5/site_perl/ diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index c5f017564af..1713977d20a 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -5,13 +5,13 @@ let inherit (pythonPackages) python nose pycrypto requests2 mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "1.8"; + version = "1.9.2"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "1cn79kbz9fhhbajxg1fqd8xlab9jz4x1n9w7n42w0j8c627q0rlv"; + sha256 = "1ajbflywfc3nfjqp95izbnxrbqjm4v56gx0am2mj0z0ypds2dvm5"; }; pythonPaths = [ pycrypto requests2 ]; diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 710a777ffb5..a79f3846474 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -1,9 +1,6 @@ -{ composableDerivation, stdenv, fetchurl, alsaLib, libjack2, ncurses }: - -let inherit (composableDerivation) edf; in - -composableDerivation.composableDerivation {} { +{ stdenv, fetchurl, alsaLib, libjack2, ncurses, pkgconfig }: +stdenv.mkDerivation { name = "timidity-2.14.0"; src = fetchurl { @@ -11,37 +8,12 @@ composableDerivation.composableDerivation {} { sha256 = "0xk41w4qbk23z1fvqdyfblbz10mmxsllw0svxzjw5sa9y11vczzr"; }; - mergeAttrBy.audioModes = a : b : "${a},${b}"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib libjack2 ncurses ]; - preConfigure = '' - configureFlags="$configureFlags --enable-audio=$audioModes" - ''; + configureFlags = [ "--enable-audio=oss,alsa,jack" "--with-default-output=alsa" "--enable-ncurses" ]; - # configure still has many more options... - flags = { - oss = { - audioModes = "oss"; - }; - alsa = { - audioModes = "alsa"; - buildInputs = [alsaLib]; - # this is better than /dev/dsp ! - configureFlags = ["--with-default-output-mode=alsa"]; - }; - jack = { - audioModes = "jack"; - buildInputs = [libjack2]; - NIX_LDFLAGS = ["-ljack -L${libjack2}/lib"]; - }; - } // edf { name = "ncurses"; enable = { buildInputs = [ncurses]; };}; - - cfg = { - ncursesSupport = true; - - ossSupport = true; - alsaSupport = true; - jackSupport = true; - }; + NIX_LDFLAGS = ["-ljack -L${libjack2}/lib"]; instruments = fetchurl { url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz; diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index b5009165799..baadd6f3064 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Instant Terminal Sharing"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ DamienCassou ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 3ca01d7e5eb..04b42f6d722 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { ''; buildInputs = with pythonPackages; [ - pytest + pytest_29 pytest-rerunfailures ]; diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index 8ef357f65eb..918ff2f3179 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.umlet.com; license = licenses.gpl3; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 633371606a8..a5abc8bef83 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -6,12 +6,12 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { - version = "0.14.0"; + version = "0.14.1"; name = "vdirsyncer-${version}"; src = fetchurl { url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz"; - sha256 = "1mbh2gykx9sqsnyfa962ifxksx4afl2lb9rcsbd6rsh3gj2il898"; + sha256 = "044f01fjd8dpz4y9dm3qcc1a8cihcxxbr1sz6y6fkvglpb6k85y5"; }; propagatedBuildInputs = with pythonPackages; [ @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://github.com/pimutils/vdirsyncer; description = "Synchronize calendars and contacts"; - maintainers = with maintainers; [ matthiasbeyer jgeerds DamienCassou ]; + maintainers = with maintainers; [ matthiasbeyer jgeerds ]; platforms = platforms.all; license = licenses.mit; }; diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 6cae1947340..1ceab4f18cf 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "mptre"; repo = "yank"; rev = "v${meta.version}"; - sha256 = "1m8pnarm8n5x6ylbzxv8j9amylrllw166arrj4cx9f2jp2zbzcic"; + sha256 = "0d1vvmz6wg1m2byd22bxikywnm2970kyfsm46fhagxardsxbp6hj"; inherit name; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "0.7.1"; + version = "0.8.0"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index f9590b3f044..175281d2a48 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, buildPythonApplication, makeWrapper, zip, ffmpeg, rtmpdump, pandoc -, atomicparsley +{ stdenv, fetchurl, buildPythonApplication +, zip, ffmpeg, rtmpdump, atomicparsley, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the # manpage argument in place in case someone wants to use this derivation to @@ -8,29 +8,31 @@ , generateManPage ? false , ffmpegSupport ? true , rtmpSupport ? true -}: +, makeWrapper }: with stdenv.lib; - buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.01.18"; + version = "2017.02.17"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "7c16f3ce7cf8a673a4c531e4a1fc10801467a61732cb65430e40b3ab8b2f2d2e"; + sha256 = "06k0g3s0c27f0kwhvm2gpk01q0q0cbhqh09zvh19svl1zc2ky72b"; }; - buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; + buildInputs = [ zip makeWrapper ] ++ optional generateManPage pandoc; # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. # rtmpdump is required to download files over RTMP # atomicparsley for embedding thumbnails postInstall = let - packagesthatwillbeusedbelow = [ atomicparsley ] ++ optional ffmpegSupport ffmpeg ++ optional rtmpSupport rtmpdump; + packagesToBinPath = + [ atomicparsley ] + ++ optional ffmpegSupport ffmpeg + ++ optional rtmpSupport rtmpdump; in '' - wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesthatwillbeusedbelow}" + wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesToBinPath}" ''; # Requires network diff --git a/pkgs/tools/networking/aiccu/default.nix b/pkgs/tools/networking/aiccu/default.nix index e1b3a420079..a821c6476f7 100644 --- a/pkgs/tools/networking/aiccu/default.nix +++ b/pkgs/tools/networking/aiccu/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { version = "20070115"; src = fetchurl { - url = "https://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_20070115.tar.gz"; - sha256 = "2260f426c13471169ccff8cb4a3908dc5f79fda18ddb6a55363e7824e6c4c760"; + url = "http://http.debian.net/debian/pool/main/a/aiccu/aiccu_20070115.orig.tar.gz"; + sha256 = "1k73vw7i25qzmnbvmsp3ci4pm6h8q70w70vnr512517s2q5gag6j"; }; buildInputs = [ gnutls iproute makeWrapper ]; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 21f03f27ab7..3b7c2926bd4 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools, libnl, pkgconfig }: stdenv.mkDerivation rec { - name = "aircrack-ng-1.2-rc3"; + name = "aircrack-ng-1.2-rc4"; src = fetchurl { url = "http://download.aircrack-ng.org/${name}.tar.gz"; - sha256 = "11a53acln0fpar6v75qlybzdg8hdwc9ssd06fxygr47yp755qncf"; + sha256 = "0dpzx9kddxpgzmgvdpl3rxn0jdaqhm5wxxndp1xd7d75mmmc2fnr"; }; buildInputs = [ libpcap openssl zlib libnl pkgconfig ]; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index ab82851f178..1f003f67df6 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.29.0"; + version = "1.31.0"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "1ivxz2ld4cl9z29kdicban9dir6s0si2jqn4g11gz587x7pagbim"; + sha256 = "0d7z4bss1plkvlw5kfwzivxryrh13zi58ii3vf8q4csaz4yqhcjy"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/networking/asynk/default.nix b/pkgs/tools/networking/asynk/default.nix index 9c381bea65d..de8bcc8e7ff 100644 --- a/pkgs/tools/networking/asynk/default.nix +++ b/pkgs/tools/networking/asynk/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = http://asynk.io/; description = "Flexible contacts synchronization program"; license = licenses.agpl3; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 1f5b5a7c638..d3b99a9381e 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babeld-1.7.1"; + name = "babeld-1.8.0"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; - sha256 = "1dl7s2lb40kiysrqhr7zd0s90yfxy6xfsp0fhqgdlwfr99ymx59c"; + sha256 = "0v2jkav2sb0rpx3fmi5chhii08lc92pxf306nyha2amq9wib3a0i"; }; preBuild = '' diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix index 2b7d3a5dc7a..906e3eda3a6 100644 --- a/pkgs/tools/networking/biosdevname/default.nix +++ b/pkgs/tools/networking/biosdevname/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchgit, autoreconfHook, zlib, pciutils }: +{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pciutils }: stdenv.mkDerivation rec { name = "biosdevname-${version}"; - version = "0.6.1"; + version = "0.7.2"; - src = fetchgit { - url = git://linux.dell.com/biosdevname.git; - rev = "refs/tags/v${version}"; - sha256 = "059s3qyky9i497c9wnrjml15sknpsqbv01ww7q95bf9ybhdqqq8w"; + src = fetchFromGitHub { + owner = "dell"; + repo = "biosdevname"; + rev = "v${version}"; + sha256 = "183k6f9nayhai27y6nizf0sp9bj1kabykj66hcwdzllhrrh505sd"; }; - buildInputs = [ - autoreconfHook - zlib - pciutils - ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zlib pciutils ]; # Don't install /lib/udev/rules.d/*-biosdevname.rules patches = [ ./makefile.patch ]; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 1e2b48207f5..32a8ca5f99e 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -1,25 +1,26 @@ -{ stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr }: +{ stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr +, libseccomp }: assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { name = "chrony-${version}"; - version = "2.4.1"; + version = "3.0"; src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "1q5nxl19fdppwpxancff5dc9crgma8f24zww7ag4bd15yq79xm8g"; + sha256 = "0vfdsajz2w6b7c94rxrj7fsr234jryhl2rbdlmb7h10gla8pnf50"; }; - buildInputs = [ readline texinfo nss nspr ] ++ stdenv.lib.optional stdenv.isLinux libcap; + buildInputs = [ readline texinfo nss nspr ] + ++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp ]; nativeBuildInputs = [ pkgconfig ]; hardeningEnable = [ "pie" ]; - configureFlags = [ - "--chronyvardir=$(out)/var/lib/chrony" - ]; + configureFlags = [ "--chronyvardir=$(out)/var/lib/chrony" ] + ++ stdenv.lib.optional stdenv.isLinux [ "--enable-scfilter" ]; meta = with stdenv.lib; { description = "Sets your computer's clock from time servers on the Net"; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 9ed56ee1ec5..de841be3f05 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -4,6 +4,7 @@ , ldapSupport ? false, openldap ? null , zlibSupport ? false, zlib ? null , sslSupport ? false, openssl ? null +, gnutlsSupport ? false, gnutls ? null , scpSupport ? false, libssh2 ? null , gssSupport ? false, gss ? null , c-aresSupport ? false, c-ares ? null @@ -14,6 +15,8 @@ assert idnSupport -> libidn != null; assert ldapSupport -> openldap != null; assert zlibSupport -> zlib != null; assert sslSupport -> openssl != null; +assert !(gnutlsSupport && sslSupport); +assert gnutlsSupport -> gnutls != null; assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; @@ -25,8 +28,12 @@ stdenv.mkDerivation rec { sha256 = "16rqhyzlpnivifin8n7l2fr9ihay9v2nw2drsniinb6bcykqaqfi"; }; + patches = [ ./issue-1174.patch ]; + outputs = [ "bin" "dev" "out" "man" "devdoc" ]; + enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig perl ]; # Zlib and OpenSSL must be propagated because `libcurl.la' contains @@ -40,6 +47,7 @@ stdenv.mkDerivation rec { optional gssSupport gss ++ optional c-aresSupport c-ares ++ optional sslSupport openssl ++ + optional gnutlsSupport gnutls ++ optional scpSupport libssh2; # for the second line see http://curl.haxx.se/mail/tracker-2014-03/0087.html @@ -52,6 +60,7 @@ stdenv.mkDerivation rec { "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" "--disable-manual" ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) + ( if gnutlsSupport then "--with-gnutls=${gnutls.dev}" else "--without-gnutls" ) ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" ) ( if ldapSupport then "--enable-ldap" else "--disable-ldap" ) ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" ) @@ -66,6 +75,10 @@ stdenv.mkDerivation rec { postInstall = '' moveToOutput bin/curl-config "$dev" sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la + '' + stdenv.lib.optionalString gnutlsSupport '' + ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so + ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4 + ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4.4.0 ''; crossAttrs = { @@ -73,6 +86,7 @@ stdenv.mkDerivation rec { # For the 'urandom', maybe it should be a cross-system option configureFlags = [ ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" ) + ( if gnutlsSupport then "--with-gnutls=${gnutls.crossDrv}" else "--without-gnutls" ) "--with-random /dev/urandom" ]; }; diff --git a/pkgs/tools/networking/curl/issue-1174.patch b/pkgs/tools/networking/curl/issue-1174.patch new file mode 100644 index 00000000000..eceeef8b001 --- /dev/null +++ b/pkgs/tools/networking/curl/issue-1174.patch @@ -0,0 +1,34 @@ +commit a7b38c9dc98481e4a5fc37e51a8690337c674dfb +Author: Daniel Stenberg +Date: Mon Dec 26 00:06:33 2016 +0100 + + vtls: s/SSLEAY/OPENSSL + + Fixed an old leftover use of the USE_SSLEAY define which would make a + socket get removed from the applications sockets to monitor when the + multi_socket API was used, leading to timeouts. + + Bug: #1174 + +diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c +index b808e1c..707f24b 100644 +--- a/lib/vtls/vtls.c ++++ b/lib/vtls/vtls.c +@@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy *data) + curlssl_close_all(data); + } + +-#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \ ++#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \ + defined(USE_DARWINSSL) || defined(USE_NSS) + /* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */ + int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks, +@@ -518,7 +518,7 @@ int Curl_ssl_getsock(struct connectdata *conn, + (void)numsocks; + return GETSOCK_BLANK; + } +-/* USE_SSLEAY || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */ ++/* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */ + #endif + + void Curl_ssl_close(struct connectdata *conn, int sockindex) diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index baa295c0b00..24aa3d4b829 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "dnscrypt-proxy-${version}"; - version = "1.9.1"; + version = "1.9.4"; src = fetchurl { url = "https://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2"; - sha256 = "0aa1qw59b72wl922lfhg24xq2gkv95v1s0daiiqv9b4zpap3ynag"; + sha256 = "07piwsjczamwvdpv1585kg4awqakip51bwsm8nqi6bljww4agx7x"; }; configureFlags = optional stdenv.isLinux "--with-systemd"; @@ -21,14 +21,6 @@ stdenv.mkDerivation rec { # Previous versions required libtool files to load plugins; they are # now strictly optional. rm $out/lib/dnscrypt-proxy/*.la - - # The installation ends up copying the same sample configuration - # into $out/etc twice, with the expectation that one of them will be - # edited by the user. Since we can't modify the file, it makes more - # sense to move only a single copy to the doc directory. - mkdir -p $out/share/doc/dnscrypt-proxy - mv $out/etc/dnscrypt-proxy.conf.example $out/share/doc/dnscrypt-proxy/ - rm -rf $out/etc ''; meta = { diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index 11e019dfec3..e5764fa421d 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fping-3.15"; + name = "fping-3.16"; src = fetchurl { url = "http://www.fping.org/dist/${name}.tar.gz"; - sha256 = "072jhm9wpz1bvwnwgvz24ijw0xwwnn3z3zan4mgr5s5y6ml8z54n"; + sha256 = "2f753094e4df3cdb1d99be1687c0fb7d2f14c0d526ebf03158c8c5519bc78f54"; }; configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index c3fe609f4cd..5eac65a009a 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - version = "4.52.0"; + version = "4.53.0"; name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "0pzplrlxwbxydvfw4kkwn60l40hk1h5sxawaa6pi0k75c220k4ni"; + sha256 = "1awjdxiq3d25h10h32a7h2wxbkgvgvsnicp5xwx4p8mm6gz9c998"; }; doCheck = false; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 8a15811407d..7d9c00ecaaf 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,13 +1,15 @@ { stdenv, pkgs, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - majorVersion = "1.6"; - version = "${majorVersion}.6"; - name = "haproxy-${version}"; + pname = "haproxy"; + majorVersion = "1.7"; + minorVersion = "2"; + version = "${majorVersion}.${minorVersion}"; + name = "${pname}-${version}"; src = fetchurl { - url = "http://haproxy.1wt.eu/download/${majorVersion}/src/${name}.tar.gz"; - sha256 = "1xamzzfvwgh3b72f3j74ar9xcn61viszqfbdpf4cdhwc0xikvc7x"; + url = "http://www.haproxy.org/download/${majorVersion}/src/${name}.tar.gz"; + sha256 = "0bsb5q3s1k5gqybv5p8zyvl6zh8iyidv3jb3wfmgwqad5bsl0nzr"; }; buildInputs = [ openssl zlib ]; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 55ba6b9db55..6f2ca8fc5ba 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pythonPackages, httpie }: pythonPackages.buildPythonApplication rec { - version = "0.8.0"; + version = "0.9.1"; name = "http-prompt"; src = fetchFromGitHub { rev = "v${version}"; repo = "http-prompt"; owner = "eliangcs"; - sha256 = "0zvkmdc6mhc5kk7cbrgzxsl8n2d02gnxy1sppm83mhwx6s1dkz30"; + sha256 = "0s2syjjz5n7256a4hn8gv3xfr0zd3qqimf4w8l188dbfvx8b8s06"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 56af632e616..b7527cf97ce 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "0lw0vcibp3v5xz855h4x2rs3ff7yx86znzjfnfri348wg413js5c"; + sha256 = "1ky4ckv5p86xxgjkgxdi48c9q9h4pff2blilg03bxks8f8dxfy9f"; }; buildInputs = [ boost zlib openssl ]; diff --git a/pkgs/tools/networking/isync/unstable.nix b/pkgs/tools/networking/isync/unstable.nix index eae7167f2fe..a20fa2fe737 100644 --- a/pkgs/tools/networking/isync/unstable.nix +++ b/pkgs/tools/networking/isync/unstable.nix @@ -1,17 +1,17 @@ -{ fetchgit, stdenv, openssl, pkgconfig, db, cyrus_sasl +{ fetchgit, stdenv, openssl, pkgconfig, db, cyrus_sasl, zlib , autoconf, automake }: stdenv.mkDerivation rec { - name = "isync-git-2015-11-08"; - rev = "46e792"; + name = "isync-git-20161218"; + rev = "77acc268123b8233843ca9bc3dcf90669efde08f"; src = fetchgit { - url = "git://git.code.sf.net/p/isync/isync"; + url = "https://git.code.sf.net/p/isync/isync"; inherit rev; - sha256 = "02bm5m3bwpfns7qdwfybyl4fwa146n55v67pdchkhxaqpa4ddws1"; + sha256 = "0i21cgmgm8acvd7xwdk9pll3kl6cxj9s1hakqzbwks8j4ncygwkj"; }; - buildInputs = [ openssl pkgconfig db cyrus_sasl autoconf automake ]; + buildInputs = [ openssl pkgconfig db cyrus_sasl zlib autoconf automake ]; preConfigure = '' touch ChangeLog @@ -22,8 +22,7 @@ stdenv.mkDerivation rec { homepage = http://isync.sourceforge.net/; description = "Free IMAP and MailDir mailbox synchronizer"; license = licenses.gpl2Plus; - - maintainers = with maintainers; [ the-kenny ]; + maintainers = with maintainers; [ the-kenny ttuegel ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index c579d12b6bd..1f5a6216e7b 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -1,33 +1,29 @@ -{ stdenv, fetchurl, openssl, net_snmp, libnl }: +{ stdenv, fetchFromGitHub, libnfnetlink, libnl, net_snmp, openssl, pkgconfig }: stdenv.mkDerivation rec { - name = "keepalived-1.2.19"; + name = "keepalived-${version}"; + version = "1.3.2"; - src = fetchurl { - url = "http://keepalived.org/software/${name}.tar.gz"; - sha256 = "0lrq963pxhgh74qmxjyy5hvxdfpm4r50v4vsrp559n0w5irsxyrj"; + src = fetchFromGitHub { + owner = "acassen"; + repo = "keepalived"; + rev = "v${version}"; + sha256 = "1mfw8116b7j8y37l382v154yssm635kbm72f4x8303g5zwg6n6qx"; }; - buildInputs = [ openssl net_snmp libnl ]; + buildInputs = [ + libnfnetlink + libnl + net_snmp + openssl + ]; - postPatch = '' - sed -i 's,$(DESTDIR)/usr/share,$out/share,g' Makefile.in - ''; - - # It doesn't know about the include/libnl directory - NIX_CFLAGS_COMPILE="-I${libnl.dev}/include/libnl3"; - NIX_LDFLAGS="-lnl-3 -lnl-genl-3"; + nativeBuildInputs = [ pkgconfig ]; configureFlags = [ - "--sysconfdir=/etc" - "--localstatedir=/var" - "--enable-snmp" "--enable-sha1" - ]; - - installFlags = [ - "sysconfdir=\${out}/etc" - ]; + "--enable-snmp" + ]; meta = with stdenv.lib; { homepage = http://keepalived.org; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 8a4f7e2dbe6..7ef00197118 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, protobuf, ncurses, pkgconfig, IOTty -, makeWrapper, perl, openssl, autoreconfHook, fetchpatch }: +, makeWrapper, perl, openssl, autoreconfHook, openssh }: stdenv.mkDerivation rec { name = "mosh-1.2.6"; @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; + patches = [ ./ssh_path.patch ]; + postPatch = '' + substituteInPlace scripts/mosh.pl \ + --subst-var-by ssh "${openssh}/bin/ssh" + ''; + postInstall = '' wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB ''; diff --git a/pkgs/tools/networking/mosh/ssh_path.patch b/pkgs/tools/networking/mosh/ssh_path.patch new file mode 100644 index 00000000000..cb2a650718a --- /dev/null +++ b/pkgs/tools/networking/mosh/ssh_path.patch @@ -0,0 +1,13 @@ +diff --git i/scripts/mosh.pl w/scripts/mosh.pl +index c511482..55bf5f3 100755 +--- i/scripts/mosh.pl ++++ w/scripts/mosh.pl +@@ -66,7 +66,7 @@ my $use_remote_ip = 'proxy'; + my $family = 'prefer-inet'; + my $port_request = undef; + +-my @ssh = ('ssh'); ++my @ssh = ('@ssh@'); + + my $term_init = 1; + diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 0cb5c92abec..8d62cb1bc74 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${name}.tar.xz"; - sha256 = "431b7b4876638c6a537c8bf9c91a9250532b3d960b22b056df554695a81e4499"; + sha256 = "09ijxicsqf39y6h8kwbfjyljfbqkkx4vrpyfn6gfg1h9mvp4cf39"; }; configureFlags = [ "--sysconfdir=/etc" ]; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 0bd79890dc0..1ad1e54e7fb 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "network-manager-${version}"; pname = "NetworkManager"; major = "1.4"; - version = "${major}.2"; + version = "${major}.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; - sha256 = "a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204"; + sha256 = "029k2f1arx1m5hppmr778i9yg34jj68nmji3i89qs06c33rpi4w2"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index 303ca70aace..e1a5f954986 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-openconnect"; major = "1.2"; - version = "${major}.2"; + version = "${major}.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; - sha256 = "522979593e21b4e884112816708db9eb66148b3491580dacfad53472b94aafec"; + sha256 = "15j98wwspv6mcmy91w30as5qc1bzsnhlk060xhjy4qrvd37y0xx1"; }; buildInputs = [ openconnect networkmanager libsecret ] diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 92dc45ac82c..3edbe7dba6e 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-openvpn"; major = "1.2"; - version = "${major}.6"; + version = "${major}.8"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; - sha256 = "2373e2bb0a8a876cb2997cd8b0e3d6e10012d9bef3705ea3ac21f6394b3f1fb0"; + sha256 = "0m06sg2rnz764psvpsrx0pvll11nfn9hypgbp3s6vna8y83l02ry"; }; buildInputs = [ openvpn networkmanager libsecret ] diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index 9e0033cca90..9d26a84d6f2 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "NetworkManager-strongswan"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2"; - sha256 = "0qfnylg949lkyw1nmyggz2ipgmy154ic5q5ljjcwcgi14r90ys02"; + sha256 = "0r5j8cr4x01d2cdy970990292n7p9v617cw103kdczw646xwcxs8"; }; postPatch = '' diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix index 3c0b0d9278a..dcc0e8596e9 100644 --- a/pkgs/tools/networking/ngrep/default.nix +++ b/pkgs/tools/networking/ngrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, gnumake3 }: +{ stdenv, fetchurl, fetchpatch, libpcap, gnumake3, pcre }: stdenv.mkDerivation rec { name = "ngrep-1.45"; @@ -8,13 +8,32 @@ stdenv.mkDerivation rec { sha256 = "19rg8339z5wscw877mz0422wbsadds3mnfsvqx3ihy58glrxv9mf"; }; - buildInputs = [ gnumake3 libpcap ]; + patches = [ + (fetchpatch { + url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/10_debian-build.diff?h=debian/1.45.ds2-14"; + sha256 = "1p359k54xjbh6r0d0lv1l679n250wxk6j8yyz23gn54kwdc29zfy"; + }) + (fetchpatch { + url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/10_man-fixes.diff?h=debian/1.45.ds2-14"; + sha256 = "1b66zfbsrsvg60j988i6ga9iif1c34fsbq3dp1gi993xy4va8m5k"; + }) + (fetchpatch { + url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/20_setlocale.diff?h=debian/1.45.ds2-14"; + sha256 = "16xbmnmvw5sjidz2qhay68k3xad05g74nrccflavxbi0jba52fdq"; + }) + (fetchpatch { + url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/40_ipv6-offsets.diff?h=debian/1.45.ds2-14"; + sha256 = "0fjlk1sav5nnjapvsa8mvdwjkhgm3kgc6dw7r9h1qx6d3b8cgl76"; + }) + ]; + + buildInputs = [ gnumake3 libpcap pcre ]; preConfigure = '' # Fix broken test for BPF header file sed -i "s|BPF=.*|BPF=${libpcap}/include/pcap/bpf.h|" configure - configureFlags="$configureFlags --with-pcap-includes=${libpcap}/include" + configureFlags="$configureFlags --enable-ipv6 --enable-pcre --disable-pcap-restart --with-pcap-includes=${libpcap}/include" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix new file mode 100644 index 00000000000..70f3d7e9c70 --- /dev/null +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "nuttcp-${version}"; + version = "8.1.4"; + + src = fetchurl { + urls = [ + "http://nuttcp.net/nuttcp/latest/${name}.c" + "http://nuttcp.net/nuttcp/${name}/${name}.c" + "http://nuttcp.net/nuttcp/beta/${name}.c" + ]; + sha256 = "1mygfhwxfi6xg0iycivx98ckak2abc3vwndq74278kpd8g0yyqyh"; + }; + + man = fetchurl { + url = "http://nuttcp.net/nuttcp/${name}/nuttcp.8"; + sha256 = "1yang94mcdqg362qbi85b63746hk6gczxrk619hyj91v5763n4vx"; + }; + + unpackPhase = ":"; + + buildPhase = '' + gcc -O2 -o nuttcp $src + ''; + + installPhase = '' + mkdir -p $out/bin + cp nuttcp $out/bin + ''; + + meta = with stdenv.lib; { + description = "Network performance measurement tool"; + longDescription = '' + nuttcp is a network performance measurement tool intended for use by + network and system managers. Its most basic usage is to determine the raw + TCP (or UDP) network layer throughput by transferring memory buffers from + a source system across an interconnecting network to a destination + system, either transferring data for a specified time interval, or + alternatively transferring a specified number of bytes. In addition to + reporting the achieved network throughput in Mbps, nuttcp also provides + additional useful information related to the data transfer such as user, + system, and wall-clock time, transmitter and receiver CPU utilization, + and loss percentage (for UDP transfers). + ''; + license = licenses.gpl2; + homepage = http://nuttcp.net/; + maintainers = with maintainers; [ viric ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index bed9bba16b0..d585be26e26 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub, pythonPackages, }: +{ stdenv, fetchFromGitHub, pythonPackages, + asciidoc, libxml2, libxslt, docbook_xml_xslt }: pythonPackages.buildPythonApplication rec { - version = "7.0.12"; + version = "7.0.13"; name = "offlineimap-${version}"; namePrefix = ""; @@ -9,13 +10,25 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "1i83p40lxjqnvh88x623iydrwnsxib1k91qbl9myc4hi5i4fnr6x"; + sha256 = "0108xmp9df6cb1nzw3ym59mir3phgfdgp5d43n44ymsk2cc39xcc"; }; + postPatch = '' + # Skip xmllint to stop failures due to no network access + sed -i docs/Makefile -e "s|a2x -v -d |a2x -L -v -d |" + ''; + doCheck = false; + nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xml_xslt ]; propagatedBuildInputs = [ pythonPackages.six ]; + postInstall = '' + make -C docs man + install -D -m 644 docs/offlineimap.1 ''${!outputMan}/share/man/man1/offlineimap.1 + install -D -m 644 docs/offlineimapui.7 ''${!outputMan}/share/man/man7/offlineimapui.7 + ''; + meta = { description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers"; homepage = "http://offlineimap.org"; diff --git a/pkgs/tools/networking/openconnect.nix b/pkgs/tools/networking/openconnect/default.nix similarity index 63% rename from pkgs/tools/networking/openconnect.nix rename to pkgs/tools/networking/openconnect/default.nix index 2160bdda9e1..e1104a88c90 100644 --- a/pkgs/tools/networking/openconnect.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, libxml2, zlib } : +{ stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, libxml2, stoken, zlib } : let xor = a: b: (a || b) && (!(a && b)); @@ -7,13 +7,13 @@ in assert xor (openssl != null) (gnutls != null); stdenv.mkDerivation rec { - name = "openconnect-7.06"; + name = "openconnect-7.08"; src = fetchurl { urls = [ "ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz" ]; - sha256 = "1wkhmgfxkdkhy2p9w9idrgipxmxij2z4f88flfk3fifwd19nkkzs"; + sha256 = "00wacb79l2c45f94gxs63b9z25wlciarasvjrb8jb8566wgyqi0w"; }; preConfigure = '' @@ -29,9 +29,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ vpnc openssl gnutls libxml2 zlib ]; + propagatedBuildInputs = [ vpnc openssl gnutls libxml2 stoken zlib ]; meta = { + description = "VPN Client for Cisco's AnyConnect SSL VPN"; + homepage = http://www.infradead.org/openconnect/; + license = stdenv.lib.licenses.lgpl21; + maintainers = with stdenv.lib.maintainers; [ pradeepchhetri ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index e3e2053e2ce..3854d94f909 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.1.4"; + version = "1.2.0"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,12 +12,12 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "08ycz053wa29ckgr93132hr3vrd84r3bks9q807qanri0n35y256"; + sha256 = "1a1l9f6zivfyxg9g2x7kzkvcyh84s7l6v0kimihhrd19zl0m41jn"; }; buildInputs = [ openssl ppp autoreconfHook ]; - hardeningDisable = [ "format" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; preConfigure = '' substituteInPlace src/tunnel.c --replace "/usr/sbin/pppd" "${ppp}/bin/pppd" diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 6b88d2d2b7d..4bdc630efd7 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -6,13 +6,13 @@ # some loss of functionality because of it. pythonPackages.buildPythonApplication rec { - version = "1.11.0"; + version = "1.12.1"; name = "tahoe-lafs-${version}"; namePrefix = ""; src = fetchurl { url = "https://tahoe-lafs.org/downloads/tahoe-lafs-${version}.tar.bz2"; - sha256 = "0hrp87rarbmmpnrxk91s83h6irkykds3pl263dagcddbdl5inqdi"; + sha256 = "0x9f1kjym1188fp6l5sqy0zz8mdb4xw861bni2ccv26q482ynbks"; }; patchPhase = '' @@ -36,7 +36,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ twisted foolscap nevow simplejson zfec pycryptopp darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface - service-identity + service-identity pyyaml ]; postInstall = '' diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index bc6b2b0e5de..90a4b988c3f 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { # Without nonpriv.patch, pppd --version doesn't work when not run as # root. ./nonpriv.patch + (fetchurl { + name = "CVE-2015-3310.patch"; + url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/rc_mksid-no-buffer-overflow?h=debian/2.4.7-1%2b4"; + sha256 = "1dk00j7bg9nfgskw39fagnwv1xgsmyv0xnkd6n1v5gy0psw0lvqh"; + }) ]; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index 6c74b52b45f..a5008e91423 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radvd-${version}"; - version = "2.15"; + version = "2.16"; src = fetchurl { url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; - sha256 = "09spyj4f05rjx21v8vmyqmmj0fz1wx810s63md1vf05hyzd0v8dk"; + sha256 = "1s3aqgn3db0wb4920b0mrvwb5isgijlb6izb1wliqhhashwffz1i"; }; nativeBuildInputs = [ pkgconfig bison flex check ]; diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix index 1fcb73e00dc..620e8d3dbba 100644 --- a/pkgs/tools/networking/redir/default.nix +++ b/pkgs/tools/networking/redir/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "redir-2.2.1"; + name = "redir-${version}"; + version = "3.1"; - src = fetchurl { - url = "http://sammy.net/~sammy/hacks/${name}.tar.gz"; - sha256 = "0v0f14br00rrmd1ss644adsby4gm29sn7a2ccy7l93ik6pw099by"; + src = fetchFromGitHub { + owner = "troglobit"; + repo = "redir"; + rev = "v${version}"; + sha256 = "1m05dchi15bzz9zfdb7jg59624sx4khp5zq0wf4pzr31s64f69cx"; }; - installPhase = '' - mkdir -p $out/bin - cp redir $out/bin - ''; + nativeBuildInputs = [ autoreconfHook ]; meta = { - description = "A port redirector"; - homepage = http://sammy.net/~sammy/hacks/; + description = "A TCP port redirector for UNIX"; + homepage = "https://github.com/troglobit/redir"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ globin ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix new file mode 100644 index 00000000000..e9aced06728 --- /dev/null +++ b/pkgs/tools/networking/redsocks/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, libevent }: + +let + pkg = "redsocks"; + version = "0.5"; +in +stdenv.mkDerivation rec { + name = "${pkg}-${version}"; + + src = fetchFromGitHub { + owner = "darkk"; + repo = pkg; + rev = "release-${version}"; + sha256 = "170cpvvivb6y2kwsqj9ppx5brgds9gkn8mixrnvj8z9c15xhvplm"; + }; + + installPhase = + '' + mkdir -p $out/{bin,share} + mv redsocks $out/bin + mv doc $out/share + ''; + + buildInputs = [ libevent ]; + + meta = { + description = "Transparent redirector of any TCP connection to proxy"; + homepage = http://darkk.net.ru/redsocks/; + license = stdenv.lib.licenses.asl20; + maintainers = [ ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 19cdb884bd1..0e9efb028ba 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, openssl, readline }: stdenv.mkDerivation rec { - name = "socat-1.7.3.1"; + name = "socat-1.7.3.2"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; - sha256 = "1apvi7sahcl44arnq1ad2y6lbfqnmvx7nhz9i3rkk0f382anbnnj"; + sha256 = "0lcj6zpra33xhgvhmz9l3cqz10v8ybafb8dd1yqkwf1rhy01ymp3"; }; buildInputs = [ openssl readline ]; - patches = [ ./enable-ecdhe.patch ./libressl-fixes.patch ]; - hardeningEnable = [ "pie" ]; meta = { diff --git a/pkgs/tools/networking/socat/enable-ecdhe.patch b/pkgs/tools/networking/socat/enable-ecdhe.patch deleted file mode 100644 index ad63ec287bc..00000000000 --- a/pkgs/tools/networking/socat/enable-ecdhe.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- socat-1.7.3.0/xio-openssl.c 2015-01-24 15:33:42.000000000 +0100 -+++ socat-1.7.3.0-ecdhe/xio-openssl.c 2015-01-25 13:38:54.353641097 +0100 -@@ -960,7 +960,6 @@ - } - } - --#if defined(EC_KEY) /* not on Openindiana 5.11 */ - { - /* see http://openssl.6102.n7.nabble.com/Problem-with-cipher-suite-ECDHE-ECDSA-AES256-SHA384-td42229.html */ - int nid; -@@ -982,7 +981,6 @@ - - SSL_CTX_set_tmp_ecdh(*ctx, ecdh); - } --#endif /* !defined(EC_KEY) */ - - #if OPENSSL_VERSION_NUMBER >= 0x00908000L - if (opt_compress) { - diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index e9c82a798ed..cf930769b86 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.38"; + version = "5.39"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "1mag0gd52f5q1jj3ds1pcn3s09si63cbxmri3zyv2fk8l6ds5b89"; + sha256 = "1vjdn32iw11zqsygwxbjmqgs4644dk3ql1h8ap890ls6a1x0i318"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index a50fad8b374..42cb3867e05 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { - name = "tcpdump-4.7.4"; + name = "tcpdump-${version}"; + version = "4.9.0"; src = fetchurl { - url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1byr8w6grk08fsq0444jmcz9ar89lq9nf4mjq2cny0w9k8k21rbb"; + #url = "http://www.tcpdump.org/release/${name}.tar.gz"; + url = "mirror://debian/pool/main/t/tcpdump/tcpdump_${version}.orig.tar.gz"; + sha256 = "0pjsxsy8l71i813sa934cwf1ryp9xbr7nxwsvnzavjdirchq3sga"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index 813290494e2..c025fba4921 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.29"; + version = "1.0.31"; name = "tinc-${version}"; src = fetchurl { url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "0y1alzxgds067m83qdkg12hsy6disa2ad3y2i0h1pgpvdxy02mq3"; + sha256 = "d3cbc82e6e07975a2ccc0b369d07e30fc3324e71e240dca8781ce9a4f629519b"; }; buildInputs = [ lzo openssl zlib ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" ]; - meta = { + meta = { description = "VPN daemon with full mesh routing"; longDescription = '' tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index 29b1ec5f39c..05e833f2f8e 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -1,31 +1,23 @@ -{ stdenv, fetchFromGitHub, libtoxcore, cmake, jsoncpp, lib, stdenvAdapters, libsodium, systemd, enableDebugging, libcap }: +{ stdenv, fetchFromGitHub, cmake, lib +, libtoxcore, jsoncpp, libsodium, systemd, libcap }: with lib; -let - libtoxcoreLocked = stdenv.lib.overrideDerivation libtoxcore (oldAttrs: { - name = "libtoxcore-2016-09-07"; - src = fetchFromGitHub { - owner = "TokTok"; - repo = "toxcore"; - rev = "3521898b0cbf398d882496f6382f6c4ea1c23bc1"; - sha256 = "1jvf0v9cqwd4ssj1iarhgsr05qg48v7yvmbnn3k01jy0lqci8iaq"; - }; - }); - -in stdenv.mkDerivation { - name = "toxvpn-2016-09-09"; +stdenv.mkDerivation rec { + name = "toxvpn-${version}"; + version = "20161230"; src = fetchFromGitHub { owner = "cleverca22"; repo = "toxvpn"; - rev = "6e188f26fff8bddc1014ee3cc7a7423f9f344a09"; - sha256 = "1bshc6pzk7z7q7g17cwx9gmlcyzn4szqvdiy0ihbk2xmx9k31c6p"; + rev = "4b7498a5fae680484cb5779ac01fb08ad3089bdd"; + sha256 = "0bazdspiym9xyzms7pd6i1f2gph13rnf764nm3jc27fbfwmc98rp"; }; - buildInputs = [ cmake libtoxcoreLocked jsoncpp libsodium libcap ] ++ optional (systemd != null) systemd; + buildInputs = [ libtoxcore jsoncpp libsodium libcap ] ++ optional stdenv.isLinux systemd; + nativeBuildInputs = [ cmake ]; - cmakeFlags = optional (systemd != null) [ "-DSYSTEMD=1" ]; + cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ]; meta = with stdenv.lib; { description = "A powerful tool that allows one to make tunneled point to point connections over Tox"; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 1d4791ffdde..f024c637c34 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, gettext, libidn, pkgconfig -, perl, perlPackages, LWP, python3 -, libiconv, libpsl ? null, openssl ? null }: +{ stdenv, fetchurl, gettext, pkgconfig, perl +, libidn2, zlib, pcre, libuuid, libiconv +, IOSocketSSL, LWP, python3 +, libpsl ? null +, openssl ? null }: stdenv.mkDerivation rec { - name = "wget-1.18"; + name = "wget-1.19.1"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.xz"; - sha256 = "1hcwx8ww3sxzdskkx3l7q70a7wd6569yrnjkw9pw013cf9smpddm"; + sha256 = "1ljcfhbkdsd0zjfm520rbl1ai62fc34i7c45sfj244l8f6b0p58c"; }; patches = [ ./remove-runtime-dep-on-openssl-headers.patch ]; @@ -26,9 +28,10 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ gettext pkgconfig perl ]; - buildInputs = [ libidn libiconv libpsl ] - ++ stdenv.lib.optionals doCheck [ perlPackages.IOSocketSSL LWP python3 ] + buildInputs = [ libidn2 libiconv zlib pcre libuuid ] + ++ stdenv.lib.optionals doCheck [ IOSocketSSL LWP python3 ] ++ stdenv.lib.optional (openssl != null) openssl + ++ stdenv.lib.optional (libpsl != null) libpsl ++ stdenv.lib.optional stdenv.isDarwin perl; configureFlags = diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index f7c94c1e72b..1a8104c2ee1 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext }: stdenv.mkDerivation rec { - version = "5.2.12"; + version = "5.2.14"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "1cis7zwh0r1hqbl2wa3i2x1446nrhfqfd52b2lknfml64l08rnk5"; + sha256 = "06nx295g03z7vzrrc3mhxikpw870zvkilrlxghd2rpcbm939iin5"; }; buildInputs = [ perl gettext ]; diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix new file mode 100644 index 00000000000..994a6f75d54 --- /dev/null +++ b/pkgs/tools/networking/wuzz/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "wuzz-${version}"; + version = "0.1.0"; + rev = "v${version}"; + + goPackagePath = "https://github.com/asciimoo/wuzz"; + + src = fetchFromGitHub { + owner = "asciimoo"; + repo = "wuzz"; + inherit rev; + sha256 = "0n55y9dmx4rsccjscvbrgiq2g1qwqxj44lg90589i55b5f7r1ljd"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/asciimoo/wuzz; + description = "Interactive cli tool for HTTP inspection"; + license = licenses.agpl3; + maintainers = with maintainers; [ pradeepchhetri ]; + }; +} diff --git a/pkgs/tools/networking/wuzz/deps.nix b/pkgs/tools/networking/wuzz/deps.nix new file mode 100644 index 00000000000..1025793cc98 --- /dev/null +++ b/pkgs/tools/networking/wuzz/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "github.com/jroimartin/gocui"; + fetch = { + type = "git"; + url = "https://github.com/jroimartin/gocui"; + rev = "7ac95c981b8a07b624ab197b3ad5813fdfbe4864"; + sha256 = "1xr752gpjv32mnzzy5v367maczl7sn8frn258wqrs6gqf07sdmjp"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8"; + sha256 = "156i8apkga8b3272kjhapyqwspgcfkrr9kpqwc5lii43k4swghpv"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "14207d285c6c197daabb5c9793d63e7af9ab2d50"; + sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv"; + }; + } +] diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 103ef8d7776..0d7a5449d6e 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.18.15"; + version = "1.18.18"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "0wd3rl1wi2d22jyavxg1ljzkymilg7p338y0c0ql0fcw7djkdsdf"; + sha256 = "1xbgjdazcxb9iqrz6jcmy8qwgwggvf6rws2265sh01b6skin32y8"; }; configureFlags = [ diff --git a/pkgs/tools/package-management/fpm/Gemfile b/pkgs/tools/package-management/fpm/Gemfile index 95916cf4322..ea498ca7835 100644 --- a/pkgs/tools/package-management/fpm/Gemfile +++ b/pkgs/tools/package-management/fpm/Gemfile @@ -1,2 +1,4 @@ source 'https://rubygems.org' + +gem 'archive-tar-minitar', '>= 0.5.2.1', github: 'peterhoeg/archive-tar-minitar' gem 'fpm' diff --git a/pkgs/tools/package-management/fpm/Gemfile.lock b/pkgs/tools/package-management/fpm/Gemfile.lock index ab3d4dd6b46..16d7a8250ec 100644 --- a/pkgs/tools/package-management/fpm/Gemfile.lock +++ b/pkgs/tools/package-management/fpm/Gemfile.lock @@ -1,7 +1,12 @@ +GIT + remote: git://github.com/peterhoeg/archive-tar-minitar.git + revision: dae32ca550a87dba32597115ae18805db4782ebe + specs: + archive-tar-minitar (0.5.2.1) + GEM remote: https://rubygems.org/ specs: - archive-tar-minitar (0.5.2) arr-pm (0.0.10) cabin (> 0) backports (3.6.8) @@ -40,7 +45,8 @@ PLATFORMS ruby DEPENDENCIES + archive-tar-minitar (>= 0.5.2.1)! fpm BUNDLED WITH - 1.12.5 + 1.14.3 diff --git a/pkgs/tools/package-management/fpm/gemset.nix b/pkgs/tools/package-management/fpm/gemset.nix index 0670d3a5b14..4243651dd25 100644 --- a/pkgs/tools/package-management/fpm/gemset.nix +++ b/pkgs/tools/package-management/fpm/gemset.nix @@ -1,11 +1,13 @@ { archive-tar-minitar = { source = { - remotes = ["https://rubygems.org"]; - sha256 = "1j666713r3cc3wb0042x0wcmq2v11vwwy5pcaayy5f0lnd26iqig"; - type = "gem"; + fetchSubmodules = false; + rev = "dae32ca550a87dba32597115ae18805db4782ebe"; + sha256 = "0fvxacbcb52fm5dis451kdd7dv74z8p6nm4vnfqf7jg2aghcxdkd"; + type = "git"; + url = "git://github.com/peterhoeg/archive-tar-minitar.git"; }; - version = "0.5.2"; + version = "0.5.2.1"; }; arr-pm = { source = { diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index ceef483c8cc..4b9b593655b 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }: +{ stdenv, fetchFromGitHub, cmake, python2, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }: stdenv.mkDerivation rec { version = "1.7.18"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { --replace ' ''${PYTHON_INSTALL_DIR}' " $out/lib/python2.7/site-packages" ''; - buildInputs = [ cmake python pkgconfig expat glib pcre openssl curl check attr gpgme ]; + buildInputs = [ cmake python2 pkgconfig expat glib pcre openssl curl check attr gpgme ]; # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here propagatedBuildInputs = [ curl gpgme expat ]; diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 6c5cb467a8f..f37940c65c1 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -37,12 +37,11 @@ in rec { nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [git coreutils]; nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [mercurial]; nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [subversion.out]; - nix-prefetch-zip = mkPrefetchScript "zip" ../../../build-support/fetchzip/nix-prefetch-zip [unzip curl.bin]; nix-prefetch-scripts = buildEnv { name = "nix-prefetch-scripts"; - paths = [ nix-prefetch-bzr nix-prefetch-cvs nix-prefetch-git nix-prefetch-hg nix-prefetch-svn nix-prefetch-zip ]; + paths = [ nix-prefetch-bzr nix-prefetch-cvs nix-prefetch-git nix-prefetch-hg nix-prefetch-svn ]; meta = with stdenv.lib; { description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 069eab421ec..49b23fec4ec 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -112,12 +112,12 @@ in rec { nixUnstable = lib.lowPrio (common rec { name = "nix-1.12${suffix}"; - suffix = "pre4911_b30d1e7"; + suffix = "pre4997_1351b0d"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "b30d1e7ada0a8fbaacc25e24e5e788d18bfe8d3c"; - sha256 = "04j6aw2bi3k7m5jyqwn1vrf78br5kdfpjsj15b5r5lvxdqhlknvm"; + rev = "1351b0df87a0984914769c5dc76489618b3a3fec"; + sha256 = "09zvphzik9pypi1bnjs0v83qwgl5cfb5w0c788jlr5wbd8x3crv1"; }; fromGit = true; }); diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index bba392e30e7..820bcbb9a35 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,9 +1,9 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "1.4"; + version = "1.5"; src = fetchurl { url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "1a6vkn8rh5lgalxh6cwr4894n3yp7f2qxcbcjv42nnmy5g4fy5fd"; + sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd"; }; }) diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 87ed6295977..4d67e8a5d6f 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -23,8 +23,10 @@ python2Packages.buildPythonApplication { azure-mgmt-resource azure-mgmt-storage adal - pysqlite # Go back to builtin sqlite once Python 2.7.13 is released + # Go back to sqlite once Python 2.7.13 is released + pysqlite datadog + digital-ocean ]; doCheck = false; diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index fb5791be239..820bcbb9a35 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -1,10 +1,9 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "2016-11-23"; + version = "1.5"; src = fetchurl { - # Hydra doesn't serve production outputs anymore :( - url = "https://static.domenkozar.com/nixops-1.5pre0_abcdef.tar.bz2"; - sha256 = "1a4cyd3zvkdjg9rf9ssr7p4i6r89zr483v5nlr5jzjdjjyi3j2bz"; + url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; + sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd"; }; }) diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index cfa9f69b386..914247dcd0b 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { - version = "1.4.23"; + version = "1.4.26"; name = "ccid-${version}"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/file/4169/ccid-1.4.23.tar.bz2"; - sha256 = "0s7c2g8idnnh19958aswaa2s51ncr2j7gqrkk5g95qpfnv7asdh8"; + url = "https://alioth.debian.org/frs/download.php/file/4205/ccid-1.4.26.tar.bz2"; + sha256 = "0bxy835c133ajalpj4gx60nqkjvpf9y1n97n04pw105pi9qbyrrj"; }; patchPhase = '' diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index 4981d8fa062..f8ef409813c 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -11,12 +11,14 @@ stdenv.mkDerivation rec { }; # TODO: replace wrapperDir below with from config.security.wrapperDir; - wrapperDir = "/var/setuid-wrappers"; + wrapperDir = "/run/wrappers/bin"; postPatch = '' FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)" for file in $FILES; do substituteInPlace "$file" \ + --replace /bin/mount ${utillinux}/bin/mount \ + --replace /bin/umount ${utillinux}/bin/umount \ --replace /sbin/mount.ecryptfs_private ${wrapperDir}/mount.ecryptfs_private \ --replace /sbin/umount.ecryptfs_private ${wrapperDir}/umount.ecryptfs_private \ --replace /sbin/mount.ecryptfs $out/sbin/mount.ecryptfs \ @@ -26,8 +28,6 @@ stdenv.mkDerivation rec { --replace /usr/bin/ecryptfs-setup-private $out/bin/ecryptfs-setup-private \ --replace /sbin/cryptsetup ${cryptsetup}/sbin/cryptsetup \ --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup \ - --replace /bin/mount ${utillinux}/bin/mount \ - --replace /bin/umount ${utillinux}/bin/umount \ --replace /sbin/unix_chkpwd ${wrapperDir}/unix_chkpwd \ --replace /bin/bash ${bash}/bin/bash done diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix index 0d4b37a8efc..05327ad3a09 100644 --- a/pkgs/tools/security/ecryptfs/helper.nix +++ b/pkgs/tools/security/ecryptfs/helper.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - # Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /var/setuid-wrappers + # Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /run/wrappers/bin installPhase = '' mkdir -p $out/bin $out/libexec cp $src $out/libexec/ecryptfs-helper.py diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 695bfcce3a5..e7a052c90f1 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,16 +1,15 @@ { stdenv, fetchFromGitHub, python, pythonPackages, gamin }: -let version = "0.9.4"; in +let version = "0.9.6"; in pythonPackages.buildPythonApplication { name = "fail2ban-${version}"; - namePrefix = ""; src = fetchFromGitHub { owner = "fail2ban"; repo = "fail2ban"; rev = version; - sha256 = "1m8gqj35kwrn30rqwd488sgakaisz22xa5v9llvz6gwf4f7ps0a9"; + sha256 = "1a75xjjqhn98zd9i51k15vjvcy0ql0gmcv9xf8pbd0bpvblgdah8"; }; propagatedBuildInputs = [ gamin ] diff --git a/pkgs/tools/security/fcrackzip/default.nix b/pkgs/tools/security/fcrackzip/default.nix new file mode 100644 index 00000000000..5d2e515c327 --- /dev/null +++ b/pkgs/tools/security/fcrackzip/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "fcrackzip-${version}"; + version = "1.0"; + src = fetchurl { + url = "http://oldhome.schmorp.de/marc/data/${name}.tar.gz"; + sha256 = "0l1qsk949vnz18k4vjf3ppq8p497966x4c7f2yx18x8pk35whn2a"; + }; + + # 'fcrackzip --use-unzip' cannot deal with file names containing a single quote + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=430387 + patches = [ ./fcrackzip_forkexec.patch ]; + + # Do not clash with unizp/zipinfo + postInstall = "mv $out/bin/zipinfo $out/bin/fcrackzip-zipinfo"; + + meta = with stdenv.lib; { + description = "zip password cracker, similar to fzc, zipcrack and others"; + homepage = http://oldhome.schmorp.de/marc/fcrackzip.html; + license = licenses.gpl2; + maintainers = with maintainers; [ nico202 ]; + platforms = with platforms; unix; + }; +} + diff --git a/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch b/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch new file mode 100644 index 00000000000..8e508ec1f59 --- /dev/null +++ b/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch @@ -0,0 +1,105 @@ +--- origin/main.c 2016-12-12 12:53:38.344285376 +0100 ++++ main.c 2016-12-12 13:01:41.134548824 +0100 +@@ -26,11 +26,13 @@ + #include + + #ifdef USE_UNIX_REDIRECTION +-#define DEVNULL ">/dev/null 2>&1" ++#define DEVNULL "/dev/null" + #else +-#define DEVNULL ">NUL 2>&1" ++#define DEVNULL "NUL" + #endif + ++#include ++ + #include "crack.h" + + int use_unzip; +@@ -47,21 +49,77 @@ + int REGPARAM + check_unzip (const char *pw) + { +- char buff[1024]; +- int status; ++pid_t cpid; ++cpid = fork (); ++if (cpid == -1) ++ { ++ perror ("fork"); ++ exit (EXIT_FAILURE); ++ } ++ ++if (cpid == 0) ++ { ++ // Redirect STDERR/STDOUT to /dev/null ++ int oldfd_stderr, oldfd_stdout; ++ oldfd_stdout = dup (fileno (stdout)); ++ if (oldfd_stdout == -1) ++ { ++ perror ("dup for stdout"); ++ _exit (127); ++ } ++ oldfd_stderr = dup (fileno (stderr)); ++ if (oldfd_stderr == -1) ++ { ++ perror ("dup for stderr"); ++ _exit (127); ++ } ++ if (freopen (DEVNULL, "w", stdout) == NULL) ++ { ++ perror ("freopen " DEVNULL " for stdout"); ++ _exit (127); ++ } ++ if (freopen (DEVNULL, "w", stderr) == NULL) ++ { ++ perror ("freopen " DEVNULL " for stderr"); ++ _exit (127); ++ } ++ execlp ("unzip", "unzip", "-qqtP", pw, file_path[0], NULL); ++ ++ // When execlp failed. ++ // Restores the stderr/stdout redirection to print an error. ++ int errno_saved = errno; ++ dup2 (oldfd_stderr, fileno (stderr)); ++ dup2 (oldfd_stdout, fileno (stdout)); ++ close (oldfd_stderr); ++ close (oldfd_stdout); ++ errno = errno_saved; ++ perror ("execlp for unzip"); ++ _exit (127); // Returns 127 on error as system(3) does ++ } + +- sprintf (buff, "unzip -qqtP \"%s\" %s " DEVNULL, pw, file_path[0]); +- status = system (buff); +- +-#undef REDIR ++ int status; + +- if (status == EXIT_SUCCESS) ++ if (waitpid (cpid, &status, 0) == -1) + { +- printf("\n\nPASSWORD FOUND!!!!: pw == %s\n", pw); ++ perror ("waitpid"); ++ exit (EXIT_FAILURE); ++ } ++ ++ // The child process does not terminated normally, OR returns the exit status 127. ++ if (!WIFEXITED (status) ++ || (WIFEXITED (status) && (WEXITSTATUS (status) == 127))) ++ { ++ fprintf (stderr, "Executing unzip failed.\n"); ++ exit (EXIT_FAILURE); ++ } ++// unzip exited normally with the exit status 0 then... ++ if (WIFEXITED (status) && (WEXITSTATUS (status) == EXIT_SUCCESS)) ++ { ++ printf ("\n\nPASSWORD FOUND!!!!: pw == %s\n", pw); + exit (EXIT_SUCCESS); + } + +- return !status; ++ return 0; + } + + /* misc. callbacks. */ diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index b96226d5c3f..e40d1f7bf01 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.1.17"; + version = "2.1.18"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1js308b46ifx1gim0c9nivr5yxhans7iq1yvkf7zl2928gdm9p65"; + sha256 = "157rrv3ly9j2k0acz43nhiba5hfl6h7048jvj55wwqjmgsmnyk6h"; }; buildInputs = [ diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index e7673cf5842..abdcd5d2d3e 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -2,16 +2,24 @@ buildGoPackage rec { name = "hologram-${version}"; - version = "20160209-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "8d86e3fdcbfd967ba58d8de02f5e8173c101212e"; - - goPackagePath = "github.com/AdRoll/hologram"; + version = "20170130-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "d20d1c30379e7010e8f9c428a5b9e82f54d390e1"; src = fetchgit { inherit rev; url = "https://github.com/AdRoll/hologram"; - sha256 = "0i0p170brdsczfz079mqbc5y7x7mdph04p3wgqsd7xcrddvlkkaf"; + sha256 = "0dg5kfs16kf2gzhpmzsg83qzi2pxgnc9g81lw5zpa6fmzpa9kgsn"; }; + goPackagePath = "github.com/AdRoll/hologram"; + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/AdRoll/hologram/; + description = "Easy, painless AWS credentials on developer laptops."; + maintainers = with maintainers; [ nand0p ]; + platforms = platforms.all; + license = licenses.asl20; + }; } diff --git a/pkgs/tools/security/hologram/deps.nix b/pkgs/tools/security/hologram/deps.nix index 2c4cdbe84f0..a9b66da2a9c 100644 --- a/pkgs/tools/security/hologram/deps.nix +++ b/pkgs/tools/security/hologram/deps.nix @@ -98,4 +98,13 @@ sha256 = "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz"; }; } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "3f8f870ec9939e32b3372abf74d24e468bcd285d"; + sha256 = "0a4hycs3d87s50z4prf5h6918r0fa2rvrrwlbffs430ilc4y8ghv"; + }; + } ] diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index a38e70df632..e502c296a50 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "kbfs-2016-11-18-git"; - version = "1.0.2"; + name = "kbfs-${version}"; + version = "20170209.d1db463"; goPackagePath = "github.com/keybase/kbfs"; subPackages = [ "kbfsfuse" ]; @@ -12,8 +12,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "keybase"; repo = "kbfs"; - rev = "aac615d7c50e7512a51a133c14cb699d9941ba8c"; - sha256 = "0vah6x37g2w1f7mb5x16f1815608mvv2d1mrpkpnhz2gz7qzz6bv"; + rev = "d1db46315d9271f21ca2700a84ca19767e638296"; + sha256 = "12i2m370r27mmn37s55krdkhr5k8kpl3x8y3gzg7w5zn2wiw8i1g"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix new file mode 100644 index 00000000000..b1d8181da65 --- /dev/null +++ b/pkgs/tools/security/keybase-gui/default.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups +, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2, nspr +, nss, pango, systemd, xorg, utillinuxMinimal }: + +let + libPath = stdenv.lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gcc.cc + gdk_pixbuf + glib + gnome2.GConf + gtk2 + nspr + nss + pango + systemd + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + ]; +in +stdenv.mkDerivation rec { + name = "keybase-gui-${version}"; + version = "1.0.18-20170209170023.17b641d"; + src = fetchurl { + url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; + sha256 = "01mr6hyzs208g3ankl4swikna66n85xzn7ig4k7p6hxmnnvplgb3"; + }; + phases = ["unpackPhase" "installPhase" "fixupPhase"]; + unpackPhase = '' + ar xf $src + tar xf data.tar.xz + ''; + installPhase = '' + mkdir -p $out/{bin,share} + mv opt/keybase $out/share/ + + cat > $out/bin/keybase-gui <&2 + exit 1 + } + + if [ ! -S "\$XDG_RUNTIME_DIR/keybase/keybased.sock" ]; then + echo "Keybase service doesn't seem to be running." >&2 + echo "You might need to run: keybase service" >&2 + checkFailed + fi + + ${utillinuxMinimal}/bin/mountpoint /keybase &>/dev/null + if [ "\$?" -ne "0" ]; then + echo "Keybase is not mounted to /keybase." >&2 + echo "You might need to run: kbfsfuse /keybase" >&2 + checkFailed + fi + + exec $out/share/keybase/Keybase "\$@" + EOF + chmod +x $out/bin/keybase-gui + ''; + postFixup = '' + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}:\$ORIGIN" "$out/share/keybase/Keybase" + ''; + + meta = with stdenv.lib; { + homepage = https://www.keybase.io/; + description = "The Keybase official GUI."; + platforms = platforms.linux; + maintainers = with maintainers; [ puffnfresh ]; + }; +} diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index fbed233b090..b962a6409b4 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,8 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "1.0.18"; - rev = "v${version}"; + version = "20170209.17b641d"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -13,8 +12,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "keybase"; repo = "client"; - inherit rev; - sha256 = "16n9fwx8v3jradp1l2564872akq6npib794jadfl5d122cll0n7h"; + rev = "17b641de629a85ad77621d0efa3e2442661b5ee7"; + sha256 = "0y6kiwj690yd0alvcyd74wx2wlbh110k1rdcvimszyb9gqig8p11"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 7b6720a2139..e4042239905 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -1,19 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, openssl, curl, libxml2, libxslt, asciidoc, docbook_xsl }: +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig +, openssl, curl, libxml2, libxslt, asciidoc, docbook_xsl }: stdenv.mkDerivation rec { name = "lastpass-cli-${version}"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "lastpass"; repo = "lastpass-cli"; rev = "v${version}"; - sha256 = "0hidx2qfr52bwjb6as4fbfa34jqh3zwvrcx590vbsji3bq4g7avb"; + sha256 = "1slqrv877c1bhivgd2i9cr1lsd72371dpz6a3h6s56l3qbyk28sa"; }; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - openssl curl libxml2 pkgconfig asciidoc docbook_xsl libxslt + openssl curl libxml2 asciidoc docbook_xsl libxslt ]; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix index 1a573048aa4..6a8f6d79fe1 100644 --- a/pkgs/tools/security/minisign/default.nix +++ b/pkgs/tools/security/minisign/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "minisign-${version}"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { repo = "minisign"; owner = "jedisct1"; rev = version; - sha256 = "1m71ngxaij3q1dw602kjgj22y5xfjlxrrkjdmx1v4p36y0n6wl92"; + sha256 = "15w8fgplkxiw9757qahwmgnl4bwx9mm0rnwp1izs2jcy1wy35vp8"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 9413f992086..aefa82128ac 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, libpcap, pkgconfig, openssl , graphicalSupport ? false -, gtk2 ? null , libX11 ? null +, gtk2 ? null , withPython ? false # required for the `ndiff` binary -, python2 ? null +, python2Packages ? null +, makeWrapper ? null }: -assert withPython -> python2 != null; +assert withPython -> python2Packages != null; with stdenv.lib; @@ -16,17 +17,13 @@ let # so automatically enable pythonSupport if graphicalSupport is requested. pythonSupport = withPython || graphicalSupport; - pythonEnv = python2.withPackages(ps: with ps; [] - ++ optionals graphicalSupport [ pycairo pygobject2 pygtk pysqlite ] - ); - in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "7.31"; + version = "7.40"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "0hiqb28950kn4bjsmw0ksfyss7j2qdmgrj3xsjf7073pq01lx7yb"; + sha256 = "121i9mgyc28ra2825akd0ix5qyssv4xc2qlx296mam6hzxgnc54y"; }; patches = ./zenmap.patch; @@ -36,10 +33,17 @@ in stdenv.mkDerivation rec { ++ optional (!graphicalSupport) "--without-zenmap" ; - buildInputs = [ libpcap pkgconfig openssl ] - ++ optional pythonSupport pythonEnv - ++ optionals graphicalSupport [ gtk2 libX11 ] - ; + postInstall = optionalString pythonSupport '' + wrapProgram $out/bin/ndiff --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" + '' + optionalString graphicalSupport '' + wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath $pygtk)/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath $pygobject)/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath $pycairo)/gtk-2.0 + ''; + + buildInputs = with python2Packages; [ libpcap pkgconfig openssl ] + ++ optionals pythonSupport [ makeWrapper python ] + ++ optionals graphicalSupport [ + libX11 gtk2 pygtk pysqlite pygobject2 pycairo + ]; meta = { description = "A free and open source utility for network discovery and security auditing"; diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index 2932143fa0e..585e089b8af 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus_libs, pcsclite , wget, coreutils -, perl, pcscperl, Glib, Gtk2, Pango +, perl, pcscperl, Glib, Gtk2, Pango, Cairo }: let deps = lib.makeBinPath [ wget coreutils ]; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/scriptor \ --set PERL5LIB "${lib.makePerlPath [ pcscperl ]}" wrapProgram $out/bin/gscriptor \ - --set PERL5LIB "${lib.makePerlPath [ pcscperl Glib Gtk2 Pango ]}" + --set PERL5LIB "${lib.makePerlPath [ pcscperl Glib Gtk2 Pango Cairo ]}" wrapProgram $out/bin/ATR_analysis \ --set PERL5LIB "${lib.makePerlPath [ pcscperl ]}" wrapProgram $out/bin/pcsc_scan \ diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 6b205d84534..90034b641a0 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -2,20 +2,18 @@ stdenv.mkDerivation rec { name = "sslscan-${version}"; - version = "1.11.7"; + version = "1.11.8"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = "${version}-rbsec"; - sha256 = "007lf3rxcn9nz6jrki3mavgd9sd2hmm9nzp2g13h0ri51yc3bkp0"; + sha256 = "0vm9r0hmpb6ifix2biqbr7za1rld9yx8hi8vf7j69vcm647z7aas"; }; buildInputs = [ openssl ]; - installFlags = [ - "PREFIX=$(out)" - ]; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Tests SSL/TLS services and discover supported cipher suites"; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index f2fede456d1..b8e0ebaa9bb 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, coreutils, pam, groff -, sendmailPath ? "/var/setuid-wrappers/sendmail" +, sendmailPath ? "/run/wrappers/bin/sendmail" , withInsults ? false }: stdenv.mkDerivation rec { - name = "sudo-1.8.19p1"; + name = "sudo-1.8.19p2"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "14pwdwl03kdbbyjkvxrfx409x3c1fjqz8aqz2wgwddinhz7v3bxq"; + sha256 = "1q2j3b1xqw66kdd5h8a6j62cz7xhk1qp1dx4rz59xm9agkk1hzi3"; }; configureFlags = [ diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix index 222b861f937..7ffec8c4c88 100644 --- a/pkgs/tools/security/tcpcrypt/default.nix +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "tcpcrypt-${version}"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { repo = "tcpcrypt"; owner = "scslab"; rev = "v${version}"; - sha256 = "04n1qpf4x8x289xa7jndmx99xp0lbxjzjw013kf64i1n70i9wbnp"; + sha256 = "0a015rlyvagz714pgwr85f8gjq1fkc0il7d7l39qcgxrsp15b96w"; }; postUnpack = ''mkdir -vp $sourceRoot/m4''; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index da52bde56bd..41cb399cb9f 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.2.8.12"; + name = "tor-0.2.9.9"; src = fetchurl { - url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "1bsagy4gcf6hgq04q949hv45ljb36j3ylxxn22cwxy4whgr4hmxk"; + url = "https://dist.torproject.org/${name}.tar.gz"; + sha256 = "0hqdk5p6dw4bpn7c8gmhyi8jjkhc37112pfw5nx4gl0g4lmmscik"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index f08d741f693..490864ee2d5 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -3,16 +3,19 @@ , atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib , gstreamer, gst_plugins_base, gst_plugins_good, gst_ffmpeg, gmp, ffmpeg , libpulseaudio +, mediaSupport ? false }: let - libPath = stdenv.lib.makeLibraryPath [ + libPath = stdenv.lib.makeLibraryPath ([ stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt + ] ++ stdenv.lib.optionals mediaSupport [ gstreamer gst_plugins_base gmp ffmpeg libpulseaudio - ] ; + ]); + # Ignored if !mediaSupport gstPlugins = [ gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg ]; gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x: @@ -21,13 +24,13 @@ in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "6.0.8"; + version = "6.5"; src = fetchurl { - url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; + url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; sha256 = if stdenv.is64bit then - "1s2yv72kj4zxba0850fi1jv41c69vcw3inhj9kqhy1d45ql7iw0w" else - "0zvqf444h35ikv1f3nwkh2jx51zj5k9w4zdxx32zcrnxpk5nhn97"; + "0q0rdwjiqjjh9awiyp0a55nkhyri5y6zhkyq3n3x6w4afihl0wf4" else + "1y1sx2gp7c66l7a4smfibl8mv54byvawhhkikpa5l2vic75vyhk9"; }; preferLocalBuild = true; @@ -77,7 +80,9 @@ stdenv.mkDerivation rec { fi export FONTCONFIG_PATH=\$HOME/Data/fontconfig export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor - export GST_PLUGIN_SYSTEM_PATH=${gstPluginsPath} + ${stdenv.lib.optionalString mediaSupport '' + export GST_PLUGIN_SYSTEM_PATH=${gstPluginsPath} + ''} exec $out/share/tor-browser/Browser/firefox --class "Tor Browser" -no-remote -profile ~/Data/Browser/profile.default "\$@" EOF chmod +x $out/bin/tor-browser diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 96bb4cd482e..0344fc0a74e 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -4,12 +4,12 @@ let vaultBashCompletions = fetchFromGitHub { owner = "iljaweis"; repo = "vault-bash-completion"; - rev = "62c142e20929f930c893ebe3366350d735e81fbd"; - sha256 = "0nfv10ykjq9751ijdyq728gjlgldm1lxvrar8kf6nz6rdfnnl2n5"; + rev = "e2f59b64be1fa5430fa05c91b6274284de4ea77c"; + sha256 = "10m75rp3hy71wlmnd88grmpjhqy0pwb9m8wm19l0f463xla54frd"; }; in buildGoPackage rec { name = "vault-${version}"; - version = "0.6.3"; + version = "0.6.5"; goPackagePath = "github.com/hashicorp/vault"; @@ -17,7 +17,7 @@ in buildGoPackage rec { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "0cbaws106v5dxqjii1s9rmk55pm6y34jls35iggpx0pp1dd433xy"; + sha256 = "0ci46zn9d9h26flgjf4inmvk4mb1hlixvx5g7vg02raw0cqvknnb"; }; buildFlagsArray = '' @@ -26,14 +26,15 @@ in buildGoPackage rec { ''; postInstall = '' - mkdir -p $bin/share/bash-completion/completions/ + mkdir -p $bin/share/bash-completion/completions/ cp ${vaultBashCompletions}/vault-bash-completion.sh $bin/share/bash-completion/completions/vault ''; meta = with stdenv.lib; { homepage = https://www.vaultproject.io; description = "A tool for managing secrets"; + platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem offline ]; + maintainers = with maintainers; [ rushmorem offline pradeepchhetri ]; }; } diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 6a5269c03dc..a3b3c1c0290 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoconf, automake, libtool, pcre +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pcre , withCrypto ? true, openssl , enableMagic ? true, file , enableCuckoo ? true, jansson }: stdenv.mkDerivation rec { - version = "3.4.0"; + version = "3.5.0"; name = "yara-${version}"; src = fetchFromGitHub { - owner = "plusvic"; + owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "1rv1xixbjqx1vkcij8r01rq08ncqgy6nn98xvkrpixwvi4fy956s"; + sha256 = "18hn6acfj0cha9cv70f6hyaqf8qbgj0c0dm9db4v2q8z7cgi1681"; }; # FIXME: this is probably not the right way to make it work @@ -34,10 +34,6 @@ stdenv.mkDerivation rec { EOF ''; patches = [ - (fetchurl { - url = "https://github.com/plusvic/yara/pull/261.diff"; - sha256 = "1fkxnk84ryvrjq7p225xvw9pn5gm2bjia2jz38fclwbsaxdi6p3b"; - }) "staticlibrary.patch" ]; diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index 9991adf4013..185645763fd 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, bison, flex, pam, sendmailPath ? "/var/setuid-wrappers/sendmail" }: +{ fetchurl, stdenv, bison, flex, pam, sendmailPath ? "/run/wrappers/bin/sendmail" }: stdenv.mkDerivation { name = "at-3.1.16"; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index fb2a66ecf37..7d649256f86 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -9,6 +9,7 @@ , libdbi ? null , libgcrypt ? null , libmemcached ? null, cyrus_sasl ? null +, libmicrohttpd ? null , libmodbus ? null , libnotify ? null, gdk_pixbuf ? null , liboping ? null @@ -34,24 +35,19 @@ , libmnl ? null }: stdenv.mkDerivation rec { - version = "5.6.0"; + version = "5.7.0"; name = "collectd-${version}"; src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; - sha256 = "08w6fjzczi2psk7va0xkjh9pigpar6sbjx2a6ayq4dmc3zcvpzzh"; + sha256 = "1cpjkv4d0iifngihxikzljavya0r2k3blarlahamgbdsqsymz815"; }; buildInputs = [ pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool - varnish yajl jdk libtool python udev net_snmp hiredis libmnl - ]; - - patches = [ - # Replace deprecated readdir_r() with readdir() to avoid a fatal warning. - ./readdir-fix.patch + varnish yajl jdk libtool python udev net_snmp hiredis libmnl libmicrohttpd ]; # for some reason libsigrok isn't auto-detected diff --git a/pkgs/tools/system/collectd/readdir-fix.patch b/pkgs/tools/system/collectd/readdir-fix.patch deleted file mode 100644 index 171dfc689a4..00000000000 --- a/pkgs/tools/system/collectd/readdir-fix.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Naur collectd-5.6.0/src/vserver.c collectd-5.6.0/src/vserver.c ---- collectd-5.6.0/src/vserver.c 2016-09-11 01:10:25.279038699 -0700 -+++ collectd-5.6.0/src/vserver.c 2016-09-25 07:44:40.771177458 -0700 -@@ -132,15 +132,8 @@ - - static int vserver_read (void) - { --#if NAME_MAX < 1024 --# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + 1024 + 1) --#else --# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + NAME_MAX + 1) --#endif -- - DIR *proc; - struct dirent *dent; /* 42 */ -- char dirent_buffer[DIRENT_BUFFER_SIZE]; - - errno = 0; - proc = opendir (PROCDIR); -@@ -165,19 +158,23 @@ - - int status; - -- status = readdir_r (proc, (struct dirent *) dirent_buffer, &dent); -- if (status != 0) -- { -- char errbuf[4096]; -- ERROR ("vserver plugin: readdir_r failed: %s", -- sstrerror (errno, errbuf, sizeof (errbuf))); -- closedir (proc); -- return (-1); -- } -- else if (dent == NULL) -+ errno = 0; -+ dent = readdir (proc); -+ if (dent == NULL) - { -- /* end of directory */ -- break; -+ if (errno != 0) -+ { -+ char errbuf[4096]; -+ ERROR ("vserver plugin: readdir failed: %s", -+ sstrerror (errno, errbuf, sizeof (errbuf))); -+ closedir (proc); -+ return (-1); -+ } -+ else -+ { -+ /* end of directory */ -+ break; -+ } - } - - if (dent->d_name[0] == '.') diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index 772c7e6d34b..dee99586c31 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "consul-template-${version}"; - version = "0.14.0"; + version = "0.18.1"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul-template"; @@ -11,6 +11,14 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "consul-template"; - sha256 = "15zsax44g3dwjmmm4fpb54mvsjvjf3b6g3ijskgipvhcy0d3j938"; + sha256 = "0swyhc5smjbp5wql43qhpxrcbg47v89l5icb1s60gszhxizlkk7d"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/hashicorp/consul-template/; + description = "Generic template rendering and notifications with Consul"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.mpl20; + maintainers = with maintainers; [ pradeepchhetri ]; }; } diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index 3d03f19cb6f..dec1bacd741 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { #define _PATH_SENDMAIL "${sendmailPath}" #undef _PATH_DEFPATH - #define _PATH_DEFPATH "/var/setuid-wrappers:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/run/current-system/sw/bin:/run/current-system/sw/sbin:/usr/bin:/bin" + #define _PATH_DEFPATH "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/run/current-system/sw/bin:/run/current-system/sw/sbin:/usr/bin:/bin" __EOT__ # Implicit saved uids do not work here due to way NixOS uses setuid wrappers diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 173c2623e18..3dcbf59d4d7 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lzip }: stdenv.mkDerivation rec { - name = "ddrescue-1.21"; + name = "ddrescue-1.22"; src = fetchurl { url = "mirror://gnu/ddrescue/${name}.tar.lz"; - sha256 = "1b71hb42lh33y9843nd1mxlwkk9qh9ajvnz6ivzd1jq9lav4x7ph"; + sha256 = "19qhx9ggkkjl0g3a88g501wmybkj1y4n5lm5kp0km0blh0p7p189"; }; nativeBuildInputs = [ lzip ]; diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix new file mode 100644 index 00000000000..fcc3f217d64 --- /dev/null +++ b/pkgs/tools/system/envconsul/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "envconsul-${version}"; + version = "0.6.2"; + rev = "v${version}"; + + goPackagePath = "github.com/hashicorp/envconsul"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "envconsul"; + sha256 = "176jbicyg7vwd0kgawz859gq7ldrxyw1gx55wig7azakiidkl731"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/hashicorp/envconsul/; + description = "Read and set environmental variables for processes from Consul"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.mpl20; + maintainers = with maintainers; [ pradeepchhetri ]; + }; +} diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 677981b97ca..9f97a403159 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,9 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.5.1"; + version = "3.6.0"; + src = fetchFromGitHub { - sha256 = "1rhfww0knjh6bj3b0ykxgfgw6rg2bzibkdrisq3nhl3djfq7r1a8"; + sha256 = "1fwvjd84nw39lgclkz4kn90z84fs9lsama3ikq0qs1in3y3jfmvi"; rev = version; repo = "facter"; owner = "puppetlabs"; @@ -24,5 +25,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.womfoo ]; platforms = platforms.linux; }; - } diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/tools/system/fakechroot/default.nix index 5827a11714d..be3a32de251 100644 --- a/pkgs/tools/system/fakechroot/default.nix +++ b/pkgs/tools/system/fakechroot/default.nix @@ -1,14 +1,19 @@ -{stdenv, fetchurl}: +{ stdenv, fetchFromGitHub, autoreconfHook, perl }: stdenv.mkDerivation rec { name = "fakechroot-${version}"; - version = "2.17.2"; + version = "2.19"; - src = fetchurl { - url = "https://github.com/dex4er/fakechroot/archive/${version}.tar.gz"; - sha256 = "0z4cxj4lb8cfb63sw82dbc31hf082fv3hshbmhk49cqkc0f673q3"; + # TODO: move back to mainline once https://github.com/dex4er/fakechroot/pull/46 is merged + src = fetchFromGitHub { + owner = "copumpkin"; + repo = "fakechroot"; + rev = "dcc0cfe3941e328538f9e62b2c0b15430d393ec1"; + sha256 = "1ls3y97qqfcfd3z0balz94xq1gskfk04pg85x6b7wjw8dm4030qd"; }; + buildInputs = [ autoreconfHook perl ]; + meta = with stdenv.lib; { homepage = https://github.com/dex4er/fakechroot; description = "Give a fake chroot environment through LD_PRELOAD"; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 2c051bb5e78..0398ffc180a 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, libaio, python, zlib }: let - version = "2.12"; - sha256 = "1m0fx0x1v2375vyxhd2i12b9w1qy4yh75f6qhwlcr78himcsmpp9"; + version = "2.17"; + sha256 = "17fygcy3flsp64mfmwpc66byy95cidby34s6grm3zgsjb7mcypr0"; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix new file mode 100644 index 00000000000..11236b7a9d1 --- /dev/null +++ b/pkgs/tools/system/hardinfo/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, which, pkgconfig, gtk2, pcre, glib, libxml2 +, libsoup ? null +}: + +stdenv.mkDerivation rec { + name = "hardinfo-${version}"; + version = "0.5.1"; + + src = fetchurl { + url = "mirror://sourceforge/project/hardinfo.berlios/hardinfo-${version}.tar.bz2"; + sha256 = "0yhvfc5icam3i4mphlz0m9d9d2irjw8mbsxq203x59wjgh6nrpx0"; + }; + + # Not adding 'hostname' command, the build shouldn't depend on what the build + # host is called. + buildInputs = [ which pkgconfig gtk2 pcre glib libxml2 libsoup ]; + + # Fixes '#error You must compile this program without "-O"' + hardeningDisable = [ "all" ]; + + preConfigure = '' + patchShebangs configure + + # -std=gnu89 fixes build error, copied from + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757525 + sed -i -e "s/^CFLAGS = \(.*\)/CFLAGS = \1 -std=gnu89/" Makefile.in + + substituteInPlace ./arch/linux/common/modules.h --replace /sbin/modinfo modinfo + ''; + + # Makefile supports DESTDIR but not PREFIX (it hardcodes $DESTDIR/usr/). + installFlags = [ "DESTDIR=$(out)" ]; + postInstall = '' + mv "$out/usr/"* "$out" + rmdir "$out/usr" + ''; + + meta = with stdenv.lib; { + homepage = http://hardinfo.org/; + description = "Display information about your hardware and operating system"; + license = licenses.gpl2; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix new file mode 100644 index 00000000000..4cdfeec12b7 --- /dev/null +++ b/pkgs/tools/system/illum/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchgit, pkgconfig, ninja, libevdev, libev }: + +stdenv.mkDerivation rec { + version = "0.4"; + name = "illum-${version}"; + + src = fetchgit { + url = "https://github.com/jmesmon/illum.git"; + fetchSubmodules = true; + rev = "48ce8631346b1c88a901a8e4fa5fa7e8ffe8e418"; + sha256 = "05v3hz7n6b1mlhc6zqijblh1vpl0ja1y8y0lafw7mjdz03wxhfdb"; + }; + + buildInputs = [ pkgconfig ninja libevdev libev ]; + + configurePhase = '' + bash ./configure + ''; + + buildPhase = '' + ninja + ''; + + installPhase = '' + mkdir -p $out/bin + mv illum-d $out/bin + ''; + + meta = { + homepage = https://github.com/jmesmon/illum; + description = "Daemon that wires button presses to screen backlight level"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.dancek ]; + license = stdenv.lib.licenses.agpl3; + }; +} diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 16bb0589841..dcbea515677 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -2,14 +2,14 @@ let pkgname = "ipmitool"; - version = "1.8.15"; + version = "1.8.17"; in stdenv.mkDerivation { name = "${pkgname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pkgname}/${pkgname}-${version}.tar.gz"; - sha256 = "0y6g8xg9p854n7xm3kds8m3d53jrsllnknp8lcr3jscf99j4x5ph"; + sha256 = "0qcrz1d1dbjg46n3fj6viglzcxlf2q15xa7bx9w1hm2hq1r3jzbi"; }; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix new file mode 100644 index 00000000000..5a66fcf5299 --- /dev/null +++ b/pkgs/tools/system/journalbeat/default.nix @@ -0,0 +1,34 @@ +{ lib, pkgs, buildGoPackage, fetchFromGitHub, makeWrapper }: + +let + + libPath = lib.makeLibraryPath [ pkgs.systemd.lib ]; + +in buildGoPackage rec { + + name = "journalbeat-${version}"; + version = "5.1.2"; + + goPackagePath = "github.com/mheese/journalbeat"; + + buildInputs = [ makeWrapper pkgs.systemd ]; + + postInstall = '' + wrapProgram $bin/bin/journalbeat \ + --prefix LD_LIBRARY_PATH : ${libPath} + ''; + + src = fetchFromGitHub { + owner = "mheese"; + repo = "journalbeat"; + rev = "v${version}"; + sha256 = "179jayzvd5k4mwhn73yflbzl5md1fmv7a9hb8vz2ir76lvr33g3l"; + }; + + meta = with lib; { + homepage = https://github.com/mheese/journalbeat; + description = "Journalbeat is a log shipper from systemd/journald to Logstash/Elasticsearch"; + license = licenses.asl20; + maintainers = with maintainers; [ mbrgm ]; + }; +} diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 47233532df3..36b84c21154 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "0.2"; + version = "0.3.2"; in stdenv.mkDerivation { name = "lr-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "chneukirchen"; repo = "lr"; rev = "v${version}"; - sha256 = "1wn1j0cf84r4nli92myf3waackh2p6r2hkavgx6533x15kdyfnf7"; + sha256 = "1bbgzshayk0kzmlyw44jqskgmxz5c4jh2h0bqg3n5zi89588ng2k"; }; makeFlags = "PREFIX=$(out)"; @@ -21,6 +21,6 @@ stdenv.mkDerivation { description = "List files recursively"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; - maintainers = [stdenv.lib.maintainers.globin]; + maintainers = [ stdenv.lib.maintainers.globin ]; }; } diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 46932076177..df04ef48730 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig, libuuid }: stdenv.mkDerivation rec{ - version = "1.4.0"; + version = "1.5.0"; name = "netdata-${version}"; src = fetchFromGitHub { rev = "v${version}"; owner = "firehol"; repo = "netdata"; - sha256 = "1wknxci2baj6f7rl8z8j7haaz122jmbb74aw7i3xbj2y61cs58n8"; + sha256 = "1nsv0s11ai1kvig9xr4cz2f2lalvilpbfjpd8fdfqk9fak690zhz"; }; buildInputs = [ autoreconfHook zlib pkgconfig libuuid ]; diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index cc30cd7a488..1a9e2d3b5b9 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,30 +1,18 @@ -{ stdenv, fetchurl -, IOKit ? null }: +{ stdenv, fetchurl, +IOKit ? null , ApplicationServices ? null }: -let - version = "6.4"; - drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB"; - dbrev = "4167"; - driverdb = fetchurl { - url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; - sha256 = "14rv1cxbpmnq12hjwr3icjiahx5i0ak7j69310c09rah0241l5j1"; - name = "smartmontools-drivedb.h"; - }; -in stdenv.mkDerivation rec { + version = "6.5"; name = "smartmontools-${version}"; src = fetchurl { url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; - sha256 = "11bsxcghh7adzdklcslamlynydxb708vfz892d5w7agdq405ddza"; + sha256 = "1g25r6sx85b5lay5n6sbnqv05qxzj6xsafsp93hnrg1h044bps49"; }; - buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; + buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]; - patchPhase = '' - cp ${driverdb} drivedb.h - sed -i -e 's@which which >/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in - ''; + patches = [ ./smartmontools.patch ]; meta = with stdenv.lib; { description = "Tools for monitoring the health of hard drives"; diff --git a/pkgs/tools/system/smartmontools/smartmontools.patch b/pkgs/tools/system/smartmontools/smartmontools.patch new file mode 100644 index 00000000000..144b2be2d33 --- /dev/null +++ b/pkgs/tools/system/smartmontools/smartmontools.patch @@ -0,0 +1,26 @@ +diff --git a/../smartmontools-6.5/configure b/./configure +index acb028a..5e2c7a1 100755 +--- a/../smartmontools-6.5/configure ++++ b/./configure +@@ -6703,7 +6703,7 @@ fi + ;; + *-*-darwin*) + os_deps='os_darwin.o' +- os_libs='-framework CoreFoundation -framework IOKit' ++ os_libs='-framework ApplicationServices -framework IOKit' + os_darwin=yes + os_man_filter=Darwin + ;; +diff --git a/../smartmontools-6.5/configure.ac b/./configure.ac +index 6bd61d7..32ff50c 100644 +--- a/../smartmontools-6.5/configure.ac ++++ b/./configure.ac +@@ -508,7 +508,7 @@ case "${host}" in + ;; + *-*-darwin*) + os_deps='os_darwin.o' +- os_libs='-framework CoreFoundation -framework IOKit' ++ os_libs='-framework ApplicationServices -framework IOKit' + os_darwin=yes + os_man_filter=Darwin + ;; diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 004b2b58fa3..b72673167bc 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, syslogng -, eventlog, perl, python, yacc, riemann_c_client, libivykis, protobufc +, eventlog, perl, python, yacc, protobufc, libivykis }: stdenv.mkDerivation rec { name = "syslog-ng-incubator-${version}"; - version = "141106-54179c5"; + version = "0.5.0"; src = fetchFromGitHub { owner = "balabit"; repo = "syslog-ng-incubator"; - rev = "54179c5f733487fe97ee856bc27130d0b09f3d5a"; - sha256 = "1y099f7pdan1441ycycd67igcwbla2m2cgnxjfvdw76llvi35sam"; + rev = name; + sha256 = "00j123ya0xfj1jicaqnk1liffx07mhhf0r406pabxjjj97gy8nlk"; }; + nativeBuildInputs = [ pkgconfig autoreconfHook yacc ]; + buildInputs = [ - autoreconfHook pkgconfig glib syslogng eventlog perl python - yacc riemann_c_client libivykis protobufc + glib syslogng eventlog perl python protobufc libivykis ]; configureFlags = [ - "--without-ivykis" "--with-module-dir=$(out)/lib/syslog-ng" ]; @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.rickynils ]; platforms = platforms.linux; + broken = true; # does not work with our new syslog-ng version yet }; } diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 7c7d5df4df8..4e1fb671957 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,29 +1,62 @@ -{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl -, riemann_c_client, protobufc, pcre, yacc }: +{ stdenv, fetchurl, openssl, libcap, curl, which +, eventlog, pkgconfig, glib, python, systemd, perl +, riemann_c_client, protobufc, pcre, libnet +, json_c, libuuid, libivykis, mongoc, rabbitmq-c }: + +let + pname = "syslog-ng"; +in stdenv.mkDerivation rec { - name = "syslog-ng-${version}"; - - version = "3.6.2"; + name = "${pname}-${version}"; + version = "3.9.1"; src = fetchurl { - url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz"; - sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg"; + url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; + sha256 = "05qaqw115py5iz55vmc0j1xcwcpr8wa9vpmbixhr1rqaamm8ay2n"; }; - buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc pcre ]; + nativeBuildInputs = [ pkgconfig which ]; + + buildInputs = [ + libcap + curl + openssl + eventlog + glib + perl + python + systemd + riemann_c_client + protobufc + pcre + libnet + json_c + libuuid + libivykis + mongoc + rabbitmq-c + ]; configureFlags = [ + "--enable-manpages" "--enable-dynamic-linking" "--enable-systemd" + "--with-ivykis=system" + "--with-librabbitmq-client=system" + "--with-mongoc=system" + "--with-jsonc=system" + "--with-systemd-journal=system" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; + outputs = [ "out" "man" ]; + meta = with stdenv.lib; { homepage = "http://www.balabit.com/network-security/syslog-ng/"; description = "Next-generation syslogd with advanced networking and filtering capabilities"; license = licenses.gpl2; - maintainers = [ maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils fpletz ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index d5936b00806..ddd6740c983 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; preConfigure = '' - export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" - ./autogen.sh #--prefix="$out" - ''; + export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" + ./autogen.sh + ''; configureFlags = [ "--sysconfdir=$(out)/etc" "--localstatedir=/var" @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - preInstall = "sysconfdir=$out/etc"; - meta = with stdenv.lib; { description = "Thermal Daemon"; homepage = "https://01.org/linux-thermal-daemon"; diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index cad1230ac87..97b35378673 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, -sendmailPath ? "/var/setuid-wrappers/sendmail" }: +sendmailPath ? "/run/wrappers/bin/sendmail" }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/text/copyright-update/default.nix b/pkgs/tools/text/copyright-update/default.nix new file mode 100644 index 00000000000..604097fbe77 --- /dev/null +++ b/pkgs/tools/text/copyright-update/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, perl }: + +stdenv.mkDerivation rec { + name = "copyright-update-${version}"; + version = "2016.1018"; + + src = fetchFromGitHub { + name = "${name}-src"; + owner = "jaalto"; + repo = "project--copyright-update"; + rev = "release/${version}"; + sha256 = "1kj6jlgyxrgvrpv7fcgbibfqqa83xljp17v6sas42dlb105h6sgd"; + }; + + buildInputs = [ perl ]; + + installFlags = [ "INSTALL=install" "prefix=$(out)" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/jaalto/project--copyright-update; + description = "Updates the copyright information in a set of files"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; +} diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index b9dca2e8709..b33ea716978 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pcre, libiconv, perl }: -let version = "2.27"; in +let version = "3.0"; in stdenv.mkDerivation { name = "gnugrep-${version}"; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; - sha256 = "1syadppgpxpfhpwhhqcsibrn131azypzps5aicx1qjh74d6w8k5d"; + sha256 = "1dcasjp3a578nrvzrcn38mpizb8w1q6mvfzhjmcqqgkf0nsivj72"; }; # Perl is needed for testing diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index ca038b3ccb4..72d632533ff 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnused-${version}"; - version = "4.3"; + version = "4.4"; src = fetchurl { url = "mirror://gnu/sed/sed-${version}.tar.xz"; - sha256 = "1anhdgah8h423hlmn9hwzxzr7hjbqjm6hxq3z1p7p7nf8640vhj7"; + sha256 = "0fv88bcnraixc8jvpacvxshi30p5x9m7yb8ns1hfv07hmb2ypmnb"; }; outputs = [ "out" "info" ]; diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index c0db454ed29..1a264885b48 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, cmake, libxslt }: +{ stdenv, fetchFromGitHub, cmake, libxslt }: -let - version = "5.0.0"; -in stdenv.mkDerivation rec { name = "html-tidy-${version}"; + version = "5.2.0"; - src = fetchurl { - url = "https://github.com/htacg/tidy-html5/archive/${version}.tar.gz"; - sha256 = "1qz7hgk482496agngp9grz4jqkyxrp29r2ywbccc9i5198yspca4"; + src = fetchFromGitHub { + owner = "htacg"; + repo = "tidy-html5"; + rev = version; + sha256 = "1yxp3kjsxd5zwwn4r5rpyq5ndyylbcnb9pisdyf7dxjqd47z64bc"; }; nativeBuildInputs = [ cmake libxslt/*manpage*/ ]; diff --git a/pkgs/tools/text/kdiff3/kde5.nix b/pkgs/tools/text/kdiff3/kde5.nix new file mode 100644 index 00000000000..f1ae958ed63 --- /dev/null +++ b/pkgs/tools/text/kdiff3/kde5.nix @@ -0,0 +1,37 @@ +{ + kdeDerivation, kdeWrapper, lib, fetchgit, + ecm, kdoctools, kconfig, kinit, kparts +}: + +let + rev = "468652ce70b1214842cef0a021c81d056ec6aa01"; + + unwrapped = kdeDerivation rec { + name = "kdiff3-${version}"; + version = "1.7.0-${lib.strings.substring 0 7 rev}"; + + src = fetchgit { + url = "https://gitlab.com/tfischer/kdiff3"; + sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m"; + inherit rev; + }; + + preConfigure = "cd kdiff3"; + + nativeBuildInputs = [ ecm kdoctools ]; + + propagatedBuildInputs = [ kconfig kinit kparts ]; + + meta = with lib; { + homepage = http://kdiff3.sourceforge.net/; + license = licenses.gpl2Plus; + description = "Compares and merges 2 or 3 files or directories"; + maintainers = with maintainers; [ viric urkud peterhoeg ]; + platforms = with platforms; linux; + }; + }; + +in kdeWrapper { + inherit unwrapped; + targets = [ "bin/kdiff3" ]; +} diff --git a/pkgs/tools/text/nkf/default.nix b/pkgs/tools/text/nkf/default.nix index 31d58fbccc3..eadb107d827 100644 --- a/pkgs/tools/text/nkf/default.nix +++ b/pkgs/tools/text/nkf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nkf-${version}"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "mirror://sourceforgejp/nkf/59912/${name}.tar.gz"; - sha256 = "8cb430ae69a1ad58b522eb4927b337b5b420bbaeb69df255919019dc64b72fc2"; + url = "mirror://sourceforgejp/nkf/64158/${name}.tar.gz"; + sha256 = "b4175070825deb3e98577186502a8408c05921b0c8ff52e772219f9d2ece89cb"; }; makeFlags = "prefix=\${out}"; diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index 0e2cac36f76..7fc84e6ec74 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, cmake, python }: stdenv.mkDerivation { - name = "opencc-1.0.4"; + name = "opencc-1.0.5"; src = fetchurl { - url = "https://github.com/BYVoid/OpenCC/archive/ver.1.0.4.tar.gz"; - sha256 = "0553b7461ebd379d118d45d7f40f8a6e272750115bdbc49267595a05ee3481ac"; + url = "https://github.com/BYVoid/OpenCC/archive/ver.1.0.5.tar.gz"; + sha256 = "1ce1649ba280cfc88bb76e740be5f54b29a9c034400c97a3ae211c37d7030705"; }; buildInputs = [ cmake python ]; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 8d7ffd3e477..7ba43e38f38 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "ripgrep-${version}"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; rev = "${version}"; - sha256 = "15j68bkkxpbh9c05f8l7j0y33da01y28kpg781lc0234h45535f3"; + sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj"; }; - depsSha256 = "142h6pcf2mr4i7dg7di4299c18aqn0yvk9nr1mxnkb7wjcmrvcfg"; + depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx"; meta = with stdenv.lib; { description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index ffbf9784f80..e87a8bc0275 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgs, gcc, gzip, gnum4 }: +{ stdenv, fetchurl, pkgs, gnum4 }: -stdenv.mkDerivation (rec { - name = "jade"; +stdenv.mkDerivation rec { + name = "jade-${version}-${debpatch}"; version = "1.2.1"; debpatch = "47.3"; src = fetchurl { - url = "ftp://ftp.jclark.com/pub/${name}/${name}-${version}.tar.gz"; + url = "ftp://ftp.jclark.com/pub/jade/jade-${version}.tar.gz"; sha256 = "84e2f8a2a87aab44f86a46b71405d4f919b219e4c73e03a83ab6c746a674b187"; }; @@ -17,14 +17,14 @@ stdenv.mkDerivation (rec { patches = [ patchsrc ]; - buildInputs = [ gcc gzip gnum4 ]; + buildInputs = [ gnum4 ]; NIX_CFLAGS_COMPILE = [ "-Wno-deprecated" ]; preInstall = '' install -d -m755 "$out"/lib ''; - + postInstall = '' mv "$out/bin/sx" "$out/bin/sgml2xml" ''; @@ -33,6 +33,7 @@ stdenv.mkDerivation (rec { description = "James Clark's DSSSL Engine"; license = "custom"; homepage = http://www.jclark.com/jade/; + platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ e-user ]; }; -}) +} diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix index 7d7cd3c49d9..b35053d362b 100644 --- a/pkgs/tools/text/xml/xpf/default.nix +++ b/pkgs/tools/text/xml/xpf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python, libxml2}: +{stdenv, fetchurl, python2, libxml2}: assert libxml2.pythonSupport == true; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz"; }; - buildInputs = [python libxml2]; + buildInputs = [ python2 libxml2 ]; meta = { description = "XML Pipes and Filters - command line tools for manipulating and querying XML data"; diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile b/pkgs/tools/typesetting/asciidoctor/Gemfile index d382e6397e1..92abd4f5cf2 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile @@ -4,3 +4,4 @@ gem 'asciidoctor-diagram' gem 'asciidoctor-bespoke' gem 'asciidoctor-pdf' gem 'asciidoctor-latex' +gem 'pygments.rb' diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 0212db3816a..34ed4a975a1 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -2,14 +2,15 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.0.2) - addressable (2.4.0) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) afm (0.2.2) asciidoctor (1.5.5) asciidoctor-bespoke (1.0.0.alpha.1) asciidoctor (>= 1.5.0) slim (~> 3.0.6) thread_safe (~> 0.3.5) - asciidoctor-diagram (1.5.2) + asciidoctor-diagram (1.5.4) asciidoctor (~> 1.5.0) asciidoctor-latex (1.5.0.17.dev) asciidoctor (~> 1.5, >= 1.5.2) @@ -25,17 +26,18 @@ GEM safe_yaml (~> 1.0.4) thread_safe (~> 0.3.5) treetop (= 1.5.3) - concurrent-ruby (1.0.2) - css_parser (1.4.6) + concurrent-ruby (1.0.4) + css_parser (1.4.8) addressable hashery (2.1.2) htmlentities (4.3.4) - json (2.0.2) + json (2.0.3) + multi_json (1.12.1) opal (0.6.3) source_map sprockets pdf-core (0.6.1) - pdf-reader (1.4.0) + pdf-reader (1.4.1) Ascii85 (~> 1.0.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -55,6 +57,9 @@ GEM prawn-templates (0.0.3) pdf-reader (~> 1.3) prawn (>= 0.15.0) + public_suffix (2.0.5) + pygments.rb (1.1.1) + multi_json (>= 1.0.0) rack (2.0.1) ruby-rc4 (0.1.5) safe_yaml (1.0.4) @@ -63,12 +68,12 @@ GEM tilt (>= 1.3.3, < 2.1) source_map (3.0.1) json - sprockets (3.7.0) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) temple (0.7.7) thread_safe (0.3.5) - tilt (2.0.5) + tilt (2.0.6) treetop (1.5.3) polyglot (~> 0.3) ttfunk (1.4.0) @@ -82,6 +87,7 @@ DEPENDENCIES asciidoctor-diagram asciidoctor-latex asciidoctor-pdf + pygments.rb BUNDLED WITH 1.13.6 diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix index 4c26c6a434a..c436d6f9751 100644 --- a/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -2,10 +2,10 @@ addressable = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs"; + sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; afm = { source = { @@ -42,10 +42,10 @@ asciidoctor-diagram = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1di271v0ic6d5xkqbbwg6scjyj1ypklgy211gdmhf18xzpka3fvi"; + sha256 = "06kqlij2yc84zqxmb39bqi9pihapgac7gxyzrwm4kxfnmfdqmxrk"; type = "gem"; }; - version = "1.5.2"; + version = "1.5.4"; }; asciidoctor-latex = { source = { @@ -66,18 +66,18 @@ concurrent-ruby = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1kb4sav7yli12pjr8lscv8z49g52a5xzpfg3z9h8clzw6z74qjsw"; + sha256 = "0p7ji1h1l407kci9w4b4yspzd58ssmlx7p91npx55kw08836dlpb"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.4"; }; css_parser = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0zsldn0ihmzl7nqk4lww9h8ijv1zb3l8g92y7b4w0da2d6cnyjw8"; + sha256 = "1aqv5ds1109s0g76ybvvaff41a71i03fjy0ix6272r8n0gdnjc3f"; type = "gem"; }; - version = "1.4.6"; + version = "1.4.8"; }; hashery = { source = { @@ -98,10 +98,18 @@ json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1lhinj9vj7mw59jqid0bjn2hlfcnq02bnvsx9iv81nl2han603s0"; + sha256 = "0cpw154il64w6q20rrnsbjx1cdfz1yrzz1lgdbpn59lcwc6mprql"; type = "gem"; }; - version = "2.0.2"; + version = "2.0.3"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + type = "gem"; + }; + version = "1.12.1"; }; opal = { source = { @@ -122,10 +130,10 @@ pdf-reader = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0j9cimzw2waic800108qmnds7w33xd9y3bdvf9qzijwv9wjv0iq1"; + sha256 = "0ivmgm73jjk3hv7896mgld5ki8jhxdvksw766rqxp6i863y9v4jq"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; polyglot = { source = { @@ -175,6 +183,22 @@ }; version = "0.0.3"; }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + type = "gem"; + }; + version = "2.0.5"; + }; + "pygments.rb" = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g0ipgxqfw0vf2md3s8sqf8y7m5lxqza2gwnr05z3vrf1nc6v6hk"; + type = "gem"; + }; + version = "1.1.1"; + }; rack = { source = { remotes = ["https://rubygems.org"]; @@ -218,10 +242,10 @@ sprockets = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jzsfiladswnzbrwqfiaj1xip68y58rwx0lpmj907vvq47k87gj1"; + sha256 = "0sv3zk5hwxyjvg7iy9sggjc7k3mfxxif7w8p260rharfyib939ar"; type = "gem"; }; - version = "3.7.0"; + version = "3.7.1"; }; temple = { source = { @@ -242,10 +266,10 @@ tilt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0lgk8bfx24959yq1cn55php3321wddw947mgj07bxfnwyipy9hqf"; + sha256 = "0qsyzq2k7blyp1rph56xczwfqi8gplns2whswyr67mdfzdi60vvm"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; treetop = { source = { diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/tools/typesetting/git-latexdiff/default.nix index 9dc73886b5a..61c05666726 100644 --- a/pkgs/tools/typesetting/git-latexdiff/default.nix +++ b/pkgs/tools/typesetting/git-latexdiff/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "View diff on LaTeX source files on the generated PDF files"; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; license = licenses.free; # https://gitlab.com/git-latexdiff/git-latexdiff/issues/9 platforms = platforms.unix; }; diff --git a/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch b/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch new file mode 100644 index 00000000000..8e1d9dfc191 --- /dev/null +++ b/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3fdabb0..378621a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,6 +59,12 @@ include_directories(${FONTFORGE_INCLUDE_DIRS}) + link_directories(${FONTFORGE_LIBRARY_DIRS}) + set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${FONTFORGE_LIBRARIES}) + ++# add glib dependency ++pkg_check_modules(GLIB REQUIRED glib-2.0) ++include_directories(${GLIB_INCLUDE_DIRS}) ++link_directories(${GLIB_INCLUDE_DIRS}) ++set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${GLIB_LIBRARIES}) ++ + # debug build flags (overwrite default cmake debug flags) + set(CMAKE_C_FLAGS_DEBUG "-ggdb -pg") + set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -pg") diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix new file mode 100644 index 00000000000..b214e986be9 --- /dev/null +++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, poppler, xlibs, pcre, python, glib, fontforge-gtk, cairo, pango, openjdk8 +}: + +stdenv.mkDerivation rec { + name = "pdf2htmlEX-0.14.6"; + + src = fetchFromGitHub { + repo = "pdf2htmlEX"; + owner = "coolwanglu"; + rev = "v0.14.6"; + sha256 = "1nh0ab8f11fsyi4ldknlkmdzcfvm1dfh8b9bmprjgq6q0vjj7f78"; + }; + + patches = [ ./add-glib-cmake.patch ]; + + cmakeFlags = [ "-DENABLE_SVG=ON" ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + cmake + pkgconfig + ]; + + buildInputs = [ + xlibs.libpthreadstubs + xlibs.libXdmcp + pcre + python + glib + cairo + pango + (poppler.override { withData = true; }) + fontforge-gtk + openjdk8 + ]; + + meta = with stdenv.lib; { + description = "Render PDF files to beautiful HTML"; + homepage = "https://github.com/coolwanglu/pdf2htmlEX"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.taktoa ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix new file mode 100644 index 00000000000..382219a0a3a --- /dev/null +++ b/pkgs/tools/typesetting/sile/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, makeWrapper, pkgconfig +, harfbuzz, icu, lpeg, luaexpat, luazlib, luafilesystem +, fontconfig, lua, libiconv +}: + +with stdenv.lib; + +let + + libs = [lpeg luaexpat luazlib luafilesystem]; + getPath = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}"; + getLuaPath = lib : getPath lib "lua"; + getLuaCPath = lib : getPath lib "so"; + luaPath = concatStringsSep ";" (map getLuaPath libs); + luaCPath = concatStringsSep ";" (map getLuaCPath libs); + +in + +stdenv.mkDerivation rec { + name = "sile-${version}"; + version = "0.9.4"; + + src = fetchurl { + url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2"; + sha256 = "1mald727hy9bi17rcaph8q400yn5xqkn5f2xf1408g94wmwncs8w"; + }; + + nativeBuildInputs = [pkgconfig makeWrapper]; + buildInputs = [ harfbuzz icu lua lpeg luaexpat luazlib luafilesystem fontconfig libiconv ]; + + LUA_PATH = luaPath; + LUA_CPATH = luaCPath; + + postInstall = '' + wrapProgram $out/bin/sile \ + --set LUA_PATH "${luaPath};" \ + --set LUA_CPATH "${luaCPath};" \ + ''; + + meta = { + description = "A typesetting system"; + longDescription = '' + SILE is a typesetting system; its job is to produce beautiful + printed documents. Conceptually, SILE is similar to TeX—from + which it borrows some concepts and even syntax and + algorithms—but the similarities end there. Rather than being a + derivative of the TeX family SILE is a new typesetting and + layout engine written from the ground up using modern + technologies and borrowing some ideas from graphical systems + such as InDesign. + ''; + homepage = "http://www.sile-typesetter.org"; + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index c3d226a2acb..83bead83ea3 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { name = "tetex-3.0"; src = fetchurl { - url = ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-3.0.tar.gz; - md5 = "944a4641e79e61043fdaf8f38ecbb4b3"; + url = http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-src-3.0.tar.gz; + sha256 = "16v44465ipd9yyqri9rgxp6rbgs194k4sh1kckvccvdsnnp7w3ww"; }; texmf = fetchurl { - url = ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-texmf-3.0.tar.gz; - md5 = "11aa15c8d3e28ee7815e0d5fcdf43fd4"; + url = http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-texmf-3.0.tar.gz; + sha256 = "1hj06qvm02a2hx1a67igp45kxlbkczjlg20gr8lbp73l36k8yfvc"; }; buildInputs = [ flex bison zlib libpng ncurses ed ]; diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index 5aaae2c06b2..6f387b5bf8b 100644 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { description = "A system to convert (La)TeX documents to HTML and various other formats"; license = stdenv.lib.licenses.lppl12; platforms = stdenv.lib.platforms.unix; + broken = true; # use the one from texlive.tex4ht }; } diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index ce23c5f4193..547700639bb 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -11,13 +11,13 @@ assert opensslSupport -> openssl != null && !gnutlsSupport; with stdenv.lib; stdenv.mkDerivation rec { name = "rtmpdump-${version}"; - version = "2015-01-15"; + version = "2015-12-30"; src = fetchgit { url = git://git.ffmpeg.org/rtmpdump; # Currently the latest commit is used (a release has not been made since 2011, i.e. '2.4') - rev = "a107cef9b392616dff54fabfd37f985ee2190a6f"; - sha256 = "03x7dy111dk8b23cq2wb5h8ljcv58fzhp0xm0d1myfvzhr9amqqs"; + rev = "fa8646daeb19dfd12c181f7d19de708d623704c0"; + sha256 = "17m9rmnnqyyzsnnxcdl8258hjmw16nxbj1n1lr7fj3kmcs189iig"; }; makeFlags = [ ''prefix=$(out)'' ] diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix new file mode 100644 index 00000000000..afc45a2d5a7 --- /dev/null +++ b/pkgs/tools/virtualization/awless/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "awless-${version}"; + version = "0.0.13"; + rev = "${version}"; + + goPackagePath = "github.com/wallix/awless"; + + src = fetchFromGitHub { + inherit rev; + owner = "wallix"; + repo = "awless"; + sha256 = "045n4r2mk40pjggsfcjlxni6q4arybs9x9raghqb9n8dyfg9v5kv"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/wallix/awless/; + description = "A Mighty CLI for AWS"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.asl20; + maintainers = with maintainers; [ pradeepchhetri ]; + }; +} diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 5cb7e3b560b..65a9c3f5814 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -16,7 +16,7 @@ umask 0022; sub showHelp { print < [--nixos-path ] [--system-path ] [--config-file ] [--config ] [--ensure-unique-name] [--auto-start] + nixos-container create [--nixos-path ] [--system-path ] [--config-file ] [--config ] [--ensure-unique-name] [--auto-start] [--bridge ] [--port ] nixos-container destroy nixos-container start nixos-container stop @@ -36,6 +36,8 @@ my $systemPath; my $nixosPath; my $ensureUniqueName = 0; my $autoStart = 0; +my $bridge; +my $port; my $extraConfig; my $signal; my $configFile; @@ -44,6 +46,8 @@ GetOptions( "help" => sub { showHelp() }, "ensure-unique-name" => \$ensureUniqueName, "auto-start" => \$autoStart, + "bridge=s" => \$bridge, + "port=s" => \$port, "system-path=s" => \$systemPath, "signal=s" => \$signal, "nixos-path=s" => \$nixosPath, @@ -153,6 +157,8 @@ if ($action eq "create") { push @conf, "PRIVATE_NETWORK=1\n"; push @conf, "HOST_ADDRESS=$hostAddress\n"; push @conf, "LOCAL_ADDRESS=$localAddress\n"; + push @conf, "HOST_BRIDGE=$bridge\n"; + push @conf, "HOST_PORT=$port\n"; push @conf, "AUTO_START=$autoStart\n"; write_file($confFile, \@conf); @@ -242,6 +248,7 @@ if ($action eq "destroy") { safeRemoveTree($profileDir) if -e $profileDir; safeRemoveTree($gcRootsDir) if -e $gcRootsDir; + system("chattr", "-i", "$root/var/empty") if -e $root; safeRemoveTree($root) if -e $root; unlink($confFile) or die; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6123c418123..57242e2a742 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -59,6 +59,7 @@ doNotDisplayTwice rec { joseki = apache-jena-fuseki; # added 2016-02-28 jquery_ui = jquery-ui; # added 2014-09-07 keepassx2-http = keepassx-reboot; # added 2016-10-17 + keepassx-reboot = keepassx-community; # added 2017-02-01 keybase-go = keybase; # added 2016-08-24 letsencrypt = certbot; # added 2016-05-16 libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2195db9bb7e..87b0ec76a1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10,44 +10,26 @@ self: pkgs: with pkgs; -let - defaultScope = pkgs // pkgs.xorg; -in - { # Allow callPackage to fill in the pkgs argument inherit pkgs; - # We use `callPackage' to be able to omit function arguments that - # can be obtained from `pkgs' or `pkgs.xorg' (i.e. `defaultScope'). - # Use `newScope' for sets of packages in `pkgs' (see e.g. `gnome' - # below). - callPackage = newScope {}; - - callPackages = lib.callPackagesWith defaultScope; - - newScope = extra: lib.callPackageWith (defaultScope // extra); - # Override system. This is useful to build i686 packages on x86_64-linux. forceSystem = system: kernel: nixpkgsFun { - inherit system; - platform = platform // { kernelArch = kernel; }; + localSystem = { + inherit system; + platform = platform // { kernelArch = kernel; }; + }; }; # Used by wine, firefox with debugging version of Flash, ... pkgsi686Linux = forceSystem "i686-linux" "i386"; - callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg); + callPackage_i686 = pkgsi686Linux.callPackage; - forceNativeDrv = drv: - # Even when cross compiling, some packages come from the stdenv's - # bootstrapping package set. Those packages are only built for the native - # platform. - if crossSystem != null && drv ? crossDrv - then drv // { crossDrv = drv.nativeDrv; } - else drv; + forcedNativePackages = if hostPlatform == buildPlatform then pkgs else buildPackages; # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's @@ -83,6 +65,7 @@ in nixpkgs-lint = callPackage ../../maintainers/scripts/nixpkgs-lint.nix { }; + common-updater-scripts = callPackage ../common-updater/scripts.nix { }; ### BUILD SUPPORT @@ -99,6 +82,10 @@ in } ''); + updateAutotoolsGnuConfigScriptsHook = makeSetupHook + { substitutions = { gnu_config = gnu-config;}; } + ../build-support/setup-hooks/update-autotools-gnu-config-scripts.sh; + buildEnv = callPackage ../build-support/buildenv { }; # not actually a package buildFHSUserEnv = callPackage ../build-support/build-fhs-userenv { }; @@ -107,8 +94,14 @@ in cmark = callPackage ../development/libraries/cmark { }; + dhallToNix = callPackage ../build-support/dhall-to-nix.nix { + inherit (haskellPackages) dhall-nix; + }; + dockerTools = callPackage ../build-support/docker { }; + docker_compose = pythonPackages.docker_compose; + dotnetenv = callPackage ../build-support/dotnetenv { dotnetfx = dotnetfx40; }; @@ -468,6 +461,8 @@ in azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; + awless = callPackage ../tools/virtualization/awless { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -500,6 +495,8 @@ in djmount = callPackage ../tools/filesystems/djmount { }; + dgsh = callPackage ../shells/dgsh { }; + elvish = callPackage ../shells/elvish { }; encryptr = callPackage ../tools/security/encryptr { @@ -524,6 +521,12 @@ in oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { }; + kwm = callPackage ../os-specific/darwin/kwm { }; + + khd = callPackage ../os-specific/darwin/khd { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; install_name_tool = callPackage ../os-specific/darwin/install_name_tool { }; @@ -550,7 +553,7 @@ in aria = aria2; aspcud = callPackage ../tools/misc/aspcud { - boost = boost155; + boost = boost163; }; at = callPackage ../tools/system/at { }; @@ -666,6 +669,8 @@ in btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; btrfs-progs_4_4_1 = callPackage ../tools/filesystems/btrfs-progs/4.4.1.nix { }; + btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {}; + btrbk = callPackage ../tools/backup/btrbk { }; bwm_ng = callPackage ../tools/networking/bwm-ng { }; @@ -702,6 +707,9 @@ in capstone = callPackage ../development/libraries/capstone { }; + cataract = callPackage ../applications/misc/cataract { }; + cataract-unstable = callPackage ../applications/misc/cataract/unstable.nix { }; + catch = callPackage ../development/libraries/catch { }; catdoc = callPackage ../tools/text/catdoc { }; @@ -746,6 +754,8 @@ in consul-template = callPackage ../tools/system/consul-template { }; + copyright-update = callPackage ../tools/text/copyright-update { }; + corebird = callPackage ../applications/networking/corebird { }; corosync = callPackage ../servers/corosync { }; @@ -782,6 +792,8 @@ in datefudge = callPackage ../tools/system/datefudge { }; + dateutils = callPackage ../tools/misc/dateutils { }; + ddate = callPackage ../tools/misc/ddate { }; dehydrated = callPackage ../tools/admin/dehydrated { }; @@ -811,6 +823,8 @@ in discount = callPackage ../tools/text/discount { }; + diskscan = callPackage ../tools/misc/diskscan { }; + disorderfs = callPackage ../tools/filesystems/disorderfs { asciidoc = asciidoc-full; }; @@ -849,6 +863,8 @@ in ent = callPackage ../tools/misc/ent { }; + envconsul = callPackage ../tools/system/envconsul { }; + f3 = callPackage ../tools/filesystems/f3 { }; facter = callPackage ../tools/system/facter { @@ -876,6 +892,8 @@ in fzy = callPackage ../tools/misc/fzy { }; + gbsplay = callPackage ../applications/audio/gbsplay { }; + gdrivefs = python27Packages.gdrivefs; go-dependency-manager = callPackage ../development/tools/gdm { }; @@ -932,6 +950,7 @@ in rsyslog = callPackage ../tools/system/rsyslog { hadoop = null; # Currently Broken + czmq = czmq3; }; rsyslog-light = callPackage ../tools/system/rsyslog { @@ -1087,6 +1106,8 @@ in cdecl = callPackage ../development/tools/cdecl { }; + cdi2iso = callPackage ../tools/cd-dvd/cdi2iso { }; + cdrdao = callPackage ../tools/cd-dvd/cdrdao { }; cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; @@ -1298,7 +1319,6 @@ in cron = callPackage ../tools/system/cron { }; inherit (callPackages ../development/compilers/cudatoolkit { }) - cudatoolkit5 cudatoolkit6 cudatoolkit65 cudatoolkit7 @@ -1677,6 +1697,8 @@ in fcppt = callPackage ../development/libraries/fcppt/default.nix { }; + fcrackzip = callPackage ../tools/security/fcrackzip { }; + fcron = callPackage ../tools/system/fcron { }; fdm = callPackage ../tools/networking/fdm {}; @@ -1981,8 +2003,6 @@ in gptfdisk = callPackage ../tools/system/gptfdisk { }; - grafana-old = callPackage ../development/tools/misc/grafana { }; - grafx2 = callPackage ../applications/graphics/grafx2 {}; grails = callPackage ../development/web/grails { jdk = null; }; @@ -2003,12 +2023,6 @@ in libdevil = libdevil-nox; }; - /* Readded by Michael Raskin. There are programs in the wild - * that do want 2.0 but not 2.22. Please give a day's notice for - * objections before removal. The feature is integer coordinates - */ - graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix { }; - /* Readded by Michael Raskin. There are programs in the wild * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for * objections before removal. The feature is libgraph. @@ -2151,6 +2165,8 @@ in halibut = callPackage ../tools/typesetting/halibut { }; + hardinfo = callPackage ../tools/system/hardinfo { }; + hdapsd = callPackage ../os-specific/linux/hdapsd { }; hddtemp = callPackage ../tools/misc/hddtemp { }; @@ -2176,6 +2192,8 @@ in hecate = callPackage ../applications/editors/hecate { }; + heaptrack = callPackage ../development/tools/profiling/heaptrack {}; + heimdall = callPackage ../tools/misc/heimdall { }; hevea = callPackage ../tools/typesetting/hevea { }; @@ -2260,15 +2278,15 @@ in }; - ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { - inherit (haskellPackages) ihaskell ghcWithPackages; + # ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { + # inherit (haskellPackages) ihaskell ghcWithPackages; - ipython = python3.buildEnv.override { - extraLibs = with python3Packages; [ ipython ipykernel jupyter_client notebook ]; - }; + # ipython = python3.buildEnv.override { + # extraLibs = with python3Packages; [ ipython ipykernel jupyter_client notebook ]; + # }; - packages = config.ihaskell.packages or (self: []); - }; + # packages = config.ihaskell.packages or (self: []); + # }; imapproxy = callPackage ../tools/networking/imapproxy { }; @@ -2286,6 +2304,12 @@ in innoextract = callPackage ../tools/archivers/innoextract { }; + intecture-agent = callPackage ../tools/admin/intecture/agent.nix { }; + + intecture-auth = callPackage ../tools/admin/intecture/auth.nix { }; + + intecture-cli = callPackage ../tools/admin/intecture/cli.nix { }; + ioping = callPackage ../tools/system/ioping { }; iops = callPackage ../tools/system/iops { }; @@ -2361,6 +2385,8 @@ in gcc = gcc49; # doesn't build with gcc5 }; + journalbeat = callPackage ../tools/system/journalbeat { }; + jp = callPackage ../development/tools/jp { }; jp2a = callPackage ../applications/misc/jp2a { }; @@ -2403,6 +2429,8 @@ in kbfs = callPackage ../tools/security/kbfs { }; + keybase-gui = callPackage ../tools/security/keybase-gui { }; + keychain = callPackage ../tools/misc/keychain { }; keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; @@ -2417,8 +2445,12 @@ in kpcli = callPackage ../tools/security/kpcli { }; + krename-qt5 = qt5.callPackage ../applications/misc/krename/kde5.nix { }; + kronometer = qt5.callPackage ../tools/misc/kronometer { }; + kdiff3-qt5 = qt5.callPackage ../tools/text/kdiff3/kde5.nix { }; + peruse = qt5.callPackage ../tools/misc/peruse { }; kst = qt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; @@ -2471,8 +2503,6 @@ in makebootfat = callPackage ../tools/misc/makebootfat { }; - libmarble-ssrf = qt55.callPackage ../development/libraries/libmarble-ssrf { }; - matrix-synapse = callPackage ../servers/matrix-synapse { }; memtester = callPackage ../tools/system/memtester { }; @@ -2539,6 +2569,8 @@ in netsniff-ng = callPackage ../tools/networking/netsniff-ng { }; + nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { }; + ninka = callPackage ../development/tools/misc/ninka { }; nodejs = hiPrio nodejs-6_x; @@ -2667,6 +2699,8 @@ in libx86emu = callPackage ../development/libraries/libx86emu { }; + libzmf = callPackage ../development/libraries/libzmf {}; + librdmacm = callPackage ../development/libraries/librdmacm { }; libreswan = callPackage ../tools/networking/libreswan { }; @@ -2776,7 +2810,9 @@ in memtest86 = callPackage ../tools/misc/memtest86 { }; - memtest86plus = callPackage ../tools/misc/memtest86+ { }; + memtest86plus = callPackage ../tools/misc/memtest86+ { + stdenv = overrideCC stdenv gcc5; + }; meo = callPackage ../tools/security/meo { boost = boost155; @@ -2850,7 +2886,7 @@ in mkcue = callPackage ../tools/cd-dvd/mkcue { }; - mkpasswd = callPackage ../tools/security/mkpasswd { }; + mkpasswd = hiPrio (callPackage ../tools/security/mkpasswd { }); mkrand = callPackage ../tools/security/mkrand { }; @@ -3080,6 +3116,8 @@ in numlockx = callPackage ../tools/X11/numlockx { }; + nuttcp = callPackage ../tools/networking/nuttcp { }; + nssmdns = callPackage ../tools/networking/nss-mdns { }; nwdiag = pythonPackages.nwdiag; @@ -3266,7 +3304,7 @@ in pngout = callPackage ../tools/graphics/pngout { }; hurdPartedCross = - if crossSystem != null && crossSystem.config == "i586-pc-gnu" + if targetPlatform != buildPlatform && targetPlatform.config == "i586-pc-gnu" then (makeOverridable ({ hurd }: (parted.override { @@ -3300,13 +3338,15 @@ in }; pcsctools = callPackage ../tools/security/pcsctools { - inherit (perlPackages) pcscperl Glib Gtk2 Pango; + inherit (perlPackages) pcscperl Glib Gtk2 Pango Cairo; }; pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { }; pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { }; + pdf2htmlEX = callPackage ../tools/typesetting/pdf2htmlEX { }; + pdf2odt = callPackage ../tools/typesetting/pdf2odt { }; pdf2svg = callPackage ../tools/graphics/pdf2svg { }; @@ -3462,6 +3502,8 @@ in ps3netsrv = callPackage ../servers/ps3netsrv { }; + psi = callPackage ../applications/networking/instant-messengers/psi { }; + psmisc = callPackage ../os-specific/linux/psmisc { }; pssh = callPackage ../tools/networking/pssh { }; @@ -3560,6 +3602,8 @@ in redmine = callPackage ../applications/version-management/redmine { }; + redsocks = callPackage ../tools/networking/redsocks { }; + rt = callPackage ../servers/rt { }; rtmpdump = callPackage ../tools/video/rtmpdump { }; @@ -3776,6 +3820,10 @@ in silc_server = callPackage ../servers/silc-server { }; + sile = callPackage ../tools/typesetting/sile { + inherit (lua52Packages) lua luaexpat luazlib luafilesystem lpeg; + }; + silver-searcher = callPackage ../tools/text/silver-searcher { }; ag = self.silver-searcher; @@ -3787,7 +3835,7 @@ in skippy-xd = callPackage ../tools/X11/skippy-xd {}; - sks = callPackage ../servers/sks { }; + sks = callPackage ../servers/sks { inherit (ocamlPackages) ocaml camlp4; }; skydns = callPackage ../servers/skydns { }; @@ -3802,7 +3850,7 @@ in slsnif = callPackage ../tools/misc/slsnif { }; smartmontools = callPackage ../tools/system/smartmontools { - inherit (darwin.apple_sdk.frameworks) IOKit; + inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices; }; smbldaptools = callPackage ../tools/networking/smbldaptools { @@ -3831,6 +3879,8 @@ in sonata = callPackage ../applications/audio/sonata { }; + souper = callPackage ../development/compilers/souper { }; + sparsehash = callPackage ../development/libraries/sparsehash { }; spiped = callPackage ../tools/networking/spiped { }; @@ -3869,9 +3919,7 @@ in su-exec = callPackage ../tools/security/su-exec {}; - subsurface = qt55.callPackage ../applications/misc/subsurface { - libdivecomputer = libdivecomputer_ssrf; - }; + subsurface = qt5.callPackage ../applications/misc/subsurface { }; sudo = callPackage ../tools/security/sudo { }; @@ -3894,7 +3942,7 @@ in sshpass = callPackage ../tools/networking/sshpass { }; sslscan = callPackage ../tools/security/sslscan { - openssl = openssl_1_0_1.override { enableSSL2 = true; }; + openssl = openssl_1_0_2.override { enableSSL2 = true; }; }; sslmate = callPackage ../development/tools/sslmate { }; @@ -4063,6 +4111,8 @@ in tpm-luks = callPackage ../tools/security/tpm-luks { }; + trezord = callPackage ../servers/trezord { }; + tthsum = callPackage ../applications/misc/tthsum { }; chaps = callPackage ../tools/security/chaps { }; @@ -4202,11 +4252,11 @@ in openconnect = openconnect_gnutls; - openconnect_openssl = callPackage ../tools/networking/openconnect.nix { + openconnect_openssl = callPackage ../tools/networking/openconnect { gnutls = null; }; - openconnect_gnutls = callPackage ../tools/networking/openconnect.nix { + openconnect_gnutls = callPackage ../tools/networking/openconnect { openssl = null; }; @@ -4409,7 +4459,7 @@ in weighttp = callPackage ../tools/networking/weighttp { }; wget = callPackage ../tools/networking/wget { - inherit (perlPackages) LWP; + inherit (perlPackages) IOSocketSSL LWP; libpsl = null; }; @@ -4433,6 +4483,8 @@ in wrk = callPackage ../tools/networking/wrk { }; + wuzz = callPackage ../tools/networking/wuzz { }; + wv = callPackage ../tools/misc/wv { }; wv2 = callPackage ../tools/misc/wv2 { }; @@ -4526,6 +4578,8 @@ in xwinmosaic = callPackage ../tools/X11/xwinmosaic {}; + yaft = callPackage ../applications/misc/yaft { }; + yarn = callPackage ../development/tools/yarn { }; yank = callPackage ../tools/misc/yank { }; @@ -4682,7 +4736,6 @@ in clang_39 = llvmPackages_39.clang; clang_38 = llvmPackages_38.clang; clang_37 = llvmPackages_37.clang; - clang_36 = llvmPackages_36.clang; clang_35 = wrapCC llvmPackages_35.clang; clang_34 = wrapCC llvmPackages_34.clang; @@ -4771,44 +4824,48 @@ in gccApple = throw "gccApple is no longer supported"; - gccCrossStageStatic = let + gccCrossStageStatic = assert targetPlatform != buildPlatform; let libcCross1 = if stdenv.cross.libc == "msvcrt" then windows.mingw_w64_headers else if stdenv.cross.libc == "libSystem" then darwin.xcode else null; in wrapGCCCross { - gcc = forceNativeDrv (gcc.cc.override { - cross = crossSystem; + gcc = forcedNativePackages.gcc.cc.override { + cross = targetPlatform; crossStageStatic = true; langCC = false; libcCross = libcCross1; enableShared = false; - }); + # Why is this needed? + inherit (forcedNativePackages) binutilsCross; + }; libc = libcCross1; binutils = binutilsCross; - cross = crossSystem; + cross = targetPlatform; }; # Only needed for mingw builds - gccCrossMingw2 = wrapGCCCross { + gccCrossMingw2 = assert targetPlatform != buildPlatform; wrapGCCCross { gcc = gccCrossStageStatic.gcc; libc = windows.mingw_headers2; binutils = binutilsCross; - cross = assert crossSystem != null; crossSystem; + cross = targetPlatform; }; - gccCrossStageFinal = wrapGCCCross { - gcc = forceNativeDrv (gcc.cc.override { - cross = crossSystem; + gccCrossStageFinal = assert targetPlatform != buildPlatform; wrapGCCCross { + gcc = forcedNativePackages.gcc.cc.override { + cross = targetPlatform; crossStageStatic = false; # XXX: We have troubles cross-compiling libstdc++ on MinGW (see # ), so don't even try. - langCC = crossSystem.config != "i686-pc-mingw32"; - }); + langCC = targetPlatform.config != "i686-pc-mingw32"; + # Why is this needed? + inherit (forcedNativePackages) binutilsCross; + }; libc = libcCross; binutils = binutilsCross; - cross = crossSystem; + cross = targetPlatform; }; gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 { @@ -4826,7 +4883,7 @@ in # and host != build), `cross' must be null but the cross-libc must still # be passed. cross = null; - libcCross = if crossSystem != null then libcCross else null; + libcCross = if targetPlatform != buildPlatform then libcCross else null; })); gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 { @@ -4839,7 +4896,7 @@ in # and host != build), `cross' must be null but the cross-libc must still # be passed. cross = null; - libcCross = if crossSystem != null then libcCross else null; + libcCross = if targetPlatform != buildPlatform then libcCross else null; isl = if !stdenv.isDarwin then isl_0_14 else null; cloog = if !stdenv.isDarwin then cloog else null; @@ -4856,7 +4913,7 @@ in # and host != build), `cross' must be null but the cross-libc must still # be passed. cross = null; - libcCross = if crossSystem != null then libcCross else null; + libcCross = if targetPlatform != buildPlatform then libcCross else null; isl = if !stdenv.isDarwin then isl_0_11 else null; @@ -4873,7 +4930,7 @@ in # and host != build), `cross' must be null but the cross-libc must still # be passed. cross = null; - libcCross = if crossSystem != null then libcCross else null; + libcCross = if targetPlatform != buildPlatform then libcCross else null; isl = if !stdenv.isDarwin then isl_0_14 else null; })); @@ -4888,7 +4945,7 @@ in # and host != build), `cross' must be null but the cross-libc must still # be passed. cross = null; - libcCross = if crossSystem != null then libcCross else null; + libcCross = if targetPlatform != buildPlatform then libcCross else null; isl = if !stdenv.isDarwin then isl_0_14 else null; })); @@ -5021,9 +5078,9 @@ in # Haskell and GHC - haskell = callPackage ./haskell-packages.nix { inherit crossSystem; }; + haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.ghc801.override { + haskellPackages = haskell.packages.ghc802.override { overrides = config.haskellPackageOverrides or (self: super: {}); }; @@ -5102,7 +5159,9 @@ in ikarus = callPackage ../development/compilers/ikarus { }; - intercal = callPackage ../development/compilers/intercal { }; + intercal = callPackage ../development/compilers/intercal { + flex = flex_2_6_1; # Works with 2.5.35 too, but not 2.6.3 + }; irony-server = callPackage ../development/tools/irony-server/default.nix { # The repository of irony to use -- must match the version of the employed emacs @@ -5150,6 +5209,7 @@ in jdk = if stdenv.isDarwin then jdk7 else jdk8; jre = if stdenv.isDarwin then jre7 else jre8; + jre_headless = if stdenv.isDarwin then jre7 else jre8_headless; openshot-qt = callPackage ../applications/video/openshot-qt { }; @@ -5227,7 +5287,6 @@ in llvm_39 = llvmPackages_39.llvm; llvm_38 = llvmPackages_38.llvm; llvm_37 = llvmPackages_37.llvm; - llvm_36 = llvmPackages_36.llvm; llvm_35 = llvmPackages_35.llvm; llvm_34 = llvmPackages_34.llvm; @@ -5246,10 +5305,6 @@ in isl = isl_0_14; }; - llvmPackages_36 = callPackage ../development/compilers/llvm/3.6 { - inherit (stdenvAdapters) overrideCC; - }; - llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({ inherit (stdenvAdapters) overrideCC; } // stdenv.lib.optionalAttrs stdenv.isDarwin { @@ -5396,10 +5451,6 @@ in sbcl = callPackage ../development/compilers/sbcl {}; # For Maxima sbcl_1_3_12 = callPackage ../development/compilers/sbcl/1.3.12.nix { }; - # For StumpWM - sbcl_1_2_5 = callPackage ../development/compilers/sbcl/1.2.5.nix { - clisp = clisp; - }; # For ACL2 sbcl_1_2_0 = callPackage ../development/compilers/sbcl/1.2.0.nix { clisp = clisp; @@ -5408,7 +5459,7 @@ in scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { }; scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { }; scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { }; - scala_2_12 = callPackage ../development/compilers/scala { }; + scala_2_12 = callPackage ../development/compilers/scala { jre = jre8; }; scala = scala_2_12; scalafmt = callPackage ../development/tools/scalafmt { }; @@ -5430,6 +5481,10 @@ in squeak = callPackage ../development/compilers/squeak { }; + squirrel-sql = callPackage ../development/tools/database/squirrel-sql { + drivers = [ mysql_jdbc postgresql_jdbc ]; + }; + stalin = callPackage ../development/compilers/stalin { }; metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { }; @@ -5499,12 +5554,12 @@ in wrapGCCCross = {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}: - forceNativeDrv (callPackage ../build-support/gcc-cross-wrapper { + forcedNativePackages.callPackage ../build-support/gcc-cross-wrapper { nativeTools = false; nativeLibc = false; noLibc = (libc == null); inherit gcc binutils libc shell name cross; - }); + }; # prolog yap = callPackage ../development/compilers/yap { }; @@ -5513,6 +5568,8 @@ in yosys = callPackage ../development/compilers/yosys { }; + zulu = callPackage ../development/compilers/zulu { }; + ### DEVELOPMENT / INTERPRETERS @@ -5751,7 +5808,7 @@ in pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; - php = php70; + php = php71; phpPackages = php70Packages; @@ -5803,7 +5860,6 @@ in # These are for compatibility and should not be used inside Nixpkgs. pythonFull = python.override{x11Support=true;}; python2Full = python2.override{x11Support=true;}; - python26Full = python26.override{includeModules=true;self=python26Full;}; python27Full = python27.override{x11Support=true;}; python3Full = python3.override{x11Support=true;}; python33Full = python33.override{x11Support=true;}; @@ -5816,10 +5872,6 @@ in python2Packages = python27Packages; python3Packages = python35Packages; - python26 = callPackage ../development/interpreters/python/cpython/2.6 { - db = db4; - self = python26; - }; python27 = callPackage ../development/interpreters/python/cpython/2.7 { self = python27; inherit (darwin) CF configd; @@ -5846,6 +5898,7 @@ in pypy27 = callPackage ../development/interpreters/python/pypy/2.7 { self = pypy27; python = python27.override{x11Support=true;}; + db = db.override { dbmSupport = true; }; }; python2nix = callPackage ../tools/package-management/python2nix { }; @@ -5886,7 +5939,6 @@ in bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; inherit (callPackage ../development/interpreters/ruby {}) - ruby_1_9_3 ruby_2_0_0 ruby_2_1_10 ruby_2_2_5 @@ -5895,7 +5947,6 @@ in # Ruby aliases ruby = ruby_2_3; - ruby_1_9 = ruby_1_9_3; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; ruby_2_2 = ruby_2_2_5; @@ -5908,7 +5959,9 @@ in self = callPackage_i686 ../development/interpreters/self { }; - spark = callPackage ../applications/networking/cluster/spark { }; + spark = spark_21; + spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.0"; }; + spark_21 = callPackage ../applications/networking/cluster/spark { version = "2.1.0"; }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { }; @@ -5917,6 +5970,8 @@ in spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { }; spidermonkey = spidermonkey_31; + ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; + supercollider = callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; }; @@ -6007,15 +6062,14 @@ in augeas = callPackage ../tools/system/augeas { }; - ansible = python2Packages.ansible; - + ansible = python2Packages.ansible2; ansible2 = python2Packages.ansible2; antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; - antlr3 = callPackage ../development/tools/parsing/antlr { }; antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { }; + antlr3 = antlr3_5; ant = apacheAnt; @@ -6084,12 +6138,12 @@ in gold = false; }); - binutilsCross = assert crossSystem != null; lowPrio (forceNativeDrv ( - if crossSystem.libc == "libSystem" then darwin.cctools_cross - else binutils.override { + binutilsCross = assert targetPlatform != buildPlatform; lowPrio ( + if targetPlatform.libc == "libSystem" then darwin.cctools_cross + else forcedNativePackages.binutils.override { noSysDirs = true; - cross = crossSystem; - })); + cross = targetPlatform; + }); bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; @@ -6115,7 +6169,6 @@ in }; buildbot-full = self.buildbot.override { plugins = with self.buildbot-plugins; [ www console-view waterfall-view ]; - enableLocalWorker = true; }; buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; @@ -6208,7 +6261,9 @@ in # Does not actually depend on Qt 5 extra-cmake-modules = qt5.ecmNoHooks; - coccinelle = callPackage ../development/tools/misc/coccinelle { }; + coccinelle = callPackage ../development/tools/misc/coccinelle { + ocamlPackages = ocamlPackages_4_01_0; + }; cpptest = callPackage ../development/libraries/cpptest { }; @@ -6222,6 +6277,13 @@ in cppcheck = callPackage ../development/tools/analysis/cppcheck { }; + creduce = callPackage ../development/tools/misc/creduce { + inherit (perlPackages) perl + ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey; + inherit (llvmPackages_39) llvm clang-unwrapped; + utillinux = if stdenv.isLinux then utillinuxMinimal else null; + }; + cscope = callPackage ../development/tools/misc/cscope { }; csslint = callPackage ../development/web/csslint { }; @@ -6293,6 +6355,8 @@ in doxygen_gui = lowPrio (doxygen.override { inherit qt4; }); + drake = callPackage ../development/tools/build-managers/drake { }; + drush = callPackage ../development/tools/misc/drush { }; editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; @@ -6318,6 +6382,7 @@ in flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin) cf-private; + ocaml = ocaml_4_02; }; framac = callPackage ../development/tools/analysis/frama-c { }; @@ -6558,9 +6623,9 @@ in cross_renaming: we should make all programs use pkgconfig as nativeBuildInput after the renaming. */ - pkgconfig = forceNativeDrv (callPackage ../development/tools/misc/pkgconfig { + pkgconfig = forcedNativePackages.callPackage ../development/tools/misc/pkgconfig { fetchurl = fetchurlBoot; - }); + }; pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; }); postiats-utilities = callPackage ../development/tools/postiats-utilities {}; @@ -6725,6 +6790,8 @@ in ruby = ruby_2_2; }; + bashdb = callPackage ../development/tools/misc/bashdb { }; + gdb = callPackage ../development/tools/misc/gdb { guile = null; hurd = gnu.hurdCross; @@ -6734,7 +6801,7 @@ in gdbGuile = lowPrio (gdb.override { inherit guile; }); gdbCross = lowPrio (callPackage ../development/tools/misc/gdb { - target = crossSystem; + target = if targetPlatform != buildPlatform then targetPlatform else null; }); gdb-multitarget = lowPrio (gdb.override { multitarget = true; }); @@ -6769,7 +6836,11 @@ in yacc = bison; - ycmd = callPackage ../development/tools/misc/ycmd { }; + ycmd = callPackage ../development/tools/misc/ycmd { + inherit (darwin.apple_sdk.frameworks) Cocoa; + llvmPackages = llvmPackages_39; + python = python2; + }; yodl = callPackage ../development/tools/misc/yodl { }; @@ -6879,6 +6950,7 @@ in boost159 = callPackage ../development/libraries/boost/1.59.nix { }; boost160 = callPackage ../development/libraries/boost/1.60.nix { }; boost162 = callPackage ../development/libraries/boost/1.62.nix { }; + boost163 = callPackage ../development/libraries/boost/1.63.nix { }; boost = boost162; boost_process = callPackage ../development/libraries/boost-process { }; @@ -6938,10 +7010,6 @@ in chromaprint = callPackage ../development/libraries/chromaprint { }; - cilaterm = callPackage ../development/libraries/cil-aterm { - stdenv = overrideInStdenv stdenv [gnumake380]; - }; - cl = callPackage ../development/libraries/cl { }; classads = callPackage ../development/libraries/classads { }; @@ -7052,6 +7120,11 @@ in dbus_libs = dbus; dbus_daemon = dbus.daemon; + makeDBusConf = { suidHelper, serviceDirectories }: + callPackage ../development/libraries/dbus/make-dbus-conf.nix { + inherit suidHelper serviceDirectories; + }; + dee = callPackage ../development/libraries/dee { }; dhex = callPackage ../applications/editors/dhex { }; @@ -7336,10 +7409,10 @@ in withGd = true; }; - glibcCross = forceNativeDrv (glibc.override { + glibcCross = forcedNativePackages.glibc.override { gccCross = gccCrossStageStatic; linuxHeaders = linuxHeadersCross; - }); + }; # We can choose: libcCrossChooser = name: if name == "glibc" then glibcCross @@ -7348,7 +7421,7 @@ in else if name == "libSystem" then darwin.xcode else throw "Unknown libc"; - libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc; + libcCross = assert targetPlatform != buildPlatform; libcCrossChooser targetPlatform.libc; # Only supported on Linux glibcLocales = if stdenv.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null; @@ -7465,14 +7538,12 @@ in gnet = callPackage ../development/libraries/gnet { }; + gnu-config = callPackage ../development/libraries/gnu-config { }; + gnu-efi = callPackage ../development/libraries/gnu-efi { }; gnutls = gnutls34; - gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix { - guileBindings = config.gnutls.guile or false; - }; - gnutls34 = callPackage ../development/libraries/gnutls/3.4.nix { guileBindings = config.gnutls.guile or false; }; @@ -7567,10 +7638,6 @@ in gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; - gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { - gtksharp = gtk-sharp-2_0; - }; - gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { inherit (gnome2) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint @@ -7740,9 +7807,9 @@ in jsoncpp = callPackage ../development/libraries/jsoncpp { }; - jsoncpp_1_6_5 = callPackage ../development/libraries/jsoncpp/1.6.5 { }; - - jsonnet = callPackage ../development/compilers/jsonnet { }; + jsonnet = callPackage ../development/compilers/jsonnet { + emscripten = emscripten.override {python=python2;}; + }; libjson = callPackage ../development/libraries/libjson { }; @@ -7970,8 +8037,6 @@ in libdivecomputer = callPackage ../development/libraries/libdivecomputer { }; - libdivecomputer_ssrf = callPackage ../development/libraries/libdivecomputer/subsurface.nix { }; - libdivsufsort = callPackage ../development/libraries/libdivsufsort { }; libdmtx = callPackage ../development/libraries/libdmtx { }; @@ -7998,7 +8063,8 @@ in libdvdread = callPackage ../development/libraries/libdvdread { }; libdvdread_4_9_9 = callPackage ../development/libraries/libdvdread/4.9.9.nix { }; - libdwarf = callPackage ../development/libraries/libdwarf { }; + inherit (callPackage ../development/libraries/libdwarf { }) + libdwarf dwarfdump; libeatmydata = callPackage ../development/libraries/libeatmydata { }; @@ -8046,6 +8112,8 @@ in libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { }; libgnome_keyring3 = gnome3.libgnome_keyring; + libglvnd = callPackage ../development/libraries/libglvnd { }; + libgnurl = callPackage ../development/libraries/libgnurl { }; libgringotts = callPackage ../development/libraries/libgringotts { }; @@ -8200,7 +8268,6 @@ in libmtp = callPackage ../development/libraries/libmtp { }; libmsgpack = callPackage ../development/libraries/libmsgpack { }; - libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { }; libmsgpack_1_4 = callPackage ../development/libraries/libmsgpack/1.4.nix { }; libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { @@ -8257,9 +8324,9 @@ in # glibc provides libiconv so systems with glibc don't need to build libiconv # separately, but we also provide libiconvReal, which will always be a # standalone libiconv, just in case you want it - libiconv = if crossSystem != null then - (if crossSystem.libc == "glibc" then libcCross - else if crossSystem.libc == "libSystem" then darwin.libiconv + libiconv = if stdenv ? cross then + (if stdenv.cross.libc == "glibc" then libcCross + else if stdenv.cross.libc == "libSystem" then darwin.libiconv else libiconvReal) else if stdenv.isGlibc then glibcIconv stdenv.cc.libc else if stdenv.isDarwin then darwin.libiconv @@ -8286,6 +8353,8 @@ in libidn = callPackage ../development/libraries/libidn { }; + libidn2 = callPackage ../development/libraries/libidn2 { }; + idnkit = callPackage ../development/libraries/idnkit { }; libiec61883 = callPackage ../development/libraries/libiec61883 { }; @@ -8309,10 +8378,6 @@ in libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { }; libjpeg = if stdenv.isLinux then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin - libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix { - libtool = libtool_1_5; - }; - libjreen = callPackage ../development/libraries/libjreen { }; libjson_rpc_cpp = callPackage ../development/libraries/libjson-rpc-cpp { }; @@ -8542,9 +8607,11 @@ in libtorrentRasterbar_1_0 = callPackage ../development/libraries/libtorrent-rasterbar/1.0.nix { }; - libtoxcore = callPackage ../development/libraries/libtoxcore/old-api { }; + libtoxcore-old = callPackage ../development/libraries/libtoxcore/old-api.nix { }; - libtoxcore-dev = callPackage ../development/libraries/libtoxcore/new-api { }; + libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; + + libtoxcore = callPackage ../development/libraries/libtoxcore { }; libtap = callPackage ../development/libraries/libtap { }; @@ -8705,8 +8772,6 @@ in libzdb = callPackage ../development/libraries/libzdb { }; - libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { }; - libwacom = callPackage ../development/libraries/libwacom { }; lightning = callPackage ../development/libraries/lightning { }; @@ -8793,7 +8858,7 @@ in mhddfs = callPackage ../tools/filesystems/mhddfs { }; - ming = callPackage ../development/libraries/ming { }; + microsoft_gsl = callPackage ../development/libraries/microsoft_gsl { }; minizip = callPackage ../development/libraries/minizip { }; @@ -8929,6 +8994,8 @@ in ogrepaged = callPackage ../development/libraries/ogrepaged { }; + olm = callPackage ../development/libraries/olm { }; + oniguruma = callPackage ../development/libraries/oniguruma { }; openal = self.openalSoft; @@ -8992,10 +9059,7 @@ in openslp = callPackage ../development/libraries/openslp {}; - libressl = libressl_2_5; - libressl_2_3 = callPackage ../development/libraries/libressl/2.3.nix { - fetchurl = fetchurlBoot; - }; + libressl = libressl_2_4; libressl_2_4 = callPackage ../development/libraries/libressl/2.4.nix { fetchurl = fetchurlBoot; }; @@ -9018,7 +9082,6 @@ in onlyHeaders = true; }; }) - openssl_1_0_1 openssl_1_0_2 openssl_1_1_0 openssl_1_0_2-steam; @@ -9071,6 +9134,8 @@ in pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {}; + pgroonga = callPackage ../servers/sql/postgresql/pgroonga {}; + phonon = callPackage ../development/libraries/phonon {}; phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {}; @@ -9155,6 +9220,7 @@ in re2 = callPackage ../development/libraries/re2 { }; qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; + qca2-qt5 = callPackage ../development/libraries/qca2 { qt = qt5.qtbase; }; qimageblitz = callPackage ../development/libraries/qimageblitz {}; @@ -9244,6 +9310,8 @@ in libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; + libktorrent = callPackage ../development/libraries/libktorrent/5.nix { }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { ffmpeg = ffmpeg_2; }; @@ -9321,6 +9389,8 @@ in rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; + range-v3 = callPackage ../development/libraries/range-v3 {}; + rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; raul = callPackage ../development/libraries/audio/raul { }; @@ -9557,7 +9627,17 @@ in subtitleeditor = callPackage ../applications/video/subtitleeditor { }; - suil = callPackage ../development/libraries/audio/suil { }; + suil-qt4 = callPackage ../development/libraries/audio/suil { + withQt4 = true; + withQt5 = false; + }; + + suil-qt5 = callPackage ../development/libraries/audio/suil { + withQt4 = false; + withQt5 = true; + }; + + suil = suil-qt4; sutils = callPackage ../tools/misc/sutils { }; @@ -9798,11 +9878,6 @@ in gst-plugins-base = gst_all_1.gst-plugins-base; }; - webkitgtk212x = callPackage ../development/libraries/webkitgtk/2.12.nix { - harfbuzz = harfbuzz-icu; - gst-plugins-base = gst_all_1.gst-plugins-base; - }; - webkitgtk2 = webkitgtk24x.override { withGtk2 = true; enableIntrospection = false; @@ -9940,9 +10015,13 @@ in cppzmq = callPackage ../development/libraries/cppzmq {}; - czmq = callPackage ../development/libraries/czmq { }; + czmq3 = callPackage ../development/libraries/czmq/3.x.nix {}; + czmq4 = callPackage ../development/libraries/czmq/4.x.nix {}; + czmq = czmq4; - czmqpp = callPackage ../development/libraries/czmqpp { }; + czmqpp = callPackage ../development/libraries/czmqpp { + czmq = czmq3; + }; zimlib = callPackage ../development/libraries/zimlib { }; @@ -10018,10 +10097,6 @@ in jflex = callPackage ../development/libraries/java/jflex { }; - jjtraveler = callPackage ../development/libraries/java/jjtraveler { - stdenv = overrideInStdenv stdenv [gnumake380]; - }; - junit = callPackage ../development/libraries/java/junit { antBuild = releaseTools.antBuild; }; junixsocket = callPackage ../development/libraries/java/junixsocket { }; @@ -10120,11 +10195,7 @@ in ### DEVELOPMENT / PYTHON MODULES - # `nix-env -i python-nose` installs for 2.7, the default python. - # Therefore we do not recurse into attributes here, in contrast to - # python27Packages. `nix-env -iA python26Packages.nose` works - # regardless. - python26Packages = python26.pkgs; + # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); @@ -10173,15 +10244,7 @@ in rdf4store = callPackage ../servers/http/4store { }; apacheHttpd = pkgs.apacheHttpd_2_4; - - apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix { - sslSupport = true; - }; - - apacheHttpd_2_4 = lowPrio (callPackage ../servers/http/apache-httpd/2.4.nix { - # 1.0.2+ for ALPN support - openssl = openssl_1_0_2; - }); + apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { inherit apacheHttpd; @@ -10206,7 +10269,6 @@ in }; apacheHttpdPackages = apacheHttpdPackagesFor pkgs.apacheHttpd pkgs.apacheHttpdPackages; - apacheHttpdPackages_2_2 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_2 pkgs.apacheHttpdPackages_2_2; apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4; archiveopteryx = callPackage ../servers/mail/archiveopteryx/default.nix { }; @@ -10235,7 +10297,10 @@ in apcupsd = callPackage ../servers/apcupsd { }; - asterisk = callPackage ../servers/asterisk { }; + asterisk = asterisk-stable; + + inherit (callPackages ../servers/asterisk { }) + asterisk-stable asterisk-lts; sabnzbd = callPackage ../servers/sabnzbd { }; @@ -10273,7 +10338,7 @@ in diod = callPackage ../servers/diod { lua = lua5_1; }; - #dnschain = callPackage ../servers/dnschain { }; + dnschain = callPackage ../servers/dnschain { }; dovecot = callPackage ../servers/mail/dovecot { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; @@ -10317,11 +10382,15 @@ in foswiki = callPackage ../servers/foswiki { }; + frab = callPackage ../servers/web-apps/frab { }; + freepops = callPackage ../servers/mail/freepops { }; freeradius = callPackage ../servers/freeradius { }; - freeswitch = callPackage ../servers/sip/freeswitch { }; + freeswitch = callPackage ../servers/sip/freeswitch { + openssl = openssl_1_0_2; + }; gatling = callPackage ../servers/http/gatling { }; @@ -10348,6 +10417,10 @@ in jetty = callPackage ../servers/http/jetty { }; knot-dns = callPackage ../servers/dns/knot-dns { }; + knot-resolver = callPackage ../servers/dns/knot-resolver { + # TODO: vimNox after it gets fixed on Darwin or something lighter + hexdump = if stdenv.isLinux then utillinux.bin else vim/*xxd*/; + }; rdkafka = callPackage ../development/libraries/rdkafka { }; @@ -10487,8 +10560,6 @@ in pies = callPackage ../servers/pies { }; - portmap = callPackage ../servers/portmap { }; - rpcbind = callPackage ../servers/rpcbind { }; mariadb = callPackage ../servers/sql/mariadb { @@ -10594,6 +10665,7 @@ in prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; + prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; @@ -10721,6 +10793,7 @@ in spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; squid = callPackage ../servers/squid { }; + squid4 = callPackage ../servers/squid/4.nix { }; sslh = callPackage ../servers/sslh { }; @@ -10735,7 +10808,6 @@ in systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; inherit (callPackages ../servers/http/tomcat { }) - tomcat6 tomcat7 tomcat8 tomcat85 @@ -10751,6 +10823,8 @@ in shaarli = callPackage ../servers/web-apps/shaarli { }; + shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; + axis2 = callPackage ../servers/http/tomcat/axis2 { }; unifi = callPackage ../servers/unifi { }; @@ -10794,7 +10868,7 @@ in python = python2; # Incompatible with Python 3x udev = if stdenv.isLinux then udev else null; libdrm = if stdenv.isLinux then libdrm else null; - fglrxCompat = config.xorg.fglrxCompat or false; # `config` because we have no `xorg.override` + abiCompat = config.xorg.abiCompat or null; # `config` because we have no `xorg.override` } // { inherit xlibsWrapper; } ); xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; @@ -10863,6 +10937,8 @@ in bluez5 = callPackage ../os-specific/linux/bluez/bluez5.nix { }; + bluez4 = callPackage ../os-specific/linux/bluez { }; + # Needed for LibreOffice bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { }); @@ -10910,8 +10986,8 @@ in cmdline = callPackage ../os-specific/darwin/command-line-tools {}; apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { }; in apple-source-releases // rec { - cctools_cross = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) { - cross = assert crossSystem != null; crossSystem; + cctools_cross = callPackage (forcedNativePackages.callPackage ../os-specific/darwin/cctools/port.nix {}).cross { + cross = assert targetPlatform != buildPlatform; targetPlatform; inherit maloader; xctoolchain = xcode.toolchain; }; @@ -10984,7 +11060,7 @@ in libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; libuuid = - if crossSystem != null && crossSystem.config == "i586-pc-gnu" + if targetPlatform != buildPlatform && targetPlatform.config == "i586-pc-gnu" then (utillinuxMinimal // { crossDrv = lib.overrideDerivation utillinuxMinimal.crossDrv (args: { # `libblkid' fails to build on GNU/Hurd. @@ -11069,7 +11145,7 @@ in # GNU/Hurd core packages. gnu = recurseIntoAttrs (callPackage ../os-specific/gnu { - inherit platform crossSystem; + inherit platform; }); hwdata = callPackage ../os-specific/linux/hwdata { }; @@ -11080,6 +11156,8 @@ in intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { }; + intel-ocl = callPackage ../os-specific/linux/intel-ocl { }; + iomelt = callPackage ../os-specific/linux/iomelt { }; iotop = callPackage ../os-specific/linux/iotop { }; @@ -11091,7 +11169,9 @@ in inherit (perlPackages) SGMLSpm; }; - iptables = callPackage ../os-specific/linux/iptables { }; + iptables = callPackage ../os-specific/linux/iptables { + flex = flex_2_5_35; + }; ipset = callPackage ../os-specific/linux/ipset { }; @@ -11116,6 +11196,8 @@ in kmscon = callPackage ../os-specific/linux/kmscon { }; + kmscube = callPackage ../os-specific/linux/kmscube { }; + latencytop = callPackage ../os-specific/linux/latencytop { }; ldm = callPackage ../os-specific/linux/ldm { }; @@ -11146,15 +11228,13 @@ in linuxHeaders = linuxHeaders_4_4; - linuxHeaders24Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/2.4.nix { - cross = assert crossSystem != null; crossSystem; - }); + linuxHeaders24Cross = forcedNativePackages.callPackage ../os-specific/linux/kernel-headers/2.4.nix { + cross = assert targetPlatform != buildPlatform; targetPlatform; + }; - linuxHeaders26Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/4.4.nix { - cross = assert crossSystem != null; crossSystem; - }); - - linuxHeaders_3_18 = callPackage ../os-specific/linux/kernel-headers/3.18.nix { }; + linuxHeaders26Cross = forcedNativePackages.callPackage ../os-specific/linux/kernel-headers/4.4.nix { + cross = assert targetPlatform != buildPlatform; targetPlatform; + }; linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { }; @@ -11163,8 +11243,8 @@ in else if ver == "2.6" then linuxHeaders26Cross else throw "Unknown linux kernel version"; - linuxHeadersCross = assert crossSystem != null; - linuxHeadersCrossChooser crossSystem.platform.kernelMajor; + linuxHeadersCross = assert targetPlatform != buildPlatform; + linuxHeadersCrossChooser targetPlatform.platform.kernelMajor; kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; @@ -11215,17 +11295,6 @@ in ]; }; - linux_3_18 = callPackage ../os-specific/linux/kernel/linux-3.18.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -11241,7 +11310,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.4" - kernelPatches.p9_caching_4_4 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11329,6 +11397,8 @@ in dpdk = callPackage ../os-specific/linux/dpdk { }; + exfat-nofuse = callPackage ../os-specific/linux/exfat { }; + pktgen = callPackage ../os-specific/linux/pktgen { }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; @@ -11353,12 +11423,13 @@ in nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; - nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { }; - nvidia_x11_legacy340 = callPackage ../os-specific/linux/nvidia-x11/legacy340.nix { }; - nvidia_x11_beta = nvidia_x11; # latest beta is lower version ATM - # callPackage ../os-specific/linux/nvidia-x11/beta.nix { }; - nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; + nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { }; + + nvidia_x11_legacy173 = nvidiaPackages.legacy_173; + nvidia_x11_legacy304 = nvidiaPackages.legacy_304; + nvidia_x11_legacy340 = nvidiaPackages.legacy_340; + nvidia_x11_beta = nvidiaPackages.beta; + nvidia_x11 = nvidiaPackages.stable; rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; @@ -11374,6 +11445,8 @@ in mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { }; + mwprocapture = callPackage ../os-specific/linux/mwprocapture { }; + mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { }; /* compiles but has to be integrated into the kernel somehow @@ -11441,7 +11514,6 @@ in linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10); linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12); - linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18); linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); @@ -11558,9 +11630,7 @@ in mingetty = callPackage ../os-specific/linux/mingetty { }; - miraclecast = callPackage ../os-specific/linux/miraclecast { - systemd = systemd.override { enableKDbus = true; }; - }; + miraclecast = callPackage ../os-specific/linux/miraclecast { }; mkinitcpio-nfs-utils = callPackage ../os-specific/linux/mkinitcpio-nfs-utils { }; @@ -11588,6 +11658,7 @@ in open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { inherit (gnome2) gtk gtkmm; }; + open-vm-tools-headless = open-vm-tools.override { withX = false; }; delve = callPackage ../development/tools/delve { }; @@ -11670,6 +11741,8 @@ in powerdns = callPackage ../servers/dns/powerdns { }; + pdns-recursor = callPackage ../servers/dns/pdns-recursor { }; + powertop = callPackage ../os-specific/linux/powertop { }; prayer = callPackage ../servers/prayer { }; @@ -11810,7 +11883,8 @@ in ubootPcduino3Nano ubootRaspberryPi ubootRaspberryPi2 - ubootRaspberryPi3 + ubootRaspberryPi3_32bit + ubootRaspberryPi3_64bit ubootWandboard ; @@ -11826,7 +11900,7 @@ in uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc { linuxHeaders = linuxHeadersCross; gccCross = gccCrossStageStatic; - cross = assert crossSystem != null; crossSystem; + cross = assert targetPlatform != buildPlatform; targetPlatform; }); udev = systemd; @@ -12122,13 +12196,18 @@ in league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; - liberation_ttf_from_source = callPackage ../data/fonts/redhat-liberation-fonts { }; - liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { }; - liberation_ttf = liberation_ttf_binary; + inherit (callPackages ../data/fonts/redhat-liberation-fonts { }) + liberation_ttf_v1_from_source + liberation_ttf_v1_binary + liberation_ttf_v2_from_source + liberation_ttf_v2_binary; + liberation_ttf = liberation_ttf_v2_binary; liberationsansnarrow = callPackage ../data/fonts/liberationsansnarrow { }; liberationsansnarrow_binary = callPackage ../data/fonts/liberationsansnarrow/binary.nix { }; + liberastika = callPackage ../data/fonts/liberastika { }; + libertine = callPackage ../data/fonts/libertine { }; libre-baskerville = callPackage ../data/fonts/libre-baskerville { }; @@ -12265,6 +12344,8 @@ in hasklig = callPackage ../data/fonts/hasklig {}; + siji = callPackage ../data/fonts/siji { }; + sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { }; source-code-pro = callPackage ../data/fonts/source-code-pro {}; @@ -12425,6 +12506,8 @@ in ao = callPackage ../applications/graphics/ao {}; + aqemu = qt5.callPackage ../applications/virtualization/aqemu { }; + ardour = callPackage ../applications/audio/ardour { inherit (gnome2) libgnomecanvas libgnomecanvasmm; inherit (vamp) vampSDK; @@ -12626,9 +12709,7 @@ in cava = callPackage ../applications/audio/cava { }; - cb2bib = callPackage ../applications/office/cb2bib { - inherit (xorg) libX11; - }; + cb2bib = qt5.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; @@ -12845,6 +12926,10 @@ in doodle = callPackage ../applications/search/doodle { }; + droopy = callPackage ../applications/networking/droopy { + inherit (python3Packages) wrapPython; + }; + drumgizmo = callPackage ../applications/audio/drumgizmo { }; dunst = callPackage ../applications/misc/dunst { }; @@ -12876,6 +12961,8 @@ in eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { }); + ecs-agent = callPackage ../applications/virtualization/ecs-agent { }; + ed = callPackage ../applications/editors/ed { }; edbrowse = callPackage ../applications/editors/edbrowse { }; @@ -13091,7 +13178,7 @@ in external = { inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent; inherit (pythonPackages) elpy; - inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig; + inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig w3m; }; }; @@ -13108,6 +13195,8 @@ in inherit (gnome3) epiphany; + epic5 = callPackage ../applications/networking/irc/epic5 { }; + eq10q = callPackage ../applications/audio/eq10q { }; errbot = callPackage ../applications/networking/errbot { @@ -13141,7 +13230,7 @@ in keepassx = callPackage ../applications/misc/keepassx { }; keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; - keepassx-reboot = callPackage ../applications/misc/keepassx/reboot.nix { }; + keepassx-community = qt5.callPackage ../applications/misc/keepassx/community.nix { }; inherit (gnome3) evince; evolution_data_server = gnome3.evolution_data_server; @@ -13278,6 +13367,7 @@ in withGtk = false; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; + # The GTK UI is deprecated by upstream. You probably want the QT version. wireshark-gtk = wireshark-cli.override { withGtk = true; }; wireshark-qt = wireshark-cli.override { withQt = true; }; wireshark = wireshark-qt; @@ -13370,14 +13460,18 @@ in xfontsel = callPackage ../applications/misc/xfontsel { }; inherit (xorg) xlsfonts; - freerdpStable = callPackage ../applications/networking/remote/freerdp { + freerdp = callPackage ../applications/networking/remote/freerdp { + inherit libpulseaudio; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; + }; + + freerdpUnstable = freerdp; + + # This must go when weston v2 is released + freerdp_legacy = callPackage ../applications/networking/remote/freerdp/legacy.nix { + cmake = cmake_2_8; ffmpeg = ffmpeg_1; }; - freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { - ffmpeg = ffmpeg_2; - cmake = cmake_2_8; - }; - freerdp = freerdpUnstable; # freerdpStable is marked broken, please switch back to it once fixed freicoin = callPackage ../applications/misc/freicoin { boost = boost155; @@ -13387,6 +13481,8 @@ in game-music-emu = callPackage ../applications/audio/game-music-emu { }; + gcalcli = callPackage ../applications/misc/gcalcli { }; + gcolor2 = callPackage ../applications/graphics/gcolor2 { }; get_iplayer = callPackage ../applications/misc/get_iplayer {}; @@ -13500,11 +13596,6 @@ in gmu = callPackage ../applications/audio/gmu { }; - gnash = callPackage ../applications/video/gnash { - inherit (gnome2) gtkglext; - xulrunner = firefox-unwrapped; - }; - gnome_mplayer = callPackage ../applications/video/gnome-mplayer { inherit (gnome2) GConf; }; @@ -13541,11 +13632,6 @@ in qrencode = callPackage ../tools/graphics/qrencode { }; - gecko_mediaplayer = callPackage ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer { - inherit (gnome2) GConf; - browser = firefox-unwrapped; - }; - geeqie = callPackage ../applications/graphics/geeqie { }; gigedit = callPackage ../applications/audio/gigedit { }; @@ -13554,10 +13640,6 @@ in gmpc = callPackage ../applications/audio/gmpc {}; - gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk { - inherit (gnome2) GConf; - }; - gnome-mpv = callPackage ../applications/video/gnome-mpv { }; gollum = callPackage ../applications/misc/gollum { }; @@ -13906,6 +13988,8 @@ in ksuperkey = callPackage ../tools/X11/ksuperkey { }; + ktorrent = qt5.callPackage ../applications/networking/p2p/ktorrent/5.nix { }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { go = go_1_6; }; @@ -13983,7 +14067,6 @@ in freefont_ttf xorg.fontmiscmisc ]; }; - mdds = mdds_0_12_1; clucene_core = clucene_core_2; lcms = lcms2; harfbuzz = harfbuzz.override { @@ -14021,7 +14104,7 @@ in bison = bison2; }; - inherit (ocaml-ng.ocamlPackages_4_02) llpp; + llpp = ocaml-ng.ocamlPackages_4_04.callPackage ../applications/misc/llpp { }; lmms = callPackage ../applications/audio/lmms { }; @@ -14049,6 +14132,8 @@ in gtk = gtk2; }; + lumail = callPackage ../applications/networking/mailreaders/lumail { }; + lv2bm = callPackage ../applications/audio/lv2bm { }; lynx = callPackage ../applications/networking/browsers/lynx { }; @@ -14137,7 +14222,9 @@ in mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; - mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; + mldonkey = callPackage ../applications/networking/p2p/mldonkey { + ocaml = ocamlPackages_4_01_0.ocaml; + }; MMA = callPackage ../applications/audio/MMA { }; @@ -14324,6 +14411,8 @@ in stdenv = stdenv_32bit; }; + polybar = callPackage ../applications/misc/polybar { }; + scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; shotcut = qt5.callPackage ../applications/video/shotcut { }; @@ -14409,6 +14498,8 @@ in notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; + muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { }; + notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { }; # Open Stack @@ -14565,6 +14656,8 @@ in pidgin-skypeweb = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb { }; + pidgin-xmpp-receipts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts { }; + pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { }; pidginosd = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-osd { }; @@ -14583,7 +14676,9 @@ in telegram-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/telegram-purple { }; - toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { }; + toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { + libtoxcore = libtoxcore-new; + }; pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { }; @@ -14669,16 +14764,11 @@ in inherit (darwin.stubs) rez setfile; }; - qemu_28 = callPackage ../applications/virtualization/qemu/2.8.nix { - inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa; - inherit (darwin.stubs) rez setfile; - }; - qgis = callPackage ../applications/gis/qgis {}; qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { }; - qjackctl = callPackage ../applications/audio/qjackctl { }; + qjackctl = qt5.callPackage ../applications/audio/qjackctl { }; qmidinet = callPackage ../applications/audio/qmidinet { }; @@ -14740,9 +14830,9 @@ in quiterss = qt5.callPackage ../applications/networking/newsreaders/quiterss {}; - quodlibet = callPackage ../applications/audio/quodlibet { }; + quodlibet-without-gst-plugins = callPackage ../applications/audio/quodlibet { }; - quodlibet-with-gst-plugins = callPackage ../applications/audio/quodlibet { + quodlibet = callPackage ../applications/audio/quodlibet { withGstPlugins = true; gst_plugins_bad = null; }; @@ -14772,7 +14862,9 @@ in ratmen = callPackage ../tools/X11/ratmen {}; - ratox = callPackage ../applications/networking/instant-messengers/ratox { }; + ratox = callPackage ../applications/networking/instant-messengers/ratox { + libtoxcore = libtoxcore-old; + }; ratpoison = callPackage ../applications/window-managers/ratpoison { }; @@ -14902,10 +14994,6 @@ in setbfree = callPackage ../applications/audio/setbfree { }; - sflphone = callPackage ../applications/networking/instant-messengers/sflphone { - gtk = gtk3; - }; - shfmt = callPackage ../tools/text/shfmt { }; shutter = callPackage ../applications/graphics/shutter { }; @@ -14990,7 +15078,7 @@ in bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; - dropbox = qt55.callPackage ../applications/networking/dropbox { }; + dropbox = qt5.callPackage ../applications/networking/dropbox { }; dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; @@ -15085,8 +15173,6 @@ in stumpwm = callPackage ../applications/window-managers/stumpwm { version = "latest"; - sbcl = sbcl_1_2_5; - lispPackages = lispPackagesFor (wrapLisp sbcl_1_2_5); }; stumpwm-git = stumpwm.override { @@ -15203,7 +15289,9 @@ in vte = gnome2.vte.override { pythonSupport = true; }; }; - termite = callPackage ../applications/misc/termite { vte = null; }; + termite = callPackage ../applications/misc/termite { + vte = gnome3.vte-ng; + }; tesseract = callPackage ../applications/graphics/tesseract { }; @@ -15294,6 +15382,8 @@ in # We need QtWebkit which was deprecated in Qt 5.6 although it can still be build trojita = with qt55; callPackage ../applications/networking/mailreaders/trojita { }; + tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { }; + tudu = callPackage ../applications/office/tudu { }; tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; @@ -15304,8 +15394,6 @@ in twmn = qt5.callPackage ../applications/misc/twmn { }; - twinkle = callPackage ../applications/networking/instant-messengers/twinkle { }; - umurmur = callPackage ../applications/networking/umurmur { }; unigine-valley = callPackage ../applications/graphics/unigine-valley { }; @@ -15314,6 +15402,8 @@ in unpaper = callPackage ../tools/graphics/unpaper { }; + urh = callPackage ../applications/misc/urh { }; + uucp = callPackage ../tools/misc/uucp { }; uvccapture = callPackage ../applications/video/uvccapture { }; @@ -15380,13 +15470,12 @@ in neovim = callPackage ../applications/editors/neovim { }; - neovim-qt = callPackage ../applications/editors/neovim/qt.nix { - qt5 = qt55; - libmsgpack = libmsgpack_1_4; - }; + neovim-qt = qt5.callPackage ../applications/editors/neovim/qt.nix { }; neovim-pygui = pythonPackages.neovim_gui; + neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { pythonPackages = python3Packages; }; + vis = callPackage ../applications/editors/vis { inherit (lua52Packages) lpeg; }; @@ -15395,6 +15484,10 @@ in spice_gtk = spice_gtk; }; + virt-top = callPackage ../applications/virtualization/virt-top { + ocamlPackages = ocamlPackages_4_01_0; + }; + virtmanager = callPackage ../applications/virtualization/virt-manager { vte = gnome3.vte; dconf = gnome3.dconf; @@ -15449,6 +15542,9 @@ in primusLib_i686 = if system == "x86_64-linux" then pkgsi686Linux.primusLib else null; + libglvnd_i686 = if system == "x86_64-linux" + then pkgsi686Linux.libglvnd + else null; }; vkeybd = callPackage ../applications/audio/vkeybd {}; @@ -15517,7 +15613,7 @@ in }; weston = callPackage ../applications/window-managers/weston { - freerdp = freerdpUnstable; + freerdp = freerdp_legacy; }; windowlab = callPackage ../applications/window-managers/windowlab { }; @@ -15548,6 +15644,8 @@ in wordnet = callPackage ../applications/misc/wordnet { }; + worker = callPackage ../applications/misc/worker { }; + workrave = callPackage ../applications/misc/workrave { inherit (gnome2) GConf gconfmm; inherit (python27Packages) cheetah; @@ -15575,12 +15673,15 @@ in ++ optional (cfg.enableMAME or false) mame ++ optional (cfg.enableMednafenPCEFast or false) mednafen-pce-fast ++ optional (cfg.enableMednafenPSX or false) mednafen-psx + ++ optional (cfg.enableMednafenSaturn or false) mednafen-saturn + ++ optional (cfg.enableMGBA or false) mgba ++ optional (cfg.enableMupen64Plus or false) mupen64plus ++ optional (cfg.enableNestopia or false) nestopia ++ optional (cfg.enablePicodrive or false) picodrive ++ optional (cfg.enablePrboom or false) prboom ++ optional (cfg.enablePPSSPP or false) ppsspp ++ optional (cfg.enableQuickNES or false) quicknes + ++ optional (cfg.enableReicast or false) reicast ++ optional (cfg.enableScummVM or false) scummvm ++ optional (cfg.enableSnes9x or false) snes9x ++ optional (cfg.enableSnes9xNext or false) snes9x-next @@ -15599,10 +15700,12 @@ in plugins = let inherit (lib) optional optionals; in with kodiPlugins; ([] ++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher - ++ optional (config.kodi.enableGenesis or false) genesis + ++ optionals (config.kodi.enableControllers or false) + (with controllers; + [ default dreamcast gba genesis mouse n64 nes ps snes ]) + ++ optional (config.kodi.enableExodus or false) exodus ++ optionals (config.kodi.enableHyperLauncher or false) (with hyper-launcher; [ plugin service pdfreader ]) - ++ optionals (config.kodi.enableSALTS or false) [salts urlresolver t0mm0-common] ++ optional (config.kodi.enableSVTPlay or false) svtplay ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher ++ optional (config.kodi.enablePVRHTS or false) pvr-hts @@ -15731,9 +15834,7 @@ in inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas; }; - apvlv = callPackage ../applications/misc/apvlv { - gtk2 = gtk2-x11; - }; + apvlv = callPackage ../applications/misc/apvlv { }; xpdf = callPackage ../applications/misc/xpdf { base14Fonts = "${ghostscript}/share/ghostscript/fonts"; @@ -15886,6 +15987,9 @@ in alienarena = callPackage ../games/alienarena { }; + amoeba = callPackage ../games/amoeba { }; + amoeba-data = callPackage ../games/amoeba/data.nix { }; + andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null; angband = callPackage ../games/angband { }; @@ -16055,6 +16159,8 @@ in gav = callPackage ../games/gav { }; + gcs = callPackage ../games/gcs { }; + gemrb = callPackage ../games/gemrb { }; ghostOne = callPackage ../servers/games/ghost-one { }; @@ -16139,7 +16245,7 @@ in minecraft-server = callPackage ../games/minecraft-server { }; - multimc = callPackage ../games/multimc { }; + multimc = qt5.callPackage ../games/multimc { }; minetest = callPackage ../games/minetest { libpng = libpng12; @@ -16423,9 +16529,7 @@ in warmux = callPackage ../games/warmux { }; - warsow = callPackage ../games/warsow { - libjpeg = libjpeg62; - }; + warsow = callPackage ../games/warsow { }; warzone2100 = qt5.callPackage ../games/warzone2100 { }; @@ -16434,7 +16538,7 @@ in wesnoth-dev = callPackage ../games/wesnoth/dev.nix { }; widelands = callPackage ../games/widelands { - lua = lua5_1; + lua = lua5_2; }; worldofgoo_demo = callPackage ../games/worldofgoo { @@ -16483,6 +16587,8 @@ in zangband = callPackage ../games/zangband { }; + zdbsp = callPackage ../games/zdoom/zdbsp.nix { }; + zdoom = callPackage ../games/zdoom { }; zod = callPackage ../games/zod { }; @@ -16619,7 +16725,7 @@ in kvirc = callPackage ../applications/networking/irc/kvirc { }; - krename = callPackage ../applications/misc/krename { + krename = callPackage ../applications/misc/krename/kde4.nix { taglib = taglib_1_9; }; @@ -16653,8 +16759,6 @@ in polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { }; - psi = callPackage ../applications/networking/instant-messengers/psi { }; - qtcurve = callPackage ../misc/themes/qtcurve { }; quassel = callPackage ../applications/networking/irc/quassel rec { @@ -16755,6 +16859,8 @@ in inherit (python3Packages) python pygobject3 pyxdg; }; + redshift-plasma-applet = callPackage ../applications/misc/redshift-plasma-applet { }; + orion = callPackage ../misc/themes/orion {}; albatross = callPackage ../misc/themes/albatross { }; @@ -16778,9 +16884,12 @@ in plasma = import ../desktops/kde-5/plasma { inherit pkgs; }; applications = import ../desktops/kde-5/applications { inherit pkgs; }; merged = self: - { plasma = plasma self; + { + plasma = plasma self; frameworks = qt5.kdeFrameworks; - applications = applications self; } + applications = applications self; + kipi-plugins = self.callPackage ../applications/graphics/kipi-plugins/5.x.nix {}; + } // qt5.kdeFrameworks // plasma self // applications self; @@ -16820,6 +16929,8 @@ in bcftools = callPackage ../applications/science/biology/bcftools { }; + ecopcr = callPackage ../applications/science/biology/ecopcr { }; + emboss = callPackage ../applications/science/biology/emboss { }; htslib = callPackage ../development/libraries/science/biology/htslib { }; @@ -16972,6 +17083,8 @@ in ### SCIENCE/PROGRAMMING + dafny = dotnetPackages.Dafny; + plm = callPackage ../applications/science/programming/plm { }; ### SCIENCE/LOGIC @@ -16986,6 +17099,8 @@ in aspino = callPackage ../applications/science/logic/aspino {}; + boogie = dotnetPackages.Boogie; + coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { make = pkgs.gnumake3; inherit (ocamlPackages_3_12_1) ocaml findlib; @@ -16996,14 +17111,10 @@ in inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk; camlp5 = ocamlPackages_4_01_0.camlp5_transitional; }; - coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix { - inherit (ocamlPackages) ocaml findlib lablgtk; - camlp5 = ocamlPackages.camlp5_transitional; - }; - coq_8_6 = callPackage ../applications/science/logic/coq/8.6.nix { - inherit (ocamlPackages) ocaml findlib lablgtk; - camlp5 = ocamlPackages.camlp5_transitional; + coq_8_5 = callPackage ../applications/science/logic/coq { + version = "8.5pl3"; }; + coq_8_6 = callPackage ../applications/science/logic/coq {}; coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { inherit (ocamlPackages) ocaml findlib lablgtk; camlp5 = ocamlPackages.camlp5_transitional; @@ -17053,6 +17164,7 @@ in flocq = callPackage ../development/coq-modules/flocq {}; interval = callPackage ../development/coq-modules/interval {}; mathcomp = callPackage ../development/coq-modules/mathcomp { }; + math-classes = callPackage ../development/coq-modules/math-classes { }; ssreflect = callPackage ../development/coq-modules/ssreflect { }; fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; }; @@ -17121,7 +17233,8 @@ in lean2 = callPackage ../applications/science/logic/lean2 {}; lean3 = lean; - leo2 = callPackage ../applications/science/logic/leo2 {}; + leo2 = callPackage ../applications/science/logic/leo2 { + ocaml = ocamlPackages_4_01_0.ocaml;}; logisim = callPackage ../applications/science/logic/logisim {}; @@ -17145,13 +17258,18 @@ in picosat = callPackage ../applications/science/logic/picosat {}; - inherit (ocaml-ng.ocamlPackages_4_01_0) prooftree; + prooftree = (with ocamlPackages_4_01_0; + callPackage ../applications/science/logic/prooftree { + camlp5 = camlp5_transitional; + }); prover9 = callPackage ../applications/science/logic/prover9 { }; proverif = callPackage ../applications/science/logic/proverif { }; - satallax = callPackage ../applications/science/logic/satallax {}; + satallax = callPackage ../applications/science/logic/satallax { + ocaml = ocamlPackages_4_01_0.ocaml; + }; saw-tools = callPackage ../applications/science/logic/saw-tools {}; @@ -17271,7 +17389,9 @@ in scilab-bin = callPackage ../applications/science/math/scilab-bin {}; - scotch = callPackage ../applications/science/math/scotch { }; + scotch = callPackage ../applications/science/math/scotch { + flex = flex_2_5_35; + }; msieve = callPackage ../applications/science/math/msieve { }; @@ -17281,11 +17401,7 @@ in yacas = callPackage ../applications/science/math/yacas { }; - speedcrunch = callPackage ../applications/science/math/speedcrunch { - qt = qt4; - cmake = cmakeCurses; - }; - + speedcrunch = qt5.callPackage ../applications/science/math/speedcrunch { }; ### SCIENCE / MISC @@ -17388,6 +17504,8 @@ in areca = callPackage ../applications/backup/areca { }; + attract-mode = callPackage ../misc/emulators/attract-mode { }; + beep = callPackage ../misc/beep { }; blackbird = callPackage ../misc/themes/blackbird { }; @@ -17408,6 +17526,8 @@ in cups-kyocera = callPackage ../misc/cups/drivers/kyocera {}; + cups-dymo = callPackage ../misc/cups/drivers/dymo {}; + crashplan = callPackage ../applications/backup/crashplan { }; e17gtk = callPackage ../misc/themes/e17gtk { }; @@ -17456,6 +17576,10 @@ in electricsheep = callPackage ../misc/screensavers/electricsheep { }; + flam3 = callPackage ../tools/graphics/flam3 { }; + + glee = callPackage ../tools/graphics/glee { }; + fakenes = callPackage ../misc/emulators/fakenes { }; faust = self.faust2; @@ -17539,6 +17663,8 @@ in hplipWithPlugin_3_15_9 = hplip_3_15_9.override { withPlugin = true; }; + illum = callPackage ../tools/system/illum { }; + # using the new configuration style proposal which is unstable jack1 = callPackage ../misc/jackaudio/jack1.nix { }; @@ -17590,7 +17716,6 @@ in nix-prefetch-git nix-prefetch-hg nix-prefetch-svn - nix-prefetch-zip nix-prefetch-scripts; nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; }; @@ -17775,7 +17900,7 @@ in tewi-font = callPackage ../data/fonts/tewi {}; - tex4ht = callPackage ../tools/typesetting/tex/tex4ht { }; + tex4ht = callPackage ../tools/typesetting/tex/tex4ht { tetex = ""; }; texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; @@ -17844,6 +17969,8 @@ in vips = callPackage ../tools/graphics/vips { }; nip2 = callPackage ../tools/graphics/nip2 { }; + vokoscreen = qt5.callPackage ../applications/video/vokoscreen { }; + wavegain = callPackage ../applications/audio/wavegain { }; wcalc = callPackage ../applications/misc/wcalc { }; @@ -17905,6 +18032,8 @@ in wmutils-core = callPackage ../tools/X11/wmutils-core { }; + wmutils-opt = callPackage ../tools/X11/wmutils-opt { }; + wraith = callPackage ../applications/networking/irc/wraith { }; wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; @@ -18009,6 +18138,8 @@ in tomb = callPackage ../os-specific/linux/tomb {}; + tomboy = callPackage ../applications/misc/tomboy {}; + imatix_gsl = callPackage ../development/tools/imatix_gsl {}; iterm2 = callPackage ../applications/misc/iterm2 {}; @@ -18036,4 +18167,6 @@ in simplenote = callPackage ../applications/misc/simplenote { }; hy = callPackage ../development/interpreters/hy {}; + + ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; } diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index a146dad63bc..3e3ecdeea6c 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -17,8 +17,14 @@ evaluation is taking place, and the configuration from environment variables or dot-files. */ -{ # The system (e.g., `i686-linux') for which to build the packages. - system +{ # The system packages will be built on. See the manual for the + # subtle division of labor between these two `*System`s and the three + # `*Platform`s. + localSystem + + # The system packages will ultimately be run on. Null if the two should be the + # same. +, crossSystem ? null , # Allow a configuration attribute set to be passed in as an argument. config ? {} @@ -27,12 +33,9 @@ overlays ? [] , # A function booting the final package set for a specific standard - # environment. See below for the arguments given to that function, - # the type of list it returns. + # environment. See below for the arguments given to that function, the type of + # list it returns. stdenvStages ? import ../stdenv - -, crossSystem ? null -, platform ? assert false; null } @ args: let # Rename the function arguments @@ -51,10 +54,10 @@ in let # Allow setting the platform in the config file. Otherwise, let's use a # reasonable default. - platform = - args.platform - or ( config.platform - or ((import ./platforms.nix).selectPlatformBySystem system) ); + localSystem = + { platform = (import ./platforms.nix).selectPlatformBySystem args.localSystem.system; } + // builtins.intersectAttrs { platform = null; } config + // args.localSystem; # A few packages make a new package set to draw their dependencies from. # (Currently to get a cross tool chain, or forced-i686 package.) Rather than @@ -71,7 +74,8 @@ in let # To put this in concrete terms, this function is basically just used today to # use package for a different platform for the current platform (namely cross # compiling toolchains and 32-bit packages on x86_64). In both those cases we - # want the provided non-native `system` argument to affect the stdenv chosen. + # want the provided non-native `localSystem` argument to affect the stdenv + # chosen. nixpkgsFun = newArgs: import ./. (args // newArgs); # Partially apply some arguments for building bootstraping stage pkgs @@ -83,7 +87,7 @@ in let boot = import ../stdenv/booter.nix { inherit lib allPackages; }; stages = stdenvStages { - inherit lib system platform crossSystem config overlays; + inherit lib localSystem crossSystem config overlays; }; pkgs = boot stages; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index c0a7adb1d7f..71f2326b937 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -220,6 +220,83 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { # SOURCE PACKAGES + Boogie = buildDotnetPackage rec { + baseName = "Boogie"; + version = "2017-01-03"; + name = "${baseName}-unstable-${version}"; + + src = fetchFromGitHub { + owner = "boogie-org"; + repo = "boogie"; + rev = "5e42f0dd2891b2b85a9198052e55592a2943b7ef"; + sha256 = "1mjnf96hbn9abgzyvmrfxlhnm213290xb9wca7rnnl12i4fa4ahl"; + }; + + buildInputs = [ dotnetPackages.NUnitRunners ]; + + xBuildFiles = [ "Source/Boogie.sln" ]; + + outputFiles = [ "Binaries/*" ]; + + postInstall = '' + mkdir -pv "$out/lib/dotnet/${baseName}" + ln -sv "${pkgs.z3}/bin/z3" "$out/lib/dotnet/${baseName}/z3.exe" + ''; + + meta = with stdenv.lib; { + description = "An intermediate verification language"; + homepage = "https://github.com/boogie-org/boogie"; + license = licenses.mspl; + maintainers = [ maintainers.taktoa ]; + platforms = with platforms; (linux ++ darwin); + }; + }; + + Dafny = buildDotnetPackage rec { + baseName = "Dafny"; + version = "1.9.8"; + + src = fetchurl { + url = "https://github.com/Microsoft/dafny/archive/v${version}.tar.gz"; + sha256 = "0n4pk4cv7d2zsn4xmyjlxvpfl9avq79r06c7kzmrng24p3k4qj6s"; + }; + + preBuild = '' + ln -s ${pkgs.z3} Binaries/z3 + ''; + + buildInputs = [ Boogie ]; + + xBuildFiles = [ "Source/Dafny.sln" ]; + xBuildFlags = [ ]; + + outputFiles = [ "Binaries/*" ]; + + # Do not wrap the z3 executable, only dafny-related ones. + exeFiles = [ "Dafny*.exe" ]; + + # Dafny needs mono in its path. + makeWrapperArgs = "--set PATH ${mono}/bin"; + + # Boogie as an input is not enough. Boogie libraries need to be at the same + # place as Dafny ones. Same for "*.dll.mdb". No idea why or how to fix. + postFixup = '' + for lib in ${Boogie}/lib/dotnet/${Boogie.baseName}/*.dll{,.mdb}; do + ln -s $lib $out/lib/dotnet/${baseName}/ + done + # We generate our own executable scripts + rm -f $out/lib/dotnet/${baseName}/dafny{,-server} + ''; + + meta = with stdenv.lib; { + description = "A programming language with built-in specification constructs"; + homepage = "http://research.microsoft.com/dafny"; + maintainers = with maintainers; [ layus ]; + license = licenses.mit; + platforms = with platforms; (linux ++ darwin); + }; + }; + Deedle = buildDotnetPackage rec { baseName = "Deedle"; version = "1.2.0"; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 092f352ec5b..5c50fe383bb 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -56,7 +56,7 @@ let }; melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix { - inherit lib; + inherit external lib; }; orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5b14af145e9..6f07c129322 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,6 +1,21 @@ -{ pkgs, callPackage, stdenv, crossSystem }: +{ pkgs, callPackage, stdenv, buildPlatform, targetPlatform }: -rec { +let # These are attributes in compiler and packages that don't support integer-simple. + integerSimpleExcludes = [ + "ghc6102Binary" + "ghc704Binary" + "ghc742Binary" + "ghc6104" + "ghc6123" + "ghc704" + "ghcjs" + "ghcjsHEAD" + "ghcCross" + "jhc" + "uhc" + "integer-simple" + ]; +in rec { lib = import ../development/haskell-modules/lib.nix { inherit pkgs; }; @@ -55,14 +70,14 @@ rec { ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) alex happy; - inherit crossSystem; + inherit buildPlatform targetPlatform; selfPkgs = packages.ghcHEAD; }; ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs { bootPkgs = packages.ghc7103; }; - ghcjsHEAD = packages.ghc801.callPackage ../development/compilers/ghcjs/head.nix { - bootPkgs = packages.ghc801; + ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix { + bootPkgs = packages.ghc802; }; jhc = callPackage ../development/compilers/jhc { @@ -74,6 +89,17 @@ rec { inherit (pkgs.haskellPackages) ghcWithPackages; }); + # The integer-simple attribute set contains all the GHC compilers + # build with integer-simple instead of integer-gmp. + integer-simple = + let integerSimpleGhcNames = + pkgs.lib.filter (name: ! builtins.elem name integerSimpleExcludes) + (pkgs.lib.attrNames compiler); + integerSimpleGhcs = pkgs.lib.genAttrs integerSimpleGhcNames + (name: compiler."${name}".override { enableIntegerSimple = true; }); + in pkgs.recurseIntoAttrs (integerSimpleGhcs // { + ghcHEAD = integerSimpleGhcs.ghcHEAD.override { selfPkgs = packages.integer-simple.ghcHEAD; }; + }); }; packages = { @@ -142,6 +168,20 @@ rec { compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; + # The integer-simple attribute set contains package sets for all the GHC compilers + # using integer-simple instead of integer-gmp. + integer-simple = + let integerSimpleGhcNames = + pkgs.lib.filter (name: ! builtins.elem name integerSimpleExcludes) + (pkgs.lib.attrNames packages); + in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override { + ghc = compiler.integer-simple."${name}"; + overrides = _self : _super : { + integer-simple = null; + integer-gmp = null; + }; + }); + # These attributes exist only for backwards-compatibility so that we don't break # stack's --nix support. These attributes will disappear in the foreseeable # future: https://github.com/commercialhaskell/stack/issues/2259. diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index 60a55c657c0..61ef729fa10 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -1,43 +1,68 @@ /* Impure default args for `pkgs/top-level/default.nix`. See that file for the meaning of each argument. */ -{ # Fallback: Assume we are building packages for the current (host, in GNU - # Autotools parlance) system. - system ? builtins.currentSystem +with builtins; + +let + + homeDir = builtins.getEnv "HOME"; + + # Return ‘x’ if it evaluates, or ‘def’ if it throws an exception. + try = x: def: let res = tryEval x; in if res.success then res.value else def; + +in + +{ # We combine legacy `system` and `platform` into `localSystem`, if + # `localSystem` was not passed. Strictly speaking, this is pure desugar, but + # it is most convient to do so before the impure `localSystem.system` default, + # so we do it now. + localSystem ? builtins.intersectAttrs { system = null; platform = null; } args + +, # These are needed only because nix's `--arg` command-line logic doesn't work + # with unnamed parameters allowed by ... + system ? localSystem.system +, platform ? localSystem.platform , # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or - # $HOME/.nixpkgs/config.nix. + # $HOME/.config/nixpkgs/config.nix. config ? let - inherit (builtins) getEnv pathExists; - configFile = getEnv "NIXPKGS_CONFIG"; - homeDir = getEnv "HOME"; - configFile2 = homeDir + "/.nixpkgs/config.nix"; + configFile2 = homeDir + "/.config/nixpkgs/config.nix"; + configFile3 = homeDir + "/.nixpkgs/config.nix"; # obsolete in if configFile != "" && pathExists configFile then import configFile else if homeDir != "" && pathExists configFile2 then import configFile2 + else if homeDir != "" && pathExists configFile3 then import configFile3 else {} , # Overlays are used to extend Nixpkgs collection with additional # collections of packages. These collection of packages are part of the # fix-point made by Nixpkgs. overlays ? let - inherit (builtins) getEnv pathExists readDir attrNames map sort - lessThan; - dirEnv = getEnv "NIXPKGS_OVERLAYS"; - dirHome = (getEnv "HOME") + "/.nixpkgs/overlays"; + dirPath = try (if pathExists then else "") ""; + dirHome = homeDir + "/.config/nixpkgs/overlays"; dirCheck = dir: dir != "" && pathExists (dir + "/."); overlays = dir: let content = readDir dir; in - map (n: import "${dir}/${n}") (sort lessThan (attrNames content)); + map (n: import (dir + ("/" + n))) + (builtins.filter (n: builtins.match ".*\.nix" n != null) + (attrNames content)); in - if dirEnv != "" then - if dirCheck dirEnv then overlays dirEnv - else throw "The environment variable NIXPKGS_OVERLAYS does not name a valid directory." + if dirPath != "" then + overlays dirPath else if dirCheck dirHome then overlays dirHome else [] , ... } @ args: -import ./. (args // { inherit system config overlays; }) +# If `localSystem` was explicitly passed, legacy `system` and `platform` should +# not be passed. +assert args ? localSystem -> !(args ? system || args ? platform); + +import ./. (builtins.removeAttrs args [ "system" "platform" ] // { + inherit config overlays; + # Fallback: Assume we are building packages on the current (build, in GNU + # Autotools parlance) system. + localSystem = { system = builtins.currentSystem; } // localSystem; +}) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 839db36ca7a..5ca9f697b87 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -14,6 +14,14 @@ let isLua51 = lua.luaversion == "5.1"; isLua52 = lua.luaversion == "5.2"; + + platformString = + if stdenv.isDarwin then "macosx" + else if stdenv.isFreeBSD then "freebsd" + else if stdenv.isLinux then "linux" + else if stdenv.isSunOS then "solaris" + else throw "unsupported platform"; + self = _self; _self = with self; { inherit lua; @@ -104,6 +112,11 @@ let buildInputs = [ expat ]; + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace '-shared' '-bundle -undefined dynamic_lookup -all_load' + ''; + preBuild = '' makeFlagsArray=( LUA_LDIR="$out/share/lua/${lua.luaversion}" @@ -113,7 +126,7 @@ let meta = { homepage = "http://matthewwild.co.uk/projects/luaexpat"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.flosse ]; }; }; @@ -124,13 +137,35 @@ let url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; sha256 = "134azkxw84xp9g5qmzjsmcva629jm7plwcmjxkdzdg05vyd7kig1"; }; + preConfigure = "substituteInPlace config --replace 'CC= gcc' '';" + + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace config \ + --replace 'LIB_OPTION= -shared' '###' \ + --replace '#LIB_OPTION= -bundle' 'LIB_OPTION= -bundle' + substituteInPlace Makefile --replace '10.3' '10.5' + ''; meta = { homepage = "https://github.com/keplerproject/luafilesystem"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with maintainers; [ flosse ]; }; }; + luaposix = buildLuaPackage rec { + name = "posix-${version}"; + version = "33.4.0"; + src = fetchurl { + url = "https://github.com/luaposix/luaposix/archive/release-v${version}.tar.gz"; + sha256 = "e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21"; + }; + buildInputs = [ perl ]; + meta = { + description = "Lua bindings for POSIX API"; + homepage = "https://github.com/luaposix/luaposix"; + platforms = stdenv.lib.platforms.unix; + }; + }; + lpty = buildLuaPackage rec { name = "lpty-${version}"; version = "1.1.1"; @@ -140,7 +175,7 @@ let }; meta = { homepage = "http://www.tset.de/lpty"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; }; preBuild = '' @@ -155,19 +190,19 @@ let }; luasec = buildLuaPackage rec { - name = "sec-0.6pre-2015-04-17"; + name = "sec-0.6"; src = fetchFromGitHub { owner = "brunoos"; repo = "luasec"; - rev = "12e1b1f1d9724974ecc6ca273a0661496d96b3e7"; - sha256 = "0m917qgi54p6n2ak33m67q8sxcw3cdni99bm216phjjka9rg7qwd"; + rev = "lua${name}"; + sha256 = "0wv8l7f7na7kw5xn8mjik2wpxbizl7zvvp5s7fcwvz9kl5jdpk5b"; }; buildInputs = [ openssl ]; preBuild = '' makeFlagsArray=( - linux + ${platformString} LUAPATH="$out/lib/lua/${lua.luaversion}" LUACPATH="$out/lib/lua/${lua.luaversion}" INC_PATH="-I${lua}/include" @@ -176,7 +211,7 @@ let meta = { homepage = "https://github.com/brunoos/luasec"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.flosse ]; }; }; @@ -197,18 +232,14 @@ let preBuild = '' makeFlagsArray=( LUAV=${lua.luaversion} - PLAT=${if stdenv.isDarwin then "macosx" - else if stdenv.isFreeBSD then "freebsd" - else if stdenv.isLinux then "linux" - else if stdenv.isSunOS then "solaris" - else throw "unsupported platform"} + PLAT=${platformString} prefix=$out ); ''; meta = with stdenv.lib; { homepage = "http://w3.impa.br/~diego/software/luasocket/"; - hydraPlatforms = with platforms; [darwin linux freebsd illumos]; + platforms = with platforms; [darwin linux freebsd illumos]; maintainers = with maintainers; [ mornfall ]; }; }; @@ -226,36 +257,38 @@ let disabled = isLua52; meta = { homepage = "https://github.com/luaforge/luazip"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; }; }; luazlib = buildLuaPackage rec { name = "zlib-${version}"; - version = "0.4"; + version = "1.1"; src = fetchzip { url = "https://github.com/brimworks/lua-zlib/archive/v${version}.tar.gz"; - sha256 = "1pgxnjc0gvk25wsr69nsm60y5ad86z1nlq7mzj3ckygzkgi782dd"; + sha256 = "1520lk4xpf094xn2zallqgqhs0zb4w61l49knv9y8pmhkdkxzzgy"; }; buildInputs = [ zlib ]; + preConfigure = "substituteInPlace Makefile --replace gcc cc --replace '-llua' ''"; + preBuild = '' makeFlagsArray=( - linux + ${platformString} LUAPATH="$out/share/lua/${lua.luaversion}" LUACPATH="$out/lib/lua/${lua.luaversion}" INCDIR="-I${lua}/include" - LIBDIR="-L$out/lib"); + LIBDIR="-L${lua}/lib"); ''; preInstall = "mkdir -p $out/lib/lua/${lua.luaversion}"; meta = with stdenv.lib; { homepage = https://github.com/brimworks/lua-zlib; - hydraPlatforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; maintainers = [ maintainers.koral ]; }; @@ -271,7 +304,7 @@ let buildInputs = [ autoreconfHook unzip ]; meta = { homepage = "https://github.com/lua-stdlib/lua-stdlib/"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; }; }; @@ -306,7 +339,7 @@ let meta = { homepage = "https://github.com/lua-stdlib/lua-stdlib/"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; broken = true; }; @@ -326,7 +359,7 @@ let meta = { homepage = "https://github.com/LuaDist/luasql-sqlite3"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; }; }; @@ -344,7 +377,7 @@ let makeFlagsArray=(CC=$CC); ''; - buildFlags = if stdenv.isDarwin then "macosx" else ""; + buildFlags = platformString; installPhase = '' mkdir -p $out/lib/lua/${lua.luaversion} @@ -354,7 +387,7 @@ let meta = { homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/"; - hydraPlatforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.mit; }; }; @@ -426,7 +459,7 @@ let meta = { description = "Simple implementation of msgpack in C Lua 5.1"; homepage = "https://github.com/tarruda/libmpack"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; }; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 199bc04f9bf..bd902396ba1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -18,8 +18,12 @@ let alcotest = callPackage ../development/ocaml-modules/alcotest {}; + angstrom = callPackage ../development/ocaml-modules/angstrom { }; + ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { }; + apron = callPackage ../development/ocaml-modules/apron { }; + asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; astring = callPackage ../development/ocaml-modules/astring { }; @@ -49,13 +53,10 @@ let bolt = callPackage ../development/ocaml-modules/bolt { }; - bitstring_2_0_4 = callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { }; - bitstring_git = callPackage ../development/ocaml-modules/bitstring { }; - bitstring = if lib.versionOlder "4.02" ocaml.version - then bitstring_git - else bitstring_2_0_4; + then callPackage ../development/ocaml-modules/bitstring { } + else callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { }; camlidl = callPackage ../development/tools/ocaml/camlidl { }; @@ -95,7 +96,10 @@ let camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; camomile = callPackage ../development/ocaml-modules/camomile { }; - camlimages_4_0 = callPackage ../development/ocaml-modules/camlimages/4.0.nix { + camlimages_4_0 = + if lib.versionOlder "4.02" ocaml.version + then null + else callPackage ../development/ocaml-modules/camlimages/4.0.nix { libpng = pkgs.libpng12; giflib = pkgs.giflib_4_1; }; @@ -128,6 +132,8 @@ let containers = callPackage ../development/ocaml-modules/containers { }; + cow = callPackage ../development/ocaml-modules/cow { }; + cpdf = callPackage ../development/ocaml-modules/cpdf { }; cppo = callPackage ../development/tools/ocaml/cppo { }; @@ -140,10 +146,14 @@ let csv = callPackage ../development/ocaml-modules/csv { }; + curses = callPackage ../development/ocaml-modules/curses { }; + custom_printf = callPackage ../development/ocaml-modules/custom_printf { }; ctypes = callPackage ../development/ocaml-modules/ctypes { }; + dolmen = callPackage ../development/ocaml-modules/dolmen { }; + dolog = callPackage ../development/ocaml-modules/dolog { }; easy-format = callPackage ../development/ocaml-modules/easy-format { }; @@ -249,6 +259,10 @@ let llvm = pkgs.llvm_37; }; + logs = callPackage ../development/ocaml-modules/logs { + lwt = ocaml_lwt; + }; + macaque = callPackage ../development/ocaml-modules/macaque { }; magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; @@ -265,6 +279,10 @@ let mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; + mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; + + mtime = callPackage ../development/ocaml-modules/mtime { }; + nocrypto = callPackage ../development/ocaml-modules/nocrypto { lwt = ocaml_lwt; }; @@ -299,10 +317,14 @@ let ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { }; + ocaml_gettext = callPackage ../development/ocaml-modules/ocaml-gettext { }; + ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; ocaml_http = callPackage ../development/ocaml-modules/http { }; + ocaml_libvirt = callPackage ../development/ocaml-modules/ocaml-libvirt { }; + ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; ocaml_lwt = callPackage ../development/ocaml-modules/lwt { }; @@ -370,6 +392,11 @@ let sequence = callPackage ../development/ocaml-modules/sequence { }; + spacetime_lib = if lib.versionOlder "4.04" ocaml.version then + callPackage ../development/tools/ocaml/ocamlbuild { } + else + null; + sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { }; tuntap = callPackage ../development/ocaml-modules/tuntap { }; @@ -488,6 +515,9 @@ let uunf = callPackage ../development/ocaml-modules/uunf { }; uri = callPackage ../development/ocaml-modules/uri { }; + uri_p4 = callPackage ../development/ocaml-modules/uri { + legacyVersion = true; + }; uuseg = callPackage ../development/ocaml-modules/uuseg { }; uutf = callPackage ../development/ocaml-modules/uutf { }; @@ -673,7 +703,6 @@ let google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; - llpp = callPackage ../applications/misc/llpp { }; monotoneViz = callPackage ../applications/version-management/monotone-viz { inherit (pkgs.gnome2) libgnomecanvas glib; @@ -697,9 +726,6 @@ let camlp5 = camlp5_transitional; }; - prooftree = callPackage ../applications/science/logic/prooftree { - camlp5 = camlp5_transitional; - }; }; in lib.fix' (lib.extends overrides packageSet); in rec @@ -723,7 +749,9 @@ in rec ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.03.nix { }) (self: super: { }); - ocamlPackages_latest = ocamlPackages_4_03; + ocamlPackages_4_04 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.04.nix { }) (self: super: { }); - ocamlPackages = ocamlPackages_4_01_0; + ocamlPackages_latest = ocamlPackages_4_04; + + ocamlPackages = ocamlPackages_4_02; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0b4f53ac861..7d3e0df62e6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -386,11 +386,17 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestNoWarnings Moo TypeTiny ]; }; - ListCompare = buildPerlPackage { - name = "List-Compare-1.18"; + ListCompare = buildPerlPackage rec { + name = "List-Compare-0.53"; src = fetchurl { - url = mirror://cpan/authors/id/J/JK/JKEENAN/List-Compare-0.39.tar.gz; - sha256 = "1v4gn176faanzf1kr9axdp1220da7nkvz0d66mnk34nd0skjjxcl"; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/${name}.tar.gz"; + sha256 = "fdbf4ff67b3135d44475fef7fcac0cd4706407d5720d26dca914860eb10f8550"; + }; + buildInputs = [ IOCaptureOutput ]; + meta = { + homepage = http://thenceforward.net/perl/modules/List-Compare/; + description = "Compare elements of two or more lists"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1549,10 +1555,10 @@ let self = _self // overrides; _self = with self; { }; CGI = buildPerlPackage rec { - name = "CGI-4.31"; + name = "CGI-4.35"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz"; - sha256 = "dee34f45525efb698d02c56ba2458a72acc34c4dcb05344706b587840b4e8c99"; + sha256 = "07gwnlc7vq58fjwmfsrv0hfyirqqdrpjhf89caq34rjrkz2wsd0b"; }; buildInputs = [ TestDeep TestWarn ]; propagatedBuildInputs = [ HTMLParser self."if" ]; @@ -2690,10 +2696,10 @@ let self = _self // overrides; _self = with self; { }; CryptOpenSSLRandom = buildPerlPackage rec { - name = "Crypt-OpenSSL-Random-0.10"; + name = "Crypt-OpenSSL-Random-0.11"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "12pirh1pj8lpvzcwj2if9i6dbr6a7s9g1zc7gzbd3v87d6mx0rdf"; + sha256 = "0yjcabkibrkafywvdkmd1xpi6br48skyk3l15ni176wvlg38335v"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; @@ -5605,6 +5611,14 @@ let self = _self // overrides; _self = with self; { }; }; + GetoptTabular = buildPerlPackage rec { + name = "Getopt-Tabular-0.3"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GW/GWARD/${name}.tar.gz"; + sha256 = "0xskl9lcj07sdfx5dkma5wvhhgf5xlsq0khgh8kk34dm6dv0dpwv"; + }; + }; + GitPurePerl = buildPerlPackage { name = "Git-PurePerl-0.51"; src = fetchurl { @@ -6257,7 +6271,11 @@ let self = _self // overrides; _self = with self; { name = "HTML-Tiny-1.05"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz"; - sha256 = "18zxg7z51f5daidnwl9vxsrs3lz0y6n5ddqhpb748bjyk3awkkfp"; + sha256 = "d7cdc9d5985e2e44ceba10b756acf1e0d3a1b3ee3b516e5b54adb850fe79fda3"; + }; + meta = { + description = "Lightweight, dependency free HTML/XML generation"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6591,10 +6609,15 @@ let self = _self // overrides; _self = with self; { }; IOCaptureOutput = buildPerlPackage rec { - name = "IO-CaptureOutput-1.1103"; + name = "IO-CaptureOutput-1.1104"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "1bcl7p87ysbzab6hssq19xn3djzc0yk9l4hk0a2mqbqb8hv6p0m5"; + sha256 = "fcc732fcb438f97a72b30e8c7796484bef2562e374553b207028e2fbf73f8330"; + }; + meta = { + homepage = https://github.com/dagolden/IO-CaptureOutput; + description = "Capture STDOUT and STDERR from Perl code, subprocesses or XS"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8599,17 +8622,16 @@ let self = _self // overrides; _self = with self; { }; MooXTypesMooseLikeNumeric = buildPerlPackage rec { - name = "MooX-Types-MooseLike-Numeric-1.02"; + name = "MooX-Types-MooseLike-Numeric-1.03"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MATEU/${name}.tar.gz"; - sha256 = "6186f75ab2747723fd979249ec6ee0c4550f5b47aa50c0d222cc7d3590182bb6"; + sha256 = "16adeb617b963d010179922c2e4e8762df77c75232e17320b459868c4970c44b"; }; - buildInputs = [ TestFatal ]; + buildInputs = [ Moo TestFatal ]; propagatedBuildInputs = [ MooXTypesMooseLike ]; meta = { description = "Moo types for numbers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -9122,13 +9144,13 @@ let self = _self // overrides; _self = with self; { }; MooseXTypes = buildPerlPackage rec { - name = "MooseX-Types-0.46"; + name = "MooseX-Types-0.50"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "e9e8c36284cf1adc6563c980c0a4f0a7df720dbaaece0dd6be66b975dde5db7a"; + sha256 = "9cd87b3492cbf0be9d2df9317b2adf9fc30663770e69906654bea3f41b17cb08"; }; - buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires ]; - propagatedBuildInputs = [ CarpClan Moose SubExporterForMethods SubName namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny TestFatal TestRequires self."if" ]; + propagatedBuildInputs = [ CarpClan ModuleRuntime Moose SubExporter SubExporterForMethods SubInstall SubName namespaceautoclean ]; meta = { homepage = https://github.com/moose/MooseX-Types; description = "Organise your Moose types in libraries"; @@ -9138,18 +9160,17 @@ let self = _self // overrides; _self = with self; { }; MooseXTypesCommon = buildPerlPackage rec { - name = "MooseX-Types-Common-0.001013"; + name = "MooseX-Types-Common-0.001014"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "ff0c963f5e8304acb5f64bdf9ba1f19284311148e1a8f0d1f81f123f9950f5f2"; + sha256 = "ef93718b6d2f240d50b5c3acb1a74b4c2a191869651470001a82be1f35d0ef0f"; }; buildInputs = [ ModuleBuildTiny TestDeep TestWarnings perl ]; - propagatedBuildInputs = [ MooseXTypes ]; + propagatedBuildInputs = [ MooseXTypes self."if" ]; meta = { homepage = https://github.com/moose/MooseX-Types-Common; description = "A library of commonly used type constraints"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; }; @@ -9627,6 +9648,19 @@ let self = _self // overrides; _self = with self; { }; }; + NetIMAPClient = buildPerlPackage rec { + name = "Net-IMAP-Client-0.9505"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GANGLION/${name}.tar.gz"; + sha256 = "d3f6a608b85e09a8080a67a9933837aae6f2cd0e8ee39df3380123dc5e3de912"; + }; + buildInputs = [TestPod TestPodCoverage]; + propagatedBuildInputs = [ IOSocketSSL ListMoreUtils ]; + meta = { + description = "Not so simple IMAP client library"; + }; + }; + NetIP = buildPerlPackage { name = "Net-IP-1.26"; src = fetchurl { @@ -11951,10 +11985,10 @@ let self = _self // overrides; _self = with self; { }; Swim = buildPerlPackage rec { - name = "Swim-0.1.44"; + name = "Swim-0.1.45"; src = fetchurl { url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "06aac148d7b1778028ffae657fdf79b1093b52035661fd8b9bdad729dc8741aa"; + sha256 = "3755ba1a02aee933c8e1de3995aca1523d6175291a1fa60c3f7fd477f5bb2469"; }; buildInputs = [ FileShareDirInstall ]; propagatedBuildInputs = [ HTMLEscape HashMerge IPCRun Pegex TextAutoformat YAMLLibYAML ]; @@ -13816,7 +13850,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ pkgs.glibc TextCharWidth ]; preConfigure = '' - substituteInPlace WrapI18N.pm --replace '/usr/bin/locale' '${pkgs.glibc}/bin/locale' + substituteInPlace WrapI18N.pm --replace '/usr/bin/locale' '${pkgs.glibc.bin}/bin/locale' ''; meta = { description = "Line wrapping module with support for multibyte, fullwidth, and combining characters and languages without whitespaces between words"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 1808d65b75c..fb1cd63a4dc 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -51,7 +51,7 @@ let "--with-libmemcached-dir=${pkgs.libmemcached}" ]; - buildInputs = with pkgs; [ pkgconfig cyrus_sasl ]; + buildInputs = with pkgs; [ pkgconfig cyrus_sasl zlib ]; }; # Not released yet @@ -69,7 +69,7 @@ let "--with-libmemcached-dir=${pkgs.libmemcached}" ]; - buildInputs = with pkgs; [ pkgconfig cyrus_sasl ]; + buildInputs = with pkgs; [ pkgconfig cyrus_sasl zlib ]; }; # No support for PHP 7 yet (and probably never will be) @@ -235,11 +235,11 @@ let composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.2.0"; + version = "1.3.2"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "15chwfsqmwmhry3bv13a5y4ih1vzb0j8h1dfd49pnzzd8lai706w"; + sha256 = "0s85zglzwx5i0hw9zlpwy1385jink1g1lhdwhv59zdjblcd7ckva"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 671aaea4491..41cd0fff52b 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -443,12 +443,54 @@ rec { }; }; - selectPlatformBySystem = system: - if system == "armv6l-linux" then raspberrypi - else if system == "armv7l-linux" then armv7l-hf-multiplatform - else if system == "armv5tel-linux" then sheevaplug - else if system == "mips64el-linux" then fuloong2f_n32 - else if system == "x86_64-linux" then pc64 - else if system == "i686-linux" then pc32 - else pcBase; + 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; + kernelAutoModules = false; + kernelExtraConfig = '' + # Raspberry Pi 3 stuff. Not needed for kernels >= 4.10. + ARCH_BCM2835 y + BCM2835_MBOX y + BCM2835_WDT y + BRCMFMAC m + DMA_BCM2835 m + DRM_VC4 m + I2C_BCM2835 m + PWM_BCM2835 m + RASPBERRYPI_FIRMWARE y + RASPBERRYPI_POWER y + SERIAL_8250_BCM2835AUX y + SERIAL_8250_EXTENDED y + SERIAL_8250_SHARE_IRQ y + SND_BCM2835_SOC_I2S m + SPI_BCM2835AUX m + SPI_BCM2835 m + + # Cavium ThunderX stuff. + PCI_HOST_THUNDER_ECAM y + THUNDER_NIC_RGX y + THUNDER_NIC_BGX y + THUNDER_NIC_PF y + THUNDER_NIC_VF y + ''; + uboot = null; + kernelTarget = "Image"; + gcc = { + arch = "armv8-a"; + }; + }; + + selectPlatformBySystem = system: { + "i686-linux" = pc32; + "x86_64-linux" = pc64; + "armv5tel-linux" = sheevaplug; + "armv6l-linux" = raspberrypi; + "armv7l-linux" = armv7l-hf-multiplatform; + "aarch64-linux" = aarch64-multiplatform; + "mips64el-linux" = fuloong2f_n32; + }.${system} or pcBase; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03977936121..0bbd7dfaa07 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12,14 +12,14 @@ let let pythonAtLeast = versionAtLeast python.pythonVersion; pythonOlder = versionOlder python.pythonVersion; - isPy26 = python.majorVersion == "2.6"; - isPy27 = python.majorVersion == "2.7"; - isPy33 = python.majorVersion == "3.3"; - isPy34 = python.majorVersion == "3.4"; - isPy35 = python.majorVersion == "3.5"; - isPy36 = python.majorVersion == "3.6"; + isPy26 = python.pythonVersion == "2.6"; + isPy27 = python.pythonVersion == "2.7"; + isPy33 = python.pythonVersion == "3.3"; + isPy34 = python.pythonVersion == "3.4"; + isPy35 = python.pythonVersion == "3.5"; + isPy36 = python.pythonVersion == "3.6"; isPyPy = python.executable == "pypy"; - isPy3k = strings.substring 0 1 python.majorVersion == "3"; + isPy3k = strings.substring 0 1 python.pythonVersion == "3"; callPackage = pkgs.newScope self; @@ -37,9 +37,29 @@ let graphiteVersion = "0.9.15"; + fetchPypi = {format ? "setuptools", ... } @attrs: + let + fetchWheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}: + # Fetch a wheel. By default we fetch an universal wheel. + # See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments. + let + url = "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl"; + in pkgs.fetchurl {inherit url sha256;}; + + fetchSource = {pname, version, sha256}: + # Fetch a source tarball. + let + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; + in pkgs.fetchurl {inherit url sha256;}; + fetcher = (if format == "wheel" then fetchWheel + else if format == "setuptools" then fetchSource + else throw "Unsupported kind ${kind}"); + in fetcher (builtins.removeAttrs attrs ["format"]); + in { inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; + inherit fetchPypi; # helpers @@ -75,6 +95,8 @@ in { }; }; + aenum = callPackage ../development/python-modules/aenum { }; + agate = buildPythonPackage rec { name = "agate-1.2.2"; disabled = isPy3k; @@ -132,6 +154,23 @@ in { }; }; + ansicolor = buildPythonPackage rec { + name = "ansicolor-${version}"; + version = "0.2.4"; + + src = pkgs.fetchurl{ + url = "mirror://pypi/a/ansicolor/${name}.tar.gz"; + sha256 = "0zlkk9706xn5yshwzdn8xsfkim8iv44zsl6qjwg2f4gn62rqky1h"; + }; + + meta = { + homepage = "https://github.com/numerodix/ansicolor/"; + description = "A library to produce ansi color output and colored highlighting and diffing"; + license = licenses.asl20; + maintainers = with maintainers; [ andsild ]; + }; + }; + # packages defined elsewhere blivet = callPackage ../development/python-modules/blivet { }; @@ -294,8 +333,9 @@ in { pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; pytimeparse = buildPythonPackage rec { - name = "pytimeparse-1.1.5"; - disabled = isPy3k; + pname = "pytimeparse"; + version = "1.1.6"; + name = "${pname}-${version}"; meta = { description = "A small Python library to parse various kinds of time expressions"; @@ -306,9 +346,9 @@ in { propagatedBuildInputs = with self; [ nose ]; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytimeparse/${name}.tar.gz"; - sha256 = "01xj31m5brydm4gvc6lwx26r74903wvm1jx3g05633k3mqlvvpcs"; + src = fetchPypi { + inherit pname version; + sha256 = "0imbb68i5n5fm704gv47if1blpxd4f8g16qmp5ar07cavgh2mibl"; }; }; @@ -514,13 +554,13 @@ in { }; afew = buildPythonPackage rec { - rev = "b19a88fa1c06cc03ed6c636475cf4361b616d128"; - name = "afew-git-2016-02-29"; + name = "afew-git-2017-02-08"; - src = pkgs.fetchurl { - url = "https://github.com/teythoon/afew/tarball/${rev}"; - name = "${name}.tar.bz"; - sha256 = "0idlyrk29bmjw3w74vn0c1a6s59phx9zhzghf2cpyqf9qdhxib8k"; + src = pkgs.fetchFromGitHub { + owner = "afewmail"; + repo = "afew"; + rev = "889a3b966835c4d16aa1f24bb89f12945b9b2a67"; + sha256 = "01gwrx1m3ka13ps3vj04a3y8llli2j2vkd3gcggcvxdphhpysckm"; }; buildInputs = with self; [ pkgs.dbacl ]; @@ -635,6 +675,24 @@ in { }; }; + ansicolors = buildPythonPackage rec { + name = "ansicolors-${version}"; + version = "1.0.2"; + + src = self.fetchPypi { + pname = "ansicolors"; + inherit version; + sha256 = "02lmh2fbqcwr98cq13l9ql0fvyad1dcb3ap3c5xq9qwjp45m6r3n"; + }; + + meta = { + homepage = "https://github.com/verigak/colors/"; + description = "ANSI colors for Python"; + license = licenses.isc; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + asgiref = buildPythonPackage rec { name = "asgiref-${version}"; version = "1.0.0"; @@ -805,7 +863,7 @@ in { alot = buildPythonPackage rec { - rev = "0.3.7"; + rev = "0.5"; name = "alot-${rev}"; disabled = isPy3k; @@ -814,7 +872,7 @@ in { owner = "pazz"; repo = "alot"; inherit rev; - sha256 = "0sscmmf42gsrjbisi6wm01alzlnq6wqhpwkm8pc557075jfg19il"; + sha256 = "1hzajfh0f21k97xip9blg7zifiv3y5k33swp2h9sc57qd7qkr5i6"; }; postPatch = '' @@ -831,6 +889,7 @@ in { self.python_magic self.configobj self.pygpgme + self.mock ]; postInstall = '' @@ -895,7 +954,7 @@ in { sha256 = "1ybywzkd840v1qvb1p2bs08js260vq1jscjg8182hv7bmwacqy0k"; }; - buildInputs = with self; [ pytest_30 case ]; + buildInputs = with self; [ pytest case ]; propagatedBuildInputs = with self; [ vine ]; meta = { @@ -923,79 +982,11 @@ in { }; }; - ansible = buildPythonPackage rec { - version = "1.9.6"; - name = "ansible-${version}"; - disabled = isPy3k; + ansible = self.ansible2; + ansible2 = self.ansible_2_2; - src = pkgs.fetchurl { - url = "https://releases.ansible.com/ansible/${name}.tar.gz"; - sha256 = "0pgfh5z4w44sjgd77q6k769a5ipigjlm28zbpf2jhvz7n60kfxsh"; - }; - - prePatch = '' - sed -i "s,/usr/,$out," lib/ansible/constants.py - ''; - - doCheck = false; - dontStrip = true; - dontPatchELF = true; - dontPatchShebangs = true; - windowsSupport = true; - - propagatedBuildInputs = with self; [ - pycrypto paramiko jinja2 pyyaml httplib2 boto six - netaddr dns - ] ++ optional windowsSupport pywinrm; - - meta = { - homepage = "http://www.ansible.com"; - description = "A simple automation tool"; - license = with licenses; [ gpl3] ; - maintainers = with maintainers; [ - jgeerds - joamaki - ]; - platforms = with platforms; linux ++ darwin; - }; - }; - - ansible2 = buildPythonPackage rec { - version = "2.2.0.0"; - name = "ansible-${version}"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "http://releases.ansible.com/ansible/${name}.tar.gz"; - sha256 = "11l5814inr44ammp0sh304rqx2382fr629c0pbwf0k1rjg99iwfr"; - }; - - prePatch = '' - sed -i "s,/usr/,$out," lib/ansible/constants.py - ''; - - doCheck = false; - dontStrip = true; - dontPatchELF = true; - dontPatchShebangs = true; - windowsSupport = true; - - propagatedBuildInputs = with self; [ - pycrypto paramiko jinja2 pyyaml httplib2 boto six - netaddr dns - ] ++ optional windowsSupport pywinrm; - - meta = with stdenv.lib; { - homepage = "http://www.ansible.com"; - description = "A simple automation tool"; - license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ - copumpkin - jgeerds - ]; - platforms = with platforms; linux ++ darwin; - }; - }; + ansible_2_1 = callPackage ../development/python-modules/ansible/2.1.nix {}; + ansible_2_2 = callPackage ../development/python-modules/ansible/2.2.nix {}; apipkg = buildPythonPackage rec { name = "apipkg-1.4"; @@ -1216,6 +1207,25 @@ in { }; }; + chainmap = buildPythonPackage rec { + name = "chainmap-1.0.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/c/chainmap/${name}.tar.gz"; + sha256 = "09h5gq43w516fqswlca0nhmd2q3v8hxq15z4wqrznfwix6ya6pa0"; + }; + + # Requires tox + doCheck = false; + + meta = { + description = "Backport/clone of ChainMap"; + homepage = "https://bitbucket.org/jeunice/chainmap"; + license = licenses.psfl; + maintainers = with maintainers; [ abbradar ]; + }; + }; + arrow = buildPythonPackage rec { name = "arrow-${version}"; version = "0.7.0"; @@ -1536,6 +1546,10 @@ in { propagatedBuildInputs = with self; [ unidecode regex ]; + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + meta = with stdenv.lib; { homepage = "https://github.com/dimka665/awesome-slugify"; description = "Python flexible slugify function"; @@ -1547,11 +1561,11 @@ in { awscli = buildPythonPackage rec { name = "awscli-${version}"; - version = "1.11.35"; + version = "1.11.45"; namePrefix = ""; src = pkgs.fetchurl { url = "mirror://pypi/a/awscli/${name}.tar.gz"; - sha256 = "0k6y8cg311bqak5x9pilg80w6f76dcbzm6xcdrw6rjnk6v4xwy70"; + sha256 = "0sv9dw4zsra8fm7ddbnwhlh80w534z4h8llz2p8asssaaj5nq2ya"; }; # No tests included @@ -1593,10 +1607,10 @@ in { sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5"; url = "mirror://pypi/a/aws-shell/aws-shell-${version}.tar.gz"; }; + # Why does it propagate packages that are used for testing? propagatedBuildInputs = with self; [ - configobj prompt_toolkit awscli boto3 pygments mock pytest - pytestcov unittest2 tox + awscli prompt_toolkit boto3 configobj pygments ]; #Checks are failing due to missing TTY, which won't exist. @@ -1699,6 +1713,11 @@ in { url = mirror://pypi/a/azure-mgmt-compute/azure-mgmt-compute-0.20.0.zip; sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v"; }; + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/compute/computemanagement.py + ''; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py @@ -1719,6 +1738,11 @@ in { url = mirror://pypi/a/azure-mgmt-network/azure-mgmt-network-0.20.1.zip; sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx"; }; + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/network/networkresourceprovider.py + ''; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py @@ -1755,6 +1779,11 @@ in { url = mirror://pypi/a/azure-mgmt-resource/azure-mgmt-resource-0.20.1.zip; sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml"; }; + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/resource/resourcemanagement.py + ''; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py @@ -1775,6 +1804,11 @@ in { url = mirror://pypi/a/azure-mgmt-storage/azure-mgmt-storage-0.20.0.zip; sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim"; }; + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py + ''; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py @@ -2718,7 +2752,7 @@ in { sha256 = "1anw68rkja1dbgvndxz5mq6f89hmxwaha0fjcdnsl5j1wj7imc1y"; }; - buildInputs = with self; [ pytest_30 case ]; + buildInputs = with self; [ pytest case ]; meta = { homepage = https://github.com/celery/billiard; @@ -3061,11 +3095,11 @@ in { boto = buildPythonPackage rec { name = "boto-${version}"; - version = "2.42.0"; + version = "2.45.0"; src = pkgs.fetchurl { url = "https://github.com/boto/boto/archive/${version}.tar.gz"; - sha256 = "04ywn8xszk57s87jnkv4j1hswc6ra7z811y9lawfvhvnfshrpx5d"; + sha256 = "18z5nacnbdpw3pmzc56didhy4sfik8riap204px24350g9xlgz7i"; }; checkPhase = '' @@ -3092,13 +3126,13 @@ in { boto3 = buildPythonPackage rec { name = "boto3-${version}"; - version = "1.4.2"; + version = "1.4.4"; src = pkgs.fetchFromGitHub { owner = "boto"; repo = "boto3"; rev = version; - sha256 = "19hzxqr7ba07b3zg2wsrz6ic3g7pq50rrcp4616flfgny5vw42j3"; + sha256 = "1zngj38a2dmc02p3ha9crzv9k682f0zgyyfx1bgg8hwwrnggikwl"; }; propagatedBuildInputs = [ self.botocore self.jmespath self.s3transfer ] ++ @@ -3114,12 +3148,9 @@ in { ''; meta = { - homepage = https://github.com/boto3/boto; - + homepage = https://github.com/boto/boto3; license = stdenv.lib.licenses.asl20; - description = "AWS SDK for Python"; - longDescription = '' Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for Python, which allows Python developers to write software that makes use of @@ -3129,11 +3160,11 @@ in { }; botocore = buildPythonPackage rec { - version = "1.4.92"; # This version is required by awscli + version = "1.5.8"; # This version is required by awscli name = "botocore-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/b/botocore/${name}.tar.gz"; - sha256 = "08rpsfqd2g4iqvi1id8yhmyz2mc299dnr4aikkwjm24rih75p9aj"; + sha256 = "1qhrq2l9kvhi3gnrgwqhvy42aqbsk93j8mfr4ixqx18yqgbnylvz"; }; propagatedBuildInputs = @@ -3634,7 +3665,7 @@ in { sha256 = "0kgmbs3fl9879n48p4m79nxy9by2yhvxq1jdvlnqzzvkdb2sdmg3"; }; - buildInputs = with self; [ pytest_30 case ]; + buildInputs = with self; [ pytest case ]; propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ]; meta = { @@ -3662,11 +3693,11 @@ in { certifi = buildPythonPackage rec { name = "certifi-${version}"; - version = "2016.2.28"; + version = "2017.1.23"; src = pkgs.fetchurl { url = "mirror://pypi/c/certifi/${name}.tar.gz"; - sha256 = "5e8eccf95924658c97b990b50552addb64f55e1e3dfe4880456ac1f287dc79d0"; + sha256 = "1klrzl3hgvcf2mjk00g0k3kk1p2z27vzwnxivwar4vhjmjvpz1w1"; }; meta = { @@ -3867,7 +3898,7 @@ in { homepage = https://github.com/click-contrib/click-log/; description = "Logging integration for Click"; license = licenses.mit; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -3880,7 +3911,7 @@ in { sha256 = "400b0bb63d9096b6bf2806efaf742a1cc8b6c88e0484f0afe7d7a7f0e9870609"; }; - checkInputs = with self; [ pytest ]; + checkInputs = with self; [ pytest_29 ]; propagatedBuildInputs = with self; [ click ] ++ optional (!isPy3k) futures; checkPhase = '' @@ -3894,7 +3925,7 @@ in { homepage = https://github.com/click-contrib/click-threading/; description = "Multithreaded Click apps made easy"; license = licenses.mit; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -3959,11 +3990,11 @@ in { cloudpickle = buildPythonPackage rec { name = "cloudpickle-${version}"; - version = "0.2.1"; + version = "0.2.2"; src = pkgs.fetchurl { url = "mirror://pypi/c/cloudpickle/${name}.tar.gz"; - sha256 = "0fsw28nmzrpk0g02y84d7pigkqr64a3x2jhhkfixplxfwravd97f"; + sha256 = "0x4fbycipkhfax7lydaxcnc14g42g274qba17j51shr5gbq6m8lx"; }; buildInputs = with self; [ pytest mock ]; @@ -4130,7 +4161,7 @@ in { # Backported version of the ConfigParser library of Python 3.3 configparser = if isPy3k then null else buildPythonPackage rec { name = "configparser-${version}"; - version = "3.3.0r2"; + version = "3.5.0"; # running install_egg_info # error: [Errno 9] Bad file descriptor: '' @@ -4138,9 +4169,12 @@ in { src = pkgs.fetchurl { url = "mirror://pypi/c/configparser/${name}.tar.gz"; - sha256 = "6a2318590dfc4013fc5bf53c2bec14a8cb455a232295eb282a13f94786c4b0b2"; + sha256 = "5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a"; }; + # No tests available + doCheck = false; + meta = { maintainers = [ ]; platforms = platforms.all; @@ -4434,11 +4468,11 @@ in { cytoolz = buildPythonPackage rec { name = "cytoolz-${version}"; - version = "0.8.0"; + version = "0.8.2"; src = pkgs.fetchurl{ url = "mirror://pypi/c/cytoolz/cytoolz-${version}.tar.gz"; - sha256 = "2239890c8fe2da3eba82947c6a68cfa406e5a5045911c9ab3de8113462372629"; + sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552"; }; # Extension types @@ -4447,8 +4481,9 @@ in { buildInputs = with self; [ nose ]; propagatedBuildInputs = with self; [ toolz ]; + # Disable failing test https://github.com/pytoolz/cytoolz/issues/97 checkPhase = '' - nosetests -v $out/${python.sitePackages} + NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages} ''; meta = { @@ -4481,11 +4516,11 @@ in { cryptography = buildPythonPackage rec { # also bump cryptography_vectors name = "cryptography-${version}"; - version = "1.5.3"; + version = "1.7.2"; src = pkgs.fetchurl { url = "mirror://pypi/c/cryptography/${name}.tar.gz"; - sha256 = "cf82ddac919b587f5e44247579b433224cc2e03332d2ea4d89aa70d7e6b64ae5"; + sha256 = "1ad9zmzi31fnz31qfchxcwiydvlxq88xndlgsvzr7m537n5vd347"; }; buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors @@ -4502,11 +4537,11 @@ in { cryptography_vectors = buildPythonPackage rec { # also bump cryptography name = "cryptography_vectors-${version}"; - version = "1.5.3"; + version = "1.7.2"; src = pkgs.fetchurl { url = "mirror://pypi/c/cryptography-vectors/${name}.tar.gz"; - sha256 = "e513fecd146a844da19022abd1b4dfbf3335c1941464988f501d7a16f30acdae"; + sha256 = "1p5cw3dzgcpzmp81qb9860hn9qlcvr4rnf0fy31fbvhxl7lfxr2b"; }; }; @@ -4740,7 +4775,7 @@ in { sha256 = "0aw1zxmyvx6gfmmnixbqmdaah28jl7rmqkzhxv53091asc23iw9k"; }; - buildInputs = with self; [ pytest ]; + buildInputs = with self; [ pytest_29 ]; propagatedBuildInputs = with self; [ future numpy ]; doCheck = true; @@ -4968,6 +5003,23 @@ in { }; }; + pydub = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pydub"; + version = "0.16.7"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/05/e0/8d2496c8ef1d7f2c8ff625be3849f550da42809b862879a8fb137c6baa11/${name}.tar.gz"; + sha256 = "10rmbvsld5fni9wsvb7la8lblrglsnzd2l1159rcxqf6b8k441dx"; + }; + + meta = { + description = "Manipulate audio with a simple and easy high level interface."; + homepage = "http://pydub.com/"; + license = licenses.mit; + platforms = platforms.all; + }; + }; + pyjade = buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyjade"; @@ -4995,61 +5047,19 @@ in { }; }; - pytest = self.pytest_29; + pytest = self.pytest_30; - pytest_27 = buildPythonPackage rec { - name = "pytest-2.7.3"; + pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {}; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest/${name}.tar.gz"; - sha256 = "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm"; - }; + pytest_28 = callPackage ../development/python-modules/pytest/2_8.nix {}; - # Disabled temporarily because of Hydra issue with namespaces - doCheck = false; + pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {}; - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - - propagatedBuildInputs = with self; [ py ] - ++ (optional isPy26 argparse) - ++ stdenv.lib.optional - pkgs.config.pythonPackages.pytest.selenium or false - self.selenium; - - meta = { - maintainers = with maintainers; [ domenkozar lovek323 madjar ]; - platforms = platforms.unix; - }; - }; - - pytest_28 = self.pytest_27.override rec { - name = "pytest-2.8.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest/${name}.tar.gz"; - sha256 = "1bwb06g64x2gky8x5hcrfpg6r351xwvafimnhm5qxq7wajz8ck7w"; - }; - }; - - pytest_29 = self.pytest_27.override rec { - name = "pytest-2.9.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest/${name}.tar.gz"; - sha256 = "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j"; - }; - }; - - pytest_30 = self.pytest_27.override rec { - name = "pytest-3.0.5"; - - propagatedBuildInputs = with self; [ hypothesis py ]; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest/${name}.tar.gz"; - sha256 = "1z9pj39w0r2gw5hsqndlmsqa80kgbrann5kfma8ww8zhaslkl02a"; + pytest_30 = callPackage ../development/python-modules/pytest{ + hypothesis = self.hypothesis.override { + # hypothesis requires pytest that causes dependency cycle + doCheck = false; + pytest = null; }; }; @@ -5077,28 +5087,7 @@ in { }; }; - pytestdjango = buildPythonPackage rec { - name = "pytest-django-${version}"; - version = "2.9.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-django/${name}.tar.gz"; - sha256 = "1mmc7zsz3dlhs6sx4sppkj1vgshabi362r1a8b8wpj1qfximpqcb"; - }; - - # doing this to allow depending packages to find - # pytest's binaries - pytest = self.pytest; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ django setuptools_scm_18 ]; - - meta = { - description = "py.test plugin for testing of Django applications"; - homepage = http://pytest-django.readthedocs.org/en/latest/; - license = licenses.bsd3; - }; - }; + pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { }; pytest-fixture-config = buildPythonPackage rec { name = "${pname}-${version}"; @@ -5220,24 +5209,7 @@ in { }; }; - pytestpep257 = buildPythonPackage rec { - name = "pytest-pep257-${version}"; - version = "0.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-pep257/${name}.tar.gz"; - sha256 = "003vdkxpx37n0kjqpwgj3314hwk2jfz3nz58db7xh68bf8xy75lk"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self ; [ pep257 ]; - - meta = { - homepage = https://github.com/anderslime/pytest-pep257; - description = "py.test plugin for PEP257"; - license = licenses.mit; - }; - }; + pytest-pep257 = callPackage ../development/python-modules/pytest-pep257.nix { }; pytest-raisesregexp = buildPythonPackage rec { name = "pytest-raisesregexp-${version}"; @@ -5548,11 +5520,11 @@ in { dask = buildPythonPackage rec { name = "dask-${version}"; - version = "0.11.0"; + version = "0.13.0"; src = pkgs.fetchurl { url = "mirror://pypi/d/dask/${name}.tar.gz"; - sha256 = "ef32490c0b156584a71576dccec4dfe550a0cd81a9c131a4ee2e43c241b601c3"; + sha256 = "1f8r6jj9666cnvx3f8bilcx0017smmlw4i4v2p1nwxshs0k514hs"; }; buildInputs = with self; [ pytest ]; @@ -5611,13 +5583,14 @@ in { zict = buildPythonPackage rec { name = "zict-${version}"; - version = "0.0.3"; + version = "0.1.1"; src = pkgs.fetchurl { url = "mirror://pypi/z/zict/${name}.tar.gz"; - sha256 = "1xsrlzrih0qmxvxqhk2c5vhzxirf509fppzdfyardl50jpsllni6"; + sha256 = "12h95vbkbar1hc6cr1kpr6zr486grj3mpx4lznvmnai0iy6pbqp4"; }; + buildInputs = with self; [ pytest ]; propagatedBuildInputs = with self; [ heapdict ]; meta = { @@ -5631,17 +5604,17 @@ in { distributed = buildPythonPackage rec { name = "distributed-${version}"; - version = "1.13.3"; + version = "1.15.1"; src = pkgs.fetchurl { url = "mirror://pypi/d/distributed/${name}.tar.gz"; - sha256 = "0nka6hqz986j1fhvfmxffgvmnxh66giq9a3ml58jsaf0riq9mjrc"; + sha256 = "037a07sdf2ch1d360nqwqz3b4ld8msydng7mw4i5s902v7xr05l6"; }; buildInputs = with self; [ pytest docutils ]; propagatedBuildInputs = with self; [ dask six boto3 s3fs tblib locket msgpack click cloudpickle tornado - psutil botocore zict lz4 + psutil botocore zict lz4 sortedcollections sortedcontainers ] ++ (if !isPy3k then [ singledispatch ] else []); # py.test not picking up local config file, even when running @@ -5677,6 +5650,8 @@ in { }; }; + leather = callPackage ../development/python-modules/leather { }; + libtmux = buildPythonPackage rec { name = "libtmux-${version}"; version = "0.6.0"; @@ -5686,7 +5661,7 @@ in { sha256 = "117savw47c2givq9vxr5m02nyxmsk34l2ihxyy5axlaiqyxyf20s"; }; - buildInputs = with self; [ pytest ]; + buildInputs = with self; [ pytest_29 ]; patchPhase = '' sed -i 's/==.*$//' requirements/test.txt ''; @@ -5742,11 +5717,11 @@ in { s3fs = buildPythonPackage rec { name = "s3fs-${version}"; - version = "0.0.4"; + version = "0.0.8"; src = pkgs.fetchurl { url = "mirror://pypi/s/s3fs/${name}.tar.gz"; - sha256 = "0gxs9zf0j97liby038i89k5njfrpvdgw0jw34ghzvlp1nzbwxwzl"; + sha256 = "0zbdzqrim0zig94fk1hswg4vfdjplw6jpx3pdi42qc830h0nscn8"; }; buildInputs = with self; [ docutils ]; @@ -6282,40 +6257,7 @@ in { }; }; - docker = buildPythonPackage rec { - name = "docker-py-${version}"; - version = "1.10.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/docker-py/${name}.tar.gz"; - sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc"; - }; - - buildInputs = [ pkgs.glibcLocales ]; - - LC_ALL="en_US.UTF-8"; - - propagatedBuildInputs = with self; [ - six - requests2 - websocket_client - ipaddress - backports_ssl_match_hostname - docker_pycreds - ]; - - # Flake8 version conflict - doCheck = false; - - meta = { - description = "An API client for docker written in Python"; - homepage = https://github.com/docker/docker-py; - license = licenses.asl20; - maintainers = with maintainers; [ - jgeerds - ]; - }; - }; + docker = callPackage ../development/python-modules/docker.nix {}; dockerpty = buildPythonPackage rec { name = "dockerpty-0.4.1"; @@ -6541,27 +6483,28 @@ in { }; }; - urllib3 = buildPythonPackage rec { - name = "urllib3-1.12"; + urllib3 = let + disabled_tests = [ + "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout" + "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event" + ]; + in buildPythonPackage rec { + pname = "urllib3"; + version = "1.20"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/u/urllib3/${name}.tar.gz"; - sha256 = "1ikj72kd4cdcq7pmmcd5p6s9dvp7wi0zw01635v4xzkid5vi598f"; + src = fetchPypi { + inherit pname version; + sha256 = "0bx76if7shzlyykmaj4fhjkir5bswc4fdx5r4q0lrn3q51p2pvwp"; }; - doCheck = !isPy3k; # lots of transient failures - checkPhase = '' - # Not worth the trouble - rm test/with_dummyserver/test_poolmanager.py - rm test/with_dummyserver/test_proxy_poolmanager.py - rm test/with_dummyserver/test_socketlevel.py - # pypy: https://github.com/shazow/urllib3/issues/736 - rm test/with_dummyserver/test_connectionpool.py + NOSE_EXCLUDE=concatStringsSep "," disabled_tests; + checkPhase = '' nosetests -v --cover-min-percentage 1 ''; - buildInputs = with self; [ coverage tornado mock nose ]; + buildInputs = with self; [ coverage tornado mock nose psutil pysocks ]; meta = { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; @@ -6728,13 +6671,14 @@ in { }); entrypoints = buildPythonPackage rec { - name = "entrypoints"; - version = "0.2.1"; + pname = "entrypoints"; + version = "0.2.2"; + name = "${pname}-${version}"; format = "wheel"; - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/a5/2d/26548d66d58f7775cb332fcf3f864987c05f5e3f800b0b22b9919dacf653/entrypoints-0.2.1-py2.py3-none-any.whl"; - sha256 = "112n36dllmls19j5k6bwcnsm6y2789lxzkjl1n9yir7gkm0dmzzw"; + src = fetchPypi { + inherit pname version format; + sha256 = "0a0685962ee5ac303f470acbb659f0f97aef5b9deb6b85d059691c706ef6e45e"; }; propagatedBuildInputs = with self; [ configparser ]; @@ -7496,7 +7440,7 @@ in { homepage = https://github.com/matlink/gplaycli; description = "Google Play Downloader via Command line"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -7796,15 +7740,16 @@ in { ipfsapi = buildPythonPackage rec { name = "ipfsapi-${version}"; - version = "0.4.0"; + version = "0.4.5-pre"; disabled = isPy26 || isPy27; - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipfsapi/${name}.tar.gz"; - sha256 = "0mqqsihannxzaqi8zcj9nca7fxwg1c85bp7xxic3xqa5zslcdcc3"; + src = pkgs.fetchFromGitHub { + owner = "ipfs"; + repo = "py-ipfs-api"; + rev = "bcce00e4a9b674d062729d82bd49a9ffbf76486f"; + sha256 = "0cdmzpk5wvi6fyfmmn96vynqkb1p59wjqjdijhm1ixf7bfl9r126"; }; - buildInputs = with self; [ pkgs.pandoc ]; propagatedBuildInputs = with self; [ six requests2 ]; meta = { @@ -7936,7 +7881,7 @@ in { }; jug = buildPythonPackage rec { - version = "1.3.0"; + version = "1.4.0"; name = "jug-${version}"; buildInputs = with self; [ nose numpy ]; propagatedBuildInputs = with self; [ @@ -7950,7 +7895,7 @@ in { src = pkgs.fetchurl { url = "mirror://pypi/J/Jug/Jug-${version}.tar.gz"; - sha256 = "1262v63f1jljfd3rqvavzc2xfcray1m7vhqav3p6wlymgd342wrl"; + sha256 = "0s9m34k8w59k32sjcg74qqdz8r492sxhsdmlhca1z7jazdk56dzb"; }; meta = { @@ -8249,6 +8194,27 @@ in { }; }; + lmdb = buildPythonPackage rec { + pname = "lmdb"; + version = "0.92"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "01nw6r08jkipx6v92kw49z34wmwikrpvc5j9xawdiyg1n2526wrx"; + }; + + # Some sort of mysterious failure with lmdb.tool + doCheck = !isPy3k; + + meta = { + description = "Universal Python binding for the LMDB 'Lightning' Database"; + homepage = "https://github.com/dw/py-lmdb"; + license = licenses.openldap; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + logilab_astng = buildPythonPackage rec { name = "logilab-astng-0.24.3"; @@ -8266,7 +8232,7 @@ in { # lpod library currently does not support Python 3.x disabled = isPy3k; - propagatedBuildInputs = with self; [ ]; + propagatedBuildInputs = with self; [ lxml docutils pillow ]; src = pkgs.fetchFromGitHub { owner = "lpod"; @@ -8439,7 +8405,7 @@ in { }; ndg-httpsclient = buildPythonPackage rec { - version = "0.4.0"; + version = "0.4.2"; name = "ndg-httpsclient-${version}"; propagatedBuildInputs = with self; [ pyopenssl ]; @@ -8447,8 +8413,8 @@ in { src = pkgs.fetchFromGitHub { owner = "cedadev"; repo = "ndg_httpsclient"; - rev = "v${version}"; - sha256 = "1prv4j3wcy9kl5ndd5by543xp4cji9k35qncsl995w6sway34s1a"; + rev = version; + sha256 = "1kk4knv029j0cicfiv23c1rayc1n3f1j3rhl0527gxiv0qv4jw8h"; }; # uses networking @@ -8458,43 +8424,11 @@ in { homepage = https://github.com/cedadev/ndg_httpsclient/; description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"; license = licenses.bsd2; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; - netcdf4 = buildPythonPackage rec { - name = "netCDF4-${version}"; - version = "1.2.4"; - - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/netCDF4/${name}.tar.gz"; - sha256 = "0lakjix9dhc26f33f03c13ffwspqcrk5j3mnnjczwxbb23ppwwx6"; - }; - - propagatedBuildInputs = with self ; [ - numpy - pkgs.zlib - pkgs.netcdf - pkgs.hdf5 - pkgs.curl - pkgs.libjpeg - ]; - - # Variables used to configure the build process - USE_NCCONFIG="0"; - HDF5_DIR="${pkgs.hdf5}"; - NETCDF4_DIR="${pkgs.netcdf}"; - CURL_DIR="${pkgs.curl.dev}"; - JPEG_DIR="${pkgs.libjpeg.dev}"; - - meta = { - description = "Interface to netCDF library (versions 3 and 4)"; - homepage = https://pypi.python.org/pypi/netCDF4; - license = licenses.free; # Mix of license (all MIT* like) - }; - }; + netcdf4 = callPackage ../development/python-modules/netcdf4.nix { }; nxt-python = buildPythonPackage rec { version = "unstable-20160819"; @@ -8579,6 +8513,40 @@ in { }; }; + pants = buildPythonPackage rec { + pname = "pantsbuild.pants"; + version = "1.2.1"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "1bnzhhd2acwk7ckv56xzg2d9vxacl3k5bh13bsjxymnq3spm962w"; + }; + + prePatch = '' + sed -E -i "s/'([[:alnum:].-]+)[=><][^']*'/'\\1'/g" setup.py + ''; + + # Unnecessary, and causes some really weird behavior around .class files, which + # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520. + dontStrip = true; + + propagatedBuildInputs = with self; [ + ansicolors beautifulsoup4 cffi coverage docutils fasteners futures + isort lmdb markdown mock packaging pathspec pep8 pex psutil pyflakes + pygments pystache pytestcov pytest pywatchman requests2 scandir + setproctitle setuptools six thrift wheel twitter-common-dirutil + twitter-common-confluence twitter-common-collections + ]; + + meta = { + description = "A build system for software projects in a variety of languages"; + homepage = "http://www.pantsbuild.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + paperwork-backend = buildPythonPackage rec { name = "paperwork-backend-${version}"; version = "1.0.6"; @@ -8614,6 +8582,24 @@ in { }; }; + pathspec = buildPythonPackage rec { + pname = "pathspec"; + version = "0.3.4"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "0a37yrr2jhlg8aiynxivh2xqani7l9j725qxzrm7cm7m4rfcl1bn"; + }; + + meta = { + description = "Utility library for gitignore-style pattern matching of file paths"; + homepage = "https://github.com/cpburnz/python-path-specification"; + license = licenses.mpl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + pathtools = buildPythonPackage rec { name = "pathtools-${version}"; version = "0.1.2"; @@ -8713,7 +8699,7 @@ in { description = "Tool for extracting information from PDF documents"; homepage = http://euske.github.io/pdfminer/index.html; license = licenses.mit; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -8752,6 +8738,27 @@ in { }; }; + pex = buildPythonPackage rec { + name = "pex-${version}"; + version = "1.2.2"; + + src = self.fetchPypi { + pname = "pex"; + sha256 = "1nwrf03cd6jw24lxyaalj59fdm2infr9glabznkpaq65mjzwshl3"; + inherit version; + }; + + # A few more dependencies I don't want to handle right now... + doCheck = false; + + meta = { + description = "A library and tool for generating .pex (Python EXecutable) files"; + homepage = "https://github.com/pantsbuild/pex"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + pies = buildPythonPackage rec { name = "pies-2.6.5"; @@ -9447,9 +9454,12 @@ in { buildInputs = with self; [ nose sphinx numpydoc ]; - # Failing test on Python 3.x - postPatch = '''' + optionalString isPy3k '' + # Failing test on Python 3.x and Darwin + postPatch = '''' + optionalString (isPy3k || stdenv.isDarwin) '' sed -i -e '70,84d' joblib/test/test_format_stack.py + # test_nested_parallel_warnings: ValueError: Non-zero return code: -9. + # Not sure why but it's nix-specific. Try removing for new joblib releases. + rm joblib/test/test_parallel.py ''; meta = { @@ -9748,6 +9758,23 @@ in { }; }; + scandir = self.buildPythonPackage rec { + name = "scandir-${version}"; + version = "1.4"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/scandir/${name}.tar.gz"; + sha256 = "0yjrgp0mxp3d8bjkq2m1ac2ys8n76wykksvgyjrnil9gr3fx7a5d"; + }; + + meta = with stdenv.lib; { + description = "A better directory iterator and faster os.walk()"; + homepage = "https://github.com/benhoyt/scandir"; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + scfbuild = self.buildPythonPackage rec { name = "scfbuild-${version}"; version = "1.0.3"; @@ -10424,28 +10451,7 @@ in { }; }; - django_guardian = buildPythonPackage rec { - name = "django-guardian-${version}"; - version = "1.4.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-guardian/${name}.tar.gz"; - sha256 = "1m7y3brk3697hr2cvkzl8dry4pp7wkmhvxmf8db1ardz1r9d8895"; - }; - - buildInputs = with self ; [ pytest pytestrunner pytestdjango django_environ mock ]; - propagatedBuildInputs = with self ; [ django six ]; - - checkPhase = '' - ${python.interpreter} nix_run_setup.py test --addopts="--ignore build" - ''; - - meta = { - description = "Per object permissions for Django"; - homepage = https://github.com/django-guardian/django-guardian; - licenses = [ licenses.mit licenses.bsd2 ]; - }; - }; + django_guardian = callPackage ../development/python-modules/django_guardian.nix { }; django_tagging = buildPythonPackage rec { name = "django-tagging-0.4.5"; @@ -10988,15 +10994,20 @@ in { }; enum34 = if pythonAtLeast "3.4" then null else buildPythonPackage rec { - name = "enum34-${version}"; - version = "1.0.4"; + pname = "enum34"; + version = "1.1.6"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/e/enum34/${name}.tar.gz"; - sha256 = "0iz4jjdvdgvfllnpmd92qxj5fnfxqpgmjpvpik0jjim3lqk9zhfk"; + src = fetchPypi { + inherit pname version; + sha256 = "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"; }; buildInputs = optional isPy26 self.ordereddict; + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + meta = { homepage = https://pypi.python.org/pypi/enum34; @@ -11170,43 +11181,7 @@ in { }; }; - docker_compose = buildPythonPackage rec { - version = "1.9.0"; - name = "docker-compose-${version}"; - namePrefix = ""; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/docker-compose/${name}.tar.gz"; - sha256 = "0zz2jqpxz69q34bp97pbwxda1ik3m8zbhh15mxvhfsn0g566dywq"; - }; - - # lots of networking and other fails - doCheck = false; - buildInputs = with self; [ mock pytest nose ]; - propagatedBuildInputs = with self; [ - requests2 six pyyaml texttable docopt docker dockerpty websocket_client - enum34 jsonschema cached-property - ]; - - patchPhase = '' - sed -i "s/'requests >= 2.6.1, < 2.8'/'requests'/" setup.py - ''; - - postInstall = '' - mkdir -p $out/share/bash-completion/completions/ - cp contrib/completion/bash/docker-compose $out/share/bash-completion/completions/docker-compose - ''; - - meta = { - homepage = "https://docs.docker.com/compose/"; - description = "Multi-container orchestration for Docker"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ - jgeerds - ]; - }; - }; + docker_compose = callPackage ../development/python-modules/docker_compose.nix {}; fdroidserver = buildPythonPackage rec { version = "2016-05-31"; @@ -11226,7 +11201,7 @@ in { meta = { homepage = https://f-droid.org; description = "Server and tools for F-Droid, the Free Software repository system for Android"; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; license = licenses.agpl3; }; }; @@ -11341,11 +11316,11 @@ in { }; flask = buildPythonPackage { - name = "flask-0.11.1"; + name = "flask-0.12"; src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask/Flask-0.11.1.tar.gz"; - sha256 = "03kbfll4sj3v5z7r31c7bhfpi11r1np076d4p1k2kg4yzcmkywdl"; + url = "mirror://pypi/F/Flask/Flask-0.12.tar.gz"; + sha256 = "12yasybryp33rdchsqgckf15zj4pjfam7ly5spmn2sijpv6h7s4k"; }; propagatedBuildInputs = with self; [ itsdangerous click werkzeug jinja2 ]; @@ -11778,14 +11753,21 @@ in { }); foolscap = buildPythonPackage (rec { - name = "foolscap-0.10.1"; + name = "foolscap-${version}"; + version = "0.12.6"; src = pkgs.fetchurl { - url = "http://foolscap.lothar.com/releases/${name}.tar.gz"; - sha256 = "1wrnbdq3y3lfxnhx30yj9xbr3iy9512jb60k8qi1da1phalnwz5x"; + url = "mirror://pypi/f/foolscap/${name}.tar.gz"; + sha256 = "1bpmqq6485mmr5jza9q2c55l9m1bfsvsbd9drsip7p5qcsi22jrz"; }; - propagatedBuildInputs = [ self.twisted self.pyopenssl self.service-identity ]; + propagatedBuildInputs = with self; [ mock twisted pyopenssl service-identity ]; + + checkPhase = '' + # Either uncomment this, or remove this custom check phase entirely, if + # you wish to do battle with the foolscap tests. ~ C. + # trial foolscap + ''; meta = { homepage = http://foolscap.lothar.com/; @@ -11933,7 +11915,6 @@ in { downloadPage = https://github.com/PythonCharmers/python-future/releases; license = licenses.mit; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; }; }; @@ -12227,14 +12208,14 @@ in { glances = buildPythonPackage rec { name = "glances-${version}"; - version = "2.7.1_1"; + version = "2.8.2"; disabled = isPyPy; src = pkgs.fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "0gc2qgpzmy7q31z8b11ls4ifb0lwrz94xnz1kj27kc369a01gbxv"; + sha256 = "1jwaq9k6q8wn197wadiwid7d8aik24rhsypmcl5q0jviwkhhiri9"; }; doCheck = false; @@ -12678,41 +12659,7 @@ in { propagatedBuildInputs = with self; [ requests2 ]; }; - hypothesis = buildPythonPackage rec { - # http://hypothesis.readthedocs.org/en/latest/packaging.html - - # Hypothesis has optional dependencies on the following libraries - # pytz fake_factory django numpy pytest - # If you need these, you can just add them to your environment. - - name = "hypothesis-${version}"; - version = "3.5.2"; - - # Upstream prefers github tarballs - src = pkgs.fetchFromGitHub { - owner = "HypothesisWorks"; - repo = "hypothesis"; - rev = "${version}"; - sha256 = "030rf4gn4b0hylr90wazilwa3bc038fcqng0wibcx67mqaq035n4"; - }; - - buildInputs = with self; [ flake8 pytest flaky ]; - propagatedBuildInputs = with self; ([ uncompyle6 ] ++ optionals isPy27 [ enum34 ]); - - # Fails randomly in tests/cover/test_conjecture_engine.py::test_interleaving_engines. - doCheck = false; - - # https://github.com/DRMacIver/hypothesis/issues/300 - checkPhase = '' - ${python.interpreter} -m pytest tests/cover - ''; - - meta = { - description = "A Python library for property based testing"; - homepage = https://github.com/DRMacIver/hypothesis; - license = licenses.mpl20; - }; - }; + hypothesis = callPackage ../development/python-modules/hypothesis.nix { }; colored = buildPythonPackage rec { name = "colored-${version}"; @@ -13033,12 +12980,12 @@ in { }; ipykernel = buildPythonPackage rec { - version = "4.5.1"; + version = "4.5.2"; name = "ipykernel-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipykernel/${name}.tar.gz"; - sha256 = "520c855c6652651c6796a3dd8bc89d533023ac65c5ccf812908187d6f0e461da"; + sha256 = "5a54f25f0e6c8ee74c362c23f9a95e10e74c6b7f5ef42059c861ff6f26d89462"; }; buildInputs = with self; [ nose ] ++ optionals isPy27 [mock]; @@ -13063,17 +13010,17 @@ in { }; ipyparallel = buildPythonPackage rec { - version = "5.2.0"; + version = "6.0.0"; name = "ipyparallel-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipyparallel/${name}.tar.gz"; - sha256 = "d99e760f1a136b1c402755a4ab51a8d7cb87c892cccadf641948a5e886c8a455"; + sha256 = "9bb5032e98a8c73ddb3da5fb8eecd93c676a5278b68799ab19257b348a0a27f6"; }; buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado + propagatedBuildInputs = with self; [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado ] ++ optionals (!isPy3k) [ futures ]; # Requires access to cluster @@ -13089,12 +13036,12 @@ in { }; ipython = buildPythonPackage rec { - version = "5.1.0"; + version = "5.2.1"; name = "ipython-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipython/${name}.tar.gz"; - sha256 = "7ef4694e1345913182126b219aaa4a0047e191af414256da6772cf249571b961"; + sha256 = "04dafc37c8876e10e797264302e4333dbcd2854ef6d16bb57cc12ce26515bfdb"; }; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' @@ -13157,6 +13104,9 @@ in { sha256 = "baf6098f054dd5eacc2934b8ea3bef908b81ca8660d839f1f940255a72c660d2"; }; + # Tests are not distributed + doCheck = false; + buildInputs = with self; [ nose pytest ]; propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook widgetsnbextension ]; @@ -13365,11 +13315,13 @@ in { }; jinja2 = buildPythonPackage rec { - name = "Jinja2-2.8"; + pname = "Jinja2"; + version = "2.9.5"; + name = "${pname}-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; - sha256 = "1x0v41lp5m1pjix3l46zx02b7lqp2hflgpnxwkywxynvi3zz47xw"; + sha256 = "702a24d992f856fa8d5a7a36db6128198d0c21e1da34448ca236c42e92384825"; }; propagatedBuildInputs = with self; [ markupsafe ]; @@ -13481,12 +13433,12 @@ in { }; jupyter_core = buildPythonPackage rec { - version = "4.2.0"; + version = "4.2.1"; name = "jupyter_core-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/j/jupyter_core/${name}.tar.gz"; - sha256 = "44ec837a53bebf4e937112d3f9ccf31fee4f8db3e406dd0dd4f0378a354bed9c"; + sha256 = "89c55399c8437f777197c2c82c1ff5639c7f71d4eb2f172a81afa120b68dc7b3"; }; buildInputs = with self; [ pytest mock ]; @@ -13649,7 +13601,7 @@ in { sha256 = "18hiricdnbnlz6hx3hbaa4dni6npv8rbid4dhf7k02k16qm6zz6h"; }; - buildInputs = with self; [ pytest_30 case pytz ]; + buildInputs = with self; [ pytest case pytz ]; propagatedBuildInputs = with self; [ amqp ]; @@ -14057,11 +14009,11 @@ in { lxml = buildPythonPackage ( rec { - name = "lxml-3.7.0"; + name = "lxml-3.7.2"; src = pkgs.fetchurl { url = "mirror://pypi/l/lxml/${name}.tar.gz"; - sha256 = "9c62eb2a1862e1ae285d7e7e3b7dc8772d387b19258086afcec143c6b7b8a5c9"; + sha256 = "02j1wf3sh2qmswcz3rh0xvsb8jm63ifaiz2bkng93hyvc1iignar"; }; buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; @@ -14340,8 +14292,7 @@ in { matplotlib = callPackage ../development/python-modules/matplotlib/default.nix { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; enableGhostscript = true; - inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa Foundation CoreData; - inherit (pkgs.darwin) cf-private libobjc; + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }; @@ -14740,6 +14691,26 @@ in { }; }; + sortedcollections = buildPythonPackage rec { + name = "sortedcollections-${version}"; + version = "0.4.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/sortedcollections/${name}.tar.gz"; + sha256 = "12dlzln9gyv8smsy2k6d6dmr0ywrpwyrr1cjy649ia5h1g7xdvwa"; + }; + buildInputs = [ self.sortedcontainers ]; + + # wants to test all python versions with tox: + doCheck = false; + + meta = { + description = "Python Sorted Collections"; + homepage = http://www.grantjenks.com/docs/sortedcollections/; + license = licenses.asl20; + }; + }; + hyperframe = buildPythonPackage rec { name = "hyperframe-${version}"; version = "4.0.1"; @@ -15068,11 +15039,11 @@ in { multipledispatch = buildPythonPackage rec { name = "multipledispatch-${version}"; - version = "0.4.8"; + version = "0.4.9"; src = pkgs.fetchurl { url = "mirror://pypi/m/multipledispatch/${name}.tar.gz"; - sha256 = "07d41fb3ed25e8424536e48a8566f88a0f9926ca4b6174bff6aa16c98251b92e"; + sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2"; }; meta = { @@ -15158,7 +15129,7 @@ in { meta = { homepage = https://github.com/aroig/mutag; license = licenses.gpl3; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -15263,7 +15234,7 @@ in { meta = { description = "Python client library to the MediaWiki API"; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; license = licenses.mit; homepage = https://github.com/mwclient/mwclient; }; @@ -15528,17 +15499,17 @@ in { }; nbconvert = buildPythonPackage rec { - version = "4.2.0"; + version = "5.1.1"; name = "nbconvert-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/nbconvert/${name}.tar.gz"; - sha256 = "1ik3k1s8dnqcc6hcrzi1wwy6f5kxfz8rnyahvpy984kl49snv52m"; + sha256 = "847731bc39829d0eb1e15a450ac98c71730e3598e53683d4d76a3f3b3fc5017d"; }; buildInputs = with self; [nose ipykernel ]; - propagatedBuildInputs = with self; [ entrypoints mistune jinja2 pygments traitlets jupyter_core nbformat ipykernel tornado jupyter_client]; + propagatedBuildInputs = with self; [ entrypoints bleach mistune jinja2 pygments traitlets testpath jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client]; checkPhase = '' nosetests -v @@ -15556,16 +15527,19 @@ in { }; nbformat = buildPythonPackage rec { - version = "4.0.1"; + version = "4.2.0"; name = "nbformat-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/nbformat/${name}.tar.gz"; - sha256 = "5261c957589b9dfcd387c338d59375162ba9ca82c69e378961a1f4e641285db5"; + sha256 = "389a5b630a30539074f238a48fb9864592f63d611baccfa2ffaf14ffe239de06"; }; + LC_ALL="en_US.UTF-8"; + buildInputs = with self; [ pytest pkgs.glibcLocales ]; + propagatedBuildInputs = with self; [ipython_genutils traitlets testpath jsonschema jupyter_core]; - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ipython_genutils traitlets jsonschema jupyter_core]; + # Failing tests and permission issues + doCheck = false; meta = { description = "The Jupyter Notebook format"; @@ -15611,13 +15585,13 @@ in { slixmpp = buildPythonPackage rec { name = "slixmpp-${version}"; - version = "1.2.1"; + version = "1.2.4.post1"; disabled = pythonOlder "3.4"; src = pkgs.fetchurl { url = "mirror://pypi/s/slixmpp/${name}.tar.gz"; - sha256 = "0fwngxf2pnmpk8vhv4pfxvl1ya3nxr4kc2z6jrh2imynbry3xfj9"; + sha256 = "0v6430dczai8a2nmznhja2dxl6pxa8c5j20nhc5737bqjg7245jk"; }; patchPhase = '' @@ -15881,11 +15855,11 @@ in { nose-exclude = buildPythonPackage rec { name = "nose-exclude-${version}"; - version = "0.4.1"; + version = "0.5.0"; src = pkgs.fetchurl { url = "mirror://pypi/n/nose-exclude/${name}.tar.gz"; - sha256 = "44466a9bcb56d2e568750f91504d1278c74eabb259a305b06e975b87b51635da"; + sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304"; }; propagatedBuildInputs = with self; [ nose ]; @@ -16001,12 +15975,12 @@ in { }; notebook = buildPythonPackage rec { - version = "4.2.3"; + version = "4.3.2"; name = "notebook-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/notebook/${name}.tar.gz"; - sha256 = "39a9603d3fe88b60de2903680c965cf643acf2c16fb2c6bac1d905e1042b5851"; + sha256 = "fc77edf4ec295542172aa66a3e9d527e75038fcaadd3ed20afbf8596e5629aa9"; }; LC_ALL = "en_US.UTF-8"; @@ -16141,12 +16115,12 @@ in { numba = callPackage ../development/python-modules/numba { }; numexpr = buildPythonPackage rec { - version = "2.6.1"; + version = "2.6.2"; name = "numexpr-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/numexpr/${name}.tar.gz"; - sha256 = "db2ee72f277b23c82d204189290ea4b792f9bd5b9d67744b045f8c2a8e929a06"; + sha256 = "6ab8ff5c19e7f452966bf5a3220b845cf3244fe0b96544f7f9acedcc2db5c705"; }; propagatedBuildInputs = with self; [ numpy ]; @@ -16738,22 +16712,23 @@ in { }; }); - osc = buildPythonPackage (rec { - name = "osc-0.133+git"; + osc = buildPythonPackage { + name = "osc-0.156.0-16-g9e6d1a5"; disabled = isPy3k; - - src = pkgs.fetchgit { - url = https://github.com/openSUSE/osc; - rev = "6cd541967ee2fca0b89e81470f18b97a3ffc23ce"; - sha256 = "0bf0yc4y1q87k7hq40xnr687lyw3ma93b3zprjlgn9pr8s1cn9xw"; + src = pkgs.fetchFromGitHub { + owner = "openSUSE"; + repo = "osc"; + rev = "64cbb10095cf9ef0270d65fff58085a13bc0abe9"; + sha256 = "0s5kz5ln96ka0f1sa9nyp34c28mkxkrgcxbvysdawlppg7ay9s1z"; }; - - doCheck = false; + propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ]; postInstall = "ln -s $out/bin/osc-wrapper.py $out/bin/osc"; - - propagatedBuildInputs = with self; [ self.m2crypto ]; - - }); + meta = { + description = "opensuse-commander with svn like handling"; + maintainers = [ maintainers.peti ]; + license = licenses.gpl2; + }; + }; oslosphinx = buildPythonPackage rec { name = "oslosphinx-3.3.1"; @@ -17095,6 +17070,7 @@ in { meta = with stdenv.lib; { description = "Python bindings to the OpenStack Cinder API"; homepage = "http://www.openstack.org/"; + broken = true; }; }; @@ -17374,6 +17350,8 @@ in { url = "mirror://pypi/r/ryu/${name}.tar.gz"; sha256 = "1fhriqi7qnvvx9mbvlfm94i5drh920lg204zy3v0qjz43sinkih6"; }; + + meta.broken = true; }; WSME = buildPythonPackage rec { @@ -17973,11 +17951,11 @@ in { requests-mock = buildPythonPackage rec { name = "requests-mock-${version}"; - version = "0.6.0"; + version = "1.3.0"; src = pkgs.fetchurl { url = "mirror://pypi/r/requests-mock/${name}.tar.gz"; - sha256 = "0gmd88c224y53b1ai8cfsrcxm9kw3gdqzysclmnaqspg7zjhxwd1"; + sha256 = "0jr997dvk6zbmhvbpcv3rajrgag69mcsm1ai3w3rgk2jdh6rg1mx"; }; patchPhase = '' @@ -18065,10 +18043,10 @@ in { bottleneck = buildPythonPackage rec { name = "Bottleneck-${version}"; - version = "1.0.0"; + version = "1.2.0"; src = pkgs.fetchurl { url = "mirror://pypi/B/Bottleneck/Bottleneck-${version}.tar.gz"; - sha256 = "15dl0ll5xmfzj2fsvajzwxsb9dbw5i9fx9i4r6n4i5nzzba7m6wd"; + sha256 = "3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8"; }; buildInputs = with self; [ nose ]; @@ -18134,15 +18112,16 @@ in { }; paramiko = buildPythonPackage rec { - name = "paramiko-${version}"; - version = "2.0.2"; + pname = "paramiko"; + version = "2.1.1"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/paramiko/${name}.tar.gz"; - sha256 = "1p21s7psqj18k9a97nq26yas058i5ivzk7pi7y98l1rbl87zj6s1"; + src = fetchPypi { + inherit pname version; + sha256 = "0xdmamqgx2ymhdm46q8flpj4fncj4wv2dqxzz0bc2dh7mnkss7fm"; }; - propagatedBuildInputs = with self; [ cryptography cryptography_vectors ]; + propagatedBuildInputs = with self; [ cryptography pyasn1 ]; # https://github.com/paramiko/paramiko/issues/449 doCheck = !(isPyPy || isPy33); @@ -18170,11 +18149,11 @@ in { parsel = buildPythonPackage rec { name = "parsel-${version}"; - version = "1.0.3"; + version = "1.1.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/parsel/${name}.tar.gz"; - sha256 = "9c12c370feda864c2f541cecce9bfb3a2a682c6c59c097a852e7b040dc6b8431"; + sha256 = "0a34d1c0bj1fzb5dk5744m2ag6v3b8glk4xp0amqxdan9ldbcd97"; }; buildInputs = with self; [ pytest pytestrunner ]; @@ -18193,11 +18172,11 @@ in { partd = buildPythonPackage rec { name = "partd-${version}"; - version = "0.3.6"; + version = "0.3.7"; src = pkgs.fetchurl { url = "mirror://pypi/p/partd/${name}.tar.gz"; - sha256 = "1wl8kifdljnpbz0ls7mbbc9j23fc5xzm639im7h88spyg02w68hm"; + sha256 = "066d254d2dh9xcanffgkjgwxpz5v0059b063bij10fvzl2y49hzx"; }; buildInputs = with self; [ pytest ]; @@ -18280,17 +18259,21 @@ in { }; paste = buildPythonPackage rec { - name = "paste-1.7.5.1"; - disabled = isPy3k; + name = "paste-${version}"; + version = "2.0.3"; src = pkgs.fetchurl { - url = mirror://pypi/P/Paste/Paste-1.7.5.1.tar.gz; - sha256 = "11645842ba8ec986ae8cfbe4c6cacff5c35f0f4527abf4f5581ae8b4ad49c0b6"; + url = "mirror://pypi/P/Paste/Paste-${version}.tar.gz"; + sha256 = "062jk0nlxf6lb2wwj6zc20rlvrwsnikpkh90y0dn8cjch93s6ii3"; }; - buildInputs = with self; [ nose ]; + checkInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ six ]; - doCheck = false; # some files required by the test seem to be missing + # Certain tests require network + checkPhase = '' + NOSE_EXCLUDE=test_ok,test_form,test_error,test_stderr,test_paste_website nosetests + ''; meta = { description = "Tools for using a Web Server Gateway Interface stack"; @@ -18328,7 +18311,7 @@ in { doCheck = false; buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ paste PasteDeploy cheetah argparse ]; + propagatedBuildInputs = with self; [ six paste PasteDeploy cheetah argparse ]; meta = { description = "A pluggable command-line frontend, including commands to setup package file layouts"; @@ -18521,28 +18504,7 @@ in { }; }; - pep257 = buildPythonPackage rec { - name = "pep257-${version}"; - version = "0.3.2"; - - src = pkgs.fetchurl { - url = "https://github.com/GreenSteam/pep257/archive/${version}.tar.gz"; - sha256 = "0v8aq0xzsa7clazszxl42904c3jpq69lg8a5hg754bqcqf72hfrn"; - }; - LC_ALL="en_US.UTF-8"; - buildInputs = with self; [ pkgs.glibcLocales pytest ]; - - checkPhase = '' - py.test - ''; - - meta = { - homepage = https://github.com/GreenSteam/pep257/; - description = "Python docstring style checker"; - longDescription = "Static analysis tool for checking compliance with Python PEP 257."; - lecense = licenses.mit; - }; - }; + pep257 = callPackage ../development/python-modules/pep257.nix { }; percol = buildPythonPackage rec { name = "percol-${version}"; @@ -18582,17 +18544,19 @@ in { pexpect = buildPythonPackage rec { - version = "3.3"; + version = "4.2.1"; name = "pexpect-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/p/pexpect/${name}.tar.gz"; - sha256 = "dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba"; + sha256 = "3d132465a75b57aa818341c6521392a06cc660feb3988d7f1074f39bd23c9a92"; }; - # Wants to run python in a subprocess + # Wants to run pythonin a subprocess doCheck = false; + propagatedBuildInputs = with self; [ ptyprocess ]; + meta = { homepage = http://www.noah.org/wiki/Pexpect; description = "Automate interactive console applications such as ssh, ftp, etc"; @@ -19649,7 +19613,7 @@ in { description = "Module for reading vCard and vCalendar files"; homepage = http://eventable.github.io/vobject/; license = licenses.asl20; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -19670,7 +19634,7 @@ in { description = "Command-line interface carddav client"; homepage = http://lostpackets.de/pycarddav; license = licenses.mit; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -20121,6 +20085,9 @@ in { path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant}/lib/' + e_path)|"; in '' sed -i "${path_hack_script}" enchant/_enchant.py + + # They hardcode a bad path for Darwin in their library search code + substituteInPlace enchant/_enchant.py --replace '/opt/local/lib/' "" ''; # dictionaries needed for tests @@ -20511,7 +20478,7 @@ in { description = "Media Meta Data retrieval framework"; homepage = http://sourceforge.net/projects/mmpython/; license = licenses.gpl2; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -20554,7 +20521,7 @@ in { description = "Generic application framework, providing the foundation for other modules"; homepage = https://github.com/freevo/kaa-base; license = licenses.lgpl21; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -20601,7 +20568,7 @@ in { description = "Python library for parsing media metadata, which can extract metadata (e.g., such as id3 tags) from a wide range of media files"; homepage = https://github.com/freevo/kaa-metadata; license = licenses.gpl2; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -20808,7 +20775,7 @@ in { for test in $disabledTests; do file="''${test%%:*}" fun="''${test#*:}" - echo "$fun = unittest.expectedFailure($fun)" >> "tests/tests_$file.py" + echo "$fun = unittest.skip($fun)" >> "tests/tests_$file.py" done ''; @@ -21106,11 +21073,11 @@ in { pysocks = buildPythonPackage rec { name = "pysocks-${version}"; - version = "1.5.7"; + version = "1.6.6"; src = pkgs.fetchurl { url = "mirror://pypi/P/PySocks/PySocks-${version}.tar.gz"; - sha256 = "124bydbcspzhkb6ynckvgqra1b79rh5mrq98kbyyd202n6a7c775"; + sha256 = "0h9zwr8z9j6l313ns335irjrkk6qnk4qzvwmjqygrp7mbwi9lh82"; }; doCheck = false; @@ -21501,11 +21468,11 @@ in { pyopenssl = buildPythonPackage rec { name = "pyopenssl-${version}"; - version = "16.1.0"; + version = "16.2.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"; - sha256 = "88f7ada2a71daf2c78a4f139b19d57551b4c8be01f53a1cb5c86c2f3bf01355f"; + sha256 = "0vji4yrfshs15xpczbhzhasnjrwcarsqg87n98ixnyafnyxs6ybp"; }; preCheck = '' @@ -22150,11 +22117,11 @@ in { requests2 = buildPythonPackage rec { name = "requests-${version}"; - version = "2.11.1"; + version = "2.13.0"; src = pkgs.fetchurl { url = "mirror://pypi/r/requests/${name}.tar.gz"; - sha256 = "5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133"; + sha256 = "5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8"; }; nativeBuildInputs = [ self.pytest ]; @@ -23142,12 +23109,12 @@ in { }; s3transfer = buildPythonPackage rec { - version = "0.1.9"; + version = "0.1.10"; name = "s3transfer-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/s/s3transfer/${name}.tar.gz"; - sha256 = "0m67nhdnp2pd11j8h4bgz63zq0mvn2f205vrxmr3my8m45kpvb8p"; + sha256 = "1h8g9bknvxflxkpbnxyfxmk8pvgykbbk9ljdvhqh6z4vjc2926ms"; }; foo = 1; @@ -23494,7 +23461,7 @@ in { url = "mirror://pypi/s/${pname}/${name}.tar.gz"; sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12"; }; - buildInputs = with self; [ pytest virtualenv pytestrunner pytest-virtualenv ]; + buildInputs = with self; [ pytest_29 virtualenv pytestrunner pytest-virtualenv ]; propagatedBuildInputs = with self; [ twisted pathlib2 ]; postPatch = '' sed -i '12,$d' tests/test_main.py @@ -23663,7 +23630,7 @@ in { description = "A Parser Generator for Python"; homepage = https://pypi.python.org/pypi/SimpleParse; platforms = platforms.all; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -24607,16 +24574,16 @@ in { sphinx = buildPythonPackage (rec { name = "${pname}-${version}"; pname = "Sphinx"; - version = "1.5.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "8e6a77a20b2df950de322fc32f3b508697d9d654fe984e3cc88f446a5b4c17c5"; + version = "1.5.2"; + src = fetchPypi { + inherit pname version; + sha256 = "049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722"; }; LC_ALL = "en_US.UTF-8"; - buildInputs = with self; [ nose simplejson mock pkgs.glibcLocales html5lib ] ++ optional (pythonOlder "3.4") self.enum34; + buildInputs = with self; [ pytest simplejson mock pkgs.glibcLocales html5lib ] ++ optional (pythonOlder "3.4") self.enum34; # Disable two tests that require network access. checkPhase = '' - NOSE_EXCLUDE=test_defaults,test_anchors_ignored make test + cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored' ''; propagatedBuildInputs = with self; [ docutils @@ -24631,6 +24598,13 @@ in { imagesize requests2 ]; + + # https://github.com/NixOS/nixpkgs/issues/22501 + # Do not run `python sphinx-build arguments` but `sphinx-build arguments`. + postPatch = '' + substituteInPlace sphinx/make_mode.py --replace "sys.executable, " "" + ''; + meta = { description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; homepage = http://sphinx.pocoo.org/; @@ -25135,7 +25109,7 @@ in { description = "Tool for automatic download/upload subtitles for videofiles using fast hashing"; homepage = http://www.subdownloader.net; license = licenses.gpl3; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -25264,14 +25238,16 @@ in { ''; patchPhase = '' - substituteInPlace "scripts/syncthing-gtk" \ - --replace "/usr/share" "$out/share" - substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'" + 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/wizard.py --replace "/usr/share" "$out/share" + substituteInPlace syncthing-gtk.desktop --replace "/usr/bin/syncthing-gtk" "$out/bin/syncthing-gtk" ''; meta = { description = " GTK3 & python based GUI for Syncthing "; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; platforms = pkgs.syncthing.meta.platforms; homepage = "https://github.com/syncthing/syncthing-gtk"; license = licenses.gpl2; @@ -25303,12 +25279,12 @@ in { }; tabulate = buildPythonPackage rec { - version = "0.7.5"; + version = "0.7.7"; name = "tabulate-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/t/tabulate/${name}.tar.gz"; - sha256 = "9071aacbd97a9a915096c1aaf0dc684ac2672904cd876db5904085d6dac9810e"; + sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6"; }; buildInputs = with self; [ nose ]; @@ -25392,6 +25368,7 @@ in { homepage = http://taskcoach.org/; description = "Todo manager to keep track of personal tasks and todo lists"; license = licenses.gpl3Plus; + broken = stdenv.isDarwin; }; }; @@ -25541,6 +25518,35 @@ in { }; }; + testpath = buildPythonPackage rec { + pname = "testpath"; + version = "0.3"; + name = "${pname}-${version}"; + + #format = "flit"; + #src = pkgs.fetchFromGitHub { + # owner = "jupyter"; + # repo = pname; + # rev = "${version}"; + # sha256 = "1ghzmkrsrk9xrj42pjsq5gl7v3g2v0ji0xy0xzzxp5aizd3wrvl9"; + #}; + #doCheck = true; + #checkPhase = '' + # ${python.interpreter} -m unittest discover + #''; + format = "wheel"; + src = fetchPypi { + inherit pname version format; + sha256 = "f16b2cb3b03e1ada4fb0200b265a4446f92f3ba4b9d88ace34f51c54ab6d294e"; + }; + + meta = { + description = "Test utilities for code working with files and commands"; + license = licenses.mit; + homepage = https://github.com/jupyter/testpath; + }; + }; + testrepository = buildPythonPackage rec { name = "testrepository-${version}"; version = "0.0.20"; @@ -25760,16 +25766,18 @@ in { toolz = buildPythonPackage rec{ name = "toolz-${version}"; - version = "0.8.0"; + version = "0.8.2"; src = pkgs.fetchurl{ url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz"; - sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479"; + sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa"; }; buildInputs = with self; [ nose ]; checkPhase = '' + # https://github.com/pytoolz/toolz/issues/357 + rm toolz/tests/test_serialization.py nosetests toolz/tests ''; @@ -26061,6 +26069,122 @@ in { }; }; + twitter-common-collections = buildPythonPackage rec { + pname = "twitter.common.collections"; + version = "0.3.9"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "0wf8ks6y2kalx2inzayq0w4kh3kg25daik1ac7r6y79i03fslsc5"; + }; + + propagatedBuildInputs = with self; [ twitter-common-lang ]; + + meta = { + description = "Twitter's common collections"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + + twitter-common-confluence = buildPythonPackage rec { + pname = "twitter.common.confluence"; + version = "0.3.9"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "1i2fjn23cmms81f1fhvvkg6hgzqpw07dlqg3ydz6cqv2glw7zq26"; + }; + + propagatedBuildInputs = with self; [ twitter-common-log ]; + + meta = { + description = "Twitter's API to the confluence wiki"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + + twitter-common-dirutil = buildPythonPackage rec { + pname = "twitter.common.dirutil"; + version = "0.3.9"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "1wpjfmmxsdwnbx5dl13is4zkkpfcm94ksbzas9y2qhgswfa9jqha"; + }; + + propagatedBuildInputs = with self; [ twitter-common-lang ]; + + meta = { + description = "Utilities for manipulating and finding files and directories"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + + twitter-common-lang = buildPythonPackage rec { + pname = "twitter.common.lang"; + version = "0.3.9"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "1l8fmnsrx7hgg3ivslg588rnl9n1gfjn2w6224fr8rs7zmkd5lan"; + }; + + meta = { + description = "Twitter's 2.x / 3.x compatibility swiss-army knife"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + + twitter-common-log = buildPythonPackage rec { + pname = "twitter.common.log"; + version = "0.3.9"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "1bdzbxx2bxwpf57xaxfz1nblzgfvhlidz8xqd7s84c62r3prh02v"; + }; + + propagatedBuildInputs = with self; [ twitter-common-options twitter-common-dirutil ]; + + meta = { + description = "Twitter's common logging library"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + + twitter-common-options = buildPythonPackage rec { + pname = "twitter.common.options"; + version = "0.3.9"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "0d1czag5mcxg0vcnlklspl2dvdab9kmznsycj04d3vggi158ljrd"; + }; + + meta = { + description = "Twitter's optparse wrapper"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + twine = buildPythonPackage rec { name = "twine-${version}"; version = "1.8.1"; @@ -26094,6 +26218,13 @@ in { propagatedBuildInputs = with self; [ zope_interface ]; + # Patch t.p._inotify to point to libc. Without this, + # twisted.python.runtime.platform.supportsINotify() == False + patchPhase = optionalString stdenv.isLinux '' + substituteInPlace twisted/python/_inotify.py --replace \ + "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'" + ''; + # Generate Twisted's plug-in cache. Twisted users must do it as well. See # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for @@ -26210,14 +26341,17 @@ in { # # 1.0.0 and up create a circle dependency with traceback2/pbr doCheck = false; - patchPhase = '' + postPatch = '' + # argparse is needed for python < 2.7, which we do not support anymore. + substituteInPlace setup.py --replace "argparse" + # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 sed -i '510i\ return None, False' unittest2/loader.py # https://github.com/pypa/packaging/pull/36 sed -i 's/version=VERSION/version=str(VERSION)/' setup.py ''; - propagatedBuildInputs = with self; [ six argparse traceback2 ]; + propagatedBuildInputs = with self; [ six traceback2 ]; meta = { description = "A backport of the new features added to the unittest testing framework"; @@ -26650,11 +26784,11 @@ EOF webassets = buildPythonPackage rec { name = "webassets-${version}"; - version = "0.12.0"; + version = "0.12.1"; src = pkgs.fetchurl { url = "mirror://pypi/w/webassets/${name}.tar.gz"; - sha256 = "14m13xa5sc7iqq2j1wsd2klcwaihqlhz2l9lmn92dks2yc8hplcr"; + sha256 = "1nrqkpb7z46h2b77xafxihqv3322cwqv6293ngaky4j3ff4cing7"; }; buildInputs = with self; [ nose jinja2 mock pytest ]; @@ -27053,11 +27187,11 @@ EOF xarray = buildPythonPackage rec { name = "xarray-${version}"; - version = "0.8.2"; + version = "0.9.1"; src = pkgs.fetchurl { url = "mirror://pypi/x/xarray/${name}.tar.gz"; - sha256 = "4da06e38baea65c51347ba0770db416ebf003dbad5637215d2b25b191f2be1fb"; + sha256 = "89772ed0e23f0e71c3fb8323746374999ecbe79c113e3fadc7ae6374e6dc0525"; }; buildInputs = with self; [ pytest ]; @@ -27934,7 +28068,7 @@ EOF homepage = https://github.com/scs3jb/screenkey; description = "A screencast tool to show your keys"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }; @@ -27995,6 +28129,10 @@ EOF buildInputs = with self; [ pytest pkgs.glibcLocales ]; }; + libasyncns = callPackage ../development/python-modules/libasyncns.nix { + inherit (pkgs) libasyncns pkgconfig; + }; + pybrowserid = buildPythonPackage rec { name = "PyBrowserID-${version}"; version = "0.9.2"; @@ -28779,13 +28917,13 @@ EOF }; libvirt = let - version = "2.5.0"; + version = "3.0.0"; in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; src = pkgs.fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "1lanyrk4invs5j4jrd7yvy7g8kilihjbcrgs5arx8k3bs9x7izgl"; + sha256 = "1ha4bqf029si1lla1z7ca786w571fh3wfs4h7zaglfk4gb2w39wl"; }; buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; @@ -28804,20 +28942,27 @@ EOF searx = buildPythonPackage rec { name = "searx-${version}"; - version = "0.10.0"; + version = "0.11.0"; src = pkgs.fetchFromGitHub { owner = "asciimoo"; repo = "searx"; rev = "v${version}"; - sha256 = "0j9pnifcrm4kzziip43w2fgadsg1sqlcm7dfxhnshdx03nby2dy2"; + sha256 = "1m6q7yd45lfk19yp30x1jmisff6npa1y348wqc9ixa3ywvb28ky8"; }; - patches = [ ../development/python-modules/searx.patch ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace 'certifi==2016.9.26' 'certifi' \ + --replace 'pyyaml==3.11' 'pyyaml' \ + --replace 'lxml==3.7.1' 'lxml' \ + --replace 'pyopenssl==16.2.0' 'pyopenssl' \ + --replace 'requests[socks]==2.12.4' 'requests[socks]' + ''; propagatedBuildInputs = with self; [ - pyyaml lxml_3_5 grequests flaskbabel flask requests2 - gevent speaklater Babel pytz dateutil pygments_2_0 + pyyaml lxml grequests flaskbabel flask requests2 + gevent speaklater Babel pytz dateutil pygments pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks ]; @@ -29452,7 +29597,7 @@ EOF homepage = http://weboob.org; description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; license = licenses.agpl3; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -30002,16 +30147,15 @@ EOF }; jenkins-job-builder = buildPythonPackage rec { - name = "jenkins-job-builder-1.4.0"; + name = "jenkins-job-builder-1.6.1"; disabled = ! (isPy26 || isPy27); src = pkgs.fetchurl { url = "mirror://pypi/j/jenkins-job-builder/${name}.tar.gz"; - sha256 = "10zipq3dyyfhwvrcyk70zky07b0fssiahwig2h8daw977aszsfqb"; + sha256 = "1v3xknfzgsp35nn3ma4imz233v569v3x75mx2yxlv1xf32nn7yk4"; }; patchPhase = '' - sed -i '/ordereddict/d' requirements.txt export HOME=$TMPDIR ''; @@ -30063,7 +30207,7 @@ EOF poezio = buildPythonApplication rec { name = "poezio-${version}"; - version = "0.10"; + version = "0.11"; disabled = pythonOlder "3.4"; @@ -30071,13 +30215,12 @@ EOF propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 ]; src = pkgs.fetchurl { - url = "http://dev.louiz.org/attachments/download/102/${name}.tar.gz"; - sha256 = "1mm0c3250p0kh7lmmjlp05hbc7byn9lknafgb906xmp4vx1p4kjn"; + url = "http://dev.louiz.org/attachments/download/118/${name}.tar.gz"; + sha256 = "07cn3717swarjv47yw8x95bvngz4nvlyyy9m7ck9fhycjgdy82r0"; }; patches = [ ../development/python-modules/poezio/fix_gnupg_import.patch - ../development/python-modules/poezio/fix_plugins_imports.patch ]; checkPhase = '' @@ -30801,13 +30944,13 @@ EOF w3lib = buildPythonPackage rec { name = "w3lib-${version}"; - version = "1.14.2"; + version = "1.17.0"; buildInputs = with self ; [ six pytest ]; src = pkgs.fetchurl { url = "mirror://pypi/w/w3lib/${name}.tar.gz"; - sha256 = "bd87eae62d208eef70869951abf05e96a8ee559714074a485168de4c5b190004"; + sha256 = "0vshh300ay5wn5hwl9qcb32m71pz5s6miy0if56vm4nggy159inq"; }; meta = { @@ -30866,48 +31009,19 @@ EOF }; }; - scrapy = buildPythonPackage rec { - name = "Scrapy-${version}"; - version = "1.1.2"; + scrapy = callPackage ../development/python-modules/scrapy { }; - buildInputs = with self; [ pkgs.glibcLocales mock pytest botocore testfixtures pillow ]; - propagatedBuildInputs = with self; [ - six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher - ]; - - LC_ALL="en_US.UTF-8"; - - checkPhase = '' - py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py - # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3 - ''; - - src = pkgs.fetchurl { - url = "mirror://pypi/S/Scrapy/${name}.tar.gz"; - sha256 = "a0a8c7bccbd598d2731ec9f267b8efbd8fb99767f826f8f2924a5610707a03d4"; - }; - - meta = { - description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; - homepage = "http://scrapy.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ drewkett ]; - platforms = platforms.linux; - }; - }; pandocfilters = buildPythonPackage rec{ - version = "1.3.0"; + version = "1.4.1"; pname = "pandocfilters"; name = pname + "-${version}"; - src = pkgs.fetchFromGitHub { - owner = "jgm"; - repo = pname; - rev = version; - sha256 = "0ky9k800ixwiwvra0na6d6qaqcyps83mycgd8qvkrn5r80hddkzz"; + src = fetchPypi{ + inherit pname version; + sha256 = "ec8bcd100d081db092c57f93462b1861bcfa1286ef126f34da5cb1d969538acd"; }; - - propagatedBuildInputs = with self; [ ]; + # No tests available + doCheck = false; meta = { description = "A python module for writing pandoc filters, with a collection of examples"; @@ -30965,27 +31079,7 @@ EOF }; }; - Keras = buildPythonPackage rec { - name = "Keras-${version}"; - version = "1.0.3"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/k/keras/${name}.tar.gz"; - sha256 = "0wi826bvifvy12w490ghj1g45z5xb83q2cadqh425sg56p98khaq"; - }; - - propagatedBuildInputs = with self; [ - six Theano pyyaml - ]; - - meta = { - description = "Deep Learning library for Theano and TensorFlow"; - homepage = "https://keras.io"; - license = licenses.mit; - maintainers = with maintainers; [ NikolaMandic ]; - }; - }; + Keras = callPackage ../development/python-modules/keras { }; Lasagne = buildPythonPackage rec { name = "Lasagne-${version}"; @@ -31108,78 +31202,11 @@ EOF }; }; - # tensorflow is built from a downloaded wheel, because the upstream - # project's build system is an arcane beast based on - # bazel. Untangling it and building the wheel from source is an open - # problem. + tensorflow = self.tensorflowWithoutCuda; - tensorflow = self.tensorflowNoGpuSupport; + tensorflowWithoutCuda = callPackage ../development/python-modules/tensorflow { }; - tensorflowNoGpuSupport = buildPythonPackage rec { - name = "tensorflow"; - version = "0.10.0"; - format = "wheel"; - - src = pkgs.fetchurl { - url = if stdenv.isDarwin then - "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-py2-none-any.whl" else - "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl"; - sha256 = if stdenv.isDarwin then - "1gjybh3j3rn34bzhsxsfdbqgsr4jh50qyx2wqywvcb24fkvy40j9" else - "0g05pa4z6kdy0giz7hjgjgwf4zzr5l8cf1zh247ymixlikn3fnpx"; - }; - - propagatedBuildInputs = with self; [ numpy six protobuf3_0_0b2 pkgs.swig mock]; - - preFixup = '' - RPATH="${stdenv.lib.makeLibraryPath [ pkgs.gcc.cc.lib pkgs.zlib ]}" - find $out -name '*.so' -exec patchelf --set-rpath "$RPATH" {} \; - ''; - - doCheck = false; - - meta = { - description = "TensorFlow helps the tensors flow (no gpu support)"; - homepage = http://tensorflow.org; - license = licenses.asl20; - platforms = with platforms; linux ++ darwin; - }; - }; - - tensorflowCuDNN = buildPythonPackage rec { - name = "tensorflow"; - version = "0.11.0rc0"; - format = "wheel"; - - src = pkgs.fetchurl { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-${version}-cp27-none-linux_x86_64.whl"; - sha256 = "1r8zlz95sw7bnjzg5zdbpa9dj8wmp8cvvgyl9sv3amsscagnnfj5"; - }; - - buildInputs = with self; [ pkgs.swig ]; - propagatedBuildInputs = with self; [ numpy six protobuf3_0 pkgs.cudatoolkit75 pkgs.cudnn5_cudatoolkit75 pkgs.gcc49 self.mock ]; - - # Note that we need to run *after* the fixup phase because the - # libraries are loaded at runtime. If we run in preFixup then - # patchelf --shrink-rpath will remove the cuda libraries. - postFixup = let rpath = stdenv.lib.makeLibraryPath [ - pkgs.gcc49.cc.lib - pkgs.zlib pkgs.cudatoolkit75 - pkgs.cudnn5_cudatoolkit75 - pkgs.linuxPackages.nvidia_x11 - ]; in '' - find $out -name '*.so' -exec patchelf --set-rpath "${rpath}" {} \; - ''; - - doCheck = false; - - meta = { - description = "TensorFlow helps the tensors flow (no gpu support)"; - homepage = http://tensorflow.org; - license = licenses.asl20; - platforms = platforms.linux; - }; - }; + tensorflowWithCuda = callPackage ../development/python-modules/tensorflow/cuda.nix { }; tflearn = buildPythonPackage rec { name = "tflearn-0.2.1"; @@ -31709,7 +31736,7 @@ EOF url = "mirror://pypi/a/${pname}/${name}.tar.gz"; sha256 = "1158ml8h3g0vlsgw2jmy579glbg7dn0mjij8xibdl509b8qv9p51"; }; - buildInputs = with self; [ unittest2 mock pytest trollius ]; + buildInputs = with self; [ unittest2 mock pytest_29 trollius ]; propagatedBuildInputs = with self; [ six twisted txaio ]; checkPhase = '' py.test $out @@ -31868,18 +31895,28 @@ EOF }; pypandoc = buildPythonPackage rec { - name = "pypandoc-1.2.0"; + name = "pypandoc-1.3.3"; src = pkgs.fetchurl { - url = "mirror://pypi/p/pypandoc/${name}.zip"; - sha256 = "1sxmgrpy0a0yy3nyxiymzqrw715gm23s01fq53q4vgn79j47jakm"; + url = "mirror://pypi/p/pypandoc/${name}.tar.gz"; + sha256 = "0628f2kn4gqimnhpf251fgzl723hwgyl3idy69dkzyjvi45s5zm6"; }; + + # Fix tests: first requires network access, second is a bug (reported upstream) + preConfigure = '' + substituteInPlace tests.py --replace "pypandoc.convert(url, 'html')" "'GPL2 license'" + substituteInPlace tests.py --replace "pypandoc.convert_file(file_name, lua_file_name)" "'

title

'" + ''; + + LC_ALL="en_US.UTF-8"; + propagatedBuildInputs = with self; [ self.pip ]; - buildInputs = [ pkgs.pandoc pkgs.texlive.combined.scheme-small pkgs.haskellPackages.pandoc-citeproc ]; + buildInputs = [ pkgs.pandoc pkgs.texlive.combined.scheme-small pkgs.haskellPackages.pandoc-citeproc pkgs.glibcLocales ]; + meta = with pkgs.stdenv.lib; { description = "Thin wrapper for pandoc"; homepage = "https://github.com/bebraw/pypandoc"; license = licenses.mit; - maintainers = with maintainers; [ bennofs ]; + maintainers = with maintainers; [ bennofs kristoff3r ]; }; }; @@ -31943,7 +31980,7 @@ EOF sha256 = "0h94x9mc9bspg23lb1f73h7smdzc39ps7z7sm0q38ds9jahmvfc7"; }; - buildInputs = with self; [ case pytest_30 ]; + buildInputs = with self; [ case pytest ]; meta = { homepage = https://github.com/celery/vine; @@ -31996,6 +32033,10 @@ EOF }; }; + incremental = callPackage ../development/python-modules/incremental { }; + + treq = callPackage ../development/python-modules/treq { }; + }); in fix' (extends overrides packages) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index f582bcf3b32..f9382985fcd 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -14,17 +14,17 @@ let /* Basic list of packages to cross-build */ basicCrossDrv = { - gccCrossStageFinal = nativePlatforms; - bison.crossDrv = nativePlatforms; - busybox.crossDrv = nativePlatforms; - coreutils.crossDrv = nativePlatforms; - dropbear.crossDrv = nativePlatforms; + bison = nativePlatforms; + busybox = nativePlatforms; + coreutils = nativePlatforms; + dropbear = nativePlatforms; }; /* Basic list of packages to be natively built, but need a crossSystem defined to get meaning */ basicNativeDrv = { - gdbCross.nativeDrv = nativePlatforms; + buildPackages.gccCrossStageFinal = nativePlatforms; + buildPackages.gdbCross = nativePlatforms; }; basic = basicCrossDrv // basicNativeDrv; @@ -32,8 +32,10 @@ let in { - # These `nativeDrv`s should be identical to their vanilla ones --- cross - # compiling should not affect the native derivation. + # These derivations from a cross package set's `buildPackages` should be + # identical to their vanilla equivalents --- none of these package should + # observe the target platform which is the only difference between those + # package sets. ensureUnaffected = let # Absurd values are fine here, as we are not building anything. In fact, # there probably a good idea to try to be "more parametric" --- i.e. avoid @@ -47,8 +49,12 @@ in # good idea lest there be some irrelevant pass-through debug attrs that # cause false negatives. testEqualOne = path: system: let - f = attrs: builtins.toString (lib.getAttrFromPath path (allPackages attrs)); - in assert f { inherit system; } == f { inherit system crossSystem; }; true; + f = path: attrs: builtins.toString (lib.getAttrFromPath path (allPackages attrs)); + in assert + f path { inherit system; } + == + f (["buildPackages"] ++ path) { inherit system crossSystem; }; + true; testEqual = path: systems: forAllSupportedSystems systems (testEqualOne path); @@ -79,7 +85,7 @@ in openssl.system = "linux-generic32"; }; in mapTestOnCross crossSystem (basic // { - ubootSheevaplug.crossDrv = nativePlatforms; + ubootSheevaplug = nativePlatforms; }); @@ -92,14 +98,14 @@ in platform = {}; }; in mapTestOnCross crossSystem { - coreutils.crossDrv = nativePlatforms; - boehmgc.crossDrv = nativePlatforms; - gmp.crossDrv = nativePlatforms; - guile_1_8.crossDrv = nativePlatforms; - libffi.crossDrv = nativePlatforms; - libtool.crossDrv = nativePlatforms; - libunistring.crossDrv = nativePlatforms; - windows.wxMSW.crossDrv = nativePlatforms; + coreutils = nativePlatforms; + boehmgc = nativePlatforms; + gmp = nativePlatforms; + guile_1_8 = nativePlatforms; + libffi = nativePlatforms; + libtool = nativePlatforms; + libunistring = nativePlatforms; + windows.wxMSW = nativePlatforms; }; @@ -113,14 +119,14 @@ in platform = {}; }; in mapTestOnCross crossSystem { - coreutils.crossDrv = nativePlatforms; - boehmgc.crossDrv = nativePlatforms; - gmp.crossDrv = nativePlatforms; - guile_1_8.crossDrv = nativePlatforms; - libffi.crossDrv = nativePlatforms; - libtool.crossDrv = nativePlatforms; - libunistring.crossDrv = nativePlatforms; - windows.wxMSW.crossDrv = nativePlatforms; + coreutils = nativePlatforms; + boehmgc = nativePlatforms; + gmp = nativePlatforms; + guile_1_8 = nativePlatforms; + libffi = nativePlatforms; + libtool = nativePlatforms; + libunistring = nativePlatforms; + windows.wxMSW = nativePlatforms; }; @@ -150,9 +156,9 @@ in }; }; in mapTestOnCross crossSystem { - coreutils.crossDrv = nativePlatforms; - ed.crossDrv = nativePlatforms; - patch.crossDrv = nativePlatforms; + coreutils = nativePlatforms; + ed = nativePlatforms; + patch = nativePlatforms; }; @@ -176,16 +182,16 @@ in }; }; in mapTestOnCross crossSystem { - coreutils.crossDrv = nativePlatforms; - ed.crossDrv = nativePlatforms; - patch.crossDrv = nativePlatforms; - vim.crossDrv = nativePlatforms; - unzip.crossDrv = nativePlatforms; - ddrescue.crossDrv = nativePlatforms; - lynx.crossDrv = nativePlatforms; - patchelf.crossDrv = nativePlatforms; - binutils.crossDrv = nativePlatforms; - mpg123.crossDrv = nativePlatforms; + coreutils = nativePlatforms; + ed = nativePlatforms; + patch = nativePlatforms; + vim = nativePlatforms; + unzip = nativePlatforms; + ddrescue = nativePlatforms; + lynx = nativePlatforms; + patchelf = nativePlatforms; + buildPackages.binutils = nativePlatforms; + mpg123 = nativePlatforms; }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 8ab27bc171d..86fbb0bf1b8 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -127,12 +127,12 @@ with import ./release-lib.nix { inherit supportedSystems; }; perl = all; pkgconfig = all; pmccabe = linux; - portmap = linux; procps = linux; python = allBut cygwin; readline = all; rlwrap = all; rpm = linux; + rpcbind = linux; rsync = linux; screen = linux ++ darwin; scrot = linux; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index ea827651b2f..faed3a218fc 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2017-01-08"; - rev = "5ca2f329d51b9466d9bda79172e0135edaf15f30"; - sha256 = "19h3zyx83va00ssagqsk9h0c83ir9wqhn192xvk5k44m9648jvsh"; + version = "2017-02-19"; + rev = "d822c5853cb14caa5de84a71f6d4ed07ea5e31e1"; + sha256 = "18m0smlqw3vkn0ljk01l333jj0x32m8rr1dgmpnq621vqvpk5mzp"; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix new file mode 100644 index 00000000000..a22587d5b57 --- /dev/null +++ b/pkgs/top-level/splice.nix @@ -0,0 +1,81 @@ +# The `splicedPackages' package set, and its use by `callPackage` +# +# The `buildPackages` pkg set is a new concept, and the vast majority package +# expression (the other *.nix files) are not designed with it in mind. This +# presents us with a problem with how to get the right version (build-time vs +# run-time) of a package to a consumer that isn't used to thinking so cleverly. +# +# The solution is to splice the package sets together as we do below, so every +# `callPackage`d expression in fact gets both versions. Each# derivation (and +# each derivation's outputs) consists of the run-time version, augmented with a +# `nativeDrv` field for the build-time version, and `crossDrv` field for the +# run-time version. +# +# We could have used any names we want for the disambiguated versions, but +# `crossDrv` and `nativeDrv` were somewhat similarly used for the old +# cross-compiling infrastructure. The names are mostly invisible as +# `mkDerivation` knows how to pull out the right ones for `buildDepends` and +# friends, but a few packages use them directly, so it seemed efficient (to +# @Ericson2314) to reuse those names, at least initially, to minimize breakage. +# +# For performance reasons, rather than uniformally splice in all cases, we only +# do so when `pkgs` and `buildPackages` are distinct. The `actuallySplice` +# parameter there the boolean value of that equality check. +lib: pkgs: actuallySplice: + +let + defaultBuildScope = pkgs.buildPackages // pkgs.buildPackages.xorg; + # TODO(@Ericson2314): we shouldn't preclude run-time fetching by removing + # these attributes. We should have a more general solution for selecting + # whether `nativeDrv` or `crossDrv` is the default in `defaultScope`. + pkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs; + defaultRunScope = pkgsWithoutFetchers // pkgs.xorg; + + splicer = buildPkgs: runPkgs: let + mash = buildPkgs // runPkgs; + merge = name: { + inherit name; + value = let + defaultValue = mash.${name}; + buildValue = buildPkgs.${name} or {}; + runValue = runPkgs.${name} or {}; + augmentedValue = defaultValue + // (lib.optionalAttrs (buildPkgs ? ${name}) { nativeDrv = buildValue; }) + // (lib.optionalAttrs (runPkgs ? ${name}) { crossDrv = runValue; }); + # Get the set of outputs of a derivation + getOutputs = value: + lib.genAttrs (value.outputs or []) (output: value.${output}); + in + # Certain *Cross derivations will fail assertions, but we need their + # nativeDrv. We are assuming anything that fails to evaluate is an + # attrset (including derivation) and thus can be unioned. + if !(builtins.tryEval defaultValue).success then augmentedValue + # The derivation along with its outputs, which we recur + # on to splice them together. + else if lib.isDerivation defaultValue then augmentedValue + // splicer (getOutputs buildValue) (getOutputs runValue) + # Just recur on plain attrsets + else if lib.isAttrs defaultValue then splicer buildValue runValue + # Don't be fancy about non-derivations. But we could have used used + # `__functor__` for functions instead. + else defaultValue; + }; + in lib.listToAttrs (map merge (lib.attrNames mash)); + + splicedPackages = + if actuallySplice + then splicer defaultBuildScope defaultRunScope + else pkgs // pkgs.xorg; + +in + +{ + # We use `callPackage' to be able to omit function arguments that can be + # obtained `pkgs` or `buildPackages` and their `xorg` package sets. Use + # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below). + callPackage = pkgs.newScope {}; + + callPackages = lib.callPackagesWith splicedPackages; + + newScope = extra: lib.callPackageWith (splicedPackages // extra); +} diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index cbf65870eb7..6febedb79f3 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -9,8 +9,45 @@ import `pkgs/default.nix` or `default.nix`. */ -{ # The system (e.g., `i686-linux') for which to build the packages. - system +{ ## Misc parameters kept the same for all stages + ## + + # Utility functions, could just import but passing in for efficiency + lib + +, # Use to reevaluate Nixpkgs; a dirty hack that should be removed + nixpkgsFun + + ## Platform parameters + ## + ## The "build" "host" "target" terminology below comes from GNU Autotools. See + ## its documentation for more information on what those words mean. Note that + ## each should always be defined, even when not cross compiling. + ## + ## For purposes of bootstrapping, think of each stage as a "sliding window" + ## over a list of platforms. Specifically, the host platform of the previous + ## stage becomes the build platform of the current one, and likewise the + ## target platform of the previous stage becomes the host platform of the + ## current one. + ## + +, # The platform on which packages are built. Consists of `system`, a + # string (e.g.,`i686-linux') identifying the most import attributes of the + # build platform, and `platform` a set of other details. + buildPlatform + +, # The platform on which packages run. + hostPlatform + +, # The platform which build tools (especially compilers) build for in this stage, + targetPlatform + + ## Other parameters + ## + +, # The package set used at build-time. If null, `buildPackages` will + # be defined internally as the produced package set as itself. + buildPackages , # The standard environment to use for building packages. stdenv @@ -21,21 +58,19 @@ allowCustomOverrides , # Non-GNU/Linux OSes are currently "impure" platforms, with their libc - # outside of the store. Thus, GCC, GFortran, & co. must always look for - # files in standard system directories (/usr/include, etc.) - noSysDirs ? (system != "x86_64-freebsd" && system != "i686-freebsd" - && system != "x86_64-solaris" - && system != "x86_64-kfreebsd-gnu") + # outside of the store. Thus, GCC, GFortran, & co. must always look for files + # in standard system directories (/usr/include, etc.) + noSysDirs ? buildPlatform.system != "x86_64-freebsd" + && buildPlatform.system != "i686-freebsd" + && buildPlatform.system != "x86_64-solaris" + && buildPlatform.system != "x86_64-kfreebsd-gnu" , # The configuration attribute set config -, overlays # List of overlays to use in the fix-point. - -, crossSystem -, platform -, lib -, nixpkgsFun +, # A list of overlays (Additional `self: super: { .. }` customization + # functions) to be fixed together in the produced package set + overlays }: let @@ -50,11 +85,28 @@ let }; stdenvBootstappingAndPlatforms = self: super: { - stdenv = stdenv // { inherit platform; }; - inherit - system platform crossSystem; + buildPackages = (if buildPackages == null then self else buildPackages) + // { recurseForDerivations = false; }; + inherit stdenv + buildPlatform hostPlatform targetPlatform; }; + # The old identifiers for cross-compiling. These should eventually be removed, + # and the packages that rely on them refactored accordingly. + platformCompat = self: super: let + # TODO(@Ericson2314) this causes infinite recursion + #inherit (self) buildPlatform hostPlatform targetPlatform; + in { + stdenv = super.stdenv // { + inherit (buildPlatform) platform; + } // lib.optionalAttrs (targetPlatform != buildPlatform) { + cross = targetPlatform; + }; + inherit (buildPlatform) system platform; + }; + + splice = self: super: import ./splice.nix lib self (buildPackages != null); + allPackages = self: super: let res = import ./all-packages.nix { inherit lib nixpkgsFun noSysDirs config; } @@ -83,8 +135,10 @@ let # The complete chain of package set builders, applied from top to bottom toFix = lib.foldl' (lib.flip lib.extends) (self: {}) ([ stdenvBootstappingAndPlatforms + platformCompat stdenvAdapters trivialBuilders + splice allPackages aliases stdenvOverrides