diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 124a1d19ecbc..297b91976a88 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -8,47 +8,75 @@ # Mentioned users will get code review requests. # This file -.github/CODEOWNERS @edolstra +/.github/CODEOWNERS @edolstra # Boostraping and core infra -pkgs/stdenv/ @edolstra -pkgs/build-support/cc-wrapper/ @edolstra +/pkgs/stdenv @edolstra +/pkgs/build-support/cc-wrapper @edolstra # Libraries -lib/ @edolstra +/lib @edolstra @nbp + +# Nixpkgs Internals +/default.nix @nbp +/pkgs/top-level/default.nix @nbp +/pkgs/top-level/impure.nix @nbp +/pkgs/top-level/stage.nix @nbp + +# NixOS Internals +/nixos/default.nix @nbp +/nixos/lib/from-env.nix @nbp +/nixos/lib/eval-config.nix @nbp +/nixos/doc/manual/configuration/abstractions.xml @nbp +/nixos/doc/manual/configuration/config-file.xml @nbp +/nixos/doc/manual/configuration/config-syntax.xml @nbp +/nixos/doc/manual/configuration/modularity.xml @nbp +/nixos/doc/manual/development/assertions.xml @nbp +/nixos/doc/manual/development/meta-attributes.xml @nbp +/nixos/doc/manual/development/option-declarations.xml @nbp +/nixos/doc/manual/development/option-def.xml @nbp +/nixos/doc/manual/development/option-types.xml @nbp +/nixos/doc/manual/development/replace-modules.xml @nbp +/nixos/doc/manual/development/writing-modules.xml @nbp +/nixos/doc/manual/man-nixos-option.xml @nbp +/nixos/modules/installer/tools/nixos-option.sh @nbp # Python-related code and docs -pkgs/top-level/python-packages.nix @FRidh -pkgs/development/interpreters/python/* @FRidh -pkgs/development/python-modules/* @FRidh -doc/languages-frameworks/python.md @FRidh +/pkgs/top-level/python-packages.nix @FRidh +/pkgs/development/interpreters/python @FRidh +/pkgs/development/python-modules @FRidh +/doc/languages-frameworks/python.md @FRidh # Haskell -pkgs/development/compilers/ghc @peti -pkgs/development/haskell-modules @peti -pkgs/development/haskell-modules/default.nix @peti -pkgs/development/haskell-modules/generic-builder.nix @peti -pkgs/development/haskell-modules/hoogle.nix @peti +/pkgs/development/compilers/ghc @peti +/pkgs/development/haskell-modules @peti +/pkgs/development/haskell-modules/default.nix @peti +/pkgs/development/haskell-modules/generic-builder.nix @peti +/pkgs/development/haskell-modules/hoogle.nix @peti # R -pkgs/applications/science/math/R @peti -pkgs/development/r-modules @peti +/pkgs/applications/science/math/R @peti +/pkgs/development/r-modules @peti + +# Ruby +/pkgs/development/interpreters/ruby @zimbatm +/pkgs/development/ruby-modules @zimbatm # Darwin-related -/pkgs/stdenv/darwin/ @org/darwin-maintainers -/pkgs/os-specific/darwin/ @org/darwin-maintainers +/pkgs/stdenv/darwin @NixOS/darwin-maintainers +/pkgs/os-specific/darwin @NixOS/darwin-maintainers # Beam-related (Erlang, Elixir, LFE, etc) -pkgs/development/beam-modules/* @gleber -pkgs/development/interpreters/erlang/* @gleber -pkgs/development/interpreters/lfe/* @gleber -pkgs/development/interpreters/elixir/* @gleber -pkgs/development/tools/build-managers/rebar/* @gleber -pkgs/development/tools/build-managers/rebar3/* @gleber -pkgs/development/tools/erlang/* @gleber +/pkgs/development/beam-modules @gleber +/pkgs/development/interpreters/erlang @gleber +/pkgs/development/interpreters/lfe @gleber +/pkgs/development/interpreters/elixir @gleber +/pkgs/development/tools/build-managers/rebar @gleber +/pkgs/development/tools/build-managers/rebar3 @gleber +/pkgs/development/tools/erlang @gleber # Jetbrains -pkgs/applications/editors/jetbrains @edwtjo +/pkgs/applications/editors/jetbrains @edwtjo # Eclipse -pkgs/applications/editors/eclipse @rycee +/pkgs/applications/editors/eclipse @rycee diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f7fac647f412..41e85bd5ac46 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -32,11 +32,14 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. The old config generation system used impure shell scripts and could break in specific circumstances (see #1234). * `meta.description` should: - * Be capitalized - * Not start with the package name - * Not have a dot at the end + * Be capitalized. + * Not start with the package name. + * Not have a period at the end. +* `meta.license` must be set and fit the upstream license. + * If there is no upstream license, `meta.license` should default to `stdenv.lib.licenses.unfree`. +* `meta.maintainers` must be set. -See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes). +See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes). ## Writing good commit messages diff --git a/doc/configuration.xml b/doc/configuration.xml index ac03b42714c6..55c5ea809d35 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -55,6 +55,10 @@ configuration file located at +Note that we are not able to test or build unfree software on Hydra +due to policy. Most unfree licenses prohibit us from either executing or +distributing the software. +
Installing broken packages diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 7bdbbbd903a0..cf81b240ceac 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -165,7 +165,7 @@ run the script in the `python3` shell. ```py #! /usr/bin/env nix-shell -#! nix-shell -i 'python3.withPackages(ps: [ps.numpy])' +#! nix-shell -i python3 -p "python3.withPackages(ps: [ps.numpy])" import numpy diff --git a/doc/manual.xml b/doc/manual.xml index 75bd21557fd1..eb0a24789d44 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -18,6 +18,7 @@ + diff --git a/doc/meta.xml b/doc/meta.xml index b1ffd0502b2b..0f9dccfb91b5 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -200,11 +200,9 @@ meta-attributes meta.platforms = stdenv.lib.platforms.linux; - Attribute Set stdenv.lib.platforms in - - nixpkgs/lib/platforms.nix defines various common - lists of platforms types. - + Attribute Set stdenv.lib.platforms defines + + various common lists of platforms types. diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 4d87a3a67fe9..184bee089ae3 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -664,4 +664,34 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el
+
+Weechat + +Weechat can currently be configured to include your choice of plugins. +To make use of this functionality, install an expression that overrides its configuration such as +weechat.override {configure = {availablePlugins, ...}: { + plugins = with availablePlugins; [ python perl ]; + } +} + + +The plugins currently available are python, +perl, ruby, guile, +tcl and lua. + + +The python plugin allows the addition of extra libraries. For instance, +the inotify.py script in weechat-scripts requires +D-Bus or libnotify, and the fish.py script requires +pycrypto. To use these scripts, use the python +plugin's withPackages attribute: +weechat.override {configure = {availablePlugins, ...}: { + plugins = with availablePlugins; [ + (python.withPackages (ps: with ps; [ pycrypto python-dbus ])) + ]; + } +} + + +
diff --git a/doc/platform-notes.xml b/doc/platform-notes.xml new file mode 100644 index 000000000000..f4f6ec600294 --- /dev/null +++ b/doc/platform-notes.xml @@ -0,0 +1,83 @@ + + +Platform Notes + +
+ +Darwin (macOS) +Some common issues when packaging software for darwin: + + + + + + The darwin stdenv uses clang instead of gcc. + When referring to the compiler $CC or cc + will work in both cases. Some builds hardcode gcc/g++ in their + build scripts, that can usually be fixed with using something + like makeFlags = [ "CC=cc" ]; or by patching + the build scripts. + + + + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + buildPhase = '' + $CC -o hello hello.c + ''; + } + + + + + + On darwin libraries are linked using absolute paths, libraries + are resolved by their install_name at link + time. Sometimes packages won't set this correctly causing the + library lookups to fail at runtime. This can be fixed by adding + extra linker flags or by running install_name_tool -id + during the fixupPhase. + + + + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + makeFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; + } + + + + + + Some packages assume xcode is available and use xcrun + to resolve build tools like clang, etc. + This causes errors like xcode-select: error: no developer tools were found at '/Applications/Xcode.app' + while the build doesn't actually depend on xcode. + + + + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + prePatch = '' + substituteInPlace Makefile \ + --replace '/usr/bin/xcrun clang' clang + ''; + } + + + + The package xcbuild can be used to build projects + that really depend on Xcode, however projects that build some kind of + graphical interface won't work without using Xcode in an impure way. + + + + +
+ + diff --git a/doc/stdenv.xml b/doc/stdenv.xml index a097762130a5..ee110b771049 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -698,8 +698,14 @@ nothing. A list of strings passed as additional flags to make. These flags are also used by the default install and check phase. For setting make flags specific to the - build phase, use buildFlags (see - below). + build phase, use buildFlags (see below). + + +makeFlags = [ "PREFIX=$(out)" ]; + + + The flags are quoted in bash, but environment variables can + be specified by using the make syntax. diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b71b5d7aa544..514709082fce 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -44,11 +44,13 @@ anderspapitto = "Anders Papitto "; andir = "Andreas Rammhold "; andres = "Andres Loeh "; + andrestylianos = "Andre S. Ramos "; andrewrk = "Andrew Kelley "; andsild = "Anders Sildnes "; aneeshusa = "Aneesh Agrawal "; ankhers = "Justin Wood "; antono = "Antono Vasiljev "; + antonxy = "Anton Schirg "; apeschar = "Albert Peschar "; apeyroux = "Alexandre Peyroux "; ardumont = "Antoine R. Dumont "; @@ -66,7 +68,7 @@ aycanirican = "Aycan iRiCAN "; bachp = "Pascal Bach "; badi = "Badi' Abdul-Wahid "; - balajisivaraman = "Balaji Sivaraman"; + balajisivaraman = "Balaji Sivaraman "; barrucadu = "Michael Walker "; basvandijk = "Bas van Dijk "; Baughn = "Svein Ove Aas "; @@ -93,6 +95,7 @@ bramd = "Bram Duvigneau "; bstrik = "Berno Strik "; bzizou = "Bruno Bzeznik "; + c0bw3b = "Renaud "; c0dehero = "CodeHero "; calbrecht = "Christian Albrecht "; calrama = "Moritz Maxeiner "; @@ -116,6 +119,7 @@ christopherpoole = "Christopher Mark Poole "; ciil = "Simon Lackerbauer "; ckampka = "Christian Kampka "; + ckauhaus = "Christian Kauhaus "; cko = "Christine Koppelt "; cleverca22 = "Michael Bishop "; cmcdragonkai = "Roger Qiu "; @@ -135,6 +139,7 @@ cryptix = "Henry Bubert "; CrystalGamma = "Jona Stubbe "; cstrahan = "Charles Strahan "; + csingley = "Christopher Singley "; cwoac = "Oliver Matthews "; DamienCassou = "Damien Cassou "; danbst = "Danylo Hlynskyi "; @@ -161,6 +166,7 @@ dgonyeo = "Derek Gonyeo "; dipinhora = "Dipin Hora "; disassembler = "Samuel Leathers "; + dizfer = "David Izquierdo "; dmalikov = "Dmitry Malikov "; DmitryTsygankov = "Dmitry Tsygankov "; dmjio = "David Johnson "; @@ -259,6 +265,7 @@ hbunke = "Hendrik Bunke "; hce = "Hans-Christian Esperer "; hectorj = "Hector Jusforgues "; + hedning = "Tor Hedin Brønner "; heel = "Sergii Paryzhskyi "; henrytill = "Henry Till "; hhm = "hhm "; @@ -268,6 +275,7 @@ htr = "Hugo Tavares Reis "; iand675 = "Ian Duncan "; ianwookim = "Ian-Woo Kim "; + iblech = "Ingo Blechschmidt "; igsha = "Igor Sharonov "; ikervagyok = "Balázs Lengyel "; infinisil = "Silvan Mosberger "; @@ -322,6 +330,7 @@ KibaFox = "Kiba Fox "; kierdavis = "Kier Davis "; kiloreux = "Kiloreux Emperex "; + kini = "Keshav Kini "; kkallio = "Karn Kallio "; knedlsepp = "Josef Kemetmüller "; konimex = "Muhammad Herdiansyah "; @@ -439,7 +448,7 @@ nicknovitski = "Nick Novitski "; nico202 = "Nicolò Balzarotti "; NikolaMandic = "Ratko Mladic "; - nixy = "Andrew R. M. "; + nixy = "Andrew R. M. "; nocoolnametom = "Tom Doggett "; notthemessiah = "Brian Cohen "; np = "Nicolas Pouillard "; @@ -548,6 +557,7 @@ ryneeverett = "Ryne Everett "; rzetterberg = "Richard Zetterberg "; s1lvester = "Markus Silvester "; + samdroid-apps = "Sam Parkinson "; samuelrivas = "Samuel Rivas "; sander = "Sander van der Burg "; sargon = "Daniel Ehlers "; @@ -557,6 +567,7 @@ schristo = "Scott Christopher "; scolobb = "Sergiu Ivanov "; sdll = "Sasha Illarionov "; + SeanZicari = "Sean Zicari "; sepi = "Raffael Mancini "; seppeljordan = "Sebastian Jordan "; shanemikel = "Shane Pearlman "; @@ -580,6 +591,7 @@ snyh = "Xia Bin "; solson = "Scott Olson "; sorpaas = "Wei Tang "; + sorki = "Richard Marko "; spacefrogg = "Michael Raitza "; spencerjanssen = "Spencer Janssen "; spinus = "Tomasz Czyż "; @@ -618,6 +630,7 @@ ThomasMader = "Thomas Mader "; thoughtpolice = "Austin Seipp "; timbertson = "Tim Cuthbertson "; + timokau = "Timo Kaufmann "; titanous = "Jonathan Rudenberg "; tnias = "Philipp Bartsch "; tohl = "Tomas Hlavaty "; diff --git a/lib/modules.nix b/lib/modules.nix index eb2f89684f3b..8c3584bbbf4c 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -338,7 +338,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.description}.") + else throw "The option value `${showOption loc}' in `${def.file}' is not of type `${type.description}'.") (type.merge loc defsFinal) defsFinal; isDefined = defsFinal != []; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 9ce697a1f7a9..9dcd59066d02 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -2,7 +2,6 @@ rec { pcBase = { name = "pc"; - uboot = null; kernelHeadersBaseConfig = "defconfig"; kernelBaseConfig = "defconfig"; # Build whatever possible as a module, if not stated in the extra config. @@ -50,9 +49,6 @@ rec { kernelTarget = "uImage"; # TODO reenable once manual-config's config actually builds a .dtb and this is checked to be working #kernelDTB = true; - - # XXX can be anything non-null, pkgs actually only cares if it is set or not - uboot = "pogoplug4"; }; sheevaplug = { @@ -162,9 +158,6 @@ rec { ''; kernelMakeFlags = [ "LOADADDR=0x0200000" ]; kernelTarget = "uImage"; - uboot = "sheevaplug"; - # Only for uboot = uboot : - ubootConfig = "sheevaplug_config"; kernelDTB = true; # Beyond 3.10 gcc = { arch = "armv5te"; @@ -251,7 +244,6 @@ rec { LATENCYTOP y ''; kernelTarget = "zImage"; - uboot = null; gcc = { arch = "armv6"; fpu = "vfp"; @@ -342,7 +334,6 @@ rec { XEN? n ''; kernelTarget = "zImage"; - uboot = null; }; scaleway-c1 = armv7l-hf-multiplatform // { @@ -374,7 +365,6 @@ rec { kernelMakeFlags = [ "LOADADDR=0x10800000" ]; kernelTarget = "uImage"; kernelDTB = true; - uboot = true; #XXX: any non-null value here is needed so that mkimage is present to build kernelTarget uImage gcc = { cpu = "cortex-a9"; fpu = "neon"; @@ -464,7 +454,6 @@ rec { FTRACE n ''; kernelTarget = "vmlinux"; - uboot = null; gcc = { arch = "loongson2f"; abi = "n32"; @@ -477,7 +466,6 @@ rec { kernelAutoModules = false; kernelExtraConfig = ""; # TBD kernel config kernelTarget = "zImage"; - uboot = null; }; armv7l-hf-multiplatform = { @@ -489,7 +477,6 @@ rec { kernelDTB = true; kernelAutoModules = true; kernelPreferBuiltin = true; - uboot = null; kernelTarget = "zImage"; kernelExtraConfig = '' # Fix broken sunxi-sid nvmem driver. @@ -552,7 +539,6 @@ rec { # which our initrd builder can't currently do easily. USB_XHCI_TEGRA m ''; - uboot = null; kernelTarget = "Image"; gcc = { arch = "armv8-a"; diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index ba0c67fb7d42..96a91c0fffbc 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -61,6 +61,16 @@ checkConfigError() { checkConfigOutput "false" config.enable ./declare-enable.nix checkConfigError 'The option .* defined in .* does not exist.' config.enable ./define-enable.nix +# Check integer types. +# unsigned +checkConfigOutput "42" config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix +checkConfigError 'The option value .* in .* is not of type.*unsigned integer.*' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix +# positive +checkConfigError 'The option value .* in .* is not of type.*positive integer.*' config.value ./declare-int-positive-value.nix ./define-value-int-zero.nix +# between +checkConfigOutput "42" config.value ./declare-int-between-value.nix ./define-value-int-positive.nix +checkConfigError 'The option value .* in .* is not of type.*between.*-21 and 43.*inclusive.*' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix + # Check mkForce without submodules. set -- config.enable ./declare-enable.nix ./define-enable.nix checkConfigOutput "true" "$@" @@ -126,7 +136,7 @@ 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 +checkConfigError 'The option value .* in .* is not.*string or signed integer.*' config.value ./declare-coerced-value.nix ./define-value-list.nix cat <= lowest && x <= highest) // { + name = "intBetween"; + description = "integer between ${betweenDesc lowest highest}"; + }; + ign = lowest: highest: name: docStart: + between lowest highest // { + inherit name; + description = docStart + "; between ${betweenDesc lowest highest}"; + }; + unsign = bit: range: ign 0 (range - 1) + "unsignedInt${toString bit}" "${toString bit} bit unsigned integer"; + sign = bit: range: ign (0 - (range / 2)) (range / 2 - 1) + "signedInt${toString bit}" "${toString bit} bit signed integer"; + + in rec { + /* An int with a fixed range. + * + * Example: + * (ints.between 0 100).check (-1) + * => false + * (ints.between 0 100).check (101) + * => false + * (ints.between 0 0).check 0 + * => true + */ + inherit between; + + unsigned = addCheck types.int (x: x >= 0) // { + name = "unsignedInt"; + description = "unsigned integer, meaning >=0"; + }; + positive = addCheck types.int (x: x > 0) // { + name = "positiveInt"; + description = "positive integer, meaning >0"; + }; + u8 = unsign 8 256; + u16 = unsign 16 65536; + # the biggest int a 64-bit Nix accepts is 2^63 - 1 (9223372036854775808), for a 32-bit Nix it is 2^31 - 1 (2147483647) + # the smallest int a 64-bit Nix accepts is -2^63 (-9223372036854775807), for a 32-bit Nix it is -2^31 (-2147483648) + # u32 = unsign 32 4294967296; + # u64 = unsign 64 18446744073709551616; + + s8 = sign 8 256; + s16 = sign 16 65536; + # s32 = sign 32 4294967296; + }; str = mkOptionType { name = "str"; @@ -172,7 +225,7 @@ rec { }; # drop this in the future: - list = builtins.trace "`types.list' is deprecated; use `types.listOf' instead" types.listOf; + list = builtins.trace "`types.list` is deprecated; use `types.listOf` instead" types.listOf; listOf = elemType: mkOptionType rec { name = "listOf"; @@ -189,7 +242,7 @@ rec { ).optionalValue ) def.value else - throw "The option value `${showOption loc}' in `${def.file}' is not a list.") defs))); + throw "The option value `${showOption loc}` in `${def.file}` is not a list.") defs))); getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]); getSubModules = elemType.getSubModules; substSubModules = m: listOf (elemType.substSubModules m); @@ -260,7 +313,7 @@ rec { let nrNulls = count (def: def.value == null) defs; in if nrNulls == length defs then null else if nrNulls != 0 then - throw "The option `${showOption loc}' is defined both null and not null, in ${showFiles (getFiles defs)}." + throw "The option `${showOption loc}` is defined both null and not null, in ${showFiles (getFiles defs)}." else elemType.merge loc defs; getSubOptions = elemType.getSubOptions; getSubModules = elemType.getSubModules; @@ -288,8 +341,17 @@ rec { }).config; getSubOptions = prefix: (evalModules { modules = opts'; inherit prefix; - # FIXME: hack to get shit to evaluate. - args = { name = ""; }; }).options; + # This is a work-around due to the fact that some sub-modules, + # such as the one included in an attribute set, expects a "args" + # attribute to be given to the sub-module. As the option + # evaluation does not have any specific attribute name, we + # provide a default one for the documentation. + # + # This is mandatory as some option declaration might use the + # "name" attribute given as argument of the submodule and use it + # as the default of option declarations. + args.name = "<name>"; + }).options; getSubModules = opts'; substSubModules = m: submodule m; functor = (defaultFunctor name) // { diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries index 7c73510c353a..3ddc8c23a79b 100755 --- a/maintainers/scripts/update-python-libraries +++ b/maintainers/scripts/update-python-libraries @@ -18,6 +18,7 @@ import os import re import requests import toolz +from concurrent.futures import ThreadPoolExecutor as pool INDEX = "https://pypi.io/pypi" """url of PyPI""" @@ -235,7 +236,8 @@ def main(): packages = map(os.path.abspath, args.package) - count = list(map(_update, packages)) + with pool() as p: + count = list(p.map(_update, packages)) logging.info("{} package(s) updated".format(sum(count))) diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 7b86e518aaf1..83dcf0232d9d 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -22,10 +22,6 @@ A boolean, its values can be true or false. - - types.int - An integer. - types.path A filesystem path, defined as anything that when coerced to @@ -39,7 +35,59 @@ -String related types: +Integer-related types: + + + + types.int + A signed integer. + + + + types.ints.{s8, s16, s32} + + + Signed integers with a fixed length (8, 16 or 32 bits). + They go from + −2n/2 + to + 2n/2−1 + + respectively (e.g. −128 to 127 + for 8 bits). + + + + + types.ints.unsigned + + An unsigned integer (that is >= 0). + + + + + types.ints.{u8, u16, u32} + + + Unsigned integers with a fixed length (8, 16 or 32 bits). + They go from + 0 to + 2n−1 + + respectively (e.g. 0 to 255 + for 8 bits). + + + + + types.ints.positive + + A positive integer (that is > 0). + + + + +String-related types: @@ -68,7 +116,7 @@
Value Types - Value types are type that take a value parameter. + Value types are types that take a value parameter. @@ -84,6 +132,17 @@ sep, e.g. types.separatedString "|". + + + types.ints.between + lowest + highest + + An integer between lowest + and highest (both inclusive). + Useful for creating types like types.port. + + types.submodule o A set of sub options o. diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 8c37643c08f5..b0674307a563 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -16,7 +16,8 @@ hardware. The NixOS manual is available on virtual console 8 - (press Alt+F8 to access). + (press Alt+F8 to access) or by running nixos-help. + You get logged in as root (with empty password). @@ -139,6 +140,11 @@ the GRUB boot loader is to be installed. Without it, NixOS cannot boot. + If there are other operating systems running on the machine before + installing NixOS, the + option can be set to + true to automatically add them to the grub menu. + Another critical option is , specifying the file systems that need to be mounted by NixOS. However, you typically don’t need to set it yourself, because diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 6fa14b553862..17b385242f6f 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -63,6 +63,15 @@ following incompatible changes: pass literal dollar signs through Postfix, double them. + + + The postage package (for web-based PostgreSQL + administration) has been renamed to pgmanage. The + corresponding module has also been renamed. To migrate please rename all + options to + . + +
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 486fe7c1cd8f..c2c36f02a143 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -93,7 +93,7 @@ in hardware.opengl.extraPackages = mkOption { type = types.listOf types.package; default = []; - example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; + example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]"; description = '' Additional packages to add to OpenGL drivers. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index c0df2977856e..7c737e84de0a 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -8,6 +8,7 @@ use File::Basename; use File::Slurp; use File::stat; +umask(0022); sub uniq { my %seen; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 7d9d9984cf28..7d0cbf6aad02 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -207,11 +207,12 @@ ripple-data-api = 186; mediatomb = 187; rdnssd = 188; - # ihaskell = 189; # unused + ihaskell = 189; i2p = 190; lambdabot = 191; asterisk = 192; plex = 193; + plexpy = 195; grafana = 196; skydns = 197; # ripple-rest = 198; # unused, removed 2017-08-12 @@ -483,7 +484,7 @@ #ripple-data-api = 186; #unused mediatomb = 187; #rdnssd = 188; # unused - # ihaskell = 189; # unused + ihaskell = 189; i2p = 190; lambdabot = 191; asterisk = 192; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6f00a97dd3ff..99d3c0112f2a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -185,7 +185,7 @@ ./services/databases/neo4j.nix ./services/databases/openldap.nix ./services/databases/opentsdb.nix - ./services/databases/postage.nix + ./services/databases/pgmanage.nix ./services/databases/postgresql.nix ./services/databases/redis.nix ./services/databases/riak.nix @@ -304,7 +304,7 @@ ./services/misc/gogs.nix ./services/misc/gollum.nix ./services/misc/gpsd.nix - #./services/misc/ihaskell.nix + ./services/misc/ihaskell.nix ./services/misc/irkerd.nix ./services/misc/jackett.nix ./services/misc/logkeys.nix @@ -328,6 +328,7 @@ ./services/misc/parsoid.nix ./services/misc/phd.nix ./services/misc/plex.nix + ./services/misc/plexpy.nix ./services/misc/pykms.nix ./services/misc/radarr.nix ./services/misc/redmine.nix @@ -412,6 +413,7 @@ ./services/networking/asterisk.nix ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix + ./services/networking/babeld.nix ./services/networking/bind.nix ./services/networking/autossh.nix ./services/networking/bird.nix diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index e0fbba897fa4..0935bf0cae71 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -148,11 +148,11 @@ in [ { hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ]; - publicKeyFile = "./pubkeys/myhost_ssh_host_dsa_key.pub"; + publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub; } { hostNames = [ "myhost2" ]; - publicKeyFile = "./pubkeys/myhost2_ssh_host_dsa_key.pub"; + publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub; } ] ''; diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index 2934fba96dda..9070722c770b 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -10,7 +10,7 @@ let #! ${pkgs.stdenv.shell} ${cfg.extraSessionCommands} PATH="${sway}/bin:$PATH" - exec ${pkgs.dbus.dbus-launch} --exit-with-session "${sway}/bin/sway" + exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap ''; swayJoined = pkgs.symlinkJoin { name = "sway-wrapped"; @@ -53,7 +53,8 @@ in config = mkIf cfg.enable { environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages; security.wrappers.sway = { - source = "${swayJoined}/bin/sway"; + program = "sway-setcap"; + source = "${sway}/bin/sway"; capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip"; owner = "root"; group = "sway"; diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index a40c5ef9ebe1..fb011019f7f5 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -139,6 +139,20 @@ in ''; }; + production = mkOption { + type = types.bool; + default = true; + description = '' + If set to true, use Let's Encrypt's production environment + instead of the staging environment. The main benefit of the + staging environment is to get much higher rate limits. + + See + https://letsencrypt.org/docs/staging-environment + for more detail. + ''; + }; + certs = mkOption { default = { }; type = with types; attrsOf (submodule certOpts); @@ -177,7 +191,9 @@ in cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ] ++ optionals (data.email != null) [ "--email" data.email ] ++ concatMap (p: [ "-f" p ]) data.plugins - ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains); + ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains) + ++ (if cfg.production then [] + else ["--server" "https://acme-staging.api.letsencrypt.org/directory"]); acmeService = { description = "Renew ACME Certificate for ${cert}"; after = [ "network.target" "network-online.target" ]; diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index 823806f4641b..6130ed82ed38 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -89,8 +89,5 @@ services.nginx = { }; } - -At the moment you still have to restart Nginx after the ACME -certs arrive. diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index b6d61f6c68bc..9c06e1d43bbe 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -33,8 +33,8 @@ in }; runtimePackages = mkOption { - default = [ pkgs.nix ]; - defaultText = "[ pkgs.nix ]"; + default = [ pkgs.bash pkgs.nix ]; + defaultText = "[ pkgs.bash pkgs.nix ]"; description = "Add programs to the buildkite-agent environment"; type = types.listOf types.package; }; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 845e6d4c22ef..c6c463bce7d5 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -67,7 +67,7 @@ in type = types.nullOr types.str; default = null; example = literalExample "0.0.0.0"; - description = "Address to bind to. The default it to bind to all addresses"; + description = "Address to bind to. The default is to bind to all addresses"; }; port = mkOption { diff --git a/nixos/modules/services/databases/postage.nix b/nixos/modules/services/databases/pgmanage.nix similarity index 53% rename from nixos/modules/services/databases/postage.nix rename to nixos/modules/services/databases/pgmanage.nix index d49c9a83a46f..86733a3e5a07 100644 --- a/nixos/modules/services/databases/postage.nix +++ b/nixos/modules/services/databases/pgmanage.nix @@ -3,16 +3,16 @@ with lib; let - cfg = config.services.postage; + cfg = config.services.pgmanage; confFile = pkgs.writeTextFile { - name = "postage.conf"; + name = "pgmanage.conf"; text = '' - connection_file = ${postageConnectionsFile} + connection_file = ${pgmanageConnectionsFile} allow_custom_connections = ${builtins.toJSON cfg.allowCustomConnections} - postage_port = ${toString cfg.port} + pgmanage_port = ${toString cfg.port} super_only = ${builtins.toJSON cfg.superOnly} @@ -20,7 +20,7 @@ let login_timeout = ${toString cfg.loginTimeout} - web_root = ${cfg.package}/etc/postage/web_root + web_root = ${cfg.package}/etc/pgmanage/web_root data_root = ${cfg.dataRoot} @@ -33,24 +33,23 @@ let ''; }; - postageConnectionsFile = pkgs.writeTextFile { - name = "postage-connections.conf"; + pgmanageConnectionsFile = pkgs.writeTextFile { + name = "pgmanage-connections.conf"; text = concatStringsSep "\n" (mapAttrsToList (name : conn : "${name}: ${conn}") cfg.connections); }; - postage = "postage"; -in { + pgmanage = "pgmanage"; - options.services.postage = { + pgmanageOptions = { enable = mkEnableOption "PostgreSQL Administration for the web"; package = mkOption { type = types.package; - default = pkgs.postage; - defaultText = "pkgs.postage"; + default = pkgs.pgmanage; + defaultText = "pkgs.pgmanage"; description = '' - The postage package to use. + The pgmanage package to use. ''; }; @@ -62,14 +61,14 @@ in { "mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require"; }; description = '' - Postage requires at least one PostgreSQL server be defined. + pgmanage requires at least one PostgreSQL server be defined. Detailed information about PostgreSQL connection strings is available at: Note that you should not specify your user name or password. That information will be entered on the login screen. If you specify a - username or password, it will be removed by Postage before attempting to + username or password, it will be removed by pgmanage before attempting to connect to a database. ''; }; @@ -78,7 +77,7 @@ in { type = types.bool; default = false; description = '' - This tells Postage whether or not to allow anyone to use a custom + This tells pgmanage whether or not to allow anyone to use a custom connection from the login screen. ''; }; @@ -87,7 +86,7 @@ in { type = types.int; default = 8080; description = '' - This tells Postage what port to listen on for browser requests. + This tells pgmanage what port to listen on for browser requests. ''; }; @@ -95,7 +94,7 @@ in { type = types.bool; default = true; description = '' - This tells Postage whether or not to set the listening socket to local + This tells pgmanage whether or not to set the listening socket to local addresses only. ''; }; @@ -104,10 +103,10 @@ in { type = types.bool; default = true; description = '' - This tells Postage whether or not to only allow super users to + This tells pgmanage whether or not to only allow super users to login. The recommended value is true and will restrict users who are not super users from logging in to any PostgreSQL instance through - Postage. Note that a connection will be made to PostgreSQL in order to + pgmanage. Note that a connection will be made to PostgreSQL in order to test if the user is a superuser. ''; }; @@ -116,8 +115,8 @@ in { type = types.nullOr types.str; default = null; description = '' - This tells Postage to only allow users in a certain PostgreSQL group to - login to Postage. Note that a connection will be made to PostgreSQL in + This tells pgmanage to only allow users in a certain PostgreSQL group to + login to pgmanage. Note that a connection will be made to PostgreSQL in order to test if the user is a member of the login group. ''; }; @@ -133,10 +132,10 @@ in { dataRoot = mkOption { type = types.str; - default = "/var/lib/postage"; + default = "/var/lib/pgmanage"; description = '' - This tells Postage where to put the SQL file history. All tabs are saved - to this location so that if you get disconnected from Postage you + This tells pgmanage where to put the SQL file history. All tabs are saved + to this location so that if you get disconnected from pgmanage you don't lose your work. ''; }; @@ -156,15 +155,15 @@ in { }); default = null; description = '' - These options tell Postage where the TLS Certificate and Key files + These options tell pgmanage where the TLS Certificate and Key files reside. If you use these options then you'll only be able to access - Postage through a secure TLS connection. These options are only - necessary if you wish to connect directly to Postage using a secure TLS - connection. As an alternative, you can set up Postage in a reverse proxy + pgmanage through a secure TLS connection. These options are only + necessary if you wish to connect directly to pgmanage using a secure TLS + connection. As an alternative, you can set up pgmanage in a reverse proxy configuration. This allows your web server to terminate the secure - connection and pass on the request to Postage. You can find help to set + connection and pass on the request to pgmanage. You can find help to set up this configuration in: - + ''; }; @@ -177,29 +176,47 @@ in { }; }; - config = mkIf cfg.enable { - systemd.services.postage = { - description = "postage - PostgreSQL Administration for the web"; - wants = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = postage; - Group = postage; - ExecStart = "${pkgs.postage}/sbin/postage -c ${confFile}" + - optionalString cfg.localOnly " --local-only=true"; + +in { + + options.services.pgmanage = pgmanageOptions; + + # This is deprecated and should be removed for NixOS-18.03. + options.services.postage = pgmanageOptions; + + config = mkMerge [ + { assertions = [ + { assertion = !config.services.postage.enable; + message = + "services.postage is deprecated in favour of pgmanage. " + + "They have the same options so just substitute postage for pgmanage." ; + } + ]; + } + (mkIf cfg.enable { + systemd.services.pgmanage = { + description = "pgmanage - PostgreSQL Administration for the web"; + wants = [ "postgresql.service" ]; + after = [ "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = pgmanage; + Group = pgmanage; + ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" + + optionalString cfg.localOnly " --local-only=true"; + }; }; - }; - users = { - users."${postage}" = { - name = postage; - group = postage; - home = cfg.dataRoot; - createHome = true; + users = { + users."${pgmanage}" = { + name = pgmanage; + group = pgmanage; + home = cfg.dataRoot; + createHome = true; + }; + groups."${pgmanage}" = { + name = pgmanage; + }; }; - groups."${postage}" = { - name = postage; - }; - }; - }; + }) + ]; } diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 1fef9ac6ec90..867c0ea6761c 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -60,11 +60,11 @@ let manpage_directory = "${pkgs.postfix}/share/man"; html_directory = "${pkgs.postfix}/share/postfix/doc/html"; shlib_directory = false; - relayhost = if cfg.lookupMX || cfg.relayHost == "" - then cfg.relayHost - else - "[${cfg.relayHost}]" - + optionalString (cfg.relayPort != null) ":${toString cfg.relayPort}"; + relayhost = if cfg.relayHost == "" then "" else + if cfg.lookupMX + then "${cfg.relayHost}:${toString cfg.relayPort}" + else "[${cfg.relayHost}]:${toString cfg.relayPort}"; + mail_spool_directory = "/var/spool/mail/"; setgid_group = setgidGroup; } @@ -461,13 +461,10 @@ in }; relayPort = mkOption { - type = types.nullOr types.int; - default = null; - example = 587; + type = types.int; + default = 25; description = " - Specify an optional port for outbound mail relay. (Note: - only used if an explicit is - defined.) + SMTP port for relay mail relay. "; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 740cbc141b53..7b2b40e59232 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -572,7 +572,7 @@ in { rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks mkdir -p ${cfg.statePath}/config - tr -dc A-Za-z0-9 < /dev/urandom | head -c 32 > ${cfg.statePath}/config/gitlab_shell_secret + ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret # The uploads directory is hardcoded somewhere deep in rails. It is # symlinked in the gitlab package to /run/gitlab/uploads to make it @@ -619,7 +619,7 @@ in { fi # enable required pg_trgm extension for gitlab - ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql gitlab -c "CREATE EXTENSION IF NOT EXISTS pg_trgm" + ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm" # Always do the db migrations just to be sure the database is up-to-date ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production @@ -634,7 +634,7 @@ in { # The gitlab:shell:create_hooks task seems broken for fixing links # so we instead delete all the hooks and create them anew - rm ${cfg.statePath}/repositories/**/*.git/hooks + rm -f ${cfg.statePath}/repositories/**/*.git/hooks ${gitlab-rake}/bin/gitlab-rake gitlab:shell:create_hooks RAILS_ENV=production # Change permissions in the last step because some of the diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 515864ec2e2d..41cadb4a6de0 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -135,8 +135,9 @@ in }; }; - services.mingetty.helpLine = mkIf cfg.showManual - "\nPress for the NixOS manual."; + services.mingetty.helpLine = "\nRun `nixos-help` " + + lib.optionalString cfg.showManual "or press " + + "for the NixOS manual."; }; diff --git a/nixos/modules/services/misc/plexpy.nix b/nixos/modules/services/misc/plexpy.nix new file mode 100644 index 000000000000..df9f12581247 --- /dev/null +++ b/nixos/modules/services/misc/plexpy.nix @@ -0,0 +1,81 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.plexpy; +in +{ + options = { + services.plexpy = { + enable = mkEnableOption "PlexPy Plex Monitor"; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/plexpy"; + description = "The directory where PlexPy stores its data files."; + }; + + configFile = mkOption { + type = types.str; + default = "/var/lib/plexpy/config.ini"; + description = "The location of PlexPy's config file."; + }; + + port = mkOption { + type = types.int; + default = 8181; + description = "TCP port where PlexPy listens."; + }; + + user = mkOption { + type = types.str; + default = "plexpy"; + description = "User account under which PlexPy runs."; + }; + + group = mkOption { + type = types.str; + default = "nogroup"; + description = "Group under which PlexPy runs."; + }; + + package = mkOption { + type = types.package; + default = pkgs.plexpy; + defaultText = "pkgs.plexpy"; + description = '' + The PlexPy package to use. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.plexpy = { + description = "PlexPy Plex Monitor"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + test -d "${cfg.dataDir}" || { + echo "Creating initial PlexPy data directory in \"${cfg.dataDir}\"." + mkdir -p "${cfg.dataDir}" + chown ${cfg.user}:${cfg.group} "${cfg.dataDir}" + } + ''; + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = "true"; + GuessMainPID = "false"; + ExecStart = "${cfg.package}/bin/plexpy --datadir ${cfg.dataDir} --config ${cfg.configFile} --port ${toString cfg.port} --pidfile ${cfg.dataDir}/plexpy.pid --nolaunch"; + Restart = "on-failure"; + }; + }; + + users.extraUsers = mkIf (cfg.user == "plexpy") { + plexpy = { group = cfg.group; uid = config.ids.uids.plexpy; }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 01b4aca91731..4b1ad34b3a4e 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -22,8 +22,8 @@ let ); graphiteApiConfig = pkgs.writeText "graphite-api.yaml" '' - time_zone: ${config.time.timeZone} search_index: ${dataDir}/index + ${optionalString (!isNull config.time.timeZone) ''time_zone: ${config.time.timeZone}''} ${optionalString (cfg.api.finders != []) ''finders:''} ${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders} ${optionalString (cfg.api.functions != []) ''functions:''} @@ -467,7 +467,15 @@ in { ]; }) - (mkIf cfg.web.enable { + (mkIf cfg.web.enable (let + python27' = pkgs.python27.override { + packageOverrides = self: super: { + django = self.django_1_8; + django_tagging = self.django_tagging_0_4_3; + }; + }; + pythonPackages = python27'.pkgs; + in { systemd.services.graphiteWeb = { description = "Graphite Web Interface"; wantedBy = [ "multi-user.target" ]; @@ -477,8 +485,8 @@ in { PYTHONPATH = let penv = pkgs.python.buildEnv.override { extraLibs = [ - pkgs.python27Packages.graphite_web - pkgs.python27Packages.pysqlite + pythonPackages.graphite_web + pythonPackages.pysqlite ]; }; penvPack = "${penv}/${pkgs.python.sitePackages}"; @@ -516,17 +524,17 @@ in { fi # Only collect static files when graphite_web changes. - if ! [ "${dataDir}/current_graphite_web" -ef "${pkgs.python27Packages.graphite_web}" ]; then + if ! [ "${dataDir}/current_graphite_web" -ef "${pythonPackages.graphite_web}" ]; then mkdir -p ${staticDir} ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py collectstatic --noinput --clear chown -R graphite:graphite ${staticDir} - ln -sfT "${pkgs.python27Packages.graphite_web}" "${dataDir}/current_graphite_web" + ln -sfT "${pythonPackages.graphite_web}" "${dataDir}/current_graphite_web" fi ''; }; - environment.systemPackages = [ pkgs.python27Packages.graphite_web ]; - }) + environment.systemPackages = [ pythonPackages.graphite_web ]; + })) (mkIf cfg.api.enable { systemd.services.graphiteApi = { @@ -536,7 +544,7 @@ in { environment = { PYTHONPATH = let aenv = pkgs.python.buildEnv.override { - extraLibs = [ cfg.api.package pkgs.cairo ] ++ cfg.api.finders; + extraLibs = [ cfg.api.package pkgs.cairo pkgs.pythonPackages.cffi ] ++ cfg.api.finders; }; in "${aenv}/${pkgs.python.sitePackages}"; GRAPHITE_API_CONFIG = graphiteApiConfig; diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix new file mode 100644 index 000000000000..dd76bac9df76 --- /dev/null +++ b/nixos/modules/services/networking/babeld.nix @@ -0,0 +1,98 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.babeld; + + paramsString = params: + concatMapStringsSep "" (name: "${name} ${boolToString (getAttr name params)}") + (attrNames params); + + interfaceConfig = name: + let + interface = getAttr name cfg.interfaces; + in + "interface ${name} ${paramsString interface}\n"; + + configFile = with cfg; pkgs.writeText "babeld.conf" ( + (optionalString (cfg.interfaceDefaults != null) '' + default ${paramsString cfg.interfaceDefaults} + '') + + (concatMapStrings interfaceConfig (attrNames cfg.interfaces)) + + extraConfig); + +in + +{ + + ###### interface + + options = { + + services.babeld = { + + enable = mkOption { + default = false; + description = '' + Whether to run the babeld network routing daemon. + ''; + }; + + interfaceDefaults = mkOption { + default = null; + description = '' + A set describing default parameters for babeld interfaces. + See babeld8 for options. + ''; + type = types.nullOr (types.attrsOf types.unspecified); + example = + { + wired = true; + "split-horizon" = true; + }; + }; + + interfaces = mkOption { + default = {}; + description = '' + A set describing babeld interfaces. + See babeld8 for options. + ''; + type = types.attrsOf (types.attrsOf types.unspecified); + example = + { enp0s2 = + { wired = true; + "hello-interval" = 5; + "split-horizon" = "auto"; + }; + }; + }; + + extraConfig = mkOption { + default = ""; + description = '' + Options that will be copied to babeld.conf. + See babeld8 for details. + ''; + }; + }; + + }; + + + ###### implementation + + config = mkIf config.services.babeld.enable { + + systemd.services.babeld = { + description = "Babel routing daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = "${pkgs.babeld}/bin/babeld -c ${configFile}"; + }; + + }; + +} diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix index ab7bbb15ad4f..ee1cd3600039 100644 --- a/nixos/modules/services/networking/dnschain.nix +++ b/nixos/modules/services/networking/dnschain.nix @@ -158,7 +158,7 @@ in serviceConfig = { User = "dnschain"; Restart = "on-failure"; - ExecStart = "${pkgs.dnschain}/bin/dnschain"; + ExecStart = "${pkgs.nodePackages.dnschain}/bin/dnschain"; }; preStart = '' diff --git a/nixos/modules/services/networking/keybase.nix b/nixos/modules/services/networking/keybase.nix index 7c7982ee8eac..a149f16a84cb 100644 --- a/nixos/modules/services/networking/keybase.nix +++ b/nixos/modules/services/networking/keybase.nix @@ -28,7 +28,7 @@ in { description = "Keybase service"; serviceConfig = { ExecStart = '' - ${pkgs.keybase}/bin/keybase -d service --auto-forked + ${pkgs.keybase}/bin/keybase service --auto-forked ''; Restart = "on-failure"; PrivateTmp = true; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index e03309c87299..6bdae32f72bb 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -32,6 +32,11 @@ let ipv6.ip6-privacy=2 ethernet.cloned-mac-address=${cfg.ethernet.macAddress} wifi.cloned-mac-address=${cfg.wifi.macAddress} + ${optionalString (cfg.wifi.powersave != null) + ''wifi.powersave=${if cfg.wifi.powersave then "3" else "2"}''} + + [device] + wifi.scan-rand-mac-address=${if cfg.wifi.scanRandMacAddress then "yes" else "no"} ''; /* @@ -179,7 +184,27 @@ in { }; ethernet.macAddress = macAddressOpt; - wifi.macAddress = macAddressOpt; + + wifi = { + macAddress = macAddressOpt; + + powersave = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + Whether to enable Wi-Fi power saving. + ''; + }; + + scanRandMacAddress = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable MAC address randomization of a Wi-Fi device + during scanning. + ''; + }; + }; useDnsmasq = mkOption { type = types.bool; diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index b0eb0460b9ba..3a3f64221c42 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -32,8 +32,10 @@ let ${caConf} ''; - strongswanConf = {setup, connections, ca, secrets}: toFile "strongswan.conf" '' + strongswanConf = {setup, connections, ca, secrets, managePlugins, enabledPlugins}: toFile "strongswan.conf" '' charon { + ${if managePlugins then "load_modular = no" else ""} + ${if managePlugins then ("load = " + (concatStringsSep " " enabledPlugins)) else ""} plugins { stroke { secrets_file = ${ipsecSecrets secrets} @@ -112,6 +114,25 @@ in file. ''; }; + + managePlugins = mkOption { + type = types.bool; + default = false; + description = '' + If set to true, this option will disable automatic plugin loading and + then tell strongSwan to enable the plugins specified in the + option. + ''; + }; + + enabledPlugins = mkOption { + type = types.listOf types.str; + default = []; + description = '' + A list of additional plugins to enable if + is true. + ''; + }; }; config = with cfg; mkIf enable { @@ -122,7 +143,7 @@ in wants = [ "keys.target" ]; after = [ "network-online.target" "keys.target" ]; environment = { - STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets; }; + STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets managePlugins enabledPlugins; }; }; serviceConfig = { ExecStart = "${pkgs.strongswan}/sbin/ipsec start --nofork"; diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index bcce4accdd6e..545ee327d596 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -8,9 +8,9 @@ let stateDir = "/var/lib/unbound"; - access = concatMapStrings (x: " access-control: ${x} allow\n") cfg.allowedAccess; + access = concatMapStringsSep "\n " (x: "access-control: ${x} allow") cfg.allowedAccess; - interfaces = concatMapStrings (x: " interface: ${x}\n") cfg.interfaces; + interfaces = concatMapStringsSep "\n " (x: "interface: ${x}") cfg.interfaces; isLocalAddress = x: substring 0 3 x == "::1" || substring 0 9 x == "127.0.0.1"; diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index eb08e7f90c0d..24accd41511c 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -195,6 +195,7 @@ let description = "WireGuard Tunnel - ${name}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + environment.DEVICE = name; serviceConfig = { Type = "oneshot"; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 1c3c7835d961..f9f2511f45dc 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -676,6 +676,7 @@ in '' ; Needed for PHP's mail() function. sendmail_path = sendmail -t -i + '' + optionalString (!isNull config.time.timeZone) '' ; Apparently PHP doesn't use $TZ. date.timezone = "${config.time.timeZone}" diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix index c6f4bcd0f666..1c654667dfc7 100644 --- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix +++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix @@ -13,6 +13,7 @@ let define('DB_HOST', '${config.dbHost}'); define('DB_CHARSET', 'utf8'); $table_prefix = '${config.tablePrefix}'; + define('AUTOMATIC_UPDATER_DISABLED', true); ${config.extraConfig} if ( !defined('ABSPATH') ) define('ABSPATH', dirname(__FILE__) . '/'); diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index 89ad2882363d..fb907618d35b 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -41,7 +41,7 @@ in name = "lxqt"; bgSupport = true; start = '' - exec ${pkgs.lxqt.lxqt-common}/bin/startlxqt + exec ${pkgs.lxqt.lxqt-session}/bin/startlxqt ''; }; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 685a93d952b1..7f54bb182fe9 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -193,6 +193,11 @@ in theme = mkDefault "breeze"; }; + boot.plymouth = { + theme = mkDefault "breeze"; + themePackages = mkDefault [ pkgs.breeze-plymouth ]; + }; + security.pam.services.kde = { allowNullPassword = true; }; # Doing these one by one seems silly, but we currently lack a better diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 83c5c95dae7e..e83f26516f5f 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -125,6 +125,7 @@ in "getty@tty1.service" ]; + systemd.services."getty@tty1".enable = false; systemd.services.display-manager.conflicts = [ "getty@tty1.service" ]; systemd.services.display-manager.serviceConfig = { # Restart = "always"; - already defined in xserver.nix diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 0938d22a45b8..4b0c498424b5 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -97,12 +97,26 @@ in moduleName="$(sed -n 's,ModuleName *= *,,p' ${themesEnv}/share/plymouth/themes/${cfg.theme}/${cfg.theme}.plymouth)" mkdir -p $out/lib/plymouth/renderers - cp ${plymouth}/lib/plymouth/{text,details,$moduleName}.so $out/lib/plymouth + # module might come from a theme + cp ${themesEnv}/lib/plymouth/{text,details,$moduleName}.so $out/lib/plymouth cp ${plymouth}/lib/plymouth/renderers/{drm,frame-buffer}.so $out/lib/plymouth/renderers mkdir -p $out/share/plymouth/themes cp ${plymouth}/share/plymouth/plymouthd.defaults $out/share/plymouth - cp -r ${themesEnv}/share/plymouth/themes/{text,details,${cfg.theme}} $out/share/plymouth/themes + + # copy themes into working directory for patching + mkdir themes + # use -L to copy the directories proper, not the symlinks to them + cp -r -L ${themesEnv}/share/plymouth/themes/{text,details,${cfg.theme}} themes + + # patch out any attempted references to the theme or plymouth's themes directory + chmod -R +w themes + find themes -type f | while read file + do + sed -i "s,/nix/.*/share/plymouth/themes,$out/share/plymouth/themes,g" $file + done + + cp -r themes/* $out/share/plymouth/themes cp ${cfg.logo} $out/share/plymouth/logo.png ''; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index e92c9bc27def..1f424f84c6e0 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -93,6 +93,7 @@ let after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ]; before = [ "network.target" "shutdown.target" ]; wants = [ "network.target" ]; + partOf = map (i: "network-addresses-${i.name}.service") interfaces; conflicts = [ "shutdown.target" ]; wantedBy = [ "multi-user.target" ] ++ optional hasDefaultGatewaySet "network-online.target"; @@ -171,8 +172,6 @@ let "network-link-${i.name}.service" "network.target" ]; - # propagate stop and reload from network-setup - partOf = [ "network-setup.service" ]; # order before network-setup because the routes that are configured # there may need ip addresses configured before = [ "network-setup.service" ]; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 82dfc1c9f1ce..e68bfd860601 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -537,7 +537,7 @@ in type = types.bool; default = false; description = '' - Wether the container is automatically started at boot-time. + Whether the container is automatically started at boot-time. ''; }; @@ -596,6 +596,8 @@ in { config, pkgs, ... }: { services.postgresql.enable = true; services.postgresql.package = pkgs.postgresql96; + + system.stateVersion = "17.03"; }; }; } diff --git a/nixos/release.nix b/nixos/release.nix index d5f59a524e04..28eb76d888e4 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -270,6 +270,10 @@ in rec { tests.plasma5 = callTest tests/plasma5.nix {}; tests.keymap = callSubTests tests/keymap.nix {}; tests.initrdNetwork = callTest tests/initrd-network.nix {}; + tests.kafka_0_9 = callTest tests/kafka_0_9.nix {}; + tests.kafka_0_10 = callTest tests/kafka_0_10.nix {}; + tests.kafka_0_11 = callTest tests/kafka_0_11.nix {}; + tests.kafka_1_0 = callTest tests/kafka_1_0.nix {}; tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {}; tests.kernel-latest = callTest tests/kernel-latest.nix {}; tests.kernel-lts = callTest tests/kernel-lts.nix {}; @@ -306,6 +310,7 @@ in rec { #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; tests.postgresql = callSubTests tests/postgresql.nix {}; + tests.pgmanage = callTest tests/pgmanage.nix {}; tests.postgis = callTest tests/postgis.nix {}; #tests.pgjwt = callTest tests/pgjwt.nix {}; tests.printing = callTest tests/printing.nix {}; @@ -329,7 +334,7 @@ in rec { tests.wordpress = callTest tests/wordpress.nix {}; tests.xfce = callTest tests/xfce.nix {}; tests.xmonad = callTest tests/xmonad.nix {}; - + tests.zookeeper = callTest tests/zookeeper.nix {}; /* Build a bunch of typical closures so that Hydra can keep track of the evolution of closure sizes. */ diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index 357911046960..7268636b62ad 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -9,9 +9,57 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { gitlab = { config, pkgs, ... }: { virtualisation.memorySize = 768; - services.gitlab.enable = true; - services.gitlab.databasePassword = "gitlab"; + + services.nginx = { + enable = true; + virtualHosts = { + "localhost" = { + locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; + }; + }; + }; + systemd.services.gitlab.serviceConfig.TimeoutStartSec = "10min"; + services.gitlab = { + enable = true; + databasePassword = "dbPassword"; + secrets = { + secret = "secret"; + otp = "otpsecret"; + db = "dbsecret"; + + # nix-shell -p openssl --run "openssl genrsa 2048" + jws = '' + -----BEGIN RSA PRIVATE KEY----- + MIIEpAIBAAKCAQEA13/qEio76OWUtWO0WIz9lWnsTWOU8Esv4sQHDq9PCEFsLt21 + PAXrlWhLjjWcxGfsrDwnh7YErGHYL62BMSxMdFJolaknlQK/O/V8UETDe45VoHM+ + Znk270RfUcfYFgiihnXUZXVmL0om9TsQSk646wCcjCY9LxtxUyKNhvT7KjgYw2aX + z34aw7M+Js3T2p1TjZPSC82GtmtKkJEKFMi5EjprLTDE7EdcUzr9Xuw+kQ+gRm9k + 7FE+JQqSoprwE3Q0v2OAn3UhLMgg0gNFRnsc5l6IAshDzV+H22RPqKKlJjVjjfPY + 0TQSvYLVApigHbDPH0BoCXfjFfQazbbP3OUHrwIDAQABAoIBAQCMU+tkcMQaYIV5 + qLdjgkwO467QpivyXcOM8wF1eosIYTHFQvIlZ+WEoSmyLQ8shlADyBgls01Pw1c3 + lNAv6RzQEmmwKzpvOh61OKH+0whIiOMRXHoh2IUBQZCgfHYlwvGyhUAN4WjtGmhM + AG4XNTQNM5S9Xpkw97nP3Qwz+YskbbkrfqtCEVy9ro+4nhbjqPsuO3adbnkva4zR + cyurRhrHgHU6LPjn5NHnHH4qw2faY2oAsL8pmpkTbO5IqWDvOcbjNfjVPgVoq26O + bbaa1qs4nmc80qQgMjRPJef535xyf3eLsSlDvpf6O8sPrJzVR1zaqEqixpQCZDac + +kRiSBrhAoGBAOwHiq0PuyJh6VzBu7ybqX6+gF/wA4Jkwzx6mbfaBgurvU1aospp + kisIonAkxSbxllZMnjbkShZEdATYKeT9o5NEhnU4YnHfc5bJZbiWOZAzYGLcY7g8 + vDQ31pBItyY4pFgPbSpNlbUvUsoPVJ45RasRADDTNCzMzdjFQQXst2V9AoGBAOm7 + sSpzYfFPLEAhieAkuhtbsX58Boo46djiKVfzGftfp6F9aHTOfzGORU5jrZ16mSbS + qkkC6BEFrATX2051dzzXC89fWoJYALrsffE5I3KlKXsCAWSnCP1MMxOfH+Ls61Mr + 7pK/LKfvJt53mUH4jIdbmmFUDwbg18oBEH+x9PmbAoGAS/+JqXu9N67rIxDGUE6W + 3tacI0f2+U9Uhe67/DTZaXyc8YFTlXU0uWKIWy+bw5RaYeM9tlL/f/f+m2i25KK+ + vrZ7zNag7CWU5GJovGyykDnauTpZaYM03mN0VPT08/uc/zXIYqyknbhlIeaZynCK + fDB3LUF0NVCknz20WCIGU0kCgYEAkxY0ZXx61Dp4pFr2wwEZxQGs7uXpz64FKyEX + 12r6nMATY4Lh6y/Px0W6w5vis8lk+5Ny6cNUevHQ0LNuJS+yu6ywl+1vrbrnqroM + f3LvpcPeGLSoX8jl1VDQi7aFgG6LoKly1xJLbdsH4NPutB9PgBbbTghx9GgmI88L + rPA2M6UCgYBOmkYJocNgxg6B1/n4Tb9fN1Q/XuJrFDE6NxVUoke+IIyMPRH7FC3m + VMYzu+b7zTVJjaBb1cmJemxl/xajziWDofJYPefhdbOVU7HXtmJFY0IG3pVxU1zW + 3bmDj5QAtCUDpuuNa6GEIT0YR4+D/V7o3DmlZ0tVIwKJmVJoQ2f5dw== + -----END RSA PRIVATE KEY----- + ''; + }; + }; }; }; @@ -19,6 +67,6 @@ import ./make-test.nix ({ pkgs, ...} : { $gitlab->start(); $gitlab->waitForUnit("gitlab.service"); $gitlab->waitForUnit("gitlab-sidekiq.service"); - $gitlab->waitUntilSucceeds("curl http://localhost:8080/users/sign_in"); + $gitlab->waitUntilSucceeds("curl http://localhost:80/users/sign_in"); ''; }) diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index 4fd7de192d55..a22ef224580a 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -4,22 +4,28 @@ import ./make-test.nix ({ pkgs, ...} : nodes = { one = { config, pkgs, ... }: { + time.timeZone = "UTC"; services.graphite = { - web = { + web.enable = true; + api = { enable = true; + port = 8082; }; - carbon = { - enableCache = true; - }; + carbon.enableCache = true; + seyren.enable = true; + pager.enable = true; }; }; - }; + }; testScript = '' startAll; $one->waitForUnit("default.target"); $one->requireActiveUnit("graphiteWeb.service"); + $one->requireActiveUnit("graphiteApi.service"); + $one->requireActiveUnit("graphitePager.service"); $one->requireActiveUnit("carbonCache.service"); + $one->requireActiveUnit("seyren.service"); $one->succeed("echo \"foo 1 `date +%s`\" | nc -q0 localhost 2003"); $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo") ''; diff --git a/nixos/tests/kafka_0_10.nix b/nixos/tests/kafka_0_10.nix new file mode 100644 index 000000000000..6e7820f64bc4 --- /dev/null +++ b/nixos/tests/kafka_0_10.nix @@ -0,0 +1,48 @@ +import ./make-test.nix ({ pkgs, lib, ... } : +let + kafkaPackage = pkgs.apacheKafka_0_10; +in { + name = "kafka_0_10"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + zookeeper1 = { config, ... }: { + services.zookeeper = { + enable = true; + }; + + networking.firewall.allowedTCPPorts = [ 2181 ]; + }; + kafka = { config, ... }: { + services.apache-kafka = { + enable = true; + extraProperties = '' + offsets.topic.replication.factor = 1 + ''; + package = kafkaPackage; + zookeeper = "zookeeper1:2181"; + }; + + networking.firewall.allowedTCPPorts = [ 9092 ]; + virtualisation.memorySize = 2048; + }; + }; + + testScript = '' + startAll; + + $zookeeper1->waitForUnit("zookeeper"); + $zookeeper1->waitForUnit("network.target"); + $zookeeper1->waitForOpenPort(2181); + + $kafka->waitForUnit("apache-kafka"); + $kafka->waitForUnit("network.target"); + $kafka->waitForOpenPort(9092); + + $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); + $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); + $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); + ''; +}) diff --git a/nixos/tests/kafka_0_11.nix b/nixos/tests/kafka_0_11.nix new file mode 100644 index 000000000000..39f9c36bb229 --- /dev/null +++ b/nixos/tests/kafka_0_11.nix @@ -0,0 +1,48 @@ +import ./make-test.nix ({ pkgs, lib, ... } : +let + kafkaPackage = pkgs.apacheKafka_0_11; +in { + name = "kafka_0_11"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + zookeeper1 = { config, ... }: { + services.zookeeper = { + enable = true; + }; + + networking.firewall.allowedTCPPorts = [ 2181 ]; + }; + kafka = { config, ... }: { + services.apache-kafka = { + enable = true; + extraProperties = '' + offsets.topic.replication.factor = 1 + ''; + package = kafkaPackage; + zookeeper = "zookeeper1:2181"; + }; + + networking.firewall.allowedTCPPorts = [ 9092 ]; + virtualisation.memorySize = 2048; + }; + }; + + testScript = '' + startAll; + + $zookeeper1->waitForUnit("zookeeper"); + $zookeeper1->waitForUnit("network.target"); + $zookeeper1->waitForOpenPort(2181); + + $kafka->waitForUnit("apache-kafka"); + $kafka->waitForUnit("network.target"); + $kafka->waitForOpenPort(9092); + + $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); + $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); + $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); + ''; +}) diff --git a/nixos/tests/kafka_0_9.nix b/nixos/tests/kafka_0_9.nix new file mode 100644 index 000000000000..fee82aba2bda --- /dev/null +++ b/nixos/tests/kafka_0_9.nix @@ -0,0 +1,48 @@ +import ./make-test.nix ({ pkgs, lib, ... } : +let + kafkaPackage = pkgs.apacheKafka_0_9; +in { + name = "kafka_0_9"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + zookeeper1 = { config, ... }: { + services.zookeeper = { + enable = true; + }; + + networking.firewall.allowedTCPPorts = [ 2181 ]; + }; + kafka = { config, ... }: { + services.apache-kafka = { + enable = true; + extraProperties = '' + offsets.topic.replication.factor = 1 + ''; + package = kafkaPackage; + zookeeper = "zookeeper1:2181"; + }; + + networking.firewall.allowedTCPPorts = [ 9092 ]; + virtualisation.memorySize = 2048; + }; + }; + + testScript = '' + startAll; + + $zookeeper1->waitForUnit("zookeeper"); + $zookeeper1->waitForUnit("network.target"); + $zookeeper1->waitForOpenPort(2181); + + $kafka->waitForUnit("apache-kafka"); + $kafka->waitForUnit("network.target"); + $kafka->waitForOpenPort(9092); + + $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); + $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); + $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --zookeeper zookeeper1:2181 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); + ''; +}) diff --git a/nixos/tests/kafka_1_0.nix b/nixos/tests/kafka_1_0.nix new file mode 100644 index 000000000000..936840dbcfdc --- /dev/null +++ b/nixos/tests/kafka_1_0.nix @@ -0,0 +1,48 @@ +import ./make-test.nix ({ pkgs, lib, ... } : +let + kafkaPackage = pkgs.apacheKafka_1_0; +in { + name = "kafka_1_0"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + zookeeper1 = { config, ... }: { + services.zookeeper = { + enable = true; + }; + + networking.firewall.allowedTCPPorts = [ 2181 ]; + }; + kafka = { config, ... }: { + services.apache-kafka = { + enable = true; + extraProperties = '' + offsets.topic.replication.factor = 1 + ''; + package = kafkaPackage; + zookeeper = "zookeeper1:2181"; + }; + + networking.firewall.allowedTCPPorts = [ 9092 ]; + virtualisation.memorySize = 2048; + }; + }; + + testScript = '' + startAll; + + $zookeeper1->waitForUnit("zookeeper"); + $zookeeper1->waitForUnit("network.target"); + $zookeeper1->waitForOpenPort(2181); + + $kafka->waitForUnit("apache-kafka"); + $kafka->waitForUnit("network.target"); + $kafka->waitForOpenPort(9092); + + $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); + $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); + $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); + ''; +}) diff --git a/nixos/tests/pgmanage.nix b/nixos/tests/pgmanage.nix new file mode 100644 index 000000000000..110cbd5c5b40 --- /dev/null +++ b/nixos/tests/pgmanage.nix @@ -0,0 +1,39 @@ +import ./make-test.nix ({ pkgs, ... } : +let + role = "test"; + password = "secret"; + conn = "local"; +in +{ + name = "pgmanage"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ basvandijk ]; + }; + nodes = { + one = { config, pkgs, ... }: { + services = { + postgresql = { + enable = true; + initialScript = pkgs.writeText "pg-init-script" '' + CREATE ROLE ${role} SUPERUSER LOGIN PASSWORD '${password}'; + ''; + }; + pgmanage = { + enable = true; + connections = { + "${conn}" = "hostaddr=127.0.0.1 port=${toString config.services.postgresql.port} dbname=postgres"; + }; + }; + }; + }; + }; + + testScript = '' + startAll; + $one->waitForUnit("default.target"); + $one->requireActiveUnit("pgmanage.service"); + + # Test if we can log in. + $one->waitUntilSucceeds("curl 'http://localhost:8080/pgmanage/auth' --data 'action=login&connname=${conn}&username=${role}&password=${password}' --fail"); + ''; +}) diff --git a/nixos/tests/zookeeper.nix b/nixos/tests/zookeeper.nix new file mode 100644 index 000000000000..d247654adade --- /dev/null +++ b/nixos/tests/zookeeper.nix @@ -0,0 +1,28 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "zookeeper"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + server = { pkgs, config, ... }: { + services.zookeeper = { + enable = true; + }; + + networking.firewall.allowedTCPPorts = [ 2181 ]; + }; + }; + + testScript = '' + startAll; + + $server->waitForUnit("zookeeper"); + $server->waitForUnit("network.target"); + $server->waitForOpenPort(2181); + + $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 create /foo bar"); + $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 set /foo hello"); + $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 get /foo | grep hello"); + ''; +}) diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index a113aadcd628..011e3cd7c874 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1fygn6cc99iasg5g5jyps5ps873hfnn4ln4hsmcwlwiqd591qxyv"; + sha256 = "0wwcgvd8zgl5qh6z1sa3kdv1lr9cwwbs9j2gaad5mqr9sfwbbxdh"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix index 2ad8e3fb3500..9eb1e54b9093 100644 --- a/pkgs/applications/altcoins/bitcoin-unlimited.nix +++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "bitcoinunlimited"; repo = "bitcoinunlimited"; rev = "v${version}"; - sha256 = "0rhk6xvzvzyfppg0pgq72nqgm2rmkiw0nhg3rwnzcvvj90nrz3da"; + sha256 = "17cmyns1908s2rqs0zwr05f3541nqm2pg08n2xn97g2k3yimdg5q"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index d8df6dd8349a..33c2e598fca9 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { owner = "dogecoin"; repo = "dogecoin"; rev = "v${version}"; - sha256 = "16q3rldj04hkzzjd23h0knszqr5dgixizy4iyc129mz8wa8pbnvy"; + sha256 = "04rddx20d4fps2w3h1jxa2j8iyqpjv2fh897z0z3r06qjvjzf7rr"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ openssl db5 openssl utillinux + buildInputs = [ openssl db5 openssl utillinux protobuf boost zlib miniupnpc ] ++ optionals withGui [ qt4 qrencode ]; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 6d4b18e29b00..8242d035e5b8 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3 -, libmowgli, libmcs, dbus_glib, libxml2, xorg, gnome3, alsaLib +, libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib , libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis , libcdio082, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b , libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gettext glib gtk3 libmowgli libmcs dbus_glib libxml2 + gettext glib gtk3 libmowgli dbus_glib libxml2 xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2 libpulseaudio fluidsynth libmad libogg libvorbis libcdio082 libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index da143c7d946a..803b0115fbdf 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -3,7 +3,7 @@ gettext, pkgconfig, qtbase, alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b, - libcddb, libcdio082, libcue, libjack2, libmad, libmcs, libmms, libmodplug, + libcddb, libcdio082, libcue, libjack2, libmad, libmms, libmodplug, libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, wavpack @@ -39,7 +39,7 @@ mkDerivation { # Plugin dependencies alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb - libcdio082 libcue libjack2 libmad libmcs libmms libmodplug libmowgli + libcdio082 libcue libjack2 libmad libmms libmodplug libmowgli libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack ]; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 07385e2a8b85..26e58c023b82 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.1.3"; + version = "2.2.0"; name = "audacity-${version}"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b"; + sha256 = "09xpr4bjnainz1xmc35v3qg3dadjr9wv8bmn1p4y91aqyihnhjry"; }; patches = [ (fetchpatch { diff --git a/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch b/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch new file mode 100644 index 000000000000..3a6296baaa64 --- /dev/null +++ b/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch @@ -0,0 +1,23 @@ +From 184c64718ee68b2738647f4a106b260c47f00437 Mon Sep 17 00:00:00 2001 +From: Sam Parkinson +Date: Thu, 26 Oct 2017 14:50:13 +1100 +Subject: [PATCH] Remove post-install script that hardcodes paths + +--- + meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 25f3e1a..18b43bd 100644 +--- a/meson.build ++++ b/meson.build +@@ -21,4 +21,5 @@ subdir('src') + # subdir('tests') + # TODO: unit tests + +-meson.add_install_script('meson_post_install.sh') ++# This does not work for nixos; it hard-codes paths ++# meson.add_install_script('meson_post_install.sh') +-- +2.14.2 + diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix new file mode 100644 index 000000000000..2f4bde92167b --- /dev/null +++ b/pkgs/applications/audio/gradio/default.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchFromGitHub, pkgconfig +, gcc +, python3 +, gsettings_desktop_schemas +, desktop_file_utils +, glib +, gtk3 +, intltool +, libsoup +, json_glib +, wrapGAppsHook +, meson +, ninja +, vala +, sqlite +, gst_all_1 +, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] +}: +let + version = "6.0.2"; + +in stdenv.mkDerivation rec { + name = "gradio-${version}"; + + src = fetchFromGitHub { + owner = "haecker-felix"; + repo = "gradio"; + rev = "v${version}"; + sha256 = "05hg26yr7splgpkl8wjxcsdks9sm1is3hcnp7f5mjnp2ch0nn57s"; + }; + + nativeBuildInputs = [ + pkgconfig + + meson + ninja + vala + + python3 + ]; + buildInputs = [ + sqlite + + glib + intltool + libsoup + json_glib + + gtk3 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + + wrapGAppsHook + desktop_file_utils + gsettings_desktop_schemas + ] ++ gst_plugins; + + enableParallelBuilding = true; + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ]; + + meta = with stdenv.lib; { + homepage = https://github.com/haecker-felix/gradio; + description = "A GTK3 app for finding and listening to internet radio stations"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.samdroid-apps ]; + }; +} diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix new file mode 100644 index 000000000000..e7a23b6f204c --- /dev/null +++ b/pkgs/applications/audio/greg/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +with pythonPackages; buildPythonApplication rec { + pname = "greg"; + version = "0.4.7"; + name = pname + "-" + version; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "manolomartinez"; + repo = pname; + rev = "v" + version; + sha256 = "0bdzgh2k1ppgcvqiasxwp3w89q44s4jgwjidlips3ixx1bzm822v"; + }; + + buildInputs = with pythonPackages; [ feedparser ]; + propagatedBuildInputs = buildInputs; + + meta = with stdenv.lib; { + homepage = "https://github.com/manolomartinez/greg"; + description = "A command-line podcast aggregator"; + license = licenses.gpl3; + maintainers = with maintainers; [ edwtjo ]; + }; +} diff --git a/pkgs/applications/audio/groovebasin/default.nix b/pkgs/applications/audio/groovebasin/default.nix deleted file mode 100644 index 7eb2e85f7bed..000000000000 --- a/pkgs/applications/audio/groovebasin/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, fetchFromGitHub, makeWrapper, callPackage, libgroove, python, utillinux, nodejs }: - -with stdenv.lib; - -let - nodePackages = callPackage (import ../../../top-level/node-packages.nix) { - inherit nodejs; - neededNatives = [ libgroove python utillinux ]; - self = nodePackages; - generated = ./package.nix; - }; - -in nodePackages.buildNodePackage rec { - version = "1.5.1"; - name = "groovebasin-${version}"; - - src = fetchFromGitHub { - owner = "andrewrk"; - repo = "groovebasin"; - rev = "${version}"; - sha256 = "1g7v0qhvgzpb050hf45pibp68qd67hnnry5npw58f4dvaxdd8yhd"; - }; - - deps = (filter (v: nixType v == "derivation") (attrValues nodePackages)); - - buildInputs = [ makeWrapper ]; - - postInstall = '' - mkdir -p "$out/lib/node_modules/groovebasin/public" - stylus -o "$out/lib/node_modules/groovebasin/public/" -c --include-css "$out/lib/node_modules/groovebasin/src/client/styles" - browserify-lite "$out/lib/node_modules/groovebasin/src/client/app.js" --outfile "$out/lib/node_modules/groovebasin/public/app.js" - wrapProgram "$out/bin/groovebasin" --set NODE_PATH "$out/lib/node_modules/groovebasin/node_modules/" - ''; - - passthru.names = ["groovebasin"]; - - meta = { - description = "Music player server with a web-based user interface"; - homepage = http://groovebasin.com/; - license = licenses.mit; - platforms = platforms.unix; - maintainers = [ maintainers.andrewrk ]; - longDescription = '' - Groove Basin runs on a server optionally connected to speakers. Guests can - control the music player by connecting with a laptop, tablet, or smart phone. - Further, users can stream their music libraries remotely. - - Groove Basin comes with a fast, responsive web interface that supports keyboard - shortcuts and drag drop. It also provides the ability to upload songs, - download songs, and import songs by URL, including YouTube URLs. - - Groove Basin supports Dynamic Mode which automatically queues random songs, - favoring songs that have not been queued recently. - - Groove Basin automatically performs ReplayGain scanning on every song using - the EBU R128 loudness standard, and automatically switches between track - and album mode. - - Groove Basin supports the MPD protocol, which means it is compatible with MPD - clients. There is also a more powerful Groove Basin protocol which you can - use if the MPD protocol does not meet your needs. - - Groove Basin supports Last.fm scrobbling. - ''; - # groovebasin was built with nodejs 0.10 which reached end of LTS - # in October 216, it doesn't built with nodejs 4.x - broken = true; - }; -} diff --git a/pkgs/applications/audio/groovebasin/package.nix b/pkgs/applications/audio/groovebasin/package.nix deleted file mode 100644 index 3f307cd32f05..000000000000 --- a/pkgs/applications/audio/groovebasin/package.nix +++ /dev/null @@ -1,4396 +0,0 @@ -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."CSSselect"."~0.4.0" = - self.by-version."CSSselect"."0.4.1"; - by-version."CSSselect"."0.4.1" = self.buildNodePackage { - name = "CSSselect-0.4.1"; - version = "0.4.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz"; - name = "CSSselect-0.4.1.tgz"; - sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2"; - }; - deps = { - "CSSwhat-0.4.7" = self.by-version."CSSwhat"."0.4.7"; - "domutils-1.4.3" = self.by-version."domutils"."1.4.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."CSSwhat"."0.4" = - self.by-version."CSSwhat"."0.4.7"; - by-version."CSSwhat"."0.4.7" = self.buildNodePackage { - name = "CSSwhat-0.4.7"; - version = "0.4.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz"; - name = "CSSwhat-0.4.7.tgz"; - sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."abbrev"."1" = - self.by-version."abbrev"."1.0.7"; - by-version."abbrev"."1.0.7" = self.buildNodePackage { - name = "abbrev-1.0.7"; - version = "1.0.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"; - name = "abbrev-1.0.7.tgz"; - sha1 = "5b6035b2ee9d4fb5cf859f08a9be81b208491843"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."abstract-leveldown"."~2.2.1" = - self.by-version."abstract-leveldown"."2.2.2"; - by-version."abstract-leveldown"."2.2.2" = self.buildNodePackage { - name = "abstract-leveldown-2.2.2"; - version = "2.2.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.2.2.tgz"; - name = "abstract-leveldown-2.2.2.tgz"; - sha1 = "ecaff98c20641422710ab04b01e8f04d6b64fe77"; - }; - deps = { - "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."accepts"."~1.2.7" = - self.by-version."accepts"."1.2.9"; - by-version."accepts"."1.2.9" = self.buildNodePackage { - name = "accepts-1.2.9"; - version = "1.2.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.2.9.tgz"; - name = "accepts-1.2.9.tgz"; - sha1 = "76e9631d05e3ff192a34afb9389f7b3953ded001"; - }; - deps = { - "mime-types-2.1.1" = self.by-version."mime-types"."2.1.1"; - "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."amdefine".">=0.0.4" = - self.by-version."amdefine"."0.1.1"; - by-version."amdefine"."0.1.1" = self.buildNodePackage { - name = "amdefine-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"; - name = "amdefine-0.1.1.tgz"; - sha1 = "b5c75c532052dccd6a39c0064c772c8d57a06cd2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ansi-regex"."^1.0.0" = - self.by-version."ansi-regex"."1.1.1"; - by-version."ansi-regex"."1.1.1" = self.buildNodePackage { - name = "ansi-regex-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"; - name = "ansi-regex-1.1.1.tgz"; - sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ansi-regex"."^1.1.0" = - self.by-version."ansi-regex"."1.1.1"; - by-spec."ansi-styles"."^2.0.1" = - self.by-version."ansi-styles"."2.0.1"; - by-version."ansi-styles"."2.0.1" = self.buildNodePackage { - name = "ansi-styles-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"; - name = "ansi-styles-2.0.1.tgz"; - sha1 = "b033f57f93e2d28adeb8bc11138fa13da0fd20a3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."asn1"."0.1.11" = - self.by-version."asn1"."0.1.11"; - by-version."asn1"."0.1.11" = self.buildNodePackage { - name = "asn1-0.1.11"; - version = "0.1.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - name = "asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."assert-plus"."^0.1.5" = - self.by-version."assert-plus"."0.1.5"; - by-version."assert-plus"."0.1.5" = self.buildNodePackage { - name = "assert-plus-0.1.5"; - version = "0.1.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - name = "assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."~0.9.0" = - self.by-version."async"."0.9.2"; - by-version."async"."0.9.2" = self.buildNodePackage { - name = "async-0.9.2"; - version = "0.9.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz"; - name = "async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."aws-sign2"."~0.5.0" = - self.by-version."aws-sign2"."0.5.0"; - by-version."aws-sign2"."0.5.0" = self.buildNodePackage { - name = "aws-sign2-0.5.0"; - version = "0.5.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - name = "aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."base64url"."0.0.3" = - self.by-version."base64url"."0.0.3"; - by-version."base64url"."0.0.3" = self.buildNodePackage { - name = "base64url-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/base64url/-/base64url-0.0.3.tgz"; - name = "base64url-0.0.3.tgz"; - sha1 = "50c20edac277dde1a0b15059954ced7a2d102d57"; - }; - deps = { - "tap-0.3.3" = self.by-version."tap"."0.3.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."base64url"."~0.0.4" = - self.by-version."base64url"."0.0.6"; - by-version."base64url"."0.0.6" = self.buildNodePackage { - name = "base64url-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/base64url/-/base64url-0.0.6.tgz"; - name = "base64url-0.0.6.tgz"; - sha1 = "9597b36b330db1c42477322ea87ea8027499b82b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."base64url"."~1.0.4" = - self.by-version."base64url"."1.0.4"; - by-version."base64url"."1.0.4" = self.buildNodePackage { - name = "base64url-1.0.4"; - version = "1.0.4"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/base64url/-/base64url-1.0.4.tgz"; - name = "base64url-1.0.4.tgz"; - sha1 = "29a2a7ade9791fbb25f312ab35a2fd3126ceac0e"; - }; - deps = { - "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10"; - "meow-2.0.0" = self.by-version."meow"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bindings"."~1.2.1" = - self.by-version."bindings"."1.2.1"; - by-version."bindings"."1.2.1" = self.buildNodePackage { - name = "bindings-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; - name = "bindings-1.2.1.tgz"; - sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bl"."~0.9.0" = - self.by-version."bl"."0.9.4"; - by-version."bl"."0.9.4" = self.buildNodePackage { - name = "bl-0.9.4"; - version = "0.9.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz"; - name = "bl-0.9.4.tgz"; - sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7"; - }; - deps = { - "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bl"."~0.9.4" = - self.by-version."bl"."0.9.4"; - by-spec."bluebird"."^2.9.26" = - self.by-version."bluebird"."2.9.30"; - by-version."bluebird"."2.9.30" = self.buildNodePackage { - name = "bluebird-2.9.30"; - version = "2.9.30"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.30.tgz"; - name = "bluebird-2.9.30.tgz"; - sha1 = "edda875ec9aad1f29cf1f56d6e82fbab2b0df556"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."boom"."0.4.x" = - self.by-version."boom"."0.4.2"; - by-version."boom"."0.4.2" = self.buildNodePackage { - name = "boom-0.4.2"; - version = "0.4.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - name = "boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }; - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."boom"."2.x.x" = - self.by-version."boom"."2.8.0"; - by-version."boom"."2.8.0" = self.buildNodePackage { - name = "boom-2.8.0"; - version = "2.8.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-2.8.0.tgz"; - name = "boom-2.8.0.tgz"; - sha1 = "317bdfd47018fe7dd79b0e9da73efe244119fdf1"; - }; - deps = { - "hoek-2.14.0" = self.by-version."hoek"."2.14.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."browserify-lite"."~0.2.4" = - self.by-version."browserify-lite"."0.2.4"; - by-version."browserify-lite"."0.2.4" = self.buildNodePackage { - name = "browserify-lite-0.2.4"; - version = "0.2.4"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/browserify-lite/-/browserify-lite-0.2.4.tgz"; - name = "browserify-lite-0.2.4.tgz"; - sha1 = "00a32f466c8f3dbbd1074250fd0aa775716ab140"; - }; - deps = { - "pend-1.2.0" = self.by-version."pend"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "browserify-lite" = self.by-version."browserify-lite"."0.2.4"; - by-spec."buffer-crc32"."~0.2.3" = - self.by-version."buffer-crc32"."0.2.5"; - by-version."buffer-crc32"."0.2.5" = self.buildNodePackage { - name = "buffer-crc32-0.2.5"; - version = "0.2.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"; - name = "buffer-crc32-0.2.5.tgz"; - sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."buffer-equal"."~0.0.0" = - self.by-version."buffer-equal"."0.0.1"; - by-version."buffer-equal"."0.0.1" = self.buildNodePackage { - name = "buffer-equal-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"; - name = "buffer-equal-0.0.1.tgz"; - sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."buffer-equal-constant-time"."^1.0.1" = - self.by-version."buffer-equal-constant-time"."1.0.1"; - by-version."buffer-equal-constant-time"."1.0.1" = self.buildNodePackage { - name = "buffer-equal-constant-time-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; - name = "buffer-equal-constant-time-1.0.1.tgz"; - sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bunker"."0.1.X" = - self.by-version."bunker"."0.1.2"; - by-version."bunker"."0.1.2" = self.buildNodePackage { - name = "bunker-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz"; - name = "bunker-0.1.2.tgz"; - sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c"; - }; - deps = { - "burrito-0.2.12" = self.by-version."burrito"."0.2.12"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."burrito".">=0.2.5 <0.3" = - self.by-version."burrito"."0.2.12"; - by-version."burrito"."0.2.12" = self.buildNodePackage { - name = "burrito-0.2.12"; - version = "0.2.12"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz"; - name = "burrito-0.2.12.tgz"; - sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b"; - }; - deps = { - "traverse-0.5.2" = self.by-version."traverse"."0.5.2"; - "uglify-js-1.1.1" = self.by-version."uglify-js"."1.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."camelcase"."^1.0.1" = - self.by-version."camelcase"."1.1.0"; - by-version."camelcase"."1.1.0" = self.buildNodePackage { - name = "camelcase-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz"; - name = "camelcase-1.1.0.tgz"; - sha1 = "953b25c3bc98671ee59a44cb9d542672da7331b9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."camelcase-keys"."^1.0.0" = - self.by-version."camelcase-keys"."1.0.0"; - by-version."camelcase-keys"."1.0.0" = self.buildNodePackage { - name = "camelcase-keys-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz"; - name = "camelcase-keys-1.0.0.tgz"; - sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec"; - }; - deps = { - "camelcase-1.1.0" = self.by-version."camelcase"."1.1.0"; - "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."caseless"."~0.10.0" = - self.by-version."caseless"."0.10.0"; - by-version."caseless"."0.10.0" = self.buildNodePackage { - name = "caseless-0.10.0"; - version = "0.10.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/caseless/-/caseless-0.10.0.tgz"; - name = "caseless-0.10.0.tgz"; - sha1 = "ed6b2719adcd1fd18f58dc081c0f1a5b43963909"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."caseless"."~0.8.0" = - self.by-version."caseless"."0.8.0"; - by-version."caseless"."0.8.0" = self.buildNodePackage { - name = "caseless-0.8.0"; - version = "0.8.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"; - name = "caseless-0.8.0.tgz"; - sha1 = "5bca2881d41437f54b2407ebe34888c7b9ad4f7d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."caseless"."~0.9.0" = - self.by-version."caseless"."0.9.0"; - by-version."caseless"."0.9.0" = self.buildNodePackage { - name = "caseless-0.9.0"; - version = "0.9.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz"; - name = "caseless-0.9.0.tgz"; - sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."chalk"."^1.0.0" = - self.by-version."chalk"."1.0.0"; - by-version."chalk"."1.0.0" = self.buildNodePackage { - name = "chalk-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz"; - name = "chalk-1.0.0.tgz"; - sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc"; - }; - deps = { - "ansi-styles-2.0.1" = self.by-version."ansi-styles"."2.0.1"; - "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3"; - "has-ansi-1.0.3" = self.by-version."has-ansi"."1.0.3"; - "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1"; - "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."charm"."0.1.x" = - self.by-version."charm"."0.1.2"; - by-version."charm"."0.1.2" = self.buildNodePackage { - name = "charm-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz"; - name = "charm-0.1.2.tgz"; - sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cheerio"."^0.18.0" = - self.by-version."cheerio"."0.18.0"; - by-version."cheerio"."0.18.0" = self.buildNodePackage { - name = "cheerio-0.18.0"; - version = "0.18.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cheerio/-/cheerio-0.18.0.tgz"; - name = "cheerio-0.18.0.tgz"; - sha1 = "4e1c06377e725b740e996e0dfec353863de677fa"; - }; - deps = { - "CSSselect-0.4.1" = self.by-version."CSSselect"."0.4.1"; - "entities-1.1.1" = self.by-version."entities"."1.1.1"; - "htmlparser2-3.8.3" = self.by-version."htmlparser2"."3.8.3"; - "dom-serializer-0.0.1" = self.by-version."dom-serializer"."0.0.1"; - "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."clarinet"."~0.8.1" = - self.by-version."clarinet"."0.8.1"; - by-version."clarinet"."0.8.1" = self.buildNodePackage { - name = "clarinet-0.8.1"; - version = "0.8.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/clarinet/-/clarinet-0.8.1.tgz"; - name = "clarinet-0.8.1.tgz"; - sha1 = "ddfd10cd292abf5cab239140774e394bfd1ee7a6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."combined-stream"."~0.0.4" = - self.by-version."combined-stream"."0.0.7"; - by-version."combined-stream"."0.0.7" = self.buildNodePackage { - name = "combined-stream-0.0.7"; - version = "0.0.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - name = "combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - deps = { - "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."combined-stream"."~0.0.5" = - self.by-version."combined-stream"."0.0.7"; - by-spec."combined-stream"."~1.0.1" = - self.by-version."combined-stream"."1.0.5"; - by-version."combined-stream"."1.0.5" = self.buildNodePackage { - name = "combined-stream-1.0.5"; - version = "1.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - name = "combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; - }; - deps = { - "delayed-stream-1.0.0" = self.by-version."delayed-stream"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."commander"."^2.8.1" = - self.by-version."commander"."2.8.1"; - by-version."commander"."2.8.1" = self.buildNodePackage { - name = "commander-2.8.1"; - version = "2.8.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; - name = "commander-2.8.1.tgz"; - sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4"; - }; - deps = { - "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."concat-stream"."~1.4.7" = - self.by-version."concat-stream"."1.4.10"; - by-version."concat-stream"."1.4.10" = self.buildNodePackage { - name = "concat-stream-1.4.10"; - version = "1.4.10"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz"; - name = "concat-stream-1.4.10.tgz"; - sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36"; - }; - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6"; - "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."connect-static"."~1.5.0" = - self.by-version."connect-static"."1.5.0"; - by-version."connect-static"."1.5.0" = self.buildNodePackage { - name = "connect-static-1.5.0"; - version = "1.5.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/connect-static/-/connect-static-1.5.0.tgz"; - name = "connect-static-1.5.0.tgz"; - sha1 = "f8b455532e04de7c3dc7c1e062207f0b7a626ec7"; - }; - deps = { - "findit2-2.2.3" = self.by-version."findit2"."2.2.3"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "pend-1.2.0" = self.by-version."pend"."1.2.0"; - "streamsink-1.2.0" = self.by-version."streamsink"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "connect-static" = self.by-version."connect-static"."1.5.0"; - by-spec."content-disposition"."0.5.0" = - self.by-version."content-disposition"."0.5.0"; - by-version."content-disposition"."0.5.0" = self.buildNodePackage { - name = "content-disposition-0.5.0"; - version = "0.5.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; - name = "content-disposition-0.5.0.tgz"; - sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."content-disposition"."~0.5.0" = - self.by-version."content-disposition"."0.5.0"; - "content-disposition" = self.by-version."content-disposition"."0.5.0"; - by-spec."content-type"."~1.0.1" = - self.by-version."content-type"."1.0.1"; - by-version."content-type"."1.0.1" = self.buildNodePackage { - name = "content-type-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz"; - name = "content-type-1.0.1.tgz"; - sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookie"."0.1.2" = - self.by-version."cookie"."0.1.2"; - by-version."cookie"."0.1.2" = self.buildNodePackage { - name = "cookie-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; - name = "cookie-0.1.2.tgz"; - sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookie-signature"."1.0.6" = - self.by-version."cookie-signature"."1.0.6"; - by-version."cookie-signature"."1.0.6" = self.buildNodePackage { - name = "cookie-signature-1.0.6"; - version = "1.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - name = "cookie-signature-1.0.6.tgz"; - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookies"."~0.5.0" = - self.by-version."cookies"."0.5.0"; - by-version."cookies"."0.5.0" = self.buildNodePackage { - name = "cookies-0.5.0"; - version = "0.5.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cookies/-/cookies-0.5.0.tgz"; - name = "cookies-0.5.0.tgz"; - sha1 = "164cac46a1d3ca3b3b87427414c24931d8381025"; - }; - deps = { - "keygrip-1.0.1" = self.by-version."keygrip"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "cookies" = self.by-version."cookies"."0.5.0"; - 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"; - 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"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."crc"."3.2.1" = - self.by-version."crc"."3.2.1"; - by-version."crc"."3.2.1" = self.buildNodePackage { - name = "crc-3.2.1"; - version = "3.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; - name = "crc-3.2.1.tgz"; - sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cryptiles"."0.2.x" = - self.by-version."cryptiles"."0.2.2"; - by-version."cryptiles"."0.2.2" = self.buildNodePackage { - name = "cryptiles-0.2.2"; - version = "0.2.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - name = "cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }; - deps = { - "boom-0.4.2" = self.by-version."boom"."0.4.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cryptiles"."2.x.x" = - self.by-version."cryptiles"."2.0.4"; - by-version."cryptiles"."2.0.4" = self.buildNodePackage { - name = "cryptiles-2.0.4"; - version = "2.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz"; - name = "cryptiles-2.0.4.tgz"; - sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285"; - }; - deps = { - "boom-2.8.0" = self.by-version."boom"."2.8.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."css-parse"."1.7.x" = - self.by-version."css-parse"."1.7.0"; - by-version."css-parse"."1.7.0" = self.buildNodePackage { - name = "css-parse-1.7.0"; - version = "1.7.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz"; - name = "css-parse-1.7.0.tgz"; - sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ctype"."0.5.3" = - self.by-version."ctype"."0.5.3"; - by-version."ctype"."0.5.3" = self.buildNodePackage { - name = "ctype-0.5.3"; - version = "0.5.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - name = "ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."curlydiff"."~2.0.1" = - self.by-version."curlydiff"."2.0.1"; - by-version."curlydiff"."2.0.1" = self.buildNodePackage { - name = "curlydiff-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/curlydiff/-/curlydiff-2.0.1.tgz"; - name = "curlydiff-2.0.1.tgz"; - sha1 = "6ac4b754ea5b63af2632022d03a152306f7eac0b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "curlydiff" = self.by-version."curlydiff"."2.0.1"; - by-spec."debug"."*" = - self.by-version."debug"."2.2.0"; - by-version."debug"."2.2.0" = self.buildNodePackage { - name = "debug-2.2.0"; - version = "2.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - name = "debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - deps = { - "ms-0.7.1" = self.by-version."ms"."0.7.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."~2.2.0" = - self.by-version."debug"."2.2.0"; - by-spec."deep-equal"."~0.0.0" = - self.by-version."deep-equal"."0.0.0"; - by-version."deep-equal"."0.0.0" = self.buildNodePackage { - name = "deep-equal-0.0.0"; - version = "0.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz"; - name = "deep-equal-0.0.0.tgz"; - sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."deep-is"."0.1.x" = - self.by-version."deep-is"."0.1.3"; - by-version."deep-is"."0.1.3" = self.buildNodePackage { - name = "deep-is-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; - name = "deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."delayed-stream"."0.0.5" = - self.by-version."delayed-stream"."0.0.5"; - by-version."delayed-stream"."0.0.5" = self.buildNodePackage { - name = "delayed-stream-0.0.5"; - version = "0.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - name = "delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."delayed-stream"."~1.0.0" = - self.by-version."delayed-stream"."1.0.0"; - by-version."delayed-stream"."1.0.0" = self.buildNodePackage { - name = "delayed-stream-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - name = "delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."depd"."~1.0.1" = - self.by-version."depd"."1.0.1"; - by-version."depd"."1.0.1" = self.buildNodePackage { - name = "depd-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; - name = "depd-1.0.1.tgz"; - sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."destroy"."1.0.3" = - self.by-version."destroy"."1.0.3"; - by-version."destroy"."1.0.3" = self.buildNodePackage { - name = "destroy-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; - name = "destroy-1.0.3.tgz"; - sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."diacritics"."~1.2.1" = - self.by-version."diacritics"."1.2.1"; - by-version."diacritics"."1.2.1" = self.buildNodePackage { - name = "diacritics-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/diacritics/-/diacritics-1.2.1.tgz"; - name = "diacritics-1.2.1.tgz"; - sha1 = "e4d323a7c564197f7af514c5964bd45d0eb8cf77"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."difflet"."~0.2.0" = - self.by-version."difflet"."0.2.6"; - by-version."difflet"."0.2.6" = self.buildNodePackage { - name = "difflet-0.2.6"; - version = "0.2.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz"; - name = "difflet-0.2.6.tgz"; - sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa"; - }; - deps = { - "traverse-0.6.6" = self.by-version."traverse"."0.6.6"; - "charm-0.1.2" = self.by-version."charm"."0.1.2"; - "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."dom-serializer"."0" = - self.by-version."dom-serializer"."0.1.0"; - by-version."dom-serializer"."0.1.0" = self.buildNodePackage { - name = "dom-serializer-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; - name = "dom-serializer-0.1.0.tgz"; - sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; - }; - deps = { - "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; - "entities-1.1.1" = self.by-version."entities"."1.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."dom-serializer"."~0.0.0" = - self.by-version."dom-serializer"."0.0.1"; - by-version."dom-serializer"."0.0.1" = self.buildNodePackage { - name = "dom-serializer-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz"; - name = "dom-serializer-0.0.1.tgz"; - sha1 = "9589827f1e32d22c37c829adabd59b3247af8eaf"; - }; - deps = { - "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; - "entities-1.1.1" = self.by-version."entities"."1.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."domelementtype"."1" = - self.by-version."domelementtype"."1.3.0"; - by-version."domelementtype"."1.3.0" = self.buildNodePackage { - name = "domelementtype-1.3.0"; - version = "1.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; - name = "domelementtype-1.3.0.tgz"; - sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."domelementtype"."~1.1.1" = - self.by-version."domelementtype"."1.1.3"; - by-version."domelementtype"."1.1.3" = self.buildNodePackage { - name = "domelementtype-1.1.3"; - version = "1.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; - name = "domelementtype-1.1.3.tgz"; - sha1 = "bd28773e2642881aec51544924299c5cd822185b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."domhandler"."2.3" = - self.by-version."domhandler"."2.3.0"; - by-version."domhandler"."2.3.0" = self.buildNodePackage { - name = "domhandler-2.3.0"; - version = "2.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"; - name = "domhandler-2.3.0.tgz"; - sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738"; - }; - deps = { - "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."domutils"."1.4" = - self.by-version."domutils"."1.4.3"; - by-version."domutils"."1.4.3" = self.buildNodePackage { - name = "domutils-1.4.3"; - version = "1.4.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz"; - name = "domutils-1.4.3.tgz"; - sha1 = "0865513796c6b306031850e175516baf80b72a6f"; - }; - deps = { - "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."domutils"."1.5" = - self.by-version."domutils"."1.5.1"; - by-version."domutils"."1.5.1" = self.buildNodePackage { - name = "domutils-1.5.1"; - version = "1.5.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; - name = "domutils-1.5.1.tgz"; - sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; - }; - deps = { - "dom-serializer-0.1.0" = self.by-version."dom-serializer"."0.1.0"; - "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ee-first"."1.1.0" = - self.by-version."ee-first"."1.1.0"; - by-version."ee-first"."1.1.0" = self.buildNodePackage { - name = "ee-first-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; - name = "ee-first-1.1.0.tgz"; - sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."entities"."1.0" = - self.by-version."entities"."1.0.0"; - by-version."entities"."1.0.0" = self.buildNodePackage { - name = "entities-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz"; - name = "entities-1.0.0.tgz"; - sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."entities"."~1.1.1" = - self.by-version."entities"."1.1.1"; - by-version."entities"."1.1.1" = self.buildNodePackage { - name = "entities-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; - name = "entities-1.1.1.tgz"; - sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."escape-html"."1.0.1" = - self.by-version."escape-html"."1.0.1"; - by-version."escape-html"."1.0.1" = self.buildNodePackage { - name = "escape-html-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; - name = "escape-html-1.0.1.tgz"; - sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."escape-string-regexp"."^1.0.2" = - self.by-version."escape-string-regexp"."1.0.3"; - by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage { - name = "escape-string-regexp-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"; - name = "escape-string-regexp-1.0.3.tgz"; - sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."etag"."~1.6.0" = - self.by-version."etag"."1.6.0"; - by-version."etag"."1.6.0" = self.buildNodePackage { - name = "etag-1.6.0"; - version = "1.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/etag/-/etag-1.6.0.tgz"; - name = "etag-1.6.0.tgz"; - sha1 = "8bcb2c6af1254c481dfc8b997c906ef4e442c207"; - }; - deps = { - "crc-3.2.1" = self.by-version."crc"."3.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."express"."~4.12.3" = - self.by-version."express"."4.12.4"; - by-version."express"."4.12.4" = self.buildNodePackage { - name = "express-4.12.4"; - version = "4.12.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.12.4.tgz"; - name = "express-4.12.4.tgz"; - sha1 = "8fec2510255bc6b2e58107c48239c0fa307c1aa2"; - }; - deps = { - "accepts-1.2.9" = self.by-version."accepts"."1.2.9"; - "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; - "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "depd-1.0.1" = self.by-version."depd"."1.0.1"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.6.0" = self.by-version."etag"."1.6.0"; - "finalhandler-0.3.6" = self.by-version."finalhandler"."0.3.6"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0"; - "methods-1.1.1" = self.by-version."methods"."1.1.1"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "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"; - "qs-2.4.2" = self.by-version."qs"."2.4.2"; - "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - "send-0.12.3" = self.by-version."send"."0.12.3"; - "serve-static-1.9.3" = self.by-version."serve-static"."1.9.3"; - "type-is-1.6.3" = self.by-version."type-is"."1.6.3"; - "vary-1.0.0" = self.by-version."vary"."1.0.0"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "express" = self.by-version."express"."4.12.4"; - by-spec."fast-future"."~1.0.0" = - self.by-version."fast-future"."1.0.1"; - by-version."fast-future"."1.0.1" = self.buildNodePackage { - name = "fast-future-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/fast-future/-/fast-future-1.0.1.tgz"; - name = "fast-future-1.0.1.tgz"; - sha1 = "6cbd22d999ab39cd10fc79392486e7a678716818"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."fd-slicer"."~1.0.0" = - self.by-version."fd-slicer"."1.0.1"; - by-version."fd-slicer"."1.0.1" = self.buildNodePackage { - name = "fd-slicer-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; - name = "fd-slicer-1.0.1.tgz"; - sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; - }; - deps = { - "pend-1.2.0" = self.by-version."pend"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."fd-slicer"."~1.0.1" = - self.by-version."fd-slicer"."1.0.1"; - by-spec."finalhandler"."0.3.6" = - self.by-version."finalhandler"."0.3.6"; - by-version."finalhandler"."0.3.6" = self.buildNodePackage { - name = "finalhandler-0.3.6"; - version = "0.3.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.6.tgz"; - name = "finalhandler-0.3.6.tgz"; - sha1 = "daf9c4161b1b06e001466b1411dfdb6973be138b"; - }; - deps = { - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."findit2"."~2.2.3" = - self.by-version."findit2"."2.2.3"; - by-version."findit2"."2.2.3" = self.buildNodePackage { - name = "findit2-2.2.3"; - version = "2.2.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/findit2/-/findit2-2.2.3.tgz"; - name = "findit2-2.2.3.tgz"; - sha1 = "58a466697df8a6205cdfdbf395536b8bd777a5f6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "findit2" = self.by-version."findit2"."2.2.3"; - by-spec."forever-agent"."~0.5.0" = - self.by-version."forever-agent"."0.5.2"; - by-version."forever-agent"."0.5.2" = self.buildNodePackage { - name = "forever-agent-0.5.2"; - version = "0.5.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - name = "forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."forever-agent"."~0.6.0" = - self.by-version."forever-agent"."0.6.1"; - by-version."forever-agent"."0.6.1" = self.buildNodePackage { - name = "forever-agent-0.6.1"; - version = "0.6.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - name = "forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."form-data"."~0.2.0" = - self.by-version."form-data"."0.2.0"; - by-version."form-data"."0.2.0" = self.buildNodePackage { - name = "form-data-0.2.0"; - version = "0.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz"; - name = "form-data-0.2.0.tgz"; - sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466"; - }; - deps = { - "async-0.9.2" = self.by-version."async"."0.9.2"; - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."forwarded"."~0.1.0" = - self.by-version."forwarded"."0.1.0"; - by-version."forwarded"."0.1.0" = self.buildNodePackage { - name = "forwarded-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; - name = "forwarded-0.1.0.tgz"; - sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."fresh"."0.2.4" = - self.by-version."fresh"."0.2.4"; - by-version."fresh"."0.2.4" = self.buildNodePackage { - name = "fresh-0.2.4"; - version = "0.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; - name = "fresh-0.2.4.tgz"; - sha1 = "3582499206c9723714190edd74b4604feb4a614c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."gapitoken"."~0.1.2" = - self.by-version."gapitoken"."0.1.4"; - by-version."gapitoken"."0.1.4" = self.buildNodePackage { - name = "gapitoken-0.1.4"; - version = "0.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/gapitoken/-/gapitoken-0.1.4.tgz"; - name = "gapitoken-0.1.4.tgz"; - sha1 = "643dedb26cb142466f62b73d2782e7822a6f1ad8"; - }; - deps = { - "jws-0.0.2" = self.by-version."jws"."0.0.2"; - "request-2.57.0" = self.by-version."request"."2.57.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."generate-function"."^2.0.0" = - self.by-version."generate-function"."2.0.0"; - by-version."generate-function"."2.0.0" = self.buildNodePackage { - name = "generate-function-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - name = "generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."generate-object-property"."^1.1.0" = - self.by-version."generate-object-property"."1.2.0"; - by-version."generate-object-property"."1.2.0" = self.buildNodePackage { - name = "generate-object-property-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - name = "generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; - }; - deps = { - "is-property-1.0.2" = self.by-version."is-property"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."get-stdin"."^4.0.1" = - self.by-version."get-stdin"."4.0.1"; - by-version."get-stdin"."4.0.1" = self.buildNodePackage { - name = "get-stdin-4.0.1"; - version = "4.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - name = "get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."glob"."3.2.x" = - self.by-version."glob"."3.2.11"; - by-version."glob"."3.2.11" = self.buildNodePackage { - name = "glob-3.2.11"; - version = "3.2.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; - name = "glob-3.2.11.tgz"; - sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; - }; - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."google-auth-library"."~0.9.3" = - self.by-version."google-auth-library"."0.9.6"; - by-version."google-auth-library"."0.9.6" = self.buildNodePackage { - name = "google-auth-library-0.9.6"; - version = "0.9.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/google-auth-library/-/google-auth-library-0.9.6.tgz"; - name = "google-auth-library-0.9.6.tgz"; - sha1 = "57aa09f2621d6eafe8852b0167c9100759a67220"; - }; - deps = { - "async-0.9.2" = self.by-version."async"."0.9.2"; - "gtoken-1.1.1" = self.by-version."gtoken"."1.1.1"; - "lodash.noop-3.0.0" = self.by-version."lodash.noop"."3.0.0"; - "jws-3.0.0" = self.by-version."jws"."3.0.0"; - "request-2.51.0" = self.by-version."request"."2.51.0"; - "string-template-0.2.1" = self.by-version."string-template"."0.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."google-p12-pem"."^0.0.1" = - self.by-version."google-p12-pem"."0.0.1"; - by-version."google-p12-pem"."0.0.1" = self.buildNodePackage { - name = "google-p12-pem-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.0.1.tgz"; - name = "google-p12-pem-0.0.1.tgz"; - sha1 = "965638d464f13b4a866356a5ba047163ec0b08b7"; - }; - deps = { - "node-forge-0.6.16" = self.by-version."node-forge"."0.6.16"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."googleapis"."~2.0.3" = - self.by-version."googleapis"."2.0.5"; - by-version."googleapis"."2.0.5" = self.buildNodePackage { - name = "googleapis-2.0.5"; - version = "2.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/googleapis/-/googleapis-2.0.5.tgz"; - name = "googleapis-2.0.5.tgz"; - sha1 = "fb2d678f97152eb0a336da84bbc1eeb16a9c8310"; - }; - deps = { - "async-0.9.2" = self.by-version."async"."0.9.2"; - "gapitoken-0.1.4" = self.by-version."gapitoken"."0.1.4"; - "google-auth-library-0.9.6" = self.by-version."google-auth-library"."0.9.6"; - "request-2.54.0" = self.by-version."request"."2.54.0"; - "string-template-0.2.1" = self.by-version."string-template"."0.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "googleapis" = self.by-version."googleapis"."2.0.5"; - by-spec."graceful-readlink".">= 1.0.0" = - self.by-version."graceful-readlink"."1.0.1"; - by-version."graceful-readlink"."1.0.1" = self.buildNodePackage { - name = "graceful-readlink-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - name = "graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."groove"."~2.3.3" = - self.by-version."groove"."2.3.4"; - by-version."groove"."2.3.4" = self.buildNodePackage { - name = "groove-2.3.4"; - version = "2.3.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/groove/-/groove-2.3.4.tgz"; - name = "groove-2.3.4.tgz"; - sha1 = "bbfb8e40584c5921f6df9d52d4017f2acb0a7e45"; - }; - deps = { - "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; - "nan-1.8.4" = self.by-version."nan"."1.8.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "groove" = self.by-version."groove"."2.3.4"; - by-spec."gtoken"."^1.1.0" = - self.by-version."gtoken"."1.1.1"; - by-version."gtoken"."1.1.1" = self.buildNodePackage { - name = "gtoken-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/gtoken/-/gtoken-1.1.1.tgz"; - name = "gtoken-1.1.1.tgz"; - sha1 = "969af828d1f7efea32a500ea09b0edfa8e0c438a"; - }; - deps = { - "google-p12-pem-0.0.1" = self.by-version."google-p12-pem"."0.0.1"; - "jws-3.0.0" = self.by-version."jws"."3.0.0"; - "mime-1.3.4" = self.by-version."mime"."1.3.4"; - "request-2.57.0" = self.by-version."request"."2.57.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."har-validator"."^1.4.0" = - self.by-version."har-validator"."1.7.1"; - by-version."har-validator"."1.7.1" = self.buildNodePackage { - name = "har-validator-1.7.1"; - version = "1.7.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/har-validator/-/har-validator-1.7.1.tgz"; - name = "har-validator-1.7.1.tgz"; - sha1 = "8ec8952f8287d21b451ba3e36f27ed8d997d8a95"; - }; - deps = { - "bluebird-2.9.30" = self.by-version."bluebird"."2.9.30"; - "chalk-1.0.0" = self.by-version."chalk"."1.0.0"; - "commander-2.8.1" = self.by-version."commander"."2.8.1"; - "is-my-json-valid-2.12.0" = self.by-version."is-my-json-valid"."2.12.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."har-validator"."^1.6.1" = - self.by-version."har-validator"."1.7.1"; - by-spec."has-ansi"."^1.0.3" = - self.by-version."has-ansi"."1.0.3"; - by-version."has-ansi"."1.0.3" = self.buildNodePackage { - name = "has-ansi-1.0.3"; - version = "1.0.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz"; - name = "has-ansi-1.0.3.tgz"; - sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538"; - }; - deps = { - "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1"; - "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hawk"."1.1.1" = - self.by-version."hawk"."1.1.1"; - by-version."hawk"."1.1.1" = self.buildNodePackage { - name = "hawk-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; - name = "hawk-1.1.1.tgz"; - sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; - }; - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - "boom-0.4.2" = self.by-version."boom"."0.4.2"; - "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2"; - "sntp-0.2.4" = self.by-version."sntp"."0.2.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hawk"."~2.3.0" = - self.by-version."hawk"."2.3.1"; - by-version."hawk"."2.3.1" = self.buildNodePackage { - name = "hawk-2.3.1"; - version = "2.3.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz"; - name = "hawk-2.3.1.tgz"; - sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f"; - }; - deps = { - "hoek-2.14.0" = self.by-version."hoek"."2.14.0"; - "boom-2.8.0" = self.by-version."boom"."2.8.0"; - "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4"; - "sntp-1.0.9" = self.by-version."sntp"."1.0.9"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hoek"."0.9.x" = - self.by-version."hoek"."0.9.1"; - by-version."hoek"."0.9.1" = self.buildNodePackage { - name = "hoek-0.9.1"; - version = "0.9.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - name = "hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hoek"."2.x.x" = - self.by-version."hoek"."2.14.0"; - by-version."hoek"."2.14.0" = self.buildNodePackage { - name = "hoek-2.14.0"; - version = "2.14.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"; - name = "hoek-2.14.0.tgz"; - sha1 = "81211691f52a5a835ae49edbf1e89c9003476aa4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."htmlparser2"."~3.8.1" = - self.by-version."htmlparser2"."3.8.3"; - by-version."htmlparser2"."3.8.3" = self.buildNodePackage { - name = "htmlparser2-3.8.3"; - version = "3.8.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz"; - name = "htmlparser2-3.8.3.tgz"; - sha1 = "996c28b191516a8be86501a7d79757e5c70c1068"; - }; - deps = { - "domhandler-2.3.0" = self.by-version."domhandler"."2.3.0"; - "domutils-1.5.1" = self.by-version."domutils"."1.5.1"; - "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; - "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; - "entities-1.0.0" = self.by-version."entities"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."http-signature"."~0.10.0" = - self.by-version."http-signature"."0.10.1"; - by-version."http-signature"."0.10.1" = self.buildNodePackage { - name = "http-signature-0.10.1"; - version = "0.10.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; - name = "http-signature-0.10.1.tgz"; - sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; - }; - deps = { - "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5"; - "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; - "ctype-0.5.3" = self.by-version."ctype"."0.5.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."http-signature"."~0.11.0" = - self.by-version."http-signature"."0.11.0"; - by-version."http-signature"."0.11.0" = self.buildNodePackage { - name = "http-signature-0.11.0"; - version = "0.11.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"; - name = "http-signature-0.11.0.tgz"; - sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6"; - }; - deps = { - "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5"; - "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; - "ctype-0.5.3" = self.by-version."ctype"."0.5.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."httpolyglot"."~0.1.1" = - self.by-version."httpolyglot"."0.1.1"; - by-version."httpolyglot"."0.1.1" = self.buildNodePackage { - name = "httpolyglot-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/httpolyglot/-/httpolyglot-0.1.1.tgz"; - name = "httpolyglot-0.1.1.tgz"; - sha1 = "cd0f5c995cbb95dde325d16a7537f90c0048e53d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "httpolyglot" = self.by-version."httpolyglot"."0.1.1"; - by-spec."human-size"."~1.1.0" = - self.by-version."human-size"."1.1.0"; - by-version."human-size"."1.1.0" = self.buildNodePackage { - name = "human-size-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/human-size/-/human-size-1.1.0.tgz"; - name = "human-size-1.1.0.tgz"; - sha1 = "052562be999841c037022c20259990c56ea996f9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "human-size" = self.by-version."human-size"."1.1.0"; - by-spec."indent-string"."^1.1.0" = - self.by-version."indent-string"."1.2.1"; - by-version."indent-string"."1.2.1" = self.buildNodePackage { - name = "indent-string-1.2.1"; - version = "1.2.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz"; - name = "indent-string-1.2.1.tgz"; - sha1 = "294c5930792f8bb5b14462a4aa425b94f07d3a56"; - }; - deps = { - "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; - "minimist-1.1.1" = self.by-version."minimist"."1.1.1"; - "repeating-1.1.3" = self.by-version."repeating"."1.1.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."inherits"."*" = - self.by-version."inherits"."2.0.1"; - by-version."inherits"."2.0.1" = self.buildNodePackage { - name = "inherits-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - name = "inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."inherits"."2" = - self.by-version."inherits"."2.0.1"; - by-spec."inherits"."~2.0.1" = - self.by-version."inherits"."2.0.1"; - 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"; - 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"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-finite"."^1.0.0" = - self.by-version."is-finite"."1.0.1"; - by-version."is-finite"."1.0.1" = self.buildNodePackage { - name = "is-finite-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"; - name = "is-finite-1.0.1.tgz"; - sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b"; - }; - deps = { - "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-my-json-valid"."^2.12.0" = - self.by-version."is-my-json-valid"."2.12.0"; - by-version."is-my-json-valid"."2.12.0" = self.buildNodePackage { - name = "is-my-json-valid-2.12.0"; - version = "2.12.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.0.tgz"; - name = "is-my-json-valid-2.12.0.tgz"; - sha1 = "8fa6c408b26be95b45a23e8f8c4b464a53874d2b"; - }; - deps = { - "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0"; - "generate-object-property-1.2.0" = self.by-version."generate-object-property"."1.2.0"; - "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0"; - "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-property"."^1.0.0" = - self.by-version."is-property"."1.0.2"; - by-version."is-property"."1.0.2" = self.buildNodePackage { - name = "is-property-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - name = "is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isarray"."0.0.1" = - self.by-version."isarray"."0.0.1"; - by-version."isarray"."0.0.1" = self.buildNodePackage { - name = "isarray-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - name = "isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isstream"."~0.1.1" = - self.by-version."isstream"."0.1.2"; - by-version."isstream"."0.1.2" = self.buildNodePackage { - name = "isstream-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - name = "isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."json-stringify-safe"."~5.0.0" = - self.by-version."json-stringify-safe"."5.0.1"; - by-version."json-stringify-safe"."5.0.1" = self.buildNodePackage { - name = "json-stringify-safe-5.0.1"; - version = "5.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - name = "json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jsonpointer"."^1.1.0" = - self.by-version."jsonpointer"."1.1.0"; - by-version."jsonpointer"."1.1.0" = self.buildNodePackage { - name = "jsonpointer-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz"; - name = "jsonpointer-1.1.0.tgz"; - sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jstream"."~0.2.7" = - self.by-version."jstream"."0.2.7"; - by-version."jstream"."0.2.7" = self.buildNodePackage { - name = "jstream-0.2.7"; - version = "0.2.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jstream/-/jstream-0.2.7.tgz"; - name = "jstream-0.2.7.tgz"; - sha1 = "55f06cd6d4204caeac4907a5de1b90aabf4d60da"; - }; - deps = { - "clarinet-0.8.1" = self.by-version."clarinet"."0.8.1"; - "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jwa"."~1.0.0" = - self.by-version."jwa"."1.0.0"; - by-version."jwa"."1.0.0" = self.buildNodePackage { - name = "jwa-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jwa/-/jwa-1.0.0.tgz"; - name = "jwa-1.0.0.tgz"; - sha1 = "040b64fb582171a65f3368e96837ea4dcf42f3d8"; - }; - deps = { - "base64url-0.0.6" = self.by-version."base64url"."0.0.6"; - "buffer-equal-constant-time-1.0.1" = self.by-version."buffer-equal-constant-time"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jws"."0.0.2" = - self.by-version."jws"."0.0.2"; - by-version."jws"."0.0.2" = self.buildNodePackage { - name = "jws-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jws/-/jws-0.0.2.tgz"; - name = "jws-0.0.2.tgz"; - sha1 = "8c6916977183cce3361da48c8c2e0c606e7a95c6"; - }; - deps = { - "tap-0.3.3" = self.by-version."tap"."0.3.3"; - "base64url-0.0.3" = self.by-version."base64url"."0.0.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jws"."^3.0.0" = - self.by-version."jws"."3.0.0"; - by-version."jws"."3.0.0" = self.buildNodePackage { - name = "jws-3.0.0"; - version = "3.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jws/-/jws-3.0.0.tgz"; - name = "jws-3.0.0.tgz"; - sha1 = "da5f267897dd4e9cf8137979db33fc54a3c05418"; - }; - deps = { - "jwa-1.0.0" = self.by-version."jwa"."1.0.0"; - "base64url-1.0.4" = self.by-version."base64url"."1.0.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jws"."~3.0.0" = - self.by-version."jws"."3.0.0"; - by-spec."keese"."~1.1.1" = - self.by-version."keese"."1.1.1"; - by-version."keese"."1.1.1" = self.buildNodePackage { - name = "keese-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/keese/-/keese-1.1.1.tgz"; - name = "keese-1.1.1.tgz"; - sha1 = "69a1f971e64ee5d2094af002f6d92fa806250842"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "keese" = self.by-version."keese"."1.1.1"; - by-spec."keygrip"."~1.0.0" = - self.by-version."keygrip"."1.0.1"; - by-version."keygrip"."1.0.1" = self.buildNodePackage { - name = "keygrip-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz"; - name = "keygrip-1.0.1.tgz"; - sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lastfm"."~0.9.2" = - self.by-version."lastfm"."0.9.2"; - by-version."lastfm"."0.9.2" = self.buildNodePackage { - name = "lastfm-0.9.2"; - version = "0.9.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lastfm/-/lastfm-0.9.2.tgz"; - name = "lastfm-0.9.2.tgz"; - sha1 = "d00ca2e3b30eb484e510792875525900e4d77d88"; - }; - deps = { - "underscore-1.6.0" = self.by-version."underscore"."1.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "lastfm" = self.by-version."lastfm"."0.9.2"; - by-spec."leveldown"."~1.0.6" = - self.by-version."leveldown"."1.0.7"; - by-version."leveldown"."1.0.7" = self.buildNodePackage { - name = "leveldown-1.0.7"; - version = "1.0.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/leveldown/-/leveldown-1.0.7.tgz"; - name = "leveldown-1.0.7.tgz"; - sha1 = "39bbe95f92ce09992ec12de47ade5167be2b6874"; - }; - deps = { - "abstract-leveldown-2.2.2" = self.by-version."abstract-leveldown"."2.2.2"; - "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; - "fast-future-1.0.1" = self.by-version."fast-future"."1.0.1"; - "nan-1.8.4" = self.by-version."nan"."1.8.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "leveldown" = self.by-version."leveldown"."1.0.7"; - by-spec."lodash"."~2.4.1" = - self.by-version."lodash"."2.4.2"; - by-version."lodash"."2.4.2" = self.buildNodePackage { - name = "lodash-2.4.2"; - version = "2.4.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; - name = "lodash-2.4.2.tgz"; - sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lodash.noop"."~3.0.0" = - self.by-version."lodash.noop"."3.0.0"; - by-version."lodash.noop"."3.0.0" = self.buildNodePackage { - name = "lodash.noop-3.0.0"; - version = "3.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.0.tgz"; - name = "lodash.noop-3.0.0.tgz"; - sha1 = "f383ca8dba97d8f217e49afcd2b824db9e5e8d68"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lru-cache"."2" = - self.by-version."lru-cache"."2.6.4"; - by-version."lru-cache"."2.6.4" = self.buildNodePackage { - name = "lru-cache-2.6.4"; - version = "2.6.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"; - name = "lru-cache-2.6.4.tgz"; - sha1 = "2675190ccd1b0701ec2f652a4d0d3d400d76c0dd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."map-obj"."^1.0.0" = - self.by-version."map-obj"."1.0.1"; - by-version."map-obj"."1.0.1" = self.buildNodePackage { - name = "map-obj-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - name = "map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."media-typer"."0.3.0" = - self.by-version."media-typer"."0.3.0"; - by-version."media-typer"."0.3.0" = self.buildNodePackage { - name = "media-typer-0.3.0"; - version = "0.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - name = "media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."meow"."~2.0.0" = - self.by-version."meow"."2.0.0"; - by-version."meow"."2.0.0" = self.buildNodePackage { - name = "meow-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/meow/-/meow-2.0.0.tgz"; - name = "meow-2.0.0.tgz"; - sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1"; - }; - deps = { - "camelcase-keys-1.0.0" = self.by-version."camelcase-keys"."1.0.0"; - "indent-string-1.2.1" = self.by-version."indent-string"."1.2.1"; - "minimist-1.1.1" = self.by-version."minimist"."1.1.1"; - "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."merge-descriptors"."1.0.0" = - self.by-version."merge-descriptors"."1.0.0"; - by-version."merge-descriptors"."1.0.0" = self.buildNodePackage { - name = "merge-descriptors-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; - name = "merge-descriptors-1.0.0.tgz"; - sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mess"."~0.1.2" = - self.by-version."mess"."0.1.2"; - by-version."mess"."0.1.2" = self.buildNodePackage { - name = "mess-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mess/-/mess-0.1.2.tgz"; - name = "mess-0.1.2.tgz"; - sha1 = "2c81a424efc87a69ad11f1c7129d1f6f6353b9c0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "mess" = self.by-version."mess"."0.1.2"; - 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"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz"; - name = "methods-1.1.1.tgz"; - sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime"."1.3.4" = - self.by-version."mime"."1.3.4"; - by-version."mime"."1.3.4" = self.buildNodePackage { - name = "mime-1.3.4"; - version = "1.3.4"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - name = "mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime"."^1.2.11" = - self.by-version."mime"."1.3.4"; - by-spec."mime"."~1.2.11" = - self.by-version."mime"."1.2.11"; - by-version."mime"."1.2.11" = self.buildNodePackage { - name = "mime-1.2.11"; - version = "1.2.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - name = "mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-db"."~1.12.0" = - self.by-version."mime-db"."1.12.0"; - by-version."mime-db"."1.12.0" = self.buildNodePackage { - name = "mime-db-1.12.0"; - version = "1.12.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; - name = "mime-db-1.12.0.tgz"; - sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-db"."~1.13.0" = - self.by-version."mime-db"."1.13.0"; - by-version."mime-db"."1.13.0" = self.buildNodePackage { - name = "mime-db-1.13.0"; - version = "1.13.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.13.0.tgz"; - name = "mime-db-1.13.0.tgz"; - sha1 = "fd6808168fe30835e7ea2205fc981d3b633e4e34"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~1.0.1" = - self.by-version."mime-types"."1.0.2"; - by-version."mime-types"."1.0.2" = self.buildNodePackage { - name = "mime-types-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; - name = "mime-types-1.0.2.tgz"; - sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~2.0.1" = - self.by-version."mime-types"."2.0.14"; - by-version."mime-types"."2.0.14" = self.buildNodePackage { - name = "mime-types-2.0.14"; - version = "2.0.14"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; - name = "mime-types-2.0.14.tgz"; - sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; - }; - deps = { - "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~2.0.3" = - self.by-version."mime-types"."2.0.14"; - by-spec."mime-types"."~2.1.1" = - self.by-version."mime-types"."2.1.1"; - by-version."mime-types"."2.1.1" = self.buildNodePackage { - name = "mime-types-2.1.1"; - version = "2.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.1.tgz"; - name = "mime-types-2.1.1.tgz"; - sha1 = "c7b692796d5166f4826d10b4675c8a916657d04e"; - }; - deps = { - "mime-db-1.13.0" = self.by-version."mime-db"."1.13.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimatch"."0.3" = - self.by-version."minimatch"."0.3.0"; - by-version."minimatch"."0.3.0" = self.buildNodePackage { - name = "minimatch-0.3.0"; - version = "0.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; - name = "minimatch-0.3.0.tgz"; - sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; - }; - deps = { - "lru-cache-2.6.4" = self.by-version."lru-cache"."2.6.4"; - "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimist"."0.0.8" = - self.by-version."minimist"."0.0.8"; - by-version."minimist"."0.0.8" = self.buildNodePackage { - name = "minimist-0.0.8"; - version = "0.0.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - name = "minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimist"."^1.1.0" = - self.by-version."minimist"."1.1.1"; - by-version."minimist"."1.1.1" = self.buildNodePackage { - name = "minimist-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"; - name = "minimist-1.1.1.tgz"; - sha1 = "1bc2bc71658cdca5712475684363615b0b4f695b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mkdirp"."0.3.x" = - self.by-version."mkdirp"."0.3.5"; - by-version."mkdirp"."0.3.5" = self.buildNodePackage { - name = "mkdirp-0.3.5"; - version = "0.3.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - name = "mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mkdirp"."~0.3" = - self.by-version."mkdirp"."0.3.5"; - by-spec."mkdirp"."~0.5.0" = - self.by-version."mkdirp"."0.5.1"; - by-version."mkdirp"."0.5.1" = self.buildNodePackage { - name = "mkdirp-0.5.1"; - version = "0.5.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - name = "mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - deps = { - "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mkdirp"."~0.5.1" = - self.by-version."mkdirp"."0.5.1"; - "mkdirp" = self.by-version."mkdirp"."0.5.1"; - 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"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - name = "ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."multiparty"."~4.1.2" = - self.by-version."multiparty"."4.1.2"; - by-version."multiparty"."4.1.2" = self.buildNodePackage { - name = "multiparty-4.1.2"; - version = "4.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/multiparty/-/multiparty-4.1.2.tgz"; - name = "multiparty-4.1.2.tgz"; - sha1 = "54f8ec9712052fa1dfd8ec975056c8230d6f2370"; - }; - deps = { - "fd-slicer-1.0.1" = self.by-version."fd-slicer"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "multiparty" = self.by-version."multiparty"."4.1.2"; - by-spec."music-library-index"."~1.3.0" = - self.by-version."music-library-index"."1.3.0"; - by-version."music-library-index"."1.3.0" = self.buildNodePackage { - name = "music-library-index-1.3.0"; - version = "1.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/music-library-index/-/music-library-index-1.3.0.tgz"; - name = "music-library-index-1.3.0.tgz"; - sha1 = "f7dbf6f7df5a0c8c50382542183872aedc5cb86a"; - }; - deps = { - "diacritics-1.2.1" = self.by-version."diacritics"."1.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "music-library-index" = self.by-version."music-library-index"."1.3.0"; - by-spec."mv"."~2.0.3" = - self.by-version."mv"."2.0.3"; - by-version."mv"."2.0.3" = self.buildNodePackage { - name = "mv-2.0.3"; - version = "2.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mv/-/mv-2.0.3.tgz"; - name = "mv-2.0.3.tgz"; - sha1 = "e9ab707d71dc38de24edcc637a8e2f5f480c7f32"; - }; - deps = { - "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; - "ncp-0.6.0" = self.by-version."ncp"."0.6.0"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "mv" = self.by-version."mv"."2.0.3"; - by-spec."nan"."~1.8.4" = - self.by-version."nan"."1.8.4"; - by-version."nan"."1.8.4" = self.buildNodePackage { - name = "nan-1.8.4"; - version = "1.8.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.8.4.tgz"; - name = "nan-1.8.4.tgz"; - sha1 = "3c76b5382eab33e44b758d2813ca9d92e9342f34"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ncp"."~0.6.0" = - self.by-version."ncp"."0.6.0"; - by-version."ncp"."0.6.0" = self.buildNodePackage { - name = "ncp-0.6.0"; - version = "0.6.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz"; - name = "ncp-0.6.0.tgz"; - sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."negotiator"."0.5.3" = - self.by-version."negotiator"."0.5.3"; - by-version."negotiator"."0.5.3" = self.buildNodePackage { - name = "negotiator-0.5.3"; - version = "0.5.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; - name = "negotiator-0.5.3.tgz"; - sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."node-forge"."0.6.16" = - self.by-version."node-forge"."0.6.16"; - by-version."node-forge"."0.6.16" = self.buildNodePackage { - name = "node-forge-0.6.16"; - version = "0.6.16"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/node-forge/-/node-forge-0.6.16.tgz"; - name = "node-forge-0.6.16.tgz"; - sha1 = "aae85babf97034d46f1b74a39bfe5891282ae842"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."node-uuid"."~1.4.0" = - self.by-version."node-uuid"."1.4.3"; - by-version."node-uuid"."1.4.3" = self.buildNodePackage { - name = "node-uuid-1.4.3"; - version = "1.4.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; - name = "node-uuid-1.4.3.tgz"; - sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nopt"."~2" = - self.by-version."nopt"."2.2.1"; - by-version."nopt"."2.2.1" = self.buildNodePackage { - name = "nopt-2.2.1"; - version = "2.2.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; - name = "nopt-2.2.1.tgz"; - sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; - }; - deps = { - "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."number-is-nan"."^1.0.0" = - self.by-version."number-is-nan"."1.0.0"; - by-version."number-is-nan"."1.0.0" = self.buildNodePackage { - name = "number-is-nan-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; - name = "number-is-nan-1.0.0.tgz"; - sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."oauth-sign"."~0.5.0" = - self.by-version."oauth-sign"."0.5.0"; - by-version."oauth-sign"."0.5.0" = self.buildNodePackage { - name = "oauth-sign-0.5.0"; - version = "0.5.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"; - name = "oauth-sign-0.5.0.tgz"; - sha1 = "d767f5169325620eab2e087ef0c472e773db6461"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."oauth-sign"."~0.6.0" = - self.by-version."oauth-sign"."0.6.0"; - by-version."oauth-sign"."0.6.0" = self.buildNodePackage { - name = "oauth-sign-0.6.0"; - version = "0.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz"; - name = "oauth-sign-0.6.0.tgz"; - sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."oauth-sign"."~0.8.0" = - self.by-version."oauth-sign"."0.8.0"; - by-version."oauth-sign"."0.8.0" = self.buildNodePackage { - name = "oauth-sign-0.8.0"; - version = "0.8.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"; - name = "oauth-sign-0.8.0.tgz"; - sha1 = "938fdc875765ba527137d8aec9d178e24debc553"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."object-assign"."^1.0.0" = - self.by-version."object-assign"."1.0.0"; - by-version."object-assign"."1.0.0" = self.buildNodePackage { - name = "object-assign-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; - name = "object-assign-1.0.0.tgz"; - sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."on-finished"."~2.2.1" = - self.by-version."on-finished"."2.2.1"; - by-version."on-finished"."2.2.1" = self.buildNodePackage { - name = "on-finished-2.2.1"; - version = "2.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; - name = "on-finished-2.2.1.tgz"; - sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; - }; - deps = { - "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."os-tmpdir"."^1.0.0" = - self.by-version."os-tmpdir"."1.0.1"; - by-version."os-tmpdir"."1.0.1" = self.buildNodePackage { - name = "os-tmpdir-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"; - name = "os-tmpdir-1.0.1.tgz"; - sha1 = "e9b423a1edaf479882562e92ed71d7743a071b6e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."osenv"."~0.1.0" = - self.by-version."osenv"."0.1.2"; - by-version."osenv"."0.1.2" = self.buildNodePackage { - name = "osenv-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/osenv/-/osenv-0.1.2.tgz"; - name = "osenv-0.1.2.tgz"; - sha1 = "f4d23ebeceaef078600fb78c0ea58fac5996a02d"; - }; - deps = { - "os-tmpdir-1.0.1" = self.by-version."os-tmpdir"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "osenv" = self.by-version."osenv"."0.1.2"; - 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"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"; - name = "parseurl-1.3.0.tgz"; - sha1 = "b58046db4223e145afa76009e61bac87cc2281b3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."path-to-regexp"."0.1.3" = - self.by-version."path-to-regexp"."0.1.3"; - by-version."path-to-regexp"."0.1.3" = self.buildNodePackage { - name = "path-to-regexp-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; - name = "path-to-regexp-0.1.3.tgz"; - sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pend"."~1.2.0" = - self.by-version."pend"."1.2.0"; - by-version."pend"."1.2.0" = self.buildNodePackage { - name = "pend-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; - name = "pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "pend" = self.by-version."pend"."1.2.0"; - by-spec."proxy-addr"."~1.0.8" = - 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"; - 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"; - }; - 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"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."2.4.2" = - self.by-version."qs"."2.4.2"; - by-version."qs"."2.4.2" = self.buildNodePackage { - name = "qs-2.4.2"; - version = "2.4.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.4.2.tgz"; - name = "qs-2.4.2.tgz"; - sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."~2.3.1" = - self.by-version."qs"."2.3.3"; - by-version."qs"."2.3.3" = self.buildNodePackage { - name = "qs-2.3.3"; - version = "2.3.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; - name = "qs-2.3.3.tgz"; - sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."~2.4.0" = - self.by-version."qs"."2.4.2"; - by-spec."qs"."~3.1.0" = - self.by-version."qs"."3.1.0"; - by-version."qs"."3.1.0" = self.buildNodePackage { - name = "qs-3.1.0"; - version = "3.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-3.1.0.tgz"; - name = "qs-3.1.0.tgz"; - sha1 = "d0e9ae745233a12dc43fb4f3055bba446261153c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - 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"; - 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"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."1.1" = - self.by-version."readable-stream"."1.1.13"; - by-version."readable-stream"."1.1.13" = self.buildNodePackage { - name = "readable-stream-1.1.13"; - version = "1.1.13"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"; - name = "readable-stream-1.1.13.tgz"; - sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e"; - }; - deps = { - "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; - "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"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."~1.0.26" = - self.by-version."readable-stream"."1.0.33"; - by-version."readable-stream"."1.0.33" = self.buildNodePackage { - name = "readable-stream-1.0.33"; - version = "1.0.33"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"; - name = "readable-stream-1.0.33.tgz"; - sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c"; - }; - deps = { - "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; - "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"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."~1.1.9" = - self.by-version."readable-stream"."1.1.13"; - by-spec."repeating"."^1.1.0" = - self.by-version."repeating"."1.1.3"; - by-version."repeating"."1.1.3" = self.buildNodePackage { - name = "repeating-1.1.3"; - version = "1.1.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; - name = "repeating-1.1.3.tgz"; - sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; - }; - deps = { - "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."request"."^2.37.0" = - self.by-version."request"."2.57.0"; - by-version."request"."2.57.0" = self.buildNodePackage { - name = "request-2.57.0"; - version = "2.57.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.57.0.tgz"; - name = "request-2.57.0.tgz"; - sha1 = "d445105a42d009b9d724289633b449a6d723d989"; - }; - deps = { - "bl-0.9.4" = self.by-version."bl"."0.9.4"; - "caseless-0.10.0" = self.by-version."caseless"."0.10.0"; - "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1"; - "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; - "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1"; - "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14"; - "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; - "qs-3.1.0" = self.by-version."qs"."3.1.0"; - "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; - "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0"; - "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0"; - "oauth-sign-0.8.0" = self.by-version."oauth-sign"."0.8.0"; - "hawk-2.3.1" = self.by-version."hawk"."2.3.1"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; - "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5"; - "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; - "har-validator-1.7.1" = self.by-version."har-validator"."1.7.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."request"."^2.54.0" = - self.by-version."request"."2.57.0"; - by-spec."request"."^2.55.0" = - self.by-version."request"."2.57.0"; - by-spec."request"."~2.51.0" = - self.by-version."request"."2.51.0"; - by-version."request"."2.51.0" = self.buildNodePackage { - name = "request-2.51.0"; - version = "2.51.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.51.0.tgz"; - name = "request-2.51.0.tgz"; - sha1 = "35d00bbecc012e55f907b1bd9e0dbd577bfef26e"; - }; - deps = { - "bl-0.9.4" = self.by-version."bl"."0.9.4"; - "caseless-0.8.0" = self.by-version."caseless"."0.8.0"; - "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; - "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1"; - "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; - "qs-2.3.3" = self.by-version."qs"."2.3.3"; - "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; - "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0"; - "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; - "oauth-sign-0.5.0" = self.by-version."oauth-sign"."0.5.0"; - "hawk-1.1.1" = self.by-version."hawk"."1.1.1"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."request"."~2.54.0" = - self.by-version."request"."2.54.0"; - by-version."request"."2.54.0" = self.buildNodePackage { - name = "request-2.54.0"; - version = "2.54.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.54.0.tgz"; - name = "request-2.54.0.tgz"; - sha1 = "a13917cd8e8fa73332da0bf2f84a30181def1953"; - }; - deps = { - "bl-0.9.4" = self.by-version."bl"."0.9.4"; - "caseless-0.9.0" = self.by-version."caseless"."0.9.0"; - "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1"; - "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; - "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1"; - "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14"; - "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; - "qs-2.4.2" = self.by-version."qs"."2.4.2"; - "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; - "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0"; - "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; - "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0"; - "hawk-2.3.1" = self.by-version."hawk"."2.3.1"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; - "har-validator-1.7.1" = self.by-version."har-validator"."1.7.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."rimraf"."~2.2.8" = - self.by-version."rimraf"."2.2.8"; - by-version."rimraf"."2.2.8" = self.buildNodePackage { - name = "rimraf-2.2.8"; - version = "2.2.8"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - name = "rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."runforcover"."~0.0.2" = - self.by-version."runforcover"."0.0.2"; - by-version."runforcover"."0.0.2" = self.buildNodePackage { - name = "runforcover-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz"; - name = "runforcover-0.0.2.tgz"; - sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc"; - }; - deps = { - "bunker-0.1.2" = self.by-version."bunker"."0.1.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sax"."0.5.x" = - self.by-version."sax"."0.5.8"; - by-version."sax"."0.5.8" = self.buildNodePackage { - name = "sax-0.5.8"; - version = "0.5.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; - name = "sax-0.5.8.tgz"; - sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."semver"."~4.3.4" = - self.by-version."semver"."4.3.6"; - by-version."semver"."4.3.6" = self.buildNodePackage { - name = "semver-4.3.6"; - version = "4.3.6"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz"; - name = "semver-4.3.6.tgz"; - sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "semver" = self.by-version."semver"."4.3.6"; - by-spec."send"."0.12.3" = - self.by-version."send"."0.12.3"; - by-version."send"."0.12.3" = self.buildNodePackage { - name = "send-0.12.3"; - version = "0.12.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.12.3.tgz"; - name = "send-0.12.3.tgz"; - sha1 = "cd12dc58fde21e4f91902b39b2fda05a7a6d9bdc"; - }; - deps = { - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "depd-1.0.1" = self.by-version."depd"."1.0.1"; - "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.6.0" = self.by-version."etag"."1.6.0"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "mime-1.3.4" = self.by-version."mime"."1.3.4"; - "ms-0.7.1" = self.by-version."ms"."0.7.1"; - "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"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."serve-static"."~1.9.3" = - self.by-version."serve-static"."1.9.3"; - by-version."serve-static"."1.9.3" = self.buildNodePackage { - name = "serve-static-1.9.3"; - version = "1.9.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.3.tgz"; - name = "serve-static-1.9.3.tgz"; - sha1 = "5f8da07323ad385ff3dc541f1a7917b2e436eb57"; - }; - 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"; - "send-0.12.3" = self.by-version."send"."0.12.3"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "serve-static" = self.by-version."serve-static"."1.9.3"; - by-spec."sigmund"."~1.0.0" = - self.by-version."sigmund"."1.0.1"; - by-version."sigmund"."1.0.1" = self.buildNodePackage { - name = "sigmund-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; - name = "sigmund-1.0.1.tgz"; - sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."slide"."*" = - self.by-version."slide"."1.1.6"; - by-version."slide"."1.1.6" = self.buildNodePackage { - name = "slide-1.1.6"; - version = "1.1.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; - name = "slide-1.1.6.tgz"; - sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sntp"."0.2.x" = - self.by-version."sntp"."0.2.4"; - by-version."sntp"."0.2.4" = self.buildNodePackage { - name = "sntp-0.2.4"; - version = "0.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - name = "sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; - }; - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sntp"."1.x.x" = - self.by-version."sntp"."1.0.9"; - by-version."sntp"."1.0.9" = self.buildNodePackage { - name = "sntp-1.0.9"; - version = "1.0.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - name = "sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; - }; - deps = { - "hoek-2.14.0" = self.by-version."hoek"."2.14.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."source-map"."0.1.x" = - self.by-version."source-map"."0.1.43"; - by-version."source-map"."0.1.43" = self.buildNodePackage { - name = "source-map-0.1.43"; - version = "0.1.43"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; - name = "source-map-0.1.43.tgz"; - sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; - }; - deps = { - "amdefine-0.1.1" = self.by-version."amdefine"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."streamsink"."~1.2.0" = - self.by-version."streamsink"."1.2.0"; - by-version."streamsink"."1.2.0" = self.buildNodePackage { - name = "streamsink-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/streamsink/-/streamsink-1.2.0.tgz"; - name = "streamsink-1.2.0.tgz"; - sha1 = "efafee9f1e22d3591ed7de3dcaa95c3f5e79f73c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."string-template"."~0.2.0" = - self.by-version."string-template"."0.2.1"; - by-version."string-template"."0.2.1" = self.buildNodePackage { - name = "string-template-0.2.1"; - version = "0.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz"; - name = "string-template-0.2.1.tgz"; - sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."string_decoder"."~0.10.x" = - self.by-version."string_decoder"."0.10.31"; - by-version."string_decoder"."0.10.31" = self.buildNodePackage { - name = "string_decoder-0.10.31"; - version = "0.10.31"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - name = "string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stringstream"."~0.0.4" = - self.by-version."stringstream"."0.0.4"; - by-version."stringstream"."0.0.4" = self.buildNodePackage { - name = "stringstream-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"; - name = "stringstream-0.0.4.tgz"; - sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."strip-ansi"."^2.0.1" = - self.by-version."strip-ansi"."2.0.1"; - by-version."strip-ansi"."2.0.1" = self.buildNodePackage { - name = "strip-ansi-2.0.1"; - version = "2.0.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz"; - name = "strip-ansi-2.0.1.tgz"; - sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e"; - }; - deps = { - "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stylus"."~0.49.3" = - self.by-version."stylus"."0.49.3"; - by-version."stylus"."0.49.3" = self.buildNodePackage { - name = "stylus-0.49.3"; - version = "0.49.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz"; - name = "stylus-0.49.3.tgz"; - sha1 = "1fbdabe479ed460872c71a6252a67f95040ba511"; - }; - deps = { - "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0"; - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "sax-0.5.8" = self.by-version."sax"."0.5.8"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "stylus" = self.by-version."stylus"."0.49.3"; - by-spec."supports-color"."^1.3.0" = - self.by-version."supports-color"."1.3.1"; - by-version."supports-color"."1.3.1" = self.buildNodePackage { - name = "supports-color-1.3.1"; - version = "1.3.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"; - name = "supports-color-1.3.1.tgz"; - sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tap"."~0.3.3" = - self.by-version."tap"."0.3.3"; - by-version."tap"."0.3.3" = self.buildNodePackage { - name = "tap-0.3.3"; - version = "0.3.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/tap/-/tap-0.3.3.tgz"; - name = "tap-0.3.3.tgz"; - sha1 = "c862237af0a213f97fff46594bd1d44eca705d63"; - }; - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "yamlish-0.0.7" = self.by-version."yamlish"."0.0.7"; - "slide-1.1.6" = self.by-version."slide"."1.1.6"; - "runforcover-0.0.2" = self.by-version."runforcover"."0.0.2"; - "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "difflet-0.2.6" = self.by-version."difflet"."0.2.6"; - "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0"; - "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tough-cookie".">=0.12.0" = - self.by-version."tough-cookie"."2.0.0"; - by-version."tough-cookie"."2.0.0" = self.buildNodePackage { - name = "tough-cookie-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"; - name = "tough-cookie-2.0.0.tgz"; - sha1 = "41ce08720b35cf90beb044dd2609fb19e928718f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."traverse"."0.6.x" = - self.by-version."traverse"."0.6.6"; - by-version."traverse"."0.6.6" = self.buildNodePackage { - name = "traverse-0.6.6"; - version = "0.6.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; - name = "traverse-0.6.6.tgz"; - sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."traverse"."~0.5.1" = - self.by-version."traverse"."0.5.2"; - by-version."traverse"."0.5.2" = self.buildNodePackage { - name = "traverse-0.5.2"; - version = "0.5.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz"; - name = "traverse-0.5.2.tgz"; - sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tunnel-agent"."~0.4.0" = - self.by-version."tunnel-agent"."0.4.0"; - by-version."tunnel-agent"."0.4.0" = self.buildNodePackage { - name = "tunnel-agent-0.4.0"; - version = "0.4.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"; - name = "tunnel-agent-0.4.0.tgz"; - sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."type-is"."~1.6.2" = - self.by-version."type-is"."1.6.3"; - by-version."type-is"."1.6.3" = self.buildNodePackage { - name = "type-is-1.6.3"; - version = "1.6.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.6.3.tgz"; - name = "type-is-1.6.3.tgz"; - sha1 = "d87d201777f76dfc526ac202679715d41a28c580"; - }; - deps = { - "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "mime-types-2.1.1" = self.by-version."mime-types"."2.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."typedarray"."~0.0.5" = - self.by-version."typedarray"."0.0.6"; - by-version."typedarray"."0.0.6" = self.buildNodePackage { - name = "typedarray-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - name = "typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."uglify-js"."~1.1.1" = - self.by-version."uglify-js"."1.1.1"; - by-version."uglify-js"."1.1.1" = self.buildNodePackage { - name = "uglify-js-1.1.1"; - version = "1.1.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz"; - name = "uglify-js-1.1.1.tgz"; - sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore"."^1.6.0" = - self.by-version."underscore"."1.8.3"; - by-version."underscore"."1.8.3" = self.buildNodePackage { - name = "underscore-1.8.3"; - version = "1.8.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - name = "underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore"."~1.6.0" = - self.by-version."underscore"."1.6.0"; - by-version."underscore"."1.6.0" = self.buildNodePackage { - name = "underscore-1.6.0"; - version = "1.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; - name = "underscore-1.6.0.tgz"; - sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."utils-merge"."1.0.0" = - self.by-version."utils-merge"."1.0.0"; - by-version."utils-merge"."1.0.0" = self.buildNodePackage { - name = "utils-merge-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; - name = "utils-merge-1.0.0.tgz"; - sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."vary"."~1.0.0" = - self.by-version."vary"."1.0.0"; - by-version."vary"."1.0.0" = self.buildNodePackage { - name = "vary-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz"; - name = "vary-1.0.0.tgz"; - sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."xtend"."^4.0.0" = - self.by-version."xtend"."4.0.0"; - by-version."xtend"."4.0.0" = self.buildNodePackage { - name = "xtend-4.0.0"; - version = "4.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"; - name = "xtend-4.0.0.tgz"; - sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."xtend"."~4.0.0" = - self.by-version."xtend"."4.0.0"; - by-spec."yamlish"."*" = - self.by-version."yamlish"."0.0.7"; - by-version."yamlish"."0.0.7" = self.buildNodePackage { - name = "yamlish-0.0.7"; - version = "0.0.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.7.tgz"; - name = "yamlish-0.0.7.tgz"; - sha1 = "b4af9a1dcc63618873c3d6e451ec3213c39a57fb"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."yauzl"."~2.3.0" = - self.by-version."yauzl"."2.3.1"; - by-version."yauzl"."2.3.1" = self.buildNodePackage { - name = "yauzl-2.3.1"; - version = "2.3.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/yauzl/-/yauzl-2.3.1.tgz"; - name = "yauzl-2.3.1.tgz"; - sha1 = "6707fe2b6a4dac9445cc429bf04a11c7dedfa36a"; - }; - deps = { - "fd-slicer-1.0.1" = self.by-version."fd-slicer"."1.0.1"; - "pend-1.2.0" = self.by-version."pend"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "yauzl" = self.by-version."yauzl"."2.3.1"; - by-spec."yawl"."~1.0.2" = - self.by-version."yawl"."1.0.2"; - by-version."yawl"."1.0.2" = self.buildNodePackage { - name = "yawl-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/yawl/-/yawl-1.0.2.tgz"; - name = "yawl-1.0.2.tgz"; - sha1 = "df1301cb50e5bc74cc36d5c1ef9cfbd1f84b408e"; - }; - deps = { - "bl-0.9.4" = self.by-version."bl"."0.9.4"; - "pend-1.2.0" = self.by-version."pend"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "yawl" = self.by-version."yawl"."1.0.2"; - by-spec."yazl"."~2.2.2" = - self.by-version."yazl"."2.2.2"; - by-version."yazl"."2.2.2" = self.buildNodePackage { - name = "yazl-2.2.2"; - version = "2.2.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/yazl/-/yazl-2.2.2.tgz"; - name = "yazl-2.2.2.tgz"; - sha1 = "60187f4ce6df314e7501c3c0e40bcf1b58fda183"; - }; - deps = { - "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "yazl" = self.by-version."yazl"."2.2.2"; - by-spec."ytdl-core".">=0.5.1" = - self.by-version."ytdl-core"."0.5.1"; - by-version."ytdl-core"."0.5.1" = self.buildNodePackage { - name = "ytdl-core-0.5.1"; - version = "0.5.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ytdl-core/-/ytdl-core-0.5.1.tgz"; - name = "ytdl-core-0.5.1.tgz"; - sha1 = "3c48d696b019d7faae635a3f1e4eaa9131110f43"; - }; - deps = { - "cheerio-0.18.0" = self.by-version."cheerio"."0.18.0"; - "jstream-0.2.7" = self.by-version."jstream"."0.2.7"; - "request-2.57.0" = self.by-version."request"."2.57.0"; - "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "ytdl-core" = self.by-version."ytdl-core"."0.5.1"; -} - diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index 05d041380a09..caeba5eb1acb 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy-iris/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-iris-${version}"; - version = "3.4.9"; + version = "3.6.1"; src = pythonPackages.fetchPypi { inherit version; pname = "Mopidy-Iris"; - sha256 = "0acr8ss5d0jgcy1qsjb12h0n6kr6qdp9zrbbk9vv3m3s6kcm8vgb"; + sha256 = "1mfi3qx7pvfq4rz0py39lnbzv7sq703b6k6mypzhj1gdzbisfn46"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index b68c44278ee1..ee0ebf234ce5 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -1,4 +1,8 @@ -{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib}: +{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib +# Specify default libao output plugin to use (e.g. "alsa", "pulse" …). +# If null, it will use the libao system default. +, defaultAudio ? null +}: stdenv.mkDerivation rec { name = "mpg321-${version}"; @@ -11,9 +15,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - configureFlags = [ - ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) - ]; + configureFlags = + [ ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) ] + ++ (stdenv.lib.optional (defaultAudio != null) + "--with-default-audio=${defaultAudio}"); buildInputs = [libao libid3tag libmad zlib] ++ stdenv.lib.optional stdenv.isLinux alsaLib; diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index ef0bb75b2ec0..cb0f35ebc156 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -1,11 +1,7 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, ncurses , mpd_clientlib, gettext }: -let - rpath = stdenv.lib.makeLibraryPath [ - glib ncurses mpd_clientlib - ]; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "ncmpc-${version}"; version = "0.28"; @@ -19,12 +15,6 @@ in stdenv.mkDerivation rec { buildInputs = [ glib ncurses mpd_clientlib ]; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; - postFixup = '' - for elf in "$out"/bin/*; do - patchelf --set-rpath '${rpath}':"$out/lib" "$elf" - done - ''; - meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; homepage = http://www.musicpd.org/clients/ncmpc/; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index c140e1a46e55..00f58750408b 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }: -let - pname = "puddletag"; - -in python2Packages.buildPythonApplication rec { - name = "${pname}-${version}"; +python2Packages.buildPythonApplication rec { + name = "puddletag-${version}"; version = "1.2.0"; src = fetchFromGitHub { - owner = "keithgg"; - repo = pname; - rev = "v${version}"; + owner = "keithgg"; + repo = "puddletag"; + rev = "v${version}"; sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz"; }; - sourceRoot = "${pname}-v${version}-src/source"; + setSourceRoot = '' + sourceRoot=$(echo */source) + ''; disabled = python2Packages.isPy3k; # work to support python 3 has not begun @@ -29,17 +28,21 @@ in python2Packages.buildPythonApplication rec { dontStrip = true; # we are not generating any binaries installPhase = '' + runHook preInstall + siteDir=$(toPythonPath $out) mkdir -p $siteDir PYTHONPATH=$PYTHONPATH:$siteDir ${python2Packages.python.interpreter} setup.py install --prefix $out + + runHook postInstall ''; meta = with stdenv.lib; { - homepage = https://puddletag.net; + homepage = https://puddletag.net; description = "An audio tag editor similar to the Windows program, Mp3tag"; - license = licenses.gpl3; - platforms = platforms.linux; + license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 2e6d61b693de..fd328669846f 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,64 +1,44 @@ -{ stdenv, fetchurl, python2Packages, intltool -, gst-python, withGstPlugins ? false, gst-plugins-base ? null -, gst-plugins-good ? null, gst-plugins-ugly ? null, gst-plugins-bad ? null }: +{ stdenv, fetchurl, python2Packages, wrapGAppsHook, gettext, intltool, libsoup, gnome3, + tag ? "", + gst_all_1, withGstPlugins ? true, + xineBackend ? false, xineLib, + withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false, + webkitgtk ? null, + keybinder3 ? null, gtksourceview ? null, libmodplug ? null, kakasi ? null, libappindicator-gtk3 ? null }: -assert withGstPlugins -> gst-plugins-base != null - || gst-plugins-good != null - || gst-plugins-ugly != null - || gst-plugins-bad != null; - -let - version = "2.6.3"; - inherit (python2Packages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python; -in buildPythonApplication { - # call the package quodlibet and just quodlibet - name = "quodlibet${stdenv.lib.optionalString (!withGstPlugins) "-without-gst-plugins"}-${version}"; +let optionals = stdenv.lib.optionals; in +python2Packages.buildPythonApplication rec { + name = "quodlibet${tag}-${version}"; + version = "3.9.1"; # XXX, tests fail doCheck = false; - srcs = [ - (fetchurl { - url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-${version}.tar.gz"; - sha256 = "0ilasi4b0ay8r6v6ba209wsm80fq2nmzigzc5kvphrk71jwypx6z"; - }) - (fetchurl { - url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-plugins-${version}.tar.gz"; - sha256 = "1rv08rhdjad8sjhplqsspcf4vkazgkxyshsqmbfbrrk5kvv57ybc"; - }) - ]; + src = fetchurl { + url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz"; + sha256 = "d2b42df5d439213973dc97149fddc779a6c90cec389c24baf1c0bdcc39ffe591"; + }; - preConfigure = '' - # TODO: for now don't a apply gdist overrides, will be needed for shipping icons, gtk, etc - sed -i /distclass/d setup.py - ''; + nativeBuildInputs = [ wrapGAppsHook gettext intltool ]; + # ++ (with python2Packages; [ pytest pyflakes pycodestyle polib ]); # test deps - sourceRoot = "quodlibet-${version}"; + buildInputs = [ gnome3.defaultIconTheme libsoup webkitgtk keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi ] + ++ (if xineBackend then [ xineLib ] else with gst_all_1; + [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); - postUnpack = '' - # the patch searches for plugins in directory ../plugins - # so link the appropriate directory there - ln -sf quodlibet-plugins-${version} plugins - ''; + propagatedBuildInputs = with python2Packages; + [ pygobject3 pycairo mutagen pygtk gst-python feedparser faulthandler futures ] + ++ optionals withDbusPython [ dbus-python ] + ++ optionals withPyInotify [ pyinotify ] + ++ optionals withMusicBrainzNgs [ musicbrainzngs ] + ++ optionals stdenv.isDarwin [ pyobjc ] + ++ optionals withPahoMqtt [ paho-mqtt ]; - patches = [ ./quodlibet-package-plugins.patch ]; - - buildInputs = stdenv.lib.optionals withGstPlugins [ - gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - ]; - - propagatedBuildInputs = [ - mutagen pygtk pygobject2 dbus-python gst-python intltool - ]; - - postInstall = stdenv.lib.optionalString withGstPlugins '' - # Wrap quodlibet so it finds the GStreamer plug-ins - wrapProgram "$out/bin/quodlibet" --prefix \ - GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH" \ - ''; + makeWrapperArgs = optionals (kakasi != null) [ "--prefix PATH : ${kakasi}/bin" ]; meta = { description = "GTK+-based audio player written in Python, using the Mutagen tagging library"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Quod Libet is a GTK+-based audio player written in Python, using @@ -74,7 +54,7 @@ in buildPythonApplication { & internet radio, and all major audio formats. ''; - maintainers = [ stdenv.lib.maintainers.coroa ]; + maintainers = with stdenv.lib.maintainers; [ coroa sauyon ]; homepage = https://quodlibet.readthedocs.io/en/latest/; }; } diff --git a/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch b/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch deleted file mode 100644 index d518f857cf10..000000000000 --- a/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur quodlibet-2.5.orig/setup.py quodlibet-2.5.new/setup.py ---- quodlibet-2.5.orig/setup.py 2012-12-19 08:47:41.000000000 +0000 -+++ quodlibet-2.5.new/setup.py 2013-04-22 19:27:07.152631051 +0000 -@@ -337,5 +338,14 @@ - } - } - }) -+ else: -+ from os.path import join -+ -+ data_files = [] -+ for type in ["playorder", "songsmenu", "editing", "events", "gstreamer"]: -+ data_files.append((join('quodlibet', 'plugins', type), -+ glob.glob(join('..', 'plugins', type, '*.py')))) -+ setup_kwargs.update({ 'data_files': data_files }); -+ - setup(**setup_kwargs) - diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 6067c5b1c75c..f81aad4e2af1 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zam-plugins-${version}"; - version = "3.8"; + version = "3.9"; src = fetchgit { url = "https://github.com/zamaudio/zam-plugins.git"; deepClone = true; - rev = "830ab2e9dd1db8cf56d12c71057157e5d8e9fd74"; - sha256 = "1hyly5inis59cvh0r7lyi203h8v5jh84ca9jpaljm53cvw6d93px"; + rev = "4976cf204074c1dfaf344821e83e8d896b35107d"; + sha256 = "1xgwl51sf2hgc5ikcnycyxaw9vy82lrcswn07b6av6i67qclm8f8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 452cb38f126a..e82d4c69def6 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -7,15 +7,15 @@ with stdenv.lib; let - ver_branch = "1.22"; - version = "1.22.0"; + ver_branch = "1.24"; + version = "1.24.0"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "0a5bvfl2h7r873al6q7c819h0kg564k9fh51rl6489z6lyvazfg4"; + sha256 = "18j33bm54i8k7ncxcs69zqi4105s62n58jrydqn3ikrb71s9nl6d"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix index 4e834afa9d06..6f8440f7b1fe 100644 --- a/pkgs/applications/editors/android-studio/packages.nix +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, makeFontsConf }: +{ stdenv, callPackage, fetchurl, makeFontsConf }: let mkStudio = opts: callPackage (import ./common.nix opts) { fontsConf = makeFontsConf { @@ -6,11 +6,11 @@ let }; }; in rec { - stable = mkStudio rec { + stable = mkStudio { pname = "android-studio"; - version = "2.3.3.0"; - build = "162.4069837"; - sha256Hash = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk"; + version = "3.0.0.18"; # "Android Studio 3.0" + build = "171.4408382"; + sha256Hash = "18npm7ckdybj6vc2vndr0wd50da19m9z2j7wld2mdidnl5ggk4br"; meta = with stdenv.lib; { description = "The Official IDE for Android (stable version)"; @@ -25,16 +25,16 @@ in rec { }; }; - preview = mkStudio rec { + preview = mkStudio { pname = "android-studio-preview"; - version = "3.0.0.17"; # "Android Studio 3.0 RC 2" - build = "171.4402976"; - sha256Hash = "18f5cq1dcmyjxaq520kqjac332bpp35pis02yplh6gzp65i4bvvf"; + version = "3.1.0.0"; # "Android Studio 3.1 Canary 1" + build = "171.4415322"; + sha256Hash = "08xgwv6mg2zxys9dqjfz66h60g640ni3snyb89ij0fkmd28rbxgj"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; homepage = https://developer.android.com/studio/preview/index.html; - maintainers = with stdenv.lib.maintainers; [ primeos tomsmeets ]; + maintainers = with stdenv.lib.maintainers; [ primeos ]; }; }; } diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index f0af3b88c72e..6ab881f22753 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.21.1"; + version = "1.21.2"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "13mpj3wvcgsxz9q6lai36lkfgd7rabcjrrih1j5309kd1dqaswnn"; + sha256 = "0snhhp8rjmk750snyzkqzwvi7f915pbc6qpa3vf0f57syf47m7vl"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index f3459e57d9b2..0aeaee2155a7 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -106,16 +106,16 @@ rec { anyedittools = buildEclipsePlugin rec { name = "anyedit-${version}"; - version = "2.7.0.201705171641"; + version = "2.7.1.201709201439"; srcFeature = fetchurl { url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar"; - sha256 = "07k029nw5ibxpjc0siy06ihylbqrxllf59yz8c544gra8lc079c9"; + sha256 = "1wqzl7wq85m9gil8rnvly45ps0a2m0svw613pg6djs5i7amhnayh"; }; srcPlugin = fetchurl { - url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.0/de.loskutov.anyedit.AnyEditTools_${version}.jar"; - sha256 = "0wbm8zfjh7gxrw5sy9m3siddiazh5czgxp7zyzxwzkdqyqzqs70h"; + url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.1/de.loskutov.anyedit.AnyEditTools_${version}.jar"; + sha256 = "03iyb6j2srq74iigmg7dk098c2svyv0ygdfql5jqr44a32n07k8q"; }; meta = with stdenv.lib; { @@ -394,7 +394,7 @@ rec { sha256 = "1xfj4j27d1h4bdf2v7f78zi8lz4zkkj7s9kskmsqx5jcs2d459yp"; extraPostFetch = '' - mv "$out/${repo}-${rev}/releases/local-repo"/* "$out/" + mv "$out/${repo}-${rev}/releases/local-repo/"* "$out/" ''; }; @@ -424,6 +424,29 @@ rec { }; }; + spotbugs = buildEclipsePlugin rec { + name = "spotbugs-${version}"; + version = "3.1.0.r201710241414-11c9895"; + + srcFeature = fetchurl { + url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar"; + sha256 = "084dj2bid5issh28j32hi5w9vx5xs829h7d5lbz5hqj1fyn9h6bs"; + }; + + srcPlugin = fetchurl { + url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar"; + sha256 = "1mqpl3gx06f54w13jm01qd8fbniab3x989mi3lysx078vrp23jas"; + }; + + meta = with stdenv.lib; { + homepage = https://spotbugs.github.io/; + description = "Plugin that uses static analysis to look for bugs in Java code"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + testng = buildEclipsePlugin rec { name = "testng-${version}"; version = "6.9.13.201609291640"; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index a2fc324a6188..f0c4ca87aa23 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -95,10 +95,10 @@ ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ahungry-theme"; - version = "1.6.0"; + version = "1.8.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ahungry-theme-1.6.0.tar"; - sha256 = "1b0x7g753gn7mym8286b937zmxv50jgdish2h6wc05w1g1lygwsz"; + url = "https://elpa.gnu.org/packages/ahungry-theme-1.8.0.tar"; + sha256 = "14dhnrlbjzrxk5ligf0z2im5bgnxpjqqzqcrmqg5355xrgpbpb7v"; }; packageRequires = [ emacs ]; meta = { @@ -700,10 +700,10 @@ ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "ebdb"; - version = "0.3.4"; + version = "0.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.3.4.tar"; - sha256 = "1jj7s0646wqg9ykmpi52cc6m6m0gk2inqc2h6h7cr7gr4v7n2l00"; + url = "https://elpa.gnu.org/packages/ebdb-0.4.1.tar"; + sha256 = "0gv1q1xkhjab0l77c92znn6x0dfdbnj6hc48axmrx6a7zwbm3g2r"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -945,10 +945,10 @@ gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "gnorb"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.3.0.tar"; - sha256 = "0c256473llp7ahl1wbm6m236cj2lhp9ms1clmxpsfv51ds27ljqv"; + url = "https://elpa.gnu.org/packages/gnorb-1.3.1.tar"; + sha256 = "1g6xldkc6l6zlzd1slqizbbd5b9k4pbr66nrf5svidgiy7mlifw5"; }; packageRequires = [ cl-lib ]; meta = { @@ -1556,10 +1556,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20171016"; + version = "20171030"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20171016.tar"; - sha256 = "1196kv83p953nd9c5gxkn8ndw2kmm2kfw34dldap6m89khqflz5a"; + url = "https://elpa.gnu.org/packages/org-20171030.tar"; + sha256 = "1lszws6b5s4r7w871cyigs433dflf6w0y33fj6rzrq8240d5092i"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/gn/default.nix b/pkgs/applications/editors/emacs-modes/gn/default.nix new file mode 100644 index 000000000000..39e7d1abf386 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/gn/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation { + name = "gn-mode-2017-09-21"; + src = fetchgit { + url = "https://chromium.googlesource.com/chromium/src/tools/gn"; + rev = "34f2780efb3fe14fe361ec161ad58440de5a6b36"; + sha256 = "10cisqz3l6ny3471yi7y1z8v622lpl65zh0liqr6absvmy63g866"; + }; + buildInputs = [ emacs ]; + + buildPhase = '' + emacs --batch -f batch-byte-compile misc/emacs/gn-mode.el + ''; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp/ + cp misc/emacs/gn-mode.el* $out/share/emacs/site-lisp/ + ''; +} diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix index 11ccff3df016..f0d120dd8030 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -2,27 +2,28 @@ let modules = [ - { name = "icicles.el"; sha256 = "175g8w620vy73pp3zyasfjspgljk6g0lki71kdnvw5z88w3s9d1n"; } - { name = "icicles-chg.el"; sha256 = "1bx5xdhirvnrjqk4pk0sjp9bpj1syymsjnckklsw04gv6y0x8zik"; } - { name = "icicles-cmd1.el"; sha256 = "1ff0mndin9zxrswwwq3a7b1s879rr6gy8rzxanr7kxg1ppciafad"; } - { name = "icicles-cmd2.el"; sha256 = "1a44l86jacp9nsy4z260azz6y672drjw3w5a0jsc8w26fgsrnx1k"; } - { name = "icicles-doc1.el"; sha256 = "0s3r4z3y06hd1nxp18wd0b8b88z2a7ryy0j8sx5fzibbmp58ars1"; } - { name = "icicles-doc2.el"; sha256 = "0c10jg91qxyrg1zwiyi4m57dbw3yf43jdrpi4nnby3pkzh6i37ic"; } - { name = "icicles-face.el"; sha256 = "0n0vcbhwgd2lyj7anq1zpwja28xry018qxbm8sprxkh6y3vlw8d2"; } - { name = "icicles-fn.el"; sha256 = "1i10593a7hp465bxd86h7h7gwrdyqxx0d13in53z4jnab8icp3d4"; } - { name = "icicles-mac.el"; sha256 = "1piq0jk8nz0hz9wwci7dkxnfxscdpygjzpj5zg3310vs22l7rrsz"; } - { name = "icicles-mcmd.el"; sha256 = "0c4325yp84i46605nlxmjm6n0f4fh69shsihvd0wb9ryg0a8qa65"; } - { name = "icicles-mode.el"; sha256 = "069wx5clqpsq2c9aavgd9xihvlad3g00iwwrc3cpl47v64dvlipq"; } - { name = "icicles-opt.el"; sha256 = "16487l3361ca8l6il2c0z892843sc5l9v4gr7lx5fxbmrlsswvvn"; } - { name = "icicles-var.el"; sha256 = "1a9cwxpi10x44fngxa7qnrg8hqfvdjb8s8k47gnn1rbh63blkkry"; } + { name = "icicles.el"; sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; } + { name = "icicles-chg.el"; sha256 = "020yg4hv120mcy7qvn76j85q6hl7mfcfv66w55c6izc9lbrvvnv8"; } + { name = "icicles-cmd1.el"; sha256 = "1715x1vkiax93890gfjbzslxsn4swsv37spvyx7chy4s1mym9kfw"; } + { name = "icicles-cmd2.el"; sha256 = "187k0gmn34fn6w1dw9hjf4i788y01vk47z7ac11ar4bddwh97ddx"; } + { name = "icicles-doc1.el"; sha256 = "1bw5dkymn2xdrfrp80am0gqi0szs0xihny4qmgzgx6hfbng351qh"; } + { name = "icicles-doc2.el"; sha256 = "0zd94m1a8mwwbrbcrahxxx8q34w8cg5lna4yww4m1gliyklww86s"; } + { name = "icicles-face.el"; sha256 = "1mlz8dq7bgzp2cf5j37i25yw90ry657d2m8r93rdj67h7l4wyxhj"; } + { name = "icicles-fn.el"; sha256 = "1cdghvgsr0b7pdq4lmnfm6kwwcqbk4wqf168kf2sjajbpa24ix96"; } + { name = "icicles-mac.el"; sha256 = "1w5sgzbp8hyjzrmqd8bwivszaayzh8dkyqa0d751adiwjfs9sq9m"; } + { name = "icicles-mcmd.el"; sha256 = "1lf2galn3g52hfz61avlr4ifyn5b42dfbmyq78cpzlq7hzc928v2"; } + { name = "icicles-mode.el"; sha256 = "0gci04j6vx0vqsh4skarznklam1xibj7pjvy67kaip8b6a4zx9ip"; } + { name = "icicles-opt.el"; sha256 = "17g35ancml0mvywagzhjrgmlr4rhm1wgb5wg3fsqhhldib9qlz56"; } + { name = "icicles-var.el"; sha256 = "0ydixg41h09yncp8g2nv8zsyv8avg1hj2f3mgrmd2kf0n27bw2nv"; } ]; forAll = f: map f modules; in -stdenv.mkDerivation { - name = "icicles-2014-11-06"; +stdenv.mkDerivation rec { + version = "2017-10-28"; + name = "icicles-${version}"; - srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs-en/download/${name}"; inherit sha256; }); + srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); buildInputs = [ emacs ]; @@ -30,11 +31,13 @@ stdenv.mkDerivation { buildPhase = "emacs --batch -L . -f batch-byte-compile *.el"; - installPhase = "mkdir -p $out/share/emacs/site-lisp; cp *.el *.elc $out/share/emacs/site-lisp/"; + installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/"; meta = { homepage = http://www.emacswiki.org/emacs/Icicles; description = "Enhance Emacs minibuffer input with cycling and powerful completion"; license = stdenv.lib.licenses.gpl2Plus; + platforms = emacs.meta.platforms; + maintainers = with stdenv.lib.maintainers; [ scolobb ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 8c17823105e9..3db74fa9d4f4 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -383,8 +383,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0"; - sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic"; + rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859"; + sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -740,8 +740,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "1a7a9a6a81e4f18fb6403691454cbacd560e330b"; - sha256 = "0b13xqn46bc04bv262wrr8dw0n8d29gr0yywlbdw4av1x41v1iv9"; + rev = "317ad1d023db6b2fe67444a2c075e656c35f5094"; + sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -757,12 +757,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20171017.422"; + version = "20171022.808"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "1a7a9a6a81e4f18fb6403691454cbacd560e330b"; - sha256 = "0b13xqn46bc04bv262wrr8dw0n8d29gr0yywlbdw4av1x41v1iv9"; + rev = "317ad1d023db6b2fe67444a2c075e656c35f5094"; + sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -803,8 +803,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; - sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; + rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; + sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -841,12 +841,12 @@ ac-slime = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "ac-slime"; - version = "20150729.2035"; + version = "20171027.1400"; src = fetchFromGitHub { owner = "purcell"; repo = "ac-slime"; - rev = "fafc6f75c90b2dbf124edd3e2887860ce052081e"; - sha256 = "0dix8giqbc9la5mycrjgq287j03s44nhrg9b1drsca2sc58cnach"; + rev = "6c80cb602ddad46486288f94ad7546396c6e4b1a"; + sha256 = "11w1z653klghi6inv9n92cigz8m3c67j3r18mdk39inc3izwplkj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ac-slime"; @@ -925,12 +925,12 @@ ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-jump-buffer"; - version = "20170828.2153"; + version = "20171031.850"; src = fetchFromGitHub { owner = "waymondo"; repo = "ace-jump-buffer"; - rev = "02797c22c10a817dbbdfbd8fddceeba6c4f0499a"; - sha256 = "13wq92ia18q9vyhmvnz1grl1l18hxnaisb7hv13dhfc06alcsrw2"; + rev = "ae5be0415c823f7bb66833aa4af2180d4cf99cef"; + sha256 = "0zg4x5faxkp0gnjq7209hn74qkzmk8k7wbr7k8wxpssjbnmxkvd1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31100b5b899e942de7796bcbf6365625d1b62574/recipes/ace-jump-buffer"; @@ -1201,8 +1201,8 @@ src = fetchFromGitHub { owner = "codesuki"; repo = "add-node-modules-path"; - rev = "6f7801b2c41e3711406b7e1654257ad5557f5bb3"; - sha256 = "1pfgy1k7vp34k4zb9835y3x4jmf81na60vsf80wlgvfafwk170z6"; + rev = "eb09f4743af210a8e27f21889b4e0fef33208e4a"; + sha256 = "064gzcyx6nkq9wdrf6sd64fs8biwfrn25qj9vv7gznlrl5rg31x9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path"; @@ -1260,12 +1260,12 @@ aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aes"; - version = "20170607.157"; + version = "20171028.2323"; src = fetchFromGitHub { owner = "Sauermann"; repo = "emacs-aes"; - rev = "8d9ddaa7d13875745241f0f98758b1d72dd3be92"; - sha256 = "1d998xyfnzgci62h0wv1n9a7hlk23ngcbl83k04ahz61g7haqnh2"; + rev = "b7d5da89c3443292e4f0b1c9d254d459933cf5af"; + sha256 = "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes"; @@ -1405,12 +1405,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "20171009.1931"; + version = "20171029.2107"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "2b06d75096d6a1c06682b70e229f2c932e9eac2c"; - sha256 = "1jxss4gnlg2vkgf10v1kj1c7isbh7vh040iqrzjkrhclf4qiag5d"; + rev = "6b078bf41f59ea0158b01742cae428ed61c4bc35"; + sha256 = "0c61wsvb82r2ygiyk3na559y0jhba266igampa43g4qdphkjzfqy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1468,12 +1468,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "alchemist"; - version = "20170803.414"; + version = "20171029.2307"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "8ea2db4781e367c1cf8ce2eec4222daa7d1b7b57"; - sha256 = "0gq4l95krvirv2rb4l52gka39588k817g4kl483hj2ii9il32gd0"; + rev = "4beb4c9ceee0534a36f7669aa35fcbdfd6bef7b7"; + sha256 = "0k1k5rb95nyndzhin47r4nzap4fp3dr57gv557wzy3a6jpl88fgz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1489,12 +1489,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "20170913.926"; + version = "20171030.1008"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "0e800594796ae283f5c0a6a374b9c2f8ebdfef56"; - sha256 = "06j1imqknya3kglnmhsz2jg18mcbcycrjlgjzb9c1n68z43xglyh"; + rev = "3a08f8349a1ebe8e0ae8622f5bf6ed93491dd785"; + sha256 = "1lrgxawhsaziwvvs16n0339xn0m1333028q0gj3md23bpgrjqa5p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1531,12 +1531,12 @@ alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }: melpaBuild { pname = "alert"; - version = "20170824.1140"; + version = "20171024.1907"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; - rev = "08f42ced409b6edd70e4b13ed648f16240dc1ec1"; - sha256 = "13my3m81binijaz9r113k1xll6p86qrcxacppzm20r71gpa1iifb"; + rev = "206d7095c93a25bb41af17cd26fd3967ddd57e00"; + sha256 = "1lyvq0zkamlyv3z23x8hb8dirjd45bihqhmwdgilnw3y139vhm4l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; @@ -2463,12 +2463,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "20171019.916"; + version = "20171022.2203"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "5d25972192cd34553997ba193c09eab093a2b870"; - sha256 = "1pp2gzw17k58s9akraf8p4jxbar8viym2a43rkc7agzy47qsybs0"; + rev = "79422b610f2c3d9f52fb35449485a2fc541bc5a0"; + sha256 = "0i2k975szdgzmrbwkvcnhrk73ndvk0q215fn68sb5m4zf43ifwxz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2945,12 +2945,12 @@ atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: melpaBuild { pname = "atomic-chrome"; - version = "20161213.730"; + version = "20171022.107"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "atomic-chrome"; - rev = "1b96d563c5d435baf8dfa9cdae5ef38ce34629b9"; - sha256 = "0caiv0snjxj0f1p0rx18r1w4nbsk8shrin2dr2ddg54mpxzf8r98"; + rev = "1bd79fc940d2be82eaec20aca2069677e156a697"; + sha256 = "1j5brpmbahnrp8kxphq10g0l703czdalqa731y3s2p3m3gida54x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; @@ -3050,12 +3050,12 @@ auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; - version = "20170123.107"; + version = "20171026.537"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "b9fb3ef8d4ebe7bef939a3cf574f9caa833347c9"; - sha256 = "1rzqz560zqsymdpv84n1z17jyf7k75797y4bkzhk5grd3ry77x9j"; + rev = "79e297e9f2c2bccb545994ddda356f958889b4ac"; + sha256 = "11nc3hicp8n21rmj00svzh0kfhyb92w37ipk6nkl1fd3jk1xzr7d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -3680,12 +3680,12 @@ autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autobookmarks"; - version = "20170417.1407"; + version = "20171021.1532"; src = fetchFromGitHub { owner = "Fuco1"; repo = "autobookmarks"; - rev = "cd19e15b8951a7af55d67a5bb4e0948e62b0a119"; - sha256 = "1xv73ls9mhvgjxa9lpw3brmzdd8739zyn9nqb1lrnvx468bz4kry"; + rev = "b40c69f2d1c419adad516bee81b07b99110e5cc3"; + sha256 = "0dailajx26dixlibqps5wfh224ps7azm453lmzxjc2d10mgapi5v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks"; @@ -3974,12 +3974,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20171018.937"; + version = "20171031.915"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "b583c34750044ad0da511341c44332ed94995520"; - sha256 = "138q2gj32sxx69vmxbc4wcihph38g9ychak7q7sy2zziqwip1nlb"; + rev = "5598fd25e483d8521e6d5f691802fa125947d7cf"; + sha256 = "1gkn1qbywv8as3csp5s1fwmrp89bmbqgyl7av0c1v9ggx7gkhd5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -4034,26 +4034,6 @@ license = lib.licenses.free; }; }) {}; - axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "axiom-environment"; - version = "20171021.822"; - src = fetchhg { - url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "f99f1eb2af8a"; - sha256 = "1n4rrvq95bhhirak72wccwsd6822p38mvyyrrkgjz8ah1xfvfm1m"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/axiom-environment"; - sha256 = "1d3h1fn5zfbh7kpm2i02kza3bq9s6if4yd2vvfjdhgrykvl86h66"; - name = "axiom-environment"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/axiom-environment"; - license = lib.licenses.free; - }; - }) {}; babel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "babel"; @@ -4232,12 +4212,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20171005.1058"; + version = "20171025.1545"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "e7e646b79b5e3cebdf34f0ed775bceb8a5f3645a"; - sha256 = "1lgg54cxl1zhv1gh7y5z99dwfb15w64gn05g8iwha2f37kmk22r4"; + rev = "1578c6cd8f76a664bda7fc9b2515ee8106552cb2"; + sha256 = "0wp2vfk7hpvagdiad9g4wj5992f1fv4v77x387v1sz5w1zn195aj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4295,12 +4275,12 @@ basic-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "basic-mode"; - version = "20171011.1126"; + version = "20171027.1114"; src = fetchFromGitHub { owner = "dykstrom"; repo = "basic-mode"; - rev = "7683d9812b1f4c6ac33b386abf81461175075c30"; - sha256 = "01pmxcff8v64sc49ahzkks636p778l4fy8s5x6p9rngnwm72gmnw"; + rev = "7a76ec2d45f6bc1e4b5a4c8996c4bf27a31741e6"; + sha256 = "02q9sxx9g8pqyiknbzy48qbmnvgl1pmcgsppbk7rybb68kq5zlqd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71801bdc0720f150edeab6796487c753c6e7c3f5/recipes/basic-mode"; @@ -4927,8 +4907,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "cb89901b52a9413b6c233d7fbb616a2d8f38b50a"; - sha256 = "1fypvrmn1brrq2200kr8s8zbcc30z9nhfv3k8vs36iawab2g573k"; + rev = "82d15961a0f2dc7842a98030d6daee0061ef63dc"; + sha256 = "0i9cqms0bm6vfn8mzkzv40dql2mzmp2jma1na6m8bf1z2ciszy6l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5364,12 +5344,12 @@ boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "boogie-friends"; - version = "20170907.922"; + version = "20171024.1955"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie-friends"; - rev = "c30b229fb765b42d059c15e76029379ed3fc7202"; - sha256 = "1cdl0sxa4rwr162cg8qhlwhvav4i0pv0njkfca7dg6xwfjkq6g8l"; + rev = "ff9903783013f3598b6f44c99d47b25c5cdbed00"; + sha256 = "0vc1pym7x6aafd88rrmm8yibq5y9wrx6b1pbgsfr7spcdq0hwwvg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends"; @@ -5993,12 +5973,12 @@ build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "build-status"; - version = "20170323.1621"; + version = "20171031.611"; src = fetchFromGitHub { owner = "sshaw"; repo = "build-status"; - rev = "01bb9cc1776e8eaab68147175aee9879d9541c4b"; - sha256 = "1c6q6rk6rvip5xv2zdpqamprx9kqh0c6v3r939fn7m4fnyyz15fn"; + rev = "c29a0146c5d0be274f5e17921e01698f572c23a1"; + sha256 = "03f0h7sp0sr9kjyhvcx7i34lvc26f5x8nikfidihgzhrqpprv2b6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status"; @@ -6140,12 +6120,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20171020.527"; + version = "20171029.1011"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "62c416a534a1b0c2acf1cababc49c435d4e33ea7"; - sha256 = "140cwm0jirmq3b9xwcqf3hfy38xsbq0z8jnzbgblwf31zpzgj6qp"; + rev = "bbbf6924ff214b518718687ead96ceec92bdbaba"; + sha256 = "0z05rr85mf9as2byj3k1ai9x5ci45a7g425svv0ywgz1lgv2vsi4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6585,8 +6565,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "09e545e159c5166ae374ab505f4c1b66fb3ec6fd"; - sha256 = "00m9zd2dnv9bsg6y3imk6nj992zjsy1zf3ylg67iw6x88v01pvji"; + rev = "65252925f597008101cdb68b6dd119227106f0e2"; + sha256 = "0627mksg7hmmz1hzalyrklsnwpz2k3jzl41dyllk5b7xpap5s9q5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -6623,12 +6603,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20170807.607"; + version = "20171026.13"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "61f4673b2b4d76ed6404f2c905e5de57c41ccc97"; - sha256 = "0nkrqmylyv2c7zrfy12p7j161mkg91zm9fb1gjjyq0k7ixad677q"; + rev = "3ecf0b89b3d36874a301a7e2fb429fc026c73f35"; + sha256 = "1mv1a0z379mr7y8by5s1lnkvp1kamch01j0yn1aqgxjry3z789dd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -7046,8 +7026,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "51b4a9aed3d18eb7b27e1580807ffacf5abd3bc2"; - sha256 = "1g9wg331fr578sgdz9c7qk27aphi2ryddib0sqdk9wsc5h41cfmi"; + rev = "b0979047d55db2aefda4adc40cd266c693a57b70"; + sha256 = "15giw6kacnj1fa3w794gnaqjpywrdrz96rgq1igsygj1rjacrgi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7819,12 +7799,12 @@ circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circadian"; - version = "20170924.1440"; + version = "20171022.724"; src = fetchFromGitHub { owner = "GuidoSchmidt"; repo = "circadian.el"; - rev = "6412eca0dfd5030ccd18f949066f1352ed89b44d"; - sha256 = "0y62c3cfsz439x7pp7s4zzfhavyasv07y4gkn37383p38k56xqdf"; + rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee"; + sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian"; @@ -7928,8 +7908,8 @@ src = fetchFromGitHub { owner = "emacsorphanage"; repo = "clang-format"; - rev = "1fc9ffb08a71d8747c26037a133fbd811673adc0"; - sha256 = "0zldh5nk5i3y41q70kwlhf576xmv0baim3q4jam01d41p4p040mq"; + rev = "6e6114fac0e4e600f1ffed7b2ce978f7adb001cd"; + sha256 = "07zabj31bgckppkqgg5if515093k0lx2xyf3adh90ymmssvvgary"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/clang-format"; @@ -8314,12 +8294,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20171008.743"; + version = "20171031.357"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "05b6f053eeb56cb8301361bb84f9fe1371a53818"; - sha256 = "1vpa5k2f0ixgy2wzly420ywhrri07nvmimns6xkydilkqpp5mk1b"; + rev = "061431d86f05a5a25d2e00fc5f317b22cb9d8a79"; + sha256 = "09cv517p42nrzj435b1ma8lfl1k4izdv1dj1q9hi5y61q1q1zhp9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8339,8 +8319,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "05b6f053eeb56cb8301361bb84f9fe1371a53818"; - sha256 = "1vpa5k2f0ixgy2wzly420ywhrri07nvmimns6xkydilkqpp5mk1b"; + rev = "061431d86f05a5a25d2e00fc5f317b22cb9d8a79"; + sha256 = "09cv517p42nrzj435b1ma8lfl1k4izdv1dj1q9hi5y61q1q1zhp9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8545,12 +8525,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20171017.608"; + version = "20171101.236"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "cfdf8522159882a3e07bfa1f648b07d807afb650"; - sha256 = "0wiv1bqgf3szg9dkdhccbxk28xgz07jdmfpfp24wic6dpny2vzjx"; + rev = "114e2df27f79816f023a07e3e8024c7ab73603f0"; + sha256 = "1n7zv325kjvmz694r11sbz6650b8y22kv2mbx4yrdha9r6y2m1f7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8570,8 +8550,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "3e0441d87735241eb496b22bb8856bb29575b941"; - sha256 = "07q91k9fim3w646mfhwvj3ai56xkycs22izqlvz34ldlwysnx68q"; + rev = "a57bad6c3d0dbc885bb71dfe465d09a380c35960"; + sha256 = "1igyb96zbdr94sxry8irffhmhcz1wi0d4a65cf98j4vvnxz36b9w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9028,12 +9008,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20171014.1430"; + version = "20171030.1358"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "acd7887256a77c07006fb45ebab67f1cd68df2f6"; - sha256 = "0rjidxjwaxmkrc8dcz37v3h76rzm4kf2gjx2s2mj3dym8l6bg5cl"; + rev = "e7f5d175916df20c411713e49be8b58aac36f7ed"; + sha256 = "11n5ly2n8l4b7xph81w57av42zv43fk2vc6b6mjhxvvn86l97ma7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9049,12 +9029,12 @@ color-theme-solarized = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-solarized"; - version = "20160626.743"; + version = "20171024.825"; src = fetchFromGitHub { owner = "sellout"; repo = "emacs-color-theme-solarized"; - rev = "797229d0d3c9a2233fd8c69c0c2d9948be1d0685"; - sha256 = "1mx4948qdbwg93261bxr0k5cjx05ws7c3cmhrv6znvjzp6gqxlcl"; + rev = "f3ca8902ea056fb8e46cb09f09c96294e31cd4ee"; + sha256 = "16d7adqi07lzzr0qipl1fbag9l8kiyr3xrqxi528pimcisbg85d3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17096b452740bf6b7afa38e62df8e623494aa6b2/recipes/color-theme-solarized"; @@ -9112,12 +9092,12 @@ column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "column-enforce-mode"; - version = "20170103.1231"; + version = "20171030.1200"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "column-enforce-mode"; - rev = "379366fe0a5bcb333db2d55cddcf18d6e76ab3fc"; - sha256 = "1vqydf174rydclwmcq6j8xpr16k9w049x9rilg1lvyjc67p7pyaf"; + rev = "2341a2b6a33d4b8b74c35062ec9cfe1bffd61944"; + sha256 = "0rcxb7daxxrp5f1i5cbv25viwawbbsn4ij1mnlclp5wz7ilcy2rs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91bebef8e97665a5d076c557d559367911a25ea2/recipes/column-enforce-mode"; @@ -9614,8 +9594,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0"; - sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic"; + rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859"; + sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9904,12 +9884,12 @@ company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "company-lsp"; - version = "20171019.2235"; + version = "20171031.1844"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "2e32d6141370e0736644928a8dbd7812b89c717e"; - sha256 = "0fyl2bkn289f3b6150kyg6civair659c2pg13ng6x5vn3pih5agk"; + rev = "5fc50b6ad5c4ee71625bddf348646be44e69f396"; + sha256 = "1gkabm9iaimv4s7v723aflvxa7z902py46m5mz0szpdcrrh36495"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; @@ -10034,8 +10014,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "1a7a9a6a81e4f18fb6403691454cbacd560e330b"; - sha256 = "0b13xqn46bc04bv262wrr8dw0n8d29gr0yywlbdw4av1x41v1iv9"; + rev = "317ad1d023db6b2fe67444a2c075e656c35f5094"; + sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10187,8 +10167,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; - sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; + rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; + sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10376,8 +10356,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "f31894da73c2b784bc9e0885ddfa6e1077782417"; - sha256 = "1v8klyrs7wivh9fd4ba18g1n72c6ar707pgwqhsxn0g3f42mlpck"; + rev = "d951afd8c1c2f25a5cbeef3acfcec5f72acfd6e4"; + sha256 = "0k6z82a3xkk71lbnw3sxqmr8ixafglivmsb5y35q1jichzz6hail"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -10456,12 +10436,12 @@ conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "conda"; - version = "20171009.1921"; + version = "20171028.617"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "32f87d1f940058404858e5e6472877a069df219e"; - sha256 = "0zr86fr0dswxchm28jvkc4fdqg3wp7hw5ch8jai2pm3cn45cqk7z"; + rev = "526be691824f4a32299f560a883913697bc4d847"; + sha256 = "1jix3md6b02fypjm4y05av7acjkqryd1vqqz9wgxyinydlagrvh7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -10477,12 +10457,12 @@ config-general-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "config-general-mode"; - version = "20170719.446"; + version = "20171024.1140"; src = fetchFromGitHub { owner = "tlinden"; repo = "config-general-mode"; - rev = "8927fd1c359275dc4236c5f48fea0e3ce8349bed"; - sha256 = "04f6608ndhan6xmipzylzwzx2asx0bsqx8a9rnxfab3bza756c99"; + rev = "b4a8e6ba0bb027a77e4a0f701409f3e57bb2e4c0"; + sha256 = "115sk0h6i1bfnxw1v11719926cvnq7gyisjcysvkam40hp3d5fx5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c06831528e4bbc44aae1cc5cd6bec60150ae087/recipes/config-general-mode"; @@ -10813,12 +10793,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20171017.1029"; + version = "20171031.1234"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe"; - sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz"; + rev = "96663b77945ab21e4e1b0aab690fc2e926f01f9c"; + sha256 = "0r691dzs77zdkvjzb787kjg8zvvba8gdj2da9zjb14m4nyjmg9d9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10876,12 +10856,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "20171020.2305"; + version = "20171026.435"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "5d7b51ce7806bbe7e1f75077b4dde2ac17a53c5d"; - sha256 = "0v3b3gs4jy8cqkvchnakwpws3a0igiklchb9q3754lnmk8784dn8"; + rev = "19757e5d79a7a504760a1e7a7095779b48ec995f"; + sha256 = "1qacqjl1x01r3ss1a9qwy0651gamnkp59nzl9i6krnrdfksc6gjz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -10957,6 +10937,27 @@ license = lib.licenses.free; }; }) {}; + counsel-pydoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "counsel-pydoc"; + version = "20171018.1342"; + src = fetchFromGitHub { + owner = "co-dh"; + repo = "pydoc_utils"; + rev = "1d8ff8ca3b9d69453cde423b1887fbb490a95c9e"; + sha256 = "06kf93y8wb9nwvs70xi4lkd5x4g6sl8f83diy2wl7ha657dwx3m8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/110939c12b4e042a486e97be4c2a2426c5978ca6/recipes/counsel-pydoc"; + sha256 = "1a3vwh4jf5y03z95bd4blk75n6wjd24l6yw6vpr3991bi4qrxclz"; + name = "counsel-pydoc"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/counsel-pydoc"; + license = lib.licenses.free; + }; + }) {}; counsel-spotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-spotify"; @@ -11335,6 +11336,27 @@ license = lib.licenses.free; }; }) {}; + crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "crystal-mode"; + version = "20171023.212"; + src = fetchFromGitHub { + owner = "crystal-lang-tools"; + repo = "emacs-crystal-mode"; + rev = "1e8061c049766c25f1c06d43e703d3133426f7c0"; + sha256 = "0w11s1vmp9b4dlq9kvnxi63j69c94bqpg3fn9w4jasnpz4w9nkcf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode"; + sha256 = "1fgpz7zab6nc6kvjzjsbvrbg8shf4by0f20cvjvyky8kym72q0hk"; + name = "crystal-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/crystal-mode"; + license = lib.licenses.free; + }; + }) {}; csgo-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csgo-conf-mode"; @@ -11380,12 +11402,12 @@ csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: melpaBuild { pname = "csound-mode"; - version = "20170923.807"; + version = "20171025.401"; src = fetchFromGitHub { owner = "hlolli"; repo = "csound-mode"; - rev = "b5abcb68cedf1231c2e419bf87e875bfdb8fbc42"; - sha256 = "0r5c8g3jjb4p3a21mjdi9xcmify0c2r61d5y7ycbia7rjv9xpgdh"; + rev = "5680a266a32c62e8d7ebd987bf6e5fd40033bbeb"; + sha256 = "1zlb7bwx82rayzphf4q5f1w6yhm3r267fzgn74xmckh50jyq917y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; @@ -11573,8 +11595,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "747f5bafad712b90da9eb7e6b893fff16683fe17"; - sha256 = "1px9pycw44jvkl8gz1zz577hw61l7xvpmdl1bf1bl5wy72x13v42"; + rev = "0cdd084498c3f5de53a26ae756e4a9f33625fa1f"; + sha256 = "1zgdc4lm6dyh57fim52ynxx0jfs9hsdgbj739firblmin6cdvm32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11671,6 +11693,27 @@ license = lib.licenses.free; }; }) {}; + cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: + melpaBuild { + pname = "cwl-mode"; + version = "20171030.230"; + src = fetchFromGitHub { + owner = "tom-tan"; + repo = "cwl-mode"; + rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9"; + sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode"; + sha256 = "0x8akxxmphpgsc2m78h6b0fs6vvcfvmi1q2jrz8hwlmai8f7zi9j"; + name = "cwl-mode"; + }; + packageRequires = [ emacs yaml-mode ]; + meta = { + homepage = "https://melpa.org/#/cwl-mode"; + license = lib.licenses.free; + }; + }) {}; cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyberpunk-theme"; @@ -11804,8 +11847,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "d31160f49f8d8dfe0287181830303f42ab2a12d5"; - sha256 = "05aggv2fzdnhpygkyabp8j2wg8m6zbn0bn8wqrgcybjr2dyp57mx"; + rev = "ed44d37a80ef91ccb059a8ae056439a889eb6973"; + sha256 = "08hk3lah5mx3aii4d6d4xb7dbz1d0m2ch0c2hf13pw2d7irqvfzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11947,12 +11990,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20171018.624"; + version = "20171101.339"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "d6e225cf5548ab67340697c2ba3a2a0f4149936a"; - sha256 = "0ll3h6ckmcagvsa0d02jymac95c3x79kgs4pi8dlly28rr7qa6b4"; + rev = "8d36d6dcddf36f89f06a3f848e69edbda28435eb"; + sha256 = "1hsfqkf3xfql3h4dprrrzrpp5fansv8ckfii5dnx55a6gl6y3sdi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12178,12 +12221,12 @@ dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "dart-mode"; - version = "20171018.1115"; + version = "20171024.2137"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "570e58c28b7f70923dfb507496468b227d5905c2"; - sha256 = "18zsqgdafphwj98jqiaaih0p0qy43z5i7d9ybsmy6b3d2qykbrwv"; + rev = "adef2a5b672d503ae3e92b30bb80095879b030d0"; + sha256 = "0bb790rpijlv4cjdcwgqzb249rnz6br557lnn74rb9g52wpabl69"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode"; @@ -12199,12 +12242,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20171010.131"; + version = "20171028.854"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "a57c2c335d0527909f472ca51a2201ad44d38aab"; - sha256 = "0dg032h4ypib2baw83x5hgz7kkclgr6fkc0fiqd6rcikjg10y2rm"; + rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78"; + sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12241,12 +12284,12 @@ dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash-functional"; - version = "20160615.1351"; + version = "20171028.804"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "a57c2c335d0527909f472ca51a2201ad44d38aab"; - sha256 = "0dg032h4ypib2baw83x5hgz7kkclgr6fkc0fiqd6rcikjg10y2rm"; + rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78"; + sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12682,12 +12725,12 @@ deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deft"; - version = "20160610.1739"; + version = "20171031.530"; src = fetchFromGitHub { owner = "jrblevin"; repo = "deft"; - rev = "86825cd420985112d9dd38060e0edb72b08c6dab"; - sha256 = "0jz8ikh143n9byidh675jyd76bymbwijs0xi2y141982s69r2n0l"; + rev = "c7413a390ac22331ad5226a8c8c007bd08759bc8"; + sha256 = "1rdjffw8vw71ay93zlr2klbr8q4q1sjnw03gsfdyll1q4idbarg1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft"; @@ -13189,8 +13232,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13206,12 +13249,12 @@ dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-collapse"; - version = "20171010.1222"; + version = "20171026.159"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -13336,8 +13379,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13357,8 +13400,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13483,8 +13526,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13504,8 +13547,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13546,8 +13589,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13567,8 +13610,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13630,8 +13673,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; - sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; + rev = "26bf9b86e67883de3813518b2356f466dc2bb727"; + sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -14406,8 +14449,8 @@ src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "8070936871e0fbb20fb04c28630288ebe314b8b9"; - sha256 = "0gk4ykvsv8wgfiym0z635a3n3jaw4wnvfmf78ppfinrzybg85r76"; + rev = "4df5f94c78817a1f3755a7c9b1358349bf287270"; + sha256 = "05ggavxq61w55n6b8g76xpqasfka3rbf3326jwxjrd1p6wzs1d3d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -15246,6 +15289,27 @@ license = lib.licenses.free; }; }) {}; + dynamic-spaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dynamic-spaces"; + version = "20171027.1151"; + src = fetchFromGitHub { + owner = "Lindydancer"; + repo = "dynamic-spaces"; + rev = "97ae8480c257ba573ca3d06dbf602f9b23c41d38"; + sha256 = "0qs7gqjl6ilwwmd21663345az6766j7h1pv7wvd2kyh24yfs1xkj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e0b59ce66132cbe2b1f41b665dcb30bdd04bc48b/recipes/dynamic-spaces"; + sha256 = "0l4hwqivzv51j7h5sgd91dxb5slylmrfrvf7r6w0k04bhld6ry0c"; + name = "dynamic-spaces"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dynamic-spaces"; + license = lib.licenses.free; + }; + }) {}; e2ansi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "e2ansi"; @@ -15435,6 +15499,27 @@ license = lib.licenses.free; }; }) {}; + eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "eacl"; + version = "20171028.258"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "eacl"; + rev = "94b0eb062899db25f2ef0e535bc6ecace4b5c4e8"; + sha256 = "042va8ysvnyr7vgwrhd970ly65q1fczk04n6vd9zqxn02cqvk2yh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; + sha256 = "16afsf3diz498jb63q85lm5ifvm487clfl838qzagl1l4aywhlwr"; + name = "eacl"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/eacl"; + license = lib.licenses.free; + }; + }) {}; easy-after-load = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-after-load"; @@ -15480,12 +15565,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20171020.503"; + version = "20171025.1516"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "0b55c207c6552223857de03bf8aec8be3344ed26"; - sha256 = "103ivy1gmb22xacxj2b99zmilqy20nbzmwvmg5i6aqnya1vs97q0"; + rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0"; + sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -15648,12 +15733,12 @@ eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "20170921.1440"; + version = "20171024.1038"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0"; - sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic"; + rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859"; + sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -16173,12 +16258,12 @@ edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "edts"; - version = "20170821.149"; + version = "20171030.9"; src = fetchFromGitHub { owner = "tjarvstrand"; repo = "edts"; - rev = "8a737e0601ab4a3fbe2f1252f8b1474ca39df94c"; - sha256 = "0dbha339yp7jd8nmz38g9igmj5bi03l9fz9gqy2z8j367br3afxs"; + rev = "6ef4bdf571235ee1b078db321402270cabff7fda"; + sha256 = "1nzf8wdv0hs4kp69cy3blwxh18c2bkxr4d4y6ggdp0vmwv41j3zi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts"; @@ -16269,8 +16354,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "170be423c79e8e28b99e5745bf7135ce3bf2de52"; - sha256 = "1hi2ch08m48lpkhqz05ry736qj1mjva4krbqn2wkhcfdfrxpzhx6"; + rev = "94d964066ed7cecaea2b31eda7703396032ea4ed"; + sha256 = "0ln5dzbrbxzhlr797hphd5dmbrhh76cdfbm1fvgl3bi1fw59g8pq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -16347,12 +16432,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20171020.1157"; + version = "20171024.1043"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "4909b176dcab9c762048dd654032722002e0f4ff"; - sha256 = "0dr2xarq5irzq095hag6scwimqsp21866iaxjy27rygzgwp5g794"; + rev = "eaded1e01378c61be8bc454d111e8cc4951a0b5b"; + sha256 = "0m0dkzr44bmgc5sxzgsp290hvsylvyrsnmfk6ki44qkvp4qg0bxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16554,12 +16639,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "20170729.1712"; + version = "20171016.1743"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "f598a7537710f929c6f7592d8c543768361ba0de"; - sha256 = "1ijnj8ldqhcv3bq22gw1knaasj08yk9vm0nyvnfca3p6w3zv65cm"; + rev = "32f7a12c2eaacd60d48ed5e5482121154a507fb8"; + sha256 = "0m1v3gjds2j16kpy05zipdh30fbsb2zrgjny156kgjjxy6fnrnki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -16806,12 +16891,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20170311.533"; + version = "20171022.625"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "5800e90f5ce23663fe370e4ad8fb40f59a4f93f5"; - sha256 = "0d3fakycfg7rfblp6wqxyynvnqnpnz4hvi812fp5v4wqz4slfjxh"; + rev = "278086fcffa1a4607392ca2b0ad57522e492b52c"; + sha256 = "1kf1281igi6pzg04fsiqwhwrlqv56c1fi56a4z6ch76wh5s63vj3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -16894,8 +16979,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "f343cfa93b7d91024496b8b7f46280762fe86659"; - sha256 = "0bysjh9626r2651n6vvq6mbbw36jrp41nmd45an6y9cl0z0wj58w"; + rev = "23cbeb803a312fd0e3801ef240e4322bf9965656"; + sha256 = "0vi0vbd2k4frj6ij2v8imx57vikgcp47gwk11w4qh4k0na4cjbfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -16964,8 +17049,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "f343cfa93b7d91024496b8b7f46280762fe86659"; - sha256 = "0bysjh9626r2651n6vvq6mbbw36jrp41nmd45an6y9cl0z0wj58w"; + rev = "23cbeb803a312fd0e3801ef240e4322bf9965656"; + sha256 = "0vi0vbd2k4frj6ij2v8imx57vikgcp47gwk11w4qh4k0na4cjbfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17191,12 +17276,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20171011.101"; + version = "20171028.2337"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "9c182dbbd7170c6626afb031bbc6a399399d2cd9"; - sha256 = "1vz8gc8az8cw2v7gg11l6ncg3cw09ynspxmp29rbcxl63qbis6fa"; + rev = "6fa343ada4a74850840e21bbe787c14fe5a67155"; + sha256 = "18yk029k12zd8xwgj4k0741lbxzl9djik0srvb5jn6bcbcp6hb9g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17419,15 +17504,15 @@ license = lib.licenses.free; }; }) {}; - elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: + elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20171015.548"; + version = "20171029.955"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "36d40a66832a3ec37702813463e4acfbb7b6b5ac"; - sha256 = "1030ihnb35dyad1v7a63kyn94jk0rdkdgil7wnj8pkpzxjvyrwqa"; + rev = "434f6799e103fcce7d896b3281eb59e15a760783"; + sha256 = "1mpxzyssvp6n1y17xqxmmpymvljz7g6j60whn9mdp3njn0ijyn5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -17436,6 +17521,7 @@ }; packageRequires = [ company + emacs find-file-in-project highlight-indentation pyvenv @@ -17954,12 +18040,12 @@ embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "embrace"; - version = "20170615.1131"; + version = "20171031.1133"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "embrace.el"; - rev = "394863dd7271e831cb9c257a1cd2249302ba962a"; - sha256 = "14qs180p5kv1h4p9qsv4jj61pq7d7bsrvwm0wm85lhgpx8v64q7i"; + rev = "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2"; + sha256 = "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace"; @@ -18431,8 +18517,8 @@ src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "c1462183573258edfd8134581417d3c95f1c9c4c"; - sha256 = "1xyg52qf8zpkrgifw1lxk8h91acrg1n7nw59mxmwq8f122lmllx7"; + rev = "cc8e64baf7f7bcef2db5b7353ddda9d9733a11cc"; + sha256 = "1bps5ld798av9nqkjsv7mnj8blnyp30dh809q0fk9qnwylpj74yy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; @@ -18511,12 +18597,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20171005.347"; + version = "20171027.1433"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "82de811bde723e78a702e98592e46514ac700f9d"; - sha256 = "15n01ni833y9viccdcvhjj80yyavm1131njxwp0q13gqgbzj3n5f"; + rev = "483e94546d9b1de5841b8853882d5644cc419479"; + sha256 = "0dd6agcjpncd3vkdx405ql03rpfacwda0njcz69f1cp7z8rc5cdz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -18624,12 +18710,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20171006.353"; + version = "20171024.651"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "4258ca3457e9a7ac46d1f0bd7a80f1da51b360cb"; - sha256 = "00v5ipcz642rrg4yicwmg1nam5n0yasqgrak13b3wqmzqx1qzf6f"; + rev = "6114b78b84cd8a96a117b7652d1e5138eee4b896"; + sha256 = "1fmvy8h3ng2ykfmr2n0zms2h3csq24f23ldf5zdxyg34riag4nl2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -19106,12 +19192,12 @@ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: melpaBuild { pname = "ergoemacs-mode"; - version = "20170915.1902"; + version = "20171030.738"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "6231ee0ae7014bd8f8ef2a3adc13b4d3d403bf71"; - sha256 = "1c3ryazy796zcxp550ic7a7qsgs4528sfqqywmwqpf8vl7p0p7xp"; + rev = "3ce23bba3cb50562693860f87f3528c471d603ba"; + sha256 = "1s3b9bridl78hh1mxmdk9nqlmqhibbaxk0a1cixmsf23s06w8w6l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -19152,8 +19238,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "4b8255e9217c293f84a1e96b3ae8034d089e815b"; - sha256 = "1nyya11mpvw0k6gvz90iqsxj65w3c5y72k9rf60171gy1rplsbib"; + rev = "a51424af47f879e776b9344be813a03d2a4bcb5b"; + sha256 = "18cyr3pmzwab6zqijl3c6h772wzkl1qh44j87p16hcn42sip9jz1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19756,12 +19842,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20171015.130"; + version = "20171030.820"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "78d86bf3a842af4dc77f02b01ed7589d8f9eedd2"; - sha256 = "064d3n05kkg8rkp6dnqsjpm9jy2qiiry01m6k7ifk25z6ab02kgn"; + rev = "da48f2fff367191796b976100c72277bdfb504d2"; + sha256 = "000rxx14fw1n4k3i6lsvy0bc249pdyx9m1pnpv3x02n0wvmfdq62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20092,12 +20178,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20171016.3"; + version = "20171031.22"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "6ca96e8df9fb957c423ae4738e6229106861d6b5"; - sha256 = "1ij64cg6qq93vwxsj4w60xq7377rlzmrlddnqaxm95m2fkbwr7fp"; + rev = "3735da896e6fc2672ee06c68e77d11befb99c9c1"; + sha256 = "01p450ap0dvnnv83cbmasb7avz6jv6xycjg4hczf8485xzq0nmcr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -20995,12 +21081,12 @@ evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: melpaBuild { pname = "evil-smartparens"; - version = "20161010.322"; + version = "20171101.13"; src = fetchFromGitHub { owner = "expez"; repo = "evil-smartparens"; - rev = "7cde5544934930819e9dcaa1e0db2e3c58f0cd6f"; - sha256 = "0pmw98n32fyqr4qnpl52a7vax4rk8dfq98v66v8400b78j6d0n3q"; + rev = "3a9c2bf24db73c9443d3e2e65ca662df85653f36"; + sha256 = "05g6j5z63gmvi2j9h6iax3dklqk61ds28yq84mkiihp58swwmfpw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens"; @@ -21146,8 +21232,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "6ca96e8df9fb957c423ae4738e6229106861d6b5"; - sha256 = "1ij64cg6qq93vwxsj4w60xq7377rlzmrlddnqaxm95m2fkbwr7fp"; + rev = "3735da896e6fc2672ee06c68e77d11befb99c9c1"; + sha256 = "01p450ap0dvnnv83cbmasb7avz6jv6xycjg4hczf8485xzq0nmcr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -21268,12 +21354,12 @@ evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }: melpaBuild { pname = "evil-vimish-fold"; - version = "20161103.333"; + version = "20171030.451"; src = fetchFromGitHub { owner = "alexmurray"; repo = "evil-vimish-fold"; - rev = "674a8a894e4ae7e7f4b2608b0c9f801a548c69eb"; - sha256 = "1v2yr5q9c239xf002ymgwndmp5yp617rj7shw2zvfl13d7x229sg"; + rev = "4db872d12274fdddf7c6e9d01cf68cbad9cfcf15"; + sha256 = "05phnswbk2r7hdwawzkw6anhkfss9ig8sy469s4vsrqf7cky4gmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd51e24f88ebbbd3fddfc7c6f3b667d5104cf2b/recipes/evil-vimish-fold"; @@ -21456,12 +21542,12 @@ exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exotica-theme"; - version = "20171021.457"; + version = "20171031.426"; src = fetchFromGitHub { owner = "jbharat"; repo = "exotica-theme"; - rev = "d20ba97e36dfb8d6965e9f43768a5fdea752da96"; - sha256 = "0am1l6b26sjdf06gnfd78qvgy5jif6r2lqrfvypb6spv4j62xy5n"; + rev = "478dddaae45a8e2373bf2b868aeece64f1288d91"; + sha256 = "17646sa3pgmlzg2s4yic82hkq1bdiqh1spgp5x2lhqh4643fi62s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; @@ -21926,12 +22012,12 @@ fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fancy-narrow"; - version = "20160124.403"; + version = "20171030.1716"; src = fetchFromGitHub { owner = "Malabarba"; repo = "fancy-narrow"; - rev = "c0f70b4333d4764323b7154e37a378adb1610ab7"; - sha256 = "0vcr1gnqawvc1yclqs23jvxm6bqix8kpflf1c7znb0wzxmz9kx7y"; + rev = "9f4a587f6a5a387271fb665e13f59d41fd42504c"; + sha256 = "0dl0fc3i8g193adpkr4fb2k151lw9r6gd8p27q9xgmm9brf9jf17"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/fancy-narrow"; @@ -22238,12 +22324,12 @@ fillcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fillcode"; - version = "20150812.941"; + version = "20171029.925"; src = fetchFromGitHub { owner = "snarfed"; repo = "fillcode"; - rev = "1f64f0303a3157eabec355fd155571bb0c042489"; - sha256 = "0cgrswhbmzyfpkrp8iznsn1lxnb61dz2f0181pqd9gdf55qrk67m"; + rev = "d0a9e20f5fcc24a786d09ea19bfb9237681ba823"; + sha256 = "1mf2gfcjaqbw523vkfbzs2nl1y9bn9gbgmbvn2phbyj78gzq18za"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85eb403503aa83799a6072bfe21bf66c8177ca73/recipes/fillcode"; @@ -22301,12 +22387,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20170906.2011"; + version = "20171025.1943"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "dcc0801c4781d76efd9ac0d86bab4084b4b93663"; - sha256 = "0axk4a4b3s0x8wn4a4mj1i89kix88cv94iclhw4wigsscndpr03v"; + rev = "a3ecd28182ba3102fefdc080e807866464153edc"; + sha256 = "08dk8jjg63rs15hq4rb32368nja2iwdsp8dxwb3isza96lsfkwmx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -22644,12 +22730,12 @@ flappymacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flappymacs"; - version = "20140715.901"; + version = "20171023.304"; src = fetchFromGitHub { owner = "taksatou"; repo = "flappymacs"; - rev = "bbc69405f62e1bc488533709d4ab0b5eba919dbd"; - sha256 = "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5"; + rev = "27f3e21acb22f786606481e3f4e5dc1edbaaaed4"; + sha256 = "0zcwsbz93p1l2jb1fs6m4s5y9klcr5qg5nw10qg30j9l2bc1hda8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/flappymacs"; @@ -22791,12 +22877,12 @@ flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flex-compile"; - version = "20171006.905"; + version = "20171031.2349"; src = fetchFromGitHub { owner = "plandes"; repo = "flex-compile"; - rev = "e2a2820282458cad5bcac4037baa6c2e76b1bdce"; - sha256 = "15dlfayyrcy54davrha8vm87vbip01sbqxgdjfbri4y134fljrk8"; + rev = "031f4612a07dc0ddb03424a2f986ea18e7064fe7"; + sha256 = "1vwvhaxhpmpcyrmzdfbwxsxif3fx40548gks3y4n0nhprji7wjmg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile"; @@ -23000,12 +23086,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20171019.835"; + version = "20171026.610"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "ed41c2f1f7f97d866d379ee3f5d6f3d9f7847357"; - sha256 = "1cjg14f44m2j3inxzzvbv3gyrpgaf93sl3wivagq5cjngh68w23a"; + rev = "0d982b2860927a03e4cdf663750bd3b4c128918a"; + sha256 = "0azjq7d3whlqwp0svj04drk1gxd1hm99d95lkqwj9pbag5hip3ly"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -23168,12 +23254,12 @@ flycheck-clang-tidy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-clang-tidy"; - version = "20170621.202"; + version = "20171024.108"; src = fetchFromGitHub { owner = "ch1bo"; repo = "flycheck-clang-tidy"; - rev = "5b1c86477f7d1eaabd781bc83dd1bd105c79335c"; - sha256 = "1zd6rqbrpvjxa9sclkldffb91mgyljh1jcvlvvd2cdlajcv98ciw"; + rev = "b8ebd49693f67e08e420ba847cc88f6721ef9e3e"; + sha256 = "0fnn1baw64f7x1zjb95adryr3mfynbblwppcd6ywh7pk0sq18b80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a289ac549a7735a12eec85521c32f915b9194b85/recipes/flycheck-clang-tidy"; @@ -23630,12 +23716,12 @@ flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-haskell"; - version = "20170815.44"; + version = "20171022.958"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-haskell"; - rev = "b313b62866b8a28cadc7331749e51eb32e4ddac2"; - sha256 = "1r94y0wj0ssmamyqfxv0gm0l5qbfrfka8qgsd5mbsaw1lzk5ikfb"; + rev = "ab2e4f9b5ce4665a9b00c3e16dc8ecce30c99d01"; + sha256 = "1508rd39zkvlwcakw708lpsahmkiq4pzagjd6j8zas0xn1gb6789"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell"; @@ -23900,6 +23986,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-nimsuggest"; + version = "20171027.1508"; + src = fetchFromGitHub { + owner = "yuutayamada"; + repo = "flycheck-nimsuggest"; + rev = "dc9a5de1cb3ee05db5794d824610959a1f603bc9"; + sha256 = "1bf65hrz0s6f180kn2ir8l5qn7in789w8pyy96b9gqn21z50vb9d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cb4170f002dbcd1906e81836f3ce035b1e81c379/recipes/flycheck-nimsuggest"; + sha256 = "099mlzramm6z66zyjb6ypn7qb0hpvwbbgk9ydsanj8sni0dd66hv"; + name = "flycheck-nimsuggest"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-nimsuggest"; + license = lib.licenses.free; + }; + }) {}; flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; @@ -24180,8 +24287,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; - sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; + rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; + sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24411,8 +24518,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "f31894da73c2b784bc9e0885ddfa6e1077782417"; - sha256 = "1v8klyrs7wivh9fd4ba18g1n72c6ar707pgwqhsxn0g3f42mlpck"; + rev = "d951afd8c1c2f25a5cbeef3acfcec5f72acfd6e4"; + sha256 = "0k6z82a3xkk71lbnw3sxqmr8ixafglivmsb5y35q1jichzz6hail"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -25981,8 +26088,8 @@ src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "021e595c589f45e8444e2d049d1300ce7811baa2"; - sha256 = "1k7fkwfgnai33mrdh3wkqmm00cyydkb13j04zmxiwg3w6q4sx3a9"; + rev = "d2f3977768f5588b9467cc73c12d9a1de204d9e8"; + sha256 = "1cx1fyr372zhkf35mjvl46c3zim7whz8z2ax88dqavh67h92ai9h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -26061,12 +26168,12 @@ function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "function-args"; - version = "20171006.1056"; + version = "20171031.1004"; src = fetchFromGitHub { owner = "abo-abo"; repo = "function-args"; - rev = "bb0f76412de0f791d82685b4131195e3127e2ccf"; - sha256 = "137fdy398f6fwp96pi7zqm3fmjlvdwh4h1kiivf8xasgp235f92z"; + rev = "609b25305670fff08d5e357298e7128e4f4e3497"; + sha256 = "1xymwk42n2l7c7iaigz23i4l580qpjgq8nqhgr4mnw6invdsgg2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args"; @@ -26103,12 +26210,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "20171018.1049"; + version = "20171026.722"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "18a1d0228b28d8abb4c0fcb4af6d9815de19be07"; - sha256 = "186915xday81bqxdpwp5h5cylmlyflk9s1w3x3ajr2wzp2q3arfi"; + rev = "bfb9c4a565ac655322efe5c7bb1f77d255762846"; + sha256 = "141q924pacsxxfsy3yngyh7a9saipjszpm529s0d4hqqws2glxvz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26229,12 +26336,12 @@ fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fzf"; - version = "20170908.945"; + version = "20171026.554"; src = fetchFromGitHub { owner = "bling"; repo = "fzf.el"; - rev = "cbcc56c372ec2d907c690a05cb420a4bf643c355"; - sha256 = "046hwfnn787c7q5y2pvqxzs5a67my2zmbg5l5rnw1g9swhfh9rfw"; + rev = "ef1dc851077913a327261a6b971fab5f5f657831"; + sha256 = "12zbvr7806xiyx2q944nfnqqfnm43v9ziaihkb9n10s2sp6ippb7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf"; @@ -26413,22 +26520,22 @@ license = lib.licenses.free; }; }) {}; - general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20170708.104"; + version = "20171031.1345"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "00efad765a3ace42a2833c65a169d96c7925623b"; - sha256 = "1jp0vp4g46pcxsyz9d8n9iqf1rsaw4lhsrilmdkayj7n3skg4ipj"; + rev = "6828a859af771df5ec1bf50b67f0fcc7261b5a11"; + sha256 = "13sm85dybjhnqqgkshc4n4m3vm6pd949ppxyb5li7f0znhq6l3ai"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; sha256 = "104ywsfylfymly64p1i3hsy9pnpz3dkpmcq1ygafnld8zjd08gpc"; name = "general"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/general"; license = lib.licenses.free; @@ -26665,6 +26772,27 @@ license = lib.licenses.free; }; }) {}; + ghost-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: + melpaBuild { + pname = "ghost-blog"; + version = "20171023.42"; + src = fetchFromGitHub { + owner = "javaguirre"; + repo = "ghost-blog-emacs"; + rev = "71b358643cc9a2db1bf752281ff94aba9b59e4cc"; + sha256 = "1fkh7zslkdi7a4x2xrk73acmigbi7yx9k6iaj75zbjfd49gyqj13"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a906d461bcb2aa07050b72669feb5787414d809/recipes/ghost-blog"; + sha256 = "0c591cx5kkfmhhqh8jall470iicxdv01mm3m13irq5xhmp3i5kjy"; + name = "ghost-blog"; + }; + packageRequires = [ markdown-mode ]; + meta = { + homepage = "https://melpa.org/#/ghost-blog"; + license = lib.licenses.free; + }; + }) {}; ghq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghq"; @@ -26903,8 +27031,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "3bb31c5705da67a8a66c2e72997b555a4f02d483"; - sha256 = "0crb7invjf2q62m3nc1cyb09m0jj5ksar813spavp1bgzj73y7hi"; + rev = "5c08d09cdaad506ca94616c59f39982f43f4c12f"; + sha256 = "053ff7gr56chbfg3n6ysn5q13db2rjr5s7nkplkv72hzla381dys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -27634,12 +27762,12 @@ gmpl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gmpl-mode"; - version = "20151116.1149"; + version = "20171031.1354"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "gmpl-mode"; - rev = "a4481bcbd84f67cd87e7bc87456b6f5b3a95fcf6"; - sha256 = "0w9dfxpiwwfk1iy83a214xpvqf858k668xkcdr2n25bccg1i148y"; + rev = "c5d362169819ee8b8e8954145daee7e260c54921"; + sha256 = "00p2z6kbyc0bas21d1zygx7z49w6mf22y9kf1rcm9gqsnnadb4j9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c89a523f87db358c477e5840b0e043e9f253e640/recipes/gmpl-mode"; @@ -28051,6 +28179,27 @@ license = lib.licenses.free; }; }) {}; + go-gen-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "go-gen-test"; + version = "20171022.2058"; + src = fetchFromGitHub { + owner = "s-kostyaev"; + repo = "go-gen-test"; + rev = "44c202ac97e728e93a35cee028a0ea8dd6e4292c"; + sha256 = "1vi5xsf0xbcbvapi20hsjangwyp38cbgi8kiccpmingnq2kp8ghs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0861c126161a2674f0e115eac6f948490b142b44/recipes/go-gen-test"; + sha256 = "1pj8n8xj9ccq9ips4wy4v6hdxxgwv11pwi671l6jjrig38v13dzr"; + name = "go-gen-test"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/go-gen-test"; + license = lib.licenses.free; + }; + }) {}; go-gopath = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-gopath"; @@ -28492,22 +28641,22 @@ license = lib.licenses.free; }; }) {}; - google-contacts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }: + google-contacts = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }: melpaBuild { pname = "google-contacts"; - version = "20170112.1022"; + version = "20171027.1033"; src = fetchFromGitHub { owner = "jd"; repo = "google-contacts.el"; - rev = "cf654c59b197a028eb8bf432d52776c2e0ad4135"; - sha256 = "1qrn9zqn25wpsrqbacamn3ixf90xmgxa8ifkday6cxn5ks0kgyj4"; + rev = "a40389bae006ae094aeb1a39fae9891ca687c0fa"; + sha256 = "06mfdmr3dlmk4gyq8fxqv78c5jyis8vxx4ih2azcr5c831pkayzi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-contacts"; sha256 = "0wgi244zy2am90alimgzazshk2z756bk1hchphssfa4j15n16jgn"; name = "google-contacts"; }; - packageRequires = [ oauth2 ]; + packageRequires = [ cl-lib oauth2 ]; meta = { homepage = "https://melpa.org/#/google-contacts"; license = lib.licenses.free; @@ -28751,8 +28900,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "b729d2e8e0270dea62f10a63be34c021d123e41b"; - sha256 = "187fkjpsvq1gyxsgnbvxi4z62hv773ii1lxna3vfz4rqjzcjgxh4"; + rev = "b227a2582a9e5175fc778fc6a03b98aa14534927"; + sha256 = "0ss8jqczipl557c9pipkpvz3h9x6lhzma15s799zw7jwyza6802y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -28877,8 +29026,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "923c77a37a89811d583042eaec56a9d4f20cdac2"; - sha256 = "1vp80iw0fgrpgph512ia36bx2akcyanp0ydkf6q02wg4iidaw6fz"; + rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2"; + sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29260,12 +29409,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20171015.430"; + version = "20171024.221"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "923c77a37a89811d583042eaec56a9d4f20cdac2"; - sha256 = "1vp80iw0fgrpgph512ia36bx2akcyanp0ydkf6q02wg4iidaw6fz"; + rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2"; + sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -29470,12 +29619,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20171005.137"; + version = "20171031.1241"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "6927d5afd2c4543bc97785d3f35e06a8b0fe86f3"; - sha256 = "1hyghwnnkl7fsq3wm7acp4ia7a7zp396wbmmyk3zw93lnpjhwkpn"; + rev = "b11ddb65044468a1d1d7091ee9636aab7b13afed"; + sha256 = "0jhmc2s1xbr5dnmckszx8j0i3kfj7n868xw1d6sqplm7i0r0wm8s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -29575,12 +29724,12 @@ habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "habitica"; - version = "20170924.857"; + version = "20171022.1922"; src = fetchFromGitHub { owner = "abrochard"; repo = "emacs-habitica"; - rev = "752bd376bcf1db563d503d554802aa0ff6e2c054"; - sha256 = "01g9kkfddn7lggbqw6s1vk3igbdjh0v6qslnlbp1llih8wa2vdlr"; + rev = "e51ff7436fe1da10404e2c0872b15d6a7a926717"; + sha256 = "1hiiqf82nagnpq2qdcdv6y2blfiqs6f8ia8k66a4zn5xgwpd13f4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica"; @@ -29974,12 +30123,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20171020.2109"; + version = "20171022.26"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "19fe60b9d07b6a29a529bb58addf91fec5392416"; - sha256 = "1x0vi50ibch57099ifzslyl6icw603bv2lasbrspz2w87qqg59mc"; + rev = "9018ad5cac0b1b1b5e0a51586027fb0ca4076b1a"; + sha256 = "0aj6mjv1i8m18klj9mp690fkmwc81wxh2q69cxjf78fdpgbrhcwl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -30245,12 +30394,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20171019.2338"; + version = "20171030.2225"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "e98a4279135d5d7f4a2fec06c7e7c8b1a1fcacf2"; - sha256 = "075dvbfv5f36r1br7w17i6nhj1vxdnv3c0x2p28rgk5mv10bdpl2"; + rev = "fe92240663f6b2314e79558f6eabbab955a797e3"; + sha256 = "1ip2a9fh3k14s87h8zhw6flybkskcx6vrayyzj5929g97mr26a5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -30476,12 +30625,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20171012.332"; + version = "20171022.220"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "1e1eecfdb62e80a9166cf6e7a3ddb8ff0e80846e"; - sha256 = "0j8xfd11ragnmz51fgfnliwqcxsphghcs8l0cn7m44kfl1kpn9pj"; + rev = "54de08577f9c19354cc303ee52836263aef486fb"; + sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -30875,12 +31024,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20171020.1124"; + version = "20171029.2252"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "e98a4279135d5d7f4a2fec06c7e7c8b1a1fcacf2"; - sha256 = "075dvbfv5f36r1br7w17i6nhj1vxdnv3c0x2p28rgk5mv10bdpl2"; + rev = "fe92240663f6b2314e79558f6eabbab955a797e3"; + sha256 = "1ip2a9fh3k14s87h8zhw6flybkskcx6vrayyzj5929g97mr26a5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -30942,8 +31091,8 @@ src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "2551469fb7faa1b7fdcbbcc3b143fdc8cab1ae66"; - sha256 = "1jmn6hyvi5y6zxbyddak6b3wxhck4w6mvi2fn7gnh04qvac2mb45"; + rev = "08961190b3982dcb8c359e633daba556a6d92ce3"; + sha256 = "1vdrfykhcfnmm254gd3aqypk9hfl0fcml1nc0wxmdjlimlsxadc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash"; @@ -32177,12 +32326,12 @@ helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-mu"; - version = "20171009.1022"; + version = "20171027.933"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-mu"; - rev = "c3d7fb6fd55c760895e0bd6491bafe70aa11409c"; - sha256 = "15jfn7djc8bdvb7xhw2j1d69bn2zn63xdss4cvcckd8dgxpkqrbh"; + rev = "cda769ef48e1e11e3b21cdafa85adb8e36384d78"; + sha256 = "0s7v2hdrsd3xmdw0iwd3zqpdj3zp3z0akcyyw3cicpmic7wrcc75"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63ee2e2aa622c96993c1b705d0fd223d6b36fd0f/recipes/helm-mu"; @@ -32790,8 +32939,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; - sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; + rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; + sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33944,8 +34093,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "e18ec3f55e288883f8042065190572e91651733d"; - sha256 = "0iq4hs2r56rnsxfjda5acd0s2wrza7jd5jsawnzbyix1vnbgp98z"; + rev = "578d1256e466eb8bf40fd7e441172eb12e878637"; + sha256 = "02dvnlg3r9pfk18664d5paqc90ll6a4sc05a9w2phafmi9kypwgr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -34234,12 +34383,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20171003.647"; + version = "20171031.1157"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "588c6a2df2ff4b8f77df49894808cf4ad3de6cad"; - sha256 = "18hjnha1imqiygydbbwwfldp0wvfhf02ffzhzd967nq6gvl0vzdf"; + rev = "7caae71ba87b592e08fb4caaaa1da8e9af80ec62"; + sha256 = "17b5hg7fkm8fj2v477ir9z87kn7q07v75akga414k29xlfzmvdw3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; @@ -34484,12 +34633,12 @@ ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ht"; - version = "20171020.1146"; + version = "20171024.1200"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ht.el"; - rev = "9d659f04b44f416676e6a002728d9a16afc9bd96"; - sha256 = "190vzs0pqcm120nv7959ri3v5qha5hnx4lgfby08wyl4973xncf4"; + rev = "a741bac82797d25ec0542764df7443e9e7241033"; + sha256 = "1m1v31bfaw2g3jymcxsl2bi1z37pj0sfhmldljk8m9zgjll56g6c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht"; @@ -34799,12 +34948,12 @@ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "20171021.30"; + version = "20171030.1023"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "903dfb4b1f46495d7a8a83fd62142c9e0dda3a03"; - sha256 = "0v5a4xbzj3gbncwy05azahznh4fgj92f0vdz23l626w446cndz0x"; + rev = "afb1610b0f78e059ee1a034048a876ece70118f1"; + sha256 = "14b5dk7n9727dwyi9p80rcwm0f6i21y1x10rj05bal1s3lxq7frp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -34944,12 +35093,12 @@ iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iasm-mode"; - version = "20131004.1644"; + version = "20171023.722"; src = fetchFromGitHub { owner = "RAttab"; repo = "iasm-mode"; - rev = "6b404ff94bbfe971b3614007c8e5dcd5757c5727"; - sha256 = "1gl21li9vqfjvls4ffjw8a4bicas2c7hmaa621k3hpllgpy6qdg5"; + rev = "abbec7f308f9ce97beeb57e459fff35f559b4c18"; + sha256 = "0hvpcckhlxab5f7w4s6iw5lhdbjrqn0l8gayg1w42rn6gssr3rap"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c230ec10eb62d1b3f6df10c05c5dbc2e25d4507/recipes/iasm-mode"; @@ -36054,12 +36203,12 @@ import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: melpaBuild { pname = "import-js"; - version = "20161220.508"; + version = "20171026.1628"; src = fetchFromGitHub { owner = "Galooshi"; repo = "emacs-import-js"; - rev = "15d395126f57408d770a72db2e5f43271f90fa52"; - sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l"; + rev = "0a1032894445062b87dbe4e2c8cdba35ac25c250"; + sha256 = "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js"; @@ -36180,12 +36329,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20171018.432"; + version = "20171027.914"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "db3b727c9deedcf9afa13e07cd25734cbf7305a2"; - sha256 = "1cm6zm8d7rywvlhzf1vpblqb1kgn6c7bwk9q2mjz7f5gdcsx1jp5"; + rev = "f7b46c9dd39dfc7ffefb52e35b0795450d3ea96f"; + sha256 = "0qba8c4qr8v0881lc2pnw6lddspzkdj7hsapf6x0vk1mwqmnww4x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -36222,12 +36371,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20171005.1130"; + version = "20171029.40"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "b048358406c24f5f22a3fc51c0a1348236bcfde1"; - sha256 = "0hw8981pi5xkcvs5023nj91vjq3agdlqabinmrrl0mj4wfh2q32q"; + rev = "b04f05d2c735795b68a10cc7e699b676a8acc811"; + sha256 = "16xsrny70f5lr6hr4sipyrnry813cvbhy25jxfx90kp2f9kkak53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -36478,8 +36627,8 @@ src = fetchFromGitHub { owner = "ideasman42"; repo = "emacs-inkpot-theme"; - rev = "b992c0996b4a711f3d6ebb6730c6f57edbc75fc5"; - sha256 = "1ykbf5hhs7z33bca5j0vk8vdyrwghbiqgdjy064nccgxlqyysy0k"; + rev = "7b2f19ebd01535f77da407e28ca970c2ce442493"; + sha256 = "1d2vi919fz6kdya5gafhy9wwmlzid88j9klcbslzh8bjmamnbxcx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme"; @@ -36683,12 +36832,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20171020.1447"; + version = "20171023.1102"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "55b17bc6b9cf1e8621a210fd07de6177e55d1334"; - sha256 = "0zx6p1i3sy771hp4n3dkfgypwrrr35qpa71hlhs5zrcn17xka9jg"; + rev = "5697c86fde2b6131629e8d1c69f9b2363dadc7ae"; + sha256 = "1zwvmchk8rymxfciiip78zf69p3f8jpbr7fqqj43cxv0lq9w284s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -37184,6 +37333,27 @@ license = lib.licenses.free; }; }) {}; + iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "iter2"; + version = "20171031.755"; + src = fetchFromGitHub { + owner = "doublep"; + repo = "iter2"; + rev = "a0e41b2f55d50c08c59ffcc6e83a977c141bcc55"; + sha256 = "0ccr9qjhc35wi07yckd9y26synihhsg8zwkxgqyzkx7avxkqfyhn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2"; + sha256 = "0kl3z2wwpvk2ddsb3798g41pv0xycsf9dclhv00snpzsr61d9v65"; + name = "iter2"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/iter2"; + license = lib.licenses.free; + }; + }) {}; iterator = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iterator"; @@ -37250,12 +37420,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20171021.207"; + version = "20171031.716"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe"; - sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz"; + rev = "96663b77945ab21e4e1b0aab690fc2e926f01f9c"; + sha256 = "0r691dzs77zdkvjzb787kjg8zvvba8gdj2da9zjb14m4nyjmg9d9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -37271,12 +37441,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20171012.332"; + version = "20171022.220"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "1e1eecfdb62e80a9166cf6e7a3ddb8ff0e80846e"; - sha256 = "0j8xfd11ragnmz51fgfnliwqcxsphghcs8l0cn7m44kfl1kpn9pj"; + rev = "54de08577f9c19354cc303ee52836263aef486fb"; + sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -37380,8 +37550,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe"; - sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz"; + rev = "96663b77945ab21e4e1b0aab690fc2e926f01f9c"; + sha256 = "0r691dzs77zdkvjzb787kjg8zvvba8gdj2da9zjb14m4nyjmg9d9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -37506,8 +37676,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; - sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; + rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; + sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -38211,6 +38381,27 @@ license = lib.licenses.free; }; }) {}; + jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jetbrains"; + version = "20171027.2055"; + src = fetchFromGitHub { + owner = "emacs-php"; + repo = "jetbrains.el"; + rev = "38e136079f3f2ddbe0e8b7dec01cf6b515e897d8"; + sha256 = "1ji64qip5raf0lbv7fv36rd4fwa33zn0xi7sa0zrgf0kcsr0qasb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains"; + sha256 = "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7"; + name = "jetbrains"; + }; + packageRequires = [ cl-lib emacs f ]; + meta = { + homepage = "https://melpa.org/#/jetbrains"; + license = lib.licenses.free; + }; + }) {}; jg-quicknav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "jg-quicknav"; @@ -38365,8 +38556,8 @@ src = fetchFromGitHub { owner = "ljos"; repo = "jq-mode"; - rev = "f2dc70af890694828b8227b2727240e82780d7e5"; - sha256 = "18hprvhlwf110j7anyrrrjp4xjr3556yipz7n4jyqj69i0kvjw5c"; + rev = "5c081859def7510dafc6b14449f5285916898f15"; + sha256 = "14421p9k6b02syb8irprz527dcqbh1r4i2m86pi94sv6ffzbs0gg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode"; @@ -38424,12 +38615,12 @@ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-auto-format-mode"; - version = "20171019.2142"; + version = "20171031.1819"; src = fetchFromGitHub { owner = "ybiquitous"; repo = "js-auto-format-mode"; - rev = "705e300a2c880f6dbfa830d6c69818b7a3a95c09"; - sha256 = "1a3dwcknjydaxnyhaycgbmlncj92qkp3m5flmi6fyqjx11lz26ag"; + rev = "68c6c51320f124d84145643dda59619966bb29f4"; + sha256 = "04slx5ipcf1lj9fvx537yfyvqmg324pfji02w5iafqnyvyhdjy9p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; @@ -38442,6 +38633,27 @@ license = lib.licenses.free; }; }) {}; + js-codemod = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "js-codemod"; + version = "20171017.1411"; + src = fetchFromGitHub { + owner = "torgeir"; + repo = "js-codemod.el"; + rev = "cf0d0a47588cad640e4397f306fd17d2166a8f04"; + sha256 = "04im9cs7hbs2bzx5ynibwgbypy91vvrz3jjy72hzfaamdglw7w8r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/81670a2467fa846a3f0e6c81e870e8ae140dd54e/recipes/js-codemod"; + sha256 = "1m5wbyx12sc5qwbrh948ikskck10p6j05ahrrvmmflvfb3q4vpcj"; + name = "js-codemod"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/js-codemod"; + license = lib.licenses.free; + }; + }) {}; js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; @@ -38909,8 +39121,8 @@ src = fetchFromGitHub { owner = "tpapp"; repo = "julia-repl"; - rev = "fbee2f5995a7781576b7a3b9f0707ea1e7ead2c5"; - sha256 = "18vqw0sz1ifhd6hpa5am9z2qykqz1dxwav65v8vgl6hrrbnkfzbq"; + rev = "b20cadb67d65e52ecb57bbb07369215d01c956e0"; + sha256 = "048jf00lmyrsr815kk8h5y5hdvpmbd6zvchq8x5vyziqd2vpsdc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl"; @@ -39257,24 +39469,24 @@ license = lib.licenses.free; }; }) {}; - kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "kaolin-theme"; - version = "20171015.2347"; + pname = "kaolin-themes"; + version = "20171101.316"; src = fetchFromGitHub { owner = "ogdenwebb"; - repo = "kaolin-theme"; - rev = "b0808035ab7bb9b5b03a0f80dfb01141beeac75d"; - sha256 = "15bklknvd3x3n75shwis4j9gjfpwms37vaxvwd2bym3m1kx8kh2d"; + repo = "emacs-kaolin-themes"; + rev = "85d11341944ff91e7949306c588f237ebf8adc5e"; + sha256 = "1cqmg3hksqb3vi2m77ysacx8znp6b94vqcxw7lm4psrdwb3ris8g"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a67c2a3ad82efcb32ba4943c7ac10fe2768d9d51/recipes/kaolin-theme"; - sha256 = "009064hhn39f9w9qxa3m0kwqhj5a12j7hg4916j9hslpwy5ghc0c"; - name = "kaolin-theme"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; + sha256 = "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw"; + name = "kaolin-themes"; }; - packageRequires = [ emacs ]; + packageRequires = [ autothemer cl-lib emacs ]; meta = { - homepage = "https://melpa.org/#/kaolin-theme"; + homepage = "https://melpa.org/#/kaolin-themes"; license = lib.licenses.free; }; }) {}; @@ -39768,8 +39980,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "1f4fdb290b9ff6f3a0694cc0cdad56e78a9490bb"; - sha256 = "0cmhsnc20x3n2njs16w6ng3s1csc8pp3k00p6ibigbbs06hd0v7l"; + rev = "be946b5e33cc1fc734a29ba46ca734391803fbcd"; + sha256 = "1ngpwjhilpg974xx4z8fiz6c2ycpdr6xbky1d3d24563hjp1a5kr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -40076,6 +40288,27 @@ license = lib.licenses.free; }; }) {}; + kubernetes-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "kubernetes-tramp"; + version = "20171026.922"; + src = fetchFromGitHub { + owner = "gruggiero"; + repo = "kubernetes-tramp"; + rev = "9fa84df71f6e88bc23a756cdf2df393a35aec945"; + sha256 = "1l1ibc97ahp3zwwypqfg3201qdxad4sdpdaq7nsfb87gh46vsbz8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ea4b15e64a9dc33b9977650488693cacadd1ab1/recipes/kubernetes-tramp"; + sha256 = "15nlx3w2v0gky0zgbx7n0w1mdr6yaj4dh028ay2k19wg8wbsckjq"; + name = "kubernetes-tramp"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/kubernetes-tramp"; + license = lib.licenses.free; + }; + }) {}; kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "kurecolor"; @@ -41409,12 +41642,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20170928.2107"; + version = "20171029.1522"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "145d21d65b5469e682ef464ae8f4e0e3d8c0f04b"; - sha256 = "1h188cprka13bd1prfj1w86m5z8c1nfaz4dw18g88jf6b0gyazhz"; + rev = "2ecd23457ac26f30f7218a5506142ca71dc602be"; + sha256 = "17d6p7i2yi3iawc2k8w4fkx5lwnr0x5kax73cgwapv6ghmr9yy42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -41517,8 +41750,8 @@ version = "20150910.644"; src = fetchgit { url = "https://llvm.org/git/llvm"; - rev = "7f2ed036912341ef20004385cf71d053a3cb156f"; - sha256 = "1kzzh5sybp9y47xzc4mirk4b6lcf736sxvi91rvf8fm5gp075sq1"; + rev = "26acced737715cfcbf29f6708f900b4bb8a6d5e8"; + sha256 = "189c90wax1zyzk017j4brq2i25smkmpkb05wzakywkf0rgswxwqh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; @@ -41973,12 +42206,12 @@ lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-java"; - version = "20171021.330"; + version = "20171023.650"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-java"; - rev = "c3aefd421535e63929bef25cd341e893572abb18"; - sha256 = "1mr3pd1744dmx0mk0advnf3d8l8axjmxkik7lqzwvv1rl7x734wx"; + rev = "5176f63e80e8f971563c0b98658db7dc72404369"; + sha256 = "07g259bx3vra2gf9mhxyd3qv1jb2s0lc0hndf0kvrcjdy29wwi52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java"; @@ -41994,12 +42227,12 @@ lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "lsp-javacomp"; - version = "20171011.422"; + version = "20171024.1547"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "lsp-javacomp"; - rev = "bd3c3714158fe52d19025e9a13efd5e490b1d202"; - sha256 = "1gv0dl0vp2nkf7j74hin8kdmjppqz9cgfn2lhg06yj32yzvg6xbw"; + rev = "ed23aaeee27e6253bed5752fb8fbb7a5fa61967c"; + sha256 = "096rbyv0qwa454p1ns7g0py9lni5r6h1gw85wm5mwr00shjzq23n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp"; @@ -42015,12 +42248,12 @@ lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-javascript-typescript"; - version = "20171021.253"; + version = "20171027.1005"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-javascript"; - rev = "c349da788f77b60f7e8ec8917054e97b8f41bc70"; - sha256 = "1b6lskd57p3c1dfz0c4pn80ksdq7vysjlbk3ja0az1nyxczmn44q"; + rev = "8a565260906f90bb39f2da54cdb6179ec27005a6"; + sha256 = "1dx0b7sq6wn309l1iy8s3ccn21hkv0xs061jbm53hz40pn30sjqc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript"; @@ -42036,12 +42269,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20171021.234"; + version = "20171029.148"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "e67ecf89b3878f8d5d079af3ce2b57933aeb1765"; - sha256 = "12ms4zl8j3s9nbqqasmglhnagxrpf8cjplagv2dakdlq7zllr8ri"; + rev = "b221b2acce8936114649cdbdf0ce1d584487ef91"; + sha256 = "0ndbhy1035ji31ffhc6hxybwm59kzmlp9hg1zjhfww4d0sym9hz9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -42054,6 +42287,27 @@ license = lib.licenses.free; }; }) {}; + lsp-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + melpaBuild { + pname = "lsp-ocaml"; + version = "20171022.308"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-ocaml"; + rev = "3683281bcb56fbe778fadb23e4363a411b6f9e73"; + sha256 = "102cfv52hicmpbczs1z3cfz8d03p2hwzdkp3n0ljx1asnk4l1b8x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7be2d7a7af3d744c531e5e018d791bf2566df428/recipes/lsp-ocaml"; + sha256 = "17334qcgqrz4jd5npizyq20fmxy07z2p3pq98s5np2kc4h9ara33"; + name = "lsp-ocaml"; + }; + packageRequires = [ emacs lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-ocaml"; + license = lib.licenses.free; + }; + }) {}; lsp-python = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-python"; @@ -42082,8 +42336,8 @@ src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-rust"; - rev = "da4877ea682e46d6d6bb0077be5d00269f4c14e8"; - sha256 = "1miql5v987k6hgxxq0fqzj20al9y3qg79a5pi9d3y4yvzznidhpa"; + rev = "239e0cb8912749266a6226b68c6bc3b4362876c1"; + sha256 = "0ki66lcdc67hxx3llzw5x8vrsfi1p5m509jpcvkhrrxs1sqr4bqn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust"; @@ -42414,12 +42668,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20171021.1158"; + version = "20171031.1141"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "3bb31c5705da67a8a66c2e72997b555a4f02d483"; - sha256 = "0crb7invjf2q62m3nc1cyb09m0jj5ksar813spavp1bgzj73y7hi"; + rev = "5c08d09cdaad506ca94616c59f39982f43f4c12f"; + sha256 = "053ff7gr56chbfg3n6ysn5q13db2rjr5s7nkplkv72hzla381dys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -42631,12 +42885,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20171020.1153"; + version = "20171023.926"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "3bb31c5705da67a8a66c2e72997b555a4f02d483"; - sha256 = "0crb7invjf2q62m3nc1cyb09m0jj5ksar813spavp1bgzj73y7hi"; + rev = "5c08d09cdaad506ca94616c59f39982f43f4c12f"; + sha256 = "053ff7gr56chbfg3n6ysn5q13db2rjr5s7nkplkv72hzla381dys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -42757,12 +43011,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20171021.1302"; + version = "20171029.1959"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "e5f33e46032deb381ec67832451a6c69cfdcb1e2"; - sha256 = "05s6cfsgxpqb6gvx6n4qdz5fznd87x7k26lz7ad0v7ky461any7w"; + rev = "2fcd5eebf3e052234950b3b07e43d26ce632a794"; + sha256 = "0k5bxxfj60vr58g7rnj562ls8ijb0ia66fdiqpyffi5sf0wan13i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -43290,12 +43544,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20171021.1428"; + version = "20171031.1725"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "df31e2e82bf88655ed895c4a372e28e3a3569353"; - sha256 = "179wa75kzr0k8kjgk4z5iq5v2c8zbg7c6ii21fq35kyikkp5n8n3"; + rev = "7a62259a22ccbf59b0132d077348ee489edf5d1e"; + sha256 = "137xkm76k6faak478hmnr6yrhymbfln0xs0ninzp4iy57kxyx9d9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -44831,8 +45085,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; - rev = "7ee76939b9269c652f93065a8fcc7da24434a167"; - sha256 = "0drhrid8gb9rk9rl8afsf3ninjzs4p78lnrp285xkhwn7hlri4v9"; + rev = "88935a26318a574adeeb2301ae8d010f0102b1d3"; + sha256 = "1zibawwflf2wx7hzg2ld7qvmlpljfd6nb86998ckzbx75s5yb20a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; @@ -46859,22 +47113,22 @@ license = lib.licenses.free; }; }) {}; - nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: + nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck-nimsuggest, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20171021.1054"; + version = "20171028.2219"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "fd1af9030443a49d333956afc36491936aa930fe"; - sha256 = "010jr43xbwr2rfgcvjgb522ms92d0945svlngfdhkjq66bnl41a5"; + rev = "10296ac3d9ee70bf31180b5158ac3b4a58f45d22"; + sha256 = "0mswc1f141xif3h4zshza0ar64s99fp6j3l795c67a3yvmc7l50v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6"; name = "nim-mode"; }; - packageRequires = [ commenter emacs epc flycheck let-alist ]; + packageRequires = [ commenter emacs epc flycheck-nimsuggest let-alist ]; meta = { homepage = "https://melpa.org/#/nim-mode"; license = lib.licenses.free; @@ -46883,12 +47137,12 @@ nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nimbus-theme"; - version = "20171003.1044"; + version = "20171026.504"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "f62edeb70cc19bc4c8de9b815c4e9d257acff35d"; - sha256 = "04y10x36bfgcg22cazza13ildkcsc3vmrd0z8qcsc74yd05n09zf"; + rev = "e78561a828e50b5bd0984723d9040620367180c8"; + sha256 = "04cbr0a3kvk79lyrriblm4q7y00j0banwl7a4r9li4iq92rgcivh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; @@ -46950,12 +47204,12 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix-mode"; - rev = "eb7623fb3b23afec25619a76adab6bab5e338bf2"; - sha256 = "1shgbh2iawml605qhr1s8bcmy0by7d455lm70wb2wkznsdlwv6wp"; + rev = "3294f8a2f83ace2d71f16c274a262ff76be412dc"; + sha256 = "1p1dka9v8fm6rklspkscj5rs5f21dwi3bq44d3hjqw6xva4q7bx4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode"; - sha256 = "15xgqgrkypcplnfvl5j6w8abayzz8q0nw2wav01sdyx39ym005k3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; + sha256 = "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5"; name = "nix-mode"; }; packageRequires = [ emacs ]; @@ -47303,8 +47557,8 @@ version = "20170927.415"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "d6929040a4828cf17fb1a4f4d49b95816a5e7b7c"; - sha256 = "1scgmw52ny6wwwdl7hcr3cw84ag2hrrvik6ppp16pfyzv58ywyw6"; + rev = "1b91884296f7e423f2e190ccf7f590ccb3028fdd"; + sha256 = "0f78b9nw7ccpkkf192ka40d5021gbj114capjlkf4d79qr8m91yh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -47464,15 +47718,15 @@ license = lib.licenses.free; }; }) {}; - nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, help-fns-plus, lib, melpaBuild, transpose-frame, undo-tree, which-key }: + nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, transpose-frame, undo-tree, which-key }: melpaBuild { pname = "nu-mode"; - version = "20171021.1508"; + version = "20171028.1443"; src = fetchFromGitHub { owner = "pyluyten"; repo = "emacs-nu"; - rev = "161f41f67b3fb10c2e3025670485a2dde24ab54b"; - sha256 = "0bqc0v4q222lx39axys2yfcfby6a5mcllnmpr3jdgsgagdhxxk05"; + rev = "683e2648a5b669e91138eec606f2e86f9f54ccd3"; + sha256 = "0mf8cj729ag7c0z1155ziaqx9s119nwxg9231rb8i8qx17vdci2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode"; @@ -47482,7 +47736,6 @@ packageRequires = [ ace-window avy - help-fns-plus transpose-frame undo-tree which-key @@ -47765,26 +48018,6 @@ license = lib.licenses.free; }; }) {}; - ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ob-axiom"; - version = "20171021.1448"; - src = fetchhg { - url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "fdb3336941b9"; - sha256 = "0adi26fj1rgcjis5xspbcrdzb98d3fd693pxv9311ffsxkpfsl9d"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ob-axiom"; - sha256 = "12cmzhgzk8314y6nvzdjwidalccz6h440lil83c1h4lz4ddlwmf6"; - name = "ob-axiom"; - }; - packageRequires = [ axiom-environment emacs ]; - meta = { - homepage = "https://melpa.org/#/ob-axiom"; - license = lib.licenses.free; - }; - }) {}; ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-blockdiag"; @@ -47890,22 +48123,22 @@ license = lib.licenses.free; }; }) {}; - ob-crystal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ob-crystal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-crystal"; - version = "20170811.57"; + version = "20171101.347"; src = fetchFromGitHub { owner = "brantou"; repo = "ob-crystal"; - rev = "4bfd36c922d28e8a204218bde0e889cd1097ec04"; - sha256 = "00rlxm0gj2arcnjhy824id08gxpha73ikfipar780xm845ripm3j"; + rev = "9d58b880b74e0ad83b37596bb44635e5d7ae5c3f"; + sha256 = "11qly91h6cm0qdj2dx8lvmfgp7bakrvvwf106rqh4f98y1qv22xh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a7d43199a83ab6f672aaa69ef4e158c868f180/recipes/ob-crystal"; sha256 = "11mk2spwlddbrvcimhzw43b6d3gxzmi8br58bily1x4qkvl6zy4n"; name = "ob-crystal"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/ob-crystal"; license = lib.licenses.free; @@ -48079,6 +48312,27 @@ license = lib.licenses.free; }; }) {}; + ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-hy"; + version = "20171101.344"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "ob-hy"; + rev = "a3512f274709dc4ab6c18d7955d361f8715505f0"; + sha256 = "1i796041svy7njjl3aqaxzjydmm24q688vpxvqd0pj5hyajqdgqw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy"; + sha256 = "18a8fpda0f28wxmjprhd9dmz7bpk1j3iayl20lqffrcal6m4f1h7"; + name = "ob-hy"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ob-hy"; + license = lib.licenses.free; + }; + }) {}; ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; @@ -49006,12 +49260,12 @@ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; - version = "20171015.1228"; + version = "20171030.2201"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "d7a63cd5f592c131615a3b6523fc2b2a04a9f00a"; - sha256 = "0cvsys9jyb0zbkj5q01q2fgjmcqvb12dxgfy049fl7a2gd9n55fj"; + rev = "906e29a702237f039f24c215fdb561a728a3df1b"; + sha256 = "1l1rzl7y5j2wmlgx7ivivwvwvbn4h7pg5s7yqsk65n9kb59ha8s8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -49327,6 +49581,27 @@ license = lib.licenses.free; }; }) {}; + orca = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "orca"; + version = "20171030.1216"; + src = fetchFromGitHub { + owner = "abo-abo"; + repo = "orca"; + rev = "5e1744afb793dda744ddc6fe342144b5e90bea08"; + sha256 = "0gqgs3rmdzm5vqk8azgzwannxjifvrf5fj40n543d0066c2dfsfi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f4d9cf89c58a9b36b7c2a42de2aecb3b60001908/recipes/orca"; + sha256 = "012ndbrgm58r09snhvi476rw0lq4m913y0slc0cxb688p9wgz5w3"; + name = "orca"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/orca"; + license = lib.licenses.free; + }; + }) {}; org-ac = callPackage ({ auto-complete-pcmp, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "org-ac"; @@ -49607,8 +49882,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "3b6120fb54bb6c8555dc24a883ddc1c8c1a601f0"; - sha256 = "0sqw4iaq9mggfwhgkc27pidqjzd3lz7qjqvdjjc23dyichsri3hq"; + rev = "8cec702f602b18da90b3d6207888a887b8e07750"; + sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture"; @@ -50316,12 +50591,12 @@ org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mru-clock"; - version = "20170901.444"; + version = "20171101.506"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-mru-clock"; - rev = "cb239b5704b742029145e7f15e928351e4e8dd9d"; - sha256 = "0h25w6i4qrbigcwpnwkz8wak5mh3kzh29nayzsf85jlq9vd2x5hq"; + rev = "10f6a7021c82dc6795f4020e89889a5a72eb8832"; + sha256 = "00f4l5w6p0l1x5ghpvbp5934m9m012fabvzb7apazwdr5c7xbd7q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock"; @@ -50596,12 +50871,12 @@ org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }: melpaBuild { pname = "org-projectile"; - version = "20171006.1230"; + version = "20171022.950"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "3b6120fb54bb6c8555dc24a883ddc1c8c1a601f0"; - sha256 = "0sqw4iaq9mggfwhgkc27pidqjzd3lz7qjqvdjjc23dyichsri3hq"; + rev = "8cec702f602b18da90b3d6207888a887b8e07750"; + sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; @@ -50621,8 +50896,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "3b6120fb54bb6c8555dc24a883ddc1c8c1a601f0"; - sha256 = "0sqw4iaq9mggfwhgkc27pidqjzd3lz7qjqvdjjc23dyichsri3hq"; + rev = "8cec702f602b18da90b3d6207888a887b8e07750"; + sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm"; @@ -50753,8 +51028,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "3c022af9adb6ff96edcc2f11ebf20cfd576df702"; - sha256 = "0qsiclmg9vm1svgr8m4yj0dwwvrvga1qaa6bzdhkw71s0r931sl2"; + rev = "8fb1275b4c0e2dd46593754e497940c49fd9da6b"; + sha256 = "0jha5qlab3gsyl8iysf1kqn2f15afvqjvnl2nyzh47llqng8yskj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -51672,12 +51947,12 @@ osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-dictionary"; - version = "20170208.505"; + version = "20171026.34"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "osx-dictionary.el"; - rev = "ec16c40cc4db0140db1cf6ad1fb1198c7c344b2b"; - sha256 = "0n09s09qaqwdrpd4dgxj16bh3lgc8nzdld49z8zkipf3cfh5v040"; + rev = "b16630ecf69f87ac873486d8b9c8c03e6c9ea7fa"; + sha256 = "06qsg8hlw1b725pzpsg5f194pxqcg1pjncsi8j0815yrlzfcg6sp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary"; @@ -52155,12 +52430,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20171019.936"; + version = "20171029.1929"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "d0e8a5d7505ebdd55074a3ecd6ca467931b98454"; - sha256 = "1r39bllndh44jjsj4j0h8sqmz8a3xkwlp6cj9d7jvp640s8wddim"; + rev = "caa3aa99c6bef6d0dcaa4713a7934c7d410a5641"; + sha256 = "0vadb0d7wgz37cdzhgciv0b0fd6wc4gwdz0ppdhk1s9y3hkcbkw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -52304,14 +52579,14 @@ pname = "ox-nikola"; version = "20151114.316"; src = fetchFromGitHub { - owner = "masayuko"; + owner = "msnoigrs"; repo = "ox-nikola"; rev = "5bcbc1a38f6619f62294194f13ca0cd4ca14dd48"; sha256 = "0cc14p6c3d4djfmrkac0abb2jq128vlmayv2a8cyvnyjffyvjbk7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-nikola"; - sha256 = "1amplnazs9igfd382djq23d8j7r0knr0hwlpasd01aypc25c82a4"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/4e3fa1b0728ad3058376800ec5e2e9e3847c1d2f/recipes/ox-nikola"; + sha256 = "13k5wggz8bhnfgpsc09jnisk7xdb226d6imp7v6vmd1ax9m2xb0w"; name = "ox-nikola"; }; packageRequires = [ emacs org ox-rst ]; @@ -52409,14 +52684,14 @@ pname = "ox-rst"; version = "20171004.1553"; src = fetchFromGitHub { - owner = "masayuko"; + owner = "msnoigrs"; repo = "ox-rst"; rev = "6d1eab55ff7c8dc4bcf511c9483e69f2a840e928"; sha256 = "10z922lcg8hz517kg57knx2irfcac8plp9nsxayrbxpkjx7mmjlj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-rst"; - sha256 = "1vyj6frrl7328n2x7vc3qwv3ssdhi8bp6ja5h2q4bqalc6bl1pq0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/85770d6e235217e98dda9d8b9f027a4ba3ebba96/recipes/ox-rst"; + sha256 = "0447q0gvasii57rp391la9prz0w228jnzgi59s785vzswdryww0n"; name = "ox-rst"; }; packageRequires = [ emacs org ]; @@ -52470,12 +52745,12 @@ ox-trac = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-trac"; - version = "20151102.955"; + version = "20171026.1123"; src = fetchFromGitHub { owner = "JalapenoGremlin"; repo = "ox-trac"; - rev = "2f2f70eefb9679025ae5812e221f0c118da36012"; - sha256 = "0w6963jvz1sk732nh18735dxivd6nl59jd4m26ps6l4wqhqby0db"; + rev = "03cc31efb1aa06991918f1071e250a9d58f96cfb"; + sha256 = "0knrmq0sc8s9c6j0967jmrp2hq8jcwg281qqk89y8j9rpbmhbaj6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b73753ef9229d0fdfbe237acc63126f1786a494/recipes/ox-trac"; @@ -53858,8 +54133,8 @@ src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "094b2931de775c734ad353c5d06cf5fc6a55f11d"; - sha256 = "0g92rd68m1l377hw5rr1y14z7fcs1blmyc6vi5a9gybr19bcxb7w"; + rev = "0f99f0c06514acf51445e7e4cb0f638fa0c75ee5"; + sha256 = "1gc7n5r60ib65bnkgpac3bn71pxnm58sxajnwjfkwi9xzgw72acv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -54104,12 +54379,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20170908.648"; + version = "20171014.111"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "fd57484756b7a7e34895bf55238413005ab35959"; - sha256 = "1f7qcy5swiqx17835dvwb89x0ndhviyxi5bqk2gn14c1z8fmld5a"; + rev = "ccf87da2c230c3a91e627105b0f034a954e6842a"; + sha256 = "1dv3ghl9falw888bl1w0d5pzp0jz8qsbisd7kfd887bsyn7x7jqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -54650,12 +54925,12 @@ php-plus--mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-plus--mode"; - version = "20170215.657"; + version = "20171027.921"; src = fetchFromGitHub { owner = "echosa"; repo = "phpplus-mode"; - rev = "8224e6aabc2e3d046d717b4c87c643aa98a8e203"; - sha256 = "041xv3c2gwcxlj9bnjx6hlrm2k7s7fyzqbp4c583is6jx1adjfn3"; + rev = "523e7e50f9978ba74b8a324f9f896cd9b5dfd9de"; + sha256 = "0xf79pxsrfr9bi3138hdq2ccrh391sci8lvmvzcs3vnzw0hrzbfh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d542e94471b9f601f1ee6f31e727bc4a31fa8f9e/recipes/php+-mode"; @@ -55444,12 +55719,12 @@ pocket-lib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, request }: melpaBuild { pname = "pocket-lib"; - version = "20171008.2135"; + version = "20171026.1610"; src = fetchFromGitHub { owner = "alphapapa"; repo = "pocket-lib.el"; - rev = "9f2a5dad867ef11d6629073ae4c8a43df1c03470"; - sha256 = "1y97zlnxp0lxh21x51bdkvd8yxg59sxbq94s06vkvkbq2pjz86pp"; + rev = "52d4c3d9ca500acbf0a4cac4abfacc0641007abe"; + sha256 = "1c59xzh2acrfmld0fg78h3kyzhgfcfcbk7nmvb584jr2qppkszgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71f17ce28f4fc8c2c100848be8aec15526ef8697/recipes/pocket-lib"; @@ -55486,12 +55761,12 @@ pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }: melpaBuild { pname = "pocket-reader"; - version = "20171015.1705"; + version = "20171023.737"; src = fetchFromGitHub { owner = "alphapapa"; repo = "pocket-reader.el"; - rev = "93ef3a0737e93fb2e73f230fbb38f0b9f6f9d9bd"; - sha256 = "02l1yd0s7dnq6wj7lldbbxqq1libdcczygc2lzx4rdc5jnr4lnsh"; + rev = "e65a7e7529ece4fb7a738c062e73d5c07ace9574"; + sha256 = "0bqxsvhmwvf0gpjmmh7pmzyw4lpcarj2prm52bgncch8x1f0gvnp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader"; @@ -55747,12 +56022,12 @@ ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ponylang-mode"; - version = "20170514.1419"; + version = "20171028.1356"; src = fetchFromGitHub { owner = "SeanTAllen"; repo = "ponylang-mode"; - rev = "88833317195f5ee2880e33a907861c6c2d3851da"; - sha256 = "0kzzf03m1jzkl9fxzivzh3536c0c9l7m9g5h7zycdz7nj5da38c0"; + rev = "5e23459dc395eb77fa4c6cfa3d6c08b1b185a6df"; + sha256 = "0iwdnv56200w53ba4f66vih7gha2nb36ajnvbqixc0byibwcsnc9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode"; @@ -56062,12 +56337,12 @@ powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powerline"; - version = "20171010.713"; + version = "20171023.750"; src = fetchFromGitHub { owner = "milkypostman"; repo = "powerline"; - rev = "595a9c1b230f4fcc4d72e6ed9c67aed7b838452d"; - sha256 = "0xpvsrr4klsw3fkclpkxcxrfwg2gk4fzc20n6di22cs5pysilp8a"; + rev = "fda4fb96984607d4a6502b1d8c8898e56d10cf6c"; + sha256 = "1lz3kr8w9z9xx5amqqvim85asjji13q84d4r1cb5x77wajmj1p21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline"; @@ -56377,12 +56652,12 @@ processing-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "processing-mode"; - version = "20150217.432"; + version = "20171022.1602"; src = fetchFromGitHub { owner = "ptrv"; repo = "processing2-emacs"; - rev = "a57415e523c9c3faeef02fa62a2b749270c4cc33"; - sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h"; + rev = "448aba82970c98322629eaf2746e73be6c30c98e"; + sha256 = "1fv74k37yyrh6jzasgqj88lrbq152gs9gpbjpxn7fz424c38gq2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-mode"; @@ -56402,8 +56677,8 @@ src = fetchFromGitHub { owner = "ptrv"; repo = "processing2-emacs"; - rev = "a57415e523c9c3faeef02fa62a2b749270c4cc33"; - sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h"; + rev = "448aba82970c98322629eaf2746e73be6c30c98e"; + sha256 = "1fv74k37yyrh6jzasgqj88lrbq152gs9gpbjpxn7fz424c38gq2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-snippets"; @@ -56607,12 +56882,12 @@ projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20171009.848"; + version = "20171031.456"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "dd48cb8af4cf41d109fb6d46f0c3f2134f37fcfb"; - sha256 = "0qgw3g4xq1qa6dvxyyhnb6536ay29jzf12829z9s689xqg0n7zsn"; + rev = "7892f642ce7ab6ee816e5926ae02ea2014dac2a8"; + sha256 = "17vclk40435qv2g0fjgyc0fndjghd2x20i43zvcff45yjqmyhw88"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -57003,22 +57278,22 @@ license = lib.licenses.free; }; }) {}; - proportional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: + proportional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "proportional"; - version = "20170628.137"; + version = "20171025.1637"; src = fetchFromGitHub { owner = "ksjogo"; repo = "proportional"; - rev = "eb2bb2b3d1ca058365049271dc341b1180009f1a"; - sha256 = "1lc3xvkvy5lcy5zralbnwqlxmar443yq735pd023z6di54xm3991"; + rev = "f671ffe8fd803e2fc462e2e1844aeeab1a13918e"; + sha256 = "02sbrcb9c27djk64xv41vii6pbw83b6iljrd66w4ad9hgz2pkxzk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e0a7f061df4cce44e5fe98f6e1c31bec4a7338f/recipes/proportional"; sha256 = "022lhbslzd67wyah8r0gl73vzxgjjwia08l3ssdd08jj3p56m3wx"; name = "proportional"; }; - packageRequires = [ emacs use-package ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/proportional"; license = lib.licenses.free; @@ -57052,8 +57327,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "b189389e2f2ca01dd534a8e9ba3ac38ea45cdba6"; - sha256 = "1yr4073qf6br07azrmhy9xk8zq9zlalbmldjsrkbf7k5r59217jg"; + rev = "cbe250591fca9d2e776776be065a72c5550a5556"; + sha256 = "0g8zp8ws7i9v3a719dvwkva0f9rap5s6jdpw2j8cj1kp94bvk9fl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -57090,12 +57365,12 @@ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }: melpaBuild { pname = "psc-ide"; - version = "20170923.250"; + version = "20171031.129"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "e577f84b938a1fb461a016540b06f5d5e399526a"; - sha256 = "14q4bj7cfny1jwsvdjfsl88nhwh5al8hyvf4rxki9k2wim8lx2bv"; + rev = "d28c33f65318a475133afc2f42e103db9251d2a2"; + sha256 = "19f9aw675d6crhd9j9jvqya39ddsf4f6hcwb03525k307syvg62y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide"; @@ -57184,12 +57459,12 @@ psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "psysh"; - version = "20170610.2104"; + version = "20171022.2229"; src = fetchFromGitHub { owner = "emacs-php"; repo = "psysh.el"; - rev = "f72d6fe41af2d9566d41b167cda66e97efdf8cfa"; - sha256 = "0hr8nlxcqfas9wl5ahz9hmvpa8b6k35n4f7iv9dx6zwf5q48q7y7"; + rev = "926af4ae0c068ed699fc939f4b3e642aaa6f7c9e"; + sha256 = "0k6kb4xbfxcvd7dm3kb600mq56xyy086zi7nal04jkv9lc59bwn7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/psysh"; @@ -57230,8 +57505,8 @@ src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "96718f802dad3acd5a3f770b1452b81e39f77d92"; - sha256 = "1jqj3qfc4686v09am869ls1k3jwy397646cql4a8dg7crjdpf023"; + rev = "9dcebdb10c50620a3a5c6d71361d53bf482a482e"; + sha256 = "1rkbk8apd612ixksyssmmkrhswks6gbxl9kxhrbaxszfrrhqx86v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -57247,12 +57522,12 @@ pulseaudio-control = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pulseaudio-control"; - version = "20171019.2026"; + version = "20171024.2339"; src = fetchFromGitHub { owner = "flexibeast"; repo = "pulseaudio-control"; - rev = "30b47a785c5f5ee44ae98d522ab541c9ea310b35"; - sha256 = "0ik06rvgz6gj86ijd6jjpivd37wv5lwszqvcvhskvg68in0ybfg4"; + rev = "08c59e1dc45ec96edb62f34036e82cf5f14c0e8b"; + sha256 = "10cgg1r00kz2fsnnryvzay5pf8s1pwb1dzlds1fbjdnyfvdgammv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7964f226e12c3a27ff856e28f4b030ebf304aea2/recipes/pulseaudio-control"; @@ -58064,12 +58339,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20171005.1620"; + version = "20171031.431"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "93345f0531b03c5bb2bf34417e9c25fc6fcda6d9"; - sha256 = "016igycxn7h3gjklr24a7yhp49y4h55f4hpd05haq9raj7vaa6qf"; + rev = "06e1db1bb2f4d2da994387f2cbb1cfc6e5db242b"; + sha256 = "019j22hmc1f1izc61l8hnasvs4vj9sb9pl9w3v63ck086h89jda1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -58397,6 +58672,27 @@ license = lib.licenses.free; }; }) {}; + quick-shell-keybind = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "quick-shell-keybind"; + version = "20171022.2313"; + src = fetchFromGitHub { + owner = "eyeinsky"; + repo = "quick-shell-keybind"; + rev = "5f4541a5a5554d108bf16b5fd1713e962161ca1b"; + sha256 = "19hqywwf80q6ay886xmcjjpr4pghkw78hzdg0mrpkpkqn2vj06gk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e9bf4d78da24d88476545f97b2af0527dde73600/recipes/quick-shell-keybind"; + sha256 = "1f66wk2m0yykcbq6qbalgscpq8s53qshyyqdnimlmdi0g0glif1b"; + name = "quick-shell-keybind"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/quick-shell-keybind"; + license = lib.licenses.free; + }; + }) {}; quickref = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "quickref"; @@ -58610,12 +58906,12 @@ rainbow-blocks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rainbow-blocks"; - version = "20140306.1033"; + version = "20171025.738"; src = fetchFromGitHub { owner = "istib"; repo = "rainbow-blocks"; - rev = "8335993563aadd4290c5fa09dd7a6a81691b0690"; - sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c"; + rev = "dd435d7bb34ff6f162a5f315df308b90b7e9f842"; + sha256 = "06yfb3i7wzvqrhkb61zib9xvpb5i00s4frizkzff66im05k0n795"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rainbow-blocks"; @@ -59267,12 +59563,12 @@ reason-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reason-mode"; - version = "20171015.1140"; + version = "20171027.2235"; src = fetchFromGitHub { owner = "reasonml-editor"; repo = "reason-mode"; - rev = "ee67917db828af02c97e18b0747725a16c3a0708"; - sha256 = "1vk00a06i2p344q5k3py38z967gsnhcix00m5k6z1vhlvd0r4m00"; + rev = "a9de59cced37b44db72ee248107021a660561d11"; + sha256 = "04g3598ykczxkmj5gjd4airfl41b821agy6r4h2bnq5fcfdj0jnx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode"; @@ -59477,12 +59773,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20171008.409"; + version = "20171030.1346"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "164d0b65d05fd883fc9ac66dd62d7427660fea37"; - sha256 = "1h09mlvrh7qx55s47135nkamv7frhcm3865xacpvifj72z46alg4"; + rev = "b01bf5db718395eead17b679ed10c6b876117034"; + sha256 = "0vnfjh0h0z9w28fb1sjncsjcc8f7h1ll0svm203cb5vw6v9d8nrs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -60190,12 +60486,12 @@ review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "review-mode"; - version = "20170804.545"; + version = "20171029.650"; src = fetchFromGitHub { owner = "kmuto"; repo = "review-el"; - rev = "e166efd9b8596a9abe14afae79b33eaa808c14ea"; - sha256 = "0cnwfb3q9xfsrzg5sf64y4p00wdcw0iiz5iard00siva0q0s5k9x"; + rev = "115cd06558c01889f89feaa659e0d7513a2ad21e"; + sha256 = "0162gg3hf633zhr5jwj222lx143xvph001qmpmlbbqdxc0sgw5hv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode"; @@ -60442,12 +60738,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "20171010.725"; + version = "20171029.1156"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "4979f4fc53eb341dc1d76bb1762bd2c734dded40"; - sha256 = "0kf5sll3npw949hxqga2ywadm1mxc2sm9h136dvnrliaqvi4s95g"; + rev = "4c10dcd764ade8e3d5dc235c26ba9299576a513d"; + sha256 = "034hrzcvbnsrr9cxy2wzggnsax708hd231hfkixwffzrrwdlhwz8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -60591,14 +60887,14 @@ pname = "rpm-spec-mode"; version = "20160710.436"; src = fetchFromGitHub { - owner = "bjorlykke"; + owner = "stigbjorlykke"; repo = "rpm-spec-mode"; rev = "c1c38050c48ea330c7cea632b8785d66daeefb2b"; sha256 = "0427kcvf2ljhzwxskn3jzk0ncrl3f9zcz2sm83d9pmhh5jax2gch"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f1ce736b8db53fea4935d195a0d07dc8141125a8/recipes/rpm-spec-mode"; - sha256 = "01vggdv8sac4p0szwk7xgxcglmd5a1hv5q0ylf8zcp1lsyyh8ypd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb7e188fffda3d4e42690511775e5e32a11e1b34/recipes/rpm-spec-mode"; + sha256 = "1ygk0pdhq1hvgzd173h79lxb04b9lmvq4hi70qf9244bqbm0m182"; name = "rpm-spec-mode"; }; packageRequires = []; @@ -60652,12 +60948,12 @@ rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "rspec-mode"; - version = "20170312.56"; + version = "20171025.1606"; src = fetchFromGitHub { owner = "pezra"; repo = "rspec-mode"; - rev = "1f468e443e7f2d8419eec29e42074edc400f8c0c"; - sha256 = "03wv1k3ppvdk2776bkbz8bhxw5n7h4b8zm3b2j2j6x7hrxfza5h4"; + rev = "94a04f148922852b591957b0b3b22de5c4237448"; + sha256 = "04qcicaklj9fhl0wbb8axi8zvd0az43cnrhf53vhgwsgnf7rjya2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode"; @@ -60673,12 +60969,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20171019.1334"; + version = "20171027.1028"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; - sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; + rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e"; + sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -61135,12 +61431,12 @@ s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "s"; - version = "20170922.900"; + version = "20171101.219"; src = fetchFromGitHub { owner = "magnars"; repo = "s.el"; - rev = "12f116d58ac03706496bd682c6449b452681874e"; - sha256 = "1g8mqd13llj007al4nlxxx4z2lcsg3wk970mgjn0avwrhjjgdmmv"; + rev = "71f2902fc7875b3df9ee089c85904a4e8a00d438"; + sha256 = "0k6ny3ca4iwvhmzpdfs5v44l19djwpx8x7a1kfjgdafdh2x6d7ds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s"; @@ -61475,8 +61771,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "bc00974cdcbf0366123fe2dc38253b1ba345dee0"; - sha256 = "0pd7w92z50xpr4vj2xnzm2bmz91728l0k1jr9my9hbpxss89xnvh"; + rev = "11ef66e8aa8d97f0ed8786c46daa091b1d812867"; + sha256 = "1p0xhsvpxk6sbw4fwq5yhnz8kgf5m7g5q3vxpx8qn7bsd3z0sg31"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -61680,12 +61976,12 @@ scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }: melpaBuild { pname = "scpaste"; - version = "20160613.1943"; + version = "20171031.1337"; src = fetchFromGitHub { owner = "technomancy"; repo = "scpaste"; - rev = "eb415f7ca56d64c89cf99d5c6f8a442c4ec3912e"; - sha256 = "1fycdsa93bfiij72cwyc0rp85bwv3lv4r169p9czsph5ns466b65"; + rev = "68445166750a46c86dd7f2ffdca14d3c50e431de"; + sha256 = "0q8cka12gx11wpjz1jk24kn5m1nlqa1xnadlxflhz2x5p9fkscvq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9007fb32097bc63731c3615dae9342fcef2558a2/recipes/scpaste"; @@ -62813,12 +63109,12 @@ shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shimbun"; - version = "20171003.2158"; + version = "20171018.131"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "284a4cdd394d2d52220c62c24ddbce00ea100471"; - sha256 = "1fnxb3fn6a25sn41isf3frja5iwxi98cbs7rvp9mkzb4jq3bhb89"; + rev = "e2e2c907f4fa575bec74803aab95af426cb37e6e"; + sha256 = "13lzj1h6ib779fszmvlz3wamnjibivdrxl8hd5l3xhh7fkgbc8c8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun"; @@ -63083,6 +63379,27 @@ license = lib.licenses.free; }; }) {}; + sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sicp"; + version = "20171028.1523"; + src = fetchFromGitHub { + owner = "webframp"; + repo = "sicp-info"; + rev = "8e13f7ff4695a05471486d37a6c5f979a5b965fb"; + sha256 = "15krfnj2qz4j2ns4a05a4wwaknhx77m4jhazg7zvz9xm4b4j1qm8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1363d7b6e95375ac63f07eed2b3947f4f81bc9ba/recipes/sicp"; + sha256 = "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz"; + name = "sicp"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sicp"; + license = lib.licenses.free; + }; + }) {}; sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sift"; @@ -64261,12 +64578,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20171021.718"; + version = "20171101.244"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "cdd10bc259fe7303e40efd8a6a05c7e43d12a242"; - sha256 = "0ybbbqnbnp1w4lksgjxjf9iccrvi012ihlq3az1c6k6ck18cmadb"; + rev = "9682ba930374a4d62b444950b008d2bca1cffba1"; + sha256 = "1nsi3x9zizbxx95ka5cgl5rnsw5iz92acjcv6b4id0acaysq6mdm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -64597,12 +64914,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20171010.808"; + version = "20171030.1016"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "95e8d8aa8312b54d6ea18b35667fa3005be1bc76"; - sha256 = "1fbn6wqm515x8barbf8bjxkvxyv8p3szdz0h9zaam7hz7zbpdap2"; + rev = "990d6d8e98b96b9afe5b9b340507b1aecd8de1ce"; + sha256 = "1bd6kwzkk8vfhfc7m384y40lh6rdw90g6624c0hlfrs9zwihmvs3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -65297,12 +65614,12 @@ sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20170831.832"; + version = "20171030.528"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "397a0d5b6da3f60ca52bebd5e698b0a764956cd2"; - sha256 = "1z9w4cn5lanxl24ws4km816dfx4fszvgvrlb2ih3wsbc13710h1l"; + rev = "e220a0c0c478fee0be3622442651981cdd82090c"; + sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -65443,12 +65760,12 @@ spice-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spice-mode"; - version = "20160919.330"; + version = "20171027.2343"; src = fetchFromGitHub { owner = "stardiviner"; repo = "spice-mode"; - rev = "1dcaa4b4cd1527cf15bfc6dfc278c574359a5062"; - sha256 = "0ngfyxpvwgyqh99vjr2msqan0hma1qlljkx971qjxcpn0y80dj23"; + rev = "702bf2d5c3561be44771ea77b476532d32068504"; + sha256 = "1wqcy9nmhpl3vyasvc79msgd25xbbzva9nbxkdrsbpg07p1is9ik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spice-mode"; @@ -65905,12 +66222,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20171018.303"; + version = "20171031.2204"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "2226edb5fc91ab766177b82e578dbcc5c7e55554"; - sha256 = "0b2jq0s56mbl051313wyn1fpk3j5n819y1q6dcv8z7sa5zxsq7hm"; + rev = "5cd1f8080fefb64e6eaa1098cc191db6abb97e23"; + sha256 = "0pn9wf4svka3rxzy09jarjp3ycz2bvm39898qaikjf0dwaydlqlw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -66957,8 +67274,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe"; - sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz"; + rev = "96663b77945ab21e4e1b0aab690fc2e926f01f9c"; + sha256 = "0r691dzs77zdkvjzb787kjg8zvvba8gdj2da9zjb14m4nyjmg9d9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -67100,12 +67417,12 @@ symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symbol-overlay"; - version = "20170825.2047"; + version = "20171031.658"; src = fetchFromGitHub { owner = "wolray"; repo = "symbol-overlay"; - rev = "6c7ec584b62b7922a5398a552a1bf60f8144306c"; - sha256 = "0haflm6b8aqjbs54h3khax62rwlky3y8py4jq4m664r1nb91ni57"; + rev = "6076319f57a7e8dbf2fe11250def5a3fa3c0c854"; + sha256 = "11ny21rbczmkc7ni3kfw94dyc70bxwzn35f9gryxn1ppw48c7zsx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay"; @@ -68106,12 +68423,12 @@ terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "terminal-here"; - version = "20170805.251"; + version = "20171022.552"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "terminal-here"; - rev = "b17f82e894d5b0f77cea04a64c4f398124eb3290"; - sha256 = "0aawmlzy1w76lajz5lxaix793j3bni3fyb4sws3v765m1rxhnc5c"; + rev = "b3659e13d3d41503b4fc59dd2c7ea622631fc3ec"; + sha256 = "1z3ngwgv8ybwq42lkpavk51a25zdkl6v9xdfi41njpxdpbfcmx8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here"; @@ -68593,8 +68910,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "54ce558ba80905d124b82727d196f6d58964b74c"; - sha256 = "060fqxwmqra2wxi22250lnkfgs98b0kps8wn0lmqjkqnh6pqy7qi"; + rev = "a533ea1615e9df935e77b99440cf264c6b417e3e"; + sha256 = "0nx6amk2jawd5nqkz54sx1x29a8nkpa7h9b4qgn0j7j5sdvfyrxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -68631,12 +68948,12 @@ tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tickscript-mode"; - version = "20171020.1330"; + version = "20171101.108"; src = fetchFromGitHub { owner = "msherry"; repo = "tickscript-mode"; - rev = "67400136647342b714c5f693c358f2bd671fe49c"; - sha256 = "0c3vap37rnr11cvwmgcamx4vl4z4bfmxj7w8hybxcrvs6wnjw20b"; + rev = "45ce0b4f8f18ffa00a4fd2ab3823118f69b94653"; + sha256 = "0w6gh6nb81c5jp4px6xx5d3wmwgkh6irzwgk42g0mkhjifzm83ip"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; @@ -68913,12 +69230,12 @@ tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tldr"; - version = "20170702.1859"; + version = "20171023.1929"; src = fetchFromGitHub { owner = "kuanyui"; repo = "tldr.el"; - rev = "ebdeb08950823765bf58dc2aba3559a5ad1103f1"; - sha256 = "1aigfmp4ra9qfwyk151y0cxmgd3n42rcjawklfm6ch2g49vx559q"; + rev = "fe1bd5cee3d30741c816f3ccc118b94105ceba4c"; + sha256 = "1hdkrgv03w968qf8fm7c35k5pahk9wfwz5vy8xz6568ci1af47h3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr"; @@ -69443,12 +69760,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20171005.1043"; + version = "20171029.1210"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "c8be91596420ca8d79de44602d836aa6d1cbe2fc"; - sha256 = "1nbm3m00s5ayicqhymw1y2y7qck5m4sajw467cp4gnsq8qw6ri53"; + rev = "d78ae51fdc9292cc0b77dfb18279b38b6ccbf480"; + sha256 = "01k0nppxvkd2cy13hjcvihgh6j9c4by92yxv4jv8zvaz35fqf92n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -69548,12 +69865,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20171021.615"; + version = "20171101.340"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "3217aba17fd2c6b05b5dd7484548f587e319e583"; - sha256 = "18lwydg9ddhc8593d4nzva2bpi14c4lnd52jxdd2xy30q5jz5llm"; + rev = "444f0517a875dbb5b832f3c3270f0ea2a39bc258"; + sha256 = "0k5rfdck8895s2906f4b213kn1icnrd49217gbm9llzqhskl8hdq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs"; @@ -69573,8 +69890,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "3217aba17fd2c6b05b5dd7484548f587e319e583"; - sha256 = "18lwydg9ddhc8593d4nzva2bpi14c4lnd52jxdd2xy30q5jz5llm"; + rev = "444f0517a875dbb5b832f3c3270f0ea2a39bc258"; + sha256 = "0k5rfdck8895s2906f4b213kn1icnrd49217gbm9llzqhskl8hdq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -69594,8 +69911,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "3217aba17fd2c6b05b5dd7484548f587e319e583"; - sha256 = "18lwydg9ddhc8593d4nzva2bpi14c4lnd52jxdd2xy30q5jz5llm"; + rev = "444f0517a875dbb5b832f3c3270f0ea2a39bc258"; + sha256 = "0k5rfdck8895s2906f4b213kn1icnrd49217gbm9llzqhskl8hdq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile"; @@ -69798,12 +70115,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20171016.910"; + version = "20171101.231"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "64537bc753094b2adc2e3e97625fa9c0a01f9ae6"; - sha256 = "03d0n49p6d77p221majmbh0gjyrmh2z4cb2l2vi5xxfwc1fsxzmp"; + rev = "359d0e7a4f75dee8f57557b7cc133ae3a65f78a5"; + sha256 = "0v8wzifrc99y4dzl1wdkil1df76d5ijl2pasx5qdig69mpf5gj1w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -70071,12 +70388,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20171017.1128"; + version = "20171022.1029"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "30391a518a1d41d5c534a30850a50b0974132aec"; - sha256 = "1msslh5zj1mi74fg8wc1kzpxjq0g6s9ms66332r2ykwqzsw1iz7c"; + rev = "56a1ea861f80979d376716629abfce45a8e5e2c7"; + sha256 = "1lbfia8n2zwg9j8f9y1shjg88zmgr3cz03dk3277yrvh9djs8kcx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -70816,12 +71133,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20171013.1548"; + version = "20171030.1428"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "cb89901b52a9413b6c233d7fbb616a2d8f38b50a"; - sha256 = "1fypvrmn1brrq2200kr8s8zbcc30z9nhfv3k8vs36iawab2g573k"; + rev = "82d15961a0f2dc7842a98030d6daee0061ef63dc"; + sha256 = "0i9cqms0bm6vfn8mzkzv40dql2mzmp2jma1na6m8bf1z2ciszy6l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -71383,12 +71700,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "20171021.1257"; + version = "20171025.514"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "3c5b181a32df5d7defa58a7a19021fa16d3670f9"; - sha256 = "17zakj614vrkyy2y3a1mdkqaa3p7r77zhg8wdaqapwiq36f5gcc1"; + rev = "b6d07ba21e9073a0e008831bfb82fbddbd0b5e90"; + sha256 = "1ypj9saprjaxx60fxjl9ab2lb4x9s8szkh3mj23iininx1bxp4wm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -71572,12 +71889,12 @@ virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "virtualenvwrapper"; - version = "20161002.1515"; + version = "20171022.1831"; src = fetchFromGitHub { owner = "porterjamesj"; repo = "virtualenvwrapper.el"; - rev = "15af07004dba640df8202e76bea0b5dc82567f72"; - sha256 = "0ahlp3yfh1yxrlyyhjf9k4qssg2z3192dw4ab8lk62xnxq99bjln"; + rev = "b4fd61aa5fddd47d33b147ffa1c873d8b20db724"; + sha256 = "04qhxg2gghb9bbvabrjbwj89jl154hhk00s07mzgg93js75ipx6z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper"; @@ -71845,12 +72162,12 @@ vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: melpaBuild { pname = "vue-mode"; - version = "20171013.1728"; + version = "20171029.1905"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "0a6b7c226c5c0a26f3402cfe40169cb00f5d792f"; - sha256 = "1s08rc3d2k6rnnn4fir854ndwq2b2xxh1blv1f2055gdf4jw25rf"; + rev = "a34f8a14fe6a680bb18cfa4519f7984d8071a4e3"; + sha256 = "08c3sgd80aszfpc4zbh0rsn7717nwwjhr38lfbsbxmgmlvqalxzk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -71887,12 +72204,12 @@ w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "w3m"; - version = "20171003.2122"; + version = "20171019.1734"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "284a4cdd394d2d52220c62c24ddbce00ea100471"; - sha256 = "1fnxb3fn6a25sn41isf3frja5iwxi98cbs7rvp9mkzb4jq3bhb89"; + rev = "e2e2c907f4fa575bec74803aab95af426cb37e6e"; + sha256 = "13lzj1h6ib779fszmvlz3wamnjibivdrxl8hd5l3xhh7fkgbc8c8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m"; @@ -71991,12 +72308,12 @@ wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "wand"; - version = "20170412.1315"; + version = "20171031.1103"; src = fetchFromGitHub { owner = "cmpitg"; repo = "wand"; - rev = "3674f2edaa6ac30c314a885b229204f978ddce14"; - sha256 = "1yylw7yn9k8li283d5r4x9i38wfdx24jmlzdivvffn0jkhjj6i4k"; + rev = "3d0b459c4ae7e0240cb16bd9bd0a0a0dc39d8f99"; + sha256 = "0wc1gmaz02bfbapwrmmc5r7rcfwqlfr52x3jqk6bhxpiav141yq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand"; @@ -72390,12 +72707,12 @@ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "20171021.1419"; + version = "20171025.956"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "bf082078fdfcefa38a4397f56c0366cf14c05600"; - sha256 = "104fzirvpp9c5h4gpb99j8i8j1imb3mr6zxh8gr42g38rg2y1nh6"; + rev = "f047313c656e0ea85033bacc564d02ae6f4605ff"; + sha256 = "00mawa0n415dcnrldqmgwwjcj2rv59wblrbzkc2g9i388nl41rp5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -73185,22 +73502,22 @@ license = lib.licenses.free; }; }) {}; - winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + winum = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "winum"; - version = "20170430.1629"; + version = "20171028.702"; src = fetchFromGitHub { owner = "deb0ch"; repo = "emacs-winum"; - rev = "e950370d82cbb90ba291fc1c32de5d6f35068932"; - sha256 = "1p4b9gdrifjndk0irv735f8spy541x78chibdnr1i3qil2ib8xms"; + rev = "c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c"; + sha256 = "09jd5srlnd4060hs719qil84ssmnvq196bz7ywaswgapv1gs1h6r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum"; sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw"; name = "winum"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib dash ]; meta = { homepage = "https://melpa.org/#/winum"; license = lib.licenses.free; @@ -73838,12 +74155,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20171021.39"; + version = "20171026.422"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "2aa7ba860e72329a96395aeef1206e2adc637cf6"; - sha256 = "0vjlc5cs56g1d1gzww7cmkyf8mzgr630xg1krlhz4bb73c538k1s"; + rev = "6130b10b0f133344d5e6afa7c083d400c8e780ca"; + sha256 = "08shy433x5papxdbr6q2xsccpg1h0vym9vv6zcaz8vzqw33kr0w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -74510,12 +74827,12 @@ yahtzee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yahtzee"; - version = "20170617.20"; + version = "20171022.712"; src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "011bcb8e2f27b333b3300d7bcab3f52d70020e45"; - sha256 = "1gkls80rbj1hnima1fnbxnrz42qjqc55shdpiphzmdyv9hmw8vvf"; + rev = "5263fb8883d37d79a4ed34dd3216a8947d2ae4a0"; + sha256 = "1qv8p3zpxkkp0ncq3cs8sq2bj4jrxs4s5jfc5hbs905a9z8bsnq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -74804,12 +75121,12 @@ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yasnippet-snippets"; - version = "20171010.1224"; + version = "20171031.617"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "07389c67234e67c8ae423779468f56d0bd65da5e"; - sha256 = "105jdikzwggn1isnqmvj6hcmni4z387r2nfy2cwd11pan31vd4wi"; + rev = "120d35010a29d028634a1e4c6ec9d00c1bea5515"; + sha256 = "1bd89d9d1m6647kpdsczj6c28r3zkjpqjj7p4qndcrwc9h37r4dv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; @@ -74845,11 +75162,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20170916.1826"; + version = "20171030.502"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "ca7cf34e959c"; - sha256 = "19pczpzl0wvkdassskcssq5qrpica0bffqxxi8sqp1j35px6v4ma"; + rev = "16763e5b7481"; + sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; @@ -74907,12 +75224,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20171012.1610"; + version = "20171027.1412"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "f31894da73c2b784bc9e0885ddfa6e1077782417"; - sha256 = "1v8klyrs7wivh9fd4ba18g1n72c6ar707pgwqhsxn0g3f42mlpck"; + rev = "d951afd8c1c2f25a5cbeef3acfcec5f72acfd6e4"; + sha256 = "0k6z82a3xkk71lbnw3sxqmr8ixafglivmsb5y35q1jichzz6hail"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -75068,8 +75385,8 @@ src = fetchFromGitHub { owner = "rudolfochrist"; repo = "zel"; - rev = "23b12d107f123667ddd443b9f3e2047209e0055a"; - sha256 = "1m8bw588r2a1034ynigrzgab857261nrjwnzag5i3rgwn27brfcz"; + rev = "9dae2d212224d1deae1f62561fa8e4d689fd09f2"; + sha256 = "1518wp3zjfdvzz5r22cjgn735c4yxr345qzj40b5agww4dsxmwmp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48132eb4c0fd01b9fc31236c5c4701f8f83a806/recipes/zel"; @@ -75399,12 +75716,12 @@ zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom"; - version = "20171018.1314"; + version = "20171030.529"; src = fetchFromGitHub { owner = "cyrus-and"; repo = "zoom"; - rev = "dc6747c754622ed88eeac896f18845681c90cae0"; - sha256 = "1innar1xrjlh8pvq3gj903xrlpkr8qwjbr60k7zi7wd2r6lqd7h0"; + rev = "d92ea444df6f6bb6cae92242f3269582d1b8ab40"; + sha256 = "08riz3dd19c1dixm3c6j5dkkwjpgcib05pxq611w8z0mgsn0hsc5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 22c98d88ed23..51b9facd111d 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -548,12 +548,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24"; - sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb"; + rev = "317ad1d023db6b2fe67444a2c075e656c35f5094"; + sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -569,12 +569,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24"; - sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb"; + rev = "317ad1d023db6b2fe67444a2c075e656c35f5094"; + sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -989,12 +989,12 @@ aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aes"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "Sauermann"; repo = "emacs-aes"; - rev = "d78796facc034b09f379cda5f27090f3139305ec"; - sha256 = "1y9bw2vkl952pha2dsi18swyr94mihgwlcg5m8hg4d5bfg2fzcb2"; + rev = "b7d5da89c3443292e4f0b1c9d254d459933cf5af"; + sha256 = "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes"; @@ -1073,12 +1073,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "1.6.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "2b06d75096d6a1c06682b70e229f2c932e9eac2c"; - sha256 = "1jxss4gnlg2vkgf10v1kj1c7isbh7vh040iqrzjkrhclf4qiag5d"; + rev = "32ce7765c95559f6a0552cdaeedb6eb97bb7a476"; + sha256 = "0c1xwqknhjx6y29fwca949r8d2fqb17mca5qc79pdxdlp3l606fg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -3331,6 +3331,27 @@ license = lib.licenses.free; }; }) {}; + build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "build-status"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "sshaw"; + repo = "build-status"; + rev = "c29a0146c5d0be274f5e17921e01698f572c23a1"; + sha256 = "03f0h7sp0sr9kjyhvcx7i34lvc26f5x8nikfidihgzhrqpprv2b6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status"; + sha256 = "0ckyf0asll50gifx1v0qqzpimjms8i1rgw9bnqiyj861qn5hch92"; + name = "build-status"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/build-status"; + license = lib.licenses.free; + }; + }) {}; bundler = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "bundler"; @@ -3670,12 +3691,12 @@ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "4.6.0beta2"; + version = "4.6.0pre1"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "817604da4d38362b6b2bd4c7787a5add6741cd21"; - sha256 = "1d49kiv9nfr624924qwmf0mfsvja28mvliipaylfbslyb3f7jpkl"; + rev = "500625015d40f716e19278209faaa44216dcff58"; + sha256 = "1s10wirx080yl0gd2n09lw5kj8yy1mbiipmcr8gpfyc8dq7kfjna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -4235,12 +4256,12 @@ circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circadian"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitHub { owner = "GuidoSchmidt"; repo = "circadian.el"; - rev = "0034de1551de9f420f42267f3ec081351c2b5d7f"; - sha256 = "1khczk5lsiicyjra7g5m3dcl1rc6g43zbypigkj3izx2dsa47n5d"; + rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee"; + sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian"; @@ -4667,12 +4688,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.10.0pre3"; + version = "3.10.0pre4"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "319622a49fb300cd8a7efd8378421a32204510de"; - sha256 = "19n0s0kd051xh3av9nd5ncpccx6bmvay6115g0kqgmi8wbw7587q"; + rev = "45da558742bad36be518e8d95dee0d0ec3793a64"; + sha256 = "0qq7dhwcl290ymza5imc16cg3f9crxym1q6b4i7w9fax8x2vlc1m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -5294,6 +5315,27 @@ license = lib.licenses.free; }; }) {}; + company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: + melpaBuild { + pname = "company-lsp"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "tigersoldier"; + repo = "company-lsp"; + rev = "86fda23d29b732ba3987bf20901034da1515b077"; + sha256 = "068lg2yrpnzq8cg73irnx7i41giww7m0ysnl2inc7hikhmm3a95y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; + sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l"; + name = "company-lsp"; + }; + packageRequires = [ company emacs lsp-mode s ]; + meta = { + homepage = "https://melpa.org/#/company-lsp"; + license = lib.licenses.free; + }; + }) {}; company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: melpaBuild { pname = "company-math"; @@ -5360,12 +5402,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24"; - sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb"; + rev = "317ad1d023db6b2fe67444a2c075e656c35f5094"; + sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -5660,12 +5702,12 @@ conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "conda"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "6ba9ef5d72ef613f478e07e2ebf57b47066beee7"; - sha256 = "0mp6jzyvz3m41vb4kwwikyvcjgc8qgryyx71n1m50jr2i23s9nk2"; + rev = "526be691824f4a32299f560a883913697bc4d847"; + sha256 = "1jix3md6b02fypjm4y05av7acjkqryd1vqqz9wgxyinydlagrvh7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -6329,6 +6371,27 @@ license = lib.licenses.free; }; }) {}; + cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: + melpaBuild { + pname = "cwl-mode"; + version = "0.2.4"; + src = fetchFromGitHub { + owner = "tom-tan"; + repo = "cwl-mode"; + rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9"; + sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode"; + sha256 = "0x8akxxmphpgsc2m78h6b0fs6vvcfvmi1q2jrz8hwlmai8f7zi9j"; + name = "cwl-mode"; + }; + packageRequires = [ emacs yaml-mode ]; + meta = { + homepage = "https://melpa.org/#/cwl-mode"; + license = lib.licenses.free; + }; + }) {}; cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyberpunk-theme"; @@ -6374,12 +6437,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "0.27.1"; + version = "0.27.2"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "32538fc162be830bf01ff96e43a020bc4924a1ee"; - sha256 = "03v4ig9zlh8dz9s0c31f5hz2wfpvjydiidb0zgghnrshlqacpyj3"; + rev = "41b4a28d7c7c505d58502c9cf69bde2e33091de0"; + sha256 = "04k534xyr8816821y0lf2dq24bzvb40v99ijdwgy5qhv4rjxbr18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -8057,15 +8120,36 @@ license = lib.licenses.free; }; }) {}; + eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "eacl"; + version = "1.0.2"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "eacl"; + rev = "c7a8d705295dc51cc306cb4c2d8773e24c4c74f4"; + sha256 = "1f3liqrw55v9wnf7g475iabx4pf7gbg2x82mqrf22hhkvxzi2b2b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; + sha256 = "16afsf3diz498jb63q85lm5ifvm487clfl838qzagl1l4aywhlwr"; + name = "eacl"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/eacl"; + license = lib.licenses.free; + }; + }) {}; easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "2.0.15"; + version = "2.0.16"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "0b55c207c6552223857de03bf8aec8be3344ed26"; - sha256 = "103ivy1gmb22xacxj2b99zmilqy20nbzmwvmg5i6aqnya1vs97q0"; + rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0"; + sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -9139,12 +9223,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "1e65cb6e988df088c299572464335b6f149addcd"; - sha256 = "01mfrn6mn8h9fkpkqg2shp21864ffjr7q5h3rpbnk6wpa3pmjc1m"; + rev = "99f0b6401bff25d40b9f58123533271f7870a286"; + sha256 = "06n0vr8y5s8y7q9v96z030l1i9n29p622p36biyi5cjcmgf5h09j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -9440,12 +9524,12 @@ embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "embrace"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "embrace.el"; - rev = "a57b4be5d60daf8c176f9bd35770540c2d3963c9"; - sha256 = "0sn81a7f8g5i4q74byfkj0jlg4aj0rxpfvx9sqv8azcg6wq2f65l"; + rev = "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2"; + sha256 = "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace"; @@ -9479,20 +9563,21 @@ license = lib.licenses.free; }; }) {}; - emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "emms"; - version = "4.3"; + version = "4.4"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "4cb3ae341847e8e8586373a95a458a453469812d"; - sha256 = "0bmxlrk2p51bw5lgh2arkcz1v9bw6rpflwk778rdzn0rhzhvhp5b"; + rev = "88fecd0234da595843ce6be4d3f9f2b755ff612d"; + sha256 = "0ycm2lggljhzrb10r3c322c7bb580gk125x9nvpvjrvsp74p8im0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94"; name = "emms"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/emms"; license = lib.licenses.free; @@ -10064,12 +10149,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.1.2"; + version = "20.1.3"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "919ef5de2858e606d4a9be3e0e995b0802c76e33"; - sha256 = "0y76ci80wmzrxvj90bhiz6cvwbis34kcc6dzas9xxsj92b6sh7sk"; + rev = "a98379d0519c28f9bc9b673ed2c09fb1ad52456e"; + sha256 = "1672yqqh7ql88c6ifv555wvqrj8nyn5a2nph43n2nc43h7hhz17c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -12585,6 +12670,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, nim-mode }: + melpaBuild { + pname = "flycheck-nimsuggest"; + version = "0.8.1"; + src = fetchFromGitHub { + owner = "yuutayamada"; + repo = "flycheck-nimsuggest"; + rev = "8b1c69e9aa924368bc4dadd4cde818ff158cd3f0"; + sha256 = "0vnwy7b3xs2smbr6ah6yk8hq7vvsciq7d6m1qr91nfnazdgvxmvg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cb4170f002dbcd1906e81836f3ce035b1e81c379/recipes/flycheck-nimsuggest"; + sha256 = "099mlzramm6z66zyjb6ypn7qb0hpvwbbgk9ydsanj8sni0dd66hv"; + name = "flycheck-nimsuggest"; + }; + packageRequires = [ emacs flycheck nim-mode ]; + meta = { + homepage = "https://melpa.org/#/flycheck-nimsuggest"; + license = lib.licenses.free; + }; + }) {}; flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; @@ -19471,12 +19577,12 @@ import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: melpaBuild { pname = "import-js"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Galooshi"; repo = "emacs-import-js"; - rev = "15d395126f57408d770a72db2e5f43271f90fa52"; - sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l"; + rev = "0a1032894445062b87dbe4e2c8cdba35ac25c250"; + sha256 = "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js"; @@ -19992,6 +20098,27 @@ license = lib.licenses.free; }; }) {}; + iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "iter2"; + version = "0.9.4"; + src = fetchFromGitHub { + owner = "doublep"; + repo = "iter2"; + rev = "a0e41b2f55d50c08c59ffcc6e83a977c141bcc55"; + sha256 = "0ccr9qjhc35wi07yckd9y26synihhsg8zwkxgqyzkx7avxkqfyhn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2"; + sha256 = "0kl3z2wwpvk2ddsb3798g41pv0xycsf9dclhv00snpzsr61d9v65"; + name = "iter2"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/iter2"; + license = lib.licenses.free; + }; + }) {}; ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; @@ -20452,6 +20579,27 @@ license = lib.licenses.free; }; }) {}; + jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jetbrains"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "emacs-php"; + repo = "jetbrains.el"; + rev = "38e136079f3f2ddbe0e8b7dec01cf6b515e897d8"; + sha256 = "1ji64qip5raf0lbv7fv36rd4fwa33zn0xi7sa0zrgf0kcsr0qasb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains"; + sha256 = "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7"; + name = "jetbrains"; + }; + packageRequires = [ cl-lib emacs f ]; + meta = { + homepage = "https://melpa.org/#/jetbrains"; + license = lib.licenses.free; + }; + }) {}; jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jinja2-mode"; @@ -20518,12 +20666,12 @@ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-auto-format-mode"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "ybiquitous"; repo = "js-auto-format-mode"; - rev = "705e300a2c880f6dbfa830d6c69818b7a3a95c09"; - sha256 = "1a3dwcknjydaxnyhaycgbmlncj92qkp3m5flmi6fyqjx11lz26ag"; + rev = "e0b7ae9d1d70fa74abd91bb6f901bd46db5a22eb"; + sha256 = "1z5vi8681afm7jsqwifnb35sja1s4b2j123b3pn0bv1j6b8iaq9j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; @@ -20956,24 +21104,24 @@ license = lib.licenses.free; }; }) {}; - kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "kaolin-theme"; - version = "0.9"; + pname = "kaolin-themes"; + version = "1.0"; src = fetchFromGitHub { owner = "ogdenwebb"; - repo = "kaolin-theme"; - rev = "d43ba0e8e6b13b08e4d74de20c6e594ebb225501"; - sha256 = "0gg19rh5q1gl6ylwrmjq0dqh6p5fkms1av6bbgry6fqv8220xf8n"; + repo = "emacs-kaolin-themes"; + rev = "720762a42ad4cb4b325f78a9d41af380b8783501"; + sha256 = "104prgkjqnnv1bqgpcl0di1q9sqkfnj4ibqvrk6ls32hw75shvdh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a67c2a3ad82efcb32ba4943c7ac10fe2768d9d51/recipes/kaolin-theme"; - sha256 = "009064hhn39f9w9qxa3m0kwqhj5a12j7hg4916j9hslpwy5ghc0c"; - name = "kaolin-theme"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; + sha256 = "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw"; + name = "kaolin-themes"; }; - packageRequires = [ emacs ]; + packageRequires = [ autothemer cl-lib emacs ]; meta = { - homepage = "https://melpa.org/#/kaolin-theme"; + homepage = "https://melpa.org/#/kaolin-themes"; license = lib.licenses.free; }; }) {}; @@ -24629,6 +24777,27 @@ license = lib.licenses.free; }; }) {}; + nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: + melpaBuild { + pname = "nim-mode"; + version = "0.4.1"; + src = fetchFromGitHub { + owner = "nim-lang"; + repo = "nim-mode"; + rev = "86abed21b9b718ac65cc167f208e0bd5b92c79ed"; + sha256 = "0h1paf9z6xvkay97ns74w2w9plwi46md5f2kik4jvjy74p57gxal"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; + sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6"; + name = "nim-mode"; + }; + packageRequires = [ commenter emacs epc flycheck let-alist ]; + meta = { + homepage = "https://melpa.org/#/nim-mode"; + license = lib.licenses.free; + }; + }) {}; ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ninja-mode"; @@ -24682,8 +24851,8 @@ sha256 = "1zpqpq6hd83prk80921nbjrvcmk0dykqrrr1mw3b29ppjma5zjiz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode"; - sha256 = "15xgqgrkypcplnfvl5j6w8abayzz8q0nw2wav01sdyx39ym005k3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; + sha256 = "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5"; name = "nix-mode"; }; packageRequires = [ emacs ]; @@ -25472,8 +25641,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "d7a63cd5f592c131615a3b6523fc2b2a04a9f00a"; - sha256 = "0cvsys9jyb0zbkj5q01q2fgjmcqvb12dxgfy049fl7a2gd9n55fj"; + rev = "906e29a702237f039f24c215fdb561a728a3df1b"; + sha256 = "1l1rzl7y5j2wmlgx7ivivwvwvbn4h7pg5s7yqsk65n9kb59ha8s8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -26109,12 +26278,12 @@ org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mru-clock"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-mru-clock"; - rev = "096a7c514ab8487ec63def6281cf4dce24e3a626"; - sha256 = "1hmyqvi1dj5yrlish8kw4sdh3yy0b0w33smw4cbjagp4rs29p3fp"; + rev = "10f6a7021c82dc6795f4020e89889a5a72eb8832"; + sha256 = "00f4l5w6p0l1x5ghpvbp5934m9m012fabvzb7apazwdr5c7xbd7q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock"; @@ -27136,12 +27305,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "0.3.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "16cf5d595644ee4e05b05b351e0c4fdd5df0ac44"; - sha256 = "1n5xbgwv9x2b9zmv7nw0x64qbll4ycjf2dp09rdj3m4bmcg2gv42"; + rev = "c32359c71e7926c7f13039069d8d7481dfb9bc82"; + sha256 = "1nw2dp6rn3hnnzzffvpr6yz7c154338h9i5ixxgh5vjxm9phzdml"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -28705,12 +28874,12 @@ pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }: melpaBuild { pname = "pocket-reader"; - version = "0.1"; + version = "0.1.1"; src = fetchFromGitHub { owner = "alphapapa"; repo = "pocket-reader.el"; - rev = "93ef3a0737e93fb2e73f230fbb38f0b9f6f9d9bd"; - sha256 = "02l1yd0s7dnq6wj7lldbbxqq1libdcczygc2lzx4rdc5jnr4lnsh"; + rev = "e65a7e7529ece4fb7a738c062e73d5c07ace9574"; + sha256 = "0bqxsvhmwvf0gpjmmh7pmzyw4lpcarj2prm52bgncch8x1f0gvnp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader"; @@ -30957,22 +31126,22 @@ license = lib.licenses.free; }; }) {}; - rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: + rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "081685a8c624220ece68d6dca8d60016585b04ff"; - sha256 = "094fy48h0mmih3g9dq7xhhdqq3dx3jbrg1x9qcq2szl3danndl6z"; + rev = "5de611eae7787ecbc285fe7e31e412b9281a4e14"; + sha256 = "18mhcipj5yywd5648pwm955wx3ipsnp9nwjyyl270qnn56hwkb6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; name = "rg"; }; - packageRequires = [ cl-lib emacs s seq ]; + packageRequires = [ cl-lib emacs s ]; meta = { homepage = "https://melpa.org/#/rg"; license = lib.licenses.free; @@ -33457,12 +33626,12 @@ sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "2.1.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "262c46a282ce54ca4745b863cf323d9bf69e2faa"; - sha256 = "02ai86c15x0fbgg2bw6a9k3k825gkhl3hy9abq62dfgdwc0cqxmn"; + rev = "e220a0c0c478fee0be3622442651981cdd82090c"; + sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -35135,12 +35304,12 @@ tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tickscript-mode"; - version = "0.3.1"; + version = "0.4"; src = fetchFromGitHub { owner = "msherry"; repo = "tickscript-mode"; - rev = "eb6eafee2df253a0f1356f260cc7f435ab68aea2"; - sha256 = "04pd1dvvs914f98yaq5n0nv1jbjr2sjgi3a288vpismrmxfybcch"; + rev = "9acf389dd055ae77c92170802769838810472490"; + sha256 = "1v60y244papzrirwqk9c2wcwgz4qp9h7m3887kvgr5ffn5imjss8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; @@ -37237,22 +37406,22 @@ license = lib.licenses.free; }; }) {}; - winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + winum = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "winum"; - version = "1.0.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "deb0ch"; repo = "emacs-winum"; - rev = "8e886302c7e1d8fd521a95e0f00d6efab295a883"; - sha256 = "19rf806v3yv6qy6p8mf54g1whdrh7vc107z31kqaqdwq681fhi37"; + rev = "c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c"; + sha256 = "09jd5srlnd4060hs719qil84ssmnvq196bz7ywaswgapv1gs1h6r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum"; sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw"; name = "winum"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib dash ]; meta = { homepage = "https://melpa.org/#/winum"; license = lib.licenses.free; @@ -38018,8 +38187,8 @@ version = "1.80"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "ca7cf34e959c"; - sha256 = "19pczpzl0wvkdassskcssq5qrpica0bffqxxi8sqp1j35px6v4ma"; + rev = "16763e5b7481"; + sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; @@ -38276,12 +38445,12 @@ zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "cyrus-and"; repo = "zoom"; - rev = "ed8aca43820678ff6e7b8ed697cba8dbb3a6136e"; - sha256 = "1na1syvbayqwbsvd1d0ajyzjvhg8q3s3mqrx82ffcbxr0ijyzzj8"; + rev = "d92ea444df6f6bb6cae92242f3269582d1b8ab40"; + sha256 = "08riz3dd19c1dixm3c6j5dkkwjpgcib05pxq611w8z0mgsn0hsc5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 8d47f36f3469..a6108093933d 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 = "20171016"; + version = "20171030"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20171016.tar"; - sha256 = "1v89wl8xlxavvv2kdd5vms0rwpqaw2x73q0162ybxmrzf4a5f5mw"; + url = "http://orgmode.org/elpa/org-20171030.tar"; + sha256 = "1g2dyzy1844lli2hhfjnbskn1mskccgaaf0mxb1cm0zhhas8bnfd"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20171016"; + version = "20171030"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20171016.tar"; - sha256 = "0xy2xrndlhs4kyvh6mmv24dnh3fn5p63d2gaimnrypf1p8znwzh4"; + url = "http://orgmode.org/elpa/org-plus-contrib-20171030.tar"; + sha256 = "0pq2hs5d2i6s036pcs0jn6ld2p1ap08dmbjf17hsh899741mg9cj"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index db74a58da43e..4f1a29278be9 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -32,7 +32,7 @@ let build_dir=$PWD cd $TMPDIR - local_path=$(basename ${store_path} .zip | sed -e 's/^[a-z0-9]*-//') + local_path=$(basename ${url} .zip) cp -r ${store_path} $local_path chmod u+rwX -R $local_path diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 0733bd796656..b20a6e5ec45c 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { name = "typora-${version}"; - version = "0.9.31"; + version = "0.9.38"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "786b5164d9c63ecc23eb427c5ff393285ce8fd540c5bfdd5c1464655fac87a42"; + sha256 = "bf6a069c5da4a7dc289bdb3c8d27e7a81daeaee99488d4d3b512c6b673780557"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "a8fe53f8984d9f8c4e06c14affbb616be58a91cd2b475b9681fb18a6e21930d1"; + sha256 = "edd092e96ebf69503cf6b39b77a61ec5e3185f8a1447da0bed063fa11861c1b9"; } ; @@ -57,8 +57,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out dpkg -x $src $out - cp -av $out/usr/* $out + mv $out/usr/bin $out + mv $out/usr/share $out rm $out/bin/typora + rmdir $out/usr # Otherwise it looks "suspicious" chmod -R g-w $out @@ -81,9 +83,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A minimal Markdown reading & writing app"; homepage = https://typora.io; - license = licenses.free; - maintainers = with stdenv.lib.maintainers; [ jensbin ]; + license = licenses.unfree; + maintainers = with maintainers; [ jensbin ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } - diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 18e1df4575da..417f2d805163 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.1150"; + version = "8.0.1257"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1k1qkmb2jbymqikrp99q1yjagdf508xzabrw7b08dlh926b2v23j"; + sha256 = "1y4c7wn5gr7n4c2ni36kadr26aldydxlf06yj7nsmw22ywwg78ig"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index f2046f0d912a..973e7f88e800 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-8"; - sha256 = "0h2jbaxrxrmdcr5crf1d93sc60v4zfqrrl3w79md6h11wf57ksbp"; + version = "7.0.7-9"; + sha256 = "0p0879chcfrghcamwgxxcmaaj04xv0z91ris7hxi37qdw8c7836w"; patches = []; }; in diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 35e4fb989b3f..507912ee43ea 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.9-20"; - sha256 = "1pz8clmhnq26vdsp1j21czq3nfbvrmfdz30k7na7w4vh7wqxsrx1"; + version = "6.9.9-21"; + sha256 = "0241g3c207rawn61bz8rc5gz55k5mi2b0n3zlwa0jv9xczlkd6a9"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 986e16834f76..2d42a479999b 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ahoviewer-${version}"; - version = "1.4.8"; + version = "1.4.9"; src = fetchFromGitHub { owner = "ahodesuka"; repo = "ahoviewer"; rev = version; - sha256 = "0fsak22hpi2r8zqysswdyngaf3n635qvclqh1p0g0wrkfza4dbc4"; + sha256 = "194h3k5zvd8gjrbs91qba7d9h7i30yh4rjk4w3aa1vwvv0qm2amx"; }; enableParallelBuilding = true; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/ahodesuka/ahoviewer; description = "A GTK2 image viewer, manga reader, and booru browser"; - maintainers = [ maintainers.skrzyp ]; + maintainers = with maintainers; [ skrzyp xzfc ]; license = licenses.mit; platforms = platforms.allBut [ "darwin" "cygwin" ]; }; diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index c0ce81b3b425..7af7c8986f2f 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -66,5 +66,59 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ hodapp ]; license = licenses.gpl2; + knownVulnerabilities = [ + "CVE-2013-1953" + "CVE-2016-7392" + "CVE-2017-9151" + "CVE-2017-9152" + "CVE-2017-9153" + "CVE-2017-9154" + "CVE-2017-9155" + "CVE-2017-9156" + "CVE-2017-9157" + "CVE-2017-9158" + "CVE-2017-9159" + "CVE-2017-9160" + "CVE-2017-9161" + "CVE-2017-9162" + "CVE-2017-9163" + "CVE-2017-9164" + "CVE-2017-9165" + "CVE-2017-9166" + "CVE-2017-9167" + "CVE-2017-9168" + "CVE-2017-9169" + "CVE-2017-9170" + "CVE-2017-9171" + "CVE-2017-9172" + "CVE-2017-9173" + "CVE-2017-9174" + "CVE-2017-9175" + "CVE-2017-9176" + "CVE-2017-9177" + "CVE-2017-9178" + "CVE-2017-9179" + "CVE-2017-9180" + "CVE-2017-9181" + "CVE-2017-9182" + "CVE-2017-9183" + "CVE-2017-9184" + "CVE-2017-9185" + "CVE-2017-9186" + "CVE-2017-9187" + "CVE-2017-9188" + "CVE-2017-9189" + "CVE-2017-9190" + "CVE-2017-9191" + "CVE-2017-9192" + "CVE-2017-9193" + "CVE-2017-9194" + "CVE-2017-9195" + "CVE-2017-9196" + "CVE-2017-9197" + "CVE-2017-9198" + "CVE-2017-9199" + "CVE-2017-9200" + ]; }; } diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 44ee807fe984..a62940ff7038 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, wrapGAppsHook +{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -33,8 +33,8 @@ , liblqr1 , libqtav , libusb1 -, mesa , marble +, mesa , mysql , opencv3 , pcre @@ -53,11 +53,11 @@ mkDerivation rec { version = "5.7.0"; src = fetchurl { - url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; + url = "mirror://kde/stable/digikam/${name}.tar.xz"; sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n"; }; - nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; buildInputs = [ bison diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index f68162de4e3e..88dc24a97fad 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.21"; + version = "2.22"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "0azgpr4al2pi4858z4xh4lfz84cvzxw3n426fn7rz6cdj34q212j"; + sha256 = "0yqcczb9c126zgfvjq2fpzqz0rg16yad8mfr3gryxwlbymy2cmxj"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 29e43a93c985..9acd8357cb71 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "hugin-2016.2.0"; + name = "hugin-2017.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/${name}.tar.bz2"; - sha256 = "058zd63vx29yrx2pphbbll7kzcxkai22q26lpw13rn4lvp41pasl"; + sha256 = "02a6rlwp20jdn5jdsyg3c7liljr10c3jfdkxiv9mkf9jgyi6wr46"; }; buildInputs = [ diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 98f92413a767..a9c238ead3c1 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -9,11 +9,11 @@ mkDerivation rec { name = "krita-${version}"; - version = "3.2.1"; + version = "3.3.2"; src = fetchurl { - url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "0fafy5ggplgq2rz85sqa42vmkzs2r9dq47qfrbnn2n6pfzkcw1pg"; + url = https://download.kde.org/stable/krita/3.3.2/krita-3.3.2.1.tar.xz; + sha256 = "0i3l27cfi1h486m74xf4ynk0pwx32xaqraa91a0g1bpj1jxf2mg5"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 669e46c6a842..ac0060ec7f8e 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -30,7 +30,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - sourceRoot = "${name}-src/ImageLounge"; + setSourceRoot = '' + sourceRoot=$(echo */ImageLounge) + ''; patches = [./fix-appdata-install.patch]; diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index 6f2b0e34cbb3..cffe485711f6 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -43,7 +43,9 @@ stdenv.mkDerivation rec { "-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}" ]; - sourceRoot = "screencloud-v${version}-src/screencloud"; + setSourceRoot = '' + sourceRoot=$(echo */screencloud) + ''; preConfigure = '' # This needs to be set in preConfigure instead of cmakeFlags in order to diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index a3be867d6ed1..b0a6f7caf885 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.27"; - minor = "0"; + minor = "1"; name = "shotwell-${version}"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz"; - sha256 = "03vwp314kckr67p7shrysqpr95hc3326lk3bv40g11i9clsik1a2"; + sha256 = "1jav7qv0s1v6wvd7x2ri85hjqnbswq883pnd228qhd6bhjbryp89"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 93bb5f151d94..68597a23ca65 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 imlib2 giflib libexif ]; + postInstall = '' + mkdir -p $out/share/applications/ + cp -v sxiv.desktop $out/share/applications/ + ''; + meta = { description = "Simple X Image Viewer"; homepage = https://github.com/muennich/sxiv; diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 013e2e63f599..fb631414838c 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -27,7 +27,7 @@ mkDerivation { lib.makeBinPath ([ p7zip unzip zip ] ++ lib.optional unfreeEnableUnrar unrar); in '' - wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}" + wrapProgram "$out/bin/ark" --prefix PATH : "${PATH}" ''; meta = { license = with lib.licenses; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 11cbfcfe5388..b4f190de136c 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/17.08.1/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/17.08.2/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/kde-locale-5.nix b/pkgs/applications/kde/kde-locale-5.nix deleted file mode 100644 index 76d601cbdc0f..000000000000 --- a/pkgs/applications/kde/kde-locale-5.nix +++ /dev/null @@ -1,24 +0,0 @@ -name: args: - -{ mkDerivation, cmake, extra-cmake-modules, gettext, kdoctools }: - -mkDerivation (args // { - sname = "kde-l10n-${name}"; - name = "kde-l10n-${name}-qt5"; - - outputs = [ "out" ]; - - nativeBuildInputs = - [ cmake extra-cmake-modules gettext kdoctools ] - ++ (args.nativeBuildInputs or []); - - preConfigure = '' - sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt - ${args.preConfigure or ""} - ''; - - preFixup = '' - propagatedBuildInputs= - propagatedNativeBuildInputs= - ''; -}) diff --git a/pkgs/applications/kde/l10n.nix b/pkgs/applications/kde/l10n.nix index 403db98c0f35..10a8472d5a9e 100644 --- a/pkgs/applications/kde/l10n.nix +++ b/pkgs/applications/kde/l10n.nix @@ -3,7 +3,6 @@ let kdeLocale4 = import ./kde-locale-4.nix; - kdeLocale5 = import ./kde-locale-5.nix; in diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index f7b5ca0b31a2..5e3c5b18b77d 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,2235 +3,2235 @@ { akonadi = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadi-17.08.1.tar.xz"; - sha256 = "1nhjhgpigi8bhavh609lxnr76w9c0j7017haiv6g6j6zd5h0pp6w"; - name = "akonadi-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadi-17.08.2.tar.xz"; + sha256 = "1cd9ca3vifg6xsqsm8s9mzdkiavx7divwwjxk2vhb7pj8zxrnl45"; + name = "akonadi-17.08.2.tar.xz"; }; }; akonadi-calendar = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadi-calendar-17.08.1.tar.xz"; - sha256 = "15ld1jn1962wc5ynf8cgg9z6bh7hvjcl4nv9fqaa5mwy4mik4a0z"; - name = "akonadi-calendar-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadi-calendar-17.08.2.tar.xz"; + sha256 = "0a26li0m4swvr74vw10vwqg6m33wb74zsrjxym5g8j16y87sw660"; + name = "akonadi-calendar-17.08.2.tar.xz"; }; }; akonadi-calendar-tools = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadi-calendar-tools-17.08.1.tar.xz"; - sha256 = "1y4r3y9gbc1zsip25pz47fxi9fw68fr6p18mljfkcg394sygvlcr"; - name = "akonadi-calendar-tools-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadi-calendar-tools-17.08.2.tar.xz"; + sha256 = "1y9iidqh1ssxp6mjzd4zjzsma3rvm2z1hfqjbs6sm2r1r3x3560q"; + name = "akonadi-calendar-tools-17.08.2.tar.xz"; }; }; akonadiconsole = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadiconsole-17.08.1.tar.xz"; - sha256 = "0xy8s23941rfh1yiz2c1v10m59jrd8hphzphckxa68zxb6cb7vws"; - name = "akonadiconsole-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadiconsole-17.08.2.tar.xz"; + sha256 = "19bxs8ds9klyqv7xhvnh3wy5ndll6qlhfvnw5cv10yf03ahf1lhb"; + name = "akonadiconsole-17.08.2.tar.xz"; }; }; akonadi-contacts = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadi-contacts-17.08.1.tar.xz"; - sha256 = "0hgabjca3fzb8hlzhfi54la7rgh4gaii6i2j623birslzry3mkc9"; - name = "akonadi-contacts-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadi-contacts-17.08.2.tar.xz"; + sha256 = "0b2zm7a1zbsxgb23cz78alhs2x364jaz8qcq8nl49qp7ydp44wn1"; + name = "akonadi-contacts-17.08.2.tar.xz"; }; }; akonadi-import-wizard = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadi-import-wizard-17.08.1.tar.xz"; - sha256 = "1f7k592papppfqdhgpcpw03phhdlkp18cbap1ibvzywhg1dn2qmg"; - name = "akonadi-import-wizard-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadi-import-wizard-17.08.2.tar.xz"; + sha256 = "1ynyjmzw8zg72hkxls0rw3p7hsvgm7y41mii28fc18qdx8qcj8vw"; + name = "akonadi-import-wizard-17.08.2.tar.xz"; }; }; akonadi-mime = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadi-mime-17.08.1.tar.xz"; - sha256 = "1apl89r1mpj5byngzdibxr4whr0932zr3j2y51pynnmilgkmyg6v"; - name = "akonadi-mime-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadi-mime-17.08.2.tar.xz"; + sha256 = "1pnxmljgsmdkv2rhg7ml6qy1q2j2gx4cswkakbga8fr2cds5fmjc"; + name = "akonadi-mime-17.08.2.tar.xz"; }; }; akonadi-notes = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadi-notes-17.08.1.tar.xz"; - sha256 = "1fgkipxhzj7c6ahdqhjii6ccxgn2qnn55jn64nrb36srmpnzrq7f"; - name = "akonadi-notes-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadi-notes-17.08.2.tar.xz"; + sha256 = "1n9rrlczsgax0hddsqx4x8h9w49ki56lpa72y2fi2hd0hqv7bdf1"; + name = "akonadi-notes-17.08.2.tar.xz"; }; }; akonadi-search = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akonadi-search-17.08.1.tar.xz"; - sha256 = "1m119843brcjcymfcp9n7pfybqnw9ydhsm9ry5im52kci4rwsfhx"; - name = "akonadi-search-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akonadi-search-17.08.2.tar.xz"; + sha256 = "0h8pcwv4svywf8sh698g6f3x15prcmz4nyxr92ab3x14k5na26v2"; + name = "akonadi-search-17.08.2.tar.xz"; }; }; akregator = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/akregator-17.08.1.tar.xz"; - sha256 = "02p1vlxm91pyqhhwg3ggik9c8xw5ayz1w7bqpxmcb81gff75ha77"; - name = "akregator-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/akregator-17.08.2.tar.xz"; + sha256 = "0ij4zxkwiai01cyzdai68c56j86r7b6nkijhmzhgvhv2mj9gi5bg"; + name = "akregator-17.08.2.tar.xz"; }; }; analitza = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/analitza-17.08.1.tar.xz"; - sha256 = "1kcyhim72g39ywq90hdd9ba6vwgq99xkbj82vbasy0il8xkkfcn4"; - name = "analitza-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/analitza-17.08.2.tar.xz"; + sha256 = "02rmgyl9sh4d3kf4412p1zgcmcmcb66drqf73fxf6cdb5addbzk3"; + name = "analitza-17.08.2.tar.xz"; }; }; ark = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ark-17.08.1.tar.xz"; - sha256 = "019gz57c46lh5wz84r0swhbx7ywgw8s7yc1f589xh4nz18i9xi69"; - name = "ark-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ark-17.08.2.tar.xz"; + sha256 = "1my3y6zsfw54c4kcbsl93ixig9b07cprgq47712v47niyqnihk92"; + name = "ark-17.08.2.tar.xz"; }; }; artikulate = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/artikulate-17.08.1.tar.xz"; - sha256 = "1dgr9ww0pm6k0rhb3lkvr65jx6pnwsck1v3sfwpyyf8rrwixbvyk"; - name = "artikulate-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/artikulate-17.08.2.tar.xz"; + sha256 = "0hw10djgnx8wsrs307j9hsh9famaaljdpr20dmf2ng3594hppxw1"; + name = "artikulate-17.08.2.tar.xz"; }; }; audiocd-kio = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/audiocd-kio-17.08.1.tar.xz"; - sha256 = "1k987lxm5wl6prdvbxxby1ly9r2dq7r5dsfbpazm43fxpx0pqyik"; - name = "audiocd-kio-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/audiocd-kio-17.08.2.tar.xz"; + sha256 = "0ivnl5aq553whgwnw6282vvj065hms34v1q1hl8l12k08rb8l2jl"; + name = "audiocd-kio-17.08.2.tar.xz"; }; }; baloo-widgets = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/baloo-widgets-17.08.1.tar.xz"; - sha256 = "19nij0hrcbcq4czxgh3l6gb25lkdi6j6sgmch24a8c7a106h0ips"; - name = "baloo-widgets-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/baloo-widgets-17.08.2.tar.xz"; + sha256 = "1qw0clwkcki6hg1hxxzb6h4nh6db7zw3ncl4hyf5550q973i2gl1"; + name = "baloo-widgets-17.08.2.tar.xz"; }; }; blinken = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/blinken-17.08.1.tar.xz"; - sha256 = "1nwdmhsyq1yzlr17mn98np0d3zg3rjyxsmlc7lyv1kszckhmb7qq"; - name = "blinken-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/blinken-17.08.2.tar.xz"; + sha256 = "1qs6nbxqrp0lmwf0z30i0r8h32r1a6a18k6sk78ja52vqkr7872h"; + name = "blinken-17.08.2.tar.xz"; }; }; blogilo = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/blogilo-17.08.1.tar.xz"; - sha256 = "1c9dq7xwdwxwdch4ygyz7pds8q41xpb5661wa4alnpd06ra0bq0c"; - name = "blogilo-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/blogilo-17.08.2.tar.xz"; + sha256 = "0ai91d5ydmw3yfv997hlrvky88v4aqcg7hacd3mizl23clqij4c9"; + name = "blogilo-17.08.2.tar.xz"; }; }; bomber = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/bomber-17.08.1.tar.xz"; - sha256 = "1pcva9rgmvvkbbabwiw3aqv0aq0w2s6vxrw0gfxh6plgs42hpb24"; - name = "bomber-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/bomber-17.08.2.tar.xz"; + sha256 = "1z6w6hh2f1k8skx87j11i6p34lcnh2c99gv2lvpd37z9gxbf0sjw"; + name = "bomber-17.08.2.tar.xz"; }; }; bovo = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/bovo-17.08.1.tar.xz"; - sha256 = "0vn4q6qvig9rjq8ynwg53vzas8vxg0b55mvpg801ky6kp3ma3m6i"; - name = "bovo-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/bovo-17.08.2.tar.xz"; + sha256 = "0vz9pfslj9f2g51yvdw8hasn92n0rn0gy4rd2f0xcfk2ifq2bwd1"; + name = "bovo-17.08.2.tar.xz"; }; }; calendarsupport = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/calendarsupport-17.08.1.tar.xz"; - sha256 = "1p1s5sn284j2lwzm09ifp6dj6gzg6p169hh7dv7k5bshi7kzf42v"; - name = "calendarsupport-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/calendarsupport-17.08.2.tar.xz"; + sha256 = "0zrazkcdm2m9rxdbgwcmidlxwnj1v4lnchf0d21i267dnck87m8x"; + name = "calendarsupport-17.08.2.tar.xz"; }; }; cantor = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/cantor-17.08.1.tar.xz"; - sha256 = "1m6si2gy6n20z27sby7g7nqaxl067qpkj29l6b3qsyyx03w73n33"; - name = "cantor-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/cantor-17.08.2.tar.xz"; + sha256 = "14hn1980z8wsr446r94scd3wdy83myy4wklxl24bynxpwiwxzv99"; + name = "cantor-17.08.2.tar.xz"; }; }; cervisia = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/cervisia-17.08.1.tar.xz"; - sha256 = "13p5gs2cg939mcnq2hvvncj8v7vr7pcklq932xhy4qfwhqbhkxp1"; - name = "cervisia-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/cervisia-17.08.2.tar.xz"; + sha256 = "0h56dfy27nf14dqz20f7chjzyhsdricxdrxxkw839r593k25fipd"; + name = "cervisia-17.08.2.tar.xz"; }; }; dolphin = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/dolphin-17.08.1.tar.xz"; - sha256 = "04b9vq03m6s5mrv7q4na65kv9hpx7i4v45g6ls7pcyxi6ziszr3q"; - name = "dolphin-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/dolphin-17.08.2.tar.xz"; + sha256 = "1m3v7z0k47r3fzl4w4nsldslw0z6sy1zn3mn3ssc03jhgqnj3grs"; + name = "dolphin-17.08.2.tar.xz"; }; }; dolphin-plugins = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/dolphin-plugins-17.08.1.tar.xz"; - sha256 = "0vrs8yk2vqfbc79xjkj95zndyig2gz2b8aafs61q25b29lzilyq9"; - name = "dolphin-plugins-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/dolphin-plugins-17.08.2.tar.xz"; + sha256 = "12mp7qf8aharyk8hqr8igwqnxraxy3nmad99mxkyny6wlkha459l"; + name = "dolphin-plugins-17.08.2.tar.xz"; }; }; dragon = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/dragon-17.08.1.tar.xz"; - sha256 = "143x7x07z5af0z7za8r3jiq5id33rmb62ygp84af905lm2gf2yk0"; - name = "dragon-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/dragon-17.08.2.tar.xz"; + sha256 = "0h9h2axwjqqvqla6mfml3bvk7gp36kij7swl96gsn7sy4ch0ydbz"; + name = "dragon-17.08.2.tar.xz"; }; }; eventviews = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/eventviews-17.08.1.tar.xz"; - sha256 = "1av86sbldkrgsdybxqzgda1pnd4y27ygxsibr76w6y8fnk66zrg7"; - name = "eventviews-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/eventviews-17.08.2.tar.xz"; + sha256 = "0gd7jmwidh9fngjbn8m6jhymzxv8qdxv3ksnawcamjxxd2k951c1"; + name = "eventviews-17.08.2.tar.xz"; }; }; ffmpegthumbs = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ffmpegthumbs-17.08.1.tar.xz"; - sha256 = "1lgi8rs3zbrwlcxbhq9qys8w0yh4f0rbalig0y020igbplkn9ccs"; - name = "ffmpegthumbs-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ffmpegthumbs-17.08.2.tar.xz"; + sha256 = "0bycdr60jnr0a121fr9alvma5zbkqm6wj45h81jvggdvmnrg7inh"; + name = "ffmpegthumbs-17.08.2.tar.xz"; }; }; filelight = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/filelight-17.08.1.tar.xz"; - sha256 = "0wi0j55z8h58slbq4hinhfycpjb69m5g4ilk0csjw8syxhmy1jhl"; - name = "filelight-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/filelight-17.08.2.tar.xz"; + sha256 = "0q7cn7hbmwg6km96yc3m1yd64nsnav8q9yjiri2k3p6v6if1042h"; + name = "filelight-17.08.2.tar.xz"; }; }; granatier = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/granatier-17.08.1.tar.xz"; - sha256 = "0panmz171ba3vfvdgjcwg1nxwv52qsh6qazagz7p5bv0hkf6y94n"; - name = "granatier-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/granatier-17.08.2.tar.xz"; + sha256 = "17ymbyzkgkwcinf65hzy3ny1zzg6p88bcg6kix1pbdmhmw4nhhj0"; + name = "granatier-17.08.2.tar.xz"; }; }; grantlee-editor = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/grantlee-editor-17.08.1.tar.xz"; - sha256 = "0xpkip7cy6d318mh3l8014zdifhx3njx8vk2cr2f00bjvs879zfj"; - name = "grantlee-editor-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/grantlee-editor-17.08.2.tar.xz"; + sha256 = "1385wcf2y3jjj9csp6p7iqyrlv0wxq32dkhdf33y80j29xnrckzp"; + name = "grantlee-editor-17.08.2.tar.xz"; }; }; grantleetheme = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/grantleetheme-17.08.1.tar.xz"; - sha256 = "0l6ycr609wvxad1dwgy56blcnag5pr30gj59d5dcnq0iqcs9v5w9"; - name = "grantleetheme-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/grantleetheme-17.08.2.tar.xz"; + sha256 = "1i1x8d7hkhzqbn4c1q0snni8x2dw1hlxkc0zw8hfyfppc9a1x5ha"; + name = "grantleetheme-17.08.2.tar.xz"; }; }; gwenview = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/gwenview-17.08.1.tar.xz"; - sha256 = "1f5c78007sqy3iq0rx8cskma8rjzinaahy26r054l59gq6b0d3v7"; - name = "gwenview-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/gwenview-17.08.2.tar.xz"; + sha256 = "0kw48xwinvyix23m1h4ark91w6nygr0a9kisdj3ighw29dqbqryx"; + name = "gwenview-17.08.2.tar.xz"; }; }; incidenceeditor = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/incidenceeditor-17.08.1.tar.xz"; - sha256 = "0axwkhwqgmdnh9qn6j87j44x24vqb5bhch2pscrifdni05j99wzx"; - name = "incidenceeditor-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/incidenceeditor-17.08.2.tar.xz"; + sha256 = "1jdwk67pxk9dwraq187wg58y0sgxwr5d18506fykrs7gv68p8dsl"; + name = "incidenceeditor-17.08.2.tar.xz"; }; }; jovie = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/jovie-17.08.1.tar.xz"; - sha256 = "19zhm6iqq505bwdd6f57rkzc9fmqqmw60071n679khrcgmsyx7ac"; - name = "jovie-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/jovie-17.08.2.tar.xz"; + sha256 = "0wh0wk653fzlaxkxjbsm305wqmvdy88vw7qr81mh9ziyfj4qpm7p"; + name = "jovie-17.08.2.tar.xz"; }; }; juk = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/juk-17.08.1.tar.xz"; - sha256 = "1r3igqgw2ani4500sndbqnxcbyjg8l0lcd0l0r6wmqs9cgf1w5d5"; - name = "juk-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/juk-17.08.2.tar.xz"; + sha256 = "0i1zh8asbzjg7s6qq26fwc1g5g9ivnppba0xnhz5c3y0nmz0g3i1"; + name = "juk-17.08.2.tar.xz"; }; }; k3b = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/k3b-17.08.1.tar.xz"; - sha256 = "1pv8fpalqr7fpcy7dypzjp91h82scvzfk5g0mpzjpqlmn99hgfj1"; - name = "k3b-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/k3b-17.08.2.tar.xz"; + sha256 = "1n7fw4zhsjc5bxxva420m8k0lmbx4whq8ay1ckianarjc8jm5dwx"; + name = "k3b-17.08.2.tar.xz"; }; }; kaccessible = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kaccessible-17.08.1.tar.xz"; - sha256 = "13j1c9l8qhll0a8fcny9nibr858w5cjpahccxgkh9v54iy3f243s"; - name = "kaccessible-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kaccessible-17.08.2.tar.xz"; + sha256 = "1phfz8n6gs9g216qhwmjhcrr0qpfk2q7bxxx68f86zzfv6b4fhjd"; + name = "kaccessible-17.08.2.tar.xz"; }; }; kaccounts-integration = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kaccounts-integration-17.08.1.tar.xz"; - sha256 = "0y09hnjhxy7lnqjhz82z090wv3y5942xh1vhgyi5ac7pkgyzjh7m"; - name = "kaccounts-integration-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kaccounts-integration-17.08.2.tar.xz"; + sha256 = "0v4ikcapq0vdfhj0v5c202yfbg1b82jbl74rpcw7lap7xjdxshgi"; + name = "kaccounts-integration-17.08.2.tar.xz"; }; }; kaccounts-providers = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kaccounts-providers-17.08.1.tar.xz"; - sha256 = "0dyrsvh98b75fxpap3x4vwvqx2dxyvcg4sfkic9sv137kwl8ihcp"; - name = "kaccounts-providers-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kaccounts-providers-17.08.2.tar.xz"; + sha256 = "1ir4s03ccf8mw56z2f293q4pb2rnh8rp0bs05nq93jjsxap3ssxn"; + name = "kaccounts-providers-17.08.2.tar.xz"; }; }; kaddressbook = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kaddressbook-17.08.1.tar.xz"; - sha256 = "0qf3wfjgbzjxrvhnwa702yhp54m8f4wk8d67jsgrlpvq3lizrzrf"; - name = "kaddressbook-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kaddressbook-17.08.2.tar.xz"; + sha256 = "0smihkmhi10c0khid3ziiwvbrlk3ihw7f1a2mf1pc62gmagf6iva"; + name = "kaddressbook-17.08.2.tar.xz"; }; }; kajongg = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kajongg-17.08.1.tar.xz"; - sha256 = "10bymw4bwqxjppvynwcx600ybr02kyd9m2ya0pi2208kj2s317m5"; - name = "kajongg-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kajongg-17.08.2.tar.xz"; + sha256 = "0607606yisch8s0ffv67fhpn8b5chi0y9h4giasc2s8m67zzjsvz"; + name = "kajongg-17.08.2.tar.xz"; }; }; kalarm = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kalarm-17.08.1.tar.xz"; - sha256 = "0nxkln40bwlfdn2fp5a2a55x40zakq5nrir9bi920jpp78ivx2mf"; - name = "kalarm-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kalarm-17.08.2.tar.xz"; + sha256 = "17sh27h6c1p0h1r6rfpqmh1pfd7clnwslhnj4rfxhvh95svdqgam"; + name = "kalarm-17.08.2.tar.xz"; }; }; kalarmcal = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kalarmcal-17.08.1.tar.xz"; - sha256 = "1dvv1rbh67c2vxcls8jv8chcgbp7q8c2jdjsr2cx2lmiasz0lqlf"; - name = "kalarmcal-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kalarmcal-17.08.2.tar.xz"; + sha256 = "00bfr9xsyg3r8nmvsana2n9m8ynhw1wcvx7dw3pazxf3f1sn5qvc"; + name = "kalarmcal-17.08.2.tar.xz"; }; }; kalgebra = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kalgebra-17.08.1.tar.xz"; - sha256 = "07l3gff8la0cjd3aszm2v0gykfb2ws6k5hix0ck9q62kz1h6zd8d"; - name = "kalgebra-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kalgebra-17.08.2.tar.xz"; + sha256 = "0f7zz9xxqckrkzmfga4ap117wix2ib4lpjq75blk43951qpnwwcw"; + name = "kalgebra-17.08.2.tar.xz"; }; }; kalzium = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kalzium-17.08.1.tar.xz"; - sha256 = "15rvpjni1a1fhr52awivzdc6v575510fs5mxxk05wqzsffa67i1f"; - name = "kalzium-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kalzium-17.08.2.tar.xz"; + sha256 = "1b27rx0ws6bikqa9gdr8d4mfqwsgcin5nl2m7svzdz27mb463iwc"; + name = "kalzium-17.08.2.tar.xz"; }; }; kamera = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kamera-17.08.1.tar.xz"; - sha256 = "044mn0k18ffxhc9nnbpqhcjlzkj4657nxqwdfl65k689y1l2bff1"; - name = "kamera-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kamera-17.08.2.tar.xz"; + sha256 = "19id26637w39b6dlsvhllnnpvcphh20mvva1394pw386s2irdrca"; + name = "kamera-17.08.2.tar.xz"; }; }; kanagram = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kanagram-17.08.1.tar.xz"; - sha256 = "07gykmv9r1ikaw4l3zz27rc7a23q2nizszblm1ygv2nlyj6lilgf"; - name = "kanagram-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kanagram-17.08.2.tar.xz"; + sha256 = "1zs1ww5w9sd9qzapl2shmfarhxsqpm8cifpw17vknwcp1w4qjwpj"; + name = "kanagram-17.08.2.tar.xz"; }; }; kapman = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kapman-17.08.1.tar.xz"; - sha256 = "1r7r13yfgf64jfarqjiirfbhmrg6d04ija5sgl8aiib8rwnbs2lb"; - name = "kapman-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kapman-17.08.2.tar.xz"; + sha256 = "0wl6zhm7cyb4ii475nh7pjz1pprccimpvdx5yxph4n99wri4xjd9"; + name = "kapman-17.08.2.tar.xz"; }; }; kapptemplate = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kapptemplate-17.08.1.tar.xz"; - sha256 = "0dcgsh4ns3749yybzz2jgdbjskxyzlnr2c0f5wzh9ilkz3yp7lq2"; - name = "kapptemplate-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kapptemplate-17.08.2.tar.xz"; + sha256 = "0b92kamyvw81bxvxly16kd1kcyn8l48cvk4hp0kqfxv5drr0y2sp"; + name = "kapptemplate-17.08.2.tar.xz"; }; }; kate = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kate-17.08.1.tar.xz"; - sha256 = "0z71s9g66ivbchrd2ps3j16ickjnky7ws484y04akjjs7sryzd0l"; - name = "kate-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kate-17.08.2.tar.xz"; + sha256 = "1m4dh9v1y8a3398wd3qv2qcz1lqjnji62cswnw8ch4hxmns6lib2"; + name = "kate-17.08.2.tar.xz"; }; }; katomic = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/katomic-17.08.1.tar.xz"; - sha256 = "04k29x2hvcqc22cm763aflpwzb6gqqbnpd6dknd34985fqrrcdp4"; - name = "katomic-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/katomic-17.08.2.tar.xz"; + sha256 = "1l8nvsm6mfsb1bvwhj77qicq010vmif8y046d2mc5sgw6xhg6xw5"; + name = "katomic-17.08.2.tar.xz"; }; }; kblackbox = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kblackbox-17.08.1.tar.xz"; - sha256 = "1n1rxh86qcaa8dm5qcs43pdxjndzssy4pdyn90anw6bqsw1mn7q0"; - name = "kblackbox-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kblackbox-17.08.2.tar.xz"; + sha256 = "0i5zy6zm8w4i5hljmv1qyhrr5iv7m5qr854f6j0iyvam33f68gdh"; + name = "kblackbox-17.08.2.tar.xz"; }; }; kblocks = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kblocks-17.08.1.tar.xz"; - sha256 = "0bx5j1kahyspbmrw2falkw037d1lkj6f1yppwdlh2l4zn7xbgx78"; - name = "kblocks-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kblocks-17.08.2.tar.xz"; + sha256 = "1qh2lcg9293icya06jwa01vri8y1m99jir7d0zxpwlm6rndrkca5"; + name = "kblocks-17.08.2.tar.xz"; }; }; kblog = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kblog-17.08.1.tar.xz"; - sha256 = "0kdwv2ym3xba7n0qslrgdlmanw1zqanv5ycjnl54gf1xlbdwbpv2"; - name = "kblog-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kblog-17.08.2.tar.xz"; + sha256 = "1095qs877zjip4899fisgyssp1n3j8rxpxkd7dc6ms4b82xnrz19"; + name = "kblog-17.08.2.tar.xz"; }; }; kbounce = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kbounce-17.08.1.tar.xz"; - sha256 = "0bl1pm8h547gwzx1pbc340711fp5scfa1dql7b1yjjpfg56flccm"; - name = "kbounce-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kbounce-17.08.2.tar.xz"; + sha256 = "0bkmk26spmlq607ycmyc5sfzi7rknim0d39fdvmn915xy7dps2l1"; + name = "kbounce-17.08.2.tar.xz"; }; }; kbreakout = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kbreakout-17.08.1.tar.xz"; - sha256 = "021hzg4m6aqvvavdx63ydj2s71shml6x1rrd9lyyw23harh7402h"; - name = "kbreakout-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kbreakout-17.08.2.tar.xz"; + sha256 = "02c4ldyxd6hcffivp1n8k5q42dibwpcf4xdp856zkaf9hk40ssjz"; + name = "kbreakout-17.08.2.tar.xz"; }; }; kbruch = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kbruch-17.08.1.tar.xz"; - sha256 = "110iar2p5wlil4b8j5gw37mizajvhc9j7fww7dmvffq1yn4m5ac2"; - name = "kbruch-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kbruch-17.08.2.tar.xz"; + sha256 = "0v8c63mxpd10nnbxiyfghbbjm97q37w9z08dzlys996nychmw0ba"; + name = "kbruch-17.08.2.tar.xz"; }; }; kcachegrind = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kcachegrind-17.08.1.tar.xz"; - sha256 = "0pgc00y7l98fws7qfc9i92a9mizgkkvap48pi12r9ajj5bhy792b"; - name = "kcachegrind-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kcachegrind-17.08.2.tar.xz"; + sha256 = "04dh0a33z7i1nf07bhc05gm1jr4wvv4a86l9avk6dgja0pag6j30"; + name = "kcachegrind-17.08.2.tar.xz"; }; }; kcalc = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kcalc-17.08.1.tar.xz"; - sha256 = "177mr533r71jpa64bvkbl349lkf2yzanrjh22d4rii7lqma63z4k"; - name = "kcalc-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kcalc-17.08.2.tar.xz"; + sha256 = "1k1l3qj4mdm8b0qbjp09hk4zd0y9qwzp062a0r428mvvcmrvpylw"; + name = "kcalc-17.08.2.tar.xz"; }; }; kcalcore = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kcalcore-17.08.1.tar.xz"; - sha256 = "084gj40lssh6lsjn7xpvzlhlfcc6vcdk6ygv47wvf8y0yipppspw"; - name = "kcalcore-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kcalcore-17.08.2.tar.xz"; + sha256 = "1j3vr2ycwsgahngwhvkv747b5rr062sx6xi35bj9anmkhpbs9kwi"; + name = "kcalcore-17.08.2.tar.xz"; }; }; kcalutils = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kcalutils-17.08.1.tar.xz"; - sha256 = "04nn5lv2x15352p42589zyh1w2fxbijkq9wmbcr51fb4nphx007l"; - name = "kcalutils-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kcalutils-17.08.2.tar.xz"; + sha256 = "02f5vr0l41kv6g92jj9g8yz5y422qvlgd3jbx3gmsagxxyvl5gss"; + name = "kcalutils-17.08.2.tar.xz"; }; }; kcharselect = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kcharselect-17.08.1.tar.xz"; - sha256 = "1w6ydp7acf5ha0kag60m1anksj7fy2kk8bghpw14lv8bxzrjwdam"; - name = "kcharselect-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kcharselect-17.08.2.tar.xz"; + sha256 = "1nmsn0kibd318dnka96lisplcggrvcgsivrqk322mw9wg6xhg5i9"; + name = "kcharselect-17.08.2.tar.xz"; }; }; kcolorchooser = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kcolorchooser-17.08.1.tar.xz"; - sha256 = "1zmzd919crj25ngcv085pp4w213x4bra54npfw4z11cmc30zz57i"; - name = "kcolorchooser-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kcolorchooser-17.08.2.tar.xz"; + sha256 = "0v8x3y2gxp8cm3m1dh8rjpxjnypfvrxm41vrqsz9p8lcs616zg6w"; + name = "kcolorchooser-17.08.2.tar.xz"; }; }; kcontacts = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kcontacts-17.08.1.tar.xz"; - sha256 = "0iqpvsnwbnzczdcvbqlrgmx2czjqgl4ag4b09vhkj1s7gs8cracy"; - name = "kcontacts-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kcontacts-17.08.2.tar.xz"; + sha256 = "1agwvi3lnmdz9fhqg6i029jpcwys4zsk2k5rpzjdqaf7bvccb9cl"; + name = "kcontacts-17.08.2.tar.xz"; }; }; kcron = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kcron-17.08.1.tar.xz"; - sha256 = "0yzv068jsxyag68fix421z5qfvpxm1i9v1q3pw3ksvq07ai740f3"; - name = "kcron-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kcron-17.08.2.tar.xz"; + sha256 = "1diqgcnlbq9x6w3sj4lk1i3kbi4g5w4j1knkc4qqjz3a6kfaqk60"; + name = "kcron-17.08.2.tar.xz"; }; }; kdav = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdav-17.08.1.tar.xz"; - sha256 = "1m9pcydg2fwz95mym7k7wdavbw4nz18ihhrhfmcda7m61x6y8z9q"; - name = "kdav-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdav-17.08.2.tar.xz"; + sha256 = "0cyh8qnzcnb7qnyjbyy73bj78kqjq853aaz7fskg2f3bk2bq5fkf"; + name = "kdav-17.08.2.tar.xz"; }; }; kdebugsettings = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdebugsettings-17.08.1.tar.xz"; - sha256 = "0jxy68fs45hwkd3hjl5rknwznsihk0nszmskw3hy3y64p2vvvzyf"; - name = "kdebugsettings-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdebugsettings-17.08.2.tar.xz"; + sha256 = "0i62w45flirca09bkwxkyyr4zhvzi4rxq7l6xh4liinl1n9kdf7w"; + name = "kdebugsettings-17.08.2.tar.xz"; }; }; kde-dev-scripts = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-dev-scripts-17.08.1.tar.xz"; - sha256 = "16dzmx80752n3wcg2dcwh4cc0mwxwckfbms134g83gwaix5wkyvd"; - name = "kde-dev-scripts-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-dev-scripts-17.08.2.tar.xz"; + sha256 = "1prk2j5y8rcz3xkhw2fnfhsky9jnk25akdg2whvz4zpvfvxn5jcw"; + name = "kde-dev-scripts-17.08.2.tar.xz"; }; }; kde-dev-utils = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-dev-utils-17.08.1.tar.xz"; - sha256 = "1lq8cya779667yjwinvx9xyfiq79p7m93m4r2zgd7r6fpakxdkch"; - name = "kde-dev-utils-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-dev-utils-17.08.2.tar.xz"; + sha256 = "0zzf1w6avjwzyr8p73jqidzzfgx7gpiksmgnfqm4nf91snfg7pp4"; + name = "kde-dev-utils-17.08.2.tar.xz"; }; }; kdeedu-data = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdeedu-data-17.08.1.tar.xz"; - sha256 = "1fk2r2cib8gzk1ss5z6wxdwswl3f0hvwmxdgg0cs0j11gk1m0m6g"; - name = "kdeedu-data-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdeedu-data-17.08.2.tar.xz"; + sha256 = "17jh5m5h64z6gkwblpq7jdsa4653bakz1mgy6qlyjlh8nljlf6wk"; + name = "kdeedu-data-17.08.2.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdegraphics-mobipocket-17.08.1.tar.xz"; - sha256 = "0y2yfcf2p864hzyxyxv65mkfl8qk08zh9pr24ycxfdl4g22pal6w"; - name = "kdegraphics-mobipocket-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdegraphics-mobipocket-17.08.2.tar.xz"; + sha256 = "008qp18m720759wj1bjm1z2nig1vafjcz8wifjgqdn3drn35qqvg"; + name = "kdegraphics-mobipocket-17.08.2.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdegraphics-thumbnailers-17.08.1.tar.xz"; - sha256 = "1milas13wb958z2p39rm1353lqz9ibhnpwb8ffw6wy5qdbx4fr4q"; - name = "kdegraphics-thumbnailers-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdegraphics-thumbnailers-17.08.2.tar.xz"; + sha256 = "11qf9dnqzw634iilmbfi9sy20w228y72w2aasjw7kg1l7y4y3y07"; + name = "kdegraphics-thumbnailers-17.08.2.tar.xz"; }; }; kde-l10n-ar = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ar-17.08.1.tar.xz"; - sha256 = "03bj86is2a0srygmabxmwmdmqxwwxm06lh9a6g362dhglh4ypp67"; - name = "kde-l10n-ar-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ar-17.08.2.tar.xz"; + sha256 = "1m5qi2qw4ndqzshg7bbi3mkvxpk0dj453bngm7qzmp9bgwpbgk3b"; + name = "kde-l10n-ar-17.08.2.tar.xz"; }; }; kde-l10n-ast = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ast-17.08.1.tar.xz"; - sha256 = "0vsyv4g8ywpvcxh1hkhx1y8plx9k068fqrgvglv9gvsr86w57xn7"; - name = "kde-l10n-ast-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ast-17.08.2.tar.xz"; + sha256 = "1y2qahv1d40k16s9xjckc51szzm8n2nhdy5bjqpakxv3iqy2yqvz"; + name = "kde-l10n-ast-17.08.2.tar.xz"; }; }; kde-l10n-bg = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-bg-17.08.1.tar.xz"; - sha256 = "0bz8ydq7i0q29znbia0fcw5y19cw9a5hxh2gh8s7v6pvniazlgfx"; - name = "kde-l10n-bg-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-bg-17.08.2.tar.xz"; + sha256 = "0h0ls4k1jyj8w2qh688nv43p6xxad3amh4gslg4xxk30scl58pay"; + name = "kde-l10n-bg-17.08.2.tar.xz"; }; }; kde-l10n-bs = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-bs-17.08.1.tar.xz"; - sha256 = "19jjrwga6b5vn0g8m5mgp9kgn9173km6jmj92fl63w7lhd60pqyy"; - name = "kde-l10n-bs-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-bs-17.08.2.tar.xz"; + sha256 = "1n2hw8835hf87d4sihnbryh702h6vh2z65s15lsrk5l760jdvyg7"; + name = "kde-l10n-bs-17.08.2.tar.xz"; }; }; kde-l10n-ca = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ca-17.08.1.tar.xz"; - sha256 = "1ldpsjaczqfczglfk2nib4kqkzi6z16mkyisx1byw3wxix7aqak5"; - name = "kde-l10n-ca-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ca-17.08.2.tar.xz"; + sha256 = "18g4vs2r63p25a0i8ggyv3gi7df54z1hv140lg44k5g4pffbzv0z"; + name = "kde-l10n-ca-17.08.2.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-17.08.1"; + version = "ca_valencia-17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ca@valencia-17.08.1.tar.xz"; - sha256 = "1dnvvc6jbwyvagy7ay3w1rdj82bx7zcc97i61drlv2cf1vgkmb4l"; - name = "kde-l10n-ca_valencia-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ca@valencia-17.08.2.tar.xz"; + sha256 = "0p7ykdkfxkqm6fa8y95j3jsmqlnkxfsigi457h8yhvikjvlym9an"; + name = "kde-l10n-ca_valencia-17.08.2.tar.xz"; }; }; kde-l10n-cs = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-cs-17.08.1.tar.xz"; - sha256 = "0f9h5ln31395kgbqa8rj1sdkwjaczw4mvjlif9656xqglzw0dvs1"; - name = "kde-l10n-cs-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-cs-17.08.2.tar.xz"; + sha256 = "13qxxh1rxv25i53r6744hyr7n7nhvhnxwb425caq0z8cl0y727xi"; + name = "kde-l10n-cs-17.08.2.tar.xz"; }; }; kde-l10n-da = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-da-17.08.1.tar.xz"; - sha256 = "0rr0gmzfbdwnya9bipbymwqy6250zdi47chawi7j3vc4j11511g2"; - name = "kde-l10n-da-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-da-17.08.2.tar.xz"; + sha256 = "1nqfmq3scmka10fqvd4q62klrsly0zxk5maqp914r2kq9a4761sr"; + name = "kde-l10n-da-17.08.2.tar.xz"; }; }; kde-l10n-de = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-de-17.08.1.tar.xz"; - sha256 = "08ad110q4k21j8mfzigjxxrlic2c6h0cxqiawbfswzc39r0vy0lb"; - name = "kde-l10n-de-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-de-17.08.2.tar.xz"; + sha256 = "0q0sqzsd9qig05qapa6psizcayfcr68jkz07wv1z0lsij6hbv81w"; + name = "kde-l10n-de-17.08.2.tar.xz"; }; }; kde-l10n-el = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-el-17.08.1.tar.xz"; - sha256 = "1m2f8rsygmyn05i3j5mnwnr7mm4jahy2yaphxv822g6i79iy3396"; - name = "kde-l10n-el-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-el-17.08.2.tar.xz"; + sha256 = "1g07qwgc5mm3x6diab934cfl9acl0baa5x1d1139c84x65d5iisx"; + name = "kde-l10n-el-17.08.2.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-17.08.1"; + version = "en_GB-17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-en_GB-17.08.1.tar.xz"; - sha256 = "14ql8kd60c4svg3ar5n61g544in805xsyfk2bgals0m47fy3axyf"; - name = "kde-l10n-en_GB-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-en_GB-17.08.2.tar.xz"; + sha256 = "03v7q53ng095rsc5h13d7ysakcr3ansvq259xw8ksqwnp3yzgivf"; + name = "kde-l10n-en_GB-17.08.2.tar.xz"; }; }; kde-l10n-eo = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-eo-17.08.1.tar.xz"; - sha256 = "05lnk520hg9kxf6f92fn9avx4h29pjk4k8j7rsk4nwngvvygqjb6"; - name = "kde-l10n-eo-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-eo-17.08.2.tar.xz"; + sha256 = "1w79dmbja6aga6z8wz5pisd9r6g5gdcbqyzf8nlj2yjvijdv19h5"; + name = "kde-l10n-eo-17.08.2.tar.xz"; }; }; kde-l10n-es = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-es-17.08.1.tar.xz"; - sha256 = "1h2lzs1z5rcyg60f5d9jkxmdxwbhrdgbmib5h1nlz3f7jnrnpj86"; - name = "kde-l10n-es-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-es-17.08.2.tar.xz"; + sha256 = "0j2y55iql56wwzfmfm5c0c3f64lqr74hqzqf5bcckhh6svjiwb9m"; + name = "kde-l10n-es-17.08.2.tar.xz"; }; }; kde-l10n-et = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-et-17.08.1.tar.xz"; - sha256 = "0ifcsc6ic76gnbni0qm4yfcbhz4b3kww3rqly34hlrpzlwf52x5w"; - name = "kde-l10n-et-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-et-17.08.2.tar.xz"; + sha256 = "0d7c3ij74iskf9hbfjjl48jfpgihlg8fjabcak34bklcf1h8qrl9"; + name = "kde-l10n-et-17.08.2.tar.xz"; }; }; kde-l10n-eu = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-eu-17.08.1.tar.xz"; - sha256 = "1nxmy2bdlljjf4dqy1fsfx7iawak7nh4h3x5h72im2s49z4y01rl"; - name = "kde-l10n-eu-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-eu-17.08.2.tar.xz"; + sha256 = "164851achb1p4yaw4x6sq83ibl6gj4iqh4771nc847rywgmq48dh"; + name = "kde-l10n-eu-17.08.2.tar.xz"; }; }; kde-l10n-fa = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-fa-17.08.1.tar.xz"; - sha256 = "19x6zacpyc7gax1lrqls2cb9ax747ls6pm8046hcgdy2nb8byqmc"; - name = "kde-l10n-fa-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-fa-17.08.2.tar.xz"; + sha256 = "030wwv8527yhn6k6jmjb790d05gz493dnhr759zv1yg0r1r14lsi"; + name = "kde-l10n-fa-17.08.2.tar.xz"; }; }; kde-l10n-fi = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-fi-17.08.1.tar.xz"; - sha256 = "04cdsrjr9hnx1x3w4chjaq82varc24hl65kqiyf13nr3nvgx3xba"; - name = "kde-l10n-fi-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-fi-17.08.2.tar.xz"; + sha256 = "1rvpkdssy346aijdb183j6fnpg7wqac2svg19rjnz40rg1sbqs5g"; + name = "kde-l10n-fi-17.08.2.tar.xz"; }; }; kde-l10n-fr = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-fr-17.08.1.tar.xz"; - sha256 = "0dqjr15sg42pp3balfvanl7169nsyqyr67pjw02xzbkskh61jihg"; - name = "kde-l10n-fr-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-fr-17.08.2.tar.xz"; + sha256 = "0i9525dvns41gvgdi3q760fivhjq8c81hsx6rmnp5gxwj2bp8nb9"; + name = "kde-l10n-fr-17.08.2.tar.xz"; }; }; kde-l10n-ga = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ga-17.08.1.tar.xz"; - sha256 = "0lbpbkip2fgml3jni4hllixpzaya5q5xcn3m674a7hs3y7gr35gs"; - name = "kde-l10n-ga-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ga-17.08.2.tar.xz"; + sha256 = "0a7ym789nqjngx0sjirxb19q0wzbh250kwsrjad5nw810syk2k8d"; + name = "kde-l10n-ga-17.08.2.tar.xz"; }; }; kde-l10n-gl = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-gl-17.08.1.tar.xz"; - sha256 = "1bbg7ya85phzxw3rcc2k04rc4axridcqdrkh719ivp7p46m47j28"; - name = "kde-l10n-gl-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-gl-17.08.2.tar.xz"; + sha256 = "1n0f4hs3qkraxc05ga2z4mzr425n5386f5wrd9crsw0pmsm24nm6"; + name = "kde-l10n-gl-17.08.2.tar.xz"; }; }; kde-l10n-he = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-he-17.08.1.tar.xz"; - sha256 = "1h4lzv2i37l2w8af5w2dxan9zancqbqbcvhc5lkngnq2mvlqhwax"; - name = "kde-l10n-he-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-he-17.08.2.tar.xz"; + sha256 = "1bk8ms9jspyphxki8fl2i8fy4b2xsx3bi55fhpah9r10fb3prccx"; + name = "kde-l10n-he-17.08.2.tar.xz"; }; }; kde-l10n-hi = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-hi-17.08.1.tar.xz"; - sha256 = "0zjbchy072gbslmvi894jqa5vlh4brxkqdk5n3b7nh8003f7kvdl"; - name = "kde-l10n-hi-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-hi-17.08.2.tar.xz"; + sha256 = "1wfjj9xdnyq94h5g3054mvwn7vd9v1n1myxclxfqszbym1lp9f6h"; + name = "kde-l10n-hi-17.08.2.tar.xz"; }; }; kde-l10n-hr = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-hr-17.08.1.tar.xz"; - sha256 = "1k4zzn0cwqp6syr82nij26pnhhjiq39pd03lj1m7r83ylmywivxv"; - name = "kde-l10n-hr-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-hr-17.08.2.tar.xz"; + sha256 = "070cbkpvvpxhi2kvmf97wazxn2x7jvrzwadfxwp8r6h1bxgpiq5f"; + name = "kde-l10n-hr-17.08.2.tar.xz"; }; }; kde-l10n-hu = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-hu-17.08.1.tar.xz"; - sha256 = "1jj20ggv96lsfl1vc7gsv3vxwb3swj2bd1v8hyaycc86bw51qfcs"; - name = "kde-l10n-hu-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-hu-17.08.2.tar.xz"; + sha256 = "1g77mh1av10h24hkqim86ik23nqxj6an4r4swzxl3ncibdx1x02f"; + name = "kde-l10n-hu-17.08.2.tar.xz"; }; }; kde-l10n-ia = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ia-17.08.1.tar.xz"; - sha256 = "0b0mp1jdbbarqd3ajc0fmjpq01y3yw37dd0ihs0r9l2v6s1ivrx2"; - name = "kde-l10n-ia-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ia-17.08.2.tar.xz"; + sha256 = "1d83558mvki39sffhrha6z3dgs1giwpbk27yi759fbc4k07w28pv"; + name = "kde-l10n-ia-17.08.2.tar.xz"; }; }; kde-l10n-id = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-id-17.08.1.tar.xz"; - sha256 = "1hdw5cgwmsp6d36jg9a7gnhiywzavrjs644w5gcw8ab2w5kzi725"; - name = "kde-l10n-id-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-id-17.08.2.tar.xz"; + sha256 = "0c1pfxc25izgrikbmp2afmi1j5i9gp9g3hkxn8c1znmwi4a0jp9n"; + name = "kde-l10n-id-17.08.2.tar.xz"; }; }; kde-l10n-is = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-is-17.08.1.tar.xz"; - sha256 = "0p9q8p3rffc79p25frgzk3jykwga3cxcc4icx29672bcy5ri6d3a"; - name = "kde-l10n-is-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-is-17.08.2.tar.xz"; + sha256 = "1jdh25rs37438acxkpb6bmwwyl4z310jv2k4dxcb3f7ml4szkg4k"; + name = "kde-l10n-is-17.08.2.tar.xz"; }; }; kde-l10n-it = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-it-17.08.1.tar.xz"; - sha256 = "1af31vfg6q30rgqfcpmjyk32rlz661azi9r205bbv45nagw5aiyz"; - name = "kde-l10n-it-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-it-17.08.2.tar.xz"; + sha256 = "015wj5xhi3mni6mcc2xv16vn18rmimfzi971jgg8xjd9z7z53fd7"; + name = "kde-l10n-it-17.08.2.tar.xz"; }; }; kde-l10n-ja = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ja-17.08.1.tar.xz"; - sha256 = "1273rm1m3ap8psf8qrvvdw7yh4bn0d90mgi02dk7vqx30j8vk2sx"; - name = "kde-l10n-ja-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ja-17.08.2.tar.xz"; + sha256 = "0vvvq1zfhj3c5xidrvfh372x4azxic3c8lhy43rn4wjalcmhyzi0"; + name = "kde-l10n-ja-17.08.2.tar.xz"; }; }; kde-l10n-kk = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-kk-17.08.1.tar.xz"; - sha256 = "15wkhp673bfs23rxw8wa2q3z0gqm1wblaca0azhmy4fyhgwqaciz"; - name = "kde-l10n-kk-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-kk-17.08.2.tar.xz"; + sha256 = "14vhxnchnlmz8ljh21vdrdirygkgkhmqpnnlmrz9pmqay7r8bzpk"; + name = "kde-l10n-kk-17.08.2.tar.xz"; }; }; kde-l10n-km = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-km-17.08.1.tar.xz"; - sha256 = "1c6bvy3fifdm1azqzdxbwb71pzlp90wn6k981c1ny2cpcmiwd4ps"; - name = "kde-l10n-km-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-km-17.08.2.tar.xz"; + sha256 = "0q82bvy359szsfa423rb3b65wbgnmvyk839blr9pzjp3gvhxiza2"; + name = "kde-l10n-km-17.08.2.tar.xz"; }; }; kde-l10n-ko = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ko-17.08.1.tar.xz"; - sha256 = "0wxnjjdlngpva34izxq7syga4gyfj2jyf1npayzq3ii0hzjarmrq"; - name = "kde-l10n-ko-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ko-17.08.2.tar.xz"; + sha256 = "1v4bjws17mz022n3r49z7rz1pdmqa4dsffj7pm60ixi6p5y3gvk2"; + name = "kde-l10n-ko-17.08.2.tar.xz"; }; }; kde-l10n-lt = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-lt-17.08.1.tar.xz"; - sha256 = "02571m0mnhryy3zggy2bzc2k3q2dqc8kwn49332jsvbmsbkznk6a"; - name = "kde-l10n-lt-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-lt-17.08.2.tar.xz"; + sha256 = "0f09kkaghydq4b0fs59vz4h8q8j84qnqaqqaljc3vq05ih3849n5"; + name = "kde-l10n-lt-17.08.2.tar.xz"; }; }; kde-l10n-lv = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-lv-17.08.1.tar.xz"; - sha256 = "17xhsgqb56al5zyvhllqfnm118fimnchd037649nnkddfpl95wwi"; - name = "kde-l10n-lv-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-lv-17.08.2.tar.xz"; + sha256 = "0aw8lpdh6y126gbwkfm408lz84kwd44wi3ryi5ascxadklmgcydw"; + name = "kde-l10n-lv-17.08.2.tar.xz"; }; }; kde-l10n-mr = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-mr-17.08.1.tar.xz"; - sha256 = "0p8ynpc1ryksb97zl50i23rknsr70p124wpxmr6i1i7aq8jagcqc"; - name = "kde-l10n-mr-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-mr-17.08.2.tar.xz"; + sha256 = "10670r4fmvd1030rnlyl1s1ixiy380jg84h3ayv3m270rydpwn4c"; + name = "kde-l10n-mr-17.08.2.tar.xz"; }; }; kde-l10n-nb = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nb-17.08.1.tar.xz"; - sha256 = "1ikh6fpj5lw4bfpmh8ln1v3mvmd9k55jz3v67ncrfyflljvwv6v7"; - name = "kde-l10n-nb-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nb-17.08.2.tar.xz"; + sha256 = "0cajcnk3clz175y2vhihpj33lcq5qmd0mgcl0srz5n28978v85wk"; + name = "kde-l10n-nb-17.08.2.tar.xz"; }; }; kde-l10n-nds = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nds-17.08.1.tar.xz"; - sha256 = "0g7da58vazj1ckw336hgp7zlp6ra31xdjp0zx6hmwcxjv9as9scy"; - name = "kde-l10n-nds-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nds-17.08.2.tar.xz"; + sha256 = "0r5zpc48sywkqb227kf963p01w1x7r828pr0dsy711h5wwwbnj93"; + name = "kde-l10n-nds-17.08.2.tar.xz"; }; }; kde-l10n-nl = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nl-17.08.1.tar.xz"; - sha256 = "0d059nb4qifpm4bx0akmxn0x9bx6cs5218yh9prqn9wpzaa96vf5"; - name = "kde-l10n-nl-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nl-17.08.2.tar.xz"; + sha256 = "02hz160xsacsbimwqva7f5fp2zk7nnngj349v0vhyx85fk2s5hd7"; + name = "kde-l10n-nl-17.08.2.tar.xz"; }; }; kde-l10n-nn = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nn-17.08.1.tar.xz"; - sha256 = "034570iymirny6di77gxck3j0b1n11v07kj7k80h03smq2gkb6rh"; - name = "kde-l10n-nn-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nn-17.08.2.tar.xz"; + sha256 = "005779r53bfzxrir56nxly5c38bzcjs20y690m3g7y4kfvlyas0d"; + name = "kde-l10n-nn-17.08.2.tar.xz"; }; }; kde-l10n-pa = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pa-17.08.1.tar.xz"; - sha256 = "10872cgamrm39xk5kr4qd5ddzpfpgra1rysj7raw9hr5fw0h5jqx"; - name = "kde-l10n-pa-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pa-17.08.2.tar.xz"; + sha256 = "0475yxyzs6m35hbhk6y68s86sfvwb838ji4ycjwg5164ml6p9x7f"; + name = "kde-l10n-pa-17.08.2.tar.xz"; }; }; kde-l10n-pl = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pl-17.08.1.tar.xz"; - sha256 = "0bvp9mcny4zbcq1pi2d33s0fkdpblg1qrizi3v3jhzmxx1i7hr3w"; - name = "kde-l10n-pl-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pl-17.08.2.tar.xz"; + sha256 = "13v729a2cpp1spk8zlvynf41naifks5skacgdxx7pnz3z5nq34ih"; + name = "kde-l10n-pl-17.08.2.tar.xz"; }; }; kde-l10n-pt = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pt-17.08.1.tar.xz"; - sha256 = "0m61a31iqzwk8wj40rjnx9i662mk3n9q21vh22p7ak9kf9r9kfhv"; - name = "kde-l10n-pt-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pt-17.08.2.tar.xz"; + sha256 = "13v7ahpp9yz197qggq6lwgyln2z4cszk4g46jc9c4qg1wq954cch"; + name = "kde-l10n-pt-17.08.2.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-17.08.1"; + version = "pt_BR-17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pt_BR-17.08.1.tar.xz"; - sha256 = "1kh7rrpx5idnkpd8j89gxkm33kjz808mvb0d6i39lsv8nqk8ifq8"; - name = "kde-l10n-pt_BR-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pt_BR-17.08.2.tar.xz"; + sha256 = "19qd7cm96hjbh4bwgy9r00i7fdzrsivjss00vd502s2620wxj8mh"; + name = "kde-l10n-pt_BR-17.08.2.tar.xz"; }; }; kde-l10n-ro = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ro-17.08.1.tar.xz"; - sha256 = "04b9bjz9nprhiki00b4yffd27dk1vjz6ddjw6bh6bxrzmzg2cgbc"; - name = "kde-l10n-ro-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ro-17.08.2.tar.xz"; + sha256 = "15jyjdvksqvhr7hkkfkb2mp7rkkidq7r15iibphi04d7nf5rgh7h"; + name = "kde-l10n-ro-17.08.2.tar.xz"; }; }; kde-l10n-ru = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ru-17.08.1.tar.xz"; - sha256 = "04zx9xf1ca2pl75rbkcr7fa6sy3kmzdgc626wygqg0s4bi3rlsh2"; - name = "kde-l10n-ru-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ru-17.08.2.tar.xz"; + sha256 = "1vk54wih1bv85ixl4zv229hi7yvfnljndlfaslzfq2ff0r3j5iyf"; + name = "kde-l10n-ru-17.08.2.tar.xz"; }; }; kde-l10n-sk = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sk-17.08.1.tar.xz"; - sha256 = "0q4ykign8mifwfwv56p3ac7bn3ywc9anj43f8n08c7bma4idxv01"; - name = "kde-l10n-sk-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sk-17.08.2.tar.xz"; + sha256 = "0n4j3cp9zh2r2jyy2mksm5qx1xxkb847q8vlx896q26cbzc2sl5k"; + name = "kde-l10n-sk-17.08.2.tar.xz"; }; }; kde-l10n-sl = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sl-17.08.1.tar.xz"; - sha256 = "13mb62fjlpbhyv485rp1f5xgdfqdkq3vm2qq82rbw4jdw140ck08"; - name = "kde-l10n-sl-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sl-17.08.2.tar.xz"; + sha256 = "05dpfmqcdclkkdk58q3dz9h4m5gyfdp0a47pj3wlp8gagn6lrll1"; + name = "kde-l10n-sl-17.08.2.tar.xz"; }; }; kde-l10n-sr = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sr-17.08.1.tar.xz"; - sha256 = "0xc6pgbm3rqn5g824pzfv0cxas6anb3glm11zhk9qhj24ig1zd5c"; - name = "kde-l10n-sr-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sr-17.08.2.tar.xz"; + sha256 = "1yavz6rfymg9ggb8xa7wrhr774482i7l7f110mbxb0hpp0rb37l4"; + name = "kde-l10n-sr-17.08.2.tar.xz"; }; }; kde-l10n-sv = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sv-17.08.1.tar.xz"; - sha256 = "0p067wi30d7vgxsv345vv0f01qbchnffamv4pjv8sfscbcmih9c6"; - name = "kde-l10n-sv-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sv-17.08.2.tar.xz"; + sha256 = "1hznlqyr93zbhp11s4q6x8ad0rscikqdxmgaw9i8h1wjiy926psy"; + name = "kde-l10n-sv-17.08.2.tar.xz"; }; }; kde-l10n-tr = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-tr-17.08.1.tar.xz"; - sha256 = "15x2r21810mndzzqx5cz1z6a6g7czmp2wiw8hw89g6nigq3qvacx"; - name = "kde-l10n-tr-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-tr-17.08.2.tar.xz"; + sha256 = "1mmi73sfrzqhwwj2pb7p1bklm0cgprs8mg73k7v1nvzxfj5mm3xl"; + name = "kde-l10n-tr-17.08.2.tar.xz"; }; }; kde-l10n-ug = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ug-17.08.1.tar.xz"; - sha256 = "1bpd63jv8dlikg3589in5h11ydkpwp5mq69vlam9z68bmbl5sy5w"; - name = "kde-l10n-ug-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ug-17.08.2.tar.xz"; + sha256 = "0b4qzcp08y6hv7184sxl305rl92y38h68ljs7kbmszggy33fw0xq"; + name = "kde-l10n-ug-17.08.2.tar.xz"; }; }; kde-l10n-uk = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-uk-17.08.1.tar.xz"; - sha256 = "1yaynm508g03gn896q3zrw8y5rn4l7m8a2x2skwyjzfxy8pk4az9"; - name = "kde-l10n-uk-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-uk-17.08.2.tar.xz"; + sha256 = "1jvrkc765s0dmbbh6yrfwp0nq3zr8kirp88ddnxv1jn4xk1wj60c"; + name = "kde-l10n-uk-17.08.2.tar.xz"; }; }; kde-l10n-wa = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-wa-17.08.1.tar.xz"; - sha256 = "0247pwdizs31jhrjx6kfydgkr2ghqnqsdza10a7mggz825mgg2hv"; - name = "kde-l10n-wa-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-wa-17.08.2.tar.xz"; + sha256 = "1jnca594pbvhm6bpqkpaibpn3bh1ady1px1cjqljm3v2173gqgsh"; + name = "kde-l10n-wa-17.08.2.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-17.08.1"; + version = "zh_CN-17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-zh_CN-17.08.1.tar.xz"; - sha256 = "0a58ikf8pkxhqr25cy04s5hwhdkp81y3304wa6xcni2k5vlzca9f"; - name = "kde-l10n-zh_CN-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-zh_CN-17.08.2.tar.xz"; + sha256 = "1szwwhd5jsafbnma968crz7x3l6r56qyx253119c0v7hribh2lh0"; + name = "kde-l10n-zh_CN-17.08.2.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-17.08.1"; + version = "zh_TW-17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-zh_TW-17.08.1.tar.xz"; - sha256 = "02lkg354vq3sqvy4iib51yynjb5yx0hsqh1alik97wajawv4fkrc"; - name = "kde-l10n-zh_TW-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-zh_TW-17.08.2.tar.xz"; + sha256 = "1v4qlh63l02689mjbxq3q6ljpij1ryr0z51lmymab65bk7vxh2mw"; + name = "kde-l10n-zh_TW-17.08.2.tar.xz"; }; }; kdelibs = { - version = "4.14.36"; + version = "4.14.37"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdelibs-4.14.36.tar.xz"; - sha256 = "08x5frbbgib9agn9ixslpx41wki8ky4l1r60xrl2pmywmwld4ag1"; - name = "kdelibs-4.14.36.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdelibs-4.14.37.tar.xz"; + sha256 = "0c74yg01r802j5jwl270w9sfkkhsn2fz26xhk5w44a1gycdlm7jf"; + name = "kdelibs-4.14.37.tar.xz"; }; }; kdenetwork-filesharing = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdenetwork-filesharing-17.08.1.tar.xz"; - sha256 = "1m79c4ww25gcx4aiwjwp81r18i8s2x6afpp76xi2am6v4sd8rjb3"; - name = "kdenetwork-filesharing-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdenetwork-filesharing-17.08.2.tar.xz"; + sha256 = "0pz2zblg8hly141xkcrqs6hnv76zq5isbvyzdad6sjngjn4spcyc"; + name = "kdenetwork-filesharing-17.08.2.tar.xz"; }; }; kdenlive = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdenlive-17.08.1.tar.xz"; - sha256 = "0cj618pjkack3wj66nbq4src460la5qryylblswg2nzm0svqawqh"; - name = "kdenlive-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdenlive-17.08.2.tar.xz"; + sha256 = "0a0qadvxy9b2drpj2k163wfg73020qfclkl47krqgrn2mdvibr92"; + name = "kdenlive-17.08.2.tar.xz"; }; }; kdepim-addons = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdepim-addons-17.08.1.tar.xz"; - sha256 = "105b8pf9g44b5fz8vy404jiysz7sccvllz0bvhi9ihv7a3g4gihg"; - name = "kdepim-addons-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdepim-addons-17.08.2.tar.xz"; + sha256 = "036zs71aqr749n2cjv61y1xhgg16lsh07lx1kdqcqwyi8qgk7c1m"; + name = "kdepim-addons-17.08.2.tar.xz"; }; }; kdepim-apps-libs = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdepim-apps-libs-17.08.1.tar.xz"; - sha256 = "000gmblsgyzgml6h4v3ccr2n0n7s359rb91higiyrzkxi1cq0bh8"; - name = "kdepim-apps-libs-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdepim-apps-libs-17.08.2.tar.xz"; + sha256 = "14m7qxvpfdq53amigysqj4y26j8y8c45j7k4j9gv90amlh716ss1"; + name = "kdepim-apps-libs-17.08.2.tar.xz"; }; }; kdepim-runtime = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdepim-runtime-17.08.1.tar.xz"; - sha256 = "0q19j5dr0lml9v88ma32vqypi3jzg2dkjzv9adl48k9d2yrywq5n"; - name = "kdepim-runtime-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdepim-runtime-17.08.2.tar.xz"; + sha256 = "0yvrgi8rgwpvzkhzc5zdqyhqxs0czfqqc4dsgprg27a06lb7i3lz"; + name = "kdepim-runtime-17.08.2.tar.xz"; }; }; kde-runtime = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kde-runtime-17.08.1.tar.xz"; - sha256 = "0gl24dpkxbkjq7kqj2i022w82daihxnyi2ccld0ql9680w73s3zg"; - name = "kde-runtime-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kde-runtime-17.08.2.tar.xz"; + sha256 = "00bjnbpx2lbjl7nz9z118yanwqmgjmy0nvq4bgxz7i4b68aw17xb"; + name = "kde-runtime-17.08.2.tar.xz"; }; }; kdesdk-kioslaves = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdesdk-kioslaves-17.08.1.tar.xz"; - sha256 = "10nz2ai5iahva93psw1dd86npwcp5xlx80n12biwqfgwj5d380k8"; - name = "kdesdk-kioslaves-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdesdk-kioslaves-17.08.2.tar.xz"; + sha256 = "0h1bv0dbi3a8b1q5dj999k28llckgxsf8055fw5fsbx6q2h0rq23"; + name = "kdesdk-kioslaves-17.08.2.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdesdk-thumbnailers-17.08.1.tar.xz"; - sha256 = "11d7vch9fc5w42wlq8bz3wpb68sjslvvqpqs67d155w682z1q4q1"; - name = "kdesdk-thumbnailers-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdesdk-thumbnailers-17.08.2.tar.xz"; + sha256 = "0z20hc8ssw439sdc8w2fzkaihzcag8sflymizwgf6x8c7awi4y2v"; + name = "kdesdk-thumbnailers-17.08.2.tar.xz"; }; }; kdf = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdf-17.08.1.tar.xz"; - sha256 = "09sjv6z5565mvgnicwaykisgrh859m7h8wfggmqs3rgldsi3iy0p"; - name = "kdf-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdf-17.08.2.tar.xz"; + sha256 = "0pfw8br46475h2v34nc0pnz94icrlivc3xcaxrf3w6x0wypmnhxs"; + name = "kdf-17.08.2.tar.xz"; }; }; kdialog = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdialog-17.08.1.tar.xz"; - sha256 = "1j5ahq4xksl0jrxcisai0mnk6vr126qbabd9hnwq491f419l3zh1"; - name = "kdialog-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdialog-17.08.2.tar.xz"; + sha256 = "03lb5h8lbravayx5fddbzb6xgi9dabcyqpld3h32ykw4v26wlb1v"; + name = "kdialog-17.08.2.tar.xz"; }; }; kdiamond = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kdiamond-17.08.1.tar.xz"; - sha256 = "07is91glcffrznsg72drmyqmz3lyki62g6ijc14x5i7k8v26nlhi"; - name = "kdiamond-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kdiamond-17.08.2.tar.xz"; + sha256 = "1fkldch162m4awk6j7xx61lh8h9i5cb9x38gndz4imvwmyvfqijn"; + name = "kdiamond-17.08.2.tar.xz"; }; }; keditbookmarks = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/keditbookmarks-17.08.1.tar.xz"; - sha256 = "1k18if8ssjwj8mgp2jgxxwa8hh6x5w402i8fb2nsc7b4khw02y9q"; - name = "keditbookmarks-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/keditbookmarks-17.08.2.tar.xz"; + sha256 = "0dfyp8macmqhczk7b60dc15wqw8wzpbp6wlm6cdibdw7hlia9hfl"; + name = "keditbookmarks-17.08.2.tar.xz"; }; }; kfilereplace = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kfilereplace-17.08.1.tar.xz"; - sha256 = "1ra01im1yp5k73m2hyz72d73qhwv3by1zyipn4l1m2m4r62kwjcr"; - name = "kfilereplace-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kfilereplace-17.08.2.tar.xz"; + sha256 = "02iwzcn5lm1riv1pg9d5s20q60f569qpx1wdbz1181r6806fsi37"; + name = "kfilereplace-17.08.2.tar.xz"; }; }; kfind = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kfind-17.08.1.tar.xz"; - sha256 = "114l6b081ddxx51ndkqjl9jnvy00nyydn245y1kskfbzk2yry1jb"; - name = "kfind-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kfind-17.08.2.tar.xz"; + sha256 = "06c3ba95h6lzfwlj4svwlrijbv0d8c5siljiradiam65zai2bfpd"; + name = "kfind-17.08.2.tar.xz"; }; }; kfloppy = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kfloppy-17.08.1.tar.xz"; - sha256 = "1afnlbk42g6sm7y7xkqnxr24mz2s95qkaap2s3zqc469gj1vlnxa"; - name = "kfloppy-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kfloppy-17.08.2.tar.xz"; + sha256 = "0icvsbxcxxg8lyzvzbga34an968gzwpd23zssbfy8flym95ci890"; + name = "kfloppy-17.08.2.tar.xz"; }; }; kfourinline = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kfourinline-17.08.1.tar.xz"; - sha256 = "12cy3sarcy361wivlbpx2cxc2yaffr2xfy4dwz3iz6vzx49mhyky"; - name = "kfourinline-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kfourinline-17.08.2.tar.xz"; + sha256 = "1d4bfl81v4v512ixi1vbfbvz8vbmn1acfxjazlhk8xjjj0ky3yb2"; + name = "kfourinline-17.08.2.tar.xz"; }; }; kgeography = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kgeography-17.08.1.tar.xz"; - sha256 = "1mjfacc850pqsgylwfcvp7yv0c4f1qgk0y7pgwrx2nspf8i1wwhc"; - name = "kgeography-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kgeography-17.08.2.tar.xz"; + sha256 = "16fgkp16bhpcibf8q0ivp9zsw8ws44icg34c3r8p5fbggfnkzqk6"; + name = "kgeography-17.08.2.tar.xz"; }; }; kget = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kget-17.08.1.tar.xz"; - sha256 = "182l5hd5hfbpl88p9yzc54n8m0mi2fffp19sjdhhadmyx142inc1"; - name = "kget-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kget-17.08.2.tar.xz"; + sha256 = "1n6ky1bvr24hj3d6s1lfmyybr73q9p59w80fpzbx5v8c8l2g40w0"; + name = "kget-17.08.2.tar.xz"; }; }; kgoldrunner = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kgoldrunner-17.08.1.tar.xz"; - sha256 = "0rzhg7hk07yaghflskiz4wh5d3jdfvhzig3zyyhimwir90lj1gxx"; - name = "kgoldrunner-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kgoldrunner-17.08.2.tar.xz"; + sha256 = "085ydmcmaiahzq32gasc5ihbxg25glpc9alqzhd4flzvqf646xmx"; + name = "kgoldrunner-17.08.2.tar.xz"; }; }; kgpg = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kgpg-17.08.1.tar.xz"; - sha256 = "1hcg9zv4f2bj1210fahxap1fnyk7zdj3gfpfpdrww6qga5z4dzcy"; - name = "kgpg-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kgpg-17.08.2.tar.xz"; + sha256 = "1nrz2p6h13wi4vk4mrpcjkksrr6brj1aap4mf1rpj0g1mhrhwqly"; + name = "kgpg-17.08.2.tar.xz"; }; }; khangman = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/khangman-17.08.1.tar.xz"; - sha256 = "17xk64lclbw2gcpnfpzi9sqryr8wl8g1v19gqrplvq4zw7qfanr5"; - name = "khangman-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/khangman-17.08.2.tar.xz"; + sha256 = "17qmsixr4ic86imdrw0z9lyjhnw00ycnxyyrzb736cw7s4jnnick"; + name = "khangman-17.08.2.tar.xz"; }; }; khelpcenter = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/khelpcenter-17.08.1.tar.xz"; - sha256 = "1js7sk1hdp3k7d4gjk8rzq5rw1al8bh0ap5irw5551kvbagm5dp4"; - name = "khelpcenter-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/khelpcenter-17.08.2.tar.xz"; + sha256 = "0n4rdw606rhc3fs7kqg28dh8ay7q3ihiaraay8by3bk5dqby8r8k"; + name = "khelpcenter-17.08.2.tar.xz"; }; }; kholidays = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kholidays-17.08.1.tar.xz"; - sha256 = "0gsvidakx0q0wqy2bgwq339hwghdcl882nvzj445hnmy10r2d6jk"; - name = "kholidays-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kholidays-17.08.2.tar.xz"; + sha256 = "03acmrw577lbs5h8az4wiw0dlmxmjiqak8pvm7w0ssmd2mrkggl2"; + name = "kholidays-17.08.2.tar.xz"; }; }; kidentitymanagement = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kidentitymanagement-17.08.1.tar.xz"; - sha256 = "1ippkav5nvfckp4145gcwa2hdl7zjw8bcaq6af5kcxqmvlcndvwv"; - name = "kidentitymanagement-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kidentitymanagement-17.08.2.tar.xz"; + sha256 = "1ylv4qcsry9m8zjddgpxb93yfmzbf0aikvf4m7j040272z2as6q9"; + name = "kidentitymanagement-17.08.2.tar.xz"; }; }; kig = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kig-17.08.1.tar.xz"; - sha256 = "0gzfdpi4qlmwg6hkx1slvnxlynsfgwv18a9law05hg35hs6zxzfk"; - name = "kig-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kig-17.08.2.tar.xz"; + sha256 = "19jm98rlfvzsqip8vdi8gf1hynfkizjn61j4p1srgaciffx5l8zb"; + name = "kig-17.08.2.tar.xz"; }; }; kigo = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kigo-17.08.1.tar.xz"; - sha256 = "0c498rzvmfkl0q5hnhddlx38qwyzsz4lh05cy5v4zpq8idvnxzj5"; - name = "kigo-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kigo-17.08.2.tar.xz"; + sha256 = "04qlqghgnnyqcvc1f3s4l9as4pma1g09jdgy48jwxlbg1h60m48z"; + name = "kigo-17.08.2.tar.xz"; }; }; killbots = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/killbots-17.08.1.tar.xz"; - sha256 = "0yay6pr83rh5slklmxvw3jr2bky7k5cgf55a8r6al5b4vsx2802r"; - name = "killbots-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/killbots-17.08.2.tar.xz"; + sha256 = "1xpigas92xn911jm0zrq47hpnxxr4lb9bvv9f5b6i7k9z8p9m8zl"; + name = "killbots-17.08.2.tar.xz"; }; }; kimagemapeditor = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kimagemapeditor-17.08.1.tar.xz"; - sha256 = "158vrszvz2acnbzvmjprg1j2knarffvg8awwjcfg3zn2i6arwwsg"; - name = "kimagemapeditor-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kimagemapeditor-17.08.2.tar.xz"; + sha256 = "13z3z4pjgky4bh5js79rnsbzcxj0ksh4wdqx3fgmjs5mzbaka5gg"; + name = "kimagemapeditor-17.08.2.tar.xz"; }; }; kimap = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kimap-17.08.1.tar.xz"; - sha256 = "1vch7y153jg010mcz7qjxjp6f3gfxrczbfh3bvx8q70cqfmx7ssm"; - name = "kimap-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kimap-17.08.2.tar.xz"; + sha256 = "0klpqy092hfqrvmm4nx3blwjnkybhg9zji500ckid90kv547ffmb"; + name = "kimap-17.08.2.tar.xz"; }; }; kio-extras = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kio-extras-17.08.1.tar.xz"; - sha256 = "1hk09yavrr1dqvxjsdg9rmn6j8jzczhnfyn71hyfbglshvlhwm8m"; - name = "kio-extras-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kio-extras-17.08.2.tar.xz"; + sha256 = "1pblk8vi2gcvyjw71pwihpd9n4qlhcksfs3py8mcll1pz2ijbz6n"; + name = "kio-extras-17.08.2.tar.xz"; }; }; kiriki = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kiriki-17.08.1.tar.xz"; - sha256 = "0cxmxxwn6ps00kf64z61r3k7iyr5falrbzmf6gz19m535b79drhi"; - name = "kiriki-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kiriki-17.08.2.tar.xz"; + sha256 = "1w83ggi02ibhgsmyw5s9cnjjqgx0zwbakf42l1dif9882svg38h7"; + name = "kiriki-17.08.2.tar.xz"; }; }; kiten = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kiten-17.08.1.tar.xz"; - sha256 = "1yp2r5linfkknvn5dx4vf2f6vxg3kzrpiqsrg34q957wvfsc91qm"; - name = "kiten-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kiten-17.08.2.tar.xz"; + sha256 = "0rdkwv4njdpv1air697gwlzx843ddqwa7kl15i012307jfgkbkj4"; + name = "kiten-17.08.2.tar.xz"; }; }; kjumpingcube = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kjumpingcube-17.08.1.tar.xz"; - sha256 = "161px7wad80a3p6hr27dj0990jb7j143q77q7ca308qysmffghnz"; - name = "kjumpingcube-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kjumpingcube-17.08.2.tar.xz"; + sha256 = "0q4y35ffq48yc2h843vv970rg4h8miy5pbsxkkrflwljcarwxv65"; + name = "kjumpingcube-17.08.2.tar.xz"; }; }; kldap = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kldap-17.08.1.tar.xz"; - sha256 = "11j0ai0y022xxgiw7ac5cgv8vqb3qa1dbh7n9jqz9lg8rhjch2ix"; - name = "kldap-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kldap-17.08.2.tar.xz"; + sha256 = "1p0ydrhji8cb4fmciyazy44d2nz6mhcl1brqn4ridv98hqa2ybpc"; + name = "kldap-17.08.2.tar.xz"; }; }; kleopatra = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kleopatra-17.08.1.tar.xz"; - sha256 = "1z32xwlsslhzqzsq8ngdws1ry56myvx8j56b973scbhd29z15www"; - name = "kleopatra-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kleopatra-17.08.2.tar.xz"; + sha256 = "0g5qg0kg1d0cza3689ppvj4hdhqdsxjcn8hc9cfpsapz28is8yk4"; + name = "kleopatra-17.08.2.tar.xz"; }; }; klettres = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/klettres-17.08.1.tar.xz"; - sha256 = "0s7n83smr4mrrs91bpyr3hk2s1sl3ix73scnllb6spb6gx5hhr13"; - name = "klettres-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/klettres-17.08.2.tar.xz"; + sha256 = "1n1z4nj3rqiyqz0ysr6fvhygayvxfyljg3z6f0y6f70n9r5n999m"; + name = "klettres-17.08.2.tar.xz"; }; }; klickety = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/klickety-17.08.1.tar.xz"; - sha256 = "0zp836x7ssgk7y5fcni7ya9cfdc28ywgvlzc01f7bi7pwh57q50x"; - name = "klickety-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/klickety-17.08.2.tar.xz"; + sha256 = "1haqc96jivnb93vhzmd9kp446p32gmkpf5zys5ix20r6lbsywgd9"; + name = "klickety-17.08.2.tar.xz"; }; }; klines = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/klines-17.08.1.tar.xz"; - sha256 = "069igz40zrwbnyvw53d59rksn2n3dxycysb9fakb165qr27kb42h"; - name = "klines-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/klines-17.08.2.tar.xz"; + sha256 = "1v5gqyyc6vl3s44w9v34q0g27fxf85kkk9i188j48q0kiblbxq8d"; + name = "klines-17.08.2.tar.xz"; }; }; klinkstatus = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/klinkstatus-17.08.1.tar.xz"; - sha256 = "11fakg10rlf4finznc2i5h1lbh1qq37wvzd93yc8vdwax98pps44"; - name = "klinkstatus-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/klinkstatus-17.08.2.tar.xz"; + sha256 = "1nfflb850mr1cd065lwryx6rd47w5bamg7sznvrhzjzqzrq6sm0x"; + name = "klinkstatus-17.08.2.tar.xz"; }; }; kmag = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmag-17.08.1.tar.xz"; - sha256 = "1y69rsdl9pz11xrbfg8p0ihm1691y3blb5jay0v228prbwsy2gn3"; - name = "kmag-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmag-17.08.2.tar.xz"; + sha256 = "16i4cysa77dmxvkhpvhja4v315nnj1i5m9pd8a62j32gkrq54cpr"; + name = "kmag-17.08.2.tar.xz"; }; }; kmahjongg = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmahjongg-17.08.1.tar.xz"; - sha256 = "17f57shs79pbwdaqblb4i9ibs3b4psy38ys69i8k5j04v7mam48s"; - name = "kmahjongg-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmahjongg-17.08.2.tar.xz"; + sha256 = "06f0wrjnlqgsh4n5kf7by5calrg2p0chm0c5b6wf4k311wb1cy65"; + name = "kmahjongg-17.08.2.tar.xz"; }; }; kmail = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmail-17.08.1.tar.xz"; - sha256 = "1c3yds59nssnqi0pxb6fjajq6yaj6ki7l83gj59wlmpsyc1nm15d"; - name = "kmail-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmail-17.08.2.tar.xz"; + sha256 = "0fxxys8fxal6f4grbnl5niwf80kg62zymlbsp3hk7iihis6zqq59"; + name = "kmail-17.08.2.tar.xz"; }; }; kmail-account-wizard = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmail-account-wizard-17.08.1.tar.xz"; - sha256 = "1vipb6330p67g4qpx2g1ps0fxnqb8w1agfwxnv61k3fccxpr4gkw"; - name = "kmail-account-wizard-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmail-account-wizard-17.08.2.tar.xz"; + sha256 = "1qf78p18pfyl7axm447q8zcrji53h6mvahampkqgmsybp35c7fd7"; + name = "kmail-account-wizard-17.08.2.tar.xz"; }; }; kmailtransport = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmailtransport-17.08.1.tar.xz"; - sha256 = "1r8xbccijiw5v92qq18rccvsdn87m8mwc6g53k8gxpjx37vxrba8"; - name = "kmailtransport-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmailtransport-17.08.2.tar.xz"; + sha256 = "0gzvvszwaqpckig8293m734gbyzx5v8sl9k9n1hi1cnwblsnn7aj"; + name = "kmailtransport-17.08.2.tar.xz"; }; }; kmbox = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmbox-17.08.1.tar.xz"; - sha256 = "0bgjj69by4c11z7j7v7inx4gzcsn6106r28n1ds6lc1k0vv8zw2d"; - name = "kmbox-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmbox-17.08.2.tar.xz"; + sha256 = "01ip8j5yj09gzzgynjqnxxxyv5d69rnnvq8mgwnpm6cxyh7lc8pv"; + name = "kmbox-17.08.2.tar.xz"; }; }; kmime = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmime-17.08.1.tar.xz"; - sha256 = "178bx5pasrrlqwzjz85ba06gs9r40prwk7z4v6ar6fr9q4pa088c"; - name = "kmime-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmime-17.08.2.tar.xz"; + sha256 = "1ai3czsl60rf0sqqbmvr34nz5q2dz7i5y818rrar52r7fdn93wba"; + name = "kmime-17.08.2.tar.xz"; }; }; kmines = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmines-17.08.1.tar.xz"; - sha256 = "1al98mzy8jrp17vq4j7np1bl5j9sd79drh78zd0343mrcqa7js28"; - name = "kmines-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmines-17.08.2.tar.xz"; + sha256 = "0k563bsd0yczcm4h5wvq2f5i029ah9wwv2f0qjwyrbzqxcl50xi0"; + name = "kmines-17.08.2.tar.xz"; }; }; kmix = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmix-17.08.1.tar.xz"; - sha256 = "1w783p49zgsj52cy3mv4zgvh8f55mdij2drzgk3qr510wsyf0cg5"; - name = "kmix-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmix-17.08.2.tar.xz"; + sha256 = "06rqnlrl2l91inllzn8jksg74sldjyghjg06vv49ly6jqyc04aqh"; + name = "kmix-17.08.2.tar.xz"; }; }; kmousetool = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmousetool-17.08.1.tar.xz"; - sha256 = "09rjvnp7f16d6cg3d5p1ah184j7710mziiiz5r0zxq7vdnkvxzlh"; - name = "kmousetool-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmousetool-17.08.2.tar.xz"; + sha256 = "1y568g0s88h0i67j9x083nqj7nyfsn4vyb149j97fm7d4iifbm2s"; + name = "kmousetool-17.08.2.tar.xz"; }; }; kmouth = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmouth-17.08.1.tar.xz"; - sha256 = "07s3fqybprw7gprksc271pspnh81yawm5prrz0lif2awvc7wp7pm"; - name = "kmouth-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmouth-17.08.2.tar.xz"; + sha256 = "0qbbqb0wb3pzz7xv6jvghm2fmgxkvwmyiyjc9m1yzbmrdzqj1rig"; + name = "kmouth-17.08.2.tar.xz"; }; }; kmplot = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kmplot-17.08.1.tar.xz"; - sha256 = "1gxhfkjdsrf8klqhqji6yzv9g4sdjcjhmyvx5j71wmrdc6pdpkpf"; - name = "kmplot-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kmplot-17.08.2.tar.xz"; + sha256 = "1ccnlbgzvx2b1sdzrvzpmnnk4g8r7rvpczm1xjyk62r7mdbffp97"; + name = "kmplot-17.08.2.tar.xz"; }; }; knavalbattle = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/knavalbattle-17.08.1.tar.xz"; - sha256 = "187n5kn5ri87a98rybsf4g5jcwvyxdnb4601iaaf4jb6rg3yf2pm"; - name = "knavalbattle-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/knavalbattle-17.08.2.tar.xz"; + sha256 = "1b0s28ybl1p62issc3rvl41zhn94y0y9aflpqkjfg6592zjc304g"; + name = "knavalbattle-17.08.2.tar.xz"; }; }; knetwalk = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/knetwalk-17.08.1.tar.xz"; - sha256 = "10kjsw94yzz82af3adk9shm67kbg8f8p0xmh60jr97cm1lvz5186"; - name = "knetwalk-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/knetwalk-17.08.2.tar.xz"; + sha256 = "0b9zqa3xgwkcfrnyxd026vd47hpf9i7j5xmx1b756rqm9yr531r5"; + name = "knetwalk-17.08.2.tar.xz"; }; }; knotes = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/knotes-17.08.1.tar.xz"; - sha256 = "0654fxaiyvhfxjyfaw9hgvv352xkix2ls7wlvyw5b15d9iqa5cl0"; - name = "knotes-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/knotes-17.08.2.tar.xz"; + sha256 = "02i25f43dwmlwx1yhhws0zvrvqf92zhw8868hbfxz0y1lq04navx"; + name = "knotes-17.08.2.tar.xz"; }; }; kolf = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kolf-17.08.1.tar.xz"; - sha256 = "0cmqpyd157b3n3x18d6wiijyvjaavxp65nagw2r0prjz9dckd1cl"; - name = "kolf-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kolf-17.08.2.tar.xz"; + sha256 = "1m0dn1v68y7vsranlv690hx3dyffzkjmnqzbvyaad72kldq0qw0l"; + name = "kolf-17.08.2.tar.xz"; }; }; kollision = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kollision-17.08.1.tar.xz"; - sha256 = "00chxdib0ym5x94pzgfg3zx2lixf9h5b7sfcbg0chvjlc8imfv2b"; - name = "kollision-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kollision-17.08.2.tar.xz"; + sha256 = "01z6yfr882hh00bga3iwcyiwxzyigxc2ddd6r8a3s6h7cpi4ik1x"; + name = "kollision-17.08.2.tar.xz"; }; }; kolourpaint = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kolourpaint-17.08.1.tar.xz"; - sha256 = "18cf856r66gwdf149zyam53p0sqvm0bf5f0k0n62mkp80z76kbvm"; - name = "kolourpaint-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kolourpaint-17.08.2.tar.xz"; + sha256 = "15bfzw03dh40m51fh1zwbrzqb5g2qjryznaaymjmzamgx08ldm4n"; + name = "kolourpaint-17.08.2.tar.xz"; }; }; kompare = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kompare-17.08.1.tar.xz"; - sha256 = "1whsbz99cdnivq6m7irvnj0vcq82s34z9mgzd4a50z3i7ms5hmvf"; - name = "kompare-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kompare-17.08.2.tar.xz"; + sha256 = "1l2rdv8sddhf2z0vnn591aarzq5nqbhi58cnnpdwb5px99kasnyv"; + name = "kompare-17.08.2.tar.xz"; }; }; konqueror = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/konqueror-17.08.1.tar.xz"; - sha256 = "1plq38ap1gdjq1s02s3km3pg8l2cgx0mkicb5jldz02qxj4z8rgy"; - name = "konqueror-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/konqueror-17.08.2.tar.xz"; + sha256 = "1c0fpbjba9bq515v3vbzj80jclx8kcy9khzvgaxasdmd9d01yvid"; + name = "konqueror-17.08.2.tar.xz"; }; }; konquest = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/konquest-17.08.1.tar.xz"; - sha256 = "01ps82zkd95w06im3x7cazwbn2m4xbr80ky16gd71v3sdgg5zpw7"; - name = "konquest-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/konquest-17.08.2.tar.xz"; + sha256 = "15mmavbkndzzfa3zzsqxh53wi2489dqr8iw25iaj3pcbjzkn75rd"; + name = "konquest-17.08.2.tar.xz"; }; }; konsole = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/konsole-17.08.1.tar.xz"; - sha256 = "00rrwk6i0ngg07md84bkfggdmmfknkpxiqbv37pb7xis1rvz9c8p"; - name = "konsole-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/konsole-17.08.2.tar.xz"; + sha256 = "0a7ks2an76jwkapy9rjhf29q9h4z212yf9bvx5757lj5qn5pwxq2"; + name = "konsole-17.08.2.tar.xz"; }; }; kontact = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kontact-17.08.1.tar.xz"; - sha256 = "1z0mqnb6567xmx7shv7v60yb2cj6wh3ndqdd9nqxp12371mgm6i0"; - name = "kontact-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kontact-17.08.2.tar.xz"; + sha256 = "19hkppf2jwky73v73j4c2ppah7va4yrsv40ivw50k51s68s60b4a"; + name = "kontact-17.08.2.tar.xz"; }; }; kontactinterface = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kontactinterface-17.08.1.tar.xz"; - sha256 = "09mpmdc65lm14s6hg1yq68i1wrawss0hl002bg9apgy2rfdk34k1"; - name = "kontactinterface-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kontactinterface-17.08.2.tar.xz"; + sha256 = "1gws8vl7s8jyqqbb37yw6gn85sqpfra8jzmin53j4wj4s8rdir5y"; + name = "kontactinterface-17.08.2.tar.xz"; }; }; kopete = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kopete-17.08.1.tar.xz"; - sha256 = "1inbw80a2mwfc2id12qn0as4l52hz3wfcvzcz3n4p393g0qfz8an"; - name = "kopete-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kopete-17.08.2.tar.xz"; + sha256 = "01km2qsf12z8sbsbg8d4ng9izaphlsfqhr29dqryf1kqrwcv6amb"; + name = "kopete-17.08.2.tar.xz"; }; }; korganizer = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/korganizer-17.08.1.tar.xz"; - sha256 = "0q35fyqxgwp5jv2qnpcjhfs1rkyp1jjrpmi28kqh93l04njmwvc0"; - name = "korganizer-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/korganizer-17.08.2.tar.xz"; + sha256 = "1anmc4bfd8pdf22vprw3x82fi2f19wh7xy5xwf144kqhwbyqk7ch"; + name = "korganizer-17.08.2.tar.xz"; }; }; kpat = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kpat-17.08.1.tar.xz"; - sha256 = "1bqqm5gb6mc1v8h524qnz2rfcplvz6v87gvc0jg3zcqjf2c4xn4y"; - name = "kpat-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kpat-17.08.2.tar.xz"; + sha256 = "09ck09ywhl2ywlv90ipgxs45xiwcc3sxvfmgviqxvky513kkx7mn"; + name = "kpat-17.08.2.tar.xz"; }; }; kpimtextedit = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kpimtextedit-17.08.1.tar.xz"; - sha256 = "16ymcccfn8pw098gr6b2k1xvwinhnx8c3npawy9fiqg138a4bkh9"; - name = "kpimtextedit-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kpimtextedit-17.08.2.tar.xz"; + sha256 = "15w338kwdrkag08zyg8dzkwfg25zh67bbwsfxa6ra40hdj1azz8p"; + name = "kpimtextedit-17.08.2.tar.xz"; }; }; kppp = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kppp-17.08.1.tar.xz"; - sha256 = "0783rn2gzgxscnfbins0drl8j8ka0lxyg3787v9778d5993fafpf"; - name = "kppp-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kppp-17.08.2.tar.xz"; + sha256 = "016rgayrxccmvn7pw40x12dv3qi781m2rbcbz8lkprdglzzavfrz"; + name = "kppp-17.08.2.tar.xz"; }; }; kqtquickcharts = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kqtquickcharts-17.08.1.tar.xz"; - sha256 = "1zym0lcim41krv1irdfvkfb4simymairqq2cp2kiagrp3ssz28km"; - name = "kqtquickcharts-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kqtquickcharts-17.08.2.tar.xz"; + sha256 = "186rqlwjpa43z9qi8m2xkyc739plq7cmvn6jkzgl4k21pkfbgx9f"; + name = "kqtquickcharts-17.08.2.tar.xz"; }; }; krdc = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/krdc-17.08.1.tar.xz"; - sha256 = "1lfh7w05b19bzdfmxydb0s55zgbizsh8j8vjblgsn2vihgm2f8lp"; - name = "krdc-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/krdc-17.08.2.tar.xz"; + sha256 = "1yv8z3hhhwrcy58lkaifnqkq38p9gs9sc6dhd3i6fpn1bci1j72a"; + name = "krdc-17.08.2.tar.xz"; }; }; kremotecontrol = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kremotecontrol-17.08.1.tar.xz"; - sha256 = "1b146xb9dnq97lswb0qnppcgjbw5vwy1y9za2k0kl3bhfvxd4qj2"; - name = "kremotecontrol-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kremotecontrol-17.08.2.tar.xz"; + sha256 = "0f31zbf7yc59jvdm7ivb0g7wwh5mmdk26kyjqw8dg46hg29k1p79"; + name = "kremotecontrol-17.08.2.tar.xz"; }; }; kreversi = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kreversi-17.08.1.tar.xz"; - sha256 = "17y2iihszjshln2hwxp6nqz30iln79mwmfv8yb2bydchdy05g807"; - name = "kreversi-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kreversi-17.08.2.tar.xz"; + sha256 = "1zrhaxnkjirkwjmbqjpagx6jijqdvb8khfhv7pwxij2q5ia9k7d8"; + name = "kreversi-17.08.2.tar.xz"; }; }; krfb = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/krfb-17.08.1.tar.xz"; - sha256 = "1dwyx0jdg0i64pxd7phm1kq7fyaj7jls8w08sfgq3730s4s59lfj"; - name = "krfb-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/krfb-17.08.2.tar.xz"; + sha256 = "1554ziphhwck62cyfq60nwiivxb9vvc7l03iz5ncwj1apgmrj9m8"; + name = "krfb-17.08.2.tar.xz"; }; }; kross-interpreters = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kross-interpreters-17.08.1.tar.xz"; - sha256 = "0hzsn1kjcpy2vbqx9sxhxbz4p67wcmv6agg932iavv2hi7731j14"; - name = "kross-interpreters-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kross-interpreters-17.08.2.tar.xz"; + sha256 = "0g5p25s1r1i60dlgsh9kwpq851cxhmprj6z00b91z6hj46v2zzx8"; + name = "kross-interpreters-17.08.2.tar.xz"; }; }; kruler = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kruler-17.08.1.tar.xz"; - sha256 = "1qmlhc35vhbzfllz6wrssr62d3s3xdq15s5rkpm3w05a70bilpyq"; - name = "kruler-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kruler-17.08.2.tar.xz"; + sha256 = "0c1sdb3nihpi3p82s49g9k86ivnr499b3jdzrqh6hfcr6dbhi8x6"; + name = "kruler-17.08.2.tar.xz"; }; }; ksaneplugin = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ksaneplugin-17.08.1.tar.xz"; - sha256 = "08zl04ly9wggcr8y0azz69nvjkr4c8gnajx4w8cwlb1dkn1b5is4"; - name = "ksaneplugin-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ksaneplugin-17.08.2.tar.xz"; + sha256 = "0zp898jb1vc5zliidhn5v4lqlqmmpn33fxarm5br9ks4zpqzam0y"; + name = "ksaneplugin-17.08.2.tar.xz"; }; }; kscd = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kscd-17.08.1.tar.xz"; - sha256 = "08mlbhbck68abj17mkaz76fpy4rcn0x4h4smwgxnhy88ddb15wa1"; - name = "kscd-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kscd-17.08.2.tar.xz"; + sha256 = "1p79dwp0gwdffhz5dhdpcyc8hrzs0ks8kxzhrrxksazc25wh3l8y"; + name = "kscd-17.08.2.tar.xz"; }; }; kshisen = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kshisen-17.08.1.tar.xz"; - sha256 = "0rg465092qkzbshr0pj6z6d38nykdfz2alhzy50qi9i32r8iwy9m"; - name = "kshisen-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kshisen-17.08.2.tar.xz"; + sha256 = "1kbyhxc5kp7s3if6lb39wjx1yxrwzkavf5vrlm0xynwzr560n6ar"; + name = "kshisen-17.08.2.tar.xz"; }; }; ksirk = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ksirk-17.08.1.tar.xz"; - sha256 = "1v4xqjak0nf4vqsf7p7i37x5c08vbxq18nb63bhwjlb2fgnbg0yh"; - name = "ksirk-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ksirk-17.08.2.tar.xz"; + sha256 = "0q19yvghp6fgdpjgs9qc3rxqm4ahf5h2dbnw32v3c1hv095dfvi0"; + name = "ksirk-17.08.2.tar.xz"; }; }; ksnakeduel = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ksnakeduel-17.08.1.tar.xz"; - sha256 = "105rjym6vkzi9m0dmzwwb6491lfmb5y1dfqax9y2gi993x0l5ihl"; - name = "ksnakeduel-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ksnakeduel-17.08.2.tar.xz"; + sha256 = "1gbsf3fmkpl438wq7xpvmyanm6p7knnyxvbvbd0my288xb4l3xf5"; + name = "ksnakeduel-17.08.2.tar.xz"; }; }; kspaceduel = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kspaceduel-17.08.1.tar.xz"; - sha256 = "11g362hax9x8b99wvcndd4hz6q918dxcn8js16cflfxn1ry80wb6"; - name = "kspaceduel-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kspaceduel-17.08.2.tar.xz"; + sha256 = "13pbg1pwl25qlyb9kha08gnpbx6njclld8zlasvpym2c4db5cxx2"; + name = "kspaceduel-17.08.2.tar.xz"; }; }; ksquares = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ksquares-17.08.1.tar.xz"; - sha256 = "1lw9qlfqfsmyry5v6fvhyjh23l8dj71iyp1z3y0xikaybc4rbbi1"; - name = "ksquares-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ksquares-17.08.2.tar.xz"; + sha256 = "1l2pgm3rj3cl7jgc1q7rjbv3kmi6zm4jh29r1q7zhfsiwin0sfz5"; + name = "ksquares-17.08.2.tar.xz"; }; }; kstars = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kstars-17.08.1.tar.xz"; - sha256 = "1qr8y4m6lqiv3zb7f2ys7c6iw7iryk9ayibdscq113nq0blm59zs"; - name = "kstars-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kstars-17.08.2.tar.xz"; + sha256 = "1l1bjqwhvzw5czlfjg4zqk48bva9xlrn53grlbl2yywzvmn5jhgy"; + name = "kstars-17.08.2.tar.xz"; }; }; ksudoku = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ksudoku-17.08.1.tar.xz"; - sha256 = "0fb9k5hdyq2alp42x17r1cfi5qz5hm9xzcwd3vz3c1kym4xavnjp"; - name = "ksudoku-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ksudoku-17.08.2.tar.xz"; + sha256 = "0hb4901gx81ra8mcrcsqbdhjqxfd1s5sxal4xhg72yd80qsg1da1"; + name = "ksudoku-17.08.2.tar.xz"; }; }; ksystemlog = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ksystemlog-17.08.1.tar.xz"; - sha256 = "0wiwak8dmdm9kih2zvw2xxg67qs94imp6s24dgfxgylqqpqirlnv"; - name = "ksystemlog-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ksystemlog-17.08.2.tar.xz"; + sha256 = "16fiprkbkpnnc17qkgsd4w8givk6ny3kflb8pc87f2zs2vw6dfad"; + name = "ksystemlog-17.08.2.tar.xz"; }; }; kteatime = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kteatime-17.08.1.tar.xz"; - sha256 = "08ripkkc6b3wi499kgsng4fzk2n7kbp3i6212q47h6bmgxs8a4zp"; - name = "kteatime-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kteatime-17.08.2.tar.xz"; + sha256 = "1cxxcaqzpjp6n8afrg1rw61grvmmla36r979761p3w0hwpgdrln3"; + name = "kteatime-17.08.2.tar.xz"; }; }; ktimer = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktimer-17.08.1.tar.xz"; - sha256 = "116c61k99h5y0yph2x7cz0ff99rsfblgj3db7sczhn3hkbcimakx"; - name = "ktimer-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktimer-17.08.2.tar.xz"; + sha256 = "0vi9lrjazw8vq811qgcd7wyfkd2n60drszii8gx7w9jq8f0hkvfp"; + name = "ktimer-17.08.2.tar.xz"; }; }; ktnef = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktnef-17.08.1.tar.xz"; - sha256 = "07jflp67mf748vf0ph89dbzy2lifm8148kl957qw1z9i1h5sm869"; - name = "ktnef-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktnef-17.08.2.tar.xz"; + sha256 = "012c1xsqj1ilq7w0shh22nmvkh1l56sn3ycg6xsigchk203im17d"; + name = "ktnef-17.08.2.tar.xz"; }; }; ktouch = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktouch-17.08.1.tar.xz"; - sha256 = "19m8bp655ir9n2pz6vly9q2x42gdnpfjs47nkfiix28mg4y004qj"; - name = "ktouch-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktouch-17.08.2.tar.xz"; + sha256 = "0zrqmhag522ri8d56hlrrdmgfh6ywswahs7mss61dbyig5bpfy4g"; + name = "ktouch-17.08.2.tar.xz"; }; }; ktp-accounts-kcm = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-accounts-kcm-17.08.1.tar.xz"; - sha256 = "1kghza63ywjndcscwlkabfqnsnalf1kprghb47gjj15qn844g019"; - name = "ktp-accounts-kcm-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-accounts-kcm-17.08.2.tar.xz"; + sha256 = "0nkji06d23y7qa505r3971r83w8pnf1jrz5l3k9di1s0x93cd2lm"; + name = "ktp-accounts-kcm-17.08.2.tar.xz"; }; }; ktp-approver = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-approver-17.08.1.tar.xz"; - sha256 = "07vkhhldqkabfga79sl9hdbfdk4fdizj066180dirwbdkllfwnpf"; - name = "ktp-approver-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-approver-17.08.2.tar.xz"; + sha256 = "07mismz8srzwy7bkfh1gqzrxbj40xavnahhf8dhbskqn4sw8j50q"; + name = "ktp-approver-17.08.2.tar.xz"; }; }; ktp-auth-handler = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-auth-handler-17.08.1.tar.xz"; - sha256 = "1612gi5izaanp9rzwz163q776lszrs03a9rrx13qczdl231smyf6"; - name = "ktp-auth-handler-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-auth-handler-17.08.2.tar.xz"; + sha256 = "0ncbmvld2v6wz9zknrj699pixxjlk7kk22xj9q0q6ay3cdiivcf2"; + name = "ktp-auth-handler-17.08.2.tar.xz"; }; }; ktp-call-ui = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-call-ui-17.08.1.tar.xz"; - sha256 = "0881lgmp04g157q3pp1im113imrw9aihxd08hhm6h5cla5z97m46"; - name = "ktp-call-ui-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-call-ui-17.08.2.tar.xz"; + sha256 = "12k5qar1v0faqqsmzvqb8932hndk8kzhc5dkib1kccq7g068br2v"; + name = "ktp-call-ui-17.08.2.tar.xz"; }; }; ktp-common-internals = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-common-internals-17.08.1.tar.xz"; - sha256 = "1nlcmlkbaj7j6y1i6gnmd7s6ks4qnmcdhwidxql4vgr6bjifr5n2"; - name = "ktp-common-internals-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-common-internals-17.08.2.tar.xz"; + sha256 = "1423sd43xyjzs0fbpvs6nsd1rgfd8ffgmpzbyal1s2f3rb4hfk8h"; + name = "ktp-common-internals-17.08.2.tar.xz"; }; }; ktp-contact-list = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-contact-list-17.08.1.tar.xz"; - sha256 = "1xv0qaf05lvzwmgdfr31vynk768sc9gqrl0w1b270ks9jgsb3k9i"; - name = "ktp-contact-list-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-contact-list-17.08.2.tar.xz"; + sha256 = "1g07v4am7m3qyq2b8bidxdgz2iwilzsq5nigzxag44nx3kc5n269"; + name = "ktp-contact-list-17.08.2.tar.xz"; }; }; ktp-contact-runner = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-contact-runner-17.08.1.tar.xz"; - sha256 = "150m1lr7n39n88b0kaz8494ch0ym7i68f8c3hgzaxpy0m62mskkv"; - name = "ktp-contact-runner-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-contact-runner-17.08.2.tar.xz"; + sha256 = "145mbfpbzsrpqpk260jq44yiawj02fw27rr70b8j8az6jffjd1i2"; + name = "ktp-contact-runner-17.08.2.tar.xz"; }; }; ktp-desktop-applets = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-desktop-applets-17.08.1.tar.xz"; - sha256 = "167h8z1xd6q50xbgirfc6sxlnclliidpb5lg7s1baqdvlpg8rarz"; - name = "ktp-desktop-applets-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-desktop-applets-17.08.2.tar.xz"; + sha256 = "0kj2k78pcyswykqlh0clvh475f1c62910bxhnk03533fxrgdib3v"; + name = "ktp-desktop-applets-17.08.2.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-filetransfer-handler-17.08.1.tar.xz"; - sha256 = "0hvy0vdznv9js9fjmhgbcmh3gq6jlnynz4mfdbj8bjff635q76az"; - name = "ktp-filetransfer-handler-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-filetransfer-handler-17.08.2.tar.xz"; + sha256 = "10v0j46fdbmgciznwrxvb6wn037535w4sinvhn7r2myhf7vsvpah"; + name = "ktp-filetransfer-handler-17.08.2.tar.xz"; }; }; ktp-kded-module = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-kded-module-17.08.1.tar.xz"; - sha256 = "0rsb6qgf6kdizpp6iw48gxr1aka1yljcwc0wx03p6s31a9aql47w"; - name = "ktp-kded-module-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-kded-module-17.08.2.tar.xz"; + sha256 = "03p75jdh0q3709rcc5m2iv75rjphjsbgr40kaphakv57xk5wdhqv"; + name = "ktp-kded-module-17.08.2.tar.xz"; }; }; ktp-send-file = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-send-file-17.08.1.tar.xz"; - sha256 = "1ncxr7cwfbqr8pwgkl3mg4zv6klss99pansmwkyh49bbjzjc9j3v"; - name = "ktp-send-file-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-send-file-17.08.2.tar.xz"; + sha256 = "15pyjxhcg7hl0p3bq11w3mrn10i3q0man6rqp7w6vqlq19bjndl3"; + name = "ktp-send-file-17.08.2.tar.xz"; }; }; ktp-text-ui = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktp-text-ui-17.08.1.tar.xz"; - sha256 = "13isirx7in0vj4p3l2m9pnjz73bf48y586qbpn0rbzpwbc7xzbmz"; - name = "ktp-text-ui-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktp-text-ui-17.08.2.tar.xz"; + sha256 = "1my2k34adf95alppq4n69apin72bnl8n84mj7b61pndjiixh4q7b"; + name = "ktp-text-ui-17.08.2.tar.xz"; }; }; ktuberling = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/ktuberling-17.08.1.tar.xz"; - sha256 = "04fsplvry85m596qkx2i7601l7pc9dag4x45sw4z325fkzvlzsx9"; - name = "ktuberling-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/ktuberling-17.08.2.tar.xz"; + sha256 = "02vwy4zbzj80a9233107xgqa52r3pi4hgnvi6cpbdq9cmvcxw7fq"; + name = "ktuberling-17.08.2.tar.xz"; }; }; kturtle = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kturtle-17.08.1.tar.xz"; - sha256 = "0nrsmhdmc1qdnpwsgrhs2gd91al8b0wrm85nwia2mmyxsfnbd45l"; - name = "kturtle-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kturtle-17.08.2.tar.xz"; + sha256 = "0vx7im20yk1172cb5g7z7mkhbsbx78ad9azs5d23rsv9fpzwikc2"; + name = "kturtle-17.08.2.tar.xz"; }; }; kubrick = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kubrick-17.08.1.tar.xz"; - sha256 = "07lxc4i92i08hca2y6gqq3wsyp4mn857vwmy6ja40c2wh8sl6bix"; - name = "kubrick-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kubrick-17.08.2.tar.xz"; + sha256 = "0f9smvasgnjswx6jvhw4b7q58k47y1mv48vzygdx61zz1jyxjr8n"; + name = "kubrick-17.08.2.tar.xz"; }; }; kwalletmanager = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kwalletmanager-17.08.1.tar.xz"; - sha256 = "0dq8m160kwbrjmda4hvdgq5izdnr7nnlksb9l3cvbslpc685d8h0"; - name = "kwalletmanager-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kwalletmanager-17.08.2.tar.xz"; + sha256 = "1a2q58wjb816fb0wfr4d7i790jxxwbfw9fpk1g8lkfk3kbvdgsnj"; + name = "kwalletmanager-17.08.2.tar.xz"; }; }; kwave = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kwave-17.08.1.tar.xz"; - sha256 = "097viq7k2l4hkj0w07hnyfzfmz3apnri2n1g69ir1h37wq59fw89"; - name = "kwave-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kwave-17.08.2.tar.xz"; + sha256 = "1szn09swm8072x2mhy9q1szjm32pgg8agga1r2chf3jxc5iah2h3"; + name = "kwave-17.08.2.tar.xz"; }; }; kwordquiz = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/kwordquiz-17.08.1.tar.xz"; - sha256 = "14l419ghf6xvdp2fnsdskflppzzvvhlbciwn6cicrkzmdr9zkawz"; - name = "kwordquiz-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/kwordquiz-17.08.2.tar.xz"; + sha256 = "0i7jl7rb4bxkifvpf6dsscbvwsay9a5jvvbkkajcwfr1v5r2w969"; + name = "kwordquiz-17.08.2.tar.xz"; }; }; libgravatar = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libgravatar-17.08.1.tar.xz"; - sha256 = "0fn860y88pvq6mdpw1jw8msvkdmknradfp037gj9kvd5ykiicbvh"; - name = "libgravatar-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libgravatar-17.08.2.tar.xz"; + sha256 = "0zsxijykxxa4lg939wzv0vxh8jr6smmdd0zip8bimvdc4x2k6dv1"; + name = "libgravatar-17.08.2.tar.xz"; }; }; libkcddb = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkcddb-17.08.1.tar.xz"; - sha256 = "06i8gm7rysbdlm89nw5pd3jgbvz9vy5schwyfyhk6jbvlm43sx7z"; - name = "libkcddb-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkcddb-17.08.2.tar.xz"; + sha256 = "0hlk2302cnpk896fmaq7p5ph7baxi3dz673qpy8f9hlcbj5k4j35"; + name = "libkcddb-17.08.2.tar.xz"; }; }; libkcompactdisc = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkcompactdisc-17.08.1.tar.xz"; - sha256 = "1xrpbpg4w275afd4fbnsmjvp737v6z5nsdz5lrfxbqg8x97xb2fm"; - name = "libkcompactdisc-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkcompactdisc-17.08.2.tar.xz"; + sha256 = "0fimkf94xd7v2cv2ixs38x4bpsrrfk4n36i7qbpakrvnw60q0rk4"; + name = "libkcompactdisc-17.08.2.tar.xz"; }; }; libkdcraw = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkdcraw-17.08.1.tar.xz"; - sha256 = "0r9prk1pnbm2hj5q93j7axb869lzr8v7msqhylpf3awghfmy32a0"; - name = "libkdcraw-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkdcraw-17.08.2.tar.xz"; + sha256 = "140wq3h13gz3sv4d67i1pnrlzghy22zxf7ads0wia0iq85s7247m"; + name = "libkdcraw-17.08.2.tar.xz"; }; }; libkdegames = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkdegames-17.08.1.tar.xz"; - sha256 = "12w8i91pqshgb2bx4h68yni3sj7ssbcxrcdybnicg18hpcf5fzpa"; - name = "libkdegames-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkdegames-17.08.2.tar.xz"; + sha256 = "1131q3i7a4xz5rmcp820hjqp9bmv2wdbq6afp01572lbn9dryvir"; + name = "libkdegames-17.08.2.tar.xz"; }; }; libkdepim = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkdepim-17.08.1.tar.xz"; - sha256 = "17pg8fwpcdkj04fwzyqgykh9a23xkmkz46mknk43b37n0bcjhxq0"; - name = "libkdepim-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkdepim-17.08.2.tar.xz"; + sha256 = "04n4gj2rfafkb1k2c9yq9zshmy70ag415gmc24y7js82s20jh7y8"; + name = "libkdepim-17.08.2.tar.xz"; }; }; libkeduvocdocument = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkeduvocdocument-17.08.1.tar.xz"; - sha256 = "0kv7yirw7q953qv23f0z3m1nmdpax6f6vsrbncpdz2057p51fwf4"; - name = "libkeduvocdocument-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkeduvocdocument-17.08.2.tar.xz"; + sha256 = "0scj7l554zqxax4i2lg8qbw11ansrl2hp422b8348lzmcdcndsyp"; + name = "libkeduvocdocument-17.08.2.tar.xz"; }; }; libkexiv2 = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkexiv2-17.08.1.tar.xz"; - sha256 = "06qwd9lnl95vyzmj7nwgxflx82rvs5wkkwx4vnp408gya8w7cpjc"; - name = "libkexiv2-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkexiv2-17.08.2.tar.xz"; + sha256 = "0251w8y36d7k9wnm52ycbz4yr0310bkr7msnfs6828npfzynmy6i"; + name = "libkexiv2-17.08.2.tar.xz"; }; }; libkface = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkface-17.08.1.tar.xz"; - sha256 = "1w81dsmz9r2vx4aw5rkkg5s08jn4gqckgr1jscdxah6af354y052"; - name = "libkface-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkface-17.08.2.tar.xz"; + sha256 = "1x9vg4dadgcxawprqxzv6glnl9b2b5qxvq7rvnr2vi4a5p0j3kkf"; + name = "libkface-17.08.2.tar.xz"; }; }; libkgapi = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkgapi-17.08.1.tar.xz"; - sha256 = "04nww7rip0qpz9cky28ygd9chfmpp1kycpri4s84cqdicwg691bv"; - name = "libkgapi-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkgapi-17.08.2.tar.xz"; + sha256 = "1rpixzydg9421gblywyj8798d786yw9qfm7dnkn7dkzbm44pfrl4"; + name = "libkgapi-17.08.2.tar.xz"; }; }; libkgeomap = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkgeomap-17.08.1.tar.xz"; - sha256 = "0llh9ixa1wyafcvah48rfrbk4n897i97a6jrk3vnf0yrqhl8nps2"; - name = "libkgeomap-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkgeomap-17.08.2.tar.xz"; + sha256 = "1s0bhv4f97241k98ss1laki04z7gcx47apps06gl0px3xgmzfyk7"; + name = "libkgeomap-17.08.2.tar.xz"; }; }; libkipi = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkipi-17.08.1.tar.xz"; - sha256 = "089avdka9rvv5j137k42d6sz6kvqci771wb8433xksnnci8r52xb"; - name = "libkipi-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkipi-17.08.2.tar.xz"; + sha256 = "1hgmiazsy80hxfgc0y01wg1nzz33q8l0iw6g1sl8cxkgb06hkw93"; + name = "libkipi-17.08.2.tar.xz"; }; }; libkleo = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkleo-17.08.1.tar.xz"; - sha256 = "0d2rby5yfwpb1gy2j87kzffzn6hls3358886qhiq6pwpx2nq7chj"; - name = "libkleo-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkleo-17.08.2.tar.xz"; + sha256 = "0qk4mf2sgji2pc3jjd0bxan7d40f7qkg9c3sgbrxvcy3jg3vdly5"; + name = "libkleo-17.08.2.tar.xz"; }; }; libkmahjongg = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkmahjongg-17.08.1.tar.xz"; - sha256 = "11ciqd54isvjfccw3xc1xrdvjjmvacgvsdsxy3arcbivikmbmdqi"; - name = "libkmahjongg-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkmahjongg-17.08.2.tar.xz"; + sha256 = "1jibrvwy0147lwx09n19k1nj2vnssqwyc3slx6b0z3l23apa7vdw"; + name = "libkmahjongg-17.08.2.tar.xz"; }; }; libkomparediff2 = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libkomparediff2-17.08.1.tar.xz"; - sha256 = "0vp33mkm52yn2gqy469m4wfmsrbzppl6hw1d842nm1q1csnva0v5"; - name = "libkomparediff2-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libkomparediff2-17.08.2.tar.xz"; + sha256 = "0xc00yh2v7dhnsr70ndiql6rid8yjqdh968qbmpc5jlhhk00ws80"; + name = "libkomparediff2-17.08.2.tar.xz"; }; }; libksane = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libksane-17.08.1.tar.xz"; - sha256 = "0k2sjz86yw7lfij0kgn1byps2vd8c9hlrd4lizppflzxi2ajmkd0"; - name = "libksane-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libksane-17.08.2.tar.xz"; + sha256 = "0ilysa21wadnv4kcyi4g268l8mzyab7m31wq8plc1hxbi1wjb72l"; + name = "libksane-17.08.2.tar.xz"; }; }; libksieve = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/libksieve-17.08.1.tar.xz"; - sha256 = "01d573a415i2advgad0xzxkg8f6z5fbfmyb0iim79qqhzkbmf6bm"; - name = "libksieve-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/libksieve-17.08.2.tar.xz"; + sha256 = "0ypa7inmndq9k08gbcliwvx5x2q7z9dwx236wvq0zww0sjgnbdyx"; + name = "libksieve-17.08.2.tar.xz"; }; }; lokalize = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/lokalize-17.08.1.tar.xz"; - sha256 = "0gr1qj0ish0kp842654fli2irbrli77q1449xryik76frlyy16wj"; - name = "lokalize-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/lokalize-17.08.2.tar.xz"; + sha256 = "024awg6xhncgzvg88n57waxcw9i5k1cmp3f16l4ic93wrk8ga8c9"; + name = "lokalize-17.08.2.tar.xz"; }; }; lskat = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/lskat-17.08.1.tar.xz"; - sha256 = "1fhkg2vjy7xpp1rnx4cp9bpvxqc4i3nymyqgph92ankal0nnw2ai"; - name = "lskat-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/lskat-17.08.2.tar.xz"; + sha256 = "1lc99vik1bi474wwjr9pkfd9xhxs2rw6rcb72a3bq4ks83m3kmf0"; + name = "lskat-17.08.2.tar.xz"; }; }; mailcommon = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/mailcommon-17.08.1.tar.xz"; - sha256 = "0qw7hsy36r39l13x492mhfxj3x9inagd7fjsxvfblhgnh1c2ad0r"; - name = "mailcommon-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/mailcommon-17.08.2.tar.xz"; + sha256 = "1g9dr7ilw65zpjvr12hkambk691zynv9xgg9kcya1krmh50hdi53"; + name = "mailcommon-17.08.2.tar.xz"; }; }; mailimporter = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/mailimporter-17.08.1.tar.xz"; - sha256 = "0wwciyc8azx2sln5407gv4kqcx7zfl680szxgbw533iq9kccvl0z"; - name = "mailimporter-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/mailimporter-17.08.2.tar.xz"; + sha256 = "1xy07wlvvg5rs9534llsd6amaxk2sylx8lfzr22s17fcpr0rl71s"; + name = "mailimporter-17.08.2.tar.xz"; }; }; marble = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/marble-17.08.1.tar.xz"; - sha256 = "1jlz37m3a0jhnac4y6ix6n3hhxkp808qdnvxpd3my1gvn715wa58"; - name = "marble-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/marble-17.08.2.tar.xz"; + sha256 = "1yvhmmfgflsknlx0ffpj82clkd4py6kalf9dcf04f3lfw0k559fm"; + name = "marble-17.08.2.tar.xz"; }; }; mbox-importer = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/mbox-importer-17.08.1.tar.xz"; - sha256 = "0kjxx0nvxb6dshibaipgdf4i8magmsxnqhfnph831x13mig15bcs"; - name = "mbox-importer-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/mbox-importer-17.08.2.tar.xz"; + sha256 = "1g8zvg4xxpnic1qf020zcyy6bijz4a094xzdxyx64lq7wp1bi269"; + name = "mbox-importer-17.08.2.tar.xz"; }; }; messagelib = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/messagelib-17.08.1.tar.xz"; - sha256 = "0srjcqbqzyk8ca9ssisrils9jwm9p6b62q4b7g9bya602cbrh38b"; - name = "messagelib-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/messagelib-17.08.2.tar.xz"; + sha256 = "0wb371cb7glwvwhmk76r5ziq821b87d8cq9fy4pgxlj1wvsny2km"; + name = "messagelib-17.08.2.tar.xz"; }; }; minuet = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/minuet-17.08.1.tar.xz"; - sha256 = "17vvsnvhvpqcyrb5qlchp4na1wk5f4qlkh7w8sj162jsd1lbxr9j"; - name = "minuet-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/minuet-17.08.2.tar.xz"; + sha256 = "1x9h3k8dpn40119s1vxpnkj78glx0hajfg9wh7jnm70phasn1jci"; + name = "minuet-17.08.2.tar.xz"; }; }; okteta = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/okteta-17.08.1.tar.xz"; - sha256 = "00wmkzjw7h99b1lmab0llwzlmh1m4xgv3yy506hjwb78z1c6wbq2"; - name = "okteta-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/okteta-17.08.2.tar.xz"; + sha256 = "1f1gpyyd1xcdii34hjhflqaxfnk3clnin2ihb6fpkbz5fz2020bq"; + name = "okteta-17.08.2.tar.xz"; }; }; okular = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/okular-17.08.1.tar.xz"; - sha256 = "027isffca4g98qm6yx7m69cp2xjplqhnh7gy00sr1b96hhnlc9c6"; - name = "okular-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/okular-17.08.2.tar.xz"; + sha256 = "0mkyqg5n870zc2ryxgwyrf9n57gn5jfj9wvlwc405h5q8zf5fvy5"; + name = "okular-17.08.2.tar.xz"; }; }; palapeli = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/palapeli-17.08.1.tar.xz"; - sha256 = "0nnplg88xipmnb24qj2ki5m090g8cbinbb3azkqadwsjfc13xk06"; - name = "palapeli-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/palapeli-17.08.2.tar.xz"; + sha256 = "1smp7an5b059hp5d8bjwq65d11zkfbfcr1kkapbljamg1ydd4y21"; + name = "palapeli-17.08.2.tar.xz"; }; }; parley = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/parley-17.08.1.tar.xz"; - sha256 = "034nc5qgiy50wpnkm3d8w3cf7svj6as23sarz0h5hks4ffw1bxhg"; - name = "parley-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/parley-17.08.2.tar.xz"; + sha256 = "15m4vsmk9s4dh5rv7x2vdcy8kbi334nms79aj8yvx01nlipv7m79"; + name = "parley-17.08.2.tar.xz"; }; }; picmi = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/picmi-17.08.1.tar.xz"; - sha256 = "14kbrbq59kmqz1rd7izrp57i1a6d6nm8i73rwcl80vyla8cnvika"; - name = "picmi-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/picmi-17.08.2.tar.xz"; + sha256 = "01fqrd9za748m6gxbq3i3yvvmz2qkf3kln14wwl69hc29b6ikk0k"; + name = "picmi-17.08.2.tar.xz"; }; }; pimcommon = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/pimcommon-17.08.1.tar.xz"; - sha256 = "14vk8pnwbc4bvha26fxdfbyn0ipxj93qgan8f24kpxc7irjkr8ic"; - name = "pimcommon-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/pimcommon-17.08.2.tar.xz"; + sha256 = "01jh4c55yk4wmi3i7f81hgs0bgqxpm8fccvg51z2k05swdm7x10b"; + name = "pimcommon-17.08.2.tar.xz"; }; }; pim-data-exporter = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/pim-data-exporter-17.08.1.tar.xz"; - sha256 = "0drzj44p66ds4p42wk45755yjcs2dpysw54mzg2qx4cdv8kf1snq"; - name = "pim-data-exporter-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/pim-data-exporter-17.08.2.tar.xz"; + sha256 = "1xnv07lvhbb12qp0jcrd39l54gsgnifdn1ibzxh7fnbdrv3iqxqv"; + name = "pim-data-exporter-17.08.2.tar.xz"; }; }; pim-sieve-editor = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/pim-sieve-editor-17.08.1.tar.xz"; - sha256 = "1hclbjs596x5niszcccnzkr6x5avg2c982prq8qcrc68cdm1h7pg"; - name = "pim-sieve-editor-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/pim-sieve-editor-17.08.2.tar.xz"; + sha256 = "0fnm055sx18ripf5vhpiqi628vkvvgyhaw4xw7hz6hbmv8f3qsma"; + name = "pim-sieve-editor-17.08.2.tar.xz"; }; }; poxml = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/poxml-17.08.1.tar.xz"; - sha256 = "17g62xp5g4icfmbd001rhypn34a9asj8pcgj301q5v9065z44mmn"; - name = "poxml-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/poxml-17.08.2.tar.xz"; + sha256 = "1hkw1m3w5v12c8vm9wdksrb9q92lki3m97949h91zmdr7lc3s3sd"; + name = "poxml-17.08.2.tar.xz"; }; }; print-manager = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/print-manager-17.08.1.tar.xz"; - sha256 = "0f354qblzw3vkv4fypwp3fj3i29x6b478z79q5d2n6x9nk8li5in"; - name = "print-manager-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/print-manager-17.08.2.tar.xz"; + sha256 = "1gcr265bzj3knhqflyj12zza3cd94vgny8bxqqk7xbs2mii0pjsd"; + name = "print-manager-17.08.2.tar.xz"; }; }; rocs = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/rocs-17.08.1.tar.xz"; - sha256 = "18nygfbyiny8zpq2jm6mxs6r4b90c4dwxwzvs0a3vrc131fjc6bc"; - name = "rocs-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/rocs-17.08.2.tar.xz"; + sha256 = "0y0d64fdy22kx0bpbh9wkpxg8zqg24y02ww32h3p52zxyxcx7zf1"; + name = "rocs-17.08.2.tar.xz"; }; }; signon-kwallet-extension = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/signon-kwallet-extension-17.08.1.tar.xz"; - sha256 = "1ax4l1whdxrfnl7bbs805vpp7j2m5zl55fq12vvrkw0x38m78v2h"; - name = "signon-kwallet-extension-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/signon-kwallet-extension-17.08.2.tar.xz"; + sha256 = "1fnhzbd5akvr9cmwfpxv7dy9bd8z7lcqzpyh9m84gdw1ppgzqypp"; + name = "signon-kwallet-extension-17.08.2.tar.xz"; }; }; spectacle = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/spectacle-17.08.1.tar.xz"; - sha256 = "07x01i629zk0l409kl85yv5gws7cw7mzmp1mlwxrjix153sr4jr9"; - name = "spectacle-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/spectacle-17.08.2.tar.xz"; + sha256 = "1wv8ld3s69v00gvlk6r49v86z5l2xy243ily917v8c1imzvz6xhj"; + name = "spectacle-17.08.2.tar.xz"; }; }; step = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/step-17.08.1.tar.xz"; - sha256 = "11p9rdg0m42200g15lq61489zz0zkkhic2j6hyynb1z1lr9c2iga"; - name = "step-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/step-17.08.2.tar.xz"; + sha256 = "0llag76b39vf20rbm8zgvs4hh3pynb85a2gbbgxb3v4kvg9nj9zk"; + name = "step-17.08.2.tar.xz"; }; }; svgpart = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/svgpart-17.08.1.tar.xz"; - sha256 = "0xr0axiyn49szwwflq50sf9wp8i5xd7qs3krwznrdzlc8jcann9j"; - name = "svgpart-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/svgpart-17.08.2.tar.xz"; + sha256 = "10xmbck1kwp0hhg5k8v9ay2bh36xvvpz1mnixydmsyrc0x9n2zh4"; + name = "svgpart-17.08.2.tar.xz"; }; }; sweeper = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/sweeper-17.08.1.tar.xz"; - sha256 = "04gzc06p1fh7rnb3sbma2k8lav98v3w657k0sgscnv4dvsgbcqh9"; - name = "sweeper-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/sweeper-17.08.2.tar.xz"; + sha256 = "1sr1fw4ny09ch0hmgn4npd6hfvgc52xfwmys1kid7hi8lwrsn7g5"; + name = "sweeper-17.08.2.tar.xz"; }; }; syndication = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/syndication-17.08.1.tar.xz"; - sha256 = "0ihkway75n4r3zw18z07g5k2ggby5q1cz4cqi29cws1ay6s09qb9"; - name = "syndication-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/syndication-17.08.2.tar.xz"; + sha256 = "165fcw486qxlq5lmab7qa9bc7pkc3jfc4xqx1m5k4rgwapfk0sv9"; + name = "syndication-17.08.2.tar.xz"; }; }; umbrello = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/umbrello-17.08.1.tar.xz"; - sha256 = "0xvxcncsxikmnxv98ar3gzcvxahsnja4jz1l23hiy2ib1lmcgcy7"; - name = "umbrello-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/umbrello-17.08.2.tar.xz"; + sha256 = "0prwsw8qwcgia98kjvh9xbv3cdnh24fqk2zl59diighw11q2dnsk"; + name = "umbrello-17.08.2.tar.xz"; }; }; zeroconf-ioslave = { - version = "17.08.1"; + version = "17.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.1/src/zeroconf-ioslave-17.08.1.tar.xz"; - sha256 = "1crypk1cdh6cav1f6fx9p60ky1yf6hyyh1n6mih8mqjiibi1brz5"; - name = "zeroconf-ioslave-17.08.1.tar.xz"; + url = "${mirror}/stable/applications/17.08.2/src/zeroconf-ioslave-17.08.2.tar.xz"; + sha256 = "0bki5dz2n8psja4mfj65hshaz7qdniyx7r72kv8xn8xk0vj292x3"; + name = "zeroconf-ioslave-17.08.2.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index a0955dcecedd..8aa191c0f3c2 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub }: with python3.pkgs; buildPythonApplication rec { - version = "3.3.1"; + version = "3.4"; name = "buku-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1byq8jgv1rb67ygibk0vzgz5ri1il4q4hpg23z5q0ml27fif9hw3"; + sha256 = "0v0wvsxw78g6yl606if25k1adghr5764chwy1kl7dsxvchqwvmg0"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index fd88ea61ad86..8b24df1bee92 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }: stdenv.mkDerivation rec { - version = "1.5"; + version = "1.6"; name = "cli-visualizer-${version}"; src = fetchFromGitHub { owner = "dpayne"; repo = "cli-visualizer"; rev = version; - sha256 = "18qv4ya64qmczq94dnynrnzn7pwhmzbn14r05qcvbbwv7r8gclzs"; + sha256 = "0mirp8bk398di5xyq95iprmdyvplfghxqmrfj7jdnpy554vx7ppc"; }; postPatch = '' diff --git a/pkgs/applications/misc/dump1090/default.nix b/pkgs/applications/misc/dump1090/default.nix new file mode 100644 index 000000000000..3e9fe133d93c --- /dev/null +++ b/pkgs/applications/misc/dump1090/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, pkgconfig, libusb, rtl-sdr }: + +stdenv.mkDerivation rec { + name = "dump1090-${version}"; + version = "2014-10-31"; + + src = fetchFromGitHub { + owner = "MalcolmRobb"; + repo = "dump1090"; + rev = "bff92c4ad772a0a8d433f788d39dae97e00e4dbe"; + sha256 = "06aaj9gpz5v4qzvnp8xf18wdfclp0jvn3hflls79ly46gz2dh9hy"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libusb rtl-sdr ]; + + makeFlags = [ "PREFIX=$out" ]; + + installPhase = '' + mkdir -p $out/bin $out/share + cp -v dump1090 $out/bin/dump1090 + cp -vr public_html $out/share/dump1090 + ''; + + meta = with stdenv.lib; { + description = "A simple Mode S decoder for RTLSDR devices"; + homepage = https://github.com/MalcolmRobb/dump1090; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ earldouglas ]; + }; +} diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 1e5bf8a48edd..d83eb1ed86a7 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ viric ]; platforms = platforms.linux; - hydraPlatforms = []; + broken = true; }; } diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 8a31c591b29b..6b090e84c3f2 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchipfs }: stdenv.mkDerivation rec { name = "hello-2.10"; - src = fetchurl { - url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"; + src = fetchipfs { + url = "https://ftp.gnu.org/gnu/hello/hello-2.10.tar.gz"; + ipfs = "QmWyj65ak3wd8kG2EvPCXKd6Tij15m4SwJz6g2yG2rQ7w8"; + sha256 = "1im1gglfm4k10bh4mdaqzmx3lm3kivnsmxrvl6vyvmfqqzljq75l"; }; doCheck = true; diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index ba04bd5c39de..3c4f409d18f1 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.22"; + version = "1.23"; 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 = "09rh510x8qc5jbpnfzazbv9wc3bqmf5asydcl2wijpqm5bi21iqp"; + sha256 = "1hnira256p7sdilx34mnkji7gi2jcl98zz4izqxsqmnzj8ghhzkv"; }; buildInputs = [ readline ncurses ]; diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix new file mode 100644 index 000000000000..91cf494d2574 --- /dev/null +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE, libXext +, freetype, libXrender, fontconfig, libXft, libXinerama, libnotify, glib +, gtk3, libappindicator-gtk3, curl }: + +let + + version = "1.2.14-36df5e3"; + + rpath = stdenv.lib.makeLibraryPath + [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft + libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3 + curl ]; + +in + +stdenv.mkDerivation { + name = "hubstaff-${version}"; + + src = fetchurl { + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/${version}/Hubstaff-${version}.sh"; + sha256 = "0yzhxk9zppj94llnf8naa6ca61f7c8jaj6b1m25zffnnz37m1sdb"; + }; + + nativeBuildInputs = [ unzip makeWrapper ]; + + unpackCmd = '' + # MojoSetups have a ZIP file at the end. ZIP’s magic string is + # most often PK\x03\x04. This *should* work for future updates, + # but feel free to come up with something more reasonable. + dataZipOffset=$(grep --max-count=1 --byte-offset --only-matching --text $'PK\x03\x04' $curSrc | cut -d: -f1) + dd bs=$dataZipOffset skip=1 if=$curSrc of=data.zip 2>/dev/null + unzip -q data.zip "data/*" + rm data.zip + ''; + + dontBuild = true; + + installPhase = '' + # TODO: handle 32-bit arch? + rm -r x86 + + opt=$out/opt/hubstaff + mkdir -p $out/bin $opt + cp -r . $opt/ + + prog=$opt/x86_64/HubstaffClient.bin.x86_64 + + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $prog + wrapProgram $prog --prefix LD_LIBRARY_PATH : ${rpath} + + ln -s $prog $out/bin/HubstaffClient + + # Why is this needed? SEGV otherwise. + ln -s $opt/data/resources $opt/x86_64/resources + ''; + + meta = with stdenv.lib; { + description = "Time tracking software"; + homepage = https://hubstaff.com/; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.michalrus ]; + }; +} diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix new file mode 100644 index 000000000000..af67db3f654a --- /dev/null +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + name = "ipmicfg-${version}"; + version = "1.27.0"; + buildVersion = "170620"; + + src = fetchzip { + url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; + sha256 = "0jr2vih4hzymb62mbqyykwcrjhbhazf6wr1g0cq8ji586i3z3vw5"; + }; + + installPhase = '' + mkdir -p "$out/bin" "$out/opt/ipmicfg" + cp Linux/64bit/* "$out/opt/ipmicfg" + + patchelf "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" + + ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg" + ''; + + dontPatchShebangs = true; # There are no scripts and it complains about null bytes. + + meta = with stdenv.lib; { + description = "Supermicro IPMI configuration tool"; + homepage = "http://www.supermicro.com/products/nfo/ipmi.cfm"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ sorki ]; + }; +} diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 38eba46138ef..46263f7d83b8 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 = "12921"; + version = "13053"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1fp6mpl8fa91dhdf3hw5hk8xsp1imj7558adjnjkb6n4vmrbszhm"; + sha256 = "0czsmx0gsml3vqzx6940jw2xpmh16idypydw0d4147k4fi9gzyz6"; }; buildInputs = [ jre8 makeWrapper ]; diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index b37d12c362f5..7995c8875b82 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "kanboard-${version}"; - version = "1.0.46"; + version = "1.0.48"; src = fetchzip { - url = "https://kanboard.net/${name}.zip"; - sha256 = "00fzzijibj7x8pz8xwc601fcrzvdwz5fv45f2zzmbygl86khp82a"; + url = "https://github.com/kanboard/kanboard/releases/download/v${version}/${name}.zip"; + sha256 = "0ipyijlfcnfqlz9n20wcnaf9pw404a675x404pm9h2n4ld8x6m5v"; }; dontBuild = true; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 1334f2317b9d..91e583e2af4e 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -5,11 +5,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "khal"; - version = "0.9.7"; + version = "0.9.8"; src = fetchPypi { inherit pname version; - sha256 = "0x1p62ff7ggb172rjr6sbdrjh1gl3ck3bwxsqlsix8i5wycwvnmv"; + sha256 = "1blx3gxnv7sj302biqphfw7i6ilzl2xlmvzp130n3113scg9w17y"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix new file mode 100644 index 000000000000..76d23f1a8f08 --- /dev/null +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }: + let + version = "4.3.61"; + in + stdenv.mkDerivation { + name = "masterpdfeditor-${version}"; + src = fetchurl { + url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; + sha256 = "1g6mx8nch6ypf78h6xsb673wim19wn5ni5840armzg0pvi3sfknm"; + }; + libPath = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc + glibc + sane-backends + qtbase + qtsvg + libXext + libX11 + libXdmcp + libXau + libxcb + ]; + dontStrip = true; + installPhase = '' + p=$out/opt/masterpdfeditor + mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps + + substituteInPlace masterpdfeditor4.desktop \ + --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ + --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ + --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" + cp -v masterpdfeditor4.png $out/share/pixmaps/ + cp -v masterpdfeditor4.desktop $out/share/applications + + cp -v masterpdfeditor4 $p/ + ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4 + cp -v -r stamps templates lang fonts $p + + install -D license.txt $out/share/$name/LICENSE + + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $libPath \ + $p/masterpdfeditor4 + ''; + meta = with stdenv.lib; { + description = "Master PDF Editor"; + homepage = "https://code-industry.net/free-pdf-editor/"; + license = licenses.unfreeRedistributable; + platforms = with platforms; [ "x86_64-linux" ]; + maintainers = with maintainers; [ cmcdragonkai flokli ]; + }; + } diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index a111e76df0c2..b50d99466f89 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { homepage = http://mupdf.com; repositories.git = git://git.ghostscript.com/mupdf.git; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; - license = licenses.gpl3Plus; + license = licenses.agpl3Plus; maintainers = with maintainers; [ viric vrthra fpletz ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/postage/default.nix b/pkgs/applications/misc/pgmanage/default.nix similarity index 63% rename from pkgs/applications/misc/postage/default.nix rename to pkgs/applications/misc/pgmanage/default.nix index eeb879ee6e48..fd66ce8fc31c 100644 --- a/pkgs/applications/misc/postage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, runCommand, postgresql, openssl } : stdenv.mkDerivation rec { - name = "postage-${version}"; - version = "3.2.18"; + name = "pgmanage-${version}"; + version = "10.0.2"; src = fetchFromGitHub { - owner = "workflowproducts"; - repo = "postage"; - rev = "eV${version}"; - sha256 = "1kdg8pw2vxwkxw3b6dim4s740s60j3iyrh96524wi3lqkkq98krn"; + owner = "pgManage"; + repo = "pgManage"; + rev = "v${version}"; + sha256 = "0g9kvhs9b6kc1s7j90fqv71amiy9v0w5p906yfvl0j7pf3ayq35a"; }; buildInputs = [ postgresql openssl ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { the style of NGINX and Node.js. This heart makes Postage as fast as any PostgreSQL interface can hope to be. ''; - homepage = http://www.workflowproducts.com/postage.html; - license = licenses.asl20; + homepage = https://github.com/pgManage/pgManage; + license = licenses.postgresql; maintainers = [ maintainers.basvandijk ]; }; } diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix index f77220534014..b2616bf7b778 100644 --- a/pkgs/applications/misc/quicksynergy/default.nix +++ b/pkgs/applications/misc/quicksynergy/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { Remember to open port 24800 (used by synergys program) if you want to host mouse and keyboard."; - homepage = https://code.google.com/p/quicksynergy/; + homepage = https://sourceforge.net/projects/quicksynergy/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.spinus ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 5ebb2b1189a3..fc7ff4842394 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; desktopItem = makeDesktopItem { - name = "Robo3T"; + name = "robo3t"; exec = "robo3t"; icon = icon; comment = "Query GUI for mongodb"; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 950f8da78605..051b67bc972c 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,64 +1,23 @@ -{ - stdenv, - cmake, doxygen, pkgconfig, autoreconfHook, - curl, - fetchgit, - grantlee, - libgit2, - libusb, - libssh2, - libxml2, - libxslt, - libzip, - qtbase, qtconnectivity, qtquickcontrols, qtscript, qtsvg, qttools, qtwebkit, - sqlite +{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, makeWrapper, pkgconfig, qmake +, curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib +, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit }: 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; - }; - }; + version = "4.7.2"; libdc = stdenv.mkDerivation rec { name = "libdivecomputer-ssrf-${version}"; - src = fetchgit { - url = "git://subsurface-divelog.org/libdc"; - rev = "refs/tags/v${version}"; - sha256 = "0s82c8bvqph9c9chwzd76iwrw968w7lgjm3pj4hmad1jim67bs6n"; + src = fetchurl { + url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz"; + sha256 = "04wadhhva1bfnwk0kl359kcv0f83mgym2fzs441spw5llcl7k52r"; }; nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zlib ]; + enableParallelBuilding = true; meta = with stdenv.lib; { @@ -70,31 +29,73 @@ let }; }; + googlemaps = stdenv.mkDerivation rec { + name = "googlemaps-${version}"; + + version = "2017-09-17"; + + src = fetchFromGitHub { + owner = "vladest"; + repo = "googlemaps"; + rev = "1b857c02504dd52b1aa442418b8dcea78ced3f35"; + sha256 = "14icmc925g4abwwdrldjc387aiyvcp3ia5z7mfh9qa09bv829a84"; + }; + + nativeBuildInputs = [ qmake ]; + + buildInputs = [ qtbase qtlocation ]; + + pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins"; + + installPhase = '' + mkdir $out $(dirname ${pluginsSubdir}) + mv plugins ${pluginsSubdir} + mv lib $out/ + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "QtLocation plugin for Google maps tile API"; + maintainers = with maintainers; [ orivej ]; + license = licenses.mit; + platforms = platforms.all; + }; + }; + in stdenv.mkDerivation rec { name = "subsurface-${version}"; - src = fetchgit { - url = "git://git.subsurface-divelog.org/subsurface"; - rev = "refs/tags/v${version}"; - sha256 = "1rk5n52p6cnyjrgi7ybhmvh7y31zxrjny0mqpnc1wql69f90h94c"; + src = fetchurl { + url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz"; + sha256 = "06f215xx1nc2q2qff2ihcl86fkrlnkvacl1swi3fw9iik6nq3bjp"; }; buildInputs = [ - libdc libmarble + libdc googlemaps curl grantlee libgit2 libssh2 libusb libxml2 libxslt libzip qtbase qtconnectivity qtsvg qttools qtwebkit ]; - nativeBuildInputs = [ cmake pkgconfig ]; - enableParallelBuilding = false; # subsurfacewebservices.h dependency on ui_webservices.h + nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; cmakeFlags = [ - "-DMARBLE_LIBRARIES=${libmarble}/lib/libssrfmarblewidget.so" + "-DLIBDC_FROM_PKGCONFIG=ON" "-DNO_PRINTING=OFF" ]; + postInstall = '' + wrapProgram $out/bin/subsurface \ + --prefix QT_PLUGIN_PATH : "${googlemaps}/${googlemaps.pluginsSubdir}" + ''; + + enableParallelBuilding = true; + + passthru = { inherit version libdc googlemaps; }; + meta = with stdenv.lib; { - description = "Subsurface is an open source divelog program that runs on Windows, Mac and Linux"; + description = "A divelog program"; longDescription = '' Subsurface can track single- and multi-tank dives using air, Nitrox or TriMix. It allows tracking of dive locations including GPS coordinates (which can also diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 3ecc772feaa3..ee3cb9cd8ed4 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "symless"; - repo = "synergy"; + repo = "synergy-core"; rev = "v${version}-stable"; sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3"; }; diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index 47cea34d4a54..c838eca50659 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -3,11 +3,12 @@ stdenv.mkDerivation rec { name = "terminal-notifier-${version}"; - version = "1.5.0"; + version = "2.0.0"; src = fetchzip { url = "https://github.com/alloy/terminal-notifier/releases/download/${version}/terminal-notifier-${version}.zip"; - sha256 = "09x7vl0kddivqq3pyrk6sg1f0sv5l7nj0bmblq222zk3b09bgg8p"; + sha256 = "0gi54v92hi1fkryxlz3k5s5d8h0s66cc57ds0vbm1m1qk3z4xhb0"; + stripRoot = false; }; dontBuild = true; diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index 2128c260b805..c7ee4fb1c4cd 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "tilix-${version}"; - version = "1.6.4"; + version = "1.7.1"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; rev = "${version}"; - sha256 = "1vqi68jlbbaky1569kd4lr6p02zsiv7v2rfb8j1pzwj7gydblaac"; + sha256 = "0x0bnb26hjvxmvvd7c9k8fw97gcm3z5ssr6r8x90xbyyw6h58hhh"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix index 8bcefe4fe7b0..f9d5f01be201 100644 --- a/pkgs/applications/networking/browsers/arora/default.nix +++ b/pkgs/applications/networking/browsers/arora/default.nix @@ -1,21 +1,25 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ stdenv, fetchFromGitHub, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "arora-${version}"; version = "0.11.0"; - src = fetchurl { - url = "http://arora.googlecode.com/files/${name}.tar.gz"; - sha256 = "1ffkranxi93lrg5r7a90pix9j8xqmf0z1mb1m8579v9m34cyypvg"; + src = fetchFromGitHub { + owner = "Arora"; + repo = "arora"; + rev = version; + sha256 = "0wmivgx3mw51rghi6q8fgivpkqc98z2mqmllf7c98ln0wd8rkf3c"; }; buildInputs = [ qt4 ]; nativeBuildInputs = [ qmake4Hook ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { platforms = qt4.meta.platforms; maintainers = [ maintainers.phreedom ]; description = "A cross-platform Qt4 Webkit browser"; - homepage = http://arora.googlecode.com; + homepage = https://github.com/Arora/arora; }; } diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 63483b4da710..42d606ae2248 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -60,10 +60,13 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); gnSystemLibraries = [ - "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib" + "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib" # "libjpeg" # fails with multiple undefined references to chromium_jpeg_* # "re2" # fails with linker errors # "ffmpeg" # https://crbug.com/731766 + ] ++ optionals (versionRange "62" "63") [ + "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together + # so we can't build with one from system and other from source ]; opusWithCustomModes = libopus.override { @@ -76,7 +79,10 @@ let libpng libcap xdg_utils yasm minizip libwebp libusb1 re2 zlib - ffmpeg harfbuzz-icu libxslt libxml2 + ffmpeg libxslt libxml2 + ] ++ optionals (versionRange "62" "63") [ + harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together + # so we can't build with one from system and other from source ]; # build paths and release info diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 5fe20b9a9818..0cf6df0e5cc6 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 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8"; - sha256bin64 = "10d1v9sa0wnnhjz6ria315aml20v1jl2bnkhcqi125rqk5fw9wrq"; - version = "62.0.3202.62"; + sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj"; + sha256bin64 = "1ca9p82k7a9h416vwldzy84ww5psv3kbvh5xdys3j3cwaxxa0b4q"; + version = "63.0.3239.18"; }; dev = { - sha256 = "0dx9n9j1apngs4gc1n0kyccczm58045l342jr06azaw5yamsk8xb"; - sha256bin64 = "1syqi1fx3kkn7865m6ldicg9cxcg1pfy9l1fr2k5mcqxsdblcyyv"; - version = "63.0.3239.9"; + sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj"; + sha256bin64 = "1hq3qz7b5nmnck5sfbaa8d25khv88ylnq10dhbp76ahz4ixn9f7k"; + version = "63.0.3239.18"; }; stable = { - sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8"; - sha256bin64 = "1ijpv76wbxgwcvgr3nd9ciyyf26z56gxw4caga4x6600pa2lm8wq"; - version = "62.0.3202.62"; + sha256 = "0k4hvmhaspw3f2scjjcam9dwnkrrzzibnx9sq5b1p56bgd2zxka9"; + sha256bin64 = "0c4g2h1kcpksx0whf784hs7w62xbgsvq42fvzs0lfjgs11s8fm0x"; + version = "62.0.3202.75"; }; } diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index b2067effb96c..9356794bb5d6 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; + broken = true; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index b66d3192fb3a..16b59debdd42 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0b11"; + version = "57.0b14"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ach/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ach/firefox-57.0b14.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "298e523e55916ea7c6fb31ad383aaa6eeb582440aca98519d6abc3e44201b60f3e382be7947dd434b47e13f7e2d2c88b62009bbb4298a7085d0512307d37b4ea"; + sha512 = "07c3398805092ba5d252adcdb690a144f8143a8827e70e3be3cb71175735c9c37c9d0edb93936f8cd1af16ad7a6f988b8e8fe9eaed7e36bbb85abab0137893b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/af/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/af/firefox-57.0b14.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "00e31d736101e3cd5c8f1b999f9b4342369bce56c061271e952022459e80ea8b77ca356cdf28ff0255bf09984caa059ee0e62a2dc0f2cb31f1156224e7eaa4ff"; + sha512 = "fd954a1ddae090d6bd2c76922d4ec53ef249749c27996fbeb1276d2d82284540a000ad4fe6efbd690bb5e73b6923016d5c9c98d34ac5748c29791187417dd8c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/an/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/an/firefox-57.0b14.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "7dec20660dbd4bf0a88742b58f4282d10b8f8778aa8b8b2b7847485039fe266b2ae4dcdc76ff1a37a516d2f0c16a2db2c2fbbab1e79d6eb8a79c63561da2539c"; + sha512 = "c57c10028a99df1694897966f54aa6f8b85a6b2d0ed23699542a7a2bbe458e26d622e2de398bf7559bc33e7e4172d23d5aff8402048174a39804247dd8516e0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ar/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ar/firefox-57.0b14.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "05e8c1271f5e3f297e927bd08ef3308d57067d18116b98010c3cb2025e7b0a9ca608d046cd592a4afa3949b9a3244127a44ad90e89ce4b651397e95f5bd4a29e"; + sha512 = "a4417b95c1bec25f148c57c42895e84024153065536a303f8eef7a0d9a7d39d4de8bf287f3af815e8ccb7ec7ec797f098416f78775acc8d778c91975d6268014"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/as/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/as/firefox-57.0b14.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "fc2986315e7514e51be8ab082be42be9b7f7f878c0c1d7cbdf36f3d7b5dccf59a39ea44329c3aa9afdd7118a29706308118c89937dfdd3d8f6109f8722c5646d"; + sha512 = "5b624b9d0a4ee345d5c7b79913a8cdb48acebae32f088479c0745acee925d58c826b5125186ffa7c017ff3524983bfa06fe5061ee9423c37fb6f0e7323cac85c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ast/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ast/firefox-57.0b14.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "8dc4d3aa8935b61f90b21a059a97a6ffbaa90f13aeeb204b7eb28dd0ea33b899934ab162b7ba8ea00cd3c341d0f61de30ae2b3af052cd420246a891a2d902563"; + sha512 = "efb5ac3daa79a88425401f2bf5df6c0fba90fefd21840723cedc8ebae149816198b727dae67c3f74406c47e01dd2365d1eeb92c39a549f1acba4ba65dab704b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/az/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/az/firefox-57.0b14.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "9fb126c09f39b6c943fcc30636b19e3b566cb5fd78b1ce68ae78b1c94d68198bfd391bdab6474ce7d616ddb114b5ff7bf54caabed94e2e3dc4557c95832e1c8f"; + sha512 = "703332727a0db4a51a39859209ce76120cbdde5a00d32a931e118e478dbb5f4a4e8f3d06abfa9bc97bf66a411f533c23b7375599fc0a7f0c13c9d7f518cb8990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/be/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/be/firefox-57.0b14.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "ba5250a70bf92c555f87fe2376c6c415678e5d065ae7c0fdcfe613a53119173a7231f5c711dc1451cb6fdd77a94c5077c98019f0441f0f0ecb97ec16aed8bffc"; + sha512 = "d8ad4ba538e2e3f86ad8564e2418cbd34f33d4e89233fa6638acf10a3e10eafc0b81d6c20b585b872c5c00bb6fa2af1ea4097c19de01446a6811e4843c99fbf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/bg/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bg/firefox-57.0b14.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "aa38dca42bb1ed7472e10db04e4346918c7d495c24d484a9182c8b1651d1ae2f68188d12f133581a6b1a7463f559320283ab0877b2c51a1b93edb195706a1ed0"; + sha512 = "cb6af38306ab8bcd9229cf1dbcfaaf310108c31e28dbae6b9fc21a4cbdd82baf9fa785a9a94bdacb779c8679721903bc721a0e7ca2a1a09995fa97f1486a8232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/bn-BD/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bn-BD/firefox-57.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "11ba74486259041c06dc0c806c6b21332fbddfc525eaadd9a6eb37b1a8498bf25bd34b42155f642c8daa840040dbaeebb0721b541239656df4fe518d1cba3aab"; + sha512 = "1739ab1c4c1a7387dab56fb89762b26d8cf279c14a7bbfb1f7f888e9c2c714eaec84aba12f1384defc7974e207b506e206f980a8a68be7f274cccf7232f30e32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/bn-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bn-IN/firefox-57.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "25ae74c773a9d525497c9d0c7d3e14cafe490fc8dbcd363f7daa102bbddafe06c4999f84847545da5c8dd974528613a5c6e1468b323f60eb0e3ba79e360b88a2"; + sha512 = "358f8e3c1e9774fabd6bd8faff4cd2903c0e0cae6e5e6ee6f2ceb228ce7d489ed9112eb729a4f7d0ea25c377a2a54772279ea1343cec449b949688dfe19a69a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/br/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/br/firefox-57.0b14.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "4f3dc389261f384238fc622d5ab1059cca0a5a4eb02daad0233bac7addd118bfc2c4c95a5bf5b7cf66053b049bc3150358593eafeb5026be47d676db212aeece"; + sha512 = "df0c34c951d81d500a0720c2a9cfda76831564dc45d2e34d37b677702414b2f53710fe4eb7f63257658fd058ffa648a904aaad4d864a325a1b1e1ddfee2faf32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/bs/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bs/firefox-57.0b14.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "91b13a19dacd457db11f78955bad518c2e590433ee1951e2951566f6609293da7195940de7daf97004021ae5229e887bc3c52832be21ae514c6a4afff3a365ef"; + sha512 = "091cffc15f609bfab74061f13c526d4c13946e7b79d3a190ced0ffe2fb9aed457e1e1780d9c152699f4b42aa920d9bc77701eb944d9f9671b70da3278fabde8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ca/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ca/firefox-57.0b14.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "037eb9153e9f05a0c9cb2d80f39ae08ad8d425f349753ae2113e6a98a96950c6ddf3784fe2859383a5ed8a7450de02e6c2d344e20b851923c91576ad0d2de9b2"; + sha512 = "cd485d1202daeee2e24ca812350ce348ba93a0bf389741b13ad6aa6a81ae4c57007ea0b312e401fed8c268c8a86b5ccbf62ee25d2c1d8d787f16e92467f3c136"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/cak/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cak/firefox-57.0b14.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "990d5f8637d4386e698cfa070118ef1e39d77065a54ff8293460caecf319707402e1f043c3ae9a46a7a58e2ddeabc312708cde361709835453a22d7826a46d1c"; + sha512 = "c5573576cc70d776f3d40a2451295ad8a6230b0de280b0a2a3dae7ecc2c1fcc2eee5fd5e4df91a2b1c9a63411263a4a55f0bfa605a0688cbfb10c341dfe4eaa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/cs/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cs/firefox-57.0b14.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "50422d5a16c205e10c1657eacad657403836ebeb5c1de656e12c4ad7b65776f0377faf55c6ea5b586be8f8694ee5952c289257d119aa3fae1860d5565f89643f"; + sha512 = "771141fa3d846651448b158d8ad583a45dd2fc05ca5e3ff2ca19687431a140744707260b3ad9e304bb2062757ef333815f69e10a48e72308a802f9088e24b22b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/cy/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cy/firefox-57.0b14.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "a78d86f637729089f5cf86778032c8093f07b03974a32444b1866f25a286b7e903630f3e836ef12a4c9df6025037885b0140a39680ffa6e6473f023fa3153155"; + sha512 = "7fd6f5eb9473b3ee68a7a2a98128c205df6654bab21e4c19f6ecc1e427dcdca3b93e9ff22239ebb652a545a3cb8892782e34cb876ada78d604bc48816960f897"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/da/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/da/firefox-57.0b14.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "50eaa3e29c322af80df70c3a52df53698c984187b8f8db86cf922fb38d61bea65dda2ecb6d6889a2f1a07c5f8b0d6026590d37c71df74068df0403f91998a584"; + sha512 = "30df907a7e99f41f9291d2e677e124363a8c2f702e90db870e2ccc1bbabec2266f0c64fa3daac66c5da1543056d1e3e1e8458dd4627cecfc0a9090ab0aee13ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/de/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/de/firefox-57.0b14.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "213227706f35dca646f3938044387aa42097d131cb6a2f361ec5d114f2c78b37b2298d9de3b289cd504c6559f37758324cdd7e59e5535caf3f8b8c8d71e701f4"; + sha512 = "bce375636ad043e2a9e331ecf84154f5e329217b6c1697ddcf17301115f39c6f35b88083cbec132f92fc30d93b414a8a913ddf02ff0c406295047d5d11a7a3e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/dsb/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/dsb/firefox-57.0b14.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "67406fe340fdd8107a36755bc75b05560540421cb1000b47d89a6492c38c0904dda5ba17686ec01e1f77a0f8b6a52878042a9f0d999766847eed54fcea0ee470"; + sha512 = "0b75a555b9b02759b4315d3f77d78e71f2106db1b2901457b54e7a487b9f35a0aed3b6f47e7363257b2bbcd42104783fe14bc4171d658515b72fb61bdf9b0fd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/el/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/el/firefox-57.0b14.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "60a67bb618aba13377c10e3d798fc370e633070c30d50e7180244667449308ceea4571e7a997c80af80ad027e27074f6b3fc670e5253f6159ed10653f8abd798"; + sha512 = "f4592a580dd7fa207943d071c92816c1f6583f579e8a8fb6564da6e95c0edff1c7dac24c581e25f874b354b55aabdb8fba17a2f4d9677b653e957a66360fabc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/en-GB/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-GB/firefox-57.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "4bed5620eb52e080379044e3785a318e131387181748414367b02a5b6dd2a4dcf43b55a794d9add241b5a438a79ecf1cfc15eeeb82d6c188baf18914d722542f"; + sha512 = "56731ee2e83a591201471bd6236a247a3a5713607344ae8a5c03efcad4f69eeec010dd89c1fdd6329325768a4b9a83ecbc278fc503a8d61244523748d0a8fd06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/en-US/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-US/firefox-57.0b14.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "85d751cfc31fbc330292aebc1fe8e7563d726a91242708b85104dde6a8043726e647628ee084b71c3f922eb0d40cbd7e1381a9a1b47aaf641edbd7401f3ec24a"; + sha512 = "cbe3a6ae2dc8d89ebd935d2c58d3f735ce08f45418c31f1faa9f75d75255a07fa87d9b7d53f571bfd876701b566e27cb8bd761cd167749e2019b1f3bc1fb569f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/en-ZA/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-ZA/firefox-57.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "ebf2cc4e016e3623e2cda742d468fb0ebf0b6ff05c90d32e9eb5bad131fbbe12c46e667a21d1f446eca897ee65a8ec7ebd59b56951cf12e5ee44ce89e7bc147e"; + sha512 = "f5c32cbea6753f4325c7cfdc99bacc4565b58b0ffb7cdc8db6d559922b8402493b502e7a05fda4e08746d48dfa50ca7b70ac27e152ceed3fadb9d2af2ac0f639"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/eo/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/eo/firefox-57.0b14.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "e3719652420eb97abe0097aed9736370dd55c572e7745f862d4b031fc84e84611f0c08bf8a2b7fc830a6759ff73183b02269dd7cd1b9eee5076e7d26155c77f3"; + sha512 = "89d278965fb4c7899abdf17f2fd1dbde201c959b623c46ba4db51628a3a09c5e054a614b8657f7f190ca5e9cdecced24f126978425bb38d14c84770958466bb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/es-AR/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-AR/firefox-57.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "4cc08c7b8b242d671ec85dc46761f546479d2e207628d68de4186ac48b619013ba39005ce3b67ea08eee6df8ac46effececc83c8fe5cb2f184d9d56d36f98f41"; + sha512 = "d21ed37e2d6461f31519d08040b271e9a6d476e7132f5db406fa3eb3fdce67384af376a89d740426fba12a5602c20a4d315c0e337f0707ed7b91d739b648ad63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/es-CL/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-CL/firefox-57.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "5c6f753e119198ef1633a1a7039199f00c891d43ee5b49b95a4a1e8d5d20ada55ae03ef30e380fa50de4b777d4ad9dd5aa8bde9d0186265a6af9d7c277858ebf"; + sha512 = "bd0dd077e732c996de27e5fabd22933aa1c1ff448425bc757be909ccfdf7a8a2f32944721a248e4998bf9d455fcce13c22a89dbb780c3a61d8fb06745075b122"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/es-ES/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-ES/firefox-57.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "702ec0d89777a6a9c4a54a9542a0d2e89b352643eb5854db83600a7a93ca41b5d811de21d1de1f33c976b9ce5b19492d2fed12be1f570aa66dd09d21aebdcc5f"; + sha512 = "7abe774d7c2baa9e055c382fbe4612244e9ce5c778185e86c1b4e8422ab8af4f99a949bc8560109e6995d8101f8563e6251643a5c6e4ff1ca9675b064e1da580"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/es-MX/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-MX/firefox-57.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "2066be080187a297a2156d9953de0b9c38ff4c18e509f56884f596e37ef21e4a832bd0644f4e2df872d22a6fe3925b72b0548187d64e88974cfd50f9f1c18c54"; + sha512 = "4f4c6a5cb3fb25a030a44f3b7c60d6a1af77b083ca4cd04711ed4663e276f03ac92f4b8be697554af7a4721641fc7588b005e27f2ed2c5c1efb947a64cfae8a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/et/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/et/firefox-57.0b14.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "0ec67c6a1186fb686f67075dbe1f07b34f2a0f45d3631b7f6b3a144b7d6ac89bc7d34bf98088826cbd908aa05a38a410fbe32135203595e604483f465d4f8af1"; + sha512 = "f23d6cdaac6a412c28c633fcd304833bb341c159090575b8f8cd7bed6068a3ca3497cae072d831b1ac40ebc98853fec978a09009d3eaa5c1f6aa6bd4f8c3b956"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/eu/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/eu/firefox-57.0b14.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "2da25d33b6fff7bb463b65a866ec5bc89a39886e66022dc9b0ce7752d962cf3852158f1ef79bf4df0d7587729e295637b9c27c99840e3f2dc0ebaf6cbdc7a3c0"; + sha512 = "1f7f209e1faafd254e607c7bfceb5b1913c59361d55bfde394d2af4f745e0be54b7d119cf71a88c577dc76f0ca9a96fa52cdb38b27ed5dd6d270eef5efca2501"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/fa/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fa/firefox-57.0b14.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "d3e17c82f7020af45b50215f39d78826a5072dd94be5bf3cdd61ed7f67a45593765efd7f65b071ec3b00be86f90ed65f15bd6a5bc2a4906c2eed9b0cac23ee6c"; + sha512 = "e175dfa91bda0daac8854d999cf3770332d61dc11ba338ba8a9c42718e7d470e07dab656a3a13ff25f4295df648196549b4a3f4b273061c278f03e0a76815213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ff/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ff/firefox-57.0b14.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "2a17680f7a595a35aff6f2a6a25eb9aeb8497ed7ab2cd2cf95e1894ea29cf99fd3c222144e3a0feee660cf0fc31d21c54d572483544267c8bc5312f0b31b9c3f"; + sha512 = "243c09586248988625ae347ad10b691cb5f93ad78562c3223a244403a5ad41b138289a992edfce91a8744f45ff8a2feb008ef3dfeca608fa2cf44e39746bf794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/fi/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fi/firefox-57.0b14.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "a54e8c300ff17a0b2f1124b5c637fc2b07f47761b5df71e219a8bb77b21f67542b19ab6051bca5c542cd30bd3517817fb5f44250990d683a997a6f9d925f6b93"; + sha512 = "66ac96ceef9d36ab4c16a288da714c9bb9dd72b12cd814dcdb3740135ce6d19f18ee564c31050b619a1af207d086674ea4f60ee01de3a18eb854f35af5d3fb8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/fr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fr/firefox-57.0b14.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "50a58b205bd0d7ecddeeb4011ac9c499b35b32659f567cf27954561dac91b6bbc2a79e37e19b1fec07aa7459dc114d4cb8641847118fe50efd7d6c98e66a6203"; + sha512 = "7a9398f8753c0b3d6777a5dab4c28fbacc493883e5326fcac0cb0a0f62509169768355a5c5db377afa6a1ec79676b8de53ccabc49666ac9830d588ad2c8bd8eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/fy-NL/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fy-NL/firefox-57.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "22025a263c986be90ab5dc05138c2a8b58108bd39de83fe8266969cc1742358c2cd0730315904a1a35adcab94bd499e8d688d65920c346c28f76b650395838d4"; + sha512 = "b309d91af97a94246c9450eea61f81cd8f6e8564bd089caab7e1238df4855aea54568ae8d40c3c59e09729779623f1f488e2b18f05094ad79d7d773a82196eee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ga-IE/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ga-IE/firefox-57.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "a1fd88907a14be9eda4e392762dcdcb009701baeac908a4cce664c8dce3c6957cc889add929b26fb48e592001c2e6e1f34ced9bbe137b0ceb7d230dbbc102f3f"; + sha512 = "f3b699c8cddca58a8610aade833b470e006a804606ecf13f166239f32ec7fdf0ae57e6f91d3a104efd08fa9cb34c7d78026753d0cc235cabad8aed8ae85ccb22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/gd/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gd/firefox-57.0b14.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "eb8331550bb43251a5d66c5f108568de1fed964a8360cccb9426b6d163f47764d34c79224026c058aefb2a526475c6b406fc1717a588a61c65d73098f217df8b"; + sha512 = "261b14e52513485a14d4c92f580a9deb228dd730f77911dde25785b8eb7974a1fc6d39b6d377a3dabf3f488f9d29892aed86c38a115aa4c9660b27a229a512f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/gl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gl/firefox-57.0b14.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e7326fbe2c6b9e10a3fae76d27ec0de8856f9aef95a31db1ae5481ea43d895ccb220337b68deaf8a76fd110d6d1f74209dd27e8726ced57a635befb8e27c0e7b"; + sha512 = "6028afc50364a4bc0e21fcf82181b3d6ab44a985d7ed55fc090544d25c0bd65ba8737e1b653e9cf860f201c6c3aded33693c2ee7cb7229b899007e9a607a39fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/gn/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gn/firefox-57.0b14.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "cb81a34ee5f87636b5519c9804f65d714c5ea4406a05c465c5ee2bc29381e8235a1788111dacc78066e420f2583f004b3dc4841df9aeef848dc7a48accb3c9c5"; + sha512 = "a189db0e527b1a69d1f42b23b5898224313f73b269ece12bcafdaa9204cecc2424660ff3543098cd6036ca17c724436fc6cce9fa7f38376dbd35c943f56cb559"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/gu-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gu-IN/firefox-57.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "e26a80e9aa0e72892d79d0cbbee8473208342d3bd966cb034fbabfa6c3e844490184089ead6dddcd2f655c1577b66da239a24a636a651a8ad7951478e3dced9f"; + sha512 = "59c9e99ce0da07aefa433b76a961cf8b9294b30c4c3198ac7c8cee5d430c89a10058f614f0955ef768d1e0c12e583fb98612caad4cd48389454b9878bbb08667"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/he/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/he/firefox-57.0b14.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "13814b3b670a92013c08dbc8e37169fe758e378db0ac464f9b1d061ef5ba48063a1bc9284686317f4fb5b791a133b773bfda4db2ca25a154da258b81e2ba7bc7"; + sha512 = "101f7135364f544517674f8c0bae2d16aa600798ec7755f4e02d0827df6920a60c19fb0d2ab3dc20febe1e9dfecd192a64fddfb2697b825ac940de530383ad7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hi-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hi-IN/firefox-57.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "51f0fd4d50751559e0590340da3f3561f3526792965aa9cd86ba2b83866ac3342b5b4b225da2f2a2724b937c7ea00ea16881f27c8bee3deacebaeabdcc446c3d"; + sha512 = "dfabec31fc6170e3390a313a6f201ee51930c1e1c884a5e1b0b2107a2a3c1d19753c91404146dbbad9dc572f9828e3196e6fc1002a9b318b3648b1dffe2a9cf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hr/firefox-57.0b14.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "fe9febf45bb0b79c131868a16a4139a7e885923eadd8ec07f0aa5262e66c06c5c188d4e6b8b4d6164bb32195f27330abc199b79a8d2a524fe4699f9c02ed66be"; + sha512 = "2dec6c07adeda8008e3d85b6552f29f882b1bb9b89a5e03422126067ebf9eda03e0272f31464c42f8b9deaea174c26b1571c1c416f1fab63a7e67cc0bfc2c136"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hsb/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hsb/firefox-57.0b14.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "fbfaa755ed9ea1f86f1f27216fa6925957b3fc48ae847534ad289361722e8c70e28beb83b9b30a447c0acc06703fd2642c652a88ec8ddd215dc3538ea0baa819"; + sha512 = "b5dce6117e1c964a612708263adc5533d8a063ad6586030fda1a214c6df887995f7ae7782039f063786bb332732857781392c16c646c29d9ffc53fc3c8cac8fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hu/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hu/firefox-57.0b14.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "b51b7ef5f2b0ed15796abffc299bf633af897393b17d12b2cd6dce5bcd6fb9165c2ee001b44eb89b91e68e616b2265b1fa307d90e68e35c34f425254a0135dab"; + sha512 = "fe5654e089d50c099aa3cc9279c0a4a3e975a3e10d15b9b832249d082f95d461cbaa51f5851c3f4a680419e293fc9137b1ddf275ad376e073090db37ed92d888"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/hy-AM/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hy-AM/firefox-57.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "b2f781a77542c754185bd4f3aa040eb0d0aabbd773f27a422db87c8cb0cb60d1173c5e32e02886f608e03f2ef8ff84dc8a3cab7d55305fc36d9b11b96ec11485"; + sha512 = "9678679c8bdd32131fb7397a88098028a955624a68d59746d073671298a3ecbd8d2933675ba564fed0650f44add7fc1135f441a3edf2ea932cfe6fe5b2ef5d13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/id/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/id/firefox-57.0b14.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "6e251aa02c0ec21272cf8bc4bbccc9e8d3b1d512a0a1bc90ea90e4d3844fd90c03989b102d9129348ced8734a40576b2dd294e8a85422e215b01b025e48180d7"; + sha512 = "c863c503ecbd71f17c311f99d94a86af12a57bc1ce0beed6fd0d0ccc5c814c25e5636de9127610b768fb947a0ee48ea585e1a205e1646ab20d2f6c2044b67618"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/is/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/is/firefox-57.0b14.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "5fe16a677f6413b0229c67b46e7831fadc0a9ef04395ea7c928d1149fc262cb9f28bf3c40b7d57eec09fd821a37286177a19f1a608a062b84ab9d82897560994"; + sha512 = "7fe2398dfc0da2bd215867414d765729e2b30620930ee1f50b98a348f6e6fc098c952d0c5ee200dbb51a84ec82f4ee2fe8b01c4a6fc879d2ebebd95f39f825ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/it/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/it/firefox-57.0b14.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "f0ed83b63ea8df081f9110b5e8a5f848e9b4e89ff5ad7ee685f9792fa4438cdceae34b0e1bf265454f966f6a6f9d00bf47d665e6553c3c786bf48f4fbceefe4f"; + sha512 = "043b409173d097ce49eda0e16144b3f50ba7f7a83ed679f8fd09c26d18914681e15b68308ec6c65aa09f26afd195b6f8e5afb4e2276a5717b716280450dc403b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ja/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ja/firefox-57.0b14.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8e9d0e446bd4b46b267001f1d24563ff5eb064bcb72be2ff30f42834d91658664e96683d680ec03fb62b8ae3f5e6d68b4a18800d6f4fe1b93692b1e4ab7258e0"; + sha512 = "9c4391e27831ae034624f22e8643922324b7940f2b6c739d1c6b5c47449b83f2c8756b11efca47a42820a867248efc023876e1218327f1c8e80cda0c960734a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ka/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ka/firefox-57.0b14.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "b557a2da452b41685e4ef61dbacd8a4563c4016b16946e197eeb60f39523dce87942f38659047a284ba2f8dc78ebd4ce5d377a86d54366e0f0c49176e29b3255"; + sha512 = "490c43518d3cf1320d9a3e8f28c70908b31a5f9ed01b211f4e53aef67baa279eaf129f06ec6c21efe2fd4a89364f55ccda95847f058cb2f83fd1f92c466263dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/kab/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kab/firefox-57.0b14.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "cab2e7df696e67a290aadeba8553e65880156f33b4cc57feedc971517496e8a8beb2ada6f8dcf4fd963a034cae4bcdc03bd970c6a9b27af720f64ce1aa9bf8b8"; + sha512 = "bffa144bd5c6c0d3fcf9c8d44c679f22af1127734ac8934a5cad4d5e6726978133cc99c61dde870143fcfa0b07c146c4d7a84117178e01083a0c37d9b4810184"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/kk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kk/firefox-57.0b14.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "ea92799a2896013796459e8b8e3f5cbb8e2da528eda74091d22c93fad5791d8669d8f092842090ed5ccfb9ee39e7c09b44502c752d29a956b5e9cbc793ff74d2"; + sha512 = "5b49760338013954ffcc3ae2c9c79b0d9ebd92f1a148188249559723bf23338a7b606b26f5326b48e2acb15e7ce023f4dd2a536c0cbf5b7af8eacfc33f3be670"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/km/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/km/firefox-57.0b14.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "76f3d509693148cc94949a786697a6bd3bdda894bc4692715e33397e24aba446d94f9e364e159c4504bc0317adba5388ccdf3698f1226cb0bfa6bee2f00fb4e0"; + sha512 = "7ea92ede74eda15d9a77b6b22a02a634364b60bff135da5356991644f474a47c16283670d24f2cc28d112c97f3b49fcfacb1c618f9caa16fb013c3c650b50feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/kn/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kn/firefox-57.0b14.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "3de7da4fa42a74b0187dec9b28cea76e3ca1bf80827f374bdf895461477a67478761c2059572da14c1e5660586a07239ed22d066e548c5271ab563713a3e0ef4"; + sha512 = "e3d3ad10a374421603068c420e2c5c28ee8a9f9b822df556a1237eccc54a778ca572e09795aa9022cfa373652cf2913c621c2fab82484f7eba77f56305ed6aab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ko/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ko/firefox-57.0b14.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "fbe8b5a9a196a08f56408f57eaab71e3bb7ffec53bc05c4db0bfde4478267975aac5b876923c915a0a182d54fc1bc99f6361117fe659cc9e998e98f3a9aa122e"; + sha512 = "a681d5e49952f1e671e0c86854102979e052b84140002b968f791f4a325858985751a3872446ae2495802ea0c1df884291c8559a573cdb236cadb7cd706ce718"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/lij/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lij/firefox-57.0b14.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "031ec2684ac7aee9a02e7aba789707b8aa6937fea27e191612b7cac6b0aa7bdf996c3f3cac1379d7ccce0a53701238f4379d691f29e2d4ad4c5b27a518d1d2b7"; + sha512 = "b33522bc78b07958a3b5b80bc0833673b1516652de2a165f5bc7ef54575a21af20a922e207be02c4531f64503e97279dca4ad4833d2eb86a6c04f3fd1fdae7f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/lt/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lt/firefox-57.0b14.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "ab056e37c0159b7b62e4d20e6fac5de190c3e7b53919bfc29cadad90c664c800e233abae58d1e7c1b8ded76af6da7603ea187da6510bac904bc2d32f9f37feda"; + sha512 = "ec27a8aabc0736b410509a9fb9706627e06316b34a241639ae27108ba3c4945b4ae675fd85da390ae053603a0a13a124c0638c11c0750c665c8226446435bfec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/lv/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lv/firefox-57.0b14.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "c4a498bd7832c9ee93d0d98730c962176775b347e95241e0e307a97e8d53fc21dd943143e880f994d81d4fe15a7d24a480a07ed41efc10d1f816549c5b37ebac"; + sha512 = "bc4b125320ba7033946a290e0d974cd4a4f517ae9c9e2a24d86d28307476fbcb4372ec0cfc567d984e90d105cf692a08100bcec81e4ab615fff19ec0ced0096f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/mai/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mai/firefox-57.0b14.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "81f85952c2966471f4c74fe7092b7b614f33130ca19c74842084aecc6b53f8dc975d05ff0d9e7a8d692096e1f9cf2a49576bb9d4625904ae1074c5e0476e4bf1"; + sha512 = "2aca4d6ce673fcb71a8c6228e243157e597573d152d05bebdf8b9df3bdb479dcce1708cdaf2462902c5ed0b7eac83a9dca523bc55a6bf6b2a9fd1d4582a3d68b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/mk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mk/firefox-57.0b14.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "c9ddf832f7da91e15ce16fa46777e2458ade47c68dbc0c5a368e5e2b8a26682487449e51ee46057724c422ced2715754a4b5f459f6598e342ac0d553f2fba267"; + sha512 = "22fd8e59aad75508702ea3fd37af4261f864a76e943cf6d07789d4f1d094d7e0d5e76e5d4c92b6dc642e0f30047d4515d8520bab667c05c16aa4ffb60f0fa168"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ml/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ml/firefox-57.0b14.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "55b8c4e2152fadd17d21ae060532ad078dc83f92c383058d1ea979dfaafbea58f9c7c7d5852688f619c6332a8ffaa37e2bbea47517f4bee71af5696a21593611"; + sha512 = "f96568186cf49bde7ceaf36805277c0cf4d75da2d5930227e625e2abddd5b740df4207ce53abac24c77dc755f52132204b945fcd7706de4e3075505635eae9fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/mr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mr/firefox-57.0b14.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "713455cb6defd82c93ef80d92803923bc5049014b2409f1903056e0c04c2316a5606c9fcd13e96c9aed79224e24ee491e24ab31366a22c5ea74b55c556cca2a0"; + sha512 = "82fbe7593e52299dbebe38fb97126b91f57e48968c7235d8adba93776ea6c6883dd8eb5df3345cae55d156a7bde2004f1f446339e46de90c85f1525eb1334147"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ms/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ms/firefox-57.0b14.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "53402320cf458dd250bcbd967381df5d5901fd62fb34943b18f86137f338e96d5b7175698d57ed3169ba138fe303c21365baaa56cd40dbe05717a82bb14d4c26"; + sha512 = "3ece240f01f8322a86d1b8861be25e895fdbfc9a024406727400e0d6cee8efe88a11cbd6799e4b7d0d8396cad80a6a7438d4f0e3b641f94396a7d2e80be06e02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/my/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/my/firefox-57.0b14.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "92b06c4aff57149610269474dcf242e58e0a9676a04a01e843bdb71cffbd24f222d0f65bc73751cc0807c6efd84149e7d241687c66413f76f75031edadce60d2"; + sha512 = "9e670ecd9628c8822f634031dc7b6ea2610687df8967591ff44a3fc2922fc11bf84575811e9e0f51997764d67c357de5020619e3f637e31c3421e64b533930dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/nb-NO/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nb-NO/firefox-57.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "52d82c8194062ec95b06f8956b52f7ef47df60436c40f3ae00358cec47034ebbc61fb2f0cb27a93dc96afd3aea5e3c7e8ebb92268f7fab01ae21d78d45f15994"; + sha512 = "298d7d24c92a5f56f00d7d615ffcaa1b483882f5845f3de4bc8be2811ec6b5808a2bb813ee9d9b8aaac84a6c6f7bc600b45b7c22480e6c4c111fbe815d46e70f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/nl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nl/firefox-57.0b14.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "75689e5e642b82e97f734b3997984d805794b9ee07a44314a6cdbfa36f7caef3840f02daa13cd1338ed8bb435aea59c14b634e269211cba3b31babbf594f8f27"; + sha512 = "c59787d50bb14ecee498e9c454e3ab79571656160761e95a53b41ae8196093f6dec3f435d9a69f064b9c4aff0bef332e2d5334153d98c8984041e26c82ef04a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/nn-NO/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nn-NO/firefox-57.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5000b5497707614d74210aa372697c38db2997fa1fdced45e885de3838abdddde402e4282f32517e2b75f25b8d21d03149ec9621affe2e84f3dc34aac5ade534"; + sha512 = "c7c9965a5810bcaac0f1b0d08ab6a9d660a00e40368369998101c2cf043837459e6e65078906c0278564412655a76987f30b671bd90edb25820362c3a846b1eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/or/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/or/firefox-57.0b14.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "123b0de9d2fea6509566df36fd2c2d0e540fada2b226e824c914cfd02ad964b37c34c3d1846aae0fe13e8bed1b01b267cb396a25f9bab1db9a6b0db420addf11"; + sha512 = "bbdad4aa7743a1af3c31eb81003612d0729ceeea5a0303f129f24e352219007b55f40a931a0140fe1b1b4cff694572d1141779238881376e77f30a3f3675512f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/pa-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pa-IN/firefox-57.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "38618f7df36e1044bbcc32d50e6158e47a0e98cb171d03082a1874b990722d535f2dc4c8df5177475ae8c33bad9407ad480925158e6f74077a977c5abeb4b4ea"; + sha512 = "99f5ba6937e08c2cb0f05be9b8f2e87e1f27d5ad610540b3011cc2fcd11c2a7a84a1cdaea9b6133d1c9a38311eaa13221ba57bdb444c9aa343c446abc41c986b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/pl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pl/firefox-57.0b14.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "54b384c63c0c017898ab5df66ccf5176c6d69c1a55c3470d3f16fb2e654854da802d4c15206f7419e26572871b09c700e6caa8cb1d85ecfccc364796d8595824"; + sha512 = "956648b1f331356f8ee31158758fa0ca7cc7685aa7b20c1833d87828f5f4d695fb3fdbebc55f4862c0f76afe72ea6035261c9ebaaec2561d728d61a4bf53ca9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/pt-BR/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pt-BR/firefox-57.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "11c908bd35ded6e5dbf4df7c518534fe321cddcc1de9ae55db4ec1557ed9df5228e085c5947117ecb50fffd7af3365455e8ba6c98dfb587c8edfb53fa7a330a1"; + sha512 = "528a30c7ec5c7485d0a64b6787e0c14c66f832b2289884ff234799631f4e9c6d620c3312ca3d1872e28c80c7a192b8e0e4d0b9d88dbad610268e9d3fb37b3a05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/pt-PT/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pt-PT/firefox-57.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "54d9dcdcda3cc5cbacdb4bf6d5e697a0f1ed257ac8650573655485342db89fdb7ec6b98675d7255b600f76284a510b11e53c6bc9a2896d2f3656f2420f252ebc"; + sha512 = "c70eb4dd653d035fbcb7de8bcc78cc1855f7d6dde8296a825d733a26e9c44e38c8e77ad54c63f806f12b90c601508bd6376aa620a1e0948c0b265dde3c2443ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/rm/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/rm/firefox-57.0b14.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "9f5565b6692fdb5fc7c9004261f4b1bf2b6b51e75fd6397018f2c5eb8699cfe93eed15e9564ab89ea3f643898ea55c98245ff8da713e479477356de645c87da7"; + sha512 = "c9b9f0e3ea90fe7e2d5c2907d82e7ea5abd5f30212f1fc5e726dfe72adbe3835107cc836e310ee4bcbbcb6ed6a08bc8bea06d3bda08d1fe7a08ae20b6a22bbdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ro/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ro/firefox-57.0b14.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "402afbb1552668d7efe27faa3895ef8f2edac40a389d5694de04a0b74f01087659503e46cc9c49c57c35dee3f8079943efc2d655b3f8eb3fff3281d4ea6972aa"; + sha512 = "6246be75562143b57f27de69e39f9c82c7aea3e60d515cbab0ed5e32228f5b33abd61cb2fa7f3c4e73c65a6dab5ed446a0eaaa94767e0196d5b337e6b5a410a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ru/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ru/firefox-57.0b14.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "fea3a0c0192a5c74cc47c8355f7b78500cf20a0c1deccb2adc3e3639404f07cbd9edfce9960a1e84a41887e1175e2643af6d2c6027f3aabcc840226f2940c153"; + sha512 = "467a4adb72e27ea95d324f52007e18c3ea307b7ff158a4e58bba69859f5369fca8e7243329e2bacf590f35315402af10d8071c34886a7fdc3cfd6e0548653aba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/si/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/si/firefox-57.0b14.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b57c8c5327d6393b841f0d4b1b327a5816560a7ad2744182bf99cab8a333b3fb833c14cc0587d1111529876e89b9de24005084967b327c3376543e0284223ebd"; + sha512 = "47b11ccc3bdc373f3591ee73b84edcb9afe915f1bdf5b7abe65eb2ea675da44316a4ee5087c0c4e69a90dc337d43e201ac15b98d04a0ad970f8017d737e4f738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sk/firefox-57.0b14.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "221ee97c377002033a46564d8707308ab9c730eccb9dea3c93fa03d9f952cccab745298a8cc6ca4eba11fd171c92ffc159ce8fc004e9cb4710ff3553781635d6"; + sha512 = "c7696394b76668733814f1b2cc1c41cbfd962d4d58e424c041fd419b3da2559b1f4057a8aee328e0698ec8b350e7909ce5da3770f287ba485dfbcbeb3d1de9ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sl/firefox-57.0b14.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "c9264bccf0c5c9c02c674349e641330e3a2a55807fd44d964c1bb50622597958278ce22c64e10ba5bdb3623d14d283ce91d61385bf0e58bd784e46f5e81b10ea"; + sha512 = "aea6c90fe73f9aa1340de0ba8207089deebdfea21d5fbd5d5c0ada6df26a4acb4349eee4a7ce09f9088439cf059fb7fcd6169cb1c34c83a33c909bdb3ed7af43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/son/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/son/firefox-57.0b14.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "e0c93706e7ebf5e054beee0827fedf620b10b3c41140bb999e722cd5dbf8c9227d478ee689fdc88d77bf85b9e41414dbdf33017ac26b3d026ffea3d3cfe94415"; + sha512 = "6d3a9b05ea14ad1281c51d99757475b6642a5411b7b409f2acba695c3c0a5719f4feaecd0c56713899475501fad3413fe46f4a3efd482111aae2395df22b1e25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sq/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sq/firefox-57.0b14.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "faad9344981f9b9a4f978a53156825bc49c88084ebeb0cf14a950a11f7d0468e3fa00a3306f48d58c18c8ae0622299b3abd428390863101678cc4ad146094451"; + sha512 = "9e7639f9fce27b4c3b3fa265e0662b31360313569f1fad798c89ad1eca1944827c3aae23c283f4e153d3f81a73d235b5fac56598cc02dfe2dcb38aca806203a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sr/firefox-57.0b14.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "cb8926a04f9c5563821ede2bca7e409ebe14c4f00c90c0edc5afa6668f9eac9e2225412cd8ec8cdbc530bc0c4988e5ab82d6a659cc19c127fb5db70d1fa898fa"; + sha512 = "d84980d2b454f33a33fdd9b44ea7e2c41a73a351492fa7bd951a8e4ec288a7aa4d12ae362443a664abfb554693e8a8f5428843b28ed48429de3d32575f94ea74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/sv-SE/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sv-SE/firefox-57.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "e20c6b93249abb71c3550623603c2a20e1ef4eff5530c1b3971f1190f00ac60539a54d17cbe8964fa91d7edc377e16c54970901077526f3964521c3aff0dea68"; + sha512 = "b26deb242735a3fa662687efbb8a293e76561821540ad701091a8b7033c9c1047459fac955815790ed026e4f69a51d2b0396a21102a79623b72f5ef8cbbd06e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ta/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ta/firefox-57.0b14.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "1cd968168f9b496046c0a10fc75bb0265deb964644098afe118f0d56f8bdc5dd038f23f78e94fe8f5585ab27f2bfbf85beb9771ca93ab9049e8d7947dd99d83d"; + sha512 = "1e98d86b9df418542dd15a204ed70732dc8111d8fdf34edbfee8217460e04467a822b66804e9876e28f15e9167ec5a6dc1551c4159c136006392feb7ca218009"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/te/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/te/firefox-57.0b14.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "b7270f188b747ef0a833c29e9155bc58d1bbf38b9e97bc8a073df70b026751bf303b424ceb295746b3529775b8eaf0d9e3112970b5fad9673adbe435af9cf16a"; + sha512 = "d22b7c8b45d37631434007b196c63044a860912826cb301a218b0aebab5ae8283370924a703cebb16a98a589336e024b31ad580b6fb57ccf3ed53f238e361704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/th/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/th/firefox-57.0b14.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "9dd0b419c71e6f8229973ce0738bd69247488786c1be9818930d24ba9506f40eef6fb9e4ab56b38136149755b217e8353eb07d3bbf11a673d34c485d4672b967"; + sha512 = "8a806b68e3e5d4ba884bb9f72bf07c2bcdcf33a8111236fe837a41738e997116d092ffe73e4028dd7429c4bb0f097270fec7a20ff3b5bb316fde0a90af92d22e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/tr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/tr/firefox-57.0b14.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "de7b9bd2cc817662a7975ff95bc34773f940d2b2a491b85df4bc3d19dc02dee75cb6305e9fc2441e3dd3d9ab746ae2de6d8984187f7276f988354a447a6096be"; + sha512 = "9b1e73d28f5f1fc352f830aa59612170b72dffd7ae060a8f2422ce14ec46f9e646fe625ce36dc4d380fb58ba0300c68a83f2d8aa8282100f6ff33a43ca79d807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/uk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/uk/firefox-57.0b14.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "13ee663e62cd68b92083b001b2a3753e4c5a6c15aa5e1187c01e6cad8692a6f53b6e25cbb0d294a62a3986421bcfdafc8bb82dc167118c213e9f4939bc991ad7"; + sha512 = "96d471b413e980ced87be210faccd8cb6b796c17b871cf785c34f10ebc04c4c76ce4756bec0dbe121b689bab2f777e54eef6ea43750e31c1c83524d0825d0fc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/ur/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ur/firefox-57.0b14.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "d913ddbf3e10f048226f3fdb5e8524e2599b236379e6def3786789b767e9359ef2d47e2ea025a508467d7c47101b922150866984d91dfc41d525876b72ed4549"; + sha512 = "0724b881cd4aa040b249882d41cf55260d6aca1f4876c89a42f717f00cecf40b32fa60451685b7a182d2ebb11dd08af7e0327bb5c9fe94b2a6f03ba8c9b4d02c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/uz/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/uz/firefox-57.0b14.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "107db43aa14f63c0b7ff4fa4bfd43b0343b657c3791fe29b07812af2c810bbc5343eeb90cd43028259c40dc79b0a763cd770b1f4954bdbadffa598bf0885ce83"; + sha512 = "bedf1751786c828779fb719edfaec466a299ec706e40dda5f886bffe911d425b82e9f9a3cbf5a0deadff7ee77fd63c73f38ce3462aa7203316fc0569a4423927"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/vi/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/vi/firefox-57.0b14.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "851f0e5fd8d057a3d55807ad8cd215dc378dcbe71b4c416bd8b88d0f0cfdd9d4febd7e93dd562affa0890d6aef9818970773f95ed76fa136c034459eecd977d4"; + sha512 = "3ed1b4f71d75d0e863da048edf60ee3cbcc5239d4a8ebaf69fa6d3a8e8be20e556dc838155d7b99ab2776ffed60e578ce253c8e6f57491dc84ef3b68049cf929"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/xh/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/xh/firefox-57.0b14.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "195e35390839059a49e6c4ae03c1d6d4f085f7cff5b1c7963455bf73904303946c0926158a0bff4024c03be96b9570eb0e18c19ffb42081609f5812cbcc2e941"; + sha512 = "23db4e5df5432094b7f31a688b84d23304c7890d0ef99cd9c992d7a108a08199b6f6f94bf3574668b9b0a915ac49d2c0e8c6b0c37ecb145da3f5e2a5660d6d9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/zh-CN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/zh-CN/firefox-57.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "2ceb83e0e1182c756ccf30ca95f252ed8e81d293f2c33cc2d325bc091fccae183bf3e75dec67bf6f497b257d4037d8715b12b540bac95427289ea0baa2bdabcb"; + sha512 = "bf08e65cf257f789dee34891818f94368fe89bb500138ffc72855da7acc62cc08a4eec3f4d32a637f59fd0eaf072994ba4d5691da300d75738e3274e4db3ff45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-x86_64/zh-TW/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/zh-TW/firefox-57.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "44597eb5fa3eb073a04a5fa36d92055ae9bff41049e4c8c3762ce2166d8af5974bb232ae244830d32d51a56e132cee3afee55f23704d389be78bc48063aef1b4"; + sha512 = "6b924c8ad6b86cf07b6b2f01a6138636391acc519c469b7c1dd96ee5c707e1b81c656fe87df31519413ad60e56e06da46c0f762b26249426428dafa0420a5b97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ach/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ach/firefox-57.0b14.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "9809327388821a5aaea4e8c4d85b61608f677c2af3842108b27d3786dacfb36ea82eb29458a7acf9337eea51f6f850c4ac0398dc67fb503d5fcc3cbbbfecfef3"; + sha512 = "56d847a9417a134af10f53ac5630f7b4a7108b177444327df97511494e2a28a279990ad37d48fe1fc482f34b45db66f1c8d458162f253faef3ea2e66e42e7166"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/af/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/af/firefox-57.0b14.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "7bbb60c0bc784c4e58b2537b47e7b4b7ebcbf0a4fd63ab6db8ee0ddc1948ba9117c08baed37e5743ea90d28395dbf4df0bc512aa8bafcd810ac4e2b11ea220c1"; + sha512 = "98d55bc29423eaa62b1c5f179887ac95e8aa228ded6e077cc645660a048ee3e42da7966adb9dad5f168477262638456bd9509aeaabfb2a754f0435b60e9b3a46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/an/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/an/firefox-57.0b14.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "d2dcadaee4456e112edaaca783c91e9c78246aa742835a3d4cd074c612bbe1b85b28ecac222550eb920f09a96249e36bcb49a274c28352a6896d8beebbcbfbd4"; + sha512 = "0478d738826d3d9b0898ab93e25527b4dae789652a65a7b16ec5796b8e48e575387fa3b7474d7092ad851e107c03f9c58d8dbe738277371f2e881c56c9f727f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ar/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ar/firefox-57.0b14.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "c993eda8d34a3b5f656a7d4cf616f820bb2230a734df6c2f0b4270d5403e8d6d23bd4bf003ae9b115acd1f7925d46b89c3cccc9345ddc7f9d73a269e3c243431"; + sha512 = "4c884b86e8ef6b554d85151f1eb780edbee0bee6b60f2ae3b30ff9be74591c4f4df07e5834d0ca5cad456c574abac712a8e856e07892df652f7db510618d231a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/as/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/as/firefox-57.0b14.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "5112aa43ee870c3fd8f13378a4159977cf4dae3b1792ef983325a0d1f0134f377e6e4c473b27406f2722c138309a1af175f4bc9ff4e37f08696abf4b8f001fc2"; + sha512 = "a58c8f47fea197a5b9a397f8e58f73e381ffae3426c83872407481f079b62a585230d2f389245d5eca6308e8832fc95d8dbb7da97d25551faa44c20f6e032bfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ast/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ast/firefox-57.0b14.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "cb7fa643c742ac1062f34acb1498a7e903dde4c8b685ba48b997cf0247aa70157ce2317b5e25660748294757f0d0fde7d08dddd6581726c8f33db1cef3767878"; + sha512 = "fa4f10093602f03b759502d76ed1d7636ca2fb0f83174869e3cdaec3503fae625e6d49a07c011dfdf6964aca7e8ba81861677cb387ab8c638a5a671864451dd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/az/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/az/firefox-57.0b14.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "267fe9b5398ec432e684efed10624819eee7a1729c8480a4acd616cf4dc988295c069a62f6e3f2936a9e822f45fc459d8aee2d94549fc77d3f2fdc6a23aa9ec6"; + sha512 = "8560bb32c0c3aec695d86d1c0ab6491ba0c2dfd0a936e7cddfb8d3cd35890db31ea233afc74d19974fa693614bfe7728e69b8d1ee47a34331b07674b0b57f118"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/be/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/be/firefox-57.0b14.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "35977b89eed0a7e7401bad75eb20e7acd07ea52ac252ffb73a464f7d7c7f44fdb9dd6bfd1418324cf8834165825ebde256704e7822734077a68c0a3ceecb8b56"; + sha512 = "026e1ecbddc4972cbf1a2a930fa1488b4e649ca7c811ad243a3c068f8cd6b57e5a73d193a3feb4cb49f012dfe3b5af9002f30609cd1551abc1ccc5e89476440f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/bg/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bg/firefox-57.0b14.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "dabb67aad05867acd8fc5226f1adc91168f70d68926a7d9e8407feb8795a9fa56121234c639b03cf10cd2ad44f638b6f96003e48977ecd07b8f267c9da10b943"; + sha512 = "9d145f71f46e12f071e8e181f6511d20a6ca5f1f1950cb076ca25b929893da7546b950450f7fcb41021c4591238738f9b8797395a86c599a907f0df687cf0282"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/bn-BD/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bn-BD/firefox-57.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "f6185c2eceae26618c3ddbb09f87cf120f300d8c3642d36b257fc8c6c0fbe7a0d0f0e409b53bf3fceb2158497be91b9dd70e3605a5177d858a115cb4cb065683"; + sha512 = "846001c844e9ee3d9305eb5be18438af65d5920363f19935a60b503d4a31c0fecf1d7e6fd286cb7ee4b7e26455496b1d27fbf6ccdf2d2a432ec2e2472ebc9c75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/bn-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bn-IN/firefox-57.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "50730081c97abb504f76f2e4c5bfc42258473b5b1cd4393a09be927156e626ede088f7ee6242ecaf9b641345cb4f28fb9f0a5276bd781882aa047adb4d1281c2"; + sha512 = "712ae023c09681b1ee9f41240d12a1641df5c4fd7eeff15d157c379e5b5779c65b93719b238fb121fdb9e5ce10809b21125a6eae23a77e1806daa0b2b13e4372"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/br/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/br/firefox-57.0b14.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "6a1cbf642c85abe216854a45d371dd8463c37a3d30a9cc0e7b88aef19baf4695def56c9ff61110868c1359c7b6b082ea9862ab4026fda70ddef05c304f805fe9"; + sha512 = "b99c48b8971dfdd0e642cf76cf890706402079122311b1b6af77d658b03acf87feb67918cb83e5435cbf0746e2c2a7c49bf7283969685d0b4bd616d4ec3066b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/bs/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bs/firefox-57.0b14.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "f62dfafbccb28abda10bdda208ff161e5db06eaf4bb3291c4a2149c990ac28a80ff4eaa28bd300c296e349c762c1baade01f5881b8e079e0e690a9c3fdc302b8"; + sha512 = "2203e66bcf453f22848df010cade83d6982178c8ccc023e05ff8fa60aa3f7e583f9d8e33a313fb70a696e149773d567be8228084708ca8d01b3cabc431a7576d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ca/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ca/firefox-57.0b14.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "990e3c75c387050c728bb6fb2dff2040e53b0ecdd73fba6ed27c6c66206597fd2ac099d561ba8a9cae1875ff38628a562143dd5802c7ab67221e2837de4ee0e9"; + sha512 = "75ce6cb2bd7c1d79b4260dfc19237a1344fbefdff9775a7e557f9a31dd9fc6235f58ca8bb8430b80bf0f25c14be5dc2509e86b41b7ff7814e2fc1baa63f187a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/cak/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cak/firefox-57.0b14.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "698fac4d2a06a5057cb81a57608eea45752e6ab787ce8264e5d3e0a1c11469d1e0b2c97a5ae34ccdce7e6221f6367dc4682154c6b013105750c854c1340252f7"; + sha512 = "b4f0a11030bad0cd177db357bc49b6f745cd429d3a8dd9bb09e99db1dffd32ce8c21a94c0b98b6db703fdbe16750b4574b3378dfd40a358bc0c7957fd2cbbe2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/cs/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cs/firefox-57.0b14.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "ae2e138b886fc3c2350437a57fff8f29a5018b78dc2b31a45dc981ffdf233d6ad11be5df8602cd7de4ff9df6868701b296ee42d1e41922da1db7aa5f1c1dfabb"; + sha512 = "5ee1dbd826801dc5b029c8eadcfe8d040f000527a6ff7f2a40713a137c59a144456adbb35cb202d7883d831486a0ad56079d07f681ce294a5e97825b7effd69c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/cy/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cy/firefox-57.0b14.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "fff159c8d07c544a8cb66b4cb52ffed3f8975d362c0b69ee83a26490eda68bebdfce45ff71147198a2ee94841deb9115a6a2ced6ff7a583d09c6dad8edc87d99"; + sha512 = "7116bf1dbec5603d22546b1927a6038812c2abe1e9e7e1ae556919e62f04af422950efd808e28eb7f8b349a9d79bf01b9280d6a6aab94bda8c0f6e2a8968b841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/da/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/da/firefox-57.0b14.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "32d5bfb5293e1d5346d189638b1e0269fc0d6aa2ebf3e7ca2f018533744d96868eed09797e8222102a6afe66d0b7e2f6ffcae5e72fcd2f249fc66f8af30e5bbe"; + sha512 = "538ddf539a6d9dd22bc2dbf9f712773c1d7896ce2a49632d4acc2e5716dda95dc9d10393bacdf2fb7d24342c8a93c39eee139f32edfb429b0bbf7053b7bb3240"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/de/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/de/firefox-57.0b14.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "63b9b1ef0c83c91406c165034f0429c9c2ecac617d4f69dce40b9d12fd5f0583fb88148f6d14858e21a71ec0f59cc22c18abc296d0c561624d584fe6e6967b18"; + sha512 = "ff33af1ffb0549951baa32e423eac3828b15bbce18ee03cfcdffb57504fb0e592db2721f7008e84562e5c1ad297311a1b3d4fd5ab41e3d8346a2d1ca50e54c35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/dsb/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/dsb/firefox-57.0b14.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "c902b5bfbefeeeccd7b49dfdcff94f3219ab42398ff2e73aa166846b7265b896838754719f1e84d0662660bd03ec14737183e60e653721840cc53b4bbd6d6658"; + sha512 = "6dce022b035bf9c5d76c45492e29617668e0000f5f3981e3f132ca1595bb54b504cffa92d220e118fbefe8088f3749f4d077c591a12657ce9266b88aab8019c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/el/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/el/firefox-57.0b14.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "85b2c08615e034ed9f1aba837bd73564e877f3385e3c3989ce864b1848f79f72e30a5bf06d6b32358a7f296137207a785fb343874fcf551f6f0b98515a52fb14"; + sha512 = "b917927c48189bd26289fabe3a51f59965c8a421aa941732a50aa9aa3769ce085ee69bb04202c21699f5ebd6ec2cff75ea2446246d89916127be9418bb00f47b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/en-GB/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-GB/firefox-57.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "d14d1d17020b8a79dc580f7f526403e17cf0337fdd567b464097bb3796e752a669208b2a94a0fa4d1834816153230be67ce815bf440e1acb9220c951fe84cfa2"; + sha512 = "17257657f8366c5efab1a0c47aeb6129e624c883222a6bc3bbb097bb49b531894cdbfd39898d0d83981a1609fd3ea5dd101419819a1f156668fd3cdb3758b8d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/en-US/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-US/firefox-57.0b14.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "fdaef350da4b8eda52c70c613f8c5e6a5c80522d5afc8f6bdd9590c91bfce43d2d2034ea095b377b47f8da65d950fe4c203c2cdfa9bd880d3f6253fcd0b252a4"; + sha512 = "c86cce7893fbaaf4d3b00b961b07a2f2d680ec07451b735449a501b2d9fcfb2fcbc0cb29150866805ad38f6a4aa1b6c4cd87f5872b8c735791953f3646600703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/en-ZA/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-ZA/firefox-57.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "c4ce10a2ad4d8ac8cff1e87a408caba7c1736f84ad2e228b45b7f9d0f87e5c9f6a4adb0a0ade89fa88c54c38a68189f7e203370890eaf69b6bd033b90afda8c7"; + sha512 = "0b278c62b2185a4a6cafb7015062693a0dad610ada1123d07e162456e4d942f02a0566ce525e68b639fd152c420b925ee3e934fd3c42ba25524b18cdeeb9af5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/eo/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/eo/firefox-57.0b14.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "37f75ab35b3ecb080dfd7c3b5edb65df950d260edb0156bb09887e8f30f1ef1d66016f6b07eaed0288be1c5c92dcd5c18b88fb0a9e742ced375ecf661a3ff5b1"; + sha512 = "a681db144a631e6584340febc3de05803921b757f7c1d39ad5b8ff3d119ed8b71a4d70a43ac1e3a121e04102770d2796103aa127886753b2bbea723e22df7000"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/es-AR/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-AR/firefox-57.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "8f2603e1d4942e6c6d4f7bb5823473a0e44f820805301aa2b0faefca6540f4a8078d43b6b9427e581d9720f6ee47ce4af82113c113753fa7131d6971ec10441e"; + sha512 = "40f5a7d9ba055f7eef155601f8a57e566c0829f32c92df48ea2ecebf6e10dd80885881a98d18a693643e2c00f8734218a7ef8908652eba1c4d4288f95a34cde3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/es-CL/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-CL/firefox-57.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "9a6845eeecb831cbc3d804377ef11ccebe513307a72f4b542968d1851e54679ce202e5c6e5b1b2efc767451a0202737837f564f146862791c53d9880e42a2565"; + sha512 = "be1e5b8c6e184519d0b10fe67736d7635b6fe8ad71ab78014e53ce9a1f1342a83aa1b18f535ecde2406e8be7a8633ea58af9adb355ad2b19ce0879c62f70bd40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/es-ES/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-ES/firefox-57.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "4d94719060001c3e4fdabb0a08e977079a3ac05d5a5f006d724dc0d6a7bd31646f5603be8236b6cb0ceba10eef64697044cc104bcb10b4308b28fe4883e89167"; + sha512 = "be0d2b2cb5f82fbaf10be63aa76a5ff9b9111b4caf0ef5222b3ad7d67d39f25dafc125352c00bd91bb1eef50a6f57e996f6a10618d50c5d1340604883bffecd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/es-MX/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-MX/firefox-57.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "38d46eaf7b40f753b9fd6fdffda3b21c5f4ea9a554488277cf55f97e230911606c98fb4e5b6b188621db24c552236aa67b1ebc880630c74f6c57777c6c0aabc1"; + sha512 = "439f679ddd8169d51e1c1f9ad32185fc9b33df0a1301af7bdf8982dbfc5410cf82edb4dfce3dedc214ab258d714da91661882e45b8220895aafcca171fa9bb02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/et/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/et/firefox-57.0b14.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "3babcc9f0bf78b491d11d96be70a62b409729180e3ebb0fc97ea0eecfa3caaa2db1f6956f8becd97066d8b7216101804d2fccd249ccea335b92bbbfe12b99d89"; + sha512 = "2b80629eba503ca034fc4e9d873707aaa7668b2d4563792e3500acf89b35153fbd7f6406d12497b1ff1423e7ddc3bb4e0f3f63cc759758e544145f31aaea5a03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/eu/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/eu/firefox-57.0b14.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "f2b1b2befbafdfcd2467822b7834c5a03ec380c2876d6641addffc5852453232c350273d310e734e7071d2dbe35c94779eea858ecda49411b6a8520629394c62"; + sha512 = "03047624365bb4fc5bae68a5bec91a396da7d404731cbe09d89baf3079be0c4a9a2c7ff73d231f39e98689d5c4dc7290d2401fe14cb564ea53d063f79d7c151c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/fa/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fa/firefox-57.0b14.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "05d1bc4004261475c6b806fd2327d2d1f0a1246769cf9de0755ac0cffad99c270064699b5d05cbc9353c5ce77be9810546f59b0d47a0f88c96d6296d4e51a358"; + sha512 = "8758735d6bce447b8492f9a395da6f58c63537fcc946b17b8173554b6eaf32a41137011bbd44842b16e8053d55642feb880e9cd52dbe75fbd55dc592724a98a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ff/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ff/firefox-57.0b14.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "448fc135f815bf79fbb62e2b4ca799bfae3891f9d1197ec8febb441f2a13dee8405add2c54a12d2eb11fad6eb291d7cacbdc31fd5af1978a253a5672444fd30e"; + sha512 = "5d6a1b45f69135dce282fc411237db713538830b00f6361f86a95da199d56f2bb351de9e59fb1d61a4b617c79e8a80adce3c3e57ba837187d4c368b79e414dad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/fi/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fi/firefox-57.0b14.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "06f995e53b88f32fadbed3d0b3b22c11117515b2e926b6ce7e9763ec6fa29bea6a05292ad8325368badd4a0a6b3f5ec8c49a147a7f864c238c814c4f53d99082"; + sha512 = "f35de96ff1b8542206fb8e9942333397050a6e88bd0e6bca3c1e56fc4dc754dfac0b554b74188d316e6c820881ded2812efd9221b2c3d6497826ff29b89382ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/fr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fr/firefox-57.0b14.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "dfd06c21d7dd83309f9d6d11fea295bfb1f942e9bfd19a5a1c45b63466eada5ed75b88fab5d4730b13db0522b3a977eb85164cb0c4121242a975462dd9518acf"; + sha512 = "118d6ae69eb686ed1d791463bb2ba025749068017de94a9d002d22b195ccb9e0cf0d042e613ca88c310e685070612a070308971e12eeb318b26b2335b13a6a33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/fy-NL/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fy-NL/firefox-57.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "ab381fb599161dd7df10db3a1c93f1e71d96ef1364a59518e1413c17f7a26b524c02ce54a33f8ea54a02829e519f8e8c475b9579b69bea62f44c76e909079e3d"; + sha512 = "79a22424fddf0add63c3a3528a63ea4c0c9d39f3bf9e35e18fc9ad4a57be7e7f675087f1a491698868d5ce57cdd149aabddc224b7b3078ad3a81e6ee6dc35b2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ga-IE/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ga-IE/firefox-57.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "9054ad0c2184063e6c42ac23004c9c63438368c03fdd7bf9bc0610d1a2d4a47b9bc4cf4762a0cafc633ae397c38ff64e050409c5d6fa0ca1ac869d918dae547d"; + sha512 = "04b87f564be35d19135973a0e17c2db1670aa804ad8c76b40c8f3ccd670e0c64456d84cfec276dfc55dfa29db5fc0bc70826752bba756cdb597c7fc12da1d30e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/gd/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gd/firefox-57.0b14.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "3844132a9433fbcb107f380200d9b57756820a9a3495c805622b7f3952c59feb8b3599c774d844f57bd38aabe01eeb45cc35d8e06073350f884ddd0a0a18d3fe"; + sha512 = "f2a66ee64ef80dfaf2c16af952be22ba9c11b3a2859b6a861e04ccc2e7863ed5bb1421338c1ce30ad9ca4506d6223190ab5feb194ee445e9fb09a11aa99a465f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/gl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gl/firefox-57.0b14.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "2d864cda23c59108866f6e8f473bf98d8c328f24202130d9168ca0588f43a9cc49c8df1ee4872601608cd27422d7243666b5a1dd006ae5ba101773b7334cdc15"; + sha512 = "f59b462819ee53e8727863b3e4cc240b83ec5828860e3a0428b012eb4047ac837760157a7db60bd85486cfb9945185a2b8f637581e489d90bf140bef873dd9f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/gn/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gn/firefox-57.0b14.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "fb23767c66deed8f0ef97fa5b8044654740b8952bd7b76da9d6074e22c91301fffd3006c5f9c09ee7e7b3ee3001e70b31a6c09a096e3dc73fcb867f15251a553"; + sha512 = "17499a923e6f7d0e63e4ff0ebee17f02c99f614da02d0ff8a737a37ecdcf69ba1798139c1b824d187b67b443e54701b1046b59fc6bac3757f86fd6303a778c57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/gu-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gu-IN/firefox-57.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "7e146f4b6c3eb1c96be1d95ce8502aa62b1483befbd7aaf9fb945fdee4e8b8f62088841057bb81d9d5f8d2163b25bf17797d5af5eb6d6f32ee77b0b7b84aecd8"; + sha512 = "605ef03bab50ab1438be938bd8aadd917c742a5ac0bebd14dc8388a6e5cd844b52e0ef23670537dc50c2f3b4ca20814a9e559e667f3baaf292ce3fa16ded26a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/he/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/he/firefox-57.0b14.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "3ecc278918acc5f65c0552f9108bd167a9ed3f55b39b4f3ec41175bf9a1cb1d84e32b57ab208e6c6816cfd66b33b5d2846d5a776a79510c7186e0d5ce6bd25bc"; + sha512 = "51bb0b64426ed0d46bb2265b18138dd0d5fdc58c2782d3bff4dd8ae13bbfb354648b346e07bfe2795a4fc31cff2df54d94ceb42ba0342a59218eb5444e9fc12f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hi-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hi-IN/firefox-57.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "7aac53bb08c527b1c199bfffc5edc25e8d49082dc7df453439775afc07722bb126f95955aec799909818cfdc949efd5a9f987942a4655440c0ac26691a0bfd9b"; + sha512 = "74c921e0bcefd0c81616b8685ac3a0fc85129a950a917ec37c724fbd92df8099e79726639cf18235379ebd345f78de754e4b4e87d859e696aec6e780c607839d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hr/firefox-57.0b14.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "ea03e4f1370fcf59c9022c7f4019484ebaea8e295e2c3ff3ad8f44aad9336ba809cda22fc0f98df2f5ed7ec536ed9ba349d5ee57bea3c4626ba5fcf41fe83be0"; + sha512 = "8c4b634cbacfe34a2031c1edf196201fbbf13f7bf22be2910f27788e56b0647598d805953b888869644f4ec3547a0813377d517676e732770684b057e5f76028"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hsb/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hsb/firefox-57.0b14.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "71ee5338b776daa0e9b33834079c94e3e9582b50d7b0e92f64e25546167838852ab606c2c2f9abb1f3480755a653b091e60c97babee00e66d4140600ae4d2612"; + sha512 = "59ed77d9722413d8d75c8474de28660fe59d8990deb3c1743fca4fb1c18529173e0e7bb171cdd98df961792ca6368b91db26d6ebeb461543473ee5ce8eb7da82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hu/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hu/firefox-57.0b14.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "defae5f9c7164bb5150af1fdd6c0b262fc88c63b9c7ed09753af5a361815ffce9ed43d0d79bad65bdf2e0de775d17660ff0c31a39134f9ebd2b6f60ca4a02d23"; + sha512 = "de8d917b533941220763d011fc9b38f0c0f8f32f09d999fdbe985017a002c3375b592865420e58fdc4a3d56f73206ddbbac568fb506ccd2e3cf4d2507e8ed315"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/hy-AM/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hy-AM/firefox-57.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "924efdc4e8584d89b60d98117a229c4c9a619b42f0a713b0fbf9fab2ed63b5761a9b5051e7cfa825459cb3d499eb4679363b13a76dee2973ef6b843c7ee9fd9b"; + sha512 = "ea76bd2eff30277dd06d606b0568dedb0f01c6330118da99fd6952f9bd5c8060a621687c66853b46554560b56f1ad2401e87e66bd44d1a85831805caf7ccebe2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/id/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/id/firefox-57.0b14.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "508c42fff4f6ba5e39cf757a1a306c7404e3c133308d6bf4d734f4d2c53fe79998724f861843d2ad76af2dc5482f108ddfa11026b8351a8786d814eacbbf839a"; + sha512 = "024ba211754ca36470ff316d626f46cfc2763b94dbfe027fec9dd628a0c617fbc9050ce7af336d22c962bcbb9190f1980b1381c5d3509485b4f7bb5780c6d15b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/is/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/is/firefox-57.0b14.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "9930f784440abd54b53fbe94f7eeb0e26ff2b1e2b16ba30fe1a7d298195db58fc32a25624444df89176072a9344088cbff188b73b9d7fa8e8b571b4390a481b3"; + sha512 = "d53d4d7545bca63ce99dc691481b890846c33f5efb802734514ba493e1b31e3b4ee9632a4389dc388c77692ceefa9eab4e9f85de1298d0337a6756ceb27d55a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/it/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/it/firefox-57.0b14.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4bd98c6c17a3cc3f883e7c2cf8a76a5423aeba67c6c22a50befaa8d4efe0e8dab495598e17789dbe078c75aec7e612ce959ef8f82254ccfab460b273456ca50c"; + sha512 = "960bdeabd29fd9bfe72f9e2b5dcefc1c9577490636e9cacee964b8646ee29ce2cc4c9cb87a93f057e2a6371cb734920928bbab90e6c6738a19098e9e5a4dab75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ja/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ja/firefox-57.0b14.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f034c703ab191fb39fd61859df9ec14040764a8e22502277d11447add96ab3b060931efc4f7dc1277519c47315c40793a7a7b8da161892b13fd433aae4f723dd"; + sha512 = "f9d889ff8a25259bcc28b1178ca511ad7cb0ad9d0882c8b3f6a04e98d5f4b63ad9b190cc66c184f93fc96e0f869bdb10cdabaeb7b9807d49c3f72b7c62efe3c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ka/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ka/firefox-57.0b14.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "8ed142d84d31914f638daec87ad64cf1aab76e110bc7bc147630df019f1a6cfec8cfffdafa139cdde91a06b65966741aefaeaf3d16c63aeb94c4f2945e04ba8d"; + sha512 = "1ece76f8237065e712b9835d0ea15f2b7318f420f8e4d6f73496bd1dd9cc5fbbb4125a04b4b4cc5c36bedaac39fb844a101653efbb5d0555bd13c3a4ea3e9d28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/kab/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kab/firefox-57.0b14.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "435e8dedbc0014ac19a37d0450537d7b9c2d4e7de993644991c58640edbfeeba17c6a59ab5eedaf1318bb8c71cefb5d30adf01528bcbd8e043e0eefa63296be3"; + sha512 = "67d22ff37a79716869d7b59e95806c4a9b89bb2e256e0f1549fe5d3bc9fb3909f7d1c23111e8bb84a9cdfb4e029414908a79a8512c49847fb1d4b20263ccb43c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/kk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kk/firefox-57.0b14.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "3b059e976cc10eb97b10ac4bd9e4dd2b8cbc24b805e23ec125d42ab731c5cc6f97bed8ecf222b1ed3e2c84a422a677cb938239110a38d6e34efa2a9f2472bbfe"; + sha512 = "b9cc2b1c31ea4bfbf17c2c7b0452bebb830cd3b8cedfcf2739360dba562119e0eede3b660a403420f367287e94e0bb34f072ea13b1cd1b58681302267f299464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/km/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/km/firefox-57.0b14.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "aacd4ce2f5a8152916b2a9b8f532cdd09c382e0e365de297082e5bc16f6c19136430504bd74e51422db530c66a13af45721c01b5cce3a7b4fa31e08beb852539"; + sha512 = "afb6985ad592ad2d634c3f84b1d573bb87c59bad892f066ddc1bafb5cce7109c59403f3c1394b2f65da0fcd29ec897a3144ce1ed410f623354410c27e386ce06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/kn/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kn/firefox-57.0b14.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "10993f98c96e83b8010957af8467c4434070ed5b3c52311aa67596621f415d6ef5d7946a6fa5112ad7fdbaea00675bb07f6845c6553774e1a9666716505778ef"; + sha512 = "cc85e9d276e4833fc962554e44a54ba8f5d56c387c37ea78f2f8deb1b845eae8ecaba1761726e209275d24c4192bd61e409c9d87320c1315665c095fb5231a9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ko/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ko/firefox-57.0b14.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "c31ea13732f5b2d14f7089d71923287be8fc99bc60db396757f1a8a2936d9ca5aa5f1e2c447cfde0f90683038868dae95eabd55ca16df17742b2f7bbbc89e7be"; + sha512 = "3934a012853c70b77fb02689141efcba7679e87d115d80d1c7f5945027f082986e679f146a6acbc97ff5b5be6b0d057e3b3f8dc292c4e66a37d5c3972fe865c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/lij/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lij/firefox-57.0b14.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "b7febb474eb13034eaf9ec555202153562b8dc34cebd0c03d680757c19b2b8fc5f7060e66b115d0080cd3510a56033597409222eb56024ba136d9ab50cfb246e"; + sha512 = "571334620261a36127ae1e7a03c6142ed22fe49a95e28534030882c47a7325ba8200b8350904fa0e501cbe0801c2bb1968b456e9982bef165d3db0e82ad34b89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/lt/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lt/firefox-57.0b14.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "d07c56a82054d1238a8a5678b65efbb88b7807aaefb327eaeaa393218ae280ef4e134d4a3ac28694458470611610e3bde2be68f3df325a496d9f922d985681fd"; + sha512 = "3a7a0f09b52991a4d8cc6009c2fb91f3f908989d8178b4b9909bfd90f29db6ba11f29ffb35f3f1e578f96d6be10eb0fb337d28188dc792e6d024e42a5a16af8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/lv/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lv/firefox-57.0b14.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "fd8adc196bded44b80d6875a0cfc270cd8672a19b8911753a7b62545823262c34381c3e1d72d21af695c273242093b4df45188bf6b07f83ba5a73aa7a8e5e528"; + sha512 = "7e5153caca960317e039f8ad44f6eee4ac8f582ff2b957f70c9eb3d6967d62fb94e4b13611006d746bcb4611ec1b0a003bbf610d412f9e41f86a8ea19096b70c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/mai/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mai/firefox-57.0b14.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "c31e747aa29393f12b4d32131b4a9134f57fcc88235258dabcec99583494832cf61079b8980171be2ea952121f3c5568c42e006e2bb9b1c0e6f6fd05d2204dc9"; + sha512 = "07cbb84ad4537482ae8b1ddb00a86197552d3a80f6432779952bc9b1577c920de07e60f78272b1ee3889b031fff1c5a34e1c1a69d3fa0621fc53413242f80242"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/mk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mk/firefox-57.0b14.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "3e304e2a82640adfb7d15705ccf740de623995385618a351651005da3bc23edaed3707209594bc2b70a244f0ba86accb80c319ef4f55ba156f5487e694fe37ee"; + sha512 = "230ba5c56d60d1ec08092e9f6ae396fa836df56dff1aaed933a706014318fb13328db5d6b0bc3dcc030daab5f906d7760bb3a6af3c03422f724d627ab8b9d48d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ml/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ml/firefox-57.0b14.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "d229529966b0890b78d53e221d2e809d003248e2e42dce182f3f761434da72362181edaa0db9ae255878d01118ccb38921af715a412408e60373a0a76f02b104"; + sha512 = "e4aff215ab6b3bbdbe08f7cc698f11b12bfdab232ddcf995681ef62dd9808789541e8ac7b9b71c003775b78451c06f79ebc45d5a85562385a2e449679db346f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/mr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mr/firefox-57.0b14.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "d8e81fd44be727b8b72cfd5c4852df33f812b6c3fbf09c07a461c00b53bb41fa63a1e2cf9c17dc90ebbd630ef18541d4aea4d9cddf471fc52d9ba10952ec5ad5"; + sha512 = "b2b44d4a205e39d82b453a35569da1a3f428610551d322a1c57e64da42d96ca2f199e8e01769a24628506cbf3b621cd734923f9760305de8e480d51f360f79e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ms/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ms/firefox-57.0b14.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "e025f2b6a8724eabe4128d9e3567f0817c833a6fb2855b541e6a12208992c2586970b5adc422156bc00fc403714bfdaab762505308931584ed9ab8f9352e1183"; + sha512 = "3646303c3858e4c2a7dbb555495f5f06b1867a04a37cb8ce95bdfd998e7bc96d8afb8c83b1df7d945bdc8327cc8d7be3f3bd7199efbe23e58cc3e38608ff8313"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/my/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/my/firefox-57.0b14.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "6518b67cc4ffe848a0e79fce56af5f9ba60f3338bad5dc65644d6064b51e1730182f4d6038c4deb64be852fac673229b75cf1fd0d1d7c37db62c830d018824fb"; + sha512 = "afbcd9f8dce81267614855d4d59da02f87d369c2c0af78e28ebf25de18ea4eaa1412999fcf3d414ebd030f9448d71e48500a4e90aae03b3905ba69f2670b17d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/nb-NO/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nb-NO/firefox-57.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "177f3638d429bc4b5d97796de91c39c3a5712ca3fe5f93d5e1801937d16b80faab94cdd75dd99ec7c6451f55a5a9282195a0deef8f5500833b83dc3ab46ab20c"; + sha512 = "747dbaa1919c1cec14d4e085f8c8f284fc49508ce82cdf9a97538a85aeb9b901eb9e160e03346a769ef760bdb2108b33a25a967a527dfd3758f25cf11bad2e31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/nl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nl/firefox-57.0b14.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "192f7cdededf9424631e96bd88d15fe66b7654cbf09701f361e0083b38106636df68f183aaf3b9a4894e432cf828f429ab5a62ee0b521956eed14e470c909aa1"; + sha512 = "d882e7c1a49ba670535f17fc9ea99e7be4505d6dbd5d90855e4614cef319c38718da445afc411f1951ec3fc5d9a3b8799c64459a7adb588a29a126d1cd16d8fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/nn-NO/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nn-NO/firefox-57.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e1d9ad0238f5fbbbb95d08e01f95a9ba71ec35ed47d0609a49a9f76e9f9008f21932a12b9a342b9ad02fde563dcbe7779d43b9bfbfcfbe7f17c4f59d324808e4"; + sha512 = "8bc137f953b13a447dfd419b9ee0e4005134437892f214e49e18f98e080d5413d1dc655bf0bf417cd7c8a09811d3e7850967662b9d0be0d3b72cbc92db7e2307"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/or/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/or/firefox-57.0b14.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "12012e659184136db31cad4448226eb4e70760b9234632c9fa1b71a54b0ca06608de7ffc62ecd018671fcb9ee7c3357ff18b7b5459b395a39eda59d1a44bbaf7"; + sha512 = "34bbba4bf288f62654f88afc461155a27cc0316a920d7b8e42198054d5800360401c933624140cd569bb9864f9eeaa5616fe2530888e4717c964506ce66cce0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/pa-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pa-IN/firefox-57.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "cc154c9b0d53ccfd515dacfcde3a55a75c16f542080770927533b9efba8bedb7f46adf0a54772f60ff8395c1e83d0ff602687d7b04998e9d9e0f6c3da2e95142"; + sha512 = "1403e23fb95cf8449a149ecd698e768897a3733718dc1f6eb4590685263e2a1b54aaa3e557a968cfe71c5172bbdf7d24f3eb9fcdbeb431e31a1a26c0b9738e9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/pl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pl/firefox-57.0b14.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "ffa0cd7b26d4fd48cbbb9b56b60937190dc271cc6f002fd4da11929945d064d4aa59788a756ea4226b15e1856434094e151fb92a96f3ca9d14141fc1bf98d037"; + sha512 = "a2d99c00bdb839e4ce89d1bd6a0334bee4b6c6d426c3054257824c46abb1eb3c1f283aa0a4a030f1865fea350a7032cfcba86e231d11ce06ec3066f5ac4d47fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/pt-BR/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pt-BR/firefox-57.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "6e227b96787f07b9e04632d54ad33ffe17931e787d1e0212a3419bace1cf8fb062178adf6a2ae8d11a851d3de2eae983b086850e8df775c0a33d518dc0306b51"; + sha512 = "5768a805aa0b7780b55fecbd9bd349c6cd78efcbb3595acc7cab18d3356835e53e63e58e352c30c79b349e0b0c80be59509fa684be21f541cc67aa320e654f44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/pt-PT/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pt-PT/firefox-57.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "fad503b60076143c5941ea7c280212570896aebe39e594e4af4b2c258b387a5489a63be17730e4c31628b96661d8deef7aad6ebd31eafd3bb52f841e4a344a39"; + sha512 = "ca4dc2c76af2db4d9a44f8ce9f29adf7188a799d00d2e8cb1bac807dc90930b06cc5329097ef771e4f070969cf42c3cfd65b32dfd3112f59efdb0071bc6292e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/rm/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/rm/firefox-57.0b14.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "737c4cd8234d87f96b1970f1ddead34eb4b109e201f794942bf2ae0603cafefce7b38f2900bea2d08d058766e8d1851d96052ed5f23fa46e351179c9ddae1c91"; + sha512 = "86af2317c04244c63f8182f46eb95abb1a113223c6d503c6b85c2fa9b596f44959e86323da0ad3a708f6c94aea4180246bb562f26c64a8c9b27d9a490d65a291"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ro/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ro/firefox-57.0b14.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "506c842023cd3fd3bc0a6a57abf7b2b822253b0ef4bf2d3f511bb3ce5407d310cc976803f6959b8678899b38ffcda582da21a887d8608fe8d42c46ac70cbf133"; + sha512 = "2120d05bdf2dd8a702726e232fb3f94838befaedeedcb7c651d8d07047759b885904220173bfaaaa6d55b71e52085ce23156ad030992e8ae3981d47b41de046e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ru/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ru/firefox-57.0b14.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "94213fe894d4d6222b321aa6d9d37f3cf32f257c0e021f8d6f122c4e8c458f9845ab5abbfcab1b043b4d8aa72f83307081685a63ce7569194fc15e2ea655cd27"; + sha512 = "221b4170254ed9acd7edb256ae560060f640c7e6c02236e1925e38489e387f839c14b5cdfa2a0e4a0173e8b98a2ab57b7733a6fa361172166097fc84b260bba3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/si/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/si/firefox-57.0b14.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "2174dc7cc1a8e8cf96550199d70e279c85a91671fe1b1a71161aa73acffc8a0c818dee6d0f2c3490384eff4de5175eb6c04cbe04ae92c60da72f5bb987bf60fd"; + sha512 = "ea216290852677ae93bdbfee42b65473f9e00797175b7e36f4766a251fb302fd69009888f36efca7d04ef29fb0d66e75bbfddbf25f7f59dbe1d6767ffeb0c543"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sk/firefox-57.0b14.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "f9a30f631ea892c1362eb17652213cdb603eddbb0a687f4ccaffe70949b8692e637a35c4d90e27f5f823da59ba01de45f810bce1ac33a0243a5c96f470f13ffd"; + sha512 = "92071604add2392aa144caf61ad747d98be52c3fbb82c86f903772d470928f71748d8def2f367a8b6bfe04ac6769fc57f8de29210ae50bc45b75b94f5005b564"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sl/firefox-57.0b14.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "abb5746927a53331da0604e4259a97b8d836c489a3c777ebcefb9d3c724503772474a2551c7347c8466e007fd248ca4b96c8e334272c958089abedd60f810a50"; + sha512 = "94341abe0210c9632ebabc47325c55577e9e6a5f54b4cfb0ba9d19298dea1b3d6f70a68c3f82f6a4c371f8ddd6e088b18ea56282faeda0c824040e6c4cee0db1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/son/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/son/firefox-57.0b14.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "a88ec432a39c197d4b312b8eade6b5b1c27e2909dcf27c309844fddf6a21255a1bfe7f666f3287c6662a0985c75810eaf67bbac20a0b871bdb583da30beebf96"; + sha512 = "537a57fb00d61b0566d9fd344919b65486f7c767c93d0aec9595467cf9a081d63c8ee7d3c7c3a3409ddb08d57f36ae078e3defc79826779954641c895079c1da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sq/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sq/firefox-57.0b14.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "32054a108dd8beef5dc9dedfdcddc4b37ec854ce32f65f6f69e1a4506e45931909391182ea61a9eefc4e3bd354027fd6cfda0d71d996906397d833a27b07cc55"; + sha512 = "a4ad413f8bf4ea8333b3c182a5c02283886e395e58b6ac5a53a298afba0938ec38648b67af3009a44468ab6fa89b6684d86b4d83525f0dcbb470f078584b6dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sr/firefox-57.0b14.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "adc284dba815ef84d2b99b90730d15ebb2a8974601cddbf38053356c8e7464f13d0e1fd764c8dc34e0cba0ca1bae427c2e1ec31bf0553f834d0213426295917b"; + sha512 = "15990e14d69bc0f043f7bcba54c5c27b7562c8fa68c5c14e7df695382303ee6ad40eb6b22319e8f9110b59f51209e0c8a6357e257862a50d8d515ea7f414ae74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/sv-SE/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sv-SE/firefox-57.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "51f3a397e95f39fc2da2349b25d625114d02bb0444e56fa09c8246d57a93575ba9cb83479681c73ae1b257269ad9100949829aced4c1567b167dfb5ea680bee4"; + sha512 = "690e94fc46c94710e488b1a8cd096927756026d0d6ea49f983883092e32f9dc0d2fdbaf6efe4c236cf750873b7907807fcec6826d2ce8b2473d0c4ef5461a1e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ta/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ta/firefox-57.0b14.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "a1a5a458d540be0a5359c15f2a70770b39bf983d1f19a469c8caf1f7c2d61688a2650bfcdfd2d41321788b63d5a900ca1cc36fac4a62b67087182d9c1c3fa84c"; + sha512 = "839ac81dd6cde69b05e934a4bfb943fa5c65f86d4c7d64c58eb86e7911f81d93a85abc3ad732ae0baa9c7df76a906826a109ea15cb4ee85e802248b99b9ef1fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/te/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/te/firefox-57.0b14.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "a948071e0f1ad4e29483a87765a307a1cc4d2af629125025e71439875144535bf0d6d69be5100a8ec6f5be6b8b9a7c7d10e851486ae41ea5c8517dea932c54e2"; + sha512 = "58b1225e50a0d3aef4b1d2da5d494b41e5ee41f53e2878a4945daf308d452348deed4cf87641aa51e9c061393c239109d02523596efb8ef7c675c885d80298aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/th/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/th/firefox-57.0b14.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "1340d951f126571e3d3fbdfb91e478ae914aeba9251da35b253a67f62b4148f0e5b9452495a7bf23e918c9fb3ab88db37f4f0fd11f28330957dc23bc65cbfe5b"; + sha512 = "6d0cd2b6cd315ca50445f3f87d1d2d2977bc34246481a58239f06a90253bbb810c0de488d064e80d3d2bcc475d34481c1f59ef0499ff59057b77c0cd67e71c7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/tr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/tr/firefox-57.0b14.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "37e37e3679ffb5ebf93e3e7410c5bc9e1f85fe8bbecc83a7a33dd5b1c7d7f7150ffff3d91fc200f4c378a253627d5dd8ec90f46692b01f72cbf9f48bea84742d"; + sha512 = "291f0c8f1241120a4fe4c2754ac82f443ef6f0d354f8b71b25b2020948a4de5b7ddbc87bbe2fc08b09ab1ec491a34fbbc69e6d472dc0114e369a99f967bf27c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/uk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/uk/firefox-57.0b14.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "067353b9d466bcff799f6c1ae46a91ffe9150a6c429a117464cf1289433fa2fed6a0f0a6e773f8b27d3618ffae233c7ebd56841f97d3c82b97ed24f038c7e4ea"; + sha512 = "a6db7a4daa79d614b2d7c94372aacc50b4068ad437b38aab72cce99aba668fb230d5b81691678e09efb645282118dedf25e0c94e9d9cd9ef6a692c43a288e119"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/ur/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ur/firefox-57.0b14.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "a868433b2b18ca92bd6a6b765ec0fe072a44043a12f75ec4bbc16f4dac29577698b1fd7618e5c0876ff14742656263c0bffc2ae5ba0826a55df70c139275f9f0"; + sha512 = "cb69cf2aab416490b866e9b15b3706dfb81b003887456ad83907047424285f46d1a4b727766b78a633b33c6418c3f24dd9b53a90b151a1752709191328c0e227"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/uz/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/uz/firefox-57.0b14.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "33603cb219121d06a97cc5c62865bdb9ad4f9acd0de6c14ef86acc16d818faf3e21b24f9f497dafd20639b81edbe7affa1fedd7a2aaf99a1a9d137b02e2b77d9"; + sha512 = "bb29f30171804b14aed28e5953bdda7bc94e2e1d23eb9af54c36937f90ff7bfd068abe4c065690aeab2ea61df08a59a5ed808e1f41e7d055b81235f8662d35ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/vi/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/vi/firefox-57.0b14.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "a841c65cade257e6b5708b3de3c6109004f54a295e6b6fea97e6b3959cb70620844f8a4029dcf908d6fbba1ae71d038cd2adc0724180e22959edadc549bf8d12"; + sha512 = "b91dade05c291572c257be0a33d685fb48079c4c1dceb95d6b51601430717c5bdd4f962b9047c2f2a22dad38578a041025ad59b424efd1260ddf6f9d9e4d92b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/xh/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/xh/firefox-57.0b14.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "9d8338b04f2d8f43a096049b11b8d359a1a09a22a2074bb0fb4364e8a551976810cef148405fb45800a4d751d2321e4d9492a79549d076a8dad3db33d22dafb1"; + sha512 = "771335861bfdb99f17ae6c8607e784e3901f637d8e4a06385bd2bab4797589377e8c1b875600e9d8434d6ce5a7003ba4ca154dced98228b85c6f70272c0b8616"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/zh-CN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/zh-CN/firefox-57.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "d3f4dab15e4293cff13be4da142169c18b2d672c9af141287c388a31fd1aec4305ce178af1dad6a21fbeef571445cc15ee15c38464bccefb4eae80dbb03177b1"; + sha512 = "d48c546975b92cc5c130e50b9fb3c84116235aaaed6ae8e04e975d8ed3605540b9ad640bc995fed23e42d271b9b2b598613b14822358c7487852030c5802dca6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b11/linux-i686/zh-TW/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/zh-TW/firefox-57.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "4b82c8291dda948e1f63dcce2c8803c1ed1db862e585612c0c2de96e14c7442c2a845cf896c5fb9492cb4424c05f14ca5a546b30c6491f557c511f936153cac2"; + sha512 = "9e731700c738f0db2390478ba293f78a98496c374cd871a0ae483c3911685f0cca1b89531c06177f739fda77ee94fba03f2d93ad4669ce219d215cac8429819a"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 31bc01ea14ad..347ceba9ab4a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -54,9 +54,12 @@ let inherit (generated) version sources; - arch = if stdenv.system == "i686-linux" - then "linux-i686" - else "linux-x86_64"; + mozillaPlatforms = { + "i686-linux" = "linux-i686"; + "x86_64-linux" = "linux-x86_64"; + }; + + arch = mozillaPlatforms.${stdenv.system}; isPrefixOf = prefix: string: builtins.substring 0 (builtins.stringLength prefix) string == prefix; @@ -185,7 +188,7 @@ stdenv.mkDerivation { free = false; url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; }; - platforms = platforms.linux; + platforms = builtins.attrNames mozillaPlatforms; maintainers = with maintainers; [ garbas ]; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 6b08c3798ba4..bd23ac6baf84 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,955 +1,965 @@ { - version = "57.0b11"; + version = "58.0b1"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ach/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ach/firefox-58.0b1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "ba86d5610b286bf392c94e7dd5436500fedf033946c34bc56a53b1e9b4e934379e5ac82a989168a1d339b4de0819f273cee48d688899c34cb353f83376201183"; + sha512 = "c76b0c8d0774eabdd49abdb211312da230ca467711ab3e4700bf683246986aef8bbae8eda45126bbb6c610db8bd5d12f8e35877956879fe02edb216f16449c58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/af/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/af/firefox-58.0b1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "7cbf2ad3b2775b2edebb6b789896d9c2cf63c6a59272dafd1548c20b6ea592396b9f5b622f09305dce199146a23f98a16c8a8b6835115edded902114aa938be9"; + sha512 = "d72db113a55e6d70cf467c1aedf24df07d9f4f5d74f3c67f3474ba3c8f959a52164a345d19b6c43e5c7ddcceefd639a9153950f5f30c945f3ba87d15ea23a66b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/an/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/an/firefox-58.0b1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "4befe56ebeadccc674cad25d5c58ba8d330b8ca79f7deda3a86314ddf289404b8e167f31e3717ab360c78163940a90361bdbcbf112ae4830eb15f0103ec40442"; + sha512 = "ad347d9d9a8cac45a5f369a4fb8284893b60b7a94b2daf4d67273410b0ecacd53d0040f78aed43405b5a99e30cdff1eeb986b7c1ad13cbf3807dae915f4dfe9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ar/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ar/firefox-58.0b1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "8aabaa49507ce8036b4c921c78697973e69cfeab9a1091bf830c085f9b8287e41b026bd237590f2e2a89255b4fa4db47e563f726f945d15ac4ae5b790335a2ac"; + sha512 = "9eb1d698f2ad84a4e8046b511272fc88d66d5142c72dce817cfa00814f4bb5320c314bbcc36f74acd774bb9bec0ae57a09ab0c46def2fdf4e1f225d467c1987c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/as/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/as/firefox-58.0b1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "68915c8a35cec3b9a2c9afb8f2c8e1cf5db0874c23195241fac7b75d317af0a23f53170d6f9169eeda3210202430c56e9fe47cb0fab434300236186d60d4e04f"; + sha512 = "d9315adfac80bbdd4af955f7f7f19d14d3209d7fdb1df538dace2264b39901a94b5d79f8944ed1509de15168058eab44a43de46d2c90c1707853ff2e4401a116"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ast/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ast/firefox-58.0b1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "f72a8fcc4cef1522f91e70158541a1328202a7dfeb467662deaf70ca62b049c942e664301f99314c3940b9cdb6bcdb663c3175c81d32c31a4a547954907813d2"; + sha512 = "3dc39b449c5eb3b877cfaff84534dc9d1acb3921d03ab2b520c5f02d1b8d2a09843976cb89954da1b99eab353e1960185580a70cb1d222dc42aed052361c4c28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/az/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/az/firefox-58.0b1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "4246cf3fd34a9824dd61d488966902086b51b68b5895b491cd7c3db81e4cdc0de8f06f74ffc77bedb80e5069e594f49eda524145c2f66c2fa8fc86db8177bfe9"; + sha512 = "6329d4265be5662d4e7286ee3147dd14896eae75738a6e29548fcd7daa86c1021a00e44508efa8ed686e58f1a927115f01e797472848b1782c90410031672227"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/be/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/be/firefox-58.0b1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "9858669e11bbbe6f56bbddc2f3c94f0586a46fa5fbbde2a4439d6aeaff5bd28c9affaebdee4a2903ff1bd29392f10df0ca84a9695065c9dc60e8066627465d0a"; + sha512 = "978062dcf2f6991c5e9f0a7b23ae65c1d3b79c526d27ac86be8f1190a866491857cc2f3d93f444a2c5654df327c53ebc05fc30e6c9e3ef2f766c55274202cc3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/bg/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/bg/firefox-58.0b1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "8e01fe5f5c02e9af5cb06a2f29860e1b7157c44ab10f21060bebb9561c9810d8a779e3c54a585cfeb2ec3647d2312b55263ad3cf5408ea36bd380caefd0a8688"; + sha512 = "eda16736abc407eba700e6cc6eb865e97091c89772df9d23d8514b2c05d1197c014586cf03e3732a839dc6ff0e031f85008c12144736145f7ef94b89b7761e41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/bn-BD/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/bn-BD/firefox-58.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "adce1d58ebf4994ddb89db06c79411e7d2bd3b49a8e55f2bfc5a4a9968245973f1b01f30c74a84fb09310dd589076865f2d10b17b418d390ce5ed0898fbb5cc9"; + sha512 = "fd5980c7127464fcb4153d52096df9b4fc784fea4a3216265451394fa73800207c9df91a098860819bd4aad1acb0c04965dd196d41b0dcca70071b51a20e4437"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/bn-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/bn-IN/firefox-58.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "23910c2086cade899f596f22d0f9476f5cec5481b90467a90710711eadf54b04a1c1a6455ab741374df64076c633a70ea8b375e2aa280c14a193ab204a4d8609"; + sha512 = "f82ddf7e43f17d836a7c8e9fa5a9eaf1c8956ee9b879ece444bdb0a4e98380c07c45cb168cdfdf8080d26ff330c0d71921d6fc65d1e59a7bd4e89fea6c2ba7d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/br/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/br/firefox-58.0b1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "31ec45b6ec424202a04287cb97ee24aa45968a41a1dab47cc7411b865dd8d3c9fd6882482d771cbc9e6c0196dec4323fd17ab5e095eb0ac436e2726896aa6a26"; + sha512 = "6e98d54e5fcc89da576648c666a9788e1843c57879d3bcfe81e6f92c5a6386c7fb606e35a1d5b6d45a6c6208122f36f127754747b4b0a75b1b0ef9f8ebb1ec6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/bs/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/bs/firefox-58.0b1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "cb90a2470143abcc536e9f737cd655e2f0c4157088837ce2194213baba6957e34f76a974133be81f201d2db649901f33e3143e4432b5f7d59401c1baa09b5d30"; + sha512 = "1d418dc9092188a40ec3ad5b168685840fe3da5444222a076324f38d71d332cfe9cba0b6497287e231252f7db4017ed31d3f004fff7425d801babd485ab13807"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ca/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ca/firefox-58.0b1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "a395e2a36990025b74a7cf2d3f58339e9f98ececedf6371fbbaf8b97afe2ddd0471231c1577044b7b030586c7ab92512aa3a2a51e77532c17678932d4fb69615"; + sha512 = "8482b0b9552915cc839f560a6a884511e6470673684877fbff233e6af23067a9e5a04589a255f885f90efc1fa00ff826bd65e6b53d4993c4eba793b578d898cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/cak/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/cak/firefox-58.0b1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "2e04f7b530ffa28af838974d278a1aade3613df7a17a0b2e5ff8854972a1071f376a2bbc974ea529b392de11662028ad05a4341504e9194a02dd983d8d011991"; + sha512 = "1f701c6a9946686f92439b354476c96254c8a57def972966a6b3f54136f259bc377f1f95801abd1e2e42785c2650f62dd449f01a305147ea2f788eaffb348b88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/cs/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/cs/firefox-58.0b1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "1e060e7c001b2bd4b722611b5f2ee7d9be5ec93581bf6fb4c5eefb4188a569716a1855fb175dcb489f12b630133374cd0879a0401027e043e04e0c2d060b4c72"; + sha512 = "11159a760106742340387a75637929eb1d7df32a811720ad509cdbd7c58cacb6b50621dba012bccf72f4960cb13fb19152512d9bcd83b2f17dcfffbf10d4976b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/cy/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/cy/firefox-58.0b1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "770b1bb389a356c5e99e371f1a1c7389d45f461a5d18f73685de289dc48f2f1686f39d44b8435133925e21659bda9053bf88f5094a332f69166dda468da40d01"; + sha512 = "387d647ed24ec9d7f77a6dc38796868a6324db960f7b8077e2b53387a1837edbccad0675eb9d4bf7a68d2ecb7bc60fc8840217d49865a05b1c4f5235479a8a65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/da/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/da/firefox-58.0b1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f659f860640b029f0f254154d7f8a21bf011d2025113e701a2894d35acce8f345513c2792b5ec0460921765a73efc5a2d6f5ae52a09d6b6a46d45cf72af769c1"; + sha512 = "60e94f82dc68b5251b084e69be480e5fb281483d1355696328888d620f3b9e404abbb990c80d43a28acaf0df062948231fdd17ebf1dc9205cd1b74d962278bf0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/de/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/de/firefox-58.0b1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "123f3e65735317da980a57026cbf83b2ca30d8cf07dbf58f7cecab8edf805b05f0ceb2828176e8dd123cc3cfe33028357b53233add467c899d6878c1b2330c07"; + sha512 = "a1699568157938780c4105888b528db7ef2277c8a5e1afc6a55382fe57b2009d7eb00351c2b993ebc3294df75bc452016a5c35e3428b4b548483a0fc4a1f2013"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/dsb/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/dsb/firefox-58.0b1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "e4f54c55fa7b66ee1bdbfe1b17f839a81c8fde5c5e0c18c9b02f779716c901adb0c01b774a470b0c6bd7971577bd0c29429284fb35402fa6c4ddfc9069d97f27"; + sha512 = "dea6a3e68356cfb47db8a6e7347437e88c9349113e73268964776ca8a1399671d648e426151cbec939b3b3b8691d8b2869536d853f0390d5ae4cfb982c2eef50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/el/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/el/firefox-58.0b1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "9fcc084e2ae0d0775d6357d9f3134cb1c60e9ee94be87d15ef90aafe7d74349684093c844c9ccbb648bc36066022762e859d21f179f074ba03ffb8ce7d7cc6c4"; + sha512 = "b0eba65b07508dd2f96846bdf7b4a71b6668d8ae38cbddcd842b7e08fbd1769087b32f05cee00d8a471adac7c63845ba93b34d906092c9778776066610c788d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/en-GB/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/en-GB/firefox-58.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "44b834bb9461d69ddc74aea8bdab6ad0c9f9184c5ddee037441b648da869ef584029f6c49119d22f96b43960ed17b96e82e466e42c7660ff990519928eea1aa6"; + sha512 = "3fc478ed384adabde913525d2afcec4f3d029c85a102144b6ba7549543429530d3970edee5bf14ac069f122e2709dcac2462f572faa9c2ebffa322101929a914"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/en-US/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/en-US/firefox-58.0b1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d9ecf0ff474a71910b1611c0c8dba01e99b588719024776f27ad468718db5e6c54459da1efd648b31e69f6c3cc2bf87e31b65d5dc7cb373b2f141cfada5a2312"; + sha512 = "5afe0a59430e9241a58af0926d5d73151355e9d64a8c8f562ca0369199824d10a1a4bc2de84102e96a8aa5921d83d9b630f49d9ed998ac4506dd481dc06264d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/en-ZA/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/en-ZA/firefox-58.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "811e666873a3211cbd31fafe3253328782053479caa3f117b27a64364b6d815e9c294f1e0ee08c3394cb9a87e7364a8b5dc2a934b394e119aef0c0ba70c713c8"; + sha512 = "c84deb7d082259e29dd2ae7964c0ab585d3bee0d2be7c1042babc122356d067792166eabf2fed8a55c7f688c23ee7f6125d7c89a3b0948546091a54b4a136ae1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/eo/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/eo/firefox-58.0b1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "13513b8f3d288009c16d06dc3cd0505ff66ed3df9d90706c8f48986be9122b3e46b0f2e1d38b2a715f6b043a15575ea05405b8d1564891291afb6bf79d90ce91"; + sha512 = "76c714ce1840b4dcab54bd675d74bd93fd8f76a45f90e526b2e0c55a2fd8882e6b8c9c8e4f559ec575338eeeea2ec7f3ff75629a276eda0051e898256b0f2add"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/es-AR/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/es-AR/firefox-58.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "d9435c6fd5b6653173c2e32b6c8f88a4673eb4427821d5d0b01fcdd7f21bf93e42b02336325e4d6c295afe09a62d184d8b875eae4eb5337680ac9ed97dd17d3d"; + sha512 = "b049c2e42a4868da6eacd1d5c0d945203acd6d3ed3803d2257b504df4ea7288765b6b6922d3b73397b0fd8b54a990b0340d4722a0ee3171a55e3a566c5a2bbce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/es-CL/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/es-CL/firefox-58.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "13623e646ccd100e3c9dbf373de2a039e5fab955c1c0fd1d35f0c20eea6e32aa519eb4a9fe57682c953bf79a7d5a766f4aca45b17c5b00eea403add4ec28a70a"; + sha512 = "48c2b419d67c26c6c6b5ce1e8b6d12dcd5bf8c084176d4c8afb3f45d17f50817a38a85e509fbc7cded4e00f659067c3e34080f58c22f74ba1e19e83cb58a415a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/es-ES/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/es-ES/firefox-58.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e1fb2a54cad6acd6ed7937dbb6c606b58261efa73a821ee2bb846d8cb32c2a89a57c52c2e5dfde8cf6571b0d23f6ec516444f9ef563e18c92b1ed60402f69d35"; + sha512 = "2ae19907f1d812268b3c49247d902b061f9caced2fa87a19ef40c88de48cff7b68d26577b30ce7f1b8f94f0e1924f32205230bc503f226c4a85497da834ac740"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/es-MX/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/es-MX/firefox-58.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "a1b2cacb14ce0f78aa41de552a53dacf04162a69f852cc11930e58ab8dcd5168e860b59310d761a63f2ff8edfec91b7b340316a708e6d2aa61b6321c82df5901"; + sha512 = "e82f465b33114ad11628c06fbc0c0102e682d8e8277e3900888aa05481a3cbc4e707545ebf5b7fbd0eaef12e824135b437bd51676cc9299ddda1969c4d4bcf2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/et/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/et/firefox-58.0b1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "6e4ffc6431cf650380344aac96be846a48e0aadae8d089d21784ba9a9944a3a1c9aa4f0d374d59023355d12cec2b38396aba0caf527088e58f6593bf5fd59bed"; + sha512 = "6c7802262a3042a78d25ed5774db69079ebea48e540847a70c0f8bdaec7e87aee5ca4ea31110ea54db14058d4f7f7a0fd12a5100e2c66f9f4c1b591d17abbcf9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/eu/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/eu/firefox-58.0b1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "29fa095b868337dfe531538bcd4b24d16346f19277be1c6ce3e579f9cd696b5134662b58afa0d9089da37f6b312d54d19575c68b0f57a8782d2c6e46f1487d25"; + sha512 = "ae43f9ed41f67610a1394cd27225585904f1efec63b2b8149a16515eceff0e2921cf8ee18c1555d69972af8b0fda71180a2e6872e9abae3cebd642693aa281be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/fa/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/fa/firefox-58.0b1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "9f6a5daa3485a1d1194a43da4d8c0d8e740cd36d10effd8dd5360297253ed2c37cd2749ee9e1d4e7446f3c84b8c985ad30128d84abdb4518e442dfc274afe770"; + sha512 = "f5ca6891883c09f292a4939c0443bd5bda8b292e7f432d81c32d1fd5e5d4c15a7d649ea6d430a618b72522ffa53319c2b5a32c028ff2a619e0f68bfee7420dff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ff/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ff/firefox-58.0b1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "a7d8f16d8edc997eb55823b8327bb057bc97bf480bff88c7c67085f601a81744b7a61f0e6364304774950f87686a5bd192937de33feb338a0de1c336d6b9773f"; + sha512 = "0a3e6d06e0e61c1bfba7ebca1a80fc7615210a148c48d89acc04f8b9ef2050a7ceb9aa7c92b9d888a376f668e4b6f1c0d40a752ba3de185548a3ac1630d9260d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/fi/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/fi/firefox-58.0b1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "e43a7e74de01d5e6145cb2b1f2757ad9692801701884079ce678768b98777a972e5ca65e037f3b1cc20ddfd7206d7582674104c4601780c02c71afa077e93a37"; + sha512 = "5213bbbb4620cd718741f4c1f31e37addaa72bf3947a81255d556c6ebcfa2def8c830f4b9d73ef472acd28fd7efaff064fe96a67b1f276f6901353ed420bfe72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/fr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/fr/firefox-58.0b1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "ab407a6f84324cc7bf302cfcdbf683f006cb9170a5d23932287392d626f3473a7b717bcfe87e09f8f7a7f7a7563dc61731474c8b4fba5e89df2d34b2b4ca1cfe"; + sha512 = "6e4c02cecae55b7930521384482b9b5edc8480fcc103ac762960a8af4230e7eb52ca5d17d3fd71fa559b49c5b2d0eee2bdce150f486969f77f71a483d8cd04f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/fy-NL/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/fy-NL/firefox-58.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "7f418fa811acddd2dd6b0a7c3c24b47359c1e80485d80812d8e11d6843914fdcb0314b1acc0e2e1a7a6df703df155849f468d2217fe5f99729b7c4e4a1b0f082"; + sha512 = "7263eb28bbeab70a833e28984108dc125868b1f1fc0cf3c1d37c3e1694b0512c028368363c28a1c0a48e87cadba366f7ce91509783805a6fe6f8ad7e298b27f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ga-IE/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ga-IE/firefox-58.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "ed03c7411b9cd7df2cce532481d2336cc296889ee25c23a387f47f920bdc21b477571ae313b6bb3c9967a48bfa025869110b398f1c4249732611fabc8c96110b"; + sha512 = "c64a0c0889e10d6463e02323e386142113afaabeff1b772d5411dfc747e09803911b161fe4332d36becbcd45bf0f1b5e000aba2e099c5bcbfc39b3e5d300e072"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/gd/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/gd/firefox-58.0b1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "421c17f1401a02793d8b5d888b7994be9638d3a62f39794f887b6e328a89a8311696ba272eaeab85a9200f9027312aa293796c48749eed8f62a60482e3513b91"; + sha512 = "70ee658038c2c2d8c9c12cd45993daa5226d35a8ef974cdd14649cf5cd3a6abc149f56eaadefef01d98daca0b5686a65b17300b5cfcea704c9942cf827e29aaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/gl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/gl/firefox-58.0b1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "970a6175e192046a9bb701bea9a80c83d09d73a7440bde2d94e740ab985808e8934c6b3df1121777b84282becfa4362c5595f977ba2650c235e235f9077e3776"; + sha512 = "73400f4ca91de506d18cefff5ac33847c1caf05770d0fac1481a58a3cd709eb96337f6f5f9a77635e18202f007f736e815fbe60ead23dd64a537ab6c67028c20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/gn/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/gn/firefox-58.0b1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "0cde258644b323b23e1810b8ea5dcf13dccd14292898d780cd24a1d2488f604d3dda4abf50a9840ca665d02bdb2b6bdb0186f0a434e0a350a71939c7fc7513ca"; + sha512 = "c5310f699ebe8f28f0ae3b07b5569c202aba5f2641ae6a365c4bc581780d12b736b8cbd2f7dab7b4b5ab4a8853af3cf004b3306ab47b71c50f428f2471c6d2c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/gu-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/gu-IN/firefox-58.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "ca20b858dc312f43844d3aaaef8de8f677bbb4409a8412d3d9ba77e0f98805aceeb0513307dafe6425fb9cc8d935f24732558fd68ad3f6d408094fe1db3a46a0"; + sha512 = "34e9331c90ab69f43867ed77520d820386a3c9e5b116b6e0851b7a264d6a632fe69080d2885819afaf7c434ecca8324a2a67b2af4d3dfb0dd737a6f147d41077"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/he/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/he/firefox-58.0b1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "176d427cde28a1f69c90aecba0fb6459fc102d2a10d1be91ec7114643356ed60eab8cb2701802dc3641445bd8b5595ac454dd3b310a8e59f99f6467dd39bf050"; + sha512 = "b3e2155264ddc8ebeab870e3c865aba4c7c04325e526134c0132efd503b825d4bfaea4389e39412e047b18eea1abd6249754c4571c690c6a4276f8a7ad627840"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hi-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hi-IN/firefox-58.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "01bb047e7f5d259da175ec008a562d1a09ac3a327d481bc9604cb754ffd52cca861113b87a5fb6420858cf5a3be262933c8d4d35ec3be4e6c7b6ca98019afa52"; + sha512 = "03ba58309941b1a209e2d162374abbd46c4fdfae505ec6b51a20a41e306d8c0d5070ebd7eb882ff63010f41aaa11be589e91c567b2efde702732051eb31e3104"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hr/firefox-58.0b1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "d4779d34de6248f911bd52f13fb2b701e3d0d30327d79090175d665e684e9267d7a529635e855c0d4d98c04b668347d6c92fac8e027aa05eb66403757064cec4"; + sha512 = "c41bab3259faddc4cda80d24f9b28bdb888078547c1fe63b7f7016748e930da158ce20707e78cd15342b6a38d37d0166094cfffbeef08f6266aee6ce80380783"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hsb/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hsb/firefox-58.0b1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "c497e1fe9840623adcc29caf6240c84666fde14da86567f20b43901c6f519e52b11f774feaf3990ce3e192da5966ad399cff6bb2618bafb355ec2746040a05bb"; + sha512 = "479436f7066df5ecda4e284a8b3b1d453385d9dda69b4b04cd1532f369dfc6ede9de9cae0218594b46dbf1feb0c44b8e5fdfe8084b9627524fd16ec3981fad68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hu/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hu/firefox-58.0b1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "b3e49356510e4e4cc3eee442b87ee8fb757ac9c6285e5ec89824a9a32ce8af72ffba96874813e2162cc0673f08e206b1b9cbe32d0fa4e7ef87ffafe41bdc7b67"; + sha512 = "4ded7381906f90f5660c81025d5ad1dd27e4c9bc49f464c84a05904d2c7a8c860f7576cc9f0f65e9666cc894084a539cece48f6242fad69d6f8f265f2b3f35b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/hy-AM/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hy-AM/firefox-58.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "fc998684acfefbf64c8da70bb01cd76943132701b635763509eb264d04630f34089a306106a70c60638e4747ef08058f7e0a44400fdbd0048e9ab64cf7b8a84c"; + sha512 = "1e90907b9280b33faebaf770ee5e148f35a3d6d79f2c3d19b8d1834c84e09a6dabe965e3f9585dc357e145e0b8272225fc90c27ec507aad7dfda0aaf0c26db89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/id/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/id/firefox-58.0b1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "9ab41fb2057d749fe86c9c578bdaca62218e83209cbc5803a8072e26a21bf3496c6f7267c7a01680ef3d7c1f6da5a402920a3bb5e83f76fde9465d9b2635deb7"; + sha512 = "f2eb5f44cbe8c20e6716bd2db644f54768c6ccdbac15acbdc8268f95383545b3f9d9e74092dedf886bd3dc02b56fc9f0f468d1cd1205ddc5fedd361b557213ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/is/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/is/firefox-58.0b1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "6f6cd48c5122337109e55ba2ac7fe4ac0a0ad0424732414adc7ff3b95f5d5e07cfb603aad0463f006316526b3a07b7270426c8d31b43b530ba27313b609820bf"; + sha512 = "d1397242c59aeca21ff98f8b3e158fb496c6813de0a73ea5454602888caf71dbcf33d2847a99a224fece4fd60e24b6b4c0c7d1b68f9df0088eddd6011e64c9b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/it/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/it/firefox-58.0b1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "c409812a276eb9491e7e764c215eb0093db7e4863ae3da01fb878c838ebd0d379210924a7cae9b9a58c88eae43c317c54618005e1ab4f9e7c28ef10281d8dbbd"; + sha512 = "468070735cbf093381640627ffe594efd0504e9a87ae2547fcb0d132e44d2ef3abb98861452f177d0d901ad8586b55c44189fff7b2dfb99d25a7d2055eb8410c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ja/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ja/firefox-58.0b1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "0325da2fa80de439d878b03635e934ec9445e8f6b48db620ae5de273181578a41b4b94db105f0b0e2567a12039fc2c25d46eb50fa95db4745bce9633d874348b"; + sha512 = "7cef74da3ff145b1b02a6b60f8f4b4933f427fd5268c4fac0cff31d0d09ec75f123a97ef08d3b5e8ce2d45bf44ac0d3fcdae0d0ab844608998fc51fb1805986f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ka/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ka/firefox-58.0b1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "fb664987b2cfb2806acfed73664425ac73bed0646fd5c55dd40b64f3883c666c40fe7a3e26d3887641055385e1561ab47dc5517ff536fe2f132a6ae0ef0cef19"; + sha512 = "febbd32b794d70c4e1a41a793f69dafd230dddecaba329c65f34ff49cfe779d63e7bf53326a0a286206f51742199776190704c8e7c1f0fa0aa663a5cd2153f26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/kab/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/kab/firefox-58.0b1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a0035b46bf35bc0d79fa2f9f065d0a80447438a56bb7f8653a56ff137a351abcacb0934d7402b70e4eb18da330aa43704d31530fddcaed115b3ab4666fc66468"; + sha512 = "caedabf8a7cc8cc54e46b6e9d7933fa7b04953dc4fd19311d097c350a8219938d3819ea34fde869f24a0f932677411114955670b179c7037b4c61ddf6b2674d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/kk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/kk/firefox-58.0b1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "3a9cbb1fcefaa47f49b7f98a612e019c07b5b838d54709a6f8b70e530665a06cbf7344ba09939e0ab89cb1cfc195a31ef60fc1524fb7d2a0dd88b87776a784b8"; + sha512 = "44f92252326591941edccbe19f62a46728fb332bb9c83c5a5904f62e9f886ef55c792cefda9ff47136c2e90ca01059f71679417a559eb257464b2a1ee3fbd261"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/km/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/km/firefox-58.0b1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "a681711346e29e9bfd8ac25b0a3b625c1e7eb7a08d502e66bc592fc4188878af0063974cf6dd60cbc9724ab489596561caabe80a91ae89ee0618a5a37c30ddfd"; + sha512 = "a3f09ec1af9c65a046ad84fc25a67cf4d5c81d16e7700ff3923d192e73846789b256ffce375436f10c563f0d31bbde6af690f8d36545412c6911329cd1315f46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/kn/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/kn/firefox-58.0b1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "7034448aafc92ada6ec4ffd974c9c15b8bcd2104ede74f58853c5e988cf4f4a10147d75e4c96730302a8bcb4a3403304ed6b379d369c2d1ebef7e37ca947e911"; + sha512 = "c8192e86a04c82b02a8232cee724a870e70990d0a706177c1937897dd82e8b4d1b87f3723e8227ad266ab4bb75393bb1bd799d3d094c5d63a38bfd356f8ab0c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ko/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ko/firefox-58.0b1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "14bec92a098c0398f75fcd2caadfd0c817bc5d1293b6cbbd667b76ae6cf4f9585aaafe85741ea297e6d994146586da348b7f576bac8af043f8d1918bccb85fcb"; + sha512 = "87b23fd57f68d60e55a01303a7ea7e4cc49cc017416eb582ecc6ced589f841504425c60e5b2b45f9d7bc17cfc0c5b8a6aae36b08314583d011bda59f96dc687d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/lij/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/lij/firefox-58.0b1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "7972f52851eec48e16037fa3fedaa2745be72dff2d147d6eadb1167ad664d7cb2620227d5acd0954a1036c7f55ea8b25f5a1da5cf0bd9e13a81b567208330eda"; + sha512 = "a96df7d83aa66c52e73682fec0d06433a32c75a9d60ec225be4a29768ab245e3263f253c15f5001615ebd9cb2bce19a8c7ad9994c17801ca59a573986f4c3f97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/lt/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/lt/firefox-58.0b1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "cbcd1637e7e9abfa847f9a44c59702adf887da8e109a280eb2e2f41e5624d2c64d3e8c6fd0d7855497ddd89b38f6485464cc6cdf10934d5752ee57f919db0aa8"; + sha512 = "ad89134d5104eee908b67faf1cf6770d9c40091de1da2382f67f224e16527e63a705d7a1ed0a5fcdfbff68813bb3d6de4a17d69e150cd702cc886d761ab2749f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/lv/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/lv/firefox-58.0b1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "323b8973ee237d34790c9febc46030ae1386a7038524c67f77c19344b55350a5b921694679761de5049d9b39710e6dc16c829423c969856cc619902cdec9ba4b"; + sha512 = "d28affbb7c92d56a3de7cdb06db345d73e0aa877b683b242ed88450471b7ca63e43e211e167041ddcfb10e408d6b7dacad09c102fa59465d337fd557ff8c6c1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/mai/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/mai/firefox-58.0b1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "0456dea7409fc7f646b89a86adcbd9769e4191fb9fd2491d9e0a09a05d7a8181ade50ad84c98522c9958437ed53dab24aded457333b5b694ebc5884ec324ad8b"; + sha512 = "4296967ff83a31e5470bd0fb354208030a5bc3b2fd7d8358f0de6df22bb50a2636188ba54194ea534dd34244e1e036f1d525bb6a397633b2c1749e78160c5eea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/mk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/mk/firefox-58.0b1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "3363dbd1913eff92a40325d61189130ceebec1994e762efc044cbb02539185697b2f4eaeb2627f77920efd84efe6da8f6e6bcb379283422d8dd276b3ac5598e1"; + sha512 = "bb6c4a0320911ee062ad5fd2d10c2b121fbed1bff2de3f7014b8d0e4b5962814e52bd6d8e96ac4c88aef07bfc18964dbc24659c32b475a18a888723327ce6b8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ml/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ml/firefox-58.0b1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "a5aa74b8c2cc081fa62d98a4476550f3c570e58da3c6bbb01216da2c290e85adccbcea5410ff48c814ee362b7194ab5f3b0ac1d00bd531726771caa2cd449c6c"; + sha512 = "c20dd470b07c46e105b4a3689797b25294a2f445825d7c3b9e55dca277fdb134003889f625fbf02807f56b04451223dc61b376337f0483f3b62e94e1b89d2382"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/mr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/mr/firefox-58.0b1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "3ba3d0a66c560e00bf4531b0dd9c2d0e1bce29f0fc890cc93511fd00298ab06f1268cfbc8ab2d759dffcabd8fae22ddf516e69b1de2b5c18ae8ea9a0313ee35b"; + sha512 = "d1baed0c6dddec7f0f8bc731e8928eea02d5e6fda10adba7a329cdbe08cc3afb8527c47756b9db07ab812cb6bdbd2439680e001b2614ce1e8afa23b5091ff642"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ms/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ms/firefox-58.0b1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "5f1275956930a50b91b6ce8641f3616ecdfd12c7ce291b50e616d9dbc92da92863cc26eb3422ffc0210963ca17d3fc621456b0acae41a5891a307c9d32dcb569"; + sha512 = "c9162c9c22a07cbd8ac6a3aec1ee218925821e24c9f41965d11ce221b21cd99f77f8e91f0c7426d272c418de11d3d51ede0f89ac6710a9d05f50cd558e59f094"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/my/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/my/firefox-58.0b1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "5ca368da2411fb199f737c0718876f4f8c44de2f2f738e689c40e55398e29b1ab3cea61e9af463341ef36baa96793b2767f30d268162ac598e5d075719db9f76"; + sha512 = "46b6758c2368780e6d0619a501d753ae51da65c55391aba72fb7eb2462c56afb5903afc04a274de68ee90afb98543f16536ab86cfc71219fecdcaf5b92fef41b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/nb-NO/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/nb-NO/firefox-58.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "dfde18c2ea0071db8353e36b7b6578701429b7f7c6130f7986443d8d922876e7f6b532c57c987de789167e3e6eca66b523329dddd120f458bf05a703e49aabee"; + sha512 = "92f72a819c65e299e5f42bf08ddba7a87037da4bcf7f40f4a175c2813a4d16407e30fb767161a8bf33762848e5c1649293cfca40e77ac7f127d024593f9e936d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/nl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ne-NP/firefox-58.0b1.tar.bz2"; + locale = "ne-NP"; + arch = "linux-x86_64"; + sha512 = "bd18c5c1c106cc37fc041722150131896665132427a5562acacf36772e6f77e34735a5c0799c8292feadd2ff5b91f5373937ac9f780b130c02707c63c9d10ace"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/nl/firefox-58.0b1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "9253d483ffc866737a3c5cc2dd22deb6269c31c1c413459860ff7f0f0a2716899fb788ca1b754354e4498ec6ce9488086083071bf13772eaab247131bb33851c"; + sha512 = "f1b1ac149e1ee37cbf54e355364f6788c638f46f4ec82541728c6f641cfefc4c5369ec541723e91ed5c75abd8a86048780375370eca9aa6fd91beda1b153168e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/nn-NO/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/nn-NO/firefox-58.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5bf67fd3411a246cbae4eb039e6d8c228df712f6ac8c01fc106feca2f64b77e6088ef9c06e059ae4ccd03477aeea40010c4b3a953216f980973b84934284bf9b"; + sha512 = "7c2f8035101ac0b197095d5c7cf1117bbb82727ff328b7752b0cba8d707a519c385f37d987190226b1fcf8256dfc70e103bbd558814e62b8dcdab1f2477dfc64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/or/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/or/firefox-58.0b1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "a2e23e8e70733939dd39162864a1fc67a2870eff5b20e9de9ca028d4d619841fa2800fa7e8621c2e7f6cd16056fb58650c249e9214cb6f25fa5348b39a2de4d5"; + sha512 = "1983452f6208949a0fd412712aae93f49f051d730b4f73ad95dc77086b745f39cc35e765f270f6d4c2094df10d99348c9aa745cf765e731a947ab99b48676921"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/pa-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/pa-IN/firefox-58.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "a87d34b6f50ab7001696b5c64577aab9cf0363f064a601cd527bab7a8181f9e5fd54bf4ed33552959ff0ef8dd8682ebd7b54d7d5de2b63150c852616897f1e57"; + sha512 = "1c86552ea21ae1c6a7d9745fa72e9e52754544b0f145e87cba1e5df6a719d524295331c6dd691ec5402cdc46fff14e68a7260da2ad7ebf56bdcdc8c9fc793fba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/pl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/pl/firefox-58.0b1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "3c748f22568a34d99a72e7630182d731ba9e46b7659334e4c5105d586d76fc13cc96cd3da7e1bf928be6b71c8e523ddd325abd7f06407845b894273a67716929"; + sha512 = "0b2df8461171913f2d6a3621c74ba497617e9512572e5fde0b5e0ae54f514e083b42134b38fc3e380be444196965a078fedd199ad3115070cb1d69f20f6540a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/pt-BR/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/pt-BR/firefox-58.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "a2239a7783497818a2c5f3b810c213ca2152fff3ee1cd2d8e57bfcb08f781cd8c588936182645c5eb9281bb41f80be493b119382f59e7fc83808e848a4d9b582"; + sha512 = "86e7c61df3bc0c1cc00bd4eab4ae9a9d307490c6c871792d8afd27208fa93c5ae4b39564caced53102d8ec5f2c7275889c23378f6bfaf4f44c1244b5c661dcc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/pt-PT/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/pt-PT/firefox-58.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "1e1ca4b80c9defa67221f642c7a79ce8b6ae350b9221269f89b252b6e150ec081780f0c6043ae015216a4986dcee4a515cc26b562c73d6ed2a274f0966f0b279"; + sha512 = "36e9e0fbddafbed694acdb37e46a2665b1bdead88fddf7b4859e33d48e6dffc904106a3c760619886981aa6cd642153dd203110269834d6183d0a09de6f7c6d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/rm/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/rm/firefox-58.0b1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "6a598e71a3da18d23bbeba744d6e8bc6b85263fef93d72edfcec66f3bd6b80b48d328e9b3cca90573352ed3a8407a98d0a2e1c61a9a56258b55df0984f21cf2b"; + sha512 = "eb0e746a428912e1d15e20e2929fb6d3fd92b2954baa5e717e393fa0449d9c15e8396ae0c2aac50213b1320347869c923c5fe29153bce1182102971d69560946"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ro/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ro/firefox-58.0b1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "3ac6ef4b82630b697b239dc972522aaa8d58829be15be41bfc91fec2b7b3fa36a4a24c2b6a0208a13ff2d0d190be3c72cebedf037f4023666c76704f1b2ea0f7"; + sha512 = "a38120e5e5aa2202ce215a938619323565ca00021cee6f66eb8d5ebd25164e3ec4fd2e4bb13a0c2d95c9b215adfe2f663f62170fc61dcd156d49615d2c1a5329"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ru/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ru/firefox-58.0b1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "4c8122918cc65958504a6b014e3729321f8d440f79605ea22d90dc3c49f4134220c2b4463fe08737854b62a76d8e67461b3c1a41ea9999c78eed95a99bb2c524"; + sha512 = "acea191b728bf9be9c979be2b869dffb5d37649ebcc2511695c85daba41a8e7e3481fdbc474cd70017c75e08a054fa068a09ac52ba11cdc3803bdbfa4a94f548"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/si/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/si/firefox-58.0b1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "e915c9acd651036a196f3845e34707a9622e5b49e2ef5614d5426849bfd809c9ab65fa0d80aa9865b7dc3bd9cfe906109b590173c545e84bb2b04d5edd2e943d"; + sha512 = "8f79244bea0d018ddedc32bbfd0fa057782d0bc88e99f82850f711dd753201f3903c588a1b065743750bdf09f6119e1af0720bccdb5f0e8e74c73e99ed267f6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sk/firefox-58.0b1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "ab7c52be7a4b0bfbaf8a52b7189407218df48c73aba5d5ddb569f6ebdf67d12c8da014e300045a51d535279571241985a21901c1c9cde9c32eb9cdbf3956ba95"; + sha512 = "6d54dffe631bd5cb1042daf577b6695d643d87f9fa332b24d7461b61c1871034195eb931726f2f35a76cfc5f3cffcbd44c34f9b5fff4ae9435b2518e8f6143c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sl/firefox-58.0b1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "b9cde14b2886aa10b09cc862ac4882eaeae69ae5295625a9db046baf66ef16a76655c23b82d85eb95bed3985d13527c6eb210d006d5808dac0917b3e2a1b94ef"; + sha512 = "85d6480d65f110bdb3bcc1c7187541d2c7a652629f57f42c5640c84f29632624fbbcd6ef70de804cdde9b903e1b6a81739297dbb7235b1cbc8877c77feab787f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/son/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/son/firefox-58.0b1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "2ba989588f9c294718c6b2cad196a0b4631d3f189a5877ef817ac1b4b2af767531bab7ba1691dae21ceb29fbf63128cc38805db6412ce07af21d179c40ddafc5"; + sha512 = "956ce25b91bc64e72a5160f185076d5afa51ed4a8a70ddbe20a0ad5ea372c9ded252ba5b29b355ecb7d7ffbf53f58da82f082f389dd178993059d911a3d8248c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sq/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sq/firefox-58.0b1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "07e478a5f07184d5730665b52a3cc162569553d7fc43b37579d4a33bde5b70f8ebf2deab9f6b144b961222fbced4f1fe204865dad46222c94b850ed3600e3a0d"; + sha512 = "7b2429c1ad8ff0febea367d6f9b049fd9d29ee74be2418777dfee396949d54d05f976964d801b5a67a83bc34558e3a6940297fce135b76d0fa4df4bf220569fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sr/firefox-58.0b1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "255f62d5f88214320dc1febe610f547b2bba08817e8eb7ec0c23dbcf5d900f47307aafe63193f93f1a3c1dabff3b7f49130df1cdde940dfdcec521553c4733a9"; + sha512 = "fa728c7049659aa6d2f0570ae037b20bc01eb15e8fa1315ff8766c7b4b93f2d7147ff8af5ed78a55ea73c57324b6c5882de77c905c984b55a3d1180e87444a8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/sv-SE/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sv-SE/firefox-58.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "4fb0f74ed4b7d221dd75c8e767b0f021c8bdda27388392c2b55cafc3ae48757b0bcc506061d59bf430fc2841ccd3aae0cb92627de00809bdd8fd536c860def24"; + sha512 = "9b1cd04b974a0952a5525f33ba8fa1195b6cf874849fc84ef8c037acf4af1497e7041057b8ea0b362f5bf57df944002f2cfb06d2004eb7114a2491d7bae2cca6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ta/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ta/firefox-58.0b1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "02214d133855b544246c930ac834c4076ba32a2f490deaf9e53cb8ed61ea6d9cf77d04b2ecc41d25eb1cd8dc87515725cb7446e85876b66ffc954d1cc8dc88ee"; + sha512 = "28578f38c1c6a38edaa5120dc772901ff7db0e752501ba5e949c6d64b2477e6c1edf59df1ead5356652f5f5f550c3520a75db65ab4c8ee430fa9c8fd62f76fb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/te/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/te/firefox-58.0b1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "94d8bdd506216e56ab6b866b9f9a8158101b961e32e691217e16eddb748533fc39d312415e005f05656b877590487d5a5c340d4cb66f5fc9f7c97d9959206ea9"; + sha512 = "3317b9857651cdad4dd3886a4a778889f62df6981d40c9c28e4ca09cfe879adaad2502108d7085048ed233be4328a7bdc24d264cf7a5e0955b573e271054a01f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/th/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/th/firefox-58.0b1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "305bfebb6a51ce94561a25e19acf82ca4efc3093a8de97ac352dce248140c9eb50212ca11cda550118f6bef6829ef3d6614c4696e09c662cd28b05b6d592f4a2"; + sha512 = "171da97ebff3276da07ea3ed3b3e9fd3a09e1ff7b443e0bc6f9a31098515eb48c604a5491cae701a9ee9e8d23f788a5e2bc095cadc9060a014aab3b157dee825"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/tr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/tr/firefox-58.0b1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "37effb1cc8d59c6b6d556c1c99eef05f5bee3a31e9afe9e606790d1f901c40a20d34099d62ec610a495e9fa7a84060de5203349af4899f9da92f705fd59e9942"; + sha512 = "d33e3b109238f1ec24cb4301e89c039bb2a7002bda379aafb1a46fd3621268d10bfb446ff9c81f3d96101c11ae946e74b359970f588a4d40af360057f6bc2537"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/uk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/uk/firefox-58.0b1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "2e7fc820dc9af6da8bc9af01d18c17138676e89d5e5d7e11e1bec938aee7db5d1ae16fa8b4aa03fba85adb4c9a31447fda87369b1b6b4ad7af4d265604ab9c13"; + sha512 = "b28fb0f609d33dcb5d7d9331a3a89979779fa284fe1a0ceac6badfb4549ea830d181d52f2f8d25c888b448b0e7400bc99bf829e185fdc06680bf81efd5f9b843"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/ur/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ur/firefox-58.0b1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "1698260ed76ecace3f65063e0e076a37fe4d780743c63512994826138cf43e60a9617c36d514d5b3a349938e7ef7b9e670d7a819cdebdc10ac5ffd00aaed5ca8"; + sha512 = "1d15aa7b5ba212e0b2f7520f4a0c4c7f9d53be840a971852485ab3491b28c0d81f0425f32774cd90508eb74d42175f3ba76f3f20f21c182a276b21090062a9b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/uz/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/uz/firefox-58.0b1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "99da803303a3269bc510fa82e278448e38ea20b73f6dad40682ac4037b23cc6869d2b6bf4f7f07ecc1b18ff3b759ba2ba4e13555a61cc9282bd29651571ec1df"; + sha512 = "bc750432a94d68897a2a39b425946aeb65e3a9980ce05dbca143615360b45d7f8afd0523ba9bfc4769d41a52ebe554e74d81981391a36b0a812a2938bb0df91d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/vi/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/vi/firefox-58.0b1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "dc967eb9b8f5f53a233212d5c9f05a7304bff7d2d9b8175e4f197eb54ec3c28ff6d8b634033651b20fc98a68e2d585338e6c3b50b9f22e4bfdf9b55096740d9f"; + sha512 = "71088078c930889f1747f087d6424743df809fcf62c833470c3222002c1037e5a91d6a2c81e08d39527c673e4d5e807e40c85ae63a7917796af8e9f1e0ea6b6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/xh/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/xh/firefox-58.0b1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "7a47ebc63b02734c2ecf53ea98fa246a3d6612c203c9393cf8958230c583e0150b5da9fa3b315131d21576d6028565ab15eaed509848da850b7dbea65f580637"; + sha512 = "c64f34d50755e61487d9280ec60659dd8fc883effe88d61d73416ce740ed5205bff1e107844f04c658aa495bde5add5d10fd8d171312913e2dabf351ade7b481"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/zh-CN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/zh-CN/firefox-58.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e6c7864bec03ae6ec3f5293373ef5b5ad04f1430cba8433b7e6d4d40ed4c40eb78ae48fd85e954c16a8dc5ad7c95d509cc3892832002ffef3b99dec161b4795c"; + sha512 = "3e86e76898a2587d079384ebff6a511c6d8a212a1a4632c224de9a1259020358d0ccb2acd1383949f0f6610c284dcb2a942c6aa483ce61d82a8bdb22a6d95ee1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-x86_64/zh-TW/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/zh-TW/firefox-58.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "18cc76259b7f9b50d1dad72d76d4e9fbd140df85101a480a078840f22f8f778b90debe246e953591a7c531a64050569cc1162be30c8dd0054602d46b1e3f7ec1"; + sha512 = "f560cfec6fb0999be49da6c27df85086a1dcb9f88d1467008c417ce47c596cc4616d5971eec40db5e112d1a57cb135ae12e9fafbc4d20b903c3e77dcf23eb826"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ach/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ach/firefox-58.0b1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "731d0a857e84a66729efc652c0b562d683f12b847df3aacafba14b6b8c9f17a3b6f7c60c40dd68d85ce81c9bd876dddb98e677fd532cc4801769683530948761"; + sha512 = "d322b206a5c7e8873d9c161984a95730b91ed900d81b9ef53b0464192cfa52dda02a684a6bb615bbb109f1f6d93f50236dd36147acb681fbb3be8e08332e6d5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/af/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/af/firefox-58.0b1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "ab2bfa2e51c36e254b9a410fa1b0ad1a5d4f2fe39b3b09c403a923ffaadcf339e71eefdf22dfa67af7a9b4c0ee543c9f507e49f9ec1ff424ec8f741950617ea9"; + sha512 = "68b112350d8f8b4ca5499e04193ffb0a8871e8089bad80cec0e232f72aad4561ac9f44a33ef65b9014fce830a878cfa9975cc6408a70d7e62878453895e3e557"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/an/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/an/firefox-58.0b1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "61bb9e3e5d8341316888c8c8ac5df92791256181e7873db98e9ac4ccb40524552569c7b028105124c549a3ae2a62c056b310d89a2489a931be6a41d5ffbc291a"; + sha512 = "69954435c30b30c77896cf195658e32465b93c7c2795f60ddcecf837b85aac4be27bf739250412bed286a9148754edaea29229593d0fd1f0dfdc02ac7918789f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ar/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ar/firefox-58.0b1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "132fb475429664ae4df2d5d2dc08274c7b8e253fdddec3e6ee2f0d11b5662b11553642dfc3ce69dfb2c1658efd16ed8568c0cab9ad626acf223979306e7132b0"; + sha512 = "962d6b22c1513c2d1e148e30b93aaff1a768e6f7aad5e2d2fa3403e47db1712daf14a32be51b5e2de74e789bc7db3cb3a7d82d24392f0af10c2d313f899a69c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/as/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/as/firefox-58.0b1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "86658f39915ab733cee46f19929101c50168f8ce78cb6e61a9d7814830a2eb7c8b7936db858c63beee7e06a94be9043b80975382cc2ae8623198afe8b65226df"; + sha512 = "8f1278ec528108c4b93c734aecac9a1cc28f5c459a76aabcbb2f03cb467299db858c89e167e8b576b74f58950979cc7c4d4c1fc563151abd1b1c50c4d89ba2e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ast/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ast/firefox-58.0b1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "1cd4a682a831772b32b603edb6277b07b3f0de78b33246c2deec2c75a023060f24de2cd6c5ee05b6eaffa20b617fc8f7a6f413f502bd99c39086b689ac817444"; + sha512 = "bc79681e1256efbb3ffaf0faeb53f8336c6c3be90f94fd815670563298adfc6e4bcad5936fd7988aca49d4ad069abbb0e9769458455b5b8d338c3d0d36a93d0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/az/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/az/firefox-58.0b1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "45e91932826645df3265152fa3c80fd74ac729f97fdea29059a2e778ea04af1cadb8a0a7df8a8935ee9e70af480762d256888c4fad1be43101eebd95672dcbab"; + sha512 = "9a7360b36c18ef4668ded6eef44030e99e488e404e083bf63c1a47bda13ebe1b8674fdbbf39f2e4ceb3fba832c0e78ed3e280d036b6cbfae3b662a716dde8c23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/be/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/be/firefox-58.0b1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "a3a7dbc02eb8b3d64c67638a71e53a98a30092e03eac97c382aee8f2aa1cf099493c65aec5ba96aece30deb50bb5cee2f35f1ebbadbf38c93e8f9f9917b79406"; + sha512 = "083df6a06d92174d1f9b0c8348d668e8834e03b4c1cac657f7cb4981167926f4d851f7f6b2071c077b99a1f5a2f717d16531092cf01b8c01320afcc69043d990"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/bg/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/bg/firefox-58.0b1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "7b52a3bf5a2be9f4de6f609ca11a7f7e9c219a9cb84d503e892e1b51868dfa10e650f6d75aeddbd0edf8fa54b48aa3d3c4852e0e4615efdac78912709b162591"; + sha512 = "cc38cfa3f2f7bb99d4c4c25bc90d5756500ed3aadbd517e3bf6cb1e700cf8c5216cae2683e9ee801613375ba8442b75efff14fa17057c9e5cc0129a813a5260d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/bn-BD/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/bn-BD/firefox-58.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "84c687130785782f9b900249db6d108e160c36dcc90eb2fc10ea9661cc91b19c8da262189e72b3259f987c05dee4e2e83c870cb2b3e3fc21178a4dbc19598981"; + sha512 = "3137e5f268b52d400a67bcb9652a3d446879e5b68ce1ad5bfe0653e1f630dcab7294a9ac060c2a9238634df13274b948e95d3549065b471db6bc33e7ab03a8f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/bn-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/bn-IN/firefox-58.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "3d269322796c2384ddb03ccb07ebc0fc6ca04409d1fadd6c11a1ee436092139929f414ff9c46883379e9c92441189da386723b8ef7dad5f6599b1b522a3984a9"; + sha512 = "40c279e62742135fa246f2f005677cfebe2e1530ffa832c435d3b7248edcb9ab28c9f82ff5a9118f05da98a0b93de02f5d66059cbac935243b6b7824dccd10cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/br/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/br/firefox-58.0b1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "95f77bc8d74e8b6fba6ae6ee59f12cfada50572aae4aba4e3b519290dca20c6ca45111b5b7e58f5fa2a96cba4d35af4ef20dda4b908e607f00ab7c2d7ffe7834"; + sha512 = "07fffb9c815a1a3299e3adf5016b2f9f4f405907f567124ba9e05dcfe7e098efffbf0cb4cc7b5ac3df171e9705331ea33cb02ce8c78d8c35766f13a328f52174"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/bs/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/bs/firefox-58.0b1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "0f171ae78a2f5c3939827afd61dae0c96fe3e062a77be6e2de172e5e7b3110e953bc282ae353d1629daf9996798db65a163e4d74e6a727a734753708545a2d0c"; + sha512 = "f7f591e6783fdcd7de3a5e33dc43580937f88381458ab774b86688a7c76943afe717026b75ad003c041df426e22638fb085ebb640f459110f5f37f195fee73c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ca/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ca/firefox-58.0b1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "31243cdce440f556b8588b53c29c8a9140b43c9259c6c16c520773b5a5aaee1944a8f29b427d443701924075547d39f8eeb4eb61b683bd467a911cb59d549e91"; + sha512 = "0ad04e6f72ad6df7cba03008ca5053f162c94d0e0109fe3d2d49e80546561f010f890bff3fb632ebf91edcd71bfac3f743614759ef3207eb19f1278ae2283561"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/cak/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/cak/firefox-58.0b1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "c8d4bc2e74ba30cdf18b09911c464b026781933d234ab8421c2b41e19753191ffff7fb73a5b77283d372b2e6496edf818e8f9ad4e06faec184370c7b31c9b3d8"; + sha512 = "1be5b051151eec3e46d9d8a5da1a44569bf56ce160a49041be51ad25c5081d019014a7c2a2861e654c39f8fc918c308450827ad68f409161a07e15de44f14b1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/cs/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/cs/firefox-58.0b1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "2b64d4d1e94ad36439fa95ea97915ae920fd4f2c0e749efa7d1367a9298a6e8ef96a177b0c435a96120644f8baddb76492827164add7caca100c80f7d11d3a9d"; + sha512 = "6362cbc640673f6c93c073f116fc98efaf5ec417a5f6754eaa28d750b4c239e12da5b89eadb7a1f163237daafea2b1fb3db211cf00d2062fc9272865472e4a04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/cy/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/cy/firefox-58.0b1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "70accb1975ffeb4fb3de11171c603e2fc5be7f9873a0d584f906e324d7b64a885efa5ec46739575abf97ede95d40299f1d30f5facf36c3073284d79485a701b9"; + sha512 = "d72e0eeaa88a03af2f8d10b329d5d734841aa45f05f6c283e2774a7a80625c638b59bf579ab0609385557e911f319701a073e6982f5319df717f786e11475df0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/da/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/da/firefox-58.0b1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "54d63d2248d253e70fd5d69f8507878cd35bac533b77378cc700df3be14e90d551f9cdb2c5e5ccef570cc8d0a27a827c45166ab5ee8a50376d03c447583a5583"; + sha512 = "7585f369e94b4f2f0ecc9f2ecfaa059c0295ee96e13cdd93f94a6558d99764bf20b248a47cb1ea97cd4f7f14c37bddebf4e1f1f396df5384795321656882d790"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/de/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/de/firefox-58.0b1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "faedb51772813930a29e639bc11d713e484e79fd220ccb0c72b0071d74eeee238f92a337cb8a00c3ea86f1892baa5211e1dfa7a1d102c2869de1743963c176d6"; + sha512 = "94610bb17c0164a9b39fecd5c108f08b44c98a7493f9db16305cfd1dce95eac8565d57dabf3335c674b92a45dd8590f95f4d0046bc132b724710cd1338d712de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/dsb/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/dsb/firefox-58.0b1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "9f409b32ff72b5039481cfe88db1245f1ad626b0f1f8a500d16c24e5b8deacf2188d5a436259e0920667059d090700c4db1997bdf875938da26863a3096fdd95"; + sha512 = "1508bfb8bb5d2756ebe39a9e778b45baee849c6109022475e9106ab79a03ee49986421b809dab70d924fa0edc6613c877150de334738cb3f9a9c53ce3d524ce8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/el/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/el/firefox-58.0b1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "069b856c0b4e5b232572bd838ff9fde813c72d14bd731a08ab7acb579f32eed3beb6402ff0669a1789b9e3a486fb76ccae593ac94975828d13350b3a24baa696"; + sha512 = "660a1f30c682ae84aa75d7519e76cb9e2c30978a5195a9e194f734c7b37ed2b12fb216a50c44c0278aa11c51e426b7b85a81363d263dc49a41dd7935db4bc49a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/en-GB/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/en-GB/firefox-58.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "fcb89801772ec01f7863016d82c0f5aa430b90231c7c46fbbc0185246cacbcebf033227fdb90a2395f3c21012bdcddf1e745c1fe3c857add303ee475c2320f9b"; + sha512 = "3e52290ebcc54803162781fb2b87389819537b6e1ad671c8bd95185372ea8dbce11a7cd40ab6d71130effba71155c16be729d0cf74bb39e0aca3d1547cd096b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/en-US/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/en-US/firefox-58.0b1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "ee3c3048b6644cbeb32ab784834b7f9c8c900d3a68da5d531fe4d7808876013f0990b2329cee04dbc1ca8b5cf3b4b10c39e19659b09d298961f1706024427a78"; + sha512 = "f1aacb89284c8627c55c186fc50a5fbb2db42577e0c8db86889599332f711f484cbdf3f53c0ecafe4431da35fe51c3a8b7cb831710c19eeb7eab2ad475061684"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/en-ZA/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/en-ZA/firefox-58.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "c31db87c3714bf29e19a25e4791e7d60c140598b7c64d3e47a413bb8ac95ecdfb67e97d6c5491b76ee355ed46bd907b736109bc64930629dbed4adb91ab07aed"; + sha512 = "f4eb9f4dd20a255bc054089a71d9fdea91c184919b8bbf75ced397bac4d4ee1fb5299d60203f59701ccd1673439653338071fa7c90c32ed0b94ad78cb510f3ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/eo/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/eo/firefox-58.0b1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "e84d9ecdbd2f03bb0d6673da736c618dc6b5dc7844384f3e1bb73041d8f7d1b85ac5f8b2cdc9c6a316a931ad34830a3a1873b6f0c517c97eee5d6fd1507b8df2"; + sha512 = "b310c3d01ed998222d922deefb641333239c57da410fff273f238c852e75909eaf1ea851afce1a93257527670b0f0d8861d9b47b68cdc80c5ba4c8bf1afe9775"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/es-AR/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/es-AR/firefox-58.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "d3f4b7711f81707a195e00ad532a5383a9d47d86681e882bdbb5d2d1145035b0d901abee5908daa607d3b6df27fb8eabfb163b6c800a4cae15b2211fd18d8209"; + sha512 = "95ce1ffd9d736b3ee78e22c3c8b6185d55fc3cfa501bef1779f30d345f4af642c92ed5a0248b2acee04136c7ab04bff604f6931d8e19fa86b9a0047c18d41569"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/es-CL/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/es-CL/firefox-58.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "c2d32c0666c7aeb41006720d7d10e55fb8f4f3e0e053ef43f8ef06c2644b79d51a47417cb4d84a7028cdb83d4d74bfee982dcce9e7399ab292f00665f31c7c18"; + sha512 = "2be8b488b2c633513e9b8832a3be8263769fcd28721bf26085ffd62d855aa22eee94bd32bf57d19a8a226d6a5997c4595e4a1d4ff3df71948e66ef9d778975cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/es-ES/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/es-ES/firefox-58.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "b3a0e567aaf8defed6cceef8832bc188a4cc47599be7a02b6a63cdea2fabfa5380433b75d48d62d9f4fe8818160239455e7374e6a3958d4853208e4cc7b16e07"; + sha512 = "e5b26bb9cb2a428bee971fb09694a47601304ed5bb49945ce83a84eab90d59e4b60358baea20015a54e4dd8dee1beaa9ce06f80faf9e1d6ef3572087eccee172"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/es-MX/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/es-MX/firefox-58.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "a073552f46c031259bc4f3b05af5a9692ec4b4266d993468900ab912bea88ae0767a2c1e4ec16ccfb33293081f83aae7ce71dc0472efe6340ea62ec65513ea18"; + sha512 = "2069a6fe973341930bbb482a7983d49576475a6ab858089c64e388812002e698efc7efa328508cb52cb38f013edbe995b5b941779e03f4f44afabe0b013f2209"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/et/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/et/firefox-58.0b1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "b24a6b6a3246685d41a303c56ccbefc4596e6a09a9690f8fb0e522c3d25e3fd2fd087bc99647d4e3035057fd4245e00eee9abf639f06612dc4b7928c4092fad0"; + sha512 = "65c02f08263fb91e5eb5f4edc445f1590e96586890200298339496ec93c9b003eff729f96ce2a954b80bd8161e1ab066bce5df1d1ec501292f4080bd3414a9b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/eu/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/eu/firefox-58.0b1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "36cd0b76748edac4a2af813fe1ae06de166501eb765521cd1abf4b05bc55b0460b74e09a45d7e39910b1cf6dc6750848e64e288f27a23466dcb76ed4107da637"; + sha512 = "b45b71c7ce796bf6a9bdf1e07ed239b33655ef4b79db6d45be4ce5137039b3ee3e10054d90db19b3733b92e9c77e822c5c27b23f1fa5dfc0350129571e56e7c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/fa/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/fa/firefox-58.0b1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "66108dc33aa1eaa305ccec598c6539795b06fad7ffc29f5da3576f770f8669345d3856f589bd6fce6eff3c446713b69913d1914946c0fa74d1c9f9dc3322964e"; + sha512 = "e64792f27a99925e49b10db7442963d8ac188f3d2d658fbb6a15e2ca462e2c609abd9f265a6577503b3bf62d9e64879c44917f541d84bd389b6f6ff4150cdf1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ff/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ff/firefox-58.0b1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "8c8c3cc9224bc4b1aaeba0037c09185ac8e7ca6702e73df125d4103c3bd4e8ed95509c922d81afb25c8704bac08003b44d637d00962c000a56a5370539b780be"; + sha512 = "ecdf7ffe75352bccc1e5a642f48ed82ed7cef703193ccc97163177fc3c7a77b5bcf4bbef452ea1768ca490037ecad5d742800ec45d984e41dfcc30dcbc70b3a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/fi/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/fi/firefox-58.0b1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "74642dfdb24453ff4e25ca74abc772ad30bb6072cd81c1e597df1b689b59e64bcf8fb36fcb366be6b3eb5378c5d682460ebd27ffd9ee069f5649a2657138c2cf"; + sha512 = "063fbd923090c7452620db1a42358687e1d29975cf19049a5867c18eb0265790f4fca2644010196c09b639e63ada98ffb71bbe17191b31a0cc1b4fd468b4838c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/fr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/fr/firefox-58.0b1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "e0e555d2e7f31a49124a2e5cdb28dca04ac1d67400ba897df52716dc705f478e0ba6928ec8cadf5e82431c754a1559fa838649f0cc5cab15994d75d86d64a12d"; + sha512 = "889f628248f6c504198988697f18cd2f99be305090350aa5fb8d5afcdac572c14cb780ba07e9c3f98b6155f29e4d32fb5f140886b0dbcc55d9a71cf31d058fc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/fy-NL/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/fy-NL/firefox-58.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c6a508bb5fc7e8350a0200da8aa189805d2af1c98bf623327404811205dfbae9365a3e4acb167d5867b48f2c28b9d1ec98edb6e7b9204d31fd0364b763e249e7"; + sha512 = "8749fc2e704a9156bc944f89626e3fdb2ac51d325cc6c3f2c6646c0a60d6029caf5b51ad8cb6a269cbd4b6c0b23b719cfa1f7c4dd1febc3cea2febc6b4964f5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ga-IE/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ga-IE/firefox-58.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "76235f086a5159d51579d772f223b694660a7c64b3701165f2f11317ab35969a3dbc8f77ced8cbd97cb0219545e10f5165e8786de0fba2a4ff0eaa87a1ee9253"; + sha512 = "93628f55f76a44041a49ae2c2564814b277095d33b67fbe4d902234554a30461acd5eaaef74780722287874ac4080b8def72a2fece9ed72f5a9e6d2140cebae3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/gd/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/gd/firefox-58.0b1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "1f0cb2ee88a34caa16865cf9e86744eb5a71c7133bc6735293bcbb5f4ef9aca7f9a3b4f8d1ec353728c3a7332c2804278ea58dcfd02a12328e5b3937e3761f39"; + sha512 = "af3bdeeb07e2f63628d787f66d0838bc073b927900e6358768a083832a13e0b056ea1821a43623e3c385b6a77d6cef49cdeacf7678be3ba16263ea7c34144d4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/gl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/gl/firefox-58.0b1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "3980aa2a37547a8e8c3d4f083cec9f69539ae0388dc342847b09b789f35ba7fc9cb83c5bd3e94eef1d56a7788dbafa0d9fd6aef305043d9a83b24598ddb750d7"; + sha512 = "37082a0429ea2fa9d8009452fc9940b4d507f64a5285d67f3f9d77ae4846aac4d40b58f4ea5c6b6684c5c59057bff330f7ca21a7ce240b78037ca90589231990"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/gn/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/gn/firefox-58.0b1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "1859234d55f1e5a11be57e4fda90608c40842025b37cd047f5c924071006dadb3933752ce72fd7287c941caf707b14f66159af5a48e34677c017fdce6f1e9a78"; + sha512 = "b2ec403ccb785f8eda9e1a03d5200c40827f20bf450a334f8ef0ad1a1b4fb38ba63b812405360efe77e0c6705730dc484541065a969e9b51406a47a8a13fa32f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/gu-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/gu-IN/firefox-58.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "e8da8d37f6a86522592084e267bb0ab3a2b26159aae08af59369091aed28b071bd3c1413ed80c3c3be4a41ed91ce3ca38a4aa4a4bddbfe924649aa382027bd32"; + sha512 = "2275c8bf1639108c77b304140ce32a69239fbc96a371c1d88464694f989deb9264ab41053c3a2d3e1afd6443ff3f0fb8e58b61d085dd2f6cde346867aa380c08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/he/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/he/firefox-58.0b1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "6165ba93179ebc019ccaecda1ebe7b68bddacb583ccb417bbc50346ca5fd68f8d882c3723361f8334cf9159567c01adb620ea8dcbf01b7ed03da7d5efedba198"; + sha512 = "982b15fc9cef3fb813154f90e1ca6d0768237b04ed496d91c141c59e6b59ce0d02623644d12b885339e6677b01556d1724f3010ed06cce89c1d26a3cbaa9863d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hi-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hi-IN/firefox-58.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "230bf538f7498e9536d3057a6321f41d54b366f1d0debf79360a6ea6fdeeda97895ffd5e4c77c2874c97b5a642e6c5a3d2193270417198a0cb383ea349e01a62"; + sha512 = "40e6842ab3a8fd79bf9c06cbb2bf1aed9244e87470a7b39957db7c48f8eab2dcbd988c47b81d362bfdf19e7c9891c1ecbf0183cceaae9761c38583aff32e6706"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hr/firefox-58.0b1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "617c8e4cd572f896b3c0094e74482e8fee5e0e924cc18f06f16e87f217b712de7665c38069be59f22d1b269951157634e11def128e0c5164a119bd23981ba9bd"; + sha512 = "9c798f2d7483a4b122fa579c0b40232a312a5ac7e19db9a940fd58aa7b54a52494822bf545a79a690c181d47dfbaa7e4e7b9c70d68a981e9bb46f3469b356855"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hsb/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hsb/firefox-58.0b1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "da7f1f00ed6b741129dac9a82b5116652e2d0f406d9ea535ece8907e1aea60c9393195882bf59557041c14ebb604456bbdd5514800d7b6a66700558bd256ff6b"; + sha512 = "b00f4b0e377e413c196eadc2eed1c914b496e6b71742c51ef87ec502308fae0fb55c0d69172d47a9ba6271b137b50e1fa365781cef11d0d65ead0089d8c16ef0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hu/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hu/firefox-58.0b1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "d6b2f966aec0e7c529d86916bebdd06a21850f32a436837c9efc4da5bd18ddbfc937697f758796b8e68ff79281b35186620e29bc93dbc885d6f9b135d028519c"; + sha512 = "806ec30cfbfc22fa206dda8e3cb5b43aeba99866a19e8fdde212b95c852bd2f313f451b93409d153c0dc07ed5e1ac94a18b75f91a4ba9b4787a89b77491a5293"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/hy-AM/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hy-AM/firefox-58.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "cc9df9dab12511549daeb011c50c20c563eff9df7ff3ad0b351fa6362cdc35817f9b5c1c204c1e484a82022d6eb4dbb196c78b43a1429a8bcd92bb22e9c757d0"; + sha512 = "9e3a8e46d15d9b71d645d830f10e3ee2089c4dc5083dd2debbd3d9d05ef464b01405f920d9a2787d5155e533ec57c3fe3def34ad88137a4542a2cf5cf8a904fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/id/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/id/firefox-58.0b1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "1d3027f632f4a7d74adb54da6c15d51af85a6713dbf91c3a01272cee6a4692c4fd130eb66757230ab7e9dd9da7dbeff7c889bb98681fc6cb193b1094d69f31ba"; + sha512 = "253958e0e6955a8768c5dc7645f6431135bacdfc9c1552305f7409c8044a3bff529a87bcdb2a0676b0eca3ec90de34fdff41a46a9ea63c5ab038b4119e231b4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/is/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/is/firefox-58.0b1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "45ca6f394b47890157680d7d0ee58b8ed75de1623491e38b0d31b79fc2940e7fef00cc2a5e7ab7ee7931261c6575122cd7ace209f94a4574e189b1acc0814755"; + sha512 = "070ba6e602719e79d2a3ecbca1f5c3c412c02cad89c8aba624918179b436606f352c6fc0586597deb2ba7f703623e0484c17a11df78655b4ca0a1a6a826a1b9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/it/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/it/firefox-58.0b1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "38b002021a2f68dcecbaa745944fec1af41b440615a04eb8ecac30923dba0514db70f505670db35d22fef794f682de03d16fb2e03888cb4e045e3d997ecddbf4"; + sha512 = "9f624b314b29b1ebaa6c92f2b8cf7b4a0b3c38851af4bfb123e140f49435e294a7aa2bf6e449ecb6b315b893d5d55beb487d30814cf6d72c4905eb7df91d0327"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ja/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ja/firefox-58.0b1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "201681b0e830834add6bc3dffe883388fb9ca8e1d5995405224057ac3a2dd044f74c800c48c42bb1f77f493bcbc92c0e10a751b3d5871309455efac26e4c4ef0"; + sha512 = "22a95b25a5e66280791fc18bd5050db7726265aa999ad959b07d45c7fa4720f067749a60e33cf8f548b93adbf440e15e47269f98a31d3643d157ed3d3c46b9d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ka/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ka/firefox-58.0b1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "9298bdf3fac725ec59d4d358be141696c4bcb2079e4689da191ef2b52569cffdeee7e6f3454922b784d3ab02a0339eeab4969140457cd4b6e2533c72c740bd71"; + sha512 = "3cec01bb5d98f192426cb39ccab91d823604b7c722831baefd8f1f6deeebcd5068a9ec8ad52cffeb02842ecccad891534598cb6a898adb40c0fda77a038b94b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/kab/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/kab/firefox-58.0b1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "65ed8e7902b0a0342f03f95fa0a51fafa5f902b3ba870e3d1fd783b366a0af257a47588981290cd9a0ec369f43aa3e72021122ab9fd8cd46c4eaa69ab726b194"; + sha512 = "9f43fea99f324955625889082fc8ca119d0aeef63d226532f87121c6659c0c5a9cb54a07faee30f8b1b10ba58ece7ca1419996269f05c705fa36c364c8fb609b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/kk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/kk/firefox-58.0b1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "fb3dff8ae89e8b59a74474eddc21dfe5f5e69e7f087731f93d775c092895b38f69b39f66a7298a8b3417ab87bc01b144a5fbe6ea3f7385b395c3a82e2e5df026"; + sha512 = "c3f10ae05036eff27646d613699c4be408891917fc9d523e202f58815d2ce76a976f3660a507e6f5e4db4dfa7172227c6ab874c8586997d530808ff409ef827a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/km/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/km/firefox-58.0b1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "3dcd608f361056ae87882d5a28171af8ce24a16184952f0f5abe148cc341e056fa2b9abd583b835026992e60f316952b9d61b9b7920b5e65b50e3b9905517e60"; + sha512 = "d25c83ccbbaec8e599c5ccbd5a21926020392bad5349d65e62a12f9ffcf7fe44bd46fb79974bec12fde2a79e43c6089b9906d5b6926cd17daa30ac3dc6e811ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/kn/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/kn/firefox-58.0b1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "7215efc6c893389fc0137b5bf21a9a7b215fdda0fc556d1f1a1f84169797a4495aff29bb9777978699134aa59653c4e53d57e06ab785c07acb293c37d4cd7962"; + sha512 = "d707cabbe662203520681556c9dce1c7dd0f97e002b795214d17e61f8ef6bcbdd7e16b77f2e5bfd1a0fa80cbba9cff49f4d416f1cffe04138460a49dc7baeded"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ko/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ko/firefox-58.0b1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "144eddbbc7fd3d3cf213cf411ac94707e2fb50cc10e981df169fbedc4c971084fc0e153ffbbc9242184f906bb4d0a412d1447e7b5e5d7136bf10633bf825bbff"; + sha512 = "c6ad38ff830a6a1af80422af252bcf9dcbdef4151deb59e72de10d048649f8e8ec7ff3013b50ee4e3851afdf609a019bb15e4bb92d93a848b8cd2d57a0bf5a3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/lij/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/lij/firefox-58.0b1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "7a90a94c35a0e1f00e3e55d34227cfa614469017355285cf053fae404807523b3e1a3146d8710b46de7c1296f9cee08bfe0eb0de9a215895ce3bfa99c06dbba5"; + sha512 = "98dea891a50e0176283eb7435aa36e038e2608ed32ac46b587d6212d3484fd42c5f4fa4dae98878fa2b79c69b46f186ce4487234cfe53474db2fce063bbebcc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/lt/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/lt/firefox-58.0b1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "71d61ebc3961011dfe60e5915176d3c361f9809b1953afdad5eca2a3e9b543958eb7bd64ad3f2d64c788ec2478d32fd3da5a172afa4790b06cec7996c4a2c5b8"; + sha512 = "5b0ed58b46552c756b47a83b6334c7a47184172db0babfe9b40e3b296088f8814ccd190854cc24c4e79f512f444ba447321848ed34d105c419ec6b1372d746e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/lv/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/lv/firefox-58.0b1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "66af0c13de2bc1c24c2635106bcc482b53f872e937ed9e6ecfbbad3b6b59a0c12d05f18cfa7136d96ffe3991faad3649a45acb8a8e9d92e8ef6e3f0392d3d151"; + sha512 = "34a6f8469d4fd7e4fd2c3c8f8f336be95160a076dd7a88b58d345ad540179d241d4a68b46c122380627b2177509ca04a565a53364a9f2190017e75dc0b26bd1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/mai/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/mai/firefox-58.0b1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "fddbd82c7de07c143c4cbb5005a88f595e38c0b6261adb534d8b0fed42233974e09d394a65359155652cf8be5ecf5a47af588f4e8f65ce649efecaca6394be72"; + sha512 = "a5bcf34dd945648f6ef88fb96d7b545936aa811f4d1863fb1b381df9e4190e74ee08eb38bab30a46bc5e6449c98a2b3db99d70a62fc46ab85a178bceab7981f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/mk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/mk/firefox-58.0b1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "10f027a08ce2fee653503dcac38f7d9afd9f888d1f904e63252dd1514dca8c471bf071f4ffaff37a9bad50c59eb833b8e5490a840593db3def2ca362cafc85ff"; + sha512 = "974c9f4ef377be4b456dfc74d8510074f8bc0bceeaec90670a806fc583795bc06360b4aa21831fa23aff8ebd8d4b8ae6c9f88126a9374b4bc96577b6cd7a5b2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ml/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ml/firefox-58.0b1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "09f79b235b65c0ecde67f6207459660dad444c28c336e8a6df3cf958fc3eed4bb35f18adcfa61d48298a9c43076577d0edc49963a6b00fc221f69f30f5c69245"; + sha512 = "a2ee22bc5caba643d7694652c2f6288aa6e709ba816023321997e070bfb84a356c6b5d5b92c4a973554aa44862e673690c388d92ac5699e4aec7290d24054565"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/mr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/mr/firefox-58.0b1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "86e1c01e504cde26a044fc2a288e3419785e93d46a6cf9deb2c49cb18e87149a486cf9bc06129c83f1387b7d7c62018930fdac77d4fce98da4fe5b5c78d061c0"; + sha512 = "cd828c6366c5450fc3fc5e16268cbccfae4a14bc2cd8041f2965192a9175d642527194564d9891c57bc6f7f8d70ad56338908520ec1c24407f2bfcad1ec1070a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ms/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ms/firefox-58.0b1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "24a7cc19585c510737ccca398f31ac3181df6601f8400187861791a564b13154b825b78427229a9ec97c7441be38f36d4d15510d1b6720b7a29d9e71b7eecf1a"; + sha512 = "21abfe77496cfef3807c962d8f9328511ced673627dd7227c025733d5e229683590b4200e6654f6c20d1ad82657d31ee4dcb64b6d83f797d0c7fa7bc3f5372ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/my/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/my/firefox-58.0b1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "1c3a160af7c960cbd2fe31407acbb93a1e31702460572315dd6c45f6dd6c2efdf419789c638551055e01bd8ed9652a8b4cb76c96b0f509348eeaf7fc548b9b68"; + sha512 = "5d4dec8c8107401ba3e09a1137866b8f690093be14991a0890d941bc4530747d3f64d9cd68bc41dab92b95aa566a30ffbb4156e69f920f0aca7d1560dd9c19c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/nb-NO/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/nb-NO/firefox-58.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "74ed8467b0678c9478c24c15fddcf22b839e0256f5e0f15379d5df8eaea59e928a42637517f6b4ef77b2136bacac8ef1477fc0b97390c20c7c09418ee9ec06b1"; + sha512 = "10eb68ae015e2a686bea9340f4a26776b388d1a0394ff229a18fc0861a5bea9b3e726f9e3256f99463b2ef56b0035bd17beb8a06b6b3d57b14e22ebd396b135a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/nl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ne-NP/firefox-58.0b1.tar.bz2"; + locale = "ne-NP"; + arch = "linux-i686"; + sha512 = "6eccbc0c1cd1307a3f37893b3e0bdc01d9de889fe5a203c034aee4ed7a615d8d049728e7fef4ee87776d9294223839d6cf15565e2a7ced72bda56faab5970a9b"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/nl/firefox-58.0b1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "30cb204b285d9f8ee321fada6fd7eb2b490ff8fc1735ed61631e1136648c78a58b06d7e0487543e8f7e99f77d03fba43667a7ca9b9d7e2860b21c1d2f6baaf71"; + sha512 = "f1e27b02d460af36dba3fea06c83446a1a12a5994fb3e8ad84dff769fe2307283e7d8eb4dd04211d1bbc12a8b058b4463b012ab01fd8996c12718072ac94311f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/nn-NO/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/nn-NO/firefox-58.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "870f52b1388b881a306f13b2ce7483ec1b07e603c5b1e9b5ecdd55263015e3b892d4343b3683e514bf58fd567466ce6d2b7da34a105ca805cb72455a17f0a48d"; + sha512 = "d3c6c97576c393f9a32375ddfe2b6f7055fda84e340af9fa2e4405c0d2e76f309da67a4885ffe58439e7394845c78815bc4ff39367626a3092bf96ae1ccdbb3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/or/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/or/firefox-58.0b1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "6441180343f8ae93b2544981bbfae7b29abfd47d59a8688e3da4f257da5c8cc95d225762c1633442908a4e3a0ebb29159491ef8cf583433913dbefdb39630273"; + sha512 = "93c8b41c446b15144615ef7c58ac81f0e63dac3747e874e52a6503a953cacb9220274dcc31268440c95dae8b242416dfeef39b392e262bae5b741a323be5fbcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/pa-IN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/pa-IN/firefox-58.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e9cc4097cb504ae0de523318afa8a5cd9fa7a1cb3348641cfe0538e039a4dc681d53bdb3976116f171018804c641450f3645af1d0d4502b3358bf4a3beb259d0"; + sha512 = "b17ac7bc677fa78f45a2855cc12a35c70701e882a6839764a4d05ee3519f68e1347194895475e916d62d2a679c7bc60588253f6f201b41d82b3a7b85a356a6f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/pl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/pl/firefox-58.0b1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "5a5003b3e04cffe5d76a9badf8f0a8c15c2d00b26be6486b871129c9111b4b53e7aa9cb2b83cf88de9c2928e17c09e548b89bc140889da7134f3195a91983f89"; + sha512 = "8b65402216f991dbc780099859821facbee757993d1b57cb9c4cdef792affdc14c01519dfc47731f195796322e5a4d3ee5db319c8d96b2565ee6fd639b42a026"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/pt-BR/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/pt-BR/firefox-58.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "9478a60bf2d3e2ec7a67a1e49c786664767ddbcb284775ad08750b0bb39a049183ba8e3feb04ec19d6e6aea6666cf280e2d90a7648c15bda1e05f5bc22f8da82"; + sha512 = "925380239a6575be1e933f645dd26d922ab5368cd10c6822d9b14df8dcb4aed5a59f4c36181d6da79fdd94019800533bff33e6879070815d3ceb089f6ded8249"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/pt-PT/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/pt-PT/firefox-58.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "b9703a29b083beb649654e526d0438a388fac253b6d0093c366742504652f88d68993f2641cb62e5c90972b9c7dcfa7d6a2e28ea32bb52d5a6ffceea34d650fd"; + sha512 = "d87499d577afcf51f2d7dad05a2307567506612adb87eee14412bd996602c6c8eed554beb1450deaf8224192ee82f8aa6dd51066e7ec1f1cd052f2285402a969"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/rm/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/rm/firefox-58.0b1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "13ea09d2b80c421852b84ec8a2a7513ac5b9d51c0920ebb282a47087e384d15d8b7e7cb01638b4857fc26ac6ac54509f368f85d7b1ec3cd70f0b3e21fea6ebbd"; + sha512 = "a99a69291f670e09abeb7bc336e089da68209fb6b7dcca3391e1716c1a0a2f679c0b2ac902f3ba7239d248159de0128ea5643b01478b66f92d139d2232cbdc10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ro/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ro/firefox-58.0b1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "af210682a5380c324b542244cb74f1a0b39b659d93ad166b01026f55995fd281124cd8a2f5b3bceef85f2f5545972a0199ff9460a7f881fb807842596057f17a"; + sha512 = "13d6d1421ccc54a249b89f172aafc1a4330df11fe68d8c49b74c8da8c4e34d7372be770e19d70f46ac57b6784a57848ecd006a35c93e50b05f89568365bd74c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ru/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ru/firefox-58.0b1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "ba01c0e7a5595fb8dc7a3534640dc87c1baf45e70d45a490605d4f81b897f7633d322be060a575dd75cb89a7e319efbfe15461e7b43893c1956de536d4c05288"; + sha512 = "2af20c6a0e203fe79c285718bd286a2c8c282e4d1fc669a1586ff3682d704a07e593670c63f94be646e7e3324666ed1de10e445cf05849184ddb295b5bec71b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/si/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/si/firefox-58.0b1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "42f647309456efa6195cf045c7ba2dae3bcd824884b2a645d6372ea8eb8cd9678076bfd555795acc463bcac550973b317a12500f8fd494ed7ea007c540c2d085"; + sha512 = "b403cb79bfa008d094262c22071e4499101f15607ae43985bb1a550aac4cfc5fd361742dbaf3a1f655cd74aab41dfdbcfeebdb1606ce9cca77030cb1dcab83aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sk/firefox-58.0b1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "ef08e41d68cd1496efbbdae6575e3c0529440b1b2d80b421aef1dd7abd2b383b31fc5091d6949f52d5b9146505d14033779188154705ed2882c1243e893713f5"; + sha512 = "a1a4b65c352ccc73a8d55f38de5aac5288b7f8b406f62d5cc6993f53b0e5a90dd71834a92be5078b0da5a95892070dd1ad51c9458b54f294c791c8307daa1219"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sl/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sl/firefox-58.0b1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "0e4aa9a51305c5f03e1e2ab953e600d922493e851d18c83927303b78cb178e0e0759e314fe6889fc7216f4af9dd82afc0288ceaeaaccf562ccc949be05525b86"; + sha512 = "8b90668816fb2869f81e4c4ed1611817b63e0072fb58a46409337e4069167722aba206976b9550f72307d8366da5c1379de05cc0102ccfd5b1a01d97b1dfd365"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/son/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/son/firefox-58.0b1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "3fcd85bcd3e85bf0114678a86776b8e7fb8bf0828b27f6e321af17f3b79f0235ee7269e36f7d3262c60f92946866084596d5dbf475cd15c459be3b7b014ccea4"; + sha512 = "3b6792727ccfdae1ac318b93b82997f6aae8754607429c2f15e16c2ed1d8f1d04f6c95bd474abed2604f16969ca580e85945a7d8ced2a694734a236c43c10949"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sq/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sq/firefox-58.0b1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "a5b6c3c7918839aedbf87e3eda194dff5bf7e0c3f107b3c71763e731448eccd7aa1671ba43df45bbfa5e29e07d243f5309b1e18858c4dd21278093f37f722804"; + sha512 = "554397bd32fbfa5475227cbb5d926c03b5359460c02833b917bd4278ac1917e9fc4da8a75c8cba566a573c26e8f8e0f82f41fef9b57e6584e3da327c6a566b5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sr/firefox-58.0b1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "9cf631abedc27fb87bbc1fd3c65e748ebdc77169d4529d7cf6bc67266cae322635e1c2d7bdbc42b59c572af2105f5f0604b7eed899eedaec9c251ebfbf0c7507"; + sha512 = "8e753463023f2428b15b58fe932ce9a33ff1dab4dcbd4321fb5055eba7768260769b1468d515c76590c61e2248d07fcffe2cc0c0d7035260d6b3694b90ce954e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/sv-SE/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sv-SE/firefox-58.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "71cb182020a6152af64ce709cf391ee70c18669081599101c34b69ef81bd3eca62024938d6c3fa121289a7e5588b2253ec536b35e7d5ed7d94190e247893b1f3"; + sha512 = "a86ddb45f3900e00906a938d35d5a463f12a7008f0c17c4775ac08216fb4207dc366ce4c23eefaaa7157af8a973cf2bc7a80e166f51c7388dc497ce9455c23fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ta/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ta/firefox-58.0b1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "f6298909d8fdd4335d891de594c7f27fe0f181f90c4493c32fdbaa7f8d5ae5190de328b5e8904f99b413b244d14d956d887ab33c19355942d810d56d0700c604"; + sha512 = "65565bff074e4f5299c6aeafd81f21d8fd265ee060788d0c494371b0c862baa9fabd1a5182d14b49d1f6aa6a9f8c47894163292236421c42fd93b27f0d9da195"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/te/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/te/firefox-58.0b1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "b24f0feacf4a484e6413ada972b1570a76c78f87dbb829f085dadf3a922d87d31d1a50c092bb45508a67267eedf3caca09d0efe10d9c329d2e46671730a30c5b"; + sha512 = "5b4f7656a5ef4dee75c958da7492d7d52e3636f0ee064e1ba93c7ad0360fb0a66825be76a4d26e316f67fb73616d223fc77ba95eaf4283f679c22da1dee79adb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/th/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/th/firefox-58.0b1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "d063097273e2f4345baf63d9502b3485bae78664d855e0ae1f33ebcbc18d49f4f5af0537bb141796cdc2c3fa35d90a6937303f4a4f54f6277f88456c3779017b"; + sha512 = "cee14df62eb7923ccf2d63953ddc4763ba76443c181cd9e1239db3b489216207b0a367eb9794cf4d52f3b7459df7515348383eb9a035f4252b0310045aa215b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/tr/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/tr/firefox-58.0b1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "c44e4b90c37484ee2050f219c5ea1f37d42ca9a3f683d8aed95cf94c412138c795011960af06d1b51ac7a44fb99f373ed28f0dfb9a8f81edc7e2675defdeca80"; + sha512 = "e385eaeb6fc0cd0902c3e48bf99fec484880ca4907c8feeabe2c0747e10fbc3d8198d5aee83bd0b21cff2550d144d20d7a9e9e68ef07169825ef8a512cb0af7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/uk/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/uk/firefox-58.0b1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "a1fbc8ed8441138e6e70e925598f1a620218d6102386b67f84b32e87b8203fb229a20ab6ac631018a196451be9db93e1cf303e2a4aea9b9c065545b6aafe9083"; + sha512 = "962aef76a18a25890be145184aabe5149a5469d69ac46c8bafe3ea997613b31c214c96d9ddd565d65173fa639fb5f2cbf5de73b9c9b2aa6394fcbc84233fd38d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/ur/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ur/firefox-58.0b1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "7500eed932e4f892ab0e96e9e43fb0301616204859eea955c7700b7b804f87bd1cdb8ea490330b989c3e191d3d837a777830d02daacb4486cd38b565d4579282"; + sha512 = "68de26543d894104bf4349a6e7e13ae58cfafdb35bd14cb97604410b02196d0cdcc40750a04c64be301fbbcdd2c74e624c47cc2363d96d4e293edbfbe0a1f3e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/uz/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/uz/firefox-58.0b1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "2de4ced396b54c9a683dfac862eea893800980bc61d21dcc5a5aba727936f8d7c0c72941068a1e088061fc4a78b8437b10e97f4e41478048fbd702db64a1461a"; + sha512 = "37afeaeced1488f94212ae76b58465c3ecffc5550db240afc9dee2c5dd1277027402f7264d35707bb132f467305b367d982eaefd83cac72e51601c7d65bef0a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/vi/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/vi/firefox-58.0b1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "f3fb64b828d8319354630afb4e8239830d471edc4b76e074d8ad30d0802d0d0529abc265183c2b60223fadfedc8189715065d980d15489afa7c297c7ab5c7863"; + sha512 = "1d23a043e6f1ba27f13f89a88061b1f4f81c4ba70abcd6c15f563c76ff7b3bb95e66d968ead3df8bca51540b10042a8ed1f1792a42eb7f1e563eed0e92035f0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/xh/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/xh/firefox-58.0b1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "447b17edec8fb04b8460b9ce2b5a00aca48ef162288944746bb9a3fe52c1365a01ac51f13d853c27b5071c7d92db7beb6dc73a12dfcafbf9bd1f65a0d3b41214"; + sha512 = "247dc73aeb071d3f430e5f61447287d641d18951bb0c519a95146746906f4a25595f57a781c2f402ec7da2379d0b4fad657b5b097d00f774584f1d746fa783ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/zh-CN/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/zh-CN/firefox-58.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "918d2ce4543eefe6c304e51988b1af5e6de3fadbf04585ae45d5344555620619327b858755201f5b300e2e11b7696ccc6d2fff81f965b2f58615426585b128f0"; + sha512 = "10ad6c7fe8693d502b9d16630962f19f23b0457403430c8d24b34fe32de9b88513f82af3b09dc23bf252c2026efc6f45cad75e7244533aaebd824c7b0ab01926"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b11/linux-i686/zh-TW/firefox-57.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/zh-TW/firefox-58.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a2fff5569721bbe2455b320f057595c2c26986d26654be00a90f4ce269124a6c7328664287e73472df8fc13c44fd5e42614e992904dd86cb6caa3b0d05145ca0"; + sha512 = "d69059c966b06a9b2c7bc10ce83d0b927f29b85d6aa2a78e62163f8718bde6478f7ee5f8040a70816a29719ae7336cc6d483b4ceefbb2b8153acd5040e0bedcc"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 56641c7ad9a8..a1d5df5029c1 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -54,8 +54,7 @@ rec { unpackPhase = '' # fetchFromGitHub produces ro sources, root dir gets a name that # is too long for shebangs. fixing - cp -a $src . - mv *-src tor-browser + cp -a $src tor-browser chmod -R +w tor-browser cd tor-browser @@ -106,9 +105,10 @@ in rec { # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; - repo = "tor-browser"; - rev = "tor-browser-45.8.0esr-6.5-2"; - sha256 = "0vbcp1qlxjlph0dqibylsyvb8iah3lnzdxc56hllpvbn51vrp39j"; + repo = "tor-browser"; + # branch "tor-browser-45.8.0esr-6.5-2" + rev = "e4140ea01b9906934f0347e95f860cec207ea824"; + sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60"; }; } // commonAttrs) { stdenv = overrideCC stdenv gcc5; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index d5e6e47e9285..e24c21b535bf 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.5.0"; + version = "27.6.0"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = version + "_Release"; - sha256 = "0m4fgwxn6hs8r240i6acaajx76cvqy1b7cqmdsxd33qpjrrj1h9d"; + sha256 = "1v5rbam93fcc7c1l69clr9chi2l0zv0dhjq12v535n8vv9lhahhl"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index da3c826adcd7..4f0e891dc496 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -28,13 +28,14 @@ let }; in buildPythonApplication rec { - name = "qutebrowser-${version}"; - version = "1.0.2"; + name = "qutebrowser-${version}${fix_postfix}"; + fix_postfix = "-1"; + version = "1.0.3"; namePrefix = ""; src = fetchurl { - url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "093nmvl9x3ykrpmvnmx98g9npg4wmq0mmf7qzgbzmg93dnyq2cpk"; + url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; + sha256 = "04d6hg2yf2wjwn0sd05bpx3zngnb93g7rizbdq17bbpmnwxchzap"; }; # Needs tox diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 56cab9de5d07..4af725d3c958 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -98,7 +98,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.0.7"; + version = "7.0.9"; lang = "en-US"; @@ -108,7 +108,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1848j28majbb61r080g6dw0lmh7hbp515iidyjdrpgcwhazzg06j"; + sha256 = "0ykbpp0qr3glygmnnc6ac41kkvrxn52472z6kbpf7i6qzvk4ba0d"; }; "i686-linux" = fetchurl { @@ -116,7 +116,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "08wvpymmyg16ifz23awnjy0pbva8xh1fdx2i8c1n18x3k12d5r7h"; + sha256 = "02alpzmvm3ldlp51sqppz41d12lx93n5qj6i3gqz6din96swm7j8"; }; }; in diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index e036fb2f38bd..ff7cb245ae2a 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.6.2"; + version = "1.7.1"; goPackagePath = "k8s.io/kops"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "0bxknjhzj9xiws6sjw9knwqma3fjh496vnm90skl766bk4pafq9l"; + sha256 = "0wii6w6hs9hjz3vvgqwa5ilwdi8a3qknmqsg3izazmgmnhl712wd"; }; buildInputs = [go-bindata]; @@ -39,7 +39,7 @@ buildGoPackage rec { description = "Easiest way to get a production Kubernetes up and running"; homepage = https://github.com/kubernetes/kops; license = licenses.asl20; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [offline zimbatm]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 116e74326908..909242273930 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -60,6 +60,8 @@ in stdenv.mkDerivation rec { "CXXFLAGS=-O2 -Wno-error=strict-aliasing" ) + substituteInPlace 3rdparty/stout/include/stout/jsonify.hpp \ + --replace '' '' # Fix cases where makedev(),major(),minor() are referenced through # instead of sed 1i'#include ' -i src/linux/fs.cpp diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 32c697ea83ac..00ee3a3771eb 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -15,15 +15,15 @@ let # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is # currently https://storage.googleapis.com/minikube/k8s_releases.json - localkube-version = "1.7.5"; + localkube-version = "1.8.0"; localkube-binary = fetchurl { url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64"; - sha256 = "1kn4lwnn961r19hqnkgr13np80zqk2fhp8xkhrvxzq6v6shk7gfz"; + sha256 = "09mv1g9i0d14brvvp2wxgmfqvgp0na5dbm4z76a660q1fxszvgqc"; }; in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.22.3"; + version = "0.23.0"; goPackagePath = "k8s.io/minikube"; @@ -31,7 +31,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "0jcfw0yrd4vqyiyhg15cy2knn2fjw91das8id4famz5gl6dnlm28"; + sha256 = "1f7kjn26y7knmab5avj8spb40ny1y0jix5j5p0dqfjvg9climl0h"; }; # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index 412335094ff3..54fc72fbfae4 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -3,14 +3,14 @@ , glib_networking }: stdenv.mkDerivation rec { - version = "1.6"; + version = "1.7.1"; name = "corebird-${version}"; src = fetchFromGitHub { owner = "baedert"; repo = "corebird"; rev = version; - sha256 = "1bxjlamdy5d2j3xdahmxf6lwc7f6xdfxbzi712ppvh1dwggw654v"; + sha256 = "1g6wkzrl6j0mmgafpv0jpqa906s1x7p5hmiqdgs9qwm7q2wlwrqd"; }; preConfigure = '' diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 89a473f0cd0a..d15b1d545b44 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -1,52 +1,23 @@ -{ mkDerivation, stdenv, lib, fetchurl, makeDesktopItem -, makeWrapper, patchelf -, dbus_libs, fontconfig, freetype, gcc, glib -, libdrm, libffi, libICE, libSM -, libX11, libXcomposite, libXext, libXmu, libXrender, libxcb -, libxml2, libxslt, ncurses, zlib -, qtbase, qtdeclarative, qtwebkit, wmctrl -}: +{ stdenv, lib, buildFHSUserEnv, writeScript, makeDesktopItem }: -# this package contains the daemon version of dropbox -# it's unfortunately closed source -# -# note: the resulting program has to be invoced as -# 'dropbox' because the internal python engine takes -# uses the name of the program as starting point. +let platforms = [ "i686-linux" "x86_64-linux" ]; in -# Dropbox ships with its own copies of some libraries. -# Unfortunately, upstream makes changes to the source of -# some libraries, rendering them incompatible with the -# open-source versions. Wherever possible, we must try -# to make the bundled libraries work, rather than replacing -# them with our own. +assert lib.elem stdenv.system platforms; +# Dropbox client to bootstrap installation. +# The client is self-updating, so the actual version may be newer. let - # NOTE: When updating, please also update in current stable, - # as older versions stop working - version = "37.4.29"; - sha256 = { - "x86_64-linux" = "0ymy8gb57bjq2mq35n52q2viww6am7wy0vskyvypliicggga8iaj"; - "i686-linux" = "0a7zir6x7z3ad71fj1iljc2l6x09f4wi40jfaiinf8ykx85cldw6"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + version = "38.4.27"; arch = { "x86_64-linux" = "x86_64"; "i686-linux" = "x86"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + }.${stdenv.system}; - # relative location where the dropbox libraries are stored - appdir = "opt/dropbox"; - - libs = [ - dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM - libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt - ncurses zlib - - qtbase qtdeclarative qtwebkit - ]; - ldpath = stdenv.lib.makeLibraryPath libs; + installer = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz"; +in +let desktopItem = makeDesktopItem { name = "dropbox"; exec = "dropbox"; @@ -56,93 +27,37 @@ let categories = "Network;FileTransfer;"; startupNotify = "false"; }; +in -in mkDerivation { - name = "dropbox-${version}"; - src = fetchurl { - name = "dropbox-${version}.tar.gz"; - url = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz"; - inherit sha256; - }; +buildFHSUserEnv { + name = "dropbox"; - sourceRoot = ".dropbox-dist"; - - nativeBuildInputs = [ makeWrapper patchelf ]; - buildInputs = libs; - dontStrip = true; # already done - - installPhase = '' - runHook preInstall - - mkdir -p "$out/${appdir}" - cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/" - - # Vendored libraries interact poorly with our graphics drivers - rm "$out/${appdir}/libdrm.so.2" - rm "$out/${appdir}/libffi.so.6" - rm "$out/${appdir}/libGL.so.1" - rm "$out/${appdir}/libX11-xcb.so.1" - - # Cannot use vendored Qt libraries due to problem with xkbcommon - rm "$out/${appdir}/"libQt5*.so.5 - rm "$out/${appdir}/qt.conf" - rm -fr "$out/${appdir}/plugins" + targetPkgs = pkgs: with pkgs; with xlibs; [ + libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender + libXxf86vm libxcb + curl dbus fontconfig freetype gcc glib gnutar libxml2 libxslt zlib + ]; + extraInstallCommands = '' mkdir -p "$out/share/applications" cp "${desktopItem}/share/applications/"* $out/share/applications - - mkdir -p "$out/share/icons" - ln -s "$out/${appdir}/images/hicolor" "$out/share/icons/hicolor" - - mkdir -p "$out/bin" - RPATH="${ldpath}:$out/${appdir}" - chmod 755 $out/${appdir}/dropbox - makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ - --prefix LD_LIBRARY_PATH : "$RPATH" - - - rm $out/${appdir}/wmctrl - ln -s ${wmctrl}/bin/wmctrl $out/${appdir}/wmctrl - - runHook postInstall ''; - preFixup = '' - INTERP=$(cat $NIX_CC/nix-support/dynamic-linker) - RPATH="${ldpath}:$out/${appdir}" - getType='s/ *Type: *\([A-Z]*\) (.*/\1/' - find "$out/${appdir}" -type f -print | while read obj; do - dynamic=$(readelf -S "$obj" 2>/dev/null | grep "DYNAMIC" || true) - if [[ -n "$dynamic" ]]; then - - if readelf -l "$obj" 2>/dev/null | grep "INTERP" >/dev/null; then - echo "patching interpreter path in $type $obj" - patchelf --set-interpreter "$INTERP" "$obj" - fi - - type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType") - if [ "$type" == "EXEC" ] || [ "$type" == "DYN" ]; then - - echo "patching RPATH in $type $obj" - oldRPATH=$(patchelf --print-rpath "$obj") - patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj" - - else - - echo "unknown ELF type \"$type\"; not patching $obj" - - fi - fi - done - - paxmark m $out/${appdir}/dropbox + runScript = writeScript "install-and-start-dropbox" '' + if ! [ -d "$HOME/.dropbox-dist" ]; then + # Dropbox is not installed. + # Download and unpack the client. If a newer version is available, + # the client will update itself when run. + curl '${installer}' | tar -C "$HOME" -x -z + fi + exec "$HOME/.dropbox-dist/dropboxd" ''; meta = with lib; { description = "Online stored folders (daemon version)"; - homepage = http://www.dropbox.com; - maintainers = with maintainers; [ ttuegel ]; + homepage = http://www.dropbox.com/; license = licenses.unfree; + maintainers = with maintainers; [ ttuegel ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 9e5e90996bcb..105239aca024 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -24,9 +24,6 @@ buildPythonApplication rec { # unicode-capable filesystem (and setting LC_ALL doesn't work). # setlocale: LC_ALL: cannot change locale (en_US.UTF-8) postPatch = '' - sed -i '/def test_non_ascii/i\ import pytest\ - @pytest.mark.skip' flexget/tests/test_filesystem.py - substituteInPlace requirements.txt \ --replace "chardet==3.0.3" "chardet" \ --replace "rebulk==0.8.2" "rebulk" \ @@ -35,7 +32,13 @@ buildPythonApplication rec { --replace "sqlalchemy==1.1.10" "sqlalchemy" \ --replace "zxcvbn-python==4.4.15" "zxcvbn-python" \ --replace "flask-cors==3.0.2" "flask-cors" \ - --replace "certifi==2017.4.17" "certifi" + --replace "certifi==2017.4.17" "certifi" \ + --replace "apscheduler==3.3.1" "apscheduler" \ + --replace "path.py==10.3.1" "path.py" \ + --replace "tempora==1.8" "tempora" \ + --replace "cheroot==5.5.0" "cheroot" \ + --replace "six==1.10.0" "six" \ + --replace "aniso8601==1.2.1" "aniso8601" ''; checkPhase = '' @@ -47,7 +50,8 @@ buildPythonApplication rec { and not test_double_episodes \ and not test_inject_force \ and not test_double_prefered \ - and not test_double" + and not test_double \ + and not test_non_ascii" ''; buildInputs = [ pytest mock vcrpy pytest-catchlog boto3 ]; diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix new file mode 100644 index 000000000000..b3a9634c8a16 --- /dev/null +++ b/pkgs/applications/networking/gmailieer/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + name = "gmailieer"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "gauteh"; + repo = "gmailieer"; + rev = "v${version}"; + sha256 = "1app783gf0p9p196nqsgbyl6s1bp304dfav86fqiq86h1scld787"; + }; + + propagatedBuildInputs = with python3Packages; [ + notmuch + oauth2client + google_api_python_client + tqdm + ]; + + meta = with stdenv.lib; { + description = "Fast email-fetching and two-way tag synchronization between notmuch and GMail"; + longDescription = '' + This program can pull email and labels (and changes to labels) + from your GMail account and store them locally in a maildir with + the labels synchronized with a notmuch database. The changes to + tags in the notmuch database may be pushed back remotely to your + GMail account. + ''; + homepage = https://github.com/gauteh/gmailieer; + repositories.git = https://github.com/gauteh/gmailieer.git; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ kaiha ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index a238009cd11b..c2e6528e637e 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, makeDesktopItem +{ stdenv, fetchurl, makeDesktopItem, makeWrapper , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig -, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: +, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -39,6 +39,8 @@ in stdenv.mkDerivation rec { # don't remove runtime deps dontPatchELF = true; + buildInputs = [ makeWrapper ]; + unpackPhase = '' tar xzf $src ''; @@ -59,6 +61,7 @@ in stdenv.mkDerivation rec { postFixup = '' paxmark m $out/opt/franz/Franz + wrapProgram $out/opt/franz/Franz --prefix PATH : ${xdg_utils}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 326f95630707..4e116e685c60 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -4,7 +4,7 @@ let - version = "4.29.4.1662"; + version = "4.30.0.1663"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -44,7 +44,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "1cz9zv9aj8xdrjs6dgi7fpm4q9l9find4m8l0nmvac2s4r60vw6y"; + sha256 = "13mh49nx75pvaygzi70sg96iad3mn9ym0p4p3ja46amkxbdkq7h7"; } else throw "HipChat is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile index 66b17ff87607..0eed9808ab4f 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile +++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile @@ -11,13 +11,13 @@ group :default do gem 'oauth', '>= 0.5.1' gem 'json_pure', '~> 1.8' gem 'addressable', '~> 2.3' - gem 'memoist', '~> 0.14' + gem 'memoist', '>= 0.16', '< 0.17' gem 'ruby-hmac', '~> 0.4' gem 'typed-array', '~> 0.1' gem 'delayer', '~> 0.0' gem 'pluggaloid', '>= 1.1.1', '< 2.0' - gem 'delayer-deferred', '>= 1.0.4', '< 2.0' - gem 'twitter-text', '1.14.2' + gem 'delayer-deferred', '>= 1.0.4', '< 1.1' + gem 'twitter-text', '>= 1.14.6' end group :test do @@ -31,7 +31,10 @@ end group :plugin do - Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), "core/plugin/*/Gemfile"))){ |path| + Dir.glob(File.expand_path(File.join(__dir__, 'core/plugin/*/Gemfile'))){ |path| + eval File.open(path).read + } + Dir.glob(File.join(File.expand_path(ENV['MIKUTTER_CONFROOT'] || '~/.mikutter'), 'plugin/*/Gemfile')){ |path| eval File.open(path).read } end diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock index 58f41087919e..69530be4a446 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock +++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock @@ -1,67 +1,72 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) - atk (3.1.1) - glib2 (= 3.1.1) - cairo (1.15.7) - native-package-installer - pkg-config (>= 1.1.5) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + atk (3.1.9) + glib2 (= 3.1.9) + cairo (1.15.10) + native-package-installer (>= 1.0.3) + pkg-config (>= 1.2.2) + cairo-gobject (3.1.9) + cairo + glib2 (= 3.1.9) crack (0.4.3) safe_yaml (~> 1.0.0) delayer (0.0.2) - delayer-deferred (1.1.1) + delayer-deferred (1.0.4) delayer (>= 0.0.2, < 0.1) - gdk_pixbuf2 (3.1.1) - gio2 (= 3.1.1) + gdk_pixbuf2 (3.1.9) + gio2 (= 3.1.9) gettext (3.0.9) locale (>= 2.0.5) text - gio2 (3.1.1) - glib2 (= 3.1.1) - gobject-introspection (= 3.1.1) - glib2 (3.1.1) - pkg-config - gobject-introspection (3.1.1) - glib2 (= 3.1.1) - gtk2 (3.1.1) - atk (= 3.1.1) - gdk_pixbuf2 (= 3.1.1) - pango (= 3.1.1) - hashdiff (0.3.4) + gio2 (3.1.9) + glib2 (= 3.1.9) + gobject-introspection (= 3.1.9) + glib2 (3.1.9) + native-package-installer (>= 1.0.3) + pkg-config (>= 1.2.2) + gobject-introspection (3.1.9) + glib2 (= 3.1.9) + gtk2 (3.1.9) + atk (= 3.1.9) + gdk_pixbuf2 (= 3.1.9) + pango (= 3.1.9) + hashdiff (0.3.7) httpclient (2.8.3) instance_storage (1.0.0) json_pure (1.8.6) locale (2.1.2) - memoist (0.15.0) + memoist (0.16.0) metaclass (0.0.4) - mini_portile2 (2.1.0) + mini_portile2 (2.3.0) mocha (0.14.0) metaclass (~> 0.0.1) moneta (1.0.0) - native-package-installer (1.0.1) - nokogiri (1.7.2) - mini_portile2 (~> 2.1.0) - oauth (0.5.1) - pango (3.1.1) + native-package-installer (1.0.4) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) + oauth (0.5.3) + pango (3.1.9) cairo (>= 1.14.0) - glib2 (= 3.1.1) - pkg-config (1.2.0) + cairo-gobject (= 3.1.9) + gobject-introspection (= 3.1.9) + pkg-config (1.2.8) pluggaloid (1.1.1) delayer instance_storage (>= 1.0.0, < 2.0.0) - power_assert (1.0.2) - public_suffix (2.0.5) + power_assert (1.1.1) + public_suffix (3.0.0) rake (10.5.0) ruby-hmac (0.4.0) ruby-prof (0.16.2) safe_yaml (1.0.4) - test-unit (3.2.3) + test-unit (3.2.6) power_assert text (1.3.1) totoridipjp (0.1.0) - twitter-text (1.14.2) + twitter-text (1.14.7) unf (~> 0.1.0) typed-array (0.1.2) unf (0.1.4) @@ -79,12 +84,12 @@ PLATFORMS DEPENDENCIES addressable (~> 2.3) delayer (~> 0.0) - delayer-deferred (>= 1.0.4, < 2.0) + delayer-deferred (>= 1.0.4, < 1.1) gettext (~> 3.0.1) - gtk2 (= 3.1.1) + gtk2 (= 3.1.9) httpclient json_pure (~> 1.8) - memoist (~> 0.14) + memoist (>= 0.16, < 0.17) mocha (~> 0.14) moneta nokogiri @@ -95,10 +100,10 @@ DEPENDENCIES ruby-prof test-unit (~> 3.0) totoridipjp - twitter-text (= 1.14.2) + twitter-text (>= 1.14.6) typed-array (~> 0.1) watch (~> 0.1) webmock (~> 1.17) BUNDLED WITH - 1.14.4 + 1.14.6 diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile index 4015fbec1bc9..b7d19db37630 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile +++ b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem 'gtk2', '3.1.1' +gem 'gtk2', '3.1.9' diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 1fa7a2fe7e95..6b17eb0a8975 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mikutter-${version}"; - version = "3.5.7"; + version = "3.5.13"; src = fetchurl { url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz"; - sha256 = "1vh5ap92q869j69hmmbznailaflmdp0km4sqdv06cpq7v8pwm28w"; + sha256 = "2e01cd6cfe0caad663a381e5263f6d8030f0fb7cd8d4f858d320166516c7c320"; }; env = bundlerEnv { diff --git a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix index d6d99f3d55b7..ef7091689b37 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix @@ -3,28 +3,37 @@ dependencies = ["public_suffix"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh"; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.2"; }; atk = { dependencies = ["glib2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "17x88g596s3pqfxplm5ia7anpcmd9kxs4nzmpf2h74bqwkbq2jrz"; + sha256 = "18l99gv6828rn59q8k6blxg146b025fj44klrcisffw6h9s9qqxm"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.9"; }; cairo = { dependencies = ["native-package-installer" "pkg-config"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "115ksrswbs7pg7kdfi2w8bi9xxv9gzmfvcjj8qj4dxy8dkvp3k4d"; + sha256 = "1f0n057cj6cjz7f38pwnflrkbwkl8pm3g9ssa51flyxr7lcpcw7c"; type = "gem"; }; - version = "1.15.7"; + version = "1.15.10"; + }; + cairo-gobject = { + dependencies = ["cairo" "glib2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qnsd9203qc6hl2i4hfzngr8v06rfk4vxfn6sbr8b4c1q4n0lq26"; + type = "gem"; + }; + version = "3.1.9"; }; crack = { dependencies = ["safe_yaml"]; @@ -47,19 +56,19 @@ dependencies = ["delayer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bw48i6qbxmjf2al4a0mw23nlkcrjrwsrdrabbwz62v8sdmdynpc"; + sha256 = "1rp2hpik8gs1kzwwq831jwj1iv5bhfwd3dmm9nvizy3nqpz1gvvb"; type = "gem"; }; - version = "1.1.1"; + version = "1.0.4"; }; gdk_pixbuf2 = { dependencies = ["gio2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x9fzsazfi6f3iq7zkqc0vjl6311876dvff0000vg41rajv3rhh1"; + sha256 = "0x7vna77qw26479dydzfs1sq7xmq31xfly2pn5fvh35wg0q4y07d"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.9"; }; gettext = { dependencies = ["locale" "text"]; @@ -74,45 +83,45 @@ dependencies = ["glib2" "gobject-introspection"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ki9yxp860xk5cf04hrgvh386n93bkr0pf4c0kl3fx6pnwr4w3v0"; + sha256 = "1dxyaxp32m19mynw20x39vkb50wa4jcxczwmbkq7pcg55j76wwhm"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.9"; }; glib2 = { - dependencies = ["pkg-config"]; + dependencies = ["native-package-installer" "pkg-config"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "131jd26n2wwp2lrkyyfq5nb3qriasaym1zpygm991qzcaq79i444"; + sha256 = "1y1ws895345a88wikqil1x87cpd7plmwfi635piam7il6vsb4h73"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.9"; }; gobject-introspection = { dependencies = ["glib2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fbi1pxyq73d674cwznya6kda38yjp4ahc2xgxi9shsdqmqcx3vs"; + sha256 = "04gla6z9y8g0d69wlwl0wr7pwyzqg132pfs1n9fq6fgkjb6l7sm3"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.9"; }; gtk2 = { dependencies = ["atk" "gdk_pixbuf2" "pango"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00cbfl306xkglk0cc758vsvv1saaa24gvwh0m2jnzwgfwxk7mc5w"; + sha256 = "1mshgsw2x0w5wfcp17qnsja50aafbjxy2g42kvk5sr19l0chkkkq"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.9"; }; hashdiff = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a"; + sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.7"; }; httpclient = { source = { @@ -149,10 +158,10 @@ memoist = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0yd3rd7bnbhn9n47qlhcii5z89liabdjhy3is3h6gq77gyfk4f5q"; + sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh"; type = "gem"; }; - version = "0.15.0"; + version = "0.16.0"; }; metaclass = { source = { @@ -165,10 +174,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb"; + sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; type = "gem"; }; - version = "2.1.0"; + version = "2.3.0"; }; mocha = { dependencies = ["metaclass"]; @@ -190,44 +199,44 @@ native-package-installer = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1zh5x87y9dr16ic7vif2c3rnpr5k5wfs6kihpy4dnb9s0mqyqhsj"; + sha256 = "0svj2sg7y7izl90qrvzd2fcb1rkq8bv3bd6lr9sh1ml18v3w882a"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.4"; }; nokogiri = { dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jd8q3pr5rkrxx1vklvhcqcgl8kmfv5c8ny36ni3z5mirw6cm70c"; + sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021"; type = "gem"; }; - version = "1.7.2"; + version = "1.8.1"; }; oauth = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1awhy8ddhixch44y68lail3h1d214rnl3y1yzk0msq5g4z2l62ky"; + sha256 = "1a5cfg9pm3mxsmlk1slj652vza8nha2lpbpbmf3rrk0lh6zi4d0b"; type = "gem"; }; - version = "0.5.1"; + version = "0.5.3"; }; pango = { - dependencies = ["cairo" "glib2"]; + dependencies = ["cairo" "cairo-gobject" "gobject-introspection"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "18cc24lz4dmb7pavfspivbhbsypf40fhcbdzj8885zs0zr0dknby"; + sha256 = "0swld0s01djjlqrari0ib75703mb7qr4ydn00cqfhdr7xim66hjk"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.9"; }; pkg-config = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0fklf2dnk354ahxma3iki5cx7b8yn9khby162pz17z6f1f3xk84g"; + sha256 = "056qb6cwbw2l9riq376wazx4kwd67cdilyclpa6j38mfsswpmzws"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.8"; }; pluggaloid = { dependencies = ["delayer" "instance_storage"]; @@ -241,18 +250,18 @@ power_assert = { source = { remotes = ["https://rubygems.org"]; - sha256 = "168ac459nv45a2lhdf86zv35lv9nr569ny5nh3kfnglnxyzyx0kr"; + sha256 = "0h0s1clasynlbk3782801c61yx24pdv959fpw53g5yl8gxqj34iz"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.1"; }; public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f"; type = "gem"; }; - version = "2.0.5"; + version = "3.0.0"; }; rake = { source = { @@ -290,10 +299,10 @@ dependencies = ["power_assert"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kngxp21sqbm7kv7wnxfqk99ik3wv1bjab519vcbj8xj30a5y4py"; + sha256 = "1gl5b2d6bysnm0a1zx54qn6iwd67f6gsjy0c7zb68ag0453rqcnv"; type = "gem"; }; - version = "3.2.3"; + version = "3.2.6"; }; text = { source = { @@ -315,10 +324,10 @@ dependencies = ["unf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lld6d8rzj1zrgs6b227mp675bn8ds56f1c9w9wvx321f6ibn6np"; + sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg"; type = "gem"; }; - version = "1.14.2"; + version = "1.14.7"; }; typed-array = { source = { diff --git a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix b/pkgs/applications/networking/instant-messengers/mikutter/shell.nix index efa57175b237..bc83767af32a 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/shell.nix @@ -8,6 +8,7 @@ pkgs.stdenv.mkDerivation { ]; shellHook = '' + export MIKUTTER_CONFROOT="/homeless-shelter" truncate --size 0 Gemfile.lock bundle lock bundle package --path=vendor/bundle --no-install diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index 53d1f30bee6a..7ab9b1947915 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2"; }; - sourceRoot = "skype4pidgin-${version}-src/skypeweb"; + setSourceRoot = '' + sourceRoot=$(echo */skypeweb) + ''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pidgin json_glib ]; diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix new file mode 100644 index 000000000000..ceb922624a12 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha }: + +stdenv.mkDerivation rec { + name = "rambox-bare-${version}"; + version = "0.5.13"; + + src = fetchFromGitHub { + owner = "saenzramiro"; + repo = "rambox"; + rev = version; + sha256 = "0c770a9z017y6gcrpyri7s1gifm8zi5f29bq5nvh3zzg4wgqh326"; + }; + + nativeBuildInputs = [ nodejs-8_x ruby sencha ]; + + node_modules = fetchNodeModules { + inherit src; + + nodejs = nodejs-8_x; + sha256 = "1y3q8ggyvfywxqi5hn9mvr1sjfylspis43iyf4b7snyr1a1br3r4"; + }; + + patches = [ ./hide-check-for-updates.patch ./isDev.patch ]; + + # These credentials are only for this derivation. If you want to get credentials + # for another distribution, go to https://auth0.com. If you want to reuse the same + # domain, drop a line at yegortimoshenko@gmail.com! + auth0ClientID = "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"; + auth0Domain = "nixpkgs.auth0.com"; + + configurePhase = '' + echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js + ln -s ${node_modules} node_modules + ''; + + buildPhase = '' + mkdir ../rambox-build + npm run sencha:compile:build + ''; + + installPhase = '' + mv ../rambox-build/ $out + + # https://github.com/saenzramiro/rambox/issues/1281 + echo '{"name": "rambox", "version": "${version}", "main": "electron/main.js"}' > $out/package.json + + # https://github.com/saenzramiro/rambox/issues/1282 + cp --parents ext/packages/ext-locale/build/ext-locale-*.js $out + + # Symbolic link causes `Uncaught Error: Cannot find module 'immutable'` + cp -r ${node_modules} $out/node_modules + ''; + + meta = with stdenv.lib; { + description = "Messaging and emailing app that combines common web applications into one"; + homepage = http://rambox.pro; + license = licenses.gpl3; + maintainers = with maintainers; [ gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 38d489de02af..2e574fae8fa5 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,63 +1,26 @@ -{ stdenv, fetchurl, dpkg -, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig -, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: +{ stdenv, newScope, makeWrapper, electron, xdg_utils }: let - bits = if stdenv.system == "x86_64-linux" then "x64" - else "ia32"; - - version = "0.5.12"; - - runtimeDeps = [ - udev libnotify - ]; - deps = (with xorg; [ - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes - libXrender libX11 libXtst libXScrnSaver libxcb - ]) ++ [ - gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus - gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc - ] ++ runtimeDeps; -in stdenv.mkDerivation rec { - name = "rambox-${version}"; - src = fetchurl { - url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb"; - sha256 = if bits == "x64" then - "1jlvpq7wryz4vf6xlsb9c38jrhjiv18rdf2ndlv76png60wl8418" else - "063j3gcpp18wdvspy7d43cgv7i5v8c42hn2zpp083jixw9ddsqwa"; + callPackage = newScope self; + self = { + fetchNodeModules = callPackage ./fetchNodeModules.nix {}; + rambox-bare = callPackage ./bare.nix {}; + sencha = callPackage ./sencha {}; }; +in - # don't remove runtime deps - dontPatchELF = true; +with self; - buildInputs = [ dpkg ]; +stdenv.mkDerivation { + name = "rambox-${rambox-bare.version}"; - unpackPhase = "dpkg-deb -x $src ."; + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = ":"; installPhase = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" opt/Rambox/rambox - patchelf --set-rpath "$out/opt/Rambox:${stdenv.lib.makeLibraryPath deps}" opt/Rambox/rambox - - mkdir -p $out/bin - cp -r opt $out - ln -s $out/opt/Rambox/rambox $out/bin - - # provide resources - cp -r usr/share $out - substituteInPlace $out/share/applications/rambox.desktop \ - --replace Exec=\"/opt/Rambox/rambox\" Exec=rambox + makeWrapper ${electron}/bin/electron $out/bin/rambox \ + --add-flags "${rambox-bare} --without-update" \ + --prefix PATH : ${xdg_utils}/bin ''; - - postFixup = '' - paxmark m $out/opt/Rambox/rambox - ''; - - meta = with stdenv.lib; { - description = "Free and Open Source messaging and emailing app that combines common web applications into one"; - homepage = http://rambox.pro; - license = licenses.mit; - maintainers = [ maintainers.gnidorah ]; - platforms = ["i686-linux" "x86_64-linux"]; - hydraPlatforms = []; - }; } diff --git a/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix b/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix new file mode 100644 index 000000000000..047890a932ca --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix @@ -0,0 +1,26 @@ +{ stdenv, jq }: { src, nodejs, sha256 }: + +# Only npm >= 5.4.2 is deterministic, see: +# https://github.com/npm/npm/issues/17979#issuecomment-332701215 +assert stdenv.lib.versionAtLeast nodejs.version "8.9.0"; + +stdenv.mkDerivation { + name = "node_modules"; + + outputHashAlgo = "sha256"; + outputHash = sha256; + outputHashMode = "recursive"; + + nativeBuildInputs = [ jq nodejs ]; + + buildCommand = '' + cp -r ${src}/* . + HOME=. npm install --force --ignore-scripts --only=production + for f in $(find node_modules -name package.json); do + # https://github.com/npm/npm/issues/10393 + jq -S 'delpaths(keys | map(select(startswith("_")) | [.]))' $f > $f.tmp + mv $f.tmp $f + done + mv node_modules $out + ''; +} diff --git a/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch b/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch new file mode 100644 index 000000000000..8363baef2dfc --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch @@ -0,0 +1,35 @@ +https://github.com/saenzramiro/rambox/issues/1283 + +diff -urNZ a/electron/menu.js b/electron/menu.js +--- a/electron/menu.js 2017-11-02 22:02:59.753119865 +0000 ++++ b/electron/menu.js 2017-11-02 22:08:34.419698562 +0000 +@@ -220,14 +220,6 @@ + } + }, + { +- label: locale['menu.help[5]'], +- click(item, win) { +- const webContents = win.webContents; +- const send = webContents.send.bind(win.webContents); +- send('autoUpdater:check-update'); +- } +- }, +- { + label: locale['menu.help[6]'], + click() { + sendAction('showAbout') +@@ -290,14 +282,6 @@ + type: 'separator' + }); + helpSubmenu.push({ +- label: `&`+locale['menu.help[5]'], +- click(item, win) { +- const webContents = win.webContents; +- const send = webContents.send.bind(win.webContents); +- send('autoUpdater:check-update'); +- } +- }); +- helpSubmenu.push({ + label: `&`+locale['menu.help[6]'], + click() { + sendAction('showAbout') diff --git a/pkgs/applications/networking/instant-messengers/rambox/isDev.patch b/pkgs/applications/networking/instant-messengers/rambox/isDev.patch new file mode 100644 index 000000000000..b918144c7662 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/isDev.patch @@ -0,0 +1,14 @@ +https://github.com/saenzramiro/rambox/issues/1280 + +diff -urNZ a/electron/main.js b/electron/main.js +--- a/electron/main.js 2017-11-02 14:58:06.085127616 +0000 ++++ b/electron/main.js 2017-11-02 14:58:18.316887679 +0000 +@@ -8,7 +8,7 @@ + // Configuration + const Config = require('electron-config'); + // Development +-const isDev = require('electron-is-dev'); ++const isDev = false; + // Updater + const updater = require('./updater'); + // File System diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix new file mode 100644 index 000000000000..9b4a718ed23d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, gzip, which, unzip, jdk }: + +let + version = "6.5.2"; + srcs = { + i686-linux = fetchurl { + url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip"; + sha256 = "18gcqw9434xab97skcb97iw4p4s2pgggvq7jaisblap0ja00kqjr"; + }; + x86_64-linux = fetchurl { + url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip"; + sha256 = "1b8jv99k37q1bi7b29f23lfzxc66v5fqdmr1rxsrqchwcrllc0z7"; + }; + }; +in + +stdenv.mkDerivation rec { + inherit version; + + name = "sencha-bare-${version}"; + src = srcs.${stdenv.system}; + + nativeBuildInputs = [ gzip which unzip ]; + buildInputs = [ jdk ]; + + sourceRoot = "."; + + configurePhase = '' + substituteAll ${./response.varfile} response.varfile + ''; + + installPhase = '' + ./SenchaCmd*.sh -q -dir $out -varfile response.varfile + rm $out/shell-wrapper.sh $out/Uninstaller + ''; + + meta = with stdenv.lib; { + license = licenses.unfree; + platforms = attrNames srcs; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix new file mode 100644 index 000000000000..1ca04a9e1686 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix @@ -0,0 +1,17 @@ +{ stdenv, callPackage, makeWrapper }: + +let + sencha-bare = callPackage ./bare.nix {}; +in + +stdenv.mkDerivation { + name = "sencha-${sencha-bare.version}"; + + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = ":"; + + installPhase = '' + makeWrapper ${sencha-bare}/sencha $out/bin/sencha + ''; +} diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile b/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile new file mode 100644 index 000000000000..0ff6f0a30d50 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile @@ -0,0 +1,13 @@ +addToPath$Integer=1 +parentDir=. +sys.adminRights$Boolean=false +sys.component.148$Boolean=true +sys.component.157$Boolean=true +sys.component.26$Boolean=true +sys.component.30$Boolean=true +sys.component.90$Boolean=true +sys.component.91$Boolean=true +sys.component.92$Boolean=true +sys.component.94$Boolean=true +sys.installationDir=@out@ +sys.languageId=en \ No newline at end of file diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 4f360c831a25..9ff1799ddd2d 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -1,7 +1,12 @@ -{stdenv, fetchurl, python27Packages, file }: +{ stdenv, fetchurl, python27Packages, file }: let inherit (python27Packages) python; + requirements = (import ./requirements.nix { + inherit stdenv fetchurl; + pythonPackages = python27Packages; + }); + in stdenv.mkDerivation rec { name = "salut-a-toi"; @@ -13,12 +18,15 @@ in sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d"; }; - buildInputs = with python27Packages; + buildInputs = with python27Packages; [ python twisted urwid wxPython pygobject2 - wokkel dbus-python pyfeed wrapPython setuptools file + dbus-python wrapPython setuptools file pycrypto pyxdg - ]; + ] ++ (with requirements; [ + pyfeed + wokkel + ]); configurePhase = '' sed -i "/use_setuptools/d" setup.py @@ -26,7 +34,7 @@ in sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${python27Packages.twisted}/bin\"" -i src/sat.sh sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh - echo 'import wokkel.muc' | python + echo 'import wokkel.muc' | python ''; buildPhase = '' @@ -39,7 +47,7 @@ in for i in "$out/bin"/*; do head -n 1 "$i" | grep -E '[/ ]python( |$)' && { wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/${python.sitePackages}" - } || true + } || true done ''; diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix new file mode 100644 index 000000000000..1a6811182453 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix @@ -0,0 +1,67 @@ +{ fetchurl +, stdenv +, pythonPackages +}: + +let + buildPythonPackage = pythonPackages.buildPythonPackage; + + xe = buildPythonPackage rec { + url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz"; + name = stdenv.lib.nameFromURL url ".tar"; + src = fetchurl { + inherit url; + sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + homepage = "http://home.blarg.net/~steveha/xe.html"; + description = "XML elements"; + }; + }; + +in { + + pyfeed = (buildPythonPackage rec { + url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; + + name = stdenv.lib.nameFromURL url ".tar"; + + src = fetchurl { + inherit url; + sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1"; + }; + + propagatedBuildInputs = [ xe ]; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + homepage = "http://home.blarg.net/~steveha/pyfeed.html"; + description = "Tools for syndication feeds"; + }; + + }); + + wokkel = buildPythonPackage (rec { + url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; + name = stdenv.lib.nameFromURL url ".tar"; + src = fetchurl { + inherit url; + sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; + }; + + propagatedBuildInputs = with pythonPackages; [twisted dateutil]; + + meta = with stdenv.lib; { + description = "Some (mainly XMPP-related) additions to twisted"; + homepage = "http://wokkel.ik.nu/"; + license = licenses.mit; + }; + }); + +} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix new file mode 100644 index 000000000000..0376fb79c9be --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -0,0 +1,88 @@ +{ stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype, +fontconfig, dbus, libX11, xlibs, libXi, libXcursor, libXdamage, libXrandr, +libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, +nspr, alsaLib, cups, expat, udev +}: +let + rpath = lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gnome2.gtk + gnome2.pango + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + nspr + nss + stdenv.cc.cc + udev + xlibs.libxcb + ]; + +in + stdenv.mkDerivation rec { + name = "signal-desktop-${version}"; + + version = "1.0.35"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; + sha256 = "d9f9d4d54f4121efc8eadf1cf0ff957828088b313e53b66dc540b851c44c1860"; + } + else + throw "Signal for Desktop is not currently supported on ${stdenv.system}"; + + phases = [ "unpackPhase" "installPhase" ]; + nativeBuildInputs = [ dpkg ]; + unpackPhase = "dpkg-deb -x $src ."; + installPhase = '' + mkdir -p $out + cp -R opt $out + + mv ./usr/share $out/share + mv $out/opt/Signal $out/libexec + rmdir $out/opt + + chmod -R g-w $out + + # Patch signal + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop + + # Symlink to bin + mkdir -p $out/bin + ln -s $out/libexec/signal-desktop $out/bin/signal-desktop + + # Fix the desktop link + substituteInPlace $out/share/applications/signal-desktop.desktop \ + --replace /opt/Signal/signal-desktop $out/bin/signal-desktop + ''; + + meta = { + description = "Signal Private Messenger for the Desktop."; + homepage = https://signal.org/; + license = lib.licenses.gpl3; + platforms = [ + "x86_64-linux" + ]; + }; + } diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 37bbfef65bba..bfccc4bfcb6c 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -4,7 +4,7 @@ let - version = "5.4.0.1"; + version = "5.5.0.1"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -54,7 +54,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "1idjgmn0kym7jml30xq6zrcp8qinx64kgnxlw8m0ys4z6zlw0c8z"; + sha256 = "1r65qlsjwp0n0fmlhvbp71h03b3x73r26jk9f4q687sjqnzmkvcr"; } else throw "Skype for linux is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 93bc6feff3c2..8f107c4f3c37 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -4,7 +4,7 @@ let - version = "2.8.0"; + version = "2.8.2"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -46,7 +46,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "02khqi0qf8ryj6bkfla95mr3scvb99zrhihwdprdjqpgvy06wqhm"; + sha256 = "019gzij6m1y9bv561nhbhgf2njp2svjqi5hs907pdjf7xwciwrkm"; } else throw "Slack is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index d74d3fe38657..9c4d88761b87 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l -, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }: +, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium, libopus, check }: stdenv.mkDerivation rec { name = "utox-${version}"; - # >= 0.14 should have unit tests and dbus support - version = "0.13.1"; + + version = "0.16.1"; src = fetchFromGitHub { owner = "uTox"; repo = "uTox"; rev = "v${version}"; - sha256 = "07aa92isknxf7531jr9kgk89wl5rvv34jrvir043fs9xvim5zq99"; + sha256 = "0ak10925v67yaga2pw9yzp0xkb5j1181srfjdyqpd29v8mi9j828"; }; buildInputs = [ libtoxcore dbus libvpx libX11 openal freetype libv4l libXrender fontconfig libXext libXft filter-audio - libsodium + libsodium libopus ]; nativeBuildInputs = [ - cmake git pkgconfig + cmake git pkgconfig check ]; cmakeFlags = [ @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { doCheck = false; + checkTarget = "test"; + meta = with stdenv.lib; { description = "Lightweight Tox client"; homepage = https://github.com/uTox/uTox; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 49cbe29eaf22..1b730af54fea 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,81 +1,129 @@ -{ stdenv, fetchurl, ncurses, openssl, aspell, gnutls -, zlib, curl , pkgconfig, libgcrypt +{ stdenv, fetchurl, fetchpatch, lib +, ncurses, openssl, aspell, gnutls +, zlib, curl, pkgconfig, libgcrypt , cmake, makeWrapper, libobjc, libresolv, libiconv +, writeScriptBin, symlinkJoin # for withPlugins , asciidoctor # manpages , guileSupport ? true, guile , luaSupport ? true, lua5 , perlSupport ? true, perl -, pythonPackages +, pythonSupport ? true, pythonPackages , rubySupport ? true, ruby , tclSupport ? true, tcl -, extraBuildInputs ? [] }: - -assert guileSupport -> guile != null; -assert luaSupport -> lua5 != null; -assert perlSupport -> perl != null; -assert rubySupport -> ruby != null; -assert tclSupport -> tcl != null; +, extraBuildInputs ? [] +, configure ? null +, runCommand }: let inherit (pythonPackages) python pycrypto pync; -in + plugins = [ + { name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; } + { name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; } + { name = "ruby"; enabled = rubySupport; cmakeFlag = "ENABLE_RUBY"; buildInputs = [ ruby ]; } + { name = "guile"; enabled = guileSupport; cmakeFlag = "ENABLE_GUILE"; buildInputs = [ guile ]; } + { name = "lua"; enabled = luaSupport; cmakeFlag = "ENABLE_LUA"; buildInputs = [ lua5 ]; } + { name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON"; buildInputs = [ python ]; } + ]; + enabledPlugins = builtins.filter (p: p.enabled) plugins; -stdenv.mkDerivation rec { - version = "1.9.1"; - name = "weechat-${version}"; + weechat = + assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; + stdenv.mkDerivation rec { + version = "1.9.1"; + name = "weechat-${version}"; - src = fetchurl { - url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "1kgi079bq4n0wb7hc7mz8p7ay1b2m0a4wpvb92sfsxrnh10qr5m1"; - }; + src = fetchurl { + url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; + sha256 = "1kgi079bq4n0wb7hc7mz8p7ay1b2m0a4wpvb92sfsxrnh10qr5m1"; + }; - outputs = [ "out" "man" ]; + patches = [ + # TODO: Remove this patch when weechat is updated to a release that + # incorporates weechat/weechat#971 + (fetchpatch { + url = https://github.com/lheckemann/weechat/commit/45a4f0565cc745b9c6e943f20199015185696df0.patch; + sha256 = "0x7vv7g0k3b2hj444x2cinyv1mq5bkr6m18grfnyy6swbymzc9bj"; + }) + ]; - enableParallelBuilding = true; - cmakeFlags = with stdenv.lib; [ - "-DENABLE_MAN=ON" - "-DENABLE_DOC=ON" - ] - ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"] - ++ optional (!guileSupport) "-DENABLE_GUILE=OFF" - ++ optional (!luaSupport) "-DENABLE_LUA=OFF" - ++ optional (!perlSupport) "-DENABLE_PERL=OFF" - ++ optional (!rubySupport) "-DENABLE_RUBY=OFF" - ++ optional (!tclSupport) "-DENABLE_TCL=OFF" - ; + outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; - buildInputs = with stdenv.lib; [ - ncurses python openssl aspell gnutls zlib curl pkgconfig - libgcrypt pycrypto makeWrapper - cmake - asciidoctor + enableParallelBuilding = true; + cmakeFlags = with stdenv.lib; [ + "-DENABLE_MAN=ON" + "-DENABLE_DOC=ON" ] - ++ optionals stdenv.isDarwin [ pync libobjc libresolv ] - ++ optional guileSupport guile - ++ optional luaSupport lua5 - ++ optional perlSupport perl - ++ optional rubySupport ruby - ++ optional tclSupport tcl - ++ extraBuildInputs; + ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"] + ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins + ; - NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" - # Fix '_res_9_init: undefined symbol' error - + (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); + buildInputs = with stdenv.lib; [ + ncurses openssl aspell gnutls zlib curl pkgconfig + libgcrypt makeWrapper cmake asciidoctor + ] + ++ optionals stdenv.isDarwin [ libobjc libresolv ] + ++ concatMap (p: p.buildInputs) enabledPlugins + ++ extraBuildInputs; - postInstall = with stdenv.lib; '' - NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" - wrapProgram "$out/bin/weechat" \ - ${optionalString perlSupport "--prefix PATH : ${perl}/bin"} \ - --prefix PATH : ${pythonPackages.python}/bin \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PYTHONPATH : "$NIX_PYTHONPATH" - ''; + NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" + # Fix '_res_9_init: undefined symbol' error + + (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); - meta = { - homepage = http://www.weechat.org/; - description = "A fast, light and extensible chat client"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny ]; - platforms = stdenv.lib.platforms.unix; - }; -} + postInstall = with stdenv.lib; '' + for p in ${concatMapStringsSep " " (p: p.name) enabledPlugins}; do + from=$out/lib/weechat/plugins/$p.so + to=''${!p}/lib/weechat/plugins/$p.so + mkdir -p $(dirname $to) + mv $from $to + done + ''; + + meta = { + homepage = http://www.weechat.org/; + description = "A fast, light and extensible chat client"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ]; + platforms = stdenv.lib.platforms.unix; + }; + }; +in if configure == null then weechat else + let + perlInterpreter = perl; + config = configure { + availablePlugins = let + simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";}; + in rec { + python = { + pluginFile = "${weechat.python}/lib/weechat/plugins/python.so"; + withPackages = pkgsFun: (python // { + extraEnv = '' + export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}" + ''; + }); + }; + perl = (simplePlugin "perl") // { + extraEnv = '' + export PATH="${perlInterpreter}/bin:$PATH" + ''; + }; + tcl = simplePlugin "tcl"; + ruby = simplePlugin "ruby"; + guile = simplePlugin "guile"; + lua = simplePlugin "lua"; + }; + }; + + inherit (config) plugins; + + pluginsDir = runCommand "weechat-plugins" {} '' + mkdir -p $out/plugins + for plugin in ${lib.concatMapStringsSep " " (p: p.pluginFile) plugins} ; do + ln -s $plugin $out/plugins + done + ''; + in writeScriptBin "weechat" '' + #!${stdenv.shell} + export WEECHAT_EXTRA_LIBDIR=${pluginsDir} + ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} + exec ${weechat}/bin/weechat "$@" + '' diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 01978a4da7e1..cccfdbc75608 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { sha256 = "0hlm2jipyr4z6izlrpvabpz4ivh49i13avnm848kr1nv68pkq2cd"; }; + outputs = [ "out" "dev" ]; + patches = [ ./mime.patch ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 281bc690bad5..b1ca80fc7e47 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -2,11 +2,13 @@ , gdk_pixbuf, libnotify, gst_all_1 , libgnome_keyring3, networkmanager , wrapGAppsHook, gnome3 -, withGnomeKeyring ? false -, withNetworkManager ? true +# otherwise passwords are stored unencrypted +, withGnomeKeyring ? true }: -pythonPackages.buildPythonApplication rec { +let + inherit (pythonPackages) python; +in pythonPackages.buildPythonApplication rec { name = "mailnag-${version}"; version = "1.2.1"; @@ -20,8 +22,7 @@ pythonPackages.buildPythonApplication rec { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gnome3.defaultIconTheme - ] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3 - ++ stdenv.lib.optional withNetworkManager networkmanager; + ] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3; nativeBuildInputs = [ wrapGAppsHook @@ -31,6 +32,10 @@ pythonPackages.buildPythonApplication rec { pygobject3 dbus-python pyxdg ]; + buildPhase = ""; + + installPhase = "${python}/bin/python setup.py install --prefix=$out"; + doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index a6cd17878b0c..4b522518e3f2 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,35 +1,58 @@ -{ stdenv, fetchFromGitHub, which, autoreconfHook, ncurses, perl +{ stdenv, fetchFromGitHub, which, autoreconfHook, writeScript, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42 }: -stdenv.mkDerivation rec { - version = "20171013"; +let + muttWrapper = writeScript "mutt" '' + #!${stdenv.shell} -eu + + echo 'The neomutt project has renamed the main binary from `mutt` to `neomutt`.' + echo "" + echo 'This wrapper is provided for compatibility purposes only. You should start calling `neomutt` instead.' + echo "" + read -p 'Press any key to launch NeoMutt...' -n1 -s + exec neomutt "$@" + ''; + +in stdenv.mkDerivation rec { + version = "20171027"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "0zn8imqfa76bxpkpy111c4vn6vjarbxc8gqv6m18qkksk0ly26l1"; + sha256 = "0pwc5zdxc9h23658dfkzndfj1ld3ijyvcxmsiv793y3i4dig0s3n"; }; - nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which ]; buildInputs = [ cyrus_sasl gss gpgme kerberos libidn ncurses notmuch openssl perl lmdb ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which ]; + + enableParallelBuilding = true; + + postPatch = '' + for f in doc/*.{xml,xsl}* ; do + substituteInPlace $f \ + --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl \ + --replace http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd ${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd + done + ''; + configureFlags = [ "--enable-debug" "--enable-gpgme" "--enable-notmuch" - "--with-homespool=mailbox" - "--with-gss" - "--with-mailpath=" - "--with-ssl" - "--with-sasl" "--with-curses" + "--with-gss" + "--with-homespool=mailbox" "--with-idn" "--with-lmdb" + "--with-mailpath=" + "--with-sasl" + "--with-ssl" # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail "ac_cv_path_SENDMAIL=sendmail" @@ -40,9 +63,9 @@ stdenv.mkDerivation rec { # like pgpring, pgpewrap, ... NIX_LDFLAGS = "-lidn"; - configureScript = "./prepare"; - - enableParallelBuilding = true; + postInstall = '' + cp ${muttWrapper} $out/bin/mutt + ''; meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix new file mode 100644 index 000000000000..d37f5293ef80 --- /dev/null +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, glib, zlib, dbus, dbus_glib, gtk2, gdk_pixbuf, cairo, pango }: + +stdenv.mkDerivation rec { + name = "tixati-${version}"; + version = "2.55"; + + src = fetchurl { + url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; + sha256 = "02mha6lfcb0mg0y977bxa6xg8krpbsbzpm4b5xw6y6wign4d8a8w"; + }; + + installPhase = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus_glib gtk2 gdk_pixbuf cairo pango ]} \ + tixati + install -D tixati $out/bin/tixati + install -D tixati.desktop $out/share/applications/tixati.desktop + install -D tixati.png $out/share/icons/tixati.png + ''; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "Torrent client"; + homepage = http://www.tixati.com; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ volth ]; + }; +} diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index e5c0e30bce3a..9d26a74f8bb1 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -4,12 +4,11 @@ stdenv.mkDerivation rec { pname = "tribler"; name = "${pname}-${version}"; - version = "7.0.0-rc2"; - revision = "1d3ddb8"; + version = "7.0.0-rc3"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "0wlv32cw52c5khnrm218dccgn2l177933p4dhp7m50hipqfb0ly2"; + sha256 = "0f1f8mzbk1ygkh8lv9y1s9mvslv12d94mxvmp3b4s2vm8w4syza7"; }; buildInputs = [ @@ -40,6 +39,8 @@ stdenv.mkDerivation rec { pythonPackages.decorator pythonPackages.feedparser pythonPackages.service-identity + pythonPackages.psutil + pythonPackages.meliae ]; postPatch = '' diff --git a/pkgs/applications/networking/pyload/beautifulsoup.nix b/pkgs/applications/networking/pyload/beautifulsoup.nix new file mode 100644 index 000000000000..571df924e1f8 --- /dev/null +++ b/pkgs/applications/networking/pyload/beautifulsoup.nix @@ -0,0 +1,20 @@ +{ pythonPackages, isPy3k, pkgs }: + +pythonPackages.buildPythonPackage rec { + name = "beautifulsoup-3.2.1"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz"; + sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + homepage = http://www.crummy.com/software/BeautifulSoup/; + license = "bsd"; + description = "Undemanding HTML/XML parser"; + }; +} diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix index f8cd1ab1d00b..c331c4f287e6 100644 --- a/pkgs/applications/networking/pyload/default.nix +++ b/pkgs/applications/networking/pyload/default.nix @@ -1,5 +1,12 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey }: -pythonPackages.buildPythonApplication rec { +{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey +, pkgs }: + +let + beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix { + inherit pythonPackages; + }; + +in pythonPackages.buildPythonApplication rec { version = "0.4.9-next"; name = "pyLoad-" + version; diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 18ece7a74019..1563cdf3d056 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -5,15 +5,19 @@ stdenv.mkDerivation rec { name = "abiword-${version}"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "http://www.abisource.org/downloads/abiword/${version}/source/${name}.tar.gz"; - sha256 = "1ik591rx15nn3n1297cwykl8wvrlgj78i528id9wbidgy3xzd570"; + url = "http://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz"; + sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg"; }; enableParallelBuilding = true; + patches = [ + ./patches/fix-13791.patch + ]; + buildInputs = [ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt libgsf enchant wv libjpeg perl boost libxslt goffice makeWrapper iconTheme @@ -29,6 +33,6 @@ stdenv.mkDerivation rec { homepage = http://www.abisource.com/; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub ylwghst ]; }; } diff --git a/pkgs/applications/office/abiword/patches/fix-13791.patch b/pkgs/applications/office/abiword/patches/fix-13791.patch new file mode 100644 index 000000000000..98004f01bcba --- /dev/null +++ b/pkgs/applications/office/abiword/patches/fix-13791.patch @@ -0,0 +1,161 @@ +From 46388f407c893123d9b3824a7570b050fc3b049b Mon Sep 17 00:00:00 2001 +From: James Cameron +Date: Thu, 17 Aug 2017 15:05:39 +1000 +Subject: [PATCH] Fix flickering +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- in GR_Caret::s_blink_timeout, avoid repeated calls by stopping the + timer, it will be restarted when needed, + +- in GR_Caret::s_enable, avoid extra unnecessary _blink calls when blink + is enabled, as they serve no purpose, + +- in XAP_UnixFrameImpl::_fe::expose, use the Cairo clip rectangle + instead of the expose event area, thanks to Hubert Figuière in + 865c1dda7e13deff04573ffc42028b71fee07f9c, + +- in XAP_UnixFrameImpl::_fe::expose, do not return FALSE, as other + handlers will need to handle the draw event, + +- in GR_UnixCairoGraphics::flush, fix excessive draw events; + gtk_widget_queue_draw only marks the widget as needing redrawing, + which causes a draw event for each call to flush, therefore every + caret blink, so use gdk_flush instead, + +Fixes AbiSource #13791. +Fixes Debian #851052. +Fixes Fedora #1287835. +Fixes Ubuntu LP: #1574278. +Fixes Sugar Labs #4915. + +Signed-off-by: James Cameron +--- + src/af/gr/gtk/gr_UnixCairoGraphics.cpp | 4 +--- + src/af/gr/xp/gr_Caret.cpp | 13 ++++--------- + src/af/xap/gtk/xap_UnixFrameImpl.cpp | 27 ++++++++++++++++++--------- + src/af/xap/gtk/xap_UnixFrameImpl.h | 2 +- + 4 files changed, 24 insertions(+), 22 deletions(-) + +diff --git a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp +index 509bd37..7c3c06f 100644 +--- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp ++++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp +@@ -577,9 +577,7 @@ void GR_UnixCairoGraphics::_endPaint() + + void GR_UnixCairoGraphics::flush(void) + { +- if (m_Widget) { +- gtk_widget_queue_draw(m_Widget); +- } ++ gdk_flush(); + } + + bool GR_UnixCairoGraphics::queryProperties(GR_Graphics::Properties gp) const +diff --git a/src/af/gr/xp/gr_Caret.cpp b/src/af/gr/xp/gr_Caret.cpp +index 5d5d116..a8aa451 100644 +--- a/src/af/gr/xp/gr_Caret.cpp ++++ b/src/af/gr/xp/gr_Caret.cpp +@@ -155,22 +155,17 @@ void GR_Caret::s_enable(UT_Worker * _w) + { + GR_Caret * c = static_cast(_w->getInstanceData()); + ++ c->m_enabler->stop(); + c->m_worker->stop(); +- c->_blink(true); +- if (!c->m_bCursorIsOn) +- c->_blink(true); // blink again +- else +- { +- c->_blink(true); // ?? - MARCM +- c->_blink(true); +- } + c->m_worker->start(); +- c->m_enabler->stop(); ++ c->_blink(true); + } + + void GR_Caret::s_blink_timeout(UT_Worker * _w) + { + GR_Caret * c = static_cast(_w->getInstanceData()); ++ ++ c->m_blinkTimeout->stop(); + if (c->isEnabled()) + c->disable(); + } +diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp +index 780000e..e81961a 100644 +--- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp ++++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp +@@ -1208,15 +1208,23 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g + } + + #if GTK_CHECK_VERSION(3,0,0) +-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) ++gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) + #else + gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) + #endif + { + XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(g_object_get_data(G_OBJECT(w), "user_data")); + FV_View * pView = static_cast(pUnixFrameImpl->getFrame()->getCurrentView()); ++ double x, y, width, height; + #if GTK_CHECK_VERSION(3,0,0) +- GdkEventExpose *pExposeEvent = reinterpret_cast(gtk_get_current_event()); ++ cairo_clip_extents (cr, &x, &y, &width, &height); ++ width -= x; ++ height -= y; ++#else ++ x = pExposeEvent->area.x; ++ y = pExposeEvent->area.y; ++ width = pExposeEvent->area.width; ++ height = pExposeEvent->area.height; + #endif + /* Jean: commenting out next lines since the zoom update code does draw only + * part of what needs to be updated. */ +@@ -1230,20 +1238,21 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) + UT_Rect rClip; + if (pGr->getPaintCount () > 0) + return TRUE; +- xxx_UT_DEBUGMSG(("Expose area: x %d y %d width %d height %d \n",pExposeEvent->area.x,pExposeEvent->area.y,pExposeEvent->area.width,pExposeEvent->area.height)); +- rClip.left = pGr->tlu(pExposeEvent->area.x); +- rClip.top = pGr->tlu(pExposeEvent->area.y); +- rClip.width = pGr->tlu(pExposeEvent->area.width)+1; +- rClip.height = pGr->tlu(pExposeEvent->area.height)+1; +-#if GTK_CHECK_VERSION(3,0,0) ++ rClip.left = pGr->tlu(x); ++ rClip.top = pGr->tlu(y); ++ #if GTK_CHECK_VERSION(3,0,0) ++ rClip.width = pGr->tlu(width); ++ rClip.height = pGr->tlu(height); + static_cast(pGr)->setCairo(cr); + pView->draw(&rClip); + static_cast(pGr)->setCairo(NULL); + #else ++ rClip.width = pGr->tlu(width)+1; ++ rClip.height = pGr->tlu(height)+1; + pView->draw(&rClip); + #endif + } +- return FALSE; ++ return TRUE; + } + + static bool bScrollWait = false; +diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h +index 30ee5d8..26fbb2e 100644 +--- a/src/af/xap/gtk/xap_UnixFrameImpl.h ++++ b/src/af/xap/gtk/xap_UnixFrameImpl.h +@@ -152,7 +152,7 @@ protected: + static gint key_release_event(GtkWidget* w, GdkEventKey* e); + static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/); + #if GTK_CHECK_VERSION(3,0,0) +- static gint draw(GtkWidget * w, cairo_t * cr); ++ static gboolean draw(GtkWidget * w, cairo_t * cr); + #else + static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent); + #endif +-- +2.11.0 + diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 0a93efd3990d..9cee31b01eb7 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, python3Packages }: stdenv.mkDerivation rec { - name = "bean-add-2017-09-13"; + name = "bean-add-2017-10-31"; src = fetchFromGitHub { owner = "simon-v"; repo = "bean-add"; - rev = "035f07a9e48a9dd23b49a27ba9c070ee9ddc4cc7"; - sha256 = "0lj8940bn2h8541am4x0sfqpfk5xfnyfdnf3jpajfgx6wyjm2frg"; + rev = "9ac64272a17e76f8292bd94deb5aee45c14130d2"; + sha256 = "1vcwbbi2jsf87yq8f2hyf7nz9br1973sb20qjnsx5fxlmcpn47jh"; }; propagatedBuildInputs = with python3Packages; [ python ]; diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix index 70d5180191e9..efc61dba7a49 100644 --- a/pkgs/applications/office/beancount/default.nix +++ b/pkgs/applications/office/beancount/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchhg, pkgs, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "2.0b15"; + version = "2.0rc1"; name = "beancount-${version}"; namePrefix = ""; src = pkgs.fetchurl { url = "mirror://pypi/b/beancount/${name}.tar.gz"; - sha256 = "1dvnpgja4v4k5zagfsmdjavlib0z3r9r4z197yvj86szhzs0z86k"; + sha256 = "12vlkck4q3dax9866krp6963c6d845b7inkkwrlkk4njh84n71wf"; }; buildInputs = with pythonPackages; [ nose ]; diff --git a/pkgs/applications/office/calligra/2.nix b/pkgs/applications/office/calligra/2.nix index 76027f29a707..959a44a35c10 100644 --- a/pkgs/applications/office/calligra/2.nix +++ b/pkgs/applications/office/calligra/2.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ phreedom ebzzry ]; inherit (kdelibs4.meta) platforms; license = licenses.gpl2; + broken = true; }; } diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 7bc549dd0fc5..56a93e990095 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,42 +1,26 @@ -{ stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }: +{ stdenv, python3, beancount }: -python3Packages.buildPythonApplication rec { - version = "1.3"; - name = "fava-${version}"; +let + inherit (python3.pkgs) buildPythonApplication fetchPypi; +in +buildPythonApplication rec { + pname = "fava"; + version = "1.5"; + name = "${pname}-${version}"; - src = fetchFromGitHub { - owner = "beancount"; - repo = "fava"; - rev = "v${version}"; - sha256 = "0g0aj0qcmpny6dipi00nks7h3mf5a4jfd6bxjm1rb5807wswcpg8"; + src = fetchPypi { + inherit pname version; + sha256 = "0d3jncidzvfsxjplzg4cmflqr4mxrbrlj5bh6fpxj529pialpkk6"; }; - assets = fetchzip { - url = "https://github.com/beancount/fava/releases/download/v${version}/fava-${version}.tar.gz"; - sha256 = "0yn2psbn436g1w5ixn94z8ca6dfd54izg98979arn0k7slpiccvz"; - }; + doCheck = false; - checkInputs = with python3Packages; [ pytest ]; - - checkPhase = '' - # pyexcel is optional - # the other 2 tests fail due non-unicode locales - PATH=$out/bin:$PATH pytest tests \ - --ignore tests/test_util_excel.py \ - --ignore tests/test_cli.py \ - --ignore tests/test_translations.py \ - ''; - - postInstall = '' - cp -r $assets/fava/static/gen $out/${python3.sitePackages}/fava/static - ''; - - propagatedBuildInputs = with python3Packages; + propagatedBuildInputs = with python3.pkgs; [ flask dateutil pygments wheel markdown2 flaskbabel tornado click beancount ]; meta = { - homepage = https://github.com/aumayr/fava; + homepage = https://beancount.github.io/fava; description = "Web interface for beancount"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix new file mode 100644 index 000000000000..67f7e2816a48 --- /dev/null +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper +, lua52Packages, libXft, ncurses, readline, zlib }: + +stdenv.mkDerivation rec { + name = "wordgrinder-${version}"; + version = "0.6-db14181"; + + src = fetchFromGitHub { + repo = "wordgrinder"; + owner = "davidgiven"; + rev = "db141815e8bd1da6e684a1142a59492e516f3041"; + sha256 = "1l1jqzcqiwnc8r1igfi7ay4pzzhdhss81znnmfr4rc1ia8bpdjc2"; + }; + + makeFlags = [ + "PREFIX=$(out)" + "LUA_INCLUDE=${lua52Packages.lua}/include" + "LUA_LIB=${lua52Packages.lua}/lib/liblua.so" + ]; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + + buildInputs = [ + libXft + lua52Packages.lua + ncurses + readline + zlib + ]; + + # To be able to find + NIX_CFLAGS_COMPILE = "-I${libXft.dev}/include/X11"; + + # Binaries look for LuaFileSystem library (lfs.so) at runtime + postInstall = '' + wrapProgram $out/bin/wordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; + wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; + ''; + + meta = with stdenv.lib; { + description = "Text-based word processor"; + homepage = https://cowlark.com/wordgrinder; + license = licenses.mit; + maintainers = with maintainers; [ matthiasbeyer ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index 2588ee39addc..ee7c0a5844d4 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ readline libX11 flex bison libICE libXaw libXext ]; - configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" ]; + configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" "--with-ngshared" ]; meta = with stdenv.lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index df7eac02513c..6b213226635d 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cln, gmp, swig, pkgconfig, readline, libantlr3c, -boost, jdk, autoreconfHook, python2, antlr3_4 }: +{ stdenv, fetchurl, cln, gmp, swig, pkgconfig +, readline, libantlr3c, boost, jdk, autoreconfHook +, python2, antlr3_4 +}: stdenv.mkDerivation rec { - name = "cvc4-unstable-${version}"; - version = "2017-05-18"; + name = "cvc4-${version}"; + version = "1.5"; - src = fetchFromGitHub { - owner = "CVC4"; - repo = "CVC4"; - rev = "d77107cc56b0a089364c3d1512813701c155ea93"; - sha256 = "085bjrrm33rl5pwqx13af9sgni9cfbg70wag6lm08jj41ws411xs"; + src = fetchurl { + url = "http://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-${version}.tar.gz"; + sha256 = "0yxxawgc9vd2cz883swjlm76rbdkj48n7a8dfppsami530y2rvhi"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { "--with-readline" "--with-boost=${boost.dev}" ]; + preConfigure = '' patchShebangs ./src/ ''; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 5da3e7c31b4a..53e1a90f5b6a 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "symbiyosys-${version}"; - version = "2017.10.16"; + version = "2017.11.05"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "symbiyosys"; - rev = "f403b99fae053baab651e3ec8345a68cb3ba6a96"; - sha256 = "0jzzlybxaqmhrasfjv3q3skshalr7lvv4p142qgdqz1ig36znbi8"; + rev = "db9c7e97b8f84ef7e9b18ae630009897c7982a08"; + sha256 = "0pyznkjm0vjmaf6mpwknmh052qrwy2fzi05h80ysx1bxc51ns0m0"; }; buildInputs = [ python3 yosys ]; diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index aac72ba24f01..a607f1066395 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -2,38 +2,40 @@ stdenv.mkDerivation rec { name = "yices-${version}"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { url = "https://github.com/SRI-CSL/yices2/archive/Yices-${version}.tar.gz"; name = "${name}-src.tar.gz"; - sha256 = "0a3zzbvmgyiljzqn6xmc037gismm779p696jywk09j2pqbvp52ac"; + sha256 = "1k8wmlddi3zv5kgg6xbch3a0s0xqsmsfc7y6z8zrgcyhswl36h7p"; }; - patchPhase = ''patchShebangs tests/regress/check.sh''; - - configureFlags = [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a" - "--with-static-gmp-include-dir=${gmp-static.dev}/include" - "--enable-mcsat" - ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ gmp-static gperf libpoly ]; + buildInputs = [ gmp-static gperf libpoly ]; + configureFlags = + [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a" + "--with-static-gmp-include-dir=${gmp-static.dev}/include" + "--enable-mcsat" + ]; enableParallelBuilding = true; doCheck = true; + # Usual shenanigans + patchPhase = ''patchShebangs tests/regress/check.sh''; + # Includes a fix for the embedded soname being libyices.so.2.5, but - # only installing the libyices.so.2.5.1 file. + # only installing the libyices.so.2.5.x file. installPhase = '' make install LDCONFIG=true - (cd $out/lib && ln -s -f libyices.so.2.5.3 libyices.so.2.5) + (cd $out/lib && ln -s -f libyices.so.${version} libyices.so.2.5) ''; meta = with stdenv.lib; { description = "A high-performance theorem prover and SMT solver"; homepage = "http://yices.csl.sri.com"; license = licenses.gpl3; - platforms = platforms.linux ++ platforms.darwin; + platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix new file mode 100644 index 000000000000..9d736694cbdc --- /dev/null +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -0,0 +1,51 @@ +{ stdenv, lib, fetchFromGitHub, ccache, cmake, ctags, swig +# data, compression +, bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy +# maths +, blas, eigen, nlopt, lp_solve, colpack +# libraries +, libarchive, liblapack, libxml2 +# extra support +, pythonSupport ? true, pythonPackages ? null +, opencvSupport ? false, opencv ? null +}: + +assert pythonSupport -> pythonPackages != null; +assert opencvSupport -> opencv != null; + +stdenv.mkDerivation rec { + + pname = "shogun"; + version = "6.0.0"; + name = pname + "-" + version; + + src = fetchFromGitHub { + owner = pname + "-toolbox"; + repo = pname; + rev = pname + "_" + version; + sha256 = "0f2zwzvn5apvwypkfkq371xp7c5bdb4g1fwqfh8c2d57ysjxhmgf"; + fetchSubmodules = true; + }; + + CCACHE_DIR=".ccache"; + + buildInputs = with lib; [ + blas bzip2 ccache cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo + protobuf nlopt snappy swig (libarchive.dev) liblapack libxml2 + ] + ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) + ++ optional (opencvSupport) opencv; + + cmakeFlags = with lib; [] + ++ (optional (pythonSupport) "-DPythonModular=ON") + ++ (optional (opencvSupport) "-DOpenCV=ON") + ; + + meta = with stdenv.lib; { + description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; + homepage = "http://shogun-toolbox.org/"; + license = licenses.gpl3; + maintainers = with maintainers; [ edwtjo ]; + }; + +} diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix new file mode 100644 index 000000000000..29785363b048 --- /dev/null +++ b/pkgs/applications/science/math/colpack/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, gettext }: + +stdenv.mkDerivation rec { + + pname = "ColPack"; + version = "1.0.10"; + name = pname + "-" + version; + + src = fetchFromGitHub { + owner = "CSCsw"; + repo = pname; + rev = "v" + version; + sha256 = "1p05vry940mrjp6236c0z83yizmw9pk6ly2lb7d8rpb7j9h03glr"; + }; + + buildInputs = [ autoconf automake gettext libtool ]; + + configurePhase = '' + autoreconf -vif + ./configure --prefix=$out --enable-openmp + ''; + + meta = with stdenv.lib; { + description = "A package comprising of implementations of algorithms for + vertex coloring and derivative computation"; + homepage = "http://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities"; + license = licenses.lgpl3; + maintainers = with maintainers; [ edwtjo ]; + }; + +} diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 64784facfb96..86d4d289c2a6 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -14,12 +14,21 @@ stdenv.mkDerivation rec { buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ]; configureScript = "./Configure"; - configureFlags = - "--mt=pthread" + - "--with-gmp=${gmp.dev} " + - "--with-readline=${readline.dev}"; + configureFlags = [ + "--mt=pthread" + "--with-gmp=${gmp.dev}" + "--with-readline=${readline.dev}" + ] ++ stdenv.lib.optional stdenv.isDarwin "--host=x86_64-darwin"; - makeFlags = "all"; + preConfigure = '' + export LD=$CC + ''; + + postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + echo 'echo x86_64-darwin' > config/arch-osname + ''; + + makeFlags = [ "all" ]; meta = with stdenv.lib; { description = "Computer algebra system for high-performance number theory computations"; @@ -36,12 +45,12 @@ stdenv.mkDerivation rec { Bordeaux I, France), PARI is now under the GPL and maintained by Karim Belabas with the help of many volunteer contributors. - - PARI is a C library, allowing fast computations. + - PARI is a C library, allowing fast computations. - gp is an easy-to-use interactive shell giving access to the PARI functions. - GP is the name of gp's scripting language. - - gp2c, the GP-to-C compiler, combines the best of both worlds - by compiling GP scripts to the C language and transparently loading + - gp2c, the GP-to-C compiler, combines the best of both worlds + by compiling GP scripts to the C language and transparently loading the resulting functions into gp. (gp2c-compiled scripts will typically run 3 or 4 times faster.) gp2c currently only understands a subset of the GP language. @@ -50,7 +59,7 @@ stdenv.mkDerivation rec { downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes raskin AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; updateWalker = true; }; } diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index bf3c7fcea989..24dc4436b0fd 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -1,42 +1,183 @@ -{ stdenv, fetchurl, m4, perl, gfortran, texlive, ffmpeg, tk, gnused_422 -, imagemagick, liblapack, python, openssl, libpng +# TODO +# - consider writing a script to convert spkgs to nix packages, similar to vim +# or cabal2nix. This would allow a more efficient and "cleaner" build, greater +# flexibility and the possibility to select which dependencies to add and which +# to remove. It would also allow to use system packages for some dependencies +# and recompile others (optimized for the system) without recompiling everything. +# - add optdeps: +# - imagemagick +# - texlive full for documentation +# - ... +# - further seperate build outputs. Also maybe run `make doc`. +# Configure flags like --bindir and --libdir oculd also be used for that, see +# ./configure --help`. + +# Other resources: +# - https://wiki.debian.org/DebianScience/Sage +# - https://github.com/cschwan/sage-on-gentoo +# - https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath + +{ stdenv +, fetchurl +, perl +, gfortran +, python +, autoreconfHook +, gettext , which +, texlive +, hevea }: stdenv.mkDerivation rec { - name = "sage-6.8"; + version = "8.0"; + name = "sage-${version}"; src = fetchurl { - url = "http://old.files.sagemath.org/src-old/${name}.tar.gz"; - sha256 = "102mrzzi215g1xn5zgcv501x9sghwg758jagx2jixvg1rj2jijj9"; - + # Note that the source is *not* fetched from github, since that doesn't + # the upstream folder with all the source tarballs of the spkgs. + # If those are not present they are fetched at build time, which breaks + # when building in a sandbox (and probably only works if you install the + # latest sage version). + urls = [ + "http://mirrors.mit.edu/sage/src/sage-${version}.tar.gz" + "ftp://ftp.fu-berlin.de/unix/misc/sage/src/sage-${version}.tar.gz" + "http://sagemath.polytechnic.edu.na/src/sage-${version}.tar.gz" + "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/src/sage-${version}.tar.gz" + "http://sagemath.mirror.ac.za/src/sage-${version}.tar.gz" + "http://ftp.leg.uct.ac.za/pub/packages/sage/src/sage-${version}.tar.gz" + "http://mirror.ufs.ac.za/sagemath/src/sage-${version}.tar.gz" + "http://mirrors-usa.go-parts.com/sage/sagemath/src/sage-${version}.tar.gz" + "http://www.cecm.sfu.ca/sage/src/sage-${version}.tar.gz" + "http://files.sagemath.org/src/sage-${version}.tar.gz" + "http://mirrors.xmission.com/sage/src/sage-${version}.tar.gz" + "http://sagemath.c3sl.ufpr.br/src/sage-${version}.tar.gz" + "http://linorg.usp.br/sage/src/sage-${version}.tar.gz" + "http://mirror.hust.edu.cn/sagemath/src/sage-${version}.tar.gz" + "http://ftp.iitm.ac.in/sage/src/sage-${version}.tar.gz" + "http://ftp.kaist.ac.kr/sage/src/sage-${version}.tar.gz" + "http://ftp.riken.jp/sagemath/src/sage-${version}.tar.gz" + "http://mirrors.tuna.tsinghua.edu.cn/sagemath/src/sage-${version}.tar.gz" + "http://mirrors.ustc.edu.cn/sagemath/src/sage-${version}.tar.gz" + "http://ftp.tsukuba.wide.ad.jp/software/sage/src/sage-${version}.tar.gz" + "http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/src/sage-${version}.tar.gz" + "http://mirror.yandex.ru/mirrors/sage.math.washington.edu/src/sage-${version}.tar.gz" + "http://mirror.aarnet.edu.au/pub/sage/src/sage-${version}.tar.gz" + "http://sage.mirror.garr.it/mirrors/sage/src/sage-${version}.tar.gz" + "http://www.mirrorservice.org/sites/www.sagemath.org/src/sage-${version}.tar.gz" + "http://mirror.switch.ch/mirror/sagemath/src/sage-${version}.tar.gz" + "https://mirrors.up.pt/pub/sage/src/sage-${version}.tar.gz" + "http://www-ftp.lip6.fr/pub/math/sagemath/src/sage-${version}.tar.gz" + "http://ftp.ntua.gr/pub/sagemath/src/sage-${version}.tar.gz" + ]; + sha256 = "1a9rhb8jby6fdqa2s7n2fl9jwqqlsl7qz7dbpbwvg6jwlrvni7fg"; }; - buildInputs = [ m4 perl gfortran texlive.combined.scheme-basic ffmpeg gnused_422 tk imagemagick liblapack - python openssl libpng which ]; + postPatch = '' + substituteAllInPlace src/bin/sage-env + ''; - patches = [ ./spkg-singular.patch ./spkg-python.patch ./spkg-git.patch ]; + installPhase = '' + # Sage installs during first `make`, `make install` is no-op and just takes time. + ''; + + outputs = [ "out" "doc" ]; + + buildInputs = [ + perl # needed for the build + python # needed for the build + gfortran # needed to build giac + autoreconfHook # needed to configure sage with prefix + gettext # needed to build the singular spkg + hevea # needed to build the docs of the giac spkg + which # needed in configure of mpir + # needed to build the docs of the giac spkg + (texlive.combine { inherit (texlive) + scheme-basic + collection-pstricks # needed by giac + times # font needed by giac + stmaryrd # needed by giac + babel-greek # optional for giac, otherwise throws a bunch of latex command not founds + ; + }) + ]; + + patches = [ + # fix usages of /bin/rm + ./spkg-singular.patch + # help python find the crypt library + ./spkg-python2.patch + ./spkg-python3.patch + # fix usages of /usr/bin/perl + ./spkg-git.patch + # fix usages of /bin/cp and add necessary argument to function call + ./spkg-giac.patch + # environment + ./env.patch + ]; enableParallelBuilding = true; - hardeningDisable = [ "format" ]; + hardeningDisable = [ + "format" # needed to build palp, for lines like `printf(ctime(&_NFL->TIME))` + # TODO could be patched with `sed s|printf(ctime(\(.*\)))|%s... or fixed upstream + ]; preConfigure = '' export SAGE_NUM_THREADS=$NIX_BUILD_CORES export SAGE_ATLAS_ARCH=fast - mkdir -p $out/sageHome - export HOME=$out/sageHome - export CPPFLAGS="-P" + + export HOME=$out/sage-home + mkdir -p $out/sage-home + + mkdir -p "$out" + + # we need to keep the source around + dir="$PWD" + cd .. + mv "$dir" "$out/sage-root" + + cd "$out/sage-root" # build in target dir, since `make` is also `make install` ''; - preBuild = "patchShebangs build"; + # for reference: http://doc.sagemath.org/html/en/installation/source.html + preBuild = '' + # TODO do this conditionally + export SAGE_SPKG_INSTALL_DOCS='no' + patchShebangs build + ''; - installPhase = ''DESTDIR=$out make install''; + postBuild = '' + rm -r "$out/sage-root/upstream" # don't keep the sources of all the spkgs + rm -r "$out/sage-root/src/build" + rm -rf "$out/sage-root/src/.git" + rm -r "$out/sage-root/logs" + # Fix dependency cycle between out and doc + rm -f "$out/sage-root/config.status" + rm -f "$out/sage-root/build/make/Makefile-auto" + rm -f "$out/sage-home/.sage/gap/libgap-workspace-"* + ''; + + # TODO there are some doctest failures, which seem harmless. + # We should figure out a way to fix the failures or ignore only those tests. + doCheck = false; + + checkTarget = "ptestalllong"; # all long tests in parallell + preCheck = '' + export SAGE_TIMEOUT=0 # no timeout + export SAGE_TIMEOUT_LONG=0 # no timeout + ''; meta = { homepage = http://www.sagemath.org; description = "A free open source mathematics software system"; + # taken from the homepage + longDescription = '' + SageMath is a free open-source mathematics software system licensed under the GPL. It builds on top of many existing open-source packages: NumPy, SciPy, matplotlib, Sympy, Maxima, GAP, FLINT, R and many more. Access their combined power through a common, Python-based language or directly via interfaces or wrappers. + Mission: Creating a viable free open source alternative to Magma, Maple, Mathematica and Matlab. + ''; license = stdenv.lib.licenses.gpl2Plus; - broken = true; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ timokau ]; }; } diff --git a/pkgs/applications/science/math/sage/env.patch b/pkgs/applications/science/math/sage/env.patch new file mode 100644 index 000000000000..a7f8538eac3d --- /dev/null +++ b/pkgs/applications/science/math/sage/env.patch @@ -0,0 +1,22 @@ +diff --git a/src/bin/sage-env b/src/bin/sage-env +index ead308f861..ed8db9f9b7 100644 +--- a/src/bin/sage-env ++++ b/src/bin/sage-env +@@ -111,6 +111,8 @@ resolvelinks() { + } + + ++SAGE_ROOT="@out@/sage-root" ++ + # New value for SAGE_ROOT: either SAGE_ROOT (if given) + # or a guessed value based on pwd. + if [ -n "$SAGE_ROOT" ]; then +@@ -185,6 +187,8 @@ fi + export SAGE_ENV_SOURCED=$SAGE_ENV_VERSION + + export SAGE_ROOT="$NEW_SAGE_ROOT" ++export SAGE_LOCAL='@out@/' ++export PYTHONPATH="@out@/lib/python2.7/site-packages:$PYTHONPATH" + + + # sage-env must know where the Sage's script files are. diff --git a/pkgs/applications/science/math/sage/fetch-mirrors.sh b/pkgs/applications/science/math/sage/fetch-mirrors.sh new file mode 100755 index 000000000000..a1103e86beb9 --- /dev/null +++ b/pkgs/applications/science/math/sage/fetch-mirrors.sh @@ -0,0 +1,11 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl go-pup + +# Fetches a list of all available source mirrors from the sage homepage. +# Note that the list is sorted by country, but fetchurl doesn't offer an option +# to customize mirror preference. + +curl -s http://www.sagemath.org/download-source.html \ + | pup 'table#mirror' \ + | pup 'a attr{href}' \ + | sed -e 's/index\.html/sage-${version}.tar.gz/' diff --git a/pkgs/applications/science/math/sage/spkg-giac.patch b/pkgs/applications/science/math/sage/spkg-giac.patch new file mode 100644 index 000000000000..15b91433d254 --- /dev/null +++ b/pkgs/applications/science/math/sage/spkg-giac.patch @@ -0,0 +1,11 @@ +--- old/build/pkgs/giac/spkg-install 2017-07-21 14:10:00.000000000 -0500 ++++ new/build/pkgs/giac/spkg-install 2017-10-15 15:55:55.321237645 -0500 +@@ -4,6 +4,8 @@ + ## Giac + ########################################### + ++find . -type f -exec sed -e 's@/bin/cp@cp@g' -i '{}' ';' && echo "Patching input parser" && find . -iname 'input_parser.cc' ++sed -e 's@yylex (&yylval)@yylex (\&yyval, scanner)@gp' -i 'src/src/input_parser.cc' + + if [ "$SAGE_LOCAL" = "" ]; then + echo "SAGE_LOCAL undefined ... exiting"; diff --git a/pkgs/applications/science/math/sage/spkg-git.patch b/pkgs/applications/science/math/sage/spkg-git.patch index a3e768a7c240..ff9a7b2e491a 100644 --- a/pkgs/applications/science/math/sage/spkg-git.patch +++ b/pkgs/applications/science/math/sage/spkg-git.patch @@ -1,10 +1,12 @@ ---- old/build/pkgs/git/spkg-install 2015-07-26 15:34:43.000000000 +0200 -+++ new/build/pkgs/git/spkg-install 2015-09-17 08:28:03.586657451 +0200 -@@ -45,6 +45,8 @@ - fi - done +diff --git a/build/pkgs/git/spkg-install b/build/pkgs/git/spkg-install +index 8469cb58c2..d0dc9a1db9 100755 +--- a/build/pkgs/git/spkg-install ++++ b/build/pkgs/git/spkg-install +@@ -35,6 +35,8 @@ fi -+find . -exec sed -e 's@/usr/bin/perl@perl@g' -i '{}' ';' + cd src + ++find . -type f -exec sed -e 's@/usr/bin/perl@perl@g' -i '{}' ';' + # We don't want to think about Fink or Macports export NO_FINK=1 diff --git a/pkgs/applications/science/math/sage/spkg-python.patch b/pkgs/applications/science/math/sage/spkg-python.patch deleted file mode 100644 index 4db9427e3e02..000000000000 --- a/pkgs/applications/science/math/sage/spkg-python.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- old/build/pkgs/python2/spkg-install 2015-07-26 15:34:43.000000000 +0200 -+++ new/build/pkgs/python2/spkg-install 2015-09-16 20:48:51.904555797 +0200 -@@ -32,7 +32,7 @@ - done - - # We are setting LDFLAGS so that we pick up Sage's readline --LDFLAGS="-L$SAGE_LOCAL/lib $LDFLAGS" -+LDFLAGS="-L$SAGE_LOCAL/lib -lcrypt $LDFLAGS" - export LDFLAGS - - if [ "$SAGE_DEBUG" = "yes" ]; then diff --git a/pkgs/applications/science/math/sage/spkg-python2.patch b/pkgs/applications/science/math/sage/spkg-python2.patch new file mode 100644 index 000000000000..5d92d3f8beaf --- /dev/null +++ b/pkgs/applications/science/math/sage/spkg-python2.patch @@ -0,0 +1,12 @@ +--- old/build/pkgs/python2/spkg-install 2017-07-21 14:10:00.000000000 -0500 ++++ new/build/pkgs/python2/spkg-install 2017-10-15 11:26:54.823134067 -0500 +@@ -22,6 +22,9 @@ + + cd src + ++LDFLAGS="-lcrypt $LDFLAGS" ++export LDFLAGS ++ + if [ "$SAGE_DEBUG" = "yes" ]; then + echo "Building Python with pydebug" + PYTHON_CONFIGURE="$PYTHON_CONFIGURE --with-pydebug" diff --git a/pkgs/applications/science/math/sage/spkg-python3.patch b/pkgs/applications/science/math/sage/spkg-python3.patch new file mode 100644 index 000000000000..51827fd11be0 --- /dev/null +++ b/pkgs/applications/science/math/sage/spkg-python3.patch @@ -0,0 +1,12 @@ +--- old/build/pkgs/python3/spkg-install 2017-07-21 14:10:00.000000000 -0500 ++++ new/build/pkgs/python3/spkg-install 2017-10-15 13:11:17.769261404 -0500 +@@ -22,6 +22,9 @@ + + cd src + ++LDFLAGS="-lcrypt $LDFLAGS" ++export LDFLAGS ++ + if [ "$SAGE_DEBUG" = "yes" ]; then + echo "Building Python with pydebug" + PYTHON_CONFIGURE="$PYTHON_CONFIGURE --with-pydebug" diff --git a/pkgs/applications/science/math/sage/spkg-singular.patch b/pkgs/applications/science/math/sage/spkg-singular.patch index a4c29825a4c4..d561768600b4 100644 --- a/pkgs/applications/science/math/sage/spkg-singular.patch +++ b/pkgs/applications/science/math/sage/spkg-singular.patch @@ -1,28 +1,12 @@ ---- old/build/pkgs/singular/spkg-install 2015-07-26 15:34:43.000000000 +0200 -+++ new/build/pkgs/singular/spkg-install 2015-09-15 20:42:51.716505855 +0200 -@@ -115,6 +115,11 @@ - done - } +--- old/build/pkgs/singular/spkg-install 2017-10-15 10:35:41.826540964 -0500 ++++ new/build/pkgs/singular/spkg-install 2017-10-15 10:36:40.613743443 -0500 +@@ -4,6 +4,9 @@ + ## Singular + ########################################### -+nix_nuke_bin_rm() -+{ -+ find . -exec sed -e 's@/bin/rm@rm@g' -i '{}' ';' -+} ++find . -type f -exec sed -e 's@/bin/rm@rm@g' -i '{}' ';' ++#echo '#!/usr/bin/env bash\nIgnoring missing $1' > src/build-aux/missing + - remove_old_version() - { - rm -f "$SAGE_LOCAL"/bin/Singular* -@@ -306,11 +311,11 @@ - - - # Actually run all the functions defined above --for i in choose_patches apply_patches remove_old_version config \ -+for i in choose_patches apply_patches nix_nuke_bin_rm remove_old_version config \ - build_singular build_libsingular build_factory build_libfac \ - create_singular_script install_docs ; do - echo "### Singular spkg-install: $i ###" -- cd "$SRC" && $i -+ cd "$SRC" && pwd && $i - if [ $? -ne 0 ]; then - echo >&2 "Error building Singular (error in $i)." - exit 1 + if [ -z "$SAGE_LOCAL" ]; then + echo >&2 "Error: SAGE_LOCAL undefined -- exiting..." + echo >&2 "Maybe run 'sage -sh'?" diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index 8902bacf11ca..94e7c0efaaee 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { inherit (s) url sha256; }; - sourceRoot="${name}-src/gui-wx/configure"; + setSourceRoot = '' + sourceRoot=$(echo */gui-wx/configure) + ''; # Link against Python explicitly as it is needed for scripts makeFlags=[ diff --git a/pkgs/applications/version-management/cvs/CVE-2017-12836.patch b/pkgs/applications/version-management/cvs/CVE-2017-12836.patch new file mode 100644 index 000000000000..950079423685 --- /dev/null +++ b/pkgs/applications/version-management/cvs/CVE-2017-12836.patch @@ -0,0 +1,29 @@ +--- a/src/rsh-client.c.orig 2005-10-02 17:17:21.000000000 +0200 ++++ b/src/rsh-client.c 2017-11-07 16:56:06.957370469 +0100 +@@ -53,7 +53,7 @@ + char *cvs_server = (root->cvs_server != NULL + ? root->cvs_server : getenv ("CVS_SERVER")); + int i = 0; +- /* This needs to fit "rsh", "-b", "-l", "USER", "host", ++ /* This needs to fit "rsh", "-b", "-l", "USER", "--", "host", + "cmd (w/ args)", and NULL. We leave some room to grow. */ + char *rsh_argv[10]; + +@@ -97,6 +97,9 @@ + rsh_argv[i++] = root->username; + } + ++ /* Only non-option arguments from here. (CVE-2017-12836) */ ++ rsh_argv[i++] = "--"; ++ + rsh_argv[i++] = root->hostname; + rsh_argv[i++] = cvs_server; + rsh_argv[i++] = "server"; +@@ -171,6 +174,7 @@ + *p++ = root->username; + } + ++ *p++ = "--"; + *p++ = root->hostname; + *p++ = command; + *p++ = NULL; diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 8c69517a7506..a330db6a8d67 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { patches = [ ./getcwd-chroot.patch ./CVE-2012-0804.patch + ./CVE-2017-12836.patch ]; hardeningDisable = [ "fortify" "format" ]; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 82846a564cd9..58a9e8089230 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -58,6 +58,8 @@ rec { # support for bugzilla git-bz = callPackage ./git-bz { }; + git-codeowners = callPackage ./git-codeowners { }; + git-cola = callPackage ./git-cola { }; git-crypt = callPackage ./git-crypt { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix new file mode 100644 index 000000000000..07e0ce80c5d6 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix @@ -0,0 +1,21 @@ +{ lib, rustPlatform, fetchFromGitHub }: +rustPlatform.buildRustPackage rec { + name = "git-codeowners-${version}"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "softprops"; + repo = "git-codeowners"; + rev = "v${version}"; + sha256 = "0imxbi6y1165bi2rik0n98v79fkgp8alb615qh41idg1p2krzyy5"; + }; + + cargoSha256 = "0h831rf5vlvpzfm4sr3fvwlc0ys776fqis90y414mczphkxvz437"; + + meta = with lib; { + homepage = "https://github.com/softprops/git-codeowners"; + description = "a git extension to work with CODEOWNERS files"; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + }; +} 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 b3c642de9b25..6358a340bb6e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.14.3"; + version = "2.15.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "078m0za5gyzcah5iaxdwx663yvdp8byvjc8rpzjzcrr4sl6rcc2k"; + sha256 = "0siyxg1ppg6szjp8xp37zfq1fj97kbdxpigi3asmidqhkx41cw8h"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile index 88b7120d6f9a..7e8f9f2b2557 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitaly/Gemfile @@ -3,3 +3,7 @@ source 'https://rubygems.org' gem 'github-linguist', '~> 4.7.0', require: 'linguist' gem 'gitaly-proto', '~> 0.37.0', require: 'gitaly' gem 'activesupport' + +group :development, :test do + gem 'gitlab-styles', '~> 2.0.0', require: false +end diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock index 68433fc6878e..5ea14855b97f 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitaly/Gemfile.lock @@ -8,6 +8,7 @@ GEM tzinfo (~> 1.1) addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) + ast (2.3.0) charlock_holmes (0.7.5) concurrent-ruby (1.0.5) escape_utils (1.1.1) @@ -21,6 +22,10 @@ GEM escape_utils (~> 1.1.0) mime-types (>= 1.19) rugged (>= 0.23.0b) + gitlab-styles (2.0.0) + rubocop (~> 0.49) + rubocop-gitlab-security (~> 0.1.0) + rubocop-rspec (~> 1.15) google-protobuf (3.4.0.2) googleauth (0.5.3) faraday (~> 0.12) @@ -47,7 +52,26 @@ GEM multi_json (1.12.1) multipart-post (2.0.0) os (0.9.6) + parallel (1.12.0) + parser (2.4.0.0) + ast (~> 2.2) + powerpack (0.1.1) public_suffix (2.0.5) + rainbow (2.2.2) + rake + rake (12.1.0) + rubocop (0.50.0) + parallel (~> 1.10) + parser (>= 2.3.3.1, < 3.0) + powerpack (~> 0.1) + rainbow (>= 2.2.2, < 3.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + rubocop-gitlab-security (0.1.0) + rubocop (>= 0.47.1) + rubocop-rspec (1.17.0) + rubocop (>= 0.50.0) + ruby-progressbar (1.8.3) rugged (0.26.0) signet (0.7.3) addressable (~> 2.3) @@ -57,6 +81,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.2) thread_safe (~> 0.1) + unicode-display_width (1.3.0) PLATFORMS ruby @@ -65,6 +90,7 @@ DEPENDENCIES activesupport gitaly-proto (~> 0.37.0) github-linguist (~> 4.7.0) + gitlab-styles (~> 2.0.0) BUNDLED WITH 1.15.4 diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix index ba8831d370c7..63e5758107f7 100644 --- a/pkgs/applications/version-management/gitaly/default.nix +++ b/pkgs/applications/version-management/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "0.38.0"; + version = "0.43.1"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "02s5gjxbjvm990n4h5zkyqj71a9mp4yj83hfl8mma0g7gx00icsf"; + sha256 = "19ggfc5nwv8q1wq739ab8qdfdngpi33431dgfa9593p6ad7v6hyq"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix index 6dc3eb596665..57480f3f337e 100644 --- a/pkgs/applications/version-management/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitaly/gemset.nix @@ -17,6 +17,14 @@ }; version = "2.5.1"; }; + ast = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m"; + type = "gem"; + }; + version = "2.3.0"; + }; charlock_holmes = { source = { remotes = ["https://rubygems.org"]; @@ -68,6 +76,15 @@ }; version = "4.7.6"; }; + gitlab-styles = { + dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k8xrkjx8rcny8p0gsp18wskvn1qbw4rfgdp1f6x0p4xp6dlhjf4"; + type = "gem"; + }; + version = "2.0.0"; + }; google-protobuf = { source = { remotes = ["https://rubygems.org"]; @@ -184,6 +201,31 @@ }; version = "0.9.6"; }; + parallel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qv2yj4sxr36ga6xdxvbq9h05hn10bwcbkqv6j6q1fiixhsdnnzd"; + type = "gem"; + }; + version = "1.12.0"; + }; + parser = { + dependencies = ["ast"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "130rfk8a2ws2fyq52hmi1n0xakylw39wv4x1qhai4z17x2b0k9cq"; + type = "gem"; + }; + version = "2.4.0.0"; + }; + powerpack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43"; + type = "gem"; + }; + version = "0.1.1"; + }; public_suffix = { source = { remotes = ["https://rubygems.org"]; @@ -192,6 +234,58 @@ }; version = "2.0.5"; }; + rainbow = { + dependencies = ["rake"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08w2ghc5nv0kcq5b257h7dwjzjz1pqcavajfdx2xjyxqsvh2y34w"; + type = "gem"; + }; + version = "2.2.2"; + }; + rake = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mfqgpp3m69s5v1rd51lfh5qpjwyia5p4rg337pw8c8wzm6pgfsw"; + type = "gem"; + }; + version = "12.1.0"; + }; + rubocop = { + dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hpd7zcv4y9y750wj630abvmcjwv39dsrj1fjff60ik7gfri0xlz"; + type = "gem"; + }; + version = "0.50.0"; + }; + rubocop-gitlab-security = { + dependencies = ["rubocop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0aw9qmyc6xj6fi0jxp8m4apk358rd91z492ragn6jp4rghkqj5cy"; + type = "gem"; + }; + version = "0.1.0"; + }; + rubocop-rspec = { + dependencies = ["rubocop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hf48ng67yswvshmv4cyysj1rs1z3fnvlycr50jdcgwlynpyxkhs"; + type = "gem"; + }; + version = "1.17.0"; + }; + ruby-progressbar = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "029kv0q3kfq53rjyak4ypn7196l8z4hflfmv4p5787n78z7baiqf"; + type = "gem"; + }; + version = "1.8.3"; + }; rugged = { source = { remotes = ["https://rubygems.org"]; @@ -226,4 +320,12 @@ }; version = "1.2.2"; }; + unicode-display_width = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12pi0gwqdnbx1lv5136v3vyr0img9wr0kxcn4wn54ipq4y41zxq8"; + type = "gem"; + }; + version = "1.3.0"; + }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 734b9d3629c2..d4afdd7b3cd4 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "15zw4b6hnx4hmzn2xlsi4p7jvh6jx4g4smbdidnrzrykzyq4rmpp"; + sha256 = "0v24q14xzmqgwk10m7rqyn6pahd630v3bnc646ij4w8fbgr8hzja"; }; patches = [ ./static-root-path.patch ]; diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index 1fdb529d9ac4..ac05ca4c4847 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "5.9.0"; + version = "5.9.3"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1zjlwivksaqlfxxhxjgpqa3293nhijw76fj7nv0l11820wplc7yf"; + sha256 = "12iil8ap9lbd7skj7xr2v6lsyjdd97svbmyj0n2j8m819fv0x27p"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch index e88dbad071f5..dd1ecafb8bf8 100644 --- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch @@ -3,7 +3,7 @@ index 0b11ce3..ffc3faf 100644 --- a/lib/gitlab_projects.rb +++ b/lib/gitlab_projects.rb @@ -8,7 +8,7 @@ require_relative 'gitlab_metrics' - require_relative 'gitlab_reference_counter' + require_relative 'gitlab_metrics' class GitlabProjects - GLOBAL_HOOKS_DIRECTORY = File.join(ROOT_PATH, 'hooks') @@ -15,7 +15,7 @@ diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index e7d0254..181ec8a 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb -@@ -163,7 +163,8 @@ class GitlabShell +@@ -188,7 +188,8 @@ class GitlabShell end # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is. diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index a91a15e66b85..1f3407eddcf5 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitLab, git, go }: stdenv.mkDerivation rec { - version = "3.0.0"; + version = "3.2.0"; name = "gitlab-workhorse-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "0lz3bgwww640c7gh97vf40a8h6cz4znscl0r00z6iiwkc0xxzp7j"; + sha256 = "1ivqlhvmxhdb8359yh469zl45j00n94b53naqi8jx06kijfsdz4r"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch b/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch index 37f3d2deef54..d8313ecb433a 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch +++ b/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch @@ -2,11 +2,11 @@ diff --git a/internal/git/command.go b/internal/git/command.go index 0e5496c..5778294 100644 --- a/internal/git/command.go +++ b/internal/git/command.go -@@ -16,6 +16,7 @@ func gitCommand(gl_id string, name string, args ...string) *exec.Cmd { +@@ -19,6 +19,7 @@ func gitCommand(gl_id string, name string, args ...string) *exec.Cmd { cmd.Env = []string{ fmt.Sprintf("HOME=%s", os.Getenv("HOME")), fmt.Sprintf("PATH=%s", os.Getenv("PATH")), + fmt.Sprintf("GITLAB_SHELL_CONFIG_PATH=%s", os.Getenv("GITLAB_SHELL_CONFIG_PATH")), fmt.Sprintf("LD_LIBRARY_PATH=%s", os.Getenv("LD_LIBRARY_PATH")), - fmt.Sprintf("GL_ID=%s", gl_id), + fmt.Sprintf("GL_PROTOCOL=http"), } diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index 97af3413b156..b4a457bff6e5 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -23,10 +23,10 @@ gem 'faraday', '~> 0.12' # Authentication libraries gem 'devise', '~> 4.2' gem 'doorkeeper', '~> 4.2.0' -gem 'doorkeeper-openid_connect', '~> 1.1.0' +gem 'doorkeeper-openid_connect', '~> 1.2.0' gem 'omniauth', '~> 1.4.2' gem 'omniauth-auth0', '~> 1.4.1' -gem 'omniauth-azure-oauth2', '~> 0.0.6' +gem 'omniauth-azure-oauth2', '~> 0.0.9' gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.1.1' @@ -105,7 +105,7 @@ gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.1.0' # for Google storage -gem 'google-api-client', '~> 0.8.6' +gem 'google-api-client', '~> 0.13.6' # for aws storage gem 'unf', '~> 0.1.4' @@ -116,7 +116,7 @@ gem 'seed-fu', '~> 2.3.5' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' gem 'deckar01-task_list', '2.0.0' -gem 'gitlab-markup', '~> 1.5.1' +gem 'gitlab-markup', '~> 1.6.2' gem 'redcarpet', '~> 3.4' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 4.2' @@ -239,7 +239,7 @@ gem 'rack-proxy', '~> 0.6.0' gem 'sass-rails', '~> 5.0.6' gem 'uglifier', '~> 2.7.2' -gem 'addressable', '~> 2.3.8' +gem 'addressable', '~> 2.5.2' gem 'bootstrap-sass', '~> 3.3.0' gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' @@ -281,7 +281,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~>0.7.0.beta14' + gem 'prometheus-client-mmap', '~>0.7.0.beta18' gem 'raindrops', '~> 0.18' end @@ -356,12 +356,13 @@ end group :test do gem 'shoulda-matchers', '~> 3.1.2', require: false gem 'email_spec', '~> 1.6.0' - gem 'json-schema', '~> 2.6.2' + gem 'json-schema', '~> 2.8.0' gem 'webmock', '~> 2.3.2' gem 'test_after_commit', '~> 1.1' gem 'sham_rack', '~> 1.3.6' gem 'timecop', '~> 0.8.0' gem 'concurrent-ruby', '~> 1.0.5' + gem 'test-prof', '~> 0.2.5' end gem 'octokit', '~> 4.6.2' @@ -397,7 +398,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.33.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index 61c5335962b0..fd3aab2d54ad 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -47,7 +47,8 @@ GEM adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) - addressable (2.3.8) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) akismet (2.0.0) allocations (1.0.5) arel (6.0.4) @@ -64,10 +65,6 @@ GEM attr_encrypted (3.0.3) encryptor (~> 3.0.0) attr_required (1.0.0) - autoparse (0.3.3) - addressable (>= 2.3.1) - extlib (>= 0.9.15) - multi_json (>= 1.0.0) autoprefixer-rails (6.2.3) execjs json @@ -85,7 +82,7 @@ GEM coderay (>= 1.0.0) erubis (>= 2.6.6) rack (>= 0.9.0) - bindata (2.3.5) + bindata (2.4.1) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) bootstrap-sass (3.3.6) @@ -148,6 +145,8 @@ GEM debugger-ruby_core_source (1.3.8) deckar01-task_list (2.0.0) html-pipeline + declarative (0.0.10) + declarative-option (0.1.0) default_value_for (3.0.2) activerecord (>= 3.2.0, < 5.1) descendants_tracker (0.0.4) @@ -169,9 +168,9 @@ GEM docile (1.1.5) domain_name (0.5.20161021) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.2.0) + doorkeeper (4.2.6) railties (>= 4.2) - doorkeeper-openid_connect (1.1.2) + doorkeeper-openid_connect (1.2.0) doorkeeper (~> 4.0) json-jwt (~> 1.6) dropzonejs-rails (0.7.2) @@ -190,13 +189,12 @@ GEM excon (0.57.1) execjs (2.6.0) expression_parser (0.9.0) - extlib (0.9.16) factory_girl (4.7.0) activesupport (>= 3.0.0) factory_girl_rails (4.7.0) factory_girl (~> 4.7.0) railties (>= 3.0.0) - faraday (0.12.1) + faraday (0.12.2) multipart-post (>= 1.2, < 3) faraday_middleware (0.11.0.1) faraday (>= 0.7.4, < 1.0) @@ -277,7 +275,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.33.0) + gitaly-proto (0.39.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -290,12 +288,12 @@ GEM flowdock (~> 0.7) gitlab-grit (>= 2.4.1) multi_json - gitlab-grit (2.8.1) + gitlab-grit (2.8.2) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) - mime-types (>= 1.16, < 3) + mime-types (>= 1.16) posix-spawn (~> 0.3) - gitlab-markup (1.5.1) + gitlab-markup (1.6.2) gitlab_omniauth-ldap (2.0.4) net-ldap (~> 0.16) omniauth (~> 1.3) @@ -321,20 +319,16 @@ GEM json multi_json request_store (>= 1.0) - google-api-client (0.8.7) - activesupport (>= 3.2, < 5.0) - addressable (~> 2.3) - autoparse (~> 0.3) - extlib (~> 0.9) - faraday (~> 0.9) - googleauth (~> 0.3) - launchy (~> 2.4) - multi_json (~> 1.10) - retriable (~> 1.4) - signet (~> 0.6) + google-api-client (0.13.6) + addressable (~> 2.5, >= 2.5.1) + googleauth (~> 0.5) + httpclient (>= 2.8.1, < 3.0) + mime-types (~> 3.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) google-protobuf (3.4.0.2) - googleauth (0.5.1) - faraday (~> 0.9) + googleauth (0.5.3) + faraday (~> 0.12) jwt (~> 1.4) logging (~> 2.0) memoist (~> 0.12) @@ -359,7 +353,7 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.4.5) + grpc (1.6.0) google-protobuf (~> 3.1) googleauth (~> 0.5.1) haml (4.0.7) @@ -418,14 +412,14 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.6) - json-jwt (1.7.1) + json-jwt (1.7.2) activesupport bindata multi_json (>= 1.3) securecompare url_safe_base64 - json-schema (2.6.2) - addressable (~> 2.3.8) + json-schema (2.8.0) + addressable (>= 2.4) jwt (1.5.6) kaminari (1.0.1) activesupport (>= 4.1.0) @@ -477,18 +471,20 @@ GEM mail (2.6.6) mime-types (>= 1.16, < 4) mail_room (0.9.1) - memoist (0.15.0) + memoist (0.16.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.8.2) - mime-types (2.99.3) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_mime (0.1.4) mini_portile2 (2.3.0) minitest (5.7.0) mmap2 (2.2.7) mousetrap-rails (1.4.6) - multi_json (1.12.1) + multi_json (1.12.2) multi_xml (0.6.0) multipart-post (2.0.0) mustermann (1.0.0) @@ -518,10 +514,10 @@ GEM omniauth-oauth2 (~> 1.1) omniauth-authentiq (0.3.1) omniauth-oauth2 (~> 1.3, >= 1.3.1) - omniauth-azure-oauth2 (0.0.6) + omniauth-azure-oauth2 (0.0.9) jwt (~> 1.0) omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) + omniauth-oauth2 (~> 1.4) omniauth-cas3 (1.1.4) addressable (~> 2.3) nokogiri (~> 1.7, >= 1.7.1) @@ -547,7 +543,7 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.3.1) + omniauth-oauth2 (1.4.0) oauth2 (~> 1.0) omniauth (~> 1.2) omniauth-oauth2-generic (0.2.2) @@ -626,7 +622,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.7.0.beta14) + prometheus-client-mmap (0.7.0.beta18) mmap2 (~> 2.2, >= 2.2.7) pry (0.10.4) coderay (~> 1.1.0) @@ -637,6 +633,7 @@ GEM pry (~> 0.10) pry-rails (0.3.5) pry (>= 0.9.10) + public_suffix (3.0.0) pyu-ruby-sasl (0.0.3.3) rack (1.6.8) rack-accept (0.4.5) @@ -686,7 +683,7 @@ GEM rainbow (2.2.2) rake raindrops (0.18.0) - rake (12.0.0) + rake (12.1.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) rbnacl (4.0.2) @@ -719,6 +716,10 @@ GEM redis-store (~> 1.2.0) redis-store (1.2.0) redis (>= 2.2) + representable (3.0.4) + declarative (< 0.1.0) + declarative-option (< 0.2.0) + uber (< 0.2.0) request_store (1.3.1) responders (2.3.0) railties (>= 4.2.0, < 5.1) @@ -726,7 +727,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - retriable (1.4.1) + retriable (3.1.1) rinku (2.0.0) rotp (2.1.2) rouge (2.2.1) @@ -884,6 +885,7 @@ GEM ffi sysexits (1.2.0) temple (0.7.7) + test-prof (0.2.5) test_after_commit (1.1.0) activerecord (>= 3.2) text (1.3.1) @@ -904,12 +906,13 @@ GEM tzinfo (1.2.3) thread_safe (~> 0.1) u2f (0.2.1) + uber (0.1.0) uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) + unf_ext (0.0.7.4) unicode-display_width (1.3.0) unicorn (5.1.0) kgio (~> 2.6) @@ -965,7 +968,7 @@ DEPENDENCIES activerecord-nulldb-adapter activerecord_sane_schema_dumper (= 0.2) acts-as-taggable-on (~> 4.0) - addressable (~> 2.3.8) + addressable (~> 2.5.2) akismet (~> 2.0) allocations (~> 1.0) asana (~> 0.6.0) @@ -1002,7 +1005,7 @@ DEPENDENCIES devise-two-factor (~> 3.0.0) diffy (~> 3.1.0) doorkeeper (~> 4.2.0) - doorkeeper-openid_connect (~> 1.1.0) + doorkeeper-openid_connect (~> 1.2.0) dropzonejs-rails (~> 0.7.1) email_reply_trimmer (~> 0.1) email_spec (~> 1.6.0) @@ -1027,15 +1030,15 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.33.0) + gitaly-proto (~> 0.39.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab-markup (~> 1.5.1) + gitlab-markup (~> 1.6.2) gitlab_omniauth-ldap (~> 2.0.4) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) gon (~> 6.1.0) - google-api-client (~> 0.8.6) + google-api-client (~> 0.13.6) gpgme grape (~> 1.0) grape-entity (~> 0.6.0) @@ -1053,7 +1056,7 @@ DEPENDENCIES jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) jquery-rails (~> 4.1.0) - json-schema (~> 2.6.2) + json-schema (~> 2.8.0) jwt (~> 1.5.6) kaminari (~> 1.0) knapsack (~> 1.11.0) @@ -1077,7 +1080,7 @@ DEPENDENCIES omniauth (~> 1.4.2) omniauth-auth0 (~> 1.4.1) omniauth-authentiq (~> 0.3.1) - omniauth-azure-oauth2 (~> 0.0.6) + omniauth-azure-oauth2 (~> 0.0.9) omniauth-cas3 (~> 1.1.4) omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.1.1) @@ -1103,7 +1106,7 @@ DEPENDENCIES pg (~> 0.18.2) poltergeist (~> 1.9.0) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.7.0.beta14) + prometheus-client-mmap (~> 0.7.0.beta18) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) @@ -1166,6 +1169,7 @@ DEPENDENCIES stackprof (~> 0.2.10) state_machines-activerecord (~> 0.4.0) sys-filesystem (~> 1.1.6) + test-prof (~> 0.2.5) test_after_commit (~> 1.1) thin (~> 1.7.0) timecop (~> 0.8.0) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 657221d4b420..bc3ca9192bcb 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -18,11 +18,11 @@ let }; }; - version = "10.0.2"; + version = "10.1.1"; gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; - sha256 = "0jsqjarvjzbxv1yiddzp5xwsqqrq5cvam0xn749p1vzqhcp8pahc"; + sha256 = "0xvzxcygy6ffqm24rk6v9gs6g9r744vpwwvk9d00wjla7hwmq3w2"; }; in @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "1602d6nkb41gg80n6p0wqxrjsn79s0z3817461d8dw2ha2dmbl34"; + sha256 = "0p118msad6l12pd4q3vkvjggiiasbkh6pnl94riqyb5zkb7yrb1a"; }; patches = [ diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index 34567ddb3ea4..4fb4c48b0dee 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -115,12 +115,13 @@ version = "0.2.0"; }; addressable = { + dependencies = ["public_suffix"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1533axm85gpz267km9gnfarf9c78g2scrysd6b8yw33vmhkz2km6"; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; type = "gem"; }; - version = "2.3.8"; + version = "2.5.2"; }; akismet = { source = { @@ -205,15 +206,6 @@ }; version = "1.0.0"; }; - autoparse = { - dependencies = ["addressable" "extlib" "multi_json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1q5wkd8gc2ckmgry9fba4b8vxb5kr8k8gqq2wycbirgq06mbllb6"; - type = "gem"; - }; - version = "0.3.3"; - }; autoprefixer-rails = { dependencies = ["execjs" "json"]; source = { @@ -292,10 +284,10 @@ bindata = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07i51jzq9iamw40xmmcgkrdq4m8f0vb5gp53p6q1vggj7z53q3v7"; + sha256 = "0anbg203zjr4crql20ss5b9xg2c6a7j8nm6hs8w3ll1h1akkpp2z"; type = "gem"; }; - version = "2.3.5"; + version = "2.4.1"; }; binding_of_caller = { dependencies = ["debug_inspector"]; @@ -592,6 +584,22 @@ }; version = "2.0.0"; }; + declarative = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j"; + type = "gem"; + }; + version = "0.0.10"; + }; + declarative-option = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p"; + type = "gem"; + }; + version = "0.1.0"; + }; default_value_for = { dependencies = ["activerecord"]; source = { @@ -665,19 +673,19 @@ dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hs8r280k7a1kibzxrhifjps880n43jfrybf4mqpffw669jrwk3v"; + sha256 = "0r5rfvjjnlf9cn97cdrfw260zkg785k4197xqidgb35445k62mah"; type = "gem"; }; - version = "4.2.0"; + version = "4.2.6"; }; doorkeeper-openid_connect = { dependencies = ["doorkeeper" "json-jwt"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pla85j5wxra0k9rhj04g2ai5d5jg97fiavi0s9v2hjba2l54cni"; + sha256 = "13k0xlr1grjj8ri26qy2zwbgi3fqxinvnygh53bnyi9qcynx5827"; type = "gem"; }; - version = "1.1.2"; + version = "1.2.0"; }; dropzonejs-rails = { dependencies = ["rails"]; @@ -778,14 +786,6 @@ }; version = "0.9.0"; }; - extlib = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cbw3vgb189z3vfc1arijmsd604m3w5y5xvdfkrblc9qh7sbk2rh"; - type = "gem"; - }; - version = "0.9.16"; - }; factory_girl = { dependencies = ["activesupport"]; source = { @@ -808,10 +808,10 @@ dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wkx9844vacsk2229xbc27djf6zw15kqd60ifr78whf9mp9v6l03"; + sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2"; type = "gem"; }; - version = "0.12.1"; + version = "0.12.2"; }; faraday_middleware = { dependencies = ["faraday"]; @@ -1071,10 +1071,10 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f15idw1850kwi0na6x3xlk13ljwx3mpfnxfv58631cmb3ac7wf8"; + sha256 = "0irc3yfyr5li2ki6w03znsklnk0qx3srk4wrb7jav042c4kw325k"; type = "gem"; }; - version = "0.33.0"; + version = "0.39.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -1106,18 +1106,18 @@ dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n"; + sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.2"; }; gitlab-markup = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1aam7zvvbai5nv7vf0c0640pvik6s71f276lip4yb4slbg0pfpn2"; + sha256 = "114jfbyyfwad609k1l1fcmbzszb3frdchh83gdwndkglllvprhjz"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.2"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; @@ -1174,13 +1174,13 @@ version = "6.1.0"; }; google-api-client = { - dependencies = ["activesupport" "addressable" "autoparse" "extlib" "faraday" "googleauth" "launchy" "multi_json" "retriable" "signet"]; + dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11wr57j9fp6x6fym4k1a7jqp72qgc8l24mfwb4y55bbvdmkv1b2d"; + sha256 = "0ac9qa0kwnirkvwz2w9zf07lqcgbmnvgd1wg8xxyjbadwsbpyf1y"; type = "gem"; }; - version = "0.8.7"; + version = "0.13.6"; }; google-protobuf = { source = { @@ -1194,10 +1194,10 @@ dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nzkg63s161c6jsia92c1jfwpayzbpwn588smd286idn07y0az2m"; + sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli"; type = "gem"; }; - version = "0.5.1"; + version = "0.5.3"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1248,10 +1248,10 @@ dependencies = ["google-protobuf" "googleauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zhci260088zlghpaz6ania1blz1dd7lgklsjnqk1vcymhpr6b38"; + sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52"; type = "gem"; }; - version = "1.4.5"; + version = "1.6.0"; }; haml = { dependencies = ["tilt"]; @@ -1471,19 +1471,19 @@ dependencies = ["activesupport" "bindata" "multi_json" "securecompare" "url_safe_base64"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ylvlnb6assan9qkhz1vq1gbfwxg35q9a8f8qhlyx0fak5fyks23"; + sha256 = "15a3v498lvsshzgjnk2dmyvjv87y3lffq71axj5xq3iz4mp1r4b2"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.2"; }; json-schema = { dependencies = ["addressable"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15bva4w940ckan3q89in5f98s8zz77nxglylgm98697wa4fbfqp9"; + sha256 = "11di8qyam6bmqn0fvvvf3crgaqy4sil0d406ymx0jacn3ff98ymz"; type = "gem"; }; - version = "2.6.2"; + version = "2.8.0"; }; jwt = { source = { @@ -1662,10 +1662,10 @@ memoist = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0yd3rd7bnbhn9n47qlhcii5z89liabdjhy3is3h6gq77gyfk4f5q"; + sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh"; type = "gem"; }; - version = "0.15.0"; + version = "0.16.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -1685,12 +1685,21 @@ version = "0.8.2"; }; mime-types = { + dependencies = ["mime-types-data"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9"; + sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m"; type = "gem"; }; - version = "2.99.3"; + version = "3.1"; + }; + mime-types-data = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm"; + type = "gem"; + }; + version = "3.2016.0521"; }; mimemagic = { source = { @@ -1743,10 +1752,10 @@ multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x"; type = "gem"; }; - version = "1.12.1"; + version = "1.12.2"; }; multi_xml = { source = { @@ -1895,10 +1904,10 @@ dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qay454zvyas8xfnfkycqpjkafaq5pw4gaji176cdfw0blhviz0s"; + sha256 = "0ck5616fjik0dw89xvak1mi8ijcv10lsh6n9h4107l5dys2g3jfx"; type = "gem"; }; - version = "0.0.6"; + version = "0.0.9"; }; omniauth-cas3 = { dependencies = ["addressable" "nokogiri" "omniauth"]; @@ -1976,10 +1985,10 @@ dependencies = ["oauth2" "omniauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mskwlw5ibx9mz7ywqji6mm56ikf7mglbnfc02qhg6ry527jsxdm"; + sha256 = "0aykbg5qfm37ywrq34dydrhxa5jwpski71dpspgp2fi6dinx09f5"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; omniauth-oauth2-generic = { dependencies = ["omniauth-oauth2"]; @@ -2247,10 +2256,10 @@ dependencies = ["mmap2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r9s30hypcpw4abxlzcjlkcwkckqvr5sbph3blbl0rq2r8c8h25p"; + sha256 = "1fgkilpiha338mvfkj5rwhny3vld0nb3v1vgbrlxbhnvch26wakh"; type = "gem"; }; - version = "0.7.0.beta14"; + version = "0.7.0.beta18"; }; pry = { dependencies = ["coderay" "method_source" "slop"]; @@ -2279,6 +2288,14 @@ }; version = "0.3.5"; }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f"; + type = "gem"; + }; + version = "3.0.0"; + }; pyu-ruby-sasl = { source = { remotes = ["https://rubygems.org"]; @@ -2431,10 +2448,10 @@ rake = { source = { remotes = ["https://rubygems.org"]; - sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; + sha256 = "0mfqgpp3m69s5v1rd51lfh5qpjwyia5p4rg337pw8c8wzm6pgfsw"; type = "gem"; }; - version = "12.0.0"; + version = "12.1.0"; }; rblineprof = { dependencies = ["debugger-ruby_core_source"]; @@ -2575,6 +2592,15 @@ }; version = "1.2.0"; }; + representable = { + dependencies = ["declarative" "declarative-option" "uber"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07"; + type = "gem"; + }; + version = "3.0.4"; + }; request_store = { source = { remotes = ["https://rubygems.org"]; @@ -2604,10 +2630,10 @@ retriable = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1cmhwgv5r4vn7iqy4bfbnbb73pzl8ik69zrwq9vdim45v8b13gsj"; + sha256 = "0pnriyn9zh120hxm92vb12hfsf7c98nawyims1shxj3ldpl0l3ar"; type = "gem"; }; - version = "1.4.1"; + version = "3.1.1"; }; rinku = { source = { @@ -3195,6 +3221,14 @@ }; version = "0.7.7"; }; + test-prof = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08nvn3c1mzgcjgk9lr3py0zjd8fjjrm3ncn9rpqkfbx429mgw2l3"; + type = "gem"; + }; + version = "0.2.5"; + }; test_after_commit = { dependencies = ["activerecord"]; source = { @@ -3296,6 +3330,14 @@ }; version = "0.2.1"; }; + uber = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv"; + type = "gem"; + }; + version = "0.1.0"; + }; uglifier = { dependencies = ["execjs" "json"]; source = { @@ -3317,10 +3359,10 @@ unf_ext = { source = { remotes = ["https://rubygems.org"]; - sha256 = "04d13bp6lyg695x94whjwsmzc2ms72d94vx861nx1y40k3817yp8"; + sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb"; type = "gem"; }; - version = "0.0.7.2"; + version = "0.0.7.4"; }; unicode-display_width = { source = { diff --git a/pkgs/applications/version-management/gitlab/nulladapter.patch b/pkgs/applications/version-management/gitlab/nulladapter.patch index 70195fe821a0..3b30ff03346b 100644 --- a/pkgs/applications/version-management/gitlab/nulladapter.patch +++ b/pkgs/applications/version-management/gitlab/nulladapter.patch @@ -14,7 +14,7 @@ diff --git a/Gemfile.lock b/Gemfile.lock index 38944248f9..08ce4486ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock -@@ -32,6 +32,8 @@ GEM +@@ -33,6 +33,8 @@ GEM activemodel (= 4.2.8) activesupport (= 4.2.8) arel (~> 6.0) @@ -23,11 +23,11 @@ index 38944248f9..08ce4486ba 100644 activerecord_sane_schema_dumper (0.2) rails (>= 4, < 5) activesupport (4.2.8) -@@ -926,6 +928,7 @@ PLATFORMS +@@ -963,6 +965,7 @@ PLATFORMS DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) + activerecord-nulldb-adapter activerecord_sane_schema_dumper (= 0.2) acts-as-taggable-on (~> 4.0) - addressable (~> 2.3.8) + addressable (~> 2.5.2) diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index c88f525715e0..39c7c28847c4 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -27,20 +27,20 @@ diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 0b33783869..cd4e41d9bd 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example -@@ -521,7 +521,7 @@ production: &base +@@ -574,7 +574,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: - bin_path: /usr/bin/git + bin_path: git - # The next value is the maximum memory size grit can use - # Given in number of bytes per git object (e.g. a commit) - # This value can be increased if you have very large commits + + ## Webpack settings + # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 8ddf8e4d2e..559cf9adf7 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb -@@ -219,7 +219,7 @@ Settings.gitlab['user'] ||= 'git' +@@ -252,7 +252,7 @@ Settings.gitlab['user'] ||= 'git' Settings.gitlab['user_home'] ||= begin Etc.getpwnam(Settings.gitlab['user']).dir rescue ArgumentError # no user configured @@ -49,15 +49,15 @@ index 8ddf8e4d2e..559cf9adf7 100644 end Settings.gitlab['time_zone'] ||= nil Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? -@@ -454,7 +454,7 @@ Settings.backup['upload']['storage_class'] ||= nil +@@ -491,7 +491,7 @@ Settings.backup['upload']['storage_class'] ||= nil + # Git # Settings['git'] ||= Settingslogic.new({}) - Settings.git['max_size'] ||= 20971520 # 20.megabytes --Settings.git['bin_path'] ||= '/usr/bin/git' -+Settings.git['bin_path'] ||= 'git' - Settings.git['timeout'] ||= 10 +-Settings.git['bin_path'] ||= '/usr/bin/git' ++Settings.git['bin_path'] ||= 'git' # Important: keep the satellites.path setting until GitLab 9.0 at + # least. This setting is fed to 'rm -rf' in diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb index 59b21149a9..4f4a39a06c 100644 --- a/lib/gitlab/logger.rb diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index d0bea6d426d5..25a85f4b92d7 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "-std=c++11"; # fix build with glm >= 0.9.6.0 meta = with stdenv.lib; { - homepage = http://code.google.com/p/gource/; + homepage = http://gource.io/; description = "A Software version control visualization tool"; license = licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 1a0c506a19d4..6466e5ab0ae5 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.1.1"; + version = "4.3.1"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "14fy5p5hx4iij5kyma9679nrprd9lsjr6j047bfyfrwa3l4knj2g"; + sha256 = "0lxppjdqjmwl5y8fmp2am0my7a3mks811yg4fff7cx0569hdp62n"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 88055f2a8241..44313f9499f5 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -1,6 +1,7 @@ { mkDerivation, lib, fetchurl, extra-cmake-modules, makeWrapper, + libpthreadstubs, libXdmcp, qtsvg, qtx11extras, ki18n, kdelibs4support, kio, kmediaplayer, kwidgetsaddons, phonon, cairo, mplayer }: @@ -29,6 +30,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules makeWrapper ]; buildInputs = [ + libpthreadstubs libXdmcp qtsvg qtx11extras ki18n kdelibs4support kio kmediaplayer kwidgetsaddons phonon cairo ]; diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix new file mode 100644 index 000000000000..9c6a49c55136 --- /dev/null +++ b/pkgs/applications/video/lightworks/default.nix @@ -0,0 +1,87 @@ +{ stdenv, fetchurl, dpkg, makeWrapper, patchelf, buildFHSUserEnv +, gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, mesa_glu +, nvidia_cg_toolkit, zlib, openssl, portaudio +}: +let + fullPath = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc + gnome3.gtk + gdk_pixbuf + cairo + libjpeg_original + glib + gnome2.pango + mesa_glu + nvidia_cg_toolkit + zlib + openssl + portaudio + ]; + + lightworks = stdenv.mkDerivation rec { + version = "14.0.0"; + name = "lightworks-${version}"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://downloads.lwks.com/v14/lwks-14.0.0-amd64.deb"; + sha256 = "66eb9f9678d979db76199f1c99a71df0ddc017bb47dfda976b508849ab305033"; + } + else throw "${name} is not supported on ${stdenv.system}"; + + buildInputs = [ dpkg makeWrapper ]; + + phases = [ "unpackPhase" "installPhase" ]; + unpackPhase = "dpkg-deb -x ${src} ./"; + + installPhase = '' + mkdir -p $out/bin + substitute usr/bin/lightworks $out/bin/lightworks \ + --replace "/usr/lib/lightworks" "$out/lib/lightworks" + chmod +x $out/bin/lightworks + + cp -r usr/lib $out + + # /usr/share/fonts is not normally searched + # This adds it to lightworks' search path while keeping the default + # using the FONTCONFIG_FILE env variable + echo " + + + /usr/share/fonts/truetype + /etc/fonts/fonts.conf + " > $out/lib/lightworks/fonts.conf + + patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/lib/lightworks/ntcardvt + + wrapProgram $out/lib/lightworks/ntcardvt \ + --prefix LD_LIBRARY_PATH : ${fullPath}:$out/lib/lightworks \ + --set FONTCONFIG_FILE $out/lib/lightworks/fonts.conf + + cp -r usr/share $out/share + ''; + + dontPatchELF = true; + + meta = { + description = "Professional Non-Linear Video Editor"; + homepage = "https://www.lwks.com/"; + license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.antonxy ]; + platforms = [ "x86_64-linux" ]; + }; + }; + +# Lightworks expects some files in /usr/share/lightworks +in buildFHSUserEnv rec { + name = "lightworks"; + + targetPkgs = pkgs: [ + lightworks + ]; + + runScript = "lightworks"; +} diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 2d7f7144f5ff..183722beed81 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "16.0.0"; + version = "17.0.0"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0zdmjp0f7sh0bkaj0ls4sy4sg9qdq9ycrl18hlkafnj9xnbijgnn"; + sha256 = "1v74rxf9wm0sn2illy0hp36hpwz7q04y0k32wq6wn7qrnzkzcc88"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index fe885d86456b..f386b457fc50 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,17 +1,17 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig , qtbase, qtmultimedia, qtsvg -, lxqt, libvncserver, libvirt, pixman, spice_gtk, spice_protocol +, lxqt, libvncserver, libvirt, pcre, pixman, spice_gtk, spice_protocol }: mkDerivation rec { name = "virt-manager-qt-${version}"; - version = "0.43.72"; + version = "0.45.75"; src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; rev = "${version}"; - sha256 = "0m8aqs58wnk404z2hav5j4yjsy8f0vfsm771pm0gprsfbx4sm3qg"; + sha256 = "1s59g7kkz8481y8yyf89f549xwbg1978zj9ds61iy94mwz80b38n"; }; cmakeFlags = [ @@ -19,21 +19,24 @@ mkDerivation rec { ]; buildInputs = [ - qtbase qtmultimedia qtsvg lxqt.qtermwidget + # virt-manager-qt currently does not compile with qtermwidget-0.8.0 + qtbase qtmultimedia qtsvg lxqt.qtermwidget_0_7_1 libvirt libvncserver pixman spice_gtk spice_protocol ]; nativeBuildInputs = [ cmake pkgconfig ]; + enableParallelBuilding = true; + meta = with lib; { - homepage = http://f1ash.github.io/qt-virt-manager; + homepage = https://f1ash.github.io/qt-virt-manager; description = "Desktop user interface for managing virtual machines (QT)"; longDescription = '' The virt-manager application is a desktop user interface for managing virtual machines through libvirt. It primarily targets KVM VMs, but also manages Xen and LXC (linux containers). ''; - license = licenses.gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index fbc0cc5ded0f..4f6da3c7cd91 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -190,7 +190,10 @@ in stdenv.mkDerivation { cp -rv out/linux.*/${buildType}/bin/src "$modsrc" ''; - passthru = { inherit version; /* for guest additions */ }; + passthru = { + inherit version; # for guest additions + inherit extensionPack; # for inclusion in profile to prevent gc + }; meta = { description = "PC emulator"; diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 614122a3b24e..308913adf89c 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -32,13 +32,15 @@ let udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir alsaLib ]; + + xsa = import ./xsa-patches.nix { inherit fetchpatch; }; in callPackage (import ./generic.nix (rec { version = "4.5.5"; src = fetchurl { - url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz"; + url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2"; }; @@ -183,227 +185,52 @@ callPackage (import ./generic.nix (rec { ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" ++ optional (withInternalOVMF) "--enable-ovmf"; - patches = - [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch - ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch - ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch - (xsaPatch { - name = "190-4.5"; - sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm"; - }) - (xsaPatch { - name = "191-4.6"; - sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg"; - }) - (xsaPatch { - name = "192-4.5"; - sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm"; - }) - (xsaPatch { - name = "193-4.5"; - sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr"; - }) - (xsaPatch { - name = "195"; - sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7"; - }) - (xsaPatch { - name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject"; - sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6"; - }) - (xsaPatch { - name = "196-0002-x86-svm-Fix-injection-of-software-interrupts"; - sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz"; - }) - (xsaPatch { - name = "198"; - sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9"; - }) - (xsaPatch { - name = "200-4.6"; - sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7"; - }) - (xsaPatch { - name = "202-4.6"; - sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f"; - }) - (xsaPatch { - name = "204-4.5"; - sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp"; - }) - (xsaPatch { - name = "206-4.5/0001-xenstored-apply-a-write-transaction-rate-limit"; - sha256 = "07vsm8mlbxh2s01ny2xywnm1bqhhxas1az31fzwb6f1g14vkzwm4"; - }) - (xsaPatch { - name = "206-4.5/0002-xenstored-Log-when-the-write-transaction-rate-limit-"; - sha256 = "17pnvxjmhny22abwwivacfig4vfsy5bqlki07z236whc2y7yzbsx"; - }) - (xsaPatch { - name = "206-4.5/0003-oxenstored-refactor-putting-response-on-wire"; - sha256 = "0xf566yicnisliy82cydb2s9k27l3bxc43qgmv6yr2ir3ixxlw5s"; - }) - (xsaPatch { - name = "206-4.5/0004-oxenstored-remove-some-unused-parameters"; - sha256 = "16cqx9i0w4w3x06qqdk9rbw4z96yhm0kbc32j40spfgxl82d1zlk"; - }) - (xsaPatch { - name = "206-4.5/0005-oxenstored-refactor-request-processing"; - sha256 = "1g2hzlv7w03sqnifbzda85mwlz3bw37rk80l248180sv3k7k6bgv"; - }) - (xsaPatch { - name = "206-4.5/0006-oxenstored-keep-track-of-each-transaction-s-operatio"; - sha256 = "0n65yfxvpfd4cz95dpbwqj3nablyzq5g7a0klvi2y9zybhch9cmg"; - }) - (xsaPatch { - name = "206-4.5/0007-oxenstored-move-functions-that-process-simple-operat"; - sha256 = "0qllvbc9rnj7jhhlslxxs35gvphvih0ywz52jszj4irm23ka5vnz"; - }) - (xsaPatch { - name = "206-4.5/0008-oxenstored-replay-transaction-upon-conflict"; - sha256 = "0lixkxjfzciy9l0f980cmkr8mcsx14c289kg0mn5w1cscg0hb46g"; - }) - (xsaPatch { - name = "206-4.5/0009-oxenstored-log-request-and-response-during-transacti"; - sha256 = "09ph8ddcx0k7rndd6hx6kszxh3fhxnvdjsq13p97n996xrpl1x7b"; - }) - (xsaPatch { - name = "206-4.5/0010-oxenstored-allow-compilation-prior-to-OCaml-3.12.0"; - sha256 = "1y0m7sqdz89z2vs4dfr45cyvxxas323rxar0xdvvvivgkgxawvxj"; - }) - (xsaPatch { - name = "206-4.5/0011-oxenstored-comments-explaining-some-variables"; - sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p"; - }) - (xsaPatch { - name = "206-4.5/0012-oxenstored-handling-of-domain-conflict-credit"; - sha256 = "12zgid5y9vrhhpk2syxp0x01lzzr6447fa76n6rjmzi1xgdzpaf8"; - }) - (xsaPatch { - name = "206-4.5/0013-oxenstored-ignore-domains-with-no-conflict-credit"; - sha256 = "0v3g9pm60w6qi360hdqjcw838s0qcyywz9qpl8gzmhrg7a35avxl"; - }) - (xsaPatch { - name = "206-4.5/0014-oxenstored-add-transaction-info-relevant-to-history-"; - sha256 = "0vv3w0h5xh554i9v2vbc8gzm8wabjf2vzya3dyv5yzvly6ygv0sb"; - }) - (xsaPatch { - name = "206-4.5/0015-oxenstored-support-commit-history-tracking"; - sha256 = "1iv2vy29g437vj73x9p33rdcr5ln2q0kx1b3pgxq202ghbc1x1zj"; - }) - (xsaPatch { - name = "206-4.5/0016-oxenstored-only-record-operations-with-side-effects-"; - sha256 = "1cjkw5ganbg6lq78qsg0igjqvbgph3j349faxgk1p5d6nr492zzy"; - }) - (xsaPatch { - name = "206-4.5/0017-oxenstored-discard-old-commit-history-on-txn-end"; - sha256 = "0lm15lq77403qqwpwcqvxlzgirp6ffh301any9g401hs98f9y4ps"; - }) - (xsaPatch { - name = "206-4.5/0018-oxenstored-track-commit-history"; - sha256 = "1jh92p6vjhkm3bn5vz260npvsjji63g2imsxflxs4f3r69sz1nkd"; - }) - (xsaPatch { - name = "206-4.5/0019-oxenstored-blame-the-connection-that-caused-a-transa"; - sha256 = "17k264pk0fvsamj85578msgpx97mw63nmj0j9v5hbj4bgfazvj4h"; - }) - (xsaPatch { - name = "206-4.5/0020-oxenstored-allow-self-conflicts"; - sha256 = "15z3rd49q0pa72si0s8wjsy2zvbm613d0hjswp4ikc6nzsnsh4qy"; - }) - (xsaPatch { - name = "206-4.5/0021-oxenstored-do-not-commit-read-only-transactions"; - sha256 = "04wpzazhv90lg3228z5i6vnh1z4lzd08z0d0fvc4br6pkd0w4va8"; - }) - (xsaPatch { - name = "206-4.5/0022-oxenstored-don-t-wake-to-issue-no-conflict-credit"; - sha256 = "1shbrn0w68rlywcc633zcgykfccck1a77igmg8ydzwjsbwxsmsjy"; - }) - (xsaPatch { - name = "206-4.5/0023-oxenstored-transaction-conflicts-improve-logging"; - sha256 = "1086y268yh8047k1vxnxs2nhp6izp7lfmq01f1gq5n7jiy1sxcq7"; - }) - (xsaPatch { - name = "206-4.5/0024-oxenstored-trim-history-in-the-frequent_ops-function"; - sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8"; - }) - (xsaPatch { - name = "207"; - sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc"; - }) - (xsaPatch { - name = "212"; - sha256 = "1ggjbbym5irq534a3zc86md9jg8imlpc9wx8xsadb9akgjrr1r8d"; - }) - (xsaPatch { - name = "213-4.5"; - sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm"; - }) - (xsaPatch { - name = "214"; - sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk"; - }) - (xsaPatch { - name = "215"; - sha256 = "0sv8ccc5xp09f1w1gj5a9n3mlsdsh96sdb1n560vh31f4kkd61xs"; - }) - (xsaPatch { - name = "217-4.5"; - sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4"; - }) - (xsaPatch { - name = "218-4.5/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures"; - sha256 = "00y6j3yjxw0igpldsavikmhlxw711k2jsj1qx0s05w2k608gadkq"; - }) - (xsaPatch { - name = "218-4.5/0002-gnttab-fix-unmap-pin-accounting-race"; - sha256 = "0qbbfnnjlpdcd29mzmacfmi859k92c213l91q7w1rg2k6pzx928k"; - }) - (xsaPatch { - name = "218-4.5/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry"; - sha256 = "1cndzvyhf41mk4my6vh3bk9jvh2y4gpmqdhvl9zhxhmppszslqkc"; - }) - (xsaPatch { - name = "218-4.5/0004-gnttab-correct-maptrack-table-accesses"; - sha256 = "02zpb0ffigijacqvyyjylwx3qpgibwslrka7mbxwnclf4s9c03a2"; - }) - (xsaPatch { - name = "219-4.5"; - sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm"; - }) - (xsaPatch { - name = "220-4.5"; - sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp"; - }) - (xsaPatch { - name = "221"; - sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26"; - }) - (xsaPatch { - name = "222-1-4.6"; - sha256 = "1g4dqm5qx4wqlv1520jpfiscph95vllcp4gqp1rdfailk8xi0mcf"; - }) - (xsaPatch { - name = "222-2-4.5"; - sha256 = "1hw8rhc7q4v309f4w11gxfsn5x1pirvxkg7s4kr711fnmvp9hkzd"; - }) - (xsaPatch { - name = "224-4.5/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; - sha256 = "1aislj66ss4cb3v2bh12mrqsyrf288d4h54rj94jjq7h1hnycw7h"; - }) - (xsaPatch { - name = "224-4.5/0002-gnttab-never-create-host-mapping-unless-asked-to"; - sha256 = "1j6fgm1ccb07gg0mi5qmdr0vqwwc3n12z433g1jrija2gbk1x8aq"; - }) - (xsaPatch { - name = "224-4.5/0003-gnttab-correct-logic-to-get-page-references-during-m"; - sha256 = "166kmicwx280fjqjvgigbmhabjksa0hhvqx5h4v6kjlcjpmxqy08"; - }) - (xsaPatch { - name = "224-4.5/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; - sha256 = "1skc0yj1zsn8xgyq1y57bdc0scvvlmd0ynrjwwf1zkias1wlilav"; - }) - ]; + patches = with xsa; flatten [ + ./0001-libxl-Spice-image-compression-setting-support-for-up.patch + ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch + ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch + XSA_190 + XSA_191 + XSA_192 + XSA_193 + XSA_195 + XSA_196 + XSA_198 + XSA_200 + XSA_202_45 + XSA_204_45 + XSA_206_45 + XSA_207 + XSA_212 + XSA_213_45 + XSA_214 + XSA_215 + XSA_217_45 + XSA_218_45 + XSA_219_45 + XSA_220_45 + XSA_221 + XSA_222_45 + XSA_223 + XSA_224_45 + XSA_227_45 + XSA_230 + XSA_231_45 + XSA_232 + XSA_233 + XSA_234_45 + XSA_235_45 + XSA_236_45 + XSA_237_45 + XSA_238_45 + XSA_239_45 + XSA_240_45 + XSA_241 + XSA_242 + XSA_243_45 + XSA_244_45 + XSA_245 + ]; # Fix build on Glibc 2.24. NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 3429545557ad..259dd72a960c 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -27,6 +27,8 @@ let inherit sha256; }); + xsa = import ./xsa-patches.nix { inherit fetchpatch; }; + qemuDeps = [ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir alsaLib @@ -34,11 +36,11 @@ let in callPackage (import ./generic.nix (rec { - version = "4.8.1"; + version = "4.8.2"; src = fetchurl { - url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz"; - sha256 = "158kb1w61jmwxi3fc560s4269hhpxrin9xhm60ljj52njhxias8x"; + url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; + sha256 = "1ydgwbn8ab0s16jrbi3wzaa6j0y3zk0j8pay458qcgayk3qc476b"; }; # Sources needed to build tools and firmwares. @@ -141,68 +143,22 @@ callPackage (import ./generic.nix (rec { ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" ++ optional (withInternalOVMF) "--enable-ovmf"; - patches = - [ (xsaPatch { - name = "213-4.8"; - sha256 = "0ia3zr6r3bqy2h48fdy7p0iz423lniy3i0qkdvzgv5a8m80darr2"; - }) - (xsaPatch { - name = "214"; - sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk"; - }) - (xsaPatch { - name = "217"; - sha256 = "1khs5ilif14dzcm7lmikjzkwsrfzlmir1rgrgzkc411gf18ylzmj"; - }) - (xsaPatch { - name = "218-4.8/0001-gnttab-fix-unmap-pin-accounting-race"; - sha256 = "0r363frai239r2wmwxi48kcr50gbk5l64nja0h9lppi3z2y3dkdd"; - }) - (xsaPatch { - name = "218-4.8/0002-gnttab-Avoid-potential-double-put-of-maptrack-entry"; - sha256 = "07wm06i7frv7bsaykakx3g9h0hfqv96zcadvwf6wv194dggq1plc"; - }) - (xsaPatch { - name = "218-4.8/0003-gnttab-correct-maptrack-table-accesses"; - sha256 = "0ad0irc3p4dmla8sp3frxbh2qciji1dipkslh0xqvy2hyf9p80y9"; - }) - (xsaPatch { - name = "219-4.8"; - sha256 = "16q7kiamy86x8qdvls74wmq5j72kgzgdilryig4q1b21mp0ij1jq"; - }) - (xsaPatch { - name = "220-4.8"; - sha256 = "0214qyqx7qap5y1pdi9fm0vz4y2fbyg71gaq36fisknj35dv2mh5"; - }) - (xsaPatch { - name = "221"; - sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26"; - }) - (xsaPatch { - name = "222-1"; - sha256 = "0x02x4kqwfw255638fh2zcxwig1dy6kadlmqim1jgnjgmrvvqas2"; - }) - (xsaPatch { - name = "222-2-4.8"; - sha256 = "1xhyp6q3c5l8djh965g1i8201m2wvhms8k886h4sn30hks38giin"; - }) - (xsaPatch { - name = "224-4.8/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; - sha256 = "1k326yan5811qzyvpdfkv801a19nyd09nsqayi8gyh58xx9c21m4"; - }) - (xsaPatch { - name = "224-4.8/0002-gnttab-never-create-host-mapping-unless-asked-to"; - sha256 = "06nj1x59bbx9hrj26xmvbw8z805lfqhld9hm0ld0fs6dmcpqzcck"; - }) - (xsaPatch { - name = "224-4.8/0003-gnttab-correct-logic-to-get-page-references-during-m"; - sha256 = "0kmag6fdsskgplcvzqp341yfi6pgc14wvjj58bp7ydb9hdk53qx2"; - }) - (xsaPatch { - name = "224-4.8/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; - sha256 = "1ww80pi7jr4gjpymkcw8qxmr5as18b2asdqv35527nqprylsff9f"; - }) - ]; + patches = with xsa; flatten [ + XSA_231 + XSA_232 + XSA_233 + XSA_234_48 + XSA_236 + XSA_237_48 + XSA_238 + XSA_239 + XSA_240_48 + XSA_241 + XSA_242 + XSA_243_48 + XSA_244 + XSA_245 + ]; # Fix build on Glibc 2.24. NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix new file mode 100644 index 000000000000..fd85c85f22bb --- /dev/null +++ b/pkgs/applications/virtualization/xen/xsa-patches.nix @@ -0,0 +1,774 @@ +{ fetchpatch }: + +let + xsaPatch = { name , sha256 }: (fetchpatch { + url = "https://xenbits.xen.org/xsa/xsa${name}.patch"; + inherit sha256; + }); +in rec { + # 4.5 + XSA_190 = (xsaPatch { + name = "190-4.5"; + sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm"; + }); + + # 4.5 + XSA_191 = (xsaPatch { + name = "191-4.6"; + sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg"; + }); + + # 4.5 + XSA_192 = (xsaPatch { + name = "192-4.5"; + sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm"; + }); + + # 4.5 + XSA_193 = (xsaPatch { + name = "193-4.5"; + sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr"; + }); + + # 4.5 + XSA_195 = (xsaPatch { + name = "195"; + sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7"; + }); + + # 4.5 + XSA_196 = [ + (xsaPatch { + name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject"; + sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6"; + }) + (xsaPatch { + name = "196-0002-x86-svm-Fix-injection-of-software-interrupts"; + sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz"; + }) + ]; + + # 4.5 + XSA_198 = (xsaPatch { + name = "198"; + sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9"; + }); + + # 4.5 + XSA_200 = (xsaPatch { + name = "200-4.6"; + sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7"; + }); + + # 4.5 + XSA_202_45 = (xsaPatch { + name = "202-4.6"; + sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f"; + }); + + # 4.8 + XSA_202 = (xsaPatch { + name = "202"; + sha256 = "0j1d5akcjgx8w2c6w6p9znv77fkmps0880m2xgpbgs1ra9grshm1"; + }); + + # 4.8 + XSA_203 = (xsaPatch { + name = "203"; + sha256 = "1s1q7xskvpg87ivwfaiqr0cj3ajdkhkhpmpikfkvq127h8hhmd8j"; + }); + + # 4.5 + XSA_204_45 = (xsaPatch { + name = "204-4.5"; + sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp"; + }); + + # 4.8 + XSA_204 = (xsaPatch { + name = "204-4.8"; + sha256 = "0rs498s4w2alz3h6jhlr2y0ni630vhggmxbrd1p1p3gcv8p6zzrr"; + }); + + # 4.5 + XSA_206_45 = [ + (xsaPatch { + name = "206-4.5/0001-xenstored-apply-a-write-transaction-rate-limit"; + sha256 = "07vsm8mlbxh2s01ny2xywnm1bqhhxas1az31fzwb6f1g14vkzwm4"; + }) + (xsaPatch { + name = "206-4.5/0002-xenstored-Log-when-the-write-transaction-rate-limit-"; + sha256 = "17pnvxjmhny22abwwivacfig4vfsy5bqlki07z236whc2y7yzbsx"; + }) + (xsaPatch { + name = "206-4.5/0003-oxenstored-refactor-putting-response-on-wire"; + sha256 = "0xf566yicnisliy82cydb2s9k27l3bxc43qgmv6yr2ir3ixxlw5s"; + }) + (xsaPatch { + name = "206-4.5/0004-oxenstored-remove-some-unused-parameters"; + sha256 = "16cqx9i0w4w3x06qqdk9rbw4z96yhm0kbc32j40spfgxl82d1zlk"; + }) + (xsaPatch { + name = "206-4.5/0005-oxenstored-refactor-request-processing"; + sha256 = "1g2hzlv7w03sqnifbzda85mwlz3bw37rk80l248180sv3k7k6bgv"; + }) + (xsaPatch { + name = "206-4.5/0006-oxenstored-keep-track-of-each-transaction-s-operatio"; + sha256 = "0n65yfxvpfd4cz95dpbwqj3nablyzq5g7a0klvi2y9zybhch9cmg"; + }) + (xsaPatch { + name = "206-4.5/0007-oxenstored-move-functions-that-process-simple-operat"; + sha256 = "0qllvbc9rnj7jhhlslxxs35gvphvih0ywz52jszj4irm23ka5vnz"; + }) + (xsaPatch { + name = "206-4.5/0008-oxenstored-replay-transaction-upon-conflict"; + sha256 = "0lixkxjfzciy9l0f980cmkr8mcsx14c289kg0mn5w1cscg0hb46g"; + }) + (xsaPatch { + name = "206-4.5/0009-oxenstored-log-request-and-response-during-transacti"; + sha256 = "09ph8ddcx0k7rndd6hx6kszxh3fhxnvdjsq13p97n996xrpl1x7b"; + }) + (xsaPatch { + name = "206-4.5/0010-oxenstored-allow-compilation-prior-to-OCaml-3.12.0"; + sha256 = "1y0m7sqdz89z2vs4dfr45cyvxxas323rxar0xdvvvivgkgxawvxj"; + }) + (xsaPatch { + name = "206-4.5/0011-oxenstored-comments-explaining-some-variables"; + sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p"; + }) + (xsaPatch { + name = "206-4.5/0012-oxenstored-handling-of-domain-conflict-credit"; + sha256 = "12zgid5y9vrhhpk2syxp0x01lzzr6447fa76n6rjmzi1xgdzpaf8"; + }) + (xsaPatch { + name = "206-4.5/0013-oxenstored-ignore-domains-with-no-conflict-credit"; + sha256 = "0v3g9pm60w6qi360hdqjcw838s0qcyywz9qpl8gzmhrg7a35avxl"; + }) + (xsaPatch { + name = "206-4.5/0014-oxenstored-add-transaction-info-relevant-to-history-"; + sha256 = "0vv3w0h5xh554i9v2vbc8gzm8wabjf2vzya3dyv5yzvly6ygv0sb"; + }) + (xsaPatch { + name = "206-4.5/0015-oxenstored-support-commit-history-tracking"; + sha256 = "1iv2vy29g437vj73x9p33rdcr5ln2q0kx1b3pgxq202ghbc1x1zj"; + }) + (xsaPatch { + name = "206-4.5/0016-oxenstored-only-record-operations-with-side-effects-"; + sha256 = "1cjkw5ganbg6lq78qsg0igjqvbgph3j349faxgk1p5d6nr492zzy"; + }) + (xsaPatch { + name = "206-4.5/0017-oxenstored-discard-old-commit-history-on-txn-end"; + sha256 = "0lm15lq77403qqwpwcqvxlzgirp6ffh301any9g401hs98f9y4ps"; + }) + (xsaPatch { + name = "206-4.5/0018-oxenstored-track-commit-history"; + sha256 = "1jh92p6vjhkm3bn5vz260npvsjji63g2imsxflxs4f3r69sz1nkd"; + }) + (xsaPatch { + name = "206-4.5/0019-oxenstored-blame-the-connection-that-caused-a-transa"; + sha256 = "17k264pk0fvsamj85578msgpx97mw63nmj0j9v5hbj4bgfazvj4h"; + }) + (xsaPatch { + name = "206-4.5/0020-oxenstored-allow-self-conflicts"; + sha256 = "15z3rd49q0pa72si0s8wjsy2zvbm613d0hjswp4ikc6nzsnsh4qy"; + }) + (xsaPatch { + name = "206-4.5/0021-oxenstored-do-not-commit-read-only-transactions"; + sha256 = "04wpzazhv90lg3228z5i6vnh1z4lzd08z0d0fvc4br6pkd0w4va8"; + }) + (xsaPatch { + name = "206-4.5/0022-oxenstored-don-t-wake-to-issue-no-conflict-credit"; + sha256 = "1shbrn0w68rlywcc633zcgykfccck1a77igmg8ydzwjsbwxsmsjy"; + }) + (xsaPatch { + name = "206-4.5/0023-oxenstored-transaction-conflicts-improve-logging"; + sha256 = "1086y268yh8047k1vxnxs2nhp6izp7lfmq01f1gq5n7jiy1sxcq7"; + }) + (xsaPatch { + name = "206-4.5/0024-oxenstored-trim-history-in-the-frequent_ops-function"; + sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8"; + }) + ]; + + # 4.8 + XSA_206 = [ + (xsaPatch { + name = "206-4.8/0001-xenstored-apply-a-write-transaction-rate-limit"; + sha256 = "1c81d93i3qx7l38f9af0sd84w5x51zvn262mzl25ilcklql4kzl6"; + }) + (xsaPatch { + name = "206-4.8/0002-xenstored-Log-when-the-write-transaction-rate-limit-"; + sha256 = "0b8iw409wi1x6p0swpnr51lcdlla1lgxjv5f910sj4wl96bca84q"; + }) + (xsaPatch { + name = "206-4.8/0003-oxenstored-comments-explaining-some-variables"; + sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p"; + }) + (xsaPatch { + name = "206-4.8/0004-oxenstored-handling-of-domain-conflict-credit"; + sha256 = "020rw7hgc0dmhr4admz91kd99b4z1bdpji47nsy1255bjgvwc01k"; + }) + (xsaPatch { + name = "206-4.8/0005-oxenstored-ignore-domains-with-no-conflict-credit"; + sha256 = "1ilhcgyn803bxvfbqv0ihfrh9jfpp0lidkv7i4613f9v9vjm8q0h"; + }) + (xsaPatch { + name = "206-4.8/0006-oxenstored-add-transaction-info-relevant-to-history-"; + sha256 = "1dbd9pzda6hn9wj9pck44dlgz9nxvch3bzgrpaivanww8llxdfzz"; + }) + (xsaPatch { + name = "206-4.8/0007-oxenstored-support-commit-history-tracking"; + sha256 = "1jfr56c22fqkhj6fnv1ha7zsid86zm9l0nihpb8m932xgc4a6h9h"; + }) + (xsaPatch { + name = "206-4.8/0008-oxenstored-only-record-operations-with-side-effects-"; + sha256 = "1y845hj8krjdrirbd2jx4jqgnylwjv7bxnk7474lkld5kdnlbjyf"; + }) + (xsaPatch { + name = "206-4.8/0009-oxenstored-discard-old-commit-history-on-txn-end"; + sha256 = "1lcr9gz2b77x74sr1flfymyyz4xzs04iv88rc1633ibyqxmvk0lx"; + }) + (xsaPatch { + name = "206-4.8/0010-oxenstored-track-commit-history"; + sha256 = "1qwnivak4y038mpby75aaz0y70r0l3yc3hsz6wl5x0b74q6yy0ja"; + }) + (xsaPatch { + name = "206-4.8/0011-oxenstored-blame-the-connection-that-caused-a-transa"; + sha256 = "0p2w5ddyhc6d95dnlxzc5k77j063p02d53ab7m7ijfm7m6gknq8y"; + }) + (xsaPatch { + name = "206-4.8/0012-oxenstored-allow-self-conflicts"; + sha256 = "1571l81m30cbmqm4pk33q33p3dy58sfy2lnkl2wbgl2b3mkk657l"; + }) + (xsaPatch { + name = "206-4.8/0013-oxenstored-do-not-commit-read-only-transactions"; + sha256 = "15985wl635w22dddjyx5l97b5p6m55mzv5ygk7xr0jx7mi192f9x"; + }) + (xsaPatch { + name = "206-4.8/0014-oxenstored-don-t-wake-to-issue-no-conflict-credit"; + sha256 = "08672w4gaf2n3r8xy09h874gh5lg2vnrkjzq6xzvzdhdl092mipw"; + }) + (xsaPatch { + name = "206-4.8/0015-oxenstored-transaction-conflicts-improve-logging"; + sha256 = "0ck98ms0py8wjsc38pbx6222x7n6l90zckfa7m7nnszsyc0sxxad"; + }) + (xsaPatch { + name = "206-4.8/0016-oxenstored-trim-history-in-the-frequent_ops-function"; + sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8"; + }) + ]; + + # 4.5 - 4.8 + XSA_207 = (xsaPatch { + name = "207"; + sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc"; + }); + + # 4.8 + XSA_210 = (xsaPatch { + name = "210"; + sha256 = "02mykxqxnsrd0sr4ij022j8y7618wzi2a6j6j761vx8qgmh11xai"; + }); + + # 4.5 - 4.8 + XSA_212 = (xsaPatch { + name = "212"; + sha256 = "1ggjbbym5irq534a3zc86md9jg8imlpc9wx8xsadb9akgjrr1r8d"; + }); + + # 4.5 + XSA_213_45 = (xsaPatch { + name = "213-4.5"; + sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm"; + }); + + # 4.8 + XSA_213 = (xsaPatch { + name = "213-4.8"; + sha256 = "0ia3zr6r3bqy2h48fdy7p0iz423lniy3i0qkdvzgv5a8m80darr2"; + }); + + # 4.5 - 4.8 + XSA_214 = (xsaPatch { + name = "214"; + sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk"; + }); + + # 4.5 + XSA_215 = (xsaPatch { + name = "215"; + sha256 = "0sv8ccc5xp09f1w1gj5a9n3mlsdsh96sdb1n560vh31f4kkd61xs"; + }); + + # 4.5 + XSA_217_45 = (xsaPatch { + name = "217-4.5"; + sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4"; + }); + + # 4.6 - 4.8 + XSA_217 = (xsaPatch { + name = "217"; + sha256 = "1khs5ilif14dzcm7lmikjzkwsrfzlmir1rgrgzkc411gf18ylzmj"; + }); + + # 4.5 + XSA_218_45 = [ + (xsaPatch { + name = "218-4.5/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures"; + sha256 = "00y6j3yjxw0igpldsavikmhlxw711k2jsj1qx0s05w2k608gadkq"; + }) + (xsaPatch { + name = "218-4.5/0002-gnttab-fix-unmap-pin-accounting-race"; + sha256 = "0qbbfnnjlpdcd29mzmacfmi859k92c213l91q7w1rg2k6pzx928k"; + }) + (xsaPatch { + name = "218-4.5/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry"; + sha256 = "1cndzvyhf41mk4my6vh3bk9jvh2y4gpmqdhvl9zhxhmppszslqkc"; + }) + (xsaPatch { + name = "218-4.5/0004-gnttab-correct-maptrack-table-accesses"; + sha256 = "02zpb0ffigijacqvyyjylwx3qpgibwslrka7mbxwnclf4s9c03a2"; + }) + ]; + + # 4.8 + XSA_218 = [ + (xsaPatch { + name = "218-4.8/0001-gnttab-fix-unmap-pin-accounting-race"; + sha256 = "0r363frai239r2wmwxi48kcr50gbk5l64nja0h9lppi3z2y3dkdd"; + }) + (xsaPatch { + name = "218-4.8/0002-gnttab-Avoid-potential-double-put-of-maptrack-entry"; + sha256 = "07wm06i7frv7bsaykakx3g9h0hfqv96zcadvwf6wv194dggq1plc"; + }) + (xsaPatch { + name = "218-4.8/0003-gnttab-correct-maptrack-table-accesses"; + sha256 = "0ad0irc3p4dmla8sp3frxbh2qciji1dipkslh0xqvy2hyf9p80y9"; + }) + ]; + + # 4.5 + XSA_219_45 = (xsaPatch { + name = "219-4.5"; + sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm"; + }); + + # 4.8 + XSA_219 = (xsaPatch { + name = "219-4.8"; + sha256 = "16q7kiamy86x8qdvls74wmq5j72kgzgdilryig4q1b21mp0ij1jq"; + }); + + # 4.5 + XSA_220_45 = (xsaPatch { + name = "220-4.5"; + sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp"; + }); + + # 4.8 + XSA_220 = (xsaPatch { + name = "220-4.8"; + sha256 = "0214qyqx7qap5y1pdi9fm0vz4y2fbyg71gaq36fisknj35dv2mh5"; + }); + + # 4.5 - 4.8 + XSA_221 = (xsaPatch { + name = "221"; + sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26"; + }); + + # 4.5 + XSA_222_45 = [ + (xsaPatch { + name = "222-1-4.6"; + sha256 = "1g4dqm5qx4wqlv1520jpfiscph95vllcp4gqp1rdfailk8xi0mcf"; + }) + (xsaPatch { + name = "222-2-4.5"; + sha256 = "1hw8rhc7q4v309f4w11gxfsn5x1pirvxkg7s4kr711fnmvp9hkzd"; + }) + ]; + + # 4.8 + XSA_222 = [ + (xsaPatch { + name = "222-1"; + sha256 = "0x02x4kqwfw255638fh2zcxwig1dy6kadlmqim1jgnjgmrvvqas2"; + }) + (xsaPatch { + name = "222-2-4.8"; + sha256 = "1xhyp6q3c5l8djh965g1i8201m2wvhms8k886h4sn30hks38giin"; + }) + ]; + + # 4.5 - 4.8 + XSA_223 = (xsaPatch { + name = "223"; + sha256 = "0803gjgcbq9vaz2mq0v5finf1fq8iik1g4hqsjqhjxvspn8l70c5"; + }); + + # 4.5 + XSA_224_45 = [ + (xsaPatch { + name = "224-4.5/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; + sha256 = "1aislj66ss4cb3v2bh12mrqsyrf288d4h54rj94jjq7h1hnycw7h"; + }) + (xsaPatch { + name = "224-4.5/0002-gnttab-never-create-host-mapping-unless-asked-to"; + sha256 = "1j6fgm1ccb07gg0mi5qmdr0vqwwc3n12z433g1jrija2gbk1x8aq"; + }) + (xsaPatch { + name = "224-4.5/0003-gnttab-correct-logic-to-get-page-references-during-m"; + sha256 = "166kmicwx280fjqjvgigbmhabjksa0hhvqx5h4v6kjlcjpmxqy08"; + }) + (xsaPatch { + name = "224-4.5/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; + sha256 = "1skc0yj1zsn8xgyq1y57bdc0scvvlmd0ynrjwwf1zkias1wlilav"; + }) + ]; + + # 4.8 + XSA_224 = [ + (xsaPatch { + name = "224-4.8/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; + sha256 = "1k326yan5811qzyvpdfkv801a19nyd09nsqayi8gyh58xx9c21m4"; + }) + (xsaPatch { + name = "224-4.8/0002-gnttab-never-create-host-mapping-unless-asked-to"; + sha256 = "06nj1x59bbx9hrj26xmvbw8z805lfqhld9hm0ld0fs6dmcpqzcck"; + }) + (xsaPatch { + name = "224-4.8/0003-gnttab-correct-logic-to-get-page-references-during-m"; + sha256 = "0kmag6fdsskgplcvzqp341yfi6pgc14wvjj58bp7ydb9hdk53qx2"; + }) + (xsaPatch { + name = "224-4.8/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; + sha256 = "1ww80pi7jr4gjpymkcw8qxmr5as18b2asdqv35527nqprylsff9f"; + }) + ]; + + # 4.6 - 4.8 + XSA_225 = (xsaPatch { + name = "225"; + sha256 = "0lcp2bs0r849xnvhrdf8s821v36cqdbzk8lwz6chrjhjalk6ha2g"; + }); + + # 4.5 + XSA_226_45 = [ + (xsaPatch { + name = "226-4.5/0001-gnttab-dont-use-possibly-unbounded-tail-calls"; + sha256 = "1hx47ppv5q33cw4dwp82lgvv4fp28gx7rxijw0iaczsv8bvb8vcg"; + }) + (xsaPatch { + name = "226-4.5/0002-gnttab-fix-transitive-grant-handling"; + sha256 = "1gzp8m2zfihwlk71c3lqyd0ajh9h11pvkhzhw0mawckxy0qksvlc"; + }) + ]; + + # 4.8 - 4.9 + XSA_226 = [ + (xsaPatch { + name = "226-4.9/0001-gnttab-dont-use-possibly-unbounded-tail-calls"; + sha256 = "1hx47ppv5q33cw4dwp82lgvv4fp28gx7rxijw0iaczsv8bvb8vcg"; + }) + (xsaPatch { + name = "226-4.9/0002-gnttab-fix-transitive-grant-handling"; + sha256 = "1gzp8m2zfihwlk71c3lqyd0ajh9h11pvkhzhw0mawckxy0qksvlc"; + }) + ]; + + # 4.5 + XSA_227_45 = (xsaPatch { + name = "227-4.5"; + sha256 = "1qfjfisgqm4x98qw54x2qrvgjnvvzizx9p1pjhcnsps9q6g1y3x8"; + }); + + # 4.8 - 4.9 + XSA_227 = (xsaPatch { + name = "227"; + sha256 = "0zdcm43i5n08rh7rrnb0fcssvd4fgawwmizsa16w2ak7pzvgmg94"; + }); + + # 4.8 + XSA_228_48 = (xsaPatch { + name = "228-4.8"; + sha256 = "085pnzwyv0rdb51hv5vhbhwfyxl0wg8sxcm912gjq8z7da5cv10n"; + }); + + # 4.9 + XSA_228 = (xsaPatch { + name = "228"; + sha256 = "0c9nvfpnr5ira7ha3fszhvvh71nsxrvmzrab56xwjhl2dbw2yy23"; + }); + + # 4.5 - 4.9 + XSA_230 = (xsaPatch { + name = "230"; + sha256 = "10x0j7wmzkrwycs1ng89fgjzvzh8vsdd4c5nb68b3j1azdx4ld83"; + }); + + # 4.5 + XSA_231_45 = (xsaPatch { + name = "231-4.5"; + sha256 = "06gwx2f1lg51dfk2b4zxp7wv9c4pxdi87pg2asvmxqc78ir7l5s6"; + }); + + # 4.8 - 4.9 + XSA_231 = (xsaPatch { + name = "231-4.9"; + sha256 = "09r8xxq2fd52wrk6i0y0sk3nbidfg6pzzrkx327hfmdjj76iyz3b"; + }); + + # 4.5 - 4.9 + XSA_232 = (xsaPatch { + name = "232"; + sha256 = "0n6irjpmraa3hbxxm64a1cplc6y6g07x7v2fmlpvn70ql3fs0220"; + }); + + # 4.5 - 4.9 + XSA_233 = (xsaPatch { + name = "233"; + sha256 = "1w3m8349cqav56av63w6jzvlsv4jw5rimwvskr9pq2rcbk2dx8kf"; + }); + + # 4.5 + XSA_234_45 = (xsaPatch { + name = "234-4.5"; + sha256 = "1ji6hbgybb4gbgz5l5fis9midnvjbddzam8d63377rkzdyb3yz9f"; + }); + + # 4.8 + XSA_234_48 = (xsaPatch { + name = "234-4.8"; + sha256 = "08n1pf7z5y67dmay1ap39bi81clgkx82fpmfn7jsh8k4aw94jrsa"; + }); + + # 4.9 + XSA_234 = (xsaPatch { + name = "234-4.9"; + sha256 = "1znmxg432is0virw8321gax8zqq2zcmi2pc5p2j31sixylixsvzx"; + }); + + # 4.5 + XSA_235_45 = (xsaPatch { + name = "235-4.5"; + sha256 = "0hhgnql2gji111020z4wiyzg23wqs6ymanb67rg11p4qad1fp3ff"; + }); + + # 4.8 - 4.9 + XSA_235 = (xsaPatch { + name = "235-4.9"; + sha256 = "1rj4jkmh79wm30jq9f8x65qv3al8l91zc3m5s23q0x6abn3pfb9z"; + }); + + # 4.5 + XSA_236_45 = (xsaPatch { + name = "236-4.5"; + sha256 = "0hcla86x81wykssd2967gblp7fzx61290p4ls4v0hcyxdg2bs2yz"; + }); + + # 4.8 - 4.9 + XSA_236 = (xsaPatch { + name = "236-4.9"; + sha256 = "0vqxy7mgflga05l33j3488fwxmdw3p9yxj4ylhk9n3nw8id72ghq"; + }); + + # 4.5 + XSA_237_45 = [ + (xsaPatch { + name = "237-4.5/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device"; + sha256 = "0hjxs20jhls4i0iph45a0qpw4znkm04gv74jmwhw84gy4hrhzq3b"; + }) + (xsaPatch { + name = "237-4.5/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s"; + sha256 = "0ki8nmbc2g1l9wnqsph45a2k4c6dk5s7jvdlxg3zznyiyxjcv8yn"; + }) + (xsaPatch { + name = "237-4.5/0003-x86-MSI-disallow-redundant-enabling"; + sha256 = "1hdz83qrjaqnihz8ji186dypxiblbfpgyb01j9m5alhk4whjqvp1"; + }) + (xsaPatch { + name = "237-4.5/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error"; + sha256 = "0csdfn9kzn1k94pg3fcwsgqw14wcd4myi1jkcq5alj1fmkhw4wmk"; + }) + (xsaPatch { + name = "237-4.5/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook"; + sha256 = "14b73rkvbkd1a2gh9kp0zrvv2d3kfwkiv24fg9agh4hrf2w3nx7y"; + }) + ]; + + # 4.8 + XSA_237_48 = [ + (xsaPatch { + name = "237-4.8/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device"; + sha256 = "0qjisp37lwi2611mp7fbbm1s7m0bx726rrg79dnxs2mj0skw59iv"; + }) + (xsaPatch { + name = "237-4.8/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s"; + sha256 = "05q1dny13jrqhjfwak7r635mqp9chpibjvn8b7d90japc1nzpq62"; + }) + (xsaPatch { + name = "237-4.8/0003-x86-MSI-disallow-redundant-enabling"; + sha256 = "1907lv8nb2zhpb6k6jlw4m0hm0n0lyd69vfr3wpzbc56dn0w7jqd"; + }) + (xsaPatch { + name = "237-4.8/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error"; + sha256 = "06nrq0bx3p9ipab2r1why6qm4g32dj0x5q24hfkwc6ih0l9xwf8h"; + }) + (xsaPatch { + name = "237-4.8/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook"; + sha256 = "1nbg7bjw2hv55gnkhf6chkh35va6brs08acq1d5jxncl6kv0amc1"; + }) + ]; + + # 4.9 + XSA_237 = [ + (xsaPatch { + name = "237-4.9/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device"; + sha256 = "1cbl24mqxa62h0wgsnrpcs6y6vs53znzj7g8dfsbmf74xwrd4px6"; + }) + (xsaPatch { + name = "237-4.9/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s"; + sha256 = "0p60148j18b78pxz0dx5ymh1gyrhg2cgmxq0jxmbk090bc4jql35"; + }) + (xsaPatch { + name = "237-4.9/0003-x86-MSI-disallow-redundant-enabling"; + sha256 = "1907lv8nb2zhpb6k6jlw4m0hm0n0lyd69vfr3wpzbc56dn0w7jqd"; + }) + (xsaPatch { + name = "237-4.9/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error"; + sha256 = "0q95z5641amni53agimnzbspva53p0hz5wl16zaz2yhnjasj5pzr"; + }) + (xsaPatch { + name = "237-4.9/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook"; + sha256 = "0bnqx9w7ppgx8wxj2zw09z0rkv1jzn3r0bd76cz0r22wz29fsdp2"; + }) + ]; + + # 4.5 + XSA_238_45 = (xsaPatch { + name = "238-4.5"; + sha256 = "1x2fg5vfv5jc084h5gjm6fq0nxjpzvi96px3sqzz4pvsvy4y4i1z"; + }); + + # 4.8 - 4.9 + XSA_238 = (xsaPatch { + name = "238"; + sha256 = "1cbmg1bi5ajh7qbwsl92ynaxw2c3p7i24p3wds81r4n93r0y5dxk"; + }); + + # 4.5 + XSA_239_45 = (xsaPatch { + name = "239-4.5"; + sha256 = "06bi8q3973yajxsdj7pcqarvb56q2gisxdiy0cpbyffbmpkfv3h6"; + }); + + # 4.8 - 4.9 + XSA_239 = (xsaPatch { + name = "239"; + sha256 = "1a9r8j7167s43ds5i7v7mm4y970vjnbhhkrjzpmzlcx8kcz96vh3"; + }); + + # 4.5 + XSA_240_45 = [ + (xsaPatch { + name = "240-4.5/0001-x86-limit-linear-page-table-use-to-a-single-level"; + sha256 = "0pmf10mbnmb88y7mly8s2l0j88cg0ayhkcnmj1zbjrkjmpccv395"; + }) + (xsaPatch { + name = "240-4.5/0002-x86-mm-Disable-PV-linear-pagetables-by-default"; + sha256 = "19f096ra3xndvzkjjasx73p2g25hfkm905px0p3yakwll0qzd029"; + }) + ]; + + # 4.8 + XSA_240_48 = [ + (xsaPatch { + name = "240-4.8/0001-x86-limit-linear-page-table-use-to-a-single-level"; + sha256 = "0m44qhhqk2pdwqg8g28pypqrylq6iw00k9qrzf6qd0iza2y42kgj"; + }) + (xsaPatch { + name = "240-4.8/0002-x86-mm-Disable-PV-linear-pagetables-by-default"; + sha256 = "1jd720wvngj9wq3fprdhakxvqlff0jd8zcx2pd3vsn2qvjbvr2gf"; + }) + ]; + + # 4.9 + XSA_240 = [ + (xsaPatch { + name = "240-4.9/0001-x86-limit-linear-page-table-use-to-a-single-level"; + sha256 = "1759ni80aifakm44g4cc6pnmbcn1xjic8j66fvj0vibm0wqk6xck"; + }) + (xsaPatch { + name = "240-4.9/0002-x86-mm-Disable-PV-linear-pagetables-by-default"; + sha256 = "0g6dpi006p5cjxw5d8h33p0429fdmdm6nqzj0m63ralpqvns3ib5"; + }) + ]; + + # 4.5 - 4.8 + XSA_241 = (xsaPatch { + name = "241-4.8"; + sha256 = "16zb75kzs98f4mdxhbyczk5mbh9dvn6j3yhfafki34x1dfdnq4pj"; + }); + + # 4.9 + XSA_241_49 = (xsaPatch { + name = "241-4.9"; + sha256 = "0xlhin7wkhmlnbp9mqcbq3q4drdwb5la482ja9nwkhi8i867p6wc"; + }); + + # 4.5 - 4.9 + XSA_242 = (xsaPatch { + name = "242-4.9"; + sha256 = "0yx3x0i2wybsm7lzdffxa2mm866bjl4ipbb9vipnw77dyg705zpr"; + }); + + # 4.5 + XSA_243_45 = [ + (xsaPatch { + name = "243-4.6-1"; + sha256 = "1cqanpyysa7px0j645z4jw9yqsvv6cbh7yq1b86ap134axfifcan"; + }) + (xsaPatch { + name = "243-4.5-2"; + sha256 = "0wbcgw4m0nzm2902jnda2020l7bd5adkq8j5myi1zmsfzbq03hwn"; + }) + ]; + + # 4.8 + XSA_243_48 = (xsaPatch { + name = "243-4.8"; + sha256 = "1q60zn55l9wpq45nrxh0av59sjz0jg8pkjm1gkyywkdsgg4fg5z4"; + }); + + # 4.9 + XSA_243 = (xsaPatch { + name = "243"; + sha256 = "06fnbnh9zlsbkqih9ipnb7a8gly54m7lp17d854j1r370ad3c4yg"; + }); + + # 4.5 + XSA_244_45 = (xsaPatch { + name = "244-4.5"; + sha256 = "05ci3vdl1ywfjpzcvsy1k52whxjk8pxzj7dh3r94yqasr56i5v2l"; + }); + + # 4.8 - 4.9 + XSA_244 = (xsaPatch { + name = "244"; + sha256 = "10308xsgmhb0vg6fk0ql8v94zifv6dcv6vkaicryfp405yj2rzkm"; + }); + + # 4.5 - 4.9 + XSA_245 = [ + (xsaPatch { + name = "245/0001-xen-page_alloc-Cover-memory-unreserved-after-boot-in"; + sha256 = "12brsgbn7xwakalsn10afykgqmx119mqg6vjj3v2b1pnmf4ss0w8"; + }) + (xsaPatch { + name = "245/0002-xen-arm-Correctly-report-the-memory-region-in-the-du"; + sha256 = "1k6z5r7wnrswsczn2j3a1mc4nvxqm4ydj6n6rvgqizk2pszdkqg8"; + }) + ]; +} diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index fd47a104326e..a589e21be98b 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { homepage = https://i3wm.org/i3lock/; maintainers = with maintainers; [ garbas malyn ]; license = licenses.bsd3; - platforms = platforms.all; + + # Needs the SSE2 instruction set. See upstream issue + # https://github.com/chrjguill/i3lock-color/issues/44 + platforms = platforms.i686 ++ platforms.x86_64; }; } diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 6d5e53b70880..215b8c38ece4 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -23,9 +23,9 @@ let patches = [ ./fix-module-path.patch ]; }; "git" = { - name = "git-20160617"; - rev = "7d5b5eb76aa656baf5a8713f514937765f66b10a"; - sha256 = "1jpj978r54086hypjxqxi0r3zacqpkr61dp6dbi0lykgx7m5bjfb"; + name = "git-20170203"; + rev = "d20f24e58ab62afceae2afb6262ffef3cc318b97"; + sha256 = "1gi29ds1x6dq7lz8lamnhcvcrr3cvvrg5yappfkggyhyvib1ii70"; patches = []; }; }.${version}; @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { sbcl lispPackages.clx lispPackages.cl-ppcre + lispPackages.alexandria xdpyinfo ]; diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index 88c312bd265d..5a8b68df364a 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { makeFlags = "WMII_HGVERSION=hg${rev}"; meta = { - homepage = https://code.google.com/archive/p/wmii/; + homepage = https://suckless.org/; # https://wmii.suckless.org/ does not exist anymore description = "A small window manager controlled by a 9P filesystem"; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; license = stdenv.lib.licenses.mit; diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index 30a42fcc0fed..ce948739c320 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -2,6 +2,7 @@ { name , buildInputs ? [] +, nativeBuildInputs ? [] , makeFlags ? [] , src ? fetchurl { url = "http://pecl.php.net/get/${name}.tgz"; @@ -15,7 +16,7 @@ stdenv.mkDerivation (args // { inherit src; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ] ++ nativeBuildInputs; buildInputs = [ php ] ++ buildInputs; makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index f1f56cf5cec4..d2cdbf6ce0cc 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -1,5 +1,5 @@ #! @shell@ -set -eu -o pipefail +set -eu -o pipefail +o posix shopt -s nullglob if (( "${NIX_DEBUG:-0}" >= 7 )); then diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 489fb02dcb5d..a12c835dd9bf 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -286,7 +286,7 @@ stdenv.mkDerivation { *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;; esac - if [ -n "$dynamicLinker" ]; then + if [ -n "''${dynamicLinker:-}" ]; then echo $dynamicLinker > $out/nix-support/dynamic-linker '' + (if targetPlatform.isDarwin then '' diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index b15f1e461e5f..7a0eb28be636 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -1,5 +1,5 @@ #! @shell@ -set -eu -o pipefail +set -eu -o pipefail +o posix shopt -s nullglob if (( "${NIX_DEBUG:-0}" >= 7 )); then diff --git a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh index 88e644dc54dc..0944d74e431b 100644 --- a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh @@ -1,5 +1,5 @@ #! @shell@ -set -eu -o pipefail +set -eu -o pipefail +o posix shopt -s nullglob if (( "${NIX_DEBUG:-0}" >= 7 )); then diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index 232e1245af07..ef618f9a86d4 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -1,5 +1,5 @@ #! @shell@ -set -eu -o pipefail +set -eu -o pipefail +o posix shopt -s nullglob if (( "${NIX_DEBUG:-0}" >= 7 )); then diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix index f1b0930cdcff..4d178ac96c5d 100644 --- a/pkgs/build-support/closure-info.nix +++ b/pkgs/build-support/closure-info.nix @@ -8,7 +8,10 @@ { rootPaths }: -if builtins.langVersion >= 5 then +#if builtins.langVersion >= 5 then +# FIXME: it doesn't work on Hydra, failing to find mkdir; +# perhaps .attrs.sh clobbers PATH with new nix? +if false then # Nix >= 1.12: Include NAR hash / size info. diff --git a/pkgs/build-support/fetchadc/builder.sh b/pkgs/build-support/fetchadc/builder.sh deleted file mode 100644 index ceeaa9213d65..000000000000 --- a/pkgs/build-support/fetchadc/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -loginpage=`curl --insecure -s -L -b cookies.txt "$url"` - -[[ $loginpage =~ form[^\>]+action=\"([^\"]+)\" ]] && loginurl=${BASH_REMATCH[1]} - -curl --insecure -s --output "$out" -L -b cookies.txt --data "appleId=${adc_user}&accountPassword=${adc_pass}" "https://idmsa.apple.com/IDMSWebAuth/${loginurl}" diff --git a/pkgs/build-support/fetchadc/default.nix b/pkgs/build-support/fetchadc/default.nix deleted file mode 100644 index 4d759e6f7f18..000000000000 --- a/pkgs/build-support/fetchadc/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, curl, adc_user, adc_pass }: - -{ # Path to fetch. - path - - # Hash of the downloaded file -, sha256 - -, # Additional curl options needed for the download to succeed. - curlOpts ? "" - -, # Name of the file. If empty, use the basename of `path'. - name ? "" -}: - -stdenv.mkDerivation { - url = "https://developer.apple.com/downloads/download.action?path=${path}"; - - name = if name != "" then name else baseNameOf path; - builder = ./builder.sh; - - buildInputs = [ curl ]; - - meta = { - # Password-guarded files from ADC are certainly unfree, as far as we're concerned! - license = stdenv.lib.licenses.unfree; - }; - - outputHashAlgo = "sha256"; - outputHash = sha256; - outputHashMode = "flat"; - - inherit curlOpts adc_user adc_pass; - - preferLocalBuild = true; -} diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix index dd0bac49cb6d..3e1f0eff84af 100644 --- a/pkgs/build-support/fetchbower/default.nix +++ b/pkgs/build-support/fetchbower/default.nix @@ -4,13 +4,13 @@ let let components = lib.splitString "#" version; hash = lib.last components; - ver = if builtins.length components == 1 then version else hash; + ver = if builtins.length components == 1 then (cleanName version) else hash; in ver; - bowerName = name: lib.replaceStrings ["/"] ["-"] name; + cleanName = name: lib.replaceStrings ["/" ":"] ["-" "-"] name; fetchbower = name: version: target: outputHash: stdenv.mkDerivation { - name = "${bowerName name}-${bowerVersion version}"; + name = "${cleanName name}-${bowerVersion version}"; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; buildCommand = '' fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}" diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh index af1257d3688c..e424fd92d51e 100644 --- a/pkgs/build-support/fetchbzr/builder.sh +++ b/pkgs/build-support/fetchbzr/builder.sh @@ -4,6 +4,6 @@ header "exporting \`$url' (revision $rev) into \`$out'" # Perform a lightweight checkout so that we don't end up importing # all the repository's history. -bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url" +BZR_LOG=/dev/null bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url" stopNest diff --git a/pkgs/build-support/fetchgit/gitrepotoname.nix b/pkgs/build-support/fetchgit/gitrepotoname.nix deleted file mode 100644 index 90005b545692..000000000000 --- a/pkgs/build-support/fetchgit/gitrepotoname.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib }: - -let - inherit (lib) removeSuffix hasPrefix removePrefix splitString stringToCharacters concatMapStrings last elem; - - allowedChars = stringToCharacters "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-._?="; - sanitizeStoreName = s: - let - s' = concatMapStrings (c: if elem c allowedChars then c else "") (stringToCharacters s); - s'' = if hasPrefix "." s' then "_${removePrefix "." s'}" else s'; - in - s''; -in - urlOrRepo: rev: - let - repo' = last (splitString ":" (baseNameOf (removeSuffix ".git" (removeSuffix "/" urlOrRepo)))); - rev' = baseNameOf rev; - in - "${sanitizeStoreName repo'}-${sanitizeStoreName rev'}-src" diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index a180509a3265..17962d08acc3 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -39,7 +39,7 @@ usage(){ Options: --out path Path where the output would be stored. - --url url Any url understand by 'git clone'. + --url url Any url understood by 'git clone'. --rev ref Any sha1 or references (such as refs/heads/master) --hash h Expected hash. --deepClone Clone the entire repository. diff --git a/pkgs/build-support/fetchgitrevision/default.nix b/pkgs/build-support/fetchgitrevision/default.nix deleted file mode 100644 index e877648978d9..000000000000 --- a/pkgs/build-support/fetchgitrevision/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -runCommand: git: repository: branch: - import (runCommand "head-revision" - { buildInputs = [ git ]; - dummy = builtins.currentTime; - } - '' - rev=$(git ls-remote ${repository} | grep "refs/${branch}$" | awk '{ print $1 }') - echo "[ \"$rev\" ]" > $out - echo Latest revision in ${branch} is $rev - '') diff --git a/pkgs/build-support/fetchipfs/builder.sh b/pkgs/build-support/fetchipfs/builder.sh new file mode 100644 index 000000000000..7a6a517566f5 --- /dev/null +++ b/pkgs/build-support/fetchipfs/builder.sh @@ -0,0 +1,87 @@ +source $stdenv/setup + +# Curl flags to handle redirects, not use EPSV, handle cookies for +# servers to need them during redirects, and work on SSL without a +# certificate (this isn't a security problem because we check the +# cryptographic hash of the output anyway). + +set -o noglob + +curl="curl \ + --location \ + --max-redirs 20 \ + --retry 2 \ + --disable-epsv \ + --cookie-jar cookies \ + --insecure \ + --speed-time 5 \ + -# \ + --fail \ + $curlOpts \ + $NIX_CURL_FLAGS" + +finish() { + runHook postFetch + set +o noglob + exit 0 +} + +ipfs_add() { + if curl --retry 0 --head --silent "localhost:5001" > /dev/null; then + echo "=IPFS= add $ipfs" + tar --owner=root --group=root -cWf "source.tar" $(echo *) + res=$(curl -# -F "file=@source.tar" "localhost:5001/api/v0/tar/add" | sed 's/.*"Hash":"\(.*\)".*/\1/') + if [ $ipfs != $res ]; then + echo "\`ipfs tar add' results in $res when $ipfs is expected" + exit 1 + fi + rm "source.tar" + fi +} + +echo + +mkdir download +cd download + +if curl --retry 0 --head --silent "localhost:5001" > /dev/null; then + curlexit=18; + echo "=IPFS= get $ipfs" + # if we get error code 18, resume partial download + while [ $curlexit -eq 18 ]; do + # keep this inside an if statement, since on failure it doesn't abort the script + if $curl -C - "http://localhost:5001/api/v0/tar/cat?arg=$ipfs" --output "$ipfs.tar"; then + unpackFile "$ipfs.tar" + rm "$ipfs.tar" + set +o noglob + mv $(echo *) "$out" + finish + else + curlexit=$?; + fi + done +fi + +if test -n "$url"; then + curlexit=18; + echo "Downloading $url" + while [ $curlexit -eq 18 ]; do + # keep this inside an if statement, since on failure it doesn't abort the script + if $curl "$url" -O; then + set +o noglob + tmpfile=$(echo *) + unpackFile $tmpfile + rm $tmpfile + ipfs_add + mv $(echo *) "$out" + finish + else + curlexit=$?; + fi + done +fi + +echo "error: cannot download $ipfs from ipfs or the given url" +echo +set +o noglob +exit 1 diff --git a/pkgs/build-support/fetchipfs/default.nix b/pkgs/build-support/fetchipfs/default.nix new file mode 100644 index 000000000000..196b3bebc916 --- /dev/null +++ b/pkgs/build-support/fetchipfs/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, curl +}: + +{ ipfs +, url ? "" +, curlOpts ? "" +, outputHash ? "" +, outputHashAlgo ? "" +, md5 ? "" +, sha1 ? "" +, sha256 ? "" +, sha512 ? "" +, meta ? {} +, port ? "8080" +, postFetch ? "" +}: + +assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; + +let + + hasHash = (outputHash != "" && outputHashAlgo != "") + || md5 != "" || sha1 != "" || sha256 != "" || sha512 != ""; + +in + +if (!hasHash) then throw "Specify sha for fetchipfs fixed-output derivation" else stdenv.mkDerivation { + name = ipfs; + builder = ./builder.sh; + buildInputs = [ curl ]; + + # New-style output content requirements. + outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else + if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; + outputHash = if outputHash != "" then outputHash else + if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; + + outputHashMode = "recursive"; + + inherit curlOpts + postFetch + ipfs + url + port; + + # Doing the download on a remote machine just duplicates network + # traffic, so don't do that. + preferLocalBuild = true; + + inherit meta; +} diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 5811950bf053..8dac273eb1ca 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -84,6 +84,9 @@ in , # Meta information, if any. meta ? {} + + # Passthru information, if any. +, passthru ? {} }: assert builtins.isList urls; @@ -139,4 +142,5 @@ else stdenv.mkDerivation { ''; inherit meta; + inherit passthru; } diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 751dba56930e..4a5381d71f20 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -11,10 +11,11 @@ stripRoot ? true , url , extraPostFetch ? "" +, name ? "source" , ... } @ args: lib.overrideDerivation (fetchurl ({ - name = args.name or (baseNameOf url); + inherit name; recursiveHash = true; diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 70727f9b49dc..5353ae828410 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -12,21 +12,18 @@ # `contents = {object = ...; symlink = /init;}' is a typical # argument. -{ stdenv, perl, cpio, contents, ubootChooser, compressor, prepend +{ stdenv, perl, cpio, contents, compressor, prepend, ubootTools , hostPlatform }: -let - inputsFun = ubootName : [ perl cpio ] - ++ stdenv.lib.optional (ubootName != null) [ (ubootChooser ubootName) ]; - makeUInitrdFun = ubootName : (ubootName != null); -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "initrd"; builder = ./make-initrd.sh; - nativeBuildInputs = inputsFun hostPlatform.platform.uboot; - makeUInitrd = makeUInitrdFun hostPlatform.platform.uboot; + makeUInitrd = hostPlatform.platform.kernelTarget == "uImage"; + + nativeBuildInputs = [ perl cpio ] + ++ stdenv.lib.optional makeUInitrd ubootTools; # !!! should use XML. objects = map (x: x.object) contents; diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 2b32da11d1ce..37ea264a53fb 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -80,5 +80,5 @@ in stdenv.mkDerivation (args // { runHook postInstall ''; - passthru = { inherit cargoDeps; }; + passthru = { inherit cargoDeps; } // (args.passthru or {}); }) diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/data/fonts/iwona/default.nix new file mode 100644 index 000000000000..3649aad99f43 --- /dev/null +++ b/pkgs/data/fonts/iwona/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + name = "iwona-${version}"; + version = "0_995"; + + src = fetchzip { + url = "http://jmn.pl/pliki/Iwona-otf-${version}.zip"; + sha256 = "1wj5bxbxpz5a8p3rhw708cyjc0lgqji8g0iv6brmmbrrkpb3jq2s"; + }; + + installPhase = '' + install -m 444 -D -t $out/share/fonts/opentype/ *.otf + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1dcpn13bd31dw7ir0s722bv3nk136dy6qsab0kznjbzfqd7agswa"; + + meta = with stdenv.lib; { + description = "A two-element sans-serif typeface, created by Małgorzata Budyta"; + homepage = http://jmn.pl/en/kurier-i-iwona/; + # "[...] GUST Font License (GFL), which is a free license, legally + # equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or + # later." - GUST website + license = licenses.lppl13c; + maintainers = with maintainers; [ siddharthist ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix index dade4be1aaff..88b608c78152 100644 --- a/pkgs/data/misc/dns-root-data/default.nix +++ b/pkgs/data/misc/dns-root-data/default.nix @@ -4,7 +4,7 @@ let rootHints = fetchurl { url = "https://www.internic.net/domain/named.root"; - sha256 = "01n4bqf95kbvig1hahqzmmdkpn4v7mzfc1p944gq922i5j3fjr92"; + sha256 = "0vdrff4l8s8grif52dnh091s8qydhh88k25zqd9rj66sf1qwcwxl"; }; rootKey = ./root.key; @@ -13,7 +13,7 @@ let in stdenv.mkDerivation { - name = "dns-root-data-2017-08-29"; + name = "dns-root-data-2017-10-24"; buildCommand = '' mkdir $out diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 14ae22798c26..c3cd9bdb4b3d 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -7,8 +7,8 @@ src-spec ? { owner = "commercialhaskell"; repo = "all-cabal-hashes"; - rev = "901c2522e6797270f5ded4495b1a529e6c16ef45"; - sha256 = "05jmwsgrk77nz9vvgfbpsps0l320qgjpkr2c9zhkn9sc3d275lfb"; + rev = "5e87c40f2cd96bd5dd953758e82f302107c7895e"; + sha256 = "12rw5fld64s0a2zjsdijfs0dv6vc6z7gcf24h4m2dmymzms4namg"; } , lib }: diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 843055a2c450..ef2bae8dbaf9 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "tzdata-${version}"; - version = "2016j"; + version = "2017c"; srcs = [ (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; - sha256 = "1j4xycpwhs57qnkcxwh3np8wnf3km69n3cf4w6p2yv2z247lxvpm"; + sha256 = "02yrrfj0p7ar885ja41ylijzbr8wc6kz6kzlw8c670i9m693ym6n"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "1dxhrk4z0n2di8p0yd6q00pa6bwyz5xqbrfbasiz8785ni7zrvxr"; + sha256 = "1dvrq0b2hz7cjqdyd7x21wpy4qcng3rvysr61ij0c2g64fyb9s41"; }) ]; diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index da49c36cd069..ce29ebf0a7ea 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, intltool, fetchurl, python +{ stdenv, intltool, fetchurl, python, autoreconfHook , pkgconfig, gtk3, glib , makeWrapper, itstool, libxml2, docbook_xsl , gnome3, librsvg, gdk_pixbuf, libxslt }: @@ -8,13 +8,25 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool libxml2 python - gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl - gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ]; + nativeBuildInputs = [ + pkgconfig intltool itstool makeWrapper docbook_xsl libxslt + # reconfiguration + autoreconfHook gnome3.gnome_common gnome3.yelp_tools + ]; + buildInputs = [ gtk3 glib libxml2 python + gnome3.gsettings_desktop_schemas + gdk_pixbuf gnome3.defaultIconTheme librsvg ]; enableParallelBuilding = true; + patches = [ + # https://bugzilla.gnome.org/show_bug.cgi?id=782161 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=351054; + sha256 = "093wjjj40027pkqqnm14jb2dp2i2m8p1bayqx1lw18pq66c8fahn"; + }) + ]; + preFixup = '' wrapProgram "$out/bin/glade" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ diff --git a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix index 7d71d1b7adc9..2812e7673b40 100644 --- a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix +++ b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool -, gobjectIntrospection, makeWrapper }: +{ stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib, gettext }: stdenv.mkDerivation rec { name = "nautilus-sendto-${version}"; - version = "3.8.1"; + version = "3.8.6"; src = fetchurl { url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz"; - sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab"; + sha256 = "164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gobjectIntrospection intltool makeWrapper ]; + nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext ]; + buildInputs = [ glib ]; meta = with stdenv.lib; { description = "Integrates Evolution and Pidgin into the Nautilus file manager"; diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 402c6c1c355e..130e8255edca 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3 +{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 , libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: let @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 - intltool docbook_xsl docbook_xsl_ns makeWrapper ]; + nativeBuildInputs = [ vala pkgconfig intltool libxslt libxml2 docbook_xsl docbook_xsl_ns makeWrapper ]; + buildInputs = [ glib dbus_glib ]; postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace client/Makefile \ diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index 171ad0774500..6fcaa67b7712 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -8,11 +8,11 @@ let majorVersion = "0.11"; in stdenv.mkDerivation rec { - name = "folks-${majorVersion}.3"; + name = "folks-${majorVersion}.4"; src = fetchurl { url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz"; - sha256 = "2a2828a7c87fd39e5786f8f2cf0ebe47576a74974f1355c478a6dc747d7bcb64"; + sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57"; }; propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index b6d9ccef6667..b8911dd5c1f1 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { major = "0.3"; - minor = "3"; + minor = "5"; name = "grilo-plugins-${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/grilo-plugins/${major}/${name}.tar.xz"; - sha256 = "fe66e887847fef9c361bcb7226047c43b2bc22b172aaf22afd5534947cc85b9c"; + sha256 = "1yv8a0mfd5qmdbdrnd0is5c51s1mvibhw61na99iagnbirxq4xr9"; }; installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ]; diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix index 18a4da4efe2d..ffa489927e2f 100644 --- a/pkgs/desktops/gnome-3/core/grilo/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { major = "0.3"; # if you change this, also change ./setup-hook.sh - minor = "3"; + minor = "4"; name = "grilo-${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz"; - sha256 = "1qx072m0gl6m3d5g5cbbf13p4h217icmlxjnrn829x5xqwi451sw"; + sha256 = "0vh67gja6yn7czh77ssmx6ncp99fl2926pbi2hplqms27c2n8sbw"; }; setupHook = ./setup-hook.sh; diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/desktops/gnome-3/core/libgdata/default.nix index 08f05bcaedc1..ddf245f49e06 100644 --- a/pkgs/desktops/gnome-3/core/libgdata/default.nix +++ b/pkgs/desktops/gnome-3/core/libgdata/default.nix @@ -5,11 +5,11 @@ let majorVersion = "0.17"; in stdenv.mkDerivation rec { - name = "libgdata-${majorVersion}.6"; + name = "libgdata-${majorVersion}.9"; src = fetchurl { url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz"; - sha256 = "8b6a3ff1db23bd9e5ebbcc958b29b769a898f892eed4798222d562ba69df30b0"; + sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45"; }; NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix index 5c1ffb450396..9e1e4588918f 100644 --- a/pkgs/desktops/gnome-3/core/libgxps/default.nix +++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff -, openssl, bzip2, acl, attr, libxml2 +{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, cairo +, libarchive, freetype, libjpeg, libtiff }: stdenv.mkDerivation rec { - name = "libgxps-0.2.2"; + name = "libgxps-0.3.0"; src = fetchurl { - url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; - sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; + url = "mirror://gnome/sources/libgxps/0.3/${name}.tar.xz"; + sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib cairo freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; + buildInputs = [ glib cairo freetype libjpeg libtiff ]; propagatedBuildInputs = [ libarchive ]; - configureFlags = "--without-liblcms2"; + mesonFlags = [ + "-Denable-test=false" + "-Dwith-liblcms2=false" + ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/libpeas/src.nix b/pkgs/desktops/gnome-3/core/libpeas/src.nix index cd440858946e..6f2cd82fb215 100644 --- a/pkgs/desktops/gnome-3/core/libpeas/src.nix +++ b/pkgs/desktops/gnome-3/core/libpeas/src.nix @@ -1,13 +1,13 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: rec { - major = "1.18"; + major = "1.22"; minor = "0"; version = "${major}.${minor}"; name = "libpeas-${version}"; src = fetchurl { url = "mirror://gnome/sources/libpeas/${major}/${name}.tar.xz"; - sha256 = "09jy2rwwgp0xx7cnypxl56m7zzxnj3j4v58xqjxjasf3chn88jdz"; + sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv"; }; } diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix index c5c75c166f73..dab1a0fea8a0 100644 --- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix +++ b/pkgs/desktops/gnome-3/core/libzapojit/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; meta = with stdenv.lib; { + description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index ebceb4ef706b..208b8b756488 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,7 +1,7 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo +{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo , pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput -, libgudev, xwayland }: +, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -9,29 +9,46 @@ stdenv.mkDerivation rec { # fatal error: gio/gunixfdlist.h: No such file or directory NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -Wno-error=format -Wno-error=sign-compare"; - configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland"; + configureFlags = [ + "--with-x" + "--disable-static" + "--enable-shape" + "--enable-sm" + "--enable-startup-notification" + "--enable-xsync" + "--enable-verbose-mode" + "--with-libcanberra" + "--with-xwayland-path=${xwayland}/bin/Xwayland" + ]; propagatedBuildInputs = [ # required for pkgconfig to detect mutter-clutter libXtst ]; + nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; + buildInputs = with gnome3; - [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower + [ glib gobjectIntrospection gtk gsettings_desktop_schemas upower gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2 - gnome3.geocode_glib libudev libinput libgudev - libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile + gnome3.geocode_glib libudev libinput libgudev libwacom + libcanberra_gtk3 zenity xkeyboard_config libxkbfile libxkbcommon ]; + patches = [ + # https://bugzilla.gnome.org/show_bug.cgi?id=760670 + (fetchpatch { + name = "libgudev-232.patch"; + url = https://bugzilla.gnome.org/attachment.cgi?id=358904; + sha256 = "0chvd7g9f2zp3a0gdhvinsfvp2h10rwb6a8ja386vsrl93ac8pix"; + }) + ]; + preFixup = '' wrapProgram "$out/bin/mutter" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - patches = [ - ./x86.patch # ./math.patch - ]; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/mutter/math.patch b/pkgs/desktops/gnome-3/core/mutter/math.patch deleted file mode 100644 index dbdfd93f5e1d..000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/math.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mutter-3.18.0/src/backends/meta-cursor-renderer.c.orig 2015-09-23 13:54:31.297523343 +0200 -+++ mutter-3.18.0/src/backends/meta-cursor-renderer.c 2015-09-23 13:54:43.728271766 +0200 -@@ -31,6 +31,7 @@ - - #include - #include -+#include - - #include "meta-stage.h" - diff --git a/pkgs/desktops/gnome-3/core/mutter/x86.patch b/pkgs/desktops/gnome-3/core/mutter/x86.patch deleted file mode 100644 index 93df1e7f2831..000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/x86.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/core/window.c 2015-05-26 10:52:41.382834963 +0200 -+++ b/src/core/window.c 2015-05-26 10:53:03.039948034 +0200 -@@ -3499,7 +3499,7 @@ - - static MetaMonitorInfo * - find_monitor_by_winsys_id (MetaWindow *window, -- guint winsys_id) -+ gint winsys_id) - { - int i; - -@@ -3618,7 +3618,7 @@ - */ - - gboolean did_placement; -- guint old_output_winsys_id; -+ gint old_output_winsys_id; - MetaRectangle unconstrained_rect; - MetaRectangle constrained_rect; - MetaMoveResizeResultFlags result = 0; diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix index 794f38013337..56fef3129272 100644 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix +++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix @@ -1,15 +1,10 @@ { stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "totem-pl-parser-3.10.2"; + inherit (import ./src.nix fetchurl) name src; - src = fetchurl { - url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz"; - sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ file intltool gmime libxml2 libsoup ]; + nativeBuildInputs = [ pkgconfig file intltool ]; + buildInputs = [ gmime libxml2 libsoup ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Videos; diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix new file mode 100644 index 000000000000..8e352ccfb4c4 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "totem-pl-parser-3.10.2"; + + src = fetchurl { + url = mirror://gnome/sources/totem-pl-parser/3.10/totem-pl-parser-3.10.2.tar.xz; + sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; + }; +} diff --git a/pkgs/desktops/gnome-3/core/vte/src.nix b/pkgs/desktops/gnome-3/core/vte/src.nix index 841798848e60..45029e8bb8dd 100644 --- a/pkgs/desktops/gnome-3/core/vte/src.nix +++ b/pkgs/desktops/gnome-3/core/vte/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "vte-0.48.3"; + name = "vte-0.50.1"; src = fetchurl { - url = mirror://gnome/sources/vte/0.48/vte-0.48.3.tar.xz; - sha256 = "a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3"; + url = mirror://gnome/sources/vte/0.50/vte-0.50.1.tar.xz; + sha256 = "cf1708e3e573160e1db107014b3ef70888fefe6b668373fed70e8d1cac45a8c2"; }; } diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 10e5f97c38fb..585f79ddea67 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -45,7 +45,7 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2 + inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2 clutter clutter-gst clutter_gtk cogl gtkvnc; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; @@ -56,7 +56,6 @@ let gtkmm = gtkmm3; vala = pkgs.vala_0_32; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; - webkitgtk = webkitgtk216x; # Simplify the nixos module and gnome packages defaultIconTheme = adwaita-icon-theme; diff --git a/pkgs/desktops/gnome-3/misc/gitg/src.nix b/pkgs/desktops/gnome-3/misc/gitg/src.nix index 9c6dd2148ccf..c72e2830ad1e 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/src.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gitg-3.24.0"; + name = "gitg-3.26.0"; src = fetchurl { - url = mirror://gnome/sources/gitg/3.24/gitg-3.24.0.tar.xz; - sha256 = "3e4ec4a8ae83bc7ced8c7610927ade70e37daa5e8beeb4f357a6ea30b4cc951e"; + url = mirror://gnome/sources/gitg/3.26/gitg-3.26.0.tar.xz; + sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5"; }; } diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix index a71dbf5494da..36feb09d7eef 100644 --- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala_0_32, libssh2 +{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala, libssh2 , gtk_doc, gobjectIntrospection, libgit2, glib }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gnome3.gnome_common libtool vala_0_32 libssh2 - gtk_doc gobjectIntrospection libgit2 glib ]; + nativeBuildInputs = [ + gnome3.gnome_common libtool pkgconfig vala gtk_doc gobjectIntrospection + ]; + + buildInputs = [ libssh2 libgit2 glib ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix index b9abde42cbda..00e747500c61 100644 --- a/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix +++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix @@ -1,12 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update -fetchurl: rec { - major = "0.25"; - minor = "0"; - name = "libgit2-glib-${major}.${minor}"; +fetchurl: { + name = "libgit2-glib-0.26.0"; src = fetchurl { - url = "mirror://gnome/sources/libgit2-glib/${major}/${name}.tar.xz"; - sha256 = "0rf5gcr3khp35wj9ax9cbyq5j3iiwa1l0fi16w6sfgmrryd6n9aa"; + url = mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.26.0.tar.xz; + sha256 = "06b16cfcc3a53d9804858618d690e5509e9af2e2245b75f0479cadbbe39745c3"; }; } diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/base/liblxqt/default.nix index 9363dba86699..bb5a9be6d848 100644 --- a/pkgs/desktops/lxqt/base/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/base/liblxqt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "liblxqt"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0dcsgj0qr4589wsibs6fdza4ncqavrhykd05d25rs78pa94lvvh5"; + sha256 = "1852vfbkbpw49i8ad682jhqmnskmc9a90qwpalipgak7m64azg3j"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/base/libqtxdg/default.nix index 47d3fb2e91c3..966566db7c8d 100644 --- a/pkgs/desktops/lxqt/base/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/base/libqtxdg/default.nix @@ -2,24 +2,28 @@ stdenv.mkDerivation rec { name = "libqtxdg-${version}"; - version = "2.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "lxde"; repo = "libqtxdg"; rev = version; - sha256 = "1s5jw4q6gcivk7mc95ir9q2nry4yyhfwy039ddf5ymh79nynv8vy"; + sha256 = "03kdrx5sgrl93yband87n30i0k2mv6dknwdw2adz45j5z9rhd3z6"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ qt5.qtbase qt5.qtsvg ]; + preConfigure = '' + cmakeFlags+=" -DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix" + ''; + meta = with stdenv.lib; { description = "Qt implementation of freedesktop.org xdg specs"; homepage = https://github.com/lxde/libqtxdg; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/base/libsysstat/default.nix index 2776a53fa833..b5013f5ac1aa 100644 --- a/pkgs/desktops/lxqt/base/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/base/libsysstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libsysstat-${version}"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "lxde"; repo = "libsysstat"; rev = version; - sha256 = "1rkbh6jj69wsf8a7w7cq8psqw08vqf9rq5pdnv4xxqb036r4bi31"; + sha256 = "0yl20dj553z1ijkfxl9n45qvkzxyl9rqw12vb4v6zj3ch6hzbzsx"; }; nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix index f8db33bc5a4d..8d369f464335 100644 --- a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, qt5 }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5 }: stdenv.mkDerivation rec { name = "lxqt-build-tools-${version}"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "lxde"; repo = "lxqt-build-tools"; rev = version; - sha256 = "1awd70ifbbi67pklhldjw968c1fw1lcif9nh4qbrjqmlg1gn3kmv"; + sha256 = "0i3pzgyd80n73dnqs8f6axinaji7biflgqsi33baxn4r1hy58ym1"; }; - nativeBuildInputs = [ cmake qt5.qtbase ]; + nativeBuildInputs = [ cmake pkgconfig pcre qt5.qtbase ]; + + preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"''; meta = with stdenv.lib; { description = "Various packaging tools and scripts for LXQt applications"; diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/core/libfm-qt/default.nix index 78c0a926b9c8..612fbeafe199 100644 --- a/pkgs/desktops/lxqt/core/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/core/libfm-qt/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, - xorg, libfm, menu-cache, + pcre, libexif, xorg, libfm, menu-cache, qtx11extras, qttools }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libfm-qt"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0k2g6bkz7bvawqkjzykbxi18wqsnhbxklqy6aqqkclpzcw45vk5v"; + sha256 = "0932yl098pc5rwgy9irrc3ys47jx64m3wm702dvs8yy15alv6x4i"; }; nativeBuildInputs = [ @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + pcre + libexif + xorg.libpthreadstubs + xorg.libxcb + xorg.libXdmcp qtx11extras qttools libfm diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/core/lxqt-about/default.nix index ac81391af1d9..645d634a26fe 100644 --- a/pkgs/desktops/lxqt/core/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-about/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-about"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1pa68pr0iwvh34lippagc8kxdfd0l2071m0vh7dnvfqbnwly29dk"; + sha256 = "13knjxbnq0mh9jgkllarf6rjxkvj2c93l0srnlrqp3939gcpwxh3"; }; nativeBuildInputs = [ @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = standardPatch; - meta = with stdenv.lib; { description = "Dialogue window providing information about LXQt and the system it's running on"; homepage = https://github.com/lxde/lxqt-about; diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix index 23b142f352f0..54731b22686c 100644 --- a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }: +{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-admin"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "12c1wdciqgiifsk5aslw3990pk9ylk9jhgwnrxvh798rr48hhflr"; + sha256 = "0dg3gm5m19dc4jarh8xcn0mcnpgxzz7nhy5dzm8chddaa6pdm7vi"; }; nativeBuildInputs = [ @@ -29,8 +29,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = standardPatch; - meta = with stdenv.lib; { description = "LXQt system administration tool"; homepage = https://github.com/lxde/lxqt-admin; diff --git a/pkgs/desktops/lxqt/core/lxqt-common/default.nix b/pkgs/desktops/lxqt/core/lxqt-common/default.nix deleted file mode 100644 index cc114c31dfd5..000000000000 --- a/pkgs/desktops/lxqt/core/lxqt-common/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, lxqt, hicolor_icon_theme, xmessage }: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "lxqt-common"; - version = "0.11.2"; - - src = fetchFromGitHub { - owner = "lxde"; - repo = pname; - rev = version; - sha256 = "07ih2w9ksbxqwy36xvgb9b31740nhkm7ap70wvv8q6x0wyhn71gn"; - }; - - nativeBuildInputs = [ - cmake - lxqt.lxqt-build-tools - ]; - - buildInputs = [ - qt5.qtsvg - hicolor_icon_theme - xmessage - ]; - - postPatch = lxqt.standardPatch - + '' - substituteInPlace ./startlxqt.in \ - --replace "cp " "cp --no-preserve=mode " \ - --replace xmessage "${xmessage}"/bin/xmessage - ''; - - meta = with stdenv.lib; { - description = "Common files for LXQt"; - homepage = https://github.com/lxde/lxqt-common; - license = licenses.lgpl21; - platforms = with platforms; unix; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix index 20e785ec5fda..191fe0796e88 100644 --- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-config"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0mqvv93djsw49n0gxpws3hrwimnyf9kzvc2vhjkzrjfxpabk2axx"; + sha256 = "1ccxkdfhgf40jxiy0132yr9b28skvs9yr8j75w663hnqi6ccn377"; }; nativeBuildInputs = [ @@ -36,7 +36,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = standardPatch; + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + ''; meta = with stdenv.lib; { description = "Tools to configure LXQt and the underlying operating system"; @@ -46,12 +49,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ romildo ]; }; - patches = [ - # Fixes a FTBFS with CMake v3.8 - (fetchpatch { - url = https://github.com/lxde/lxqt-config/commit/bca652a75f8a497a69b1fbc1c7eaa353f6b4eef8.patch; - sha256 = "17k26xj97ks9gvcjhiwc5y39fciria4xyxrzcz67zj0flqm3cmrf"; - }) - ]; - } diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix index 73248da1ef80..9e74eee5ec17 100644 --- a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-globalkeys"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1kwibll2azi4pafk7crfgibk5a54rnsia3c4cz680iny7xz1wy6h"; + sha256 = "14icyik9x47wi3gfkmkyhag26a2ivyc42f4f8qwdgbr3dcg10b9a"; }; nativeBuildInputs = [ @@ -29,7 +29,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = standardPatch; + postPatch = '' + for dir in autostart xdg; do + substituteInPlace $dir/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + done + ''; meta = with stdenv.lib; { description = "Daemon used to register global keyboard shortcuts"; diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix index b836b9776e65..10b767aedac0 100644 --- a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lxqt-l10n-${version}"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "lxde"; repo = "lxqt-l10n"; rev = version; - sha256 = "1vk4q98kraq0lba50n9z6jwiapc7nz2b143b4ldlmrz4wscd867h"; + sha256 = "025zg5y9f286p74rab4yxyz4cqlh4hqjq43xxpi76ma2fy2s03a4"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix index 8aea9a6458b3..061a8522a6fe 100644 --- a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, qtx11extras }: +{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-notificationd"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1n39zjczzhqn73vfyjngybmk9w8j1z3vjkaq80rf2hk89vwsm0wc"; + sha256 = "0pmpdqgnb2dfxw5lirh89j8hnrwwcn2zc64byg4zi0xdvq6qms43"; }; nativeBuildInputs = [ @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { lxqt-build-tools ]; + postPatch = '' + substituteInPlace autostart/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + ''; + buildInputs = [ qtbase qttools @@ -24,7 +29,6 @@ stdenv.mkDerivation rec { kwindowsystem liblxqt libqtxdg - lxqt-common qtx11extras ]; diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix index a52ce02cd14b..bcc00a0add50 100644 --- a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-openssh-askpass"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "030pzys86s7rpgl35kl4b3y7gmv9982j3blmg8927nq4pw61gfj9"; + sha256 = "16xcw4yll6i9vij16kdb10s4aq2s57x4yjlwv6d8r75y5gq9iiw6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix index d2faf9c0eee4..77a49410bb60 100644 --- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix @@ -1,22 +1,22 @@ { - stdenv, fetchFromGitHub, fetchurl, standardPatch, + stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, - kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat, + kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat, xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, - lxmenu-data + lxmenu-data, pcre }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-panel"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "097rivly61i99v0w9a3dgbwbc4c5x9nh3jl0n94dix1qgd4w983y"; + sha256 = "01xmnb17jpydyfvxwaa6kymzdasnyd94z62gjah8y4pzsmykcr4x"; }; nativeBuildInputs = [ @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { kguiaddons liblxqt libqtxdg - lxqt-common lxqt-globalkeys libsysstat xorg.libpthreadstubs @@ -47,18 +46,19 @@ stdenv.mkDerivation rec { alsaLib menu-cache lxmenu-data - ]; - - patches = [ - (fetchurl { - url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch; - sha256 = "1ywwk8gb6gbvs8z9gwgsnb13z1jvyvjij349nq7ij6iyhyld0jlr"; - }) + pcre ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = standardPatch; + postPatch = '' + for dir in autostart menu; do + substituteInPlace $dir/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + done + substituteInPlace panel/CMakeLists.txt \ + --replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg" + ''; meta = with stdenv.lib; { description = "The LXQt desktop panel"; diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix index bdcc0a4d606e..fca6a9ff1f61 100644 --- a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt, - libqtxdg, + libqtxdg, pcre }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-policykit"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0sf8wj152z1xid1i2x5g1zpgh7lwq8f0rbrk3r9shyksxqcj2d8p"; + sha256 = "1hxz5bxxi118g255aqb3da767va0wd25y671lk2w9r1641j8zf2d"; }; nativeBuildInputs = [ @@ -31,10 +31,16 @@ stdenv.mkDerivation rec { kwindowsystem liblxqt libqtxdg + pcre ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + substituteInPlace autostart/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + ''; + meta = with stdenv.lib; { description = "The LXQt PolicyKit agent"; homepage = https://github.com/lxde/lxqt-policykit; diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix index d3793a9d9286..e5012abed6a4 100644 --- a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-powermanagement"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0rcjq20ap6kc3m1f2glb8c62qhsx8qh0rkzlj3rykdj6n4hc0x79"; + sha256 = "1fxklxmvjaykdpf0nj6cpgwx4yf52087g25k1zdak9n0l9n7hm8d"; }; nativeBuildInputs = [ @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + substituteInPlace autostart/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + ''; + meta = with stdenv.lib; { description = "Power management module for LXQt"; homepage = https://github.com/lxde/lxqt-powermanagement; diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix index d5b8987bbb82..c5fae1e9ecb3 100644 --- a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix @@ -1,19 +1,19 @@ { - stdenv, fetchFromGitHub, standardPatch, + stdenv, fetchFromGitHub, cmake, lxqt-build-tools, - qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, + qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, libfm-qt }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-qtplugin"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "12hyw7rk3zx51n6g2bazlqv70xap0lygm9v21ibxgy1aw0j6iy02"; + sha256 = "1i1rga0pg764ccwhq7acdsckxpl1apxwj4lv4gygxxmpkrg62zkv"; }; nativeBuildInputs = [ @@ -28,11 +28,13 @@ stdenv.mkDerivation rec { qtsvg libdbusmenu libqtxdg + libfm-qt ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - - postPatch = standardPatch; + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" + ''; meta = with stdenv.lib; { description = "LXQt Qt platform integration plugin"; diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix index 8e2332dad5c7..0c1f08b34d77 100644 --- a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, qtx11extras, -menu-cache, muparser }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras, +menu-cache, muparser, pcre }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-runner"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1nsxm0fplwrzz3vccd5fm82lpl4fqss6kv558zj44vzpsl13l954"; + sha256 = "1354vdaskhch1n8v3kdy15nszgqb1092csr84nbhymzgrhrq1093"; }; nativeBuildInputs = [ @@ -27,14 +27,19 @@ stdenv.mkDerivation rec { kwindowsystem liblxqt libqtxdg - lxqt-common lxqt-globalkeys menu-cache muparser + pcre ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + substituteInPlace autostart/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + ''; + meta = with stdenv.lib; { description = "Tool used to launch programs quickly by typing their names"; homepage = https://github.com/lxde/lxqt-runner; diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/core/lxqt-session/default.nix index ba0bb69ce926..d3733950ed00 100644 --- a/pkgs/desktops/lxqt/core/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-session/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, lxqt-common, xorg, xdg-user-dirs }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-session"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "14ahgix5jsv7fkmvz1imw9a12ygxccqrdxp9yfbpin1az9q1n1qv"; + sha256 = "03gi9svxqsfjhk5ifbaalq9i44ggx8afwms1hb312czqn82wrszb"; }; nativeBuildInputs = [ @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { kwindowsystem liblxqt libqtxdg - lxqt-common xorg.libpthreadstubs xorg.libXdmcp xdg-user-dirs @@ -34,6 +33,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + for dir in autostart config; do + substituteInPlace $dir/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + done + ''; + meta = with stdenv.lib; { description = "An alternative session manager ported from the original razor-session"; homepage = https://github.com/lxde/lxqt-session; diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix index 1e235af3c900..8700a768abdf 100644 --- a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-sudo"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0imy4cs51im81rd0wa03wy418cdv9gqqgmwkc7v58cip7h665pyk"; + sha256 = "0ql436yb51qwbnj5gbzvqi4rqx4zkmja5rdjs6yavb1x8ggn1jv6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix new file mode 100644 index 000000000000..6251667430b2 --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, lxqt }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-themes"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "0f7bipkxkl741lpb2cziw9wlqy05514nqqrppsz5g4y8bmzw910n"; + }; + + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics" + substituteInPlace themes/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt" + ''; + + meta = with stdenv.lib; { + description = "Themes, graphics and icons for LXQt"; + homepage = https://github.com/lxde/lxqt-themes; + license = licenses.lgpl21; + platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix index b8421d062021..862a4ff9cf99 100644 --- a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio, pcre, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "pavucontrol-qt"; - version = "0.2.0"; + version = "0.3.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0k7sg4dxr48nk15gpqlnkjr9gbh7r5gs0s0ydifcmw281khrzlzj"; + sha256 = "1pfqdzsbygvq77npsizydps25d9g6vgw177yqvmz3cg3a68dad27"; }; nativeBuildInputs = [ @@ -19,10 +19,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qt5.qtbase - qt5.qttools - qt5.qtx11extras + qtbase + qttools + qtx11extras libpulseaudio + pcre ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix index 7c115c2ca27f..d9e2a651c3a8 100644 --- a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "pcmanfm-qt"; - version = "0.11.3"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "04vhfhjmz1a4rhkpb6y35hwg565047rp53rcxf4pdn0i9f6zhr4f"; + sha256 = "050h5w1wph35l5m69qbxzvc96y7y0bg1m7flqdadrp688pbnzcxb"; }; nativeBuildInputs = [ @@ -30,6 +30,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + for dir in autostart config; do + substituteInPlace $dir/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + done + ''; + meta = with stdenv.lib; { description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; homepage = https://github.com/lxde/pcmanfm-qt; diff --git a/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix b/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix new file mode 100644 index 000000000000..6bd6e2833f5e --- /dev/null +++ b/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, qt5 }: + +stdenv.mkDerivation rec { + name = "${pname}_0_7_1-${version}"; + pname = "qtermwidget"; + version = "0.7.1"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qt5.qtbase ]; + + meta = with stdenv.lib; { + description = "A terminal emulator widget for Qt 5"; + homepage = https://github.com/lxde/qtermwidget; + license = licenses.gpl2; + platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/core/qtermwidget/default.nix index 66620e195ec0..f882088d07b8 100644 --- a/pkgs/desktops/lxqt/core/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/core/qtermwidget/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchFromGitHub, cmake, qt5 }: +{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qtermwidget"; - version = "0.7.1"; + version = "0.8.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz"; + sha256 = "14yjz6b1l2yd7sfsxjv26yg5153fpyq23443kswkgkd9jh32gxj4"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ]; - buildInputs = [ qt5.qtbase ]; + buildInputs = [ qt5.qtbase qt5.qttools]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; meta = with stdenv.lib; { description = "A terminal emulator widget for Qt 5"; diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 735ba79b405c..40c25b3302ca 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -6,24 +6,6 @@ let # For compiling information, see: # - https://github.com/lxde/lxqt/wiki/Building-from-source - standardPatch = '' - for file in $(find . -name CMakeLists.txt); do - substituteInPlace $file \ - --replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg" \ - --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ - --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt" \ - --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics" \ - --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" \ - --replace "\''${LXQT_TRANSLATIONS_DIR}" share/lxqt/translations - echo ============================ - echo $file - grep --color=always DESTINATION $file || true - grep --color=always share/lxqt/translations $file || true - grep --color=always platform $file || true - done - echo -------------------------------------------------------- - ''; - ### BASE libqtxdg = callPackage ./base/libqtxdg { }; lxqt-build-tools = callPackage ./base/lxqt-build-tools { }; @@ -34,7 +16,6 @@ let libfm-qt = callPackage ./core/libfm-qt { }; lxqt-about = callPackage ./core/lxqt-about { }; lxqt-admin = callPackage ./core/lxqt-admin { }; - lxqt-common = callPackage ./core/lxqt-common { }; lxqt-config = callPackage ./core/lxqt-config { }; lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { }; lxqt-l10n = callPackage ./core/lxqt-l10n { }; @@ -45,8 +26,11 @@ let lxqt-qtplugin = callPackage ./core/lxqt-qtplugin { }; lxqt-session = callPackage ./core/lxqt-session { }; lxqt-sudo = callPackage ./core/lxqt-sudo { }; - pavucontrol-qt = callPackage ./core/pavucontrol-qt { }; + lxqt-themes = callPackage ./core/lxqt-themes { }; + pavucontrol-qt = libsForQt5.callPackage ./core/pavucontrol-qt { }; qtermwidget = callPackage ./core/qtermwidget { }; + # for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0 + qtermwidget_0_7_1 = callPackage ./core/qtermwidget/0.7.1.nix { }; ### CORE 2 lxqt-panel = callPackage ./core/lxqt-panel { }; @@ -84,7 +68,6 @@ let libfm-qt lxqt-about lxqt-admin - lxqt-common lxqt-config lxqt-globalkeys lxqt-l10n @@ -95,6 +78,7 @@ let lxqt-qtplugin lxqt-session lxqt-sudo + lxqt-themes pavucontrol-qt ### CORE 2 diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/optional/compton-conf/default.nix index 6e1ea1288539..253f8112f5b2 100644 --- a/pkgs/desktops/lxqt/optional/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/optional/compton-conf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "compton-conf"; - version = "0.2.1"; + version = "0.3.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1hmirhsz010h6a6k7my1krh5nw5ds4x00c5fq6apamrdd8d4zrmq"; + sha256 = "1p1y7g5psczx1dgh6gd1h5iga8rylvczkwlfirzrh0rfl45dajgb"; }; nativeBuildInputs = [ @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + preConfigure = '' + substituteInPlace autostart/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ + ''; + meta = with stdenv.lib; { description = "GUI configuration tool for compton X composite manager"; homepage = https://github.com/lxde/compton-conf; diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix index 3308f0e412bd..80921cac891d 100644 --- a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix @@ -3,16 +3,15 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lximage-qt"; - version = "0.5.1"; + version = "0.6.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0hyiarjjxjwvzinlfnfxbqx40dhgydd3ccv3xqwvj7yni1nfx7pb"; + sha256 = "0zmrpfgmlq005zikyvhqbpip6mz6pfcf9aqjpncyc5vlggmh28ym"; }; - nativeBuildInputs = [ cmake pkgconfig diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix index 36490b726e0f..e3cb02e8b8af 100644 --- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt, openbox, hicolor_icon_theme }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor_icon_theme }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "obconf-qt"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1w94g8jk2j9qrkwg3i6qwgai2sj1m657bbk2zlk9bc3qvzmwxwrc"; + sha256 = "1vwza1516z7f18s5vfnhzsiyxs6afb1hgr3yqkr7qhplmq5wjma5"; }; nativeBuildInputs = [ @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + pcre qt5.qtbase qt5.qttools qt5.qtx11extras diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/optional/qlipper/default.nix index 376b8fb0190d..04b0cd3e6ac6 100644 --- a/pkgs/desktops/lxqt/optional/qlipper/default.nix +++ b/pkgs/desktops/lxqt/optional/qlipper/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "qlipper"; version = "5.0.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "pvanek"; repo = pname; rev = version; diff --git a/pkgs/desktops/lxqt/optional/qps/default.nix b/pkgs/desktops/lxqt/optional/qps/default.nix index d39341eb05d0..e27388fa1681 100644 --- a/pkgs/desktops/lxqt/optional/qps/default.nix +++ b/pkgs/desktops/lxqt/optional/qps/default.nix @@ -1,39 +1,20 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, makeDesktopItem }: +{ stdenv, fetchFromGitHub, cmake, qt5 }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qps"; - version = "1.10.16"; + version = "1.10.17"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "QtDesktop"; repo = pname; - rev = "v${version}"; - sha256 = "1s6hvqfv9hv1cl5pfsmghqn1zqhibr4plq3glzgd8s7swwdnsvjj"; - }; - - desktopItem = makeDesktopItem { - name = "qps"; - exec = "qps"; - icon = "qps"; - comment = "Visual process manager - Qt version of ps/top"; - desktopName = "qps"; - genericName = meta.description; - categories = "System;"; + rev = version; + sha256 = "1d5r6w9wsxjdrzq2hllrj2n1d9azy6g05hg0w0s6pikrmn1yl0a3"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ qt5.qtbase qt5.qtx11extras ]; - - installPhase = '' - mkdir -p $out/{bin,share/{man/man1,doc,icons}} - cp -a src/qps $out/bin/ - cp -a ../README.md $out/share/doc/ - cp -a ../qps.1 $out/share/man/man1/ - cp -a ../icon/icon.xpm $out/share/icons/qps.xpm - ln -sv "${desktopItem}/share/applications" $out/share/ - ''; + buildInputs = [ qt5.qtbase qt5.qtx11extras qt5.qttools ]; meta = with stdenv.lib; { description = "The Qt process manager"; diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/optional/qterminal/default.nix index ff59a2d893c6..88c4740760f8 100644 --- a/pkgs/desktops/lxqt/optional/qterminal/default.nix +++ b/pkgs/desktops/lxqt/optional/qterminal/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qterminal"; - version = "0.7.1"; + version = "0.8.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "14pfwii8axyswrkwvfmc2i0a07fjnhpyk3hh06qkbj2w3r00xhyb"; + sha256 = "1899a5zc5kx7mxiyrncigqjia1k98qg526qynf4754nr9ifghxdw"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix index 4bd040c00a8b..3c4bebf39fd9 100644 --- a/pkgs/desktops/lxqt/optional/screengrab/default.nix +++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "screengrab-${version}"; version = "1.97"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "QtDesktop"; repo = "screengrab"; rev = version; @@ -24,10 +24,6 @@ stdenv.mkDerivation rec { xorg.libXdmcp ]; - 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/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index f4d396047261..cb0f50727d7a 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.1/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.2/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 900c6c0b2c43..5873f747060e 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,355 +3,355 @@ { bluedevil = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/bluedevil-5.11.1.tar.xz"; - sha256 = "0p1y3p87xg7rjj35n81jg4v4yr2k7bf80qzfnwslbvwrpnzs982q"; - name = "bluedevil-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/bluedevil-5.11.2.tar.xz"; + sha256 = "0gwvmy8zn3wcdvcgc5j84gy1y7cxysy7bvnppg34rh6l5qc7vvjq"; + name = "bluedevil-5.11.2.tar.xz"; }; }; breeze = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/breeze-5.11.1.tar.xz"; - sha256 = "0yqbr7j0iqnmczbfv454f1l5x3787vzfchgkrd995d6za2d0w2lp"; - name = "breeze-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/breeze-5.11.2.tar.xz"; + sha256 = "1wv5dp657gw4vyiv9zf6r8qbs67sp5g0x0kf1vmr1bp0gkw0ai81"; + name = "breeze-5.11.2.tar.xz"; }; }; breeze-grub = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/breeze-grub-5.11.1.tar.xz"; - sha256 = "0pcri1z4min5m6wb6ncyjavwd9nszyis3cqdyw6mqb4av55z0xl0"; - name = "breeze-grub-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/breeze-grub-5.11.2.tar.xz"; + sha256 = "04m74iy0rijccmvqd7c9n4p6nk3flmb3zaf5qk8hv31qscg5qjaj"; + name = "breeze-grub-5.11.2.tar.xz"; }; }; breeze-gtk = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/breeze-gtk-5.11.1.tar.xz"; - sha256 = "0qb3ykf1mdw1iparsaxnypc4z41lfal6idksz9va25p3vclh02gr"; - name = "breeze-gtk-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/breeze-gtk-5.11.2.tar.xz"; + sha256 = "0c3vshnkgp6c38rwr1x34hn244r78qkc7fj0ax2cibydv3l852d4"; + name = "breeze-gtk-5.11.2.tar.xz"; }; }; breeze-plymouth = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/breeze-plymouth-5.11.1.tar.xz"; - sha256 = "1z175176583aqdvv6gwy7mdkndr50x1c8xdihrrcvdhvqy9qc7hr"; - name = "breeze-plymouth-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/breeze-plymouth-5.11.2.tar.xz"; + sha256 = "1v43z59y0zzwsrwa0y255i2q8krvr9yafdciyr63v4pb2564v4sd"; + name = "breeze-plymouth-5.11.2.tar.xz"; }; }; discover = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/discover-5.11.1.tar.xz"; - sha256 = "0zr53nw9lix80wlf7wa7irng2vvy80wccjs439ib8r1yh3ggiq4c"; - name = "discover-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/discover-5.11.2.tar.xz"; + sha256 = "0j31x26s446xvi6dxr83v15xbr6ysifiwvdzil8yfsynifhjk5n3"; + name = "discover-5.11.2.tar.xz"; }; }; drkonqi = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/drkonqi-5.11.1.tar.xz"; - sha256 = "0kq06sz39m8qg19b4cjqfwnx19j3s29hddhls8wywswwxlz4aq35"; - name = "drkonqi-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/drkonqi-5.11.2.tar.xz"; + sha256 = "1mgcp8zk4md0cyx6z6zz9s64jx9yshlnmsf1jxzhqwg8lyhyb77b"; + name = "drkonqi-5.11.2.tar.xz"; }; }; kactivitymanagerd = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kactivitymanagerd-5.11.1.tar.xz"; - sha256 = "1j36mbngga492xxhm1ndw1bnq1qn480qpvzi94wyax9y3r4szmhg"; - name = "kactivitymanagerd-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kactivitymanagerd-5.11.2.tar.xz"; + sha256 = "165nybhn7pwgr6fds6frwcp3qsnxpmkz3842h0ni0flkkcl74n52"; + name = "kactivitymanagerd-5.11.2.tar.xz"; }; }; kde-cli-tools = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kde-cli-tools-5.11.1.tar.xz"; - sha256 = "0di7ypyhda4gpadhi0lbji4nyi9xk1y844kxfb586wpzkim5w82c"; - name = "kde-cli-tools-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kde-cli-tools-5.11.2.tar.xz"; + sha256 = "18pl9v2dxayzwzk4rw674ka3j45dj864604hgg0874kkr3kgsgka"; + name = "kde-cli-tools-5.11.2.tar.xz"; }; }; kdecoration = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kdecoration-5.11.1.tar.xz"; - sha256 = "1jpvdscmy5ymyvj22784swvf6181f7ggr875djhx57c7i4shb3ph"; - name = "kdecoration-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kdecoration-5.11.2.tar.xz"; + sha256 = "0qkh3p1zzvk0yvlpbvwfgmb2wvj0gd3j2sbz10vplf66fm3ck2va"; + name = "kdecoration-5.11.2.tar.xz"; }; }; kde-gtk-config = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kde-gtk-config-5.11.1.tar.xz"; - sha256 = "1afbwdrjdv9a2qwyxysgnslavan20cmhrz88kmnf9imxlll0i7al"; - name = "kde-gtk-config-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kde-gtk-config-5.11.2.tar.xz"; + sha256 = "0vhmpma2ssp7nqdy8yd12d42y2a2fnsyyz9msi4s7n1w5qga0g5p"; + name = "kde-gtk-config-5.11.2.tar.xz"; }; }; kdeplasma-addons = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kdeplasma-addons-5.11.1.tar.xz"; - sha256 = "09dwmd1aiiivkvdbyv97fili067sd8mw9dpknawair4mh7qb0zln"; - name = "kdeplasma-addons-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kdeplasma-addons-5.11.2.tar.xz"; + sha256 = "0x1lgvcnrc9vcy9fqvc60ilmcm8pbym76fq784qmgnmzm0br3bq6"; + name = "kdeplasma-addons-5.11.2.tar.xz"; }; }; kgamma5 = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kgamma5-5.11.1.tar.xz"; - sha256 = "1m9maxzn5y3zijmj2fkwsfwhinprhz97v9fi312dmwyvfhq3qvyd"; - name = "kgamma5-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kgamma5-5.11.2.tar.xz"; + sha256 = "0k6j6nl26bhdavfr4y0ph17fywprzxjnamh67vibk39xg6vwa56d"; + name = "kgamma5-5.11.2.tar.xz"; }; }; khotkeys = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/khotkeys-5.11.1.tar.xz"; - sha256 = "0d1p1sia9qvdls38m29jijsf1ya8zvza557flmhcajb5ldn243l5"; - name = "khotkeys-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/khotkeys-5.11.2.tar.xz"; + sha256 = "1w1a06v2cgq48z0b1rz6px1g14hm7f5jxzxf7sa26yszsyhwqglm"; + name = "khotkeys-5.11.2.tar.xz"; }; }; kinfocenter = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kinfocenter-5.11.1.tar.xz"; - sha256 = "0ivhf460y83qv4qdphdvskx2nlfqzy453xfnq7ldyzp2yacdmcc8"; - name = "kinfocenter-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kinfocenter-5.11.2.tar.xz"; + sha256 = "1131gnqapnin8i4bm3skzhfsqgcaynaxn9xgfwxnj64z41cc8z8l"; + name = "kinfocenter-5.11.2.tar.xz"; }; }; kmenuedit = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kmenuedit-5.11.1.tar.xz"; - sha256 = "081lqh5ck854pha1f99w6w4j032spl3v28ild61fmhvhzkvx48a6"; - name = "kmenuedit-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kmenuedit-5.11.2.tar.xz"; + sha256 = "03412s6wc9h2422lx57rg65zln9ywjk5gbs5mqjr6fi46a1zp5lg"; + name = "kmenuedit-5.11.2.tar.xz"; }; }; kscreen = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kscreen-5.11.1.tar.xz"; - sha256 = "1skdg59qacxxkiyz3gc1nn4y4lflbynpcb4mpsliqb2n2xdhvg8r"; - name = "kscreen-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kscreen-5.11.2.tar.xz"; + sha256 = "0bs09zfq1cs1ajgvz4p7l5naa3g3vzp72v9q7qkncx8yqiffxlnc"; + name = "kscreen-5.11.2.tar.xz"; }; }; kscreenlocker = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kscreenlocker-5.11.1.tar.xz"; - sha256 = "0jgq2w7zi1i4wdlfmfz1jh1kbkcn2lxkdg9ds5brisc3f6r4n3vg"; - name = "kscreenlocker-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kscreenlocker-5.11.2.tar.xz"; + sha256 = "1k32nzhv9d4g5ijkx8bl22hp5j1g22frriwq14xjw47ga8vkqmxw"; + name = "kscreenlocker-5.11.2.tar.xz"; }; }; ksshaskpass = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/ksshaskpass-5.11.1.tar.xz"; - sha256 = "00ghycjmagc8mjwsgny9bkr45ppnad6aay44ha6fn5gyx973xcmx"; - name = "ksshaskpass-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/ksshaskpass-5.11.2.tar.xz"; + sha256 = "1z3vm8kwyi9pf51bhpqf3phbjkbrqfj4iiqzzs0aqm0l5db5il0r"; + name = "ksshaskpass-5.11.2.tar.xz"; }; }; ksysguard = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/ksysguard-5.11.1.tar.xz"; - sha256 = "11z29w95ji815gwaggs0n9bw8f040z4fd87ci2wmqcpyrjs7a6z1"; - name = "ksysguard-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/ksysguard-5.11.2.tar.xz"; + sha256 = "0vy2ivsn0cg70n1cxwa2385fwh350xngc1429zjfcs0jj8lcj21l"; + name = "ksysguard-5.11.2.tar.xz"; }; }; kwallet-pam = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kwallet-pam-5.11.1.tar.xz"; - sha256 = "0zipldqjg3mazm2j7vrxkc0pqp7x7mmdq7cg1vlb1xlj8ld2vl7y"; - name = "kwallet-pam-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kwallet-pam-5.11.2.tar.xz"; + sha256 = "1jr4zvf9c5npi9mcgil5byx4bwh6kaa205329p5z8i15n1zf250f"; + name = "kwallet-pam-5.11.2.tar.xz"; }; }; kwayland-integration = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kwayland-integration-5.11.1.tar.xz"; - sha256 = "1h1lcvzbcf628hs5hj3ykpzy086ylvf5bz63gr0clhyckjxrbbkh"; - name = "kwayland-integration-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kwayland-integration-5.11.2.tar.xz"; + sha256 = "1dzlf9638d36h8z5a7rjbb0xl2wjqg04j37gn4jnjclm57bwlrjm"; + name = "kwayland-integration-5.11.2.tar.xz"; }; }; kwin = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kwin-5.11.1.tar.xz"; - sha256 = "1anc8pblpsb8g7lvnq43ji6fgpwxsnmypc3gkip26lb4j7gqfhqm"; - name = "kwin-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kwin-5.11.2.tar.xz"; + sha256 = "1wvq4pll1adncj88qd7isc0ip7hx2c72ah0vvmvxmkwxa4r5a89b"; + name = "kwin-5.11.2.tar.xz"; }; }; kwrited = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/kwrited-5.11.1.tar.xz"; - sha256 = "11y2dpjs0g01nah1924dzf39y1smzlswc6nx1cwgfky3raaz3cj0"; - name = "kwrited-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/kwrited-5.11.2.tar.xz"; + sha256 = "17i33yvpvpj6q42c58adb99xs1yb7yfchs626vw5nmllv7r7496l"; + name = "kwrited-5.11.2.tar.xz"; }; }; libkscreen = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/libkscreen-5.11.1.tar.xz"; - sha256 = "0drv6f8gzilirwp7p31qrng7cdp7b23ar5v1d5bkdrr1q29z8wdv"; - name = "libkscreen-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/libkscreen-5.11.2.tar.xz"; + sha256 = "18bf7mzzri7fj8iw60wqbs6w46lin8lninpqpcs5fwz6m81lcxsg"; + name = "libkscreen-5.11.2.tar.xz"; }; }; libksysguard = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/libksysguard-5.11.1.tar.xz"; - sha256 = "1m8514jv2487fbypxys65qb0a55psqvyzkw5l81ka4ydnrhl2hhm"; - name = "libksysguard-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/libksysguard-5.11.2.tar.xz"; + sha256 = "12d0r4rilydbqdgkm256khvkb9m0hya3p27xqvv3hg77wgxzdl3f"; + name = "libksysguard-5.11.2.tar.xz"; }; }; milou = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/milou-5.11.1.tar.xz"; - sha256 = "1v7rbjw8i1pdvl60xh8s0srrp17jks360zk42rp3hq9srsffd8cp"; - name = "milou-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/milou-5.11.2.tar.xz"; + sha256 = "0kxf2q0pk7kyfirrspgpwlnj18v8q2770rrmrv0jcfsgv4jhl2gj"; + name = "milou-5.11.2.tar.xz"; }; }; oxygen = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/oxygen-5.11.1.tar.xz"; - sha256 = "0b3yl4q5cbcj6d07xrmifpvwysaa870gf56a7l38zjba6z04819z"; - name = "oxygen-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/oxygen-5.11.2.tar.xz"; + sha256 = "18nkw02q7lzdhalmbwsb5i704szs19zc5a0z73smanf20cfq7a91"; + name = "oxygen-5.11.2.tar.xz"; }; }; plasma-desktop = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-desktop-5.11.1.tar.xz"; - sha256 = "1r7chviykyq2650k513qcp665pv8vpdczvbrvqfhbpn4yy47crps"; - name = "plasma-desktop-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-desktop-5.11.2.tar.xz"; + sha256 = "0dz57qywlircjjybxzb3mqxwaid86zdfwjgfwcb6fhm8rxhbhrzq"; + name = "plasma-desktop-5.11.2.tar.xz"; }; }; plasma-integration = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-integration-5.11.1.tar.xz"; - sha256 = "0jpshilcpklyx7cbpn0cf96md2h6pwd86bk8lphzm64zv3c655ly"; - name = "plasma-integration-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-integration-5.11.2.tar.xz"; + sha256 = "15vjmmrlk9dw0if0z3xam171f8z3qkjcllj3zyc0zxdwi2zw6i2l"; + name = "plasma-integration-5.11.2.tar.xz"; }; }; plasma-nm = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-nm-5.11.1.tar.xz"; - sha256 = "0479cqy7503krish11djg7rc4g7kdlbj3gapsbgvlq9x6j7ixz1p"; - name = "plasma-nm-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-nm-5.11.2.tar.xz"; + sha256 = "1h3ajq3fdv8fn0r51cpkhihacpjvpgzpfyg2m9aydh7ajygf0njq"; + name = "plasma-nm-5.11.2.tar.xz"; }; }; plasma-pa = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-pa-5.11.1.tar.xz"; - sha256 = "0g565v4dwcn6jppn1p2dvljg5r39xmgjzgf8rcipw70kcwc1nx4c"; - name = "plasma-pa-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-pa-5.11.2.tar.xz"; + sha256 = "1ckk4ckhy5y3b6cm7gahwkqvf8bxndk0srij3ggqdasxzdc4fjn8"; + name = "plasma-pa-5.11.2.tar.xz"; }; }; plasma-sdk = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-sdk-5.11.1.tar.xz"; - sha256 = "0ss148yig5zzprkk2ydq3np34gr0bnbh1gn18hgb5z33iglbdl3n"; - name = "plasma-sdk-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-sdk-5.11.2.tar.xz"; + sha256 = "10ayy3r36ysq3a79nlpqspfff0s28iq2xyp5767qpmzfrjby4bcx"; + name = "plasma-sdk-5.11.2.tar.xz"; }; }; plasma-tests = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-tests-5.11.1.tar.xz"; - sha256 = "03r5dczb9iqigg2s7h0k6zgb616358lqvl2h0k0bg2hxggnh8lpk"; - name = "plasma-tests-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-tests-5.11.2.tar.xz"; + sha256 = "06k1cmmbyp4rslhmj6b1ngq6pg0hv9hmc3yi135vjgppj5x523mm"; + name = "plasma-tests-5.11.2.tar.xz"; }; }; plasma-vault = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-vault-5.11.1.tar.xz"; - sha256 = "09wbjk0bsbjyh5n1d5gywdvaimajqr50sd23dbfdbnpi3br0gk10"; - name = "plasma-vault-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-vault-5.11.2.tar.xz"; + sha256 = "1lxp40lmb03aicw9lz742i1lrigkki76yy7p5h9gnb4djzv5h0m6"; + name = "plasma-vault-5.11.2.tar.xz"; }; }; plasma-workspace = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-workspace-5.11.1.tar.xz"; - sha256 = "1fy4bdxrz8mn29nc2qjxjnpxzjy9mynwwdjxj0jr61w0ljd40wiy"; - name = "plasma-workspace-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-workspace-5.11.2.tar.xz"; + sha256 = "12i7raf4qqinr3wd4kzz96pkng19c7mdjqz28m8jwb3c1gdlps2w"; + name = "plasma-workspace-5.11.2.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plasma-workspace-wallpapers-5.11.1.tar.xz"; - sha256 = "0dcfrad2543fxapizmlikv52m9nmdg45gddvh9chc83kangsydlc"; - name = "plasma-workspace-wallpapers-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plasma-workspace-wallpapers-5.11.2.tar.xz"; + sha256 = "01a4cz7d15mrb96yhfvck61vbqdnw208mgssrllrmcfdn7hwalv1"; + name = "plasma-workspace-wallpapers-5.11.2.tar.xz"; }; }; plymouth-kcm = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/plymouth-kcm-5.11.1.tar.xz"; - sha256 = "0w3yhazbx79s9k1yc3lj16hanc3wrqphhk9zjl9q1vxsn2rzas8h"; - name = "plymouth-kcm-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/plymouth-kcm-5.11.2.tar.xz"; + sha256 = "1dig5msins4grby4lvrrby0adjci8yplq1nw52xq571qvvcixjf4"; + name = "plymouth-kcm-5.11.2.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.11.1"; + version = "1-5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/polkit-kde-agent-1-5.11.1.tar.xz"; - sha256 = "04ycjqx9hnk3ab8qxk5gqz7b4r7im3bwap613qcgxjqr5cagp66w"; - name = "polkit-kde-agent-1-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/polkit-kde-agent-1-5.11.2.tar.xz"; + sha256 = "0qbr8c3fn6yp6ixfcfg4190q2wdj1xlm6791nn23bynd0nrxmxb3"; + name = "polkit-kde-agent-1-5.11.2.tar.xz"; }; }; powerdevil = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/powerdevil-5.11.1.tar.xz"; - sha256 = "02rf8iz2spcc78xs88dknl6a7slwgfgh4ra8lhwk69d210cxgahq"; - name = "powerdevil-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/powerdevil-5.11.2.tar.xz"; + sha256 = "10ah28rqdn8xhz578yhcnampbfq7vh89gm0jzjx9ryxiv6rch2cw"; + name = "powerdevil-5.11.2.tar.xz"; }; }; sddm-kcm = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/sddm-kcm-5.11.1.tar.xz"; - sha256 = "0sac2cknq7m26v8a59q1aakn6xjzmspnslfs6k633a8yz8w4lh19"; - name = "sddm-kcm-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/sddm-kcm-5.11.2.tar.xz"; + sha256 = "159qwvzk7g4ygg2sdb6k84vq0k1yadrgwzgq6sfbfhffim1w6dr1"; + name = "sddm-kcm-5.11.2.tar.xz"; }; }; systemsettings = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/systemsettings-5.11.1.tar.xz"; - sha256 = "0bnygmb3g573b7a8g0qg3ddj65miw29v3p25sh0ic9ij5bx6f4rw"; - name = "systemsettings-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/systemsettings-5.11.2.tar.xz"; + sha256 = "11gcrd1i28hifjysvnj97fcy619h660j4bgszj9lmr8w554j0cri"; + name = "systemsettings-5.11.2.tar.xz"; }; }; user-manager = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/user-manager-5.11.1.tar.xz"; - sha256 = "1iz5wm8d3ljn97msbh1bc7v8zmmgxrfr5mwfzh0ssdldba4wqlpm"; - name = "user-manager-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/user-manager-5.11.2.tar.xz"; + sha256 = "1pyyhhi276s8503q65n25rqwcddcbzy6l2vl844dnmmpd1m0gi4r"; + name = "user-manager-5.11.2.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.1/xdg-desktop-portal-kde-5.11.1.tar.xz"; - sha256 = "0w822jlg0h7qim70zamm7q5x2b614qmiggz9wr8yxq80lajizxnf"; - name = "xdg-desktop-portal-kde-5.11.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.2/xdg-desktop-portal-kde-5.11.2.tar.xz"; + sha256 = "0yjidwqk25c7grj42facqfl84ai7h4fin0zlf8y9jdksv26hskl0"; + name = "xdg-desktop-portal-kde-5.11.2.tar.xz"; }; }; } diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index 7f933f9a78a6..d0af0b59c9f9 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -8,13 +8,13 @@ let pkg = self: stdenv.mkDerivation rec { name = "hex"; - version = "v0.14.0"; + version = "v0.17.1"; src = fetchFromGitHub { owner = "hexpm"; repo = "hex"; rev = "${version}"; - sha256 = "042rcwznb6cf9khn4l969axf7vhk53gy3rp23y6c8fhfp1472pai"; + sha256 = "1s4asar1mcavzj3w37jcz243ka0z5jm0r42yws3h4aagawxxg02z"; }; setupHook = writeText "setupHook.sh" '' diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 17f068c1c6f4..7db75d129781 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "arachne-pnr-${version}"; - version = "2017.06.29"; + version = "2017.11.05"; src = fetchFromGitHub { - owner = "cseed"; - repo = "arachne-pnr"; - rev = "7e135edb31feacde85ec5b7e5c03fc9157080977"; - sha256 = "1wszcx6hgw4q4r778zswrlwdwvwxq834bkajck8w9yfqwxs9lmq8"; + owner = "cseed"; + repo = "arachne-pnr"; + rev = "1e81432830c75c505c76e419619f605a6c4c7583"; + sha256 = "0lzblmi1klbsmd32h8nh027npm1z1a199lng13lcrqwr17lhb7my"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index e4ceb40cad6e..b85d32326a1a 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "chez-scheme-${version}"; - version = "9.4-${dver}"; - dver = "20160507"; + version = "9.5-${dver}"; + dver = "20171012"; src = fetchgit { url = "https://github.com/cisco/chezscheme.git"; - rev = "65df1d1f7c37f5b5a93cd7e5b475dda9dbafe03c"; - sha256 = "1b273il3njnn04z55w1hnygvcqllc6p5qg9mcwh10w39fwsd8fbs"; + rev = "adb3b7bb22ddaa1ba91b98b6f4a647427c3a4d9b"; + sha256 = "0hiynf7g0q77ipqxjsqdm2zb0m15bl1hhp615fn3i2hv0qz5a4xr"; fetchSubmodules = true; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { */ patchPhase = '' substituteInPlace ./configure \ - --replace "git submodule init && git submodule update || exit 1" "" + --replace "git submodule init && git submodule update || exit 1" "true" substituteInPlace ./workarea \ --replace "/bin/ln" "${coreutils}/bin/ln" \ diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix index 6fab56e4e7da..6a3cddbd2e50 100644 --- a/pkgs/development/compilers/dmd/2.067.1.nix +++ b/pkgs/development/compilers/dmd/2.067.1.nix @@ -17,18 +17,21 @@ stdenv.mkDerivation rec { repo = "dmd"; rev = "v${version}"; sha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz"; + name = "dmd-v${version}-src"; }) (fetchFromGitHub { owner = "dlang"; repo = "druntime"; rev = "v${version}"; sha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02"; + name = "druntime-v${version}-src"; }) (fetchFromGitHub { owner = "dlang"; repo = "phobos"; rev = "v${version}"; sha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1"; + name = "phobos-v${version}-src"; }) ]; diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 27f70b8d6c71..938dd04904bf 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -14,18 +14,21 @@ stdenv.mkDerivation rec { repo = "dmd"; rev = "v${version}"; sha256 = "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5"; + name = "dmd-v${version}-src"; }) (fetchFromGitHub { owner = "dlang"; repo = "druntime"; rev = "v${version}"; sha256 = "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j"; + name = "druntime-v${version}-src"; }) (fetchFromGitHub { owner = "dlang"; repo = "phobos"; rev = "v${version}"; sha256 = "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04"; + name = "phobos-v${version}-src"; }) ]; diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index a9340fc94fe4..56db835ac10a 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -1,37 +1,40 @@ -{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base, binary -, bytestring, containers, directory, edit-distance, fetchgit -, filemanip, filepath, HUnit, indents, mtl, optparse-applicative -, parsec, pretty, process, QuickCheck, quickcheck-io -, regex-applicative, split, stdenv, tasty, tasty-golden -, tasty-hunit, tasty-quickcheck, text, union-find, wl-pprint +{ mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary +, bytestring, Cabal, cmark, containers, directory, fetchgit +, filepath, free, HUnit, indents, json, mtl, optparse-applicative +, parsec, process, QuickCheck, quickcheck-io, split, stdenv, tasty +, tasty-golden, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "elm-format"; - version = "0.5.2"; + version = "0.7.0"; src = fetchgit { url = "http://github.com/avh4/elm-format"; - sha256 = "0lman7h6wr75y90javcc4y1scvwgv125gqqaqvfrd5xrfmm43gg8"; - rev = "e452ed9342620e7bb0bc822983b96411d57143ef"; + sha256 = "1snl2lrrzdwgzi68agi3sdw84aslj04pzzxpm1mam9ic6dzhn3jf"; + rev = "da4b415c6a2b7e77b7d9f00beca3e45230e603fb"; }; - isLibrary = false; + + doHaddock = false; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base binary bytestring - containers directory edit-distance filemanip filepath indents mtl - optparse-applicative parsec pretty process regex-applicative split - text + setupHaskellDepends = [ base Cabal directory filepath process ]; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint base binary bytestring containers + directory filepath free indents json mtl optparse-applicative + parsec process split text ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base binary bytestring - containers directory edit-distance filemanip filepath HUnit indents - mtl optparse-applicative parsec pretty process QuickCheck - quickcheck-io regex-applicative split tasty tasty-golden - tasty-hunit tasty-quickcheck text union-find wl-pprint + base cmark containers HUnit mtl parsec QuickCheck quickcheck-io + split tasty tasty-golden tasty-hunit tasty-quickcheck text ]; jailbreak = true; postInstall = '' ln -s $out/bin/elm-format-0.18 $out/bin/elm-format ''; + postPatch = '' + sed -i "s|desc <-.*||" ./Setup.hs + sed -i "s|gitDescribe = .*|gitDescribe = \\\\\"da4b415c\\\\\"\"|" ./Setup.hs + ''; homepage = http://elm-lang.org; description = "A source code formatter for Elm"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index 87572661635b..ae2d39d604a6 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, glib, glibc, git, rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses, libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext, - mesa, libXmu, libXt, libICE, libSM }: + mesa_glu, libXmu, libXt, libICE, libSM }: stdenv.mkDerivation rec { name = "factor-lang-${version}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ git rlwrap curl perl makeWrapper libX11 pango cairo gtk2 gdk_pixbuf gtkglext - mesa libXmu libXt libICE libSM ]; + mesa_glu libXmu libXt libICE libSM ]; buildPhase = '' make $(bash ./build-support/factor.sh make-target) GIT_LABEL=heads/master-${rev} @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # to be a generic solution here. find $(echo ${stdenv.lib.makeLibraryPath [ glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext - mesa libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst + mesa_glu libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst (echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'"; for l in $(<$TMPDIR/so.lst); @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \ "${stdenv.lib.makeLibraryPath [ glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext - mesa libXmu libXt libICE libSM ]}" + mesa_glu libXmu libXt libICE libSM ]}" sed -ie 's#/bin/.factor-wrapped#/lib/factor/factor#g' $out/bin/factor mv $out/bin/.factor-wrapped $out/lib/factor/factor diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 5bad03d30252..41d31888bde1 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -153,6 +153,7 @@ stdenv.mkDerivation ({ # target libraries and tools. ++ optional langAda ../gnat-cflags.patch ++ optional langVhdl ./ghdl-ortho-cflags.patch + ++ [ ../struct-ucontext-4.5.patch ] # glibc-2.26 ; postPatch = diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 72e37f18a178..3031df56150b 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -78,7 +78,11 @@ let version = "4.8.5"; sha256 = "01jd7pdarh54ki498g6sz64ijl9a1l5f9v8q2696aaxalvh2vwzl"; excludes = [ "gcc/cp/ChangeLog" ]; })] - ; + ++ [ # glibc-2.26 + ../struct-ucontext-4.8.patch + ../sigsegv-not-declared.patch + ../res_state-not-declared.patch + ]; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index d7684a61a2ac..4675787912e8 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -72,6 +72,7 @@ let version = "4.9.4"; # target libraries and tools. ++ optional langAda ../gnat-cflags.patch ++ optional langFortran ../gfortran-driving.patch + ++ [ ../struct-ucontext.patch ../struct-sigaltstack-4.9.patch ] # glibc-2.26 ; javaEcj = fetchurl { diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index d1c76b6097ea..346ea928b76f 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -59,8 +59,8 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "5.4.0"; - sha256 = "0fihlcy5hnksdxk0sn6bvgnyq8gfrgs8m794b1jxwd1dxinzg3b0"; +let version = "5.5.0"; + sha256 = "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; @@ -217,7 +217,7 @@ stdenv.mkDerivation ({ builder = ../builder.sh; src = fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; + url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz"; inherit sha256; }; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 47cb93c19953..7d019c7fe848 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -72,7 +72,9 @@ let version = "6.4.0"; # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. ++ optional langAda ../gnat-cflags.patch - ++ optional langFortran ../gfortran-driving.patch; + ++ optional langFortran ../gfortran-driving.patch + ++ [ ../struct-ucontext.patch ../struct-sigaltstack.patch ] # glibc-2.26 + ; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at diff --git a/pkgs/development/compilers/gcc/res_state-not-declared.patch b/pkgs/development/compilers/gcc/res_state-not-declared.patch new file mode 100644 index 000000000000..e970487786d0 --- /dev/null +++ b/pkgs/development/compilers/gcc/res_state-not-declared.patch @@ -0,0 +1,13 @@ +diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc +index fe69430..49f5270 100644 +--- a/libsanitizer/tsan/tsan_platform_linux.cc ++++ b/libsanitizer/tsan/tsan_platform_linux.cc +@@ -351,7 +351,7 @@ bool IsGlobalVar(uptr addr) { + // closes within glibc. The code is a pure hack. + int ExtractResolvFDs(void *state, int *fds, int nfd) { + int cnt = 0; +- __res_state *statp = (__res_state*)state; ++ struct __res_state *statp = (struct __res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { + if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) + fds[cnt++] = statp->_u._ext.nssocks[i]; diff --git a/pkgs/development/compilers/gcc/sigsegv-not-declared.patch b/pkgs/development/compilers/gcc/sigsegv-not-declared.patch new file mode 100644 index 000000000000..f9cfaec82026 --- /dev/null +++ b/pkgs/development/compilers/gcc/sigsegv-not-declared.patch @@ -0,0 +1,13 @@ +error: 'SIGSEGV' was not declared in this scope +diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc +index 0692eb1..472f734 100644 +--- a/libsanitizer/asan/asan_linux.cc ++++ b/libsanitizer/asan/asan_linux.cc +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/pkgs/development/compilers/gcc/struct-sigaltstack-4.9.patch b/pkgs/development/compilers/gcc/struct-sigaltstack-4.9.patch new file mode 100644 index 000000000000..fc126b4813d6 --- /dev/null +++ b/pkgs/development/compilers/gcc/struct-sigaltstack-4.9.patch @@ -0,0 +1,78 @@ +hand-resolved trivial conflicts for 4.9 from the upstream patch +72edc2c02f8b4768ad660f46a1c7e2400c0a8e06 +diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc +index 69c9c10..8e53673 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc +@@ -599,8 +599,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) { + return internal_syscall(__NR_prctl, option, arg2, arg3, arg4, arg5); + } + +-uptr internal_sigaltstack(const struct sigaltstack *ss, +- struct sigaltstack *oss) { ++uptr internal_sigaltstack(const void *ss, void *oss) { + return internal_syscall(__NR_sigaltstack, (uptr)ss, (uptr)oss); + } + +diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h +index 6422df1..8e111d1 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_linux.h ++++ b/libsanitizer/sanitizer_common/sanitizer_linux.h +@@ -18,7 +18,6 @@ + #include "sanitizer_platform_limits_posix.h" + + struct link_map; // Opaque type returned by dlopen(). +-struct sigaltstack; + + namespace __sanitizer { + // Dirent structure for getdents(). Note that this structure is different from +@@ -28,8 +27,7 @@ struct linux_dirent; + // Syscall wrappers. + uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); + uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5); +-uptr internal_sigaltstack(const struct sigaltstack* ss, +- struct sigaltstack* oss); ++uptr internal_sigaltstack(const void* ss, void* oss); + uptr internal_sigaction(int signum, const __sanitizer_kernel_sigaction_t *act, + __sanitizer_kernel_sigaction_t *oldact); + uptr internal_sigprocmask(int how, __sanitizer_kernel_sigset_t *set, +diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +index 891386dc..234e8c6 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +@@ -273,7 +273,7 @@ static int TracerThread(void* argument) { + + // Alternate stack for signal handling. + InternalScopedBuffer handler_stack_memory(kHandlerStackSize); +- struct sigaltstack handler_stack; ++ stack_t handler_stack; + internal_memset(&handler_stack, 0, sizeof(handler_stack)); + handler_stack.ss_sp = handler_stack_memory.data(); + handler_stack.ss_size = kHandlerStackSize; +diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc +index 2ed5718..6f972ab 100644 +--- a/libsanitizer/tsan/tsan_platform_linux.cc ++++ b/libsanitizer/tsan/tsan_platform_linux.cc +@@ -287,7 +287,7 @@ void InitializePlatform() { + int ExtractResolvFDs(void *state, int *fds, int nfd) { + #if SANITIZER_LINUX && !SANITIZER_ANDROID + int cnt = 0; +- __res_state *statp = (__res_state*)state; ++ struct __res_state *statp = (struct __res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { + if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) + fds[cnt++] = statp->_u._ext.nssocks[i]; + +error: 'SIGSEGV' was not declared in this scope +diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc +index 0692eb1..472f734 100644 +--- a/libsanitizer/asan/asan_linux.cc ++++ b/libsanitizer/asan/asan_linux.cc +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/pkgs/development/compilers/gcc/struct-sigaltstack.patch b/pkgs/development/compilers/gcc/struct-sigaltstack.patch new file mode 100644 index 000000000000..6e1ddb252c24 --- /dev/null +++ b/pkgs/development/compilers/gcc/struct-sigaltstack.patch @@ -0,0 +1,87 @@ +From 72edc2c02f8b4768ad660f46a1c7e2400c0a8e06 Mon Sep 17 00:00:00 2001 +From: jakub +Date: Mon, 17 Jul 2017 19:41:08 +0000 +Subject: [PATCH] Backported from mainline 2017-07-14 Jakub + Jelinek + + PR sanitizer/81066 + * sanitizer_common/sanitizer_linux.h: Cherry-pick upstream r307969. + * sanitizer_common/sanitizer_linux.cc: Likewise. + * sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: Likewise. + * tsan/tsan_platform_linux.cc: Likewise. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@250287 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + libsanitizer/ChangeLog (REMOVED) | 11 +++++++++++ + libsanitizer/sanitizer_common/sanitizer_linux.cc | 3 +-- + libsanitizer/sanitizer_common/sanitizer_linux.h | 4 +--- + .../sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 2 +- + libsanitizer/tsan/tsan_platform_linux.cc | 2 +- + 5 files changed, 15 insertions(+), 7 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc +index 806fcd5..5b6f186 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc +@@ -605,8 +605,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) { + } + #endif + +-uptr internal_sigaltstack(const struct sigaltstack *ss, +- struct sigaltstack *oss) { ++uptr internal_sigaltstack(const void *ss, void *oss) { + return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss); + } + +diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h +index 895bfc1..a42df57 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_linux.h ++++ b/libsanitizer/sanitizer_common/sanitizer_linux.h +@@ -19,7 +19,6 @@ + #include "sanitizer_platform_limits_posix.h" + + struct link_map; // Opaque type returned by dlopen(). +-struct sigaltstack; + + namespace __sanitizer { + // Dirent structure for getdents(). Note that this structure is different from +@@ -28,8 +27,7 @@ struct linux_dirent; + + // Syscall wrappers. + uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); +-uptr internal_sigaltstack(const struct sigaltstack* ss, +- struct sigaltstack* oss); ++uptr internal_sigaltstack(const void* ss, void* oss); + uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set, + __sanitizer_sigset_t *oldset); + +diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +index 891386dc..234e8c6 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +@@ -273,7 +273,7 @@ static int TracerThread(void* argument) { + + // Alternate stack for signal handling. + InternalScopedBuffer handler_stack_memory(kHandlerStackSize); +- struct sigaltstack handler_stack; ++ stack_t handler_stack; + internal_memset(&handler_stack, 0, sizeof(handler_stack)); + handler_stack.ss_sp = handler_stack_memory.data(); + handler_stack.ss_size = kHandlerStackSize; +diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc +index 2ed5718..6f972ab 100644 +--- a/libsanitizer/tsan/tsan_platform_linux.cc ++++ b/libsanitizer/tsan/tsan_platform_linux.cc +@@ -287,7 +287,7 @@ void InitializePlatform() { + int ExtractResolvFDs(void *state, int *fds, int nfd) { + #if SANITIZER_LINUX && !SANITIZER_ANDROID + int cnt = 0; +- __res_state *statp = (__res_state*)state; ++ struct __res_state *statp = (struct __res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { + if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) + fds[cnt++] = statp->_u._ext.nssocks[i]; +-- +2.9.3 + diff --git a/pkgs/development/compilers/gcc/struct-ucontext-4.5.patch b/pkgs/development/compilers/gcc/struct-ucontext-4.5.patch new file mode 100644 index 000000000000..a84e9ffe2681 --- /dev/null +++ b/pkgs/development/compilers/gcc/struct-ucontext-4.5.patch @@ -0,0 +1,107 @@ +Trivally backported the upstream commit +b685411208e0aaa79190d54faf945763514706b8 +(different directory, some files not present, etc.) +We only really use x86* from those, probably, so I didn't bother much. +diff --git a/gcc/config/alpha/linux-unwind.h b/gcc/config/alpha/linux-unwind.h +index bdbba4a..e84812e 100644 +--- a/gcc/config/alpha/linux-unwind.h ++++ b/gcc/config/alpha/linux-unwind.h +@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context, + { + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + sc = &rt_->uc.uc_mcontext; + } +diff --git a/gcc/config/bfin/linux-unwind.h b/gcc/config/bfin/linux-unwind.h +index 77b7c23..8bf5e82 100644 +--- a/gcc/config/bfin/linux-unwind.h ++++ b/gcc/config/bfin/linux-unwind.h +@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context, + void *puc; + char retcode[8]; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + + /* The void * cast is necessary to avoid an aliasing warning. +diff --git a/gcc/config/i386/linux-unwind.h b/gcc/config/i386/linux-unwind.h +index 540a0a2..29efbe3 100644 +--- a/gcc/config/i386/linux-unwind.h ++++ b/gcc/config/i386/linux-unwind.h +@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context, + if (*(unsigned char *)(pc+0) == 0x48 + && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL) + { +- struct ucontext *uc_ = context->cfa; ++ ucontext_t *uc_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem + because it does not alias anything. */ +@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context, + siginfo_t *pinfo; + void *puc; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem +diff --git a/gcc/config/m68k/linux-unwind.h b/gcc/config/m68k/linux-unwind.h +index 75b7cf7..f964e24 100644 +--- a/gcc/config/m68k/linux-unwind.h ++++ b/gcc/config/m68k/linux-unwind.h +@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + /* is unfortunately broken right now. */ + struct uw_ucontext { + unsigned long uc_flags; +- struct ucontext *uc_link; ++ ucontext_t *uc_link; + stack_t uc_stack; + mcontext_t uc_mcontext; + unsigned long uc_filler[80]; +diff --git a/gcc/config/pa/linux-unwind.h b/gcc/config/pa/linux-unwind.h +index 9a2657f..e47493d 100644 +--- a/gcc/config/pa/linux-unwind.h ++++ b/gcc/config/pa/linux-unwind.h +@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context, + struct sigcontext *sc; + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *frame; + + /* rt_sigreturn trampoline: +diff --git a/gcc/config/sh/linux-unwind.h b/gcc/config/sh/linux-unwind.h +index e389cac..0bf43ba 100644 +--- a/gcc/config/sh/linux-unwind.h ++++ b/gcc/config/sh/linux-unwind.h +@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context, + { + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem +diff --git a/gcc/config/xtensa/linux-unwind.h b/gcc/config/xtensa/linux-unwind.h +index 9872492..586a9d4 100644 +--- a/gcc/config/xtensa/linux-unwind.h ++++ b/gcc/config/xtensa/linux-unwind.h +@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context, + + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_; + + /* movi a2, __NR_rt_sigreturn; syscall */ +-- +2.9.3 + diff --git a/pkgs/development/compilers/gcc/struct-ucontext-4.8.patch b/pkgs/development/compilers/gcc/struct-ucontext-4.8.patch new file mode 100644 index 000000000000..630ef6586e45 --- /dev/null +++ b/pkgs/development/compilers/gcc/struct-ucontext-4.8.patch @@ -0,0 +1,177 @@ +From b685411208e0aaa79190d54faf945763514706b8 Mon Sep 17 00:00:00 2001 +From: jsm28 +Date: Tue, 4 Jul 2017 10:23:57 +0000 +Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files. + +Current glibc no longer gives the ucontext_t type the tag struct +ucontext, to conform with POSIX namespace rules. This requires +various linux-unwind.h files in libgcc, that were previously using +struct ucontext, to be fixed to use ucontext_t instead. This is +similar to the removal of the struct siginfo tag from siginfo_t some +years ago. + +This patch changes those files to use ucontext_t instead. As the +standard name that should be unconditionally safe, so this is not +restricted to architectures supported by glibc, or conditioned on the +glibc version. + +Tested compilation together with current glibc with glibc's +build-many-glibcs.py. + + * config/aarch64/linux-unwind.h (aarch64_fallback_frame_state), + config/alpha/linux-unwind.h (alpha_fallback_frame_state), + config/bfin/linux-unwind.h (bfin_fallback_frame_state), + config/i386/linux-unwind.h (x86_64_fallback_frame_state, + x86_fallback_frame_state), config/m68k/linux-unwind.h (struct + uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext), + config/pa/linux-unwind.h (pa32_fallback_frame_state), + config/sh/linux-unwind.h (sh_fallback_frame_state), + config/tilepro/linux-unwind.h (tile_fallback_frame_state), + config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use + ucontext_t instead of struct ucontext. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@249957 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + libgcc/ChangeLog (REMOVED) | 14 ++++++++++++++ + libgcc/config/aarch64/linux-unwind.h | 2 +- + libgcc/config/alpha/linux-unwind.h | 2 +- + libgcc/config/bfin/linux-unwind.h | 2 +- + libgcc/config/i386/linux-unwind.h | 4 ++-- + libgcc/config/m68k/linux-unwind.h | 2 +- + libgcc/config/nios2/linux-unwind.h | 2 +- + libgcc/config/pa/linux-unwind.h | 2 +- + libgcc/config/sh/linux-unwind.h | 2 +- + libgcc/config/tilepro/linux-unwind.h | 2 +- + libgcc/config/xtensa/linux-unwind.h | 2 +- + 11 files changed, 25 insertions(+), 11 deletions(-) + +diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h +index 4512efb..06de45a 100644 +--- a/libgcc/config/aarch64/linux-unwind.h ++++ b/libgcc/config/aarch64/linux-unwind.h +@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context, + struct rt_sigframe + { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + }; + + struct rt_sigframe *rt_; +diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h +index bdbba4a..e84812e 100644 +--- a/libgcc/config/alpha/linux-unwind.h ++++ b/libgcc/config/alpha/linux-unwind.h +@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context, + { + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + sc = &rt_->uc.uc_mcontext; + } +diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h +index 77b7c23..8bf5e82 100644 +--- a/libgcc/config/bfin/linux-unwind.h ++++ b/libgcc/config/bfin/linux-unwind.h +@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context, + void *puc; + char retcode[8]; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + + /* The void * cast is necessary to avoid an aliasing warning. +diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h +index 540a0a2..29efbe3 100644 +--- a/libgcc/config/i386/linux-unwind.h ++++ b/libgcc/config/i386/linux-unwind.h +@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context, + if (*(unsigned char *)(pc+0) == 0x48 + && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL) + { +- struct ucontext *uc_ = context->cfa; ++ ucontext_t *uc_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem + because it does not alias anything. */ +@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context, + siginfo_t *pinfo; + void *puc; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem +diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h +index 75b7cf7..f964e24 100644 +--- a/libgcc/config/m68k/linux-unwind.h ++++ b/libgcc/config/m68k/linux-unwind.h +@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + /* is unfortunately broken right now. */ + struct uw_ucontext { + unsigned long uc_flags; +- struct ucontext *uc_link; ++ ucontext_t *uc_link; + stack_t uc_stack; + mcontext_t uc_mcontext; + unsigned long uc_filler[80]; +diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h +index 9a2657f..e47493d 100644 +--- a/libgcc/config/pa/linux-unwind.h ++++ b/libgcc/config/pa/linux-unwind.h +@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context, + struct sigcontext *sc; + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *frame; + + /* rt_sigreturn trampoline: +diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h +index e389cac..0bf43ba 100644 +--- a/libgcc/config/sh/linux-unwind.h ++++ b/libgcc/config/sh/linux-unwind.h +@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context, + { + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem +diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h +index 796e976..75f8890 100644 +--- a/libgcc/config/tilepro/linux-unwind.h ++++ b/libgcc/config/tilepro/linux-unwind.h +@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context, + struct rt_sigframe { + unsigned char save_area[C_ABI_SAVE_AREA_SIZE]; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_; + + /* Return if this is not a signal handler. */ +diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h +index 9872492..586a9d4 100644 +--- a/libgcc/config/xtensa/linux-unwind.h ++++ b/libgcc/config/xtensa/linux-unwind.h +@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context, + + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_; + + /* movi a2, __NR_rt_sigreturn; syscall */ +-- +2.9.3 + diff --git a/pkgs/development/compilers/gcc/struct-ucontext.patch b/pkgs/development/compilers/gcc/struct-ucontext.patch new file mode 100644 index 000000000000..c7fb6d1f71cf --- /dev/null +++ b/pkgs/development/compilers/gcc/struct-ucontext.patch @@ -0,0 +1,190 @@ +From b685411208e0aaa79190d54faf945763514706b8 Mon Sep 17 00:00:00 2001 +From: jsm28 +Date: Tue, 4 Jul 2017 10:23:57 +0000 +Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files. + +Current glibc no longer gives the ucontext_t type the tag struct +ucontext, to conform with POSIX namespace rules. This requires +various linux-unwind.h files in libgcc, that were previously using +struct ucontext, to be fixed to use ucontext_t instead. This is +similar to the removal of the struct siginfo tag from siginfo_t some +years ago. + +This patch changes those files to use ucontext_t instead. As the +standard name that should be unconditionally safe, so this is not +restricted to architectures supported by glibc, or conditioned on the +glibc version. + +Tested compilation together with current glibc with glibc's +build-many-glibcs.py. + + * config/aarch64/linux-unwind.h (aarch64_fallback_frame_state), + config/alpha/linux-unwind.h (alpha_fallback_frame_state), + config/bfin/linux-unwind.h (bfin_fallback_frame_state), + config/i386/linux-unwind.h (x86_64_fallback_frame_state, + x86_fallback_frame_state), config/m68k/linux-unwind.h (struct + uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext), + config/pa/linux-unwind.h (pa32_fallback_frame_state), + config/sh/linux-unwind.h (sh_fallback_frame_state), + config/tilepro/linux-unwind.h (tile_fallback_frame_state), + config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use + ucontext_t instead of struct ucontext. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@249957 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + libgcc/ChangeLog (REMOVED) | 14 ++++++++++++++ + libgcc/config/aarch64/linux-unwind.h | 2 +- + libgcc/config/alpha/linux-unwind.h | 2 +- + libgcc/config/bfin/linux-unwind.h | 2 +- + libgcc/config/i386/linux-unwind.h | 4 ++-- + libgcc/config/m68k/linux-unwind.h | 2 +- + libgcc/config/nios2/linux-unwind.h | 2 +- + libgcc/config/pa/linux-unwind.h | 2 +- + libgcc/config/sh/linux-unwind.h | 2 +- + libgcc/config/tilepro/linux-unwind.h | 2 +- + libgcc/config/xtensa/linux-unwind.h | 2 +- + 11 files changed, 25 insertions(+), 11 deletions(-) + +diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h +index 4512efb..06de45a 100644 +--- a/libgcc/config/aarch64/linux-unwind.h ++++ b/libgcc/config/aarch64/linux-unwind.h +@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context, + struct rt_sigframe + { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + }; + + struct rt_sigframe *rt_; +diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h +index bdbba4a..e84812e 100644 +--- a/libgcc/config/alpha/linux-unwind.h ++++ b/libgcc/config/alpha/linux-unwind.h +@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context, + { + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + sc = &rt_->uc.uc_mcontext; + } +diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h +index 77b7c23..8bf5e82 100644 +--- a/libgcc/config/bfin/linux-unwind.h ++++ b/libgcc/config/bfin/linux-unwind.h +@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context, + void *puc; + char retcode[8]; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + + /* The void * cast is necessary to avoid an aliasing warning. +diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h +index 540a0a2..29efbe3 100644 +--- a/libgcc/config/i386/linux-unwind.h ++++ b/libgcc/config/i386/linux-unwind.h +@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context, + if (*(unsigned char *)(pc+0) == 0x48 + && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL) + { +- struct ucontext *uc_ = context->cfa; ++ ucontext_t *uc_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem + because it does not alias anything. */ +@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context, + siginfo_t *pinfo; + void *puc; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem +diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h +index 75b7cf7..f964e24 100644 +--- a/libgcc/config/m68k/linux-unwind.h ++++ b/libgcc/config/m68k/linux-unwind.h +@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + /* is unfortunately broken right now. */ + struct uw_ucontext { + unsigned long uc_flags; +- struct ucontext *uc_link; ++ ucontext_t *uc_link; + stack_t uc_stack; + mcontext_t uc_mcontext; + unsigned long uc_filler[80]; +diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h +index 2304142..30f25ea 100644 +--- a/libgcc/config/nios2/linux-unwind.h ++++ b/libgcc/config/nios2/linux-unwind.h +@@ -38,7 +38,7 @@ struct nios2_mcontext { + + struct nios2_ucontext { + unsigned long uc_flags; +- struct ucontext *uc_link; ++ ucontext_t *uc_link; + stack_t uc_stack; + struct nios2_mcontext uc_mcontext; + sigset_t uc_sigmask; /* mask last for extensibility */ +diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h +index 9a2657f..e47493d 100644 +--- a/libgcc/config/pa/linux-unwind.h ++++ b/libgcc/config/pa/linux-unwind.h +@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context, + struct sigcontext *sc; + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *frame; + + /* rt_sigreturn trampoline: +diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h +index e389cac..0bf43ba 100644 +--- a/libgcc/config/sh/linux-unwind.h ++++ b/libgcc/config/sh/linux-unwind.h +@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context, + { + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem +diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h +index 796e976..75f8890 100644 +--- a/libgcc/config/tilepro/linux-unwind.h ++++ b/libgcc/config/tilepro/linux-unwind.h +@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context, + struct rt_sigframe { + unsigned char save_area[C_ABI_SAVE_AREA_SIZE]; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_; + + /* Return if this is not a signal handler. */ +diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h +index 9872492..586a9d4 100644 +--- a/libgcc/config/xtensa/linux-unwind.h ++++ b/libgcc/config/xtensa/linux-unwind.h +@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context, + + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_; + + /* movi a2, __NR_rt_sigreturn; syscall */ +-- +2.9.3 + diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix new file mode 100644 index 000000000000..f76958227d6e --- /dev/null +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -0,0 +1,119 @@ +{ stdenv, lib, fetchurl, bootPkgs, perl, ncurses, libiconv, binutils, coreutils +, autoconf, automake, happy, alex, python3, sphinx, hscolour +, 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 + inherit (bootPkgs) ghc; + version = "8.2.1.20171030"; + + commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; + commonPreConfigure = '' + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + 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; + name = "ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/8.2.2-rc2/${name}-src.tar.xz"; + sha256 = "0m2lx13yscgxmb18nrzhgg5h4kwzcnxdw7rjcqwx4dcwl1k0a724"; + }; + + postPatch = "patchShebangs ."; + + patches = [ ./ghc-gold-linker.patch ]; + + preConfigure = commonPreConfigure; + + buildInputs = commonBuildInputs; + + enableParallelBuilding = true; + + configureFlags = [ + "CC=${stdenv.cc}/bin/cc" + "--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" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + postInstall = '' + paxmark m $out/lib/${name}/bin/{ghc,haddock} + + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i + done + ''; + + outputs = [ "out" "doc" ]; + + passthru = { + inherit bootPkgs; + } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { + crossCompiler = selfPkgs.ghc.override { + cross = targetPlatform; + bootPkgs = selfPkgs; + }; + }; + + meta = { + homepage = http://haskell.org/ghc; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} // stdenv.lib.optionalAttrs (cross != null) { + name = "${cross.config}-ghc-${version}"; + + preConfigure = commonPreConfigure + '' + sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk + ''; + + configureFlags = [ + "CC=${stdenv.ccCross}/bin/${cross.config}-cc" + "LD=${stdenv.binutils}/bin/${cross.config}-ld" + "AR=${stdenv.binutils}/bin/${cross.config}-ar" + "NM=${stdenv.binutils}/bin/${cross.config}-nm" + "RANLIB=${stdenv.binutils}/bin/${cross.config}-ranlib" + "--target=${cross.config}" + "--enable-bootstrap-with-devel-snapshot" + ] ++ + # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; + + buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutils ]; + + dontSetConfigureCross = true; + + passthru = { + inherit bootPkgs cross; + cc = "${stdenv.ccCross}/bin/${cross.config}-cc"; + ld = "${stdenv.binutils}/bin/${cross.config}-ld"; + }; +}) diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index a7381fa1a146..d4418b058d92 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -40,11 +40,6 @@ , coreutils , libiconv -, ghcjsNodePkgs ? callPackage ../../../top-level/node-packages.nix { - generated = ./node-packages-generated.nix; - self = ghcjsNodePkgs; - } - , version ? "0.2.0" , ghcjsSrc ? fetchFromGitHub { owner = "ghcjs"; @@ -178,7 +173,7 @@ in mkDerivation (rec { isCross = true; isGhcjs = true; inherit nodejs ghcjsBoot; - inherit (ghcjsNodePkgs) "socket.io"; + socket-io = pkgs.nodePackages."socket.io"; inherit stage1Packages; mkStage2 = stage2 { diff --git a/pkgs/development/compilers/ghcjs/node-packages-generated.nix b/pkgs/development/compilers/ghcjs/node-packages-generated.nix deleted file mode 100644 index a3c882ff76c8..000000000000 --- a/pkgs/development/compilers/ghcjs/node-packages-generated.nix +++ /dev/null @@ -1,943 +0,0 @@ -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."accepts"."1.1.4" = - self.by-version."accepts"."1.1.4"; - by-version."accepts"."1.1.4" = self.buildNodePackage { - name = "accepts-1.1.4"; - version = "1.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz"; - name = "accepts-1.1.4.tgz"; - sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a"; - }; - deps = { - "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14"; - "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."after"."0.8.1" = - self.by-version."after"."0.8.1"; - by-version."after"."0.8.1" = self.buildNodePackage { - name = "after-0.8.1"; - version = "0.8.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/after/-/after-0.8.1.tgz"; - name = "after-0.8.1.tgz"; - sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."arraybuffer.slice"."0.0.6" = - self.by-version."arraybuffer.slice"."0.0.6"; - by-version."arraybuffer.slice"."0.0.6" = self.buildNodePackage { - name = "arraybuffer.slice-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"; - name = "arraybuffer.slice-0.0.6.tgz"; - sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."backo2"."1.0.2" = - self.by-version."backo2"."1.0.2"; - by-version."backo2"."1.0.2" = self.buildNodePackage { - name = "backo2-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"; - name = "backo2-1.0.2.tgz"; - sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."base64-arraybuffer"."0.1.2" = - self.by-version."base64-arraybuffer"."0.1.2"; - by-version."base64-arraybuffer"."0.1.2" = self.buildNodePackage { - name = "base64-arraybuffer-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"; - name = "base64-arraybuffer-0.1.2.tgz"; - sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."base64id"."0.1.0" = - self.by-version."base64id"."0.1.0"; - by-version."base64id"."0.1.0" = self.buildNodePackage { - name = "base64id-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; - name = "base64id-0.1.0.tgz"; - sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."benchmark"."1.0.0" = - self.by-version."benchmark"."1.0.0"; - by-version."benchmark"."1.0.0" = self.buildNodePackage { - name = "benchmark-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz"; - name = "benchmark-1.0.0.tgz"; - sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."better-assert"."~1.0.0" = - self.by-version."better-assert"."1.0.2"; - by-version."better-assert"."1.0.2" = self.buildNodePackage { - name = "better-assert-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"; - name = "better-assert-1.0.2.tgz"; - sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; - }; - deps = { - "callsite-1.0.0" = self.by-version."callsite"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."blob"."0.0.4" = - self.by-version."blob"."0.0.4"; - by-version."blob"."0.0.4" = self.buildNodePackage { - name = "blob-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/blob/-/blob-0.0.4.tgz"; - name = "blob-0.0.4.tgz"; - sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."callsite"."1.0.0" = - self.by-version."callsite"."1.0.0"; - by-version."callsite"."1.0.0" = self.buildNodePackage { - name = "callsite-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"; - name = "callsite-1.0.0.tgz"; - sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."component-bind"."1.0.0" = - self.by-version."component-bind"."1.0.0"; - by-version."component-bind"."1.0.0" = self.buildNodePackage { - name = "component-bind-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; - name = "component-bind-1.0.0.tgz"; - sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."component-emitter"."1.1.2" = - self.by-version."component-emitter"."1.1.2"; - by-version."component-emitter"."1.1.2" = self.buildNodePackage { - name = "component-emitter-1.1.2"; - version = "1.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; - name = "component-emitter-1.1.2.tgz"; - sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."component-emitter"."1.2.0" = - self.by-version."component-emitter"."1.2.0"; - by-version."component-emitter"."1.2.0" = self.buildNodePackage { - name = "component-emitter-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz"; - name = "component-emitter-1.2.0.tgz"; - sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."component-inherit"."0.0.3" = - self.by-version."component-inherit"."0.0.3"; - by-version."component-inherit"."0.0.3" = self.buildNodePackage { - name = "component-inherit-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"; - name = "component-inherit-0.0.3.tgz"; - sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."0.7.4" = - self.by-version."debug"."0.7.4"; - by-version."debug"."0.7.4" = self.buildNodePackage { - name = "debug-0.7.4"; - version = "0.7.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; - name = "debug-0.7.4.tgz"; - sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."2.2.0" = - self.by-version."debug"."2.2.0"; - by-version."debug"."2.2.0" = self.buildNodePackage { - name = "debug-2.2.0"; - version = "2.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - name = "debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - deps = { - "ms-0.7.1" = self.by-version."ms"."0.7.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."engine.io"."1.6.8" = - self.by-version."engine.io"."1.6.8"; - by-version."engine.io"."1.6.8" = self.buildNodePackage { - name = "engine.io-1.6.8"; - version = "1.6.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/engine.io/-/engine.io-1.6.8.tgz"; - name = "engine.io-1.6.8.tgz"; - sha1 = "de05a06b757e7517695e088c7b051c47819f511b"; - }; - deps = { - "base64id-0.1.0" = self.by-version."base64id"."0.1.0"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "ws-1.0.1" = self.by-version."ws"."1.0.1"; - "engine.io-parser-1.2.4" = self.by-version."engine.io-parser"."1.2.4"; - "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."engine.io-client"."1.6.8" = - self.by-version."engine.io-client"."1.6.8"; - by-version."engine.io-client"."1.6.8" = self.buildNodePackage { - name = "engine.io-client-1.6.8"; - version = "1.6.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.8.tgz"; - name = "engine.io-client-1.6.8.tgz"; - sha1 = "6e2db11648b45e405c46b172ea3e3dac37cc0ceb"; - }; - deps = { - "has-cors-1.1.0" = self.by-version."has-cors"."1.1.0"; - "ws-1.0.1" = self.by-version."ws"."1.0.1"; - "xmlhttprequest-ssl-1.5.1" = self.by-version."xmlhttprequest-ssl"."1.5.1"; - "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; - "indexof-0.0.1" = self.by-version."indexof"."0.0.1"; - "engine.io-parser-1.2.4" = self.by-version."engine.io-parser"."1.2.4"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4"; - "parsejson-0.0.1" = self.by-version."parsejson"."0.0.1"; - "parseqs-0.0.2" = self.by-version."parseqs"."0.0.2"; - "component-inherit-0.0.3" = self.by-version."component-inherit"."0.0.3"; - "yeast-0.1.2" = self.by-version."yeast"."0.1.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."engine.io-parser"."1.2.4" = - self.by-version."engine.io-parser"."1.2.4"; - by-version."engine.io-parser"."1.2.4" = self.buildNodePackage { - name = "engine.io-parser-1.2.4"; - version = "1.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz"; - name = "engine.io-parser-1.2.4.tgz"; - sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42"; - }; - deps = { - "after-0.8.1" = self.by-version."after"."0.8.1"; - "arraybuffer.slice-0.0.6" = self.by-version."arraybuffer.slice"."0.0.6"; - "base64-arraybuffer-0.1.2" = self.by-version."base64-arraybuffer"."0.1.2"; - "blob-0.0.4" = self.by-version."blob"."0.0.4"; - "has-binary-0.1.6" = self.by-version."has-binary"."0.1.6"; - "utf8-2.1.0" = self.by-version."utf8"."2.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."has-binary"."0.1.6" = - self.by-version."has-binary"."0.1.6"; - by-version."has-binary"."0.1.6" = self.buildNodePackage { - name = "has-binary-0.1.6"; - version = "0.1.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz"; - name = "has-binary-0.1.6.tgz"; - sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10"; - }; - deps = { - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."has-binary"."0.1.7" = - self.by-version."has-binary"."0.1.7"; - by-version."has-binary"."0.1.7" = self.buildNodePackage { - name = "has-binary-0.1.7"; - version = "0.1.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz"; - name = "has-binary-0.1.7.tgz"; - sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c"; - }; - deps = { - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."has-cors"."1.1.0" = - self.by-version."has-cors"."1.1.0"; - by-version."has-cors"."1.1.0" = self.buildNodePackage { - name = "has-cors-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; - name = "has-cors-1.1.0.tgz"; - sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."indexof"."0.0.1" = - self.by-version."indexof"."0.0.1"; - by-version."indexof"."0.0.1" = self.buildNodePackage { - name = "indexof-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; - name = "indexof-0.0.1.tgz"; - sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isarray"."0.0.1" = - self.by-version."isarray"."0.0.1"; - by-version."isarray"."0.0.1" = self.buildNodePackage { - name = "isarray-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - name = "isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."json3"."3.2.6" = - self.by-version."json3"."3.2.6"; - by-version."json3"."3.2.6" = self.buildNodePackage { - name = "json3-3.2.6"; - version = "3.2.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/json3/-/json3-3.2.6.tgz"; - name = "json3-3.2.6.tgz"; - sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."json3"."3.3.2" = - self.by-version."json3"."3.3.2"; - by-version."json3"."3.3.2" = self.buildNodePackage { - name = "json3-3.3.2"; - version = "3.3.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; - name = "json3-3.3.2.tgz"; - sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-db"."~1.12.0" = - self.by-version."mime-db"."1.12.0"; - by-version."mime-db"."1.12.0" = self.buildNodePackage { - name = "mime-db-1.12.0"; - version = "1.12.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; - name = "mime-db-1.12.0.tgz"; - sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~2.0.4" = - self.by-version."mime-types"."2.0.14"; - by-version."mime-types"."2.0.14" = self.buildNodePackage { - name = "mime-types-2.0.14"; - version = "2.0.14"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; - name = "mime-types-2.0.14.tgz"; - sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; - }; - deps = { - "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - 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"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - name = "ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."negotiator"."0.4.9" = - self.by-version."negotiator"."0.4.9"; - by-version."negotiator"."0.4.9" = self.buildNodePackage { - name = "negotiator-0.4.9"; - version = "0.4.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz"; - name = "negotiator-0.4.9.tgz"; - sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."object-component"."0.0.3" = - self.by-version."object-component"."0.0.3"; - by-version."object-component"."0.0.3" = self.buildNodePackage { - name = "object-component-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; - name = "object-component-0.0.3.tgz"; - sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."options".">=0.0.5" = - self.by-version."options"."0.0.6"; - by-version."options"."0.0.6" = self.buildNodePackage { - name = "options-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz"; - name = "options-0.0.6.tgz"; - sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."parsejson"."0.0.1" = - self.by-version."parsejson"."0.0.1"; - by-version."parsejson"."0.0.1" = self.buildNodePackage { - name = "parsejson-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz"; - name = "parsejson-0.0.1.tgz"; - sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc"; - }; - deps = { - "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."parseqs"."0.0.2" = - self.by-version."parseqs"."0.0.2"; - by-version."parseqs"."0.0.2" = self.buildNodePackage { - name = "parseqs-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz"; - name = "parseqs-0.0.2.tgz"; - sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7"; - }; - deps = { - "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."parseuri"."0.0.4" = - self.by-version."parseuri"."0.0.4"; - by-version."parseuri"."0.0.4" = self.buildNodePackage { - name = "parseuri-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz"; - name = "parseuri-0.0.4.tgz"; - sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350"; - }; - deps = { - "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."socket.io"."*" = - self.by-version."socket.io"."1.4.5"; - by-version."socket.io"."1.4.5" = self.buildNodePackage { - name = "socket.io-1.4.5"; - version = "1.4.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io/-/socket.io-1.4.5.tgz"; - name = "socket.io-1.4.5.tgz"; - sha1 = "f202f49eeb9cf7cf6c0971ad75d8d96d451ea4f7"; - }; - deps = { - "engine.io-1.6.8" = self.by-version."engine.io"."1.6.8"; - "socket.io-parser-2.2.6" = self.by-version."socket.io-parser"."2.2.6"; - "socket.io-client-1.4.5" = self.by-version."socket.io-client"."1.4.5"; - "socket.io-adapter-0.4.0" = self.by-version."socket.io-adapter"."0.4.0"; - "has-binary-0.1.7" = self.by-version."has-binary"."0.1.7"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "socket.io" = self.by-version."socket.io"."1.4.5"; - by-spec."socket.io-adapter"."0.4.0" = - self.by-version."socket.io-adapter"."0.4.0"; - by-version."socket.io-adapter"."0.4.0" = self.buildNodePackage { - name = "socket.io-adapter-0.4.0"; - version = "0.4.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz"; - name = "socket.io-adapter-0.4.0.tgz"; - sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f"; - }; - deps = { - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "socket.io-parser-2.2.2" = self.by-version."socket.io-parser"."2.2.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."socket.io-client"."1.4.5" = - self.by-version."socket.io-client"."1.4.5"; - by-version."socket.io-client"."1.4.5" = self.buildNodePackage { - name = "socket.io-client-1.4.5"; - version = "1.4.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.5.tgz"; - name = "socket.io-client-1.4.5.tgz"; - sha1 = "400d630c31e7c9579e45173f977e4f5bd8dc7d2e"; - }; - deps = { - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "engine.io-client-1.6.8" = self.by-version."engine.io-client"."1.6.8"; - "component-bind-1.0.0" = self.by-version."component-bind"."1.0.0"; - "component-emitter-1.2.0" = self.by-version."component-emitter"."1.2.0"; - "object-component-0.0.3" = self.by-version."object-component"."0.0.3"; - "socket.io-parser-2.2.6" = self.by-version."socket.io-parser"."2.2.6"; - "has-binary-0.1.7" = self.by-version."has-binary"."0.1.7"; - "indexof-0.0.1" = self.by-version."indexof"."0.0.1"; - "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4"; - "to-array-0.1.4" = self.by-version."to-array"."0.1.4"; - "backo2-1.0.2" = self.by-version."backo2"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."socket.io-parser"."2.2.2" = - self.by-version."socket.io-parser"."2.2.2"; - by-version."socket.io-parser"."2.2.2" = self.buildNodePackage { - name = "socket.io-parser-2.2.2"; - version = "2.2.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz"; - name = "socket.io-parser-2.2.2.tgz"; - sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417"; - }; - deps = { - "debug-0.7.4" = self.by-version."debug"."0.7.4"; - "json3-3.2.6" = self.by-version."json3"."3.2.6"; - "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."socket.io-parser"."2.2.6" = - self.by-version."socket.io-parser"."2.2.6"; - by-version."socket.io-parser"."2.2.6" = self.buildNodePackage { - name = "socket.io-parser-2.2.6"; - version = "2.2.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz"; - name = "socket.io-parser-2.2.6.tgz"; - sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99"; - }; - deps = { - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "json3-3.3.2" = self.by-version."json3"."3.3.2"; - "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."to-array"."0.1.4" = - self.by-version."to-array"."0.1.4"; - by-version."to-array"."0.1.4" = self.buildNodePackage { - name = "to-array-0.1.4"; - version = "0.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"; - name = "to-array-0.1.4.tgz"; - sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ultron"."1.0.x" = - self.by-version."ultron"."1.0.2"; - by-version."ultron"."1.0.2" = self.buildNodePackage { - name = "ultron-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"; - name = "ultron-1.0.2.tgz"; - sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."utf8"."2.1.0" = - self.by-version."utf8"."2.1.0"; - by-version."utf8"."2.1.0" = self.buildNodePackage { - name = "utf8-2.1.0"; - version = "2.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz"; - name = "utf8-2.1.0.tgz"; - sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ws"."1.0.1" = - self.by-version."ws"."1.0.1"; - by-version."ws"."1.0.1" = self.buildNodePackage { - name = "ws-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ws/-/ws-1.0.1.tgz"; - name = "ws-1.0.1.tgz"; - sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9"; - }; - deps = { - "options-0.0.6" = self.by-version."options"."0.0.6"; - "ultron-1.0.2" = self.by-version."ultron"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."xmlhttprequest-ssl"."1.5.1" = - self.by-version."xmlhttprequest-ssl"."1.5.1"; - by-version."xmlhttprequest-ssl"."1.5.1" = self.buildNodePackage { - name = "xmlhttprequest-ssl-1.5.1"; - version = "1.5.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz"; - name = "xmlhttprequest-ssl-1.5.1.tgz"; - sha1 = "3b7741fea4a86675976e908d296d4445961faa67"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."yeast"."0.1.2" = - self.by-version."yeast"."0.1.2"; - by-version."yeast"."0.1.2" = self.buildNodePackage { - name = "yeast-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz"; - name = "yeast-0.1.2.tgz"; - sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; -} diff --git a/pkgs/development/compilers/ghcjs/node-packages.json b/pkgs/development/compilers/ghcjs/node-packages.json deleted file mode 100644 index 55fa86675e7a..000000000000 --- a/pkgs/development/compilers/ghcjs/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "socket.io" ] diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 838032c96984..538c20bac72a 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "0p0m63y39pja3fkj43sdq0qv8kqljkz7d58bf9jbw0rjw2c9ml4a"; + sha256 = "1ab021l3v29ciaxp738cjpbkh1chlsl6928672q3i82anmdzn5m5"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index a90985c2525a..50fa2d976273 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "1p226lgsmiwgcvmiakac9i08304cq5ick23vmsk1vjcsh6dvz9i3"; + sha256 = "07p4ld07r2nml2bsbfb8h51hqilbqyhhdlia99y1gk7ibvhybv8i"; }; # perl is used for testing go vet @@ -123,10 +123,6 @@ stdenv.mkDerivation rec { url = "https://github.com/golang/go/commit/29415eb2b92e78481897c4161ba99f5b09fa6102.patch"; sha256 = "01jkm4b2dazzjnfla7rdd0w2clzplga3zza6ybpmkjkk3i4bp73d"; }) - (fetchpatch { - url = "https://github.com/golang/go/commit/27e80f7c4d8001598367e15a1617fa524bd0fb11.patch"; - sha256 = "1250nrc79jwcagkjqffn5srn78isykvjhvmqhwipwyqb99q85wcz"; - }) ]; postPatch = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index 4705c327b425..f15e1060203b 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "gwt-java-2.4.0"; src = fetchurl { - url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip; - sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/google-web-toolkit/gwt-2.4.0.zip"; + sha256 = "1gvyg00vx7fdqgfl2w7nhql78clg3abs6fxxy7m03pprdm5qmm17"; }; buildInputs = [ unzip ]; @@ -17,8 +17,9 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://code.google.com/webtoolkit/; + homepage = http://www.gwtproject.org/; description = "A development toolkit for building and optimizing complex browser-based applications"; + license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 4be275318887..5c283dd4380c 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -11,24 +11,28 @@ stdenv.mkDerivation rec { repo = "ldc"; rev = "v${version}"; sha256 = "1ac3j4cwwgjpayhijxx4d6478bc3iqksjxkd7xp7byx7k8w1ppdl"; + name = "ldc-v${version}-src"; }) (fetchFromGitHub { owner = "ldc-developers"; repo = "druntime"; rev = "ldc-v${version}"; sha256 = "1m13370wnj3sizqk3sdpzi9am5d24srf27d613qblhqa9n8vwz30"; + name = "druntime-ldc-v${version}-src"; }) (fetchFromGitHub { owner = "ldc-developers"; repo = "phobos"; rev = "ldc-v${version}"; sha256 = "0fhcdfi7a00plwj27ysfyv783nhk0kspq7hawf6vbsl3s1nyvn8g"; + name = "phobos-ldc-v${version}-src"; }) (fetchFromGitHub { owner = "ldc-developers"; repo = "dmd-testsuite"; rev = "ldc-v${version}"; sha256 = "0dmdkp220gqhxjrmrjfkf0vsvylwfaj70hswavq4q3v4dg17pzmj"; + name = "dmd-testsuite-ldc-v${version}-src"; }) ]; diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index b600665cd8f6..54ab8c108773 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , perl , groff , cmake @@ -45,6 +46,18 @@ in stdenv.mkDerivation rec { # those always succeed has the net effect of disabling all bindings. prePatch = '' substituteInPlace cmake/config-ix.cmake --replace "if(WIN32)" "if(1)" + '' + + stdenv.lib.optionalString (stdenv ? glibc) '' + ( + cd projects/compiler-rt + patch -p1 < ${ + fetchpatch { + name = "sigaltstack.patch"; # for glibc-2.26 + url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; + sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; + } + } + ) ''; # hacky fix: created binaries need to be run before installation diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index f8b8948e749e..a0fbdf2b706a 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , perl , groff , cmake @@ -49,6 +50,18 @@ in stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt \ --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$out/lib")" \ --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' "" + '' + + stdenv.lib.optionalString (stdenv ? glibc) '' + ( + cd projects/compiler-rt + patch -p1 < ${ + fetchpatch { + name = "sigaltstack.patch"; # for glibc-2.26 + url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; + sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; + } + } + ) ''; # hacky fix: created binaries need to be run before installation diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 809c49ac24a2..495f95a5bbdb 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -91,6 +91,20 @@ in stdenv.mkDerivation rec { + stdenv.lib.optionalString (enableSharedLibraries) '' substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib patch -p1 < ./llvm-outputs.patch + '' + + stdenv.lib.optionalString (stdenv ? glibc) '' + ( + cd projects/compiler-rt + patch -p1 < ${ + fetchpatch { + name = "sigaltstack.patch"; # for glibc-2.26 + url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; + sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; + } + } + substituteInPlace lib/esan/esan_sideline_linux.cpp \ + --replace 'struct sigaltstack' 'stack_t' + ) ''; # hacky fix: created binaries need to be run before installation diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index e90603ffefae..332fee8529ba 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -67,6 +67,20 @@ in stdenv.mkDerivation rec { + stdenv.lib.optionalString (enableSharedLibraries) '' substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib patch -p1 < ./llvm-outputs.patch + '' + + stdenv.lib.optionalString (stdenv ? glibc) '' + ( + cd projects/compiler-rt + patch -p1 < ${ + fetchpatch { + name = "sigaltstack.patch"; # for glibc-2.26 + url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; + sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; + } + } + substituteInPlace lib/esan/esan_sideline_linux.cpp \ + --replace 'struct sigaltstack' 'stack_t' + ) ''; # hacky fix: created binaries need to be run before installation diff --git a/pkgs/development/compilers/ocaml/4.06.nix b/pkgs/development/compilers/ocaml/4.06.nix new file mode 100644 index 000000000000..b913d169e97a --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.06.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "06"; + patch_version = "0"; + sha256 = "1dy542yfnnw10zvh5s9qzswliq11mg7l0bcyss3501qw3vwvadhj"; + + # If the executable is stipped it does not work + dontStrip = true; +} diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 5e0cbb9d395d..543fc6dfa48f 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "orc-0.4.26"; + name = "orc-0.4.27"; src = fetchurl { - url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.xz"; - sha256 = "0jd69ynvr3k70mlxxgbsk047l1rd63m1wkj3qdcq7644xy0gllkx"; + url = "https://gstreamer.freedesktop.org/src/orc/${name}.tar.xz"; + sha256 = "14vbwdydwarcvswzf744jdjb3ibhv6k4j6hzdacfan41zic3xrai"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index e364f536c889..a4f0442d9d1b 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,41 +1,20 @@ { stdenv, makeWrapper, buildOcaml, fetchFromGitHub, ocaml, opam, topkg, menhir, merlin_extend, ppx_tools_versioned, utop }: -let - version = "2.0.0"; +buildOcaml rec { + name = "reason"; + version = "3.0.0"; + src = fetchFromGitHub { owner = "facebook"; repo = "reason"; rev = version; - sha256 = "0l3lwfvppplah707rq5nqjav2354lq6d7xfflfigkzhn74hlx6iy"; - }; - meta = with stdenv.lib; { - homepage = https://facebook.github.io/reason/; - description = "Facebook's friendly syntax to OCaml"; - license = licenses.bsd3; - maintainers = [ maintainers.volth ]; + sha256 = "0vj3y9vlm9gqvj9grmb9n487avbrj4q5611m7wv1bsdpndvv96jr"; }; - reason-parser = buildOcaml { - name = "reason-parser"; - inherit version src meta; - sourceRoot = "reason-${version}-src/reason-parser"; + propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; - minimumSupportedOcamlVersion = "4.02"; - - propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; - buildInputs = [ opam topkg ]; - - createFindlibDestdir = true; - - inherit (topkg) installPhase; - }; -in -buildOcaml { - name = "reason"; - inherit version src meta; - - buildInputs = [ makeWrapper opam topkg reason-parser utop ]; + buildInputs = [ makeWrapper opam topkg utop menhir opam topkg ]; buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed @@ -48,10 +27,15 @@ buildOcaml { installPhase = '' ${topkg.installPhase} - wrapProgram $out/bin/reup \ - --prefix PATH : "${opam}/bin" wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \ --set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH ''; + + meta = with stdenv.lib; { + homepage = https://facebook.github.io/reason/; + description = "Facebook's friendly syntax to OCaml"; + license = licenses.bsd3; + maintainers = [ maintainers.volth ]; + }; } diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 6eb160add26e..a113f5db4807 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -85,6 +85,9 @@ stdenv.mkDerivation { # https://reviews.llvm.org/rL281650 rm -vr src/test/run-pass/issue-36474.rs || true + # On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)' + sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs + # Disable some failing gdb tests. Try re-enabling these when gdb # is updated past version 7.12. rm src/test/debuginfo/basic-types-globals.rs diff --git a/pkgs/development/compilers/sbcl/1.2.0.nix b/pkgs/development/compilers/sbcl/1.2.0.nix deleted file mode 100644 index 975cb7db1bbf..000000000000 --- a/pkgs/development/compilers/sbcl/1.2.0.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ stdenv, fetchurl, sbclBootstrap, clisp}: - -stdenv.mkDerivation rec { - name = "sbcl-${version}"; - version = "1.2.0"; - - src = fetchurl { - url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; - }; - - buildInputs = [ ] - ++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap) - ++ (stdenv.lib.optional stdenv.isLinux clisp) - ; - - patchPhase = '' - echo '"${version}.nixos"' > version.lisp-expr - echo " - (lambda (features) - (flet ((enable (x) - (pushnew x features)) - (disable (x) - (setf features (remove x features)))) - (enable :sb-thread))) " > customize-target-features.lisp - - pwd - - # SBCL checks whether files are up-to-date in many places.. - # Unfortunately, same timestamp is not good enough - sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp - sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp - sed -i src/cold/slam.lisp -e \ - '/file-write-date input/a)' - sed -i src/cold/slam.lisp -e \ - '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-fasl/a)' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' - - # Fix the tests - sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp - - sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp - sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp - - # Use whatever `cc` the stdenv provides - substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc - - substituteInPlace src/runtime/Config.x86-64-darwin \ - --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5 - ''; - - preBuild = '' - export INSTALL_ROOT=$out - mkdir -p test-home - export HOME=$PWD/test-home - ''; - - buildPhase = if stdenv.isLinux - then '' - sh make.sh clisp --prefix=$out - '' - else '' - sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit' - ''; - - installPhase = '' - INSTALL_ROOT=$out sh install.sh - ''; - - meta = { - description = "Lisp compiler"; - homepage = http://www.sbcl.org; - license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.all; - inherit version; - }; -} diff --git a/pkgs/development/compilers/sbcl/1.3.12.nix b/pkgs/development/compilers/sbcl/1.3.12.nix deleted file mode 100644 index 8fa4741a4a14..000000000000 --- a/pkgs/development/compilers/sbcl/1.3.12.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ stdenv, fetchurl, writeText, sbclBootstrap -, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" -, threadSupport ? (stdenv.isi686 || stdenv.isx86_64) - # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die. - # Note that the created binaries still need `patchelf --set-interpreter ...` - # to get rid of ${glibc} dependency. -, purgeNixReferences ? false -}: - -stdenv.mkDerivation rec { - name = "sbcl-${version}"; - version = "1.3.12"; - - src = fetchurl { - url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1hjr2xqazy4j0m58y4na6fz8ii3xflqairxy7vpd7ajbs00yqfc0"; - }; - - patchPhase = '' - echo '"${version}.nixos"' > version.lisp-expr - echo " - (lambda (features) - (flet ((enable (x) - (pushnew x features)) - (disable (x) - (setf features (remove x features)))) - '' - + (if threadSupport then "(enable :sb-thread)" else "(disable :sb-thread)") - + stdenv.lib.optionalString stdenv.isArm "(enable :arm)" - + '' - )) " > customize-target-features.lisp - - pwd - - # SBCL checks whether files are up-to-date in many places.. - # Unfortunately, same timestamp is not good enough - sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp - sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp - sed -i src/cold/slam.lisp -e \ - '/file-write-date input/a)' - sed -i src/cold/slam.lisp -e \ - '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-fasl/a)' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' - - # Fix the tests - sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp - - sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp - sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp - - # Use whatever `cc` the stdenv provides - substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc - - substituteInPlace src/runtime/Config.x86-64-darwin \ - --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5 - '' - + (if purgeNixReferences - then - # This is the default location to look for the core; by default in $out/lib/sbcl - '' - sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \ - -i src/runtime/runtime.c - '' - else - # Fix software version retrieval - '' - sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp - '' - ); - - - preBuild = '' - export INSTALL_ROOT=$out - mkdir -p test-home - export HOME=$PWD/test-home - ''; - - buildPhase = '' - sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" - ''; - - installPhase = '' - INSTALL_ROOT=$out sh install.sh - ''; - - # Specifying $SBCL_HOME is only truly needed with `purgeNixReferences = true`. - setupHook = writeText "setupHook.sh" '' - envHooks+=(_setSbclHome) - _setSbclHome() { - export SBCL_HOME='@out@/lib/sbcl/' - } - ''; - - meta = sbclBootstrap.meta // { - inherit version; - updateWalker = true; - }; -} diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 85004767e582..9b7ce4120c48 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, sbclBootstrap +{ stdenv, fetchurl, fetchgit, writeText, sbclBootstrap , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.system) # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die. @@ -9,11 +9,16 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.0"; + version = "1.4.1.0.20171104"; - src = fetchurl { - url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0s87ax5hg9hz6b8kc9yrjckgz56s9iv96l2dcq216cbqkykrrm88"; + #src = fetchurl { + # url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; + # sha256 = "1qdaf847g5p2zgq00ax5hdy4r82bl3ss382psd0kkca1h83cdiz8"; + #}; + src = fetchgit { + url = "https://git.code.sf.net/p/sbcl/sbcl"; + sha256 = "1fq34h8h8pax5q17w84kwv5amiaag3ikkq3cdmb31r64736mxi6r"; + rev = "11aa57d23bc464d6a6867a80e946907404ceadd1"; }; patchPhase = '' @@ -35,7 +40,7 @@ stdenv.mkDerivation rec { # SBCL checks whether files are up-to-date in many places.. # Unfortunately, same timestamp is not good enough sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp - sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp + #sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp sed -i src/cold/slam.lisp -e \ '/file-write-date input/a)' sed -i src/cold/slam.lisp -e \ diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix index 301915b7a26b..222a22bf1cd9 100644 --- a/pkgs/development/compilers/teyjus/default.nix +++ b/pkgs/development/compilers/teyjus/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "teyjus-2.0b2"; src = fetchurl { - url = "https://teyjus.googlecode.com/files/teyjus-source-2.0-b2.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/teyjus/teyjus-source-2.0-b2.tar.gz"; sha256 = "f589fb460d7095a6e674b7a6413772c41b98654c38602c3e8c477a976da99052"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An efficient implementation of the Lambda Prolog language"; - homepage = https://code.google.com/p/teyjus/; + homepage = https://github.com/teyjus/teyjus; license = stdenv.lib.licenses.gpl3; maintainers = [ maintainers.bcdarwin ]; platforms = platforms.linux; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 02f5d3494e65..b1c36f841a4b 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -4,21 +4,21 @@ stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2017.10.16"; + version = "2017.11.05"; srcs = [ (fetchFromGitHub { owner = "cliffordwolf"; repo = "yosys"; - rev = "716dbc92745aa8b41d85a60d50263433d5a79393"; - sha256 = "0va77my4iddsw6psgjfhfgs0z0z1hpj0l8ipchcl8crpxipxcr77"; + rev = "4f31cb6daddedcee467d85797d81b79360ce1826"; + sha256 = "1a5n0g5kpjsy8f99f64w81gkrr450wvffp407r1pddl8pmb0c3r7"; name = "yosys"; }) (fetchFromBitbucket { owner = "alanmi"; repo = "abc"; - rev = "6283c5d99b06"; - sha256 = "1mv8r1la4d4r9bk32sl4nq3flyxi8jf2ccaak64j5rz9hirrlpla"; + rev = "f6838749f234"; + sha256 = "0n7ywvih958h1c4n7a398a9w3qikhkv885fx5j3y2a0xwqc86m4y"; name = "yosys-abc"; }) ]; diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 688182f4e5eb..af509dee29c4 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -20,11 +20,6 @@ let param = sha256 = "06kwnrfndnr6w8bmaa2s0i0rkqyv081zj55z3vcyn0wr6x6mlsz9"; }; - "8.7" = { - version = "20170616"; - rev = "366ee3f8e599b5cab438a63a09713f44ac544c5a"; - sha256 = "06kwnrfndnr6w8bmaa2s0i0rkqyv081zj55z3vcyn0wr6x6mlsz9"; - }; }."${coq.coq-version}" ; in diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix new file mode 100644 index 000000000000..5762da66fedd --- /dev/null +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, coq }: + +let rev_and_sha = { + "8.6" = { + rev = "v8.6.0"; + sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj"; + }; + "8.7" = { + rev = "V8.7.0"; + sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; + }; +}; +in + +if ! (rev_and_sha ? "${coq.coq-version}") then + throw "bignums is not available for Coq ${coq.coq-version}" +else with rev_and_sha."${coq.coq-version}"; + +stdenv.mkDerivation rec { + + name = "coq${coq.coq-version}-bignums"; + + src = fetchFromGitHub { + owner = "coq"; + repo = "bignums"; + inherit rev sha256; + }; + + buildInputs = [ coq.ocaml coq.camlp5 coq.findlib coq ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = with stdenv.lib; { + license = licenses.lgpl2; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index aec3828f323e..65be1f4e0667 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -1,11 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }: let param = { - "8.7" = { - version = "0.6.1"; - rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663"; - sha256 = "1jaafkwsb5450378nprjsds1illgdaq60gryi8kspw0i25ykz2c9"; - }; "8.6" = { version = "0.6.1"; rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663"; diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index 0e7549623e7a..d045ec4223b2 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, coq }: +{ stdenv, fetchFromGitHub, coq, coqPackages }: -stdenv.mkDerivation { - name = "coq${coq.coq-version}-math-classes-1.0.6"; +if ! stdenv.lib.versionAtLeast coq.coq-version "8.6" then + throw "Math-Classes requires Coq 8.6 or later." +else - src = fetchurl { - url = https://github.com/math-classes/math-classes/archive/1.0.6.tar.gz; - sha256 = "071hgjk4bz2ybci7dp2mw7xqmxmm2zph7kj28xcdg28iy796lf02"; +stdenv.mkDerivation rec { + + name = "coq${coq.coq-version}-math-classes-${version}"; + version = "1.0.7"; + + src = fetchFromGitHub { + owner = "math-classes"; + repo = "math-classes"; + rev = version; + sha256 = "0wgnczacvkb2pc3vjbni9bwjijfyd5jcdnyyjg8185hkf9zzabgi"; }; - # src = fetchFromGitHub { - # owner = "math-classes"; - # repo = "math-classes"; - # rev = "1d426a08c2fbfd68bd1b3622fe8f31dd03712e6c"; - # sha256 = "3kjc2wzb6n9hcqb2ijx2pckn8jk5g09crrb87yb4s9m0mrw79smr"; - # }; - - buildInputs = [ coq ]; + buildInputs = [ coq coqPackages.bignums ]; enableParallelBuilding = true; installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 5a1a0eb52eb3..3a973fc2644a 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,4 +1,5 @@ -{ go, govers, parallel, lib, fetchgit, fetchhg, fetchbzr, rsync, removeReferencesTo }: +{ go, govers, parallel, lib, fetchgit, fetchhg, fetchbzr, rsync +, removeReferencesTo, fetchFromGitHub }: { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? "" @@ -58,6 +59,10 @@ let fetchbzr { inherit (goDep.fetch) url rev sha256; } + else if goDep.fetch.type == "FromGitHub" then + fetchFromGitHub { + inherit (goDep.fetch) owner repo rev sha256; + } else abort "Unrecognized package fetch type: ${goDep.fetch.type}"; }; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2b050dd613f5..f7df3ec31581 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -98,7 +98,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "1143qcsljp66v0xvq2a2nqji24890rnmxcmwnxw8xj818gqk0p3m"; + sha256 = "0iz0yz0bwkmpza5qahsxr9plg1ylmkv7znp1a8f0z65px7f300an"; }; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -976,4 +976,6 @@ self: super: { # Build with gi overloading feature disabled. ltk = super.ltk.overrideScope (self: super: { haskell-gi-overloading = self.haskell-gi-overloading_0_0; }); + # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4 + stack2nix = doJailbreak super.stack2nix; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 8de2749004e5..93d8180bd0a7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 9.10 + # LTS Haskell 9.11 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -323,7 +323,7 @@ default-package-overrides: - bytestring-strict-builder ==0.4.5 - bytestring-tree-builder ==0.2.7.1 - bytestring-trie ==0.2.4.1 - - bzlib-conduit ==0.2.1.4 + - bzlib-conduit ==0.2.1.5 - c2hs ==0.28.2 - Cabal ==1.24.2.0 - cabal-dependency-licenses ==0.2.0.0 @@ -669,7 +669,7 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.9 - exp-pairs ==0.1.5.2 - - extensible ==0.4.5 + - extensible ==0.4.6 - extensible-effects ==1.11.1.0 - extensible-exceptions ==0.1.1.4 - extra ==1.5.3 @@ -686,6 +686,7 @@ default-package-overrides: - fclabels ==2.0.3.2 - fdo-notify ==0.3.1 - feature-flags ==0.1.0.1 + - fedora-haskell-tools ==0.3 - feed ==0.3.12.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 @@ -790,7 +791,7 @@ default-package-overrides: - gi-soup ==2.4.14 - git ==0.2.0 - github ==0.16.0 - - github-release ==1.0.6 + - github-release ==1.0.7 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 - github-webhook-handler-snap ==0.0.7 @@ -948,7 +949,7 @@ default-package-overrides: - haddock-api ==2.17.4 - haddock-library ==1.4.3 - haddock-test ==0.0.1 - - hailgun ==0.4.1.5 + - hailgun ==0.4.1.6 - hailgun-simple ==0.1.0.0 - hakyll ==4.9.8.0 - hakyll-favicon ==0.1.0 @@ -1024,12 +1025,12 @@ default-package-overrides: - hebrew-time ==0.1.1 - hedgehog ==0.5 - hedgehog-quickcheck ==0.1 - - hedis ==0.9.10 + - hedis ==0.9.11 - here ==1.2.11 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.0 - hex ==0.1.2 - - hexml ==0.3.2 + - hexml ==0.3.3 - hexpat ==0.20.13 - hexstring ==0.11.1 - hformat ==0.3.1.0 @@ -1090,8 +1091,8 @@ default-package-overrides: - hsebaysdk ==0.4.0.0 - hse-cpp ==0.2 - hsemail ==2 - - hset ==2.2.0 - HSet ==0.0.1 + - hset ==2.2.0 - hsexif ==0.6.1.4 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -1207,7 +1208,7 @@ default-package-overrides: - inline-c ==0.5.6.1 - inline-c-cpp ==0.1.0.0 - inline-java ==0.6.5 - - inline-r ==0.9.0.1 + - inline-r ==0.9.0.2 - insert-ordered-containers ==0.2.1.0 - instance-control ==0.1.2.0 - integer-logarithms ==1.0.2 @@ -1232,10 +1233,10 @@ default-package-overrides: - ip6addr ==0.5.3 - iproute ==1.7.1 - IPv6Addr ==1.0.1 - - IPv6DB ==0.2.2 + - IPv6DB ==0.2.3 - irc ==0.6.1.0 - irc-client ==0.4.4.4 - - irc-conduit ==0.2.2.3 + - irc-conduit ==0.2.2.4 - irc-ctcp ==0.1.3.0 - irc-dcc ==2.0.1 - islink ==0.1.0.0 @@ -1283,7 +1284,7 @@ default-package-overrides: - kraken ==0.0.3 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==0.4.3 + - lackey ==0.4.4 - lame ==0.1.1 - language-c ==0.6.1 - language-c-quote ==0.12.1 @@ -1349,7 +1350,7 @@ default-package-overrides: - lmdb ==0.2.5 - loch-th ==0.2.1 - log ==0.9.0.1 - - log-base ==0.7.3.0 + - log-base ==0.7.4.0 - log-domain ==0.11.2 - log-elasticsearch ==0.9.1.0 - logfloat ==0.13.3.3 @@ -1630,14 +1631,14 @@ default-package-overrides: - perf ==0.1.2 - persistable-record ==0.5.1.1 - persistable-types-HDBC-pg ==0.0.1.5 - - persistent ==2.7.0 + - persistent ==2.7.1 - persistent-mongoDB ==2.6.0 - - persistent-mysql ==2.6.1 + - persistent-mysql ==2.6.2.1 - persistent-mysql-haskell ==0.3.0.0 - - persistent-postgresql ==2.6.1 + - persistent-postgresql ==2.6.2 - persistent-redis ==2.5.2 - persistent-refs ==0.4 - - persistent-sqlite ==2.6.2 + - persistent-sqlite ==2.6.3 - persistent-template ==2.5.3 - pgp-wordlist ==0.1.0.2 - pg-transact ==0.1.0.1 @@ -1646,7 +1647,7 @@ default-package-overrides: - picoparsec ==0.1.2.3 - picosat ==0.1.4 - pid1 ==0.1.2.0 - - pinboard ==0.9.12.5 + - pinboard ==0.9.12.6 - pinch ==0.3.2.0 - pinchot ==0.24.0.0 - pipes ==4.3.6 @@ -1735,8 +1736,8 @@ default-package-overrides: - prompt ==0.1.1.2 - protobuf ==0.2.1.1 - protobuf-simple ==0.1.0.4 - - protocol-buffers ==2.4.4 - - protocol-buffers-descriptor ==2.4.4 + - protocol-buffers ==2.4.5 + - protocol-buffers-descriptor ==2.4.5 - proto-lens ==0.2.1.0 - proto-lens-arbitrary ==0.1.1.1 - proto-lens-combinators ==0.1.0.7 @@ -1752,7 +1753,7 @@ default-package-overrides: - publicsuffix ==0.20170508 - pure-io ==0.2.1 - pureMD5 ==2.1.3 - - purescript-bridge ==0.11.1.0 + - purescript-bridge ==0.11.1.1 - pusher-http-haskell ==1.2.0.1 - pwstore-fast ==2.4.4 - QuasiText ==0.1.2.6 @@ -1783,7 +1784,7 @@ default-package-overrides: - rank-product ==0.2.0.1 - Rasterific ==0.7.2.1 - rasterific-svg ==0.3.3 - - ratel ==0.3.5 + - ratel ==0.3.6 - ratel-wai ==0.2.0 - rattletrap ==2.5.0 - rawfilepath ==0.2.4 @@ -1852,7 +1853,7 @@ default-package-overrides: - result ==0.2.6.0 - rethinkdb ==2.2.0.10 - rethinkdb-client-driver ==0.0.25 - - retry ==0.7.4.2 + - retry ==0.7.4.3 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - rng-utils ==0.2.1 @@ -1921,16 +1922,16 @@ default-package-overrides: - servant-mock ==0.8.2 - servant-purescript ==0.8.0.1 - servant-ruby ==0.2.1.0 - - servant-server ==0.11 + - servant-server ==0.11.0.1 - servant-static-th ==0.1.0.6 - servant-subscriber ==0.6.0.0 - servant-swagger ==1.1.3.1 - - servant-swagger-ui ==0.2.4.3.0.20 + - servant-swagger-ui ==0.2.4.3.4.0 - servant-yaml ==0.1.0.0 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - serversession-frontend-yesod ==1.0 - - servius ==1.2.0.2 + - servius ==1.2.0.3 - set-cover ==0.0.8 - setenv ==0.1.1.3 - setlocale ==1.0.0.5 @@ -2251,7 +2252,7 @@ default-package-overrides: - typography-geometry ==1.0.0.1 - tz ==0.1.3.0 - tzdata ==0.1.20170320.0 - - ua-parser ==0.7.4 + - ua-parser ==0.7.4.1 - uglymemo ==0.1.0.1 - unbound ==0.5.1 - unbounded-delays ==0.1.1.0 @@ -2357,7 +2358,7 @@ default-package-overrides: - wai-routes ==0.10.0 - wai-routing ==0.13.0 - wai-session ==0.3.2 - - wai-session-postgresql ==0.2.1.0 + - wai-session-postgresql ==0.2.1.1 - wai-slack-middleware ==0.2.0 - waitra ==0.0.4.0 - wai-transformers ==0.0.7 @@ -2802,6 +2803,7 @@ dont-distribute-packages: aeson-smart: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-t: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-tiled: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-yak: [ i686-linux, x86_64-linux, x86_64-darwin ] AesonBson: [ i686-linux, x86_64-linux, x86_64-darwin ] affection: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3258,6 +3260,7 @@ dont-distribute-packages: cabal-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2arch: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2doap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3409,6 +3412,7 @@ dont-distribute-packages: clafer: [ i686-linux, x86_64-linux, x86_64-darwin ] claferIG: [ i686-linux, x86_64-linux, x86_64-darwin ] claferwiki: [ i686-linux, x86_64-linux, x86_64-darwin ] + clang-compilation-database: [ i686-linux, x86_64-linux, x86_64-darwin ] clang-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] clanki: [ i686-linux, x86_64-linux, x86_64-darwin ] clarifai: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3564,6 +3568,7 @@ dont-distribute-packages: Configurable: [ i686-linux, x86_64-linux, x86_64-darwin ] congruence-relation: [ i686-linux, x86_64-linux, x86_64-darwin ] conjure: [ i686-linux, x86_64-linux, x86_64-darwin ] + conkin: [ i686-linux, x86_64-linux, x86_64-darwin ] conlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] Conscript: [ i686-linux, x86_64-linux, x86_64-darwin ] consistent: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4229,6 +4234,7 @@ dont-distribute-packages: filediff: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] + filepath-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] filepath-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] filepather: [ i686-linux, x86_64-linux, x86_64-darwin ] FilePather: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4335,7 +4341,9 @@ dont-distribute-packages: free-theorems-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-vector-spaces: [ i686-linux, x86_64-linux, x86_64-darwin ] freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] + freelude: [ i686-linux, x86_64-linux, x86_64-darwin ] freesect: [ i686-linux, x86_64-linux, x86_64-darwin ] freesound: [ i686-linux, x86_64-linux, x86_64-darwin ] freetype-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4831,6 +4839,7 @@ dont-distribute-packages: haskell-brainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-cnc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-coffee: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-compression: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-eigen-util: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5020,6 +5029,7 @@ dont-distribute-packages: Hermes: [ i686-linux, x86_64-linux, x86_64-darwin ] hermit-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] hermit: [ i686-linux, x86_64-linux, x86_64-darwin ] + herms: [ i686-linux, x86_64-linux, x86_64-darwin ] herringbone-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] herringbone-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] herringbone: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5752,6 +5762,7 @@ dont-distribute-packages: karakuri: [ i686-linux, x86_64-linux, x86_64-darwin ] karps: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + katip-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] katt: [ i686-linux, x86_64-linux, x86_64-darwin ] kawaii: [ i686-linux, x86_64-linux, x86_64-darwin ] kazura-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5943,6 +5954,7 @@ dont-distribute-packages: libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ] libvirt-hs: [ "x86_64-darwin" ] + libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] libxls: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5964,6 +5976,7 @@ dont-distribute-packages: linear-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-vect: [ i686-linux, x86_64-linux, x86_64-darwin ] + linearmap-category: [ i686-linux, x86_64-linux, x86_64-darwin ] linearscan-hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] LinearSplit: [ i686-linux, x86_64-linux, x86_64-darwin ] LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5988,6 +6001,7 @@ dont-distribute-packages: liquid: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] + liquidhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] list-mux: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6129,6 +6143,7 @@ dont-distribute-packages: mandulia: [ i686-linux, x86_64-linux, x86_64-darwin ] mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] manifold-random: [ i686-linux, x86_64-linux, x86_64-darwin ] + manifolds-core: [ i686-linux, x86_64-linux, x86_64-darwin ] manifolds: [ i686-linux, x86_64-linux, x86_64-darwin ] mappy: [ i686-linux, x86_64-linux, x86_64-darwin ] marionetta: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6252,6 +6267,7 @@ dont-distribute-packages: mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ] moan: [ i686-linux, x86_64-linux, x86_64-darwin ] modelicaparser: [ i686-linux, x86_64-linux, x86_64-darwin ] + modern-uri: [ i686-linux, x86_64-linux, x86_64-darwin ] modsplit: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-prelude-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6314,6 +6330,7 @@ dont-distribute-packages: mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ] monoid-owns: [ i686-linux, x86_64-linux, x86_64-darwin ] + monoid-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] monoidplus: [ i686-linux, x86_64-linux, x86_64-darwin ] monoids: [ i686-linux, x86_64-linux, x86_64-darwin ] monte-carlo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6324,6 +6341,7 @@ dont-distribute-packages: morfeusz: [ i686-linux, x86_64-linux, x86_64-darwin ] morph: [ i686-linux, x86_64-linux, x86_64-darwin ] mosaico-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + motor: [ i686-linux, x86_64-linux, x86_64-darwin ] mount: [ i686-linux, x86_64-linux, x86_64-darwin ] movie-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] mp3decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6673,6 +6691,7 @@ dont-distribute-packages: paragon: [ i686-linux, x86_64-linux, x86_64-darwin ] Paraiso: [ i686-linux, x86_64-linux, x86_64-darwin ] parallel-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] + parameterized: [ i686-linux, x86_64-linux, x86_64-darwin ] paranoia: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6877,6 +6896,7 @@ dont-distribute-packages: postgresql-typed-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] PostgreSQL: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgrest-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] postgrest: [ i686-linux, x86_64-linux, x86_64-darwin ] postie: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7047,6 +7067,7 @@ dont-distribute-packages: rail-compiler-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] rails-session: [ i686-linux, x86_64-linux, x86_64-darwin ] rainbow-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + Raincat: [ i686-linux, x86_64-linux, x86_64-darwin ] raketka: [ i686-linux, x86_64-linux, x86_64-darwin ] rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] rakuten: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7175,6 +7196,7 @@ dont-distribute-packages: reify: [ i686-linux, x86_64-linux, x86_64-darwin ] relation: [ i686-linux, x86_64-linux, x86_64-darwin ] relational-postgresql8: [ i686-linux, x86_64-linux, x86_64-darwin ] + relational-record-examples: [ 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 ] remark: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7236,6 +7258,7 @@ dont-distribute-packages: rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] rezoom: [ i686-linux, x86_64-linux, x86_64-darwin ] + rhine: [ i686-linux, x86_64-linux, x86_64-darwin ] rhythm-game-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] riak: [ i686-linux, x86_64-linux, x86_64-darwin ] RichConditional: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7323,6 +7346,7 @@ dont-distribute-packages: safer-file-handles: [ i686-linux, x86_64-linux, x86_64-darwin ] saferoute: [ i686-linux, x86_64-linux, x86_64-darwin ] sai-shape-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] + sajson: [ i686-linux, x86_64-linux, x86_64-darwin ] Salsa: [ i686-linux, x86_64-linux, x86_64-darwin ] saltine-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] saltine: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7392,6 +7416,7 @@ dont-distribute-packages: sdl2-cairo-image: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-compositor: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-gfx: [ i686-linux, x86_64-linux, x86_64-darwin ] + sdl2-mixer: [ i686-linux, x86_64-linux, x86_64-darwin ] sdr: [ i686-linux, x86_64-linux, x86_64-darwin ] seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] search: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7762,6 +7787,7 @@ dont-distribute-packages: step-function: [ i686-linux, x86_64-linux, x86_64-darwin ] stepwise: [ i686-linux, x86_64-linux, x86_64-darwin ] stgi: [ i686-linux, x86_64-linux, x86_64-darwin ] + STLinkUSB: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-chunked-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8354,6 +8380,7 @@ dont-distribute-packages: wai-lite: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-logger-prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-make-assets: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-brotli: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-catch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8435,6 +8462,7 @@ dont-distribute-packages: WikimediaParser: [ i686-linux, x86_64-linux, x86_64-darwin ] wikipedia4epub: [ i686-linux, x86_64-linux, x86_64-darwin ] wild-bind-task-x11: [ "x86_64-darwin" ] + windns: [ i686-linux, x86_64-linux, x86_64-darwin ] windowslive: [ i686-linux, x86_64-linux, x86_64-darwin ] winerror: [ i686-linux, x86_64-linux, x86_64-darwin ] winio: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8450,6 +8478,7 @@ dont-distribute-packages: woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] wolf: [ i686-linux, x86_64-linux, x86_64-darwin ] WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] + wordchoice: [ i686-linux, x86_64-linux, x86_64-darwin ] Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8509,6 +8538,7 @@ dont-distribute-packages: xing-api: [ i686-linux, x86_64-linux, x86_64-darwin ] xkbcommon: [ "x86_64-darwin" ] xkcd: [ i686-linux, x86_64-linux, x86_64-darwin ] + xleb: [ i686-linux, x86_64-linux, x86_64-darwin ] xls: [ "x86_64-darwin" ] xlsior: [ i686-linux, x86_64-linux, x86_64-darwin ] xlsx-templater: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 5d8a28f5c2b0..3e82003be43c 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -362,8 +362,7 @@ stdenv.mkDerivation ({ env = stdenv.mkDerivation { name = "interactive-${pname}-${version}-environment"; - nativeBuildInputs = [ ghcEnv systemBuildInputs ] - ++ optional isGhcjs ghc."socket.io"; # for ghcjsi + nativeBuildInputs = [ ghcEnv systemBuildInputs ]; LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; shellHook = '' diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 7fbca53886ef..6e43df9aba69 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, cacert }@depArgs: +{ stdenv, ghc, pkgconfig, glibcLocales, cacert, stack }@depArgs: with stdenv.lib; @@ -6,15 +6,17 @@ with stdenv.lib; , extraArgs ? [] , LD_LIBRARY_PATH ? [] , ghc ? depArgs.ghc +, stack ? depArgs.stack , ... }@args: -stdenv.mkDerivation (args // { +let stackCmd = "stack --internal-re-exec-version=${stack.version}"; +in stdenv.mkDerivation (args // { buildInputs = buildInputs ++ optional stdenv.isLinux glibcLocales ++ - [ ghc pkgconfig ]; + [ ghc pkgconfig stack ]; STACK_PLATFORM_VARIANT="nix"; STACK_IN_NIX_SHELL=1; @@ -39,13 +41,13 @@ stdenv.mkDerivation (args // { export STACK_ROOT=$NIX_BUILD_TOP/.stack ''; - buildPhase = args.buildPhase or "stack build"; + buildPhase = args.buildPhase or "${stackCmd} build"; - checkPhase = args.checkPhase or "stack test"; + checkPhase = args.checkPhase or "${stackCmd} test"; doCheck = args.doCheck or true; installPhase = args.installPhase or '' - stack --local-bin-path=$out/bin build --copy-bins + ${stackCmd} --local-bin-path=$out/bin build --copy-bins ''; }) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b9b9e75c859e..4a3937182575 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1835,8 +1835,8 @@ self: { }: mkDerivation { pname = "Blogdown"; - version = "0.2.2"; - sha256 = "18lxj5ka4jfaz1ig6x6qkdzlil99i3bcy4cqpbsccvyvhbax323c"; + version = "0.2.3"; + sha256 = "0xdlcx82nfm74n88fghbg5f6fnjvrajpsz52hrc4bl5afxx63bpx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -2230,10 +2230,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "CSPM-CoreLanguage"; - version = "0.3.0.3"; - sha256 = "0vr6zpdz5lnpkyzwhig72pv8ncvqdjyp1nn76zpx3v6xlpzrs3q2"; + version = "0.3.1.0"; + sha256 = "0dlb761kj33v9p53fw44gg4r7j8kcl4jxvvgi7rz0pv8v7nh6255"; libraryHaskellDepends = [ base ]; - description = "Definition of a FDR-compatible CSP core-language"; + description = "Definition of a CSP core-language"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -2243,8 +2243,8 @@ self: { }: mkDerivation { pname = "CSPM-FiringRules"; - version = "0.4.3.0"; - sha256 = "0rdggf00zq51j4af6rhk4ix8rbpd82piy2al4m6ymziwflv3b70m"; + version = "0.4.4.0"; + sha256 = "11j4f9za74x9f0l8jbf7mvjnmd6gyx02zb31jjrhza3y4hpcj412"; libraryHaskellDepends = [ base containers CSPM-CoreLanguage mtl parallel-tree-search QuickCheck random tree-monad @@ -2255,16 +2255,16 @@ self: { }) {}; "CSPM-Frontend" = callPackage - ({ mkDerivation, alex, array, base, containers, dlist, either - , ghc-prim, mtl, parsec2, prettyclass, syb, transformers + ({ mkDerivation, alex, array, base, containers, dlist, either, mtl + , parsec, prettyclass, syb, transformers }: mkDerivation { pname = "CSPM-Frontend"; - version = "0.10.0.0"; - sha256 = "0wmfk9givv604ajzkg60586lz08xqcx60bnqgslpfzkh458mz9z3"; + version = "0.12.1.0"; + sha256 = "17i5app854vb4mghf9l0laldbgraqbq08w36hh61j5n161ypb1s5"; libraryHaskellDepends = [ - array base containers dlist either ghc-prim mtl parsec2 prettyclass - syb transformers + array base containers dlist either mtl parsec prettyclass syb + transformers ]; libraryToolDepends = [ alex ]; description = "A CSP-M parser compatible with FDR-2.91"; @@ -2278,8 +2278,8 @@ self: { }: mkDerivation { pname = "CSPM-Interpreter"; - version = "0.7.0.0"; - sha256 = "0shf0bb4zqnxvclsavvxnsy697xbl5q1xjqww8makps6dirwk0qn"; + version = "0.7.1.0"; + sha256 = "01byczl4109mwmxflmnflxxh4pnfj4anqsfgng5q664a8rjzqfwy"; libraryHaskellDepends = [ array base containers CSPM-CoreLanguage CSPM-Frontend mtl prettyclass syb @@ -2290,15 +2290,13 @@ self: { }) {}; "CSPM-ToProlog" = callPackage - ({ mkDerivation, array, base, containers, CSPM-Frontend, ghc-prim - , pretty - }: + ({ mkDerivation, array, base, containers, CSPM-Frontend, pretty }: mkDerivation { pname = "CSPM-ToProlog"; - version = "0.5.2.0"; - sha256 = "0qy2zdxgdm9vacm2ickf1lvyj6wrcnpifaxgh25apg9j9v6g0h12"; + version = "0.5.5.0"; + sha256 = "1jr4q8jyai53g4yps1377q7wv9c52mg50yikycyirrpz46giiy2r"; libraryHaskellDepends = [ - array base containers CSPM-Frontend ghc-prim pretty + array base containers CSPM-Frontend pretty ]; description = "some modules specific for the ProB tool"; license = stdenv.lib.licenses.bsd3; @@ -2308,22 +2306,22 @@ self: { "CSPM-cspm" = callPackage ({ mkDerivation, base, cmdargs, containers, CSPM-CoreLanguage , CSPM-FiringRules, CSPM-Frontend, CSPM-Interpreter, CSPM-ToProlog - , hslua, parallel, pretty, prettyclass, syb, transformers, xml + , hslua, parallel, prettyclass, syb, transformers, xml }: mkDerivation { pname = "CSPM-cspm"; - version = "0.8.0.0"; - sha256 = "1lhfq8gjls2g3xwskwa7vx1kj6n83b4msx4fc6769li4r2xn1bc9"; + version = "0.8.1.0"; + sha256 = "0brgzzhkqk8pvdniqwzcfwwr9v7y3kw3zdhsw053lxs0dcb191n0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cmdargs containers CSPM-CoreLanguage CSPM-FiringRules - CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty + CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel prettyclass syb transformers xml ]; executableHaskellDepends = [ base cmdargs containers CSPM-CoreLanguage CSPM-FiringRules - CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty + CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel prettyclass syb transformers xml ]; description = "cspm command line tool for analyzing CSPM specifications"; @@ -6077,8 +6075,8 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.9.1.1"; - sha256 = "13536fari7askp70zp7arzbk16vwgz42lw7anwxnhi9gpq2hjy5y"; + version = "0.9.2"; + sha256 = "04k0i27igqzvxmyp2yy5gvd9agymmxwxnnkqxkiv0qjhk1kj8p8r"; libraryHaskellDepends = [ array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector @@ -8751,6 +8749,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HUnit-approx_1_1_1_1" = callPackage + ({ mkDerivation, base, call-stack, HUnit }: + mkDerivation { + pname = "HUnit-approx"; + version = "1.1.1.1"; + sha256 = "1brblqpz002jzql9wgzxk5zlfglmkv91s8gcfd6992xv539jfhsa"; + libraryHaskellDepends = [ base call-stack HUnit ]; + testHaskellDepends = [ base call-stack HUnit ]; + 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 ({ mkDerivation, base, base64-string, binary, bytestring , crypto-api, enumerator, HLogger, network, pureMD5, random @@ -9351,8 +9363,8 @@ self: { }: mkDerivation { pname = "Hastodon"; - version = "0.1.0"; - sha256 = "012b8f2jb297bnx7sgsvz0vw0ic0xmlrr0b7fs65y6ycll6ih2zw"; + version = "0.2.0"; + sha256 = "1ybchvkcv9n4wp8r4xassmgw1z0kdscmkccg3rbhz72lwp3m13zz"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types MissingH text ]; @@ -10251,36 +10263,6 @@ self: { }) {}; "IPv6DB" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger - , hedis, hspec, http-client, http-types, IPv6Addr, mtl - , optparse-applicative, text, unordered-containers, vector, wai - , wai-logger, warp - }: - mkDerivation { - pname = "IPv6DB"; - version = "0.2.2"; - sha256 = "117qn9h25wi0q8nnj10yj33spqizcsf0inb7n4xpbccg60x9i51k"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring fast-logger hedis http-types IPv6Addr mtl - optparse-applicative text unordered-containers vector wai - wai-logger warp - ]; - testHaskellDepends = [ - aeson base hspec http-client http-types vector - ]; - homepage = "http://ipv6db.cybervisible.com"; - description = "A RESTful Web Service for IPv6-related data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "IPv6DB_0_2_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger , hedis, hspec, http-client, http-types, IPv6Addr, mtl , optparse-applicative, text, unordered-containers, vector, wai @@ -10729,6 +10711,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels-extra_0_2_2" = callPackage + ({ mkDerivation, base, criterion, hspec, JuicyPixels }: + mkDerivation { + pname = "JuicyPixels-extra"; + version = "0.2.2"; + sha256 = "1f0ysxwd73s04mrqzqj9rfp6dd5441ckc96x2a4zkc1hixgkfzld"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base JuicyPixels ]; + testHaskellDepends = [ base hspec JuicyPixels ]; + benchmarkHaskellDepends = [ base criterion JuicyPixels ]; + homepage = "https://github.com/mrkkrp/JuicyPixels-extra"; + description = "Efficiently scale, crop, flip images with JuicyPixels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "JuicyPixels-repa" = callPackage ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }: mkDerivation { @@ -12662,31 +12660,33 @@ self: { }) {}; "MutationOrder" = callPackage - ({ mkDerivation, ADPfusion, ADPfusionSet, aeson, base, bimaps - , BiobaseXNA, bytestring, cereal, cereal-vector, cmdargs - , containers, deepseq, directory, DPutils, file-embed, filepath - , FormalGrammars, log-domain, parallel, PrimitiveArray + ({ mkDerivation, ADPfusion, ADPfusionSet, aeson, attoparsec, base + , bimaps, BiobaseXNA, bytestring, bytestring-trie, cereal + , cereal-vector, cmdargs, containers, deepseq, directory, DPutils + , errors, file-embed, filemanip, filepath, FormalGrammars, hashable + , lens, log-domain, mtl, OrderedBits, parallel, PrimitiveArray , PrimitiveArray-Pretty, QuickCheck, serialize-instances - , ShortestPathProblems, tasty, tasty-quickcheck, tasty-th, text - , unordered-containers, vector, vector-strategies + , ShortestPathProblems, split, tasty, tasty-quickcheck, tasty-th + , text, unordered-containers, vector, vector-strategies , ViennaRNA-bindings, zlib }: mkDerivation { pname = "MutationOrder"; - version = "0.0.0.2"; - sha256 = "0bzk2n84j2w1j11b8pi5505kdad3fzr4m86qwkwc9kmv2l25j680"; + version = "0.0.1.0"; + sha256 = "0zk0cwjapsinnadwk8ss5cv3g81c6cz1dcqq47g53bfi0m9aly9q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ADPfusion ADPfusionSet aeson base bimaps BiobaseXNA bytestring - cereal cereal-vector containers deepseq directory DPutils filepath - FormalGrammars log-domain parallel PrimitiveArray - PrimitiveArray-Pretty serialize-instances ShortestPathProblems text - unordered-containers vector vector-strategies ViennaRNA-bindings - zlib + ADPfusion ADPfusionSet aeson attoparsec base bimaps BiobaseXNA + bytestring bytestring-trie cereal cereal-vector containers deepseq + directory DPutils errors filemanip filepath FormalGrammars hashable + lens log-domain mtl OrderedBits parallel PrimitiveArray + PrimitiveArray-Pretty serialize-instances ShortestPathProblems + split text unordered-containers vector vector-strategies + ViennaRNA-bindings zlib ]; executableHaskellDepends = [ - base bytestring cmdargs file-embed filepath + base bytestring cmdargs directory errors file-embed filepath ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th vector @@ -15171,7 +15171,7 @@ self: { homepage = "http://raincat.bysusanlin.com/"; description = "A puzzle game written in Haskell with a cat in lead role"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Random123" = callPackage @@ -15872,6 +15872,49 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "STLinkUSB" = callPackage + ({ mkDerivation, base, binary, bytestring, transformers, usb + , vector + }: + mkDerivation { + pname = "STLinkUSB"; + version = "0.1.1"; + sha256 = "1b0cxrjbldsdh948fa3d5qr0lmjl2g5qkh7ii4smkmsakzk9jx0s"; + libraryHaskellDepends = [ + base binary bytestring transformers usb vector + ]; + description = "STLink USB interface in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "STM32-Zombie" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, STLinkUSB + , STM32F103xx-SVD, transformers + }: + mkDerivation { + pname = "STM32-Zombie"; + version = "0.2.0"; + sha256 = "10vknxgihz3cgyzi1rmyh30zqyg0q7ll653ljndjj8lh3hnghajx"; + libraryHaskellDepends = [ + base binary bytestring containers STLinkUSB STM32F103xx-SVD + transformers + ]; + description = "control a STM32F103 microcontroller"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "STM32F103xx-SVD" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "STM32F103xx-SVD"; + version = "0.1"; + sha256 = "0m6vvj4mfmmn1r21aglwdb6801bwr0ks60vbwz7y1cb97vsdad9v"; + libraryHaskellDepends = [ base ]; + description = "Definition for Peripherals,Registers and Fields from STM32F103xx.svd"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "STMonadTrans" = callPackage ({ mkDerivation, array, base, Cabal, mtl }: mkDerivation { @@ -15886,6 +15929,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "SVD2HS" = callPackage + ({ mkDerivation, base, containers, pretty, text, xml-conduit + , xml-lens + }: + mkDerivation { + pname = "SVD2HS"; + version = "0.1"; + sha256 = "16crp18wyp7gb99x0vmjcqdwvsvns2kppaic3aspnidlc14hwg35"; + libraryHaskellDepends = [ + base containers pretty text xml-conduit xml-lens + ]; + description = "translate a SVD of a Microcontroller to Haskell tables"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "SVG2Q" = callPackage ({ mkDerivation, base, haskell98, language-c, pretty, svgutils, syb , xml @@ -17478,8 +17536,8 @@ self: { }: mkDerivation { pname = "TeX-my-math"; - version = "0.201.0.0"; - sha256 = "0lrv0wybagc1zka9nq78qrdaygl4wbhkllw3w79cnmk1bagslxs4"; + version = "0.201.1.1"; + sha256 = "064ram3i1a59ypd8i3wnp7x9vbkc8zawby52676y4pfkqvddnhnm"; libraryHaskellDepends = [ base decimal-literals dumb-cas hashable haskell-src-meta HaTeX template-haskell text unordered-containers vector-space void @@ -18330,8 +18388,8 @@ self: { }: mkDerivation { pname = "Villefort"; - version = "0.1.1.14"; - sha256 = "020ialav8dxbzkyra8sjip397l50j7d3gy3m44jf4wgiyk3d9jpj"; + version = "0.1.2.1"; + sha256 = "1iabmpf31vb493xp8ypmai15ld4jbf0zchjnmf6hwfs58w92v27d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -18674,14 +18732,14 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; - "Win32_2_6_0_0" = callPackage + "Win32_2_6_1_0" = callPackage ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32 , msimg32, shell32, shfolder, shlwapi, unbuildable, user32, winmm }: mkDerivation { pname = "Win32"; - version = "2.6.0.0"; - sha256 = "1swrahwg89c6001cprzfx9fi64kndzmfvwbr34k2f00izv39fn6l"; + version = "2.6.1.0"; + sha256 = "1qwwznnnqnr6zqvjzwr35bkvzrvjf7v90j4qkhinzs8p0yx4b97b"; libraryHaskellDepends = [ base bytestring filepath unbuildable ]; librarySystemDepends = [ advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm @@ -19856,6 +19914,8 @@ self: { pname = "accelerate-blas"; version = "0.1.0.1"; sha256 = "0rjcga34ipml402gikwvdxnpdjrmh9vnhd8wvcv109gs1ih6pafd"; + revision = "2"; + editedCabalFile = "1bxh38hyn7lq73z1dqg8rsbdblvy3551lp08jlm2h8p9b8bsriia"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda @@ -21980,6 +22040,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-tiled" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec, text + , vector + }: + mkDerivation { + pname = "aeson-tiled"; + version = "0.0.0.1"; + sha256 = "147rm19czz8bvzmjj4mmcvjyz02mr3cisyprzdfpx1q5msi7aghk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers text vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ aeson base hspec ]; + homepage = "https://github.com/schell/aeson-tiled#readme"; + description = "Aeson instances for the Tiled map editor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-toolkit" = callPackage ({ mkDerivation, aeson, base, bytestring, failure, hspec, text }: mkDerivation { @@ -22426,8 +22507,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "5.3"; - sha256 = "0apx1i3v5p416wa9d0s8qacras3p137f9djbyv5miz5n7yhmlfi3"; + version = "5.4"; + sha256 = "1ymzhbmff1wnpksnad0dc47xa0iha5pf6w3ng6gykni2wx8smsgv"; libraryHaskellDepends = [ array base binary containers deepseq mtl mwc-random random vector ]; @@ -22459,8 +22540,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "0.7.4.2"; - sha256 = "12igx82kzbsg9zick5r9nai2zdds33pkfgp0zm9kdr4a04qz58z1"; + version = "0.8"; + sha256 = "1ggr95d6na41sllnz6a8lnscb63v04b8x466hw6658r8vxai0560"; libraryHaskellDepends = [ aivika aivika-transformers base binary containers distributed-process exceptions mtl mwc-random random stm time @@ -22558,15 +22639,16 @@ self: { }) {}; "aivika-lattice" = callPackage - ({ mkDerivation, aivika, aivika-transformers, base, containers, mtl - , mwc-random, random + ({ mkDerivation, aivika, aivika-transformers, array, base + , containers, mtl, mwc-random, random }: mkDerivation { pname = "aivika-lattice"; - version = "0.3"; - sha256 = "1770w2jbfyvcrdsvlh00l7861ckxk37yk4qc27fmigd060gbz552"; + version = "0.5"; + sha256 = "05s7mv2k8211qmrqh8m1xfzpnm7g6x0b9asqlizgqrxq0n5vdyhj"; libraryHaskellDepends = [ - aivika aivika-transformers base containers mtl mwc-random random + aivika aivika-transformers array base containers mtl mwc-random + random ]; homepage = "http://www.aivikasoft.com"; description = "Nested discrete event simulation module for the Aivika library using lattice"; @@ -22596,8 +22678,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "5.3"; - sha256 = "08c8hkc1sbq08dsj25sb6ik9nq0insv0k8j42klbpgzmmc4pjvxd"; + version = "5.4"; + sha256 = "0if4i3jsc0bf8l0grdrijyzs5h5c85nq328gkwpmzpmawzssbqr5"; libraryHaskellDepends = [ aivika array base containers mtl mwc-random random vector ]; @@ -22788,6 +22870,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "alg" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "alg"; + version = "0.2.0.0"; + sha256 = "1lh5pz3zmzyq9dkgzabgi8xhlssxccxw24ng97lynmsvc7jjras8"; + libraryHaskellDepends = [ base ]; + description = "Algebraic structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "alga" = callPackage ({ mkDerivation, aeson, base, containers, data-default, exceptions , file-embed, filepath, formatting, haskeline, hspec, hxt @@ -25249,7 +25342,6 @@ self: { ]; description = "Generic Haskell AMQP Consumer"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amqp-worker" = callPackage @@ -26130,25 +26222,25 @@ self: { "apiary" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-html - , blaze-markup, bytestring, bytestring-read, case-insensitive - , data-default-class, directory, exceptions, hashable, http-date - , http-types, HUnit, mime-types, monad-control, mtl, process - , resourcet, stringsearch, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, time, transformers, transformers-base - , types-compat, unix-compat, unordered-containers, vault, wai - , wai-extra, web-routing + , blaze-markup, bytestring, bytestring-lexing, case-insensitive + , data-default-class, directory, exceptions, ghc-prim, hashable + , hetero-dict, http-date, http-types, HUnit, mime-types + , monad-control, mtl, primitive, process, resourcet, stringsearch + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , time, transformers, transformers-base, unix-compat + , unordered-containers, vault, wai, wai-extra }: mkDerivation { pname = "apiary"; - version = "2.0.2"; - sha256 = "155mkd7fdy32vhpl3njwa4v5r720w1y436i3laz9nysxnjaqk85r"; + version = "2.1.2"; + sha256 = "03b3rhjpjfinj1xnkngipz09d1j1dijy25s0z0a5mvygahlf9kvc"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html blaze-markup bytestring - bytestring-read case-insensitive data-default-class exceptions - hashable http-date http-types mime-types monad-control mtl process - resourcet stringsearch template-haskell text time transformers - transformers-base types-compat unix-compat unordered-containers - vault wai wai-extra web-routing + bytestring-lexing case-insensitive data-default-class exceptions + ghc-prim hashable hetero-dict http-date http-types mime-types + monad-control mtl primitive process resourcet stringsearch + template-haskell text time transformers transformers-base + unix-compat unordered-containers vault wai wai-extra ]; testHaskellDepends = [ aeson base bytestring directory http-types HUnit mtl tasty @@ -26164,18 +26256,16 @@ self: { ({ mkDerivation, apiary, apiary-session, authenticate, base , blaze-builder, bytestring, cereal, data-default-class , http-client, http-client-tls, http-types, monad-control - , resourcet, text, types-compat, wai, web-routing + , resourcet, text, wai }: mkDerivation { pname = "apiary-authenticate"; - version = "1.4.0"; - sha256 = "01yivdslscbri4gy19mma794v9v2gnf94wlvms8p1flrcw6xpns0"; - revision = "5"; - editedCabalFile = "0jndacr6vcnh14d7bd10v9jl2qcpzfwr223j7x1f6zza70r2p5rl"; + version = "1.5.1"; + sha256 = "0j28iv0am45a104cpc6jd1gv1j7nqwbjji892d0q9g90wlf2r5p8"; libraryHaskellDepends = [ apiary apiary-session authenticate base blaze-builder bytestring cereal data-default-class http-client http-client-tls http-types - monad-control resourcet text types-compat wai web-routing + monad-control resourcet text wai ]; homepage = "https://github.com/philopon/apiary"; description = "authenticate support for apiary web framework"; @@ -26190,10 +26280,8 @@ self: { }: mkDerivation { pname = "apiary-clientsession"; - version = "1.4.0"; - sha256 = "1z96c4zfyyvrihr1al9zp6pwv4wxkfq02a1z63bxxrrfglrs3fx6"; - revision = "3"; - editedCabalFile = "06kcmwm1mrvqmbl510ni2j1rdsrzhs81xsjia5wlyhn4jr4192ag"; + version = "1.5.1"; + sha256 = "1cxxc3nn05k2v0mr2lnhhjwigykx5jws23mik3znq259r18wjjk7"; libraryHaskellDepends = [ apiary apiary-cookie apiary-session base bytestring cereal clientsession data-default-class time unix-compat vault @@ -26206,17 +26294,14 @@ self: { "apiary-cookie" = callPackage ({ mkDerivation, apiary, base, blaze-builder, blaze-html - , bytestring, cookie, time, types-compat, wai, web-routing + , bytestring, cookie, time, wai }: mkDerivation { pname = "apiary-cookie"; - version = "1.4.0"; - sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx"; - revision = "4"; - editedCabalFile = "0qc5nzjak8zb5i3kavz7hi1qy6ywalsrgj2wrxdb53jwac76gigc"; + version = "1.5.1"; + sha256 = "1lci1vim94nk3ah72wa9iy1vza3gnf3c05jp10bnv0khy131mghy"; libraryHaskellDepends = [ - apiary base blaze-builder blaze-html bytestring cookie time - types-compat wai web-routing + apiary base blaze-builder blaze-html bytestring cookie time wai ]; homepage = "https://github.com/philopon/apiary"; description = "Cookie support for apiary web framework"; @@ -26228,10 +26313,8 @@ self: { ({ mkDerivation, apiary, base, blaze-builder, wai-extra }: mkDerivation { pname = "apiary-eventsource"; - version = "1.4.0"; - sha256 = "0xh1pm1l59n4c48vbk3ls42fxh4lzr6p8k8rmij1hl58zrkgbjd7"; - revision = "2"; - editedCabalFile = "15fc0hdrcic1nk62znn3dcq6dp00d0msl38kb7pdapvkpnyh1z0g"; + version = "1.5.1"; + sha256 = "0dkvj03ay44m49pmm96y9nvyqlrw91kyw0pzm6wraspagbvs57nm"; libraryHaskellDepends = [ apiary base blaze-builder wai-extra ]; homepage = "https://github.com/philopon/apiary"; description = "eventsource support for apiary web framework"; @@ -26262,15 +26345,15 @@ self: { "apiary-http-client" = callPackage ({ mkDerivation, apiary, base, bytestring, bytestring-builder - , http-client, http-types, text, transformers, types-compat, wai + , http-client, http-types, text, transformers, wai }: mkDerivation { pname = "apiary-http-client"; - version = "0.1.3.0"; - sha256 = "1p1scvv9m93g11xy7fix10nyw1ps4261v9h98k77z2hmhcvwnrpd"; + version = "0.1.4.0"; + sha256 = "0y5sl8xy2ginmb97495xb3dzzczjvrznfrdklvrbsrll9a4b5iia"; libraryHaskellDepends = [ apiary base bytestring bytestring-builder http-client http-types - text transformers types-compat wai + text transformers wai ]; homepage = "https://github.com/winterland1989/apiary-http-client"; description = "A http client for Apiary"; @@ -26281,18 +26364,15 @@ self: { "apiary-logger" = callPackage ({ mkDerivation, apiary, base, data-default-class, fast-logger , lifted-base, monad-control, monad-logger, transformers - , transformers-base, types-compat + , transformers-base }: mkDerivation { pname = "apiary-logger"; - version = "1.4.0"; - sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48"; - revision = "4"; - editedCabalFile = "1qs3fxaiybyb4g9d4w393yxwsxr4b6wzg5va7qmlqpcavr9l1224"; + version = "1.5.1"; + sha256 = "19a8qiv0dygxmznjpr46s3wihryi83qj6d12nzr7d0n7j36ja2d8"; libraryHaskellDepends = [ apiary base data-default-class fast-logger lifted-base monad-control monad-logger transformers transformers-base - types-compat ]; homepage = "https://github.com/philopon/apiary"; description = "fast-logger support for apiary web framework"; @@ -26323,17 +26403,15 @@ self: { "apiary-mongoDB" = callPackage ({ mkDerivation, apiary, base, bson, data-default-class , lifted-base, monad-control, mongoDB, resource-pool, text, time - , transformers, types-compat + , transformers }: mkDerivation { pname = "apiary-mongoDB"; - version = "1.4.0"; - sha256 = "1srnkyw1i0vjarwqg13cmnwc0x0ab5m8scax9wd4scsmblpa75wd"; - revision = "2"; - editedCabalFile = "1pk0axkr5zrlbyqskznh050ahvpnccdpa0ixfn3i5sw26nnva4ny"; + version = "1.5.1"; + sha256 = "1liiyk2w2v18455ydbxz7k5d58f29sgmlagxikkgsplbdm3m5mz0"; libraryHaskellDepends = [ apiary base bson data-default-class lifted-base monad-control - mongoDB resource-pool text time transformers types-compat + mongoDB resource-pool text time transformers ]; homepage = "https://github.com/philopon/apiary"; description = "mongoDB support for apiary web framework"; @@ -26344,18 +26422,15 @@ self: { "apiary-persistent" = callPackage ({ mkDerivation, apiary, apiary-logger, base, monad-control , monad-logger, persistent, resource-pool, resourcet, transformers - , transformers-base, types-compat, web-routing + , transformers-base }: mkDerivation { pname = "apiary-persistent"; - version = "1.4.0"; - sha256 = "00jaiykbxj1lh8qgv4y0ma9awaj1ymrjskwr9ra5pmka1mrwbih9"; - revision = "3"; - editedCabalFile = "17i3l8aj2k1hzlmyf2h4jl5savbrdvnvz2i8riwcmwfqgnmcfdc2"; + version = "1.5.1"; + sha256 = "03vd0vjz72dd8ngi5n9dziplpxdysql5gxgiqfn825fzc75c9pn4"; libraryHaskellDepends = [ apiary apiary-logger base monad-control monad-logger persistent - resource-pool resourcet transformers transformers-base types-compat - web-routing + resource-pool resourcet transformers transformers-base ]; homepage = "https://github.com/philopon/apiary"; description = "persistent support for apiary web framework"; @@ -26385,16 +26460,12 @@ self: { }) {}; "apiary-session" = callPackage - ({ mkDerivation, apiary, base, types-compat, wai, web-routing }: + ({ mkDerivation, apiary, base, wai }: mkDerivation { pname = "apiary-session"; - version = "1.4.0"; - sha256 = "0jnppjykcrzdvlsli2ycyc11874dfqhwayny5p3x8nx9hnwxhk23"; - revision = "3"; - editedCabalFile = "04yrlp26dbhhybqvviajmd85vrcdbscmbw4nmag32wfnz5xdb0qr"; - libraryHaskellDepends = [ - apiary base types-compat wai web-routing - ]; + version = "1.5.0"; + sha256 = "01z4r0sfm562wssfpqs3yzgwrprh8jzp0xsck4z099pwjknfi4i4"; + libraryHaskellDepends = [ apiary base wai ]; homepage = "https://github.com/philopon/apiary"; description = "session support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -26402,18 +26473,12 @@ self: { }) {}; "apiary-websockets" = callPackage - ({ mkDerivation, apiary, base, wai-websockets, web-routing - , websockets - }: + ({ mkDerivation, apiary, base, wai-websockets, websockets }: mkDerivation { pname = "apiary-websockets"; - version = "1.4.0"; - sha256 = "0nslzy0s24jn58jd1q4z2gf0h7n1y2xks7cw86i9ybdph697wpp1"; - revision = "2"; - editedCabalFile = "1s8mpk1h6a6yxmwivclawwn20s2zs094cvbphl8ymil8mm505n3j"; - libraryHaskellDepends = [ - apiary base wai-websockets web-routing websockets - ]; + version = "1.5.0"; + sha256 = "0z43lqjz51r3mw92drjkrl3m8na7ldick76vqas0dr17v1d4qdsw"; + libraryHaskellDepends = [ apiary base wai-websockets websockets ]; homepage = "https://github.com/philopon/apiary"; description = "websockets support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -28914,8 +28979,8 @@ self: { ({ mkDerivation, attoparsec, base, ip }: mkDerivation { pname = "attoparsec-ip"; - version = "0.0.0"; - sha256 = "08hgjmi9nlgg9qavsh5sl0s52yzh7vk6c933dgx9k16vk456r2y4"; + version = "0.0.1"; + sha256 = "0aananvfa7h9d73yf1c69zw5b3s3m67qhfmfrzdbifw3wj5cm9cd"; libraryHaskellDepends = [ attoparsec base ip ]; testHaskellDepends = [ base ]; homepage = "https://github.com/athanclark/attoparsec-ip#readme"; @@ -29074,8 +29139,8 @@ self: { }: mkDerivation { pname = "attoparsec-uri"; - version = "0.0.2"; - sha256 = "096w3zb9a0fcqcnzl7lb9n27hgbaj6f5n93vll7rih972657h0my"; + version = "0.0.3"; + sha256 = "1n89gkgnd8zp7ggklv98y58hk3f45l20wr3m1avcpk9a42ig186n"; libraryHaskellDepends = [ attoparsec attoparsec-ip base bytedump ip strict text vector ]; @@ -34841,6 +34906,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bizzlelude-js" = callPackage + ({ mkDerivation, base, containers, text }: + mkDerivation { + pname = "bizzlelude-js"; + version = "1.0.4"; + sha256 = "1wp1542cjcypz339f9b5qxcgf1ppilbxgi8861s5d9p89zrgimij"; + libraryHaskellDepends = [ base containers text ]; + homepage = "http://github.com/TheBizzle"; + description = "A lousy Prelude replacement by a lousy dude"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bk-tree" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -35993,8 +36070,8 @@ self: { }: mkDerivation { pname = "bond"; - version = "0.10.0.0"; - sha256 = "1f7vfh9pcg6za8rcdpq1lbvyn2z7plcb70d5r1xj330akvl626jw"; + version = "0.10.1.0"; + sha256 = "024qd9dmgqsa3q5xykc0bbvgay9hp9qwl9xixkgjpa5li68rd54c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36184,8 +36261,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit }: mkDerivation { pname = "boolean-list"; - version = "0.1.0.1"; - sha256 = "0xz0p3simx0vzvpjcmlqw7hnx0v3fiz25q8d9n7iw6z72c1920mc"; + version = "0.1.0.2"; + sha256 = "1vqn1igmsgq6nry9bpz5vhggbm3j8kc3p6d6wy16nf94z10nq3qs"; libraryHaskellDepends = [ base bytestring HUnit ]; homepage = "http://xy30.com"; description = "convert numbers to binary coded lists"; @@ -36312,6 +36389,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "boop" = callPackage + ({ mkDerivation, base, mtl, text }: + mkDerivation { + pname = "boop"; + version = "0.1.0.0"; + sha256 = "1gn4b8y6dlhhf1vi92km32lyryl25xvbc8akbq1xxgn16iq49y8c"; + libraryHaskellDepends = [ base mtl text ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/tdammers/boop"; + description = "OOP primitives for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bootstrap-types" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -37140,6 +37230,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "buffer" = callPackage + ({ mkDerivation, base, base-prelude, bug, bytestring, criterion + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "buffer"; + version = "0.5.3"; + sha256 = "0bf9y6rb3q26rk6qd7a2mjlb1gd1gp2k080ywhp5g48l474h6p26"; + libraryHaskellDepends = [ base base-prelude bug bytestring ]; + testHaskellDepends = [ + bug quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/buffer"; + description = "Simple mutable low-level buffer for IO"; + license = stdenv.lib.licenses.mit; + }) {}; + "buffer-builder" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances @@ -37494,8 +37604,8 @@ self: { }: mkDerivation { pname = "bustle"; - version = "0.6.1"; - sha256 = "18qg8fwmdq0lrfz7gyyzv6f4ch24sm925ykxb68rr996wxnmlbm2"; + version = "0.6.2"; + sha256 = "099awz60hp9bpc8d27zkb3vm8r5bqp2y358drj6bzas5gqlg67bf"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -38132,8 +38242,8 @@ self: { }: mkDerivation { pname = "bzlib-conduit"; - version = "0.2.1.4"; - sha256 = "07gxnbr65pl70lssgcxbajc0id9x4p3p8mc0hfi9lgf8rh270w1d"; + version = "0.2.1.5"; + sha256 = "1bv78qr6fbf6lg1dx06g3r2904fjnpvb87mlqv6np2kpyzjc11an"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bindings-DSL bytestring conduit conduit-extra data-default mtl @@ -38562,6 +38672,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-doctest_1_0_3" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "cabal-doctest"; + version = "1.0.3"; + sha256 = "1qyqxmw5z1418jda3q5j04pknqirfrfrqigibbxi4n31ajwlfisc"; + libraryHaskellDepends = [ base Cabal directory filepath ]; + homepage = "https://github.com/phadej/cabal-doctest"; + description = "A Setup.hs helper for doctests running"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-file-th" = callPackage ({ mkDerivation, base, Cabal, directory, pretty, template-haskell }: @@ -39107,6 +39230,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cabal-toolkit" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, containers + , template-haskell + }: + mkDerivation { + pname = "cabal-toolkit"; + version = "0.0.1"; + sha256 = "0rlr2zcm4pmiknw7z4jgn1n1wd9wr056g5hbv7jcr3l709b1753j"; + libraryHaskellDepends = [ + base binary bytestring Cabal containers template-haskell + ]; + homepage = "https://github.com/TerrorJack/cabal-toolkit#readme"; + description = "Helper functions for writing custom Setup.hs scripts."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-uninstall" = callPackage ({ mkDerivation, base, directory, filepath, mtl, process }: mkDerivation { @@ -42191,8 +42331,8 @@ self: { }: mkDerivation { pname = "chatwork"; - version = "0.1.1.2"; - sha256 = "050a0vhv59svdgja4lc8jxcyxqbrd9zr14hwbrnk7hzk9dxvd0wz"; + version = "0.1.1.3"; + sha256 = "0g7995g5i49mxd0qhdb2l1l1yz047yqwnmzk9f6xvqv5fqy5c6p5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42378,6 +42518,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "checkers_0_4_9_5" = callPackage + ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: + mkDerivation { + pname = "checkers"; + version = "0.4.9.5"; + sha256 = "1xaffx0vmq4swciyq3qzjfklfj19nnhd5yama9di5sas4f8v517i"; + libraryHaskellDepends = [ + array base QuickCheck random semigroupoids + ]; + homepage = "https://github.com/conal/checkers"; + description = "Check properties on standard classes and data structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "checkmate" = callPackage ({ mkDerivation, base, bytestring, containers, diff-parse , directory, file-embed, filepath, github, hlint, hspec @@ -42387,8 +42542,8 @@ self: { }: mkDerivation { pname = "checkmate"; - version = "0.3.0"; - sha256 = "0yqinjpc65flh50kb2jax10lrmcbp8lcy36ivrya180wdfvlcm0n"; + version = "0.3.2"; + sha256 = "1s79cpi5hzfb59705i6gdvicczvddsbikcwwqx22v3yfyakbbxww"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42406,7 +42561,7 @@ self: { ]; homepage = "https://github.com/spoqa/checkmate#readme"; description = "Generate checklists relevant to a given patch"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -42676,13 +42831,14 @@ self: { }) {}; "chronologique" = callPackage - ({ mkDerivation, base, hourglass, hspec, QuickCheck, time }: + ({ mkDerivation, base, hourglass, hspec, QuickCheck, time, vector + }: mkDerivation { pname = "chronologique"; - version = "0.2.1.0"; - sha256 = "13lrngxfbsfsmqph8slh8zn7hvvihbwzc6cna315kjzhi3a3mwbm"; - libraryHaskellDepends = [ base hourglass time ]; - testHaskellDepends = [ base hourglass hspec QuickCheck ]; + version = "0.3.0.0"; + sha256 = "1pgggmsmb3ah15iqkib9d9ms0vs4j3945a7mbih0zra4xha39dg9"; + libraryHaskellDepends = [ base hourglass time vector ]; + testHaskellDepends = [ base hourglass hspec QuickCheck vector ]; description = "Time to manipulate time"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -42690,16 +42846,16 @@ self: { "chronos" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable , HUnit, primitive, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, vector + , test-framework-hunit, test-framework-quickcheck2, text, torsor + , vector }: mkDerivation { pname = "chronos"; - version = "0.4"; - sha256 = "0lc7qb1ky15sxmvndfjcmmy6j913ncnzq0hjx9mbqljvg7di0yal"; - revision = "1"; - editedCabalFile = "1mk6kn0gs7azv7c9bcal8k6zzlpska0x9akk91la2xvg298sy6a5"; + version = "1.0"; + sha256 = "135fb54lac1rqb7ql0810f22a41whmswckhjbmb1xysryv0gv05k"; libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable primitive text vector + aeson attoparsec base bytestring hashable primitive text torsor + vector ]; testHaskellDepends = [ attoparsec base bytestring HUnit QuickCheck test-framework @@ -43390,6 +43546,7 @@ self: { homepage = "https://github.com/lambdageek/clang-compilation-database"; description = "JSON Compilation Database Format encoding and decoding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clang-pure" = callPackage @@ -45306,8 +45463,8 @@ self: { ({ mkDerivation, array, base, bytestring, text }: mkDerivation { pname = "cndict"; - version = "0.8.2"; - sha256 = "0pc6rph99mxy5cbrxrysxq5q01vn2k2ax3c00pv9sw7inn4inh0p"; + version = "0.8.3"; + sha256 = "1vci3z74jsxfhbbz122mcbcdh6n2371i0l803vgd8ndzawhs13m4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring text ]; homepage = "https://github.com/Lemmih/cndict"; @@ -46019,8 +46176,8 @@ self: { }: mkDerivation { pname = "colour-space"; - version = "0.1.3.0"; - sha256 = "06ainna4nrqd9an0s0hvcrqw18g55v0fqw4a6p00g5kw53729qyq"; + version = "0.1.4.0"; + sha256 = "0sr341chqhngm7ihyy3ym3w345sk101gznw80iksjwxjg3iiqxmq"; libraryHaskellDepends = [ base colour constrained-categories JuicyPixels linear linearmap-category manifolds semigroups vector-space @@ -46057,8 +46214,8 @@ self: { }: mkDerivation { pname = "columbia"; - version = "0.1.1"; - sha256 = "10yd0rp9zzdsx2hcb7gn0yxz8b9zj0pfy4g8d09qgs3c8lg8fdan"; + version = "0.1.2"; + sha256 = "1mayj9bzjrf37chd37mnwr6xbc126n4cbsdjzb2fy87q3vy4g7bh"; libraryHaskellDepends = [ array base bytestring containers contravariant data-endian directory filelock invariant mmap mmorph monad-loops mtl parallel @@ -47471,6 +47628,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "concurrent-buffer" = callPackage + ({ mkDerivation, base, base-prelude, bug, bytestring, criterion + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "concurrent-buffer"; + version = "0.1"; + sha256 = "0qrnsp98x42blvngixm9wzk9cnwk335s5axslwrl6hq8pawx2ycd"; + libraryHaskellDepends = [ base base-prelude bug bytestring ]; + testHaskellDepends = [ + bug quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/concurrent-buffer"; + description = "Concurrent expanding buffer"; + license = stdenv.lib.licenses.mit; + }) {}; + "concurrent-dns-cache" = callPackage ({ mkDerivation, array, async, base, bytestring, containers, dns , hspec, iproute, lifted-base, monad-control, network, psqueues @@ -47798,24 +47975,24 @@ self: { "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, containers, deepseq - , directory, filepath, HUnit, mtl, resourcet, stm, stm-chans - , stm-conduit, test-framework, test-framework-hunit - , test-framework-th, transformers, unix + , directory, HUnit, mtl, resourcet, stm, stm-conduit + , test-framework, test-framework-hunit, test-framework-th + , transformers }: mkDerivation { pname = "conduit-algorithms"; - version = "0.0.6.0"; - sha256 = "0b3wpmx35bl85mzy9v0hiz48flzv2vjdimkgdv58si24l3drg6g6"; + version = "0.0.6.1"; + sha256 = "0zs7klxlkirch0j7gasxqalfw9nc4pfslgrg93jwn5vhpxdxhgwk"; libraryHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq directory filepath mtl resourcet - stm stm-chans stm-conduit transformers unix + conduit-extra containers deepseq mtl resourcet stm stm-conduit + transformers ]; testHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq directory filepath HUnit mtl - resourcet stm stm-chans stm-conduit test-framework - test-framework-hunit test-framework-th transformers unix + conduit-extra containers deepseq directory HUnit mtl resourcet stm + stm-conduit test-framework test-framework-hunit test-framework-th + transformers ]; description = "Conduit-based algorithms"; license = stdenv.lib.licenses.mit; @@ -48107,16 +48284,16 @@ self: { }) {}; "conduit-resumablesink" = callPackage - ({ mkDerivation, base, bytestring, conduit, hspec, transformers - , void + ({ mkDerivation, base, bytestring, conduit, hspec, resourcet + , transformers, void }: mkDerivation { pname = "conduit-resumablesink"; - version = "0.1.1"; - sha256 = "1bqdpnhqjh4dhvppsa8nlgja0jpdw48kxywz2999sp5hi53qxdfg"; + version = "0.2"; + sha256 = "0pk4qvsxmmvrx9kfypbsjiq6kgcma73w97873rk3nrc9vdcm888v"; libraryHaskellDepends = [ base conduit void ]; testHaskellDepends = [ - base bytestring conduit hspec transformers void + base bytestring conduit hspec resourcet transformers void ]; homepage = "http://github.com/A1kmm/conduit-resumablesink"; description = "Allows conduit to resume sinks to feed multiple sources into it"; @@ -48126,21 +48303,21 @@ self: { "conduit-throttle" = callPackage ({ mkDerivation, async, base, conduit, conduit-combinators - , conduit-extra, HUnit, resourcet, stm, stm-chans, stm-conduit - , test-framework, test-framework-hunit, throttle-io-stream - , unliftio, unliftio-core + , conduit-extra, HUnit, monad-control, resourcet, stm, stm-chans + , stm-conduit, test-framework, test-framework-hunit + , throttle-io-stream, unliftio, unliftio-core }: mkDerivation { pname = "conduit-throttle"; - version = "0.2.0.1"; - sha256 = "0402bnj5z4m2lqgagbw8rc7c8vmm3sldp1vcrywd5zvcp5031xsa"; + version = "0.3.0.0"; + sha256 = "1kwrryplhck8q6hn6lx6j741d9hllzf84ykmqwiq0h34fjdd0a4r"; libraryHaskellDepends = [ - async base conduit conduit-combinators conduit-extra resourcet stm - stm-chans throttle-io-stream unliftio unliftio-core + async base conduit conduit-combinators conduit-extra monad-control + resourcet stm stm-chans throttle-io-stream unliftio unliftio-core ]; testHaskellDepends = [ async base conduit conduit-combinators conduit-extra HUnit - resourcet stm stm-chans stm-conduit test-framework + monad-control resourcet stm stm-chans stm-conduit test-framework test-framework-hunit throttle-io-stream unliftio unliftio-core ]; homepage = "https://github.com/mtesseract/conduit-throttle#readme"; @@ -48565,6 +48742,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "conkin" = callPackage + ({ mkDerivation, base, data-default, doctest, markdown-unlit + , pretty-show + }: + mkDerivation { + pname = "conkin"; + version = "1.0.2"; + sha256 = "1843mlmf09jgdj6hd7jzn81pwd4biimrc4rxaki9s2df2qd2zr6r"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base data-default doctest markdown-unlit pretty-show + ]; + homepage = "http://github.com/rampion/conkin"; + description = "Tools for functors from Hask^k to Hask"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conlogger" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -48993,6 +49188,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "content-store" = callPackage + ({ mkDerivation, aeson, base, bytestring, cond, conduit + , conduit-combinators, conduit-extra, cryptonite, directory + , filepath, hspec, htoml, memory, monad-control, mtl, resourcet + , temporary, text, transformers, transformers-base, unix + }: + mkDerivation { + pname = "content-store"; + version = "0.1.0"; + sha256 = "1qimbnqfvnl7zhcpklnzp2n7s7swq5knif6li29fyvfb6ls1471c"; + libraryHaskellDepends = [ + aeson base bytestring cond conduit conduit-combinators + conduit-extra cryptonite directory filepath htoml memory + monad-control mtl resourcet temporary text transformers + transformers-base unix + ]; + testHaskellDepends = [ base bytestring hspec memory ]; + homepage = "https://github.com/weldr/content-store"; + description = "Store and retrieve data from an on-disk store"; + license = "LGPL"; + }) {}; + "context-free-grammar" = callPackage ({ mkDerivation, array, base, containers, control-monad-omega , dlist, HUnit, mtl, pretty, QuickCheck, quickcheck-properties @@ -50806,8 +51023,8 @@ self: { }: mkDerivation { pname = "creatur"; - version = "5.9.20"; - sha256 = "08cvagp0v98s8x99cdq86yk1i33fcpgxq3zdm414lf6cpjq80qa1"; + version = "5.9.23"; + sha256 = "04f66vjl1bpfgsf0j5dpz7wjvkvw22ia0f1d375mzhp5xmv4qw46"; libraryHaskellDepends = [ array base binary bytestring cereal cond directory exceptions filepath gray-extended hdaemonize hsyslog MonadRandom mtl @@ -51872,8 +52089,8 @@ self: { }: mkDerivation { pname = "cryptoids"; - version = "0.3.0.0"; - sha256 = "1n8mr80n1hmld02n1a97nsxh3x8fmnqmbpnnvjawkq1mj768nbc4"; + version = "0.4.0.0"; + sha256 = "1km63vgckjsxxrkd45w7c5gc3d5hk6dg6f0y4z4c8wajz4ddp1a3"; libraryHaskellDepends = [ base binary bytestring cryptoids-types cryptonite directory exceptions filepath memory @@ -52565,8 +52782,8 @@ self: { }: mkDerivation { pname = "cuda"; - version = "0.8.0.0"; - sha256 = "0zlasd6c3da462qaffj9z44546551b2cvs0wv0f23739x4i929z9"; + version = "0.8.0.1"; + sha256 = "0raaydjcnicg38kxy1mjpxb0k57q5nnzb7p38i8x5ify30bzxw0w"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -54183,14 +54400,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse_1_2_0_2" = callPackage + "data-diverse_1_2_0_3" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim , hspec, tagged }: mkDerivation { pname = "data-diverse"; - version = "1.2.0.2"; - sha256 = "0h0wifwckybn0py6xndaj1fp0sld28aca4qgclw07qsyfd9rnc9x"; + version = "1.2.0.3"; + sha256 = "0mc9xzh0hja8zvgwnfa65hdwirqzggbw1k07fspgzs699wj9dh6r"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -54215,13 +54432,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_0_5_0_0" = callPackage - ({ mkDerivation, base, data-diverse, hspec, lens, tagged }: + "data-diverse-lens_0_5_1_0" = callPackage + ({ mkDerivation, base, data-diverse, hspec, lens, profunctors + , tagged + }: mkDerivation { pname = "data-diverse-lens"; - version = "0.5.0.0"; - sha256 = "1can16ndkff8c3dfn585hdbg8zw805icax01hfm0ys3rvypwn4vq"; - libraryHaskellDepends = [ base data-diverse lens tagged ]; + version = "0.5.1.0"; + sha256 = "0c1hrz9b8a01vphfqmlfgx3mh6ci8hd5wwr8iwpkv6z7ps7sp9kd"; + libraryHaskellDepends = [ + base data-diverse lens profunctors tagged + ]; testHaskellDepends = [ base data-diverse hspec lens tagged ]; homepage = "https://github.com/louispan/data-diverse-lens#readme"; description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which"; @@ -56941,18 +57162,17 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "dejafu_0_9_0_0" = callPackage + "dejafu_0_9_0_2" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions - , leancheck, mtl, random, ref-fd, semigroups, transformers - , transformers-base + , leancheck, random, ref-fd, transformers, transformers-base }: mkDerivation { pname = "dejafu"; - version = "0.9.0.0"; - sha256 = "0n2qj6kaldg006pjz5aj0wjigr3dd7vgbl35fgsz3fx9j64ydi72"; + version = "0.9.0.2"; + sha256 = "1mxg88jlr6qga82s37xs9mwq2y26vgfkd9dg9j9mxwdzw39581gr"; libraryHaskellDepends = [ - base concurrency containers deepseq exceptions leancheck mtl random - ref-fd semigroups transformers transformers-base + base concurrency containers deepseq exceptions leancheck random + ref-fd transformers transformers-base ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Systematic testing for Haskell concurrency"; @@ -57448,16 +57668,20 @@ self: { }) {}; "derive-topdown" = callPackage - ({ mkDerivation, base, mtl, primitive, syb, template-haskell - , th-expand-syns, transformers + ({ mkDerivation, base, binary, derive, haskell-src, mtl, primitive + , QuickCheck, syb, template-haskell, th-expand-syns, transformers }: mkDerivation { pname = "derive-topdown"; - version = "0.0.0.7"; - sha256 = "1r566bcp0qqwwbndwbbfnczxwmlyl9dfnsysnija7v8fn46z30ni"; + version = "0.0.0.9"; + sha256 = "0jvmdwd1dif8hxb45s2fw96pca1hm41p5cac68in1pkpsvq7z6cf"; libraryHaskellDepends = [ base mtl primitive syb template-haskell th-expand-syns transformers ]; + testHaskellDepends = [ + base binary derive haskell-src mtl primitive QuickCheck syb + template-haskell th-expand-syns transformers + ]; homepage = "https://github.com/HaskellZhangSong/derive-topdown"; description = "Help Haskellers derive class instances for composited data types"; license = stdenv.lib.licenses.bsd3; @@ -57741,23 +57965,25 @@ self: { }) {}; "dhall" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, case-insensitive - , charset, containers, contravariant, exceptions, http-client - , http-client-tls, lens, optparse-generic, parsers, prettyprinter - , system-fileio, system-filepath, tasty, tasty-hunit, text - , text-format, transformers, trifecta, unordered-containers, vector + ({ mkDerivation, ansi-wl-pprint, base, base16-bytestring + , bytestring, case-insensitive, charset, containers, contravariant + , cryptohash, exceptions, http-client, http-client-tls, lens + , optparse-generic, parsers, prettyprinter, system-fileio + , system-filepath, tasty, tasty-hunit, text, text-format + , transformers, trifecta, unordered-containers, vector }: mkDerivation { pname = "dhall"; - version = "1.7.0"; - sha256 = "1177px9xlvby3wbhwgrvx23wxgmcqhl3qllbry6k42rbgf7rw900"; + version = "1.8.0"; + sha256 = "0bfnylfjqp8065i2akz5b8p55c45396hi8h6lx0jkl1i597567c4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base bytestring case-insensitive charset containers - contravariant exceptions http-client http-client-tls lens parsers - prettyprinter system-fileio system-filepath text text-format - transformers trifecta unordered-containers vector + ansi-wl-pprint base base16-bytestring bytestring case-insensitive + charset containers contravariant cryptohash exceptions http-client + http-client-tls lens parsers prettyprinter system-fileio + system-filepath text text-format transformers trifecta + unordered-containers vector ]; executableHaskellDepends = [ base optparse-generic prettyprinter system-filepath text trifecta @@ -57776,8 +58002,8 @@ self: { }: mkDerivation { pname = "dhall-bash"; - version = "1.0.5"; - sha256 = "1cicl18sz969ws64jybxsibcbk1686mfia9avw8asy1fmr2w6ryv"; + version = "1.0.6"; + sha256 = "1wjwjpprvd90dpmxij5zj1gr5x41bvzmr4qwyfhxd2am6bzg5n5d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57818,8 +58044,8 @@ self: { }: mkDerivation { pname = "dhall-json"; - version = "1.0.7"; - sha256 = "1wgzj9gfvxs2yvh0hnncfck2qbf4fhqpnibl6n10d0hllmvdbq1b"; + version = "1.0.8"; + sha256 = "0icwbsx7a6m62klyghllvwj474f2kxghh40d7f5v01l135qrg8a1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57836,16 +58062,18 @@ self: { "dhall-nix" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix - , neat-interpolation, optparse-generic, text, trifecta, vector + , neat-interpolation, optparse-generic, text, text-format, trifecta + , vector }: mkDerivation { pname = "dhall-nix"; - version = "1.0.8"; - sha256 = "1z6jgcfk1zi0alhpp6ycskb6yd40j2l7bl9bxfkb79443383r2mm"; + version = "1.0.9"; + sha256 = "06njwk2mmn8virrzd7q1bw91rwagcczkjn21kjhbajn6gzl77dry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-fix dhall hnix neat-interpolation text vector + base containers data-fix dhall hnix neat-interpolation text + text-format vector ]; executableHaskellDepends = [ base dhall hnix optparse-generic text trifecta @@ -57859,8 +58087,8 @@ self: { ({ mkDerivation, base, dhall, optparse-generic, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.3"; - sha256 = "1kic5mwndqmxqrg9f2a7panawns5j43pik42hl2dds5fvj3cmvr9"; + version = "1.0.4"; + sha256 = "1ba2sljiq016jhgx7ifh5vjrwxd1czv2gm56h2pig3p0x45ds2wm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base dhall optparse-generic text ]; @@ -59089,8 +59317,8 @@ self: { ({ mkDerivation, base, Cabal, ghc-prim, QuickCheck }: mkDerivation { pname = "dimensions"; - version = "0.3.1.0"; - sha256 = "1img3byk6jyfjqn1diss2067k88ii6hg5g92yaghkizh1d2vmyi0"; + version = "0.3.2.0"; + sha256 = "1ps9yy363xfpvq6dl5mjp02h0cj1vdib2vggvsykvgqwwrnra83p"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base Cabal QuickCheck ]; homepage = "https://github.com/achirkin/easytensor#readme"; @@ -59607,6 +59835,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "disjoint-containers" = callPackage + ({ mkDerivation, base, containers, doctest, QuickCheck + , transformers + }: + mkDerivation { + pname = "disjoint-containers"; + version = "0.2.1"; + sha256 = "1082mx4af7h70hvnj0fxgimhnqbgn3ywkh53lm1hyhcfalnmyrs7"; + libraryHaskellDepends = [ base containers transformers ]; + testHaskellDepends = [ base containers doctest QuickCheck ]; + homepage = "https://github.com/andrewthad/disjoint-containers#readme"; + description = "Disjoint containers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "disjoint-set" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, QuickCheck , transformers @@ -59671,8 +59914,8 @@ self: { }: mkDerivation { pname = "diskhash"; - version = "0.0.2.1"; - sha256 = "1kgjwcggi33jw1k1s462cya6hydcz7ka9pkqk2lgdcxwlw9fy9kb"; + version = "0.0.2.3"; + sha256 = "08g484knhw96mlk5qa6cx1cm9kblxrz8979c9xcvmidgj44phb8z"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring directory HUnit QuickCheck test-framework @@ -61379,15 +61622,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dotenv_0_5_1_0" = callPackage + "dotenv_0_5_1_1" = callPackage ({ mkDerivation, base, base-compat, exceptions, hspec , hspec-megaparsec, megaparsec, optparse-applicative, process, text , transformers }: mkDerivation { pname = "dotenv"; - version = "0.5.1.0"; - sha256 = "1cgx9q8gdfvkv3vr10yafa0vls2iil5kr5nqdbn4n9xf8m5p3dn1"; + version = "0.5.1.1"; + sha256 = "1i4892xc2d05qnswcyf40ww5idjd1m3wwqz9wxwhph1jqzvsgc9b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -62332,15 +62575,14 @@ self: { }: mkDerivation { pname = "dumb-cas"; - version = "0.1.0.0"; - sha256 = "0jrxphgxm6f7wzrn8vzfz0i6scz2xz72yja5i2bmkf185gqvhpjz"; - revision = "1"; - editedCabalFile = "0wzq73i209fa8apj34lc851cgg6047kimxkl9ykv8l9nspg22faq"; + version = "0.1.1.1"; + sha256 = "0pimlspgrfv04hwz91krbcq0g01fhrp9vgi2sj1kc7wz9hcd1pva"; libraryHaskellDepends = [ base containers decimal-literals hashable template-haskell unordered-containers ]; testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "https://github.com/leftaroundabout/dumb-cas"; description = "A computer “algebra” system that knows nothing about algebra, at the core"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -62388,9 +62630,10 @@ self: { ({ mkDerivation, base, transformers, transformers-base }: mkDerivation { pname = "dunai"; - version = "0.1.1.0"; - sha256 = "1smzf6m5l2ma500r9d51iia994lq8wvq2ryf3gijz3fyll6f5ibn"; + version = "0.3.0.0"; + sha256 = "0ncznc3khbanqsq4ab0n246sx30slq13awclafln5bjxvi1cx3yl"; libraryHaskellDepends = [ base transformers transformers-base ]; + homepage = "https://github.com/ivanperez-keera/dunai"; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -62744,8 +62987,8 @@ self: { }: mkDerivation { pname = "dynamic-plot"; - version = "0.2.2.0"; - sha256 = "1w4w58x75x04i4mgfwb2znprrbf8vbml691niymlx1vlzlcsf13z"; + version = "0.3.0.0"; + sha256 = "0a674aqs9jnkga3a9sp24qyr3fssbizh4p1zwfvzwafnjrbmrc5c"; libraryHaskellDepends = [ base colour colour-space constrained-categories containers data-default deepseq diagrams-cairo diagrams-core diagrams-gtk @@ -62951,12 +63194,16 @@ self: { }) {}; "eap" = callPackage - ({ mkDerivation, base, binary, bytestring }: + ({ mkDerivation, base, binary, bytestring, cryptonite, memory, mtl + , pretty-hex + }: mkDerivation { pname = "eap"; - version = "0.1.0.0"; - sha256 = "118nayxnc8xwyhx622wvgr3l35v90481j50m43x2zfkwish23dir"; - libraryHaskellDepends = [ base binary bytestring ]; + version = "0.9.0.1"; + sha256 = "0z7ab3i16424gpxwjhc4x7c55yhvzx5qjm80f2klpf94zz4w37ab"; + libraryHaskellDepends = [ + base binary bytestring cryptonite memory mtl pretty-hex + ]; homepage = "https://github.com/erickg/eap#readme"; description = "Extensible Authentication Protocol (EAP)"; license = stdenv.lib.licenses.bsd3; @@ -63092,8 +63339,8 @@ self: { }: mkDerivation { pname = "easytensor"; - version = "0.3.1.0"; - sha256 = "07shnpbnh3qq28yhcrhwhhb8m8b9x5ad36cj5f5hxqghfhih7k6b"; + version = "0.4.0.0"; + sha256 = "13wgg67gjg07r1n91kqikbhz8nnzfbgmi0v8a1596a6z7al4kvpr"; libraryHaskellDepends = [ base dimensions ghc-prim ]; testHaskellDepends = [ base Cabal dimensions QuickCheck ]; benchmarkHaskellDepends = [ base dimensions time ]; @@ -64602,6 +64849,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "elm-websocket" = callPackage + ({ mkDerivation, aeson, base, bytestring, concurrent-extra + , containers, directory, formatting, hspec, http-types, lens, mtl + , network, scotty, stm, text, time, wai, wai-middleware-static + , wai-websockets, warp, websockets, wl-pprint-text + }: + mkDerivation { + pname = "elm-websocket"; + version = "1.0"; + sha256 = "10v97m93dl34apvv3jn26jfcb7f206q3bqvwqk220j83s8kas07a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring concurrent-extra containers directory + formatting lens mtl stm text time wai wai-websockets websockets + wl-pprint-text + ]; + executableHaskellDepends = [ + aeson base concurrent-extra http-types scotty text wai + wai-middleware-static warp + ]; + testHaskellDepends = [ + aeson base concurrent-extra hspec http-types mtl network text wai + warp websockets + ]; + homepage = "http://github.com/rhyskeepence/elm-websocket"; + description = "Generate ELM code from a Wai websocket application"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "elm-yesod" = callPackage ({ mkDerivation, base, blaze-markup, Elm, shakespeare-js, text , yesod-core @@ -64832,8 +65109,8 @@ self: { }: mkDerivation { pname = "emailparse"; - version = "0.2.0.6"; - sha256 = "0n02h7d3n4xaivwpqiki2p0qca44y1md5zxp77l74ld7lf7y7rm9"; + version = "0.2.0.8"; + sha256 = "1x6hzmmsmdyqbcsx3sfgzi59y21ps7knz5hdinsyg1s30i22zgkz"; libraryHaskellDepends = [ attoparsec base bytestring either either-unwrap mime MissingH strptime text text-icu time word8 @@ -67868,8 +68145,8 @@ self: { }: mkDerivation { pname = "expressions"; - version = "0.1.3"; - sha256 = "0b3f9h0s7ayijkpqk929pgw6lxszbq94c9y69wsfcs7h7awd792h"; + version = "0.1.4"; + sha256 = "1dxkg5yc2njq7dpv7vgkmrs73x5np5w1ahi79my6ysamnc2w8a04"; libraryHaskellDepends = [ attoparsec base containers lattices singletons text transformers ]; @@ -67887,8 +68164,8 @@ self: { }: mkDerivation { pname = "expressions-z3"; - version = "0.1.0"; - sha256 = "1ma1g8b25466cpk8fyaf6fajp330wvnd44h2ddjvm9hkgaa8s82x"; + version = "0.1.1"; + sha256 = "0hk8qhkvlh4v210k7d845krg31px72ma44fmwahbycn6pgy32659"; libraryHaskellDepends = [ base containers expressions singletons transformers z3 ]; @@ -67976,17 +68253,18 @@ self: { "extensible" = callPackage ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim - , lens, monad-skeleton, mtl, primitive, profunctors, QuickCheck - , semigroups, StateVar, tagged, template-haskell, transformers + , hashable, lens, monad-skeleton, mtl, primitive, profunctors + , QuickCheck, semigroups, StateVar, tagged, template-haskell + , transformers, vector }: mkDerivation { pname = "extensible"; - version = "0.4.5"; - sha256 = "10cs47fdl79dasq5afbj5b47ybmvfsx589bwy6y3qcmlwybjnmlj"; + version = "0.4.6"; + sha256 = "0khi212qc834qnrssbn4xcfiypi2m7x8gwpwvpd6sbi6hi6c052v"; libraryHaskellDepends = [ - base comonad constraints deepseq ghc-prim monad-skeleton mtl - primitive profunctors QuickCheck semigroups StateVar tagged - template-haskell transformers + base comonad constraints deepseq ghc-prim hashable monad-skeleton + mtl primitive profunctors QuickCheck semigroups StateVar tagged + template-haskell transformers vector ]; testHaskellDepends = [ base lens QuickCheck template-haskell ]; homepage = "https://github.com/fumieval/extensible"; @@ -68532,6 +68810,28 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "fast-builder_0_0_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, process, QuickCheck, scientific, stm + , template-haskell, text, true-name, unordered-containers, vector + }: + mkDerivation { + pname = "fast-builder"; + version = "0.0.1.0"; + sha256 = "09s0jyiv1ch8cbgwfaxn5mmn9w7ik661h2g6d5znxr0nsi0bp2n1"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + testHaskellDepends = [ base bytestring process QuickCheck stm ]; + benchmarkHaskellDepends = [ + aeson base bytestring containers criterion deepseq ghc-prim + scientific template-haskell text true-name unordered-containers + vector + ]; + homepage = "http://github.com/takano-akio/fast-builder"; + description = "Fast ByteString Builder"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-digits" = callPackage ({ mkDerivation, base, criterion, digits, integer-gmp, QuickCheck , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck @@ -69264,6 +69564,22 @@ self: { license = "GPL"; }) {}; + "fedora-haskell-tools" = callPackage + ({ mkDerivation, base, directory, filepath, process, time, unix }: + mkDerivation { + pname = "fedora-haskell-tools"; + version = "0.3"; + sha256 = "0ml5laiwkpd68j87px57jdvjc90pw1ma41gsc06h1qjlhnvhhill"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath process time unix + ]; + homepage = "https://github.com/fedora-haskell/fedora-haskell-tools"; + description = "Building and tracking tools for Fedora Haskell"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "fedora-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hlint , HsOpenSSL, hspec, http-streams, io-streams, lens, text @@ -69717,8 +70033,8 @@ self: { }: mkDerivation { pname = "ffmpeg-light"; - version = "0.12.0"; - sha256 = "0cv8jq2if0pv40yp8inl3slsgs3z1rncffjgs2522qimq123rxcz"; + version = "0.12.0.1"; + sha256 = "1ikyhdkr3pvkpmqw7j4xgz07bnxnvckld8kd06191kgqlvr2k764"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70218,6 +70534,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "filepath-crypto" = callPackage + ({ mkDerivation, base, binary, bytestring, case-insensitive + , cryptoids, cryptoids-types, encoding, exceptions, filepath, sandi + , template-haskell + }: + mkDerivation { + pname = "filepath-crypto"; + version = "0.0.0.2"; + sha256 = "1i6y0bpyndghkfip2l0ijk9mnhia0fjmd6skzl1a3dbh5pibf7fd"; + libraryHaskellDepends = [ + base binary bytestring case-insensitive cryptoids cryptoids-types + encoding exceptions filepath sandi template-haskell + ]; + description = "Reversable and secure encoding of object ids as filepaths"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "filepath-io-access" = callPackage ({ mkDerivation, base, base-io-access, filepath }: mkDerivation { @@ -70890,6 +71224,8 @@ self: { pname = "fixed-vector-binary"; version = "0.6.0.0"; sha256 = "1yjyw9wc92laiwd9w8ng3456azicvf9a9wqk2v6liiksj3flw7hy"; + revision = "1"; + editedCabalFile = "04xrlp3r2798jpjw9v0zfjda79j19xz81szwp8jp5g71r5y16pvj"; libraryHaskellDepends = [ base binary fixed-vector ]; testHaskellDepends = [ base binary fixed-vector tasty tasty-quickcheck @@ -70906,6 +71242,8 @@ self: { pname = "fixed-vector-cereal"; version = "0.6.0.0"; sha256 = "1kf3d0pfaif5fish1vc5z7d5ym23bwl80l8bg4bgpdw75cg2dnn6"; + revision = "1"; + editedCabalFile = "1xhryv8d2znbfi99grg8dsn2lpya0wd8ff4pv6piyb01c13fl3xh"; libraryHaskellDepends = [ base cereal fixed-vector ]; testHaskellDepends = [ base cereal fixed-vector tasty tasty-quickcheck @@ -70922,6 +71260,8 @@ self: { pname = "fixed-vector-hetero"; version = "0.3.1.2"; sha256 = "0l8vphi8ijyzyk372r9i7imq8r6ki1w774gid69c8d2a2b63gvdd"; + revision = "1"; + editedCabalFile = "05scgl0r3g9nnb0pfg39cinylm11wdyqr8f51k69wj5y79fzf5yz"; libraryHaskellDepends = [ base deepseq fixed-vector ghc-prim primitive transformers ]; @@ -71830,8 +72170,8 @@ self: { }: mkDerivation { pname = "fluid-idl"; - version = "0.0.1"; - sha256 = "1mqswhsvyycxa7c7c92jag6rsp0dbkdm8bwjv6pcr92w293ycrv2"; + version = "0.0.2"; + sha256 = "1qcsdnjwz0gcn8z6ss27f3a687fi47cmm95a9rfag42gvvlwyr9z"; libraryHaskellDepends = [ aeson base bytestring containers errors exceptions lifted-async monad-control monad-logger mtl random safe-exceptions scientific @@ -72808,6 +73148,24 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "fortytwo" = callPackage + ({ mkDerivation, ansi-terminal, async, base, doctest, hspec + , process, text + }: + mkDerivation { + pname = "fortytwo"; + version = "1.0.2"; + sha256 = "15imj5ps040iz5abfnzjpgfq726j9c28bwwg06zbf07ji74dz190"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-terminal base text ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ async base doctest hspec process ]; + homepage = "https://github.com/gianlucaguarini/fortytwo#readme"; + description = "Interactive terminal prompt"; + license = stdenv.lib.licenses.mit; + }) {}; + "forward-chan" = callPackage ({ mkDerivation, base, SafeSemaphore, stm, unagi-chan }: mkDerivation { @@ -73424,14 +73782,15 @@ self: { }: mkDerivation { pname = "free-vector-spaces"; - version = "0.1.2.0"; - sha256 = "1km43gdngrjbyd6z8v6nfj25aybb4xdkxdnfizkd9sbkdqyxkbk8"; + version = "0.1.4.0"; + sha256 = "057l1fnkqyqnjbhzjz2jjlcrsmkcv2gd16gb5n3j99crw97s62xj"; libraryHaskellDepends = [ base lens linear MemoTrie vector vector-space ]; homepage = "https://github.com/leftaroundabout/free-vector-spaces"; description = "Instantiate the classes from the vector-space package with types from linear"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-vl" = callPackage @@ -73492,6 +73851,7 @@ self: { homepage = "https://github.com/clintonmead/freelude#readme"; description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freenect" = callPackage @@ -74758,6 +75118,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fuzzyset" = callPackage + ({ mkDerivation, base, base-unicode-symbols, data-default, hspec + , ieee754, lens, text, text-metrics, unordered-containers, vector + }: + mkDerivation { + pname = "fuzzyset"; + version = "0.1.0.2"; + sha256 = "1gpx8qw9vxlardjxncgkbbk3zvq8zjrc6nhjk80va7d7ix5zpdhz"; + libraryHaskellDepends = [ + base base-unicode-symbols data-default lens text text-metrics + unordered-containers vector + ]; + testHaskellDepends = [ + base base-unicode-symbols hspec ieee754 lens text + unordered-containers + ]; + homepage = "https://github.com/laserpants/fuzzyset-haskell"; + description = "Fuzzy set for approximate string matching"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fuzzytime" = callPackage ({ mkDerivation, base, cmdargs, directory, old-time, process }: mkDerivation { @@ -75051,23 +75432,22 @@ self: { }) {}; "gauge" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, basement, bytestring - , code-page, containers, deepseq, directory, foundation, HUnit - , math-functions, mwc-random, optparse-applicative, QuickCheck - , statistics, tasty, tasty-hunit, tasty-quickcheck, vector + ({ mkDerivation, base, basement, bytestring, code-page, containers + , deepseq, directory, HUnit, math-functions, mwc-random, tasty + , tasty-hunit, vector }: mkDerivation { pname = "gauge"; - version = "0.1.0"; - sha256 = "10hxx7n8hpcivi0g34w85dsvfx4l926rv1b6s88hyhpwj4qyvxb5"; + version = "0.1.3"; + sha256 = "1i97f00haj4832s2arbnqq19dpna54ygmchvnqkq00hsxk38cyc0"; libraryHaskellDepends = [ - ansi-wl-pprint base basement code-page containers deepseq - foundation math-functions mwc-random optparse-applicative vector + base basement code-page containers deepseq math-functions + mwc-random vector ]; testHaskellDepends = [ - base bytestring deepseq directory foundation HUnit QuickCheck - statistics tasty tasty-hunit tasty-quickcheck vector + base bytestring deepseq directory HUnit tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base ]; homepage = "https://github.com/vincenthz/hs-gauge"; description = "small framework for performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; @@ -75393,29 +75773,108 @@ self: { }) {inherit (pkgs) gegl;}; "gelatin" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , file-embed, FontyFruity, gl, GLFW-b, JuicyPixels, lens, linear - , time, vector + ({ mkDerivation, base, bytestring, containers, lens, linear, mtl + , transformers, vector }: mkDerivation { pname = "gelatin"; - version = "0.0.0.3"; - sha256 = "07ixnrhgqfqgb8cfm5qik17vx893jrjk7lq6342lpczpks22a58q"; + version = "0.1.0.1"; + sha256 = "151sf11a9sfwi6wg26l7lyphklv3lgy51djfqx3qszykhzccgv7b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base bytestring containers directory file-embed FontyFruity - gl GLFW-b JuicyPixels lens linear time vector + base bytestring containers lens linear mtl transformers vector ]; - executableHaskellDepends = [ - async base bytestring containers directory file-embed FontyFruity - gl GLFW-b JuicyPixels lens linear time vector - ]; - description = "An experimental real time renderer"; + executableHaskellDepends = [ base linear mtl vector ]; + homepage = "https://github.com/schell/gelatin"; + description = "A graphics description language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gelatin-freetype2" = callPackage + ({ mkDerivation, base, containers, either, freetype2, gelatin + , gelatin-gl, mtl, transformers + }: + mkDerivation { + pname = "gelatin-freetype2"; + version = "0.1.0.0"; + sha256 = "0nr5xsxwg73liyr572jv1vzj5bjk3qhkkk7j6g0kqf2h31yxgqhr"; + libraryHaskellDepends = [ + base containers either freetype2 gelatin gelatin-gl mtl + transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/schell/gelatin/gelatin-freetype2#readme"; + description = "FreeType2 based text rendering for the gelatin realtime rendering system"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "gelatin-fruity" = callPackage + ({ mkDerivation, base, FontyFruity, gelatin, linear, vector }: + mkDerivation { + pname = "gelatin-fruity"; + version = "0.1.0.0"; + sha256 = "0yp3z4sz52f21zvdy1xmd0bvpicbnv4wa53937rq1vw2jv60xx2r"; + libraryHaskellDepends = [ base FontyFruity gelatin linear vector ]; + homepage = "https://github.com/schell/gelatin-fruity#readme"; + description = "Gelatin's support for rendering TTF outlines, using FontyFruity"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "gelatin-gl" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, either + , filepath, gelatin, gelatin-shaders, gl, JuicyPixels, lens, linear + , mtl, template-haskell, transformers, vector + }: + mkDerivation { + pname = "gelatin-gl"; + version = "0.1.0.0"; + sha256 = "1x9a3wb878d1nrlxj2rciw4xz93gn3m326zciqnn5dg31fwqs396"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory either filepath gelatin + gelatin-shaders gl JuicyPixels lens linear mtl template-haskell + transformers vector + ]; + executableHaskellDepends = [ base gelatin lens linear mtl vector ]; + homepage = "https://github.com/schell/gelatin/gelatin-gl"; + description = "OpenGL rendering routines for the gelatin-picture graphics EDSL"; + license = stdenv.lib.licenses.mit; + }) {}; + + "gelatin-sdl2" = callPackage + ({ mkDerivation, base, either, filepath, gelatin-gl, mtl, sdl2 + , transformers + }: + mkDerivation { + pname = "gelatin-sdl2"; + version = "0.1.1.0"; + sha256 = "0gnn5b06q6fsbblrjghyzn46dby2skm5r9ys6pl6fhp7pa3c924n"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base gelatin-gl mtl sdl2 transformers ]; + executableHaskellDepends = [ base either filepath sdl2 ]; + homepage = "https://github.com/schell/gelatin"; + description = "An SDL2 backend for the gelatin renderer"; + license = stdenv.lib.licenses.mit; + }) {}; + + "gelatin-shaders" = callPackage + ({ mkDerivation, base, bytestring, filepath, gelatin }: + mkDerivation { + pname = "gelatin-shaders"; + version = "0.1.0.0"; + sha256 = "001ifyyv85b9gb5l4hf21b5dqakg4f7n3bil5a1abb4vcj2zmpfr"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base bytestring filepath gelatin ]; + homepage = "https://github.com/schell/gelatin-shaders#readme"; + description = "Gelatin's OpenGL shaders"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gemstone" = callPackage ({ mkDerivation, array, base, bitmap, bitmap-opengl, containers , FTGL, lens, linear, OpenGL, random, SDL, SDL-image, stb-image @@ -76626,8 +77085,8 @@ self: { }: mkDerivation { pname = "geoip2"; - version = "0.3.0.0"; - sha256 = "1yazd4wgf4ivk2x3apymddcww24z7a4b0jxzph7l8273wd8dy8zg"; + version = "0.3.1.0"; + sha256 = "1w9iqfkyi0ij33kng4adczi6m8chyhsadc2af5ryp8xzl7w64l8m"; libraryHaskellDepends = [ base bytestring cereal containers iproute mmap reinterpret-cast text @@ -77644,14 +78103,14 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "ghc-typelits-natnormalise_0_5_5" = callPackage + "ghc-typelits-natnormalise_0_5_6" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit, template-haskell }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.5.5"; - sha256 = "1dr0568hfxrjhvpgl624zghnvinfg7wwn9x36lrnxr4cl7najqk5"; + version = "0.5.6"; + sha256 = "07rrc3aw00i36z6xgp2jik9wqi0d8byzy48dy8jj089vp7s6birb"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra integer-gmp ]; @@ -78992,7 +79451,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ginger_0_7_2_0" = callPackage + "ginger_0_7_3_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , data-default, filepath, http-types, mtl, parsec, safe, scientific , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers @@ -79000,8 +79459,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.7.2.0"; - sha256 = "1xgczxqqd4ml8ifcyr45nrgbqn5a40nrbkvzbn4r4djpivnsrk0k"; + version = "0.7.3.0"; + sha256 = "1c4k0ixpkdb711arxcn028z27y78ssr6j5n7dfs9cajf93x727gs"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -79185,7 +79644,7 @@ self: { "git-annex" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder - , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive + , bloomfilter, bup, byteable, bytestring, case-insensitive , clientsession, concurrent-output, conduit, conduit-extra , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus , directory, disk-free-space, dlist, dns, edit-distance, esqueleto @@ -79204,8 +79663,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20171018"; - sha256 = "17armwygz44wphv6hqpyjggh4ybarhy3a2ypnsrc1ifhpq3rf15d"; + version = "6.20171026"; + sha256 = "0i44cfxp5wy6y527l9jbj83ilkxilp4jm7106q70czls0hnx6yij"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -79214,10 +79673,6 @@ self: { ]; isLibrary = false; isExecutable = true; - setupHaskellDepends = [ - base bytestring Cabal data-default directory exceptions filepath - hslogger IfElse process split unix unix-compat - ]; executableHaskellDepends = [ aeson async aws base blaze-builder bloomfilter byteable bytestring case-insensitive clientsession concurrent-output conduit @@ -79711,27 +80166,6 @@ self: { }) {}; "github-release" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers, uri-templater - }: - mkDerivation { - pname = "github-release"; - version = "1.0.6"; - sha256 = "1ixs76y5cb1dkrvl8i13a7s9xgs3170w3sjx6bhj05fi6wvz3n8z"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring http-client http-client-tls http-types - mime-types optparse-generic text unordered-containers uri-templater - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/tfausak/github-release#readme"; - description = "Upload files to GitHub releases"; - license = stdenv.lib.licenses.mit; - }) {}; - - "github-release_1_0_7" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, http-types, mime-types, optparse-generic, text , unordered-containers, uri-templater @@ -79750,7 +80184,6 @@ self: { homepage = "https://github.com/tfausak/github-release#readme"; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-tools" = callPackage @@ -85459,13 +85892,13 @@ self: { ({ mkDerivation, base, cairo, containers, filepath, gtk }: mkDerivation { pname = "gulcii"; - version = "0.2.0.3"; - sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29"; + version = "0.3"; + sha256 = "1crx9kz4s8by509x1k60m89jmmn7gfhi46d05q44ikhk5zkxycws"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base cairo containers filepath gtk ]; - homepage = "http://code.mathr.co.uk/gulcii"; + homepage = "https://code.mathr.co.uk/gulcii"; description = "graphical untyped lambda calculus interactive interpreter"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -87495,25 +87928,6 @@ self: { }) {}; "hailgun" = 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.5"; - sha256 = "0hi9a8aa10n14ipk4g8ksrf175z92kkwk0d9n3qzn835fkj5kkyr"; - libraryHaskellDepends = [ - aeson base bytestring email-validate exceptions filepath - http-client http-client-tls http-types tagsoup text time - transformers - ]; - homepage = "https://bitbucket.org/robertmassaioli/hailgun"; - description = "Mailgun REST api interface for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hailgun_0_4_1_6" = callPackage ({ mkDerivation, aeson, base, bytestring, email-validate , exceptions, filepath, http-client, http-client-tls, http-types , tagsoup, text, time, transformers @@ -87530,7 +87944,6 @@ self: { homepage = "https://bitbucket.org/robertmassaioli/hailgun"; description = "Mailgun REST api interface for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hailgun-send" = callPackage @@ -90361,8 +90774,8 @@ self: { }: mkDerivation { pname = "haskanoid"; - version = "0.1.5.2"; - sha256 = "1hw4ylwwsmp59ifw8s4w1394gv7p2xc6nvqajfmil0p8r8s6r1pf"; + version = "0.1.5.4"; + sha256 = "01cwjvs1sj66w9siqfq3vzrw5607bh2pxr6zzx64jhqhcr3yv73d"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -90687,23 +91100,25 @@ self: { }) {}; "haskell-compression" = callPackage - ({ mkDerivation, base, bimap, booleanlist, bytestring, containers + ({ mkDerivation, base, bimap, boolean-list, bytestring, containers }: mkDerivation { pname = "haskell-compression"; - version = "0.2"; - sha256 = "0z0jhz5m70qrs2w3q58xghgv279yjvhfdspy5pqpss87jm1fm3ab"; + version = "0.3"; + sha256 = "1yksgwhxpfl47d6zrqdx5bdxyya9vd3kr1g33pz19qfqsvfcqlhp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bimap booleanlist bytestring containers + base bimap boolean-list bytestring containers + ]; + executableHaskellDepends = [ + base bimap boolean-list bytestring containers ]; - executableHaskellDepends = [ base bimap bytestring containers ]; homepage = "http://xy30.com"; description = "compress files"; license = stdenv.lib.licenses.gpl3; - broken = true; - }) {booleanlist = null;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; "haskell-conll" = callPackage ({ mkDerivation, base, containers, lens, pretty-show, protolude @@ -93337,8 +93752,8 @@ self: { }: mkDerivation { pname = "hasktags"; - version = "0.69.3"; - sha256 = "1yjsdvb3y6ly29anvh14bvfan1fplc9brb6i68ipcz9a7jk9l1jf"; + version = "0.69.4"; + sha256 = "1s7phsg20h15p2dnri6viy5k6c4n42gchy684dv3r30qrwwvv0ni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93562,7 +93977,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hasql_1" = callPackage + "hasql_1_1" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , criterion, data-default-class, dlist, either, hashable @@ -93573,8 +93988,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1"; - sha256 = "0zhk9vwlmjc1cwbqx1l9nns155a5f2zbb8k1240wqcylignfqi2b"; + version = "1.1"; + sha256 = "1c2gfdgxki17ng6b5qr3pvmra7v7x3hf9vh75hq4n6jr8rp03iki"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring bytestring-strict-builder contravariant contravariant-extras data-default-class dlist either @@ -93643,8 +94058,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-query"; - version = "0.4.3.1"; - sha256 = "0m9lr2n5ac0n9gslj2v24jmm68b1aq29zb9ca5wszfs16x6v92ci"; + version = "0.4.4"; + sha256 = "0xbnhgix1g4sf2cpimz77ljiwm79l4lnx1ys7q31rak1fyw7fgs0"; libraryHaskellDepends = [ base base-prelude bytestring contravariant foldl hasql hasql-cursor-transaction hasql-transaction profunctors @@ -93666,8 +94081,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-transaction"; - version = "0.6.2.1"; - sha256 = "113fkkkdh2ar431b9l3jbqabymmas2r0fwc7icfys3ayh8r50fg7"; + version = "0.6.3"; + sha256 = "12vzkay4r0pzz41p4n60zd077yigr3373i5nr8cpf8z39msj8vaj"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras hasql hasql-transaction transformers @@ -93726,8 +94141,8 @@ self: { }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.2.3"; - sha256 = "0ph2dzfl12bcdcd4xqw5kg1sdyd36ajz3n3ha27rnvv0l8slld6i"; + version = "0.2.4"; + sha256 = "0gdbwhzcfjriq2yah5kfn9r1anc77f1iyay86zsdgq4z8qi6asvr"; libraryHaskellDepends = [ base-prelude hasql hasql-pool optparse-applicative ]; @@ -93748,6 +94163,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-pool_0_4_3" = callPackage + ({ mkDerivation, base-prelude, hasql, resource-pool, time }: + mkDerivation { + pname = "hasql-pool"; + version = "0.4.3"; + sha256 = "08fzh0y1cxaslp8ia26p9jhs3dckjfdvmiqw1lasdabb7ij82i0j"; + libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; + homepage = "https://github.com/nikita-volkov/hasql-pool"; + description = "A pool of connections for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-postgres" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , criterion-plus, deepseq, directory, doctest, either, filepath @@ -93852,6 +94280,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-transaction_0_5_2" = callPackage + ({ mkDerivation, async, base, base-prelude, bytestring + , bytestring-tree-builder, contravariant, contravariant-extras + , hasql, mtl, rebase, transformers + }: + mkDerivation { + pname = "hasql-transaction"; + version = "0.5.2"; + sha256 = "0w4y65vqgc4pk66xpip9jzzbas6cpnss4gx1w91rg7j48491cmym"; + libraryHaskellDepends = [ + base base-prelude bytestring bytestring-tree-builder contravariant + contravariant-extras hasql mtl transformers + ]; + testHaskellDepends = [ async hasql rebase ]; + homepage = "https://github.com/nikita-volkov/hasql-transaction"; + description = "A composable abstraction over the retryable transactions for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hastache" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , directory, filepath, HUnit, ieee754, mtl, process, syb, text @@ -94091,10 +94539,8 @@ self: { }: mkDerivation { pname = "hat"; - version = "2.9.0.0"; - sha256 = "05sbgq1mliahdn4qj7flgw7klrm67r2mz7gxs03i6lx6mi3phm9f"; - revision = "1"; - editedCabalFile = "1wspd2shxpp3x4p4ghgf82vqchlkxk6qhvsgn07ypzm2kfz3a9dh"; + version = "2.9.4"; + sha256 = "13ldpj92qzp243zwnx0q044isdq2nmbh93wardqzr37jybs7m4xs"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -95446,23 +95892,42 @@ self: { }) {}; "heavy-logger" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, fast-logger, hsyslog - , monad-control, monad-logger, mtl, template-haskell, text - , text-format-heavy, transformers-base + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default, fast-logger, hsyslog, lifted-base, monad-control + , monad-logger, mtl, stm, template-haskell, text, text-format-heavy + , th-lift, th-lift-instances, thread-local-storage + , transformers-base }: mkDerivation { pname = "heavy-logger"; - version = "0.1.0.0"; - sha256 = "0wnvgjbhwscmq0wm7arlwpqj5dsrshaqhnx5nvlcvjkzrhcpxlpp"; + version = "0.3.1.0"; + sha256 = "0cmanxnahxgk52ffpni0zx4z22vdrh6r5my4llvsdd94bpfmxpi4"; libraryHaskellDepends = [ - attoparsec base bytestring fast-logger hsyslog monad-control - monad-logger mtl template-haskell text text-format-heavy - transformers-base + attoparsec base bytestring containers data-default fast-logger + hsyslog lifted-base monad-control monad-logger mtl stm + template-haskell text text-format-heavy th-lift th-lift-instances + thread-local-storage transformers-base ]; description = "Full-weight logging based on fast-logger"; license = stdenv.lib.licenses.bsd3; }) {}; + "heavy-logger-amazon" = callPackage + ({ mkDerivation, amazonka-core, base, binary, heavy-logger + , template-haskell, text + }: + mkDerivation { + pname = "heavy-logger-amazon"; + version = "0.1.0.0"; + sha256 = "18wcnpnjmv841ac3kvnyk0s9rrgfwvlgv950s1znnjdmi3qc0bjk"; + libraryHaskellDepends = [ + amazonka-core base binary heavy-logger template-haskell text + ]; + homepage = "https://github.com/portnov/heavy-logger-amazon#readme"; + description = "heavy-logger compatibility with amazonka-core logging"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hebrew-time" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, time @@ -95555,30 +96020,6 @@ self: { }) {}; "hedis" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, HUnit, mtl, network, resource-pool, scanner - , slave-thread, stm, test-framework, test-framework-hunit, text - , time, unordered-containers, vector - }: - mkDerivation { - pname = "hedis"; - version = "0.9.10"; - sha256 = "1z8vl3ql5nyl4jg3pzghsbi1ld9a047zbwz6fgzgk1lvspa0pcd3"; - libraryHaskellDepends = [ - async base bytestring bytestring-lexing deepseq mtl network - resource-pool scanner stm text time unordered-containers vector - ]; - testHaskellDepends = [ - async base bytestring HUnit mtl slave-thread stm test-framework - test-framework-hunit text time - ]; - benchmarkHaskellDepends = [ base mtl time ]; - homepage = "https://github.com/informatikr/hedis"; - description = "Client library for the Redis datastore: supports full command set, pipelining"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedis_0_9_11" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, HUnit, mtl, network, resource-pool, scanner , slave-thread, stm, test-framework, test-framework-hunit, text @@ -95600,7 +96041,6 @@ self: { homepage = "https://github.com/informatikr/hedis"; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedis-config" = callPackage @@ -96374,6 +96814,7 @@ self: { homepage = "https://github.com/JackKiefer/herms"; description = "A command-line manager for delicious kitchen recipes"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hero-club-five-tenets" = callPackage @@ -96699,8 +97140,8 @@ self: { ({ mkDerivation, base, bytestring, extra }: mkDerivation { pname = "hexml"; - version = "0.3.2"; - sha256 = "0vyv45s6nqhbgkzxcgx1ihmif0d7sxmfafqc2xcmcm2vg4jb7ls4"; + version = "0.3.3"; + sha256 = "1lhwhv75s71bqdclvfawhg9ss9z5icg9rpihkjfss4yzhxhcrvf4"; libraryHaskellDepends = [ base bytestring extra ]; testHaskellDepends = [ base bytestring ]; homepage = "https://github.com/ndmitchell/hexml#readme"; @@ -98908,7 +99349,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hjsonschema_1_7_0" = callPackage + "hjsonschema_1_7_1" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, file-embed, filepath, hashable, hjsonpointer, hspec , http-client, http-types, pcre-heavy, profunctors, protolude @@ -98917,8 +99358,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "1.7.0"; - sha256 = "01k29v8xqw3d8vy3qdf6ppgjmly7ppbg19yjrsiv10szishwigg2"; + version = "1.7.1"; + sha256 = "0x9w33scdnbfdmadxpx2c4fgkmpvny9ipsl2y7fq56zr6fa0ybfz"; libraryHaskellDepends = [ aeson base bytestring containers file-embed filepath hashable hjsonpointer http-client http-types pcre-heavy profunctors @@ -99471,6 +99912,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hlint_2_0_10" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs + , containers, cpphs, data-default, directory, extra, filepath + , haskell-src-exts, haskell-src-exts-util, hscolour, process + , refact, text, transformers, uniplate, unordered-containers + , vector, yaml + }: + mkDerivation { + pname = "hlint"; + version = "2.0.10"; + sha256 = "1kmjgdj652lx269sppa35wga8a2376nzjd548nnc6h52kdpgix30"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers cpphs + data-default directory extra filepath haskell-src-exts + haskell-src-exts-util hscolour process refact text transformers + uniplate unordered-containers vector yaml + ]; + 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 { @@ -100308,15 +100776,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoauth2_1_4_0" = callPackage + "hoauth2_1_5_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions , http-conduit, http-types, microlens, text, unordered-containers , uri-bytestring, uri-bytestring-aeson, wai, warp }: mkDerivation { pname = "hoauth2"; - version = "1.4.0"; - sha256 = "0wksa14mj7pyd6mjv81m1djqs8s79sri8a1by14l626pgai7p3h0"; + version = "1.5.0"; + sha256 = "0dfrqdjrvc94f94xl8vqggdvzbkiwj3xfkmwilkskvnfg1s1hg8q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101147,20 +101615,20 @@ self: { license = stdenv.lib.licenses.isc; }) {inherit (pkgs) openssl;}; - "hoopl_3_10_2_1" = callPackage + "hoopl_3_10_2_2" = callPackage ({ mkDerivation, base, containers, filepath, mtl, parsec , test-framework, test-framework-hunit }: mkDerivation { pname = "hoopl"; - version = "3.10.2.1"; - sha256 = "1c20ahr12dlapajzgb7mhxb1m8q1485amwmvzmsgy7l7x2ls41kw"; + version = "3.10.2.2"; + sha256 = "15rbb9a8mza3zv8h3p237zhmy29bxc4k48ik27kzzj7islb16yq9"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers filepath mtl parsec test-framework test-framework-hunit ]; - homepage = "http://ghc.cs.tufts.edu/hoopl/"; + homepage = "https://github.com/haskell/hoopl"; description = "A library to support dataflow analysis and optimization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -101244,8 +101712,8 @@ self: { pname = "hopenpgp-tools"; version = "0.19.5"; sha256 = "1yb6slxphz7lghclv1cjs2kwig1ll1dxzcaf4js26nanq280lqz0"; - revision = "1"; - editedCabalFile = "0lid8ck44b5ybb8wq81bh8wianr4r4rigqzq49cfr1g4kxmhqcq8"; + revision = "2"; + editedCabalFile = "1w9ban4w6zm7cknfnlzhgx649xg2j0vsrhqdlnd5g8qzcbbhh0si"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -102350,8 +102818,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.4"; - sha256 = "0vijl65rxir61nwx7sdgy6lcwgskyks3cdgcqd814smnavh6nhdn"; + version = "2.4.5"; + sha256 = "0f4h9b5c6s523967hkqg6wz57g350awa26r2y2wlfr4f39qgjwx3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102731,6 +103199,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libb2;}; + "hs-brotli" = callPackage + ({ mkDerivation, base, brotli, brotlidec, brotlienc, bytestring + , ghc-prim, libbrotlidec, libbrotlienc, QuickCheck + , quickcheck-instances, tasty-quickcheck + }: + mkDerivation { + pname = "hs-brotli"; + version = "0.1.0.0"; + sha256 = "083l7bbjlxh629a9m88mfp087f09gwsmzs9vmpxrqffw23zrnclf"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + librarySystemDepends = [ brotlidec brotlienc ]; + libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ]; + testHaskellDepends = [ + base brotli bytestring QuickCheck quickcheck-instances + tasty-quickcheck + ]; + homepage = "https://github.com/iand675/brotli#readme"; + description = "Compression and decompression in the brotli format"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {brotli = null; brotlidec = null; brotlienc = null; + libbrotlidec = null; libbrotlienc = null;}; + "hs-captcha" = callPackage ({ mkDerivation, base, bytestring, gd, random }: mkDerivation { @@ -103382,8 +103873,8 @@ self: { ({ mkDerivation, base, bytestring, unix }: mkDerivation { pname = "hsI2C"; - version = "0.1.2"; - sha256 = "0ma8klvyv4rnfxkag99vm4nvw77yppcv63p6829b4ynsa9vyv9rn"; + version = "0.1.3"; + sha256 = "0p77xndqpqfyjw9y7q791pysrpz3zkimw8mcxyfl4yrh34sammx9"; libraryHaskellDepends = [ base bytestring unix ]; description = "I2C access for Haskell and Linux"; license = stdenv.lib.licenses.bsd3; @@ -103443,6 +103934,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hsass_0_5_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, filepath + , hlibsass, hspec, hspec-discover, monad-loops, temporary + , transformers + }: + mkDerivation { + pname = "hsass"; + version = "0.5.0"; + sha256 = "07jhny061fnxqiijr2rqac85qzlxz24w8dms5pn844as8nkwdi4d"; + libraryHaskellDepends = [ + base bytestring data-default-class filepath hlibsass monad-loops + transformers + ]; + testHaskellDepends = [ + base bytestring data-default-class hspec hspec-discover temporary + ]; + homepage = "https://github.com/jakubfijalkowski/hsass"; + description = "Integrating Sass into Haskell applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsay" = callPackage ({ mkDerivation, base, Hclip, HTTP, process, unix }: mkDerivation { @@ -108910,15 +109423,15 @@ self: { }) {}; "hw-conduit" = callPackage - ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec - , mmap, time, vector, word8 + ({ mkDerivation, array, base, bytestring, conduit + , conduit-combinators, criterion, hspec, mmap, time, vector, word8 }: mkDerivation { pname = "hw-conduit"; - version = "0.2.0.2"; - sha256 = "052sgj1bny2d2j4gsmfj7mx9jcnkac7b0rsz7310nv2rc9h46sbl"; + version = "0.2.0.3"; + sha256 = "19fwlgnpc17h305nmaygd5w9p5yv9jm25jgc440r9frqzw7if83a"; libraryHaskellDepends = [ - array base bytestring conduit time word8 + array base bytestring conduit conduit-combinators time word8 ]; testHaskellDepends = [ base bytestring conduit hspec ]; benchmarkHaskellDepends = [ @@ -109115,20 +109628,20 @@ self: { "hw-kafka-avro" = callPackage ({ mkDerivation, aeson, avro, base, binary, bytestring, cache - , containers, errors, hashable, hspec, http-client, mtl, pure-zlib - , QuickCheck, semigroups, servant, servant-client, text + , containers, errors, hashable, hspec, http-client, http-types, mtl + , pure-zlib, QuickCheck, semigroups, servant, servant-client, text , transformers, unordered-containers }: mkDerivation { pname = "hw-kafka-avro"; - version = "1.2.0"; - sha256 = "0v2l7g524wz45mnqdqrs33qbb1psm33jlfl1hlnd22dxfw7mhdhl"; + version = "1.3.0"; + sha256 = "0lryr18gcmgfxa10gmd5y43l62x684ahpzk53wx5z5qww0chy7fa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson avro base binary bytestring cache containers errors hashable - http-client mtl pure-zlib semigroups servant servant-client text - transformers unordered-containers + http-client http-types mtl pure-zlib semigroups servant + servant-client text transformers unordered-containers ]; executableHaskellDepends = [ aeson avro base binary bytestring cache containers errors hashable @@ -109153,8 +109666,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "2.0.3"; - sha256 = "0xdkkasjql0la376kmb8zljndfbcxyizf9rqj02nlb1np8gs6apq"; + version = "2.1.0"; + sha256 = "1kl9pkcpsciwxya92kr75nd0n2xb4qrhs5fs75ifkgzicjipxd5v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109571,8 +110084,8 @@ self: { }: mkDerivation { pname = "hwsl2"; - version = "0.4.0.0"; - sha256 = "0f081h2w2his8fgis6prj6z5bywh4csjqgwn5mc4wdy5s1zi6010"; + version = "0.4.0.1"; + sha256 = "07kg0m75fi9m236lnisrjdyx7y53hl6pm4v5l9cxvghfankfbgk0"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring quickcheck-properties tasty tasty-quickcheck @@ -111132,7 +111645,7 @@ self: { pname = "idris"; version = "1.0"; sha256 = "1srbz0cyvd0k1yqgbrwnfj94yg5y3z533q1kzac96z1h7v454s5h"; - configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; + configureFlags = [ "-fcurses" "-f-execonly" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -111176,7 +111689,7 @@ self: { pname = "idris"; version = "1.1.1"; sha256 = "0rq43i3mf7b4yiwzrzzpyh3ldka3j514ms9cf31vsfpy0jn3bvkp"; - configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; + configureFlags = [ "-fcurses" "-fexeconly" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -111855,6 +112368,8 @@ self: { pname = "imagesize-conduit"; version = "1.1"; sha256 = "06dc0453l7n3g05pg118y4smlzkl6p56zazpi4dr41dkg12pii9i"; + revision = "1"; + editedCabalFile = "1gq749v6558zkvvn8iqkd4iqv4giiysxjqb2kncarnhghkkbgbaf"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions ]; @@ -112415,6 +112930,27 @@ self: { license = "GPL"; }) {}; + "incremental-parser_0_2_5_2" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.2.5.2"; + sha256 = "0qlawnlghp8cz96sc6kjzhp0dlinmnyh38gjcp6i1wfn2qy8qy7d"; + libraryHaskellDepends = [ base monoid-subclasses ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + homepage = "https://github.com/blamario/incremental-parser"; + description = "Generic parser library capable of providing partial results from partial input"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -113111,8 +113647,8 @@ self: { }: mkDerivation { pname = "inline-r"; - version = "0.9.0.1"; - sha256 = "1by27qjsgwaws7nf3lslml7n58j2fk478pinflk10jji5zcs4nz9"; + version = "0.9.0.2"; + sha256 = "1swxdilr1l7h3pk313fyjgpg58g20v6560j9g4cxz0gakqqhb3jc"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq exceptions mtl pretty primitive process reflection setenv @@ -114665,8 +115201,8 @@ self: { }: mkDerivation { pname = "irc-conduit"; - version = "0.2.2.3"; - sha256 = "06gklbipbjg0n2c3iqh753v9njd602r3lj4rmq1155kx0bxlwhmg"; + version = "0.2.2.4"; + sha256 = "118ksbf8kh0bmwk5m32qv609kggwssm3a56zc14f8bg67bkdkrc4"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls profunctors text time tls transformers @@ -117857,8 +118393,8 @@ self: { }: mkDerivation { pname = "justified-containers"; - version = "0.2.0.0"; - sha256 = "0fsr9j4qnlffhkgbz50lwy3f18d619risxfl44wgfgr9b722xj8r"; + version = "0.2.0.1"; + sha256 = "0k2vw8d37hkjj786kx52hjs7qlmmv4hr8bp9dd2rskgsnwjizmw2"; libraryHaskellDepends = [ base containers roles ]; testHaskellDepends = [ base containers ghc-prim hspec QuickCheck should-not-typecheck @@ -118469,14 +119005,14 @@ self: { ({ mkDerivation, aeson, async, base, bloodhound, bytestring , containers, criterion, deepseq, enclosed-exceptions, exceptions , http-client, http-types, katip, lens, lens-aeson - , quickcheck-instances, retry, rng-utils, scientific, stm - , stm-chans, tagged, tasty, tasty-hunit, tasty-quickcheck, text - , time, transformers, unordered-containers, uuid, vector + , quickcheck-instances, random, retry, scientific, stm, stm-chans + , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unordered-containers, uuid, vector }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.4.0.1"; - sha256 = "0w1iprf3lpnbgil3gzpka5akjc8kl3l6g2knizddjb6xvszy564q"; + version = "0.4.0.3"; + sha256 = "0aji0738dz7i0lry30y6rpfbhvcpc79mfqc77nlvaplb3plw0m51"; libraryHaskellDepends = [ aeson async base bloodhound bytestring enclosed-exceptions exceptions http-client http-types katip retry scientific stm @@ -118489,9 +119025,10 @@ self: { unordered-containers vector ]; benchmarkHaskellDepends = [ - aeson base bloodhound criterion deepseq rng-utils text + aeson base bloodhound criterion deepseq random text unordered-containers uuid ]; + homepage = "https://github.com/Soostone/katip"; description = "ElasticSearch scribe for the Katip logging framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -118512,6 +119049,7 @@ self: { homepage = "https://github.com/iconnect/katip-syslog#readme"; description = "Syslog Katip Scribe"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katt" = callPackage @@ -119986,8 +120524,8 @@ self: { }: mkDerivation { pname = "lackey"; - version = "0.4.3"; - sha256 = "07n5acnrwy991qsx0bg1hbpxky0nxwybnh1zs08n4jmbl10rvsrs"; + version = "0.4.4"; + sha256 = "0p689g86rim4hqw0chn6p22yr9vcb4xcl44aiv6lzqb8fnwzyadx"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base servant tasty tasty-hspec text ]; homepage = "https://github.com/tfausak/lackey#readme"; @@ -119995,6 +120533,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lackey_0_4_5" = callPackage + ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec + , text + }: + mkDerivation { + pname = "lackey"; + version = "0.4.5"; + sha256 = "0xczvbfvgcifb6mzyicihgz6vcn7bx2d3w9r8ih9mdclbfhc32l6"; + libraryHaskellDepends = [ base servant servant-foreign text ]; + testHaskellDepends = [ base servant tasty tasty-hspec text ]; + homepage = "https://github.com/tfausak/lackey#readme"; + description = "Generate Ruby clients from Servant APIs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lagrangian" = callPackage ({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -121872,8 +122426,8 @@ self: { ({ mkDerivation, base, HUnit, parsec, wl-pprint }: mkDerivation { pname = "language-webidl"; - version = "0.1.4.0"; - sha256 = "06px2m4zf1b14lx7nx0m21gmxqskfyk7a777j7sbqd3dwsrbl834"; + version = "0.2.0.0"; + sha256 = "1h93a19y8109mwxl795hi0xdb3jy1z9w2ks3sc6g673kv04pw0pf"; libraryHaskellDepends = [ base parsec wl-pprint ]; testHaskellDepends = [ base HUnit ]; description = "Parser and Pretty Printer for WebIDL"; @@ -122860,8 +123414,8 @@ self: { }: mkDerivation { pname = "leksah-server"; - version = "0.16.2.0"; - sha256 = "0wfikbv98p29rv2cl1wwnac82g5vj1w70hy4m40vxgag3qpnr6iw"; + version = "0.16.3.0"; + sha256 = "0cjg4r6yjwfzr2xn90gvrw2x93mlpz6z2i1i4djbnilknl9s53vp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -123319,8 +123873,8 @@ self: { ({ mkDerivation, base, base-unicode-symbols, transformers }: mkDerivation { pname = "lenz"; - version = "0.1.2.1"; - sha256 = "058j5gkcz0dcwscnssjzxhkgkq5zxffbsj12dwbgiiyd57fwfv88"; + version = "0.1.2.2"; + sha256 = "1hzvw76fgaf5d5l1dca9662c0pplgv0h53dwfr42cwg0hxj6c876"; libraryHaskellDepends = [ base base-unicode-symbols transformers ]; description = "Van Laarhoven lenses"; license = "unknown"; @@ -123332,8 +123886,8 @@ self: { }: mkDerivation { pname = "lenz-template"; - version = "0.1"; - sha256 = "1cbpb0m31kf7x9li0yf0c2gblz0nbyhl3k7pj70k97y1d4ns0g7h"; + version = "0.1.0.1"; + sha256 = "1j11cg76w9kyc1nn395qhzj9cp64ff0jq8y0h5x9lcn2r18zihhi"; libraryHaskellDepends = [ base base-unicode-symbols containers lenz template-haskell ]; @@ -124160,24 +124714,26 @@ self: { }) {}; "libssh2" = callPackage - ({ mkDerivation, base, bytestring, c2hs, libssh2, network, ssh2 + ({ mkDerivation, base, bytestring, c2hs, libssh2, network, select , syb, time }: mkDerivation { pname = "libssh2"; - version = "0.2.0.4"; - sha256 = "1abdd5k4pnfxpg1kg1kvmwgwv946zlndhnydhhphad2ah3d2pkjf"; + version = "0.2.0.5"; + sha256 = "0l224pd8bb9d29043qdy40dbknnhmwnjc95r3yyc93lhwd5fsqma"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring network syb time ]; - librarySystemDepends = [ ssh2 ]; + libraryHaskellDepends = [ + base bytestring network select syb time + ]; + librarySystemDepends = [ libssh2 ]; libraryPkgconfigDepends = [ libssh2 ]; libraryToolDepends = [ c2hs ]; homepage = "https://github.com/portnov/libssh2-hs"; description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libssh2; ssh2 = null;}; + }) {inherit (pkgs) libssh2;}; "libssh2-conduit" = callPackage ({ mkDerivation, base, conduit, libssh2, monad-control, stm @@ -124280,7 +124836,7 @@ self: { homepage = "http://redmine.iportnov.ru/projects/libvirt-hs"; description = "FFI bindings to libvirt virtualization API (http://libvirt.org)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libvirt;}; "libvorbis" = callPackage @@ -125012,8 +125568,8 @@ self: { ({ mkDerivation, base, sbv }: mkDerivation { pname = "linearEqSolver"; - version = "1.3"; - sha256 = "0bszi1k27ag4yk31zxkn3jk3cqh1xzdcscm4nb6k4n0psf0qm2rp"; + version = "2.0"; + sha256 = "0dianwg8r4b6x6z17d994kmhjmqwdx083vlm9rzakfkn7p773l8w"; libraryHaskellDepends = [ base sbv ]; homepage = "http://github.com/LeventErkok/linearEqSolver"; description = "Use SMT solvers to solve linear systems over integers and rationals"; @@ -125027,8 +125583,10 @@ self: { }: mkDerivation { pname = "linearmap-category"; - version = "0.3.2.0"; - sha256 = "0g93h1sl6djyf0r6295a7iayjnwjwmk8w7m06gi3vqr2srwjk4s5"; + version = "0.3.4.0"; + sha256 = "0idmaw25cz7lk3kr9n0jri776j0qajrlc9j1aki0brvx6p6yh2dp"; + revision = "1"; + editedCabalFile = "0vrx3ws23qg1ygh1ksvgrpz92nhnr1nmrwy8a3ax08n8jcx2nrrw"; libraryHaskellDepends = [ base constrained-categories containers free-vector-spaces ieee754 lens linear manifolds-core semigroups tagged transformers vector @@ -125037,6 +125595,7 @@ self: { homepage = "https://github.com/leftaroundabout/linearmap-family"; description = "Native, complete, matrix-free linear algebra"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linearscan" = callPackage @@ -125625,6 +126184,7 @@ self: { homepage = "https://github.com/ucsd-progsys/liquidhaskell"; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -126968,8 +127528,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.7.3.0"; - sha256 = "15bf0ly3fl2k7dqn5vskafsihil5lb7ij96vw0nsb3dil80f54qk"; + version = "0.7.4.0"; + sha256 = "06rzvh3g294hpwpxw2syvywrw3rms1chjxqhki8b97ml1nlfnrs0"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control monad-time mtl semigroups stm text time @@ -128145,8 +128705,8 @@ self: { }: mkDerivation { pname = "ltk"; - version = "0.16.1.0"; - sha256 = "00vxsp5w38wv12wl09z6wa72kpczd6k5g9m02clshaq3ai6cyg1a"; + version = "0.16.2.0"; + sha256 = "1x8abgss6j46wp0cz7vfr704j38f00pcgkhyxn8ismqf3k7sdzxc"; libraryHaskellDepends = [ base base-compat Cabal containers filepath ghc gi-cairo gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-hs haskell-gi-base @@ -129094,22 +129654,24 @@ self: { "madlang" = callPackage ({ mkDerivation, ansi-wl-pprint, base, Cabal, composition-prelude , containers, criterion, directory, file-embed, hspec - , hspec-megaparsec, http-client, megaparsec, MonadRandom, mtl - , optparse-applicative, process, random-shuffle, recursion-schemes - , tar, template-haskell, text, zip-archive, zlib + , hspec-megaparsec, http-client, http-client-tls, megaparsec + , MonadRandom, mtl, optparse-applicative, process, random-shuffle + , recursion-schemes, recursion-schemes-ext, tar, template-haskell + , text, th-lift-instances, titlecase, zip-archive, zlib }: mkDerivation { pname = "madlang"; - version = "3.0.0.1"; - sha256 = "0zh935qpaq3w0qdijbmpyf71yvjigygks7ryxfcw9q9hivypvxgj"; + version = "3.1.1.18"; + sha256 = "00np5hkbab7hi46056hp6maa7fc63vbx227pj0y3d5q502hgf3jj"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal directory file-embed process ]; + setupHaskellDepends = [ base Cabal directory process ]; libraryHaskellDepends = [ ansi-wl-pprint base composition-prelude containers directory - file-embed http-client megaparsec MonadRandom mtl - optparse-applicative random-shuffle recursion-schemes tar - template-haskell text zip-archive zlib + file-embed http-client http-client-tls megaparsec MonadRandom mtl + optparse-applicative random-shuffle recursion-schemes + recursion-schemes-ext tar template-haskell text th-lift-instances + titlecase zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec hspec-megaparsec text ]; @@ -129181,6 +129743,37 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "magicbane_0_1_2" = callPackage + ({ mkDerivation, aeson, aeson-qq, attoparsec, base, classy-prelude + , conduit, conduit-combinators, data-default, data-has, either + , ekg-core, ekg-wai, envy, errors, fast-logger, http-api-data + , http-client, http-client-tls, http-conduit, http-date + , http-link-header, http-media, http-types, lifted-async + , mime-types, monad-control, monad-logger, monad-metrics, mtl + , network, network-uri, raw-strings-qq, refined, servant + , servant-server, split, string-conversions, text, transformers + , unordered-containers, wai, wai-cli, wai-middleware-metrics + }: + mkDerivation { + pname = "magicbane"; + version = "0.1.2"; + sha256 = "19k31vy2ldf9a3jvmlys16n6w31a8h7b1iyp6m35f4n16ndjvwa1"; + libraryHaskellDepends = [ + aeson aeson-qq attoparsec base classy-prelude conduit + conduit-combinators data-default data-has either ekg-core ekg-wai + envy errors fast-logger http-api-data http-client http-client-tls + http-conduit http-date http-link-header http-media http-types + lifted-async mime-types monad-control monad-logger monad-metrics + mtl network network-uri raw-strings-qq refined servant + servant-server split string-conversions text transformers + unordered-containers wai wai-cli wai-middleware-metrics + ]; + homepage = "https://github.com/myfreeweb/magicbane#readme"; + description = "A web framework that integrates Servant, ClassyPrelude, EKG, fast-logger, wai-cli…"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "magico" = callPackage ({ mkDerivation, base, hmatrix, transformers, utility-ht }: mkDerivation { @@ -129471,6 +130064,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "makefile_1_1_0_0" = callPackage + ({ mkDerivation, attoparsec, base, doctest, Glob, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "makefile"; + version = "1.1.0.0"; + sha256 = "01swnw8fp2cx5z5xim9apia3yw48six61mhf6p3g0gp99w4i4ypd"; + libraryHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ + attoparsec base doctest Glob QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + homepage = "http://github.com/nmattia/mask"; + description = "Simple Makefile parser and generator"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mallard" = callPackage ({ mkDerivation, base, byteable, bytestring, cryptohash, exceptions , fgl, file-embed, hashable, hasql, hasql-optparse-applicative @@ -129982,8 +130594,8 @@ self: { }: mkDerivation { pname = "manifold-random"; - version = "0.4.1.0"; - sha256 = "0493y21sq56hj99ny10nn9kbgq2525ij79rmq5x2p1dx30gk16m5"; + version = "0.4.4.0"; + sha256 = "1qihbyhmf9abyb7fh4gf6qxwbk2a1jwnxdpnjinfi3x87xasvajj"; libraryHaskellDepends = [ base constrained-categories linearmap-category manifolds random-fu semigroups vector-space @@ -129995,20 +130607,26 @@ self: { }) {}; "manifolds" = callPackage - ({ mkDerivation, base, comonad, constrained-categories, containers - , deepseq, free, free-vector-spaces, lens, linear + ({ mkDerivation, base, call-stack, comonad, constrained-categories + , containers, deepseq, free, free-vector-spaces, lens, linear , linearmap-category, manifolds-core, MemoTrie, number-show - , semigroups, tagged, transformers, vector, vector-space, void + , placeholders, pragmatic-show, semigroups, tagged, tasty + , tasty-hunit, tasty-quickcheck, transformers, vector, vector-space + , void }: mkDerivation { pname = "manifolds"; - version = "0.4.1.0"; - sha256 = "1vmgcv0yy72a29w15sg0z3z885vjhfpapgabilqbvh7dpxfv43x1"; + version = "0.4.4.0"; + sha256 = "1wsqar82w0sqspihyvkd9jndw2q6818nci82clqgxb1dawyna5vx"; libraryHaskellDepends = [ - base comonad constrained-categories containers deepseq free - free-vector-spaces lens linear linearmap-category manifolds-core - MemoTrie number-show semigroups tagged transformers vector - vector-space void + base call-stack comonad constrained-categories containers deepseq + free free-vector-spaces lens linear linearmap-category + manifolds-core MemoTrie number-show placeholders pragmatic-show + semigroups tagged transformers vector vector-space void + ]; + testHaskellDepends = [ + base constrained-categories containers lens linearmap-category + pragmatic-show tasty tasty-hunit tasty-quickcheck vector-space ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "Coordinate-free hypersurfaces"; @@ -130017,15 +130635,16 @@ self: { }) {}; "manifolds-core" = callPackage - ({ mkDerivation, base, tagged, vector-space }: + ({ mkDerivation, base, call-stack, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.4.1.0"; - sha256 = "041b4mjrl800vlyg1ibfmmyp87ad2mak6171s2mlc4mwsi4xrl4g"; - libraryHaskellDepends = [ base tagged vector-space ]; + version = "0.4.4.0"; + sha256 = "00b24ry943f6m46wkbxh8452q9xswcn2ri9c511r9bsinhzg653q"; + libraryHaskellDepends = [ base call-stack tagged vector-space ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "map-exts" = callPackage @@ -133119,8 +133738,8 @@ self: { }: mkDerivation { pname = "milena"; - version = "0.5.1.0"; - sha256 = "0vfypwp503ab91hca5mmclgxxy0ggzd9g90h7jaj5vxrij7ya5ly"; + version = "0.5.2.0"; + sha256 = "06gx1j9bxzxnagsymgr0nzhs1s6jsr14mhh2qx38h85n5g12zpvb"; libraryHaskellDepends = [ base bytestring cereal containers digest lens lifted-base monad-control mtl murmur-hash network random resource-pool @@ -133130,6 +133749,7 @@ self: { base bytestring lens mtl network QuickCheck semigroups tasty tasty-hspec tasty-quickcheck ]; + homepage = "https://github.com/adamflott/milena.git#readme"; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -134060,6 +134680,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "model_0_4_1" = callPackage + ({ mkDerivation, base, containers, convertible, deepseq, doctest + , filemanip, ghc-prim, pretty, tasty, tasty-hunit, tasty-quickcheck + , transformers + }: + mkDerivation { + pname = "model"; + version = "0.4.1"; + sha256 = "115apma3mbvpskd5kbgccs4g4d1n9g5lj62bd9appd0d0i8rskf8"; + libraryHaskellDepends = [ + base containers convertible deepseq pretty transformers + ]; + testHaskellDepends = [ + base containers doctest filemanip ghc-prim pretty tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "http://github.com/tittoassini/model"; + description = "Derive a model of a data type using Generics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "modelicaparser" = callPackage ({ mkDerivation, ansi-terminal, base, containers, filepath, parsec , QuickCheck @@ -134077,6 +134719,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "modern-uri" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant + , criterion, deepseq, exceptions, hspec, hspec-megaparsec + , megaparsec, profunctors, QuickCheck, template-haskell, text + , weigh + }: + mkDerivation { + pname = "modern-uri"; + version = "0.1.0.0"; + sha256 = "04k6v2mdkwdwvphfhhm7dwgy12n3kwxi02azkpzng0qa24vb1w1r"; + libraryHaskellDepends = [ + base bytestring containers contravariant deepseq exceptions + megaparsec profunctors QuickCheck template-haskell text + ]; + testHaskellDepends = [ + base bytestring hspec hspec-megaparsec megaparsec QuickCheck text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq megaparsec text weigh + ]; + homepage = "https://github.com/mrkkrp/modern-uri"; + description = "Modern library for working with URIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "modify-fasta" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split @@ -135890,6 +136558,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mono-traversable_1_0_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, foldl + , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split + , text, transformers, unordered-containers, vector + , vector-algorithms + }: + mkDerivation { + pname = "mono-traversable"; + version = "1.0.4.0"; + sha256 = "0qwmzjf25gradzajr4f9zw3a48m4hw26qvqnb134daqkyxpkzf13"; + libraryHaskellDepends = [ + base bytestring containers hashable split text transformers + unordered-containers vector vector-algorithms + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec HUnit QuickCheck semigroups + text transformers unordered-containers vector + ]; + benchmarkHaskellDepends = [ base criterion mwc-random vector ]; + homepage = "https://github.com/snoyberg/mono-traversable"; + description = "Type classes for mapping, folding, and traversing monomorphic containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mono-traversable-instances" = callPackage ({ mkDerivation, base, comonad, containers, dlist, dlist-instances , mono-traversable, semigroupoids, semigroups, transformers @@ -135973,15 +136666,23 @@ self: { }) {}; "monoid-statistics" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, math-functions, QuickCheck, tasty + , tasty-quickcheck, vector, vector-th-unbox + }: mkDerivation { pname = "monoid-statistics"; - version = "0.3.1"; - sha256 = "0gfdjmx457r580lc40vpg8fkzd8n971b5vam96v6kzssg2cznqy3"; - libraryHaskellDepends = [ base ]; - homepage = "https://bitbucket.org/Shimuuar/monoid-statistics"; + version = "1.0.0"; + sha256 = "0n3q8izk197lrkvm6hmdzg7dl1mzji2z09b1wkz02pm4y0gganv3"; + libraryHaskellDepends = [ + base math-functions vector vector-th-unbox + ]; + testHaskellDepends = [ + base math-functions QuickCheck tasty tasty-quickcheck + ]; + homepage = "https://github.com/Shimuuar/monoid-statistics"; description = "Monoids for calculation of statistics of sample"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoid-subclasses" = callPackage @@ -136311,6 +137012,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "morte_1_6_11" = callPackage + ({ mkDerivation, alex, array, base, binary, code-page, containers + , criterion, 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.11"; + sha256 = "10zwdf82hxjgxh7zs7wlnvyzjpaqalwj7rlg454jjlml59ifzvmw"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = 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 code-page optparse-applicative text text-format + ]; + testHaskellDepends = [ + base mtl QuickCheck system-filepath tasty tasty-hunit + tasty-quickcheck text transformers + ]; + benchmarkHaskellDepends = [ base criterion system-filepath text ]; + description = "A bare-bones calculus of constructions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mosaico-lib" = callPackage ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels @@ -136343,6 +137077,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "motor" = callPackage + ({ mkDerivation, base, CTRex, indexed, indexed-extras, reflection + }: + mkDerivation { + pname = "motor"; + version = "0.1.0.0"; + sha256 = "00jr7dlnm22cvjwprclizcbm4kw2i84zzzd7n6im9li00w1a2iwy"; + libraryHaskellDepends = [ + base CTRex indexed indexed-extras reflection + ]; + testHaskellDepends = [ base CTRex indexed indexed-extras ]; + description = "Type-safe effectful state machines in Haskell"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mount" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -139259,8 +140009,8 @@ self: { pname = "natural-transformation"; version = "0.4"; sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma"; - revision = "1"; - editedCabalFile = "1scwm1gs07znkj4ahfyxpwrksj4rdl1pa81xflcqhkqfgcndvgl3"; + revision = "2"; + editedCabalFile = "1j90pd1zznr18966axskad5w0kx4dvqg62r65rmw1ihqwxm1ndix"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -141433,8 +142183,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "0.9.0.0"; - sha256 = "099q24f9879sdwqa0jnlsamvpz1jbyryn90w7jp7np68avbhv9bf"; + version = "0.9.1.2"; + sha256 = "1428pkzj7kam7ya21fb3qchq95lvp6dp9dnh5qj41nkw9x5dz517"; libraryHaskellDepends = [ async base binary bytestring monad-loops template-haskell unix ]; @@ -141490,8 +142240,8 @@ self: { }: mkDerivation { pname = "nice-html"; - version = "0.2.0"; - sha256 = "0lkqqfp6x3w9lxh1jgm6c07pyfz1yr7drkr15s1m9vwvdh7mj24v"; + version = "0.3.0"; + sha256 = "1ns6qrzm9lwbgjcr7mw58g0qivbqac4yxisvbfy9j2cq3dqzm6d3"; libraryHaskellDepends = [ base bifunctors blaze-markup bytestring data-default-class deepseq free recursion-schemes template-haskell text transformers vector @@ -142663,6 +143413,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "numbered-semigroups" = callPackage + ({ mkDerivation, base, call-stack, semigroups }: + mkDerivation { + pname = "numbered-semigroups"; + version = "0.1.0.0"; + sha256 = "100r6k3cwycl75mj9g1x4w4qv064v8bdaan5rsj2vnvx4w1jrhp2"; + libraryHaskellDepends = [ base call-stack semigroups ]; + homepage = "https://github.com/leftaroundabout/numbered-semigroups"; + description = "A sequence of semigroups, for composing stuff in multiple spatial directions"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "numbering" = callPackage ({ mkDerivation, base, containers, vector }: mkDerivation { @@ -143435,6 +144197,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "octane_0_20_3" = callPackage + ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers + , data-default-class, file-embed, http-client, http-client-tls + , overloaded-records, rattletrap, text + }: + mkDerivation { + pname = "octane"; + version = "0.20.3"; + sha256 = "0rjvl7f3sa8i7a1svhh4phc2r2zjjwi1p3cajnwzms7kasmcqfjp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bimap binary bytestring containers data-default-class + file-embed overloaded-records rattletrap text + ]; + executableHaskellDepends = [ + aeson base bimap binary bytestring containers data-default-class + file-embed http-client http-client-tls overloaded-records + rattletrap text + ]; + homepage = "https://github.com/tfausak/octane#readme"; + description = "Parse Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "octohat" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , base64-bytestring, bytestring, containers, cryptohash, dotenv @@ -144157,6 +144945,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye-trans_0_3_7" = callPackage + ({ mkDerivation, base, mtl, opaleye, postgresql-simple + , product-profunctors, transformers, transformers-base + }: + mkDerivation { + pname = "opaleye-trans"; + version = "0.3.7"; + sha256 = "17yfa0kgd3v8dlz77nlgplyi23f622f46z9q2xyswnrrf5w2c4z0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base mtl opaleye postgresql-simple product-profunctors transformers + transformers-base + ]; + executableHaskellDepends = [ + base opaleye postgresql-simple product-profunctors + ]; + homepage = "https://github.com/WraithM/opaleye-trans"; + description = "A monad transformer for Opaleye"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "open-browser" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -145342,6 +146153,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-simple_0_0_4" = callPackage + ({ mkDerivation, base, bytestring, directory, either, gitrev + , optparse-applicative, template-haskell, transformers + }: + mkDerivation { + pname = "optparse-simple"; + version = "0.0.4"; + sha256 = "1md24dlz6949rqv6y2x9d5r07lrqw42c21kdy09nk5y8r3mq43x0"; + libraryHaskellDepends = [ + base either gitrev optparse-applicative template-haskell + transformers + ]; + testHaskellDepends = [ base bytestring directory ]; + description = "Simple interface to optparse-applicative"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optparse-text" = callPackage ({ mkDerivation, base, hspec, optparse-applicative, text }: mkDerivation { @@ -145633,7 +146462,7 @@ self: { }) {}; "orgstat" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, colour + ({ mkDerivation, aeson, attoparsec, base, boxes, 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 @@ -145642,15 +146471,15 @@ self: { }: mkDerivation { pname = "orgstat"; - version = "0.1.1"; - sha256 = "0241f7d996akmqi1id6dqwki5yql7mgw331msxvza616s3gcyd36"; + version = "0.1.2"; + sha256 = "11q8n9sy841klms368bs0wl14wg0q5dq5gfcipzm25pw6jswfgyy"; 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 + aeson attoparsec base boxes 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 @@ -146472,6 +147301,54 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "pandoc_2_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , binary, blaze-html, blaze-markup, bytestring, Cabal + , case-insensitive, cmark-gfm, containers, criterion, data-default + , deepseq, Diff, directory, doctemplates, executable-path, filepath + , Glob, haddock-library, hslua, HTTP, http-client, http-client-tls + , http-types, JuicyPixels, mtl, network, network-uri, pandoc-types + , parsec, process, QuickCheck, random, safe, scientific, SHA + , skylighting, split, syb, tagsoup, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, temporary, texmath, text, time + , unix, unordered-containers, vector, xml, yaml, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.0.1"; + sha256 = "00c7iv2s70dijyd651sflncmba9dfbflrrzii1hn0m5als75jgmb"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring binary blaze-html + blaze-markup bytestring case-insensitive cmark-gfm containers + data-default deepseq directory doctemplates filepath Glob + haddock-library hslua HTTP http-client http-client-tls http-types + JuicyPixels mtl network network-uri pandoc-types parsec process + random safe scientific SHA skylighting split syb tagsoup temporary + texmath text time unix unordered-containers vector xml yaml + zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring containers Diff directory executable-path filepath + hslua pandoc-types process QuickCheck tasty tasty-golden + tasty-hunit tasty-quickcheck temporary text zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion text time + ]; + doCheck = false; + homepage = "http://pandoc.org"; + description = "Conversion between markup formats"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -146510,20 +147387,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_11_1_1" = callPackage + "pandoc-citeproc_0_11_1_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hs-bibutils, mtl - , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 + , Cabal, containers, data-default, directory, filepath, hs-bibutils + , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 , setenv, split, syb, tagsoup, temporary, text, time , unordered-containers, vector, xml-conduit, yaml }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.11.1.1"; - sha256 = "00732amji7xlrkxzlwc5rzkq6saxjlvwlvinhkw4hyh1w0d74qwj"; + version = "0.11.1.3"; + sha256 = "00c9r8v7rc8ff8gw41470c3marhp0vqrdywmj91565k4ri7wfnwp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ aeson base bytestring containers data-default directory filepath hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 @@ -146656,8 +147534,8 @@ self: { }: mkDerivation { pname = "pandoc-include-code"; - version = "1.1.0.0"; - sha256 = "1ygdmnmr4lw7f83xhqaa7m074ii6wbrsx148i9qx3inz5z2rm9b5"; + version = "1.1.1.0"; + sha256 = "016c6xf9avh4ydhd0vb5l044d4zlxgrpvp40v15889plrkbvxnbb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146764,17 +147642,17 @@ self: { }) {}; "pandoc-stylefrommeta" = callPackage - ({ mkDerivation, base, containers, HaTeX, MissingH, pandoc - , pandoc-types + ({ mkDerivation, base, bytestring, containers, MissingH, pandoc + , pandoc-types, text }: mkDerivation { pname = "pandoc-stylefrommeta"; - version = "0.1.0.1"; - sha256 = "1lzjia4fl2s6aak00cb79sq5n85wyfcdn5xjanl7x9xr07rv2641"; + version = "0.2.0.2"; + sha256 = "12yvbh8cx5r6llx0gnz70n1b3zwm3zc8bdciq3cxyfivci5iks2r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base containers HaTeX MissingH pandoc pandoc-types + base bytestring containers MissingH pandoc pandoc-types text ]; homepage = "http://github.com/lyokha/styleFromMeta"; description = "Pandoc filter to customize links, images and paragraphs"; @@ -147543,6 +148421,20 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "parameterized" = callPackage + ({ mkDerivation, base, data-diverse, hspec, transformers }: + mkDerivation { + pname = "parameterized"; + version = "0.3.0.0"; + sha256 = "148i3s6j38qvncbkk2hz86lbzprr5h7l7gpjqf0zb0ay0i9idczs"; + libraryHaskellDepends = [ base data-diverse transformers ]; + testHaskellDepends = [ base data-diverse hspec transformers ]; + homepage = "https://github.com/louispan/parameterized#readme"; + description = "Extensible records and polymorphic variants"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "parameterized-data" = callPackage ({ mkDerivation, base, template-haskell, type-level }: mkDerivation { @@ -148212,13 +149104,13 @@ self: { }) {}; "partial-semigroup" = callPackage - ({ mkDerivation, base, hedgehog }: + ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; - version = "0.2.0.1"; - sha256 = "0k3b66wlhi280wk3q5ilmcn93m4rch1ily8f3z79lpxjjlraz7lw"; + version = "0.3.0.2"; + sha256 = "0r2rhcq73lb18j03h5nk7j6vzv9qxjnw8zsir3zy6cynkv4w35zd"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hedgehog ]; + testHaskellDepends = [ base doctest hedgehog ]; homepage = "https://github.com/chris-martin/partial-semigroup"; description = "A partial binary associative operator"; license = stdenv.lib.licenses.asl20; @@ -148228,8 +149120,8 @@ self: { ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { pname = "partial-semigroup-hedgehog"; - version = "0.2.0.1"; - sha256 = "1c4rbf1x6llgprx0rgil71z3306ky9x59sl8db1z6hg9ykriv4n2"; + version = "0.3.0.1"; + sha256 = "0i1p3277qv05jrshj3f61l9ag10dlh0hbwx550achlff3blfqhdr"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; homepage = "https://github.com/chris-martin/partial-semigroup"; description = "Property testing for partial semigroups using Hedgehog"; @@ -148240,8 +149132,8 @@ self: { ({ mkDerivation, partial-semigroup-hedgehog }: mkDerivation { pname = "partial-semigroup-test"; - version = "0.2.0.1"; - sha256 = "1cdlwjq7bbbq7yz5flzjkj0kp5s991nwsjq52xiqhmlzbim598s4"; + version = "0.3.0.1"; + sha256 = "006dlck7dr1xs2wwd233bm87mf619dlwnb66xlcfp82ksdmnfl6n"; libraryHaskellDepends = [ partial-semigroup-hedgehog ]; doHaddock = false; homepage = "https://github.com/chris-martin/partial-semigroup"; @@ -149855,8 +150747,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.7.0"; - sha256 = "1snywd1qaj572m0nqdadqm9i86n0mhz8gcwwnaf35kk2sd8lvg6f"; + version = "2.7.1"; + sha256 = "079r6b1rvvwgagznxwf4j5i29jpqrvnck545ig004v2853r6x2f2"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger http-api-data @@ -150042,8 +150934,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.6.1"; - sha256 = "0i1a7xmspgxzlwi1z9jyh5ckjx16yba1xs289vh2id9400yh8c57"; + version = "2.6.2.1"; + sha256 = "0rk3rplz8y0b9macvb19w7m7ljnkq4gkmrjrdqdqcpga6ih357ik"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger mysql mysql-simple persistent @@ -150079,7 +150971,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "persistent-mysql-haskell_0_3_4_1" = callPackage + "persistent-mysql-haskell_0_3_5" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , io-streams, monad-control, monad-logger, mysql-haskell, network , persistent, persistent-template, resource-pool, resourcet, text @@ -150087,8 +150979,8 @@ self: { }: mkDerivation { pname = "persistent-mysql-haskell"; - version = "0.3.4.1"; - sha256 = "0w80z2098rh3svxncyaa4jrqdcdgzrfrzq4p981g34cs7kysfmn2"; + version = "0.3.5"; + sha256 = "0sc6hw112d8jk1rflyrmcc8gkjddl41bbw6hksyv7a5w6sc7z33n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150147,8 +151039,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.6.1"; - sha256 = "0w7qssz4avq82vzs40kf82gkjdkcxqbkrfq6kz39x9m3za9b9pqc"; + version = "2.6.2"; + sha256 = "0140cki5c5aj21qg2cvqm5a511l6n4zbx3vb94hpfr1bs9nmfjam"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -150261,8 +151153,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.6.2"; - sha256 = "1gw5p531187dqchi7384q3irh9n8p7prs172zpq9r1l1ziqw8dk1"; + version = "2.6.3"; + sha256 = "0wgj8v6wkqvj60klmxlmhgmbl6yp3i425v95p8s45wm96phpzn9l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151244,32 +152136,6 @@ self: { }) {}; "pinboard" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec - , http-client, http-client-tls, http-types, monad-logger, mtl - , network, profunctors, QuickCheck, random, safe-exceptions - , semigroups, text, time, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "pinboard"; - version = "0.9.12.5"; - sha256 = "1gvq7slby26cm62203gh13s4blwphiy0chdhkp3vl4k3gjlbslam"; - libraryHaskellDepends = [ - aeson base bytestring containers http-client http-client-tls - http-types monad-logger mtl network profunctors random - safe-exceptions text time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers hspec mtl QuickCheck - safe-exceptions 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_6" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , http-client, http-client-tls, http-types, monad-logger, mtl , network, profunctors, QuickCheck, random, safe-exceptions @@ -151293,7 +152159,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 @@ -154938,6 +155803,33 @@ self: { pname = "postgresql-typed"; version = "0.5.1"; sha256 = "0bvrbbzqjvzsm0bqinvbcz897fzf1isg76mk3hniyf8l9a19a3wv"; + revision = "1"; + editedCabalFile = "047bjdwgg94gbpzcapar46vw33n4g8gx639ns9i4d32105w32f0r"; + libraryHaskellDepends = [ + aeson array attoparsec base binary bytestring containers cryptonite + haskell-src-meta HDBC memory network old-locale postgresql-binary + scientific template-haskell text time utf8-string uuid + ]; + testHaskellDepends = [ + base bytestring containers convertible HDBC HUnit network + QuickCheck time + ]; + homepage = "https://github.com/dylex/postgresql-typed"; + description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "postgresql-typed_0_5_2" = callPackage + ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring + , containers, convertible, cryptonite, haskell-src-meta, HDBC + , HUnit, memory, network, old-locale, postgresql-binary, QuickCheck + , scientific, template-haskell, text, time, utf8-string, uuid + }: + mkDerivation { + pname = "postgresql-typed"; + version = "0.5.2"; + sha256 = "0ws9xmh199jsvdmxjxkhm59j05ljfsrf16xchkbxqd8p1pg8786c"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers cryptonite haskell-src-meta HDBC memory network old-locale postgresql-binary @@ -155053,6 +155945,7 @@ self: { homepage = "https://github.com/diogob/postgrest-ws#readme"; description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postie" = callPackage @@ -155084,8 +155977,8 @@ self: { }: mkDerivation { pname = "postmark"; - version = "0.2.1"; - sha256 = "1afy3yra89909vilwr36j8vrvkhsy1xcp1jcvrdj90bj93rq64v3"; + version = "0.2.2"; + sha256 = "043q69v629r6y8ljij8nmfjz4qs3181278wrnlfgagfahh98pg0b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155427,8 +156320,8 @@ self: { }: mkDerivation { pname = "preamble"; - version = "0.0.49"; - sha256 = "1xk8l4lbicl1k6xr14x80dlc5g55dj59xgzgx01b61d0k595mmj1"; + version = "0.0.50"; + sha256 = "09gsl99ikglf1cyzmy53xcn2lb549z6gi5930ldz03nd50lg0fdg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156640,14 +157533,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_1_0" = callPackage + "process_1_6_2_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.1.0"; - sha256 = "0lwaa9qfh1x8zgmq7panhsvrs1nwcc1fficcg391dxp995ga4pr4"; + version = "1.6.2.0"; + sha256 = "0gsyzwvid2w1z5m0w492sqb8q8c86q9wa7iqjadcdhbv8ag9z6xm"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -157529,8 +158422,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "4.8.1"; - sha256 = "14q1zd6bvrfcs21pklxd6wgiqpb92v0464k4zhq9l31v4k2p5zpk"; + version = "4.9.0"; + sha256 = "1pciifl4hm5bmdx2li4hj3cm41ffj7s23r4ivkr8x3zghmik3n88"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157953,8 +158846,8 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.4.4"; - sha256 = "1qlkilnxfx5grim0hxf7drg2m48z76f88d4r61sy71npybf3mqnv"; + version = "2.4.5"; + sha256 = "1dcyv89z3869zd43wkby7xrzb1gz1iy2jrdr7yk45q2d1i63ssh4"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -157968,8 +158861,8 @@ self: { ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.4.4"; - sha256 = "0jr1clff6vn8lpx2rbc72angn0glc2v18ji5lqgzijri8zya9nqj"; + version = "2.4.5"; + sha256 = "0rz1v9iab012sc2m45yvmag94xg64gjrw0pqddp8gvw67i5lfan3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers protocol-buffers @@ -158298,6 +159191,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ptr" = callPackage + ({ mkDerivation, base, base-prelude, bug, bytestring, contravariant + , mtl, profunctors, quickcheck-instances, rerebase, semigroups + , tasty, tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "ptr"; + version = "0.15.4"; + sha256 = "0hmj6411wqsa9wgh2i3aksbkx07yaz88lp9h6lj9r8qfyv9yls5l"; + libraryHaskellDepends = [ + base base-prelude bug bytestring contravariant mtl profunctors + semigroups text transformers + ]; + testHaskellDepends = [ + bug quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/nikita-volkov/ptr"; + description = "Abstractions for operations on pointers"; + license = stdenv.lib.licenses.mit; + }) {}; + "pub" = callPackage ({ mkDerivation, base, bytestring, hedis, optparse-generic, pipes , pipes-bytestring, text @@ -158846,8 +159761,8 @@ self: { }: mkDerivation { pname = "purescript-bridge"; - version = "0.11.1.0"; - sha256 = "0syx11yzan1m86skjlxwv17ickplbiamkhbf2xsif0w0216whbvx"; + version = "0.11.1.1"; + sha256 = "023j88q724l38zqry6v916na1hlqhcinb5pw3cqssmql0cf32ajh"; libraryHaskellDepends = [ base containers directory filepath generic-deriving lens mtl text transformers @@ -159060,7 +159975,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pusher-http-haskell_1_5_0_0" = callPackage + "pusher-http-haskell_1_5_0_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , containers, cryptonite, hashable, hspec, HTTP, http-client , http-types, memory, network-uri, QuickCheck, scientific, text @@ -159068,8 +159983,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.0.0"; - sha256 = "098vj92gwzspqp0xbd4dxxb3dggpdz5gpf616p2spkj9xvdqgy17"; + version = "1.5.0.1"; + sha256 = "08fgyvm1lp1yr9p9a6fr111x78rlzhr02gbsd6q6hjxnlffya4vf"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring containers cryptonite hashable HTTP http-client http-types memory text time transformers @@ -160866,8 +161781,8 @@ self: { }: mkDerivation { pname = "radium"; - version = "0.8.0"; - sha256 = "04pc3zy09hg7p9w54ffwvfcby3341vbpzlv2d9ma2q9py0ymx6d5"; + version = "0.9.0"; + sha256 = "142c2qra8080yndj2y0m0bdrqmf8l6r0z43pj1icdvjqj9451j16"; libraryHaskellDepends = [ base containers lens parsec ]; testHaskellDepends = [ base Cabal containers hspec lens parsec QuickCheck @@ -160895,13 +161810,15 @@ self: { }) {}; "radius" = callPackage - ({ mkDerivation, base, binary, bytestring, iproute, pretty-hex }: + ({ mkDerivation, base, binary, bytestring, cryptonite, iproute + , memory + }: mkDerivation { pname = "radius"; - version = "0.2.0.0"; - sha256 = "1arch1d93yijbm7r9a9ggjj7wzy7rk0immj5g8frczrbp0xpgmzy"; + version = "0.4.0.0"; + sha256 = "0bdixglg4yy5n6chw0n5mpk563dbkhh7iyzrmp9q2vpzxxvvdi06"; libraryHaskellDepends = [ - base binary bytestring iproute pretty-hex + base binary bytestring cryptonite iproute memory ]; homepage = "https://github.com/erickg/radius#readme"; description = "Remote Authentication Dial In User Service (RADIUS)"; @@ -161142,8 +162059,8 @@ self: { }: mkDerivation { pname = "rakuten"; - version = "0.1.0.0"; - sha256 = "18gasv78zq8l51kpwvx6gc089day6pmlz2f43vrfichqbivahmhf"; + version = "0.1.0.1"; + sha256 = "1y9kyipmhhy5f0f7v805a17x7g938vkvxnzj9n4h9rlprpdbdczc"; libraryHaskellDepends = [ aeson base bytestring connection constraints data-default-class extensible http-api-data http-client http-client-tls http-types @@ -161994,8 +162911,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "0.3.5"; - sha256 = "0mw59q5wbj5mbhznqd4szc5ps7d1r7gf490vdjqfblb5sqncy510"; + version = "0.3.6"; + sha256 = "04d93i7044zpax9hhx1xyipc8lliyn5z1xgq7k0011yzdsd8w31s"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid @@ -162006,15 +162923,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ratel_0_3_6" = callPackage + "ratel_0_3_7" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, filepath, http-client, http-client-tls, http-types , tasty, tasty-hspec, text, uuid }: mkDerivation { pname = "ratel"; - version = "0.3.6"; - sha256 = "04d93i7044zpax9hhx1xyipc8lliyn5z1xgq7k0011yzdsd8w31s"; + version = "0.3.7"; + sha256 = "0jwmlnxnaaldi1gr988gdy82y3ylvmi9ylnrsas8rg6pwyj76v9c"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid @@ -162837,8 +163754,8 @@ self: { }: mkDerivation { pname = "reactive-midyim"; - version = "0.4"; - sha256 = "0aq3iaq3l4wcdixa09q9na2n4l92nkzikjbma3mxl4d6gklhcvhy"; + version = "0.4.0.1"; + sha256 = "1ck2f8nhlhcw9vyh42svp94xrnd4jcvic2kzxikw50vjcd4w6rrf"; libraryHaskellDepends = [ base containers data-accessor data-accessor-transformers event-list midi non-negative random reactive-banana-bunch transformers @@ -164068,15 +164985,18 @@ self: { }) {}; "reflex-sdl2" = callPackage - ({ mkDerivation, base, dependent-sum, mtl, ref-tf, reflex, sdl2 }: + ({ mkDerivation, async, base, containers, dependent-sum + , exception-transformers, mtl, primitive, ref-tf, reflex, sdl2, stm + }: mkDerivation { pname = "reflex-sdl2"; - version = "0.1.0.0"; - sha256 = "1k18lb7aa440i76yd6x4bh3sz6wsqv1cq1l93wpac1673bvxicll"; + version = "0.2.0.0"; + sha256 = "1aqcmj9gv1dhm8vqykawphk41fi24k4k061ynvfnpdypakldlvvw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base dependent-sum mtl ref-tf reflex sdl2 + async base containers dependent-sum exception-transformers mtl + primitive ref-tf reflex sdl2 stm ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/schell/reflex-sdl2#readme"; @@ -165271,13 +166191,13 @@ self: { "relational-record-examples" = callPackage ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3 - , persistable-record, relational-query, relational-query-HDBC - , relational-schemas, template-haskell, time + , persistable-record, product-isomorphic, relational-query + , relational-query-HDBC, relational-schemas, template-haskell, time }: mkDerivation { pname = "relational-record-examples"; - version = "0.3.2.1"; - sha256 = "1y0bxg2sgrq72wpa1llymhn3kbks7krnsh0qzqd1cqni01g6q8hv"; + version = "0.4.0.0"; + sha256 = "0ch075l87sxxgmvis6hnrpc72lr0v21nx0xhw0ahpirqbw01ndqh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165286,10 +166206,11 @@ self: { template-haskell ]; executableHaskellDepends = [ - base relational-query template-haskell time + base product-isomorphic relational-query template-haskell time ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-schemas" = callPackage @@ -166260,8 +167181,8 @@ self: { pname = "req-conduit"; version = "0.2.1"; sha256 = "1f3nbmdmkr68i5nm3527s06w9crdgn9jrkzam2fgcg8qp6q73q4c"; - revision = "1"; - editedCabalFile = "0pz1pz7l06c6g0d6ripgb8yn5kz5zryzjhabnx93d89qix0dzkg3"; + revision = "2"; + editedCabalFile = "1r7qfg670gdncb9yszgg4dw5x8az17cfgbkpbnb7zjdy7rqrj442"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -166418,15 +167339,14 @@ self: { }: mkDerivation { pname = "resolv"; - version = "0.1.1.0"; - sha256 = "03k0r57q93y3iv3g62zpjhh5a647v3g9imn3z9jr1vnj5gracyh5"; + version = "0.1.1.1"; + sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; testHaskellDepends = [ base bytestring directory filepath tasty tasty-hunit ]; - homepage = "http://github.com/hvr/resolv"; description = "Domain Name Service (DNS) lookup via the libresolv standard library routines"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -166759,6 +167679,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rest-snap_0_3_0_0" = callPackage + ({ mkDerivation, base, base-compat, bytestring, case-insensitive + , rest-core, safe, snap-core, unordered-containers, uri-encode + , utf8-string + }: + mkDerivation { + pname = "rest-snap"; + version = "0.3.0.0"; + sha256 = "1s38xrmg90y80rxmz1kf5wfxq7dgf63xysicg0jfawwl3sy88iff"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive rest-core safe + snap-core unordered-containers uri-encode utf8-string + ]; + description = "Rest driver for Snap"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rest-stringmap" = callPackage ({ mkDerivation, aeson, base, containers, hashable, hxt , json-schema, tostring, unordered-containers @@ -167012,8 +167950,8 @@ self: { }: mkDerivation { pname = "retry"; - version = "0.7.4.2"; - sha256 = "0z5ls9z5zcqkk3vbpl4wdgspi98n19m5i8mfian1fyxkf0jkj6sj"; + version = "0.7.4.3"; + sha256 = "0i47gmlljz00fwf2qwkrh24hgsyw5sz2npaighx4wxvykf00d390"; libraryHaskellDepends = [ base data-default-class exceptions ghc-prim random transformers ]; @@ -167243,8 +168181,8 @@ self: { }: mkDerivation { pname = "rhine"; - version = "0.1.0.0"; - sha256 = "1gjz5i7a00kq48fkg7ms3qr04jzg8mw5vb3lgn1pflp45m4p95vi"; + version = "0.1.1.0"; + sha256 = "1vl7hnnb2bmrzaf4231pq9rvn8l7y2y3x5g6b1ry77rb45bzspkq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167253,6 +168191,7 @@ self: { executableHaskellDepends = [ base ]; description = "Functional Reactive Programming with type-level clocks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rhythm-game-tutorial" = callPackage @@ -168179,6 +169118,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rose-trees_0_0_4_4" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, hashable + , mtl, QuickCheck, quickcheck-instances, semigroupoids, semigroups + , sets, tasty, tasty-quickcheck, unordered-containers, witherable + }: + mkDerivation { + pname = "rose-trees"; + version = "0.0.4.4"; + sha256 = "1kbjkfknl2pyp30n5c6m6xavqlm8zg06w78b3x7iwvi854yi64r3"; + libraryHaskellDepends = [ + base containers deepseq hashable mtl QuickCheck + quickcheck-instances semigroupoids semigroups sets + unordered-containers witherable + ]; + testHaskellDepends = [ + base containers deepseq hashable QuickCheck quickcheck-instances + semigroupoids semigroups sets tasty tasty-quickcheck + unordered-containers witherable + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq hashable mtl QuickCheck + quickcheck-instances semigroupoids semigroups sets + unordered-containers witherable + ]; + description = "A collection of rose tree structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rose-trie" = callPackage ({ mkDerivation, base, containers, deepseq, minilens, mtl , transformers @@ -169607,6 +170575,7 @@ self: { homepage = "https://github.com/kccqzy/haskell-sajson#readme"; description = "Fast JSON parsing powered by Chad Austin's sajson library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "saltine" = callPackage @@ -170186,13 +171155,13 @@ self: { ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-conduit, bytestring, conduit , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck , template-haskell, text, unordered-containers, yaml }: mkDerivation { pname = "sbp"; - version = "2.2.12"; - sha256 = "14c188bn883nd5nngvydx6aj8z7x1cgjgsl41l8a6hsiwjx721l0"; + version = "2.2.15"; + sha256 = "02y9mvy2ij1kdn06wgdpn5y5f4wa814lj4krvfsjyc2g9am06y83"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170202,7 +171171,7 @@ self: { ]; executableHaskellDepends = [ aeson base basic-prelude binary-conduit bytestring conduit - conduit-extra yaml + conduit-extra resourcet yaml ]; testHaskellDepends = [ aeson base base64-bytestring basic-prelude bytestring QuickCheck @@ -170242,8 +171211,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "7.3"; - sha256 = "01vcil4zij8ap1bnkmmi8439mmnsbw3qc1gw994wdnar082wzh66"; + version = "7.4"; + sha256 = "0yylg2zdrcqzckhmlz9d5chac1jawbnrdp7fn49ia1nsl0i3jggc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum data-binary-ieee754 deepseq @@ -170645,7 +171614,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "schematic_0_4_0_0" = callPackage + "schematic_0_4_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hjsonschema , hspec, hspec-core, hspec-discover, hspec-smallcheck, HUnit, lens , mtl, profunctors, regex-tdfa, regex-tdfa-text, scientific @@ -170654,8 +171623,8 @@ self: { }: mkDerivation { pname = "schematic"; - version = "0.4.0.0"; - sha256 = "1n0i7irbf4flnhybhvl5kqkcyz673nyv7bl8z14yxi152a7kjkqi"; + version = "0.4.2.0"; + sha256 = "0k63pnv8mip8kn623s5n7w24bd4spjmi1a9h280nf7wd1q8z72n4"; libraryHaskellDepends = [ aeson base bytestring containers hjsonschema mtl profunctors regex-tdfa regex-tdfa-text scientific singletons smallcheck tagged @@ -170858,6 +171827,8 @@ self: { pname = "scientific"; version = "0.3.5.2"; sha256 = "0msnjz7ml0zycw9bssslxbg0nigziw7vs5km4q3vjbs8jpzpkr2w"; + revision = "1"; + editedCabalFile = "1gnz52yrd9bnq4qvd4v9kd00clx0sfbh64phafdq5g2hbk9yrg0v"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-gmp integer-logarithms primitive text @@ -171651,7 +172622,7 @@ self: { executableHaskellDepends = [ base data-default-class sdl2 vector ]; description = "Bindings to SDL2_mixer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2_mixer;}; "sdl2-ttf" = callPackage @@ -172560,15 +173531,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sensu-run_0_4_0" = callPackage + "sensu-run_0_4_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, http-client , http-types, lens, network, optparse-applicative, process , temporary, text, time, unix, unix-compat, vector, wreq }: mkDerivation { pname = "sensu-run"; - version = "0.4.0"; - sha256 = "0wsrm7l12yfm89yfd5y1w8xypfg29d2s1afy7m8dpcdypmrxrghw"; + version = "0.4.0.1"; + sha256 = "05vmrbf3hk26ya5rvhadc8q1qb932x2n0x153bhafbf60yzc4bc5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -173078,8 +174049,8 @@ self: { pname = "servant"; version = "0.11"; sha256 = "00vbhijdxb00n8ha068zdwvqlfqv1iradkkdchzzvnhg2jpzgcy5"; - revision = "1"; - editedCabalFile = "1az9id2dl7psc8lknf7y9cvzkivcjzw7g27yyp40flb6bfvmaqp3"; + revision = "2"; + editedCabalFile = "1b5zxz1cqf0n2y1jfvb1rsza95hdyhn9fc6fl73bxr5m9apv511z"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring case-insensitive @@ -173211,6 +174182,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-auth-cookie_0_5_0_6" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring + , cereal, cookie, criterion, 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.5.0.6"; + sha256 = "1bxvgf71710jzs0k83bz4rdj7zsagmwpsqv96invw8d7shipg650"; + isLibrary = true; + isExecutable = true; + 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 bytestring cereal cryptonite data-default deepseq hspec + QuickCheck servant-server time transformers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion cryptonite servant-server + ]; + description = "Authentication via encrypted cookies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-auth-docs" = callPackage ({ mkDerivation, base, doctest, Glob, hspec, lens, QuickCheck , servant, servant-auth, servant-docs, text, yaml @@ -173505,6 +174506,8 @@ self: { pname = "servant-checked-exceptions"; version = "0.4.1.0"; sha256 = "19h0vywlh6b41mdjpka4b7rz4l6gxmjlvji8nzbgkllsjgr81g3g"; + revision = "1"; + editedCabalFile = "07srldxvgzgzxq5dik787ays7xylwsdmz8bv3ffvp435nvvpmrzr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173538,8 +174541,8 @@ self: { pname = "servant-client"; version = "0.11"; sha256 = "1yiar76gf1zg8jaymz0xq751xs51fp0ryra4x4hwg71s32l2nvga"; - revision = "1"; - editedCabalFile = "0ymiqsn6451znpn524w1wn129plnqbplbvwxwjpp1drz3ab6xk6b"; + revision = "2"; + editedCabalFile = "0w3b3036rv9vfya5ayn9z70rkwk7hd9zisl7klgxzk4fgfmc3sgd"; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring exceptions generics-sop http-api-data http-client http-client-tls @@ -173915,6 +174918,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-kotlin" = callPackage + ({ mkDerivation, aeson, base, containers, directory, formatting + , hspec, http-api-data, lens, servant, servant-foreign, shelly + , text, time, wl-pprint-text + }: + mkDerivation { + pname = "servant-kotlin"; + version = "0.1.0.0"; + sha256 = "0rsy8bmycmgxpnimaly08shlaqmna084bdgcxxs3ad0kicc427r1"; + libraryHaskellDepends = [ + base containers directory formatting lens servant servant-foreign + text time wl-pprint-text + ]; + testHaskellDepends = [ + aeson base containers directory formatting hspec http-api-data lens + servant servant-foreign text time wl-pprint-text + ]; + benchmarkHaskellDepends = [ + aeson base containers directory formatting http-api-data lens + servant servant-foreign shelly text time wl-pprint-text + ]; + homepage = "https://github.com/matsubara0507/servant-kotlin#readme"; + description = "Automatically derive Kotlin class to query servant webservices"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-lucid" = callPackage ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { @@ -173959,8 +174988,8 @@ self: { pname = "servant-mock"; version = "0.8.2"; sha256 = "146z4n7ayg0347kabwdz1crha7ilfdcdx3pazdgsmq2bl8mwad3w"; - revision = "1"; - editedCabalFile = "19vvzy09wj0yxjz4sv417c45h1n34nd7zc9n8agxavr3wyi9lihh"; + revision = "2"; + editedCabalFile = "16zbbjz7rj7fg6qs8zjy9arz7bwza9pq1gn15csnsvm5n6qnpgal"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174347,10 +175376,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.11"; - sha256 = "1c821ia2741v7nxbv651hcj21dmcqnqf4ix198is5b63sj4ff3ib"; - revision = "1"; - editedCabalFile = "04s8kzc1jzarxg68nqgdckv0ajw846a1byqjksgzlqlmfqm0l32l"; + version = "0.11.0.1"; + sha256 = "0yrcs1ixy7mzifdyssi58m34xn95mfy9zxbkm9k5z6svqnv1qp72"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -174557,10 +175584,8 @@ self: { }: mkDerivation { pname = "servant-swagger-ui"; - version = "0.2.4.3.0.20"; - sha256 = "18qp908s0kjcz6dlvj2031kr8qjnzrgh2v92mdg4lwa1j7ddf0xn"; - revision = "1"; - editedCabalFile = "1wsbb9zaq5qv39hrymy1cma581337rbvqlm7y24jwfvk4vafs3fp"; + version = "0.2.4.3.4.0"; + sha256 = "1vb1bp7hjjyhb1p6x0j7z2ky05n72qm7zcmwgnsmnqalaxdnsvri"; libraryHaskellDepends = [ base blaze-markup bytestring directory file-embed filepath http-media servant servant-blaze servant-server servant-swagger @@ -174907,25 +175932,6 @@ self: { }) {}; "servius" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-html, bytestring - , http-types, markdown, shakespeare, text, wai, wai-app-static - }: - mkDerivation { - pname = "servius"; - version = "1.2.0.2"; - sha256 = "0asxkdg7csxmnpzw672jazynhnnc73ddpay65npql0jz93mq45n1"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base blaze-builder blaze-html bytestring http-types markdown - shakespeare text wai wai-app-static - ]; - homepage = "http://github.com/snoyberg/servius#readme"; - description = "Warp web server with template rendering"; - license = stdenv.lib.licenses.mit; - }) {}; - - "servius_1_2_0_3" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, bytestring , http-types, markdown, shakespeare, text, wai, wai-app-static }: @@ -174942,7 +175948,6 @@ self: { homepage = "http://github.com/snoyberg/servius#readme"; description = "Warp web server with template rendering"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ses-html" = callPackage @@ -175334,8 +176339,8 @@ self: { }: mkDerivation { pname = "sext"; - version = "0.1.3"; - sha256 = "0z6a4ghv5knfcwv28bax4gny5za0k0y076d15bnk01qg293w273b"; + version = "0.1.3.1"; + sha256 = "0836faqrrb9wsw5hlm82587isw6rkn4v8i6dh9hzxsqif1izd363"; libraryHaskellDepends = [ base bytestring template-haskell text vector ]; @@ -175801,8 +176806,8 @@ self: { }: mkDerivation { pname = "shakers"; - version = "0.0.33"; - sha256 = "1wn0bk867nbzcg6c6a8q5sa4ma60r3zc46ykpdla34k61nq5g3qy"; + version = "0.0.35"; + sha256 = "14hkdkhpg5gs1mhd96ldy7xb35rqrr0cqnnaw3hmv2cyk6np7fnz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176694,8 +177699,8 @@ self: { ({ mkDerivation, base, bytestring, hsI2C, time, transformers }: mkDerivation { pname = "si-clock"; - version = "0.1.3"; - sha256 = "0s2d1liaknk5qhh41pi3508m3dz9k0ljl5fc2v1vs6ckv4sd9fjr"; + version = "0.1.3.1"; + sha256 = "15fk63nynpk5wz9ikij18g5vnrslsrv97fn649dkssmsdwifjfj5"; libraryHaskellDepends = [ base bytestring hsI2C time transformers ]; @@ -177753,18 +178758,18 @@ self: { }) {}; "simplessh" = callPackage - ({ mkDerivation, base, bytestring, mtl, ssh2 }: + ({ mkDerivation, base, bytestring, libssh2, mtl }: mkDerivation { pname = "simplessh"; version = "0.2.0.5"; sha256 = "1f0rck8shcm69bg2n2ijjad6dzrybfyrjqpsx5qh333mmz0q7bbq"; libraryHaskellDepends = [ base bytestring mtl ]; - librarySystemDepends = [ ssh2 ]; + librarySystemDepends = [ libssh2 ]; homepage = "http://hub.darcs.net/thoferon/simplessh"; description = "Simple wrapper around libssh2"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {ssh2 = null;}; + }) {inherit (pkgs) libssh2;}; "simplest-sqlite" = callPackage ({ mkDerivation, base, bytestring, exception-hierarchy, sqlite @@ -177908,8 +178913,8 @@ self: { ({ mkDerivation, base, singletons }: mkDerivation { pname = "singleton-nats"; - version = "0.4.0.2"; - sha256 = "1nrjdy7rkjla2cgyb2j50p7qi30divl6aa75m3yvf2whb38wgisw"; + version = "0.4.0.3"; + sha256 = "150pfyfgyvksx600c9c7pyw154dvjgfiykas3wxfzkm3l9mhg32v"; libraryHaskellDepends = [ base singletons ]; homepage = "https://github.com/AndrasKovacs/singleton-nats"; description = "Unary natural numbers relying on the singletons infrastructure"; @@ -178064,8 +179069,8 @@ self: { }: mkDerivation { pname = "sitepipe"; - version = "0.1.1"; - sha256 = "1kymvi3pf67chjsvqxv29i4fbac2yyrjx5llc2r7qjfw3hblf5sj"; + version = "0.2.0.0"; + sha256 = "15cynic59qkfgb8d3ca6hr3dag0cs48af266xaiblpvim39rk1fb"; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions filepath Glob lens lens-aeson megaparsec MissingH mtl mustache @@ -178391,7 +179396,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_4_1" = callPackage + "skylighting_0_4_3_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , blaze-html, bytestring, case-insensitive, containers, criterion , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show, random @@ -178400,8 +179405,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.4.1"; - sha256 = "0dsngs2nw2ijhxxwa8d7fb9rxgqz6kgimbsvxmhpd5s4y6a1ygf4"; + version = "0.4.3.1"; + sha256 = "087f41qx28609i9ryc5njvjyyw1n3ypym63vmw2q4bhlr5lxkf30"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180202,17 +181207,26 @@ self: { }) {}; "snaplet-redis" = callPackage - ({ mkDerivation, base, configurator, hedis, lens, mtl, network - , snap, text, transformers + ({ mkDerivation, aeson, base, bytestring, cereal, clientsession + , configurator, hedis, heist, lens, monad-control, mtl, network + , snap, snap-core, snap-server, text, time, transformers + , unordered-containers, xmlhtml }: mkDerivation { pname = "snaplet-redis"; - version = "0.1.4.2"; - sha256 = "0ri5cj3gjz5c1snh7kbncb08ijs1551ixr06v3nxjsb03hrl4hhh"; + version = "0.1.5"; + sha256 = "12c4pgh2axnvd7hnyf0xpnsidfss39siys3nzwafdmm0p5wf67bx"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base configurator hedis lens mtl network snap text transformers + base bytestring cereal clientsession configurator hedis lens mtl + network snap snap-core text time transformers unordered-containers ]; - homepage = "https://github.com/dzhus/snaplet-redis/"; + executableHaskellDepends = [ + aeson base bytestring hedis heist lens monad-control mtl snap + snap-core snap-server text time xmlhtml + ]; + homepage = "https://github.com/dzhus/snaplet-redis#readme"; description = "Redis support for Snap Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -181879,8 +182893,8 @@ self: { ({ mkDerivation, base, cmdargs, containers, leancheck }: mkDerivation { pname = "speculate"; - version = "0.2.9"; - sha256 = "0xk8i5hskr59vrf8vkvwsvp4n048fd66k959q7nl0i5z3k0lx2m2"; + version = "0.2.10"; + sha256 = "1c2fpswmlrza9al6i94rjnd1k14g5f48g4zrqgyxrgl4sqkhbbs9"; libraryHaskellDepends = [ base cmdargs containers leancheck ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -185404,15 +186418,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_10_0" = callPackage + "stratosphere_0_11_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable , hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.10.0"; - sha256 = "195rr247bzrnnvjv7i13z88xbpajxk34n94ywqvfyf3457466iqh"; + version = "0.11.0"; + sha256 = "1l9wyyw8zvmb7z0qvs5qk0mxbjnlm1405sxiz7wzff6ibxvk9kn5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187034,6 +188048,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "substring-parser" = callPackage + ({ mkDerivation, attoparsec, base, hspec, NoTrace, text }: + mkDerivation { + pname = "substring-parser"; + version = "0.1.0.0"; + sha256 = "0f4rbfpdhbnpk4gm4rsavblqdabxlqbf58xr9rvjcxq62hac6lvc"; + libraryHaskellDepends = [ attoparsec base NoTrace text ]; + testHaskellDepends = [ attoparsec base hspec NoTrace text ]; + homepage = "https://gitlab.com/igrep/substring-parser"; + description = "Match / replace substrings with a parser combinators"; + license = stdenv.lib.licenses.asl20; + }) {}; + "subtitleParser" = callPackage ({ mkDerivation, attoparsec, base, containers, text }: mkDerivation { @@ -187736,8 +188763,8 @@ self: { }: mkDerivation { pname = "swagger-petstore"; - version = "0.0.1.4"; - sha256 = "177aipxcycs79kh5vdkgq5rj8n0mixy374mxaggfp959i28rx164"; + version = "0.0.1.5"; + sha256 = "0fpviny6yxrmdhraan3ffhgwynn1lj88xdj093jf4229ysj0cskk"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -188919,8 +189946,8 @@ self: { ({ mkDerivation, base, process, regex, regex-with-pcre }: mkDerivation { pname = "system-info"; - version = "0.1.0.8"; - sha256 = "0pv4f5yrzybm2r1zi02ranq1ag1akkpzzc8w3qjpwliv2ahy4516"; + version = "0.1.0.9"; + sha256 = "0f27y3bdqlyvbxdchsn7mz2rhsvk4bxqy0xldy6l30vsv2q9gdx4"; libraryHaskellDepends = [ base process regex regex-with-pcre ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; @@ -190340,6 +191367,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty_0_12" = callPackage + ({ mkDerivation, ansi-terminal, async, base, clock, containers + , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged + , unbounded-delays, unix + }: + mkDerivation { + pname = "tasty"; + version = "0.12"; + sha256 = "0840ziawhj0lrzn927nx9lww6wxc5krvf0c3xygl577vvxh4adg1"; + libraryHaskellDepends = [ + ansi-terminal async base clock containers deepseq mtl + optparse-applicative regex-tdfa stm tagged unbounded-delays unix + ]; + homepage = "https://github.com/feuerbach/tasty"; + description = "Modern and extensible testing framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-ant-xml" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers @@ -190393,12 +191439,12 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "tasty-dejafu_0_7_0_2" = callPackage + "tasty-dejafu_0_7_0_3" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "0.7.0.2"; - sha256 = "1yj4sdprlz79sk14q5b8089sw1bn0z4nqpbdb2sr90smlxa57zpa"; + version = "0.7.0.3"; + sha256 = "0xvqlw5w5rwz1xxi277r9w7iad7prds5i1rrmy8wz3x3vh9kbnmm"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; @@ -190553,6 +191599,8 @@ self: { pname = "tasty-hspec"; version = "1.1.3.2"; sha256 = "0n4pn89jz9i8d7mxsdp6ynwkg5gjyaipdy261parx64m3nxi4vcv"; + revision = "1"; + editedCabalFile = "05fl6jirj479lax2wqg6h5m82mkc475lhas7wmpx91kv1kfklx54"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck random tagged tasty tasty-quickcheck tasty-smallcheck @@ -190817,6 +191865,8 @@ self: { pname = "tasty-stats"; version = "0.2.0.3"; sha256 = "1jyywffrs270rvf8k9zc82b7fqqv6x1czk6qlbi6sq9z1wgs5w1b"; + revision = "1"; + editedCabalFile = "1kvvz549gs7vm9w6gypr8pa1klsab335rzmdq7v638rvijgqfbn8"; libraryHaskellDepends = [ base containers directory process stm tagged tasty time ]; @@ -190859,6 +191909,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-travis" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit }: + mkDerivation { + pname = "tasty-travis"; + version = "0.1.2"; + sha256 = "0ypk596sjlh6s2gyy1bgx414jhhfhaaqqqdl9647mjsd49a83g2s"; + libraryHaskellDepends = [ base tasty ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "https://github.com/merijn/tasty-travis"; + description = "Fancy Travis CI output for tasty tests"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tateti-tateti" = callPackage ({ mkDerivation, array, base, lens-simple, mtl, ncurses, random }: mkDerivation { @@ -192212,6 +193275,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "test-fixture_0_5_1_0" = callPackage + ({ mkDerivation, base, data-default-class, exceptions + , haskell-src-exts, haskell-src-meta, hspec, hspec-discover, mtl + , template-haskell, th-orphans, transformers + }: + mkDerivation { + pname = "test-fixture"; + version = "0.5.1.0"; + sha256 = "1mjy7nx2w7gvsibvc5vl21hr8ypxd4qdiy46iagnfij1k3kdh6wv"; + libraryHaskellDepends = [ + base data-default-class exceptions haskell-src-exts + haskell-src-meta mtl template-haskell th-orphans + ]; + testHaskellDepends = [ + base hspec hspec-discover mtl template-haskell transformers + ]; + 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 ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers , hostname, old-locale, random, regex-posix, time, xml @@ -192578,13 +193663,18 @@ self: { }) {}; "testCom" = callPackage - ({ mkDerivation, base, haskell-src-meta, template-haskell }: + ({ mkDerivation, base, haskell-src-meta, random, template-haskell + }: mkDerivation { pname = "testCom"; - version = "0.2.0"; - sha256 = "1gp8ylpp6315srcr1pi78a9f6kr24kp5dyfml9yibj35qd6wdil2"; - libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; - testHaskellDepends = [ base haskell-src-meta template-haskell ]; + version = "0.3.0"; + sha256 = "0j9mh47jq6igh5xkalgbrvjrvjsnyl7ir6jq7kr9rhh7rab4m7h1"; + libraryHaskellDepends = [ + base haskell-src-meta random template-haskell + ]; + testHaskellDepends = [ + base haskell-src-meta random template-haskell + ]; description = "Write your tests in comments"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -192761,8 +193851,8 @@ self: { }: mkDerivation { pname = "texbuilder"; - version = "0.1.1.1"; - sha256 = "14fg4hxyfvv54n85495dbk6avccms92kw5jzgycylnk8aiw2nxa4"; + version = "0.1.1.2"; + sha256 = "069y2d2k87sfx4mkmd8219iiyh9s6x79kigxbdi9swfa4k9xa1gm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -192800,6 +193890,31 @@ self: { license = "GPL"; }) {}; + "texmath_0_10" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, network-uri, pandoc-types, parsec, process, split, syb + , temporary, text, utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.10"; + sha256 = "0i9haxii7kklz6qrfidb54iv5cl73p201zy24mwkf4bf56lff1pa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb xml + ]; + executableHaskellDepends = [ network-uri ]; + 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 @@ -192989,8 +194104,8 @@ self: { }: mkDerivation { pname = "text-format-heavy"; - version = "0.1.4.0"; - sha256 = "1kmiksxzvd99d762n4vgrx90awsdy0s3gm1a5s73r9yd79pajq5n"; + version = "0.1.5.0"; + sha256 = "127h2pw3p9ixx34jiql9kgpjbjmkmwigm56iklaz6wxd69zr0sfx"; libraryHaskellDepends = [ base bytestring containers data-default parsec text time ]; @@ -194359,8 +195474,8 @@ self: { }: mkDerivation { pname = "thank-you-stars"; - version = "0.1.0"; - sha256 = "1qxi26g81ndrx8vxckb8hkpaqqpbd60r2ck705mhafrv0yd3kry7"; + version = "0.2.0"; + sha256 = "0a1mv7k7m4yaadfrmb45s09aa5zy0wd2jccjsyqhp63v89m58z8j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194368,7 +195483,9 @@ self: { hackage-db req split text ]; executableHaskellDepends = [ base containers directory filepath ]; - testHaskellDepends = [ base Cabal containers hackage-db hspec ]; + testHaskellDepends = [ + base Cabal containers directory filepath hspec + ]; homepage = "https://github.com/y-taka-23/thank-you-stars#readme"; description = "Give your dependencies stars on GitHub!"; license = stdenv.lib.licenses.bsd3; @@ -194616,16 +195733,16 @@ self: { "thread-hierarchy" = callPackage ({ mkDerivation, base, containers, hspec, lifted-base - , monad-control, transformers-base + , monad-control, stm, transformers-base }: mkDerivation { pname = "thread-hierarchy"; - version = "0.1.0.2"; - sha256 = "1fhbwzx8shf2ph9l5mkrlz40dxdzn02rvjgz9l2kvjmi8v5rclxk"; + version = "0.2.0.0"; + sha256 = "1y11q5ijb9hqvxgcf5jig6d24895nrrg06ig8sy7fk1s32rr0bqm"; libraryHaskellDepends = [ - base containers lifted-base monad-control transformers-base + base containers lifted-base monad-control stm transformers-base ]; - testHaskellDepends = [ base containers hspec ]; + testHaskellDepends = [ base containers hspec stm ]; homepage = "https://github.com/nshimaza/thread-hierarchy#readme"; description = "Simple Haskel thread management in hierarchical manner"; license = stdenv.lib.licenses.mit; @@ -194808,22 +195925,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "threepenny-editors_0_5_5" = callPackage + "threepenny-editors_0_5_6" = callPackage ({ mkDerivation, base, bifunctors, casing, containers, generics-sop - , profunctors, threepenny-gui + , profunctors, text, threepenny-gui }: mkDerivation { pname = "threepenny-editors"; - version = "0.5.5"; - sha256 = "1gblkdkmkngry2fncjv4l7f3q614rw4p25cskf850kjgvcvm04fj"; + version = "0.5.6"; + sha256 = "0gnbzf3a3xykkf8xc5bnn1wznszyrnllf5s6cb4gqz6cbqnf2mnw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors casing containers generics-sop profunctors + base bifunctors casing containers generics-sop profunctors text threepenny-gui ]; executableHaskellDepends = [ - base bifunctors casing containers generics-sop profunctors + base bifunctors casing containers generics-sop profunctors text threepenny-gui ]; homepage = "https://github.com/pepeiborra/threepenny-editors"; @@ -195350,8 +196467,8 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "tile"; - version = "0.1.0.0"; - sha256 = "1j952m67spr4v7g3i8lpa9cn79rlmb8ybbg9hw2yswcijpq52fyb"; + version = "0.3.0.0"; + sha256 = "1w35rhrpjs39xbcg2i635jxdkbp4nhkzrrnl9p3bz85yc1iiiv8m"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; homepage = "https://github.com/caneroj1/tile#readme"; @@ -196417,8 +197534,8 @@ self: { ({ mkDerivation, base, containers, HUnit, network-uri, text }: mkDerivation { pname = "tld"; - version = "0.3.0.1"; - sha256 = "0rfzcwaj9fyhrc8vswjjnqdj4bi7jln2lq38pcvnkl5zwx7kqhxa"; + version = "0.3.0.2"; + sha256 = "1snw5cdkyqyninqqqwa6qfndfmwfr4lkdg0v94267g7xbwcqjj8h"; libraryHaskellDepends = [ base containers network-uri text ]; testHaskellDepends = [ base HUnit network-uri text ]; description = "This project separates subdomains, domains, and top-level-domains from URLs"; @@ -196969,8 +198086,8 @@ self: { }: mkDerivation { pname = "tomlcheck"; - version = "0.1.0.14"; - sha256 = "1zms4vigyy29c3wmjh6zmhjlmvj3x98dx99mdpxws6sxl0wibfcv"; + version = "0.1.0.17"; + sha256 = "0yfy0453j3s5sskz529rd50dbjxhr411a4g5803dsw06kibij05s"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -199153,25 +200270,24 @@ self: { "tweet-hs" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition-prelude, containers, criterion - , data-default, directory, extra, hspec, htoml, http-client - , http-client-tls, http-types, lens, megaparsec - , optparse-applicative, QuickCheck, split, text - , unordered-containers + , data-default, directory, extra, hspec, htoml-megaparsec + , http-client, http-client-tls, http-types, lens, megaparsec + , optparse-applicative, split, text, unordered-containers }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.9"; - sha256 = "1s9gg1247xa2rl30s9i4rza04107s7awrx7pbmd4vc436mv4624z"; + version = "1.0.1.21"; + sha256 = "0m35d2ym83d3c0k2imjr9ws2nai6yhm784is9k1g6xrbazd947gr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint authenticate-oauth base bytestring - composition-prelude containers data-default directory extra htoml - http-client http-client-tls http-types lens megaparsec - optparse-applicative split text unordered-containers + composition-prelude containers data-default directory extra + htoml-megaparsec http-client http-client-tls http-types lens + megaparsec optparse-applicative split text unordered-containers ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base bytestring hspec QuickCheck ]; + testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; description = "Command-line tool for twitter"; @@ -200199,17 +201315,19 @@ self: { }) {}; "type-of-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, criterion, ghc-prim - , hspec, QuickCheck, text + ({ mkDerivation, base, blaze-html, bytestring, criterion + , double-conversion, ghc-prim, hspec, QuickCheck, text }: mkDerivation { pname = "type-of-html"; - version = "1.0.0.0"; - sha256 = "0yknmw9xfi0pdg0ps2wg966i5k9y3nrqr38srj4lifng9bcgahx0"; - libraryHaskellDepends = [ base bytestring ghc-prim text ]; - testHaskellDepends = [ base hspec QuickCheck text ]; + version = "1.0.1.1"; + sha256 = "1fc8pqkvmrcvh3wayykqbc0ha336x77xq0hbzym9bknzr1xpy56n"; + libraryHaskellDepends = [ + base bytestring double-conversion ghc-prim text + ]; + testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ - base blaze-html bytestring criterion text + base blaze-html bytestring criterion QuickCheck text ]; homepage = "https://github.com/knupfer/type-of-html"; description = "High performance type driven html generation"; @@ -200525,6 +201643,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "typedflow" = callPackage + ({ mkDerivation, base, ghc-typelits-knownnat, mtl, pretty-compact + }: + mkDerivation { + pname = "typedflow"; + version = "0.9"; + sha256 = "0hanh2gww0i4a8dkq1kxizni8qgk5mzj6qkvz9k1yvprpx2kym8c"; + libraryHaskellDepends = [ + base ghc-typelits-knownnat mtl pretty-compact + ]; + description = "Typed frontend to TensorFlow and higher-order deep learning"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "typedquery" = callPackage ({ mkDerivation, aeson, base, bytestring, haskell-src-meta, parsec , template-haskell, text, transformers @@ -200848,8 +201980,8 @@ self: { }: mkDerivation { pname = "ua-parser"; - version = "0.7.4"; - sha256 = "1maph5na307ih1qx2ziww3mhc9c0a5rxqj2jfc4w404hisby947i"; + version = "0.7.4.1"; + sha256 = "1pwls2qbhd3ig2lm4ix3kh08yw20k0iajigbxqd0vmpkx459pmrf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring data-default file-embed pcre-light text yaml @@ -202010,6 +203142,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "units-parser_0_1_1" = callPackage + ({ mkDerivation, base, containers, mtl, multimap, parsec, syb + , tasty, tasty-hunit, template-haskell + }: + mkDerivation { + pname = "units-parser"; + version = "0.1.1"; + sha256 = "0d39r1vcwqs61529gjz3329a41fp4pwx0x4j4kw4xl2lza3wr164"; + libraryHaskellDepends = [ base containers mtl multimap parsec ]; + testHaskellDepends = [ + base containers mtl multimap parsec syb tasty tasty-hunit + template-haskell + ]; + description = "A parser for units of measure"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unittyped" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -202193,21 +203343,26 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, exceptions - , ghc-prim, hashable, microlens, microlens-mtl, mtl, safe - , safe-exceptions, stm, text, text-format, transformers - , type-operators, unordered-containers, utf8-string, vector + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , exceptions, ghc-prim, hashable, microlens, microlens-mtl, mtl + , safe, safe-exceptions, semigroups, stm, text, text-format + , transformers, type-operators, unordered-containers, utf8-string + , vector }: mkDerivation { pname = "universum"; - version = "0.7.0"; - sha256 = "1d2887l2g8f9scpwcrvlxk0dm8w9d7qnlpbfjswa08dnmy63kcrf"; + version = "0.7.1.1"; + sha256 = "08q3ldx0saahlxh2zkwmsq71lkwrvfrs19nzbgwwdvd31y4r0iq6"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions ghc-prim hashable microlens microlens-mtl mtl safe safe-exceptions stm text text-format transformers type-operators unordered-containers utf8-string vector ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq hashable mtl semigroups text + unordered-containers + ]; homepage = "https://github.com/serokell/universum"; description = "Custom prelude used in Serokell"; license = stdenv.lib.licenses.mit; @@ -203860,8 +205015,8 @@ self: { }: mkDerivation { pname = "uuid-crypto"; - version = "1.3.0.0"; - sha256 = "02vzxxijz2pdwq4asgvsxvj6gcnjdzrfrhiavwbmc0vckw8s108s"; + version = "1.3.1.0"; + sha256 = "10r6phn23f3piqs4jhx764pcl6f3dbxq75pvwsnmwcszdi970a3l"; libraryHaskellDepends = [ base binary bytestring cryptoids cryptoids-types exceptions uuid ]; @@ -204217,23 +205372,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "validation_0_6_0" = callPackage - ({ mkDerivation, base, bifunctors, Cabal, cabal-doctest, directory - , doctest, filepath, lens, mtl, QuickCheck, semigroupoids - , semigroups, template-haskell, transformers + "validation_0_6_2" = callPackage + ({ mkDerivation, base, bifunctors, hedgehog, HUnit, lens, mtl + , semigroupoids, semigroups, transformers }: mkDerivation { pname = "validation"; - version = "0.6.0"; - sha256 = "1x2mi8lgy18q7g2gwwk8c31kg77lkfpmjkxf5nkli5pri9z947av"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.6.2"; + sha256 = "0631g3ffxchgg6hpy8w94a3713plgqp1k45zq85vaxyjg2x5bh7r"; libraryHaskellDepends = [ base bifunctors lens mtl semigroupoids semigroups transformers ]; - testHaskellDepends = [ - base cabal-doctest directory doctest filepath QuickCheck - template-haskell - ]; + testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; homepage = "https://github.com/qfpl/validation"; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; @@ -205259,8 +206409,8 @@ self: { pname = "vector-space-points"; version = "0.2.1.2"; sha256 = "0jqiy7b3hy21c0imqxbzvcx0hxy33bh97bv47bpv099dx32d7spy"; - revision = "1"; - editedCabalFile = "1vgywmhxkkb7mfirl0wik5mk8xj9s3d23f9zwj5svnbyvdkc3fl4"; + revision = "2"; + editedCabalFile = "0jnnzhwkc82flvaxqc1vv30d8vpdwnyi82614c34j79m51wcmvya"; libraryHaskellDepends = [ base vector-space ]; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3; @@ -205484,10 +206634,8 @@ self: { }: mkDerivation { pname = "vgrep"; - version = "0.2.0.0"; - sha256 = "0crd7hrnvl4z5xb1b6km47b6250ica1yv4sy370m7lkjx00c4lrb"; - revision = "1"; - editedCabalFile = "0qljh5nddpgv2w7y3nq5h12jpwc509yyizqv8cjzdr1krfsnk4ck"; + version = "0.2.1.0"; + sha256 = "0k74bpi995wqxmin6h7bx3yjiwh403c708yjp19igbw1971irxjr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206975,6 +208123,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-middleware-brotli" = callPackage + ({ mkDerivation, base, binary, bytestring, directory, filepath + , hs-brotli, http-types, mtl, tasty, tasty-hspec, tasty-hunit, unix + , wai, wai-app-static, wai-extra, warp + }: + mkDerivation { + pname = "wai-middleware-brotli"; + version = "0.1.0.0"; + sha256 = "1gv3s2y49179kzkjqzs905g2rq1a9al9n716y86ivan8nnkhxjnq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring directory filepath hs-brotli http-types unix + wai + ]; + executableHaskellDepends = [ + base http-types wai wai-app-static wai-extra warp + ]; + testHaskellDepends = [ + base bytestring hs-brotli http-types mtl tasty tasty-hspec + tasty-hunit wai wai-extra + ]; + homepage = "https://github.com/iand675/wai-middleware-brotli#readme"; + description = "WAI middleware for brotli compression"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-cache" = callPackage ({ mkDerivation, base, binary, blaze-builder-conduit, bytestring , conduit, crypto-conduit, http-types, HUnit, pureMD5 @@ -207790,8 +208966,8 @@ self: { }: mkDerivation { pname = "wai-session-postgresql"; - version = "0.2.1.0"; - sha256 = "16myzcxas9nwhd54bc5pi1biym39vrz707rfmmc1mar6ia7a1xil"; + version = "0.2.1.1"; + sha256 = "0yab46s0xyd49s46skrgm9hk4pvzqv3sr8mzr58231jvn7lijyf9"; libraryHaskellDepends = [ base bytestring cereal cookie data-default entropy postgresql-simple resource-pool text time transformers wai @@ -209778,6 +210954,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wigner-ville-accelerate" = callPackage + ({ mkDerivation, accelerate, accelerate-fft, base, wigner }: + mkDerivation { + pname = "wigner-ville-accelerate"; + version = "0.1.0.2"; + sha256 = "1h5zdn3lkjnlr4m7s2xxiv36cr6hs7bnkr5rq20z585rfhbhavj5"; + libraryHaskellDepends = [ accelerate accelerate-fft base ]; + testHaskellDepends = [ base wigner ]; + homepage = "https://github.com/Haskell-mouse/wigner-ville-accelerate"; + description = "Wigner-ville transform using the Accelerate library"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {wigner = null;}; + "wikicfp-scraper" = callPackage ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec , scalpel-core, text, time @@ -209900,6 +211090,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "windns" = callPackage + ({ mkDerivation, base, bytestring, deepseq, dnsapi }: + mkDerivation { + pname = "windns"; + version = "0.1.0.0"; + sha256 = "1hphwmwc1182p5aqjswcgqjbilm91rv5svjqhd93cqq599gg8q0c"; + revision = "1"; + editedCabalFile = "0kz6gv4dpppnnnyl57ibxi9gvykmkbmaz22yssx92mq306wbyimv"; + libraryHaskellDepends = [ base bytestring deepseq ]; + librarySystemDepends = [ dnsapi ]; + description = "Domain Name Service (DNS) lookup via the Windows dnsapi standard library"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {dnsapi = null;}; + "windowslive" = callPackage ({ mkDerivation, base, Crypto, dataenc, mtl, network, parsec , pretty, split, time, urlencoded @@ -210085,6 +211290,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "witherable_0_2" = callPackage + ({ mkDerivation, base, base-orphans, containers, hashable + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "witherable"; + version = "0.2"; + sha256 = "0bga2vx3bkg1m6pwdvnxbqjbljpwr6mxyq94fi87j3zy08mmmnwx"; + libraryHaskellDepends = [ + base base-orphans containers hashable transformers + unordered-containers vector + ]; + homepage = "https://github.com/fumieval/witherable"; + description = "filterable traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "witness" = callPackage ({ mkDerivation, base, constraints, semigroupoids, transformers }: mkDerivation { @@ -210356,8 +211579,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.26"; - sha256 = "1wa1qpz5fdsgisvm9idla3jri1gzdgycmiphhynkn1k0337j0xy9"; + version = "0.3.31"; + sha256 = "1f5b4j788yr2m7f9if2fj41j236h5zjszzldcna0v6f93za7kzy2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210466,8 +211689,8 @@ self: { }: mkDerivation { pname = "wordchoice"; - version = "0.1.2.0"; - sha256 = "01zmgxs09dplk8hf41cfqjcm6w9mjnd6szn22kz2ycjxxdd7kncv"; + version = "0.1.2.1"; + sha256 = "0b9la9lh00x0rnh4mpgl8djgik72x75q5070r96ibzkl5hp6483w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210481,6 +211704,7 @@ self: { homepage = "https://github.com/githubuser/wordchoice#readme"; description = "Get word counts and distributions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wordcloud" = callPackage @@ -211117,6 +212341,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ws" = callPackage + ({ mkDerivation, async, base, bytestring, exceptions, haskeline + , mtl, network, network-uri, optparse-applicative, text, websockets + , wuss + }: + mkDerivation { + pname = "ws"; + version = "0.0.1"; + sha256 = "1i9jglq199pwxs9giigf3xgndspiwp30s2fb833mc7fl5s5mghhh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring exceptions haskeline mtl network network-uri + text websockets wuss + ]; + executableHaskellDepends = [ + base exceptions network-uri optparse-applicative + ]; + description = "A simple CLI utility for interacting with a websocket"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ws-chans" = callPackage ({ mkDerivation, async, base, http-types, HUnit, network , QuickCheck, quickcheck-instances, test-framework @@ -212175,6 +213421,7 @@ self: { homepage = "https://github.com/aisamanra/xleb"; description = "A simple monadic language for parsing XML structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xls" = callPackage @@ -212595,19 +213842,22 @@ self: { }) {}; "xml-isogen" = callPackage - ({ mkDerivation, base, dom-parser, lens, mtl, QuickCheck - , semigroups, template-haskell, text, xml-conduit - , xml-conduit-writer + ({ mkDerivation, base, data-default, dom-parser, generic-arbitrary + , hspec, lens, mtl, QuickCheck, quickcheck-instances, semigroups + , template-haskell, text, xml-conduit, xml-conduit-writer }: mkDerivation { pname = "xml-isogen"; - version = "0.2.0"; - sha256 = "1dmf660cyrs96ih1swlw44spd2g05dfikpak9mmjag40mab36116"; + version = "0.2.1"; + sha256 = "1kfv09ykz96dqd45bi618qi2qhzjkifh377ccylfzd55jkqnvn6l"; libraryHaskellDepends = [ base dom-parser lens mtl QuickCheck semigroups template-haskell text xml-conduit xml-conduit-writer ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ + base data-default dom-parser generic-arbitrary hspec QuickCheck + quickcheck-instances semigroups xml-conduit xml-conduit-writer + ]; homepage = "https://github.com/typeable/xml-isogen"; description = "Generate XML-isomorphic types"; license = stdenv.lib.licenses.mit; @@ -213217,6 +214467,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xmonad-extras_0_13_2" = callPackage + ({ mkDerivation, alsa-mixer, base, bytestring, containers, hint + , libmpd, mtl, network, regex-posix, X11, xmonad, xmonad-contrib + }: + mkDerivation { + pname = "xmonad-extras"; + version = "0.13.2"; + sha256 = "1ixnr76gmym9gab6m6r2rvrrvakxa5kda6cll9nbq954sjvj54jx"; + configureFlags = [ + "-f-with_hlist" "-fwith_parsec" "-fwith_split" + ]; + libraryHaskellDepends = [ + alsa-mixer base bytestring containers hint libmpd mtl network + regex-posix X11 xmonad xmonad-contrib + ]; + homepage = "https://github.com/xmonad/xmonad-extras"; + description = "Third party extensions for xmonad with wacky dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xmonad-screenshot" = callPackage ({ mkDerivation, base, gtk, xmonad }: mkDerivation { @@ -213824,6 +215095,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libyaml;}; + "yaml_0_8_24" = callPackage + ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat + , bytestring, conduit, containers, directory, filepath, hspec + , HUnit, libyaml, mockery, resourcet, scientific, semigroups + , template-haskell, temporary, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.8.24"; + sha256 = "08cawq5q2bm23fi48m56x1h6qdf52wn9i9y770v6q2810wj2f7n1"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + filepath resourcet scientific semigroups template-haskell text + transformers unordered-containers vector + ]; + libraryPkgconfigDepends = [ libyaml ]; + executableHaskellDepends = [ aeson base bytestring ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring conduit directory hspec + HUnit mockery resourcet temporary text transformers + unordered-containers vector + ]; + homepage = "http://github.com/snoyberg/yaml/"; + description = "Support for parsing and rendering YAML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libyaml;}; + "yaml-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop , scientific, tasty, tasty-hunit, text, transformers @@ -216333,8 +217636,8 @@ self: { }: mkDerivation { pname = "yi"; - version = "0.15.0"; - sha256 = "1mkdpc4fg7qx8mslcmjwnws24hr5p7289v026qf0m6ivc4dkbkbi"; + version = "0.17.1"; + sha256 = "18937w0w1hk7ngyrl1p5gy4djgz8py9kcsndas82w82wwh36jnqg"; configureFlags = [ "-fpango" "-fvty" ]; isLibrary = false; isExecutable = true; @@ -216412,23 +217715,23 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-core_0_17_0" = callPackage + "yi-core_0_17_1" = callPackage ({ mkDerivation, array, attoparsec, base, binary, bytestring , containers, criterion, data-default, deepseq, directory, dlist - , dynamic-state, filepath, hashable, ListLike, microlens-platform - , mtl, old-locale, oo-prototypes, parsec, pointedlist, process - , process-extras, quickcheck-text, split, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers-base, unix - , unix-compat, unordered-containers, xdg-basedir, yi-language - , yi-rope + , dynamic-state, exceptions, filepath, hashable, ListLike + , microlens-platform, mtl, old-locale, oo-prototypes, parsec + , pointedlist, process, process-extras, quickcheck-text, split + , tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers-base, unix, unix-compat, unordered-containers + , xdg-basedir, yi-language, yi-rope }: mkDerivation { pname = "yi-core"; - version = "0.17.0"; - sha256 = "018fcmviyy0xrzrvmcrdl4r4mk69ig7jgck5zgq58y0h7m4wxkmg"; + version = "0.17.1"; + sha256 = "1qv86znr7kjwnxv771xx1j7z63fqbnfasn2ndkbj5ldk3m5bil0p"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default - directory dlist dynamic-state filepath hashable ListLike + directory dlist dynamic-state exceptions filepath hashable ListLike microlens-platform mtl old-locale oo-prototypes parsec pointedlist process process-extras split text time transformers-base unix unix-compat unordered-containers xdg-basedir yi-language yi-rope @@ -216450,8 +217753,8 @@ self: { }: mkDerivation { pname = "yi-dynamic-configuration"; - version = "0.17.0"; - sha256 = "1slf3qrq61b171sg6izw212qajvmjwv786gndhql8r9kyi7na9ys"; + version = "0.17.1"; + sha256 = "1cnafzrgi7js9zayq223752v7jvl9rp526s7bd1nwwyjwl59y0h8"; libraryHaskellDepends = [ base data-default dyre microlens-platform mtl text transformers-base yi-core yi-rope @@ -216481,8 +217784,8 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.17.0"; - sha256 = "141kp6f6f0xrql8jmghqj1h5vrbim28z7p1a9psa40xry1hhlhr7"; + version = "0.17.1"; + sha256 = "0jh9bmxhjr1wpilmghanihq6iwn4xn34ihqlfc2c080wm5s8kw4w"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl @@ -216513,15 +217816,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-frontend-vty_0_17_0" = callPackage + "yi-frontend-vty_0_17_1" = callPackage ({ mkDerivation, base, containers, data-default, dlist , microlens-platform, pointedlist, stm, text, vty, yi-core , yi-language, yi-rope }: mkDerivation { pname = "yi-frontend-vty"; - version = "0.17.0"; - sha256 = "12yl4d3dkjkbz8n184lcs8z08mj8yc1ybaj52z7j58nialvq4ibh"; + version = "0.17.1"; + sha256 = "0i00m3z7zj6xqgh78wfrw2zqwcffsb31i2549m0b5g9qsicfp9h6"; libraryHaskellDepends = [ base containers data-default dlist microlens-platform pointedlist stm text vty yi-core yi-language yi-rope @@ -216550,15 +217853,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-fuzzy-open_0_17_0" = callPackage + "yi-fuzzy-open_0_17_1" = callPackage ({ mkDerivation, base, binary, containers, data-default, directory , filepath, mtl, pointedlist, text, transformers-base, vector , yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-fuzzy-open"; - version = "0.17.0"; - sha256 = "1447w8gqwjnala08sysvy1bxhdna1hydh0bnjx2awz7hns5040ap"; + version = "0.17.1"; + sha256 = "1wd1w1d67hkp5rk3130cnmffgh40qb1vp9pnz6f36n0c8b2jqvjh"; libraryHaskellDepends = [ base binary containers data-default directory filepath mtl pointedlist text transformers-base vector yi-core yi-language @@ -216599,14 +217902,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-ireader_0_17_0" = callPackage + "yi-ireader_0_17_1" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-default , microlens-platform, text, yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-ireader"; - version = "0.17.0"; - sha256 = "0cwfjajs25lbxhzn8zbpjavy1yjym3k4iliqal9iq3i51k9inacc"; + version = "0.17.1"; + sha256 = "12babkhlqr7w3mb7z8w8ccwrvmkz8583yi0p9s50rqkn778cij7y"; libraryHaskellDepends = [ base binary bytestring containers data-default microlens-platform text yi-core yi-language yi-rope @@ -216633,14 +217936,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-keymap-cua_0_17_0" = callPackage + "yi-keymap-cua_0_17_1" = callPackage ({ mkDerivation, base, microlens-platform, text, yi-core , yi-keymap-emacs, yi-rope }: mkDerivation { pname = "yi-keymap-cua"; - version = "0.17.0"; - sha256 = "0v7gcd5arq33r2cf55ig307cfvapz3r1h9cz3ssvkw0fjzr1p1a3"; + version = "0.17.1"; + sha256 = "053w4b1p482wma64888vb3ikh7x0f58bl43vy7xs1lazlz22iwaj"; libraryHaskellDepends = [ base microlens-platform text yi-core yi-keymap-emacs yi-rope ]; @@ -216669,15 +217972,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-keymap-emacs_0_17_0" = callPackage + "yi-keymap-emacs_0_17_1" = callPackage ({ mkDerivation, base, containers, filepath, Hclip , microlens-platform, mtl, oo-prototypes, text, transformers-base , yi-core, yi-language, yi-misc-modes, yi-rope }: mkDerivation { pname = "yi-keymap-emacs"; - version = "0.17.0"; - sha256 = "1d90884kjpq13d7nrxjla9kx6gr09xh8lwzbpnf69jg6iiavjlfg"; + version = "0.17.1"; + sha256 = "1jx7vhp7v098p3rrs21b43fwcbra6fmg4clamgqbbvbqgiy4bsrw"; libraryHaskellDepends = [ base containers filepath Hclip microlens-platform mtl oo-prototypes text transformers-base yi-core yi-language yi-misc-modes yi-rope @@ -216717,7 +218020,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-keymap-vim_0_16_0" = callPackage + "yi-keymap-vim_0_17_1" = callPackage ({ mkDerivation, attoparsec, base, binary, containers, data-default , directory, filepath, Hclip, microlens-platform, mtl , oo-prototypes, pointedlist, QuickCheck, safe, tasty, tasty-hunit @@ -216726,9 +218029,8 @@ self: { }: mkDerivation { pname = "yi-keymap-vim"; - version = "0.16.0"; - sha256 = "1fvl4frjikkdp561zai6z35r8r7f4fq2izlcxl1k1rvsvxz3cbi2"; - enableSeparateDataOutput = true; + version = "0.17.1"; + sha256 = "1zvd0y6ak56cqxa60x4kgil2lp5lbidnkmp6kh7dq3i71n0nv48w"; libraryHaskellDepends = [ attoparsec base binary containers data-default directory filepath Hclip microlens-platform mtl oo-prototypes pointedlist safe text @@ -216774,7 +218076,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-language_0_17_0" = callPackage + "yi-language_0_17_1" = callPackage ({ mkDerivation, alex, array, base, binary, containers , data-default, hashable, microlens-platform, oo-prototypes , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec @@ -216783,8 +218085,8 @@ self: { }: mkDerivation { pname = "yi-language"; - version = "0.17.0"; - sha256 = "046aavm0pf5s8bx6z0v8fvbizzr3s9s8kq79sj3gvis26im9kzpy"; + version = "0.17.1"; + sha256 = "17mnjfhxr6vhpfx7l4zg606f2vffjr39ga4j5qmnp7cf4y5n5vja"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -216822,14 +218124,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-misc-modes_0_17_0" = callPackage + "yi-misc-modes_0_17_1" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, text, yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-misc-modes"; - version = "0.17.0"; - sha256 = "0ki6dc1frzhgn7dfbsrpbf75a5i32iz9a8cvy1c33xmdh9s8k4fw"; + version = "0.17.1"; + sha256 = "0yyv8p65vhpcjj97pzax0b8bbqhh3lzy3by4rzf0f11p862wzag0"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -216859,14 +218161,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-mode-haskell_0_17_0" = callPackage + "yi-mode-haskell_0_17_1" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, text, yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-mode-haskell"; - version = "0.17.0"; - sha256 = "17cfbww6lpg29dz51pbzlsx95azhxlgv0lqcpxpxk82w9s4c2dji"; + version = "0.17.1"; + sha256 = "1fl9kmv264c0cmpn6c77ylyngyjh9ilcvpcrsn7j75g2xacgdpyx"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -216897,15 +218199,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-mode-javascript_0_17_0" = callPackage + "yi-mode-javascript_0_17_1" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, dlist , filepath, microlens-platform, mtl, text, yi-core, yi-language , yi-rope }: mkDerivation { pname = "yi-mode-javascript"; - version = "0.17.0"; - sha256 = "040mc9mfm46alfl21p6p4a8n9p8hr12ywn6sfgq32zrhpa1zn9yb"; + version = "0.17.1"; + sha256 = "073yywxsf3j4vcc9rg0hw7jm6gmwvc7krvm0g9q9pv2y49n5aj14"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -216992,15 +218294,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-snippet_0_17_0" = callPackage + "yi-snippet_0_17_1" = callPackage ({ mkDerivation, base, binary, containers, data-default, free , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector , yi-core, yi-rope }: mkDerivation { pname = "yi-snippet"; - version = "0.17.0"; - sha256 = "10680a4zc5r9mnvhajgfrvzxpf8naclx4sygvbi69c5aann4q4a1"; + version = "0.17.1"; + sha256 = "1prczicjzmqnpkq6sda878f056g4ld1g6wmfpqzly2qa5rs4zg6b"; libraryHaskellDepends = [ base binary containers data-default free microlens-platform mtl text vector yi-core yi-rope @@ -217285,8 +218587,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.5.1.2"; - sha256 = "0q185phadgi8m45ii90x5k7mpw2xqf021q55q00nqyw8l7yai8pr"; + version = "0.6"; + sha256 = "059mbh2x4i521kg99b2mmgvc2rwbid641ilzc14ri7ym7ljkw1mv"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index ec7d961581a4..ac484b3c1124 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -74,6 +74,9 @@ symlinkJoin { --set "NIX_${ghcCommandCaps}PKG" "$out/bin/${ghcCommand}-pkg" \ --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}" \ --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" \ + ${lib.optionalString (ghc.isGhcjs or false) + ''--set NODE_PATH "${ghc.socket-io}/lib/node_modules"'' + } \ ${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''} fi done diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 4d7c4928283a..16f6c65b094a 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -1,4 +1,4 @@ -{ pkgs, idris, overrides ? (self: super: {}) }: let +{ pkgs, idris-no-deps, overrides ? (self: super: {}) }: let inherit (pkgs.lib) callPackageWith fix' extends; /* Taken from haskell-modules/default.nix, should probably abstract this away */ @@ -33,7 +33,12 @@ value = callPackage (./. + "/${name}.nix") {}; }) files)) // { - inherit idris callPackage; + inherit idris-no-deps callPackage; + # See #10450 about why we have to wrap the executable + idris = + (pkgs.callPackage ./idris-wrapper.nix {}) + idris-no-deps + { path = [ pkgs.gcc ]; lib = [pkgs.gmp]; }; # A list of all of the libraries that come with idris builtins = pkgs.lib.mapAttrsToList (name: value: value) builtins_; diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix new file mode 100644 index 000000000000..32424ba1f862 --- /dev/null +++ b/pkgs/development/idris-modules/idris-wrapper.nix @@ -0,0 +1,14 @@ +{ symlinkJoin, makeWrapper, stdenv }: idris: { path, lib }: + +symlinkJoin { + name = idris.name; + src = idris.src; + paths = [ idris ]; + buildInputs = [ makeWrapper ]; + postBuild = '' + wrapProgram $out/bin/idris \ + --suffix PATH : ${ stdenv.lib.makeBinPath path } \ + --suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib} + ''; + } + diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix index edcd20c10978..d2b09808ec15 100644 --- a/pkgs/development/idris-modules/with-packages.nix +++ b/pkgs/development/idris-modules/with-packages.nix @@ -10,7 +10,7 @@ installIdrisLib () { if [ -d $1/lib/${idris.name} ]; then - ln -sv $1/lib/${idris.name}/* $out/lib/${idris.name} + ln -fsv $1/lib/${idris.name}/* $out/lib/${idris.name} fi } @@ -34,7 +34,7 @@ ''; buildPhase = '' - gcc -O3 -o idris idris.c + $CC -O3 -o idris idris.c ''; installPhase = '' diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index f1e2315d7941..16734c184eb8 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -1,16 +1,26 @@ -{ stdenv, fetchurl, sbcl }: +{ stdenv, fetchFromGitHub, + # perl, which, nettools, + sbcl }: -stdenv.mkDerivation rec { +let hashes = { + "7.4" = "04jb789nks9llwysxz1zw9pq1dh0j39b5fcmivcc4bq9v9cga2l1"; +}; +in stdenv.mkDerivation rec { name = "acl2-${version}"; - version = "v6-5"; + version = "7.4"; - src = fetchurl { - url = "http://www.cs.utexas.edu/users/moore/acl2/${version}/distrib/acl2.tar.gz"; - sha256 = "19kfclgpdyms016s06pjf3icj3mx9jlcj8vfgpbx2ac4ls0ir36g"; - name = "acl2-${version}.tar.gz"; + src = fetchFromGitHub { + owner = "acl2-devel"; + repo = "acl2-devel"; + rev = "${version}"; + sha256 = hashes."${version}"; }; - buildInputs = [ sbcl ]; + buildInputs = [ sbcl + # which perl nettools + ]; + + enableParallelBuilding = true; phases = "unpackPhase installPhase"; @@ -18,18 +28,45 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/${installSuffix} + mkdir -p $out/bin cp -R . $out/share/${installSuffix} cd $out/share/${installSuffix} - make 'LISP=${sbcl}/bin/sbcl --dynamic-space-size 2000' - make 'LISP=${sbcl}/bin/sbcl --dynamic-space-size 2000' regression - make LISP=${sbcl}/bin/sbcl TAGS - mkdir -p $out/bin + + # make ACL2 image + make LISP=${sbcl}/bin/sbcl + + # The community books don't build properly under Nix yet. + rm -rf books + #make ACL2=$out/share/saved_acl2 USE_QUICKLISP=1 regression-everything + cp saved_acl2 $out/bin/acl2 ''; meta = { description = "An interpreter and a prover for a Lisp dialect"; - maintainers = with stdenv.lib.maintainers; [ raskin ]; + longDescription = '' + ACL2 is a logic and programming language in which you can model + computer systems, together with a tool to help you prove + properties of those models. "ACL2" denotes "A Computational + Logic for Applicative Common Lisp". + + ACL2 is part of the Boyer-Moore family of provers, for which its + authors have received the 2005 ACM Software System Award. + + NOTE: In nixpkgs, the community books that usually ship with + ACL2 have been removed because it is not currently possible to + build them with Nix. + ''; + homepage = http://www.cs.utexas.edu/users/moore/acl2/; + downloadPage = https://github.com/acl2-devel/acl2-devel/releases; + # There are a bunch of licenses in the community books, but since + # they currently get deleted during the build, we don't mention + # their licenses here. ACL2 proper is released under a BSD + # 3-clause license. + #license = with stdenv.lib.licenses; + #[ free bsd3 mit gpl2 llgpl21 cc0 publicDomain ]; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ kini raskin ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix index e85d25002235..469502a3f85e 100644 --- a/pkgs/development/interpreters/elixir/1.5.nix +++ b/pkgs/development/interpreters/elixir/1.5.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.5.1"; - sha256 = "0q0zr3v9cyb7p9aab8v038hnjm84nf9b60kikffp6w9rfqqqf767"; + version = "1.5.2"; + sha256 = "0ng7z2gz1c8lkn07fric18b3awcw886s9xb864kmnn2iah5gc65j"; minimumOTPVersion = "18"; } diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix new file mode 100644 index 000000000000..8906c9c5d249 --- /dev/null +++ b/pkgs/development/interpreters/joker/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "joker-${version}"; + version = "0.8.6"; + + goPackagePath = "github.com/candid82/joker"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "candid82"; + repo = "joker"; + sha256 = "0m6xi1jgss6f4maxqpwjyyhyyc71wy5a7jpm908m49xx80mz5ams"; + }; + + preBuild = "go generate ./..."; + + dontInstallSrc = true; + + excludedPackages = "gen"; # Do not install private generators. + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/candid82/joker; + description = "A small Clojure interpreter and linter written in Go"; + license = licenses.epl10; + platforms = platforms.all; + maintainers = with maintainers; [ andrestylianos ]; + }; +} diff --git a/pkgs/development/interpreters/joker/deps.nix b/pkgs/development/interpreters/joker/deps.nix new file mode 100644 index 000000000000..d5cc0bc44b0b --- /dev/null +++ b/pkgs/development/interpreters/joker/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "6a4bc7b4feaeff8feb63f87d5fb2cf3e3610a559"; + sha256 = "1ny3rws671sa9bj5phg6k1rprlgzys73kfdr14vxq4wnwz84zbrc"; + }; + } +] diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 0ea1bf19231f..ff192c072865 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "9.1.12.0"; + version = "9.1.13.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "15x5w4awy8h6xfkbj0p4xnb68xzfrss1rf2prk0kzk5kyjakrcnx"; + sha256 = "021rmm5c18js569i4z6vj1bb193j4nska43jfiqz5hisc936c5cx"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix index 80661c3feb9e..e7bcef7bc3e0 100644 --- a/pkgs/development/interpreters/jython/default.nix +++ b/pkgs/development/interpreters/jython/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "jython-${version}"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar"; - sha256 = "0sk4myh9v7ma7nmzb8khg41na77xfi2zck7876bs7kq18n8nc1nx"; + sha256 = "0jwc4ly75cna78blnisv4q8nfcn5s0g4wk7jf4d16j0rfcd0shf4"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index c1d313a36569..a512a2513134 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "lua-${version}"; luaversion = "5.3"; - version = "${luaversion}.0"; + version = "${luaversion}.4"; src = fetchurl { - url = "http://www.lua.org/ftp/${name}.tar.gz"; - sha256 = "00fv1p6dv4701pyjrlvkrr6ykzxqy9hy1qxzj6qmwlb0ssr5wjmf"; + url = "https://www.lua.org/ftp/${name}.tar.gz"; + sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn"; }; nativeBuildInputs = [ readline ]; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 5246c5b0e593..97e395d2a6df 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -116,9 +116,7 @@ let platforms = platforms.all; }; }; - in rec { - perl = perl524; perl522 = common { @@ -127,8 +125,7 @@ in rec { }; perl524 = common { - version = "5.24.2"; - sha256 = "1x4yj814a79lcarwb3ab6bbcb36hvb5n4ph4zg3yb0nabsjfi6v0"; + version = "5.24.3"; + sha256 = "1m2px85kq2fyp2d4rx3bw9kg3car67qfqwrs5vlv96dx0x8rl06b"; }; - } diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 57383fa34126..c967ed2b8623 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -50,7 +50,7 @@ let ldap = { configureFlags = [ - "--with-ldap" + "--with-ldap=/invalid/path" "LDAP_DIR=${openldap.dev}" "LDAP_INCDIR=${openldap.dev}/include" "LDAP_LIBDIR=${openldap.out}/lib" @@ -326,17 +326,17 @@ let in { php56 = generic { - version = "5.6.31"; - sha256 = "03xixkvfp64bqp97p8vlj3hp63bpjw7hc16b7fgm7w35rdlp2fcg"; + version = "5.6.32"; + sha256 = "0lfbmdkvijkm6xc4p9sykv66y8xwhws0vsmka8v5cax4bxx4xr1y"; }; php70 = generic { - version = "7.0.24"; - sha256 = "06fgpljz6xpxxkpf4cv9rqz8g504l9ikbw5aq0hqh5sgd611kycv"; + version = "7.0.25"; + sha256 = "09fc2lj447phprvilvq2sb6n0r1snj142f8faphrd896s6b4v8lm"; }; php71 = generic { - version = "7.1.9"; - sha256 = "1blvzm2js8mrdbmwks0v6nlb5wj4789ixzmlxm1l8z6xvw8cqk9i"; + version = "7.1.11"; + sha256 = "0ww5493w8w3jlks0xqlfm3v6mm53vpnv5vjy63inkj8zf3gdfikn"; }; } diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 127c093501c3..1614159a7ef0 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.6"; - minorVersion = "2"; + minorVersion = "3"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "1ab4vlpdax1ihpiyiwchlgsk36apl4kgdw271wvl9l8ywhxpfacj"; + sha256 = "1nl1raaagr4car787a2hmjv2dw6gqny53xfd6wisbgx4r5kxk9yd"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index bc586e0b3cee..098ab0b1719f 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -8,7 +8,7 @@ , ensureNewerSourcesHook }: -{ name +{ name ? "${attrs.pname}-${attrs.version}" # by default prefix `name` e.g. "python3.3-${name}" , namePrefix ? python.libPrefix + "-" diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 1a9475df2846..19517e2216b1 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.10.1"; + version = "6.11"; src = fetchurl { - url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "0v3z6x277lq1y7wkqdf6mj3826z5vq0yadygspx9h4r0f1dnmafc"; + url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; + sha256 = "1nk7705x24jjlbqqhj8yvbgqkfscxx3m81bry1g56kjxysjmf3sw"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix new file mode 100644 index 000000000000..75c7c64e324d --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchurl, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }: + +stdenv.mkDerivation rec { + version = "52.2.1gnome1"; + name = "spidermonkey-${version}"; + + # the release notes point to some guys home directory, see + # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38 + # probably it would be more ideal to pull a particular tag/revision + # from the mercurial repo + src = fetchurl { + url = "mirror://gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-${version}.tar.gz"; + sha256 = "1bxhz724s1ch1c0kdlzlg9ylhg1mk8kbhdgfkax53fyvn51pjs9i"; + }; + + buildInputs = [ readline icu zlib nspr ]; + nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; + + postUnpack = "sourceRoot=\${sourceRoot}/js/src"; + + preConfigure = '' + export CXXFLAGS="-fpermissive" + export LIBXUL_DIST=$out + export PYTHON="${python2.interpreter}" + ''; + + configureFlags = [ + "--enable-threadsafe" + "--with-system-nspr" + "--with-system-zlib" + "--with-system-icu" + "--with-intl-api" + "--enable-readline" + + # enabling these because they're wanted by 0ad. They may or may + # not be good defaults for other uses. + "--enable-gcgenerational" + "--enable-shared-js" + ]; + + # This addresses some build system bug. It's quite likely to be safe + # to re-enable parallel builds if the source revision changes. + enableParallelBuilding = true; + + postFixup = '' + # The headers are symlinks to a directory that doesn't get put + # into $out, so they end up broken. Fix that by just resolving the + # symlinks. + for i in $(find $out -type l); do + cp --remove-destination "$(readlink "$i")" "$i"; + done + ''; + + meta = with stdenv.lib; { + description = "Mozilla's JavaScript engine written in C/C++"; + homepage = https://developer.mozilla.org/en/SpiderMonkey; + # TODO: MPL/GPL/LGPL tri-license. + + maintainers = [ maintainers.abbradar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 877b10f69a33..d2ffa45626be 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -2,6 +2,7 @@ , openglSupport ? false, mesa_noglu , alsaSupport ? true, alsaLib , x11Support ? true, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr +, waylandSupport ? true, wayland, wayland-protocols, libxkbcommon , dbusSupport ? false, dbus , udevSupport ? false, udev , ibusSupport ? false, ibus @@ -17,18 +18,18 @@ assert openglSupport -> (stdenv.isDarwin || mesa_noglu != null && x11Support); let configureFlagsFun = attrs: [ - "--disable-oss" "--disable-x11-shared" + "--disable-oss" "--disable-x11-shared" "--disable-wayland-shared" "--disable-pulseaudio-shared" "--disable-alsa-shared" ] ++ lib.optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib" ++ lib.optional (!x11Support) "--without-x"; in stdenv.mkDerivation rec { name = "SDL2-${version}"; - version = "2.0.5"; + version = "2.0.7"; src = fetchurl { url = "http://www.libsdl.org/release/${name}.tar.gz"; - sha256 = "11c75qj1qxmx67iwkvf9z4x69phk301pdn86zzr6jncnap7kh824"; + sha256 = "0pjdpxla5kh1w1b0shxrx97a116vyy31njxi0jhyvqhk8d6cfdgf"; }; outputs = [ "out" "dev" ]; @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. propagatedBuildInputs = lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] ++ + lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ lib.optional pulseaudioSupport libpulseaudio; buildInputs = [ audiofile ] ++ diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index 78e0f4ed9725..548f8e686ba8 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "SDL2_image-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; - sha256 = "0r3z1l7fdn76qkpy7snpkcjqz8dkv2zp6lsqpq25q4m5xsyaygis"; + sha256 = "1s3ciydixrgv34vlf45ak5syq5nlfaqf19wf162lbz4ixxd0gpvj"; }; buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ]; diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index c0fdbf921a60..6eada0c83e52 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -4,19 +4,21 @@ stdenv.mkDerivation rec { name = "SDL2_mixer-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; - sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s"; + sha256 = "1fw3kkqi5346ai5if4pxrcbhs5c4vv3a4smgz6fl6kyaxwkmwqaf"; }; + preAutoreconf = '' + aclocal + ''; + nativeBuildInputs = [ autoreconfHook pkgconfig which ]; propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ]; - patches = [ ./libmodplug.patch ]; - configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl"; diff --git a/pkgs/development/libraries/SDL2_mixer/libmodplug.patch b/pkgs/development/libraries/SDL2_mixer/libmodplug.patch deleted file mode 100644 index 63ed2732ebfe..000000000000 --- a/pkgs/development/libraries/SDL2_mixer/libmodplug.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.in b/configure.in -index d511646..77dc3fe 100644 ---- a/configure.in -+++ b/configure.in -@@ -258,7 +258,7 @@ if test x$enable_music_mod = xyes -a x$enable_music_mod_modplug = xyes; then - have_libmodplug_lib=yes - ], [dnl - AC_CHECK_HEADER([libmodplug/modplug.h], [have_libmodplug_hdr=yes]) -- AC_CHECK_LIB([modplug], [have_libmodplug_lib=yes]) -+ AC_CHECK_LIB([modplug], [ModPlug_Load], [have_libmodplug_lib=yes]) - ]) - - if test x$have_libmodplug_hdr = xyes -a x$have_libmodplug_lib = xyes; then diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 4ab09f5bb1d5..bd540cdd5005 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec buildInputs = [ unzip cmake openexr hdf5 ]; - sourceRoot = "${name}-src"; - enableParallelBuilding = true; buildPhase = '' diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index e07e1fc39087..d177c3acfa71 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,17 +1,9 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, intltool, glib -, gtk_doc, autoconf, automake, libtool, libarchive -, gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl -, libuuid, json_glib, autoconf-archive, meson, gperf, ninja, gdk_pixbuf +{ stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, glib +, gtk_doc, libarchive, gobjectIntrospection +, sqlite, libsoup, gcab, attr, acl, docbook_xsl +, libuuid, json_glib, meson, gperf, ninja }: -let rpath = stdenv.lib.makeLibraryPath - [ libuuid.out - glib - libsoup - gdk_pixbuf - libarchive.lib - gcab - ]; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "appstream-glib-0.7.2"; src = fetchFromGitHub { @@ -28,12 +20,6 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gtk3 ]; mesonFlags = [ "-Denable-rpm=false" "-Denable-stemmer=false" "-Denable-dep11=false" ]; - postFixup = '' - for elf in "$out"/bin/* "$out"/lib/*.so; do - patchelf --set-rpath '${rpath}':"$out/lib" "$elf" - done - ''; - meta = with stdenv.lib; { description = "Objects and helper methods to read and write AppStream metadata"; homepage = https://github.com/hughsie/appstream-glib; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index d2b605c4f19c..b79f274b9c3a 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { cmakeFlags = '' -DSTEMMING=off ''; - + meta = with stdenv.lib; { description = "Software metadata handling library"; - homepage = "http://www.freedesktop.org/wiki/Distributions/AppStream/Software/"; + homepage = https://www.freedesktop.org/wiki/Distributions/AppStream/; longDescription = '' AppStream is a cross-distro effort for building Software-Center applications diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 18a15c70223a..2484e287016b 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -15,34 +15,34 @@ , mesa_noglu , makeWrapper , beignet -}: +}: stdenv.mkDerivation rec { name = "beignet-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "https://01.org/sites/default/files/${name}-source.tar.gz"; - sha256 = "07snrgjlhwl5fxz82dyqp632cnf5hp0gfqrjd2930jv79p37p6rr"; - }; + sha256 = "0hqb04jhjjslnmi3fnpzphanz84zywwkyw2sjr1k5qlx2jxfsmf5"; + }; - patches = [ ./clang_llvm.patch ]; + patches = [ ./clang_llvm.patch ]; enableParallelBuilding = true; postPatch = '' patchShebangs src/git_sha1.sh - ''; + ''; cmakeFlags = [ "-DCLANG_LIBRARY_DIR=${clang-unwrapped}/lib" ]; - buildInputs = [ - llvm + buildInputs = [ + llvm clang-unwrapped - libX11 + libX11 libXext libpthreadstubs - libdrm + libdrm libXdmcp libXdamage ocl-icd @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { It supports the Intel OpenCL runtime library and compiler. ''; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ artuuge ]; + maintainers = with maintainers; [ artuuge zimbatm ]; platforms = platforms.linux; - }; + }; } diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index c5a6f55681ab..9805930c7bfa 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ libmilter libX11 openssl readline utillinux ]; nativeBuildInputs = [ icmake yodl ]; - sourceRoot = "bobcat-${version}-src/bobcat"; + setSourceRoot = '' + sourceRoot=$(echo */bobcat) + ''; postPatch = '' substituteInPlace INSTALL.im --replace /usr $out diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index e4311c0a5e9c..1ac96e2b4f04 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { [ "--enable-cplusplus" ] ++ lib.optional enableLargeConfig "--enable-large-config"; - doCheck = true; + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; # Don't run the native `strip' when cross-compiling. dontStrip = hostPlatform != buildPlatform; diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 0c9f0903f148..e7b500905370 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { Bullet 3D Game Multiphysics Library provides state of the art collision detection, soft body and rigid body dynamics. ''; - homepage = http://code.google.com/p/bullet/; + homepage = http://bulletphysics.org; license = stdenv.lib.licenses.zlib; maintainers = with stdenv.lib.maintainers; [ aforemny ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 39296f86d8e1..bada2c2c709c 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { major = "1.8"; - minor = "2"; + minor = "4"; name = "clutter-gtk-${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz"; - sha256 = "da27d486325490ad3f65d2abf9413aeb8b4a8f7b559e4b2f73567a5344a26b94"; + sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j"; }; propagatedBuildInputs = [ clutter gtk3 ]; diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index c620777dc5bf..aa0708daaa7f 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -13,7 +13,9 @@ in python2Packages.buildPythonApplication rec { sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17"; }; - sourceRoot = "${name}-src/python"; + setSourceRoot = '' + sourceRoot=$(echo */python) + ''; meta = with stdenv.lib; { homepage = http://cxxtest.com; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 5dbf134cf450..68398e93764c 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext, pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false }: +{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext, + pam, fixDarwinDylibNames, autoreconfHook, fetchpatch, enableLdap ? false }: with stdenv.lib; stdenv.mkDerivation rec { @@ -21,6 +22,10 @@ stdenv.mkDerivation rec { patches = [ ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519 + (fetchpatch { # CVE-2013-4122 + url = "http://sourceforge.net/projects/miscellaneouspa/files/glibc217/cyrus-sasl-2.1.26-glibc217-crypt.diff"; + sha256 = "05l7dh1w9d5fvzg0pjwzqh0fy4ah8y5cv6v67s4ssbq8xwd4pkf2"; + }) ] ++ lib.optional stdenv.isFreeBSD ( fetchurl { url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch"; diff --git a/pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch b/pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch new file mode 100644 index 000000000000..ed916fcf4d1f --- /dev/null +++ b/pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch @@ -0,0 +1,11 @@ +--- a/env/env_open.c.old 2017-06-26 10:32:11.011419981 +0200 ++++ b/env/env_open.c 2017-06-26 10:32:46.893721233 +0200 +@@ -473,7 +473,7 @@ + env->db_mode = mode == 0 ? DB_MODE_660 : mode; + + /* Read the DB_CONFIG file. */ +- if ((ret = __env_read_db_config(env)) != 0) ++ if (env->db_home != NULL && (ret = __env_read_db_config(env)) != 0) + return (ret); + + /* diff --git a/pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch b/pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch new file mode 100644 index 000000000000..652e962bbe18 --- /dev/null +++ b/pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch @@ -0,0 +1,11 @@ +--- db-5.3.28/src/env/env_open.c.old 2017-06-26 10:32:11.011419981 +0200 ++++ db-5.3.28/src/env/env_open.c 2017-06-26 10:32:46.893721233 +0200 +@@ -473,7 +473,7 @@ + env->db_mode = mode == 0 ? DB_MODE_660 : mode; + + /* Read the DB_CONFIG file. */ +- if ((ret = __env_read_db_config(env)) != 0) ++ if (env->db_home != NULL && (ret = __env_read_db_config(env)) != 0) + return (ret); + + /* diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index bce91e5a9401..76e30e921ba1 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -3,7 +3,7 @@ import ./generic.nix (args // rec { version = "4.8.30"; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; - extraPatches = [ ./clang-4.8.patch ]; + extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ]; drvArgs.hardeningDisable = [ "format" ]; drvArgs.doCheck = false; diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 066eca4e63d8..7894e4c73262 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -3,5 +3,5 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; - extraPatches = [ ./clang-5.3.patch ]; + extraPatches = [ ./clang-5.3.patch ./CVE-2017-10140-cwd-db_config.patch ]; }) diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix index b7c5667b883e..bafca3bd52d2 100644 --- a/pkgs/development/libraries/db/db-6.0.nix +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -4,5 +4,5 @@ import ./generic.nix (args // rec { version = "6.0.20"; sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; license = stdenv.lib.licenses.agpl3; - extraPatches = [ ./clang-6.0.patch ]; + extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ]; }) diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix index f897e3744af1..96f7668aa903 100644 --- a/pkgs/development/libraries/db/db-6.2.nix +++ b/pkgs/development/libraries/db/db-6.2.nix @@ -4,5 +4,5 @@ import ./generic.nix (args // rec { version = "6.2.23"; sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7"; license = stdenv.lib.licenses.agpl3; - extraPatches = [ ./clang-6.0.patch ]; + extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ]; }) diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 6533997de2f8..01f3c11ac737 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchpatch, fetchurl }: stdenv.mkDerivation rec { - name = "expat-2.2.4"; + name = "expat-2.2.5"; src = fetchurl { url = "mirror://sourceforge/expat/${name}.tar.bz2"; - sha256 = "17h1fb9zvqvf0sr78j211bngc6jpql5wzar8fg9b52jzjvdqbb83"; + sha256 = "1xpd78sp7m34jqrw5x13bz7kgz0n6aj15wn4zj4gfx3ypbpk5p6r"; }; outputs = [ "out" "dev" ]; # TODO: fix referrers @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputMan = "dev"; # tiny page for a dev tool - doCheck = true; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; preCheck = '' patchShebangs ./run.sh diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 11d365159f80..b50025aa108a 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -411,7 +411,8 @@ stdenv.mkDerivation rec { ++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optionals nvenc [ nvidia-video-sdk ] ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation - MediaToolbox VideoDecodeAcceleration ]; + MediaToolbox VideoDecodeAcceleration + libiconv ]; # Build qt-faststart executable buildPhase = optional qtFaststartProgram ''make tools/qt-faststart''; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 2e06c3bbec78..d764121e8d6b 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -1,34 +1,35 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, autoreconfHook, pkgconfig +, openssl , odbcSupport ? false, unixODBC ? null }: assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { - name = "freetds-0.91"; + name = "freetds-${version}"; + version = "1.00.70"; src = fetchurl { - url = "http://mirrors.ibiblio.org/freetds/stable/${name}.tar.gz"; - sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba"; + url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; + sha256 = "1ydh0c89nb6wh6wakbkqad7mdwpymygvgbcrk8c2mp7abgv1jqzp"; }; - hardeningDisable = [ "format" ]; + configureFlags = [ + "--with-tdsver=7.3" + ]; - buildInputs = stdenv.lib.optional odbcSupport [ unixODBC ]; + buildInputs = [ + openssl + ] ++ stdenv.lib.optional odbcSupport unixODBC; - configureFlags = stdenv.lib.optionalString odbcSupport "--with-odbc=${unixODBC}"; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - doDist = true; + enableParallelBuilding = true; - distPhase = '' - touch $out/include/tds.h - touch $out/lib/libtds.a - ''; - - meta = { - description = - "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; - homepage = http://www.freetds.org; - license = "lgpl"; - platforms = stdenv.lib.platforms.all; + meta = with stdenv.lib; { + description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; + homepage = http://www.freetds.org; + license = licenses.lgpl2; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix index f1df8c5ff7f6..c1f9c6ad0137 100644 --- a/pkgs/development/libraries/garmintools/default.nix +++ b/pkgs/development/libraries/garmintools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { name = "garmintools-0.10"; src = fetchurl { - url = https://garmintools.googlecode.com/files/garmintools-0.10.tar.gz; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/garmintools/garmintools-0.10.tar.gz"; sha256 = "1vjc8h0z4kx2h52yc3chxn3wh1krn234fg12sggbia9zjrzhpmgz"; }; buildInputs = [ libusb ]; meta = { - homepage = https://code.google.com/p/garmintools; + homepage = https://code.google.com/archive/p/garmintools/; # community clone at https://github.com/ianmartin/garmintools license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.ocharles ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index c6313dec90ce..3b78225a447f 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lx201q20dvc70f8a3c9s7s18z15inlxvbffph97ngvrgnyjq9cx"; }; - doCheck = true; + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; # Linking static stubs on cygwin requires correct ordering. # Consider upstreaming this. diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 64d61d64bb63..483ee39c2da1 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "19hfmr8fa1js8ynazdyjxlyrqpjn6m1719ay70ilga4rayxrcyyi"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; @@ -21,6 +23,8 @@ stdenv.mkDerivation rec { dbus dbus_glib avahi ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; + propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ]; + preConfigure = '' substituteInPlace configure --replace "-Werror" "" ''; @@ -35,7 +39,9 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; - propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ]; + postInstall = '' + sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|" + ''; meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index f75290005391..ff65ca97eb74 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 gnome2.GConf libxslt glib_networking ]; diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index 17847695f973..b166a69043e8 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -8,9 +8,25 @@ stdenv.mkDerivation rec { sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; }; + outputs = [ "out" "dev" ]; + setOutputFlags = false; + + preConfigure = '' + configureFlagsArray+=( + --includedir=$dev/include + ) + ''; + buildInputs = [ xlibsWrapper ]; propagatedBuildInputs = [ imlib2 ]; + postFixup = '' + moveToOutput bin/giblib-config "$dev" + + # Doesn't contain useful stuff + rm -rf $out/share/doc + ''; + meta = { homepage = http://linuxbrit.co.uk/giblib/; description = "wrapper library for imlib2, and other stuff"; diff --git a/pkgs/development/libraries/git2/0.25.nix b/pkgs/development/libraries/git2/0.25.nix new file mode 100644 index 000000000000..679049a0e13e --- /dev/null +++ b/pkgs/development/libraries/git2/0.25.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, python +, zlib, libssh2, openssl, http-parser, curl, libiconv +}: + +stdenv.mkDerivation (rec { + version = "0.25.1"; + name = "libgit2-${version}"; + + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "1jhikg0gqpdzfzhgv44ybdpm24lvgkc7ki4306lc5lvmj1s2nylj"; + }; + + cmakeFlags = "-DTHREADSAFE=ON"; + + nativeBuildInputs = [ cmake python pkgconfig ]; + + buildInputs = [ zlib libssh2 openssl http-parser curl ]; + + enableParallelBuilding = true; + + meta = { + description = "The Git linkable library"; + homepage = https://libgit2.github.com/; + license = stdenv.lib.licenses.gpl2; + platforms = with stdenv.lib.platforms; all; + }; +} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { + NIX_LDFLAGS = "-liconv"; + propagatedBuildInputs = [ libiconv ]; +}) diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 0d53d00737ba..42cf181f84f1 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,35 +1,30 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }: +{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }: stdenv.mkDerivation (rec { - version = "0.25.1"; name = "libgit2-${version}"; + version = "0.26.0"; + # keep the version in sync with pythonPackages.pygit2 and gnome3.libgit2-glib - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "100bah8picqjzyhpw4wd7z5vyidcb8aggin50bhbpn607h8n8bml"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "0zrrmfkfhd2xb4879z5khjb6xsdklrm01f1lscrs2ks68v25fk78"; }; - # TODO: `cargo` (rust's package manager) surfaced a serious bug in - # libgit2 when the `Security.framework` transport is used on Darwin. - # The upstream issue is tracked at - # https://github.com/libgit2/libgit2/issues/3885 - feel free to - # remove this patch as soon as it's resolved (i.E. when cargo is - # working fine without this patch) - patches = stdenv.lib.optionals stdenv.isDarwin [ - ./disable-security.framework.patch - ]; - cmakeFlags = "-DTHREADSAFE=ON"; nativeBuildInputs = [ cmake python pkgconfig ]; + buildInputs = [ zlib libssh2 openssl http-parser curl ]; - meta = { + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "The Git linkable library"; homepage = https://libgit2.github.com/; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; all; + license = licenses.gpl2; + platforms = with platforms; all; }; } // stdenv.lib.optionalAttrs (!stdenv.isLinux) { NIX_LDFLAGS = "-liconv"; diff --git a/pkgs/development/libraries/git2/disable-security.framework.patch b/pkgs/development/libraries/git2/disable-security.framework.patch deleted file mode 100644 index ce6a008b1c4c..000000000000 --- a/pkgs/development/libraries/git2/disable-security.framework.patch +++ /dev/null @@ -1,58 +0,0 @@ -From fbc2ea65406236a740b8734dd41dc5ddbc24f8c9 Mon Sep 17 00:00:00 2001 -From: mulrich -Date: Mon, 8 Aug 2016 15:36:07 +0200 -Subject: [PATCH] disable security.framework - ---- - CMakeLists.txt | 7 +++---- - src/curl_stream.c | 9 ++++++++- - 2 files changed, 11 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 93a9e47..331e148 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,7 +49,8 @@ ENDIF() - - IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - SET( USE_ICONV ON ) -- FIND_PACKAGE(Security) -+ # FIND_PACKAGE(Security) -+ SET(SECURITY_FOUND "NO") - FIND_PACKAGE(CoreFoundation REQUIRED) - ENDIF() - -@@ -87,9 +88,7 @@ IF(MSVC) - OPTION(MSVC_CRTDBG "Enable CRTDBG memory leak reporting" OFF) - ENDIF() - --IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -- OPTION( USE_OPENSSL "Link with and use openssl library" ON ) --ENDIF() -+OPTION( USE_OPENSSL "Link with and use openssl library" ON ) - - CHECK_STRUCT_HAS_MEMBER ("struct stat" st_mtim "sys/types.h;sys/stat.h" - HAVE_STRUCT_STAT_ST_MTIM LANGUAGE C) -diff --git a/src/curl_stream.c b/src/curl_stream.c -index 98de187..a8a9f4c 100644 ---- a/src/curl_stream.c -+++ b/src/curl_stream.c -@@ -309,7 +309,14 @@ int git_curl_stream_new(git_stream **out, const char *host, const char *port) - curl_easy_setopt(handle, CURLOPT_HTTPPROXYTUNNEL, 1); - curl_easy_setopt(handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY); - -- /* curl_easy_setopt(handle, CURLOPT_VERBOSE, 1); */ -+ const char* cainfo = getenv("SSL_CERT_FILE"); -+ if(cainfo != NULL) { -+ curl_easy_setopt(handle, CURLOPT_CAINFO, cainfo); -+ } -+ -+ /* -+ curl_easy_setopt(handle, CURLOPT_VERBOSE, 1); -+ */ - - st->parent.version = GIT_STREAM_VERSION; - st->parent.encrypted = 0; /* we don't encrypt ourselves */ --- -2.3.8 (Apple Git-58) - diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 422b7f4c58c6..fd8055fd0b39 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -2,7 +2,7 @@ , gsettings_desktop_schemas }: let - ver_maj = "2.50"; + ver_maj = "2.54"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz"; - sha256 = "3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee"; + sha256 = "5961b3779080b72314b373ff5d4790eb7e41b75ca91816ad7a81ef32922f7096"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs diff --git a/pkgs/development/libraries/glibc/2.25-49.patch.gz b/pkgs/development/libraries/glibc/2.25-49.patch.gz deleted file mode 100644 index 6796347e3795..000000000000 Binary files a/pkgs/development/libraries/glibc/2.25-49.patch.gz and /dev/null differ diff --git a/pkgs/development/libraries/glibc/2.26-75.patch.gz b/pkgs/development/libraries/glibc/2.26-75.patch.gz new file mode 100644 index 000000000000..e2a8867e4fff Binary files /dev/null and b/pkgs/development/libraries/glibc/2.26-75.patch.gz differ diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 5c7bbb32c330..7894d75fbe67 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -19,9 +19,9 @@ } @ args: let - version = "2.25"; - patchSuffix = "-49"; - sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0"; + version = "2.26"; + patchSuffix = "-75"; + sha256 = "1ggnj1hzjym7sn93rbwydcqd562q73lsb7g7kd199g6j9j9hlkp5"; cross = if buildPlatform != hostPlatform then hostPlatform else null; in @@ -46,7 +46,7 @@ stdenv.mkDerivation ({ glibc-2.25-49-gbc5ace67fe $ git show --reverse glibc-2.25..release/2.25/master | gzip -n -9 --rsyncable - > 2.25-49.patch.gz */ - ./2.25-49.patch.gz + ./2.26-75.patch.gz /* Have rpcgen(1) look for cpp(1) in $PATH. */ ./rpcgen-path.patch @@ -100,15 +100,12 @@ stdenv.mkDerivation ({ (if profilingLibraries then "--enable-profile" else "--disable-profile") - ] ++ lib.optionals (cross == null && withLinuxHeaders) [ - "--enable-kernel=2.6.32" + ] ++ lib.optionals withLinuxHeaders [ + "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26 ] ++ lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls") (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") - ] ++ lib.optionals (cross != null - && cross.platform ? kernelMajor - && cross.platform.kernelMajor == "2.6") [ - "--enable-kernel=2.6.0" + ] ++ lib.optionals (cross != null) [ "--with-__thread" ] ++ lib.optionals (cross == null && stdenv.isArm) [ "--host=arm-linux-gnueabi" diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 5c318c9b46a2..a3af96d51edc 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx }: let - ver_maj = "2.50"; - ver_min = "0"; + ver_maj = "2.54"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "glibmm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz"; - sha256 = "df726e3c6ef42b7621474b03b644a2e40ec4eef94a1c5a932c1e740a78f95e94"; + sha256 = "0jkapw18icz59cmlmsl00nwwz0wh291kb4hc9z9hxmq45drqrhkw"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index c663c4e68a77..10ef1bbd920f 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "glog-${version}"; version = "0.3.4"; - + src = fetchFromGitHub { owner = "Google"; repo = "glog"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = http://code.google.com/p/google-glog/; + homepage = https://github.com/google/glog; license = licenses.bsd3; description = "Library for application-level logging"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 0b633f0a2f17..d2947cd7c6b5 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -12,7 +12,8 @@ assert guileBindings -> guile != null; let # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"; + doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4" + && stdenv.buildPlatform == stdenv.hostPlatform; in stdenv.mkDerivation { name = "gnutls-${version}"; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index b26ae9c9d612..f629b9a8a3c3 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -7,7 +7,7 @@ # In that case its about 6MB which could be separated let - ver_maj = "1.52"; + ver_maj = "1.54"; ver_min = "1"; in with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz"; - sha256 = "1x5gkyrglv3dn9b4fsgw6asqgjw1wj7qc37g9pyac6pyaa6w7l1f"; + sha256 = "0zl7pfkzkm07733391b4f3cwjbnvb1nwvpmajf5bajh6bxgfv3dq"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index e6d1fd3b6403..5c863cf26cbe 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://code.google.com/p/gperftools/; + homepage = https://github.com/gperftools/gperftools; description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; platforms = with platforms; linux ++ darwin; license = licenses.bsd3; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 69378d95a301..2e0e711ce71d 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -17,11 +17,11 @@ let inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.10.4"; + name = "gst-plugins-bad-1.12.2"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = "https://gstreamer.freedesktop.org"; longDescription = '' a set of plug-ins that aren't up to par compared to the rest. They might be close to being good quality, but they're missing @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "0rk9rlzf2b0hjw5hwbadz53yh4ls7vm3w3cshsa3n8isdd8axp93"; + sha256 = "0dwyq03g2m0p16dwx8q5qvjn5x9ia72h21sf87mp97gmwkfpwb4w"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 70aa9101ad8b..2ff429179642 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -4,18 +4,18 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.10.4"; + name = "gst-plugins-base-1.12.2"; meta = { description = "Base plugins and helper libraries"; - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; }; src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "1dsyjf6rncsbg4rfj40cvf1wwpjj9h3j3c7bh4zp7jylnfv4blpn"; + sha256 = "0x86a7aph0y6gyq178plvwvbbyhkfb3hf0gadx9sk5z1mzixqrsh"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 4bd7fb5396ac..67521e40daf6 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.10.4"; + name = "gstreamer-1.12.2"; meta = { description = "Open source multimedia framework"; - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.ttuegel ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "062jidnw17hkpva6ddygp80gyasyigfkpm1y7w56rk56a2pzbhjh"; + sha256 = "1fllz7n58lavyy4nh64xc7izd4ffhl12a2ff0yg4z67al8wkzplz"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index cf69fa943a27..e206f317d4ba 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -3,18 +3,18 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.10.4"; + name = "gstreamer-editing-services-1.12.2"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; }; src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "0i11b1rwkjsy9gxrf9vk9lgg8qm60ggfi5lp0ncyh4lxvh16vbgj"; + sha256 = "0bi0f487949k9xnl1r6ngysgaibmmswwgdqcrchg0dixnnbm9isr"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix index 90d4ec458a93..c04b64ae3c6a 100644 --- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gstreamer Non-Linear Multimedia Editing Plugins"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = "https://gstreamer.freedesktop.org"; longDescription = '' Gnonlin is a library built on top of GStreamer which provides support for writing non-linear audio and video editing diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index c18d8332b0c0..1c7f7951e916 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -11,11 +11,11 @@ let inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-good-1.10.4"; + name = "gst-plugins-good-1.12.2"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = "https://gstreamer.freedesktop.org"; longDescription = '' a set of plug-ins that we consider to have good quality code, correct functionality, our preferred license (LGPL for the plug-in @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "0zjdwxn83sp9wjp9rxjbyk8kf284g9av7l2v6rjldi586hacd1la"; + sha256 = "15pfw54fsh9s9xwrnbap4z4njwgqdfvq52k562d2hc5b11rfx4am"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index a41695655114..f6138fafaefc 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -12,6 +12,13 @@ stdenv.mkDerivation rec { sha256 = "0i4sk6ns4dyi4szk45bkm4kvl57l52lgm15p2wg2rhx2gr2w3qry"; }; + patches = [ + (fetchurl { + url = https://bug783628.bugzilla-attachments.gnome.org/attachment.cgi?id=354765; + sha256 = "082510a934bl05mz4cyakp8mfmd97cdj7vdrbvyqc4g58dcskvz0"; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig file ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix index 953f8900ade9..95b394a6d4b7 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2" + "https://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix index fecc77b2a544..bdb1b6c7bb7a 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "‘Bad’ (potentially low quality) plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index 5b2ba728f3a8..2c2e1b0da122 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/gtk-doc"; meta = with stdenv.lib; { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "Base plug-ins for GStreamer"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index 9339de3d9ed4..d533f798d999 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "`Good' plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index 9863b3e01285..5c289fb39114 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index fd01aa5c1dce..c8414a7b681b 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gstreamer python ]; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "Python bindings for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix index 74b1417e0694..9797f21c1685 100644 --- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "qt-gstreamer"; src = fetchurl { - url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2"; sha256 = "1pqg9sxzk8sdrf7pazb5v21hasqai9i4l203gbdqz29w2ll1ybsl"; }; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index f312a14de24f..7c0a05f8202b 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -9,17 +9,17 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.10.4"; + name = "gst-libav-1.12.2"; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; }; src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "12r68ri03mgbbwsxyn6yklgfsq32rwvyq83zw0aq7m73fp5gx83c"; + sha256 = "1crdahkjm23byg1awcrjkmgfbalfpvvac7h7whm6b2r1pfwkbdsv"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix index 72068bb1f7bc..a9e7f9fcff3e 100644 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "qt-gstreamer"; src = fetchurl { - url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz"; sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4"; }; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index bd034ac13a15..610f10075a8d 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.10.4"; + name = "gst-plugins-ugly-1.12.2"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = "https://gstreamer.freedesktop.org"; longDescription = '' a set of plug-ins that have good quality and correct functionality, but distributing them might pose problems. The license on either @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "0ngsiwcsz3jd08id4mc0qiy2q1n7h2kkvdnh3r1vm725m1ycg1k3"; + sha256 = "0rplyp1qk359c97ig9i2vc1v34g92khd8dslwfipva1ypwmr9hqw"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index caca54400841..becd4cf0d921 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.4"; + version = "1.12.2"; src = fetchurl { url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; - sha256 = "0xfyf1mgcxnwf380wxv20hakl2srp34dmiw6bm4zkncl2mi91rh3"; + sha256 = "0fhncs27hcdcnb9a4prkxlyvr883hnzsx148zzk7lg2b8zh19ir3"; }; outputs = [ "out" "dev" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0"; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index b537ad2897d7..9704ca1d743c 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -3,18 +3,18 @@ }: stdenv.mkDerivation rec { - name = "gst-validate-1.10.4"; + name = "gst-validate-1.12.2"; meta = { description = "Integration testing infrastructure for the GStreamer framework"; - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; }; src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "0g6px08x4kq5xqlbyxvxn6cm9b1s1gfvhkmlrmvw9afccjzh1775"; + sha256 = "1pgycs35bwmp4aicyxwyzlfy1i5l2rzmh2a8ivhgy21azp8jaykb"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 84b1fa9757ce..f5fc635a5a43 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Google's framework for writing C++ tests"; - homepage = https://code.google.com/p/googletest/; + homepage = https://github.com/google/googletest; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ zoomulator ivan-tkatchev ]; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 93f24b0f7225..4da9db3ef047 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,24 +1,22 @@ {stdenv, fetchurl , automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt -, glib, systemd, libusb1, vala_0_23 +, glib, systemd, libusb1, vala_0_38 }: stdenv.mkDerivation rec { name = "gusb-${version}"; - version = "0.2.9"; + version = "0.2.11"; enableParallelBuilding = true; src = fetchurl { - url = "http://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; - sha256 = "056yxlppgycsfw1l8c9j6givk1n15jylhvx89wqhsxdi1b6vs83k"; + url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; + sha256 = "1pppz17lw3khyz8by1dddxdqrv6qn4a23fpxs38c67db7x4l7ccw"; }; preConfigure = "./autogen.sh"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt - systemd vala_0_23 glib - ]; + nativeBuildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext + gobjectIntrospection libxslt vala_0_38 ]; + buildInputs = [ systemd glib ]; propagatedBuildInputs = [ libusb1 ]; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 6eb341d66bce..78f507ca1465 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, libtool , glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit -, libgphoto2, avahi, libarchive, fuse, libcdio +, libgphoto2, avahi, libarchive, fuse, libcdio, file, bzip2, lzma , libxml2, libxslt, docbook_xsl, samba, libmtp , gnomeSupport ? false, gnome, makeWrapper }: let - ver_maj = "1.30"; + ver_maj = "1.34"; version = "${ver_maj}.1"; in stdenv.mkDerivation rec { @@ -13,21 +13,21 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz"; - sha256 = "e752e7bb46e64e4025f63428d4f5247e3e5c0d0b5eeb4f81dbf1cd7b75f59d7b"; + sha256 = "1d3j6f252mk316hrspwy63inrhxk6l78l4bmlmql401lqapb5yby"; }; nativeBuildInputs = [ - pkgconfig intltool libtool + pkgconfig intltool libtool file makeWrapper libxml2 libxslt docbook_xsl ]; buildInputs = - [ makeWrapper glib dbus udev libgudev udisks2 libgcrypt - libgphoto2 avahi libarchive fuse libcdio + [ glib dbus udev libgudev udisks2 libgcrypt + libgphoto2 avahi libarchive fuse libcdio lzma bzip2 samba libmtp libcap polkit # ToDo: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ - gtk libsoup libgnome_keyring gconf gcr + libsoup libgnome_keyring gconf gcr # ToDo: not working and probably useless until gnome3 from x-updates ]); diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 78e0c5740446..8a7cf8365a5b 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation { echo Source root reset to ''${sourceRoot} ''; + # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 + postPatch = if stdenv ? glibc + then "substituteInPlace i18n/digitlst.cpp --replace '' ''" + else null; # won't find locale_t on darwin + inherit patchFlags patches; preConfigure = '' diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 8d26cabc9b54..54c70197af4d 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig -, freetype +, freetype, libid3tag , x11Support ? true, xlibsWrapper ? null }: with stdenv.lib; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0wm2q2xlkbm71k7mw2jyzbxgzylrkcj5yh6nq58w5gybhp98qs9z"; }; - buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype ] + buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype libid3tag ] ++ optional x11Support xlibsWrapper; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index a09bcd6f039c..e586b30393e6 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -1,17 +1,14 @@ { stdenv, fetchFromGitHub }: -let - inherit (stdenv.lib) optional; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "iniparser-${version}"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "ndevilla"; repo = "iniparser"; rev = "v${version}"; - sha256 = "0339qa0qxa5z02xjcs5my8v91v0r9jm4piswrl1sa29kwyxgv5nb"; + sha256 = "0dhab6pad6wh816lr7r3jb6z273njlgw2vpw8kcfnmi7ijaqhnr5"; }; patches = ./no-usr.patch; @@ -19,9 +16,6 @@ in stdenv.mkDerivation rec { doCheck = true; preCheck = "patchShebangs test/make-tests.sh"; - # TODO: Build dylib on Darwin - buildFlags = (if stdenv.isDarwin then [ "libiniparser.a" ] else [ "libiniparser.so" ]) ++ [ "CC=cc" ]; - installPhase = '' mkdir -p $out/lib @@ -34,17 +28,16 @@ in stdenv.mkDerivation rec { done; cp -r html $out/share/doc/${name} - '' + (if stdenv.isDarwin then '' cp libiniparser.a $out/lib - '' else '' - cp libiniparser.so.0 $out/lib - ln -s libiniparser.so.0 $out/lib/libiniparser.so - ''); + cp libiniparser.so.1 $out/lib + ln -s libiniparser.so.1 $out/lib/libiniparser.so + ''; - meta = { + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Free standalone ini file parsing library"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.primeos ]; }; } diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix index 317ba601cfbd..bc34957b9c3e 100644 --- a/pkgs/development/libraries/java/junixsocket/default.nix +++ b/pkgs/development/libraries/java/junixsocket/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "junixsocket-1.3"; src = fetchurl { - url = "http://junixsocket.googlecode.com/files/${name}-src.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/junixsocket/${name}-src.tar.bz2"; sha256 = "0c6p8vmiv5nk8i6g1hgivnl3mpb2k3lhjjz0ss9dlirisfrxf1ym"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "A Java/JNI library for using Unix Domain Sockets from Java"; - homepage = https://code.google.com/p/junixsocket/; + homepage = https://github.com/kohlschutter/junixsocket; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 9d434c088bad..2414931e76aa 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,24 +1,34 @@ -{ stdenv, fetchurl, glib, pkgconfig, gobjectIntrospection, dbus, libintlOrEmpty }: +{ stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext, gobjectIntrospection, dbus, libintlOrEmpty }: stdenv.mkDerivation rec { - name = "json-glib-${minVer}.0"; - minVer = "1.2"; + name = "json-glib-${minVer}.2"; + minVer = "1.4"; src = fetchurl { url = "mirror://gnome/sources/json-glib/${minVer}/${name}.tar.xz"; - sha256 = "1lx7p1c7cl21byvfgw92n8dhm09vi6qxrs0zkx9dg3y096zdzmlr"; + sha256 = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8"; }; - configureflags= "--with-introspection"; - - propagatedBuildInputs = [ glib gobjectIntrospection ]; - nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glib ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; buildInputs = libintlOrEmpty; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + patches = [ + # https://gitlab.gnome.org/GNOME/json-glib/issues/27 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/json-glib/merge_requests/2.diff"; + sha256 = "0pf006jxj1ki7a0w4ykxm6b24m0wafrhpdcmixsw9x83m227156c"; + }) + ]; + outputs = [ "out" "dev" ]; + doCheck = true; + + checkPhase = "meson test"; + meta = with stdenv.lib; { homepage = http://live.gnome.org/JsonGlib; description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 9f212c422f4f..0e0372ad7ac1 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.38/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.39/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index 9e88c0a99fc6..7fc11b1505c9 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, fetchpatch, extra-cmake-modules, perl, karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2, qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols @@ -14,4 +14,9 @@ mkDerivation { qtxmlpatterns sonnet syntax-highlighting qtquickcontrols ]; propagatedBuildInputs = [ kparts ]; + patches = [ (fetchpatch { + url = "https://cgit.kde.org/ktexteditor.git/patch/?id=aeebeadb5f5955995c17de56cf83ba7166a132dd"; + sha256 = "10a61w1qyw3czffl06xgccgd3yycz7s0hpg2vj0a24v05jhqiigf"; + name = "ktextedtor_fix_indenters.patch"; + })]; } diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index ffad3b1a7fde..c075adf02941 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -1,6 +1,7 @@ { mkDerivation, lib, copyPathsToStore, extra-cmake-modules, + libpthreadstubs, libXdmcp, qtbase, qttools, qtx11extras }: @@ -11,7 +12,7 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qttools qtx11extras ]; + buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); preConfigure = '' diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 0672e48aba23..3a8ed594655e 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,603 +3,611 @@ { attica = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/attica-5.38.0.tar.xz"; - sha256 = "12smdcd7lcyjqiw0bsk3lwivrl6cvmiqv5cqaw0gz8flhvk29w96"; - name = "attica-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/attica-5.39.0.tar.xz"; + sha256 = "15972518n4g65k391imkcsjikfsfhx8livdm6n0whag0aiz55haf"; + name = "attica-5.39.0.tar.xz"; }; }; baloo = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/baloo-5.38.0.tar.xz"; - sha256 = "14522akyxg36lclfblp65xai95i9hiydqjhkmfkadjbq82wm9s9i"; - name = "baloo-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/baloo-5.39.0.tar.xz"; + sha256 = "06y8mv7v9y7syz04x0zicdm628k6za3p366xrzwafc43m159wyms"; + name = "baloo-5.39.0.tar.xz"; }; }; bluez-qt = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/bluez-qt-5.38.0.tar.xz"; - sha256 = "0hanmygp4smbvczxn4dj997z3bln32p017z0r26z89m2p0b2ylwv"; - name = "bluez-qt-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/bluez-qt-5.39.0.tar.xz"; + sha256 = "0j0072q0zc9hdpjbkqciqv18pwpdij74qrjph7whh66csjkr5ad1"; + name = "bluez-qt-5.39.0.tar.xz"; }; }; breeze-icons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/breeze-icons-5.38.0.tar.xz"; - sha256 = "09afi6c4h31ycs6aa85lqbmn392zi532zf8fp7ll43xxjv9isac9"; - name = "breeze-icons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/breeze-icons-5.39.0.tar.xz"; + sha256 = "132bpgma1lqhrly48zz1f8jyg5z5pvnn1wnqxz6psvqhipw7fh5x"; + name = "breeze-icons-5.39.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/extra-cmake-modules-5.38.0.tar.xz"; - sha256 = "0ci3vdzdbcrbnxpqvf4hcwcrzz1ijhifp8b99wh3k53rinnai231"; - name = "extra-cmake-modules-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/extra-cmake-modules-5.39.0.tar.xz"; + sha256 = "1ldwzx2bzlzw7r31w8zy08j4cn9q7d1kszc5jb22zhfqpvbkc1dq"; + name = "extra-cmake-modules-5.39.0.tar.xz"; }; }; frameworkintegration = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/frameworkintegration-5.38.0.tar.xz"; - sha256 = "0w1n3czgsnnmaqwypy3mpci8s4ppv9030zxw7ka7rsvwgkpqijq8"; - name = "frameworkintegration-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/frameworkintegration-5.39.0.tar.xz"; + sha256 = "136s8chyiac30czicqgkrc4abgm7c8b2ppnqwv9ngxpx7nsjgd2h"; + name = "frameworkintegration-5.39.0.tar.xz"; }; }; kactivities = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kactivities-5.38.0.tar.xz"; - sha256 = "0grm0cilc80g5ih2hqhwgwm35mlfnrs343j6ixkd9s0mflv2b798"; - name = "kactivities-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kactivities-5.39.0.tar.xz"; + sha256 = "0nkc1p7n6yvybcib6aqmnz08hwn3ryj1f9wbkiimgs0svr00sslq"; + name = "kactivities-5.39.0.tar.xz"; }; }; kactivities-stats = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kactivities-stats-5.38.0.tar.xz"; - sha256 = "0s57iz04n3m4fpqrqflda6vpk4l1mnf0nyz1iyza382fb375afd2"; - name = "kactivities-stats-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kactivities-stats-5.39.0.tar.xz"; + sha256 = "18ghfqggwf38rmb1lkbv8ggxx71cp6ba3882kp5ccb7wwih51qcy"; + name = "kactivities-stats-5.39.0.tar.xz"; }; }; kapidox = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kapidox-5.38.0.tar.xz"; - sha256 = "1j4k75lhqdnsxmgyvblla0627qvgabxivw6limfdb3rdpmqdxj76"; - name = "kapidox-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kapidox-5.39.0.tar.xz"; + sha256 = "12nmsa1cg5amyawfxywlg8qsl01idi0jacrd8jzmvdj5m8sisw6n"; + name = "kapidox-5.39.0.tar.xz"; }; }; karchive = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/karchive-5.38.0.tar.xz"; - sha256 = "0n5nxd3v9ljjff0r6k4xrvy5hj057b7c7jzcq258harl359d8m4k"; - name = "karchive-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/karchive-5.39.0.tar.xz"; + sha256 = "0rb8vr6lg8vx4f07swvlsyrxy4gj21aqfffk0cvhlsdz94j1phrw"; + name = "karchive-5.39.0.tar.xz"; }; }; kauth = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kauth-5.38.0.tar.xz"; - sha256 = "12nyfbilz4v4b2i5x191iph3jj4lcpw7z1rh0xrv5y1v7dczk6i7"; - name = "kauth-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kauth-5.39.0.tar.xz"; + sha256 = "08bjxvv22y199skx4l9m8az165wz7inqqx7s8b7p5cjms4bvi15i"; + name = "kauth-5.39.0.tar.xz"; }; }; kbookmarks = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kbookmarks-5.38.0.tar.xz"; - sha256 = "0s230mcwmrg0qpz42sg804m96j2xpnwj4bdp0mfv08x3jasqpbrq"; - name = "kbookmarks-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kbookmarks-5.39.0.tar.xz"; + sha256 = "1xfabyc7hxmi1p0wqld0va5pl6bfwh50px4mvpxbnjdna6anw6z5"; + name = "kbookmarks-5.39.0.tar.xz"; }; }; kcmutils = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kcmutils-5.38.0.tar.xz"; - sha256 = "0n6f2xvl5v8fwfxpdl6la1hb01dh4h1pcdrf05nn60v0rqg9f58b"; - name = "kcmutils-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kcmutils-5.39.0.tar.xz"; + sha256 = "1cz4haj83j59szl16r0mfh4zx93szrwkmb9mq2r21v46c8k5ldw0"; + name = "kcmutils-5.39.0.tar.xz"; }; }; kcodecs = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kcodecs-5.38.0.tar.xz"; - sha256 = "0cnxhaj5jk7f3j9q4hzphc3nm3vdaqwy9xab5d4nvn1kv8vjv8ii"; - name = "kcodecs-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kcodecs-5.39.0.tar.xz"; + sha256 = "1q0l88nfbxgdy5lpm5xbcs749n9jyxhq7xsgqpf9c8irc7c1gw7f"; + name = "kcodecs-5.39.0.tar.xz"; }; }; kcompletion = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kcompletion-5.38.0.tar.xz"; - sha256 = "0f955w67wrk15rdmglrk7k0xc5i6kah12bpb078xhzlyfackg52w"; - name = "kcompletion-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kcompletion-5.39.0.tar.xz"; + sha256 = "09jdc4pn7yjb7nagic38xiqdpv9fy4f2f4c1a5ynbli7x1r6l7ms"; + name = "kcompletion-5.39.0.tar.xz"; }; }; kconfig = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kconfig-5.38.0.tar.xz"; - sha256 = "0fi428dsr6qpa9336wcfic6hyix6l2p9s135w00qzdwhdkr4lx3r"; - name = "kconfig-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kconfig-5.39.0.tar.xz"; + sha256 = "011i48f07470igqqcz4hychbw0q85p0bh5dykpla4zwdldllsl1w"; + name = "kconfig-5.39.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kconfigwidgets-5.38.0.tar.xz"; - sha256 = "0w319d94wxn90dbbdfw5zrn2ddnv9vb7wldkpvvycq7yxrhsfw0x"; - name = "kconfigwidgets-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kconfigwidgets-5.39.0.tar.xz"; + sha256 = "1i6cniqsmn9sds8nj7bcsnbmlkq9m1yjwvr45mhal9rkhaas4xzw"; + name = "kconfigwidgets-5.39.0.tar.xz"; }; }; kcoreaddons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kcoreaddons-5.38.0.tar.xz"; - sha256 = "1m3mn9fhllwcidzji2l26k5yxzrqkbyjdly04nh3s5rf823dvqwv"; - name = "kcoreaddons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kcoreaddons-5.39.0.tar.xz"; + sha256 = "0qskv44siykyn8iiq99llibw3bk499ry7r3i8abx4ljjl717cvlz"; + name = "kcoreaddons-5.39.0.tar.xz"; }; }; kcrash = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kcrash-5.38.0.tar.xz"; - sha256 = "1a8hvyhwa112wx4ldadlrxpyda6qpial387j07dr1jq1cnzr0p11"; - name = "kcrash-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kcrash-5.39.0.tar.xz"; + sha256 = "1fv32l50h9rlc5s9iplyljcsrscivgdy2baghq7hbcs58xrjf1ws"; + name = "kcrash-5.39.0.tar.xz"; }; }; kdbusaddons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdbusaddons-5.38.0.tar.xz"; - sha256 = "1mw9sl82y2aj7l2xj1skrbxbyv55br60h6f61r4f1mqcaxaqj7qw"; - name = "kdbusaddons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdbusaddons-5.39.0.tar.xz"; + sha256 = "0hp85995n3193dvvdv48hv59b66dzd9p4iwnx2dmj797lghpnir3"; + name = "kdbusaddons-5.39.0.tar.xz"; }; }; kdeclarative = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdeclarative-5.38.0.tar.xz"; - sha256 = "1966sxzhdkzi2lwg5ixhrx0yg10plbvn9lsjgnj9crghaajsnf4b"; - name = "kdeclarative-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdeclarative-5.39.0.tar.xz"; + sha256 = "1l8wnyfz6qjqmcpdzavsb6m1r3ay1b2r186myymsyknr80yr2d7p"; + name = "kdeclarative-5.39.0.tar.xz"; }; }; kded = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kded-5.38.0.tar.xz"; - sha256 = "0xsjzj5jx4wsrq5fnbv6raqlr11shz20p2mvypf5wfvq2c1vb5lb"; - name = "kded-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kded-5.39.0.tar.xz"; + sha256 = "0jv4ghl2gzfdkhk1in3vx39kigvpprvcb9xlzc5506mpfjc38ga5"; + name = "kded-5.39.0.tar.xz"; }; }; kdelibs4support = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/kdelibs4support-5.38.0.tar.xz"; - sha256 = "06vlgziy212pwm4z9r8rbfa9ziwx3nkihy9b25m13gbh60baqapp"; - name = "kdelibs4support-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/kdelibs4support-5.39.0.tar.xz"; + sha256 = "03xjzhdvs497sk9bpz79crxlzwff198ivj4n5f0mwmnqc0100dfp"; + name = "kdelibs4support-5.39.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdesignerplugin-5.38.0.tar.xz"; - sha256 = "0rivjxgsxvsgk24lnzsqpzqr7m1i1faqnbby3rnkw2059z28l0y6"; - name = "kdesignerplugin-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdesignerplugin-5.39.0.tar.xz"; + sha256 = "1b7rn66wsyn9aipgvfmn2pq18g0zdjxb469126dj18fahg2k777f"; + name = "kdesignerplugin-5.39.0.tar.xz"; }; }; kdesu = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdesu-5.38.0.tar.xz"; - sha256 = "1c9j2zih7r0jph41kzxnxpri9snphm1k4w4rs1q6zawwz8a5kcr5"; - name = "kdesu-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdesu-5.39.0.tar.xz"; + sha256 = "03avzhs6a0p3cjv4kk9vavf6f64ffgs3pzhbdkfr76fh58h1v6wx"; + name = "kdesu-5.39.0.tar.xz"; }; }; kdewebkit = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdewebkit-5.38.0.tar.xz"; - sha256 = "1cncbjkgrbrnvwx3izjqh9hqiw9bg6aqaq09f8bdryvr8537b0zf"; - name = "kdewebkit-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdewebkit-5.39.0.tar.xz"; + sha256 = "05f0l3zw8cnvyavwwijwy5jx8dairhdbvg6ynpn7r5l10vawcf6x"; + name = "kdewebkit-5.39.0.tar.xz"; }; }; kdnssd = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdnssd-5.38.0.tar.xz"; - sha256 = "101gygxrq2m3yfz6j0ldspib3pm3jjvqz505j3h15zj59qcwqw0x"; - name = "kdnssd-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdnssd-5.39.0.tar.xz"; + sha256 = "1c8d1wwr0hkdkgnq4k7lgkqwm1pj676i09l1kas256rzz6dcyl75"; + name = "kdnssd-5.39.0.tar.xz"; }; }; kdoctools = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdoctools-5.38.0.tar.xz"; - sha256 = "0fbv7i1930rl496psny7nfiixvsnaq535h1zggwkwv6i9dh7wpy9"; - name = "kdoctools-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdoctools-5.39.0.tar.xz"; + sha256 = "17g4kf7mbjjxhii4nbhfpmhjs1q23mlh0d3fqyxxhm3pp02jg8ap"; + name = "kdoctools-5.39.0.tar.xz"; }; }; kemoticons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kemoticons-5.38.0.tar.xz"; - sha256 = "1c0991yd8jx2diy5ynl11h5qqyapn1dsir2gy04y8m90h944vdd5"; - name = "kemoticons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kemoticons-5.39.0.tar.xz"; + sha256 = "132gs69v43ms117ibdqmnhbyzzs5by76pfz7bd2zqwl4mq94hpgh"; + name = "kemoticons-5.39.0.tar.xz"; }; }; kfilemetadata = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kfilemetadata-5.38.0.tar.xz"; - sha256 = "1815r9lx99h9kzbk67bfk41jya3y2hsi112fsgpv3m4mg028pklm"; - name = "kfilemetadata-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kfilemetadata-5.39.0.tar.xz"; + sha256 = "1mcxphjpayyq7v16b6c3zhb6c9vn67495xywfb9y8ysma1cdpshg"; + name = "kfilemetadata-5.39.0.tar.xz"; }; }; kglobalaccel = { - version = "5.38.1"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kglobalaccel-5.38.1.tar.xz"; - sha256 = "0si3bxxa6wj008j6rr6a1ljnsbmim4z0pqyx1z48ih4qamcfpkin"; - name = "kglobalaccel-5.38.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kglobalaccel-5.39.0.tar.xz"; + sha256 = "0wcbnwfi98cx8f99a2mcz2kg7mggz3hipfxv9s8ks6c80865kar1"; + name = "kglobalaccel-5.39.0.tar.xz"; }; }; kguiaddons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kguiaddons-5.38.0.tar.xz"; - sha256 = "1jks0hwn665hlypl0qfhi5r0prqzrg1gv4skc88zp1kgx05kb9h1"; - name = "kguiaddons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kguiaddons-5.39.0.tar.xz"; + sha256 = "1az9i5bg7xd7kv7ajq8j8jab7zly683gyi90rmk54vfnn6igbq3f"; + name = "kguiaddons-5.39.0.tar.xz"; }; }; khtml = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/khtml-5.38.0.tar.xz"; - sha256 = "0fa61va3dbwml40y4scxks223swlb8vf5730wr7rijl91lz1adgy"; - name = "khtml-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/khtml-5.39.0.tar.xz"; + sha256 = "097nbwv8ba48xmrga62j1irlkkc0l0f3971fp7225pzh1g3cg152"; + name = "khtml-5.39.0.tar.xz"; }; }; ki18n = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/ki18n-5.38.0.tar.xz"; - sha256 = "0z9arj2s4fn04vavl6ad3avl1p5yr3mgr2n802lmvy2wlqicy314"; - name = "ki18n-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/ki18n-5.39.0.tar.xz"; + sha256 = "1985qgihrch37b5gf7qw33bazahm3xb5v2nj43k6vdjxfg1clcay"; + name = "ki18n-5.39.0.tar.xz"; }; }; kiconthemes = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kiconthemes-5.38.0.tar.xz"; - sha256 = "01xa30r2cx312vbmz2c3x8vvna1cqb6fx91cjp4aivp9q4jwaz9a"; - name = "kiconthemes-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kiconthemes-5.39.0.tar.xz"; + sha256 = "1k4r263zz54497dgqaw9a74wqdklq4w353mc0g905k2g8arh7p9f"; + name = "kiconthemes-5.39.0.tar.xz"; }; }; kidletime = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kidletime-5.38.0.tar.xz"; - sha256 = "1i91w9hcb2k5n9qz8q7k2z44z9ss7r9i2zsg9vnl8am7dqqhmlsv"; - name = "kidletime-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kidletime-5.39.0.tar.xz"; + sha256 = "01h5pcr5kn11jby0zsz6igiwzf31hzip7h63dcsa8h67li4sibd8"; + name = "kidletime-5.39.0.tar.xz"; }; }; kimageformats = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kimageformats-5.38.0.tar.xz"; - sha256 = "0q78shcwgczdm5ylhbp9fnq70w3hqzkbynp2vpyyg5pjaam8xjlp"; - name = "kimageformats-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kimageformats-5.39.0.tar.xz"; + sha256 = "1mnfdsxqnqdzhw3as77n1f1ddxpmab4slqlpwi4ih55xmgl85455"; + name = "kimageformats-5.39.0.tar.xz"; }; }; kinit = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kinit-5.38.0.tar.xz"; - sha256 = "0k4i0zrwkz088vjkk7d7whwhkrjvqqhdigspzf58d1laryiy0jdf"; - name = "kinit-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kinit-5.39.0.tar.xz"; + sha256 = "0a2wl1vhsbb2x1cjd3wz7j3bp9kz1pxfc6mml7gpnq70qgk8hsn2"; + name = "kinit-5.39.0.tar.xz"; }; }; kio = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kio-5.38.0.tar.xz"; - sha256 = "15qmr2ghrj7pgqxrgpvhdp9g5vaap9mzlmry6ayph75m1afb4fpl"; - name = "kio-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kio-5.39.0.tar.xz"; + sha256 = "091g4dbnals6c5wrj3xh3ws29wszysmb9ksyvyqf3d1lp9dfmjwn"; + name = "kio-5.39.0.tar.xz"; }; }; kirigami2 = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kirigami2-5.38.0.tar.xz"; - sha256 = "18k41j5ijmgmzgl2rv4ac0bnxlax3505zi1nmqm8bkdpznhfr13c"; - name = "kirigami2-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kirigami2-5.39.0.tar.xz"; + sha256 = "0spgylk4yjy74rs5d5b28qv72qz5ra9j3wfmk6vx2b6cvf1fw517"; + name = "kirigami2-5.39.0.tar.xz"; }; }; kitemmodels = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kitemmodels-5.38.0.tar.xz"; - sha256 = "0s20in4jjd2pvv9bn79lvgqqlf806hw014icp51f5hfknrhpdyjc"; - name = "kitemmodels-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kitemmodels-5.39.0.tar.xz"; + sha256 = "1bn0k0ya2phix6fyv8ax800ahncrkdzikz0sa3xrw5bq3iz1x6k9"; + name = "kitemmodels-5.39.0.tar.xz"; }; }; kitemviews = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kitemviews-5.38.0.tar.xz"; - sha256 = "0ldi8qzs2sbhz8l57nshjrnwhjl9mhw90kcqw71cldp41wm0pps6"; - name = "kitemviews-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kitemviews-5.39.0.tar.xz"; + sha256 = "0pl899d1lz1dymdbq70485a8332z9i3s38dxnxv3cdwbla3xlsfh"; + name = "kitemviews-5.39.0.tar.xz"; }; }; kjobwidgets = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kjobwidgets-5.38.0.tar.xz"; - sha256 = "0vp6nc73c9788nrib742k9nzqbx4m8m77ipqh9dnnkx4ggrhsd55"; - name = "kjobwidgets-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kjobwidgets-5.39.0.tar.xz"; + sha256 = "1z26555pkirdkfw8c9j1a863pqybklryfa30v3a59a0m9v2jdzfc"; + name = "kjobwidgets-5.39.0.tar.xz"; }; }; kjs = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/kjs-5.38.0.tar.xz"; - sha256 = "0diw580k5kyv60bqhnxhqinlrn0b3p3n89iy0kdgjgnr6197fwy1"; - name = "kjs-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/kjs-5.39.0.tar.xz"; + sha256 = "0fkn308l6drj7pa94niqhcn2pqv7da7da5lq1nk8q6zlyg4nbcrn"; + name = "kjs-5.39.0.tar.xz"; }; }; kjsembed = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/kjsembed-5.38.0.tar.xz"; - sha256 = "0nb07n54208gnmag7h3dhc8hri2s83ln1c9wq6c0xw7jchaz9z8a"; - name = "kjsembed-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/kjsembed-5.39.0.tar.xz"; + sha256 = "1i3qyxr409x82nqyck4qva63maxa2vvi07i0yxm6zqx5lvm9gkgb"; + name = "kjsembed-5.39.0.tar.xz"; }; }; kmediaplayer = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/kmediaplayer-5.38.0.tar.xz"; - sha256 = "1qb2g8j871gf38i2dk2j9ags848fa3kqdjl3l4924hf28az0g736"; - name = "kmediaplayer-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/kmediaplayer-5.39.0.tar.xz"; + sha256 = "09ysw11br4k26bq6rvzcws2g565336p3gjkz4fxc8w2g3ma527p1"; + name = "kmediaplayer-5.39.0.tar.xz"; }; }; knewstuff = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/knewstuff-5.38.0.tar.xz"; - sha256 = "1l4cmfcsljg7v5l6341fxcp7c7i615l8351l941dwcmw4yng0lj0"; - name = "knewstuff-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/knewstuff-5.39.0.tar.xz"; + sha256 = "1amflv96ybd6dqkc1chmz6d5crrl4dcq07fwsalxzx9mgr0z499r"; + name = "knewstuff-5.39.0.tar.xz"; }; }; knotifications = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/knotifications-5.38.0.tar.xz"; - sha256 = "1jvmv2hi3dbf0bd2b61l9s5lb1dx2rjl9z7pw1fb5j20910k6zgd"; - name = "knotifications-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/knotifications-5.39.0.tar.xz"; + sha256 = "0f38ca090p291d114fg3jz25lhwz7vad7s60ql4x3xwmdgaaw7dj"; + name = "knotifications-5.39.0.tar.xz"; }; }; knotifyconfig = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/knotifyconfig-5.38.0.tar.xz"; - sha256 = "05hgglm6ypbaplxr43632zh5fmgsz6543110169k9fbjnczyhcyk"; - name = "knotifyconfig-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/knotifyconfig-5.39.0.tar.xz"; + sha256 = "09nk6sr6sp9a85lj4x9ac0ir4s5ac08835927b95d7m4ap2dbxrb"; + name = "knotifyconfig-5.39.0.tar.xz"; }; }; kpackage = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kpackage-5.38.0.tar.xz"; - sha256 = "0v4j3kqgg52rlmdxmd98aqw0hk7i2xqsw9mhhxfs9c7vm1x05sxn"; - name = "kpackage-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kpackage-5.39.0.tar.xz"; + sha256 = "1ibppkg9m77p0dcpfshcd891vlxcfgx6rk205gq6d5qxyqizygki"; + name = "kpackage-5.39.0.tar.xz"; }; }; kparts = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kparts-5.38.0.tar.xz"; - sha256 = "19ba749pwnb7xvmr7lryn6z53zb49hqn0xq4j9fmbic95nh039zp"; - name = "kparts-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kparts-5.39.0.tar.xz"; + sha256 = "1r32jf2qbhqdjih9ff4n0ajd6s1cdncpq367mp5am31fz1jv3sr6"; + name = "kparts-5.39.0.tar.xz"; }; }; kpeople = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kpeople-5.38.0.tar.xz"; - sha256 = "0yd29436bgfw6jjjr9n38hx8561mrlgl5vynci6ng9bx1jflay0x"; - name = "kpeople-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kpeople-5.39.0.tar.xz"; + sha256 = "1s78dld3zlldhpk66s08v34zwi1k5ghivzbi7ab290sgrjc9afar"; + name = "kpeople-5.39.0.tar.xz"; }; }; kplotting = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kplotting-5.38.0.tar.xz"; - sha256 = "1hvfqm6i5fsyssb51w3yybsil8h9cbqgd2n8k0wnz99m8xifzn72"; - name = "kplotting-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kplotting-5.39.0.tar.xz"; + sha256 = "1diy1f23n6pih0s91kv1bp4mnnypnjl3pmi1xqni1v2cfwy0mnba"; + name = "kplotting-5.39.0.tar.xz"; }; }; kpty = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kpty-5.38.0.tar.xz"; - sha256 = "0cgh8hixrplgc280652jlvk8ibcddmjvflwb0gjawd9iq7lcb66y"; - name = "kpty-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kpty-5.39.0.tar.xz"; + sha256 = "02h6dg3w3k58d1ydzyz6mhd1y5gds3k64wdsb84fnpxvlw46dlhn"; + name = "kpty-5.39.0.tar.xz"; }; }; kross = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/kross-5.38.0.tar.xz"; - sha256 = "1dccg214cqpyn3nninalpknglfmchz2k1fk4rlgq53wf4n6w23b7"; - name = "kross-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/kross-5.39.0.tar.xz"; + sha256 = "1gh9gicr7ba8y3c0r7qpw2fj651fbbrhsy8gps8yll71axhxqvfh"; + name = "kross-5.39.0.tar.xz"; }; }; krunner = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/krunner-5.38.0.tar.xz"; - sha256 = "16fhl5zm8scyxk83mpkavvzkn23qgzcblg315jy6klr5bz9jxgcm"; - name = "krunner-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/krunner-5.39.0.tar.xz"; + sha256 = "0gxs9z8mlb3s615ccrgkwyxww4jly48d8fkay33zwjaanqhkhgfl"; + name = "krunner-5.39.0.tar.xz"; }; }; kservice = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kservice-5.38.0.tar.xz"; - sha256 = "0zaamvxhfx4xdy2m8spyhi0hdv6p0fn5hqn9pyi5l8xdixnwjc9d"; - name = "kservice-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kservice-5.39.0.tar.xz"; + sha256 = "0abz878yc8yir7iv5scn55d0g2nljnzhr9c81wa6ggjsw0h077hl"; + name = "kservice-5.39.0.tar.xz"; }; }; ktexteditor = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/ktexteditor-5.38.0.tar.xz"; - sha256 = "195ygv1j4wfvly31g22wxz9sshhqyi1yyf2mv1v63d9ci88v7rri"; - name = "ktexteditor-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/ktexteditor-5.39.0.tar.xz"; + sha256 = "1bk5wlvzjmfv7g9ab77asn055jp647zj69mfx2z3lvxb69swdnf5"; + name = "ktexteditor-5.39.0.tar.xz"; }; }; ktextwidgets = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/ktextwidgets-5.38.0.tar.xz"; - sha256 = "120jxab8w1vhqcckda51r0x2pmfb2qd2h6inhivl72c4m5x89w7f"; - name = "ktextwidgets-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/ktextwidgets-5.39.0.tar.xz"; + sha256 = "0p6h165y03ir7qdf50kc77iq9plgvx39c8pz9dalvscvx42d2jaq"; + name = "ktextwidgets-5.39.0.tar.xz"; }; }; kunitconversion = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kunitconversion-5.38.0.tar.xz"; - sha256 = "10k0xfb11r7l1bdnlanqgdwwx8wrs8bmnswb2y85xxr7wwsqnlvc"; - name = "kunitconversion-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kunitconversion-5.39.0.tar.xz"; + sha256 = "04r1b2nc6vi56nfh6glhhd3d9v0ywxn2waibryjbszwrr39yhlzv"; + name = "kunitconversion-5.39.0.tar.xz"; }; }; kwallet = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kwallet-5.38.0.tar.xz"; - sha256 = "1qysdj4nmkxywj7bzqdc78ifnqjnkrz9qbp4a49acpng2y4zw1nw"; - name = "kwallet-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kwallet-5.39.0.tar.xz"; + sha256 = "1vlz9y3r1n6w7q9is60jsl9f7bm1djckdi9ibgzanwsp4k5ab0sz"; + name = "kwallet-5.39.0.tar.xz"; }; }; kwayland = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kwayland-5.38.0.tar.xz"; - sha256 = "0gd58nvyc39waj7vv2c68r59qqpv0jppm95548j2p924w48syjj0"; - name = "kwayland-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kwayland-5.39.0.tar.xz"; + sha256 = "0a9hi47nrsspkak88c9f6ind2i7q69zjmrgr5n7xsa4zxznwhx6x"; + name = "kwayland-5.39.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kwidgetsaddons-5.38.0.tar.xz"; - sha256 = "1yh48qxdqz3rk020wr897vkzsi4nhh37lxbg6211xrlirn0lzvj5"; - name = "kwidgetsaddons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kwidgetsaddons-5.39.0.tar.xz"; + sha256 = "1d0d3ags15vr7ck031m6n5n3hw347siskzhb8rsgzghn6xnmbfdb"; + name = "kwidgetsaddons-5.39.0.tar.xz"; }; }; kwindowsystem = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kwindowsystem-5.38.0.tar.xz"; - sha256 = "02xrin8lshvqkw12d0692z40h3g61f4crh28jcmi5zqlaxiyn5ic"; - name = "kwindowsystem-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kwindowsystem-5.39.0.tar.xz"; + sha256 = "1dys70va4h00ixxgxv52wbg8wi3jgsqckaikjqr34fzrmjh1lxqp"; + name = "kwindowsystem-5.39.0.tar.xz"; }; }; kxmlgui = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kxmlgui-5.38.0.tar.xz"; - sha256 = "12cmyhm05nkr9xj7cpnqihrlndfqn1kjkzhcn1ywj20y1gd3mxv4"; - name = "kxmlgui-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kxmlgui-5.39.0.tar.xz"; + sha256 = "0zwy11rh3yphl2346hmcahajxkgmrnfz1m8pd3vlnjs175dwz115"; + name = "kxmlgui-5.39.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kxmlrpcclient-5.38.0.tar.xz"; - sha256 = "0g9ah59h8vq68yg4pfdbqx44xrs856wrr181rsdbsizj0qj3hyaa"; - name = "kxmlrpcclient-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kxmlrpcclient-5.39.0.tar.xz"; + sha256 = "1j4a1n3ydln62m98h5p5lxlg1i7k5vzxb4f9kxkvzhw5gfpy78zs"; + name = "kxmlrpcclient-5.39.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/modemmanager-qt-5.38.0.tar.xz"; - sha256 = "18ham8lrxblywc634n49237js5y5k6qgjf5zrjc8gzapn934l89w"; - name = "modemmanager-qt-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/modemmanager-qt-5.39.0.tar.xz"; + sha256 = "0gdsp1017yjcfbq2jny7jz5rv7y4cavps5pfvg7zmylx0v057zk7"; + name = "modemmanager-qt-5.39.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/networkmanager-qt-5.38.0.tar.xz"; - sha256 = "10d28nrkppmmfl9pwq2hkrvi461acf29djdzala4l37mp4dwvbf8"; - name = "networkmanager-qt-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/networkmanager-qt-5.39.0.tar.xz"; + sha256 = "1jksv0zsdmkrid2f1m92fxw3gl6crcjaw43v5zra8h2m394iyr81"; + name = "networkmanager-qt-5.39.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/oxygen-icons5-5.38.0.tar.xz"; - sha256 = "0fk97r3br5myqpnfalz67l5hkamxc5vc5swa68wpg1xih6jc3iid"; - name = "oxygen-icons5-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/oxygen-icons5-5.39.0.tar.xz"; + sha256 = "1k1rns0fz5gvfnfwg60lrcw885cqmn814nzql9jvk07340w29s98"; + name = "oxygen-icons5-5.39.0.tar.xz"; }; }; plasma-framework = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/plasma-framework-5.38.0.tar.xz"; - sha256 = "1dvhqfi34v44h0wj0m68k477hmx53x9zsf4mh03xq164w1yz68sg"; - name = "plasma-framework-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/plasma-framework-5.39.0.tar.xz"; + sha256 = "1gaxk9mzwlyld09gqk29y3shvi6a1g1q3l849a9kl1hd07gr53x3"; + name = "plasma-framework-5.39.0.tar.xz"; }; }; prison = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/prison-5.38.0.tar.xz"; - sha256 = "0prj3z6s3aighmk4qarfljca7j9cy7ypvgh8rv5di3jb2v4nbg4m"; - name = "prison-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/prison-5.39.0.tar.xz"; + sha256 = "1b0ji341xcamrd19z54r2nkm8cglbr4qfxyxmqzn8yc6icfl61nv"; + name = "prison-5.39.0.tar.xz"; + }; + }; + qqc2-desktop-style = { + version = "5.39.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.39/qqc2-desktop-style-5.39.0.tar.xz"; + sha256 = "1q8ihhrnk2dh6bbmwkz822l5vv15y11qaj7gig1lf7xw5nr1i27v"; + name = "qqc2-desktop-style-5.39.0.tar.xz"; }; }; solid = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/solid-5.38.0.tar.xz"; - sha256 = "1b3c5drx4m1x4ai0ziz0yan16a5s3ghf0py37mb92qyimq586lhh"; - name = "solid-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/solid-5.39.0.tar.xz"; + sha256 = "19bl7hzg1fya613vqhdxllh09csm6amrndnhfqnx90w4gb31p36r"; + name = "solid-5.39.0.tar.xz"; }; }; sonnet = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/sonnet-5.38.0.tar.xz"; - sha256 = "1355p88swnk828gsbnm3v4gryffnwbzjcdq49k8jwywzb65bnwxa"; - name = "sonnet-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/sonnet-5.39.0.tar.xz"; + sha256 = "1b5bfjbpb6l3c9j9k42shhnz9lqqxk2g607qx9ni0n2pr7w2p7w1"; + name = "sonnet-5.39.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/syntax-highlighting-5.38.0.tar.xz"; - sha256 = "101ng0l3jfg8x9bns9z38jk3iayijwcb299kf860vfy0nki8gf6l"; - name = "syntax-highlighting-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/syntax-highlighting-5.39.0.tar.xz"; + sha256 = "0b8sdkh9dqmqk3x48d25v4qhrqph0mv76v47skhvls9jspw7kzdc"; + name = "syntax-highlighting-5.39.0.tar.xz"; }; }; threadweaver = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/threadweaver-5.38.0.tar.xz"; - sha256 = "1d89l9lknc1q25cz9r8iwc1a102q788mj01ghnl6ydss65rclvfv"; - name = "threadweaver-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/threadweaver-5.39.0.tar.xz"; + sha256 = "101bk8rzdysb3vi3vbbkh2s7sb1dhnsa8ncdvdsxqyyaya9ns4aw"; + name = "threadweaver-5.39.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index b324494faff7..2f713cb59775 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -23,15 +23,13 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lame-${version}"; - version = "3.99.5"; + version = "3.100"; src = fetchurl { url = "mirror://sourceforge/lame/${name}.tar.gz"; - sha256 = "1zr3kadv35ii6liia0bpfgxpag27xcivp571ybckpbz4b10nnd14"; + sha256 = "07nsn5sy3a8xbmw1bidxnsj5fj6kg9ai04icmqw40ybkp353dznx"; }; - patches = [ ./gcc-4.9.patch ]; - outputs = [ "out" "lib" "doc" ]; # a small single header outputMan = "out"; @@ -57,11 +55,17 @@ stdenv.mkDerivation rec { (if debugSupport then "--enable-debug=alot" else "") ]; + preConfigure = '' + # Prevent a build failure for 3.100 due to using outdated symbol list + # https://hydrogenaud.io/index.php/topic,114777.msg946373.html#msg946373 + sed -i '/lame_init_old/d' include/libmp3lame.sym + ''; + meta = { description = "A high quality MPEG Audio Layer III (MP3) encoder"; homepage = http://lame.sourceforge.net; license = licenses.lgpl2; - maintainers = with maintainers; [ codyopel ]; + maintainers = with maintainers; [ codyopel fpletz ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/lame/gcc-4.9.patch b/pkgs/development/libraries/lame/gcc-4.9.patch deleted file mode 100644 index 59f8e00e4a8e..000000000000 --- a/pkgs/development/libraries/lame/gcc-4.9.patch +++ /dev/null @@ -1,33 +0,0 @@ -fix sse optimizations build on 32-bit with gcc 4.9 -http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=351af417bae0d09bd5a3753d1237f03adf591933 - -xmm_quantize_sub.c: In function 'init_xrpow_core_sse': -xmm_quantize_sub.c:65:18: warning: SSE vector return without SSE enabled changes the ABI [-W -psabi] - const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]); - ^ -In file included from xmm_quantize_sub.c:37:0: -/usr/lib/gcc/i686-w64-mingw32/4.9.0/include/xmmintrin.h:933:1: error: inlining failed in call to always_inline '_mm_loadu_ps': target specific option mismatch - _mm_loadu_ps (float const *__P) - ^ -xmm_quantize_sub.c:65:18: error: called from here - const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]); - ^ ---- lame/libmp3lame/vector/xmm_quantize_sub.c.orig 2014-06-08 12:16:19.455468042 -0700 -+++ lame/libmp3lame/vector/xmm_quantize_sub.c 2014-06-08 12:16:09.592356980 -0700 -@@ -35,6 +35,7 @@ - #ifdef HAVE_XMMINTRIN_H - - #include -+#pragma GCC target("sse") - - typedef union { - int32_t _i_32[4]; /* unions are initialized by its first member */ -@@ -124,6 +125,7 @@ - } - - -+#pragma GCC target("sse2") - void - fht_SSE2(FLOAT * fz, int n) - { diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 0057611ed0f6..2a109e0366fd 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "; meta = with stdenv.lib; { - homepage = https://code.google.com/p/leveldb/; + homepage = https://github.com/google/leveldb; description = "Fast and lightweight key/value database library by Google"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/libarchive/CVE-2017-14166.patch b/pkgs/development/libraries/libarchive/CVE-2017-14166.patch new file mode 100644 index 000000000000..b729ae41e0ad --- /dev/null +++ b/pkgs/development/libraries/libarchive/CVE-2017-14166.patch @@ -0,0 +1,36 @@ +From fa7438a0ff4033e4741c807394a9af6207940d71 Mon Sep 17 00:00:00 2001 +From: Joerg Sonnenberger +Date: Tue, 5 Sep 2017 18:12:19 +0200 +Subject: [PATCH] Do something sensible for empty strings to make fuzzers + happy. + +--- + libarchive/archive_read_support_format_xar.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c +index 7a22beb9d..93eeacc5e 100644 +--- a/libarchive/archive_read_support_format_xar.c ++++ b/libarchive/archive_read_support_format_xar.c +@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt) + uint64_t l; + int digit; + ++ if (char_cnt == 0) ++ return (0); ++ + l = 0; + digit = *p - '0'; + while (digit >= 0 && digit < 10 && char_cnt-- > 0) { +@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt) + { + int64_t l; + int digit; +- ++ ++ if (char_cnt == 0) ++ return (0); ++ + l = 0; + while (char_cnt-- > 0) { + if (*p >= '0' && *p <= '7') diff --git a/pkgs/development/libraries/libarchive/CVE-2017-14502.patch b/pkgs/development/libraries/libarchive/CVE-2017-14502.patch new file mode 100644 index 000000000000..dad8a93a8a81 --- /dev/null +++ b/pkgs/development/libraries/libarchive/CVE-2017-14502.patch @@ -0,0 +1,28 @@ +From 5562545b5562f6d12a4ef991fae158bf4ccf92b6 Mon Sep 17 00:00:00 2001 +From: Joerg Sonnenberger +Date: Sat, 9 Sep 2017 17:47:32 +0200 +Subject: [PATCH] Avoid a read off-by-one error for UTF16 names in RAR + archives. + +Reported-By: OSS-Fuzz issue 573 +--- + libarchive/archive_read_support_format_rar.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c +index cbb14c32d..751de6979 100644 +--- a/libarchive/archive_read_support_format_rar.c ++++ b/libarchive/archive_read_support_format_rar.c +@@ -1496,7 +1496,11 @@ read_header(struct archive_read *a, struct archive_entry *entry, + return (ARCHIVE_FATAL); + } + filename[filename_size++] = '\0'; +- filename[filename_size++] = '\0'; ++ /* ++ * Do not increment filename_size here as the computations below ++ * add the space for the terminating NUL explicitly. ++ */ ++ filename[filename_size] = '\0'; + + /* Decoded unicode form is UTF-16BE, so we have to update a string + * conversion object for it. */ diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index fb1faf8d1b1b..e0242802fd34 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { sha256 = "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd"; }; + patches = [ + ./CVE-2017-14166.patch + ./CVE-2017-14502.patch + ]; + outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 90d7583673a3..e348fe0fae28 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -27,8 +27,9 @@ let inherit (stdenv.lib) optional optionals hasPrefix; in let result = { + # e.g. https://libav.org/releases/libav-11.11.tar.xz.sha1 libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f"; - libav_11 = libavFun "11.10" "38db6721ca8423682e4d614c170eccc33ba32e00"; + libav_11 = libavFun "11.11" "d7444fa4f135bdd7347cc962ab4b5228796b0f23"; libav_12 = libavFun "12.2" "3784b15f88076ca0ab8fb6b0377e975b83a5c9f5"; }; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index f6d6c5b803eb..514a1fa85343 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { major = "0.12"; - version = "${major}.14"; + version = "${major}.16"; name = "libchamplain-${version}"; src = fetchurl { url = "mirror://gnome/sources/libchamplain/${major}/${name}.tar.xz"; - sha256 = "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi"; + sha256 = "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix index 036c918b32db..10a4c276ebd5 100644 --- a/pkgs/development/libraries/libcredis/default.nix +++ b/pkgs/development/libraries/libcredis/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libcredis-0.2.3"; src = fetchurl { - url = "https://credis.googlecode.com/files/credis-0.2.3.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/credis/credis-0.2.3.tar.gz"; sha256 = "1l3hlw9rrc11qggbg9a2303p3bhxxx2vqkmlk8avsrbqw15r1ayr"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C client library for Redis (key-value database)"; - homepage = https://code.google.com/p/credis/; + homepage = https://code.google.com/archive/p/credis/; license = licenses.bsd3; # from homepage platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix index cdaeb4969ae4..94dc733a69b0 100644 --- a/pkgs/development/libraries/libctemplate/default.nix +++ b/pkgs/development/libraries/libctemplate/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { emphasizes separating logic from presentation: it is impossible to embed application logic in this template language. ''; - homepage = http://code.google.com/p/google-ctemplate/; - license = "bsd"; + homepage = https://github.com/OlafvdSpek/ctemplate; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix index d171f57eb1bc..01ac56e885d0 100644 --- a/pkgs/development/libraries/libdivsufsort/default.nix +++ b/pkgs/development/libraries/libdivsufsort/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation { name = "libdivsufsort-2.0.1"; - + src = fetchurl { - url = http://libdivsufsort.googlecode.com/files/libdivsufsort-2.0.1.tar.bz2; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libdivsufsort/libdivsufsort-2.0.1.tar.bz2"; sha256 = "1g0q40vb2k689bpasa914yi8sjsmih04017mw20zaqqpxa32rh2m"; }; meta = { - homepage = http://code.google.com/p/libdivsufsort/; + homepage = https://github.com/y-256/libdivsufsort; license = stdenv.lib.licenses.mit; description = "Library to construct the suffix array and the BW transformed string"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index dbda4107c485..46e264b59caf 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; src = fetchurl { - url = http://libdnet.googlecode.com/files/libdnet-1.12.tgz; - sha1 = "71302be302e84fc19b559e811951b5d600d976f8"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libdnet/libdnet-1.12.tgz"; + sha256 = "09mhbr8x66ykhf5581a5zjpplpjxibqzgkkpx689kybwg0wk1cw3"; }; buildInputs = [ automake autoconf libtool ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Provides a simplified, portable interface to several low-level networking routines"; - homepage = http://code.google.com/p/libdnet/; + homepage = https://github.com/dugsong/libdnet; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index a0e72f2b561f..4bb91878bd35 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libelf }: let - version = "20161124"; + version = "20170709"; src = fetchurl { url = "http://www.prevanders.net/libdwarf-${version}.tar.gz"; - sha512 = "38e480bce5ae8273fd585ec1d8ba94dc3e865a0ef3fcfcf38b5d92fa1ce41f8b" - + "8c95a7cf8a6e69e7c6f638a3cc56ebbfb37b6317047309725fa17e7929096799"; + sha512 = "afff6716ef1af5d8aae2b887f36b9a6547fb576770bc6f630b82725ed1e59cbd" + + "387779aa729bbd1a5ae026a25ac76aacf64b038cd898b2419a8676f9aa8c59f1"; }; meta = { homepage = https://www.prevanders.net/dwarf.html; diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index a91acb230525..090a12f63de1 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.5.6"; + name = "libevdev-1.5.7"; src = fetchurl { url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c"; + sha256 = "08nl3p6226k51zph52fhilxvi3b31spp6fz8szzrglzhl8vrxrd1"; }; buildInputs = [ python ]; diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index 2e8fad3db827..cfae74b4b9e3 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.4.0"; src = fetchurl { - url = "https://libfreefare.googlecode.com/files/libfreefare-0.4.0.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libfreefare/libfreefare-0.4.0.tar.bz2"; sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz"; }; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The libfreefare project aims to provide a convenient API for MIFARE card manipulations"; - license = licenses.gpl3; - homepage = http://code.google.com/p/libfreefare/; + license = licenses.lgpl3; + homepage = https://github.com/nfc-tools/libfreefare; maintainers = with maintainers; [bobvanderlinden]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index de72072e48be..49cd1d163a60 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, glib, pkgconfig, perl, intltool, gobjectIntrospection, libintlOrEmpty }: stdenv.mkDerivation rec { name = "libgtop-${version}"; - major = "2.34"; - version = "${major}.1"; + major = "2.38"; + version = "${major}.0"; src = fetchurl { url = "mirror://gnome/sources/libgtop/${major}/${name}.tar.xz"; - sha256 = "c89978a76662b18d392edbe0d1b794f5a9a399a5ccf22a02d5b9e28b5ed609e2"; + sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g"; }; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index ef2a44bf183a..a5f8f5036d04 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libgudev-${version}"; - version = "231"; + version = "232"; src = fetchurl { - url = "https://download.gnome.org/sources/libgudev/${version}/${name}.tar.xz"; - sha256 = "15iz0qp57qy5pjrblsn36l0chlncqggqsg8h8i8c71499afzj7iv"; + url = "mirror://gnome/sources/libgudev/${version}/${name}.tar.xz"; + sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libhangul/default.nix b/pkgs/development/libraries/libhangul/default.nix index 79fc973731a6..9e72d933433b 100644 --- a/pkgs/development/libraries/libhangul/default.nix +++ b/pkgs/development/libraries/libhangul/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { name = "libhangul-0.1.0"; src = fetchurl { - url = "https://libhangul.googlecode.com/files/libhangul-0.1.0.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libhangul/libhangul-0.1.0.tar.gz"; sha256 = "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar"; }; meta = with stdenv.lib; { description = "Core algorithm library for Korean input routines"; - homepage = https://code.google.com/p/libhangul; + homepage = https://github.com/choehwanjin/libhangul; license = licenses.lgpl21; maintainers = [ maintainers.ianwookim ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index a91205e182c7..5ba8bb667845 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -2,18 +2,21 @@ stdenv.mkDerivation rec { name = "libical-${version}"; - version = "1.0.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "1y6rbw24m133d984pyqzx2bi7f37dsw6f33l6arwn6yd4zlqdib9"; + sha256 = "0xsvqy1hzmwxn783wrb2k8p751544pzv39v9ynr9pj4yzkwjzsvb"; }; nativeBuildInputs = [ perl cmake ]; - patches = [ ./respect-env-tzdir.patch ]; + patches = [ + # TODO: upstream this patch + ./respect-env-tzdir.patch + ]; meta = with stdenv.lib; { homepage = https://github.com/libical/libical; diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch index fad78c2fb8a0..715ba1fa8426 100644 --- a/pkgs/development/libraries/libical/respect-env-tzdir.patch +++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch @@ -1,27 +1,29 @@ ---- a/src/libical/icaltz-util.c 2015-06-11 15:40:58.843138630 +0200 -+++ b/src/libical/icaltz-util.c 2015-06-11 15:43:12.722046252 +0200 -@@ -107,7 +107,7 @@ - char charcnt[4]; - } tzinfo; - --static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"}; -+static char *search_paths [] = {"/etc/zoneinfo","/usr/share/zoneinfo","/usr/lib/zoneinfo","/usr/share/lib/zoneinfo"}; +--- a/src/libical/icaltz-util.c ++++ b/src/libical/icaltz-util.c +@@ -96,9 +96,9 @@ typedef struct static char *zdir = NULL; - #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0])) -@@ -194,6 +194,15 @@ - const char *fname = ZONES_TAB_SYSTEM_FILENAME; - unsigned int i; + static char *search_paths[] = { ++ "/etc/zoneinfo", + "/usr/share/zoneinfo", + "/usr/lib/zoneinfo", +- "/etc/zoneinfo", + "/usr/share/lib/zoneinfo" + }; -+ const char *env_tzdir = getenv ("TZDIR"); -+ if (env_tzdir) { -+ sprintf (file_path, "%s/%s", env_tzdir, fname); -+ if (!access (file_path, F_OK|R_OK)) { -+ zdir = env_tzdir; -+ return; -+ } -+ } +@@ -179,6 +179,15 @@ static void set_zonedir(void) + const char *fname = ZONES_TAB_SYSTEM_FILENAME; + size_t i, num_search_paths; + ++ const char *env_tzdir = getenv ("TZDIR"); ++ if (env_tzdir) { ++ snprintf(file_path, MAXPATHLEN, "%s/%s", env_tzdir, fname); ++ if (!access (file_path, F_OK|R_OK)) { ++ zdir = env_tzdir; ++ return; ++ } ++ } + - for (i = 0; i < NUM_SEARCH_PATHS; i++) { - sprintf (file_path, "%s/%s", search_paths [i], fname); - if (!access (file_path, F_OK|R_OK)) { + num_search_paths = sizeof(search_paths) / sizeof(search_paths[0]); + for (i = 0; i < num_search_paths; i++) { + snprintf(file_path, MAXPATHLEN, "%s/%s", search_paths[i], fname); diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index b03d7643f0f3..a153001a9600 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,24 +1,33 @@ {stdenv, fetchurl, writeText, zlib, gperf}: stdenv.mkDerivation rec { - version = "0.15.1b"; - name = "libid3tag-${version}"; + version = "0.15.1b"; src = fetchurl { url = mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz; sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"; }; + outputs = [ "out" "dev" ]; + setOutputFlags = false; + propagatedBuildInputs = [ zlib gperf ]; patches = [ ./debian-patches.patch ]; + preConfigure = '' + configureFlagsArray+=( + --includedir=$dev/include + ) + ''; + postInstall = '' - mkdir -p $out/lib/pkgconfig - cp ${./id3tag.pc} $out/lib/pkgconfig/id3tag.pc - substituteInPlace $out/lib/pkgconfig/id3tag.pc \ + mkdir -p $dev/lib/pkgconfig + cp ${./id3tag.pc} $dev/lib/pkgconfig/id3tag.pc + substituteInPlace $dev/lib/pkgconfig/id3tag.pc \ --subst-var-by out $out \ + --subst-var-by dev $dev \ --subst-var-by version "${version}" ''; diff --git a/pkgs/development/libraries/libid3tag/id3tag.pc b/pkgs/development/libraries/libid3tag/id3tag.pc index 854f1783cae5..e3df7b3f9df0 100644 --- a/pkgs/development/libraries/libid3tag/id3tag.pc +++ b/pkgs/development/libraries/libid3tag/id3tag.pc @@ -1,7 +1,7 @@ prefix=@out@ exec_prefix=${prefix} libdir=${exec_prefix}/lib -includedir=${exec_prefix}/include +includedir=@dev@/include Name: libid3tag Description: ID3 tag manipulation library diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 3de9cf1e0dbc..df92693de5a6 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "info" "devdoc" ]; - doCheck = ! stdenv.isDarwin; + doCheck = (stdenv.buildPlatform == stdenv.hostPlatform) && !stdenv.isDarwin; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 1cc275b30480..d39a71e16da9 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,48 +1,56 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkgconfig, meson, ninja , libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support -, testsSupport ? false, check ? null, valgrind ? null -, autoconf, automake +, testsSupport ? false, check ? null, valgrind ? null, python3Packages ? null }: assert documentationSupport -> doxygen != null && graphviz != null; assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; -assert testsSupport -> check != null && valgrind != null; +assert testsSupport -> check != null && valgrind != null && python3Packages != null; let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; + mkFlag = optSet: flag: "-D${flag}=${stdenv.lib.boolToString optSet}"; in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.7.3"; + version = "1.9.1"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89"; + sha256 = "1y3559146zlfizncky1jlly226i66vwikxhpdkw0jg8v47j0sy7h"; }; outputs = [ "out" "dev" ]; - configureFlags = [ + mesonFlags = [ (mkFlag documentationSupport "documentation") - (mkFlag eventGUISupport "event-gui") + (mkFlag eventGUISupport "debug-gui") (mkFlag testsSupport "tests") ]; - nativeBuildInputs = [ pkgconfig ]; - - buildInputs = [ libevdev mtdev libwacom autoconf automake ] - ++ optionals eventGUISupport [ cairo glib gtk3 ] + nativeBuildInputs = [ pkgconfig meson ninja ] ++ optionals documentationSupport [ doxygen graphviz ] - ++ optionals testsSupport [ check valgrind ]; + ++ optionals testsSupport [ check valgrind python3Packages.pyparsing ]; + + buildInputs = [ libevdev mtdev libwacom ] + ++ optionals eventGUISupport [ cairo glib gtk3 ]; propagatedBuildInputs = [ udev ]; patches = [ ./udev-absolute-path.patch ]; - patchFlags = [ "-p0" ]; + + preBuild = '' + # meson setup-hook changes the directory so the files are located one level up + patchShebangs ../udev/parse_hwdb.py + patchShebangs ../test/symbols-leak-test.in + ''; + + doCheck = testsSupport; + + checkPhase = "meson test"; meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch index 2d3fa966b299..fb22fea40e80 100644 --- a/pkgs/development/libraries/libinput/udev-absolute-path.patch +++ b/pkgs/development/libraries/libinput/udev-absolute-path.patch @@ -1,12 +1,11 @@ ---- configure.ac 2016-05-27 14:00:25.248388226 +0200 -+++ configure.ac 2016-05-27 14:01:28.228943416 +0200 -@@ -214,7 +214,8 @@ AM_CONDITIONAL(BUILD_DOCS, [test "x$buil - # Used by the udev rules so we can use callouts during testing without - # installing everything first. Default is the empty string so the installed - # rule will use udev's default path. Override is in udev/Makefile.am --AC_SUBST(UDEV_TEST_PATH, "") -+UDEV_TEST_PATH="${UDEV_DIR}/" -+AC_SUBST(UDEV_TEST_PATH) - AC_PATH_PROG(SED, [sed]) +--- a/meson.build ++++ b/meson.build +@@ -100,7 +100,7 @@ + args : model_quirks) - AC_CONFIG_FILES([Makefile + udev_rules_config = configuration_data() +-udev_rules_config.set('UDEV_TEST_PATH', '') ++udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/') + configure_file(input : 'udev/80-libinput-device-groups.rules.in', + output : '80-libinput-device-groups.rules', + install : true, diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix index 6245a810c1de..68835c1414c3 100644 --- a/pkgs/development/libraries/libixp-hg/default.nix +++ b/pkgs/development/libraries/libixp-hg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip txt2tags ]; meta = { - homepage = https://code.google.com/archive/p/libixp/; + homepage = http://repo.cat-v.org/libixp/; # see also https://libs.suckless.org/deprecated/libixp description = "Portable, simple C-language 9P client and server libary"; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 1023c8ae5056..77f9d999de44 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; checkTarget = "test"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix index 7a3eb9caa661..77f047b4c586 100644 --- a/pkgs/development/libraries/libkate/default.nix +++ b/pkgs/development/libraries/libkate/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libkate-0.3.8"; src = fetchurl { - url = "http://libkate.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libkate/${name}.tar.gz"; sha256 = "00d6561g31la9bb8q99b7l4rvi67yiwm50ky8dhlsjd88h7rks2n"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { bitstream format. Kate is a karaoke and text codec meant for encapsulation in an Ogg container. It can carry Unicode text, images, and animate them.''; - homepage = http://code.google.com/p/libkate; + homepage = https://code.google.com/archive/p/libkate/; maintainers = [ ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libmcs/default.nix b/pkgs/development/libraries/libmcs/default.nix deleted file mode 100644 index a457adfed80f..000000000000 --- a/pkgs/development/libraries/libmcs/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libmowgli }: - -stdenv.mkDerivation rec { - name = "libmcs-0.7.2"; - - src = fetchurl { - url = "http://distfiles.atheme.org/${name}.tbz2"; - sha256 = "1knmgxrg2kxdlin8qyf6351943ldg8myllwf860af58x1wncxc74"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libmowgli ]; - - meta = { - description = "A library and set of userland tools which abstract the storage of configuration settings away from userland applications"; - homepage = http://www.atheme.org/projects/mcs.shtml; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index 150ece2a6270..bef977caa28e 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source library libnfc for Near Field Communication"; license = licenses.gpl3; - homepage = http://code.google.com/p/libnfc/; + homepage = https://github.com/nfc-tools/libnfc; maintainers = with maintainers; [offline]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index dc0beb07db94..531e30ba7552 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "libofa-${version}"; src = fetchurl { - url = "http://musicip-libofa.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${name}.tar.gz"; sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ expat curl fftw ]; meta = { - homepage = http://code.google.com/musicip-libofa/; + homepage = https://code.google.com/archive/p/musicip-libofa/; description = "Library Open Fingerprint Architecture"; longDescription = '' LibOFA (Library Open Fingerprint Architecture) is an open-source audio diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 7845f28adc91..09a0f4444b54 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -6,11 +6,11 @@ # no introspection by default, it's too big stdenv.mkDerivation rec { - name = "librsvg-2.40.17"; + name = "librsvg-2.40.19"; src = fetchurl { - url = "mirror://gnome/sources/librsvg/2.40/${name}.tar.xz"; - sha256 = "1k39gyf7f5m9x0jvpcxvfcqswdb04xhm1lbwbjabn1f4xk5wbxp6"; + url = "mirror://gnome/sources/librsvg/2.40/librsvg-2.40.18.tar.xz"; + sha256 = "0k2nbd4g31qinkdfd8r5c5ih2ixl85fbkgkqqh9747lwr24c9j5z"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 516005b874fc..7fa53fe162b2 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - name = "CVE-2017-9310.patch"; + name = "CVE-2017-10790.patch"; url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=d8d805e1f2e6799bb2dff4871a8598dc83088a39"; sha256 = "1v5w0dazp9qc2v7pc8b6g7s4dz5ak10hzrn35hx66q76yzrrzp7i"; }) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index f43db801f248..ee21f3df7ac9 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; meta = with stdenv.lib; { description = "Library and utilities for working with the TIFF image file format"; diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index 3a67e1267e20..aa5de3f2a5f3 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libtiger-0.3.4"; src = fetchurl { - url = "http://libtiger.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libtiger/${name}.tar.gz"; sha256 = "0rj1bmr9kngrgbxrjbn4f4f9pww0wmf6viflinq7ava7zdav4hkk"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libkate pango cairo ]; meta = { - homepage = http://code.google.com/p/libtiger/; + homepage = https://code.google.com/archive/p/libtiger/; description = "A rendering library for Kate streams using Pango and Cairo"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index c4acc0627af8..42376b61f423 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # XXX: There are test failures on non-GNU systems, see # http://lists.gnu.org/archive/html/bug-libunistring/2010-02/msg00004.html . - doCheck = stdenv ? glibc; + doCheck = (stdenv ? glibc) && (stdenv.hostPlatform == stdenv.buildPlatform); meta = { homepage = http://www.gnu.org/software/libunistring/; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index ad3cbe119c55..1fb0605530d7 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libwacom-${version}"; - version = "0.22"; + version = "0.26"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2"; - sha256 = "1h10awwapj5v8nik220ga0raggv3lgaq0kzwlma2qjmzdhhrrhcp"; + sha256 = "0xpvkjvzaj9blcmw8ha46616bzfivj99kwzvr91clxd6iaf11r63"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index fd61ae840284..e730cc6eaabf 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }: stdenv.mkDerivation rec { - name = "libxkbcommon-0.7.1"; + name = "libxkbcommon-0.7.2"; src = fetchurl { url = "http://xkbcommon.org/download/${name}.tar.xz"; - sha256 = "ba59305d2e19e47c27ea065c2e0df96ebac6a3c6e97e28ae5620073b6084e68b"; + sha256 = "1n5rv5n210kjnkyrvbh04gfwaa7zrmzy1393p8nyqfw66lkxr918"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 28b6faa436aa..bf38a954d60d 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; + doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin; crossAttrs = lib.optionalAttrs (hostPlatform.libc == "msvcrt") { # creating the DLL is broken ATM diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index de4d295ebe3b..e0f84f5080df 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -12,7 +12,12 @@ stdenv.mkDerivation { sha256 = "02z2f8z5cy0ajnh9pgar40lsxdknfw5cbyw52138hxnpr6adrvak"; }; - postPatch = "sed 's,/bin/rm,rm,g' -i genMakefiles"; + postPatch = "sed 's,/bin/rm,rm,g' -i genMakefiles" + + stdenv.lib.optionalString (stdenv ? glibc) '' + + substituteInPlace liveMedia/include/Locale.hh \ + --replace '' '' + ''; configurePhase = '' sed \ diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index 8739c9d25d59..e8f8a6ab9bba 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; meta = with stdenv.lib; { description = "Real-time data (de)compression library"; diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/development/libraries/marisa/default.nix index 5f050c6e7a73..ed824ec75922 100644 --- a/pkgs/development/libraries/marisa/default.nix +++ b/pkgs/development/libraries/marisa/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://code.google.com/p/marisa-trie/; + homepage = https://github.com/s-yata/marisa-trie; description = "Static and space-efficient trie data structure library"; license = licenses.bsd3; maintainers = with maintainers; [ sifmelcara ]; diff --git a/pkgs/development/libraries/mdds/0.12.1.nix b/pkgs/development/libraries/mdds/0.12.1.nix index 3c3a874c8ad0..1c6134d0480b 100644 --- a/pkgs/development/libraries/mdds/0.12.1.nix +++ b/pkgs/development/libraries/mdds/0.12.1.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = https://code.google.com/p/multidimalgorithm/; + homepage = https://gitlab.com/mdds/mdds; description = "A collection of multi-dimensional data structure and indexing algorithm"; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/mdds/0.7.1.nix b/pkgs/development/libraries/mdds/0.7.1.nix index 9c6c8e5e3340..8ff1d6d5e9a2 100644 --- a/pkgs/development/libraries/mdds/0.7.1.nix +++ b/pkgs/development/libraries/mdds/0.7.1.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { name = "mdds-${version}"; src = fetchurl { - url = "http://multidimalgorithm.googlecode.com/files/mdds_${version}.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/multidimalgorithm/mdds_${version}.tar.bz2"; sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy"; }; meta = { - homepage = https://code.google.com/p/multidimalgorithm/; + homepage = https://gitlab.com/mdds/mdds/; description = "A collection of multi-dimensional data structure and indexing algorithm"; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 0fde0192726b..fe34a8bb88fa 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -66,7 +66,7 @@ let in let - version = "17.2.2"; + version = "17.2.4"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -81,7 +81,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "10jplvxg7rlbp7569w08z0igwlsjjfb7q3n07zgfr8d5sr224lng"; + sha256 = "0l75q9l4g15y66rqk2swqvj18qj60hpimv0f97jk44bfrpz0i92v"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index 741ca96348d0..de8e5f786466 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -19,8 +19,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = http://code.google.com/p/mp4v2; + homepage = https://code.google.com/archive/p/mp4v2/; maintainers = [ ]; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mpl11; }; } diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index b80d549931c6..d400712a6f9b 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -1,33 +1,17 @@ { stdenv, fetchurl, python, perl, gfortran }: -let version = "1.4"; in -stdenv.mkDerivation { - name = "mpich2-${version}"; +stdenv.mkDerivation rec { + name = "mpich-${version}"; + version = "3.2"; src = fetchurl { - url = "http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${version}/mpich2-${version}.tar.gz"; + url = "http://www.mpich.org/static/downloads/3.2/mpich-3.2.tar.gz"; sha256 = "0bvvk4n9g4rmrncrgs9jnkcfh142i65wli5qp1akn9kwab1q80z6"; }; configureFlags = "--enable-shared --enable-sharedlib"; - buildInputs = [ python perl gfortran ]; - propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) stdenv.glibc; - - patchPhase = - '' for i in $(find -type f -not -name Makefile.\*) - do - if grep -q /usr/bin/env "$i" - then - interpreter="$(cat $i | grep /usr/bin/env | sed -'es|^.*/usr/bin/env \([^ ]\+\).*$|\1|g')" - echo "file \`$i' -> interpreter \`$interpreter'" - path="$(type -P $interpreter)" - echo "\`/usr/bin/env $interpreter' -> \`$path' in \`$i'..." - sed -i "$i" -e "s|/usr/bin/env $interpreter|$path|g" - fi - done - true - ''; + buildInputs = [ perl gfortran ]; meta = { description = "Implementation of the Message Passing Interface (MPI) standard"; diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix index c2799d039cc1..43732406064e 100644 --- a/pkgs/development/libraries/npapi-sdk/default.nix +++ b/pkgs/development/libraries/npapi-sdk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A bundle of NPAPI headers by Mozilla"; - homepage = https://code.google.com/p/npapi-sdk/; + homepage = https://bitbucket.org/mgorny/npapi-sdk; # see also https://github.com/mozilla/npapi-sdk license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index d42677254e35..2408c3e49041 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Paged Geometry for Ogre3D"; - homepage = http://code.google.com/p/ogre-paged/; + homepage = https://github.com/RigsOfRods/ogre-paged; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5a4d23b6a39b..68e88cc57d06 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -107,13 +107,13 @@ let in { openssl_1_0_2 = common { - version = "1.0.2l"; - sha256 = "037kvpisc6qh5dkppcwbm5bg2q800xh2hma3vghz8xcycmdij1yf"; + version = "1.0.2m"; + sha256 = "03vvlfnxx4lhxc83ikfdl6jqph4h52y7lb7li03va6dkqrgg2vwc"; }; openssl_1_1_0 = common { - version = "1.1.0f"; - sha256 = "0r97n4n552ns571diz54qsgarihrxvbn7kvyv8wjyfs9ybrldxqj"; + version = "1.1.0g"; + sha256 = "1bvka2wf33w2vxv7yw578nnjqyhz2b3chvfb0l4k2ffscw950kfy"; }; } diff --git a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch index b615f1482b7c..893fb3eb6643 100644 --- a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch +++ b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch @@ -5,10 +5,10 @@ diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto switch (cmd) { case X509_L_FILE_LOAD: if (argl == X509_FILETYPE_DEFAULT) { -- file = (char *)getenv(X509_get_default_cert_file_env()); -+ file = (char *)getenv("NIX_SSL_CERT_FILE"); +- file = getenv(X509_get_default_cert_file_env()); ++ file = getenv("NIX_SSL_CERT_FILE"); + if (!file) -+ file = (char *)getenv(X509_get_default_cert_file_env()); ++ file = getenv(X509_get_default_cert_file_env()); if (file) ok = (X509_load_cert_crl_file(ctx, file, X509_FILETYPE_PEM) != 0); diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index b172b82a295c..2940ab45eaaf 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec buildInputs = [ unzip openexr boost tbb jemalloc c-blosc ilmbase ]; - sourceRoot = "openvdb-v${version}-src/openvdb"; + setSourceRoot = '' + sourceRoot=$(echo */openvdb) + ''; installTargets = "install_lib"; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index ed0f38f8538b..4f93ed562115 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec buildInputs = [ unzip cmake freeglut mesa zlib swig python doxygen xorg.libXi xorg.libXmu ]; - sourceRoot = "partio-v${version}-src"; - enableParallelBuilding = true; buildPhase = '' diff --git a/pkgs/development/libraries/pcre/CVE-2017-7186.patch b/pkgs/development/libraries/pcre/CVE-2017-7186.patch deleted file mode 100644 index e9e1997e47c9..000000000000 --- a/pkgs/development/libraries/pcre/CVE-2017-7186.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/pcre_internal.h 2016/05/21 13:34:44 1649 -+++ b/pcre_internal.h 2017/02/24 17:30:30 1688 -@@ -2772,6 +2772,9 @@ - extern const pcre_uint16 PRIV(ucd_stage2)[]; - extern const pcre_uint32 PRIV(ucp_gentype)[]; - extern const pcre_uint32 PRIV(ucp_gbtable)[]; -+#ifdef COMPILE_PCRE32 -+extern const ucd_record PRIV(dummy_ucd_record)[]; -+#endif - #ifdef SUPPORT_JIT - extern const int PRIV(ucp_typerange)[]; - #endif -@@ -2780,9 +2783,15 @@ - /* UCD access macros */ - - #define UCD_BLOCK_SIZE 128 --#define GET_UCD(ch) (PRIV(ucd_records) + \ -+#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \ - PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \ - UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE]) -+ -+#ifdef COMPILE_PCRE32 -+#define GET_UCD(ch) ((ch > 0x10ffff)? PRIV(dummy_ucd_record) : REAL_GET_UCD(ch)) -+#else -+#define GET_UCD(ch) REAL_GET_UCD(ch) -+#endif - - #define UCD_CHARTYPE(ch) GET_UCD(ch)->chartype - #define UCD_SCRIPT(ch) GET_UCD(ch)->script ---- a/pcre_ucd.c 2014/06/19 07:51:39 1490 -+++ b/pcre_ucd.c 2017/02/24 17:30:30 1688 -@@ -38,6 +38,20 @@ - const pcre_uint32 PRIV(ucd_caseless_sets)[] = {0}; - #else - -+/* If the 32-bit library is run in non-32-bit mode, character values -+greater than 0x10ffff may be encountered. For these we set up a -+special record. */ -+ -+#ifdef COMPILE_PCRE32 -+const ucd_record PRIV(dummy_ucd_record)[] = {{ -+ ucp_Common, /* script */ -+ ucp_Cn, /* type unassigned */ -+ ucp_gbOther, /* grapheme break property */ -+ 0, /* case set */ -+ 0, /* other case */ -+ }}; -+#endif -+ - /* When recompiling tables with a new Unicode version, please check the - types in this structure definition from pcre_internal.h (the actual - field names will be different): diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index d19410f735f9..e6055151301c 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; assert elem variant [ null "cpp" "pcre16" "pcre32" ]; let - version = "8.40"; + version = "8.41"; pname = if (variant == null) then "pcre" else if (variant == "cpp") then "pcre-cpp" else variant; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2"; - sha256 = "1x7lpjn7jhk0n3sdvggxrlrhab8kkfjwl7qix0ypw9nlx8lpmqh0"; + sha256 = "0c5m469p5pd7jip621ipq6hbgh7128lzh7xndllfgh77ban7wb76"; }; outputs = [ "bin" "dev" "out" "doc" "man" ]; @@ -31,8 +31,6 @@ in stdenv.mkDerivation rec { ] ++ optional (variant != null) "--enable-${variant}"; - patches = [ ./CVE-2017-7186.patch ]; - buildInputs = optional (hostPlatform.libc == "msvcrt") windows.mingw_w64_pthreads; doCheck = !(with hostPlatform; isCygwin || isFreeBSD) && hostPlatform == buildPlatform; diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index c55d17113219..6a882ecd9003 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjack2 ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; - configureFlags = [ "--disable-mac-universal" ]; + configureFlags = [ "--disable-mac-universal --enable-cxx" ]; propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix index 7774cdbcb888..d40ae8564951 100644 --- a/pkgs/development/libraries/ptex/default.nix +++ b/pkgs/development/libraries/ptex/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec buildInputs = [ zlib python cmake ]; - sourceRoot = "ptex-v${version}-src"; - enableParallelBuilding = true; buildPhase = '' diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh index ce1dada0c479..3f6a00dc1a1e 100644 --- a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh +++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh @@ -3,7 +3,7 @@ qtQmlPrefix=@qtQmlPrefix@ qtDocPrefix=@qtDocPrefix@ _qtRmCMakeLink() { - find "${!outputLib}" -name "*.cmake" -type l | xargs rm + find "${!outputLib}" -name "*.cmake" -type l -delete } postInstallHooks+=(_qtRmCMakeLink) diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index 103b495f8e2c..040072cb463e 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -3,40 +3,45 @@ stdenv.mkDerivation { name = "qtscriptgenerator-0.1.0"; src = fetchurl { - url = http://qtscriptgenerator.googlecode.com/files/qtscriptgenerator-src-0.1.0.tar.gz; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/qtscriptgenerator/qtscriptgenerator-src-0.1.0.tar.gz"; sha256 = "0h8zjh38n2wfz7jld0jz6a09y66dbsd2jhm4f2024qfgcmxcabj6"; }; buildInputs = [ qt4 ]; patches = [ ./qtscriptgenerator.gcc-4.4.patch ./qt-4.8.patch ]; - # Why isn't the author providing proper Makefile or a CMakeLists.txt ? - buildPhase = '' + postPatch = '' # remove phonon stuff which causes errors (thanks to Gentoo bug reports) sed -i "/typesystem_phonon.xml/d" generator/generator.qrc sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro + ''; - cd generator - qmake - make - # Set QTDIR, see http://code.google.com/p/qtscriptgenerator/issues/detail?id=38 - QTDIR=${qt4} ./generator - cd ../qtbindings - qmake - make + configurePhase = '' + ( cd generator; qmake ) + ( cd qtbindings; qmake ) + ''; + + buildPhase = '' + makeFlags="SHELL=$SHELL ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES}" + make $makeFlags -C generator + + # Set QTDIR, see https://code.google.com/archive/p/qtscriptgenerator/issues/38 + ( cd generator; QTDIR=${qt4} ./generator ) + make $makeFlags -C qtbindings ''; installPhase = '' - cd .. mkdir -p $out/lib/qt4/plugins/script cp -av plugins/script/* $out/lib/qt4/plugins/script ''; + enableParallelBuilding = true; + hardeningDisable = [ "format" ]; meta = { description = "QtScript bindings generator"; - homepage = http://code.google.com/p/qtscriptgenerator/; + homepage = https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/; inherit (qt4.meta) platforms; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index db66d8545883..574899d3a89c 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -30,16 +30,16 @@ in }; cudnn_cudatoolkit8 = generic rec { - version = "7.0"; + version = "7.0.3"; cudatoolkit = cudatoolkit8; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "19yjdslrslwv5ic4vgpzb0fa0mqbgi6a66b7gc66vdc9n9589398"; + sha256 = "0gzwadxcyirr2zgiikdapnm860x3gcfwfxh5xn3s47zaa03x4kg4"; }; cudnn_cudatoolkit9 = generic rec { - version = "7.0"; + version = "7.0.3"; cudatoolkit = cudatoolkit9; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "1ld5x819vya6p2ppmr7i3lz9ac2y81kssgbzgd0lsign7r2qjapc"; + sha256 = "1ycy413cq9y9yxj20djqv05aarn3qzcy2md3dvvjpvhc269kwn09"; }; } diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index a31fa1f0516d..c5e52124ceed 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "snappy-${version}"; version = "1.1.4"; - + src = fetchurl { url = "http://github.com/google/snappy/releases/download/${version}/" + "snappy-${version}.tar.gz"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { - homepage = http://code.google.com/p/snappy/; + homepage = https://google.github.io/snappy/; license = licenses.bsd3; description = "Compression/decompression library for very high speeds"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/development/libraries/sparsehash/default.nix index 15b84363e020..f898152d820e 100644 --- a/pkgs/development/libraries/sparsehash/default.nix +++ b/pkgs/development/libraries/sparsehash/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://code.google.com/p/sparsehash/; + homepage = https://github.com/sparsehash/sparsehash; description = "An extremely memory-efficient hash_map implementation"; platforms = platforms.all; license = licenses.bsd3; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 240de378afc7..080dbc4510dd 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, spice_protocol, intltool, celt_0_5_1 +{ stdenv, fetchurl, pkgconfig, spice_protocol, gettext, celt_0_5_1 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup , gtk3, epoxy }: @@ -8,11 +8,11 @@ with stdenv.lib; let inherit (python2Packages) python pygtk; in stdenv.mkDerivation rec { - name = "spice-gtk-0.33"; + name = "spice-gtk-0.34"; src = fetchurl { url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2"; - sha256 = "0fdgx9k4vgmasp8i2n0swrkapq8f212igcg7wsgvr3mbhsvk7bvx"; + sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9"; }; buildInputs = [ @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy ]; - nativeBuildInputs = [ pkgconfig intltool libsoup autoreconfHook ]; + nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook ]; NIX_CFLAGS_COMPILE = "-fno-stack-protector"; @@ -29,10 +29,6 @@ in stdenv.mkDerivation rec { --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' ''; - preConfigure = '' - intltoolize -f - ''; - configureFlags = [ "--disable-maintainer-mode" "--with-gtk3" diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index bd56d880f94a..56adea9ca82e 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "spice-protocol-0.12.12"; + name = "spice-protocol-0.12.13"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "00wx81f2ml62g3maw63jq9w217zym921rdi38h7lpm5m8ckxraqp"; + sha256 = "0cwrgkp558mblcf4vrhacb3iizz12khsrrl82w38w9nj0ar13vl9"; }; postInstall = '' diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 6dc09ddd39f8..0625183fb7de 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.20.0"; + name = "sqlite-3.21.0"; src = fetchurl { - url = "http://sqlite.org/2017/sqlite-autoconf-3200000.tar.gz"; - sha256 = "1876dapm1xx5aqd2d8l7ymmkd2z9rybh99rp5f5rd4zz57vcc51q"; + url = "http://sqlite.org/2017/sqlite-autoconf-3210000.tar.gz"; + sha256 = "1qxvzdjwzw6k0kqjfabj86rnq87xdbwbca7laxxdhnh0fmkm3pfp"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index a8a0d5dc2b3f..13b1970866e7 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,15 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: -stdenv.mkDerivation { - name = "tbb-4.4-u2"; +with stdenv.lib; stdenv.mkDerivation rec { + name = "tbb-${version}"; + version = "2018_U1"; - src = fetchurl { - url = "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20151115oss_src.tgz"; - sha256 = "1fvprkjdxj7529hr1qkzkxkk18mx6zllrpiwglq4k3y1hpyc9m9x"; + src = fetchFromGitHub { + owner = "01org"; + repo = "tbb"; + rev = version; + sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw"; }; - checkTarget = "test"; - doCheck = false; + makeFlags = concatStringsSep " " ( + optional (compiler != null) "compiler=${compiler}" ++ + optional (stdver != null) "stdver=${stdver}" + ); installPhase = '' mkdir -p $out/{lib,share/doc} @@ -23,8 +28,8 @@ stdenv.mkDerivation { meta = { description = "Intel Thread Building Blocks C++ Library"; - homepage = http://threadingbuildingblocks.org/; - license = stdenv.lib.licenses.lgpl3Plus; + homepage = "http://threadingbuildingblocks.org/"; + license = licenses.asl20; longDescription = '' Intel Threading Building Blocks offers a rich and complete approach to expressing parallelism in a C++ program. It is a library that helps you @@ -33,7 +38,7 @@ stdenv.mkDerivation { represents a higher-level, task-based parallelism that abstracts platform details and threading mechanisms for scalability and performance. ''; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ peti thoughtpolice ]; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ peti thoughtpolice dizfer ]; }; } diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index ec26c9f567b5..fffe677f6a71 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dbus_glib, glib, python2, pkgconfig, libxslt -, gobjectIntrospection, valaSupport ? true, vala_0_23, glibcLocales }: +, gobjectIntrospection, valaSupport ? true, vala_0_38, glibcLocales }: stdenv.mkDerivation rec { name = "telepathy-glib-0.24.1"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; propagatedBuildInputs = [dbus_glib glib gobjectIntrospection]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxslt glibcLocales python2 ] ++ stdenv.lib.optional valaSupport vala_0_23; + nativeBuildInputs = [ pkgconfig libxslt ] ++ stdenv.lib.optional valaSupport vala_0_38; + buildInputs = [ glibcLocales python2 ]; preConfigure = '' substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix new file mode 100644 index 000000000000..a0110c5f22b2 --- /dev/null +++ b/pkgs/development/libraries/theft/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.4.3"; + name = "theft-${version}"; + + src = fetchFromGitHub { + owner = "silentbicycle"; + repo = "theft"; + rev = "v${version}"; + sha256 = "1ibh8np12lafnrsrvjbbzlyq45zq654939x0y22vdnc6s8dpbhw4"; + }; + + preConfigure = "patchShebangs ./scripts/mk_bits_lut"; + + doCheck = true; + checkTarget = "test"; + + installFlags = [ "PREFIX=$(out)" ]; + postInstall = "install -m644 vendor/greatest.h $out/include/"; + + meta = { + description = "A C library for property-based testing"; + platforms = stdenv.lib.platforms.linux; + homepage = "http://github.com/silentbicycle/theft/"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.kquick ]; + }; +} diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index d66b5d82ff52..0d6674cce814 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1xchbxy0xql7yl7z4n1icj8r7dmly46i22fvm00vdjq64zlmqg3j"; }; + postPatch = '' + sed '1i#include ' -i src/xdr_sizeof.c + ''; + nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libkrb5 ]; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index df68b86519b7..dcb44a408a82 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -3,11 +3,12 @@ }: stdenv.mkDerivation rec { - name = "libva-intel-driver-1.7.3"; + name = "intel-vaapi-driver-${version}"; + version = "1.8.2"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; - sha256 = "0dzryi9x873p9gikzcb9wzwqv2j3wssm0b85ws63vqjszpckgbbn"; + sha256 = "00mpcvininwr5c4wyhp16s4bddg7vclxxjm2sfq5h7lifjcxyv46"; }; patchPhase = '' diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index cdbecb4dc8bb..6864db12f18d 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, - zimg, libass, yasm, python3, libiconv, ApplicationServices, - ocrSupport ? false, tesseract, - imwriSupport? true, imagemagick7 +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +, zimg, libass, python3, libiconv +, ApplicationServices, nasm +, ocrSupport ? false, tesseract +, imwriSupport? true, imagemagick7 }: assert ocrSupport -> tesseract != null; @@ -11,18 +12,18 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "vapoursynth-${version}"; - version = "R38"; + version = "R39"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "0nabl6949s7awy7rnr4ck52v50xr0hwr280fyzsqixgp8w369jn0"; + sha256 = "0cw7w8xiwhxhwykydy13m44wm9vn9hrsi30z6017ngga9d84fhqy"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkgconfig autoreconfHook nasm ]; buildInputs = [ - zimg libass tesseract yasm + zimg libass (python3.withPackages (ps: with ps; [ sphinx cython ])) ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ] ++ optional ocrSupport tesseract diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 2910e8b7dbbc..324d977c72e5 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -24,6 +24,8 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals (stdenv.system == "x86_64-linux") [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; homepage = http://hci.iwr.uni-heidelberg.de/vigra; diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/development/libraries/vrb/default.nix new file mode 100644 index 000000000000..4f72cc138acf --- /dev/null +++ b/pkgs/development/libraries/vrb/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "vrb-${version}"; + version = "0.5.1"; + + src = fetchurl { + url = "http://vrb.sourceforge.net/download/${name}.tar.bz2"; + sha256 = "d579ed1998ef2d78e2ef8481a748d26e1fa12cdda806d2e31d8ec66ffb0e289f"; + }; + + patches = [ + ./removed_options.patch + ./unused-but-set-variable.patch + ]; + + postPatch = '' + patchShebangs configure + ''; + + postInstall = '' + mkdir -p $out/share/man/man3 + cp -p vrb/man/man3/*.3 $out/share/man/man3/ + ''; + + meta = with stdenv.lib; { + description = "A virtual ring buffer library written in C"; + license = licenses.lgpl21; + homepage = http://vrb.sourceforge.net/; + maintainers = [ maintainers.bobvanderlinden ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/development/libraries/vrb/removed_options.patch b/pkgs/development/libraries/vrb/removed_options.patch new file mode 100644 index 000000000000..eda88e751843 --- /dev/null +++ b/pkgs/development/libraries/vrb/removed_options.patch @@ -0,0 +1,13 @@ +--- a/configure 2010-10-05 16:32:59.000000000 +0200 ++++ b/configure 2010-10-05 16:33:08.000000000 +0200 +@@ -341,8 +341,8 @@ + pgm_warn=( "${pgm_warn[@]}" -Winline ) + fi + +-lib_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -fgnu-linker -frerun-loop-opt -finline -finline-functions -fmove-all-movables ) +-pgm_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -fgnu-linker -frerun-loop-opt -finline -finline-functions -fmove-all-movables ) ++lib_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -frerun-loop-opt -finline -finline-functions ) ++pgm_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -frerun-loop-opt -finline -finline-functions ) + + lib_cp_opt=( -pipe ) + pgm_cp_opt=( -pipe ) diff --git a/pkgs/development/libraries/vrb/unused-but-set-variable.patch b/pkgs/development/libraries/vrb/unused-but-set-variable.patch new file mode 100644 index 000000000000..43429255e8cd --- /dev/null +++ b/pkgs/development/libraries/vrb/unused-but-set-variable.patch @@ -0,0 +1,19 @@ +--- a/vrb/src/bin/vbuf.c1 2011-06-13 22:14:24.000000000 +0200 ++++ b/vrb/src/bin/vbuf.c 2011-06-13 22:14:43.000000000 +0200 +@@ -426,7 +426,6 @@ + int opt_progress ; + int output_fd ; + int poll_time ; +- int poll_num ; + int poll_write ; + int poll_read ; + +@@ -861,7 +860,7 @@ + poll_time = display_time - get_time_ms(); + if ( poll_time < 0 ) poll_time = 0; + } +- poll_num = poll( poll_list, 2, poll_time ); ++ poll( poll_list, 2, poll_time ); + + //----------------------- + // Check for poll events. diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.18.nix similarity index 88% rename from pkgs/development/libraries/webkitgtk/2.16.nix rename to pkgs/development/libraries/webkitgtk/2.18.nix index d69993534146..e1b520eb10b1 100644 --- a/pkgs/development/libraries/webkitgtk/2.16.nix +++ b/pkgs/development/libraries/webkitgtk/2.18.nix @@ -4,7 +4,7 @@ , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit , libidn, libedit, readline, mesa, libintlOrEmpty , enableGeoLocation ? true, geoclue2, sqlite -, gst-plugins-base +, gst-plugins-base, gst-plugins-bad }: assert enableGeoLocation -> geoclue2 != null; @@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.16.6"; + version = "2.18.1"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "08abxbhi2n1pfby9f2c20z8mpmbvbs2z7vf0p5ckq4jkz46na8zw"; + sha256 = "15fp7szmkpannx7avsynf0nv3y343qwq0fvq3rz2m2mw5wq7pnww"; }; # see if we can clean this up.... @@ -77,10 +77,7 @@ stdenv.mkDerivation rec { "-DENABLE_GTKDOC=OFF" ]; - # 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" - + (optionalString stdenv.isDarwin " -lintl"); + NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; nativeBuildInputs = [ cmake perl python2 ruby bison gperf @@ -90,7 +87,7 @@ stdenv.mkDerivation rec { buildInputs = libintlOrEmpty ++ [ gtk2 libwebp enchant libnotify gnutls pcre nettle libidn libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit - sqlite gst-plugins-base libxkbcommon epoxy at_spi2_core + sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core ] ++ optional enableGeoLocation geoclue2 ++ (with xlibs; [ libXdmcp libXt libXtst ]) ++ optionals stdenv.isDarwin [ libedit readline mesa ] diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index 2672d6efbec1..fbfc460db96d 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -2,21 +2,22 @@ stdenv.mkDerivation rec { name = "websocket++-${version}"; - version = "0.4.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "zaphoyd"; repo = "websocketpp"; rev = version; - sha256 = "1n6j0dh3qpis0f7crd49a2nhxd5459h0blch408z3kwlasx2g0i5"; + sha256 = "1i64sps52kvy8yffysjbmmbb109pi28kqai0qdxxz1dcj3xfckqd"; }; buildInputs = [ cmake ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.zaphoyd.com/websocketpp/; description = "C++/Boost Asio based websocket client/server library"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ andir ]; }; } diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix new file mode 100644 index 000000000000..79bd8bb96659 --- /dev/null +++ b/pkgs/development/libraries/wlroots/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +, wayland, mesa_noglu, wayland-protocols, libinput, libxkbcommon, pixman +, xcbutilwm, libX11, libcap +}: + +let pname = "wlroots"; + version = "unstable-2017-10-31"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "swaywm"; + repo = "wlroots"; + rev = "7200d643363e988edf6777c38e7f8fcd451a2c50"; + sha256 = "179raymkni1xzaph32zdhg7nfin0xfzrlnbnxkcr266k9y8k66ac"; + }; + + # TODO: Temporary workaround for compilation errors + patches = [ ./libdrm.patch ./no-werror.patch ]; + + nativeBuildInputs = [ meson ninja pkgconfig ]; + + buildInputs = [ + wayland mesa_noglu wayland-protocols libinput libxkbcommon pixman + xcbutilwm libX11 libcap + ]; + + meta = with stdenv.lib; { + description = "A modular Wayland compositor library"; + inherit (src.meta) homepage; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/libraries/wlroots/libdrm.patch b/pkgs/development/libraries/wlroots/libdrm.patch new file mode 100644 index 000000000000..2b9d85382764 --- /dev/null +++ b/pkgs/development/libraries/wlroots/libdrm.patch @@ -0,0 +1,9 @@ +--- a/backend/meson.build 2017-10-31 22:08:01.112927610 +0100 ++++ b/backend/meson.build 2017-10-31 22:09:28.155264343 +0100 +@@ -43,5 +43,5 @@ + 'wlr_backend', + backend_files, + include_directories: wlr_inc, +- dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos], ++ dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos, drm], + ) diff --git a/pkgs/development/libraries/wlroots/no-werror.patch b/pkgs/development/libraries/wlroots/no-werror.patch new file mode 100644 index 000000000000..78c374d9dbb8 --- /dev/null +++ b/pkgs/development/libraries/wlroots/no-werror.patch @@ -0,0 +1,10 @@ +--- a/meson.build 2017-10-31 22:08:01.132927689 +0100 ++++ b/meson.build 2017-10-31 22:20:58.215784350 +0100 +@@ -5,7 +5,6 @@ + default_options: [ + 'c_std=c11', + 'warning_level=2', +- 'werror=true', + ], + ) + diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 56080841ca3d..6230536b33ab 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -20,6 +20,14 @@ stdenv.mkDerivation { sha256 = "04jda4bns7cmp7xy68qz112yg0lribpc6xs5k9gilfqcyhshqlvc"; }; + patches = [ + (fetchurl { # https://trac.wxwidgets.org/ticket/17942 + url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/" + + "fix_assertion_using_hide_in_destroy.diff"; + sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; + }) + ]; + buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 35300ed9419a..951f27f7d547 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, gtk3, libXinerama, libSM, libXxf86vm +{ stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig +, gtk2, gtk3, libXinerama, libSM, libXxf86vm , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile , withMesa ? true, mesa_glu ? null, mesa_noglu ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true -, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk216x ? null +, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk218x ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: assert withMesa -> mesa_glu != null && mesa_noglu != null; -assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != null; +assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) != null; with stdenv.lib; @@ -30,16 +31,21 @@ stdenv.mkDerivation { [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] ++ optional withMesa mesa_glu - ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) + ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = optional stdenv.isDarwin AGL; - patches = + patches = [ + (fetchurl { # https://trac.wxwidgets.org/ticket/17942 + url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/" + + "fix_assertion_using_hide_in_destroy.diff"; + sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; + }) # "Add support for WebKit2GTK+ in wxWebView". Will be in 3.0.4 - optional (!withGtk2) (fetchpatch { + ] ++ optional (!withGtk2) (fetchpatch { url = "https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc893fb7516731ca9c71e0d0bbc5ae9ff7.patch"; sha256 = "0gxd83xajm7gdv9rdzyvqwa2p5nz29nr23i0zx2dgfpsvz2qjp3q"; }); diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index e759e65dfc6b..ed84dec365e1 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala_0_23 +{ stdenv, fetchgit, pkgconfig, glib, sqlite, gnome3, vala_0_38 , intltool, libtool, dbus_libs, telepathy_glib , gtk3, json_glib, librdf_raptor2, dbus_glib , pythonSupport ? true, python2Packages }: stdenv.mkDerivation rec { - version = "0.9.15"; + version = "1.0"; name = "zeitgeist-${version}"; - src = fetchurl { - url = "https://github.com/seiflotfy/zeitgeist/archive/v${version}.tar.gz"; - sha256 = "07pnc7kmjpd0ncm32z6s3ny5p4zl52v9lld0n0f8sp6cw87k12p0"; + src = fetchgit { + url = "git://anongit.freedesktop.org/git/zeitgeist/zeitgeist"; + rev = "v${version}"; + sha256 = "0vw6m0azycqabbz8f0fd8xsh5kf6j3ig4wpqlhw6sklvf44ii5b8"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; @@ -19,9 +20,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib sqlite gnome3.gnome_common intltool - libtool dbus_libs telepathy_glib vala_0_23 dbus_glib + nativeBuildInputs = [ pkgconfig gnome3.gnome_common intltool libtool vala_0_38 ]; + buildInputs = [ glib sqlite dbus_libs telepathy_glib dbus_glib gtk3 json_glib librdf_raptor2 python2Packages.rdflib ]; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 2c9d27a8b6ad..b5bb73e3e33b 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,17 +2,16 @@ stdenv.mkDerivation rec{ name = "zimg-${version}"; - version = "2.4"; + version = "2.6.1"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; - rev = "v${version}"; - sha256 = "11pk8a5manr751jhy0xrql57jzab57lwqjxbpd8kvm9m8b51icwq"; + rev = "release-${version}"; + sha256 = "08hynzcxz95a4i67k5cn6isafdb6xjgd0x0miyhlnp2xc220zfqj"; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; meta = with stdenv.lib; { description = "Scaling, colorspace conversion and dithering library"; diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix index 2088439c61d5..fb4a090c702a 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { substituteAll ${./common-lisp.sh} "$out"/bin/common-lisp.sh substituteAll "${./build-with-lisp.sh}" "$out/bin/build-with-lisp.sh" substituteAll "${./cl-wrapper.sh}" "$out/bin/cl-wrapper.sh" + patchShebangs "$out/bin" chmod a+x "$out"/bin/* substituteAll "${./setup-hook.sh}" "setup-hook-parsed" diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 2a44cdfca0b0..7152d0b9e360 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -5,14 +5,13 @@ lua: if disabled then throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}" else - lua.stdenv.mkDerivation ({ - - preBuild = '' - makeFlagsArray=( - PREFIX=$out - LUA_LIBDIR="$out/lib/lua/${lua.luaversion}" - LUA_INC="-I${lua}/include"); - ''; + lua.stdenv.mkDerivation ( + { + makeFlags = [ + "PREFIX=$(out)" + "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}" + "LUA_INC=-I${lua}/include" + ]; } // attrs diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index fc2981f7f1f7..7775716a7122 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -99,7 +99,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support"; - homepage = http://developer.amd.com/tools/heterogeneous-computing/amd-accelerated-parallel-processing-app-sdk/; + homepage = http://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/; license = licenses.amd; maintainers = [ maintainers.offline ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index fd5796276f7a..88d24fddf79e 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -3,17 +3,17 @@ with rustPlatform; buildRustPackage rec { - version = "2017-06-23"; + version = "0.4.1"; name = "loc-${version}"; src = fetchFromGitHub { owner = "cgag"; repo = "loc"; - rev = "bbea575f56879ef614d57a42a6b79fd45b9a8b38"; - sha256 = "0agyhi55rh248fmlsip4fi1iw4xv3433q7bcb2lpjfnjpzxxlvfn"; + rev = "v${version}"; + sha256 = "0086asrx48qlmc484pjz5r5znli85q6qgpfbd81gjlzylj7f57gg"; }; - cargoSha256 = "0f3i8av9g19r2nhr9m8ca8s23kq294c5kqyvx155l6p76r7a9kvb"; + cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk"; meta = { homepage = http://github.com/cgag/loc; diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md index dea7cd9b38b9..79f180759b09 100644 --- a/pkgs/development/node-packages/README.md +++ b/pkgs/development/node-packages/README.md @@ -1,13 +1,34 @@ Node.js packages ================ -To add a package from [NPM](https://www.npmjs.com/) to nixpkgs: +The `pkgs/development/node-packages` folder contains a generated collection of +[NPM packages](https://npmjs.com/) that can be installed with the Nix package +manager. + +As a rule of thumb, the package set should only provide *end user* software +packages, such as command-line utilities. Libraries should only be added to the +package set if there is a non-NPM package that requires it. + +When it is desired to use NPM libraries in a development project, use the +`node2nix` generator directly on the `package.json` configuration file of the +project. + +The package set also provides support for multiple Node.js versions. The policy +is that a new package should be added to the collection for the latest stable LTS +release (which is currently 6.x), unless there is an explicit reason to support +a different release. + +To add a package from NPM to nixpkgs: 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json` - for packagages depending on Node.js 4.x) + for packages depending on Node.js 4.x) 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`. 3. Build your new package to test your changes: `cd /path/to/nixpkgs && nix-build -A nodePackages.`. To build against a specific Node.js version (e.g. 4.x): `nix-build -A nodePackages_4_x.` 4. Add and commit all modified and generated files. + +For more information about the generation process, consult the +[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` +tool. diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix index dc5899ebf1a3..f63ae1ef7503 100644 --- a/pkgs/development/node-packages/composition-v4.nix +++ b/pkgs/development/node-packages/composition-v4.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.3.0. Do not edit! +# This file has been generated by node2nix 1.4.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index 0c01a169af41..4d4f68cf50ca 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.3.0. Do not edit! +# This file has been generated by node2nix 1.4.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix index 99cb7ca40441..7546b2e34ce9 100644 --- a/pkgs/development/node-packages/default-v4.nix +++ b/pkgs/development/node-packages/default-v4.nix @@ -1,4 +1,4 @@ -{pkgs, system, nodejs}: +{pkgs, system, nodejs, stdenv}: let nodePackages = import ./composition-v4.nix { @@ -9,42 +9,4 @@ nodePackages // { node-inspector = nodePackages.node-inspector.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; }); - - phantomjs = nodePackages.phantomjs.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; - }); - - webdrvr = nodePackages.webdrvr.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; - - preRebuild = '' - mkdir $TMPDIR/webdrvr - - ln -s ${pkgs.fetchurl { - url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; - sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; - }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar - ln -s ${pkgs.fetchurl { - url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip"; - sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89"; - }} $TMPDIR/webdrvr/chromedriver_linux64.zip - ''; - }); - - wring = nodePackages.wring.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; - }); - - npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { - postInstall = "npm run-script prepublish"; - }; - - bower2nix = nodePackages.bower2nix.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; - postInstall = '' - for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" - done - ''; - }); } diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 334c79a82672..179629ddfa69 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -1,4 +1,4 @@ -{pkgs, system, nodejs}: +{pkgs, system, nodejs, stdenv}: let nodePackages = import ./composition-v6.nix { @@ -6,6 +6,13 @@ let }; in nodePackages // { + dnschain = nodePackages.dnschain.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ]; + postInstall = '' + wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin + ''; + }); + node-inspector = nodePackages.node-inspector.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; }); @@ -41,7 +48,7 @@ nodePackages // { buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; postInstall = '' for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} done ''; }); @@ -54,7 +61,7 @@ nodePackages // { ''; }); - fast-cli = nodePackages.fast-cli.override (oldAttrs: { + fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: { preRebuild = '' # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 356e78f027bf..33073e55ce56 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -110,16 +110,16 @@ let text = '' var fs = require('fs'); var path = require('path'); - + function resolveDependencyVersion(location, name) { if(location == process.env['NIX_STORE']) { return null; } else { var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - + if(fs.existsSync(dependencyPackageJSON)) { var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - + if(dependencyPackageObj.name == name) { return dependencyPackageObj.version; } @@ -128,12 +128,12 @@ let } } } - + function replaceDependencies(dependencies) { if(typeof dependencies == "object" && dependencies !== null) { for(var dependency in dependencies) { var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - + if(resolvedVersion === null) { process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); } else { @@ -142,17 +142,17 @@ let } } } - + /* Read the package.json configuration */ var packageObj = JSON.parse(fs.readFileSync('./package.json')); - + /* Pinpoint all dependencies */ replaceDependencies(packageObj.dependencies); if(process.argv[2] == "development") { replaceDependencies(packageObj.devDependencies); } replaceDependencies(packageObj.optionalDependencies); - + /* Write the fixed package.json file */ fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); ''; @@ -160,7 +160,7 @@ let in '' node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - + ${stdenv.lib.optionalString (dependencies != []) '' if [ -d node_modules ] @@ -171,11 +171,11 @@ let fi ''} ''; - + # Recursively traverses all dependencies of a package and pinpoints all # dependencies in the package.json file to the versions that are actually # being used. - + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: '' if [ -d "${packageName}" ] @@ -210,7 +210,7 @@ let compositionScript = composePackage args; pinpointDependenciesScript = pinpointDependenciesOfPackage args; - + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; installPhase = args.installPhase or '' @@ -220,7 +220,7 @@ let # Compose the package and all its dependencies source $compositionScriptPath - + # Pinpoint the versions of all dependencies to the ones that are actually being used echo "pinpointing versions of dependencies..." source $pinpointDependenciesScriptPath @@ -287,31 +287,31 @@ let includeScript = includeDependencies { inherit dependencies; }; pinpointDependenciesScript = pinpointDependenciesOfPackage args; - + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; buildCommand = '' - mkdir -p $out/lib - cd $out/lib + mkdir -p $out/${packageName} + cd $out/${packageName} + source $includeScriptPath - - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath # Create fake package.json to make the npm commands work properly - cat > package.json <catdir( $sqlite_base, 'lib' ); -- $sqlite_inc = File::Spec->catdir( $sqlite_base, 'include' ); -- } -- if ( $sqlite_local = (grep(/USE_LOCAL_SQLITE=.*/, @ARGV))[0] ) { -- $sqlite_local =~ /=(.*)/; -- $sqlite_local = "$1" ? 1 : 0; -- if ( $sqlite_local ) { -- # Keep these from making into CFLAGS/LDFLAGS -- undef $sqlite_lib; -- undef $sqlite_inc; -- } -- } -+my ($sqlite_local, $sqlite_lib, $sqlite_inc); +if ( 1 ) { -+ $sqlite_lib = '@sqlite_out@/lib'; -+ $sqlite_inc = '@sqlite_dev@/include'; - - # Now check for a compatible sqlite3 - unless ( $sqlite_local ) { + require File::Spec; + if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) { + $sqlite_base =~ /=(.*)/; diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index a556aebc47ed..a9b5faf60064 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "APScheduler"; - version = "3.3.1"; + version = "3.4.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f68874dff1bdffcc6ce3adb7840c1e4d162c609a3e3f831351df30b75732767b"; + sha256 = "b51118a8ed014104f7e440456dcbd90f2015aea7bcc34c57e307fb34bc746316"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 0513f67e5697..751e064ad706 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "Cython"; name = "${pname}-${version}"; - version = "0.26.1"; + version = "0.27.3"; src = fetchPypi { inherit pname version; - sha256 = "c2e63c4794161135adafa8aa4a855d6068073f421c83ffacc39369497a189dd5"; + sha256 = "6a00512de1f2e3ce66ba35c5420babaef1fe2d9c43a8faab4080b0dbcc26bc64"; }; # With Python 2.x on i686-linux or 32-bit ARM this test fails because the diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix index a022fd9fc410..56e2cf501eda 100644 --- a/pkgs/development/python-modules/MechanicalSoup/default.nix +++ b/pkgs/development/python-modules/MechanicalSoup/default.nix @@ -1,19 +1,31 @@ { fetchPypi, buildPythonPackage, lib -, requests, beautifulsoup4, six }: +, requests, beautifulsoup4, six +, pytestrunner, requests-mock, pytestcov, pytest +}: buildPythonPackage rec { name = "${pname}-${version}"; pname = "MechanicalSoup"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0wh93rml446ipx603n5z5i5bpan46pzliq6sw76d0ms9w7w2658d"; + sha256 = "38a6ca35428196be94f87f8f036ee4a88b1418d1f77e5634ad92acfaa22c28da"; }; + checkInputs = [ pytest pytestrunner requests-mock pytestcov ]; + propagatedBuildInputs = [ requests beautifulsoup4 six ]; + # Requires network + doCheck = false; + + postPatch = '' + # Is in setup_requires but not used in setup.py... + substituteInPlace setup.py --replace "'pytest-runner'," "" + ''; + meta = with lib; { description = "A Python library for automating interaction with websites"; homepage = https://github.com/hickford/MechanicalSoup; diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index fe8597f4d488..f281a02d49b6 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Nikola"; - version = "7.8.9"; + version = "7.8.10"; # Nix contains only Python 3 supported version of doit, which is a dependency # of Nikola. Python 2 support would require older doit 0.29.0 (which on the @@ -47,7 +47,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c85bf293a245a34057fb55236fc2f2c5d28e9ef1c375889f443bca1d86924df4"; + sha256 = "e242c3d0dd175d95a0baf5268b108081ba160b83ceafec8c9bc2ec0a24a56537"; }; meta = { diff --git a/pkgs/development/python-modules/affinity/default.nix b/pkgs/development/python-modules/affinity/default.nix new file mode 100644 index 000000000000..f2cb2ef6445e --- /dev/null +++ b/pkgs/development/python-modules/affinity/default.nix @@ -0,0 +1,16 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "affinity"; + version = "0.1.0"; + src = fetchPypi { + inherit pname version; + sha256 = "1i6j7kszvnzh5vh9k48cqwx2kzf73a6abgv9s6bf0j2zmfjl2wb6"; + }; + meta = { + description = "control processor affinity on windows and linux"; + homepage = http://cheeseshop.python.org/pypi/affinity; + license = with lib.licenses; [ psfl ]; + }; +} diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index d1c6e279064e..9139c62618a6 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "aiofiles"; - version = "0.3.1"; + version = "0.3.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "6c4936cea65175277183553dbc27d08b286a24ae5bd86f44fbe485dfcf77a14a"; + sha256 = "852a493a877b73e11823bfd4e8e5ef2610d70d12c9eaed961bcd9124d8de8c10"; }; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 72b28d01ceab..5f87580643f6 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "2.2.5"; + version = "2.3.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "af5bfdd164256118a0a306b3f7046e63207d1f8cba73a67dcc0bd858dcfcd3bc"; + sha256 = "42373fbdbe8f09233c17e74f53cee877bc7d5b495b4fc14c32a119255e85e736"; }; disabled = pythonOlder "3.4"; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 45bea1fe687a..e40e30085632 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "alembic"; - version = "0.9.5"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "8bdcb4babaa16b9a826f8084949cc2665cb328ecf7b89b3224b0ab85bd16fd05"; + sha256 = "042851ebe9efa07be6dc1395b1793b6c1d8964a39b73a0ce1649e2bcd41ea732"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 7e9701906ef9..d3cdc0f43f23 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "altair"; - version = "1.2.0"; + version = "1.2.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "05c47dm20p7m0017p2h38il721rxag1q0457dj7whp0k8rc7qd1n"; + sha256 = "c1303f77f1ba4d632f2958c83c0f457b2b969860b1ac9adfb872aefa1780baa7"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 95eda37d3f28..6e61e84a5d53 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aniso8601"; - version = "1.2.1"; + version = "1.3.0"; name = "${pname}-${version}"; meta = with stdenv.lib; { @@ -16,6 +16,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e7ba4f42d3aea75909c79b1f4c4614768b4f13fbb98fc658a7b6061ddb0be47c"; + sha256 = "c3b5246f5601b6ae5671911bc4ee5b3e3fe94752e8afab5ce074d8b1232952f1"; }; } diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 346257db098f..41a111c3167a 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "asana"; - version = "0.6.2"; + version = "0.6.5"; name = "${pname}-${version}"; meta = { @@ -15,10 +15,10 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0skai72392n3i1c4bl3hn2kh5lj990qsbasdwkbjdcy6vq57jggf"; + sha256 = "eab8d24c2a4670b541b75da2f4bf5b995fe71559c1338da53ce9039f7b19c9a0"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ requests requests_oauthlib six ]; patchPhase = '' diff --git a/pkgs/development/python-modules/asgi_ipc/default.nix b/pkgs/development/python-modules/asgi_ipc/default.nix index 41de61dbccae..a60109b6e8c7 100644 --- a/pkgs/development/python-modules/asgi_ipc/default.nix +++ b/pkgs/development/python-modules/asgi_ipc/default.nix @@ -2,13 +2,13 @@ asgiref, msgpack, posix_ipc }: buildPythonPackage rec { - version = "1.4.1"; + version = "1.4.2"; pname = "asgi_ipc"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz"; - sha256 = "87cc9dda476d28f335261b73f0f3070f28847718de2e64da9a80492638203e43"; + sha256 = "2403f41184405791b05e7aee570bd6ccd47e2d91845d78fe17adcf58ef48c037"; }; propagatedBuildInputs = [ asgiref msgpack posix_ipc ]; diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index a34879e55967..eedaac50fac9 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asn1crypto"; - version = "0.22.0"; + version = "0.23.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "cbbadd640d3165ab24b06ef25d1dca09a3441611ac15f6a6b452474fdf0aed1a"; + sha256 = "0874981329cfebb366d6584c3d16e913f2a0eb026c9463efcc4aaf42a9d94d70"; }; # No tests included diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index ba73c232c89a..12f00be0cb74 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "astropy"; - version = "2.0.1"; + version = "2.0.2"; name = "${pname}-${version}"; doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook. src = fetchPypi { inherit pname version; - sha256 = "25e0881a392a2e03b4a705cf9592f01894d23f64797323b21387efa8ea9ec03e"; + sha256 = "4544a422b1173d79b2d65ba74c627f04a5fd8530d97fb604752d657d754e103d"; }; propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index 94c2379b0e15..650517d44d92 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -7,13 +7,13 @@ let pname = "async-timeout"; - version = "1.3.0"; + version = "2.0.0"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "f4651f122a9877049930ce31a8422bc202a47937627295fe5e411b2c2083481f"; + sha256 = "c17d8ac2d735d59aa62737d76f2787a6c938f5a944ecf768a8c0ab70b0dea566"; }; buildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 8d647a9b52eb..5a6121aaf7f4 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "autobahn"; - version = "17.8.1"; + version = "17.9.3"; src = fetchurl { url = "mirror://pypi/a/${pname}/${name}.tar.gz"; - sha256 = "72b1b1e30bd41d52e7454ef6fe78fe80ebf2341a747616e2cd854a76203a0ec4"; + sha256 = "206a3a579a580ca3ce2532ac12ec52d447135c9ace7c4bf6065b832a7cff25ba"; }; # Upstream claim python2 support, but tests require pytest-asyncio which diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix new file mode 100644 index 000000000000..06ad939cfa8b --- /dev/null +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchPypi, buildPythonPackage, pycodestyle }: + +buildPythonPackage rec { + pname = "autopep8"; + version = "1.3.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c1gl648g2xnz3j0rsp71ld4i32zlglmqjvqf4q8r08jp3zpny7z"; + }; + + propagatedBuildInputs = [ pycodestyle ]; + + # One test fails: + # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests) + doCheck = false; + + meta = with stdenv.lib; { + description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"; + homepage = https://pypi.python.org/pypi/autopep8/; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/backports_tempfile/default.nix b/pkgs/development/python-modules/backports_tempfile/default.nix new file mode 100644 index 000000000000..5a04b6afd678 --- /dev/null +++ b/pkgs/development/python-modules/backports_tempfile/default.nix @@ -0,0 +1,35 @@ +{ lib +, python +, buildPythonPackage +, fetchPypi +, setuptools_scm +, backports_weakref +}: + +buildPythonPackage rec { + pname = "backports.tempfile"; + version = "1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1c648c452e8770d759bdc5a5e2431209be70d25484e1be24876cf2168722c762"; + }; + + buildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ backports_weakref ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + # requires https://pypi.org/project/backports.test.support + doCheck = false; + + meta = { + description = "Backport of new features in Python's tempfile module"; + license = lib.licenses.psfl; + homepage = https://github.com/pjdelport/backports.tempfile; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/backports_weakref/default.nix b/pkgs/development/python-modules/backports_weakref/default.nix index 0528fa405aeb..6ad69b80b6d1 100644 --- a/pkgs/development/python-modules/backports_weakref/default.nix +++ b/pkgs/development/python-modules/backports_weakref/default.nix @@ -9,10 +9,10 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "backports.weakref"; - version = "1.0rc1"; + version = "1.0.post1"; src = fetchPypi { inherit pname version; - sha256 = "14i8m3lspykdfpzf50grij3z286j9q8f32f2bnwdicv659qvy4w8"; + sha256 = "bc4170a29915f8b22c9e7c4939701859650f2eb84184aee80da329ac0b9825c2"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index 9f99708b0714..a1b49da34a4a 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "bayespy"; - version = "0.5.10"; + version = "0.5.12"; name = "${pname}-${version}"; # Python 2 not supported and not some old Python 3 because MPL doesn't support @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "01cwd88ri29zy6qpvnqzljkgc44n7a17yijizr73blcnh4dz5n1w"; + sha256 = "9609a3e85f88434a47c8263f40567cd24363d0e10d236354630b670fca313c00"; }; checkInputs = [ pytest glibcLocales ]; diff --git a/pkgs/development/python-modules/bcrypt.nix b/pkgs/development/python-modules/bcrypt/default.nix similarity index 85% rename from pkgs/development/python-modules/bcrypt.nix rename to pkgs/development/python-modules/bcrypt/default.nix index d159ff8fe902..72800d2f6c29 100644 --- a/pkgs/development/python-modules/bcrypt.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; buildPythonPackage rec { - version = "3.1.3"; + version = "3.1.4"; pname = "bcrypt"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/b/bcrypt/${name}.tar.gz"; - sha256 = "6645c8d0ad845308de3eb9be98b6fd22a46ec5412bfc664a423e411cdd8f5488"; + sha256 = "67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d"; }; buildInputs = [ pycparser mock pytest py ]; propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi; diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix new file mode 100644 index 000000000000..762154ac45d2 --- /dev/null +++ b/pkgs/development/python-modules/betamax-matchers/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, betamax, requests_toolbelt }: + +buildPythonPackage rec { + pname = "betamax-matchers"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "07qpwjyq2i2aqhz5iwghnj4pqr2ys5n45v1vmpcfx9r5mhwrsq43"; + }; + + buildInputs = [ betamax requests_toolbelt ]; + + meta = with stdenv.lib; { + homepage = https://github.com/sigmavirus24/betamax_matchers; + description = "A group of experimental matchers for Betamax"; + license = licenses.asl20; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/development/python-modules/betamax-serializers/default.nix b/pkgs/development/python-modules/betamax-serializers/default.nix new file mode 100644 index 000000000000..2ad23f1f9e65 --- /dev/null +++ b/pkgs/development/python-modules/betamax-serializers/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi +, betamax, pyyaml }: + +buildPythonPackage rec { + pname = "betamax-serializers"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1yqzwx204m4lxlpg04cwv6iwzmcpdzr19wvj97vvxchp0g4qg83d"; + }; + + buildInputs = [ betamax pyyaml ]; + + meta = with stdenv.lib; { + homepage = https://gitlab.com/betamax/serializers; + description = "A set of third-party serializers for Betamax"; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix new file mode 100644 index 000000000000..f6c56646dcb9 --- /dev/null +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "bitstring"; + version = "3.1.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1"; + extension = "zip"; + }; + + meta = with stdenv.lib; { + description = "Module for binary data manipulation"; + homepage = "https://github.com/scott-griffiths/bitstring"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix new file mode 100644 index 000000000000..fed6f6e9219e --- /dev/null +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils +, pillow, webcolors, funcparserlib +}: + +buildPythonPackage rec { + name = "blockdiag-${version}"; + version = "1.5.3"; + + src = fetchurl { + url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2"; + sha256 = "0r0qbmv0ijnqidsgm2rqs162y9aixmnkmzgnzgk52hiy7ydm4k8f"; + }; + + buildInputs = [ pep8 nose unittest2 docutils ]; + + propagatedBuildInputs = [ pillow webcolors funcparserlib ]; + + # One test fails: + # ... + # FAIL: test_auto_font_detection (blockdiag.tests.test_boot_params.TestBootParams) + doCheck = false; + + meta = with stdenv.lib; { + description = "Generate block-diagram image from spec-text file (similar to Graphviz)"; + homepage = http://blockdiag.com/; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index a1ae95e6d5d5..61bfe7121cb9 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -34,11 +34,11 @@ buildPythonPackage rec { pname = "bokeh"; name = "${pname}${version}"; - version = "0.12.9"; + version = "0.12.10"; src = fetchPypi { inherit pname version; - sha256 = "00jx3yycy6fziihz45hwj1dsh520h3vmypp28mw0877rxpxl2yxg"; + sha256 = "6465fae82e94223f16584645b38d34a73d95712870f29c0244649c2cbf2c8393"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix new file mode 100644 index 000000000000..515494b5f931 --- /dev/null +++ b/pkgs/development/python-modules/bpython/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchurl, pygments, greenlet, curtsies, urwid, requests, mock }: + +buildPythonPackage rec { + pname = "bpython"; + version = "0.17"; + name = "${pname}-${version}"; + + # 0.17 is still missing on PyPI, https://github.com/bpython/bpython/issues/706 + src = fetchurl { + url = "https://bpython-interpreter.org/releases/${pname}-${version}.tar.gz"; + sha256 = "13fyyx06645ikvmj9zmkixr12kzk1c3a3f9s9i2rvaczjycn82lz"; + }; + + propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ]; + + checkInputs = [ mock ]; + + # tests fail: https://github.com/bpython/bpython/issues/712 + doCheck = false; + + meta = with stdenv.lib; { + description = "A fancy curses interface to the Python interactive interpreter"; + homepage = "https://bpython-interpreter.org/"; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 6f539f15222c..1397dc6876fa 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }: buildPythonPackage rec { - version = "4.7.2"; + version = "4.7.3"; pname = "breathe"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/b/breathe/${name}.tar.gz"; - sha256 = "dd15efc66d65180e4c994edd15fcb642812ad04ac9c36738b28bf248d7c0be32"; + sha256 = "d0b0e029daba6c3889d15d6c2dd4b0e9d468dc631d41021d0576c1b0dabee302"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index fcb46f4bac14..70c6f3baaf1a 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.9.4"; + version = "2.9.5"; name = "${pname}-nix-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; - sha256 = "df56cc55735e984510986c633090ad0d64f59d7e42d1aac57ecf04ab183d1053"; + sha256 = "dce840ea379e2ff10bae27465778708704e0a4287cde92eb6c7961f5b0277cfa"; }; patches = [ ./nix.patch ]; diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index 2ed704e34825..3fbdb500af80 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "cement"; name = "${pname}-${version}"; - version = "2.8.2"; + version = "2.10.2"; src = fetchPypi { inherit pname version; - sha256 = "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7"; + sha256 = "d50c5980bf3e2456e515178ba097d16e36be0fbcab7811a60589d22f45b64f55"; }; # Disable test tests since they depend on a memcached server running on diff --git a/pkgs/development/python-modules/cffi/clang.patch b/pkgs/development/python-modules/cffi/clang.patch new file mode 100644 index 000000000000..27674edb58b4 --- /dev/null +++ b/pkgs/development/python-modules/cffi/clang.patch @@ -0,0 +1,13 @@ +diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py +index a3277b0..0d6e2c3 100644 +--- a/testing/cffi1/test_recompiler.py ++++ b/testing/cffi1/test_recompiler.py +@@ -2270,7 +2270,7 @@ def test_char16_char32_type(no_cpp=False): + char32_t foo_4bytes(char32_t); + """) + lib = verify(ffi, "test_char16_char32_type" + no_cpp * "_nocpp", """ +- #if !defined(__cplusplus) || __cplusplus < 201103L ++ #if !defined(__cplusplus) + typedef uint_least16_t char16_t; + typedef uint_least32_t char32_t; + #endif diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index cced78c0c6a5..b0524b4121ad 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -1,22 +1,24 @@ -{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }: +{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }: if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.10.0"; + version = "1.11.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1mffyilq4qycm8gs4wkgb18rnqil8a9blqq77chdlshzxc8jkc5k"; + sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6"; }; + patches = stdenv.lib.optional (isPy27 && stdenv.cc.isClang) ./clang.patch; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ libffi pycparser ]; buildInputs = [ pytest ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unreachable-code"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index c20cbabe0d61..8447f7fea50c 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "cheroot"; - version = "5.5.0"; + version = "5.8.3"; src = fetchPypi { inherit pname version; - sha256 = "1fhyk8lgs2blfx4zjvwsy6f0ynrs5fwnnr3qf07r6c4j3gwlkqsr"; + sha256 = "5c0531fd732700b1fb3e6e7079dc3aefbdf29e9136925633d93f009cb87d70a3"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix new file mode 100644 index 000000000000..9d8e61d1f450 --- /dev/null +++ b/pkgs/development/python-modules/construct/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, six, pythonOlder }: + +buildPythonPackage rec { + name = "construct-${version}"; + version = "2.8.16"; + + src = fetchFromGitHub { + owner = "construct"; + repo = "construct"; + rev = "v${version}"; + sha256 = "0lzz1dy419n254qccch7yx4nkpwd0fsyjhnsnaf6ysgwzqxxv63j"; + }; + + propagatedBuildInputs = [ six ]; + + # Tests fail with the following error on Python 3.5+ + # TypeError: not all arguments converted during string formatting + doCheck = pythonOlder "3.5"; + + meta = with stdenv.lib; { + description = "Powerful declarative parser (and builder) for binary data"; + homepage = http://construct.readthedocs.org/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 9f61018ceabb..810a6a7bd8e3 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "credstash"; - version = "1.13.3"; + version = "1.13.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1x2dh4rs5sahb8h2xznhq7srcm2zl9ykc72a8iqpq4dz7l9k7x7i"; + sha256 = "676cc03a6143dec260c78aeef09d08a64faf27c411f8a94f6d9338e985879f81"; }; propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ]; diff --git a/pkgs/development/python-modules/csscompressor.nix b/pkgs/development/python-modules/csscompressor/default.nix similarity index 100% rename from pkgs/development/python-modules/csscompressor.nix rename to pkgs/development/python-modules/csscompressor/default.nix diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix new file mode 100644 index 000000000000..a1e5f2352356 --- /dev/null +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, pytest, wcwidth }: + +buildPythonPackage rec { + pname = "curtsies"; + version = "0.2.11"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vljmw3sy6lrqahhpyg4gk13mzcx3mwhvg8s41698ms3cpgkjipc"; + }; + + propagatedBuildInputs = [ blessings wcwidth pyte ]; + + checkInputs = [ nose mock pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "Curses-like terminal wrapper, with colored strings!"; + homepage = https://pypi.python.org/pypi/curtsies; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix new file mode 100644 index 000000000000..dcb4e9474c3b --- /dev/null +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, nose +, toolz +, python +}: + +buildPythonPackage rec { + pname = "cytoolz"; + version = "0.8.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552"; + }; + + # Extension types + disabled = isPyPy; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ toolz ]; + + # Disable failing test https://github.com/pytoolz/cytoolz/issues/97 + checkPhase = '' + NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages} + ''; + + meta = { + homepage = "http://github.com/pytoolz/cytoolz/"; + description = "Cython implementation of Toolz: High performance functional utilities"; + license = "licenses.bsd3"; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index b1d39e493b7a..c319e6535e92 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dask"; - version = "0.15.2"; + version = "0.15.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "abe6758540fdbc260f14ee71cebc3ab88682e24ff147afa89375b7006f57d3ed"; + sha256 = "cb93b8260f5f854ccf26b52bdc700600a08e6b7527085c7b7d63c04238bab9ea"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix new file mode 100644 index 000000000000..81ead8431695 --- /dev/null +++ b/pkgs/development/python-modules/datashape/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, mock +, numpy +, multipledispatch +, dateutil +}: + +buildPythonPackage rec { + pname = "datashape"; + version = "0.5.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783"; + }; + + checkInputs = [ pytest mock ]; + propagatedBuildInputs = [ numpy multipledispatch dateutil ]; + + checkPhase = '' + py.test datashape/tests + ''; + + meta = { + homepage = https://github.com/ContinuumIO/datashape; + description = "A data description language"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix new file mode 100644 index 000000000000..4f5d7a11bd8f --- /dev/null +++ b/pkgs/development/python-modules/demjson/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy36 }: + +buildPythonPackage rec { + pname = "demjson"; + version = "2.2.4"; + name = "${pname}-${version}"; + disabled = isPy36; + + src = fetchPypi { + inherit pname version; + sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; + }; + + meta = with stdenv.lib; { + description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; + homepage = http://deron.meranda.us/python/demjson/; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 971d53e3dddd..67f8debc43a0 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -2,18 +2,20 @@ with pythonPackages;buildPythonPackage rec { pname = "devpi-common"; - version = "3.2.0rc1"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1ws35g1r0j2xccsna4r6fc9a08przfi28kf9hciq3rmd6ndbr9c9"; + sha256 = "d89634a57981ed43cb5dcd25e00c9454ea111189c5ddc08d945b3d5187ada5fd"; }; propagatedBuildInputs = [ requests py ]; checkInputs = [ pytest ]; checkPhase = '' + # Don't know why this test is failing! + substituteInPlace testing/test_request.py --replace "test_env" "noop_test_env" py.test ''; diff --git a/pkgs/development/python-modules/discogs_client/default.nix b/pkgs/development/python-modules/discogs_client/default.nix index d6891b0e157f..ae56fd5f7e59 100644 --- a/pkgs/development/python-modules/discogs_client/default.nix +++ b/pkgs/development/python-modules/discogs_client/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "discogs-client"; - version = "2.2.0"; + version = "2.2.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1kjm4zyxlkv8cjyd4zl0yslbkmfz4ga9nm3d2glpw3nmvmvajn40"; + sha256 = "9e32b5e45cff41af8025891c71aa3025b3e1895de59b37c11fd203a8af687414"; }; propagatedBuildInputs = [ requests oauthlib ]; diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index c9ae73b1661d..e11ee54f1a6f 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -11,13 +11,13 @@ let pname = "discord.py"; - version = "0.16.11"; + version = "0.16.12"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "eb3c6faa7d4570cce05533d0742bbcb768629e2b3ba9e1cc79c05833db91ac4d"; + sha256 = "17fb8814100fbaf7a79468baa432184db6cef3bbea4ad194fe297c7407d50108"; }; propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ]; diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 20a1c3dc221f..1b54213e2af7 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "django-picklefield"; name = "${pname}-${version}"; - version = "0.3.2"; + version = "1.0.0"; meta = { description = "A pickled object field for Django"; @@ -13,6 +13,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1qlsbp3798ii68ny9zlz2ppkna00jf7i4hmjal3p8433gi18md7s"; + sha256 = "61e3ba7f6df82d8df9e6be3a8c55ef589eb3bf926c3d25d2b7949b07eae78354"; }; } diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index fb5a62296b92..2fe45b7a1f62 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "Django"; name = "${pname}-${version}"; - version = "1.11.6"; + version = "1.11.7"; disabled = pythonOlder "2.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz"; - sha256 = "0q0cmwifa6c0k6kh8fpa3mjmqw7yqd616qz8m4ls3h51xyhjrd63"; + sha256 = "16ab3p6jj1da94wkz2b5fb128ycy4826bbsnbabcd3qdaf9f6649"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django_guardian.nix b/pkgs/development/python-modules/django_guardian/default.nix similarity index 100% rename from pkgs/development/python-modules/django_guardian.nix rename to pkgs/development/python-modules/django_guardian/default.nix diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index 42f2cde81130..5c00ef604177 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -2,12 +2,12 @@ mock, django, redis, msgpack }: buildPythonPackage rec { pname = "django-redis"; - version = "4.5.0"; + version = "4.8.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "170dbk1wmdg0mxp5m3376zz54dyxmhmhnswrccf0jnny1wqcgpsp"; + sha256 = "5229da5b07ccb8d3e3e9ee098c0b7c03e20eba48634bc456697dd73d62c68b19"; }; doCheck = false; diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix index 6207408e0123..b6fcddd528f2 100644 --- a/pkgs/development/python-modules/django_tagging/default.nix +++ b/pkgs/development/python-modules/django_tagging/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "django-tagging"; - version = "0.4.5"; + version = "0.4.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "00ki1g6pb2lnaj4lh0s865mmlf4kdwx7a6n38iy5qz9qv4xrvz4q"; + sha256 = "210b32af8372b8f68f261fdb7394075669222608d1e6a3bbf2031d59c826eb68"; }; # error: invalid command 'test' diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 648ee0196825..62e291306d8c 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, django }: buildPythonPackage rec { - version = "3.6.4"; + version = "3.7.1"; pname = "djangorestframework"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/djangorestframework/${name}.tar.gz"; - sha256 = "de8ac68b3cf6dd41b98e01dcc92dc0022a5958f096eafc181a17fa975d18ca42"; + sha256 = "305b2c6564ca46d3b558ba21110ed717135c467adf1a6dfd192bd85f4bb04d50"; }; # Test settings are missing diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker/default.nix similarity index 100% rename from pkgs/development/python-modules/docker.nix rename to pkgs/development/python-modules/docker/default.nix diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose/default.nix similarity index 91% rename from pkgs/development/python-modules/docker_compose.nix rename to pkgs/development/python-modules/docker_compose/default.nix index 18d68e4ea5d8..91a0c4183c9b 100644 --- a/pkgs/development/python-modules/docker_compose.nix +++ b/pkgs/development/python-modules/docker_compose/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchurl, pythonOlder +{ stdenv, buildPythonApplication, fetchPypi, pythonOlder , mock, pytest, nose , pyyaml, backports_ssl_match_hostname, colorama, docopt , dockerpty, docker, ipaddress, jsonschema, requests @@ -10,8 +10,8 @@ buildPythonApplication rec { pname = "docker-compose"; name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/d/docker-compose/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0yg58m5kk22kihbra0h40miqnbdmkirjr9y47wns613sdikrymmg"; }; diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix new file mode 100644 index 000000000000..43c318fc7c3e --- /dev/null +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "dpkt"; + version = "1.9.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rr9ygczhxkfb61778jx0cxs0sq46zwlcj5l3wn6xmd3iy3yx9y6"; + }; + + meta = with stdenv.lib; { + description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols"; + homepage = https://code.google.com/p/dpkt/; + license = licenses.bsd3; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/ds4drv.nix b/pkgs/development/python-modules/ds4drv/default.nix similarity index 100% rename from pkgs/development/python-modules/ds4drv.nix rename to pkgs/development/python-modules/ds4drv/default.nix diff --git a/pkgs/development/python-modules/dulwich.nix b/pkgs/development/python-modules/dulwich/default.nix similarity index 86% rename from pkgs/development/python-modules/dulwich.nix rename to pkgs/development/python-modules/dulwich/default.nix index bbf43ce615c4..422674152a68 100644 --- a/pkgs/development/python-modules/dulwich.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -3,13 +3,13 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.18.2"; + version = "0.18.5"; pname = "dulwich"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/dulwich/${name}.tar.gz"; - sha256 = "284d0000b21ac12f94bcd5eb3d7dcc42da51e5506b9a53a11c615b46da906d9b"; + sha256 = "838bac318fd0ed79e0eedb6cfd53b6424dc618fec6b99dc959881b12da7bd6e0"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index e4bbe4e071d9..881f51b69aa0 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "dyn"; - version = "1.6.3"; + version = "1.8.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1xq90fliix5nbv934s3wf2pahmx6m2b9y0kqwn192c76qh7xlzib"; + sha256 = "4ab3cd9a1478674cf2d2aa6740fb0ddf77daaa9ab3e35e5d2bc92f60301f8523"; }; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 79743f8ac0d6..38e201849c19 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "easy-thumbnails"; name = "${pname}-${version}"; - version = "2.4.1"; + version = "2.4.2"; meta = { description = "Easy thumbnails for Django"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0w228b6hx8k4r15v7z62hyg99qp6xp4mdkgqs1ah64fyqxp1riaw"; + sha256 = "8cad7ea4fb2b800284e842d8a44f685cbc1968535be04c24a4bbf6e6dbc550c4"; }; propagatedBuildInputs = [ django pillow ]; diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index 93ac292282a6..d29174209a9d 100644 --- a/pkgs/development/python-modules/edward/default.nix +++ b/pkgs/development/python-modules/edward/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "edward"; - version = "1.3.3"; + version = "1.3.4"; name = "${pname}-${version}"; disabled = !(isPy27 || pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "104d58321c5040235b3039ae3215c3c7881073e6aa88bb0b8ca1141ca87c4891"; + sha256 = "10d6d7886235f4b9fa4ba401daef87c27937a04d2763f507643d730e51de37b6"; }; # disabled for now due to Tensorflow trying to create files in $HOME: diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 3a2a0a64ce6f..02926e0fd743 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,12 +8,12 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "0.7.18"; + version = "0.8.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "310b20f3c497a777622920dca314d90f774028d49c7ee7ccfa96ca4b9d9bf429"; + sha256 = "3c98dd04bba667ecfddb77fcd0dfd19b376b258d21beeaf5b95578826e275a83"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix new file mode 100644 index 000000000000..ee1048ec5fac --- /dev/null +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, python, fetchurl }: + +buildPythonPackage rec { + name = "fastimport-${version}"; + version = "0.9.6"; + + src = fetchurl { + url = "mirror://pypi/f/fastimport/${name}.tar.gz"; + sha256 = "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + meta = with stdenv.lib; { + homepage = https://launchpad.net/python-fastimport; + description = "VCS fastimport/fastexport parser"; + maintainers = with maintainers; [ koral ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix new file mode 100644 index 000000000000..f8d877f0655b --- /dev/null +++ b/pkgs/development/python-modules/faulthandler/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "faulthandler"; + version = "2.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zywq3jaznddvqc3hnfrlv24wmpyq4xgajk9xhv6578qw1rpfj2r"; + }; + + meta = { + description = "Dump the Python traceback"; + license = stdenv.lib.licenses.bsd2; + maintainers = with stdenv.lib.maintainers; [ sauyon ]; + homepage = http://faulthandler.readthedocs.io/; + }; +} diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index 9ad28e52baac..e8bdb78f7317 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -2,17 +2,18 @@ buildPythonPackage rec { pname = "feedgen"; - version = "0.5.1"; + version = "0.6.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "3a344b5e3662e9012d095a081a7f216f188dccf3a8f44ad7882960fef05e6787"; + sha256 = "e5a1f2a8aaed06dae325e6024aa7083e90655c6cbddeb3671249b3895c135762"; }; propagatedBuildInputs = [ dateutil lxml ]; - doCheck = true; + # No tests in archive + doCheck = false; meta = with stdenv.lib; { description = "Python module to generate ATOM feeds, RSS feeds and Podcasts."; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 42e8e423bdda..5c150844c845 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.7.9"; + version = "1.7.10.post1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1fmdgpfnifaqfqwkfiwkpk19wmpi9avmh8a7jqylqi578jvp3fwi"; + sha256 = "fc4c8996be3131f36c791d66273317d38b72b19dc24c2afc332fd734752eb7a8"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index f7f78e709f92..89b554f3e68b 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "flake8"; - version = "3.4.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "c20044779ff848f67f89c56a0e4624c04298cd476e25253ac0c36f910a1a11d8"; + sha256 = "7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0"; }; buildInputs = [ pytest mock pytestrunner ]; diff --git a/pkgs/development/python-modules/flask-elastic.nix b/pkgs/development/python-modules/flask-elastic/default.nix similarity index 100% rename from pkgs/development/python-modules/flask-elastic.nix rename to pkgs/development/python-modules/flask-elastic/default.nix diff --git a/pkgs/development/python-modules/flask-ldap-login.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix similarity index 100% rename from pkgs/development/python-modules/flask-ldap-login.nix rename to pkgs/development/python-modules/flask-ldap-login/default.nix diff --git a/pkgs/development/python-modules/flask-login.nix b/pkgs/development/python-modules/flask-login/default.nix similarity index 100% rename from pkgs/development/python-modules/flask-login.nix rename to pkgs/development/python-modules/flask-login/default.nix diff --git a/pkgs/development/python-modules/flask-oauthlib.nix b/pkgs/development/python-modules/flask-oauthlib/default.nix similarity index 100% rename from pkgs/development/python-modules/flask-oauthlib.nix rename to pkgs/development/python-modules/flask-oauthlib/default.nix diff --git a/pkgs/development/python-modules/flask-testing.nix b/pkgs/development/python-modules/flask-testing/default.nix similarity index 100% rename from pkgs/development/python-modules/flask-testing.nix rename to pkgs/development/python-modules/flask-testing/default.nix diff --git a/pkgs/development/python-modules/flask-wtf.nix b/pkgs/development/python-modules/flask-wtf/default.nix similarity index 100% rename from pkgs/development/python-modules/flask-wtf.nix rename to pkgs/development/python-modules/flask-wtf/default.nix diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 387da64219df..71aabd75d754 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "folium"; - version = "0.3.0"; + version = "0.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7729ddd6766b9c5dab17b3709e2387935fd5c655872f1cbab7b7036474415217"; + sha256 = "748944521146d85c6cd6230acf234e885864cd0f42fea3758d655488517e5e6e"; }; postPatch = '' diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index c037decbc873..1dfc22f769b4 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.15.1"; + version = "3.17.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "8df4b605a28e313f0f9e0a79502caba4150a521347fdbafc063e52fee34912c2"; + sha256 = "1c4f26bf32cd58d5881bfe1f42e5f0a1637a58452a60ae1623999f3ae7da0e24"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index aced6675495d..b1ba77ab868c 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ftfy"; # latest is 5.1.1, buy spaCy requires 4.4.3 - version = "4.4.3"; + version = "5.1.1"; src = fetchPypi { inherit pname version; - sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w"; + sha256 = "67a29a2fad5f72aec2d8a0a7084e4f499ed040455133ee96b1c458609fc29e78"; }; propagatedBuildInputs = [ html5lib wcwidth]; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 2d953abd53cd..ea5fc12e4321 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -13,10 +13,10 @@ buildPythonPackage rec { pname = "gensim"; name = "${pname}-${version}"; - version = "2.3.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "7d0dccc7d2c576e270037949874800b7cfbc86ef081ff981483f612cd18e223f"; + sha256 = "4827012f6f020ac4f4067c2a2a88542391917113faaa417505e1ee8a1e7e2650"; }; propagatedBuildInputs = [ smart_open numpy six scipy diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix new file mode 100644 index 000000000000..8a3d3b3d09b7 --- /dev/null +++ b/pkgs/development/python-modules/gevent/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, buildPythonPackage, isPyPy, python, libev, greenlet }: + +buildPythonPackage rec { + name = "gevent-1.1.2"; + + src = fetchurl { + url = "mirror://pypi/g/gevent/${name}.tar.gz"; + sha256 = "cb15cf73d69a2eeefed330858f09634e2c50bf46da9f9e7635730fcfb872c02c"; + }; + + # Why do we have this patch? + postPatch = '' + substituteInPlace libev/ev.c --replace \ + "ecb_inline void ecb_unreachable (void) ecb_noreturn" \ + "ecb_inline ecb_noreturn void ecb_unreachable (void)" + ''; + + buildInputs = [ libev ]; + propagatedBuildInputs = stdenv.lib.optionals (!isPyPy) [ greenlet ]; + + checkPhase = '' + cd greentest + ${python.interpreter} testrunner.py + ''; + + # Bunch of failures. + doCheck = false; + + meta = with stdenv.lib; { + description = "Coroutine-based networking library"; + homepage = http://www.gevent.org/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/gflags/default.nix b/pkgs/development/python-modules/gflags/default.nix index 48fff7230569..f73ff2b4686d 100644 --- a/pkgs/development/python-modules/gflags/default.nix +++ b/pkgs/development/python-modules/gflags/default.nix @@ -1,13 +1,13 @@ { lib, buildPythonPackage, fetchPypi, six, pytest }: buildPythonPackage rec { - version = "3.1.1"; + version = "3.1.2"; name = "gflags-${version}"; src = fetchPypi { inherit version; pname = "python-gflags"; - sha256 = "0qvcizlz6r4511kl4jlg6fr34y1ka956dr2jj1q0qcklr94n9zxa"; + sha256 = "40ae131e899ef68e9e14aa53ca063839c34f6a168afe622217b5b875492a1ee2"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/ghdiff.nix b/pkgs/development/python-modules/ghdiff/default.nix similarity index 100% rename from pkgs/development/python-modules/ghdiff.nix rename to pkgs/development/python-modules/ghdiff/default.nix diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index 0bdc7247b3d5..bc48a7490aa9 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "GPy"; - version = "1.7.7"; + version = "1.8.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1b4siirlkqic1lsn9bi9mnp8fpbpw1ijwv0z2i6r2zdrk3d6szs1"; + sha256 = "38c1202f1790952b88c298224139ee5b14d4518e3ddc6186c60db2ece016d8c1"; }; # running tests produces "ImportError: cannot import name 'linalg_cython'" diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 1333c4b59a47..71d77c283b84 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "gst-python"; - version = "1.10.4"; + version = "1.12.2"; name = "${pname}-${version}"; src = fetchurl { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { "${meta.homepage}/src/gst-python/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "04l2hvvz9b0f3nyds1k3yfk5di8a91fpr6maj19c11mwp1s82l2r"; + sha256 = "0iwy0v2k27wd3957ich6j5f0f04b0wb2mb175ypf2lx68snk5k7l"; }; patches = [ ./different-path-with-pygobject.patch ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { passthru.pythonPath = []; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "Python bindings for GStreamer"; diff --git a/pkgs/development/python-modules/gunicorn.nix b/pkgs/development/python-modules/gunicorn/default.nix similarity index 100% rename from pkgs/development/python-modules/gunicorn.nix rename to pkgs/development/python-modules/gunicorn/default.nix diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix new file mode 100644 index 000000000000..08cd1943eff6 --- /dev/null +++ b/pkgs/development/python-modules/h2/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, enum34, hpack, hyperframe }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "h2"; + version = "3.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0r3f43r0v7sqgdjjg5ngw0dndk2v6cyd0jncpwya54m37y42z5mj"; + }; + + propagatedBuildInputs = [ enum34 hpack hyperframe ]; + + meta = with stdenv.lib; { + description = "HTTP/2 State-Machine based protocol implementation"; + homepage = "http://hyper.rtfd.org/"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 697bc1cd0e3d..212fd5c957df 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "hidapi"; - version = "0.7.99.post20"; + version = "0.7.99.post21"; src = fetchPypi { inherit pname version; - sha256 = "1k7z5m7xsqy8j4qkjy4pfxdx4hm36ha68vi65z6smvnyg4zgv22z"; + sha256 = "e0be1aa6566979266a8fc845ab0e18613f4918cf2c977fe67050f5dc7e2a9a97"; }; propagatedBuildInputs = [ libusb1 udev cython ]; diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix index 9e97e56c1341..27d4b8a15b81 100644 --- a/pkgs/development/python-modules/hieroglyph/default.nix +++ b/pkgs/development/python-modules/hieroglyph/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "hieroglyph"; - version = "0.7.1"; + version = "1.0.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/h/hieroglyph/${name}.tar.gz"; - sha256 = "0rswfk7x6zlj1z8388f153k3zn2h52k5h9b6p57pn7kqagsjilcb"; + sha256 = "8e137f0b1cd60c47b870011089790d3c8ddb74fcf409a75ddf2c7f2516ff337c"; }; propagatedBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/htmlmin.nix b/pkgs/development/python-modules/htmlmin/default.nix similarity index 83% rename from pkgs/development/python-modules/htmlmin.nix rename to pkgs/development/python-modules/htmlmin/default.nix index 35f86479a4e3..2206b3559bae 100644 --- a/pkgs/development/python-modules/htmlmin.nix +++ b/pkgs/development/python-modules/htmlmin/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "htmlmin"; - version = "0.1.10"; + version = "0.1.11"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ca5c5dfbb0fa58562e5cbc8dc026047f6cb431d4333504b11853853be448aa63"; + sha256 = "f27fb96fdddeb1725ee077be532c7bea23288c69d0e996e7798f24fae7a14e5e"; }; # Tests run fine in a normal source checkout, but not when being built by nix. diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 72917fdd771b..d11d6b3668f6 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -5,7 +5,8 @@ , markupsafe , decorator , itsdangerous -, six }: +, six +}: buildPythonPackage rec { pname = "httpbin"; @@ -19,6 +20,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask markupsafe decorator itsdangerous six ]; + # No tests + doCheck = false; + meta = with stdenv.lib; { homepage = https://github.com/kennethreitz/httpbin; description = "HTTP Request & Response Service"; diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix new file mode 100644 index 000000000000..91e00a7a1461 --- /dev/null +++ b/pkgs/development/python-modules/hyperframe/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "hyperframe"; + version = "5.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "017vjbb1xjak1pxcvihhilzjnmpfvhapk7k88wp6lvdkkm9l8nd2"; + }; + + meta = with stdenv.lib; { + description = "HTTP/2 framing layer for Python"; + homepage = "http://hyper.rtfd.org/"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis/default.nix similarity index 100% rename from pkgs/development/python-modules/hypothesis.nix rename to pkgs/development/python-modules/hypothesis/default.nix diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index af5bf5c4faa4..ac26573f4a75 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "6.1.0"; + version = "6.2.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "5c53e8ee4d4bec27879982b9f3b4aa2d6e3cfd7b26782d250fa117f85bb29814"; + sha256 = "51c158a6c8b899898d1c91c6b51a34110196815cc905f9be0fa5878e19355608"; }; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/ipython_genutils/default.nix b/pkgs/development/python-modules/ipython_genutils/default.nix new file mode 100644 index 000000000000..503ccb37d57e --- /dev/null +++ b/pkgs/development/python-modules/ipython_genutils/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, glibcLocales +}: + +buildPythonPackage rec { + pname = "ipython_genutils"; + version = "0.2.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"; + }; + + checkInputs = [ nose glibcLocales ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests -v ipython_genutils/tests + ''; + + meta = { + description = "Vestigial utilities from IPython"; + homepage = http://ipython.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index ce0aed4964d3..14b03e5e282a 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.0.0"; + version = "7.0.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "63e454202f72796044e99846881c33767c47fa050735dc1f927657b9cd2b7fcd"; + sha256 = "f98b4c3719097c9d2e6489f303db520b20bd4de3e0b1d6d4f92f81bfe3c2a0c8"; }; # Tests are not distributed diff --git a/pkgs/development/python-modules/jabberbot.nix b/pkgs/development/python-modules/jabberbot/default.nix similarity index 100% rename from pkgs/development/python-modules/jabberbot.nix rename to pkgs/development/python-modules/jabberbot/default.nix diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 5d904ee311ff..6cdf784dc3ba 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -1,17 +1,19 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov }: +{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: buildPythonPackage rec { pname = "jedi"; - version = "0.10.2"; + version = "0.11.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7abb618cac6470ebbd142e59c23daec5e6e063bfcecc8a43a037d2ab57276f4e"; + sha256 = "f6d5973573e76b1fd2ea75f6dcd6445d02d41ff3af5fc61b275b4e323d1dd396"; }; checkInputs = [ pytest glibcLocales tox pytestcov ]; + propagatedBuildInputs = [ parso ]; + checkPhase = '' LC_ALL="en_US.UTF-8" py.test test ''; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index f6ead8c8266c..eedbed250a12 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -6,26 +6,23 @@ , numpydoc , isPy3k , stdenv +, pytest }: buildPythonPackage rec { pname = "joblib"; name = "${pname}-${version}"; - version = "0.10.3"; + version = "0.11"; src = fetchPypi { inherit pname version; - sha256 = "29b2965a9efbc90a5fe66a389ae35ac5b5b0c1feabfc7cab7fd5d19f429a071d"; + sha256 = "7b8fd56df36d9731a83729395ccb85a3b401f62a96255deb1a77220c00ed4085"; }; - checkInputs = [ nose sphinx numpydoc ]; + checkInputs = [ sphinx numpydoc pytest ]; - # Failing test on Python 3.x and Darwin - postPatch = '''' + lib.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 + checkPhase = '' + py.test -k 'not test_disk_used and not test_nested_parallel_warnings' joblib/test ''; meta = { @@ -33,4 +30,4 @@ buildPythonPackage rec { homepage = http://pythonhosted.org/joblib/; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index c199b2f50dbd..a2278566c6d7 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,8 +2,8 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.6.14"; - name = "jsbeautifier-1.6.14"; + version = "1.7.4"; + name = "${pname}-${version}"; propagatedBuildInputs = [ six ]; @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchurl { url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz"; - sha256 = "50b2af556aa1da7283a6a92eaa699668312cb91f2ba6b78a4422b1d42af964a2"; + sha256 = "7fc14f279117a55a5e854602f6e8c1cb178c6d83f7cf75e2e9f50678fe11079e"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix new file mode 100644 index 000000000000..b1053bbdaab1 --- /dev/null +++ b/pkgs/development/python-modules/jug/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, numpy +, bottle, pyyaml, redis, six +, zlib }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Jug"; + version = "1.6.4"; + buildInputs = [ nose numpy ]; + propagatedBuildInputs = [ + bottle + pyyaml + redis + six + + zlib + ]; + + src = fetchPypi { + inherit pname version; + sha256 = "e739b20e7fe53ac50f5954b9e32568bdd92012dd4bd199d13e2a675ccd69d97d"; + }; + + meta = with stdenv.lib; { + description = "A Task-Based Parallelization Framework"; + license = licenses.mit; + url = https://jug.readthedocs.io/; + maintainers = with maintainers; [ luispedro ]; + }; +} diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix new file mode 100644 index 000000000000..c99619566175 --- /dev/null +++ b/pkgs/development/python-modules/kaitaistruct/default.nix @@ -0,0 +1,18 @@ +{ stdenv, kaitaistruct, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "kaitaistruct"; + version = "0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "19j3snmr0qbd48f7yd3cc21ffv13dahf8ys591dnalbhvnkar71i"; + }; + + meta = with stdenv.lib; { + description = "Kaitai Struct: runtime library for Python"; + homepage = "https://github.com/kaitai-io/kaitai_struct_python_runtime"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 877fbe9470d1..c2d5362b134b 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.0.8"; + version = "2.0.9"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "899dc6aaed366f20100b9f80cf1093ea5b43eecc74afd1dc63a4e48dfa776ab9"; + sha256 = "6b8572cf1b4a22fd0120b7c23382ba4fa04a6f0397e02af1249be9a7309d1767"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix new file mode 100644 index 000000000000..2746f1616682 --- /dev/null +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchurl, pkgs, pytestrunner }: + +let + pname = "keyutils"; + version = "0.5"; +in buildPythonPackage rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/k/${pname}/${name}.tar.gz"; + sha256 = "0dskys71vkn59vlsfs1ljli0qnzk7b10iv4pawxawnk2hvyjrf10"; + }; + + buildInputs = [ pkgs.keyutils pytestrunner ]; + + doCheck = false; + + meta = { + description = "A set of python bindings for keyutils"; + homepage = https://github.com/sassoftware/python-keyutils; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap/default.nix similarity index 93% rename from pkgs/development/python-modules/ldap.nix rename to pkgs/development/python-modules/ldap/default.nix index c67fdcd548f6..635308f37607 100644 --- a/pkgs/development/python-modules/ldap.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "python-ldap"; - version = "2.4.41"; + version = "2.4.45"; name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6d430ecf040f2fc704ee316d3390cb1f5419c191371e1e131baef54a0e42cef0"; + sha256 = "824fde180a53772e23edc031c4dd64ac1af4a3eade78f00d9d510937d562f64e"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix new file mode 100644 index 000000000000..895272f351de --- /dev/null +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage, gssapi, pyasn1 }: + +buildPythonPackage rec { + version = "2.3"; + pname = "ldap3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1b36lwil4iflk2ay8gi663abpnfm8id7qg4n3jkmmqbnc1sv6mn0"; + }; + + buildInputs = [ gssapi ]; + + propagatedBuildInputs = [ pyasn1 ]; + + doCheck = false; # requires network + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/ldap3; + description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library"; + license = licenses.lgpl3; + }; +} diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 0bee4dd47b55..9b2499cd5b23 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ledgerblue"; - version = "0.1.15"; + version = "0.1.16"; src = fetchPypi { inherit pname version; - sha256 = "42cbcd74615576294142d56eb9eaa7e1b67f9dd87eeb24d713336b56e8c01c5c"; + sha256 = "eba56b887339fb5f8582771e4e398df4fa5a017183b908d4f8950588157c1504"; }; buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ]; diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index fe12f5ffb197..e8cecda75897 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "libagent"; - version = "0.9.2"; + version = "0.9.5"; src = fetchPypi{ inherit pname version; - sha256 = "d6c6dccc0a7693fc966f5962604a69a800e044ac5add3dd030c34cfd4d64311f"; + sha256 = "982b81c19dc9ee1158dc32fedbe1c36aff2b6872fa0dd42173b639b965ccfb2e"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 2f041f0da4a2..b9404ab5ec31 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "libtmux"; - version = "0.7.4"; + version = "0.7.5"; src = fetchPypi { inherit pname version; - sha256 = "c7407aa4103d40f50f99432bf4dffe0b4591f976956b2dd7ee7bbf53ad138bd9"; + sha256 = "12e5006e59b7d98af5d1a9294f9c8ff2829ac2c1c6ae23dc73c280100b15f485"; }; buildInputs = [ pytest_29 ]; diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix new file mode 100644 index 000000000000..7c907d1e5ef3 --- /dev/null +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, buildPythonPackage, pkgconfig, pytest, fuse, attr, which +, contextlib2 +}: + +buildPythonPackage rec { + name = "llfuse-1.0"; + + src = fetchurl { + url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; + sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pytest fuse attr which ]; + + propagatedBuildInputs = [ contextlib2 ]; + + checkPhase = '' + py.test + ''; + + # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin' + doCheck = false; + + meta = with stdenv.lib; { + description = "Python bindings for the low-level FUSE API"; + homepage = https://code.google.com/p/python-llfuse/; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 5de795f84ef9..57deaf3caf36 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.19.0"; + version = "0.20.0"; disabled = isPyPy; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "fbaeb3d584e0f6bac82a33776e9b5f0b5b4a3415a03edeff5d66f6176f0edbe2"; + sha256 = "b2f174848df16bb9195a07fec102110a06d018da736bd9b3570a54d44c797c29"; }; propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 066a9856e500..e493596cfa59 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "m2r"; name = "${pname}-${version}"; - version = "0.1.11"; + version = "0.1.12"; src = fetchPypi { inherit pname version; - sha256 = "7e69fe9b2752926c33399709e354da3bcca60043c7bf5e727b7126ec3a5db7db"; + sha256 = "adfb86ebb7ff3fcd3ebb27ce8cd6f795c409a13f0c03363e265f17419ce5b9ab"; }; propagatedBuildInputs = [ mistune docutils ]; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index cc1e663209ec..b21643b4547a 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.10.2"; + version = "0.10.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "55a423247faee7a0644d25f37760495978cd494ba0274fefd8cd1fad493954ee"; + sha256 = "48465d58f9c0d729dc586627cf280830e7ed59f9e7999946ae1d763c6b8db999"; }; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/markdown2.nix b/pkgs/development/python-modules/markdown2/default.nix similarity index 100% rename from pkgs/development/python-modules/markdown2.nix rename to pkgs/development/python-modules/markdown2/default.nix diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index a024d73037f9..656f7f44f965 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; name = "${pname}-${version}"; - version = "0.13.1"; + version = "0.13.2"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0082ca2wwc9bymzkp1mr1l5h6rq0k1csv3vcq8ab24x0hdyg5qgk"; + sha256 = "9804ef2829f781f469a06528d107c2a763f109c687266ab8b1f000f9684184ae"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 17325d3204d0..afb60801dc94 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "marshmallow"; name = "${pname}-${version}"; - version = "2.13.5"; + version = "2.14.0"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "048rzdkvnais51xdiy27nail5vxjb4ggw3vd60prn1q11lf16wig"; + sha256 = "09943a460026b9a61c3f4cedd0e5ccfed7cfce3271debd19e3f97df561088718"; }; propagatedBuildInputs = [ dateutil simplejson ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 03a03007cf91..345a21ecddfe 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, buildPythonPackage, pycairo +{ stdenv, fetchurl, python, buildPythonPackage, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado , freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32 , enableGhostscript ? false, ghostscript ? null, gtk3 @@ -20,13 +20,13 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt4 != null; buildPythonPackage rec { - version = "2.0.2"; + version = "2.1.0"; pname = "matplotlib"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; - sha256 = "0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1"; + sha256 = "4b5f16c9cefde553ea79975305dcaa67c8e13d927b6e55aa14b4a8d867e25387"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cycler dateutil nose numpy pyparsing tornado freetype - libpng pkgconfig mock pytz + libpng pkgconfig mock pytz backports_functools_lru_cache ] ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ] diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix index a52d695ac814..2a1c4f4341f7 100644 --- a/pkgs/development/python-modules/meliae/default.nix +++ b/pkgs/development/python-modules/meliae/default.nix @@ -8,12 +8,16 @@ buildPythonPackage rec { pname = "meliae"; - version = "0.4.0"; + version = "0.4.0.final.0"; name = "${pname}-${version}"; src = fetchPypi { - inherit pname version; - sha256 = "16gcgjzcjlbfarwlj18fn089bz34kzfw8varbzxsi9ma0amijrcp"; + inherit pname; + # FIXME when updating to the next version: The tarball on pypi is called + # "meliae-0.4.0.tar.gz" while the version within that tarball is + # "0.4.0.final.0". + version = "0.4.0"; + sha256 = "976519ab02aaa6a8fb5f596dc4dd9f64fc9510b00e054979566e51c9be7cec99"; }; disabled = isPy3k; diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix index 9f71fdb8e741..ad1443024178 100644 --- a/pkgs/development/python-modules/mnemonic/default.nix +++ b/pkgs/development/python-modules/mnemonic/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "mnemonic"; - version = "0.17"; + version = "0.18"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/${pname}/${name}.tar.gz"; - sha256 = "1hq6xb47jagfqf65iwcrh0065mj3521d2mxmahg7vfraihqyqdjn"; + sha256 = "02a7306a792370f4a0c106c2cf1ce5a0c84b9dbd7e71c6792fdb9ad88a727f1d"; }; propagatedBuildInputs = [ pbkdf2 ]; diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 4141b69f0cdc..614157542b16 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,27 +1,24 @@ { lib , fetchurl , buildPythonPackage -, pytest +, cython +, pytest, psutil, pytestrunner , isPy3k -, psutil }: let pname = "multidict"; - version = "3.1.3"; + version = "3.3.2"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "875f80a046e7799b40df4b015b8fc5dae91697936872a8d7362c909a02ec6d12"; + sha256 = "f82e61c7408ed0dce1862100db55595481911f159d6ddec0b375d35b6449509b"; }; - checkInputs = [ pytest psutil ]; - - checkPhase = '' - py.test - ''; + buildInputs = [ cython ]; + checkInputs = [ pytest psutil pytestrunner ]; disabled = !isPy3k; @@ -30,4 +27,4 @@ in buildPythonPackage rec { homepage = https://github.com/aio-libs/multidict/; license = lib.licenses.asl20; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix new file mode 100644 index 000000000000..d1c392106077 --- /dev/null +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "multipledispatch"; + version = "0.4.9"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2"; + }; + + # No tests in archive + doCheck = false; + + meta = { + homepage = http://github.com/mrocklin/multipledispatch/; + description = "A relatively sane approach to multiple dispatch in Python"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/pkgs/development/python-modules/nbmerge/default.nix new file mode 100644 index 000000000000..df6c774bfbe1 --- /dev/null +++ b/pkgs/development/python-modules/nbmerge/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nbformat +, nose +}: + +buildPythonPackage rec { + pname = "nbmerge"; + version = "unstable-2017-10-23"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "jbn"; + repo = pname; + rev = "fc0ba95e8422340317358ffec4404235defbc06a"; + sha256 = "1cn550kjadnxc1sx2xy814248fpzrj3lgvrmsbrwmk03vwaa2hmi"; + }; + + propagatedBuildInputs = [ nbformat ]; + checkInputs = [ nose ]; + + checkPhase = '' + patchShebangs . + nosetests -v + PATH=$PATH:$out/bin ./cli_tests.sh + ''; + + meta = { + description = "A tool to merge/concatenate Jupyter (IPython) notebooks"; + inherit (src.meta) homepage; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ globin ]; + }; +} diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 75b4723b0b51..67df4403f980 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "netCDF4"; name = "${pname}-${version}"; - version = "1.2.9"; + version = "1.3.1"; disabled = isPyPy; src = fetchurl { url = "mirror://pypi/n/netCDF4/${name}.tar.gz"; - sha256 = "259edab1f03b1c1b93bdbaa804d50211a0c9d8a15eee4f23988b5685c6c0d2c0"; + sha256 = "570ea59992aa6d98a9b672c71161d11ba5683f787da53446086077470a869957"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/nltk.nix b/pkgs/development/python-modules/nltk/default.nix similarity index 90% rename from pkgs/development/python-modules/nltk.nix rename to pkgs/development/python-modules/nltk/default.nix index 302bd89be02c..d30e030a0498 100644 --- a/pkgs/development/python-modules/nltk.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,13 +1,13 @@ { fetchurl, buildPythonPackage, isPy33, lib, six, pythonAtLeast, pythonOlder }: buildPythonPackage rec { - version = "3.2.4"; + version = "3.2.5"; pname = "nltk"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/n/nltk/nltk-${version}.tar.gz"; - sha256 = "8682ae52f5de4f2ba7b77bd78222a38575ad01ef29946214b254dfdf93a3a0eb"; + sha256 = "2661f9971d983db314bbebd51ba770811a362c6597fd0f303bb1d3beadcb4834"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 0bd569fd4ad3..8c518f9b7ff4 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { name = "${pname}-${version}"; - version = "0.1.1"; + version = "0.2.0"; pname = "node-semver"; buildInputs = [ pytest tox ]; src = fetchPypi { inherit pname version; - sha256 = "1b3xiqgl436q33grbkh4chpfchl8i2dmcpggbb2q4vgv3vjy97p2"; + sha256 = "c32bfc976fd9e003c4a15665e5fe9f337366ba6b60aeb34e4479da9d7bbb0081"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/nose-exclude/default.nix b/pkgs/development/python-modules/nose-exclude/default.nix new file mode 100644 index 000000000000..d9ec2f85fa25 --- /dev/null +++ b/pkgs/development/python-modules/nose-exclude/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec { + pname = "nose-exclude"; + version = "0.5.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304"; + }; + + propagatedBuildInputs = [ nose ]; + + meta = { + license = lib.licenses.lgpl21; + description = "Exclude specific directories from nosetests runs"; + homepage = https://github.com/kgrandis/nose-exclude; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index c30e6e5e77d6..2a23ff4de78c 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.2.0"; + version = "5.2.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1sh3jkkmjzv17c3r8ii3kfhpxi6dkjk846b2lfy71g9qwqdcvbvz"; + sha256 = "4ae5b81dd39b37cdd99dcffe83a5182c849947b92d46ac4d2b5093af2bb9f224"; }; LC_ALL = "en_US.utf8"; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 840df8769387..b0d7ae72c95b 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "0.34.0"; + version = "0.35.0"; pname = "numba"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/n/numba/${name}.tar.gz"; - sha256 = "4f86df9212cb2678598e6583973ef1df978f3e3ba497b4dc6f91848887710577"; + sha256 = "11564937757605bee590c5758c73cfe9fd6d569726b56d970316a6228971ecc3"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index ffb74021d8d8..2d575d8742aa 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "numpy"; - version = "1.13.2"; + version = "1.13.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1fmq8923q91xyjf6fngl0n6jlysryyzx06288b5qdvv97mlfpklh"; + sha256 = "36ee86d5adbabc4fa2643a073f93d5504bdfed37a149a3a49f4dde259f35a750"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/numtraits/default.nix b/pkgs/development/python-modules/numtraits/default.nix new file mode 100644 index 000000000000..858b5ae594ae --- /dev/null +++ b/pkgs/development/python-modules/numtraits/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, six +, numpy +, traitlets +}: + +buildPythonPackage rec { + pname = "numtraits"; + version = "0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ six numpy traitlets]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "Numerical traits for Python objects"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fridh ]; + homepage = https://github.com/astrofrog/numtraits; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix new file mode 100644 index 000000000000..ebf7ce944c11 --- /dev/null +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils +, blockdiag +}: + +buildPythonPackage rec { + name = "nwdiag-1.0.3"; + + src = fetchurl { + url = "mirror://pypi/n/nwdiag/${name}.tar.gz"; + sha256 = "0n7ary1fngxk8bk15vabc8fhnmxlh098piciwaviwn7l4a5q1zys"; + }; + + buildInputs = [ pep8 nose unittest2 docutils ]; + + propagatedBuildInputs = [ blockdiag ]; + + # tests fail + doCheck = false; + + meta = with stdenv.lib; { + description = "Generate network-diagram image from spec-text file (similar to Graphviz)"; + homepage = http://blockdiag.com/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/odo/default.nix b/pkgs/development/python-modules/odo/default.nix new file mode 100644 index 000000000000..73b3f0be1503 --- /dev/null +++ b/pkgs/development/python-modules/odo/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, datashape +, numpy +, pandas +, toolz +, multipledispatch +, networkx +}: + +buildPythonPackage rec { + pname = "odo"; + version= "0.5.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mh5k69d9ph9jd07jl9yqh78rbnh5cjspi1q530v3ml7ivjzz4p8"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ datashape numpy pandas toolz multipledispatch networkx ]; + + checkPhase = '' + py.test odo/tests + ''; + + meta = { + homepage = https://github.com/ContinuumIO/odo; + description = "Data migration utilities"; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix new file mode 100644 index 000000000000..3b5fa1f531a2 --- /dev/null +++ b/pkgs/development/python-modules/ofxclient/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, + ofxhome, ofxparse, beautifulsoup4, lxml, keyring +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "2.0.3"; + pname = "ofxclient"; + + src = fetchPypi { + inherit pname version; + sha256 = "0jdhqsbl34yn3n0x6mwsnl58c25v5lp6vr910c2hk7l74l5y7538"; + }; + + patchPhase = '' + substituteInPlace setup.py --replace '"argparse",' "" + ''; + + # ImportError: No module named tests + doCheck = false; + + propagatedBuildInputs = [ ofxhome ofxparse beautifulsoup4 lxml keyring ]; + + meta = with stdenv.lib; { + homepage = https://github.com/captin411/ofxclient; + description = "OFX client for dowloading transactions from banks"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index a214af5eab7f..9a94848000ce 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.4.8"; + version = "2.4.9"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ee7551efb70648fa8ee569c2b6a6dbbeff390cc94b321da5d508a573b90a4f17"; + sha256 = "95e007f4d121f4fd73f39a6d74a883c75e9fa9d96de91d43c1641c103c3a9b18"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/os-testr/default.nix b/pkgs/development/python-modules/os-testr/default.nix index d97c525b17a8..baafc44d10d3 100644 --- a/pkgs/development/python-modules/os-testr/default.nix +++ b/pkgs/development/python-modules/os-testr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchurl, python, +{ stdenv, buildPythonPackage, fetchPypi, python, pbr, Babel, testrepository, subunit, testtools, coverage, oslosphinx, oslotest, testscenarios, six, ddt }: @@ -7,8 +7,8 @@ buildPythonPackage rec { pname = "os-testr"; name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/o/os-testr/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "d8a60bd56c541714a5cab4d1996c8ddfdb5c7c35393d55be617803048c170837"; }; diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index fce8c21284c7..de91a507f179 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -3,12 +3,12 @@ debtcollector, rfc3986, pyyaml, oslo-i18n }: buildPythonPackage rec { pname = "oslo.config"; - version = "4.12.0"; + version = "4.13.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1pa9lajsadyq47bmxx12dxlcmnqsqlgnb55hwqas26lgnb2073dx"; + sha256 = "882e5f1dcc0e5b0d7af877b2df0e2692113c5975db8cbbbf0dd3d2b905aefc0b"; }; propagatedBuildInputs = [ pbr six netaddr stevedore debtcollector rfc3986 pyyaml oslo-i18n ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 7bab184bb2a0..2cbb67545a06 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -8,6 +8,7 @@ , cython , dateutil , scipy +, moto , numexpr , pytz , xlrd @@ -27,12 +28,12 @@ let inherit (stdenv) isDarwin; in buildPythonPackage rec { pname = "pandas"; - version = "0.20.3"; + version = "0.21.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "a777e07633d83d546c55706420179551c8e01075b53c497dcf8ae4036766bc66"; + sha256 = "0nf50ls2cnlsd2635nyji7l70xc91dw81qg5y01g5sifwwqcpmaw"; }; LC_ALL = "en_US.UTF-8"; @@ -64,6 +65,7 @@ in buildPythonPackage rec { "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" ''; + checkInputs = [ moto ]; checkPhase = '' runHook preCheck '' diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 5137485a58fd..3d9fd2afacae 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "paramz"; - version = "0.7.4"; + version = "0.8.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1r4mayzp7cb5w1kz45sw65is9j3p60h0yyp8hdhsx393rr4n82nn"; + sha256 = "297e59b48e57e78e15f547b1af8b21ddfd19a6312d70b9dc07c7262711adfed9"; }; propagatedBuildInputs = [ numpy scipy six decorator ]; diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix new file mode 100644 index 000000000000..26617826e124 --- /dev/null +++ b/pkgs/development/python-modules/parso/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "parso"; + version = "0.1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "c5279916bb417aa2bf634648ff895cf35dce371d7319744884827bfad06f8d7b"; + }; + + checkInputs = [ pytest ]; + + meta = { + description = "A Python Parser"; + homepage = https://github.com/davidhalter/parso; + license = lib.licenses.mit; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index a40635b8d33b..cf5c5ee06cd4 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "path.py"; - version = "10.3.1"; + version = "10.4"; name = "path.py-${version}"; src = fetchPypi { inherit pname version; - sha256 = "412706be1cd8ab723c77829f9aa0c4d4b7c7b26c7b1be0275a6841c3cb1001e0"; + sha256 = "c63c75777c8a01f7b273c0065a8ea1e3ba0c9b369fa4a2601831e412b2c4881a"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index f39957585210..bf74906d9e57 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.5.3"; + version = "0.5.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "54478a66a360f4ebe4499c9235e4206fca5dec837b8e272d1ce37e0a626cc64d"; + sha256 = "72c495d1bbe76674219e307f6d1c6062f2e1b0b483a5e4886435127d0df3d0d3"; }; meta = { diff --git a/pkgs/development/python-modules/pelican-fix-tests-with-pygments-2.1.patch b/pkgs/development/python-modules/pelican-fix-tests-with-pygments-2.1.patch deleted file mode 100644 index 4568b8b94481..000000000000 --- a/pkgs/development/python-modules/pelican-fix-tests-with-pygments-2.1.patch +++ /dev/null @@ -1,318 +0,0 @@ -diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml -index 3ce41d7..3cf97a8 100644 ---- a/pelican/tests/output/basic/feeds/all-en.atom.xml -+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml -@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -@@ -58,4 +58,4 @@ pelican.conf, it will have nothing in default.</p> - <p>Lovely.</p> - </div> - The baz tag2010-03-14T00:00:00+00:00tag:,2010-03-14:tag/baz.html<p>This article overrides the listening of the articles under the <em>baz</em> tag.</p> -- -+ -\ No newline at end of file -diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml -index 3a9478a..24d31a9 100644 ---- a/pelican/tests/output/basic/feeds/all.atom.xml -+++ b/pelican/tests/output/basic/feeds/all.atom.xml -@@ -43,7 +43,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -@@ -59,4 +59,4 @@ pelican.conf, it will have nothing in default.</p> - <p>Lovely.</p> - </div> - The baz tag2010-03-14T00:00:00+00:00tag:,2010-03-14:tag/baz.html<p>This article overrides the listening of the articles under the <em>baz</em> tag.</p> -- -+ -\ No newline at end of file -diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml -index a9b5977..4ad7008 100644 ---- a/pelican/tests/output/basic/feeds/misc.atom.xml -+++ b/pelican/tests/output/basic/feeds/misc.atom.xml -@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -@@ -35,4 +35,4 @@ pelican.conf, it will have nothing in default.</p> - <p>Lovely.</p> - </div> - The baz tag2010-03-14T00:00:00+00:00tag:,2010-03-14:tag/baz.html<p>This article overrides the listening of the articles under the <em>baz</em> tag.</p> -- -+ -\ No newline at end of file -diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html -index dfb0c54..b7f8a7e 100644 ---- a/pelican/tests/output/basic/unbelievable.html -+++ b/pelican/tests/output/basic/unbelievable.html -@@ -38,7 +38,7 @@ - Published: Fri 15 October 2010 - - --

In misc.

-+

In misc.

- -

Or completely awesome. Depends the needs.

-

a root-relative link to markdown-article -@@ -58,7 +58,7 @@ pelican.conf, it will have nothing in default.

- -
-

Testing more sourcecode directives

--
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
-+
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
-

Lovely.

-
-
-@@ -97,4 +97,4 @@ pelican.conf, it will have nothing in default.

- - - -- -+ -\ No newline at end of file -diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml -index cb74637..987f987 100644 ---- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml -+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml -@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml -index 2c4b116..89082ee 100644 ---- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml -+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml -@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml -index 3574ab4..75b6333 100644 ---- a/pelican/tests/output/custom/feeds/all-en.atom.xml -+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml -@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml -index 391ab85..efb43cd 100644 ---- a/pelican/tests/output/custom/feeds/all.atom.xml -+++ b/pelican/tests/output/custom/feeds/all.atom.xml -@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml -index a78d2de..548b16c 100644 ---- a/pelican/tests/output/custom/feeds/all.rss.xml -+++ b/pelican/tests/output/custom/feeds/all.rss.xml -@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml -index 91d6b28..dbab63c 100644 ---- a/pelican/tests/output/custom/feeds/misc.atom.xml -+++ b/pelican/tests/output/custom/feeds/misc.atom.xml -@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml -index 3493d2a..2d13bda 100644 ---- a/pelican/tests/output/custom/feeds/misc.rss.xml -+++ b/pelican/tests/output/custom/feeds/misc.rss.xml -@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html -index 2e51cf0..b6d2136 100644 ---- a/pelican/tests/output/custom/unbelievable.html -+++ b/pelican/tests/output/custom/unbelievable.html -@@ -43,9 +43,9 @@ - - -
-- By Alexis Métaireau -+ By Alexis Métaireau -
--

In misc.

-+

In misc.

- -

Or completely awesome. Depends the needs.

-

a root-relative link to markdown-article -@@ -65,7 +65,7 @@ pelican.conf, it will have nothing in default.

-
-
-

Testing more sourcecode directives

--
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
-+
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
-

Lovely.

-
-
-diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml -index 8fb3ef6..2090087 100644 ---- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml -+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml -@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml -index 99255ee..00944ce 100644 ---- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml -+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml -@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml -index 6b2f09b..297558d 100644 ---- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml -+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml -@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml -index 5ef59e0..78da527 100644 ---- a/pelican/tests/output/custom_locale/feeds/all.atom.xml -+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml -@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml -index 071e2f1..84fd5df 100644 ---- a/pelican/tests/output/custom_locale/feeds/all.rss.xml -+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml -@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml -index c91d4d7..fde02e6 100644 ---- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml -+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml -@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml -index 82b5898..bd727bb 100644 ---- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml -+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml -@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.</p> - </div> - <div class="section" id="testing-more-sourcecode-directives"> - <h2>Testing more sourcecode directives</h2> --<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> -+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> - <p>Lovely.</p> - </div> - <div class="section" id="testing-even-more-sourcecode-directives"> -diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html -index a6ea869..1e2d78f 100644 ---- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html -+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html -@@ -45,7 +45,7 @@ -
- By Alexis Métaireau -
--

In misc.

-+

In misc.

- -

Or completely awesome. Depends the needs.

-

a root-relative link to markdown-article -@@ -65,7 +65,7 @@ pelican.conf, it will have nothing in default.

-
-
-

Testing more sourcecode directives

--
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
-+
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
-

Lovely.

-
-
diff --git a/pkgs/development/python-modules/pep257.nix b/pkgs/development/python-modules/pep257/default.nix similarity index 100% rename from pkgs/development/python-modules/pep257.nix rename to pkgs/development/python-modules/pep257/default.nix diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 9fb16bb03021..75a3f51afc61 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.8.4"; + version = "8.8.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "01kim7mwgm97wysclhyxcwvd2a8ifinaidkskglx7b2k0r7ji5sj"; + sha256 = "adb2dd985f875ac035bbdc6a1cc57e30834e106e2ff7899e09a1690b474c1774"; }; meta = { diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix index 2c921959852a..c4aa8dcf16c9 100644 --- a/pkgs/development/python-modules/piexif/default.nix +++ b/pkgs/development/python-modules/piexif/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "piexif"; - version = "1.0.12"; + version = "1.0.13"; # pillow needed for unit tests buildInputs = [ pillow ]; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "15dvdr7b5xxsbsq5k6kq8h0xnzrkqzc08dzlih48a21x27i02bii"; + sha256 = "1d3dde03bd6298393645bc11d585b67a6ea98fd7e9e1aded6d5d6ec3e4cfbdda"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 9161e8a43b6d..4be9c911f71a 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -3,12 +3,12 @@ freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11}: buildPythonPackage rec { pname = "Pillow"; - version = "4.2.1"; + version = "4.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0wq0fiw964bj5rdmw66mhbfsjnmb13bcdr42krpk2ig5f1cgc967"; + sha256 = "a97c715d44efd5b4aa8d739b8fad88b93ed79f1b33fc2822d5802043f3b1b527"; }; doCheck = !stdenv.isDarwin && !isPyPy; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 5fa03a18aaa2..d916f9b95b1d 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -1,21 +1,29 @@ -{ stdenv, fetchurl, buildPythonPackage, pip, pytest, click, six, first, setuptools_scm, glibcLocales }: +{ stdenv, fetchurl, buildPythonPackage, pip, pytest, click, six, first +, setuptools_scm, git, glibcLocales, mock }: + buildPythonPackage rec { pname = "pip-tools"; - version = "1.9.0"; + version = "1.10.1"; name = "pip-tools-${version}"; src = fetchurl { url = "mirror://pypi/p/pip-tools/${name}.tar.gz"; - sha256 = "0mjdpq2zjn8n4lzn9l2myh4bv0l2f6751k1rdpgdm8k3fargw1h7"; + sha256 = "37b85d69ceed97337aeefb3e52e41fe0884a505c874757a5bbaa58d92b533ce0"; }; LC_ALL = "en_US.UTF-8"; - buildInputs = [ pytest glibcLocales ]; + checkInputs = [ pytest git glibcLocales mock ]; propagatedBuildInputs = [ pip click six first setuptools_scm ]; checkPhase = '' - export HOME=$(mktemp -d) - py.test -k "not test_realistic_complex_sub_dependencies" # requires network + export HOME=$(mktemp -d) VIRTUAL_ENV=1 + tests_without_network_access=" + not test_realistic_complex_sub_dependencies \ + and not test_editable_package_vcs \ + and not test_generate_hashes_all_platforms \ + and not test_generate_hashes_without_interfering_with_each_other \ + " + py.test -k "$tests_without_network_access" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index 9f370a9c0fb3..75c0bdc00f16 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "plaster"; - version = "0.5"; + version = "1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0z48pis4qyhyqj3ia82r04diaa153dw66wrpbly06hdzvhw8j0ia"; + sha256 = "8351c7c7efdf33084c1de88dd0f422cbe7342534537b553c49b857b12d98c8c3"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index ac3c4f1d3246..2744805a5042 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "plotly"; - version = "2.0.15"; + version = "2.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0ecd16a11778674c63615a590e22f79307801eaf009b399bf7e46c486dec8f99"; + sha256 = "ff6899dc11907b1efb944f79f9583b2e30ba2964bb009145f3580bf30b4d9ee4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix index 25682099225c..b45c8d96fc47 100644 --- a/pkgs/development/python-modules/podcastparser/default.nix +++ b/pkgs/development/python-modules/podcastparser/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "podcastparser"; - version = "0.6.1"; + version = "0.6.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "gpodder"; repo = "podcastparser"; rev = version; - sha256 = "0q3qc8adykmm692ha0c37xd6wbj830zlq900fyw6vrfan9bgdj5y"; + sha256 = "1mhg7192d6s1ll9mx1b63yfj6k4cnv4i95jllbnydyjv9ykkv0k1"; }; propagatedBuildInputs = [ ]; diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 94c3295f029c..77b373de259a 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -1,13 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, cython, networkx, joblib, nose }: +{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose }: buildPythonPackage rec { pname = "pomegranate"; - version = "0.7.7"; + version = "0.8.1"; name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "b5b7a6256778fc4097ee77caec28ec845ec1fee3d701f3f26f83860b2d45c453"; + + src = fetchFromGitHub { + repo = pname; + owner = "jmschrei"; + rev = "v${version}"; + sha256 = "085nka5bh88bxbd5vl1azyv9cfpp6grz2ngclc85f9kgccac1djr"; }; propagatedBuildInputs = [ numpy scipy cython networkx joblib ]; diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index cb418678a996..bd13c63c4043 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "portend"; - version = "2.1.2"; + version = "2.2"; buildInputs = [ pytest pytest-sugar pytest-warnings setuptools_scm ]; propagatedBuildInputs = [ tempora ]; src = fetchPypi { inherit pname version; - sha256 = "0dx8b1rn64ymx5s4mdzlw5hz59qi167z7nny36dl75ghlldn41w4"; + sha256 = "bc48d3d99e1eaf2e9406c729f8848bfdaf87876cd3560dc3ec6c16714f529586"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix new file mode 100644 index 000000000000..c0be1009b069 --- /dev/null +++ b/pkgs/development/python-modules/praw/default.nix @@ -0,0 +1,43 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, requests, decorator, flake8, mock, six, update_checker, pytestrunner, prawcore +, pytest, betamax, betamax-serializers, betamax-matchers, requests_toolbelt +}: + +buildPythonPackage rec { + pname = "praw"; + version = "5.2.0"; + + src = fetchFromGitHub { + owner = "praw-dev"; + repo = "praw"; + rev = "v${version}"; + sha256 = "0nwfadczxa1fyq65zc3sfv8g2r4w3xrx3bdi5fv9xpn97wh2ifgw"; + }; + + propagatedBuildInputs = [ + requests + decorator + flake8 + mock + six + update_checker + pytestrunner + prawcore + ]; + + checkInputs = [ + pytest + betamax + betamax-serializers + betamax-matchers + requests_toolbelt + ]; + + meta = with stdenv.lib; { + description = "Python Reddit API wrapper"; + homepage = http://praw.readthedocs.org/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ jgeerds ]; + }; +} diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix new file mode 100644 index 000000000000..eb3fb784dc97 --- /dev/null +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, requests +, testfixtures, mock, requests_toolbelt +, betamax, betamax-serializers, betamax-matchers +}: + +buildPythonPackage rec { + pname = "prawcore"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "praw-dev"; + repo = "prawcore"; + rev = "v${version}"; + sha256 = "1z5fz6v4bv6xw84l4q3rpw3j63bb2dldl0fd6ckz8wqlpb2l45br"; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + testfixtures + mock + betamax + betamax-serializers + betamax-matchers + requests_toolbelt + ]; + + meta = with stdenv.lib; { + description = "Low-level communication layer for PRAW"; + homepage = http://praw.readthedocs.org/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ jgeerds ]; + }; +} diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index f2f8c0f89fd6..006b99518a88 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "premailer"; name = "${pname}-${version}"; - version = "3.0.1"; + version = "3.1.1"; meta = { description = "Turns CSS blocks into style attributes "; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0cmlvqx1dvy16k5q5ylmr43nlfpb9k2zl3q7s4kzhf0lml4wqwaf"; + sha256 = "fd07dadc47345f7d44a0587bd65a37c45886f19c44b3ec94904761e4b2d39124"; }; buildInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/protobuf.nix b/pkgs/development/python-modules/protobuf/default.nix similarity index 100% rename from pkgs/development/python-modules/protobuf.nix rename to pkgs/development/python-modules/protobuf/default.nix diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix new file mode 100644 index 000000000000..57f7c2c317dc --- /dev/null +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, Mako, packaging, pysocks, pygments, ROPGadget +, capstone, paramiko, pip, psutil +, pyelftools, pypandoc, pyserial, dateutil +, requests, tox, pandoc, unicorn, intervaltree }: + +buildPythonPackage rec { + version = "3.10.0"; + pname = "pwntools"; + name = "pwntools-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1l8hb30mwxqd1y7r5ihd7kzmjm2mz6m5aiphd3hwzmxkmxbxj8zk"; + }; + + propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pandoc unicorn intervaltree ]; + + disabled = isPy3k; + + meta = with stdenv.lib; { + homepage = "http://pwntools.com"; + description = "CTF framework and exploit development library"; + license = licenses.mit; + maintainers = with maintainers; [ bennofs kristoff3r ]; + }; +} diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix new file mode 100644 index 000000000000..4656b99df0a0 --- /dev/null +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx }: + +buildPythonPackage rec { + pname = "py3exiv2"; + version = "0.2.1"; + name = "${pname}-${version}"; + disabled = !(isPy3k); + + src = fetchPypi { + inherit pname version; + sha256 = "06q7mlqy05c3jr61nmz93fxb6ilizfyggbh5sg0krwjap2sw1fr8"; + }; + + buildInputs = [ exiv2 boost ]; + + # work around python distutils compiling C++ with $CC (see issue #26709) + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + + # fix broken libboost_python3 detection + patches = [ ./setup.patch ]; + + meta = { + homepage = "https://launchpad.net/py3exiv2"; + description = "A Python3 binding to the library exiv2"; + license = with stdenv.lib.licenses; [ gpl3 ]; + maintainers = with stdenv.lib.maintainers; [ vinymeuh ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/python-modules/py3exiv2/setup.patch b/pkgs/development/python-modules/py3exiv2/setup.patch new file mode 100644 index 000000000000..bb4b11523479 --- /dev/null +++ b/pkgs/development/python-modules/py3exiv2/setup.patch @@ -0,0 +1,11 @@ +--- a/setup.py 2017-10-16 22:03:02.000000000 +0200 ++++ b/setup.py 2017-10-16 22:03:34.000000000 +0200 +@@ -39,7 +39,7 @@ + if '3' in l[2:]: + return l.replace('libboost', 'boost') + +-libboost = get_libboost_name() ++libboost = 'boost_python3' + + setup( + name='py3exiv2', diff --git a/pkgs/development/python-modules/pyaes.nix b/pkgs/development/python-modules/pyaes/default.nix similarity index 75% rename from pkgs/development/python-modules/pyaes.nix rename to pkgs/development/python-modules/pyaes/default.nix index c2feb2e239c7..6104e72a37bc 100644 --- a/pkgs/development/python-modules/pyaes.nix +++ b/pkgs/development/python-modules/pyaes/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyaes"; - version = "1.6.0"; + version = "1.6.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0bp9bjqy1n6ij1zb86wz9lqa1dhla8qr1d7w2kxyn7jbj56sbmcw"; + sha256 = "02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f"; }; meta = { diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix new file mode 100644 index 000000000000..a7ee15d6a181 --- /dev/null +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, pyasn1, isPyPy }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pyasn1-modules"; + version = "0.1.5"; + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1239h6h67vg0wazg2qgv6m3hdim2gs66pl89lbnayk55bbnkwc0x"; + }; + + propagatedBuildInputs = [ pyasn1 ]; + + meta = with stdenv.lib; { + description = "A collection of ASN.1-based protocols modules"; + homepage = https://pypi.python.org/pypi/pyasn1-modules; + license = licenses.bsd3; + platforms = platforms.unix; # same as pyasn1 + }; +} diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix new file mode 100644 index 000000000000..d0122a5b7e40 --- /dev/null +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pyasn1"; + version = "0.3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "06hhy38jhwh95gpn8f03cr439273fsfsh4vhd5024r86nh5gyiir"; + }; + + meta = with stdenv.lib; { + description = "ASN.1 tools for Python"; + homepage = http://pyasn1.sourceforge.net/; + license = "mBSD"; + platforms = platforms.unix; # arbitrary choice + }; +} diff --git a/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch b/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch deleted file mode 100644 index 4e36612d80d0..000000000000 --- a/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -Nurp pycdio-0.20-orig/test/cdtext.toc pycdio-0.20/test/cdtext.toc ---- pycdio-0.20-orig/test/cdtext.toc 1970-01-01 01:00:00.000000000 +0100 -+++ pycdio-0.20/test/cdtext.toc 2014-11-06 23:36:12.520708320 +0100 -@@ -0,0 +1,48 @@ -+CD_DA -+ -+// global CD-TEXT data -+ -+CD_TEXT { -+ -+ // Mapping from language number (0..7) used in 'LANGUAGE' statements -+ // to language code. -+/// LANGUAGE_MAP { -+/// 0 : EN // 9 is the code for ENGLISH, -+/// // I don't know any other language code, yet -+/// } -+ -+ // Language number should always start with 0 -+ LANGUAGE 0 { -+ // Required fields - at least all CD-TEXT CDs I've seen so far have them. -+ TITLE "CD Title" -+ PERFORMER "Performer" -+ DISC_ID "XY12345" -+ UPC_EAN "" // usually empty -+ -+ // Further possible items, all of them are optional -+ ARRANGER "" -+ SONGWRITER "" -+ MESSAGE "" -+ GENRE "" // I'm not sure if this should be really ascii data -+ } -+} -+ -+ -+TRACK AUDIO -+// track specific CD-TEXT data -+CD_TEXT { -+ LANGUAGE 0 { -+ // if an item is defined for one track it should be defined for all tracks -+ TITLE "Track Title" -+ -+ PERFORMER "Performer" -+ ISRC "US-XX1-98-01234" -+ -+ ARRANGER "" -+ SONGWRITER "" -+ MESSAGE "" -+ } -+} -+ -+SILENCE 1:0:0 -+ diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix new file mode 100644 index 000000000000..948d9741bd8b --- /dev/null +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchPypi, buildPythonPackage, numpy, isPy3k, dateutil, dateutil_1_5 }: + +buildPythonPackage rec { + pname = "pycollada"; + version = "0.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1g96maw2c25l4i3ks51784h33zf7s18vrn6iyz4ca34iy4sl7yq9"; + }; + + buildInputs = [ numpy ] ++ (if isPy3k then [dateutil] else [dateutil_1_5]); + + # Some tests fail because they refer to test data files that don't exist + # (upstream packaging issue) + doCheck = false; + + meta = with stdenv.lib; { + description = "Python library for reading and writing collada documents"; + homepage = http://pycollada.github.io/; + license = "BSD"; # they don't specify which BSD variant + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 1d1ac67732a3..35a7213306f9 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; name = "${pname}-${version}"; - version = "3.4.5"; + version = "3.4.7"; meta = { description = "A self-contained cryptographic library for Python"; @@ -13,6 +13,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1n5w5ls5syapmb39kavqgz2sa9pinzx4c9dvwa2147gj0hkh87wj"; + sha256 = "52aa2e540d06d63636e4b5356957c520611e28a88386bad4d18980e4b00e0b5a"; }; } diff --git a/pkgs/development/python-modules/pyev/default.nix b/pkgs/development/python-modules/pyev/default.nix new file mode 100644 index 000000000000..db06fedd68cc --- /dev/null +++ b/pkgs/development/python-modules/pyev/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, buildPythonPackage, libev }: + +buildPythonPackage rec { + name = "pyev-0.9.0"; + + src = fetchurl { + url = "mirror://pypi/p/pyev/${name}.tar.gz"; + sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx"; + }; + + buildInputs = [ libev ]; + + libEvSharedLibrary = + if !stdenv.isDarwin + then "${libev}/lib/libev.so.4" + else "${libev}/lib/libev.4.dylib"; + + postPatch = '' + test -f "${libEvSharedLibrary}" || { echo "ERROR: File ${libEvSharedLibrary} does not exist, please fix nix expression for pyev"; exit 1; } + sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"${libEvSharedLibrary}\"|" setup.py + ''; + + meta = with stdenv.lib; { + description = "Python bindings for libev"; + homepage = https://code.google.com/p/pyev/; + license = licenses.gpl3; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/pyfeed/default.nix b/pkgs/development/python-modules/pyfeed/default.nix deleted file mode 100644 index a1591037fb5a..000000000000 --- a/pkgs/development/python-modules/pyfeed/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, buildPythonPackage, fetchurl -, xe }: - -buildPythonPackage rec { - url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; - - name = stdenv.lib.nameFromURL url ".tar"; - - src = fetchurl { - inherit url; - sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1"; - }; - - propagatedBuildInputs = [ xe ]; - - # error: invalid command 'test' - doCheck = false; - - meta = with stdenv.lib; { - homepage = "http://home.blarg.net/~steveha/pyfeed.html"; - description = "Tools for syndication feeds"; - }; -} diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index fbb0de6f0ced..b1f1619d9100 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyflakes"; - version = "1.5.0"; + version = "1.6.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1x1pcca4a24k4pw8x1c77sgi58cg1wl2k38mp8a25k608pzls3da"; + sha256 = "8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805"; }; buildInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix new file mode 100644 index 000000000000..90bfe9783918 --- /dev/null +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, libgit2, six, cffi }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pygit2"; + version = "0.26.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cbc488ra3kg7r3qky17ms0szi3cda2d96qfkv1l9djsy9hnvw57"; + }; + + preConfigure = lib.optionalString stdenv.isDarwin '' + export DYLD_LIBRARY_PATH="${libgit2}/lib" + ''; + + propagatedBuildInputs = [ libgit2 six ] ++ lib.optional (!isPyPy) cffi; + + preCheck = '' + # disable tests that require networking + rm test/test_repository.py + rm test/test_credentials.py + rm test/test_submodule.py + ''; + + meta = with lib; { + description = "A set of Python bindings to the libgit2 shared library"; + homepage = https://pypi.python.org/pypi/pygit2; + license = licenses.gpl2; + }; +} diff --git a/pkgs/development/python-modules/pyjwkest/default.nix b/pkgs/development/python-modules/pyjwkest/default.nix index 03cea021be8c..563c0a092843 100644 --- a/pkgs/development/python-modules/pyjwkest/default.nix +++ b/pkgs/development/python-modules/pyjwkest/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "pyjwkest"; name = "${pname}-${version}"; - version = "1.3.2"; + version = "1.4.0"; meta = { description = "Implementation of JWT, JWS, JWE and JWK"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "11rrswsmma3wzi2qnmq929323yc6i9fkjsv8zr7b3vajd72yr49d"; + sha256 = "128e3c81d02993ac4cd7e29ef7aac767d91daa59380e6883ae589092945e4aad"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/pkgs/development/python-modules/pylibacl/default.nix new file mode 100644 index 000000000000..97fbe28e50d7 --- /dev/null +++ b/pkgs/development/python-modules/pylibacl/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pkgs +}: + +buildPythonPackage rec { + pname = "pylibacl"; + version = "0.5.3"; + name = pname + "-" + version; + + src = fetchPypi { + inherit pname version; + sha256 = "0c3xw1s5bh6jnsc0wwyxnn6kn6x6rpbmmi05ap1f81fyqlgrzgj0"; + }; + + # ERROR: testExtended (tests.test_acls.AclExtensions) + # IOError: [Errno 0] Error + doCheck = false; + + buildInputs = with pkgs; [ acl ]; + + meta = { + description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them"; + license = lib.licenses.lgpl21Plus; + }; +} diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 8c0fd1b7a8fe..afe3bf8e503d 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pylint"; - version = "1.7.2"; + version = "1.7.4"; src = fetchPypi { inherit pname version; - sha256 = "ea6afb93a9ed810cf52ff3838eb3a15e2bf6a81b80de0eaede1ce442caa5ca69"; + sha256 = "1f65b3815c3bf7524b845711d54c4242e4057dd93826586620239ecdfe591fb1"; }; buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix new file mode 100644 index 000000000000..0cf083196451 --- /dev/null +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchPypi, isPy3k, buildPythonPackage }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pyobjc"; + version = "4.0b1"; + + # Gives "No matching distribution found for + # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "16bng6960c1m57nnh1l09ycnyimrqzw9mx9pnyjxn5zzm5kalr37"; + }; + + meta = { + description = "A bridge between the Python and Objective-C programming languages"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ sauyon ]; + homepage = https://pythonhosted.org/pyobjc/; + }; +} diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix new file mode 100644 index 000000000000..b236715a5d65 --- /dev/null +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, libiodbc }: + +buildPythonPackage rec { + pname = "pyodbc"; + version = "4.0.21"; + name = "${pname}-${version}"; + disabled = isPyPy; # use pypypdbc instead + + src = fetchPypi { + inherit pname version; + sha256 = "9655f84ca9e5cb2dfffff705601017420c840d55271ba62dd44f05383eff0329"; + }; + + buildInputs = [ libiodbc ]; + + meta = with stdenv.lib; { + description = "Python ODBC module to connect to almost any database"; + homepage = "https://github.com/mkleehammer/pyodbc"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/pyrax.nix b/pkgs/development/python-modules/pyrax/default.nix similarity index 100% rename from pkgs/development/python-modules/pyrax.nix rename to pkgs/development/python-modules/pyrax/default.nix diff --git a/pkgs/development/python-modules/pyro/default.nix b/pkgs/development/python-modules/pyro/default.nix new file mode 100644 index 000000000000..dbad83bef7e7 --- /dev/null +++ b/pkgs/development/python-modules/pyro/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, buildPythonPackage, isPy3k }: + +buildPythonPackage rec { + name = "Pyro-3.16"; + disabled = isPy3k; + + src = fetchurl { + url = "mirror://pypi/P/Pyro/${name}.tar.gz"; + sha256 = "1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578"; + }; + + meta = with stdenv.lib; { + description = "Distributed object middleware for Python (IPC/RPC)"; + homepage = http://pythonhosted.org/Pyro/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/pkgs/development/python-modules/pyrtlsdr/default.nix index 274e5b61c14f..0d50686f8924 100644 --- a/pkgs/development/python-modules/pyrtlsdr/default.nix +++ b/pkgs/development/python-modules/pyrtlsdr/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pyrtlsdr"; - version = "0.2.5"; + version = "0.2.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "dd041143b68628c713c2227c78c40b0b4a0cb5d08df116f7bdc5f83c529be0e4"; + sha256 = "7942fe2e7821d09206002ea7e820e694094b3f964885123eb6eee1167f39b8da"; }; buildInputs = [ pypandoc pandoc ]; diff --git a/pkgs/development/python-modules/pysoundfile/default.nix b/pkgs/development/python-modules/pysoundfile/default.nix new file mode 100644 index 000000000000..fe24f0203f0d --- /dev/null +++ b/pkgs/development/python-modules/pysoundfile/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, numpy +, libsndfile +, cffi +, isPyPy +, stdenv +}: + +buildPythonPackage rec { + pname = "PySoundFile"; + name = "PySoundFile-${version}"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "72c3e23b7c9998460ec78176084ea101e3439596ab29df476bc8508708df84df"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ numpy libsndfile cffi ]; + + meta = { + description = "An audio library based on libsndfile, CFFI and NumPy"; + license = lib.licenses.bsd3; + homepage = https://github.com/bastibe/PySoundFile; + maintainers = with lib.maintainers; [ fridh ]; + }; + + prePatch = '' + substituteInPlace soundfile.py --replace "'sndfile'" "'${libsndfile.out}/lib/libsndfile.so'" + ''; + + # https://github.com/bastibe/PySoundFile/issues/157 + disabled = isPyPy || stdenv.isi686; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix index 2f275005c199..7fbda048ca33 100644 --- a/pkgs/development/python-modules/pyspread/default.nix +++ b/pkgs/development/python-modules/pyspread/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyspread"; - version = "1.1"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0m1a4zvzrfrnc42j8mrbm7747w03nzyl9z02wjagccmlhi6nd9hx"; + sha256 = "b90edb92c7fce3b8332cdddd3dd1c72ba14440ab39a10ca89c9888ad973a8862"; }; propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ]; diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix new file mode 100644 index 000000000000..2bd710705815 --- /dev/null +++ b/pkgs/development/python-modules/pyte/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }: + +buildPythonPackage rec { + pname = "pyte"; + version = "0.7.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1an54hvyjm8gncx8cgabz9mkpgjkdb0bkyjlkh7g7f94nr3wnfl7"; + }; + + propagatedBuildInputs = [ wcwidth ]; + + checkInputs = [ pytest pytestrunner ]; + + # tries to write to os.path.dirname(__file__) in test_input_output + checkPhase = '' + py.test -k "not test_input_output" + ''; + + meta = with stdenv.lib; { + description = "Simple VTXXX-compatible linux terminal emulator"; + homepage = https://github.com/selectel/pyte; + license = licenses.lgpl3; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 605c970cedc4..0918b5db1db2 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pytest-asyncio"; - version = "0.6.0"; + version = "0.8.0"; disabled = !isPy3k; src = fetchurl { url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "e5c6786ece4b3bbb0cca1bf68bf089756a62760e3764dc84eaee39bfab70289b"; + sha256 = "f32804bb58a66e13a3eda11f8942a71b1b6a30466b0d2ffe9214787aab0e172e"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-pep257.nix b/pkgs/development/python-modules/pytest-pep257/default.nix similarity index 100% rename from pkgs/development/python-modules/pytest-pep257.nix rename to pkgs/development/python-modules/pytest-pep257/default.nix diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index dc1a31a89225..e993a67c49f1 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pytest-xdist"; - version = "1.20.0"; + version = "1.20.1"; src = fetchPypi { inherit pname version; - sha256 = "7924d45c2430191fe3679a58116c74ceea13307d7822c169d65fd59a24b3a4fe"; + sha256 = "433e82f9b34986a4e4b2be38c60e82cca3ac64b7e1b38f4d8e3e118292939712"; }; buildInputs = [ pytest setuptools_scm pytest-forked]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 32ad71de7044..42a591e58b64 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -2,7 +2,7 @@ , setuptools_scm }: buildPythonPackage rec { - version = "3.2.1"; + version = "3.2.3"; pname = "pytest"; name = "${pname}-${version}"; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "4c2159d2be2b4e13fa293e7a72bdf2f06848a017150d5c6d35112ce51cfd74ce"; + sha256 = "27fa6617efc2869d3e969a3e75ec060375bfb28831ade8b5cdd68da3a741dc3c"; }; buildInputs = [ hypothesis setuptools_scm ]; diff --git a/pkgs/development/python-modules/python-fuse/default.nix b/pkgs/development/python-modules/python-fuse/default.nix new file mode 100644 index 000000000000..d9debce6aecb --- /dev/null +++ b/pkgs/development/python-modules/python-fuse/default.nix @@ -0,0 +1,27 @@ +{ lib +, pkgconfig +, fetchurl +, fuse +, buildPythonPackage +, isPy3k +}: + +buildPythonPackage rec { + baseName = "fuse"; + version = "0.2.1"; + name = "${baseName}-${version}"; + disabled = isPy3k; + + src = fetchurl { + url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz"; + sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse ]; + + meta = { + description = "Python bindings for FUSE"; + license = lib.licenses.lgpl21; + }; +} diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 8e8fa61e9bc8..a78b1ffbee26 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,14 +1,14 @@ { lib, fetchurl, buildPythonPackage, isPy3k }: buildPythonPackage rec { - version = "1.6"; + version = "1.7"; pname = "python-stdnum"; name = "${pname}-${version}"; # Failing tests and dependency issue on Py3k disabled = isPy3k; src = fetchurl { url = "mirror://pypi/p/python-stdnum/${name}.tar.gz"; - sha256 = "157a0aef01b1e846ddd11252dc516637da6b3347e32f0130825b7fae1d8b4655"; + sha256 = "987c25e1047e8742131bcf29dac7a406987adb1463465749e2daaba8cb19d264"; }; meta = { homepage = http://arthurdejong.org/python-stdnum/; diff --git a/pkgs/development/python-modules/pyudev.nix b/pkgs/development/python-modules/pyudev/default.nix similarity index 100% rename from pkgs/development/python-modules/pyudev.nix rename to pkgs/development/python-modules/pyudev/default.nix diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix new file mode 100644 index 000000000000..6ba6794bfd13 --- /dev/null +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchPypi, buildPythonPackage, libusb, libusb1 }: + +buildPythonPackage rec { + pname = "pyusb"; + version = "1.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qkk2jn270jwwl1x26hmdhb14m9kkbrzzwzizdjcl1a29b6756sf"; + }; + + # Fix the USB backend library lookup + postPatch = + '' + libusb=${libusb1.out}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary} + test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } + sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py + ''; + + propagatedBuildInputs = [ libusb ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + description = "Python USB access module (wraps libusb 1.0)"; # can use other backends + homepage = http://pyusb.sourceforge.net/; + license = licenses.bsd3; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix new file mode 100644 index 000000000000..558dc37a394f --- /dev/null +++ b/pkgs/development/python-modules/pyxattr/default.nix @@ -0,0 +1,26 @@ +{ lib +, pkgs +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "pyxattr"; + version = "0.6.0"; + name = pname + "-" + version; + + src = fetchPypi { + inherit pname version; + sha256 = "1a3fqjlgbzq5hmc3yrnxxxl8nyn3rz2kfn17svbsahaq4gj0xl09"; + }; + + # IOError: [Errno 95] Operation not supported (expected) + doCheck = false; + + buildInputs = with pkgs; [ attr ]; + + meta = with lib; { + description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems"; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/development/python-modules/rackspace-novaclient.nix b/pkgs/development/python-modules/rackspace-novaclient/default.nix similarity index 100% rename from pkgs/development/python-modules/rackspace-novaclient.nix rename to pkgs/development/python-modules/rackspace-novaclient/default.nix diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix new file mode 100644 index 000000000000..00bc54d844b1 --- /dev/null +++ b/pkgs/development/python-modules/raven/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchurl, isPy3k, contextlib2 }: + +buildPythonPackage rec { + name = "raven-6.3.0"; + + src = fetchurl { + url = "mirror://pypi/r/raven/${name}.tar.gz"; + sha256 = "1wgddbd092vih6k6mknp68vvm1pp12fikjqzglw6mnyw8njnbr7k"; + }; + + # way too many dependencies to run tests + # see https://github.com/getsentry/raven-python/blob/master/setup.py + doCheck = false; + + propagatedBuildInputs = lib.optionals (!isPy3k) [ contextlib2 ]; + + meta = { + description = "A Python client for Sentry (getsentry.com)"; + homepage = https://github.com/getsentry/raven-python; + license = [ lib.licenses.bsd3 ]; + maintainers = with lib.maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix new file mode 100644 index 000000000000..e03bd3536271 --- /dev/null +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, sphinx +, CommonMark_54 +, docutils +}: + +buildPythonPackage rec { + pname = "recommonmark"; + name = "${pname}-${version}"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d"; + }; + + checkInputs = [ pytest sphinx ]; + propagatedBuildInputs = [ CommonMark_54 docutils ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "A docutils-compatibility bridge to CommonMark"; + homepage = https://github.com/rtfd/recommonmark; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 1010766cf2da..5e1ea8b46424 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { pname = "relatorio"; name = "${pname}-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "mirror://pypi/r/relatorio/${name}.tar.gz"; - sha256 = "efd68d96573b15c59c24a8f420ed14210ce51de535a8470d14381f2bed69d845"; + sha256 = "744f1e39313f037a0ab52a154338ece151d83e5442a9278db1f8ce450ce6c2cd"; }; propagatedBuildInputs = [ genshi diff --git a/pkgs/development/python-modules/requests-oauthlib.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix similarity index 100% rename from pkgs/development/python-modules/requests-oauthlib.nix rename to pkgs/development/python-modules/requests-oauthlib/default.nix diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix new file mode 100644 index 000000000000..4e2646eb6ab2 --- /dev/null +++ b/pkgs/development/python-modules/requests_download/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "requests_download"; + version = "0.1.1"; + name = "${pname}-${version}"; + + format = "wheel"; + + #src = pkgs.fetchurl { + # url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.1-py2.py3-none-any.whl; + # sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; + #}; + + src = fetchPypi { + inherit pname version format; + sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = { + description = "Download files using requests and save them to a target path"; + homepage = https://www.github.com/takluyver/requests_download; + license = lib.licenses.mit; + maintainer = lib.maintainers.fridh; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/requests_ntlm/default.nix b/pkgs/development/python-modules/requests_ntlm/default.nix index c475ff85ff36..51f194a79cf8 100644 --- a/pkgs/development/python-modules/requests_ntlm/default.nix +++ b/pkgs/development/python-modules/requests_ntlm/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "requests_ntlm"; - version = "1.0.0"; + version = "1.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0hb689p2jyb867c2wlq5mjkqxgc0jq6lxv3rmhw8rq9qangk3jjk"; + sha256 = "9189c92e8c61ae91402a64b972c4802b2457ce6a799d658256ebf084d5c7eb71"; }; propagatedBuildInputs = [ ntlm-auth requests ]; diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix new file mode 100644 index 000000000000..1e7b020cd513 --- /dev/null +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, buildPythonPackage, pyparsing, argparse, robotframework }: + +buildPythonPackage rec { + name = "robomachine-0.6"; + + src = fetchurl { + url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz"; + sha256 = "6c9a9bae7bffa272b2a09b05df06c29a3a776542c70cae8041a8975a061d2e54"; + }; + + propagatedBuildInputs = [ pyparsing argparse robotframework ]; + + # Remove Windows .bat files + postInstall = '' + rm "$out/bin/"*.bat + ''; + + postPatch = '' + substituteInPlace setup.py --replace "argparse" "" + ''; + + meta = with stdenv.lib; { + description = "Test data generator for Robot Framework"; + homepage = https://github.com/mkorpela/RoboMachine; + license = licenses.asl20; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix new file mode 100644 index 000000000000..a9b536fc76ed --- /dev/null +++ b/pkgs/development/python-modules/robotframework-ride/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }: + +buildPythonPackage rec { + version = "1.2.3"; + name = "robotframework-ride-${version}"; + disabled = isPy3k; + + src = fetchurl { + url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz"; + sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j"; + }; + + propagatedBuildInputs = [ pygments wxPython ]; + + # ride_postinstall.py checks that needed deps are installed and creates a + # desktop shortcut. We don't really need it and it clutters up bin/ so + # remove it. + postInstall = '' + rm -f "$out/bin/ride_postinstall.py" + ''; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + description = "Light-weight and intuitive editor for Robot Framework test case files"; + homepage = https://code.google.com/p/robotframework-ride/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix new file mode 100644 index 000000000000..e0a05eb2e258 --- /dev/null +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, buildPythonPackage, isPy3k }: + +buildPythonPackage rec { + version = "3.0.2"; + name = "robotframework-${version}"; + disabled = isPy3k; + + src = fetchurl { + url = "mirror://pypi/r/robotframework/${name}.tar.gz"; + sha256 = "1xqzxv00lxf9xi4vdxdsyd1bfmx18gi96vrnijpzj9w2aqrz4610"; + }; + + meta = with stdenv.lib; { + description = "Generic test automation framework"; + homepage = http://robotframework.org/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix new file mode 100644 index 000000000000..2dd672c01097 --- /dev/null +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, unittest2, robotframework, lxml }: + +buildPythonPackage rec { + pname = "robotsuite"; + version = "2.0.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "15iw7g6gspf1ill0mzjrj71dirqfc86f1j14wphdvs2lazv8d50z"; + }; + + buildInputs = [ unittest2 ]; + propagatedBuildInputs = [ robotframework lxml ]; + + meta = with stdenv.lib; { + description = "Python unittest test suite for Robot Framework"; + homepage = http://github.com/collective/robotsuite/; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix new file mode 100644 index 000000000000..912b3fd6ab06 --- /dev/null +++ b/pkgs/development/python-modules/rply/default.nix @@ -0,0 +1,28 @@ +{ stdenv, pytest, fetchFromGitHub, buildPythonPackage, appdirs }: + +buildPythonPackage rec { + pname = "rply"; + name = "${pname}-${version}"; + version = "0.7.5"; + + src = fetchFromGitHub { + owner = "alex"; + repo = "rply"; + rev = "v${version}"; + sha256 = "0v05gdy5dval30wvz96lywvz2jyf000dp0pnrd1lwdx3cyywq659"; + }; + + buildInputs = [ appdirs ]; + + checkInputs = [ pytest ]; + checkPhase = '' + HOME=$(mktemp -d) py.test tests + ''; + + meta = with stdenv.lib; { + description = "A python Lex/Yacc that works with RPython"; + homepage = https://github.com/alex/rply; + license = licenses.bsd3; + maintainers = with maintainers; [ nixy ]; + }; +} diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix new file mode 100644 index 000000000000..5241b632f122 --- /dev/null +++ b/pkgs/development/python-modules/scapy/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, buildPythonPackage, isPy3k, isPyPy }: + +buildPythonPackage rec { + name = "scapy-2.2.0"; + + disabled = isPy3k || isPyPy; + + src = fetchurl { + url = "http://www.secdev.org/projects/scapy/files/${name}.tar.gz"; + sha256 = "1bqmp0xglkndrqgmybpwmzkv462mir8qlkfwsxwbvvzh9li3ndn5"; + }; + + meta = with stdenv.lib; { + description = "Powerful interactive network packet manipulation program"; + homepage = http://www.secdev.org/projects/scapy/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index eb669adff457..b2826588a288 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.19.0"; + version = "0.19.1"; name = "${pname}-${version}"; disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "07q261l9145c9xr8b4pcsa08ih1ifhclp05i4xwg43cyamkwpx94"; + sha256 = "5ca0ad32ee04abe0d4ba02c8d89d501b4e5e0304bdf4d45c2e9875a735b323a0"; }; buildInputs = [ nose pillow gfortran glibcLocales ]; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index f4e4518ef168..df2e569076a2 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,16 +1,17 @@ -{lib, fetchurl, python, buildPythonPackage, isPyPy, gfortran, nose, numpy}: +{lib, fetchurl, python, buildPythonPackage, isPyPy, gfortran, nose, pytest, numpy}: buildPythonPackage rec { pname = "scipy"; - version = "0.19.1"; + version = "1.0.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; - sha256 = "a19a2ca7a7336495ec180adeaa0dfdcf41e96dbbee90d51c3ed828ba570884e6"; + sha256 = "87ea1f11a0e9ec08c264dc64551d501fa307289460705f6fccd84cbfc7926d10"; }; - buildInputs = [ gfortran nose numpy.blas ]; + checkInputs = [ nose pytest ]; + buildInputs = [ gfortran numpy.blas ]; propagatedBuildInputs = [ numpy ]; # Remove tests because of broken wrapper diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix new file mode 100644 index 000000000000..1647e6cfc143 --- /dev/null +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, pandas +, matplotlib +}: + +buildPythonPackage rec { + pname = "seaborn"; + version = "0.7.1"; + name = "${pname}-${version}"; + src = fetchPypi { + inherit pname version; + sha256 = "0pawrqc3mxpwd5g9pvi9gba02637bh5c8ldpp8izfwpfn52469zs"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ pandas matplotlib ]; + + checkPhase = '' + nosetests -v + ''; + + # Computationally very demanding tests + doCheck = false; + + meta = { + description = "Statisitical data visualization"; + homepage = "http://stanford.edu/~mwaskom/software/seaborn/"; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index f2f3069fbf9f..9a309d1e3b94 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "semver"; - version = "2.7.8"; + version = "2.7.9"; src = fetchPypi { inherit pname version; - sha256 = "a6212f5c552452e306502ac8476bbca48af62db29c4528fdd91d319d0a44b07b"; + sha256 = "1ffb55fb86a076cf7c161e6b5931f7da59f15abe217e0f24cea96cc8eec50f42"; }; # No tests in archive diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix new file mode 100644 index 000000000000..98a81873a718 --- /dev/null +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils +, blockdiag +}: + +buildPythonPackage rec { + name = "seqdiag-0.9.4"; + + src = fetchurl { + url = "mirror://pypi/s/seqdiag/${name}.tar.gz"; + sha256 = "1qa7d0m1wahvmrj95rxkb6128cbwd4w3gy8gbzncls66h46bifiz"; + }; + + buildInputs = [ pep8 nose unittest2 docutils ]; + + propagatedBuildInputs = [ blockdiag ]; + + # Tests fail: + # ... + # ERROR: Failure: OSError ([Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.9.0.drv-0/seqdiag-0.9.0/src/seqdiag/tests/diagrams/') + doCheck = false; + + meta = with stdenv.lib; { + description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)"; + homepage = http://blockdiag.com/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix index e2ecbdcb67ae..2414b97e94ab 100644 --- a/pkgs/development/python-modules/serpy/default.nix +++ b/pkgs/development/python-modules/serpy/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "serpy"; name = "${pname}-${version}"; - version = "0.1.1"; + version = "0.2.0"; meta = { description = "ridiculously fast object serialization"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0r9wn99x9nbqxfancnq9jh3cn83i1b6gc79xj0ipnxixp661yj5i"; + sha256 = "7e62e242321b208362966d5ab32b45df93b1cb88da4ce6260277da060b4f7475"; }; buildInputs = [ flake8 py pyflakes tox ]; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 1c6fb414a73b..818468d0fcae 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,13 +8,13 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "36.4.0"; + version = "36.6.0"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2758b0270fe8ceec42f336ee5b411e60dc8579febc27bb3ba9b794dc7f0239ae"; + sha256 = "62074589522a798da243f47348f38020d55b6c945652e2f2c09d3a96299812b7"; }; buildInputs = [ python wrapPython unzip ]; diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 85052a34a568..e8e92818ecf5 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Shapely"; - version = "1.6.1"; + version = "1.6.2.post1"; src = fetchPypi { inherit pname version; - sha256 = "1iyhrkm6g233gwbd20sf4aq4by0kg52cz1d2k7imnqgzjpmkgqas"; + sha256 = "07fba518e76b3276558f62a5829bdfa476f790cdef752383ccdc8c66b04b0899"; }; buildInputs = [ geos glibcLocales cython ]; diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix new file mode 100644 index 000000000000..38117337d06a --- /dev/null +++ b/pkgs/development/python-modules/six/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "six"; + version = "1.11.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test test_six.py + ''; + + meta = { + description = "A Python 2 and 3 compatibility library"; + homepage = http://pypi.python.org/pypi/six/; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 0413366c5501..050a59c6e926 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sounddevice"; name = "${pname}-${version}"; - version = "0.3.8"; + version = "0.3.9"; src = fetchPypi { inherit pname version; - sha256 = "dc5ec8534c3831ab133c497721f3aaeed4f5084b0eda842f0c0ada09f2f066dc"; + sha256 = "1c9e833f8c8ccc67c0291c3448b29e9acc548fe56d15ee6f7fdd7037e00319f8"; }; propagatedBuildInputs = [ cffi numpy portaudio ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; prePatch = '' - substituteInPlace sounddevice.py --replace "'portaudio'" "'${portaudio}/lib/libportaudio.so.2'" + substituteInPlace src/sounddevice.py --replace "'portaudio'" "'${portaudio}/lib/libportaudio.so.2'" ''; meta = { diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index a96a31824f78..e83ab1c724aa 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -27,10 +27,10 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Sphinx"; - version = "1.6.3"; + version = "1.6.5"; src = fetchPypi { inherit pname version; - sha256 = "af8bdb8c714552b77d01d4536e3d6d2879d6cb9d25423d29163d5788e27046e6"; + sha256 = "c6de5dbdbb7a0d7d2757f4389cc00e8f6eb3c49e1772378967a12cfcf2cfe098"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch b/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch deleted file mode 100644 index 5880af40d14a..000000000000 --- a/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch +++ /dev/null @@ -1,49 +0,0 @@ -From abd9f52ade78c737571be69f21dba384be3edf4e Mon Sep 17 00:00:00 2001 -From: Mike Bayer -Date: Sat, 2 Mar 2013 16:24:50 -0500 -Subject: [PATCH] - Fixed an import of "logging" in test_execute which was not - working on some linux platforms. [ticket:2669] - ---- - doc/build/changelog/changelog_07.rst | 10 ++++++++++ - lib/sqlalchemy/__init__.py | 2 +- - test/engine/test_execute.py | 2 +- - 3 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst -index 416df5a..f07c9ec 100644 ---- a/doc/build/changelog/changelog_07.rst -+++ b/doc/build/changelog/changelog_07.rst -@@ -3,6 +3,16 @@ - 0.7 Changelog - ============== - -+.. changelog:: -+ :version: 0.7.11 -+ -+ .. change:: -+ :tags: bug, tests -+ :tickets: 2669 -+ :pullreq: 41 -+ -+ Fixed an import of "logging" in test_execute which was not -+ working on some linux platforms. - - .. changelog:: - :version: 0.7.10 -diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py -index 69b94f1..a37f684 100644 ---- a/test/engine/test_execute.py -+++ b/test/engine/test_execute.py -@@ -9,7 +9,7 @@ - import sqlalchemy as tsa - from test.lib import testing, engines - from test.lib.engines import testing_engine --import logging -+import logging.handlers - from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam - from sqlalchemy.engine import base, default - from sqlalchemy.engine.base import Connection, Engine --- -1.8.1.6 - diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 27a3c4ac2ae3..9b3a5fa20396 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; name = "${pname}-${version}"; - version = "1.1.13"; + version = "1.1.15"; src = fetchPypi { inherit pname version; - sha256 = "2a98ac87b30eaa2bee1f1044848b9590e476e7f93d033c6542e60b993a5cf898"; + sha256 = "8b79a5ed91cdcb5abe97b0045664c55c140aec09e5dd5c01303e23de5fe7a95a"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index b976524ba698..2c85bdbe3d1c 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.1.9"; + version = "1.1.11"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "3387ba58383f4e8131f109b40e2b001dec436f38cd9b9b78d38871b8608fdd9e"; + sha256 = "bb5297df9cd97316b3c7ca64f8e31cae5cc6b94c015afd84c546877f1f77d6e4"; }; # No tests in archive diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 0625dd851e5b..1955320fd266 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "stevedore"; - version = "1.25.0"; + version = "1.27.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "c8a373b90487b7a1b52ebaa3ca5059315bf68d9ebe15b2203c2fa675bd7e1e7e"; + sha256 = "236468dae36707069e8b3bdb455e9f1be090b1e6b937f4ac0c56a538d6f50be0"; }; doCheck = false; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 8755a1d4b635..7edfb9c4f0e6 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "1.62.1"; + version = "1.70.0"; name = "${pname}-${version}"; # Tests require network connectivity and there's no easy way to disable @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7cc83b8d405a48d8a792640761519c64e373ad3514ea8bb4a9a5128f98b0b679"; + sha256 = "ee77103d2d18fe6369f23c40c93067425c5ed67e08b1a7678e681217e8fa8062"; }; buildInputs = [ unittest2 mock ]; diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix new file mode 100644 index 000000000000..b1fe22df4767 --- /dev/null +++ b/pkgs/development/python-modules/sybil/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonApplication, fetchPypi +, pytest, nose }: + +buildPythonApplication rec { + pname = "sybil"; + version = "1.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0x8qd5p5qliv8wmdglda2iy3f70i4jg8zqyk8yhklm5hrxm8jdl6"; + }; + + checkInputs = [ pytest nose ]; + + checkPhase = '' + py.test tests + ''; + + meta = with stdenv.lib; { + description = "Automated testing for the examples in your documentation."; + homepage = https://github.com/cjw296/sybil/; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix new file mode 100644 index 000000000000..9ddc2a0e08b3 --- /dev/null +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec { + version = "0.7.7"; + pname = "tabulate"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6"; + }; + + checkInputs = [ nose ]; + + # Tests: cannot import common (relative import). + doCheck = false; + + meta = { + description = "Pretty-print tabular data"; + homepage = https://bitbucket.org/astanin/python-tabulate; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index a8eba4cb3a0c..1ac6c4a54d07 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "tempora"; - version = "1.8"; + version = "1.9"; src = fetchPypi { inherit pname version; - sha256 = "1b29d19r8h5my9kzzywi9khn1qzvk3qzp08k0f4rrsa7qks930l4"; + sha256 = "9ea980c63be54f83d2a466fccc6eeef96a409f74c5034764fb328b0d43247e96"; }; doCheck = false; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index a0a2f3a24afc..2ce419fa7fb6 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -7,6 +7,9 @@ , cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null # Default from ./configure script , cudaCapabilities ? [ "3.5" "5.2" ] +, sse42Support ? false +, avx2Support ? false +, fmaSupport ? false }: assert cudaSupport -> cudatoolkit != null @@ -77,6 +80,9 @@ let hardeningDisable = [ "all" ]; bazelFlags = [ "--config=opt" ] + ++ lib.optional sse42Support "--copt=-msse4.2" + ++ lib.optional avx2Support "--copt=-mavx2" + ++ lib.optional fmaSupport "--copt=-mfma" ++ lib.optional cudaSupport "--config=cuda"; bazelTarget = "//tensorflow/tools/pip_package:build_pip_package"; diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix new file mode 100644 index 000000000000..23b5a5aa9e26 --- /dev/null +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi +, mock, manuel, pytest, sybil, zope_component, django }: + +buildPythonPackage rec { + pname = "testfixtures"; + version = "5.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xfar653qmikwb94xj3f0xfp8dh2llxjsxipx1272d8qwl0aknnx"; + }; + + checkInputs = [ mock manuel pytest sybil zope_component ]; + + checkPhase = '' + # django is too much hasle to setup at the moment + pytest --ignore=testfixtures/tests/test_django testfixtures/tests + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/Simplistix/testfixtures"; + }; +} diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index d1f3a5feeaaa..7b432154b605 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -8,11 +8,15 @@ , unittest2 , traceback2 , isPy3k +, fixtures +, pyrsistent }: +# testtools 2.0.0 and up has a circular run-time dependency on futures + buildPythonPackage rec { pname = "testtools"; - version = "1.8.0"; + version = "1.9.0"; name = "${pname}-${version}"; # Python 2 only judging from SyntaxError @@ -20,12 +24,11 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "15yxz8d70iy1b1x6gd7spvblq0mjxjardl4vnaqasxafzc069zca"; + sha256 = "b46eec2ad3da6e83d53f2b0eca9a8debb687b4f71343a074f83a16bbdb3c0644"; }; - propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 ]; + propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 pyrsistent ]; buildInputs = [ traceback2 ]; - patches = [ ./testtools_support_unittest2.patch ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch b/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch deleted file mode 100644 index 545e5f01ec09..000000000000 --- a/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e600d12980ccb807ba1ca3fb6a4da1d0b89c02f6 Mon Sep 17 00:00:00 2001 -From: Robert Collins -Date: Wed, 1 Jul 2015 15:46:28 +1200 -Subject: [PATCH] Fix tests with unittest2 1.1.0 and higher. - -Change-Id: I4613d47852fbf901819f197f6e388ccaa717b53e ---- - testtools/tests/test_run.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testtools/tests/test_run.py b/testtools/tests/test_run.py -index ead716b..433b6f8 100644 ---- a/testtools/tests/test_run.py -+++ b/testtools/tests/test_run.py -@@ -201,6 +201,7 @@ def test_run_list_failed_import(self): - run.main, ['prog', 'discover', '-l', broken.package.base, '*.py'], out) - self.assertEqual(2, exc.args[0]) - self.assertThat(out.getvalue(), DocTestMatches("""\ -+unittest2.loader._FailedTest.runexample - Failed to import test module: runexample - Traceback (most recent call last): - File ".../loader.py", line ..., in _find_test_path diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix new file mode 100644 index 000000000000..36b85bce3acd --- /dev/null +++ b/pkgs/development/python-modules/toolz/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec{ + pname = "toolz"; + version = "0.8.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa"; + }; + + checkInputs = [ nose ]; + + checkPhase = '' + # https://github.com/pytoolz/toolz/issues/357 + rm toolz/tests/test_serialization.py + nosetests toolz/tests + ''; + + meta = { + homepage = "http://github.com/pytoolz/toolz/"; + description = "List processing tools and functional utilities"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index bc6d7c2fba98..95039cc591fc 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.15.0"; + version = "4.19.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "6ec1dc74efacf2cda936b4a6cf4082ce224c76763bdec9f17e437c8cfcaa9953"; + sha256 = "7ca803c2ea268c6bdb541e2dac74a3af23cf4bf7b4132a6a78926d255f8c8df1"; }; buildInputs = [ nose coverage glibcLocales flake8 ]; diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix new file mode 100644 index 000000000000..c34bb09b794c --- /dev/null +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, glibcLocales +, pytest +, mock +, ipython_genutils +, decorator +, enum34 +}: + +buildPythonPackage rec { + pname = "traitlets"; + version = "4.3.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835"; + }; + + checkInputs = [ glibcLocales pytest mock ]; + propagatedBuildInputs = [ ipython_genutils decorator enum34 ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" py.test $out + ''; + + meta = { + description = "Traitlets Python config system"; + homepage = http://ipython.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 8acbfc91a41b..a064a7c98b41 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "Twisted"; name = "${pname}-${version}"; - version = "17.5.0"; + version = "17.9.0"; src = fetchurl { url = "mirror://pypi/T/Twisted/${name}.tar.bz2"; - sha256 = "1sh2h23nnizcdyrl2rn7zxijglikxwz7z7grqpvq496zy2aa967i"; + sha256 = "0da1a7e35d5fcae37bc9c7978970b5feb3bc82822155b8654ec63925c05af75c"; }; propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ]; diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 27ce7a99fa77..b4662c640a35 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "txaio"; - version = "2.8.1"; + version = "2.8.2"; src = fetchPypi { inherit pname version; - sha256 = "fe2e0e4d3a06705f86bbd351fdd1f39dae61755e44162375e024acbf32eafddb"; + sha256 = "484cd6c4cdd3f6081b87188f3b2b9a36e02fba6816e8256917c4f6571b567571"; }; buildInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 481ff67dd97e..0a073cca0c51 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,11 +1,11 @@ { buildPythonPackage, fetchPypi, isPy3k, lib, pythonOlder }: buildPythonPackage rec { pname = "typed-ast"; - version = "1.0.4"; + version = "1.1.0"; name = "${pname}-${version}"; src = fetchPypi{ inherit pname version; - sha256 = "73f09aac0119f6664a3f471a1ec1c9b719f572bc9212913cea96a78b22c2e96e"; + sha256 = "57fe287f0cdd9ceaf69e7b71a2e94a24b5d268b35df251a88fef5cc241bf73aa"; }; # Only works with Python 3.3 and newer; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix index d7d56bed8819..c0748b6b53b2 100644 --- a/pkgs/development/python-modules/ukpostcodeparser/default.nix +++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "UkPostcodeParser"; - version = "1.1.1"; + version = "1.1.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "b7a7ac19d48897637c7aaa2f2970288f1c260e4a99140bf04c6086cf65576c6b"; + sha256 = "930264efa293db80af0103a4fe9c161b06365598d24bb6fe5403f3f57c70530e"; }; doCheck = false; diff --git a/pkgs/development/python-modules/update_checker/default.nix b/pkgs/development/python-modules/update_checker/default.nix new file mode 100644 index 000000000000..ad401d80190d --- /dev/null +++ b/pkgs/development/python-modules/update_checker/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests}: + +buildPythonPackage rec { + pname = "update_checker"; + version = "0.16"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f38l40d32dm0avcidf3dmikma8z0la84yngj88v4xygzi399qvh"; + }; + + propagatedBuildInputs = [ requests ]; + + # requires network + doCheck = false; + + meta = with stdenv.lib; { + description = "A python module that will check for package updates"; + homepage = https://github.com/bboe/update_checker; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index d680c29e224e..99b648b0ee1f 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "uritools"; name = "uritools-${version}"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "20d7881a947cd3c3bb452e2b541f44acc52febe9c4e3f6d05c55d559fb208c50"; + sha256 = "a7b58a249a851ef5fff1bc513b940653f0d4841a6668e02431c1297f05efeec3"; }; propagatedBuildInputs = [ ipaddress ]; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix new file mode 100644 index 000000000000..d77a212003b1 --- /dev/null +++ b/pkgs/development/python-modules/urwid/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch }: + +buildPythonPackage (rec { + pname = "urwid"; + version = "1.3.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "18cnd1wdjcas08x5qwa5ayw6jsfcn33w4d9f7q3s29fy6qzc1kng"; + }; + + patches = [ + # fix tests + (fetchpatch { + url = "https://github.com/urwid/urwid/commit/4b0ed8b6030450e6d99909a7c683e9642e546387.patch"; + sha256 = "0azpn0ylbg8mfpr0y27n4lnq0ph75a4d4m9wdv3napnhf1vh9ahx"; + }) + # fix tests + (fetchpatch { + url = "https://github.com/floppym/urwid/commit/f68f2cf089cfd5ec45863baf59a91d5aeb0cf5c3.patch"; + sha256 = "1b3vz7mrwz2bqvdwvbyv2j835f9lzapgw0j2km4sam76bxmgfpgq"; + }) + ]; + + meta = with stdenv.lib; { + description = "A full-featured console (xterm et al.) user interface library"; + homepage = http://excess.org/urwid; + repositories.git = git://github.com/wardi/urwid.git; + license = licenses.lgpl21; + maintainers = with maintainers; [ garbas ]; + }; +}) diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix new file mode 100644 index 000000000000..0c6842749073 --- /dev/null +++ b/pkgs/development/python-modules/usbtmc/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, buildPythonPackage, pyusb }: + +buildPythonPackage rec { + name = "usbtmc-${version}"; + version = "0.8"; + + src = fetchurl { + url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz"; + sha256 = "14f4j77ljr45crnjwlp1dqbxwa45s20y2fpq5rg59r60w15al4yw"; + }; + + propagatedBuildInputs = [ pyusb ]; + + meta = with stdenv.lib; { + description = "Python implementation of the USBTMC instrument control protocol"; + homepage = http://alexforencich.com/wiki/en/python-usbtmc/start; + license = licenses.mit; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 80c5abeb47c1..760af59918ac 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; name = "${pname}-${version}"; - version = "3.0.2"; + version = "3.0.6"; src = fetchPypi { inherit pname version; - sha256 = "e8890d87c80782ee4ea3ed9afffc89a0af8b4ff475d1608d900f728ea55f041c"; + sha256 = "3fbedb4ae0883f48af2397c65a8f9fbf8ed868f1808db70f8aa72f25d391fa9b"; }; propagatedBuildInputs = [ notebook ]; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index 2923fcaf3ebf..859bd62f998c 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.8.1"; + version = "1.9.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "048743567ca9511e19222233ebb53795586a2cede07b79e801577e0a9b4f173c"; + sha256 = "75295a7cbfb3529e02551d4e95c2e3eb85d66292bedcfb463d25d71308065e34"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 4bdfbccadf14..2ded73d5250a 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.17.0"; + version = "0.19.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "5472f4c95ab9b9fe9f5bf74ece3c986bfafa1f98ad9e1e296d4c35d291c97856"; + sha256 = "701b076a4916e3cfbba345e0297dcd54a02fd0fdcae1f43346f8a043c3bbd052"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 046b749ffa72..1275178d5d0b 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -8,12 +8,12 @@ let pname = "yarl"; - version = "0.12.0"; + version = "0.13.0"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "fc0f71ffdce882b4d4b287b0b3a68d9f2557ab14cc2c10ce4df714c42512cbde"; + sha256 = "25fe681a982f2cec567df8abac7cbd2ac27016e4aec89193945cab0643bfdb42"; }; buildInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 0f19e7f4e5d8..e00d6c7e24ba 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -20,17 +20,18 @@ , pytestcov , requests-mock , testtools +, tornado }: let pname = "zeep"; - version = "2.3.0"; + version = "2.4.0"; in buildPythonPackage { name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "b01d81c61d7b7858b7be001615d3c995a371815f5e6902c914fea9beba30b716"; + sha256 = "8631e2735c5f2219eb18ca4f0615ae482455628518508f69c3690dbfb8238aee"; }; propagatedBuildInputs = [ @@ -47,6 +48,10 @@ in buildPythonPackage { # testtools dependency not supported for py3k doCheck = !isPy3k; + checkInputs = [ + tornado + ]; + buildInputs = if isPy3k then [] else [ freezegun mock diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 0c1ece54fb68..c6b5900c6272 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "zetup"; - version = "0.2.34"; + version = "0.2.42"; src = fetchPypi { inherit pname version; - sha256 = "0k4lm51b5qjy7yxy3n5z8vc5hlvjcsfsvwjgqzkr0pisysar1kpf"; + sha256 = "6c9e25249f3014ed2162398772ccf1a5e8a4e9e66c74e3c7f6683945a6a3d84c"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/zipfile36/default.nix b/pkgs/development/python-modules/zipfile36/default.nix new file mode 100644 index 000000000000..0915eb002b79 --- /dev/null +++ b/pkgs/development/python-modules/zipfile36/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, isPy3k +, pythonOlder +}: + +buildPythonPackage rec { + pname = "zipfile36"; + version = "0.1.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest test_zipfile.py + ''; + + # Only works with Python 3.x. + # Not supposed to be used with 3.6 and up. + disabled = !(isPy3k && (pythonOlder "3.6")); + + meta = { + description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; + homepage = https://gitlab.com/takluyver/zipfile36; + license = lib.licenses.psfl; + maintainer = lib.maintainers.fridh; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/zipstream/default.nix b/pkgs/development/python-modules/zipstream/default.nix new file mode 100644 index 000000000000..aac2bceeb15d --- /dev/null +++ b/pkgs/development/python-modules/zipstream/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchurl, nose }: + +let + pname = "zipstream"; + version = "1.1.4"; +in buildPythonPackage rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/z/${pname}/${name}.tar.gz"; + sha256 = "01im5anqdyggmwkigqcjg0qw2a5bnn84h33mfaqjjd69a28lpwif"; + }; + + buildInputs = [ nose ]; + + meta = { + description = "A zip archive generator"; + homepage = https://github.com/allanlei/python-zipstream; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch b/pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch new file mode 100644 index 000000000000..b6bcedea91a8 --- /dev/null +++ b/pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch @@ -0,0 +1,29 @@ +Tests are kind of broken in ZODB-5.3.0. Fix setup code and disable one +especially problematic test. + +diff -u ZODB-5.3.0/setup.py ZODB-5.3.0/setup.py +--- ZODB-5.3.0/setup.py 2017-08-30 14:55:10.000000000 +0200 ++++ ZODB-5.3.0/setup.py 2017-10-29 11:34:17.277953730 +0100 +@@ -85,7 +85,10 @@ + mod = __import__( + _modname(dirpath, base, os.path.splitext(filename)[0]), + {}, {}, ['*']) +- _unittests_only(suite, mod.test_suite()) ++ try: ++ _unittests_only(suite, mod.test_suite()) ++ except AttributeError: ++ pass + elif 'tests.py' in filenames: + mod = __import__(_modname(dirpath, base, 'tests'), {}, {}, ['*']) + _unittests_only(suite, mod.test_suite()) +diff -u ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py +--- ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py 2017-08-30 14:55:10.000000000 +0200 ++++ ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py 2017-10-29 11:35:10.348240386 +0100 +@@ -1184,7 +1184,4 @@ + #unittest.makeSuite(Test_do_backup), #TODO + unittest.makeSuite(Test_do_recover), + unittest.makeSuite(Test_do_verify), +- # N.B.: this test take forever to run (~40sec on a fast laptop), +- # *and* it is non-deterministic. +- unittest.makeSuite(MonteCarloTests), + ]) diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index a4855c23865c..232acaec506c 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -17,14 +17,18 @@ buildPythonPackage rec { pname = "ZODB"; - version = "5.2.4"; + version = "5.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1pya0inkkxaqmi14gp796cidf894nz64n603zk670jj9xz0wkhgc"; + sha256 = "633c2f89481d8ebc55639b59216f7d16d07b44a94758850c0b887006967214f3"; }; + patches = [ + ./ZODB-5.3.0-fix-tests.patch + ]; + propagatedBuildInputs = [ manuel transaction diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index f51b30ab51e3..9438e8ca54f4 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "0.6.0"; + version = "0.7.0"; name = "${pname}-${version}"; disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 src = fetchPypi { inherit pname version; - sha256 = "ea3248be966159e7791e3db0e35ea992b9235d52e7d39835438686741d196665"; + sha256 = "95a247fb17bce980af8d548af70ac5bd1bad22773f242eb8efa24428efa909a8"; }; # fails.. diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index 7af2d11e25c5..32f756a3cdd6 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "zope.interface"; - version = "4.4.2"; + version = "4.4.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "4e59e427200201f69ef82956ddf9e527891becf5b7cde8ec3ce39e1d0e262eb0"; + sha256 = "d6d26d5dfbfd60c65152938fcb82f949e8dada37c041f72916fef6621ba5c5ce"; }; propagatedBuildInputs = [ zope_event ]; diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md index 477059cbb2c8..c8f02bd14780 100644 --- a/pkgs/development/r-modules/README.md +++ b/pkgs/development/r-modules/README.md @@ -79,6 +79,23 @@ environment, see `rstudioWrapper`, which functions similarly to Then like above, `nix-env -f "" -iA rstudioEnv` will install this into your user profile. +Alternatively, you can create a self-contained `shell.nix` without the need to +modify any configuration files: + +```nix +{ pkgs ? import {} +}: + +pkgs.rstudioWrapper.override { + packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ]; +} + +``` + +Executing `nix-shell` will then drop you into an environment equivalent to the +one above. If you need additional packages just add them to the list and +re-enter the shell. + ## Updating the package set ```bash diff --git a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb index 92321d6427dc..fe8c43f55ed1 100644 --- a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb +++ b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb @@ -18,7 +18,8 @@ paths.each do |path| next unless File.directory?("#{path}/nix-support/gem-meta") name = File.read("#{path}/nix-support/gem-meta/name") - executables = File.read("#{path}/nix-support/gem-meta/executables").split + executables = File.read("#{path}/nix-support/gem-meta/executables") + .force_encoding('UTF-8').split executables.each do |exe| File.open("#{out}/bin/#{exe}", "w") do |f| f.write(<<-EOF) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index ff5398a42931..05415b889680 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -22,7 +22,7 @@ , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xlibs, gtk2, buildRubyGem -, re2 +, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf }@args: let @@ -41,7 +41,7 @@ in { atk = attrs: { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 pcre ]; + buildInputs = [ gtk2 pcre rake ]; }; bundler = attrs: @@ -64,6 +64,11 @@ in buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp]; }; + cairo-gobject = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cairo pcre xlibs.libpthreadstubs xlibs.libXdmcp ]; + }; + capybara-webkit = attrs: { buildInputs = [ qt48 ]; }; @@ -71,7 +76,7 @@ in charlock_holmes = attrs: { buildInputs = [ which icu zlib ]; }; - + curb = attrs: { buildInputs = [ curl ]; }; @@ -93,6 +98,11 @@ in buildInputs = [ libffi ]; }; + gdk_pixbuf2 = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ rake gdk_pixbuf ]; + }; + gpgme = attrs: { buildInputs = [ gpgme ]; }; @@ -116,8 +126,10 @@ in CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; }; - nativeBuildInputs = [ pkgconfig ]; - gobject-introspection = attrs: { buildInputs = [ gtk2 pcre ]; }; + gobject-introspection = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gobjectIntrospection gtk2 pcre ]; + }; grpc = attrs: { nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 372295084d5a..803bd70dbd86 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.57.3"; + version = "0.58.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "0pmgj2mv4pmgw8slh4gdj7jskcgxbdsy09arh5rnwf0byy81fky6"; + sha256 = "0s27zj3lx1mqpmfwqpvdcqpz9gzp40mbiy5hp5796pg7627spld5"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/splint/darwin.patch b/pkgs/development/tools/analysis/splint/darwin.patch new file mode 100644 index 000000000000..8c435707571d --- /dev/null +++ b/pkgs/development/tools/analysis/splint/darwin.patch @@ -0,0 +1,13 @@ +diff --git a/src/osd.c b/src/osd.c +index ebe214a..4ba81d5 100644 +--- a/src/osd.c ++++ b/src/osd.c +@@ -516,7 +516,7 @@ osd_getPid () + # if defined (WIN32) || defined (OS2) && defined (__IBMC__) + int pid = _getpid (); + # else +- __pid_t pid = getpid (); ++ pid_t pid = getpid (); + # endif + + return (int) pid; diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix index e8a056bca5a7..2d6129dd3764 100644 --- a/pkgs/development/tools/analysis/splint/default.nix +++ b/pkgs/development/tools/analysis/splint/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "02pv8kscsrkrzip9r08pfs9xs98q74c52mlxzbii6cv6vx1vd3f7"; }; - patches = [ ./tmpdir.patch ]; + patches = [ ./tmpdir.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch; buildInputs = [ flex ]; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 5490790fe385..79648c16f5e7 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -2,7 +2,7 @@ assert jdk != null; -let version = "3.5.0"; in +let version = "3.5.2"; in stdenv.mkDerivation rec { name = "apache-maven-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz"; - sha256 = "0d7hjnj77hc7qqnnfmqlwij8n6pcldfavvd6lilvv5ak4hci9fdy"; + sha256 = "1zza5kjf69hnx41gy3yhvsk1kz259nig5njcmzjbsr8a75p1yyvh"; }; buildInputs = [ makeWrapper ]; @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://maven.apache.org/; license = licenses.asl20; platforms = platforms.unix; + maintainers = with maintainers; [ cko ]; }; } diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 8701db8d161e..e15b212ebca6 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.7.0"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "19rb1lh6v2gi8xlxhdmhydp16i1bgmvb510i053rfy0jlmh1znns"; + sha256 = "05n4zz2a29y4vr2svc7ya9fx7qxb9151a6gkycxk9qj3v32sk150"; }; sourceRoot = "."; diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix index 6f9c2ce38a74..d9dc59ee72df 100644 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ b/pkgs/development/tools/build-managers/boot/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jdk }: stdenv.mkDerivation rec { - version = "2.5.2"; + version = "2.7.2"; name = "boot-${version}"; src = fetchurl { url = "https://github.com/boot-clj/boot-bin/releases/download/${version}/boot.sh"; - sha256 = "0brsimvmmpksxwc4l5c0x0cl5hhdjz76crd26yxphjvzyf7fypc9"; + sha256 = "1hqp3xxmsj5vkym0l3blhlaq9g3w0lhjgmp37g6y3rr741znkk8c"; }; inherit jdk; @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ jdk ]; - meta = { + meta = with stdenv.lib; { description = "Build tooling for Clojure"; homepage = http://boot-clj.com/; - license = stdenv.lib.licenses.epl10; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.ragge ]; + license = licenses.epl10; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ ragge ]; }; } diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index cddb1a90765a..5d486f47844e 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "buck-${version}"; - version = "v2017.05.31.01"; + version = "v2017.10.01.01"; src = fetchFromGitHub { owner = "facebook"; repo = "buck"; - rev = "0b8b3828a11afa79dc128832cb55b106f07e48aa"; - sha256 = "1g3yg8qq91cdhsq7zmir7wxw3767l120f5zhq969gppdw9apqy0s"; + rev = "2025fd74327477728b524eafdd4619a0170a24ea"; + sha256 = "05nyyb6f0hv1h67zzvdq8297yl8zjhpbasx35lxnrsjz0m1h8ngw"; }; patches = [ ./pex-mtime.patch ]; diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index bf876e81cda5..331f907ae612 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -84,6 +84,9 @@ makeCmakeFindLibs(){ -L*) export CMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH${CMAKE_LIBRARY_PATH:+:}${flag:2}" ;; + -F*) + export CMAKE_FRAMEWORK_PATH="$CMAKE_FRAMEWORK_PATH${CMAKE_FRAMEWORK_PATH:+:}${flag:2}" + ;; -isystem) isystem_seen=1 ;; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 253aadb86d73..7914d8ebb4f8 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for # included Makefiles, don't look in /usr/include and friends. ./impure-dirs.patch + ./pselect.patch ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch b/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch new file mode 100644 index 000000000000..5a03acb2f7ca --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch @@ -0,0 +1,170 @@ +From b552b05251980f693c729e251f93f5225b400714 Mon Sep 17 00:00:00 2001 +From: Paul Smith +Date: Sat, 3 Jun 2017 16:20:51 -0400 +Subject: [SV 51159] Use a non-blocking read with pselect to avoid hangs. + +* posixos.c (set_blocking): Set blocking on a file descriptor. +(jobserver_setup): Set non-blocking on the jobserver read side. +(jobserver_parse_auth): Ditto. +(jobserver_acquire_all): Set blocking to avoid a busy-wait loop. +(jobserver_acquire): If the non-blocking read() returns without +taking a token then try again. +--- + posixos.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 71 insertions(+), 26 deletions(-) + +diff --git posixos.c posixos.c +index e642d7f..dbafa51 100644 +--- posixos.c ++++ posixos.c +@@ -62,6 +62,24 @@ make_job_rfd (void) + #endif + } + ++static void ++set_blocking (int fd, int blocking) ++{ ++ // If we're not using pselect() don't change the blocking ++#ifdef HAVE_PSELECT ++ int flags; ++ EINTRLOOP (flags, fcntl (fd, F_GETFL)); ++ if (flags >= 0) ++ { ++ int r; ++ flags = blocking ? (flags & ~O_NONBLOCK) : (flags | O_NONBLOCK); ++ EINTRLOOP (r, fcntl (fd, F_SETFL, flags)); ++ if (r < 0) ++ pfatal_with_name ("fcntl(O_NONBLOCK)"); ++ } ++#endif ++} ++ + unsigned int + jobserver_setup (int slots) + { +@@ -86,6 +104,9 @@ jobserver_setup (int slots) + pfatal_with_name (_("init jobserver pipe")); + } + ++ /* When using pselect() we want the read to be non-blocking. */ ++ set_blocking (job_fds[0], 0); ++ + return 1; + } + +@@ -121,6 +142,9 @@ jobserver_parse_auth (const char *auth) + return 0; + } + ++ /* When using pselect() we want the read to be non-blocking. */ ++ set_blocking (job_fds[0], 0); ++ + return 1; + } + +@@ -169,7 +193,10 @@ jobserver_acquire_all (void) + { + unsigned int tokens = 0; + +- /* Close the write side, so the read() won't hang. */ ++ /* Use blocking reads to wait for all outstanding jobs. */ ++ set_blocking (job_fds[0], 1); ++ ++ /* Close the write side, so the read() won't hang forever. */ + close (job_fds[1]); + job_fds[1] = -1; + +@@ -236,18 +263,12 @@ jobserver_pre_acquire (void) + unsigned int + jobserver_acquire (int timeout) + { +- sigset_t empty; +- fd_set readfds; + struct timespec spec; + struct timespec *specp = NULL; +- int r; +- char intake; ++ sigset_t empty; + + sigemptyset (&empty); + +- FD_ZERO (&readfds); +- FD_SET (job_fds[0], &readfds); +- + if (timeout) + { + /* Alarm after one second (is this too granular?) */ +@@ -256,28 +277,52 @@ jobserver_acquire (int timeout) + specp = &spec; + } + +- r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); +- +- if (r == -1) ++ while (1) + { +- /* Better be SIGCHLD. */ +- if (errno != EINTR) +- pfatal_with_name (_("pselect jobs pipe")); +- return 0; +- } ++ fd_set readfds; ++ int r; ++ char intake; + +- if (r == 0) +- /* Timeout. */ +- return 0; ++ FD_ZERO (&readfds); ++ FD_SET (job_fds[0], &readfds); + +- /* The read FD is ready: read it! */ +- EINTRLOOP (r, read (job_fds[0], &intake, 1)); +- if (r < 0) +- pfatal_with_name (_("read jobs pipe")); ++ r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); ++ if (r < 0) ++ switch (errno) ++ { ++ case EINTR: ++ /* SIGCHLD will show up as an EINTR. */ ++ return 0; ++ ++ case EBADF: ++ /* Someone closed the jobs pipe. ++ That shouldn't happen but if it does we're done. */ ++ O (fatal, NILF, _("job server shut down")); + +- /* What does it mean if read() returns 0? It shouldn't happen because only +- the master make can reap all the tokens and close the write side...?? */ +- return r > 0; ++ default: ++ pfatal_with_name (_("pselect jobs pipe")); ++ } ++ ++ if (r == 0) ++ /* Timeout. */ ++ return 0; ++ ++ /* The read FD is ready: read it! This is non-blocking. */ ++ EINTRLOOP (r, read (job_fds[0], &intake, 1)); ++ ++ if (r < 0) ++ { ++ /* Someone sniped our token! Try again. */ ++ if (errno == EAGAIN) ++ continue; ++ ++ pfatal_with_name (_("read jobs pipe")); ++ } ++ ++ /* read() should never return 0: only the master make can reap all the ++ tokens and close the write side...?? */ ++ return r > 0; ++ } + } + + #else +-- +cgit v1.0-41-gc330 + diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index a5ea6df3c8df..bbfcc8513078 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.2.1"; + name = "gradle-4.3"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1h7v133rm81jf0bgv9mgvydl7rgh4430dnsfs66wflfay82cqldm"; + sha256 = "0k358y18pp2809kn5il4kv3qvlqrbwmy276bbm3mnmwjxx7g9jwd"; }; }; diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 9185f5b9eaab..c79f238673e4 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { owner = "fbb-git"; }; - sourceRoot = "icmake-${version}-src/icmake"; + + setSourceRoot = '' + sourceRoot=$(echo */icmake) + ''; buildInputs = [ gcc ]; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 1c2e726cdc54..8e4c5d4801a4 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { sed -i -e 's|e.fix_rpath(install_rpath)||' mesonbuild/scripts/meson_install.py ''; - setupHook = ./setup-hook.sh; + setupHook = ./setup-hook.sh; meta = with lib; { homepage = http://mesonbuild.com; diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index cd9635ab6142..fbbca9a0cfe4 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, which, curl, makeWrapper }: let rev = "77686b3dfa20a34270cc52377c8e37c3a461e484"; @@ -17,9 +17,13 @@ stdenv.mkDerivation { dontBuild = true; + buildInputs = [ makeWrapper ]; + installPhase = '' mkdir -p $out/bin install bin/sbt $out/bin + + wrapProgram $out/bin/sbt --prefix PATH : ${stdenv.lib.makeBinPath [ which curl]} ''; meta = { diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index e5f68365e427..4dacfd0568ac 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, bc }: stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { urls = [ @@ -10,11 +10,14 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "1w1f6nsdq3inxhqhy69mgljfjr51n1v1s8i51gcg11rd2bc67w63"; + sha256 = "041cv25gxqsi3rlglw5d8aqgdzb6y5ak3f52dwqvzrrj854vyx13"; }; patchPhase = '' echo -java-home ${jre.home} >>conf/sbtopts + + substituteInPlace bin/sbt-launch-lib.bash \ + --replace "| bc)" "| ${bc}/bin/bc)" ''; installPhase = '' diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 430e46f23030..44e4f494ff24 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 = "10.0.2"; + version = "10.1.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "14lrc9frigym93ppphmdhwnbhk7xz5drpai3d29gyi1z4xsm1jaq"; + sha256 = "0h8fwqsr8ibd82jxq4pc9p8x7af0i8jyrrsj13p4daqhla0srxr4"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "013bly0xswzkf2kwi2pr2ryd880h63n8pya2ccv4z77hxs80cfmp"; + sha256 = "0bzj8zr6d5ab5bjlbw7q3iwn19ha8fksymrvw6cyzs4qacfsj54w"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0hr964r7bcff74sna0b8w3d2ip0hs441ijlhplh2xzqnzpbvx2jq"; + sha256 = "0knvjmxcscyr6v5b9vvyvm8w6p58a1h6nfcvf13dxp59psm71q00"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index de0321109d7d..ea5a5e370178 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.86"; + version = "2.88"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "198fcj2wkz8qxawk3mq29kwl51pxlbd7ivndcpvdvg42g0caqyi0"; + sha256 = "062hnbyj73311sxhkwla6sl33zb43v8p7hjssgbh0bfvgmnlayim"; }; buildCommand = '' @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://jenkins-ci.org; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ coconnor fpletz ]; + maintainers = with maintainers; [ coconnor fpletz earldouglas ]; }; } diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix new file mode 100644 index 000000000000..a397ba696977 --- /dev/null +++ b/pkgs/development/tools/database/shmig/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub +, withMySQL ? false, withPSQL ? false, withSQLite ? false +, mariadb, postgresql, sqlite, gawk, which +, lib +}: + +stdenv.mkDerivation { + name = "shmig-2017-07-24"; + + src = fetchFromGitHub { + owner = "mbucc"; + repo = "shmig"; + rev = "aff54e03d13f8f95b422cf898505490a56152a4a"; + sha256 = "08q94dka5yqkzkis3w7j1q8kc7d3kk7mb2drx8ms59jcqvp847j3"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + postPatch = '' + patchShebangs . + + substituteInPlace shmig \ + --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mariadb}/bin/mysql"}" \ + --replace "\`which psql\`" "${lib.optionalString withPSQL "${postgresql}/bin/psql"}" \ + --replace "\`which sqlite3\`" "${lib.optionalString withSQLite "${sqlite}/bin/sqlite3"}" \ + --replace "awk" "${gawk}/bin/awk" \ + --replace "which" "${which}/bin/which" + ''; + + preBuild = '' + mkdir -p $out/bin + ''; + + meta = with stdenv.lib; { + description = "Minimalistic database migration tool with MySQL, PostgreSQL and SQLite support"; + homepage = "https://github.com/mbucc/shmig"; + license = licenses.bsd3; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index adeb377dccd0..74adac9f8a32 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,32 +1,39 @@ -{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, sqlite, cmake }: +{ mkDerivation, lib, fetchFromGitHub, cmake, antlr +, qtbase, qttools, qscintilla, sqlite }: mkDerivation rec { - version = "3.10.0"; + version = "3.10.1"; name = "sqlitebrowser-${version}"; src = fetchFromGitHub { repo = "sqlitebrowser"; owner = "sqlitebrowser"; rev = "v${version}"; - sha256 = "1fwr7p4b6glc3s0a06i7cg8l9p1mrcm4vyhyf2wi89cyg22rrf5c"; + sha256 = "1brzam8yv6sbdmbqsp7vglhd6wlx49g2ap8llr271zrkld4k3kar"; }; - buildInputs = [ qtbase qttools sqlite ]; - nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase qscintilla sqlite ]; - cmakeFlags = [ "-DUSE_QT5=TRUE" ]; + nativeBuildInputs = [ cmake antlr qttools ]; - # A regression was introduced in CMakeLists.txt on v3.9.x - # See https://github.com/sqlitebrowser/sqlitebrowser/issues/832 and issues/755 + enableParallelBuilding = true; + + # We have to patch out Test and PrintSupport to make this work with Qt 5.9 + # It can go when the application supports 5.9 postPatch = '' - substituteInPlace CMakeLists.txt --replace 'project("DB Browser for SQLite")' 'project(sqlitebrowser)' + substituteInPlace CMakeLists.txt \ + --replace Test "" \ + --replace PrintSupport "" + + substituteInPlace libs/qcustomplot-source/CMakeLists.txt \ + --replace PrintSupport "" ''; meta = with lib; { description = "DB Browser for SQLite"; homepage = http://sqlitebrowser.org/; license = licenses.gpl3; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux; # can only test on linux }; } diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 44120ad023ae..7d94863ea1cb 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -17,7 +17,7 @@ buildRustPackage rec { cargoDepsHook = '' ( - cd ${name}-src + cd */ # see https://github.com/git-series/git-series/pull/56 patch -p1 < ${fetchpatch { url = "https://github.com/Mic92/git-series/commit/3aa30a47d74ebf90b444dccdf8c153f07f119483.patch"; diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 3408c90cda6a..e9a7e7ac8918 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "gotools-${version}"; - version = "20160519-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; + version = "20170807-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "5d2fd3ccab986d52112bf301d47a819783339d0e"; goPackagePath = "golang.org/x/tools"; goPackageAliases = [ "code.google.com/p/go.tools" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + sha256 = "0r3fp7na6pg0bc5xfycjvv951f0vma1qfnpw5zy6l75yxm5r47kn"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index f1a4f219682d..75ad33e72f63 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -1,27 +1,28 @@ -{ stdenv, writeScriptBin, makeWrapper, buildEnv, ghcWithPackages, ihaskell, ipython, packages }: +{ stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, ihaskell, jupyter, packages }: let ihaskellEnv = ghcWithPackages (self: [ self.ihaskell - self.ihaskell-blaze - self.ihaskell-diagrams - self.ihaskell-display + (haskell.lib.doJailbreak self.ihaskell-blaze) + (haskell.lib.doJailbreak self.ihaskell-diagrams) + (haskell.lib.doJailbreak self.ihaskell-display) ] ++ packages self); ihaskellSh = writeScriptBin "ihaskell-notebook" '' #! ${stdenv.shell} export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH" - export PATH="${stdenv.lib.makeBinPath [ ihaskell ihaskellEnv ipython ]}" - ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell + export PATH="${stdenv.lib.makeBinPath ([ ihaskell ihaskellEnv jupyter ])}" + ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook ''; - profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar"; in buildEnv { name = "ihaskell-with-packages"; - paths = [ ihaskellEnv ipython ]; + buildInputs = [ makeWrapper ]; + paths = [ ihaskellEnv jupyter ]; postBuild = '' - . "${makeWrapper}/nix-support/setup-hook" - ln -s ${ihaskellSh}/bin/ihaskell-notebook $out/bin/. + ln -s ${ihaskellSh}/bin/ihaskell-notebook $out/bin/ for prg in $out/bin"/"*;do - wrapProgram $prg --set PYTHONPATH "$(echo ${ipython}/lib/*/site-packages)" + if [[ -f $prg && -x $prg ]]; then + wrapProgram $prg --set PYTHONPATH "$(echo ${jupyter}/lib/*/site-packages)" + fi done ''; } diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index b01127ffa564..b9d72084518b 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "icestorm-${version}"; - version = "2017.10.16"; + version = "2017.11.05"; src = fetchFromGitHub { - owner = "cliffordwolf"; - repo = "icestorm"; - rev = "d9d2a3dcaa749014f5b9a539768b8368bb529b28"; - sha256 = "1a755jnbjq3v7a3l90qjlgihmrpbdfiiabb4g8sw3ay3qmvzwh6b"; + owner = "cliffordwolf"; + repo = "icestorm"; + rev = "3ba18d001754de563ab0baa2a1c8eecbe63ef121"; + sha256 = "1c7yv91xi4vx0130xn2zq74gfjbf7fhm2q4fma9xgwj5xpdy8rmn"; }; buildInputs = [ python3 libftdi ]; diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix index 0d5c6e83c01e..3a1c4225bffb 100644 --- a/pkgs/development/tools/kafkacat/default.nix +++ b/pkgs/development/tools/kafkacat/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { buildInputs = [ zlib rdkafka yajl ]; + preConfigure = '' + patchShebangs ./configure + ''; + meta = with stdenv.lib; { description = "A generic non-JVM producer and consumer for Apache Kafka"; homepage = https://github.com/edenhill/kafkacat; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index bd08c6c4c05e..14a52f4e08a6 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -2,7 +2,7 @@ , pythonPackages, makeWrapper, gnome3, libwnck3 }: let - version = "${major}.11"; + version = "${major}.12"; major = "0.3"; in pythonPackages.buildPythonApplication rec { name = "d-feet-${version}"; @@ -10,7 +10,7 @@ in pythonPackages.buildPythonApplication rec { src = fetchurl { url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz"; - sha256 = "a3dc940c66f84b996c328531e3034d475ec690d7ff639445ff7ca746aa8cb9c2"; + sha256 = "054hl56rii9ff7rzl42h7993ywjbxmhlcd7bk8fi1c2bx98c6s68"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 71e9ee27a9e8..50f451ebae23 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gtkdialog-0.8.3"; src = fetchurl { - url = http://gtkdialog.googlecode.com/files/gtkdialog-0.8.3.tar.gz; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gtkdialog/gtkdialog-0.8.3.tar.gz"; sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; @@ -12,7 +12,8 @@ stdenv.mkDerivation { buildInputs = [ gtk2 hicolor_icon_theme ]; meta = { - homepage = http://gtkdialog.googlecode.com/; + homepage = https://code.google.com/archive/p/gtkdialog/; + # community links: http://murga-linux.com/puppy/viewtopic.php?t=111923 -> https://github.com/01micko/gtkdialog description = "Small utility for fast and easy GUI building from many scripted and compiled languages"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index f20343156e3f..f81b327d8428 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "stm32flash-1.0"; src = fetchurl { - url = https://stm32flash.googlecode.com/files/stm32flash.tar.gz; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/stm32flash/stm32flash.tar.gz"; sha256 = "04k631g9lzvp9xr4sw51xpq1g542np61s1l8fpwx9rbsc8m5l0i6"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open source flash program for the STM32 ARM processors using the ST bootloader"; - homepage = https://code.google.com/p/stm32flash/; + homepage = https://sourceforge.net/projects/stm32flash/; license = stdenv.lib.licenses.gpl2; platforms = platforms.all; # Should work on all platforms maintainers = [ maintainers.the-kenny ]; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index b44548c8ffd3..2759b18e35c3 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -13,13 +13,12 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0y0rkxhkv31v5sa0425dwskd80i6srwbqhqkrw1g1kbmbs9y0vxz"; - installPhase = '' - mkdir -p $out/bin - cp -p target/release/tokei $out/bin/ + buildPhase = '' + # do not pass --frozen since Cargo.lock has the wrong tokei version + cargo build --release ''; meta = with stdenv.lib; { - broken = true; description = "Count code, quickly"; homepage = https://github.com/Aaronepower/tokei; license = licenses.mit; diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 1eed4c2ad862..e0bf9eac6963 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { owner = "fbb-git"; }; - sourceRoot = "yodl-${version}-src/yodl"; + setSourceRoot = '' + sourceRoot=$(echo */yodl) + ''; preConfigure = '' patchShebangs ./build diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix index 9f5685043171..6dc57afb51ef 100644 --- a/pkgs/development/tools/mypy/default.nix +++ b/pkgs/development/tools/mypy/default.nix @@ -3,14 +3,14 @@ buildPythonApplication rec { name = "${pname}-${version}"; pname = "mypy"; - version = "0.521"; + version = "0.540"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "9d30df20cd937b80cfc6007d75426f27a232789cfa288c63bf9370f2542c9658"; + sha256 = "5d82f51e228a88e5de6ac1d6699dd09e250ce7de217a5ff1256e317266e738ec"; }; propagatedBuildInputs = [ lxml typed-ast ]; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index e5c79f534b0c..0acd70b424a8 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-7.02"; + name = "camlp5${if transitional then "_transitional" else ""}-7.03"; src = fetchzip { - url = https://github.com/camlp5/camlp5/archive/rel702.tar.gz; - sha256 = "1m2d55zrgllidhgslvzgmr27f56qzdahz2sv56bvjs3bg7grmhnc"; + url = https://github.com/camlp5/camlp5/archive/rel703.tar.gz; + sha256 = "0bwzhp4qjypfa0x8drp8w434dfixm1nzrm6pcy9s5akpmqvb50a8"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index 93d96005d35d..0f536c489eb6 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.2"; + version = "0.10.3"; src = fetchurl { url = "http://download.camlcity.org/download/${name}.tar.gz"; - sha256 = "1znnlkpz89hk44byvnl1pr92ym6hwfyyw2qm9clq446r6l2z4m64"; + sha256 = "07bdg1h5i7qnlv9xq81ad5hfypl10hxm771h4rjyl5cn8plhfcgz"; }; buildInputs = [ ocaml ncurses ]; diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 92fba47b756f..4ea11a622ea1 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, bison, m4 }: +{ stdenv, fetchurl, bison, m4 +, fetchpatch, autoreconfHook, help2man +}: stdenv.mkDerivation rec { name = "flex-${version}"; @@ -9,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"; }; + # Also upstream, will be part of 2.6.5 + # https://github.com/westes/flex/commit/24fd0551333e + patches = [(fetchpatch { + name = "glibc-2.26.patch"; + url = "https://raw.githubusercontent.com/lede-project/source/0fb14a2b1ab2f82c" + + "/tools/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch"; + sha256 = "1aarhcmz7mfrgh15pkj6f7ikxa2m0mllw1i1vscsf1kw5d05lw6f"; + })]; + nativeBuildInputs = [ autoreconfHook help2man ]; + buildInputs = [ bison ]; propagatedBuildInputs = [ m4 ]; diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index 7fb1289b7ebd..c782df507580 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { owner = "fbb-git"; }; - sourceRoot = "flexcpp-${version}-src/flexc++"; + setSourceRoot = '' + sourceRoot=$(echo */flexc++) + ''; buildInputs = [ bobcat ]; nativeBuildInputs = [ icmake yodl ]; diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 5bcbacff4b93..70c292365abc 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { if [ -e git-export ]; then mv git-export/src/pypi2nix $out/pkgs/pypi2nix else - mv pypi2nix*/src/pypi2nix $out/pkgs/pypi2nix + mv source/src/pypi2nix $out/pkgs/pypi2nix fi fi ''; diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 32be2a503bfc..8fe47bd0cb54 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "rtags-${version}"; - version = "2.12"; + version = "2.15"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ llvmPackages.llvm openssl emacs ] @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { rev = "refs/tags/v${version}"; fetchSubmodules = true; url = "https://github.com/andersbakken/rtags.git"; - sha256 = "0bgjcvyvkpqcgw4571iz39sqydmcaz6ymx7kxcmq6j7rffs6qs7l"; + sha256 = "12nnyav2q1ddkz9wm0aclhn7r74xj4ibrb0x05k7mcf694bg79c0"; # unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation postFetch = '' diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 1240e7cc38f4..d304560515c4 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -4,13 +4,13 @@ rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; - version = "0.30.0"; + version = "0.31.1"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rust-bindgen"; rev = "v${version}"; - sha256 = "02ic48qng76rvwa54i8zkvqgr8kfsyj3axc08naylzcvwzp84bsf"; + sha256 = "0b0nr42vvxzrykzn11mwk1h9cqn87fh8423wwrs3h8vpk5jqg55i"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib" ''; - cargoSha256 = "128skg31lc9v8i7ghfb3wyiazivqfvzhi1mvmjcl0gkx1hi5006v"; + cargoSha256 = "1pjyancb5w9rrxirwx8ghhjbnfcc2r0ha5bfnmlfamj8aaaqdc5w"; doCheck = false; # A test fails because it can't find standard headers in NixOS diff --git a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch new file mode 100644 index 000000000000..4d77cf45d417 --- /dev/null +++ b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch @@ -0,0 +1,54 @@ +From c21cc756b69a5f33c8a7758b746a816f40f55932 Mon Sep 17 00:00:00 2001 +From: Leon Isenberg +Date: Sat, 28 Oct 2017 17:58:17 +0200 +Subject: [PATCH] nix customization: patchelf installed binaries + +--- + src/rustup-dist/src/component/package.rs | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) + +diff --git a/src/rustup-dist/src/component/package.rs b/src/rustup-dist/src/component/package.rs +index 8aa63db9..4d219826 100644 +--- a/src/rustup-dist/src/component/package.rs ++++ b/src/rustup-dist/src/component/package.rs +@@ -99,7 +99,13 @@ impl Package for DirectoryPackage { + let src_path = root.join(&path); + + match &*part.0 { +- "file" => try!(builder.copy_file(path.clone(), &src_path)), ++ "file" => { ++ try!(builder.copy_file(path.clone(), &src_path)); ++ nix_patchelf_if_needed( ++ &target.prefix().path().join(path.clone()), ++ &src_path, ++ ) ++ } + "dir" => try!(builder.copy_dir(path.clone(), &src_path)), + _ => return Err(ErrorKind::CorruptComponent(name.to_owned()).into()), + } +@@ -117,6 +123,22 @@ impl Package for DirectoryPackage { + } + } + ++fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) { ++ let is_bin = if let Some(p) = src_path.parent() { ++ p.ends_with("bin") ++ } else { ++ false ++ }; ++ ++ if is_bin { ++ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") ++ .arg("--set-interpreter") ++ .arg("@dynamicLinker@") ++ .arg(dest_path) ++ .output(); ++ } ++} ++ + // On Unix we need to set up the file permissions correctly so + // binaries are executable and directories readable. This shouldn't be + // necessary: the source files *should* have the right permissions, +-- +2.14.1 + diff --git a/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch b/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch deleted file mode 100644 index 3b429c1745e4..000000000000 --- a/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 36c053f37670c6003f9e8dc001741f7c49e9526a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Sat, 15 Apr 2017 20:42:10 +0200 -Subject: [PATCH] use hardcoded dynamic-linker -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - src/rustup-cli/common.rs | 3 ++- - src/rustup/toolchain.rs | 22 ++++++++++++++++++++-- - 2 files changed, 22 insertions(+), 3 deletions(-) - -diff --git a/src/rustup-cli/common.rs b/src/rustup-cli/common.rs -index 1abf345..21096e7 100644 ---- a/src/rustup-cli/common.rs -+++ b/src/rustup-cli/common.rs -@@ -220,7 +220,8 @@ pub fn rustc_version(toolchain: &Toolchain) -> String { - if toolchain.exists() { - let rustc_path = toolchain.binary_file("rustc"); - if utils::is_file(&rustc_path) { -- let mut cmd = Command::new(&rustc_path); -+ let mut cmd = Command::new("@dynamicLinker@"); -+ cmd.arg(&rustc_path); - cmd.arg("--version"); - toolchain.set_ldpath(&mut cmd); - -diff --git a/src/rustup/toolchain.rs b/src/rustup/toolchain.rs -index dc29c32..212a4ab 100644 ---- a/src/rustup/toolchain.rs -+++ b/src/rustup/toolchain.rs -@@ -315,7 +315,7 @@ impl<'a> Toolchain<'a> { - } - Path::new(&binary) - }; -- let mut cmd = Command::new(&path); -+ let mut cmd = wrap_elf_interpreter(&path); - self.set_env(&mut cmd); - Ok(cmd) - } -@@ -363,7 +363,7 @@ impl<'a> Toolchain<'a> { - } else { - src_file - }; -- let mut cmd = Command::new(exe_path); -+ let mut cmd = wrap_elf_interpreter(exe_path); - self.set_env(&mut cmd); - cmd.env("RUSTUP_TOOLCHAIN", &primary_toolchain.name); - Ok(cmd) -@@ -648,3 +648,21 @@ impl<'a> Toolchain<'a> { - path - } - } -+ -+fn wrap_elf_interpreter>(p: S) -> Command { -+ use std::fs::File; -+ use std::io::Read; -+ let path = Path::new(&p); -+ let is_elf = File::open(path).map(|mut f| { -+ let mut buf = [0; 4]; -+ let _ = f.read(&mut buf); -+ buf == b"\x7fELF"[..] -+ }).unwrap_or(false); -+ if is_elf { -+ let mut cmd = Command::new("@dynamicLinker@"); -+ cmd.arg(&path); -+ cmd -+ } else { -+ Command::new(&path) -+ } -+} --- -2.12.2 - diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 65599ad8d18f..b7065cc5d7da 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -1,18 +1,18 @@ -{ stdenv, lib, runCommand +{ stdenv, lib, runCommand, patchelf , fetchFromGitHub, rustPlatform , pkgconfig, curl, Security }: rustPlatform.buildRustPackage rec { name = "rustup-${version}"; - version = "1.3.0"; + version = "2017-10-29"; - cargoSha256 = "1yd7k0jpx78p5bp6iyzgbyj7pjz8vyjg9g7fmf1bl60jsbdpgv3g"; + cargoSha256 = "1xwxv8y9xjgdmm92ldrn9m9fml2zb5h7qqm7dhw63j6psb3ajqrw"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rustup.rs"; - rev = version; - sha256 = "199jlqqidzak7nxmv2nzjzv7zfzy9z7hw6h8d8wf1rbfdwd9l6hs"; + rev = "13c8092507bf646f3ef6a621fe2c5a68212e800f"; + sha256 = "1qd01rjk9qpfzgqs35f5nxrcf00kmf76zwmgj3yzdig9zymjwndg"; }; nativeBuildInputs = [ pkgconfig ]; @@ -24,9 +24,11 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features no-self-update" ]; patches = lib.optionals stdenv.isLinux [ - (runCommand "0001-use-hardcoded-dynamic-linker.patch" { CC=stdenv.cc; } '' + (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; } '' export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) - substituteAll ${./0001-use-hardcoded-dynamic-linker.patch} $out + substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ + --subst-var patchelf \ + --subst-var dynamicLinker '') ]; diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index c22772149513..dcc3893ee0de 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -1,15 +1,25 @@ { stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }: with stdenv.lib; - +let + name = "selendroid-standalone-${version}"; + pluginName = "selendroid-grid-plugin-${version}"; + version = "0.17.0"; + srcs = { + jar = fetchurl { + url = "https://github.com/selendroid/selendroid/releases/download/${version}/${name}-with-dependencies.jar"; + sha256 = "10lxdsgp711pv8r6dk2aagnbvnn1b25zfqjvz7plc73zqhx1dxvw"; + }; + gridPlugin = fetchurl { + url = "https://search.maven.org/remotecontent?filepath=io/selendroid/selendroid-grid-plugin/${version}/${pluginName}.jar"; + sha256 = "1x6cjmp2hpghbgbf8vss0qaj2n4sfl29wp3bc4k1s3hnnpccvz70"; + }; + }; +in stdenv.mkDerivation rec { - name = "selendroid-standalone-${version}"; - version = "0.11.0"; - src = fetchurl { - url = "https://github.com/selendroid/selendroid/releases/download/${version}/selendroid-standalone-${version}-with-dependencies.jar"; - sha256 = "1p6k974pr2634q1g65wx243cxdqhac63x8w2gsmh6vnni0818clk"; - }; + inherit name; + inherit version; unpackPhase = "true"; @@ -17,17 +27,21 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/lib/selendroid - cp $src $out/share/lib/selendroid/${name}.jar + cp ${srcs.jar} $out/share/lib/selendroid/${name}.jar + cp ${srcs.gridPlugin} $out/share/lib/selendroid/${pluginName}.jar + makeWrapper ${jdk}/bin/java $out/bin/selendroid \ --add-flags "-jar $out/share/lib/selendroid/${name}.jar" makeWrapper ${jdk}/bin/java $out/bin/selendroid-selenium \ --add-flags "-Dfile.encoding=UTF-8" \ - --add-flags "-cp \"$out/share/lib/selendroid/${name}.jar:${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar\"" \ - --add-flags "org.openqa.grid.selenium.GridLauncherV3" + --add-flags "-cp ${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar:$out/share/lib/selendroid/${pluginName}.jar" \ + --add-flags "org.openqa.grid.selenium.GridLauncherV3" \ + --add-flags "-role hub" \ + --add-flags "-capabilityMatcher io.selendroid.grid.SelendroidCapabilityMatcher" ''; meta = { - homepage = https://code.google.com/p/selenium; + homepage = http://selendroid.io/; description = "Test automation for native or hybrid Android apps and the mobile web"; maintainers = with maintainers; [ offline ]; platforms = platforms.all; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 4d506c900ec8..3b1e8c2c8a75 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = https://code.google.com/p/selenium; + homepage = http://www.seleniumhq.org/; description = "Selenium Server for remote WebDriver"; maintainers = with maintainers; [ coconnor offline ]; platforms = platforms.all; diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index c55f76f9b7f5..636d8ef7b78e 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -1,33 +1,38 @@ -{ stdenv, fetchurl, freetds, readline }: +{ stdenv, fetchurl, autoreconfHook, freetds, readline }: -stdenv.mkDerivation rec { - version = "2.5.16.1"; +let + mainVersion = "2.5"; + +in stdenv.mkDerivation rec { name = "sqsh-${version}"; + version = "${mainVersion}.16.1"; src = fetchurl { - url = "http://www.mirrorservice.org/sites/downloads.sourceforge.net/s/sq/sqsh/sqsh/sqsh-2.5/${name}.tgz"; + url = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${name}.tgz"; sha256 = "1wi0hdmhk7l8nrz4j3kaa177mmxyklmzhj7sq1gj4q6fb8v1yr6n"; }; - preConfigure = - '' + preConfigure = '' export SYBASE=${freetds} - ''; - buildInputs = [ - freetds - readline - ]; + substituteInPlace src/cmd_connect.c \ + --replace CS_TDS_80 CS_TDS_73 + ''; - meta = { + enableParallelBuilding = true; + + buildInputs = [ freetds readline ]; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { description = "Command line tool for querying Sybase/MSSQL databases"; - longDescription = - '' + longDescription = '' Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell), it is intended as a replacement for the venerable 'isql' program supplied by Sybase. - ''; - homepage = http://www.cs.washington.edu/~rose/sqsh/sqsh.html; - platforms = stdenv.lib.platforms.all; + ''; + homepage = http://sourceforge.net/projects/sqsh/; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 779aed7fea34..e0aac84abb70 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -2,11 +2,11 @@ let name = "wp-cli-${version}"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "0q5d32jq7a6rba77sr1yyj6ib6x838hw14mm186ah1xxgnn7rnry"; + sha256 = "0rav5a6znx81gwaxin1ib10sbfg16bgdnnyv1zn5sjify3f1wpqj"; }; completion = fetchurl { diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 0e66727ab1df..72b0fe2adaf7 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "1.2.1"; + version = "1.3.2"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "0jsaszykgmli503jgwdk79qks44krjgjr0qmizh3y7z4lplqdjip"; + sha256 = "0lyh24ais8xqfmzbb4sszd2002xl6qbsg9sdjnpwh6aysrwp56r8"; }; buildInputs = [makeWrapper nodejs]; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index d7917c52c99c..eafaf956ee02 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool, fetchpatch -, callPackage +{ stdenv, fetchurl, openssl, python2, zlib, libuv, utillinux, http-parser +, pkgconfig, which , darwin ? null -, enableNpm ? true }: with stdenv.lib; +{ enableNpm ? true, version, sha256, patches }: + let inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + + + baseName = if enableNpm then "nodejs" else "nodejs-slim"; + sharedLibDeps = { inherit openssl zlib libuv; } // (optionalAttrs (!stdenv.isDarwin) { inherit http-parser; }); sharedConfigureFlags = concatMap (name: [ @@ -25,12 +29,20 @@ let extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; in - rec { + stdenv.mkDerivation { + inherit version; + + name = "${baseName}-${version}"; + + src = fetchurl { + url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; + inherit sha256; + }; buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] ++ [ python2 which zlib libuv openssl ] ++ optionals stdenv.isLinux [ utillinux http-parser ] - ++ optionals stdenv.isDarwin [ pkgconfig libtool ]; + ++ optionals stdenv.isDarwin [ pkgconfig darwin.cctools ]; configureFlags = sharedConfigureFlags ++ [ "--without-dtrace" ] ++ extraConfigFlags; @@ -40,10 +52,9 @@ in passthru.interpreterName = "nodejs"; - setupHook = ./setup-hook.sh; - patches = optionals stdenv.isDarwin [ ./no-xcode.patch ]; + inherit patches; preBuild = optionalString stdenv.isDarwin '' sed -i -e "s|tr1/type_traits|type_traits|g" \ @@ -59,7 +70,7 @@ in paxmark m $out/bin/node PATH=$out/bin:$PATH patchShebangs $out - ${optionalString enableNpm '' + ${optionalString enableNpm '' mkdir -p $out/share/bash-completion/completions/ $out/bin/npm completion > $out/share/bash-completion/completions/npm ''} diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index 24832b6b8be0..08fd91aaf8de 100644 --- a/pkgs/development/web/nodejs/v4.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -1,20 +1,11 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool, fetchpatch -, callPackage -, darwin ? null -, enableNpm ? true -}@args: +{ stdenv, callPackage, lib, enableNpm ? true }: let - nodejs = import ./nodejs.nix args; - baseName = if enableNpm then "nodejs" else "nodejs-slim"; + buildNodejs = callPackage ./nodejs.nix {}; in - stdenv.mkDerivation (nodejs // rec { - version = "4.8.4"; - name = "${baseName}-${version}"; - src = fetchurl { - url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; - sha256 = "35fe633a48cbe93c79327161d9dc964ac9810f4ceb2ed8628487e6e14a15905b"; - }; - - }) + buildNodejs { + inherit enableNpm; + version = "4.8.5"; + sha256 = "0lqdnnihmc2wpl1v1shj60i49wka2354b00a86k0xbjg5gyfx2m4"; + patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; + } diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index 58cfc9af9fc1..c703377d5a04 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -1,19 +1,11 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool, fetchpatch -, callPackage -, darwin ? null -, enableNpm ? true -}@args: +{ stdenv, callPackage, lib, enableNpm ? true }: let - nodejs = import ./nodejs.nix args; - baseName = if enableNpm then "nodejs" else "nodejs-slim"; + buildNodejs = callPackage ./nodejs.nix {}; in - stdenv.mkDerivation (nodejs // rec { - version = "6.11.4"; - name = "${baseName}-${version}"; - src = fetchurl { - url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "0l6lmid8wfvvbq391x0k19crs63zf6kkcln79fn3d088wcsh8bsc"; - }; - }) + buildNodejs { + inherit enableNpm; + version = "6.11.5"; + sha256 = "1bwakrvy0if5spbymwpb05qwrb47xwzlnc42rapgp6b744ay8v8w"; + patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; + } diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 560df06b8c53..1735d1cf9cfd 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -1,22 +1,11 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool, fetchpatch -, callPackage -, darwin ? null -, enableNpm ? true -}@args: +{ stdenv, callPackage, lib, enableNpm ? true }: let - nodejs = import ./nodejs.nix args; - baseName = if enableNpm then "nodejs" else "nodejs-slim"; + buildNodejs = callPackage ./nodejs.nix {}; in - stdenv.mkDerivation (nodejs // rec { - version = "8.7.0"; - name = "${baseName}-${version}"; - src = fetchurl { - url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "16mml3cwjnq7yf9yd67d2dybav3nvbnk89fkixs1wz7fd26d05ss"; - }; - - patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; - }) - + buildNodejs { + inherit enableNpm; + version = "8.9.0"; + sha256 = "128ir6rkdz1xj55hbflw0sh7snrrvjwgvxmgnka7cyhjkvw5i0mf"; + patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; + } diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix new file mode 100644 index 000000000000..aa51421253fb --- /dev/null +++ b/pkgs/development/web/nodejs/v9.nix @@ -0,0 +1,11 @@ +{ stdenv, callPackage, lib, enableNpm ? true }: + +let + buildNodejs = callPackage ./nodejs.nix {}; +in + buildNodejs { + inherit enableNpm; + version = "9.0.0"; + sha256 = "19az7mxcb3d1aj0f7gvhriyyghn1rwn0425924pa84d6j1mbsljv"; + patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; + } diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index c5bac4db8e5b..4a531c07efd0 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -7,8 +7,8 @@ }: let - version = "2.0.46"; - inherit (python2Packages) python wrapPython sqlalchemy pyaudio beautifulsoup httplib2 matplotlib pyqt4; + version = "2.0.47"; + inherit (python2Packages) python wrapPython sqlalchemy pyaudio beautifulsoup4 httplib2 matplotlib pyqt4; qt4 = pyqt4.qt; in stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "01h51rbnj0r6lmjnn2vzxzaf7mxkc0azmg1v4mvf4pkpsp50a7hr"; }; - pythonPath = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ] + pythonPath = [ pyqt4 sqlalchemy pyaudio beautifulsoup4 httplib2 ] ++ lib.optional plotsSupport matplotlib; buildInputs = [ python wrapPython lame mplayer libpulseaudio ]; diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 40b594a19524..e6594adde552 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "arx-libertatis-${version}"; - version = "2017-02-26"; + version = "2017-10-30"; src = fetchFromGitHub { owner = "arx"; repo = "ArxLibertatis"; - rev = "0d2bb46025b2ad0fd5c8bcddd1cc04750282608d"; + rev = "e5ea4e8f0f7e86102cfc9113c53daeb0bdee6dd3"; sha256 = "11z0ndhk802jr3w3z5gfqw064g98v99xin883q1qd36jw96s27p5"; }; diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix index fc4a006a6a9d..b4dca34b11fd 100644 --- a/pkgs/games/duckmarines/default.nix +++ b/pkgs/games/duckmarines/default.nix @@ -2,7 +2,7 @@ let pname = "duckmarines"; - version = "1.0b"; + version = "1.0c"; icon = fetchurl { url = "http://tangramgames.dk/img/thumb/duckmarines.png"; diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index d26258081fcb..bdd55b5aeda7 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -11,6 +11,9 @@ let inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT; }; + soundSense = callPackage ./soundsense.nix { }; + stoneSense = callPackage ./stonesense.nix { }; + dwarf-fortress-unfuck = callPackage ./unfuck.nix { }; dwarf-fortress = callPackage ./wrapper { diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 0df91bb8df05..dbb3e7c32e25 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, cmake, writeScriptBin -, perl, XMLLibXML, XMLLibXSLT -, zlib +{ stdenv, lib, fetchgit, cmake, writeScriptBin, callPackage +, perl, XMLLibXML, XMLLibXSLT, zlib +, enableStoneSense ? false, allegro5, mesa }: let @@ -43,11 +43,12 @@ in stdenv.mkDerivation rec { inherit rev sha256; }; - patches = [ ./skip-ruby.patch ]; + patches = [ ./fix-stonesense.patch ]; nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # We don't use system libraries because dfhack needs old C++ ABI. - buildInputs = [ zlib ]; + buildInputs = [ zlib ] + ++ lib.optionals enableStoneSense [ allegro5 mesa ]; preConfigure = '' # Trick build system into believing we have .git @@ -59,7 +60,8 @@ in stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH" ''; - cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" ]; + cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ] + ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ]; enableParallelBuilding = true; diff --git a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch new file mode 100644 index 000000000000..da860cd55624 --- /dev/null +++ b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch @@ -0,0 +1,23 @@ +From f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae Mon Sep 17 00:00:00 2001 +From: Herwig Hochleitner +Date: Sun, 1 Oct 2017 18:01:43 +0200 +Subject: [PATCH] include + +this fixes `GLhandleARB` not being defined +--- + plugins/stonesense/common.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/plugins/stonesense/common.h b/plugins/stonesense/common.h +index eb36691..ef45389 100644 +--- a/plugins/stonesense/common.h ++++ b/plugins/stonesense/common.h +@@ -31,6 +31,8 @@ using namespace df::enums; + #include + #include + ++#include ++ + // allegro leaks X headers, undef some of it here: + #undef TileShape + #undef None \ No newline at end of file diff --git a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch b/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch deleted file mode 100644 index 877f6c3d215a..000000000000 --- a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/plugins/ruby/CMakeLists.txt b/plugins/ruby/CMakeLists.txt -index f1ef12ac..0976e18a 100644 ---- a/plugins/ruby/CMakeLists.txt -+++ b/plugins/ruby/CMakeLists.txt -@@ -1,5 +1,5 @@ - # Allow build system to turn off downloading of libruby.so. --OPTION(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." ON) -+OPTION(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." OFF) - - IF (DOWNLOAD_RUBY) diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index bfdedcdd133f..e7ef9a02eb70 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -1,29 +1,34 @@ -{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmake, texlive }: +{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, cmake, texlive, ninja }: stdenv.mkDerivation rec { name = "dwarf-therapist-original-${version}"; - version = "37.0.0"; + version = "37.0.0-Hello71"; src = fetchFromGitHub { - owner = "splintermind"; + ## We use `Hello71`'s fork for 43.05 support + # owner = "splintermind"; + owner = "Hello71"; repo = "Dwarf-Therapist"; - rev = "v${version}"; - sha256 = "0dw86b4x5hjhb7h4ynvwjgcinpqywfc5l48ljb5sahz08rfnx63d"; + rev = "42ccaa71f6077ebdd41543255a360c3470812b97"; + sha256 = "0f6mlfck7q31jl5cb6d6blf5sb7cigvvs2rn31k16xc93hsdgxaz"; }; outputs = [ "out" "layouts" ]; buildInputs = [ qtbase qtdeclarative ]; - nativeBuildInputs = [ texlive qmake ]; + nativeBuildInputs = [ texlive cmake ninja ]; - enableParallelBuilding = false; + configurePhase = '' + cmake -GNinja + ''; - # Move layout files so they cannot be found by Therapist - postInstall = '' - mkdir -p $layouts - mv $out/share/dwarftherapist/memory_layouts/* $layouts - rmdir $out/share/dwarftherapist/memory_layouts - # Useless symlink - rm $out/bin/dwarftherapist + buildPhase = '' + ninja -j$NIX_BUILD_CORES + ''; + + installPhase = '' + mkdir -p $out/bin + cp ./DwarfTherapist $out/bin/DwarfTherapist + cp -r ./share/memory_layouts $layouts ''; meta = with stdenv.lib; { diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index cbc8d31e6750..3a1a52d44cdb 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -3,7 +3,7 @@ let df = dwarf-fortress-original; dt = dwarf-therapist-original; - inifile = "linux/v0${df.baseVersion}.${df.patchVersion}.ini"; + inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}.ini"; dfHashFile = "${df}/hash.md5"; in symlinkJoin { diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix new file mode 100644 index 000000000000..c87f42d58c0f --- /dev/null +++ b/pkgs/games/dwarf-fortress/soundsense.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchzip, dos2unix +, soundPack ? stdenv.mkDerivation { + name = "soundsense-soundpack"; + src = fetchzip { + url = "http://df.zweistein.cz/soundsense/soundpack.zip"; + sha256 = "0qz0mjkp7wp0gxk3ws2x760awv8c9lkacj2fn9bz3gqqnq262ffa"; + }; + installPhase = '' + cp -r . $out + ''; +}}: + +stdenv.mkDerivation rec { + version = "2016-1_196"; + dfVersion = "0.43.05"; + inherit soundPack; + name = "soundsense-${version}"; + src = fetchzip { + url = "http://df.zweistein.cz/soundsense/soundSense_${version}.zip"; + sha256 = "1gkrs69l3xsh858yjp204ddp29m668j630akm7arssc9359wxqkk"; + }; + phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + nativeBuildInputs = [ dos2unix ]; + buildPhase = '' + dos2unix soundSense.sh + chmod +x soundSense.sh + ''; + installPhase = '' + mkdir $out + cp -R . $out/soundsense + ln -s $out/soundsense/dfhack $out/hack + ln -s $soundPack $out/soundsense/packs + ''; + passthru = { inherit version dfVersion; }; +} diff --git a/pkgs/games/dwarf-fortress/stonesense.nix b/pkgs/games/dwarf-fortress/stonesense.nix new file mode 100644 index 000000000000..52de513ac8fd --- /dev/null +++ b/pkgs/games/dwarf-fortress/stonesense.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "stonesense"; + src = fetchFromGitHub { + owner = "DFHack"; + repo = "stonesense"; + rev = "be793a080e66db1ff79ac284070632ec1a896708"; + sha256 = "1kibqblxp16z75zm48kk59w483933rkg4w339f28fcrbpg4sn92s"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DDFHACK_BUILD_ARCH=64" ]; +} diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 15b51631b33b..05e851db6f85 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -1,10 +1,16 @@ { stdenv, lib, buildEnv, dwarf-fortress-original, substituteAll , enableDFHack ? false, dfhack +, enableSoundSense ? false, soundSense, jdk +, enableStoneSense ? false , themes ? {} , theme ? null }: let + dfhack_ = dfhack.override { + inherit enableStoneSense; + }; + ptheme = if builtins.isString theme then builtins.getAttr theme themes @@ -12,19 +18,20 @@ let # These are in inverse order for first packages to override the next ones. pkgs = lib.optional (theme != null) ptheme - ++ lib.optional enableDFHack dfhack + ++ lib.optional enableDFHack dfhack_ + ++ lib.optional enableSoundSense soundSense ++ [ dwarf-fortress-original ]; env = buildEnv { name = "dwarf-fortress-env-${dwarf-fortress-original.dfVersion}"; paths = pkgs; - pathsToLink = [ "/" "/hack" ]; + pathsToLink = [ "/" "/hack" "/hack/scripts" ]; ignoreCollisions = true; postBuild = lib.optionalString enableDFHack '' rm $out/hack/symbols.xml - substitute ${dfhack}/hack/symbols.xml $out/hack/symbols.xml \ + substitute ${dfhack_}/hack/symbols.xml $out/hack/symbols.xml \ --replace $(cat ${dwarf-fortress-original}/hash.md5.orig) \ $(cat ${dwarf-fortress-original}/hash.md5) ''; @@ -44,6 +51,7 @@ stdenv.mkDerivation rec { runDF = ./dwarf-fortress.in; runDFHack = ./dfhack.in; + runSoundSense = ./soundSense.in; buildCommand = '' mkdir -p $out/bin @@ -57,6 +65,12 @@ stdenv.mkDerivation rec { --subst-var-by stdenv_shell ${stdenv.shell} \ --subst-var dfInit chmod 755 $out/bin/dfhack + '' + lib.optionalString enableSoundSense '' + substitute $runSoundSense $out/bin/soundsense \ + --subst-var-by stdenv_shell ${stdenv.shell} \ + --subst-var-by jre ${jdk.jre} \ + --subst-var dfInit + chmod 755 $out/bin/soundsense ''; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/wrapper/dfhack.in b/pkgs/games/dwarf-fortress/wrapper/dfhack.in index c8d8d287403b..4cf884ebed2c 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dfhack.in +++ b/pkgs/games/dwarf-fortress/wrapper/dfhack.in @@ -2,7 +2,7 @@ source @dfInit@ -for i in dfhack.init-example dfhack-config/default hack/*; do +for i in dfhack.init-example dfhack-config/default hack/* stonesense/*; do update_path "$i" done diff --git a/pkgs/games/dwarf-fortress/wrapper/soundSense.in b/pkgs/games/dwarf-fortress/wrapper/soundSense.in new file mode 100644 index 000000000000..28357ed7579f --- /dev/null +++ b/pkgs/games/dwarf-fortress/wrapper/soundSense.in @@ -0,0 +1,10 @@ +#!@stdenv_shell@ -e + +source @dfInit@ + +for p in soundsense/*; do + update_path "$p" +done + +cd "$DF_DIR" +PATH=@jre@/bin exec $DF_DIR/soundsense/soundSense.sh diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index fb01346d84e8..5665dfc9e945 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, mono, makeWrapper, lua , SDL2, freetype, openal, systemd, pkgconfig, - dotnetPackages, gnome3, curl, unzip, which + dotnetPackages, gnome3, curl, unzip, which, python }: stdenv.mkDerivation rec { @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { postInstall = with stdenv.lib; let runtime = makeLibraryPath [ SDL2 freetype openal systemd lua ]; - binaries= makeBinPath [ which mono gnome3.zenity ]; + binaries= makeBinPath [ which mono gnome3.zenity python ]; in '' wrapProgram $out/lib/openra/launch-game.sh \ --prefix PATH : "${binaries}" \ diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index a54d3a45ae81..6881767cbb90 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -24,8 +24,7 @@ in stdenv.mkDerivation rec { inherit name; - srcs = [ openrct2-src title-sequences-src ]; - sourceRoot = "."; + src = openrct2-src; buildInputs = [ SDL2 @@ -46,11 +45,7 @@ stdenv.mkDerivation rec { ]; postUnpack = '' - cp -r ${openrct2-src}/* ${sourceRoot} - cp -r ${title-sequences-src} ${sourceRoot}/title - - # creating temporary files in fixCmakeFiles fails otherwise - chmod -R u+w ${sourceRoot} + cp -r ${title-sequences-src} $sourceRoot/title ''; cmakeFlags = [ diff --git a/pkgs/games/robotfindskitten/default.nix b/pkgs/games/robotfindskitten/default.nix index 16e36a03dce0..00d73f95bdb3 100644 --- a/pkgs/games/robotfindskitten/default.nix +++ b/pkgs/games/robotfindskitten/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ]; + makeFlags = [ "execgamesdir=$(out)/bin" ]; + + postInstall = '' + install -Dm644 {nki,$out/share/games/robotfindskitten}/vanilla.nki + ''; + meta = { description = "Yet another zen simulation; A simple find-the-kitten game"; homepage = http://robotfindskitten.org/; diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 1ec9fc7d5d97..388e5cc3a6cf 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -26,7 +26,7 @@ let xlibs.libICE gnome2.GConf freetype - curl + (curl.override { gnutlsSupport = true; sslSupport = false; }) nspr nss fontconfig @@ -57,6 +57,7 @@ let glew110 openssl libidn + tbb # Other things from runtime xlibs.libXinerama diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 1b6ad5b34c32..26f0fe534f3f 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -1,4 +1,4 @@ -{ fetchpatch, fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, +{ fetchpatch, fetchurl, stdenv, mesa_glu, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, libpng, zlib, bash, makeWrapper }: @@ -29,18 +29,11 @@ stdenv.mkDerivation rec { sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in ''; - buildInputs = [ mesa freeglut libX11 plib openal freealut libXrandr xproto + buildInputs = [ mesa_glu freeglut libX11 plib openal freealut libXrandr xproto libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis makeWrapper ]; - nativeBuildInputs = [ bash ]; - installTargets = "install datainstall"; - postInstall = '' - wrapProgram $out/bin/torcs \ - --prefix LD_LIBRARY_PATH : ${mesa}/lib - ''; - meta = { description = "Car racing game"; homepage = http://torcs.sourceforge.net/; diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index 14ceb405d687..bfc8271ad659 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "PIXMAPS=$(out)/share/pixmaps" "UDEVBIN=$(out)/bin" "UDEVDIR=$(out)/etc/udev/rules.d" - "UDEVD=${systemd.udev.bin}/sbin/udevd" + "UDEVD=${systemd}/sbin/udevd" "LIBUDEVDIR=$(out)/lib/udev/rules.d" "USBDIR=$(out)/etc/hotplug/usb" "FOODB=$(out)/share/foomatic/db/source" diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index a01fc74ce471..66ed1d44adc7 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -11,16 +11,16 @@ let name = "hplip-${version}"; - version = "3.17.9"; + version = "3.17.10"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0y46jjq8jdfk9m4vjq55h8yggibvqbi9rl08vni7vbhxym1diamj"; + sha256 = "0v27hg856b5z2rilczcbfgz8ksxn0n810g1glac3mxkj8qbl8wqg"; }; plugin = fetchurl { - url = "http://hplipopensource.com/hplip-web/plugin/${name}-plugin.run"; - sha256 = "10z8vzwcwmwni7s4j9xp0fa7l4lwrhl4kp450dga3fj0cck1gxwq"; + url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; + sha256 = "07am3dnl0ipgfswz5wndprryljh9rqbfhq7mm4d4yyj3bdnnzlig"; }; hplipState = substituteAll { diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index f2d3abc0de3b..6be60526eb66 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; - sourceRoot = "snes9x-${version}-src"; preAutoreconf = "cd gtk; intltoolize"; buildInputs = [ SDL zlib gtk2 libxml2 libXv ]; diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index 357d65aed53f..f5f8d6a5f107 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to install DLLs needed to work around problems in Wine"; license = stdenv.lib.licenses.lgpl21; - homepage = http://code.google.com/p/winetricks/; + homepage = https://github.com/Winetricks/winetricks; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 15481d74598f..f312cce19d74 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec{ fontforge help2man groff makeWrapper t1utils ]; - enableParallelBuilding = true; + #enableParallelBuilding = true; # fatal error: parser.hh: No such file or directory meta = with stdenv.lib; { description = "Music typesetting system"; diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index bfbae3396c8b..9a4ec9f49f68 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.91.2.147"; + version = "3.92.1.72"; src = fetchFromGitHub { - owner = "tista500"; - repo = "Adapta"; + owner = "adapta-project"; + repo = "adapta-gtk-theme"; rev = version; - sha256 = "1sv4s8rcc40v4lanapdqanlqf1l60rbc5wd7h73l5cigbqxxgda9"; + sha256 = "19kav8m6aj4h7qg0z92k09lppzdgy6h9lxxv3qqqrl3hmg7bn0sx"; }; preferLocalBuild = true; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An adaptive Gtk+ theme based on Material Design"; - homepage = https://github.com/tista500/Adapta; + homepage = https://github.com/adapta-project/adapta-gtk-theme; license = with licenses; [ gpl2 cc-by-sa-30 ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix index 3fbb77816d3b..f0bb2bf729dc 100644 --- a/pkgs/misc/themes/e17gtk/default.nix +++ b/pkgs/misc/themes/e17gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "e17gtk-${version}"; - version = "3.22.1"; + version = "3.22.2"; src = fetchFromGitHub { owner = "tsujan"; repo = "E17gtk"; rev = "V${version}"; - sha256 = "0y1v5hamssgzgcmwbr60iz7wipb9yzzj3ypzkc6i65mp4pyazrv8"; + sha256 = "1qwj1hmdlk8sdqhkrh60p2xg4av1rl0lmipdg5j0i40318pmiml1"; }; installPhase = '' diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix index 233a73df868e..e21faf8b805c 100644 --- a/pkgs/misc/themes/numix/default.nix +++ b/pkgs/misc/themes/numix/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { repo = "numix-gtk-theme"; owner = "numixproject"; rev = version; - sha256 = "1fmlc6vi8prvwsq0nxxcd00lp04bwmapzjqf727wb1czqf2lf0dv"; + sha256 = "12mw0kr0kkvg395qlbsvkvaqccr90cmxw5rrsl236zh43kj8grb7"; }; nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ]; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 90502188e5fc..5ce787021489 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -3,7 +3,7 @@ , which, fetchgit, llvmPackages , xkb_switch, rustracerd, fzf , python3, boost, icu -, ycmd +, ycmd, makeWrapper, rake , pythonPackages, python3Packages , Cocoa ? null, git }: @@ -16,7 +16,7 @@ in # TL;DR # Add your plugin to ./vim-plugin-names -# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix"` +# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix null != gdb; + +/* + Note that this version of the extension still has some nix specific issues + which could not be fixed merely by patching (inside a C# dll). + + In particular, the debugger requires either gnome-terminal or xterm. However + instead of looking for the terminal executable in `PATH`, for any linux platform + the dll uses an hardcoded path to one of these. + + So, in order for debugging to work properly, you merely need to create symlinks + to one of these terminals at the appropriate location. + + The good news is the the utility library is open source and with some effort + we could build a patched version ourselves. See: + + + + Also, the extension should eventually no longer require an external terminal. See: + + + + Once the symbolic link temporary solution taken, everything shoud run smootly. +*/ + +let + gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; + + langComponentBinaries = stdenv.mkDerivation { + name = "cpptools-language-component-binaries"; + + src = fetchurl { + url = https://download.visualstudio.microsoft.com/download/pr/11151953/d3cc8b654bffb8a2f3896d101f3c3155/Bin_Linux.zip; + sha256 = "12qbxsrdc73cqjb84xdck1xafzhfkcyn6bqbpcy1bxxr3b7hxbii"; + }; + + buildInputs = [ unzip ]; + + patchPhase = '' + elfInterpreter="${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2" + patchelf --set-interpreter "$elfInterpreter" ./Microsoft.VSCode.CPP.Extension.linux + patchelf --set-interpreter "$elfInterpreter" ./Microsoft.VSCode.CPP.IntelliSense.Msvc.linux + chmod a+x ./Microsoft.VSCode.CPP.Extension.linux ./Microsoft.VSCode.CPP.IntelliSense.Msvc.linux + ''; + + installPhase = '' + mkdir -p "$out/bin" + find . -mindepth 1 -maxdepth 1 | xargs cp -a -t "$out/bin" + ''; + }; + + cpptoolsJsonFile = fetchurl { + url = https://download.visualstudio.microsoft.com/download/pr/11070848/7b97d6724d52cae8377c61bb4601c989/cpptools.json; + sha256 = "124f091aic92rzbg2vg831y22zr5wi056c1kh775djqs3qv31ja6"; + }; + + + + openDebugAD7Script = writeScript "OpenDebugAD7" '' + #!${stdenv.shell} + BIN_DIR="$(cd "$(dirname "$0")" && pwd -P)" + ${if gdbUseFixed + then '' + export PATH=''${PATH}''${PATH:+:}${gdb}/bin + '' + else ""} + ${mono46}/bin/mono $BIN_DIR/bin/OpenDebugAD7.exe $* + ''; +in + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "cpptools"; + publisher = "ms-vscode"; + version = "0.12.3"; + sha256 = "1dcqy54n1w29xhbvxscd41hdrbdwar6g12zx02f6kh2f1kw34z5z"; + }; + + buildInputs = [ + dos2unix + ]; + + prePatch = '' + dos2unix package.json + ''; + + patches = [ + ./vscode-cpptools-0-12-3-package-json.patch + ]; + + postPatch = '' + # Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. + substituteInPlace "./package.json" \ + --replace "\"default\": \"/usr/bin/gdb\"" "\"default\": \"${gdbDefaultsTo}\"" + + # Prevent download/install of extensions + touch "./install.lock" + + # Move unused files out of the way. + mv ./debugAdapters/bin/OpenDebugAD7.exe.config ./debugAdapters/bin/OpenDebugAD7.exe.config.unused + + # Bring the `cpptools.json` file at the root of the package, same as the extension would do. + cp -p "${cpptoolsJsonFile}" "./cpptools.json" + + # Combining the language component binaries as part of our package. + find "${langComponentBinaries}/bin" -mindepth 1 -maxdepth 1 | xargs cp -p -t "./bin" + + # Mono runtimes from nix package (used by generated `OpenDebugAD7`). + rm "./debugAdapters/OpenDebugAD7" + cp -p "${openDebugAD7Script}" "./debugAdapters/OpenDebugAD7" + + # Clang-format from nix package. + mkdir -p "./LLVM" + find "${clang-tools}" -mindepth 1 -maxdepth 1 | xargs ln -s -t "./LLVM" + ''; + + meta = with stdenv.lib; { + license = licenses.unfree; + maintainer = [ maintainers.jraygauthier ]; + # A 32 bit linux would also be possible with some effort (specific download of binaries + + # patching of the elf files with 32 bit interpreter). + platforms = [ "x86_64-linux" ]; + }; +} \ No newline at end of file diff --git a/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch b/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch new file mode 100644 index 000000000000..1873963f460d --- /dev/null +++ b/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch @@ -0,0 +1,82 @@ +diff --git a/package.json b/package.json +index 518e839..1c17c35 100644 +--- a/package.json ++++ b/package.json +@@ -37,7 +37,26 @@ + "Linters" + ], + "activationEvents": [ +- "*" ++ "onLanguage:cpp", ++ "onLanguage:c", ++ "onCommand:extension.pickNativeProcess", ++ "onCommand:extension.pickRemoteNativeProcess", ++ "onCommand:extension.provideInitialConfigurations_cppvsdbg", ++ "onCommand:extension.provideInitialConfigurations_cppdbg", ++ "onCommand:C_Cpp.ConfigurationEdit", ++ "onCommand:C_Cpp.ConfigurationSelect", ++ "onCommand:C_Cpp.SwitchHeaderSource", ++ "onCommand:C_Cpp.UnloadLanguageServer", ++ "onCommand:C_Cpp.Navigate", ++ "onCommand:C_Cpp.GoToDeclaration", ++ "onCommand:C_Cpp.PeekDeclaration", ++ "onCommand:C_Cpp.ToggleErrorSquiggles", ++ "onCommand:C_Cpp.ToggleIncludeFallback", ++ "onCommand:C_Cpp.ShowReleaseNotes", ++ "onCommand:C_Cpp.ResetDatabase", ++ "workspaceContains:.vscode/c_cpp_properties.json", ++ "onDebug:cppdbg", ++ "onDebug:cppvsdbg" + ], + "main": "./out/src/main", + "contributes": { +@@ -281,8 +300,7 @@ + "cpp" + ] + }, +- "runtime": "node", +- "program": "./out/src/Debugger/Proxy/debugProxy.js", ++ "program": "./debugAdapters/OpenDebugAD7", + "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", + "variables": { + "pickProcess": "extension.pickNativeProcess", +@@ -722,7 +740,29 @@ + } + } + } +- } ++ }, ++ "configurationSnippets": [ ++ { ++ "label": "C/C++: (gdb) Launch", ++ "description": "Launch with gdb.", ++ "bodyText": "{\n\t\"name\": \"(gdb) Launch\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"launch\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"args\": [],\n\t\"stopAtEntry\": false,\n\t\"cwd\": \"\\${workspaceRoot}\",\n\t\"environment\": [],\n\t\"externalConsole\": true,\n\t\"MIMode\": \"gdb\",\n\t\"setupCommands\": [\n\t {\n\t \"description\": \"Enable pretty-printing for gdb\",\n\t \"text\": \"-enable-pretty-printing\",\n\t \"ignoreFailures\": true\n\t }\n\t]\n}" ++ }, ++ { ++ "label": "C/C++: (gdb) Attach", ++ "description": "Attach with gdb.", ++ "bodyText": "{ \n\t\"name\": \"(gdb) Attach\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"attach\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"processId\": \"\\${command:pickProcess}\",\n\t\"MIMode\": \"gdb\"\n}" ++ }, ++ { ++ "label": "C/C++: (gdb) Pipe Launch", ++ "description": "Pipe Launch with gdb.", ++ "bodyText": "{\n\t\"name\": \"(gdb) Pipe Launch\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"launch\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"args\": [],\n\t\"stopAtEntry\": false,\n\t\"cwd\": \"\\${workspaceRoot}\",\n\t\"environment\": [],\n\t\"externalConsole\": true,\n\t\"pipeTransport\": {\n\t\t\"debuggerPath\": \"/usr/bin/gdb\",\n\t\t\"pipeProgram\": \"/usr/bin/ssh\",\n\t\t\"pipeArgs\": [],\n\t\t\"pipeCwd\": \"\"\n\t},\n\t\"MIMode\": \"gdb\",\n\t\"setupCommands\": [\n\t {\n\t \"description\": \"Enable pretty-printing for gdb\",\n\t \"text\": \"-enable-pretty-printing\",\n\t \"ignoreFailures\": true\n\t }\n\t]\n}" ++ }, ++ { ++ "label": "C/C++: (gdb) Pipe Attach", ++ "description": "Pipe Attach with gdb.", ++ "bodyText": "{\n\t\"name\": \"(gdb) Pipe Attach\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"attach\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"processId\": \"\\${command:pickRemoteProcess}\",\n\t\"pipeTransport\": {\n\t\t\"debuggerPath\": \"/usr/bin/gdb\",\n\t\t\"pipeProgram\": \"/usr/bin/ssh\",\n\t\t\"pipeArgs\": [],\n\t\t\"pipeCwd\": \"\"\n\t},\n\t\"MIMode\": \"gdb\"\n}" ++ } ++ ] + }, + { + "type": "cppvsdbg", +@@ -741,7 +781,7 @@ + "variables": { + "pickProcess": "extension.pickNativeProcess" + }, +- "initialConfigurations": "extension.provideInitialConfigurations_cppvsdbg", ++ "initialConfigurations": "", + "configurationAttributes": { + "launch": { + "required": [ diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index d357c43abd85..8047e29ad558 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, vscode-utils }: +{ stdenv, lib, fetchurl, callPackage, vscode-utils }: let inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension; @@ -22,4 +22,6 @@ rec { license = licenses.mit; }; }; + + ms-vscode.cpptools = callPackage ./cpptools {}; } \ No newline at end of file diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 0e8389948870..965632b5788d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -144,6 +144,10 @@ let appleDerivation_ = name: version: sha256: attrs: stdenv.mkDerivation ({ inherit version; name = "${name}-${version}"; + enableParallelBuilding = true; + meta = { + platforms = stdenv.lib.platforms.darwin; + }; } // (if attrs ? srcs then {} else { src = fetchApple version sha256 name; }) // attrs); @@ -153,7 +157,7 @@ let name = builtins.elemAt (stdenv.lib.splitString "/" namePath) 0; appleDerivation = appleDerivation_ name version sha256; callPackage = pkgs.newScope (packages // pkgs.darwin // { inherit appleDerivation name version; }); - in callPackage (./. + builtins.toPath "/${namePath}"); + in callPackage (./. + "/${namePath}"); libsecPackage = pkgs.callPackage ./libsecurity_generic { inherit applePackage appleDerivation_; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix index 0234cbc62792..fb1ea2509d76 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix @@ -6,7 +6,7 @@ appleDerivation { libsecurity_cdsa_plugin ]; patchPhase = '' - cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/local/include/sandbox_private.h . + cp ${osx_private_sdk}/include/sandbox_private.h . substituteInPlace sandbox_private.h --replace '' '"${apple_sdk.sdk}/include/sandbox.h"' substituteInPlace lib/AtomicFile.cpp --replace '' '"sandbox_private.h"' ''; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index ef449a7d415d..93857ea792c2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -10,7 +10,7 @@ name: version: sha256: args: let patchPhase = '' # allows including - ln -s ${pkgs.darwin.osx_private_sdk}/PrivateSDK10.9.sparse.sdk/System/Library/Frameworks/Security.framework/Versions/A/PrivateHeaders Security + cp -R ${pkgs.darwin.osx_private_sdk}/include/SecurityPrivateHeaders Security grep -Rl MacErrors.h . | while read file; do substituteInPlace "''$file" --replace \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix index 34a2a49ea0e4..06137879410d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix @@ -18,9 +18,9 @@ appleDerivation { substituteInPlace lib/SecCertificate.cpp --replace '#include ' "" - cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/xpc/private.h xpc + cp ${osx_private_sdk}/include/xpc/private.h xpc cp ${apple_sdk.sdk}/include/xpc/*.h xpc - cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/local/include/sandbox_private.h lib/sandbox.h + cp ${osx_private_sdk}/include/sandbox_private.h lib/sandbox.h substituteInPlace lib/SecItemPriv.h \ --replace "extern CFTypeRef kSecAttrAccessGroup" "extern const CFTypeRef kSecAttrAccessGroup" \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix index 8dae60724137..bb55fd48d8b2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix @@ -17,9 +17,8 @@ appleDerivation { substituteInPlace lib/powerwatch.h --replace \ '' \ '"${IOKit}/Library/Frameworks/IOKit.framework/Headers/pwr_mgt/IOPMLibPrivate.h"' - - cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/security_utilities/utilities_dtrace.h lib - cp -R ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/local/include/bsm lib + cp -R ${osx_private_sdk}/include/bsm lib + cp ${osx_private_sdk}/include/utilities_dtrace.h lib '' + stdenv.lib.optionalString (!stdenv.cc.nativeLibc) '' substituteInPlace lib/vproc++.cpp --replace /usr/local/include/vproc_priv.h ${stdenv.libc}/include/vproc_priv.h ''; diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index fd0d00d81cfb..0ce9c54e48c4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -127,8 +127,4 @@ appleDerivation { mkdir $out/Library/PrivateFrameworks mv $out/Library/Frameworks/IOKit.framework $out/Library/PrivateFrameworks ''; - - meta = { - platforms = stdenv.lib.platforms.darwin; - }; } diff --git a/pkgs/os-specific/darwin/cf-private/default.nix b/pkgs/os-specific/darwin/cf-private/default.nix index 48860504f73c..f8c25339370b 100644 --- a/pkgs/os-specific/darwin/cf-private/default.nix +++ b/pkgs/os-specific/darwin/cf-private/default.nix @@ -1,31 +1,18 @@ { stdenv, osx_private_sdk, CF }: -let - headers = [ - "CFAvailability.h" - "CFAttributedString.h" - "CFFileDescriptor.h" - "CFFileSecurity.h" - "CFNotificationCenter.h" - "CFStringTokenizer.h" - "CFURLEnumerator.h" - "CFURL.h" - "CoreFoundation.h" - ]; - -in stdenv.mkDerivation { +stdenv.mkDerivation { name = "${CF.name}-private"; phases = [ "installPhase" "fixupPhase" ]; installPhase = '' dest=$out/Library/Frameworks/CoreFoundation.framework/Headers mkdir -p $dest pushd $dest - for file in ${CF}/Library/Frameworks/CoreFoundation.framework/Headers/*; do - ln -s $file - done + cp -Lv ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* $dest + for file in ${CF}/Library/Frameworks/CoreFoundation.framework/Headers/*; do + ln -sf $file + done popd - install -m 0644 ${osx_private_sdk}/PrivateSDK10.10.sparse.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/{${stdenv.lib.concatStringsSep "," headers}} $dest ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/os-specific/darwin/osx-private-sdk/default.nix b/pkgs/os-specific/darwin/osx-private-sdk/default.nix index c2c2aea54f8c..1eecdbc5618d 100644 --- a/pkgs/os-specific/darwin/osx-private-sdk/default.nix +++ b/pkgs/os-specific/darwin/osx-private-sdk/default.nix @@ -1,8 +1,27 @@ { stdenv, fetchFromGitHub }: -fetchFromGitHub { - owner = "samdmarshall"; - repo = "OSXPrivateSDK"; - rev = "f4d52b60e86b496abfaffa119a7d299562d99783"; - sha256 = "0bv0884yxpvk2ishxj8gdy1w6wb0gwfq55q5qjp0s8z0z7f63zqh"; +stdenv.mkDerivation { + name = "OSXPrivateSDK"; + + src = fetchFromGitHub { + owner = "samdmarshall"; + repo = "OSXPrivateSDK"; + rev = "f4d52b60e86b496abfaffa119a7d299562d99783"; + sha256 = "0bv0884yxpvk2ishxj8gdy1w6wb0gwfq55q5qjp0s8z0z7f63zqh"; + }; + + # NOTE: we install only headers that are really needed to keep closure sie + # reasonable. + installPhase = '' + mkdir -p $out/include + sdk10=PrivateSDK10.10.sparse.sdk + sdk=PrivateSDK10.9.sparse.sdk + cp $sdk/usr/local/include/sandbox_private.h $out/include/sandbox_private.h + # this can be removed once we dtrace binary + cp $sdk/usr/local/include/security_utilities/utilities_dtrace.h $out/include/utilities_dtrace.h + cp -RL $sdk/usr/include/xpc $out/include/xpc + cp -RL $sdk/usr/local/include/bsm $out/include/bsm + cp -RL $sdk/System/Library/Frameworks/Security.framework/Versions/A/PrivateHeaders $out/include/SecurityPrivateHeaders + cp -RL $sdk10/System/Library/Frameworks/CoreFoundation.framework/Headers $out/include/CoreFoundationPrivateHeaders + ''; } diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix index 5a89940c9dae..2b8c7718aee8 100644 --- a/pkgs/os-specific/darwin/security-tool/default.nix +++ b/pkgs/os-specific/darwin/security-tool/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchPhase = '' # copied from libsecurity_generic - ln -s ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/System/Library/Frameworks/Security.framework/Versions/A/PrivateHeaders Security + cp -R ${osx_private_sdk}/include/SecurityPrivateHeaders Security substituteInPlace cmsutil.c --replace \ '' \ diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index b8b08430de86..28b17d7e69c4 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 = "20171014"; + version = "20171031"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "15mqngwv7x2xpdsaiga33lb0s9hcrhnambcv9fp6jvgkf6604cdr"; + sha256 = "0h9rp1bmry81lybly9x7qjdmaq0sj0m1ybl237qly8zqw7ywv5la"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 698c478aca07..8c207e4a47d7 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -24,6 +24,8 @@ in stdenv.mkDerivation { export E2FSCK=${e2fsprogs}/bin/fsck.ext2 export E3FSCK=${e2fsprogs}/bin/fsck.ext3 export E4FSCK=${e2fsprogs}/bin/fsck.ext4 + + unset STRIP # Makefile.rules defines a usable STRIP only without the env var. ''; installPhase = '' diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 37c8c6841f69..75b7802772d6 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper cmake flex bison ]; + cmakeFlags="-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules"; + postInstall = '' mkdir -p $out/bin $out/share rm -r $out/share/bcc/tools/old @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { mv $out/share/bcc/man $out/share/ find $out/share/bcc/tools -type f -executable -print0 | \ - while IFS= read -r -d $'\0' f; do + while IFS= read -r -d ''$'\0' f; do pythonLibs="$out/lib/python2.7/site-packages:${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages" rm -f $out/bin/$(basename $f) makeWrapper $f $out/bin/$(basename $f) \ @@ -39,6 +41,6 @@ stdenv.mkDerivation rec { description = "Dynamic Tracing Tools for Linux"; homepage = https://iovisor.github.io/bcc/; license = licenses.asl20; - maintainers = with maintainers; [ ragge ]; + maintainers = with maintainers; [ ragge mic92 ]; }; } diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index 9fbed50f3b9a..8e01bb2a5c80 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -10,16 +10,17 @@ stdenv.mkDerivation rec { sha256 = "1m5wjm43lzp6bld8higsvdm2dkddydihhwv9qw2w9r4dm0largcv"; }; + # Don't build tests + postPatch = '' + sed '/-C test/d' -i Makefile + sed '1i#include ' -i checkpolicy.c + ''; + nativeBuildInputs = [ bison flex ]; buildInputs = [ libsepol ]; NIX_CFLAGS_COMPILE = "-fstack-protector-all"; - # Don't build tests - postPatch = '' - sed -i '/-C test/d' Makefile - ''; - preBuild = '' makeFlagsArray+=("LEX=flex") makeFlagsArray+=("LIBDIR=${libsepol}/lib") diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 6f14e713139a..23d1c4821b87 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,26 +1,27 @@ { stdenv, fetchurl, protobuf, protobufc, asciidoc -, xmlto, utillinux, docbook_xsl, libpaper, libnl, libcap, pkgconfig +, xmlto, utillinux, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig , python }: stdenv.mkDerivation rec { name = "criu-${version}"; - version = "2.0"; + version = "2.12.1"; src = fetchurl { url = "http://download.openvz.org/criu/${name}.tar.bz2"; - sha256 = "1zqqshslcf503lqip89azp1zz0i8kb7v19b3dyp52izpak62c1z8"; + sha256 = "18m0sjgcfvzc86w49fd3kxw145nmrsvc5w7zf42nxdiklmszbr1k"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig docbook_xsl ]; - buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap python ]; + buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ]; patchPhase = '' chmod +w ./scripts/gen-offsets.sh substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" + substituteInPlace ./Documentation/Makefile --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3" - substituteInPlace ./Makefile --replace "tar-name := $(shell git tag -l v$(CRIU_VERSION))" "tar-name = 2.0" # --replace "-Werror" "" + substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${version}.0" ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. @@ -31,7 +32,9 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; - hardeningDisable = [ "stackprotector" ]; + hardeningDisable = [ "stackprotector" "fortify" ]; + # dropping fortify here as well as package uses it by default: + # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] installPhase = '' mkdir -p $out/etc/logrotate.d diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 5c0fae7bf4fa..971eef6a8b52 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preConfigure = '' - export PATH=${systemd.udev.bin}/sbin:$PATH + export PATH=${systemd}/sbin:$PATH substituteInPlace user/Makefile.in \ --replace /sbin '$(sbindir)' substituteInPlace user/legacy/Makefile.in \ diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 9230e6920f96..5ee8ab564b09 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.48"; + version="0.9.50"; name="${baseName}-${version}"; - hash="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3"; - url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.48.tar.xz"; - sha256="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3"; + hash="005q7f1h7z4c1wg8vzb1zh0xi4msz6z0fcph0y3ywhlbxjvpam61"; + url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.50.tar.xz"; + sha256="005q7f1h7z4c1wg8vzb1zh0xi4msz6z0fcph0y3ywhlbxjvpam61"; }; buildInputs = [ which diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 455defa5823e..09ca05484f7f 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -1,30 +1,10 @@ { stdenv, fetchurl, gtk_doc, pkgconfig, gobjectIntrospection, intltool , libgudev, polkit, appstream-glib, gusb, sqlite, libarchive , libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar -, fwupdate, libgpgerror, libyaml, valgrind, meson, libuuid, pygobject3 -, pillow, ninja, gcab, makeWrapper, glib, gdk_pixbuf +, fwupdate, libyaml, valgrind, meson, libuuid, pygobject3 +, pillow, ninja, gcab }: let version = "0.9.6"; - rpath = stdenv.lib.makeLibraryPath - [ libuuid.out - appstream-glib - glib - libsoup - gdk_pixbuf - libarchive.lib - gcab - sqlite.out - gusb - polkit.out - gpgme - libgpgerror - libelf - efivar - libsmbios - fwupdate - libgudev - "$out" - ]; in stdenv.mkDerivation { name = "fwupd-${version}"; @@ -36,18 +16,13 @@ in [ gtk_doc pkgconfig gobjectIntrospection intltool libgudev polkit appstream-glib gusb sqlite libarchive libsoup docbook2x libxslt libelf libsmbios fwupdate libyaml valgrind - meson gpgme libuuid pygobject3 pillow ninja gcab makeWrapper + meson gpgme libuuid pygobject3 pillow ninja gcab ]; patches = [ ./fix-missing-deps.patch ]; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${efivar}/include/efivar" ''; mesonFlags = [ "-Denable-colorhug=false" "-Denable-man=false" "-Denable-tests=false" "--localstatedir=/var" "-Denable-doc=false" "-Dwith-bootdir=/boot" ]; - postFixup = '' - for prog in $out/bin/* $out/libexec/fwupd/*; do - wrapProgram "$prog" --prefix LD_LIBRARY_PATH : ${rpath} - done - ''; enableParallelBuilding = true; meta = { license = [ stdenv.lib.licenses.gpl2 ]; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index bb714f60c2df..c71f1c0ea2e9 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "raspberrypi-firmware-${version}"; - version = "1.20170811"; + version = "1.20171029"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "1lrbbslpwjgvrn7hk3l104gkl07qxh7qd4cdyqccqhqzip9wqhkn"; + sha256 = "12aisha8rlr28310hakps04z9p45kd2wvks0w1vxw1kwfh1ncy9s"; }; dontStrip = true; # Stripping breaks some of the binaries diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix index 1ca7d43b6a70..73a6d18fc8b7 100644 --- a/pkgs/os-specific/linux/ftop/default.nix +++ b/pkgs/os-specific/linux/ftop/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0"; src = fetchurl { - url = "http://ftop.googlecode.com/files/${name}.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ftop/${name}.tar.bz2"; sha256 = "3a705f4f291384344cd32c3dd5f5f6a7cd7cea7624c83cb7e923966dbcd47f82"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Show progress of open files and file systems"; - homepage = https://code.google.com/p/ftop/; + homepage = https://code.google.com/archive/p/ftop/; license = licenses.gpl3Plus; longDescription = '' ftop is to files what top is to processes. The progress of all open files diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index dcbf3232e940..6d0c5ae82bcc 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "i7z-0.27.2"; src = fetchurl { - url = "http://i7z.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/i7z/${name}.tar.gz"; sha256 = "1wa7ix6m75wl3k2n88sz0x8cckvlzqklja2gvzqfw5rcfdjjvxx7"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "A better i7 (and now i3, i5) reporting tool for Linux"; - homepage = http://code.google.com/p/i7z; + homepage = https://github.com/ajaiantilal/i7z; repositories.git = https://github.com/ajaiantilal/i7z.git; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix index 0d33954fd5d8..d604c9ef6b79 100644 --- a/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }: stdenv.mkDerivation rec { - version = "r4.0-59481"; name = "intel-ocl-${version}"; + version = "5.0-63503"; src = fetchzip { - url = "https://software.intel.com/sites/default/files/managed/48/96/SRB4_linux64.zip"; - sha256 = "1q69g28i6l7p13hnsk82g2qhdf2chwh4f0wvzac6xml67hna3v34"; + url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/11396/SRB5.0_linux64.zip"; + sha256 = "0qbp63l74s0i80ysh9ya8x7r79xkddbbz4378nms9i7a0kprg9p2"; stripRoot = false; }; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { 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 + rpmextract source/intel-opencl-r${version}.x86_64.rpm + rpmextract source/intel-opencl-cpu-r${version}.x86_64.rpm ''; patchPhase = '' diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index 43edd8723a01..50f0398e1343 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation { src = sourceAttrs.src; - sourceRoot = "Jool-v${sourceAttrs.version}-src/usr"; + setSourceRoot = '' + sourceRoot=$(echo */usr) + ''; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libnl ]; diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix index 8e9f29306e74..617dad8bdddc 100644 --- a/pkgs/os-specific/linux/jujuutils/default.nix +++ b/pkgs/os-specific/linux/jujuutils/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation { name = "jujuutils-0.2"; src = fetchurl { - url = "http://jujuutils.googlecode.com/files/jujuutils-0.2.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jujuutils/jujuutils-0.2.tar.gz"; sha256 = "1r74m7s7rs9d6y7cffi7mdap3jf96qwm1v6jcw53x5cikgmfxn4x"; }; buildInputs = [ linuxHeaders ]; meta = { - homepage = http://code.google.com/p/jujuutils/; + homepage = https://github.com/cladisch/linux-firewire-utils; description = "Utilities around FireWire devices connected to a Linux computer"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch new file mode 100644 index 000000000000..8f2418c9efce --- /dev/null +++ b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch @@ -0,0 +1,407 @@ +commit e7cae741f6d645ac68fe8823ca6ef45dbbf6891b +Author: Tejun Heo +Date: Fri Mar 11 07:31:23 2016 -0500 + + sched: Misc preps for cgroup unified hierarchy interface + + Make the following changes in preparation for the cpu controller + interface implementation for the unified hierarchy. This patch + doesn't cause any functional differences. + + * s/cpu_stats_show()/cpu_cfs_stats_show()/ + + * s/cpu_files/cpu_legacy_files/ + + * Separate out cpuacct_stats_read() from cpuacct_stats_show(). While + at it, remove pointless cpuacct_stat_desc[] array. + + Signed-off-by: Tejun Heo + Cc: Ingo Molnar + Cc: Peter Zijlstra + Cc: Li Zefan + Cc: Johannes Weiner + +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index 732e993..77f3ddd 100644 +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -8512,7 +8512,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) + return ret; + } + +-static int cpu_stats_show(struct seq_file *sf, void *v) ++static int cpu_cfs_stats_show(struct seq_file *sf, void *v) + { + struct task_group *tg = css_tg(seq_css(sf)); + struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; +@@ -8552,7 +8552,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css, + } + #endif /* CONFIG_RT_GROUP_SCHED */ + +-static struct cftype cpu_files[] = { ++static struct cftype cpu_legacy_files[] = { + #ifdef CONFIG_FAIR_GROUP_SCHED + { + .name = "shares", +@@ -8573,7 +8573,7 @@ static struct cftype cpu_files[] = { + }, + { + .name = "stat", +- .seq_show = cpu_stats_show, ++ .seq_show = cpu_cfs_stats_show, + }, + #endif + #ifdef CONFIG_RT_GROUP_SCHED +@@ -8599,7 +8599,7 @@ struct cgroup_subsys cpu_cgrp_subsys = { + .fork = cpu_cgroup_fork, + .can_attach = cpu_cgroup_can_attach, + .attach = cpu_cgroup_attach, +- .legacy_cftypes = cpu_files, ++ .legacy_cftypes = cpu_legacy_files, + .early_init = 1, + }; + +diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c +index dd7cbb5..42b2dd5 100644 +--- a/kernel/sched/cpuacct.c ++++ b/kernel/sched/cpuacct.c +@@ -177,36 +177,33 @@ static int cpuacct_percpu_seq_show(struct seq_file *m, void *V) + return 0; + } + +-static const char * const cpuacct_stat_desc[] = { +- [CPUACCT_STAT_USER] = "user", +- [CPUACCT_STAT_SYSTEM] = "system", +-}; +- +-static int cpuacct_stats_show(struct seq_file *sf, void *v) ++static void cpuacct_stats_read(struct cpuacct *ca, u64 *userp, u64 *sysp) + { +- struct cpuacct *ca = css_ca(seq_css(sf)); + int cpu; +- s64 val = 0; + ++ *userp = 0; + for_each_online_cpu(cpu) { + struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); +- val += kcpustat->cpustat[CPUTIME_USER]; +- val += kcpustat->cpustat[CPUTIME_NICE]; ++ *userp += kcpustat->cpustat[CPUTIME_USER]; ++ *userp += kcpustat->cpustat[CPUTIME_NICE]; + } +- val = cputime64_to_clock_t(val); +- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_USER], val); + +- val = 0; ++ *sysp = 0; + for_each_online_cpu(cpu) { + struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); +- val += kcpustat->cpustat[CPUTIME_SYSTEM]; +- val += kcpustat->cpustat[CPUTIME_IRQ]; +- val += kcpustat->cpustat[CPUTIME_SOFTIRQ]; ++ *sysp += kcpustat->cpustat[CPUTIME_SYSTEM]; ++ *sysp += kcpustat->cpustat[CPUTIME_IRQ]; ++ *sysp += kcpustat->cpustat[CPUTIME_SOFTIRQ]; + } ++} + +- val = cputime64_to_clock_t(val); +- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_SYSTEM], val); ++static int cpuacct_stats_show(struct seq_file *sf, void *v) ++{ ++ cputime64_t user, sys; + ++ cpuacct_stats_read(css_ca(seq_css(sf)), &user, &sys); ++ seq_printf(sf, "user %lld\n", cputime64_to_clock_t(user)); ++ seq_printf(sf, "system %lld\n", cputime64_to_clock_t(sys)); + return 0; + } + + +commit 1bb33e8a69f089f2d3f58a0e681d4ff352e11c97 +Author: Tejun Heo +Date: Fri Mar 11 07:31:23 2016 -0500 + + sched: Implement interface for cgroup unified hierarchy + + While the cpu controller doesn't have any functional problems, there + are a couple interface issues which can be addressed in the v2 + interface. + + * cpuacct being a separate controller. This separation is artificial + and rather pointless as demonstrated by most use cases co-mounting + the two controllers. It also forces certain information to be + accounted twice. + + * Use of different time units. Writable control knobs use + microseconds, some stat fields use nanoseconds while other cpuacct + stat fields use centiseconds. + + * Control knobs which can't be used in the root cgroup still show up + in the root. + + * Control knob names and semantics aren't consistent with other + controllers. + + This patchset implements cpu controller's interface on the unified + hierarchy which adheres to the controller file conventions described + in Documentation/cgroups/unified-hierarchy.txt. Overall, the + following changes are made. + + * cpuacct is implictly enabled and disabled by cpu and its information + is reported through "cpu.stat" which now uses microseconds for all + time durations. All time duration fields now have "_usec" appended + to them for clarity. While this doesn't solve the double accounting + immediately, once majority of users switch to v2, cpu can directly + account and report the relevant stats and cpuacct can be disabled on + the unified hierarchy. + + Note that cpuacct.usage_percpu is currently not included in + "cpu.stat". If this information is actually called for, it can be + added later. + + * "cpu.shares" is replaced with "cpu.weight" and operates on the + standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000). + The weight is scaled to scheduler weight so that 100 maps to 1024 + and the ratio relationship is preserved - if weight is W and its + scaled value is S, W / 100 == S / 1024. While the mapped range is a + bit smaller than the orignal scheduler weight range, the dead zones + on both sides are relatively small and covers wider range than the + nice value mappings. This file doesn't make sense in the root + cgroup and isn't create on root. + + * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max" + which contains both quota and period. + + * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by + "cpu.rt.max" which contains both runtime and period. + + v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for + CFS bandwidth stats and also using raw division for u64. Use + CONFIG_CFS_BANDWITH and do_div() instead. + + The semantics of "cpu.rt.max" is not fully decided yet. Dropped + for now. + + Signed-off-by: Tejun Heo + Cc: Ingo Molnar + Cc: Peter Zijlstra + Cc: Li Zefan + Cc: Johannes Weiner + +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index 77f3ddd..7aafe63 100644 +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -8591,6 +8591,139 @@ static struct cftype cpu_legacy_files[] = { + { } /* terminate */ + }; + ++static int cpu_stats_show(struct seq_file *sf, void *v) ++{ ++ cpuacct_cpu_stats_show(sf); ++ ++#ifdef CONFIG_CFS_BANDWIDTH ++ { ++ struct task_group *tg = css_tg(seq_css(sf)); ++ struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; ++ u64 throttled_usec; ++ ++ throttled_usec = cfs_b->throttled_time; ++ do_div(throttled_usec, NSEC_PER_USEC); ++ ++ seq_printf(sf, "nr_periods %d\n" ++ "nr_throttled %d\n" ++ "throttled_usec %llu\n", ++ cfs_b->nr_periods, cfs_b->nr_throttled, ++ throttled_usec); ++ } ++#endif ++ return 0; ++} ++ ++#ifdef CONFIG_FAIR_GROUP_SCHED ++static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css, ++ struct cftype *cft) ++{ ++ struct task_group *tg = css_tg(css); ++ u64 weight = scale_load_down(tg->shares); ++ ++ return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024); ++} ++ ++static int cpu_weight_write_u64(struct cgroup_subsys_state *css, ++ struct cftype *cftype, u64 weight) ++{ ++ /* ++ * cgroup weight knobs should use the common MIN, DFL and MAX ++ * values which are 1, 100 and 10000 respectively. While it loses ++ * a bit of range on both ends, it maps pretty well onto the shares ++ * value used by scheduler and the round-trip conversions preserve ++ * the original value over the entire range. ++ */ ++ if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX) ++ return -ERANGE; ++ ++ weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL); ++ ++ return sched_group_set_shares(css_tg(css), scale_load(weight)); ++} ++#endif ++ ++static void __maybe_unused cpu_period_quota_print(struct seq_file *sf, ++ long period, long quota) ++{ ++ if (quota < 0) ++ seq_puts(sf, "max"); ++ else ++ seq_printf(sf, "%ld", quota); ++ ++ seq_printf(sf, " %ld\n", period); ++} ++ ++/* caller should put the current value in *@periodp before calling */ ++static int __maybe_unused cpu_period_quota_parse(char *buf, ++ u64 *periodp, u64 *quotap) ++{ ++ char tok[21]; /* U64_MAX */ ++ ++ if (!sscanf(buf, "%s %llu", tok, periodp)) ++ return -EINVAL; ++ ++ *periodp *= NSEC_PER_USEC; ++ ++ if (sscanf(tok, "%llu", quotap)) ++ *quotap *= NSEC_PER_USEC; ++ else if (!strcmp(tok, "max")) ++ *quotap = RUNTIME_INF; ++ else ++ return -EINVAL; ++ ++ return 0; ++} ++ ++#ifdef CONFIG_CFS_BANDWIDTH ++static int cpu_max_show(struct seq_file *sf, void *v) ++{ ++ struct task_group *tg = css_tg(seq_css(sf)); ++ ++ cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg)); ++ return 0; ++} ++ ++static ssize_t cpu_max_write(struct kernfs_open_file *of, ++ char *buf, size_t nbytes, loff_t off) ++{ ++ struct task_group *tg = css_tg(of_css(of)); ++ u64 period = tg_get_cfs_period(tg); ++ u64 quota; ++ int ret; ++ ++ ret = cpu_period_quota_parse(buf, &period, "a); ++ if (!ret) ++ ret = tg_set_cfs_bandwidth(tg, period, quota); ++ return ret ?: nbytes; ++} ++#endif ++ ++static struct cftype cpu_files[] = { ++ { ++ .name = "stat", ++ .flags = CFTYPE_NOT_ON_ROOT, ++ .seq_show = cpu_stats_show, ++ }, ++#ifdef CONFIG_FAIR_GROUP_SCHED ++ { ++ .name = "weight", ++ .flags = CFTYPE_NOT_ON_ROOT, ++ .read_u64 = cpu_weight_read_u64, ++ .write_u64 = cpu_weight_write_u64, ++ }, ++#endif ++#ifdef CONFIG_CFS_BANDWIDTH ++ { ++ .name = "max", ++ .flags = CFTYPE_NOT_ON_ROOT, ++ .seq_show = cpu_max_show, ++ .write = cpu_max_write, ++ }, ++#endif ++ { } /* terminate */ ++}; ++ + struct cgroup_subsys cpu_cgrp_subsys = { + .css_alloc = cpu_cgroup_css_alloc, + .css_free = cpu_cgroup_css_free, +@@ -8600,7 +8733,15 @@ struct cgroup_subsys cpu_cgrp_subsys = { + .can_attach = cpu_cgroup_can_attach, + .attach = cpu_cgroup_attach, + .legacy_cftypes = cpu_legacy_files, ++ .dfl_cftypes = cpu_files, + .early_init = 1, ++#ifdef CONFIG_CGROUP_CPUACCT ++ /* ++ * cpuacct is enabled together with cpu on the unified hierarchy ++ * and its stats are reported through "cpu.stat". ++ */ ++ .depends_on = 1 << cpuacct_cgrp_id, ++#endif + }; + + #endif /* CONFIG_CGROUP_SCHED */ +diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c +index 42b2dd5..b4d32a6 100644 +--- a/kernel/sched/cpuacct.c ++++ b/kernel/sched/cpuacct.c +@@ -224,6 +224,30 @@ static struct cftype files[] = { + { } /* terminate */ + }; + ++/* used to print cpuacct stats in cpu.stat on the unified hierarchy */ ++void cpuacct_cpu_stats_show(struct seq_file *sf) ++{ ++ struct cgroup_subsys_state *css; ++ u64 usage, user, sys; ++ ++ css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys); ++ ++ usage = cpuusage_read(css, seq_cft(sf)); ++ cpuacct_stats_read(css_ca(css), &user, &sys); ++ ++ user *= TICK_NSEC; ++ sys *= TICK_NSEC; ++ do_div(usage, NSEC_PER_USEC); ++ do_div(user, NSEC_PER_USEC); ++ do_div(sys, NSEC_PER_USEC); ++ ++ seq_printf(sf, "usage_usec %llu\n" ++ "user_usec %llu\n" ++ "system_usec %llu\n", usage, user, sys); ++ ++ css_put(css); ++} ++ + /* + * charge this task's execution time to its accounting group. + * +diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h +index ed60562..44eace9 100644 +--- a/kernel/sched/cpuacct.h ++++ b/kernel/sched/cpuacct.h +@@ -2,6 +2,7 @@ + + extern void cpuacct_charge(struct task_struct *tsk, u64 cputime); + extern void cpuacct_account_field(struct task_struct *p, int index, u64 val); ++extern void cpuacct_cpu_stats_show(struct seq_file *sf); + + #else + +@@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *p, int index, u64 val) + { + } + ++static inline void cpuacct_cpu_stats_show(struct seq_file *sf) ++{ ++} ++ + #endif diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 3912d9d10f5e..c2f4e6843f59 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -29,7 +29,6 @@ , ... }: -assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null; assert stdenv.isLinux; let diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index 77d137f94535..bb40bbcb72ea 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.9"; + version = "4.13.11"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "13ra6psp6w3rf5vzmvhg88v2nh8zq20xl0r92728b8x9vgj1bp51"; + sha256 = "1vzl2i72c8iidhdc8a490npsbk7q7iphjqil4i9609disqw75gx4"; }; } // (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 new file mode 100644 index 000000000000..3a49c3486876 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -0,0 +1,11 @@ +{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.4.96"; + extraMeta.branch = "4.4"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "1asvcqip5w9nkg4c5jllbjygski9cnw7qn6ci7p6zwnd2mfks794"; + }; +} // (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 e1f3fe63ea07..7431694e362e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.58"; + version = "4.9.60"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "19r1ybrfqjh2cmpvljd94cwag34kly7pzih2j5m4nr49hsi153vl"; + sha256 = "015dzkrhadmr3kadz0m3yhjikkmga8dv90f6s5ji5i2ja5f6qchf"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index a93e4a96119c..47ef31bd20a5 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.13.9"; + version = "4.13.11"; revision = "a"; - sha256 = "0v2ki1vgmg8yifnflbhryrv7pxvyf0157ysngc1n1hcqyypq4sji"; + sha256 = "1nby5iii1k0vjvs1s2qvlszln2p9sza9ivbjjdhrmvpp1shzwcvx"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index dc4d10a04125..c7e9859ded79 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,18 +1,20 @@ -{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: +{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - mptcpVersion = "0.91.3"; - modDirVersion = "4.1.38"; + mptcpVersion = "0.93"; + modDirVersion = "4.9.60"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; extraMeta = { - branch = "4.1"; - maintainers = [ stdenv.lib.maintainers.layus ]; + branch = "4.4"; + maintainers = with stdenv.lib.maintainers; [ teto layus ]; }; - src = fetchurl { - url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; - sha256 = "0vqjnkzcbbvyq24w3cryfmw7hhws1xqkkxqcv71szkbqqs6mcr14"; + src = fetchFromGitHub { + owner = "multipath-tcp"; + repo = "mptcp"; + rev = "v${mptcpVersion}"; + sha256 = "1irlppzvcmckrazs2c4vg6y8ji31552izc3wqabf401v57jvxcys"; }; extraConfig = '' diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 2d8a3f0afcdd..fb97aa579df0 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,8 @@ { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: let - modDirVersion = "4.9.41"; - tag = "1.20170811"; + modDirVersion = "4.9.59"; + tag = "1.20171029"; in stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { version = "${modDirVersion}-${tag}"; @@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "1ly0x7a43zvig0fv7lc6rpq49pcdb7i9sdb78p4gi5485zap40kb"; + sha256 = "19lb1gxz21x1d5zdznzqfq60kxg7iqmyl6l0mb9qg2vrl8fcgnxk"; }; features = { diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 3a8d82cdb269..54e37e721303 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.14-rc6"; - modDirVersion = "4.14.0-rc6"; + version = "4.14-rc8"; + modDirVersion = "4.14.0-rc8"; extraMeta.branch = "4.14"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0gmxrf4jmw8xl5gx487chyx94yas7rva5jbkczm9iw9sw0c8gwcb"; + sha256 = "0ir2ggflm1xjnn1kvv2c99m5zni5kg0ygzlpm588wnhkzd93nqjh"; }; # 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 8227475f1b1a..28ad5aeca35f 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl -, writeTextFile, ubootChooser +, writeTextFile, ubootTools , hostPlatform }: @@ -224,8 +224,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe enableParallelBuilding = true; - nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] ++ optional (stdenv.platform.uboot != null) - (ubootChooser stdenv.platform.uboot); + nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] + ++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ]; @@ -244,10 +244,6 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe karch = cp.kernelArch; - # !!! uboot has messed up cross-compiling, nativeDrv builds arm tools on x86, - # crossDrv builds x86 tools on x86 (but arm uboot). If this is fixed, uboot - # can just go into buildInputs (but not nativeBuildInputs since cp.uboot - # may be different from stdenv.platform.uboot) - buildInputs = optional (cp.uboot != null) (ubootChooser cp.uboot).crossDrv; + nativeBuildInputs = optional (cp.kernelTarget == "uImage") ubootTools; }; }) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 93d7acdd8e71..c1288108b4f1 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -58,15 +58,6 @@ rec { cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; - DCCP_double_free_vulnerability_CVE-2017-6074 = rec - { name = "DCCP_double_free_vulnerability_CVE-2017-6074.patch"; - patch = fetchpatch { - inherit name; - url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4"; - sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2"; - }; - }; - tag_hardened = rec { name = "tag-hardened"; patch = ./tag-hardened.patch; diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 1cc8ab60d75a..17cd40e427b9 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -30,9 +30,8 @@ stdenv.mkDerivation rec { # ensure capsh can find bash in $PATH substituteInPlace progs/capsh.c --replace execve execvpe - ''; - preInstall = '' + # set prefixes substituteInPlace Make.Rules \ --replace 'prefix=/usr' "prefix=$lib" \ --replace 'exec_prefix=' "exec_prefix=$out" \ diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index f20efcb32373..541ead7258f6 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -39,6 +39,9 @@ stdenv.mkDerivation rec { postPatch = optionalString enablePython '' sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile + '' + + '' + sed '1i#include ' -i src/setrans_client.c ''; preBuild = '' diff --git a/pkgs/os-specific/linux/lsb-release/default.nix b/pkgs/os-specific/linux/lsb-release/default.nix index 9715f77f9e4e..34dae105a8dd 100644 --- a/pkgs/os-specific/linux/lsb-release/default.nix +++ b/pkgs/os-specific/linux/lsb-release/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, getopt }: +{ stdenv, fetchurl, perl, coreutils, getopt, makeWrapper }: stdenv.mkDerivation rec { version = "1.4"; @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=$(out)" ]; - buildInputs = [ perl getopt ]; + nativeBuildInputs = [ makeWrapper perl ]; + + buildInputs = [ coreutils getopt ]; + + # Ensure utilities used are available + preFixup = '' + wrapProgram $out/bin/lsb_release --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils getopt ]} + ''; meta = { description = "Prints certain LSB (Linux Standard Base) and Distribution information"; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 1a36c669577b..6382b90f1683 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ - --replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm + --replace /usr/bin/udevadm ${systemd}/bin/udevadm sed -i /DEFAULT_SYS_DIR/d Makefile.in sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index c51b8b26c809..aaef5315b0f0 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.17"; + version = "1.1.18"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "0r0lyp2w6v2bvm8h1si7w3p2qx037szl14qnxm5p00568z3m3an8"; + sha256 = "0651lnj5spckqjf83nz116s8qhhydgqdy3rkl4icbh5f05fyw5yh"; }; enableParallelBuilding = true; @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { "CFLAGS=-fstack-protector-strong" ]; - patches = []; - dontDisableStatic = true; meta = { diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 3801036f9e57..5b16799a89c7 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "rewritefs-${version}"; - version = "2016-07-27"; + version = "2017-08-14"; src = fetchFromGitHub { - owner = "sloonz"; - repo = "rewritefs"; - rev = "fe19d389746bdffcc1cc7b3e3156dbacd04b4e9b"; + owner = "sloonz"; + repo = "rewritefs"; + rev = "33fb844d8e8ff441a3fc80d2715e8c64f8563d81"; sha256 = "15bcxprkxf0xqxljsqhb0jpi7p1vwqcb00sjs7nzrj7vh2p7mqla"; }; diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/os-specific/linux/service-wrapper/default.nix new file mode 100644 index 000000000000..07a9b06ae76d --- /dev/null +++ b/pkgs/os-specific/linux/service-wrapper/default.nix @@ -0,0 +1,25 @@ +{ lib, runCommand, substituteAll, fetchurl, systemd, coreutils }: + +let + name = "service-wrapper-${version}"; + version = "16.04.0"; # Ajar to Ubuntu Release +in +runCommand "${name}" { + script = substituteAll { + src = ./service-wrapper.sh; + inherit coreutils; + }; + + meta = with lib; { + description = "A convenient wrapper for the systemctl commands, borrow from Ubuntu"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ DerTim1 ]; + }; +} +'' + mkdir -p $out/bin + ln -s $out/bin $out/sbin + cp $script $out/bin/service + chmod a+x $out/bin/service +'' diff --git a/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh b/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh new file mode 100755 index 000000000000..373d86443f02 --- /dev/null +++ b/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh @@ -0,0 +1,247 @@ +#!/bin/sh + +########################################################################### +# /usr/bin/service +# +# A convenient wrapper for the /etc/init.d init scripts. +# +# This script is a modified version of the /sbin/service utility found on +# Red Hat/Fedora systems (licensed GPLv2+). +# +# Copyright (C) 2006 Red Hat, Inc. All rights reserved. +# Copyright (C) 2008 Canonical Ltd. +# * August 2008 - Dustin Kirkland +# Copyright (C) 2013 Michael Stapelberg +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# On Debian GNU/Linux systems, the complete text of the GNU General +# Public License can be found in `/usr/share/common-licenses/GPL-2'. +########################################################################### + + +is_ignored_file() { + case "$1" in + skeleton | README | *.dpkg-dist | *.dpkg-old | rc | rcS | single | reboot | bootclean.sh) + return 0 + ;; + esac + return 1 +} + +VERSION=$(@coreutils@/bin/basename $0)" ver. 0.91-ubuntu1" +USAGE="Usage: "$(@coreutils@/bin/basename $0)" < option > | --status-all | \ +[ service_name [ command | --full-restart ] ]" +SERVICE= +ACTION= +SERVICEDIR="/etc/init.d" +OPTIONS= +is_systemd= + + +if [ $# -eq 0 ]; then + echo "${USAGE}" >&2 + exit 1 +fi + +if [ -d /run/systemd/system ]; then + is_systemd=1 +fi + +cd / +while [ $# -gt 0 ]; do + case "${1}" in + --help | -h | --h* ) + echo "${USAGE}" >&2 + exit 0 + ;; + --version | -V ) + echo "${VERSION}" >&2 + exit 0 + ;; + *) + if [ -z "${SERVICE}" -a $# -eq 1 -a "${1}" = "--status-all" ]; then + if [ -d "${SERVICEDIR}" ]; then + cd ${SERVICEDIR} + for SERVICE in * ; do + case "${SERVICE}" in + functions | halt | killall | single| linuxconf| kudzu) + ;; + *) + if ! is_ignored_file "${SERVICE}" \ + && [ -x "${SERVICEDIR}/${SERVICE}" ]; then + out=$(env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status 2>&1) + retval=$? + if echo "$out" | egrep -iq "usage:"; then + #printf " %s %-60s %s\n" "[?]" "$SERVICE:" "unknown" 1>&2 + echo " [ ? ] $SERVICE" 1>&2 + continue + else + if [ "$retval" = "0" -a -n "$out" ]; then + #printf " %s %-60s %s\n" "[+]" "$SERVICE:" "running" + echo " [ + ] $SERVICE" + continue + else + #printf " %s %-60s %s\n" "[-]" "$SERVICE:" "NOT running" + echo " [ - ] $SERVICE" + continue + fi + fi + #env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status + fi + ;; + esac + done + else + systemctl $sctl_args list-units + fi + exit 0 + elif [ $# -eq 2 -a "${2}" = "--full-restart" ]; then + SERVICE="${1}" + # On systems using systemd, we just perform a normal restart: + # A restart with systemd is already a full restart. + if [ -n "$is_systemd" ]; then + ACTION="restart" + else + if [ -x "${SERVICEDIR}/${SERVICE}" ]; then + env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" stop + env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" start + exit $? + fi + fi + elif [ -z "${SERVICE}" ]; then + SERVICE="${1}" + elif [ -z "${ACTION}" ]; then + ACTION="${1}" + else + OPTIONS="${OPTIONS} ${1}" + fi + shift + ;; + esac +done + +# Operate against system upstart, not session +unset UPSTART_SESSION +if [ -r "/etc/init/${SERVICE}.conf" ] && which initctl >/dev/null \ + && initctl version 2>/dev/null | grep -q upstart \ + && initctl status ${SERVICE} 2>/dev/null 1>/dev/null +then + # Upstart configuration exists for this job and we're running on upstart + case "${ACTION}" in + start|stop|status|reload) + # Action is a valid upstart action + exec ${ACTION} ${SERVICE} ${OPTIONS} + ;; + restart|force-reload) + # Map restart to the usual sysvinit behavior. + # Map force-reload to restart as per Debian policy 9.3.2, + # since there is no way to know if "reload" is supported + stop ${SERVICE} ${OPTIONS} || : + exec start ${SERVICE} ${OPTIONS} + ;; + esac +fi + + +run_via_sysvinit() { + # Otherwise, use the traditional sysvinit + if [ -x "${SERVICEDIR}/${SERVICE}" ]; then + exec env -i LANG="$LANG" LANGUAGE="$LANGUAGE" LC_CTYPE="$LC_CTYPE" LC_NUMERIC="$LC_NUMERIC" LC_TIME="$LC_TIME" LC_COLLATE="$LC_COLLATE" LC_MONETARY="$LC_MONETARY" LC_MESSAGES="$LC_MESSAGES" LC_PAPER="$LC_PAPER" LC_NAME="$LC_NAME" LC_ADDRESS="$LC_ADDRESS" LC_TELEPHONE="$LC_TELEPHONE" LC_MEASUREMENT="$LC_MEASUREMENT" LC_IDENTIFICATION="$LC_IDENTIFICATION" LC_ALL="$LC_ALL" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" ${ACTION} ${OPTIONS} + else + echo "${SERVICE}: unrecognized service" >&2 + exit 1 + fi +} + +update_openrc_started_symlinks() { + # maintain the symlinks of /run/openrc/started so that + # rc-status works with the service command as well + if [ -d /run/openrc/started ] ; then + case "${ACTION}" in + start) + if [ ! -h /run/openrc/started/$SERVICE ] ; then + ln -s $SERVICEDIR/$SERVICE /run/openrc/started/$SERVICE || true + fi + ;; + stop) + rm /run/openrc/started/$SERVICE || true + ;; + esac + fi +} + +# When this machine is running systemd, standard service calls are turned into +# systemctl calls. +if [ -n "$is_systemd" ] +then + UNIT="${SERVICE%.sh}.service" + # avoid deadlocks during bootup and shutdown from units/hooks + # which call "invoke-rc.d service reload" and similar, since + # the synchronous wait plus systemd's normal behaviour of + # transactionally processing all dependencies first easily + # causes dependency loops + if ! systemctl --quiet is-active multi-user.target; then + sctl_args="--job-mode=ignore-dependencies" + fi + + case "${ACTION}" in + restart|status) + exec systemctl $sctl_args ${ACTION} ${UNIT} + ;; + start|stop) + # Follow the principle of least surprise for SysV people: + # When running "service foo stop" and foo happens to be a service that + # has one or more .socket files, we also stop the .socket units. + # Users who need more control will use systemctl directly. + for unit in $(systemctl list-unit-files --full --type=socket 2>/dev/null | sed -ne 's/\.socket\s*[a-z]*\s*$/.socket/p'); do + if [ "$(systemctl -p Triggers show $unit)" = "Triggers=${UNIT}" ]; then + systemctl $sctl_args ${ACTION} $unit + fi + done + exec systemctl $sctl_args ${ACTION} ${UNIT} + ;; + reload) + _canreload="$(SYSTEMCTL -p CanReload show ${UNIT} 2>/dev/null)" + if [ "$_canreload" = "CanReload=no" ]; then + # The reload action falls back to the sysv init script just in case + # the systemd service file does not (yet) support reload for a + # specific service. + run_via_sysvinit + else + exec systemctl $sctl_args reload "${UNIT}" + fi + ;; + force-stop) + exec systemctl --signal=KILL kill "${UNIT}" + ;; + force-reload) + _canreload="$(systemctl -p CanReload show ${UNIT} 2>/dev/null)" + if [ "$_canreload" = "CanReload=no" ]; then + exec systemctl $sctl_args restart "${UNIT}" + else + exec systemctl $sctl_args reload "${UNIT}" + fi + ;; + *) + # We try to run non-standard actions by running + # the init script directly. + run_via_sysvinit + ;; + esac +fi + +update_openrc_started_symlinks +run_via_sysvinit diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 5e0f83c4c681..b29573179f85 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -63,8 +63,8 @@ in assert buildKernel -> kernel != null; { splStable = common { - version = "0.7.2"; - sha256 = "10rq0npjlp09xjdgn9lc3wm310dqc71j0wgxwj92ncf9r61zf445"; + version = "0.7.3"; + sha256 = "0j8mb9ky3pjz9hnz5w6fajpzajl15jq3p0xvxb6lhpqj3rjzsqxb"; }; splUnstable = common { diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 3d4309b7177a..f54f3ab311a5 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -4,15 +4,15 @@ let version = lib.concatStringsSep "." ([ majorVersion ] ++ lib.optional (patchVersion != "") patchVersion); - majorVersion = "2.30"; - patchVersion = "2"; + majorVersion = "2.31"; + patchVersion = ""; in stdenv.mkDerivation rec { name = "util-linux-${version}"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; - sha256 = "1p494mwd8v6p6mpmmjybkc7bz1qwp9x4cdi8hdvp2nwvkr4fanvv"; + sha256 = "12nw108xjhm63sh2n5a0qs33vpvbvb6rln96l9j50p7wykf7rgpr"; }; patches = [ diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 18ed3287edc4..cc1890438f96 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20171017"; + version = "0.0.20171101"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1k9m980d7zmnhpj9kanyfavqrn7ryva16iblk9jrk6sdhxi9mdsp"; + sha256 = "0983aivw7wc5qq8didh4bdbdxcmddbpganf0z1xnqmjyls168sq9"; }; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index e231e3a59892..2ebb2b1890d5 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -3,11 +3,11 @@ , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.34.0"; + name = "xf86-input-wacom-0.35.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "0idhkigl0pnyp08sqm6bqfb4h20v6rjrb71z1gdv59gk7d7qwpgi"; + sha256 = "0za44snc0zirq65a4lxsmg7blp1bynj6j835hm459x8yx1qhmxjm"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index bfa8dac72ba7..ccec513a4704 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -140,9 +140,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.2"; + version = "0.7.3"; - sha256 = "1dl6i4sg7z0k4p1dmfcm9arx62x30lqsr9hycvhhs3pf58ks8z2v"; + sha256 = "1bbajrwfilnmfhn1n69gvsaznyc4q29wi7nkwc0p9r4dli37w28b"; extraPatches = [ (fetchpatch { diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index cc68697756cd..152e60455746 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -1,20 +1,28 @@ { stdenv, fetchurl, jre, makeWrapper, bash, - majorVersion ? "0.9" }: + majorVersion ? "1.0" }: let versionMap = { - "0.8" = { kafkaVersion = "0.8.2.2"; - scalaVersion = "2.10"; - sha256 = "1azccf1k0nr8y1sfpjgqf9swyp87ypvgva68ci4kczwcx1z9d89v"; - }; - "0.9" = { kafkaVersion = "0.9.0.1"; - scalaVersion = "2.11"; - sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v"; - }; - "0.10" = { kafkaVersion = "0.10.2.0"; - scalaVersion = "2.12"; - sha256 = "0py43s6zv8z7wr2lk8403k07xxckl11gla3vs4gr99lixc4whis1"; - }; + "0.9" = { + kafkaVersion = "0.9.0.1"; + scalaVersion = "2.11"; + sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v"; + }; + "0.10" = { + kafkaVersion = "0.10.2.1"; + scalaVersion = "2.12"; + sha256 = "0iszr6r0n9yjgq7kcp1hf00fg754m86gs4jzqc18542an94b88z5"; + }; + "0.11" = { + kafkaVersion = "0.11.0.1"; + scalaVersion = "2.12"; + sha256 = "1wj639h95aq5n132fq1rbyzqh5rsa4mlhbg3c5mszqglnzdz4xn7"; + }; + "1.0" = { + kafkaVersion = "1.0.0"; + scalaVersion = "2.12"; + sha256 = "1cs4nmp39m99gqjpy5klsffqksc0h9pz514jkq99qb95a83x1cfm"; + }; }; in diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 24f5cec8179b..c24780095dbe 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.10.9"; + version = "0.10.10"; goPackagePath = "github.com/mholt/caddy"; @@ -12,19 +12,9 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "1shry7dqcbb5d3hp9xz5l3jx9a6i18wssz3m28kpjf3cks427v55"; + sha256 = "1x7f1yz5vnsy9n50ak0vjrm4w8fqc1qvhv8fmqnsc8cgbp7f3p8w"; }; - patches = [ - # This header was added in 0.10.9 and was since reverted but no new release made - # remove this patch when updating to next release - (fetchpatch { - url = "https://github.com/mholt/caddy/commit/d267b62fe9fdd008f13774afc72d95335934d133.patch"; - name = "revert-sponsors-header.patch"; - sha256 = "192g23kzkrwgif7ii9c70mh1a25gwhm1l1mzyqm9i0d3jifsfc2j"; - }) - ]; - buildFlagsArray = '' -ldflags= -X github.com/mholt/caddy/caddy/caddymain.gitTag=v${version} diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 81d6d54df69c..9207ceb12f1a 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn , systemd, nettle, libedit, zlib, libiconv, libintlOrEmpty -, fetchpatch }: let inherit (stdenv.lib) optional optionals; in @@ -8,27 +7,13 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "68e04961d0bf6ba193cb7ec658b295c4ff6e60b3754d64bcd77ebdcee0f283fd"; + sha256 = "3013d45b4c7484268f3cad078f66f730a5bc9606e6b1061488dd821c1dce41e3"; }; - patches = [ - # remove both for >= 2.6.1 - (fetchpatch { - name = "kdig-tls.patch"; - url = "https://gitlab.labs.nic.cz/knot/knot-dns/commit/b72d5cd032795.diff"; - sha256 = "0ig31rp82j49jh8n3s0dcf5abhh35mcp2k2wii7bh0c60ngb29k6"; - }) - (fetchpatch { - name = "kdig-tls-sni.patch"; - url = "https://gitlab.labs.nic.cz/knot/knot-dns/commit/2e94ccee671ec70e.diff"; - sha256 = "0psl6650v7g240i8w196v7zxy6j11d0aa6hm11b7vnaimjshgibv"; - }) - ]; - outputs = [ "bin" "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 44c8b933400e..ad5c87de365e 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "ac19c121fd687c7e4f5f907b46932d26f8f9d9e01626c4dadb3847e25ea31ceb"; + sha256 = "c032e63a6b922294746e1ab4002860346e7a6d92b8502965a13ba599088fcb42"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 0e8d1e70bc70..9b017249c15e 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -11,11 +11,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pdns-recursor-${version}"; - version = "4.0.4"; + version = "4.0.6"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "0k8y9zxj2lz4rq782vgzr28yd43q0hwlnvszwq0k9l6c967pff13"; + sha256 = "03fnjiacvhdlkr3a2206mham0p6p24gkawashs5v12r68k32l67j"; }; nativeBuildInputs = [ pkgconfig ]; @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { "--with-systemd" ]; + enableParallelBuilding = true; + meta = { description = "A recursive DNS server"; homepage = http://www.powerdns.com/; diff --git a/pkgs/servers/dnschain/default.nix b/pkgs/servers/dnschain/default.nix deleted file mode 100644 index 52cccae50c52..000000000000 --- a/pkgs/servers/dnschain/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchFromGitHub, callPackage, makeWrapper, openssl }: - -let - nodePackages = callPackage (import ../../top-level/node-packages.nix) { - self = nodePackages; - generated = ./package.nix; - }; - -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.json b/pkgs/servers/dnschain/package.json deleted file mode 100644 index fda40c8a90a6..000000000000 --- a/pkgs/servers/dnschain/package.json +++ /dev/null @@ -1,3 +0,0 @@ -[ "dnschain" -, "coffee-script" -] diff --git a/pkgs/servers/dnschain/package.nix b/pkgs/servers/dnschain/package.nix deleted file mode 100644 index 600f5a94684f..000000000000 --- a/pkgs/servers/dnschain/package.nix +++ /dev/null @@ -1,2188 +0,0 @@ - -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."accepts"."~1.2.3" = - self.by-version."accepts"."1.2.13"; - by-version."accepts"."1.2.13" = self.buildNodePackage { - name = "accepts-1.2.13"; - version = "1.2.13"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz"; - name = "accepts-1.2.13.tgz"; - sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; - }; - deps = { - "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 = { - }; - peerDependencies = []; - 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 { - name = "async-0.2.10"; - version = "0.2.10"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; - name = "async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."~0.9.0" = - self.by-version."async"."0.9.2"; - by-version."async"."0.9.2" = self.buildNodePackage { - name = "async-0.9.2"; - version = "0.9.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - name = "async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."better-curry"."1.x.x" = - self.by-version."better-curry"."1.6.0"; - by-version."better-curry"."1.6.0" = self.buildNodePackage { - name = "better-curry-1.6.0"; - version = "1.6.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/better-curry/-/better-curry-1.6.0.tgz"; - name = "better-curry-1.6.0.tgz"; - sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."binaryheap".">= 0.0.3" = - self.by-version."binaryheap"."0.0.3"; - by-version."binaryheap"."0.0.3" = self.buildNodePackage { - name = "binaryheap-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz"; - name = "binaryheap-0.0.3.tgz"; - sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bindings"."*" = - self.by-version."bindings"."1.2.1"; - by-version."bindings"."1.2.1" = self.buildNodePackage { - name = "bindings-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; - name = "bindings-1.2.1.tgz"; - sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bluebird"."2.9.9" = - self.by-version."bluebird"."2.9.9"; - by-version."bluebird"."2.9.9" = self.buildNodePackage { - name = "bluebird-2.9.9"; - version = "2.9.9"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; - name = "bluebird-2.9.9.tgz"; - sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bottleneck"."1.5.x" = - self.by-version."bottleneck"."1.5.3"; - by-version."bottleneck"."1.5.3" = self.buildNodePackage { - name = "bottleneck-1.5.3"; - version = "1.5.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz"; - name = "bottleneck-1.5.3.tgz"; - sha1 = "55fa64920d9670087d44150404525d59f9511c20"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."buffercursor".">= 0.0.12" = - self.by-version."buffercursor"."0.0.12"; - by-version."buffercursor"."0.0.12" = self.buildNodePackage { - name = "buffercursor-0.0.12"; - version = "0.0.12"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz"; - name = "buffercursor-0.0.12.tgz"; - sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; - }; - deps = { - "verror-1.9.0" = self.by-version."verror"."1.9.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."buffercursor".">= 0.0.5" = - self.by-version."buffercursor"."0.0.12"; - by-spec."coffee-script"."*" = - 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 = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz"; - name = "coffee-script-1.12.2.tgz"; - sha1 = "0d4cbdee183f650da95419570c4929d08ef91376"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "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 { - name = "colors-0.6.2"; - version = "0.6.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - name = "colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."combined-stream"."~0.0.4" = - self.by-version."combined-stream"."0.0.7"; - by-version."combined-stream"."0.0.7" = self.buildNodePackage { - name = "combined-stream-0.0.7"; - version = "0.0.7"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - name = "combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - deps = { - "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."component-emitter"."1.1.2" = - self.by-version."component-emitter"."1.1.2"; - by-version."component-emitter"."1.1.2" = self.buildNodePackage { - name = "component-emitter-1.1.2"; - version = "1.1.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; - name = "component-emitter-1.1.2.tgz"; - sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."content-disposition"."0.5.0" = - self.by-version."content-disposition"."0.5.0"; - by-version."content-disposition"."0.5.0" = self.buildNodePackage { - name = "content-disposition-0.5.0"; - version = "0.5.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; - name = "content-disposition-0.5.0.tgz"; - sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookie"."0.1.2" = - self.by-version."cookie"."0.1.2"; - by-version."cookie"."0.1.2" = self.buildNodePackage { - name = "cookie-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; - name = "cookie-0.1.2.tgz"; - sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookie-signature"."1.0.5" = - self.by-version."cookie-signature"."1.0.5"; - by-version."cookie-signature"."1.0.5" = self.buildNodePackage { - name = "cookie-signature-1.0.5"; - version = "1.0.5"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; - name = "cookie-signature-1.0.5.tgz"; - sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookiejar"."2.0.1" = - self.by-version."cookiejar"."2.0.1"; - by-version."cookiejar"."2.0.1" = self.buildNodePackage { - name = "cookiejar-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; - name = "cookiejar-2.0.1.tgz"; - sha1 = "3d12752f6adf68a892f332433492bd5812bb668f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - 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 = "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 = { - }; - optionalDependencies = { - }; - peerDependencies = []; - 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 { - name = "crc-3.2.1"; - version = "3.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; - name = "crc-3.2.1.tgz"; - sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cycle"."1.0.x" = - self.by-version."cycle"."1.0.3"; - by-version."cycle"."1.0.3" = self.buildNodePackage { - name = "cycle-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - name = "cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."1.x.x" = - self.by-version."debug"."1.0.4"; - by-version."debug"."1.0.4" = self.buildNodePackage { - name = "debug-1.0.4"; - version = "1.0.4"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; - name = "debug-1.0.4.tgz"; - sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; - }; - deps = { - "ms-0.6.2" = self.by-version."ms"."0.6.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."2" = - 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 = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; - name = "debug-2.6.0.tgz"; - sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; - }; - deps = { - "ms-0.7.2" = self.by-version."ms"."0.7.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."~2.1.1" = - self.by-version."debug"."2.1.3"; - by-version."debug"."2.1.3" = self.buildNodePackage { - name = "debug-2.1.3"; - version = "2.1.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; - name = "debug-2.1.3.tgz"; - sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e"; - }; - deps = { - "ms-0.7.0" = self.by-version."ms"."0.7.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."delayed-stream"."0.0.5" = - self.by-version."delayed-stream"."0.0.5"; - by-version."delayed-stream"."0.0.5" = self.buildNodePackage { - name = "delayed-stream-0.0.5"; - version = "0.0.5"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - name = "delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."depd"."~1.0.0" = - self.by-version."depd"."1.0.1"; - by-version."depd"."1.0.1" = self.buildNodePackage { - name = "depd-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; - name = "depd-1.0.1.tgz"; - sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."destroy"."1.0.3" = - self.by-version."destroy"."1.0.3"; - by-version."destroy"."1.0.3" = self.buildNodePackage { - name = "destroy-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; - name = "destroy-1.0.3.tgz"; - sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."duplexer"."~0.1.1" = - self.by-version."duplexer"."0.1.1"; - by-version."duplexer"."0.1.1" = self.buildNodePackage { - name = "duplexer-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; - name = "duplexer-0.1.1.tgz"; - sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ee-first"."1.1.0" = - self.by-version."ee-first"."1.1.0"; - by-version."ee-first"."1.1.0" = self.buildNodePackage { - name = "ee-first-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; - name = "ee-first-1.1.0.tgz"; - sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."es5class"."2.x.x" = - self.by-version."es5class"."2.3.1"; - by-version."es5class"."2.3.1" = self.buildNodePackage { - name = "es5class-2.3.1"; - version = "2.3.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/es5class/-/es5class-2.3.1.tgz"; - name = "es5class-2.3.1.tgz"; - sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66"; - }; - deps = { - "better-curry-1.6.0" = self.by-version."better-curry"."1.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."escape-html"."1.0.1" = - self.by-version."escape-html"."1.0.1"; - by-version."escape-html"."1.0.1" = self.buildNodePackage { - name = "escape-html-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; - name = "escape-html-1.0.1.tgz"; - sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."etag"."~1.5.1" = - self.by-version."etag"."1.5.1"; - by-version."etag"."1.5.1" = self.buildNodePackage { - name = "etag-1.5.1"; - version = "1.5.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; - name = "etag-1.5.1.tgz"; - sha1 = "54c50de04ee42695562925ac566588291be7e9ea"; - }; - deps = { - "crc-3.2.1" = self.by-version."crc"."3.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."event-stream"."3.2.2" = - self.by-version."event-stream"."3.2.2"; - by-version."event-stream"."3.2.2" = self.buildNodePackage { - name = "event-stream-3.2.2"; - version = "3.2.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz"; - name = "event-stream-3.2.2.tgz"; - sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d"; - }; - deps = { - "through-2.3.8" = self.by-version."through"."2.3.8"; - "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; - "from-0.1.3" = self.by-version."from"."0.1.3"; - "map-stream-0.1.0" = self.by-version."map-stream"."0.1.0"; - "pause-stream-0.0.11" = self.by-version."pause-stream"."0.0.11"; - "split-0.3.3" = self.by-version."split"."0.3.3"; - "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."eventemitter3"."0.x.x" = - self.by-version."eventemitter3"."0.1.6"; - by-version."eventemitter3"."0.1.6" = self.buildNodePackage { - name = "eventemitter3-0.1.6"; - version = "0.1.6"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz"; - name = "eventemitter3-0.1.6.tgz"; - sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."express"."4.11.2" = - self.by-version."express"."4.11.2"; - by-version."express"."4.11.2" = self.buildNodePackage { - name = "express-4.11.2"; - version = "4.11.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.11.2.tgz"; - name = "express-4.11.2.tgz"; - sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148"; - }; - deps = { - "accepts-1.2.13" = self.by-version."accepts"."1.2.13"; - "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; - "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.1" = self.by-version."depd"."1.0.1"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.5.1" = self.by-version."etag"."1.5.1"; - "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.2" = self.by-version."methods"."1.1.2"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - "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.10" = self.by-version."proxy-addr"."1.0.10"; - "qs-2.3.3" = self.by-version."qs"."2.3.3"; - "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"; - "vary-1.0.1" = self.by-version."vary"."1.0.1"; - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."extend"."~1.2.1" = - self.by-version."extend"."1.2.1"; - by-version."extend"."1.2.1" = self.buildNodePackage { - name = "extend-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; - name = "extend-1.2.1.tgz"; - sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - 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 = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - name = "extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."eyes"."0.1.x" = - self.by-version."eyes"."0.1.8"; - by-version."eyes"."0.1.8" = self.buildNodePackage { - name = "eyes-0.1.8"; - version = "0.1.8"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - name = "eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."faye-websocket"."0.x.x" = - 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 = "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.5" = self.by-version."websocket-driver"."0.6.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."finalhandler"."0.3.3" = - self.by-version."finalhandler"."0.3.3"; - by-version."finalhandler"."0.3.3" = self.buildNodePackage { - name = "finalhandler-0.3.3"; - version = "0.3.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz"; - name = "finalhandler-0.3.3.tgz"; - sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426"; - }; - deps = { - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."form-data"."0.1.3" = - self.by-version."form-data"."0.1.3"; - by-version."form-data"."0.1.3" = self.buildNodePackage { - name = "form-data-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; - name = "form-data-0.1.3.tgz"; - sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; - }; - deps = { - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "async-0.9.2" = self.by-version."async"."0.9.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."formidable"."1.0.14" = - self.by-version."formidable"."1.0.14"; - by-version."formidable"."1.0.14" = self.buildNodePackage { - name = "formidable-1.0.14"; - version = "1.0.14"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; - name = "formidable-1.0.14.tgz"; - sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."forwarded"."~0.1.0" = - self.by-version."forwarded"."0.1.0"; - by-version."forwarded"."0.1.0" = self.buildNodePackage { - name = "forwarded-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; - name = "forwarded-0.1.0.tgz"; - sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."fresh"."0.2.4" = - self.by-version."fresh"."0.2.4"; - by-version."fresh"."0.2.4" = self.buildNodePackage { - name = "fresh-0.2.4"; - version = "0.2.4"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; - name = "fresh-0.2.4.tgz"; - sha1 = "3582499206c9723714190edd74b4604feb4a614c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."from"."~0" = - self.by-version."from"."0.1.3"; - by-version."from"."0.1.3" = self.buildNodePackage { - name = "from-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/from/-/from-0.1.3.tgz"; - name = "from-0.1.3.tgz"; - sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hiredis"."0.4.1" = - self.by-version."hiredis"."0.4.1"; - by-version."hiredis"."0.4.1" = self.buildNodePackage { - name = "hiredis-0.4.1"; - version = "0.4.1"; - bin = false; - src = fetchurl { - 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.5.0" = self.by-version."nan"."2.5.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."inherits"."~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 = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - name = "inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ini"."1.x.x" = - self.by-version."ini"."1.3.4"; - by-version."ini"."1.3.4" = self.buildNodePackage { - name = "ini-1.3.4"; - version = "1.3.4"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; - name = "ini-1.3.4.tgz"; - sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - 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 = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz"; - name = "ipaddr.js-1.0.5.tgz"; - sha1 = "5fa78cf301b825c78abc3042d812723049ea23c7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ipaddr.js".">= 0.1.1" = - 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 = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.2.0.tgz"; - name = "ipaddr.js-1.2.0.tgz"; - sha1 = "8aba49c9192799585bdd643e0ccb50e8ae777ba4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isarray"."0.0.1" = - self.by-version."isarray"."0.0.1"; - by-version."isarray"."0.0.1" = self.buildNodePackage { - name = "isarray-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - name = "isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."json-rpc2"."0.8.1" = - self.by-version."json-rpc2"."0.8.1"; - by-version."json-rpc2"."0.8.1" = self.buildNodePackage { - name = "json-rpc2-0.8.1"; - version = "0.8.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/json-rpc2/-/json-rpc2-0.8.1.tgz"; - name = "json-rpc2-0.8.1.tgz"; - sha1 = "efe8c9834605b556c488d1ed7bcf24ee381eeeb2"; - }; - deps = { - "jsonparse-0.0.6" = self.by-version."jsonparse"."0.0.6"; - "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.11.0" = self.by-version."faye-websocket"."0.11.0"; - "eventemitter3-0.1.6" = self.by-version."eventemitter3"."0.1.6"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jsonparse"."0.x.x" = - self.by-version."jsonparse"."0.0.6"; - by-version."jsonparse"."0.0.6" = self.buildNodePackage { - name = "jsonparse-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.6.tgz"; - name = "jsonparse-0.0.6.tgz"; - sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lodash"."2.x.x" = - self.by-version."lodash"."2.4.2"; - by-version."lodash"."2.4.2" = self.buildNodePackage { - name = "lodash-2.4.2"; - version = "2.4.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; - name = "lodash-2.4.2.tgz"; - sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lodash"."3.1.0" = - self.by-version."lodash"."3.1.0"; - by-version."lodash"."3.1.0" = self.buildNodePackage { - name = "lodash-3.1.0"; - version = "3.1.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz"; - name = "lodash-3.1.0.tgz"; - sha1 = "d41b8b33530cb3be088853208ad30092d2c27961"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."map-stream"."~0.1.0" = - self.by-version."map-stream"."0.1.0"; - by-version."map-stream"."0.1.0" = self.buildNodePackage { - name = "map-stream-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; - name = "map-stream-0.1.0.tgz"; - sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."media-typer"."0.3.0" = - self.by-version."media-typer"."0.3.0"; - by-version."media-typer"."0.3.0" = self.buildNodePackage { - name = "media-typer-0.3.0"; - version = "0.3.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - name = "media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."merge-descriptors"."0.0.2" = - self.by-version."merge-descriptors"."0.0.2"; - by-version."merge-descriptors"."0.0.2" = self.buildNodePackage { - name = "merge-descriptors-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; - name = "merge-descriptors-0.0.2.tgz"; - sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."methods"."1.0.1" = - self.by-version."methods"."1.0.1"; - by-version."methods"."1.0.1" = self.buildNodePackage { - name = "methods-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; - name = "methods-1.0.1.tgz"; - sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."methods"."~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 = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - name = "methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime"."1.2.11" = - self.by-version."mime"."1.2.11"; - by-version."mime"."1.2.11" = self.buildNodePackage { - name = "mime-1.2.11"; - version = "1.2.11"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - name = "mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime"."~1.2.11" = - self.by-version."mime"."1.2.11"; - by-spec."mime-db"."~1.12.0" = - self.by-version."mime-db"."1.12.0"; - by-version."mime-db"."1.12.0" = self.buildNodePackage { - name = "mime-db-1.12.0"; - version = "1.12.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; - name = "mime-db-1.12.0.tgz"; - sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - 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 = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"; - name = "mime-db-1.26.0.tgz"; - sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~2.0.9" = - self.by-version."mime-types"."2.0.14"; - by-version."mime-types"."2.0.14" = self.buildNodePackage { - name = "mime-types-2.0.14"; - version = "2.0.14"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; - name = "mime-types-2.0.14.tgz"; - sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; - }; - deps = { - "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~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 = "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.26.0" = self.by-version."mime-db"."1.26.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimist"."~0.0.1" = - self.by-version."minimist"."0.0.10"; - by-version."minimist"."0.0.10" = self.buildNodePackage { - name = "minimist-0.0.10"; - version = "0.0.10"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; - name = "minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms"."0.6.2" = - self.by-version."ms"."0.6.2"; - by-version."ms"."0.6.2" = self.buildNodePackage { - name = "ms-0.6.2"; - version = "0.6.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; - name = "ms-0.6.2.tgz"; - sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms"."0.7.0" = - self.by-version."ms"."0.7.0"; - by-version."ms"."0.7.0" = self.buildNodePackage { - name = "ms-0.7.0"; - version = "0.7.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; - name = "ms-0.7.0.tgz"; - sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - 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 = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; - name = "ms-0.7.2.tgz"; - sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nan"."^2.0.5" = - 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 = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; - name = "nan-2.5.0.tgz"; - sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."native-dns"."git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" = - self.by-version."native-dns"."0.6.1"; - by-version."native-dns"."0.6.1" = self.buildNodePackage { - name = "native-dns-0.6.1"; - version = "0.6.1"; - bin = false; - src = fetchgit { - url = "https://github.com/okTurtles/node-dns.git"; - rev = "08433ec98f517eed3c6d5e47bdf62603539cd402"; - sha256 = "9c3faf4d39fda7bb6dd52a82036625f37ed442d5e948d295acb2f055dd367080"; - }; - deps = { - "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"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."native-dns-cache"."git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" = - self.by-version."native-dns-cache"."0.0.2"; - by-version."native-dns-cache"."0.0.2" = self.buildNodePackage { - name = "native-dns-cache-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchgit { - url = "https://github.com/okTurtles/native-dns-cache.git"; - rev = "8714196bb9223cc9a4064a4fddf9e82ec50b7d4d"; - sha256 = "3f06b2577afc3c1e428533baae3c51bad44a2e1e02fca147a1303943c214f841"; - }; - deps = { - "binaryheap-0.0.3" = self.by-version."binaryheap"."0.0.3"; - "native-dns-packet-0.0.3" = self.by-version."native-dns-packet"."0.0.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."native-dns-packet"."0.1.1" = - self.by-version."native-dns-packet"."0.1.1"; - by-version."native-dns-packet"."0.1.1" = self.buildNodePackage { - name = "native-dns-packet-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - 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.2.0" = self.by-version."ipaddr.js"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."native-dns-packet"."git+https://github.com/okTurtles/native-dns-packet.git#307e77a47ebba57a5ae9118a284e916e5ebb305a" = - self.by-version."native-dns-packet"."0.0.3"; - by-version."native-dns-packet"."0.0.3" = self.buildNodePackage { - name = "native-dns-packet-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchgit { - url = "https://github.com/okTurtles/native-dns-packet.git"; - rev = "307e77a47ebba57a5ae9118a284e916e5ebb305a"; - sha256 = "3ab023906deb8ee86bcb34c3e67e03cebeed1ba2dcb0b1d561c362ca995b0739"; - }; - deps = { - "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12"; - "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."native-dns-packet"."git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" = - self.by-version."native-dns-packet"."0.0.4"; - by-version."native-dns-packet"."0.0.4" = self.buildNodePackage { - name = "native-dns-packet-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchgit { - url = "https://github.com/okTurtles/native-dns-packet.git"; - rev = "8bf2714c318cfe7d31bca2006385882ccbf503e4"; - sha256 = "2a5951696b4e514ab5dee36e4e5394781656a8e94c6aacba83b03f7e647f8df3"; - }; - deps = { - "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12"; - "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nconf"."0.7.1" = - self.by-version."nconf"."0.7.1"; - by-version."nconf"."0.7.1" = self.buildNodePackage { - name = "nconf-0.7.1"; - version = "0.7.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz"; - name = "nconf-0.7.1.tgz"; - sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b"; - }; - deps = { - "async-0.9.2" = self.by-version."async"."0.9.2"; - "ini-1.3.4" = self.by-version."ini"."1.3.4"; - "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."negotiator"."0.5.3" = - self.by-version."negotiator"."0.5.3"; - by-version."negotiator"."0.5.3" = self.buildNodePackage { - name = "negotiator-0.5.3"; - version = "0.5.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; - name = "negotiator-0.5.3.tgz"; - sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."on-finished"."~2.2.0" = - self.by-version."on-finished"."2.2.1"; - by-version."on-finished"."2.2.1" = self.buildNodePackage { - name = "on-finished-2.2.1"; - version = "2.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; - name = "on-finished-2.2.1.tgz"; - sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; - }; - deps = { - "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."optimist"."~0.6.0" = - self.by-version."optimist"."0.6.1"; - by-version."optimist"."0.6.1" = self.buildNodePackage { - name = "optimist-0.6.1"; - version = "0.6.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; - name = "optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; - }; - deps = { - "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; - "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."parseurl"."~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 = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz"; - name = "parseurl-1.3.1.tgz"; - sha1 = "c8ab8c9223ba34888aa64a297b28853bec18da56"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."path-to-regexp"."0.1.3" = - self.by-version."path-to-regexp"."0.1.3"; - by-version."path-to-regexp"."0.1.3" = self.buildNodePackage { - name = "path-to-regexp-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - 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"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pause-stream"."0.0.11" = - self.by-version."pause-stream"."0.0.11"; - by-version."pause-stream"."0.0.11" = self.buildNodePackage { - name = "pause-stream-0.0.11"; - version = "0.0.11"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; - name = "pause-stream-0.0.11.tgz"; - sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; - }; - deps = { - "through-2.3.8" = self.by-version."through"."2.3.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pkginfo"."0.3.x" = - 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 = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; - name = "pkginfo-0.3.1.tgz"; - sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."properties"."1.2.1" = - self.by-version."properties"."1.2.1"; - by-version."properties"."1.2.1" = self.buildNodePackage { - name = "properties-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/properties/-/properties-1.2.1.tgz"; - name = "properties-1.2.1.tgz"; - sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."proxy-addr"."~1.0.6" = - 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 = "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.5" = self.by-version."ipaddr.js"."1.0.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."1.2.0" = - self.by-version."qs"."1.2.0"; - by-version."qs"."1.2.0" = self.buildNodePackage { - name = "qs-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-1.2.0.tgz"; - name = "qs-1.2.0.tgz"; - sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."2.3.3" = - self.by-version."qs"."2.3.3"; - by-version."qs"."2.3.3" = self.buildNodePackage { - name = "qs-2.3.3"; - version = "2.3.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; - name = "qs-2.3.3.tgz"; - sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."range-parser"."~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 = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; - name = "range-parser-1.0.3.tgz"; - sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."1.0.27-1" = - self.by-version."readable-stream"."1.0.27-1"; - by-version."readable-stream"."1.0.27-1" = self.buildNodePackage { - name = "readable-stream-1.0.27-1"; - version = "1.0.27-1"; - bin = false; - src = fetchurl { - 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.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.3" = self.by-version."inherits"."2.0.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."redis"."0.12.x" = - self.by-version."redis"."0.12.1"; - by-version."redis"."0.12.1" = self.buildNodePackage { - name = "redis-0.12.1"; - version = "0.12.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"; - name = "redis-0.12.1.tgz"; - sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."reduce-component"."1.0.1" = - self.by-version."reduce-component"."1.0.1"; - by-version."reduce-component"."1.0.1" = self.buildNodePackage { - name = "reduce-component-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; - name = "reduce-component-1.0.1.tgz"; - sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."send"."0.11.1" = - self.by-version."send"."0.11.1"; - by-version."send"."0.11.1" = self.buildNodePackage { - name = "send-0.11.1"; - version = "0.11.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.11.1.tgz"; - name = "send-0.11.1.tgz"; - sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5"; - }; - deps = { - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.1" = self.by-version."depd"."1.0.1"; - "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.5.1" = self.by-version."etag"."1.5.1"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "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.3" = self.by-version."range-parser"."1.0.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."serve-static"."~1.8.1" = - self.by-version."serve-static"."1.8.1"; - by-version."serve-static"."1.8.1" = self.buildNodePackage { - name = "serve-static-1.8.1"; - version = "1.8.1"; - bin = false; - src = fetchurl { - 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.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"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."split"."0.3" = - self.by-version."split"."0.3.3"; - by-version."split"."0.3.3" = self.buildNodePackage { - name = "split-0.3.3"; - version = "0.3.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz"; - name = "split-0.3.3.tgz"; - sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; - }; - deps = { - "through-2.3.8" = self.by-version."through"."2.3.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stack-trace"."0.0.x" = - self.by-version."stack-trace"."0.0.9"; - by-version."stack-trace"."0.0.9" = self.buildNodePackage { - name = "stack-trace-0.0.9"; - version = "0.0.9"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; - name = "stack-trace-0.0.9.tgz"; - sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stream-combiner"."~0.0.4" = - self.by-version."stream-combiner"."0.0.4"; - by-version."stream-combiner"."0.0.4" = self.buildNodePackage { - name = "stream-combiner-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; - name = "stream-combiner-0.0.4.tgz"; - sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; - }; - deps = { - "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."string"."2.0.1" = - self.by-version."string"."2.0.1"; - by-version."string"."2.0.1" = self.buildNodePackage { - name = "string-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/string/-/string-2.0.1.tgz"; - name = "string-2.0.1.tgz"; - sha1 = "ef1473b3e11cb8158671856556959b9aff5fd759"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."string_decoder"."~0.10.x" = - self.by-version."string_decoder"."0.10.31"; - by-version."string_decoder"."0.10.31" = self.buildNodePackage { - name = "string_decoder-0.10.31"; - version = "0.10.31"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - name = "string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."superagent"."0.21.0" = - self.by-version."superagent"."0.21.0"; - by-version."superagent"."0.21.0" = self.buildNodePackage { - name = "superagent-0.21.0"; - version = "0.21.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz"; - name = "superagent-0.21.0.tgz"; - sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87"; - }; - deps = { - "qs-1.2.0" = self.by-version."qs"."1.2.0"; - "formidable-1.0.14" = self.by-version."formidable"."1.0.14"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "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.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"; - "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."through"."2" = - self.by-version."through"."2.3.8"; - by-version."through"."2.3.8" = self.buildNodePackage { - name = "through-2.3.8"; - version = "2.3.8"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - name = "through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."through"."~2.3" = - self.by-version."through"."2.3.8"; - by-spec."through"."~2.3.1" = - self.by-version."through"."2.3.8"; - by-spec."type-is"."~1.5.6" = - self.by-version."type-is"."1.5.7"; - by-version."type-is"."1.5.7" = self.buildNodePackage { - name = "type-is-1.5.7"; - version = "1.5.7"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz"; - name = "type-is-1.5.7.tgz"; - sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90"; - }; - deps = { - "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."utils-merge"."1.0.0" = - self.by-version."utils-merge"."1.0.0"; - by-version."utils-merge"."1.0.0" = self.buildNodePackage { - name = "utils-merge-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; - name = "utils-merge-1.0.0.tgz"; - sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."vary"."~1.0.0" = - self.by-version."vary"."1.0.1"; - by-version."vary"."1.0.1" = self.buildNodePackage { - name = "vary-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; - name = "vary-1.0.1.tgz"; - sha1 = "99e4981566a286118dfb2b817357df7993376d10"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."verror"."^1.4.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 = "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz"; - name = "verror-1.9.0.tgz"; - sha1 = "107a8a2d14c33586fc4bb830057cd2d19ae2a6ee"; - }; - deps = { - "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 = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."websocket-driver".">=0.5.1" = - 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 = "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"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."websocket-extensions".">=0.1.1" = - self.by-version."websocket-extensions"."0.1.1"; - by-version."websocket-extensions"."0.1.1" = self.buildNodePackage { - name = "websocket-extensions-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; - name = "websocket-extensions-0.1.1.tgz"; - sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."winston"."0.8.0" = - self.by-version."winston"."0.8.0"; - by-version."winston"."0.8.0" = self.buildNodePackage { - name = "winston-0.8.0"; - version = "0.8.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; - name = "winston-0.8.0.tgz"; - sha1 = "61d0830fa699706212206b0a2b5ca69a93043668"; - }; - deps = { - "async-0.2.10" = self.by-version."async"."0.2.10"; - "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.1" = self.by-version."pkginfo"."0.3.1"; - "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."wordwrap"."~0.0.2" = - self.by-version."wordwrap"."0.0.3"; - by-version."wordwrap"."0.0.3" = self.buildNodePackage { - name = "wordwrap-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - name = "wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; -} diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index e260ccfb761b..6096aa1ed74d 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { sha256 = "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh"; }; + postPatch = '' + sed '1i#include ' -i src/daemon/open_console.c + substituteInPlace src/prog/gpm-root.y --replace __sigemptyset sigemptyset + ''; + nativeBuildInputs = [ automake autoconf libtool flex bison texinfo ]; buildInputs = [ ncurses ]; diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 1d8507fc4eb3..1e898075d191 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://code.google.com/p/modwsgi/; + homepage = https://github.com/GrahamDumpleton/mod_wsgi; description = "Host Python applications in Apache through the WSGI interface"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 61de807d8e8d..5768e7badea0 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { configureFlags = "--with-apxs=${apacheHttpd.dev}/bin/apxs --with-java-home=${jdk}"; - sourceRoot = "${name}-src/native"; + setSourceRoot = '' + sourceRoot=$(echo */native) + ''; installPhase = '' mkdir -p $out/modules diff --git a/pkgs/servers/http/hyp/default.nix b/pkgs/servers/http/hyp/default.nix new file mode 100644 index 000000000000..3a1eb50f05be --- /dev/null +++ b/pkgs/servers/http/hyp/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, python3Packages }: + +python3Packages.buildPythonPackage rec { + name = "hyp-server-${version}"; + version = "1.2.0"; + + src = fetchurl { + url = "mirror://pypi/h/hyp-server/${name}.tar.gz"; + sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15"; + }; + + meta = with stdenv.lib; { + description = "Hyperminimal https server"; + homepage = https://github.com/rnhmjoj/hyp; + license = with licenses; [gpl3Plus mit]; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index f3222f2982b4..9f0f5ac4bb99 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -35,7 +35,7 @@ owner = "openresty"; repo = "headers-more-nginx-module"; rev = "v0.26"; - sha256 = "01wkqhk8mk8jgmzi7jbzmg5kamffx3lmhj5yfwryvnvs6xqs74wn"; + sha256 = "0zhr3ai4xf5yghxvlbrwv8n06fgx33f1n1d4a6gmsczdfjzf8g6g"; }; }; diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix index 2e2923e17c39..554401438705 100644 --- a/pkgs/servers/kippo/default.nix +++ b/pkgs/servers/kippo/default.nix @@ -63,8 +63,8 @@ in stdenv.mkDerivation rec { name = "kippo-${version}"; version = "0.8"; src = fetchurl { - url = "https://kippo.googlecode.com/files/kippo-${version}.tar.gz"; - sha1 = "f57a5cf88171cb005afe44a4b33cb16f825c33d6"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kippo/${name}.tar.gz"; + sha256 = "0rd2mk36d02qd24z8s4xyy64fy54rzpar4379iq4dcjwg7l7f63d"; }; buildInputs = with pythonPackages; [ pycrypto pyasn1 twisted_13 ]; installPhase = '' @@ -76,17 +76,17 @@ in stdenv.mkDerivation rec { --replace "data_path = data" "data_path = /var/lib/kippo/data" \ --replace "txtcmds_path = txtcmds" "txtcmds_path = /var/lib/kippo/txtcmds" \ --replace "public_key = public.key" "public_key = /var/lib/kippo/keys/public.key" \ - --replace "private_key = private.key" "private_key = /var/lib/kippo/keys/private.key" + --replace "private_key = private.key" "private_key = /var/lib/kippo/keys/private.key" mkdir -p $out/bin mkdir -p $out/src - mv ./* $out/src + mv ./* $out/src mv $out/src/utils/* $out/bin ''; passthru.twisted = twisted_13; meta = with stdenv.lib; { - homepage = https://code.google.com/p/kippo; + homepage = https://github.com/desaster/kippo; description = "SSH Honeypot"; longDescription = '' Default port is 2222. Recommend using something like this for port redirection to default SSH port: diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 637b7dd8b92b..5ef909a6d09c 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { passthru.version = version; meta = with stdenv.lib; { - homepage = https://directory.fedoraproject.org/; + homepage = http://www.port389.org/; description = "Enterprise-class Open Source LDAP server for Linux"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index be923ff2305c..f17f3ed2de7e 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -4,12 +4,12 @@ assert tls -> gnutls != null; stdenv.mkDerivation rec { - version = "2.0"; + version = "2.1"; name = "nullmailer-${version}"; src = fetchurl { url = "http://untroubled.org/nullmailer/nullmailer-${version}.tar.gz"; - sha256 = "112ghdln8q9yljc8kp9mc3843mh0fyb4rig2v4q2dzy1l324q3yp"; + sha256 = "0gykh0qc86rk0knfvp8ndqkryal3pvqdfdya94wvb6n1cc8p3ild"; }; buildInputs = stdenv.lib.optional tls gnutls; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index c7c33928714b..73498e5b8844 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,6 +1,6 @@ { lib, pkgs, stdenv, pythonPackages, fetchurl, fetchFromGitHub }: let - matrix-angular-sdk = pythonPackages.buildPythonApplication rec { + matrix-angular-sdk = pythonPackages.buildPythonPackage rec { name = "matrix-angular-sdk-${version}"; version = "0.6.8"; @@ -9,7 +9,7 @@ let sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2"; }; }; - matrix-synapse-ldap3 = pythonPackages.buildPythonApplication rec { + matrix-synapse-ldap3 = pythonPackages.buildPythonPackage rec { name = "matrix-synapse-ldap3-${version}"; version = "0.1.2"; @@ -24,24 +24,24 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.22.1"; + version = "0.24.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "06kqqsfqmziff7i99yyxqvkqjm7fwi56abc2vy25g9kqzpdvkay7"; + sha256 = "08w8sawq0nj28dzi9wc4rsg9z2qv528djj4zbcs5c4yc3mylq1nq"; }; patches = [ ./matrix-synapse.patch ]; propagatedBuildInputs = with pythonPackages; [ - blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1 + blist canonicaljson daemonize dateutil frozendict pillow pyasn1 pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests signedjson systemd twisted ujson unpaddedbase64 pyyaml matrix-angular-sdk bleach netaddr jinja2 psycopg2 psutil msgpack lxml matrix-synapse-ldap3 - phonenumbers jsonschema + phonenumbers jsonschema affinity bcrypt ]; # Checks fail because of Tox. diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index f6a4860380b7..c186fc2835fd 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.6.0"; + version = "4.6.1"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0z3981xnx97d1gn6w31kc066kyqksacdjmxbbrsczwn7mprkv6ij"; + sha256 = "1l606dbx3rfbqbr30iirsc2lkzqa2kc6160g2sn0205mdz8b31zj"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "14sk3rb29aa8qfskb1x9lmisn038a7v0rz5jr6x0m21rzc11ripa"; + sha256 = "04756ry3b8fyk91lzacsixha6l4q1g532krxz759d17sfrnbaz2q"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index 027e10901573..859849f7b2c7 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { buildInputs = [ freetype libX11 libftdi libusb libusb1 ncurses ]; nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkgconfig ]; - enableParallelBuilding = true; + + # In 0.5.9: gcc: error: libbignum.a: No such file or directory + enableParallelBuilding = false; postFixup = '' for f in $out/bin/*.pl ; do diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix new file mode 100644 index 000000000000..5044aef2bb53 --- /dev/null +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, gotools, buildGoPackage }: + +buildGoPackage rec { + name = "mtail-${version}"; + version = "3.0.0-rc4"; + goPackagePath = "github.com/google/mtail"; + + src = fetchFromGitHub { + owner = "google"; + repo = "mtail"; + rev = "v${version}"; + sha256 = "1n7pqvid48ayn15qfpgpbsx0iqg24x08wphzpc08mlfw47gq7jg3"; + }; + + buildInputs = [ gotools ]; + goDeps = ./deps.nix; + patches = [ ./fix-gopath.patch ]; + preBuild = "go generate -x ./go/src/github.com/google/mtail/vm/"; + + + meta = with lib; { + license = licenses.asl20; + homepage = "https://github.com/google/mtail"; + description = "Tool for extracting metrics from application logs"; + }; +} diff --git a/pkgs/servers/monitoring/mtail/deps.nix b/pkgs/servers/monitoring/mtail/deps.nix new file mode 100644 index 000000000000..6de3c8b6e139 --- /dev/null +++ b/pkgs/servers/monitoring/mtail/deps.nix @@ -0,0 +1,56 @@ +[ + rec { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://${goPackagePath}.git"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + rec { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://${goPackagePath}.git"; + rev = "5660eeed305fe5f69c8fc6cf899132a459a97064"; + sha256 = "0rpwvjp9xfmy2yvbmy810qamjhimr56zydvx7hb1gjn3b7jp4rhd"; + }; + } + rec { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://${goPackagePath}.git"; + rev = "v1.4.2"; + sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3"; + }; + } + rec { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://${goPackagePath}.git"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "95c6576299259db960f6c5b9b69ea52422860fce"; + sha256 = "1fhq8bianb9a1iccpr92mi2hix9zvm10n0f7syx6vfbxdw32i316"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "3ba1a4dc141f5236b19ccbf2f67cb63d1a688d46"; + sha256 = "07sbakmman41p5hmdbf4y2wak0gh7k1z88m0zb72acsypp4179h1"; + }; + } +] diff --git a/pkgs/servers/monitoring/mtail/fix-gopath.patch b/pkgs/servers/monitoring/mtail/fix-gopath.patch new file mode 100644 index 000000000000..9421d194a9e5 --- /dev/null +++ b/pkgs/servers/monitoring/mtail/fix-gopath.patch @@ -0,0 +1,13 @@ +diff --git a/vm/compiler.go b/vm/compiler.go +index c55266b..a46417c 100644 +--- a/vm/compiler.go ++++ b/vm/compiler.go +@@ -2,7 +2,7 @@ + // This file is available under the Apache license. + + // Build the parser: +-//go:generate $GOPATH/bin/goyacc -v y.output -o parser.go -p mtail parser.y ++//go:generate goyacc -v y.output -o parser.go -p mtail parser.y + + package vm + diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 3ae2a45ca6d0..444aa92ec2e6 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "alertmanager-${version}"; - version = "0.8.0"; + version = "0.9.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "0bqc58j0nrq7y8nbd927z7x74m8mcd2782cxkqwscpq6d9983qql"; + sha256 = "1lkfj63pp4jf58xmn015r7s42p1wyj6fryihpmdn0k76b0ccwqzj"; }; # Tests exist, but seem to clash with the firewall. diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index ee373878cb62..969cd183c5c1 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; -let version = "3.2.9"; +let version = "3.4.2"; system-libraries = [ "pcre" #"asio" -- XXX use package? @@ -43,8 +43,8 @@ in stdenv.mkDerivation rec { name = "mongodb-${version}"; src = fetchurl { - url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "06q6j2bjy31pjwqws53wdpmn2x8w2hafzsnv1s3wx15pc9vq3y15"; + url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz"; + sha256 = "0n8vspccrpd2z9xk3yjpz4gprd730dfacw914ksjzz9iadn0zdi9"; }; nativeBuildInputs = [ scons ]; @@ -52,12 +52,6 @@ in stdenv.mkDerivation rec { patches = [ - # When not building with the system valgrind, the build should use the - # vendored header file - regardless of whether or not we're using the system - # tcmalloc - so we need to lift the include path manipulation out of the - # conditional. - ./valgrind-include.patch - # MongoDB keeps track of its build parameters, which tricks nix into # keeping dependencies to build inputs in the final output. # We remove the build flags from buildInfo data. @@ -67,6 +61,12 @@ in stdenv.mkDerivation rec { name = "boost160.patch"; sha256 = "0bvsf3499zj55pzamwjmsssr6x63w434944w76273fr5rxwzcmh8"; }) + # probably not needed for > 3.4.10 + (fetchpatch { + url = https://github.com/mongodb/mongo/commit/218a7b1d4ea3d3b.diff; + name = "pcre-8.41.patch"; + sha256 = "1dra51gw130bq78l2yfkdaj0jkha95ikpv4ig21rapbl63ip3znj"; + }) ]; postPatch = '' @@ -87,6 +87,8 @@ in stdenv.mkDerivation rec { --replace 'engine("wiredTiger")' 'engine("mmapv1")' ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unused-command-line-argument"; + buildPhase = '' scons -j $NIX_BUILD_CORES core --release ${other-args} ''; diff --git a/pkgs/servers/nosql/mongodb/valgrind-include.patch b/pkgs/servers/nosql/mongodb/valgrind-include.patch deleted file mode 100644 index 6b401525c080..000000000000 --- a/pkgs/servers/nosql/mongodb/valgrind-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript -index 6add602..6e232d8 100644 ---- a/src/mongo/util/SConscript -+++ b/src/mongo/util/SConscript -@@ -241,9 +241,6 @@ if get_option('allocator') == 'tcmalloc': - # Add in the include path for our vendored tcmalloc. - tcmspEnv.InjectThirdPartyIncludePaths('gperftools') - -- # Include valgrind since tcmalloc disables itself while running under valgrind -- tcmspEnv.InjectThirdPartyIncludePaths('valgrind') -- - # If our changes to tcmalloc are ever upstreamed, this should become set based on a top - # level configure check, though its effects should still be scoped just to these files. - tcmspEnv.Append( -@@ -252,6 +249,10 @@ if get_option('allocator') == 'tcmalloc': - ] - ) - -+ # Include valgrind since tcmalloc disables itself while running under valgrind -+ if not use_system_version_of_library('valgrind'): -+ tcmspEnv.InjectThirdPartyIncludePaths('valgrind') -+ - tcmspEnv.Library( - target='tcmalloc_set_parameter', - source=[ diff --git a/pkgs/servers/plexpy/default.nix b/pkgs/servers/plexpy/default.nix new file mode 100644 index 000000000000..2875ecc52404 --- /dev/null +++ b/pkgs/servers/plexpy/default.nix @@ -0,0 +1,41 @@ +{stdenv, fetchFromGitHub, python}: + +stdenv.mkDerivation rec { + version = "1.4.25"; + pname = "plexpy"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "JonnyWong16"; + repo = pname; + rev = "v${version}"; + sha256 = "0a4ynrfamlwkgqil4n61v47p21czxpjdzg0mias4kdjam2nnwnjx"; + }; + + buildPhase = ":"; + + installPhase = '' + mkdir -p $out + cp -R * $out/ + + # Remove superfluous Python checks from main script; + # prepend shebang + echo "#!${python.interpreter}" > $out/PlexPy.py + tail -n +7 PlexPy.py >> $out/PlexPy.py + + mkdir $out/bin + # Can't just symlink to the main script, since it uses __file__ to + # import bundled packages and manage the service + echo "#!/bin/bash" > $out/bin/plexpy + echo "$out/PlexPy.py \$*" >> $out/bin/plexpy + chmod +x $out/bin/plexpy + ''; + + meta = with stdenv.lib; { + description = "A Python based monitoring and tracking tool for Plex Media Server."; + homepage = http://jonnywong16.github.io/plexpy/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ csingley ]; + }; +} diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index ba3cc6dae761..68c9b7a59362 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "quagga-${version}"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = "mirror://savannah/quagga/${name}.tar.gz"; - sha256 = "1kgvcr9cfgys5asvb5lh5h95silkr624apqm5x68xva19xfvmpda"; + sha256 = "0c99rjjc62xl5kwvx2pwyvs0709vbwax1qydqbqf6r7fpvr24bjj"; }; buildInputs = diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index 2a36e1f67a26..70bf5c32b3d4 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://code.google.com/p/shellinabox; + homepage = https://github.com/shellinabox/shellinabox; description = "Web based AJAX terminal emulator"; license = licenses.gpl2; maintainers = with maintainers; [ tomberek lihop ]; diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 6a85d956a0c2..28e7824cd423 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.57"; + version = "5.5.58"; src = fetchurl { url = "mirror://mysql/MySQL-5.5/${name}.tar.gz"; - sha256 = "113kynpfj45fffr62xack2657pds8mkhsgg77zj94ksj3qrbvhn1"; + sha256 = "1f890376ld1qapl038sjh2ialdizys3sj96vfn4mqmb1ybx14scv"; }; patches = if stdenv.isCygwin then [ diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 5598a7926338..687993e0dc57 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.7.19"; + version = "5.7.20"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "1c8y54yk756179nx4dgg79dijmjdq5n8l057cnqsg70pjdpyfl9y"; + sha256 = "11v4g3igigv3zvknv67qml8in6fjrbs2vnr3q6bg6f62nydm95sk"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix index fbf0bfa19265..223bd6e470b9 100644 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "0.5.0"; + version = "0.6.0"; buildInputs = [ postgresql ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "01swgjw563c42azxsg55ry7cyiipxkcvfrxmw71jil5dxl3s0fkz"; + sha256 = "061z1ll3x7ca7fj12rl2difkdvmqykksqhpsql552qkkylg7iq4d"; }; installPhase = '' diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 851149ad7f71..7ff0796811ad 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -1,21 +1,27 @@ -{avahi, cmake, dbus, fetchurl, gettext, git, gnutar, gzip, bzip2, ffmpeg, libiconv, openssl, pkgconfig, python -, stdenv, which, zlib}: +{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig +, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg, libiconv, openssl, python +, which, zlib }: -with stdenv.lib; +let + version = "4.2.1"; -let version = "4.2.1"; - pkgName = "tvheadend"; +in stdenv.mkDerivation rec { + name = "tvheadend-${version}"; -in - -stdenv.mkDerivation rec { - name = "${pkgName}-${version}"; - - src = fetchurl { - url = "https://github.com/tvheadend/tvheadend/archive/v${version}.tar.gz"; - sha256 = "1wrj3w595c1hfl2vmfdmp5qncy5samqi7iisyq76jf3nlzgw6dvn"; + src = fetchFromGitHub { + owner = "tvheadend"; + repo = "tvheadend"; + rev = "v${version}"; + sha256 = "1lhk8psvifmn4kjwyfxjj21z0apyr59zizzsfd4j22v7bk66rrl9"; }; + buildInputs = [ + avahi dbus gettext git gnutar gzip bzip2 ffmpeg libiconv openssl python + which zlib + ]; + + nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + enableParallelBuilding = true; # disable dvbscan, as having it enabled causes a network download which @@ -28,28 +34,32 @@ stdenv.mkDerivation rec { "--disable-hdhomerun_static" ]; - buildPhase = "make"; - dontUseCmakeConfigure = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ avahi dbus cmake gettext git gnutar gzip bzip2 ffmpeg libiconv openssl python - which zlib ]; - preConfigure = '' patchShebangs ./configure + substituteInPlace src/config.c --replace /usr/bin/tar ${gnutar}/bin/tar + + # the version detection script `support/version` reads this file if it + # exists, so let's just use that + echo ${version} > rpm/version ''; - meta = { + postInstall = '' + wrapProgram $out/bin/tvheadend \ + --prefix PATH : ${stdenv.lib.makeBinPath [ bzip2 ]} + ''; + + meta = with stdenv.lib; { description = "TV streaming server"; longDescription = '' - Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android + Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, SAT>IP and HDHomeRun as input sources. Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.''; homepage = https://tvheadend.org; license = licenses.gpl3; platforms = platforms.unix; - maintainers = [ maintainers.simonvandel ]; + maintainers = with maintainers; [ simonvandel ]; }; } diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 878e8480bb99..bb07c42b872c 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,12 @@ { fetchFromGitHub, lib } : fetchFromGitHub { owner = "WordPress"; repo = "WordPress"; - rev = "4.7.4"; - sha256 = "1ia9d3n085x2r6pvdrv4rk6gdp6xhjhpsq5g7a6448xzv9hf14ri"; + rev = "4.8.3"; + sha256 = "077bdx22sj29v8q493b49xfzxpc38q45pjhmn4znw2fmkjilih5p"; meta = { homepage = https://wordpress.org; description = "WordPress is open source software you can use to create a beautiful website, blog, or app."; license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.basvandijk ]; }; } diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index fa22717b0355..87dfeb3cfa7f 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -321,8 +321,9 @@ in url = "mirror://xorg/individual/driver/${name}.tar.bz2"; sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb"; }; + outputs = [ "out" "dev" ]; buildInputs = attrs.buildInputs ++ [ args.libinput ]; - installFlags = "sdkdir=\${out}/include/xorg"; + installFlags = "sdkdir=\${dev}/include/xorg"; }; xf86inputsynaptics = attrs: attrs // { diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 28463dc6163c..6de53faf7710 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -17,6 +17,7 @@ overrideDerivation xorgserver (oldAttrs: { "--disable-xnest" "--disable-xquartz" "--disable-xwin" + "--enable-glamor" "--with-default-font-path=" "--with-xkb-bin-directory=${xkbcomp}/bin" "--with-xkb-path=${xkeyboard_config}/etc/X11/xkb" diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix index eaae85990b20..af0552662938 100644 --- a/pkgs/shells/nix-zsh-completions/default.nix +++ b/pkgs/shells/nix-zsh-completions/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "0.3.1"; + version = "0.3.2"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "spwhitt"; repo = "nix-zsh-completions"; rev = "${version}"; - sha256 = "1sbc52f5818bcygljrji84dyvgw727x50m9v6qfrsdaji3zkqga1"; + sha256 = "0i306k50g07n9smy68npma1k90sv173zy12jdi8wm7h1sj53m5rv"; }; installPhase = '' @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { description = "ZSH completions for Nix, NixOS, and NixOps"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb ]; + maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb stdenv.lib.maintainers.hedning ]; }; } diff --git a/pkgs/shells/zsh-completions/default.nix b/pkgs/shells/zsh-completions/default.nix index 4a5731b91523..92a9d293e84f 100644 --- a/pkgs/shells/zsh-completions/default.nix +++ b/pkgs/shells/zsh-completions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-completions-${version}"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-completions"; rev = "${version}"; - sha256 = "16yhwf42a11v8bhnfb7nda0svxmglzph3c0cknvf8p5m6mkqj9s2"; + sha256 = "1c2xx9bkkvyy0c6aq9vv3fjw7snlm0m5bjygfk5391qgjpvchd29"; }; installPhase= '' diff --git a/pkgs/shells/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh-syntax-highlighting/default.nix index a97251d8e560..b7b44098fd7a 100644 --- a/pkgs/shells/zsh-syntax-highlighting/default.nix +++ b/pkgs/shells/zsh-syntax-highlighting/default.nix @@ -3,14 +3,14 @@ # To make use of this derivation, use the `programs.zsh.enableSyntaxHighlighting` option stdenv.mkDerivation rec { - version = "0.5.0"; + version = "0.6.0"; name = "zsh-syntax-highlighting-${version}"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-syntax-highlighting"; rev = version; - sha256 = "0k0m5aw67lhi4z143sdawx93y1892scvvdfdnjvljb4hf0vzs2ww"; + sha256 = "0zmq66dzasmr5pwribyh4kbkk23jxbpdw4rjxx0i7dx8jjp2lzl4"; }; buildInputs = [ zsh ]; diff --git a/pkgs/tools/X11/xosview2/default.nix b/pkgs/tools/X11/xosview2/default.nix new file mode 100644 index 000000000000..c8b658d4350e --- /dev/null +++ b/pkgs/tools/X11/xosview2/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, libX11 }: + +stdenv.mkDerivation rec { + name = "xosview2-${version}"; + version = "2.2.2"; + + src = fetchurl { + url = "mirror://sourceforge/xosview/${name}.tar.gz"; + sha256 = "3502e119a5305ff2396f559340132910807351c7d4e375f13b5c338404990406"; + }; + + # The software failed to buid with this enabled; it seemed tests were not implemented + doCheck = false; + + buildInputs = [ libX11 ]; + + meta = with stdenv.lib; { + description = "Lightweight program that gathers information from your operating system and displays it in graphical form"; + longDescription = '' + xosview is a lightweight program that gathers information from your + operating system and displays it in graphical form. It attempts to show + you in a quick glance an overview of how your system resources are being + utilized. + + It can be configured to be nothing more than a small strip showing a + couple of parameters on a desktop task bar. Or it can display dozens of + meters and rolling graphical charts over your entire screen. + + Since xosview renders all graphics with core X11 drawing methods, you can + run it on one machine and display it on another. This works even if your + other host is an operating system not running an X server inside a + virtual machine running on a physically different host. If you can + connect to it on a network, then you can popup an xosview instance and + monitor what is going on. + ''; + homepage = "http://xosview.sourceforge.net/index.html"; + license = licenses.gpl1; + maintainers = [ maintainers.SeanZicari ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/admin/ansible/2.4.nix b/pkgs/tools/admin/ansible/2.4.nix index dd9c12c831c9..80bd33bc7769 100644 --- a/pkgs/tools/admin/ansible/2.4.nix +++ b/pkgs/tools/admin/ansible/2.4.nix @@ -6,12 +6,12 @@ pythonPackages.buildPythonPackage rec { pname = "ansible"; - version = "2.4.0.0"; + version = "2.4.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "http://releases.ansible.com/ansible/${name}.tar.gz"; - sha256 = "0xkwnx817rygb1922gncv9ivgvb7hjg8g53r39hfdm3jgzp6y9qs"; + sha256 = "0spv0kjaicwss4q52s727b6grdizcxpa0bbsfg26pgf5kjrayqfs"; }; prePatch = '' diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 8f10ee22ddcf..30c75f19fbf8 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -24,7 +24,7 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.0) - fastlane (2.61.0) + fastlane (2.63.0) CFPropertyList (>= 2.3, < 3.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -65,9 +65,9 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - googleauth (0.5.3) + googleauth (0.6.1) faraday (~> 0.12) - jwt (~> 1.4) + jwt (>= 1.4, < 3.0) logging (~> 2.0) memoist (~> 0.12) multi_json (~> 1.11) @@ -78,7 +78,7 @@ GEM domain_name (~> 0.5) httpclient (2.8.3) json (2.1.0) - jwt (1.5.6) + jwt (2.1.0) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) @@ -112,21 +112,21 @@ GEM terminal-notifier (1.8.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - tty-screen (0.5.0) + tty-screen (0.5.1) uber (0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.7.4) unicode-display_width (1.3.0) word_wrap (1.0.0) - xcodeproj (1.5.2) + xcodeproj (1.5.3) CFPropertyList (~> 2.3.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.2.3) xcpretty (0.2.8) rouge (~> 2.0.7) - xcpretty-travis-formatter (0.0.4) + xcpretty-travis-formatter (1.0.0) xcpretty (~> 0.2, >= 0.0.7) PLATFORMS diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index c1285e434963..8dd51a5733e6 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -137,10 +137,10 @@ dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n73748vw7y29ycx0rjdg9zvn8xhncq07zq1l4a16n5s82rb14iy"; + sha256 = "1al75bb3zq0y9r1ilrbhks198zmvwykmqnn2675jd9i2ijcbxv78"; type = "gem"; }; - version = "2.61.0"; + version = "2.63.0"; }; gh_inspector = { source = { @@ -163,10 +163,10 @@ dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli"; + sha256 = "13laklpf99m3qzq9n3vnc9dblgw7q05n1r16jlxsh4lxlaijr0sf"; type = "gem"; }; - version = "0.5.3"; + version = "0.6.1"; }; highline = { source = { @@ -204,10 +204,10 @@ jwt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4"; + sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky"; type = "gem"; }; - version = "1.5.6"; + version = "2.1.0"; }; little-plugger = { source = { @@ -393,10 +393,10 @@ tty-screen = { source = { remotes = ["https://rubygems.org"]; - sha256 = "005rpl9l1r9i7wypb4kv057y01fxqvanznx62msx6z451cfjsfn3"; + sha256 = "12qkjwpkgznvhwbywq2y7l5mcq2f4z404b0ip7xm4byg3827lh4h"; type = "gem"; }; - version = "0.5.0"; + version = "0.5.1"; }; uber = { source = { @@ -443,10 +443,10 @@ dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v40167wxhjfczjqp7axvblivrzgbmqldaj9vb15pw45qh6xly51"; + sha256 = "1gvnd5ixa4wbn1cpc6jp6i9z0dxhcwlxny47irzbr6zr8wpj3ww7"; type = "gem"; }; - version = "1.5.2"; + version = "1.5.3"; }; xcpretty = { dependencies = ["rouge"]; @@ -461,9 +461,9 @@ dependencies = ["xcpretty"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wn5pcxja1jkc8y5b6s3pks5inc1vmjkq7fqmlbkl39z8l1vdis2"; + sha256 = "15b5c0lxz2blmichfdlabzlbyw5nlh1ci898pxwb661m9bahz3ml"; type = "gem"; }; - version = "0.0.4"; + version = "1.0.0"; }; } \ No newline at end of file diff --git a/pkgs/tools/admin/fastlane/update b/pkgs/tools/admin/fastlane/update new file mode 100755 index 000000000000..22d1e52e2977 --- /dev/null +++ b/pkgs/tools/admin/fastlane/update @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p bash ruby bundler bundix + +rm Gemfile.lock +bundler install +bundix + +if [ "clean" == "$1" ]; then + rm -r ~/.gem +fi diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index f1165f6172b2..3622b981cc4f 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -5,27 +5,28 @@ let pythonInputs = [ cffi cryptography pyopenssl crcmod google-compute-engine ]; pythonPath = lib.makeSearchPath python.sitePackages pythonInputs; + sources = name: system: { + i686-linux = { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; + sha256 = "0aq938s1w9mzj60avmcc68kgll54pl7635vl2mi89f6r56n0xslp"; + }; + + x86_64-darwin = { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz"; + sha256 = "13k2i1svry9q800s1jgf8jss0rzfxwk6qci3hsy1wrb9b2mwlz5g"; + }; + + x86_64-linux = { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; + sha256 = "1kvaz8p1iflsi85wwi7lb6km6frj70xsricyz1ah0sw3q71zyqmc"; + }; + }.${system}; + in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "171.0.0"; - - src = - if stdenv.system == "i686-linux" then - fetchurl { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; - sha256 = "0scp9nhd46mrnd02bw7skm5fa04i7azf68g08js8kawvjgbwq0sb"; - } - 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 = "0xvrqsg0vqws9n20lvipxilb45aln5p9iy0ldjfxx8vvi0s42298"; - } - else - fetchurl { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; - sha256 = "0b9rqhwd30hn5l82a2x10rz86jz1j03b19di7bc3bqn4x041qii5"; - }; + version = "177.0.0"; + src = fetchurl (sources name stdenv.system); buildInputs = [ python makeWrapper ]; diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index a257ece48773..1c8d8367793a 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, gtk2, pkgconfig, intltool }: +{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt }: stdenv.mkDerivation rec { - version = "0.5.4.7"; + version = "0.5.4.12"; name = "xarchiver-${version}"; src = fetchFromGitHub { owner = "ib"; repo = "xarchiver"; - rev = "${name}"; - sha256 = "0w9lx8d8r50j48qfhn2r0dlcnwy3pjyy6xjvgpr0qagy5l1q1qj4"; + rev = "${version}"; + sha256 = "13d8slcx3frz0dhl1w4llj7001n57cjjb8r7dlaw5qacaas3xfwi"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 intltool ]; + buildInputs = [ gtk3 intltool libxslt ]; meta = { description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 4ff61d1ac954..6395b91fa73a 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, python3Packages, acl, lz4, openssl }: +{ stdenv, fetchurl, python3Packages, acl, lz4, openssl, openssh }: python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; - version = "1.1.0"; + version = "1.1.1"; namePrefix = ""; src = fetchurl { url = "https://github.com/borgbackup/borg/releases/download/" + "${version}/${name}.tar.gz"; - sha256 = "0vwyg0b4kxb0rspqwhvgi5c78dzimgkydf03wif27a40qhh1235l"; + sha256 = "0iik5lq349cl87imlwra2pp0j36wjhpn8r1d3778azvvqpyjq2d5"; }; nativeBuildInputs = with python3Packages; [ @@ -27,6 +27,10 @@ python3Packages.buildPythonApplication rec { export BORG_LZ4_PREFIX="${lz4.dev}" ''; + makeWrapperArgs = [ + ''--prefix PATH ':' "${openssh}/bin"'' + ]; + postInstall = '' make -C docs singlehtml mkdir -p $out/share/doc/borg @@ -45,6 +49,6 @@ python3Packages.buildPythonApplication rec { homepage = https://borgbackup.github.io/; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage - maintainers = with maintainers; [ nckx ]; + maintainers = with maintainers; [ nckx flokli ]; }; } diff --git a/pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch new file mode 100644 index 000000000000..f78bb7178af2 --- /dev/null +++ b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch @@ -0,0 +1,25 @@ +--- a/bchunk.c 2017-10-30 18:03:58.658741629 +0000 ++++ b/bchunk.c 2017-10-30 19:40:25.558131619 +0000 +@@ -18,6 +18,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#define _GNU_SOURCE + #include + #include + #include +@@ -271,11 +272,10 @@ + int16_t i; + float fl; + +- if (!(fname = malloc(strlen(bname) + 8))) { +- fprintf(stderr, "main(): malloc() failed, out of memory\n"); ++ if (asprintf(&fname, "%s%2.2d.%s", bname, track->num, track->extension) == -1) { ++ fprintf(stderr, "writetrack(): asprintf() failed, out of memory\n"); + exit(4); + } +- sprintf(fname, "%s%2.2d.%s", bname, track->num, track->extension); + + printf("%2d: %s ", track->num, fname); + + diff --git a/pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch new file mode 100644 index 000000000000..80930ac69bc3 --- /dev/null +++ b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch @@ -0,0 +1,33 @@ +diff -urNZ bchunk-1.2.0.orig/bchunk.c bchunk-1.2.0/bchunk.c +--- a/bchunk.c 2017-10-30 18:03:58.658741629 +0000 ++++ b/bchunk.c 2017-10-30 19:17:36.732855884 +0000 +@@ -426,11 +426,11 @@ + printf("\nTrack "); + if (!(p = strchr(p, ' '))) { + fprintf(stderr, "... ouch, no space after TRACK.\n"); +- continue; ++ exit(3); + } + p++; + if (!(t = strchr(p, ' '))) { + fprintf(stderr, "... ouch, no space after track number.\n"); +- continue; ++ exit(3); + } + *t = '\0'; + +@@ -460,12 +460,12 @@ + } else if ((p = strstr(s, "INDEX"))) { + if (!(p = strchr(p, ' '))) { + printf("... ouch, no space after INDEX.\n"); +- continue; ++ exit(3); + } + p++; + if (!(t = strchr(p, ' '))) { + printf("... ouch, no space after index number.\n"); +- continue; ++ exit(3); + } + *t = '\0'; + t++; \ No newline at end of file diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index 4b8510773a3d..ea4046f31f8c 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -8,20 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0pcbyx3689cbl23dcij497hb3q5f1wmki7cxic5nzldx71g9vp5g"; }; - preConfigure = - '' - substituteInPlace Makefile \ - --replace "-o root -g root" "" \ - --replace "-o bin -g bin" "" - ''; + patches = [ ./CVE-2017-15953.patch ./CVE-2017-15955.patch ]; - makeFlags = "PREFIX=$(out) MAN_DIR=$(out)/share/man"; + installPhase = '' + install -Dt $out/bin bchunk + install -Dt $out/share/man/man1 bchunk.1 + ''; - preInstall = "mkdir -p $out/bin $out/share/man/man1"; - - meta = { + meta = with stdenv.lib; { homepage = http://he.fi/bchunk/; - description = "A program that converts CD-ROM images in BIN/CUE format into a set of ISO and CDR tracks"; - platforms = stdenv.lib.platforms.linux; + description = "A program that converts CD images in BIN/CUE format into a set of ISO and CDR tracks"; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 3b8040e2b917..25d94593f5ef 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lame, libvorbis, libmad, pkgconfig, libao}: +{stdenv, fetchurl, libvorbis, libmad, pkgconfig, libao}: stdenv.mkDerivation { name = "cdrdao-1.2.3"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { makeFlags = "RM=rm LN=ln MV=mv"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lame libvorbis libmad libao ]; + buildInputs = [ libvorbis libmad libao ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 4d6ddd546dbc..7deac71f1512 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -3,16 +3,18 @@ stdenv.mkDerivation rec { name = "unetbootin-${version}"; - version = "655"; + version = "657"; src = fetchFromGitHub { owner = "unetbootin"; repo = "unetbootin"; rev = version; - sha256 = "1gis75vy172k7lgh8bwgap74s259y9x1wg3rkqhhqncl2vv0w1py"; + sha256 = "18bbcrjk6ladr46kl3dvqz5pq2xcv4nnwmajqllb4sl3k1xqsngy"; }; - sourceRoot = "${name}-src/src/unetbootin"; + setSourceRoot = '' + sourceRoot=$(echo */src/unetbootin) + ''; buildInputs = [ qt4 ]; nativeBuildInputs = [ makeWrapper qmake4Hook ]; @@ -42,18 +44,17 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin - cp unetbootin $out/bin + runHook preInstall - mkdir -p $out/share/unetbootin - cp unetbootin_*.qm $out/share/unetbootin - - mkdir -p $out/share/applications - cp unetbootin.desktop $out/share/applications + install -Dm755 -t $out/bin unetbootin + install -Dm644 -t $out/share/unetbootin unetbootin_*.qm + install -Dm644 -t $out/share/applications unetbootin.desktop wrapProgram $out/bin/unetbootin \ --prefix PATH : ${stdenv.lib.makeBinPath [ mtools p7zip which ]} \ --set QT_X11_NO_MITSHM 1 + + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 4b2f0276d78c..bc8666a26907 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { multiple GB/s per core, typically reaching RAM speed limits on multi-core systems. ''; - homepage = https://code.google.com/p/lz4/; + homepage = https://lz4.github.io/lz4/; license = with licenses; [ bsd2 gpl2Plus ]; platforms = platforms.unix; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 2be3bf167dad..aad9421305eb 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.3.0"; + version = "1.3.2"; src = fetchFromGitHub { - sha256 = "1rnxfhcmg8zsagyf70hiwm32mam60hq58pzgy7jn8c3iwv24mpz5"; + sha256 = "1hwh6pw1z3y5kpwcwxrk8cwc83anigiqhy3z06ywy1jll8im57pz"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; diff --git a/pkgs/tools/compression/zstdmt/default.nix b/pkgs/tools/compression/zstdmt/default.nix index 5cf88e68c64b..b723c107936c 100644 --- a/pkgs/tools/compression/zstdmt/default.nix +++ b/pkgs/tools/compression/zstdmt/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { owner = "mcmilk"; }; - sourceRoot = "zstdmt-v${version}-src/unix"; + setSourceRoot = '' + sourceRoot=$(echo */unix) + ''; buildInputs = [ zstd lz4 diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index c75cc45170af..5ad54adc08ad 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "9pfs"; src = fetchFromGitHub { - owner = "spewspew"; + owner = "mischief"; repo = "9pfs"; rev = "7f4ca4cd750d650c1215b92ac3cc2a28041960e4"; sha256 = "007s2idsn6bspmfxv1qabj39ggkgvn6gwdbhczwn04lb4c6gh3xc"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://github.com/spewspew/9pfs; + #homepage = https://github.com/spewspew/9pfs; # the account apparently doesn't exist description = "FUSE-based client of the 9P network filesystem protocol"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index 6d2b073d8696..ac1a7c1c1485 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = https://code.google.com/p/mtpfs/; + homepage = https://github.com/cjd/mtpfs; description = "FUSE Filesystem providing access to MTP devices"; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.qknight ]; diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index 853654c0f790..b421a768b3dc 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { name = "rdfind-${version}"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "http://rdfind.pauldreik.se/${name}.tar.gz"; - sha256 = "0zfc5whh6j5xfbxr6wvznk62qs1mkd3r7jcq72wjgnck43vv7w55"; + url = "https://rdfind.pauldreik.se/${name}.tar.gz"; + sha256 = "0i63f2lwwkiq5m8shi3wwi59i1s25r6dx6flsgqxs1jvlcg0lvn3"; }; buildInputs = [ nettle ]; - meta = { - homepage = http://rdfind.pauldreik.se/; + meta = with stdenv.lib; { + homepage = https://rdfind.pauldreik.se/; description = "Removes or hardlinks duplicate files very swiftly"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ wmertens ]; - platforms = with stdenv.lib.platforms; all; + maintainers = [ maintainers.wmertens ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index cc31a6680597..b39be214d89f 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://code.google.com/p/s3backer/; + homepage = https://github.com/archiecobbs/s3backer; description = "FUSE-based single file backing store via Amazon S3"; license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index c9f605ca69f0..597be1b0f42f 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "amadvance"; repo = "snapraid"; rev = "v${version}"; - sha256 = "13v0gz22ng09gs87f7900z2sk2hg5543njl32rfn4cxxp0jncs3r"; + sha256 = "1vgyiagn6qvyyz4jkf8pzlg0w9apb6mzza97a9x03p82fav2afx0"; }; doCheck = true; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 7d251d2e00d0..eebe3076c98a 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -4,7 +4,6 @@ let inherit (stdenv.lib) optional; - rpath = stdenv.lib.makeLibraryPath [ fuse3 glib ]; in stdenv.mkDerivation rec { version = "3.3.1"; name = "sshfs-fuse-${version}"; @@ -30,10 +29,6 @@ in stdenv.mkDerivation rec { ln -sf $out/bin/sshfs $out/sbin/mount.sshfs ''; - postFixup = '' - patchelf --set-rpath '${rpath}' "$out/bin/sshfs" - ''; - meta = with stdenv.lib; { inherit (src.meta) homepage; description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH"; diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 4404a8b6440c..7c5f9eaf5de6 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gifsicle-${version}"; - version = "1.88"; + version = "1.90"; src = fetchurl { url = "http://www.lcdf.org/gifsicle/${name}.tar.gz"; - sha256 = "4585d2e683d7f68eb8fcb15504732d71d7ede48ab5963e61915201f9e68305be"; + sha256 = "0kc35g99fygzjj7qjcy87rdb8mbgmacr2mga9ihgln1dfnbb0wrd"; }; buildInputs = optional gifview [ xproto libXt libX11 ]; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index abebc0fc4ca6..2f18857b2a16 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { glm freetype ]; meta = with stdenv.lib; { - homepage = http://code.google.com/p/logstalgia; + homepage = http://logstalgia.io/; description = "Website traffic visualization tool"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 5e4fd3ff0624..49bd74ea412f 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -2,23 +2,21 @@ let debPatch = fetchzip { - url = mirror://debian/pool/main/s/scrot/scrot_0.8-17.debian.tar.xz; - sha256 = "0ydsr3vah5wkcbnp91knkdbil4hx0cn0iy57frl03azqzc29bkw5"; + url = mirror://debian/pool/main/s/scrot/scrot_0.8-18.debian.tar.xz; + sha256 = "1m8m8ad0idf3nzw0k57f6rfbw8n7dza69a7iikriqgbrpyvxqybx"; }; in stdenv.mkDerivation rec { - name = "scrot-0.8-17"; + name = "scrot-0.8-18"; src = fetchurl { url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz"; sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1"; }; - inherit debPatch; - postPatch = '' - for patch in $(cat $debPatch/patches/series); do - patch -p1 < "$debPatch/patches/$patch" + for patch in $(cat ${debPatch}/patches/series); do + patch -p1 < "${debPatch}/patches/$patch" done ''; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 596b3ce15652..170ac4c6a26f 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -33,7 +33,7 @@ in clangStdenv.mkDerivation rec { ''; patch_version = "2.18.2612.102.1"; - patches = [ + patches = [ (fetchpatch rec { name = "fcitx-mozc-${patch_version}.patch"; url = "https://download.fcitx-im.org/fcitx-mozc/${name}"; @@ -43,7 +43,7 @@ in clangStdenv.mkDerivation rec { postPatch = '' substituteInPlace src/unix/fcitx/mozc.conf \ - --replace "/usr/share/fcitx/mozc/icon/mozc.png" "mozc" + --replace "/usr/share/fcitx/mozc/icon/mozc.png" "mozc" ''; configurePhase = '' @@ -91,7 +91,7 @@ in clangStdenv.mkDerivation rec { meta = with clangStdenv.lib; { isFcitxEngine = true; description = "Fcitx engine for Google japanese input method"; - homepage = http://code.google.com/p/mozc/; + homepage = https://github.com/google/mozc; downloadPage = "http://download.fcitx-im.org/fcitx-mozc/"; license = licenses.free; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 2e32075992c9..fd924cdd2a2b 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -15,7 +15,7 @@ in clangStdenv.mkDerivation rec { meta = with clangStdenv.lib; { isIbusEngine = true; description = "Japanese input method from Google"; - homepage = http://code.google.com/p/mozc/; + homepage = https://github.com/google/mozc; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ gebner ericsagnes ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 69ac0ad3ef68..3fd29d65f369 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -10,11 +10,11 @@ let srcs = { data = fetchurl { url = "http://unicode.org/Public/emoji/5.0/emoji-data.txt"; - sha256 = "0zfn3z61xy76yah3d24dd745qjssrib009m4nvqpnx4sf1r13i2x"; + sha256 = "11jfz5rrvyc2ixliqfcjgmch4cn9mfy0x96qnpfcyz5fy1jvfyxf"; }; sequences = fetchurl { url = "http://unicode.org/Public/emoji/5.0/emoji-sequences.txt"; - sha256 = "0xzk7hi2a8macx9s5gj2pb36d38y8fa9001sj71g6kw25c2h94cn"; + sha256 = "09bii7f5mmladg0kl3n80fa9qaix6bv5ylm92x52j7wygzv0szb1"; }; variation-sequences = fetchurl { url = "http://unicode.org/Public/emoji/5.0/emoji-variation-sequences.txt"; @@ -22,11 +22,11 @@ let }; zwj-sequences = fetchurl { url = "http://unicode.org/Public/emoji/5.0/emoji-zwj-sequences.txt"; - sha256 = "0rrnk94mhm3k9vs74pvyvs4ir7f31f1libx7c196fmdqvp1qfafw"; + sha256 = "16gvzv76mjv9g81lm1m6cr3rpfqyn2k4hb9a62xd329252dhl25q"; }; test = fetchurl { url = "http://unicode.org/Public/emoji/5.0/emoji-test.txt"; - sha256 = "1dvxw5xp1xiy13c1p1c7l2xc9q8f8znk47kb7q8g7bbgbi21cq5m"; + sha256 = "031qk2v8xdnba7hfinmgrmpglc9l8ll2hds6mw885p0hngdb3dgw"; }; }; in stdenv.mkDerivation { diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index 7ca5af555f96..b93c59d9789b 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "nabi-1.0.0"; src = fetchurl { - url = "http://nabi.googlecode.com/files/nabi-1.0.0.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/nabi/nabi-1.0.0.tar.gz"; sha256 = "0craa24pw7b70sh253arv9bg9sy4q3mhsjwfss3bnv5nf0xwnncw"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Easy Hangul XIM"; - homepage = https://code.google.com/p/nabi; + homepage = https://github.com/choehwanjin/nabi; license = licenses.gpl2; maintainers = [ maintainers.ianwookim ]; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix new file mode 100644 index 000000000000..8661da66b92a --- /dev/null +++ b/pkgs/tools/inputmethods/skk/skktools/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pkgconfig, gdbm, glib }: + +# Note (2017-10-24, yuriaisaka): +# - Version 1.3.3 dates from Jul. 19, 2013. +# - The latest commit to the github repo dates from Mar. 05, 2017 +# - The repo since appears to have become a kitchen sink place to keep +# misc tools to handle SKK dictionaries, and these tools have runtime +# dependencies on a Ruby interpreter etc. +# - We for the moment do not package them to keep the dependencies slim. +# Probably, shall package the newer tools as skktools-extra in the future. +stdenv.mkDerivation rec { + name = "skktools-${version}"; + version = "1.3.3"; + src = fetchFromGitHub { + owner = "skk-dev"; + repo = "skktools"; + rev = "c8816fe720604d4fd79f3552e99e0430ca6f2769"; + sha256 = "11v1i5gkxvfsipigc1w1m16ijzh85drpl694kg6ih4jfam1q4vdh"; + }; + # # See "12.2. Package naming" + # name = "skktools-unstable-${version}"; + # version = "2017-03-05"; + # src = fetchFromGitHub { + # owner = "skk-dev"; + # repo = "skktools"; + # rev = "e14d98e734d2fdff611385c7df65826e94d929db"; + # sha256 = "1k9zxqybl1l5h0a8px2awc920qrdyp1qls50h3kfrj3g65d08aq2"; + # }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gdbm glib ]; + + meta = { + description = "A collection of tools to edit SKK dictionaries"; + longDescription = '' + This package provides a collection of tools to manipulate + (merge, sort etc.) the dictionaries formatted for SKK Japanese + input method. + ''; + homepage = https://github.com/skk-dev/skktools; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index b32d0c78a1b7..bdcbc939a07b 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "touchegg-${version}"; version = "1.1.1"; src = fetchurl { - url = "https://touchegg.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${name}.tar.gz"; sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://code.google.com/p/touchegg/; + homepage = https://github.com/JoseExposito/touchegg; description = "Macro binding for touch surfaces"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 9af5de0476a7..3f37c1a2ab0c 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -38,12 +38,12 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; src = fetchurl { - url = "http://uim.googlecode.com/files/uim-${version}.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/uim/uim-${version}.tar.bz2"; sha1 = "43b9dbdead6797880e6cfc9c032ecb2d37d42777"; }; meta = with stdenv.lib; { - homepage = "http://code.google.com/p/uim/"; + homepage = "https://github.com/uim/uim"; description = "A multilingual input method framework"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix index 18e6176b706d..60f3a0feb55b 100644 --- a/pkgs/tools/inputmethods/zinnia/default.nix +++ b/pkgs/tools/inputmethods/zinnia/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1izjy5qw6swg0rs2ym2i72zndb90mwrfbd1iv8xbpwckbm4899lg"; }; - setSourceRoot = "export sourceRoot=$(echo zinnia-*/zinnia/)"; + setSourceRoot = '' + sourceRoot=$(echo */zinnia) + ''; meta = with stdenv.lib; { description = "Online hand recognition system with machine learning"; diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix index f8adedc7c241..760757190c32 100644 --- a/pkgs/tools/misc/arp-scan/default.nix +++ b/pkgs/tools/misc/arp-scan/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { Arp-scan is a command-line tool that uses the ARP protocol to discover and fingerprint IP hosts on the local network. ''; - homepage = http://www.nta-monitor.com/tools-resources/security-tools/arp-scan; + homepage = http://www.nta-monitor.com/wiki/index.php/Arp-scan_Documentation; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index bf1377419a5c..b8b01a7c0fc7 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.158"; + version = "1.170"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "12zaj7hi5gzdh9r7rcyqnkwik1ljw1qzj6j7rw80bgw6fn611rs9"; + sha256 = "0xh743cr21qk8cmc6ijp59d61dqra4ggdlgbin9v991xqa0mqdxb"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 534e3d950d36..a1c04f06d144 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1ihma4f6f92jp1mvzr4rjrgyh9m5wzrlxngaxfn7g0a8r2kyi65b"; }; - sourceRoot = "cloc-${version}-src/Unix"; + setSourceRoot = '' + sourceRoot=$(echo */Unix) + ''; buildInputs = [ makeWrapper perl AlgorithmDiff RegexpCommon ]; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 40ea672296d8..020599e17a81 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,51 +1,44 @@ { stdenv, fetchurl, bash-completion -, glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus -, gtk_doc, gobjectIntrospection, argyllcms, autoreconfHook +, glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus +, gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_38 , libgudev, sane-backends }: stdenv.mkDerivation rec { - name = "colord-1.2.12"; + name = "colord-1.4.1"; src = fetchurl { url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; - sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m"; + sha256 = "0m854clp8szvq38z16jpazzlqfb3lb3icxcfnsisfrc25748y1ib"; }; enableParallelBuilding = true; - # Version mismatch requires intltoolize to overwrite - # with newer version. - preConfigure = '' - intltoolize --force - ''; - - configureFlags = [ - "--enable-sane" - "--with-udevrulesdir=$(out)/lib/udev/rules.d" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + mesonFlags = [ + "-Denable-sane=true" + "-Denable-vala=true" "--localstatedir=/var" - "--disable-bash-completion" + "-Denable-bash-completion=true" + # TODO: man page cannot be build with docbook2x + "-Denable-man=false" + "-Denable-docs=false" ]; + patches = [ + ./fix-build-paths.patch + ]; - # don't touch /var at install time, colord creates what it needs at runtime - postPatch = '' - sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in} - ''; + nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection ]; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; - - buildInputs = [ glib polkit gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection + buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus bash-completion argyllcms libgudev sane-backends ]; postInstall = '' - mkdir -p $out/etc/bash_completion.d - cp -v data/colormgr $out/etc/bash_completion.d + glib-compile-schemas $out/share/glib-2.0/schemas ''; meta = { description = "System service to manage, install and generate color profiles to accurately color manage input and output devices"; - homepage = http://www.freedesktop.org/software/colord/intro.html; + homepage = https://www.freedesktop.org/software/colord/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/colord/fix-build-paths.patch b/pkgs/tools/misc/colord/fix-build-paths.patch new file mode 100644 index 000000000000..7eb66a0b34be --- /dev/null +++ b/pkgs/tools/misc/colord/fix-build-paths.patch @@ -0,0 +1,56 @@ +--- a/contrib/session-helper/meson.build ++++ b/contrib/session-helper/meson.build +@@ -21,7 +21,7 @@ + output : 'colord-session.service', + configuration : con2, + install: true, +- install_dir: systemd.get_pkgconfig_variable('systemduserunitdir'), ++ install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'user'), + ) + endif + +--- a/data/meson.build ++++ b/data/meson.build +@@ -8,13 +8,13 @@ + + if get_option('enable-systemd') + install_data('colord.conf', +- install_dir: systemd.get_pkgconfig_variable('tmpfilesdir') ++ install_dir: join_paths(get_option('prefix'), 'lib', 'tmpfiles.d') + ) + endif + + if get_option('enable-bash-completion') + install_data('colormgr', +- install_dir: bash_completion.get_pkgconfig_variable('completionsdir') ++ install_dir: join_paths(get_option('prefix'), 'etc', 'bash_completion.d') + ) + endif + +@@ -31,7 +31,7 @@ + output : 'colord.service', + configuration : con2, + install: true, +- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'), ++ install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'system'), + ) + endif + +--- a/meson.build ++++ b/meson.build +@@ -258,6 +258,3 @@ + subdir('policy') + subdir('rules') + subdir('src') +- +-meson.add_install_script('meson_post_install.sh', +- localstatedir, get_option('with-daemon-user')) +--- a/rules/meson.build ++++ b/rules/meson.build +@@ -9,5 +9,5 @@ + sensor_rules_in, + '95-cd-devices.rules', + ], +- install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') ++ install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d') + ) diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index c45c85e4271d..53755c8a19d2 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ddcutil-${version}"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "1hcdg54xyb1pfl03iqll14y9yglwmyvxyvhbql87hd9q0dywah6m"; + sha256 = "1w9bkrlxlgc58rpf03xfd2qbkj73rlbiqrhy8nhwxqqhsj1kkdb0"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index e70efe6c4f11..a65862a78451 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.87"; + version = "1.0.92"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "1amk3wghx4f7zfp7d8r0hgqn5gvph50qa6nvh32q2j8aihdr7374"; + sha256 = "06gp6ivmfh0ks4mibx1mz0pwzjyxqas319s741pp9b3k091jkip1"; }; buildInputs = [ dpkg gettext gawk perl ]; diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index ae6ea6e3f538..85672619d61c 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ethtool-${version}"; - version = "4.11"; + version = "4.13"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "1cp132kk2xd2cwn1ysjv0cl8i9lnq3n4zi4wy676p5k4h2mfvn0j"; + sha256 = "1flwz4x76ajxigadq9knxgwr778g03y3qfx6c7rflc3x020a7hdp"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 54d17e6f64cc..09debd461dc4 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,18 +2,23 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "4.0.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "1aw4pgsmvzzqlvbxzv5jnw42nf316qfhvr50b58iqi2dxy8z8cmv"; + sha256 = "17y2fr3faaf32lv171ppkgi55v5zxq97jiilsgmjcn00rd9i6v0j"; }; - cargoSha256 = "1v9wg4dq4c7i85bkdhd79bj8gx7200z6np05wsyj2ycbv97p095j"; + cargoSha256 = "17f4plyj6mnz0d9f4ykgbmddsdp6c3f6q4kmgj406p49xsf0jjkc"; - meta = { + preFixup = '' + mkdir -p "$out/man/man1" + cp "$src/doc/fd.1" "$out/man/man1" + ''; + + meta = with stdenv.lib; { description = "A simple, fast and user-friendly alternative to find"; longDescription = '' `fd` is a simple, fast and user-friendly alternative to `find`. @@ -22,7 +27,7 @@ rustPlatform.buildRustPackage rec { it provides sensible (opinionated) defaults for 80% of the use cases. ''; homepage = "https://github.com/sharkdp/fd"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = with licenses; [ asl20 /* or */ mit ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 8937de88c38d..82b3a1d963d4 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "0.14.3"; + version = "0.16.1"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "15sjpxw1llpipshriivpha6470lkvhcgs5wh5mlaabjbvrgxygqh"; + sha256 = "1hphgpwxzdbfswzxbx0jm7lma1xkkwxvm8ll3jp2ljmimqzzb7jf"; }; doCheck = true; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index e0367dc915d3..830f9cb878be 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.17.0-2"; + version = "0.17.1"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "0j4m3xf6qxfymfq6y5ml5rgz2rr1glh54k3b5xa9zi4cl5wg43qv"; + sha256 = "0zxav6kfifppj49kif8917djq1vqjznqzmviqj4iiar8jmyrn2fy"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix new file mode 100644 index 000000000000..588511638bea --- /dev/null +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -0,0 +1,58 @@ +{ fetchzip +, libX11 +, mesa +, makeWrapper +, stdenv +}: + +let + + libPath = stdenv.lib.makeLibraryPath [ + mesa + stdenv.cc.cc + libX11 + ]; + + inidir = "\\\${XDG_CONFIG_HOME:-\\$HOME/.config}/kisslicer"; + +in + +stdenv.mkDerivation rec { + name = "kisslicer-1.6.2"; + + src = fetchzip { + url = "http://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_1.6.2_release.zip"; + sha256 = "0fb7hzic78skq3ykc37srnjsw0yri7m0pb3arlz076ws7jrcbr0f"; + stripRoot = false; + }; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + buildInputs = [ + makeWrapper + mesa + libX11 + ]; + + installPhase = '' + mkdir -p $out/bin + cp -p * $out/bin + ''; + + fixupPhase = '' + chmod 755 $out/bin/KISSlicer + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${libPath} $out/bin/KISSlicer + wrapProgram $out/bin/KISSlicer \ + --add-flags "-inidir ${inidir}" \ + --run "mkdir -p ${inidir}" + ''; + + meta = with stdenv.lib; { + description = "Convert STL files into Gcode"; + homepage = http://www.kisslicer.com; + license = licenses.unfree; + maintainers = [ maintainers.cransom ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index b10b7891e5d1..f8b687a5c8ba 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-unstable-${version}"; - version = "2017-09-06"; + version = "2017-10-30"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; - rev = "ae4a29e5501f805fadb115658e83df6744a258b2"; # nightly - sha256 = "099ckbnyk08a716fc5qz7yldalb1p9gn2zn8kqp7bp4adi541hid"; + rev = "3f7bd0a62d1a243562e182d9051ebb54f3414aaa"; # nightly + sha256 = "0g6wf4j3dfy3yfkby3wlqajryv4kffqvhljq2q0x482fsrl4vipz"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index 5b014d18dc1c..91a0c368d5f9 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 = "4ed959e0540971545eddb8c75514973d670cf739"; # master - sha256 = "1vx64i1mg660if3wwm81p4b7lzxfb3qbr39i7misdyld3fc486p9"; + rev = "10cefba34bc5e7a6e5df0836a42513c28a10e074"; # master + sha256 = "05jy6dpva2a1xfsv3yajavbx41gx8hhh5k3k901dnk0118hnyd0w"; }; } { diff --git a/pkgs/tools/misc/mht2htm/default.nix b/pkgs/tools/misc/mht2htm/default.nix new file mode 100644 index 000000000000..930fd1e5d3ec --- /dev/null +++ b/pkgs/tools/misc/mht2htm/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, unzip, fpc, lazarus }: + +let + date = "07.apr.2016"; + +in stdenv.mkDerivation rec { + name = "mht2mht-${version}"; + version = "1.8.1.35"; + + src = fetchurl { + # there is a disconnect between the directory name date and file name date + # you should verify if that is still then case when the next version is released + url = "mirror://sourceforge/mht2htm/mht2htm/1.8.1%20%2805.apr.2016%29/mht2htmcl-${version}_${date}.source.zip"; + sha256 = "16r6zkihp84yqllp2hyaf0nvymdn9ji3g30mc5scfwycdfanja6f"; + }; + + sourceRoot = "."; + + buildInputs = [ fpc lazarus ]; + + nativeBuildInputs = [ unzip ]; + + buildPhase = '' + runHook preBuild + lazbuild --lazarusdir=${lazarus}/share/lazarus mht2htmcl.lpi + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm755 -t $out/bin mht2htmcl + install -Dm644 -t $out/share/doc/mht2htm CHANGELOG COPYING README + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Convert .mht files to .html"; + homepage = http://pgm.bpalanka.com/mht2htm.html; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 82abb5c9bbcf..a8332ad494da 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection , libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse -, libcap, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42 +, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42 }: let libglnx-src = fetchFromGitHub { owner = "GNOME"; repo = "libglnx"; - rev = "50a0feaba03ffa5a1980d3a14487276b8f49f8a6"; - sha256 = "1rn5jdh84y1yfpqmvidx82lkm0jr7scjzdrps57r37ksxvrk3ibs"; + rev = "5362f6bc3ff3e30f379e767b203d15c9e56d6f08"; + sha256 = "1l4vm7bx3cf4q44n3a1i2gszyryqyimcxvx54gna72q7dw130mrr"; }; bsdiff-src = fetchFromGitHub { owner = "mendsley"; repo = "bsdiff"; - rev = "7d70d8f4ff48345bc76e314c9d98da91f78873fa"; - sha256 = "0ai2kykj8i4bqcy3gry36r3n4ax0fldncfhksl5b293nf2fihnws"; + rev = "1edf9f656850c0c64dae260960fabd8249ea9c60"; + sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1"; }; - version = "2017.9"; + version = "2017.12"; in stdenv.mkDerivation { name = "ostree-${version}"; @@ -26,7 +26,7 @@ in stdenv.mkDerivation { rev = "v${version}"; owner = "ostreedev"; repo = "ostree"; - sha256 = "1040xcw8qcs6xq8x4wg47hha3915qzb6lndb38wjyn6wzl1680q3"; + sha256 = "0gxvpzwz7z4zihz5hkn6ajv7f6gas4zi2pznhi5v6wy7cw06if68"; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ in stdenv.mkDerivation { libxslt docbook_xsl docbook_xml_dtd_42 ]; - buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libcap ]; + buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libarchive libcap bzip2 ]; prePatch = '' rmdir libglnx bsdiff @@ -50,7 +50,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Git for operating system binaries"; - homepage = "http://live.gnome.org/OSTree/"; + homepage = https://ostree.readthedocs.io/en/latest/; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ copumpkin ]; diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index 86d81fd25856..bd60e786036f 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "rlwrap-0.42"; + name = "rlwrap-${version}"; + version = "0.43"; src = fetchurl { - url = "http://utopia.knoware.nl/~hlub/uck/rlwrap/${name}.tar.gz"; - sha256 = "0i3yz303wscrysyzpdq04h4nrl9ajz9dbwi80risdl5rkm3dhw2s"; + url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${name}.tar.gz"; + sha256 = "0bzb7ylk2770iv59v2d0gypb21y2xn87m299s9rqm6rdi2vx11lf"; }; buildInputs = [ readline ]; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Readline wrapper for console programs"; - homepage = http://utopia.knoware.nl/~hlub/uck/rlwrap/; + homepage = https://github.com/hanslub42/rlwrap; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 9faa36c13f02..24486980b4ba 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "tmuxp-${version}"; - version = "1.3.1"; + version = "1.3.4"; namePrefix = ""; src = fetchurl { url = "mirror://pypi/t/tmuxp/${name}.tar.gz"; - sha256 = "189mxnb2pxj3wjijn56j8y5x1r23fil00fn2q7d6bd13vgr0f85s"; + sha256 = "149n35rr27n2c6yna1bla20x3w1zz9gxnjj3m3xxdfp4fbsd2y31"; }; patchPhase = '' diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 731a194cc6a2..382b69722a42 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -6,18 +6,19 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { - version = "0.15.0"; + version = "0.16.3"; name = "vdirsyncer-${version}"; src = fetchurl { url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz"; - sha256 = "08aa5yxcj7ziz2r0hz4p554q8hgpfl2bh8r6r85f4g24mg6arxsj"; + sha256 = "0dpwbfi97ksijqng191659m8k0v215y8ld95w8gb126m4m96qpzw"; }; propagatedBuildInputs = with pythonPackages; [ click click-log click-threading requests_toolbelt requests + requests_oauthlib # required for google oauth sync atomicwrites ]; diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix index 3410d0e2c5c9..81dd294d786a 100644 --- a/pkgs/tools/networking/bully/default.nix +++ b/pkgs/tools/networking/bully/default.nix @@ -1,13 +1,15 @@ -{stdenv, fetchFromGitHub, openssl, libpcap}: +{ stdenv, fetchFromGitHub, openssl, libpcap }: stdenv.mkDerivation rec { + name = "bully-${version}"; - version = "1.0-22"; + version = "1.1"; + src = fetchFromGitHub { - sha256 = "0wk9jmcibd03gspnnr2qvfkw57rg94cwmi0kjpy1mgi05s6vlw1y"; - rev = "v${version}"; + sha256 = "1qvbbf72ryd85bp4v62fk93ag2sn25rj7kipgagbv22hnq8yl3zd"; + rev = version; repo = "bully"; - owner = "HorayNarea"; + owner = "aanarchyy"; }; buildInputs = [ openssl libpcap ]; @@ -21,11 +23,11 @@ stdenv.mkDerivation rec { mv bully $out/bin ''; - meta = { + meta = with stdenv.lib; { description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point"; - homepage = https://github.com/Lrs121/bully; - maintainers = [ stdenv.lib.maintainers.edwtjo ]; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/aanarchyy/bully; + maintainers = with maintainers; [ edwtjo ]; + license = licenses.gpl3; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 11f65ea82b03..d5819639fa2c 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, fetchpatch, nodejs, which, python27, utillinux }: +{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: let version = "20"; in stdenv.mkDerivation { name = "cjdns-"+version; - src = fetchurl { - url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz"; - sha256 = "1dyqxi9l2pmrgm16a161909rg3vfzvib40frr7p6ddpk8yfh5888"; + src = fetchFromGitHub { + owner = "cjdelisle"; + repo = "cjdns"; + rev = "cjdns-v${version}"; + sha256 = "0gqcspiz1n0j711vwq807cy456dkcf03r376l04qc92173g2fzrx"; }; buildInputs = [ which python27 nodejs ] ++ diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix index 985cb0c3015a..d145e1e12c3a 100644 --- a/pkgs/tools/networking/curl-unix-socket/default.nix +++ b/pkgs/tools/networking/curl-unix-socket/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation { }; buildInputs = [ go ]; - buildPhase = "go build"; - installPhase = "install -D curl-unix-socket* $out/bin/curl-unix-socket"; + buildPhase = "go build -o curl-unix-socket"; + installPhase = "install -D curl-unix-socket $out/bin/curl-unix-socket"; meta = with stdenv.lib; { description = "Run HTTP requests over UNIX socket"; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index c01dbbaa3a71..d67b34371fe2 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.56.0"; + name = "curl-7.56.1"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1pvr2bqfhk46bzq2x2hskmnq3wc8qxlps7apm9q1qiixb9ra8q6y"; + sha256 = "142zidvlmrz31yx480nrhh47hl01d7jbaagin23pspl7cw1ng515"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index 0061620b58d1..3984922abe28 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -1,45 +1,31 @@ -{ stdenv, fetchurl - , openssl, tdb, zlib, flex, bison - }: -let - buildInputs = [ openssl tdb zlib flex bison ]; - sourceInfo = rec { - baseName="fdm"; - version = "1.8"; - name="${baseName}-${version}"; - url="mirror://sourceforge/${baseName}/${baseName}/${name}.tar.gz"; - sha256 = "0hi39f31ipv8f9wxb41pajvl61w6vaapl39wq8v1kl9c7q6h0k2g"; - }; +{ stdenv, fetchFromGitHub, autoreconfHook, openssl, tdb, zlib, flex, bison }: + +let + + baseName = "fdm"; + version = "1.9.0.20170124"; + in -stdenv.mkDerivation { - src = fetchurl { - inherit (sourceInfo) url sha256; + +stdenv.mkDerivation rec { + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "nicm"; + repo = baseName; + rev = "cae4ea37b6b296d1b2e48f62934ea3a7f6085e33"; + sha256 = "048191wdv1yprwinipmx2152gvd2iq1ssv7xfb1bzh6zirh1ya3n"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ openssl tdb zlib flex bison ]; - preBuild = '' - export makeFlags="$makeFlags PREFIX=$out" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Dbool=int" - sed -i */Makefile -i Makefile -e 's@ -g bin @ @' - sed -i */Makefile -i Makefile -e 's@ -o root @ @' - sed -i GNUmakefile -e 's@ -g $(BIN_OWNER) @ @' - sed -i GNUmakefile -e 's@ -o $(BIN_GROUP) @ @' - sed -i */Makefile -i Makefile -i GNUmakefile -e 's@-I-@@g' - ''; - - meta = { + meta = with stdenv.lib; { description = "Mail fetching and delivery tool - should do the job of getmail and procmail"; - maintainers = with stdenv.lib.maintainers; - [ - raskin - ]; - platforms = with stdenv.lib.platforms; - linux; - homepage = http://fdm.sourceforge.net/; - inherit (sourceInfo) version; - updateWalker = true; + maintainers = with maintainers; [ raskin ]; + platforms = with platforms; linux; + homepage = https://github.com/nicm/fdm; + downloadPage = https://github.com/nicm/fdm/releases; }; } diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index 10ed8f34e3a6..d937f3c2f0b9 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchurl, coreutils, binutils }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.1.3"; + version = "1.2.0"; name = "htpdate-${version}"; src = fetchurl { - url = "http://twekkel.home.xs4all.nl/htp/htpdate-${version}.tar.gz"; - sha256 = "0hfg4qrsmpqw03m9qwf3zgi4brbf65w6wd3w30nkamc7x8b4vn5i"; + url = "http://www.vervest.org/htp/archive/c/${name}.tar.xz"; + sha256 = "00xwppq3aj951m0srjvxmr17kiaaflyjmbfkvpnfs3jvqhzczci2"; }; - installFlags = [ - "INSTALL=${coreutils}/bin/install" - "STRIP=${binutils}/bin/strip" + makeFlags = [ + "INSTALL=install" + "STRIP=strip" "prefix=$(out)" ]; - meta = { + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "Utility to fetch time and set the system clock over HTTP"; homepage = http://www.vervest.org/htp/; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + platforms = platforms.unix; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 5f6f0466f630..83ad64a66a4a 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.10.2"; + version = "0.11.0"; name = "http-prompt"; src = fetchFromGitHub { rev = "v${version}"; repo = "http-prompt"; owner = "eliangcs"; - sha256 = "0c03n1ll61zd4f60kzih3skl0hspck5hhpcf74h5l6v5as7qdbi2"; + sha256 = "0arl85880nnyfx8cvpzm6cr8nalhyrkz5zqfr628p487rwqv45ip"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index e13ada5994cd..cf26ec61139b 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { - name = "i2p-0.9.30"; + name = "i2p-0.9.31"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "03hrirmah3ba9ygql487jy233nsxkfjyz82mmyppazi0mcgiass1"; + sha256 = "1v2my5jqcj8zidxij34h0lpa533rr6ianzz8yld01sxi6gg41w28"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index 7348cd7f1165..f96987a1300b 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -1,82 +1,32 @@ { stdenv, fetchpatch, fetchFromGitHub, fetchurl, python3, glibcLocales }: -let - p = python3.override { - packageOverrides = self: super: { - cryptography = super.cryptography.overridePythonAttrs (oldAttrs: rec { - version = "1.8.2"; - name = "${oldAttrs.pname}-${version}"; - src = oldAttrs.src.override { - inherit version; - sha256 = "8e88ebac371a388024dab3ccf393bf3c1790d21bc3c299d5a6f9f83fb823beda"; - }; - }); - cryptography_vectors = super.cryptography_vectors.overridePythonAttrs (oldAttrs: rec { - version = self.cryptography.version; - name = "${oldAttrs.pname}-${version}"; - src = oldAttrs.src.override { - inherit version; - sha256 = "00daa04c9870345f56605d91d7d4897bc1b16f6fff7c74cb602b08ef16c0fb43"; - }; - }); - pyopenssl = super.pyopenssl.overridePythonAttrs (oldAttrs: rec { - version = "17.0.0"; - name = "${oldAttrs.pname}-${version}"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1pdg1gpmkzj8yasg6cmkhcivxcdp4c12nif88y4qvsxq5ffzxas8"; - }; - patches = fetchpatch { - url = "https://github.com/pyca/pyopenssl/commit/" - + "a40898b5f1d472f9449a344f703fa7f90cddc21d.patch"; - sha256 = "0bdfrhfvdfxhfknn46s4db23i3hww6ami2r1l5rfrri0pn8b8mh7"; - }; - }); - }; - }; -in p.pkgs.buildPythonPackage rec { +python3.pkgs.buildPythonPackage rec { baseName = "mitmproxy"; - name = "${baseName}-${version}"; - version = "2.0.2"; + name = "${baseName}-unstable-2017-10-31"; src = fetchFromGitHub { owner = baseName; repo = baseName; - rev = "v${version}"; - sha256 = "1x1a28al5clpfd69rjcpw26gjjnpsm1vfl4scrwpdd1jhkw044h9"; + rev = "80a8eaa708ea31dd9c5e7e1ab6b02c69079039c0"; + sha256 = "0rvwm11yryzlp3c1i42rk2iv1m38yn6r83k41jb51hwg6wzbwzvw"; }; - patches = [ - # fix tests - (fetchpatch { - url = "https://github.com/mitmproxy/mitmproxy/commit/b3525570929ba47c10d9d08696876c39487f7000.patch"; - sha256 = "111fld5gqdii7rs1jhqaqrxgbyhfn6qd0y7l15k4npamsnvdnv20"; - }) - # bump pyOpenSSL - (fetchpatch { - url = https://github.com/mitmproxy/mitmproxy/commit/6af72160bf98b58682b8f9fc5aabf51928d2b1d3.patch; - sha256 = "1q4ml81pq9c8j9iscq8janbxf4s37w3bqskbs6r30yqzy63v54f2"; - }) - # https://github.com/mitmproxy/mitmproxy/commit/3d7cde058b7e6242d93b9bc9d3e17520ffb578a5 - ./tornado-4.6.patch - ]; - checkPhase = '' export HOME=$(mktemp -d) # test_echo resolves hostnames - LC_CTYPE=en_US.UTF-8 pytest -k 'not test_echo' + LC_CTYPE=en_US.UTF-8 pytest -k 'not test_echo and not test_find_unclaimed_URLs ' ''; - propagatedBuildInputs = with p.pkgs; [ - blinker click certifi construct cryptography - cssutils editorconfig h2 html2text hyperframe - jsbeautifier kaitaistruct passlib pyasn1 pyopenssl + propagatedBuildInputs = with python3.pkgs; [ + blinker click certifi cryptography + h2 hyperframe + kaitaistruct passlib pyasn1 pyopenssl pyparsing pyperclip requests ruamel_yaml tornado - urwid watchdog brotlipy sortedcontainers + urwid brotlipy sortedcontainers ldap3 ]; - buildInputs = with p.pkgs; [ - beautifulsoup4 flask pytz pytest pytestrunner protobuf glibcLocales + buildInputs = with python3.pkgs; [ + beautifulsoup4 flask pytest pytestrunner glibcLocales ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/pkgs/tools/networking/nat-traverse/default.nix new file mode 100644 index 000000000000..a352596eed05 --- /dev/null +++ b/pkgs/tools/networking/nat-traverse/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + name = "nat-traverse-${version}"; + version = "0.7"; + + src = fetchurl { + url = "https://www.speicherleck.de/iblech/nat-traverse/nat-traverse-${version}.tar.bz2"; + sha256 = "0knwnqsjwv7sa5wjb863ghabs7s269a73qwkmxpsbngjw9s0j2ih"; + }; + + nativeBuildInputs = [ perl ]; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + cp nat-traverse $out/bin + gzip -c nat-traverse.1 > $out/share/man/man1/nat-traverse.1.gz + ''; + + meta = with stdenv.lib; { + description = "NAT gateway traversal utility"; + longDescription = '' + nat-traverse establishes direct connections between nodes which are + behind NAT gateways, i.e. hosts which do not have public IP addresses. + This is done using an UDP NAT traversal technique. Additionally, it's + possible to setup a small VPN by using pppd on top of nat-traverse. + + nat-traverse does not need an external server on the Internet, and it + isn't necessary to reconfigure the involved NAT gateways, either. + nat-traverse works out-of-the-box. + ''; + homepage = https://www.speicherleck.de/iblech/nat-traverse/; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.iblech ]; + }; +} diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 3220aebdfe49..fc320ba2fb96 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 -, libnotify, libsecret, polkit, isocodes, modemmanager, librsvg +, libnotify, libsecret, polkit, isocodes, modemmanager , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk +, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk , withGnome ? false }: stdenv.mkDerivation rec { @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas - polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring - modemmanager jansson librsvg glib_networking gnome3.dconf + polkit isocodes udev libgudev gnome3.libgnome_keyring + modemmanager jansson glib_networking ] ++ stdenv.lib.optional withGnome webkitgtk; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; - propagatedUserEnvPkgs = [ gnome3.gconf gnome3.gnome_keyring hicolor_icon_theme ]; + propagatedUserEnvPkgs = [ gnome3.gnome_keyring hicolor_icon_theme ]; makeFlags = [ ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 2b2b441f2f98..7e1c257ec4b6 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { "--with-privsep-user=${privsepUser}" "--sysconfdir=/etc" "--localstatedir=/var" + "--with-cacert=/etc/ssl/certs/ca-certificates.crt" ]; buildInputs = [ libressl ]; diff --git a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix new file mode 100644 index 000000000000..3d1055be02b8 --- /dev/null +++ b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix @@ -0,0 +1,76 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, + autoreconfHook, re2c, openldap, openvpn, gnustep, check +}: + +let + srcName = "openvpn-auth-ldap"; + srcVersion = "2.0.3"; + debianRev = "6.1"; + + fetchPatchFromDebian = + {patch, sha256}: + fetchpatch { + inherit sha256; + url = "http://sources.debian.net/data/main/o/${srcName}/${srcVersion}-${debianRev}/debian/patches/${patch}"; + }; +in + +stdenv.mkDerivation rec { + name = "${srcName}-${version}"; + version = "${srcVersion}+deb${debianRev}"; + + srcs = fetchFromGitHub { + owner = "threerings"; + repo = srcName; + rev = "auth-ldap-${version}"; + sha256 = "1v635ylzf5x3l3lirf3n6173q1w8g0ssjjkf27qqw98c3iqp63sq"; + }; + + patches = map fetchPatchFromDebian [ + {patch = "STARTTLS_before_auth.patch"; + sha256 = "14d2vy366rhzggxb1zb3ld00wmaqxi2gq885vxhlldnwpgig0jx0";} + {patch = "gobjc_4.7_runtime.patch"; + sha256 = "11hpmd4i1cm3m27x8c77d9jrwxpir4cy5d74k2kxq0q77rawnxcm";} + {patch = "openvpn_ldap_simpler_add_handler_4"; + sha256 = "0qj7v2w921489c18mfrs5bmipzn1mcjj9avyp15x4531ss0lyanb";} + {patch = "auth-ldap-gnustep.patch"; + sha256 = "0cz3jgyzgzi2p9bavd4lh69pnlnf4s7n9ihwg6zmmh6vqsynqss3";} + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + check + gnustep.base + gnustep.libobjc + gnustep.make + openldap + openvpn + re2c + ]; + + configureFlags = [ + "--with-objc-runtime=modern" + "--with-openvpn=${openvpn}/include" + "--libdir=$(out)/lib/openvpn" + ]; + + preInstall = '' + mkdir -p $out/lib/openvpn $out/share/doc/openvpn/examples + cp README $out/share/doc/openvpn/ + cp auth-ldap.conf $out/share/doc/openvpn/examples/ + ''; + + meta = with lib; { + description = "LDAP authentication plugin for OpenVPN"; + homepage = https://github.com/threerings/openvpn-auth-ldap; + license = [ + licenses.asl20 + licenses.bsd3 + ]; + maintainers = [ maintainers.benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 0c8ca56024bf..5633061c7212 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://pdsh.googlecode.com/files/${name}.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pdsh/${name}.tar.bz2"; sha256 = "1kvzz01fyaxfqmbh53f4ljfsgvxdykh5jyr6fh4f1bw2ywxr1w2p"; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://code.google.com/p/pdsh/; + homepage = https://github.com/chaos/pdsh; description = "High-performance, parallel remote shell utility"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index c2c41d92acbe..6185f66b80e4 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { patchPhase = '' sed -e 's/install -o root/install/' -i Makefile - sed -e 's,/bin/ip,${iproute}/sbin/ip,' -i routing.c ''; preConfigure = '' - makeFlagsArray=( PPPD=${ppp}/sbin/pppd BINDIR=$out/sbin \ - MANDIR=$out/share/man/man8 PPPDIR=$out/etc/ppp ) + makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \ + BINDIR=$out/sbin MANDIR=$out/share/man/man8 \ + PPPDIR=$out/etc/ppp ) ''; nativeBuildInputs = [ perl which ]; diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/tools/networking/reaver-wps-t6x/default.nix index 6e4a5561f07a..2f0e19b231c0 100644 --- a/pkgs/tools/networking/reaver-wps-t6x/default.nix +++ b/pkgs/tools/networking/reaver-wps-t6x/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpcap sqlite pixiewps ]; - sourceRoot = "reaver-wps-fork-t6x-v${version}-src/src"; + setSourceRoot = '' + sourceRoot=$(echo */src) + ''; configureFlags = "--sysconfdir=${confdir}"; diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index c9bd3fbaa853..6cbee7d2a851 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpcap sqlite ]; - sourceRoot = "reaver-${version}/src"; + + setSourceRoot = '' + sourceRoot=$(echo */src) + ''; configureFlags = "--sysconfdir=${confdir}"; @@ -28,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Brute force attack against Wifi Protected Setup"; - homepage = http://code.google.com/p/reaver-wps; + homepage = https://code.google.com/archive/p/reaver-wps/; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ nico202 volth ]; diff --git a/pkgs/tools/networking/slimrat/default.nix b/pkgs/tools/networking/slimrat/default.nix index 14283c279e46..ef2c91ee2fab 100644 --- a/pkgs/tools/networking/slimrat/default.nix +++ b/pkgs/tools/networking/slimrat/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "slimrat-1.0"; src = fetchurl { - url = http://slimrat.googlecode.com/files/slimrat-1.0.tar.bz2; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/slimrat/slimrat-1.0.tar.bz2"; sha256 = "139b71d45k4b1y47iq62a9732cnaqqbh8s4knkrgq2hx0jxpsk5a"; }; @@ -24,9 +24,10 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://code.google.com/p/slimrat/; + homepage = https://code.google.com/archive/p/slimrat/; description = "Linux Rapidshare downloader"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; + broken = true; # officially abandonned upstream }; } diff --git a/pkgs/tools/networking/statsd/default.nix b/pkgs/tools/networking/statsd/default.nix deleted file mode 100644 index 6f909a915ae3..000000000000 --- a/pkgs/tools/networking/statsd/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ recurseIntoAttrs, callPackage, nodejs -}: - -let - self = recurseIntoAttrs ( - callPackage ../../../top-level/node-packages.nix { - inherit nodejs self; - generated = callPackage ./node-packages.nix { inherit self; }; - overrides = { - "statsd" = { passthru.nodePackages = self; }; - }; - }); -in self.statsd diff --git a/pkgs/tools/networking/statsd/node-packages.json b/pkgs/tools/networking/statsd/node-packages.json deleted file mode 100644 index f75224e79f92..000000000000 --- a/pkgs/tools/networking/statsd/node-packages.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - "statsd" -, "statsd-librato-backend" -, "stackdriver-statsd-backend" -, "statsd-influxdb-backend" -] diff --git a/pkgs/tools/networking/statsd/node-packages.nix b/pkgs/tools/networking/statsd/node-packages.nix deleted file mode 100644 index fd196c249ae1..000000000000 --- a/pkgs/tools/networking/statsd/node-packages.nix +++ /dev/null @@ -1,284 +0,0 @@ -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."commander"."1.3.1" = - self.by-version."commander"."1.3.1"; - by-version."commander"."1.3.1" = self.buildNodePackage { - name = "commander-1.3.1"; - version = "1.3.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.3.1.tgz"; - name = "commander-1.3.1.tgz"; - sha1 = "02443e02db96f4b32b674225451abb6e9510000e"; - }; - deps = { - "keypress-0.1.0" = self.by-version."keypress"."0.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."connection-parse"."0.0.x" = - self.by-version."connection-parse"."0.0.7"; - by-version."connection-parse"."0.0.7" = self.buildNodePackage { - name = "connection-parse-0.0.7"; - version = "0.0.7"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; - name = "connection-parse-0.0.7.tgz"; - sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."generic-pool"."2.2.0" = - self.by-version."generic-pool"."2.2.0"; - by-version."generic-pool"."2.2.0" = self.buildNodePackage { - name = "generic-pool-2.2.0"; - version = "2.2.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.0.tgz"; - name = "generic-pool-2.2.0.tgz"; - sha1 = "8b465c1a7588ea9dd2bb133bda0bb66bfef8a63e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hashring"."3.2.0" = - self.by-version."hashring"."3.2.0"; - by-version."hashring"."3.2.0" = self.buildNodePackage { - name = "hashring-3.2.0"; - version = "3.2.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz"; - name = "hashring-3.2.0.tgz"; - sha1 = "fda4efde8aa22cdb97fb1d2a65e88401e1c144ce"; - }; - deps = { - "connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7"; - "simple-lru-cache-0.0.2" = self.by-version."simple-lru-cache"."0.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."keypress"."0.1.x" = - self.by-version."keypress"."0.1.0"; - by-version."keypress"."0.1.0" = self.buildNodePackage { - name = "keypress-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; - name = "keypress-0.1.0.tgz"; - sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."modern-syslog"."1.1.2" = - self.by-version."modern-syslog"."1.1.2"; - by-version."modern-syslog"."1.1.2" = self.buildNodePackage { - name = "modern-syslog-1.1.2"; - version = "1.1.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/modern-syslog/-/modern-syslog-1.1.2.tgz"; - name = "modern-syslog-1.1.2.tgz"; - sha1 = "f1fa58899f3f452d788f1573401212a4ef898de5"; - }; - deps = { - "nan-2.4.0" = self.by-version."nan"."2.4.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ "!win32" ]; - cpu = [ ]; - }; - by-spec."nan"."^2.0.5" = - self.by-version."nan"."2.4.0"; - by-version."nan"."2.4.0" = self.buildNodePackage { - name = "nan-2.4.0"; - version = "2.4.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"; - name = "nan-2.4.0.tgz"; - sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sequence"."2.2.1" = - self.by-version."sequence"."2.2.1"; - by-version."sequence"."2.2.1" = self.buildNodePackage { - name = "sequence-2.2.1"; - version = "2.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; - name = "sequence-2.2.1.tgz"; - sha1 = "7f5617895d44351c0a047e764467690490a16b03"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."simple-lru-cache"."0.0.x" = - self.by-version."simple-lru-cache"."0.0.2"; - by-version."simple-lru-cache"."0.0.2" = self.buildNodePackage { - name = "simple-lru-cache-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; - name = "simple-lru-cache-0.0.2.tgz"; - sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stackdriver-statsd-backend"."*" = - self.by-version."stackdriver-statsd-backend"."0.2.3"; - by-version."stackdriver-statsd-backend"."0.2.3" = self.buildNodePackage { - name = "stackdriver-statsd-backend-0.2.3"; - version = "0.2.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz"; - name = "stackdriver-statsd-backend-0.2.3.tgz"; - sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.3"; - by-spec."statsd"."*" = - self.by-version."statsd"."0.8.0"; - by-version."statsd"."0.8.0" = self.buildNodePackage { - name = "statsd-0.8.0"; - version = "0.8.0"; - bin = true; - src = fetchurl { - url = "https://registry.npmjs.org/statsd/-/statsd-0.8.0.tgz"; - name = "statsd-0.8.0.tgz"; - sha1 = "92041479e174a214df7147f2fab1348af0839052"; - }; - deps = { - "generic-pool-2.2.0" = self.by-version."generic-pool"."2.2.0"; - }; - optionalDependencies = { - "modern-syslog-1.1.2" = self.by-version."modern-syslog"."1.1.2"; - "hashring-3.2.0" = self.by-version."hashring"."3.2.0"; - "winser-0.1.6" = self.by-version."winser"."0.1.6"; - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "statsd" = self.by-version."statsd"."0.8.0"; - by-spec."statsd-influxdb-backend"."*" = - self.by-version."statsd-influxdb-backend"."0.6.0"; - by-version."statsd-influxdb-backend"."0.6.0" = self.buildNodePackage { - name = "statsd-influxdb-backend-0.6.0"; - version = "0.6.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz"; - name = "statsd-influxdb-backend-0.6.0.tgz"; - sha1 = "25fb83cf0b3af923dfc7d506eb1208def8790d78"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.6.0"; - by-spec."statsd-librato-backend"."*" = - self.by-version."statsd-librato-backend"."0.1.7"; - by-version."statsd-librato-backend"."0.1.7" = self.buildNodePackage { - name = "statsd-librato-backend-0.1.7"; - version = "0.1.7"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.7.tgz"; - name = "statsd-librato-backend-0.1.7.tgz"; - sha1 = "270dc406481c0e6a6f4e72957681a73015f478f6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.7"; - by-spec."winser"."=0.1.6" = - self.by-version."winser"."0.1.6"; - by-version."winser"."0.1.6" = self.buildNodePackage { - name = "winser-0.1.6"; - version = "0.1.6"; - bin = true; - src = fetchurl { - url = "https://registry.npmjs.org/winser/-/winser-0.1.6.tgz"; - name = "winser-0.1.6.tgz"; - sha1 = "08663dc32878a12bbce162d840da5097b48466c9"; - }; - deps = { - "sequence-2.2.1" = self.by-version."sequence"."2.2.1"; - "commander-1.3.1" = self.by-version."commander"."1.3.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; -} diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 7ef278e359cc..89019986bca2 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { # the configuration files. In the absence of that we patch swanctl to look # for configuration files in /etc/swanctl. substituteInPlace src/swanctl/swanctl.h --replace "SWANCTLDIR" "\"/etc/swanctl\"" + # glibc-2.26 reorganized internal includes + sed '1i#include ' -i src/libstrongswan/utils/utils/memory.h ''; preConfigure = '' diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/tools/networking/tcpflow/default.nix index 52727f1c49e7..1df0f2c37fc2 100644 --- a/pkgs/tools/networking/tcpflow/default.nix +++ b/pkgs/tools/networking/tcpflow/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib libpcap boost automake autoconf ] ++ lib.optional useCairo cairo; postUnpack = '' - pushd tcpflow-*-src/src + pushd "$sourceRoot/src" cp -rv ${be13_api}/* be13_api/ cp -rv ${dfxml}/* dfxml/ cp -rv ${httpparser}/* http-parser/ diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix index b12ce573d1c4..4ee4fa418335 100644 --- a/pkgs/tools/networking/udptunnel/default.nix +++ b/pkgs/tools/networking/udptunnel/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "udptunnel-19"; src = fetchurl { - url = http://udptunnel.googlecode.com/files/udptunnel-r19.tar.gz; - sha1 = "51edec3b63b659229bcf92f6157568d3b074ede0"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/udptunnel/udptunnel-r19.tar.gz"; + sha256 = "1hkrn153rdyrp9g15z4d5dq44cqlnby2bfplp6z0g3862lnv7m3l"; }; installPhase = '' @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://code.google.com/p/udptunnel/; + homepage = https://code.google.com/archive/p/udptunnel/; description = "Tunnels TCP over UDP packets"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index cb462a2cedd2..b124352fd7b9 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.6.6"; + version = "1.6.7"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "145kska9a63yf32y3jg91y5ikcmsb7qvbcm7a8k6fgh96gf18awp"; + sha256 = "17qwfmlls0w9kpkya3dlpn44b3kr87wsswzg3gawc13hh8yx8ysf"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 1a260f910e20..b6bbae65e695 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,24 +1,19 @@ { stdenv, fetchurl, gettext, pkgconfig, perl , libidn2, zlib, pcre, libuuid, libiconv -, IOSocketSSL, LWP, python3 +, IOSocketSSL, LWP, python3, lzip , libpsl ? null , openssl ? null }: stdenv.mkDerivation rec { - name = "wget-1.19.1"; + name = "wget-1.19.2"; src = fetchurl { - url = "mirror://gnu/wget/${name}.tar.xz"; - sha256 = "1ljcfhbkdsd0zjfm520rbl1ai62fc34i7c45sfj244l8f6b0p58c"; + url = "mirror://gnu/wget/${name}.tar.lz"; + sha256 = "01yzal7xm85543x02bij3capnigr063d6c5vc039f8n5s9d796nm"; }; patches = [ ./remove-runtime-dep-on-openssl-headers.patch - (fetchurl { - name = "CVE-2017-6508"; - url = "http://git.savannah.gnu.org/cgit/wget.git/patch/?id=4d729e322fae359a1aefaafec1144764a54e8ad4"; - sha256 = "14r0c5y3w3gavxp2d9yq8xji82izi5sx0sjv6jpmk6zp6cnr7cjf"; - }) ]; preConfigure = '' @@ -34,7 +29,7 @@ stdenv.mkDerivation rec { export LIBS="-liconv -lintl" ''; - nativeBuildInputs = [ gettext pkgconfig perl ]; + nativeBuildInputs = [ gettext pkgconfig perl lzip ]; buildInputs = [ libidn2 libiconv zlib pcre libuuid ] ++ stdenv.lib.optionals doCheck [ IOSocketSSL LWP python3 ] ++ stdenv.lib.optional (openssl != null) openssl diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 53c39003483d..63431e29facb 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }: +{ stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper, coreutils }: stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.18.24"; + version = "1.19.0.4"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1d6p22vk1b9v16q96mwaz9w2xr4ly28yamkh49md9gq67qfhhlyq"; + sha256 = "02lrwrkl2g1jwj71088rwswx07a1zq1jkq7193lbvy8jj2qnp9lq"; }; configureFlags = [ @@ -31,6 +31,24 @@ stdenv.mkDerivation rec { done ''; + patchPhase = '' + patchShebangs . + + # Dpkg commands sometimes calls out to shell commands + substituteInPlace lib/dpkg/dpkg.h \ + --replace '"dpkg-deb"' \"$out/bin/dpkg-deb\" \ + --replace '"dpkg-split"' \"$out/bin/dpkg-split\" \ + --replace '"dpkg-query"' \"$out/bin/dpkg-query\" \ + --replace '"dpkg-divert"' \"$out/bin/dpkg-divert\" \ + --replace '"dpkg-statoverride"' \"$out/bin/dpkg-statoverride\" \ + --replace '"dpkg-trigger"' \"$out/bin/dpkg-trigger\" \ + --replace '"dpkg"' \"$out/bin/dpkg\" \ + --replace '"debsig-verify"' \"$out/bin/debsig-verify\" \ + --replace '"rm"' \"${coreutils}/bin/rm\" \ + --replace '"cat"' \"${coreutils}/bin/cat\" \ + --replace '"diff"' \"${coreutils}/bin/diff\" + ''; + buildInputs = [ perl zlib bzip2 xz ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/package-management/fpm/Gemfile b/pkgs/tools/package-management/fpm/Gemfile index ea498ca78355..17ed0a0cb2af 100644 --- a/pkgs/tools/package-management/fpm/Gemfile +++ b/pkgs/tools/package-management/fpm/Gemfile @@ -1,4 +1,3 @@ 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 16d7a8250ec9..e0c12dcce31a 100644 --- a/pkgs/tools/package-management/fpm/Gemfile.lock +++ b/pkgs/tools/package-management/fpm/Gemfile.lock @@ -1,22 +1,16 @@ -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: arr-pm (0.0.10) cabin (> 0) - backports (3.6.8) - cabin (0.8.1) - childprocess (0.5.9) + backports (3.10.3) + cabin (0.9.0) + childprocess (0.8.0) ffi (~> 1.0, >= 1.0.11) - clamp (1.0.0) - ffi (1.9.14) - fpm (1.6.2) - archive-tar-minitar + clamp (1.0.1) + dotenv (2.2.1) + ffi (1.9.18) + fpm (1.9.3) arr-pm (~> 0.0.10) backports (>= 2.6.2) cabin (>= 0.6.0) @@ -24,29 +18,30 @@ GEM clamp (~> 1.0.0) ffi json (>= 1.7.7, < 2.0) - pleaserun (~> 0.0.24) + pleaserun (~> 0.0.29) ruby-xz + stud insist (1.0.0) io-like (0.3.0) - json (1.8.3) + json (1.8.6) mustache (0.99.8) - pleaserun (0.0.24) + pleaserun (0.0.30) cabin (> 0) clamp + dotenv insist mustache (= 0.99.8) stud ruby-xz (0.2.3) ffi (~> 1.9) io-like (~> 0.3) - stud (0.0.22) + stud (0.0.23) PLATFORMS ruby DEPENDENCIES - archive-tar-minitar (>= 0.5.2.1)! fpm BUNDLED WITH - 1.14.3 + 1.14.6 diff --git a/pkgs/tools/package-management/fpm/gemset.nix b/pkgs/tools/package-management/fpm/gemset.nix index 4243651dd25d..26450bc36122 100644 --- a/pkgs/tools/package-management/fpm/gemset.nix +++ b/pkgs/tools/package-management/fpm/gemset.nix @@ -1,15 +1,6 @@ { - archive-tar-minitar = { - source = { - fetchSubmodules = false; - rev = "dae32ca550a87dba32597115ae18805db4782ebe"; - sha256 = "0fvxacbcb52fm5dis451kdd7dv74z8p6nm4vnfqf7jg2aghcxdkd"; - type = "git"; - url = "git://github.com/peterhoeg/archive-tar-minitar.git"; - }; - version = "0.5.2.1"; - }; arr-pm = { + dependencies = ["cabin"]; source = { remotes = ["https://rubygems.org"]; sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg"; @@ -20,50 +11,60 @@ backports = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1zcgqw7m7jb8n7b2jwla5cq0nw9wsgddxfmn0a9v89ihzd4i1a5k"; + sha256 = "1agsk23kfr194s690jnrpijh9pf3hq4a9yy66j1wzzj2x19ss9y0"; type = "gem"; }; - version = "3.6.8"; + version = "3.10.3"; }; cabin = { source = { remotes = ["https://rubygems.org"]; - sha256 = "06b5ri2629ad9xjc419xswz17zli90v8x640k2sd6v2yb90zkr1b"; + sha256 = "0b3b8j3iqnagjfn1261b9ncaac9g44zrx1kcg81yg4z9i513kici"; type = "gem"; }; - version = "0.8.1"; + version = "0.9.0"; }; childprocess = { + dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1is253wm9k2s325nfryjnzdqv9flq8bm4y2076mhdrncxamrh7r2"; + sha256 = "081hxbgrqjxha0jz0p0wkncdqawdvlsxb3awsx195g0pgkpqrcms"; type = "gem"; }; - version = "0.5.9"; + version = "0.8.0"; }; clamp = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0vy6ghz9l84qazlza30z0dwwrlifc5c7akgrl1v72ivmmjga45hw"; + sha256 = "0jb6l4scp69xifhicb5sffdixqkw8wgkk9k2q57kh2y36x1px9az"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; + }; + dotenv = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pgzlvs0sswnqlgfm9gkz2hlhkc0zd3vnlp2vglb1wbgnx37pjjv"; + type = "gem"; + }; + version = "2.2.1"; }; ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nkcrmxqr0vb1y4rwliclwlj2ajsi4ddpdx2gvzjy0xbkk5iqzfp"; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; type = "gem"; }; - version = "1.9.14"; + version = "1.9.18"; }; fpm = { + dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ids20mcs6w8nf4bpjj749ayc7h637kqx0pdw5d5a0yzik34daaj"; + sha256 = "0yvp9cifzfrxv3pr1kvcvvnyrcz8vxf6yd43hg5blaick50sbm23"; type = "gem"; }; - version = "1.6.2"; + version = "1.9.3"; }; insist = { source = { @@ -84,10 +85,10 @@ json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; type = "gem"; }; - version = "1.8.3"; + version = "1.8.6"; }; mustache = { source = { @@ -98,14 +99,16 @@ version = "0.99.8"; }; pleaserun = { + dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s26216ip6skzbdl48z8wbrzqbvwq1q4s6sm8r209zvvlp0rinkw"; + sha256 = "0hgnrl67zkqaxmfkwbyscawj4wqjm7h8khpbj58s6iw54wp3408p"; type = "gem"; }; - version = "0.0.24"; + version = "0.0.30"; }; ruby-xz = { + dependencies = ["ffi" "io-like"]; source = { remotes = ["https://rubygems.org"]; sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw"; @@ -116,9 +119,9 @@ stud = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1raavxgn5k4bxap5wqdl7zmfw5k4ndl8aagnajlfg4f0bmm8yni7"; + sha256 = "0qpb57cbpm9rwgsygqxifca0zma87drnlacv49cqs2n5iyi6z8kb"; type = "gem"; }; - version = "0.0.22"; + version = "0.0.23"; }; } \ No newline at end of file diff --git a/pkgs/tools/package-management/fpm/update b/pkgs/tools/package-management/fpm/update new file mode 100755 index 000000000000..22d1e52e2977 --- /dev/null +++ b/pkgs/tools/package-management/fpm/update @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p bash ruby bundler bundix + +rm Gemfile.lock +bundler install +bundix + +if [ "clean" == "$1" ]; then + rm -r ~/.gem +fi diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 4359682d96a0..fe7818691779 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -160,13 +160,13 @@ in rec { }) // { perl-bindings = nixStable; }; nixUnstable = (lib.lowPrio (common rec { - name = "nix-1.12${suffix}"; - suffix = "pre5663_c7af84ce"; + name = "nix-unstable-1.12${suffix}"; + suffix = "pre5732_fd10f6f2"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "c7af84ce846a9deefa5b4db1b1bce1c091ca2a1e"; - sha256 = "1sc6rkx0500jz4fyfqm7443s1q24whmpx10mfs12wdk516f0q8qh"; + rev = "fd10f6f2414521947ca60b9d1508d909f50e9faa"; + sha256 = "17561jll94c8hdpxnyvdbjslnwr9g7ii4wqvrla7gfza236j9hff"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 1467faac8e3f..daecb8746eaf 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.5.1"; + version = "1.5.2"; src = fetchurl { url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "0pba9c8ya4hvqmg458p74g69hb06lh0f5bsgw7dsi8pjrcb0624g"; + sha256 = "00y2arc5rffvy6xmx4p6ibpjyc61k8dkiabq7ccwwjgckz1d2dpb"; }; }) diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index ed7ec74483f3..f6c5c7b53e13 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -25,6 +25,7 @@ pythonPackages.buildPythonApplication rec { homepage = https://github.com/madjar/nox; description = "Tools to make nix nicer to use"; maintainers = [ lib.maintainers.madjar ]; + license = lib.licenses.mit; platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index e1e57a84b555..a0368b0df89e 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight package management system based upon ipkg"; - homepage = http://code.google.com/p/opkg/; + homepage = https://git.yoctoproject.org/cgit/cgit.cgi/opkg/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 180395571b22..d4e6885d8f36 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, lib , intltool, glib, pkgconfig, polkit, python, sqlite, systemd -, gobjectIntrospection, vala_0_23, gtk_doc, autoreconfHook, autoconf-archive +, gobjectIntrospection, vala_0_38, gtk_doc, autoreconfHook, autoconf-archive # TODO: set enableNixBackend to true, as soon as it builds , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { name = "packagekit-${version}"; - version = "1.1.3"; + version = "1.1.7"; src = fetchFromGitHub { owner = "hughsie"; repo = "PackageKit"; rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "150mpar7bhlvwfpwsr6zrjn3yggvklzr6nlhk0shaxnrfkfxvvb6"; + sha256 = "076rrczmyhapj87pxqldsar5pbz4mid6cm9l1n91zh2q403chdkb"; }; - buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_23 ] + buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ] ++ lib.optional enableBashCompletion bash-completion; propagatedBuildInputs = [ sqlite nix boost ]; nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ]; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 860be0e1f791..0e9ef3876d2b 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rpm-${version}"; - version = "4.13.0.1"; + version = "4.14.0"; src = fetchurl { - url = "http://ftp.rpm.org/releases/rpm-4.13.x/rpm-${version}.tar.bz2"; - sha256 = "27fc7ba7d419622b1ce34d6507aa70b0808bc344021d298072a0c2ec165f9b0d"; + url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2"; + sha256 = "053396glswgszzg6wizn76vc8zc5m2bicw025vj44g0dc1aav806"; }; outputs = [ "out" "dev" "man" ]; @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ]; - patches = [ ./rpm-4.13.0.1-bfd-config.patch ]; - postPatch = '' # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable} diff --git a/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch b/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch deleted file mode 100644 index b8192b24f134..000000000000 --- a/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru rpm-4.13.0.1/tools/sepdebugcrcfix.c rpm-4.13.0.1.new/tools/sepdebugcrcfix.c ---- rpm-4.13.0.1/tools/sepdebugcrcfix.c 2017-02-16 10:40:09.988649399 +0100 -+++ rpm-4.13.0.1.new/tools/sepdebugcrcfix.c 2017-04-15 00:02:21.151359876 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - - #define _(x) x diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index c078c3a21c5a..7230d30c7955 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -3,15 +3,17 @@ buildGoPackage rec { name = "browserpass-${version}"; - version = "1.0.6"; + version = "2.0.7"; goPackagePath = "github.com/dannyvankooten/browserpass"; + goDeps = ./deps.nix; + src = fetchFromGitHub { repo = "browserpass"; owner = "dannyvankooten"; rev = version; - sha256 = "07wkvwb9klzxnlrm9a07kxzj3skpy0lymc9ijr8ykfbz6l0bpbqy"; + sha256 = "1dbp5za5qh6xmgh3w2cx5fbw13mh1szgj2y7ilmq0jh2ik09fbnd"; }; postInstall = '' diff --git a/pkgs/tools/security/browserpass/deps.nix b/pkgs/tools/security/browserpass/deps.nix new file mode 100644 index 000000000000..4a86966a9fc0 --- /dev/null +++ b/pkgs/tools/security/browserpass/deps.nix @@ -0,0 +1,30 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/gokyle/twofactor"; + fetch = { + type = "git"; + url = "https://github.com/gokyle/twofactor"; + rev = "eaad1884d40f9cabff98a57a524c17afd00c9fe7"; + sha256 = "07kvga6f2b56kpy52a3xk16garvlqz950s350dax97x7cayba95g"; + }; + } + { + goPackagePath = "github.com/mattn/go-zglob"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-zglob"; + rev = "4b74c24375b3b1ee226867156e01996f4e19a8d6"; + sha256 = "1qc502an4q3wgvrd9zw6zprgm28d90d2f98bdamdf4js03jj22xn"; + }; + } + { + goPackagePath = "rsc.io/qr"; + fetch = { + type = "git"; + url = "https://github.com/rsc/qr"; + rev = "48b2ede4844e13f1a2b7ce4d2529c9af7e359fc5"; + sha256 = "1npxy32glnkvsp0871972jzjzgkwaqmbv6jsj9wgqsa1s2jr004p"; + }; + } +] diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix new file mode 100644 index 000000000000..2766c2c07a4f --- /dev/null +++ b/pkgs/tools/security/ecdsautils/default.nix @@ -0,0 +1,24 @@ +{ stdenv, pkgs }: + +stdenv.mkDerivation rec { + version = "0.4.0"; + name = "ecdsautils-${version}"; + + src = pkgs.fetchFromGitHub { + owner = "tcatm"; + repo = "ecdsautils"; + rev = "07538893fb6c2a9539678c45f9dbbf1e4f222b46"; + sha256 = "18sr8x3qiw8s9l5pfi7r9i3ayplz4jqdml75ga9y933vj7vs0k4d"; + }; + + nativeBuildInputs = with pkgs; [ cmake pkgconfig doxygen ]; + buildInputs = with pkgs; [ libuecc ]; + + meta = with stdenv.lib; { + description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)"; + homepage = https://github.com/tcatm/ecdsautils/; + license = with licenses; [ mit bsd2 ]; + maintainers = with maintainers; [ andir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 298dd336be1f..81c92415c509 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -1,40 +1,39 @@ -{ stdenv, fetchurl, gmp }: +{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd }: -assert stdenv.isLinux; - -let - bits = if stdenv.system == "x86_64-linux" then "64" else "32"; -in stdenv.mkDerivation rec { name = "hashcat-${version}"; - version = "2.00"; + version = "4.0.0"; src = fetchurl { - name = "${name}.tar.gz"; - url = "https://codeload.github.com/hashcat/hashcat/tar.gz/${version}"; - sha256 = "0i2l4i1jkdhj9bkvycgd2nf809kki3jp83y0vrd4iwsdbbbyc9b3"; + url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; + sha256 = "0l1vq4h1gfxc2yclxkvy6gfz6sii2vyzip8pw6ifq930y8dvi34y"; }; - buildInputs = [ gmp ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ opencl-headers ]; - buildFlags = [ "posix${bits}" ] - ++ stdenv.lib.optionals (bits == "64") [ "posixXOP" "posixAVX" ]; + makeFlags = [ + "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" + "COMPTIME=1337" + "VERSION_TAG=${version}" + ]; - # Upstream Makefile doesn't have 'install' target - installPhase = '' - mkdir -p $out/bin $out/libexec - cp -R * $out/libexec - - ln -s $out/libexec/hashcat-cli${bits}.bin $out/bin/hashcat - ln -s $out/libexec/hashcat-cliXOP.bin $out/bin/hashcat-xop - ln -s $out/libexec/hashcat-cliAVX.bin $out/bin/hashcat-avx + # $out is not known until the build has started. + configurePhase = '' + runHook preConfigure + makeFlags="$makeFlags PREFIX=$out" + runHook postConfigure ''; - meta = { + postFixup = '' + wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib + ''; + + meta = with stdenv.lib; { description = "Fast password cracker"; - homepage = "https://hashcat.net/hashcat/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + homepage = https://hashcat.net/hashcat/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ kierdavis zimbatm ]; }; } diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix deleted file mode 100644 index 7a0d7241bbf9..000000000000 --- a/pkgs/tools/security/hashcat/hashcat3/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd }: - -assert stdenv.isLinux; - -stdenv.mkDerivation rec { - name = "hashcat-${version}"; - version = "3.6.0"; - - src = fetchurl { - url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "127hdvq6ikah7r5vch63jnnkcsj7y61f9h8x79c3w25x9w55bxry"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ opencl-headers ]; - - makeFlags = [ "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" ]; - - # $out is not known until the build has started. - configurePhase = '' - runHook preConfigure - makeFlags="$makeFlags PREFIX=$out" - runHook postConfigure - ''; - - postFixup = '' - wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib - ''; - - meta = { - description = "Fast password cracker"; - homepage = https://hashcat.net/hashcat/; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.kierdavis ]; - }; -} diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index 46c90481628d..22a452ccabdd 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, libpcap }: +{ stdenv, fetchFromGitHub, makeWrapper, libpcap }: stdenv.mkDerivation rec { name = "masscan-${version}"; - version = "2016-11-03"; + version = "1.0.4"; src = fetchFromGitHub { owner = "robertdavidgraham"; repo = "masscan"; - rev = "dc88677a11dc3d9a5f6aa55cc1377bc17dba1496"; - sha256 = "1mdjqkn4gnbwr5nci6i6xn7qzkjgq7dx37fzd6gghv87xgw7cdbg"; + rev = "39061a5e9ef158dde1e6618f6fbf379739934a73"; + sha256 = "0mjvwh4i0ncsa3ywavw2s55v5bfv7pyga028c8m8xfash9764wwf"; }; - buildInputs = [ libpcap ]; + buildInputs = [ makeWrapper ]; makeFlags = [ "PREFIX=$(out)" "CC=cc" "-j" ]; @@ -24,13 +24,15 @@ stdenv.mkDerivation rec { cp -t $out/share/doc/masscan doc/algorithm.js doc/howto-afl.md doc/bot.hml cp doc/masscan.8 $out/share/man/man8/masscan.8 cp LICENSE $out/share/licenses/masscan/LICENSE + + wrapProgram $out/bin/masscan --prefix LD_LIBRARY_PATH : "${libpcap}/lib" ''; meta = with stdenv.lib; { description = "Fast scan of the Internet"; homepage = https://github.com/robertdavidgraham/masscan; license = licenses.agpl3; - platforms = with platforms; allBut darwin; + platforms = platforms.unix; maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix index ebd9a6d5e7ee..3d4bdd2edf17 100644 --- a/pkgs/tools/security/mfcuk/default.nix +++ b/pkgs/tools/security/mfcuk/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.3.8"; src = fetchurl { - url = "http://mfcuk.googlecode.com/files/mfcuk-0.3.8.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mfcuk/mfcuk-0.3.8.tar.gz"; sha256 = "0m9sy61rsbw63xk05jrrmnyc3xda0c3m1s8pg3sf8ijbbdv9axcp"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MiFare Classic Universal toolKit"; license = licenses.gpl2; - homepage = http://code.google.com/p/mfcuk/; + homepage = https://github.com/nfc-tools/mfcuk; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/tools/security/mfoc/default.nix index 8a454ca67fde..278818e88b54 100644 --- a/pkgs/tools/security/mfoc/default.nix +++ b/pkgs/tools/security/mfoc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.10.6"; src = fetchurl { - url = "http://mfoc.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mfoc/${name}.tar.gz"; sha1 = "3adce3029dce9124ff3bc7d0fad86fa0c374a9e3"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mifare Classic Offline Cracker"; license = licenses.gpl2; - homepage = http://code.google.com/p/mfoc/; + homepage = https://github.com/nfc-tools/mfoc; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index a9763b07b71f..8f087ef3d93c 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -3,29 +3,31 @@ stdenv.mkDerivation rec { name = "nsjail-${version}"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "google"; repo = "nsjail"; rev = version; fetchSubmodules = true; - sha256 = "1wkhy86d0vgzngdvv593yhcghjh63chb8s67v891zll6bwgwg5h2"; + sha256 = "11323j5wd02nm8ibvzbzq7dla70bmcldc71lv5bpk4x7h64ai14v"; }; nativeBuildInputs = [ autoconf libtool pkgconfig ]; buildInputs = [ bison flex libnl protobuf protobufc ]; + enableParallelBuilding = true; installPhase = '' - mkdir -p $out/bin - cp nsjail $out/bin + mkdir -p $out/bin $out/share/man/man1 + install nsjail $out/bin/ + install nsjail.1 $out/share/man/man1/ ''; meta = with stdenv.lib; { description = "A light-weight process isolation tool, making use of Linux namespaces and seccomp-bpf syscall filters"; homepage = http://nsjail.com/; - license = licenses.apsl20; - maintainers = [ maintainers.bosu ]; + license = licenses.asl20; + maintainers = with maintainers; [ bosu c0bw3b ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix index 9e01e8f0a9f3..91df7f3fbb0a 100644 --- a/pkgs/tools/security/omapd/default.nix +++ b/pkgs/tools/security/omapd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.2"; src = fetchurl { - url = "http://omapd.googlecode.com/files/${name}.tgz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${name}.tgz"; sha256 = "0d7lgv957jhbsav60j50jhdy3rpcqgql74qsniwnnpm3yqj9p0xc"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://code.google.com/p/omapd; + homepage = https://code.google.com/archive/p/omapd/; description = "IF-MAP Server that implements the IF-MAP v1.1 and v2.0 specifications published by the Trusted Computing Group (TCG)"; license = licenses.gpl3; maintainers = [ maintainers.tstrobel ]; diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 919ad9791a2c..61f51973ed32 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "rofi-pass-${version}"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "carnager"; repo = "rofi-pass"; rev = version; - sha256 = "1sc4b1g2z7402akk96rqbnwjd66n6qn046ihpwxdb03bv2qahiap"; + sha256 = "1fn1j2rf3abc5qb44zfc8z8ffw6rva4xfp7597hwr1g3szacazpq"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix index 93b53c3ad4a3..09b5b5f58ca4 100644 --- a/pkgs/tools/security/pgpdump/default.nix +++ b/pkgs/tools/security/pgpdump/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub +, supportCompressedPackets ? true, zlib, bzip2 +}: stdenv.mkDerivation rec { name = "pgpdump-${version}"; @@ -11,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1ip7q5sgh3nwdqbrzpp6sllkls5kma98kns53yspw1830xi1n8xc"; }; + buildInputs = stdenv.lib.optionals supportCompressedPackets [ zlib bzip2 ]; + meta = with stdenv.lib; { description = "A PGP packet visualizer"; longDescription = '' diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix index b793219f6497..79e8fb071b37 100644 --- a/pkgs/tools/security/pwgen/default.nix +++ b/pkgs/tools/security/pwgen/default.nix @@ -1,11 +1,14 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, autoreconfHook}: stdenv.mkDerivation { - name = "pwgen-2.07"; + name = "pwgen-2.08"; src = fetchurl { - url = mirror://sourceforge/pwgen/pwgen-2.07.tar.gz; - sha256 = "0mhmw700kkh238fzivcwnwi94bj9f3h36yfh3k3j2v19b0zmjx7b"; + url = https://github.com/tytso/pwgen/archive/v2.08.tar.gz; + sha256 = "8d6e94f28655e61d6126290e3eafad4d17d7fba0d0d354239522a740a270bb2f"; }; + + nativeBuildInputs = [ autoreconfHook ]; + meta = { description = "Password generator which creates passwords which can be easily memorized by a human"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix index bb165e53c73d..6db16c95fc88 100644 --- a/pkgs/tools/security/sshguard/default.nix +++ b/pkgs/tools/security/sshguard/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, autoreconfHook, yacc, flex}: - stdenv.mkDerivation rec { - version = "2.0.0"; + version = "2.1.0"; name = "sshguard-${version}"; src = fetchurl { - url = "mirror://sourceforge/sshguard/sshguard-2.0.0.tar.gz"; - sha256 = "e87c6c4a6dddf06f440ea76464eb6197869c0293f0a60ffa51f8a6a0d7b0cb06"; + url = "mirror://sourceforge/sshguard/${name}.tar.gz"; + sha256 = "12h2rx40lf3p3kgazmgakkgajjk2d3sdvr2f73ghi15d6i42l991"; }; doCheck = true; @@ -16,8 +15,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" ]; - patches = [ ./0001-Remove-the-unnecessary-from-ipset-cmds.patch ]; - meta = with stdenv.lib; { description = "SSHGuard protects hosts from brute-force attacks"; longDescription = '' diff --git a/pkgs/tools/security/tmin/default.nix b/pkgs/tools/security/tmin/default.nix index 2c16e936a695..30bca5d1b26f 100644 --- a/pkgs/tools/security/tmin/default.nix +++ b/pkgs/tools/security/tmin/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.05"; src = fetchurl { - url = "https://tmin.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/tmin/${name}.tar.gz"; sha256 = "0166kcfs4b0da4hs2aqyn41f5l09i8rwxpi20k7x17qsxbmjbpd5"; }; @@ -16,9 +16,13 @@ stdenv.mkDerivation rec { meta = { description = "Fuzzing tool test-case optimizer"; - homepage = "https://code.google.com/p/tmin"; + longDescription = '' + This project is obsolete and replaced by the afl-tmin tool bundled with american fuzzy lop (afl) + ''; + homepage = "https://code.google.com/archive/p/tmin/"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + broken = true; # officially deprecated upstream in favor of afl-tmin (afl package) }; } diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 3daf30d2ff0a..576189d9a85a 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.3.1.7"; + name = "tor-0.3.1.8"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "13y0v4zfla0vziy9kkahmhrwylv32ianjikcr46mwbxvji4dvx8x"; + sha256 = "18dinpj03d036rashlad16lv7j2hba8gg742z07l37x5c242kxkx"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 466dc4b4e46c..ebc567f54cea 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Wrapper to safely torify applications"; - homepage = http://code.google.com/p/torsocks/; + homepage = https://github.com/dgoulet/torsocks; repositories.git = https://git.torproject.org/torsocks.git; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index 1beb2268fc6c..c86891d8ccd8 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -3,19 +3,15 @@ pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "vulnix"; - version = "1.2.2"; + version = "1.3.4"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1ia9plziwach0bxnlcd33q30kcsf8sv0nf2jc78gsmrqnxjabr12"; + sha256 = "1js1i86pgkkqc9yzp1rck7rmaz79klv4048r9z7v56fam0a6sg05"; }; buildInputs = with pythonPackages; [ flake8 pytest pytestcov ]; - postPatch = '' - sed -i -e 's/==\([^=]\+\)/>=\1/g' setup.py - ''; - propagatedBuildInputs = [ nix ] ++ (with pythonPackages; [ @@ -27,12 +23,16 @@ pythonPackages.buildPythonApplication rec { zodb ]); + postPatch = '' + sed -i -e 's/==\([^=]\+\)/>=\1/g' setup.py + ''; + checkPhase = "py.test"; meta = with stdenv.lib; { description = "NixOS vulnerability scanner"; homepage = https://github.com/flyingcircusio/vulnix; license = licenses.bsd2; - maintainers = with maintainers; [ plumps ]; + maintainers = with maintainers; [ ckauhaus plumps ]; }; } diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index 13c2938f63bc..2c2d778697a4 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "datefudge"; - version = "1.2.1"; + version = "1.22"; name = "${pname}-${version}"; src = fetchgit { - sha256 = "0l83kn6c3jr3wzs880zfa64rw81cqjjk55gjxz71rjf2balp64ps"; + sha256 = "1fmd05r00wx4zc90lbi804jl7xwdl11jq2a1kp5lqimk3yyvfw4c"; url = "git://anonscm.debian.org/users/robert/datefudge.git"; - rev = "cd141c63bebe9b579109b2232b5e83db18f222c2"; + rev = "fe27db47a0f250fb56164114fff8ae8d5af47ab6"; }; patchPhase = '' diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index b85ad32ca37c..ea062115402d 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -1,29 +1,33 @@ -{ fetchurl, stdenv, unzip }: +{ stdenv, fetchurl, pcre2 }: -let - rev = "3ec908d539"; -in -stdenv.mkDerivation { - name = "hardlink-2012.9.${rev}"; + +stdenv.mkDerivation rec { + name = "hardlink-${version}"; + version = "1.3-4"; src = fetchurl { - url = "http://pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip"; - sha256 = "fea1803170b538d5fecf6a8d312ded1d25d516e9386a3797441a247487551647"; - name = "hardlink-${rev}.zip"; + url = "http://pkgs.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz"; + sha256 = "0g4hyrnd9hpykbf06qvvp3s4yyk7flbd95gilkf7r3w9vqiagvs2"; }; + buildInputs = [ pcre2 ]; + NIX_CFLAGS_LINK = "-lpcre2-8"; + + buildPhase = '' + $CC -O2 hardlink.c -o hardlink $NIX_CFLAGS_LINK + ''; + installPhase = '' mkdir -p $out/bin $out/share/man/man1 - cc -O2 hardlink.c -o $out/bin/hardlink - mv hardlink.1 $out/share/man/man1/hardlink.1 + cp -f hardlink $out/bin/hardlink + cp -f hardlink.1 $out/share/man/man1/hardlink.1 ''; - buildInputs = [ unzip ]; - - meta = { - homepage = http://pkgs.fedoraproject.org/cgit/hardlink.git/; + meta = with stdenv.lib; { description = "Consolidate duplicate files via hardlinks"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + homepage = https://pagure.io/hardlink; + repositories.git = http://pkgs.fedoraproject.org/cgit/rpms/hardlink.git; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 6dfc6d1349d0..e410ef1cee50 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -1,42 +1,35 @@ -{ stdenv, fetchgit, pkgconfig, libuuid, openssl }: +{ stdenv, fetchgit, pkgconfig, libuuid, openssl, libyaml, lzma }: stdenv.mkDerivation rec { - version = "20130507"; - checkout = "25/50225/2"; + version = "20171023"; + checkout = "8122e0b8b13794"; name = "vboot_reference-${version}"; src = fetchgit { url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference; - rev = "refs/changes/${checkout}"; - sha256 = "14d3a93ha5k4al4ib43nyn1ppx7kgb12xw6mkflhx8nxmx8827nc"; + rev = "${checkout}"; + sha256 = "0qxm3qlvm2fgjrn9b3n8rdccw2f5pdi7z542m2hdfddflx7jz1w7"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl stdenv.cc.libc.static ] - ++ stdenv.lib.optional (libuuid != null) - (libuuid.overrideAttrs (attrs: - { configureFlags = attrs.configureFlags ++ [ "--enable-static" ]; })); + buildInputs = [ openssl libuuid libyaml lzma ]; - arch = if stdenv.system == "x86_64-linux" then "x86_64" - else if stdenv.system == "i686-linux" then "x86" - else throw "vboot_reference for: ${stdenv.system} not supported!"; + enableParallelBuilding = true; - buildPhase = '' - make ARCH=${arch} `pwd`/build/cgpt/cgpt - make ARCH=${arch} `pwd`/build/utility/vbutil_kernel - make ARCH=${arch} `pwd`/build/utility/vbutil_key - make ARCH=${arch} `pwd`/build/utility/vbutil_keyblock - make ARCH=${arch} `pwd`/build/utility/vbutil_firmware + patches = [ ./dont_static_link.patch ]; + + preBuild = '' + patchShebangs scripts ''; - installPhase = '' - mkdir -p $out/bin - cp build/cgpt/cgpt $out/bin - cp build/utility/vbutil_kernel $out/bin - cp build/utility/vbutil_key $out/bin - cp build/utility/vbutil_keyblock $out/bin - cp build/utility/vbutil_firmware $out/bin + makeFlags = [ + "DESTDIR=$(out)" + ]; + + postInstall = '' + mkdir -p $out/share/vboot + cp -r tests/devkeys* $out/share/vboot/ ''; meta = { diff --git a/pkgs/tools/system/vboot_reference/dont_static_link.patch b/pkgs/tools/system/vboot_reference/dont_static_link.patch new file mode 100644 index 000000000000..506b942e246e --- /dev/null +++ b/pkgs/tools/system/vboot_reference/dont_static_link.patch @@ -0,0 +1,30 @@ +--- +--- a/Makefile ++++ b/Makefile +@@ -964,7 +964,7 @@ ${UTILLIB21}: ${UTILLIB21_OBJS} ${FWLIB2 + # Link tests for external repos + ${BUILD}/host/linktest/extern: ${HOSTLIB} + ${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB} +-${BUILD}/host/linktest/extern: LDLIBS += -static ++#${BUILD}/host/linktest/extern: LDLIBS += -static + TEST_OBJS += ${BUILD}/host/linktest/extern.o + + .PHONY: hostlib +@@ -1056,7 +1056,7 @@ ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTIL + ${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB} + + # Utilities for auto-update toolkits must be statically linked. +-${UTIL_BINS_STATIC}: LDFLAGS += -static ++${UTIL_BINS_STATIC}: + + + .PHONY: utils +@@ -1089,7 +1089,7 @@ futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN} + + ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB} + @${PRINTF} " LD $(subst ${BUILD}/,,$@)\n" +- ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS} ++ ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS} + + ${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS} + ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix index 2535354aa229..f423bd7ea1c4 100644 --- a/pkgs/tools/text/a2ps/default.nix +++ b/pkgs/tools/text/a2ps/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { (page number, printing date, file name or supplied header), line numbering, symbol substitution as well as pretty printing for a wide range of programming languages. ''; - homepage = http://www.inf.enst.fr/~demaille/a2ps/index.html; + homepage = https://www.gnu.org/software/a2ps/; license = licenses.gpl3Plus; maintainers = [ maintainers.bennofs ]; platforms = platforms.linux; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 415a2ade28db..65d0a1e4c00a 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -19,11 +19,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "gawk-4.1.4"; + name = "gawk-4.2.0"; src = fetchurl { url = "mirror://gnu/gawk/${name}.tar.xz"; - sha256 = "0rn2mmjxm767zliqzd67j7h2ncjn4j0321c60y9fy3grs3i89qak"; + sha256 = "1wm9lqj77y7xz07zi0n187aqm8zavzxzpm1j53ahxz81q0qwvwyl"; }; # When we do build separate interactive version, it makes sense to always include man. diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 71c5e352b949..275d65e7c370 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, getopt, lua, boost, pkgconfig, gcc }: +{ stdenv, fetchFromGitHub, getopt, lua, boost, pkgconfig, gcc }: with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.39"; + version = "3.40"; - src = fetchurl { - url = "http://www.andre-simon.de/zip/${name}.tar.bz2"; - sha256 = "0z8gs69sqlyis4kvl8wwdgzywi199k73kkvn1mf9pf60npvcxwj4"; + src = fetchFromGitHub { + owner = "andre-simon"; + repo = "highlight"; + rev = "${version}"; + sha256 = "0bkywhz4y10qcajimdha1ck5mvn7fsrv3yn8nd6rqbva39gbfmfd"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; @@ -28,6 +30,6 @@ stdenv.mkDerivation rec { description = "Source code highlighting tool"; homepage = http://www.andre-simon.de/doku/highlight/en/highlight.php; platforms = platforms.unix; - maintainers = [ maintainers.ndowens ]; + maintainers = with maintainers; [ ndowens willibutz ]; }; } diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix new file mode 100644 index 000000000000..46d290b79ffb --- /dev/null +++ b/pkgs/tools/text/jsawk/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, makeWrapper, spidermonkey }: + +stdenv.mkDerivation rec { + name = "jsawk-${version}"; + version = "1.5-pre"; + src = fetchFromGitHub { + owner = "micha"; + repo = "jsawk"; + rev = "5a14c4af3c7b59807701b70a954ecefc6f77e978"; + sha256 = "0z3vdr3c8nvdrrxkjv9b4xg47mdb2hsknxpimw6shgwbigihapyr"; + }; + dontBuild = true; + buildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out/bin + cp $src/jsawk $out/bin/ + wrapProgram $out/bin/jsawk \ + --prefix PATH : "${spidermonkey}/bin" + ''; + + meta = { + description = "Jsawk is like awk, but for JSON"; + homepage = https://github.com/micha/jsawk; + license = stdenv.lib.licenses.publicDomain; + maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 8aed674a644a..4f3f8af3256d 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { EXE chmod +x $out/bin/$lt done + cat > $out/bin/languagetool-http-server < $out/lib/lua/${lua.luaversion}/vicious.lua + ''; + meta = with stdenv.lib; { description = "Vicious widgets for window managers"; homepage = https://github.com/Mic92/vicious; @@ -562,13 +675,6 @@ let maintainers = with maintainers; [ makefu mic92 ]; platforms = platforms.linux; }; - - buildInputs = [ lua ]; - installPhase = '' - mkdir -p $out/lib/lua/${lua.luaversion}/ - cp -r . $out/lib/lua/${lua.luaversion}/vicious/ - printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' .. package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua - ''; }; }; in self diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index d8eb668107be..4f72b4206998 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -66,7 +66,7 @@ in rec { bower2nix.buildInputs = [ pkgs.makeWrapper ]; bower2nix.postInstall = '' for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} done ''; } // args.overrides or {}; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 43c249e7b1d9..5e95f2ce7fdb 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -387,6 +387,10 @@ let lwt = ocaml_lwt; }; + num = if lib.versionOlder "4.06" ocaml.version + then callPackage ../development/ocaml-modules/num {} + else null; + ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; comparelib = callPackage ../development/ocaml-modules/comparelib { }; @@ -407,7 +411,10 @@ let ocaml_data_notation = callPackage ../development/ocaml-modules/odn { }; - ocaml_expat = callPackage ../development/ocaml-modules/expat { }; + ocaml_expat = + if lib.versionAtLeast ocaml.version "4.02" + then callPackage ../development/ocaml-modules/expat { } + else callPackage ../development/ocaml-modules/expat/0.9.nix { }; frontc = callPackage ../development/ocaml-modules/frontc { }; @@ -675,7 +682,7 @@ let janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; janeStreet = import ../development/ocaml-modules/janestreet { - inherit lib janePackage ocaml ocamlbuild ctypes cryptokit magic-mime; + inherit lib janePackage ocaml ocamlbuild ctypes cryptokit magic-mime num; inherit ocaml-migrate-parsetree octavius ounit ppx_deriving re zarith; inherit (pkgs) stdenv openssl; }; @@ -987,7 +994,9 @@ in rec ocamlPackages_4_05 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.05.nix { }) (self: super: { }); - ocamlPackages_latest = ocamlPackages_4_05; + ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix { }) (self: super: { }); + + ocamlPackages_latest = ocamlPackages_4_06; ocamlPackages = ocamlPackages_4_04; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0cd34e1a2f5f..0bdd0f2ccac5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -152,7 +152,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; sha256 = "2e3376d03bfa5f172f43d4c615ba496281c9ffe3093a828c539683e17e2fbbcb"; }; - propagatedBuildInputs = [ AnyEvent CommonSense ]; + propagatedBuildInputs = [ AnyEvent commonsense ]; }; AnyEventI3 = buildPerlPackage rec { @@ -227,11 +227,11 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.40.tar.gz; sha256 = "0h5fsi0is6nhclsd3wwkkqx2hfgl3bpdazxycafm9sqxr3qkgx9w"; }; - checkPhase = '' - make test \ - NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols \ - LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so - ''; + doCheck = false; + meta = { + description = "Test.pm wrapper with helpers for testing Apache"; + license = stdenv.lib.licenses.asl20; + }; }; AppCLI = buildPerlPackage { @@ -1641,12 +1641,12 @@ let self = _self // overrides; _self = with self; { }; CGI = buildPerlPackage rec { - name = "CGI-4.36"; + name = "CGI-4.37"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz"; - sha256 = "142la7jagpni5z7m4s9h9v5vpg0pisc3y3z8kdzqc7j6yba89zpy"; + sha256 = "7a14eee5df640f7141848f653cf48d99bfc9b5c68e18167338ee01b91cdfb883"; }; - buildInputs = [ TestDeep TestWarn ]; + buildInputs = [ TestDeep TestNoWarnings TestWarn ]; propagatedBuildInputs = [ HTMLParser self."if" ]; meta = { homepage = https://metacpan.org/module/CGI; @@ -2194,7 +2194,10 @@ let self = _self // overrides; _self = with self; { }; }; - CommonSense = buildPerlPackage rec { + # For backwards compatibility. + CommonSense = self.commonsense; + + commonsense = buildPerlPackage rec { name = "common-sense-3.74"; src = fetchurl { url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; @@ -2202,6 +2205,8 @@ let self = _self // overrides; _self = with self; { }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Implements some sane defaults for Perl programs"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4051,7 +4056,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ FileWhich JSONMaybeXS TestDifferences ]; meta = { - homepage = https://code.google.com/p/perl-devel-nytprof/; + homepage = https://github.com/timbunce/devel-nytprof; description = "Powerful fast feature-rich Perl source code profiler"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4938,7 +4943,7 @@ let self = _self // overrides; _self = with self; { sha256 = "2ae7f8734e2e4945510252152c3bea4be35f4aa58aad3db0504c38844b08a991"; }; buildInputs = [ CanaryStability ]; - propagatedBuildInputs = [ CommonSense ]; + propagatedBuildInputs = [ commonsense ]; meta = { license = stdenv.lib.licenses.gpl1Plus; }; @@ -5224,13 +5229,14 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsPkgConfig = buildPerlPackage rec { - name = "ExtUtils-PkgConfig-1.15"; + name = "ExtUtils-PkgConfig-1.16"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "1cxh6w8vmyqmhl6afys2q6z6jkp1m6zvacpk70196zmk48p1kcv9"; + sha256 = "bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e"; }; propagatedBuildInputs = [ pkgs.pkgconfig ]; meta = { + homepage = http://gtk2-perl.sourceforge.net; description = "Simplistic interface to pkg-config"; license = stdenv.lib.licenses.lgpl21Plus; }; @@ -5535,10 +5541,10 @@ let self = _self // overrides; _self = with self; { }; FileLibMagic = buildPerlPackage rec { - name = "File-LibMagic-1.15"; + name = "File-LibMagic-1.16"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "2c7fb54912caf2c22d06b02d6a88edad970e0f8b017634dc30eec46e53763e84"; + sha256 = "c8a695fac1454f52e18e2e1b624c0647cf117326014023dda69fa3e1a5f33d60"; }; buildInputs = [ TestFatal pkgs.file ]; makeMakerFlags = "--lib=${pkgs.file}/lib"; @@ -7396,51 +7402,42 @@ let self = _self // overrides; _self = with self; { }; Inline = buildPerlPackage rec { - name = "Inline-0.64"; - + name = "Inline-0.80"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/${name}.tar.gz"; - sha256 = "17n3gbc9jigpfwqfhgmxpvbgr9rkdrij8jayxqpzw611ixcxrplw"; + url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; + sha256 = "7e2bd984b1ebd43e336b937896463f2c6cb682c956cbd2c311a464363d2ccef6"; }; - buildInputs = [ TestWarn ]; propagatedBuildInputs = [ ParseRecDescent ]; - meta = { - description = "Inline -- Write Perl subroutines in other programming languages"; - + homepage = https://github.com/ingydotnet/inline-pm; + description = "Write Perl Subroutines in Other Programming Languages"; longDescription = '' The Inline module allows you to put source code from other programming languages directly "inline" in a Perl script or module. The code is automatically compiled as needed, and then loaded for immediate access from Perl. ''; - - license = stdenv.lib.licenses.artistic2; - - maintainers = [ ]; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; InlineC = buildPerlPackage rec { - name = "Inline-C-0.76"; - + name = "Inline-C-0.78"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "0dcs39zjiglif3ss8p8yl0jyqk7qvc9g1ad9wi4kq79k9lxp3s92"; + url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz"; + sha256 = "9a7804d85c01a386073d2176582b0262b6374c5c0341049da3ef84c6f53efbc7"; }; - + buildInputs = [ FileCopyRecursive FileShareDirInstall TestWarn YAMLLibYAML ]; + propagatedBuildInputs = [ Inline ParseRecDescent Pegex ]; postPatch = '' # this test will fail with chroot builds rm -f t/08taint.t rm -f t/28autowrap.t ''; - - buildInputs = [ TestWarn FileCopyRecursive FileShareDirInstall IOAll Pegex YAMLLibYAML ]; - propagatedBuildInputs = [ Inline ]; - meta = { - description = "Write Perl Subroutines in C"; + homepage = https://github.com/ingydotnet/inline-c-pm; + description = "C Language Support for Inline"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7584,7 +7581,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-2.34.tar.gz; sha256 = "1sh0i73skxp3rvd9w8phxqncw9m1r5ibnb9qxxm21bmrfwkxybx6"; }; - propagatedBuildInputs = [ CommonSense ]; + propagatedBuildInputs = [ commonsense ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; @@ -7630,6 +7627,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/I/IS/ISAAC/libapreq2-2.13.tar.gz; sha256 = "5731e6833b32d88e4a5c690e45ddf20fcf969ce3da666c5627d775e92da0cf6e"; }; + outputs = [ "out" ]; buildInputs = [ ApacheTest ExtUtilsXSBuilder mod_perl2 pkgs.apacheHttpd pkgs.apr pkgs.aprutil ]; propagatedBuildInputs = [ mod_perl2 ]; makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd.dev} --with-apache2-apxs=${pkgs.apacheHttpd.dev}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd --with-apr-config=${pkgs.apr.dev}/bin/apr-1-config --with-apu-config=${pkgs.aprutil.dev}/bin/apu-1-config"; @@ -7822,7 +7820,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/modules/by-module/Linux/${name}.tar.gz"; sha256 = "1l916p8xak6c51x4x1vrzd8wpi55bld74wf0p5w5m4vr80zjb7dw"; }; - propagatedBuildInputs = [ CommonSense ]; + propagatedBuildInputs = [ commonsense ]; }; ListAllUtils = buildPerlPackage { @@ -10799,10 +10797,14 @@ let self = _self // overrides; _self = with self; { }; ParseRecDescent = buildPerlPackage rec { - name = "Parse-RecDescent-1.967009"; + name = "Parse-RecDescent-1.967015"; src = fetchurl { url = "mirror://cpan/authors/id/J/JT/JTBRAUN/${name}.tar.gz"; - sha256 = "11y6fpz4j6kdimyaz2a6ig0jz0x7csqslhxaipxnjqi5h85hy071"; + sha256 = "1943336a4cb54f1788a733f0827c0c55db4310d5eae15e542639c9dd85656e37"; + }; + meta = { + description = "Generate Recursive-Descent Parsers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12116,12 +12118,13 @@ let self = _self // overrides; _self = with self; { }; SoftwareLicense = buildPerlPackage rec { - name = "Software-License-0.103012"; + name = "Software-License-0.103013"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "47f9acb7f4eeed35e38c1bec37a71b61e651965233d67dadfae6390571517db1"; + url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; + sha256 = "2641d937390f43b08fa31c419713cd96a2f0bf160be04cab322631daf6810ff3"; }; - propagatedBuildInputs = [ DataSection TextTemplate TryTiny ]; + buildInputs = [ TryTiny ]; + propagatedBuildInputs = [ DataSection TextTemplate ]; meta = { homepage = https://github.com/rjbs/Software-License; description = "Packages that provide templated software licenses"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 960de37332f6..e016c13e6a80 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -18,9 +18,13 @@ let }; apcu51 = assert isPhp7; buildPecl { - name = "apcu-5.1.2"; + name = "apcu-5.1.8"; - sha256 = "0r5pfbjbmdj46h20jm3iqmy969qd27ajyf0phjhgykv6j0cqjlgd"; + sha256 = "01dfbf0245d8cc0f51ba16467a60b5fad08e30b28df7846e0dd213da1143ecce"; + + doCheck = true; + checkTarget = "test"; + checkFlagsArray = ["REPORT_EXIT_STATUS=1" "NO_INTERACTION=1"]; }; ast = assert isPhp7; buildPecl { @@ -269,22 +273,16 @@ let buildInputs = [ pkgs.geoip ]; }; - redis = if isPhp7 then redisPhp7 else redis22; + redis = if isPhp7 then redis31 else redis22; redis22 = assert !isPhp7; buildPecl { name = "redis-2.2.7"; sha256 = "00n9dpk9ak0bl35sbcd3msr78sijrxdlb727nhg7f2g7swf37rcm"; }; - # Not released yet - redisPhp7 = assert isPhp7; buildPecl rec { - name = "redis-php7"; - - src = fetchgit { - url = "https://github.com/phpredis/phpredis"; - rev = "4a37e47d0256581ce2f7a3b15b5bb932add09f36"; - sha256 = "1qm2ifa0zf95l1g967iiabmja17srpwz73lfci7z13ffdw1ayhfd"; - }; + redis31 = assert isPhp7; buildPecl { + name = "redis-3.1.4"; + sha256 = "0rgjdrqfif8pfn3ipk1v4gyjkkdcdrdk479qbpda89w25vaxzsxd"; }; v8 = assert isPhp7; buildPecl rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf670a40c6cc..4d278f5f4f9a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -108,6 +108,8 @@ in { aenum = callPackage ../development/python-modules/aenum { }; + affinity = callPackage ../development/python-modules/affinity { }; + agate = callPackage ../development/python-modules/agate { }; agate-dbf = callPackage ../development/python-modules/agate-dbf { }; @@ -206,7 +208,7 @@ in { # version of nixpart. nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; - nltk = callPackage ../development/python-modules/nltk.nix { }; + nltk = callPackage ../development/python-modules/nltk { }; ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; @@ -214,7 +216,7 @@ in { Pmw = callPackage ../development/python-modules/Pmw { }; - pyaes = callPackage ../development/python-modules/pyaes.nix { }; + pyaes = callPackage ../development/python-modules/pyaes { }; pyatspi = if isPy3k then callPackage ../development/python-modules/pyatspi { } else throw "pyatspi not supported for interpreter ${python.executable}"; @@ -232,6 +234,8 @@ in { pyexiv2 = if (!isPy3k) then callPackage ../development/python-modules/pyexiv2 {} else throw "pyexiv2 not supported for interpreter ${python.executable}"; + py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; + pygame = callPackage ../development/python-modules/pygame { }; pygame-git = callPackage ../development/python-modules/pygame/git.nix { }; @@ -674,28 +678,7 @@ in { }; }; - autopep8 = buildPythonPackage (rec { - name = "autopep8-1.0.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/autopep8/${name}.tar.gz"; - sha256 = "17lydqm8y9a5qadp6iifxrb5mb0g9fr1vxn5qy1fjpyhazxaw8n1"; - }; - - propagatedBuildInputs = with self; [ pep8 ]; - - # One test fails: - # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests) - doCheck = false; - - meta = { - description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"; - homepage = https://pypi.python.org/pypi/autopep8/; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ bjornfor ]; - }; - }); + autopep8 = callPackage ../development/python-modules/autopep8 { }; av = buildPythonPackage rec { name = "av-${version}"; @@ -1191,6 +1174,8 @@ in { }; }; + backports_tempfile = callPackage ../development/python-modules/backports_tempfile { }; + backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock {}; babelfish = buildPythonPackage rec { @@ -1272,25 +1257,6 @@ in { }; }; - beautifulsoup = buildPythonPackage (rec { - name = "beautifulsoup-3.2.1"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz"; - sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://www.crummy.com/software/BeautifulSoup/; - license = "bsd"; - description = "Undemanding HTML/XML parser"; - }; - }); - beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; beaker = buildPythonPackage rec { @@ -1345,24 +1311,9 @@ in { }; }; - betamax-matchers = buildPythonPackage rec { - name = "betamax-matchers-${version}"; - version = "0.3.0"; + betamax-matchers = callPackage ../development/python-modules/betamax-matchers { }; - src = pkgs.fetchurl { - url = "mirror://pypi/b/betamax-matchers/${name}.tar.gz"; - sha256 = "039kvqsdcvvlfxjc3n1x2xvjg6qkqbql0p7rc4z7bnxm9kcm88la"; - }; - - buildInputs = with self; [ betamax requests_toolbelt ]; - - meta = with stdenv.lib; { - homepage = https://github.com/sigmavirus24/betamax_matchers; - description = "A group of experimental matchers for Betamax"; - license = licenses.asl20; - maintainers = with maintainers; [ pSub ]; - }; - }; + betamax-serializers = callPackage ../development/python-modules/betamax-serializers { }; bibtexparser = callPackage ../development/python-modules/bibtexparser { }; @@ -1676,7 +1627,7 @@ in { cram = callPackage ../development/python-modules/cram { }; - csscompressor = callPackage ../development/python-modules/csscompressor.nix {}; + csscompressor = callPackage ../development/python-modules/csscompressor {}; csvkit = callPackage ../development/python-modules/csvkit { }; @@ -1938,26 +1889,7 @@ in { }; }; - - bitstring = buildPythonPackage rec { - name = "bitstring-3.1.2"; - - src = pkgs.fetchurl { - url = "https://python-bitstring.googlecode.com/files/${name}.zip"; - sha256 = "1i1p3rkj4ad108f23xyib34r4rcy571gy65paml6fk77knh0k66p"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - description = "Module for binary data manipulation"; - homepage = https://code.google.com/p/python-bitstring/; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + bitstring = callPackage ../development/python-modules/bitstring { }; blaze = callPackage ../development/python-modules/blaze { }; @@ -2050,51 +1982,9 @@ in { }; }; + blockdiag = callPackage ../development/python-modules/blockdiag { }; - blockdiag = buildPythonPackage rec { - name = "blockdiag-${version}"; - version = "1.5.3"; - - src = pkgs.fetchurl { - url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2"; - sha256 = "0r0qbmv0ijnqidsgm2rqs162y9aixmnkmzgnzgk52hiy7ydm4k8f"; - }; - - buildInputs = with self; [ pep8 nose unittest2 docutils ]; - - propagatedBuildInputs = with self; [ pillow webcolors funcparserlib ]; - - # One test fails: - # ... - # FAIL: test_auto_font_detection (blockdiag.tests.test_boot_params.TestBootParams) - doCheck = false; - - meta = { - description = "Generate block-diagram image from spec-text file (similar to Graphviz)"; - homepage = http://blockdiag.com/; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; - }; - }; - - - bpython = buildPythonPackage rec { - name = "bpython-0.12"; - src = pkgs.fetchurl { - url = "http://www.bpython-interpreter.org/releases/bpython-0.12.tar.gz"; - sha256 = "1ilf58qq7sazmcgg4f1wswbhcn2gb8qbbrpgm6gf0j2lbm60gabl"; - }; - - propagatedBuildInputs = with self; [ pygments ]; - doCheck = false; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = with maintainers; [ domenkozar ]; - }; - }; + bpython = callPackage ../development/python-modules/bpython {}; bsddb3 = buildPythonPackage rec { name = "bsddb3-${version}"; @@ -2783,12 +2673,12 @@ in { }; click-log = buildPythonPackage rec { - version = "0.1.3"; + version = "0.2.1"; name = "click-log-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/c/click-log/${name}.tar.gz"; - sha256 = "0kdd1vminxpcfczxl2kkf285n0dr1gxh2cdbx1p6vkj7b7bci3gx"; + sha256 = "1r1x85023cslb2pwldd089jjk573mk3w78cnashs77wrx7yz8fj9"; }; propagatedBuildInputs = with self; [ click ]; @@ -2832,24 +2722,6 @@ in { cligj = callPackage ../development/python-modules/cligj { }; - clientform = buildPythonPackage (rec { - name = "clientform-0.2.10"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/C/ClientForm/ClientForm-0.2.10.tar.gz"; - sha256 = "0dydh3i1sx7rrj6d0gj375wkjpiivm7jjlsimw6hmwv4ck7yf1wm"; - }; - - meta = { - homepage = http://wwwsearch.sourceforge.net/ClientForm/; - - license = "bsd"; - - description = "Python module for handling HTML forms on the client side"; - }; - }); - /* There is a project called "closure-linter" on PyPI that is the same as this, but it does not appear to be owned by Google. So we're pulling from Google's GitHub repo instead. */ @@ -3098,59 +2970,9 @@ in { }); - configshell_fb = buildPythonPackage rec { - version = "1.1.fb10"; - name = "configshell-fb-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/agrover/configshell-fb/archive/v${version}.tar.gz"; - sha256 = "1dd87xvm98nk3jzybb041gjdahi2z9b53pwqhyxcfj4a91y82ndy"; - }; - - propagatedBuildInputs = with self; [ - pyparsing - urwid - ]; - - # Fails on python 3 due to a None value where a string is expected - doCheck = !isPy3k; - - meta = { - description = "A Python library for building configuration shells"; - homepage = "https://github.com/agrover/configshell-fb"; - platforms = platforms.linux; - }; - }; - confluent-kafka = callPackage ../development/python-modules/confluent-kafka {}; - - construct = buildPythonPackage rec { - name = "construct-${version}"; - version = "2.8.10"; - - src = pkgs.fetchFromGitHub { - owner = "construct"; - repo = "construct"; - rev = "v${version}"; - sha256 = "1xfmmc5pihn3ql9f7blrciy06y2bwczqvkbcpvh96dmgqwc3wys3"; - }; - - propagatedBuildInputs = with self; [ six ]; - - # Tests fail with the following error on Python 3.5+ - # TypeError: not all arguments converted during string formatting - doCheck = pythonOlder "3.5"; - - meta = { - description = "Powerful declarative parser (and builder) for binary data"; - homepage = http://construct.readthedocs.org/; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; - + construct = callPackage ../development/python-modules/construct {}; consul = buildPythonPackage (rec { name = "python-consul-0.7.0"; @@ -3260,33 +3082,7 @@ in { cython = callPackage ../development/python-modules/Cython { }; - cytoolz = buildPythonPackage rec { - name = "cytoolz-${version}"; - version = "0.8.2"; - - src = pkgs.fetchurl{ - url = "mirror://pypi/c/cytoolz/cytoolz-${version}.tar.gz"; - sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552"; - }; - - # Extension types - disabled = isPyPy; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ toolz ]; - - # Disable failing test https://github.com/pytoolz/cytoolz/issues/97 - checkPhase = '' - NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages} - ''; - - meta = { - homepage = "http://github.com/pytoolz/cytoolz/"; - description = "Cython implementation of Toolz: High performance functional utilities"; - license = "licenses.bsd3"; - maintainers = with maintainers; [ fridh ]; - }; - }; + cytoolz = callPackage ../development/python-modules/cytoolz { }; cryptacular = buildPythonPackage rec { name = "cryptacular-1.4.1"; @@ -3367,6 +3163,8 @@ in { doCheck = false; }; + curtsies = callPackage ../development/python-modules/curtsies { }; + oslo-vmware = buildPythonPackage rec { name = "oslo.vmware-${version}"; version = "1.22.0"; @@ -3769,32 +3567,11 @@ in { }; }; - bcrypt = callPackage ../development/python-modules/bcrypt.nix { }; + bcrypt = callPackage ../development/python-modules/bcrypt { }; cffi = callPackage ../development/python-modules/cffi { }; - pycollada = buildPythonPackage rec { - name = "pycollada-0.4.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pycollada/${name}.tar.gz"; - sha256 = "0i50lh98550pwr95zgzrgiqzsspm09wl52xlv83y5nrsz4mblylv"; - }; - - buildInputs = with self; [ numpy ] ++ (if isPy3k then [dateutil] else [dateutil_1_5]); - - # Some tests fail because they refer to test data files that don't exist - # (upstream packaging issue) - doCheck = false; - - meta = { - description = "Python library for reading and writing collada documents"; - homepage = http://pycollada.github.io/; - license = "BSD"; # they don't specify which BSD variant - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + pycollada = callPackage ../development/python-modules/pycollada { }; pycontracts = buildPythonPackage rec { version = "1.7.9"; @@ -4109,7 +3886,7 @@ in { }; }; - pytest-pep257 = callPackage ../development/python-modules/pytest-pep257.nix { }; + pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; pytest-raisesregexp = buildPythonPackage rec { name = "pytest-raisesregexp-${version}"; @@ -4566,29 +4343,7 @@ in { }; }; - datashape = buildPythonPackage rec { - name = "datashape-${version}"; - version = "0.5.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/D/DataShape/${name}.tar.gz"; - sha256 = "2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783"; - }; - - buildInputs = with self; [ pytest mock ]; - propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ]; - - checkPhase = '' - py.test datashape/tests - ''; - - meta = { - homepage = https://github.com/ContinuumIO/datashape; - description = "A data description language"; - license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; - }; - }; + datashape = callPackage ../development/python-modules/datashape { }; requests-cache = buildPythonPackage (rec { name = "requests-cache-${version}"; @@ -4827,53 +4582,6 @@ in { }; }; - deform_bootstrap = buildPythonPackage rec { - name = "deform_bootstrap-0.2.9"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/deform_bootstrap/${name}.tar.gz"; - sha256 = "1hgq3vqsfqdmlyahnlc40w13viawhpzqf4jzigsggdb41x545fda"; - }; - - buildInputs = [ self.mock ]; - propagatedBuildInputs = with self; [ deform pyramid ]; - - # demo is removed as it depends on deformdemo - patchPhase = '' - rm -rf deform_bootstrap/demo - ''; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - platforms = platforms.all; - }; - }; - - - demjson = buildPythonPackage rec { - name = "demjson-1.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/demjson/${name}.tar.gz"; - sha256 = "0abf7wqqq7rk1sycy47ayn5p93yy7gjq50cb2z69wmik1qqrr60x"; - }; - - doCheck = false; # there are no tests - - preFixup = '' - mkdir -p "$out/bin" - cp jsonlint "$out/bin/" - ''; - - meta = { - description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; - homepage = http://deron.meranda.us/python/demjson/; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.all; - }; - }; - derpconf = self.buildPythonPackage rec { name = "derpconf-0.4.9"; @@ -4931,7 +4639,7 @@ in { dns = callPackage ../development/python-modules/dns { }; - docker = callPackage ../development/python-modules/docker.nix {}; + docker = callPackage ../development/python-modules/docker {}; dockerpty = buildPythonPackage rec { name = "dockerpty-0.4.1"; @@ -5102,26 +4810,7 @@ in { }; }; - dpkt = buildPythonPackage rec { - name = "dpkt-1.8"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "https://dpkt.googlecode.com/files/${name}.tar.gz"; - sha256 = "01q5prynymaqyfsfi2296xncicdpid2hs3yyasim8iigvkwy4vf5"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols"; - homepage = https://code.google.com/p/dpkt/; - license = licenses.bsd3; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.all; - }; - }; + dpkt = callPackage ../development/python-modules/dpkt {}; urllib3 = callPackage ../development/python-modules/urllib3 {}; @@ -5145,7 +4834,7 @@ in { }; }; - ds4drv = callPackage ../development/python-modules/ds4drv.nix { + ds4drv = callPackage ../development/python-modules/ds4drv { inherit (pkgs) fetchFromGitHub bluez; }; @@ -5510,6 +5199,10 @@ in { buildInputs = with self; [ fudge_9 nose ]; }; + faulthandler = if ! isPy3k + then callPackage ../development/python-modules/faulthandler {} + else throw "faulthandler is built into ${python.executable}"; + fedpkg = callPackage ../development/python-modules/fedpkg { }; flit = callPackage ../development/python-modules/flit { }; @@ -5887,27 +5580,6 @@ in { google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; - googlecl = buildPythonPackage rec { - version = "0.9.14"; - name = "googlecl-${version}"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "https://googlecl.googlecode.com/files/${name}.tar.gz"; - sha256 = "0nnf7xkr780wivr5xnchfcrahlzy9bi2dxcs1w1bh1014jql0iha"; - }; - - meta = { - description = "Brings Google services to the command line"; - homepage = https://code.google.com/p/googlecl/; - license = licenses.asl20; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; - - propagatedBuildInputs = with self; [ gdata ]; - }; - gplaycli = buildPythonPackage rec { version = "0.1.2"; name = "gplaycli-${version}"; @@ -6153,7 +5825,7 @@ in { }); - htmlmin = callPackage ../development/python-modules/htmlmin.nix {}; + htmlmin = callPackage ../development/python-modules/htmlmin {}; httpauth = buildPythonPackage rec { version = "0.3"; @@ -6325,31 +5997,7 @@ in { jsbeautifier = callPackage ../development/python-modules/jsbeautifier {}; - jug = buildPythonPackage rec { - version = "1.6.1"; - name = "jug-${version}"; - buildInputs = with self; [ nose numpy ]; - propagatedBuildInputs = with self; [ - bottle - pyyaml - redis - six - - pkgs.zlib - ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/J/Jug/Jug-${version}.tar.gz"; - sha256 = "15lv998mz6kpp65kh8wsfnrl5ay02bk1lm07nbbdv2k455bhrn1i"; - }; - - meta = { - description = "A Task-Based Parallelization Framework"; - license = licenses.mit; - url = https://jug.readthedocs.io/; - maintainers = with maintainers; [ luispedro ]; - }; - }; + jug = callPackage ../development/python-modules/jug {}; jsmin = callPackage ../development/python-modules/jsmin { }; @@ -6419,35 +6067,6 @@ in { }; }; - ledger-autosync = buildPythonPackage rec { - name = "ledger-autosync-${version}"; - version = "0.2.3"; - src = pkgs.fetchurl { - url = "mirror://pypi/l/ledger-autosync/ledger-autosync-${version}.tar.gz"; - sha256 = "f19fa66e656309825887171d84a462e64676b1cc36b62e4dd8679ff63926a469"; - }; - - propagatedBuildInputs = with self; [ ofxclient ]; - - buildInputs = with self; [ - mock - nose - # Used at runtime to translate ofx entries to the ledger - # format. In fact, user could use either ledger or hledger. - pkgs.which - pkgs.ledger ]; - - # Tests are disable since they require hledger and python-ledger - doCheck = false; - - meta = { - homepage = https://gitlab.com/egh/ledger-autosync; - description = "ledger-autosync is a program to pull down transactions from your bank and create ledger transactions for them"; - license = licenses.gpl3; - maintainers = with maintainers; [ lewo ]; - }; - }; - libsexy = callPackage ../development/python-modules/libsexy { libsexy = pkgs.libsexy; }; @@ -7430,19 +7049,6 @@ in { }; - pyramid_debugtoolbar = buildPythonPackage rec { - name = "pyramid_debugtoolbar-1.0.9"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyramid_debugtoolbar/${name}.tar.gz"; - sha256 = "1vnzg1qnnyisv7znxg7pasayfyr3nz7rrs5nqr4fmdgwj9q2pyv0"; - }; - - buildInputs = with self; [ ]; - propagatedBuildInputs = with self; [ pyramid pyramid_mako ]; - }; - - pyramid_mako = buildPythonPackage rec { name = "pyramid_mako-0.3.1"; @@ -7582,24 +7188,7 @@ in { }; }; - raven = buildPythonPackage rec { - name = "raven-6.2.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/raven/${name}.tar.gz"; - sha256 = "1jmr9kpajfh6fvxbym6fdybmlr14216y0dkbial7ris9pi1pwhf5"; - }; - - # way too many dependencies to run tests - # see https://github.com/getsentry/raven-python/blob/master/setup.py - doCheck = false; - - propagatedBuildInputs = optionals (!isPy3k) [ self.contextlib2 ]; - - meta = { - maintainers = with maintainers; [ primeos ]; - }; - }; + raven = callPackage ../development/python-modules/raven { }; rethinkdb = buildPythonPackage rec { name = "rethinkdb-${version}"; @@ -7726,25 +7315,6 @@ in { subliminal = callPackage ../development/python-modules/subliminal {}; - hyp = buildPythonPackage rec { - name = "hyp-server-${version}"; - version = "1.2.0"; - disabled = !isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/hyp-server/${name}.tar.gz"; - sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15"; - }; - - meta = { - description = "Hyperminimal https server"; - homepage = https://github.com/rnhmjoj/hyp; - license = with licenses; [gpl3Plus mit]; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.unix; - }; - }; - hyperlink = callPackage ../development/python-modules/hyperlink {}; zope_copy = buildPythonPackage rec { @@ -7997,30 +7567,6 @@ in { }; - rtmidi = buildPythonPackage rec { - version = "0.3a"; - name = "rtmidi-${version}"; - - src = pkgs.fetchurl { - url = "http://chrisarndt.de/projects/python-rtmidi/download/python-${name}.tar.bz2"; - sha256 = "0d2if633m3kbiricd5hgn1csccd8xab6lnab1bq9prdr9ks9i8h6"; - }; - - preConfigure = '' - sed -i "/use_setuptools/d" setup.py - ''; - - buildInputs = with self; [ pkgs.alsaLib pkgs.libjack2 ]; - - meta = { - description = "A Python wrapper for the RtMidi C++ library written with Cython"; - homepage = http://trac.chrisarndt.de/code/wiki/python-rtmidi; - license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; - }; - }; - - setuptools-git = buildPythonPackage rec { name = "setuptools-git-${version}"; version = "1.1"; @@ -8305,7 +7851,7 @@ in { django_extensions = callPackage ../development/python-modules/django-extensions { }; - django_guardian = callPackage ../development/python-modules/django_guardian.nix { }; + django_guardian = callPackage ../development/python-modules/django_guardian { }; django-ipware = callPackage ../development/python-modules/django-ipware { }; @@ -8325,14 +7871,17 @@ in { django_tagging = callPackage ../development/python-modules/django_tagging { }; - django_tagging_0_4_3 = self.django_tagging.overrideAttrs (attrs: rec { + django_tagging_0_4_3 = if + self.django != self.django_1_8 + then throw "django_tagging_0_4_3 should be build with django_1_8" + else (callPackage ../development/python-modules/django_tagging {}).overrideAttrs (attrs: rec { name = "django-tagging-0.4.3"; src = pkgs.fetchurl { url = "mirror://pypi/d/django-tagging/${name}.tar.gz"; sha256 = "0617azpmp6jpg3d88v2ir97qrc9aqcs2s9gyvv9bgf2cp55khxhs"; }; - propagatedBuildInputs = with self; [ django_1_8 ]; + propagatedBuildInputs = with self; [ django ]; }); django_classytags = buildPythonPackage rec { @@ -8634,7 +8183,7 @@ in { }; }; - dulwich = callPackage ../development/python-modules/dulwich.nix { + dulwich = callPackage ../development/python-modules/dulwich { inherit (pkgs) git glibcLocales; }; @@ -8676,22 +8225,6 @@ in { }; }; - doxypy = buildPythonPackage rec { - name = "doxypy-0.4.2"; - - src = pkgs.fetchurl { - url = "http://code.foosel.org/files/${name}.tar.gz"; - sha256 = "1afmb30zmy7942b53qa5vd3js883wwqqls35n8xfb3rnj0qnll8g"; - }; - - meta = { - homepage = http://code.foosel.org/doxypy; - description = "An input filter for Doxygen"; - }; - - doCheck = false; - }; - dtopt = buildPythonPackage rec { name = "dtopt-0.1"; @@ -8901,30 +8434,8 @@ in { }; }; - fastimport = buildPythonPackage rec { - name = "fastimport-${version}"; - version = "0.9.4"; - - # Judging from SyntaxError - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/fastimport/${name}.tar.gz"; - sha256 = "0k8x7552ypx9rc14vbsvg2lc6z0r8pv9laah28pdwyynbq10825d"; - }; - - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; - - meta = { - homepage = https://launchpad.net/python-fastimport; - description = "VCS fastimport/fastexport parser"; - maintainers = with maintainers; [ koral ]; - license = licenses.gpl2Plus; - }; - }; - + fastimport = callPackage ../development/python-modules/fastimport { }; + feedgen = callPackage ../development/python-modules/feedgen { }; feedgenerator = callPackage ../development/python-modules/feedgenerator { @@ -8967,7 +8478,7 @@ in { }; }; - docker_compose = callPackage ../development/python-modules/docker_compose.nix {}; + docker_compose = callPackage ../development/python-modules/docker_compose {}; fdroidserver = buildPythonPackage rec { version = "2016-05-31"; @@ -9116,11 +8627,11 @@ in { flask-cors = callPackage ../development/python-modules/flask-cors { }; - flask_elastic = callPackage ../development/python-modules/flask-elastic.nix { }; + flask_elastic = callPackage ../development/python-modules/flask-elastic { }; - flask_login = callPackage ../development/python-modules/flask-login.nix { }; + flask_login = callPackage ../development/python-modules/flask-login { }; - flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login.nix { }; + flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; flask_mail = callPackage ../development/python-modules/flask-mail { }; @@ -9128,7 +8639,7 @@ in { flask_migrate = callPackage ../development/python-modules/flask-migrate { }; - flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib.nix { }; + flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib { }; flask_principal = buildPythonPackage rec { name = "Flask-Principal-${version}"; @@ -9195,9 +8706,9 @@ in { }; }; - flask_testing = callPackage ../development/python-modules/flask-testing.nix { }; + flask_testing = callPackage ../development/python-modules/flask-testing { }; - flask_wtf = callPackage ../development/python-modules/flask-wtf.nix { }; + flask_wtf = callPackage ../development/python-modules/flask-wtf { }; wtforms = buildPythonPackage rec { version = "2.1"; @@ -9255,27 +8766,6 @@ in { pytorch = callPackage ../development/python-modules/pytorch { }; - python_tvrage = buildPythonPackage (rec { - version = "0.4.1"; - name = "tvrage-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-tvrage/python-tvrage-${version}.tar.gz"; - sha256 = "f8a530376c5cf1bc573d1945a8504c3394b228c731a3eff5100c705997a72063"; - }; - - # has mostly networking dependent tests - doCheck = false; - propagatedBuildInputs = with self; [ beautifulsoup ]; - - meta = { - homepage = https://github.com/ckreutzer/python-tvrage; - description = "Client interface for tvrage.com's XML-based api feeds"; - license = licenses.bsd3; - maintainers = with maintainers; [ domenkozar ]; - }; - }); - python2-pythondialog = buildPythonPackage rec { name = "python2-pythondialog-${version}"; version = "3.3.0"; @@ -9486,25 +8976,7 @@ in { }; }; - fuse = buildPythonPackage (rec { - baseName = "fuse"; - version = "0.2.1"; - name = "${baseName}-${version}"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz"; - sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; - }; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with self; [ pkgs.fuse ]; - - meta = { - description = "Python bindings for FUSE"; - license = licenses.lgpl21; - }; - }); + fuse = callPackage ../development/python-modules/python-fuse { fuse = pkgs.fuse; }; fusepy = buildPythonPackage rec { name = "fusepy-2.0.4"; @@ -9660,40 +9132,7 @@ in { }; }; - gevent = buildPythonPackage rec { - name = "gevent-1.1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/g/gevent/${name}.tar.gz"; - sha256 = "cb15cf73d69a2eeefed330858f09634e2c50bf46da9f9e7635730fcfb872c02c"; - }; - - # Why do we have this patch? - postPatch = '' - substituteInPlace libev/ev.c --replace \ - "ecb_inline void ecb_unreachable (void) ecb_noreturn" \ - "ecb_inline ecb_noreturn void ecb_unreachable (void)" - ''; - - buildInputs = with self; [ pkgs.libev ]; - propagatedBuildInputs = with self; optionals (!isPyPy) [ greenlet ]; - - checkPhase = '' - cd greentest - ${python.interpreter} testrunner.py - ''; - - # Bunch of failures. - doCheck = false; - - meta = { - description = "Coroutine-based networking library"; - homepage = http://www.gevent.org/; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + gevent = callPackage ../development/python-modules/gevent { }; geventhttpclient = buildPythonPackage rec { name = "geventhttpclient-${version}"; @@ -9770,7 +9209,7 @@ in { gflags = callPackage ../development/python-modules/gflags { }; - ghdiff = callPackage ../development/python-modules/ghdiff.nix { }; + ghdiff = callPackage ../development/python-modules/ghdiff { }; gipc = buildPythonPackage rec { name = "gipc-0.5.0"; @@ -10086,7 +9525,7 @@ in { rebulk = callPackage ../development/python-modules/rebulk { }; - gunicorn = callPackage ../development/python-modules/gunicorn.nix { }; + gunicorn = callPackage ../development/python-modules/gunicorn { }; hawkauthlib = buildPythonPackage rec { name = "hawkauthlib-${version}"; @@ -10229,7 +9668,7 @@ in { propagatedBuildInputs = with self; [ requests ]; }; - hypothesis = callPackage ../development/python-modules/hypothesis.nix { }; + hypothesis = callPackage ../development/python-modules/hypothesis { }; colored = buildPythonPackage rec { name = "colored-${version}"; @@ -10543,30 +9982,7 @@ in { ipython_6 = callPackage ../development/python-modules/ipython { }; - ipython_genutils = buildPythonPackage rec { - version = "0.2.0"; - name = "ipython_genutils-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipython_genutils/${name}.tar.gz"; - sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"; - }; - - LC_ALL = "en_US.UTF-8"; - buildInputs = with self; [ nose pkgs.glibcLocales ]; - - checkPhase = '' - nosetests -v ipython_genutils/tests - ''; - - meta = { - description = "Vestigial utilities from IPython"; - homepage = http://ipython.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; - + ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; ipywidgets = callPackage ../development/python-modules/ipywidgets { }; @@ -10698,7 +10114,7 @@ in { }; }; - jabberbot = callPackage ../development/python-modules/jabberbot.nix {}; + jabberbot = callPackage ../development/python-modules/jabberbot {}; jedi = callPackage ../development/python-modules/jedi { }; @@ -10845,27 +10261,7 @@ in { keyring = callPackage ../development/python-modules/keyring { }; - keyutils = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "keyutils"; - version = "0.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/k/${pname}/${name}.tar.gz"; - sha256 = "0dskys71vkn59vlsfs1ljli0qnzk7b10iv4pawxawnk2hvyjrf10"; - }; - - buildInputs = with self; [ pkgs.keyutils pytestrunner ]; - - doCheck = false; - - meta = { - description = "A set of python bindings for keyutils"; - homepage = https://github.com/sassoftware/python-keyutils; - license = licenses.asl20; - maintainers = with maintainers; [ primeos ]; - }; - }; + keyutils = callPackage ../development/python-modules/keyutils { }; klaus = buildPythonPackage rec { version = "0.9.1"; @@ -11209,33 +10605,8 @@ in { livereload = callPackage ../development/python-modules/livereload { }; - llfuse = buildPythonPackage rec { - name = "llfuse-1.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; - sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; - }; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with self; [ pytest pkgs.fuse pkgs.attr pkgs.which ]; - - propagatedBuildInputs = with self; [ contextlib2 ]; - - checkPhase = '' - py.test - ''; - - # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin' - doCheck = false; - - meta = { - description = "Python bindings for the low-level FUSE API"; - homepage = https://code.google.com/p/python-llfuse/; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; - }; + llfuse = callPackage ../development/python-modules/llfuse { + fuse = pkgs.fuse; # use "real" fuse, not the python module }; locustio = buildPythonPackage rec { @@ -11595,7 +10966,7 @@ in { sha256 = "0rki9nl4y42q694parafcsdcdqvkdjckrbg6n0691302lfsrkyfl"; }; - propagatedBuildInputs = with self; [ clientform html5lib ]; + propagatedBuildInputs = with self; [ html5lib ]; doCheck = false; @@ -11937,39 +11308,9 @@ in { }; }; - hyperframe = buildPythonPackage rec { - name = "hyperframe-${version}"; - version = "4.0.1"; + hyperframe = callPackage ../development/python-modules/hyperframe { }; - src = pkgs.fetchurl { - url = "mirror://pypi/h/hyperframe/${name}.tar.gz"; - sha256 = "0hsfq0jigwa0i58z7vbnp62l7za49gmlg75vnygq2ijhkidkcmwa"; - }; - - meta = { - description = "HTTP/2 framing layer for Python"; - homepage = "http://hyper.rtfd.org/"; - license = licenses.mit; - }; - }; - - h2 = buildPythonPackage rec { - name = "h2-${version}"; - version = "2.5.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/h2/${name}.tar.gz"; - sha256 = "0xhzm5vcfhdq3mihynwh4ljwi0r06lvzk3ypr0gmmbcp1x43ffb7"; - }; - - propagatedBuildInputs = with self; [ enum34 hpack hyperframe ]; - - meta = { - description = "HTTP/2 State-Machine based protocol implementation"; - homepage = "http://hyper.rtfd.org/"; - license = licenses.mit; - }; - }; + h2 = callPackage ../development/python-modules/h2 { }; editorconfig = buildPythonPackage rec { name = "EditorConfig-${version}"; @@ -12226,25 +11567,7 @@ in { propagatedBuildInputs = with self; [ eventlib application gnutls ]; }; - multipledispatch = buildPythonPackage rec { - name = "multipledispatch-${version}"; - version = "0.4.9"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/multipledispatch/${name}.tar.gz"; - sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2"; - }; - - # No tests in archive - doCheck = false; - - meta = { - homepage = http://github.com/mrocklin/multipledispatch/; - description = "A relatively sane approach to multiple dispatch in Python"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + multipledispatch = callPackage ../development/python-modules/multipledispatch { }; multiprocess = buildPythonPackage rec { name = "multiprocess-${version}"; @@ -12493,6 +11816,8 @@ in { }; }; + pyte = callPackage ../development/python-modules/pyte { }; + graphviz = buildPythonPackage rec { name = "graphviz-${version}"; version = "0.5.2"; @@ -12700,6 +12025,8 @@ in { nbformat = callPackage ../development/python-modules/nbformat { }; + nbmerge = callPackage ../development/python-modules/nbmerge { }; + nbxmpp = buildPythonPackage rec { name = "nbxmpp-${version}"; version = "0.5.5"; @@ -12779,7 +12106,7 @@ in { patches = [ (pkgs.fetchpatch { url = https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch; - sha256 = "08rn1s3w9424jhandy4j9sksy852ny00088zh15nirw5ajqg1dn7"; + sha256 = "0s1cdn9v5alpviabhcjmzc0m2pnpq9dh2fnnk2x96dnry1pshg39"; }) ]; @@ -12989,42 +12316,7 @@ in { }; }; - nose-exclude = buildPythonPackage rec { - name = "nose-exclude-${version}"; - version = "0.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nose-exclude/${name}.tar.gz"; - sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304"; - }; - - propagatedBuildInputs = with self; [ nose ]; - - meta = { - license = licenses.lgpl21; - description = "Exclude specific directories from nosetests runs"; - homepage = https://github.com/kgrandis/nose-exclude; - maintainers = with maintainers; [ fridh ]; - }; - - }; - - nose-selecttests = buildPythonPackage rec { - version = "0.4"; - name = "nose-selecttests-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nose-selecttests/${name}.zip"; - sha256 = "0lgrfgp3sq8xi8d9grrg0z8jsyk0wl8a3rxw31hb7vdncin5b7n5"; - }; - - propagatedBuildInputs = with self; [ nose ]; - - meta = { - description = "Simple nose plugin that enables developers to run subset of collected tests to spare some waiting time for better things"; - }; - }; - + nose-exclude = callPackage ../development/python-modules/nose-exclude { }; nose2 = if isPy26 then null else (buildPythonPackage rec { name = "nose2-0.5.0"; @@ -13313,54 +12605,9 @@ in { numpy-stl = callPackage ../development/python-modules/numpy-stl { }; - numtraits = buildPythonPackage rec { - pname = "numtraits"; - version = "0.2"; - name = "${pname}-${version}"; + numtraits = callPackage ../development/python-modules/numtraits { }; - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ six numpy traitlets]; - - checkPhase = '' - py.test - ''; - - meta = { - description = "Numerical traits for Python objects"; - license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; - homepage = https://github.com/astrofrog/numtraits; - }; - }; - - nwdiag = buildPythonPackage rec { - name = "nwdiag-1.0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nwdiag/${name}.tar.gz"; - sha256 = "0n7ary1fngxk8bk15vabc8fhnmxlh098piciwaviwn7l4a5q1zys"; - }; - - buildInputs = with self; [ pep8 nose unittest2 docutils ]; - - propagatedBuildInputs = with self; [ blockdiag ]; - - # tests fail - doCheck = false; - - meta = { - description = "Generate network-diagram image from spec-text file (similar to Graphviz)"; - homepage = http://blockdiag.com/; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + nwdiag = callPackage ../development/python-modules/nwdiag { }; dynd = buildPythonPackage rec { version = "0.7.2"; @@ -13580,29 +12827,7 @@ in { }; }; - odo = buildPythonPackage rec { - name = "odo-${version}"; - version= "0.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/odo/${name}.tar.gz"; - sha256 = "1mh5k69d9ph9jd07jl9yqh78rbnh5cjspi1q530v3ml7ivjzz4p8"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ datashape numpy pandas toolz multipledispatch networkx ]; - - checkPhase = '' - py.test odo/tests - ''; - - meta = { - homepage = https://github.com/ContinuumIO/odo; - description = "Data migration utilities"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ fridh ]; - }; - }; + odo = callPackage ../development/python-modules/odo { }; offtrac = buildPythonPackage rec { name = "offtrac-0.1.0"; @@ -14274,21 +13499,7 @@ in { pecan = callPackage ../development/python-modules/pecan { }; - kaitaistruct = buildPythonPackage rec { - name = "kaitaistruct-${version}"; - version = "0.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/k/kaitaistruct/${name}.tar.gz"; - sha256 = "0rwcrlz7f2bwmypqa38pag492bp71wp1bhz51hsaynjjyr9knr12"; - }; - - meta = with stdenv.lib; { - description = "Kaitai Struct: runtime library for Python"; - homepage = "https://github.com/kaitai-io/kaitai_struct_python_runtime"; - license = licenses.mit; - }; - }; + kaitaistruct = callPackage ../development/python-modules/kaitaistruct { }; Kajiki = buildPythonPackage rec { name = "Kajiki-${version}"; @@ -15101,6 +14312,8 @@ in { }; }; + parso = callPackage ../development/python-modules/parso { }; + partd = buildPythonPackage rec { name = "partd-${version}"; version = "0.3.7"; @@ -15335,7 +14548,7 @@ in { }; }; - pep257 = callPackage ../development/python-modules/pep257.nix { }; + pep257 = callPackage ../development/python-modules/pep257 { }; percol = buildPythonPackage rec { name = "percol-${version}"; @@ -15544,6 +14757,7 @@ in { }; pip-tools = callPackage ../development/python-modules/pip-tools { + git = pkgs.gitMinimal; glibcLocales = pkgs.glibcLocales; }; @@ -15638,32 +14852,7 @@ in { }; }; - pysoundfile = buildPythonPackage rec { - name = "pysoundfile-${version}"; - version = "0.8.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/PySoundFile/PySoundFile-${version}.tar.gz"; - sha256 = "72c3e23b7c9998460ec78176084ea101e3439596ab29df476bc8508708df84df"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ numpy pkgs.libsndfile cffi ]; - - meta = { - description = "An audio library based on libsndfile, CFFI and NumPy"; - license = licenses.bsd3; - homepage = https://github.com/bastibe/PySoundFile; - maintainers = with maintainers; [ fridh ]; - }; - - prePatch = '' - substituteInPlace soundfile.py --replace "'sndfile'" "'${pkgs.libsndfile.out}/lib/libsndfile.so'" - ''; - - # https://github.com/bastibe/PySoundFile/issues/157 - disabled = isPyPy || stdenv.isi686; - }; + pysoundfile = callPackage ../development/python-modules/pysoundfile { }; python3pika = buildPythonPackage { name = "python3-pika-0.9.14"; @@ -15818,34 +15007,9 @@ in { }; }; - praw = buildPythonPackage rec { - name = "praw-3.5.0"; + praw = callPackage ../development/python-modules/praw { }; - src = pkgs.fetchurl { - url = "mirror://pypi/p/praw/${name}.zip"; - sha256 = "1hwdzqbrjdkicqhyxpcpsmld21k0ndpy8d2gk6l5mv9isw3dm8qa"; - }; - - propagatedBuildInputs = with self; [ - requests - decorator - flake8 - mock - six - update_checker - ]; - - # can't find the tests module? - doCheck = false; - - meta = { - description = "Python Reddit API wrapper"; - homepage = http://praw.readthedocs.org/; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ jgeerds ]; - }; - }; + prawcore = callPackage ../development/python-modules/prawcore { }; premailer = callPackage ../development/python-modules/premailer { }; @@ -15888,13 +15052,13 @@ in { }); - protobuf = callPackage ../development/python-modules/protobuf.nix { + protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; doCheck = !isPy3k; protobuf = pkgs.protobuf; }; - protobuf3_1 = callPackage ../development/python-modules/protobuf.nix { + protobuf3_1 = callPackage ../development/python-modules/protobuf { disabled = isPyPy; doCheck = !isPy3k; protobuf = pkgs.protobuf3_1; @@ -15919,7 +15083,7 @@ in { meta = { description = "Process and system utilization information interface for python"; - homepage = http://code.google.com/p/psutil/; + homepage = https://github.com/giampaolo/psutil; }; }; @@ -16023,41 +15187,9 @@ in { }; - pyasn1 = buildPythonPackage rec { - name = "pyasn1-0.1.9"; + pyasn1 = callPackage ../development/python-modules/pyasn1 { }; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyasn1/${name}.tar.gz"; - sha256 = "0zraxni14bqi20kr4bi6nwsh32aibz0fq0xaczfisw0zdpcsqg45"; - }; - - meta = { - description = "ASN.1 tools for Python"; - homepage = http://pyasn1.sourceforge.net/; - license = "mBSD"; - platforms = platforms.unix; # arbitrary choice - }; - }; - - pyasn1-modules = buildPythonPackage rec { - name = "pyasn1-modules-${version}"; - version = "0.0.8"; - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyasn1-modules/${name}.tar.gz"; - sha256 = "0drqgw81xd3fxdlg89kgd79zzrabvfncvkbybi2wr6w2y4s1jmhh"; - }; - - propagatedBuildInputs = with self; [ pyasn1 ]; - - meta = { - description = "A collection of ASN.1-based protocols modules"; - homepage = https://pypi.python.org/pypi/pyasn1-modules; - license = licenses.bsd3; - platforms = platforms.unix; # same as pyasn1 - }; - }; + pyasn1-modules = callPackage ../development/python-modules/pyasn1-modules { }; pyaudio = buildPythonPackage rec { name = "python-pyaudio-${version}"; @@ -16228,45 +15360,7 @@ in { }; }; - pygit2 = buildPythonPackage rec { - name = "pygit2-0.25.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pygit2/${name}.tar.gz"; - sha256 = "0sja3g9mqwp5bnhdc313b2gc4z3p70nn6zzf2h8j581g0lrn0sg8"; - }; - - # Fixes a bug which can cause test failed when cffi==1.10 - prePatch = let - cffiVersionPatch = pkgs.fetchurl { - url = "https://github.com/libgit2/pygit2/commit/b88dc868423af2f760f649960112efd0e37e5335.patch"; - sha256 = "14cfrz56y2dnwlxrrss9pjhxfnyyg5856gbabzjzyx674k0qcid4"; - }; - in '' - # we need to delete part of the patch because the missing .travis.yml causes problem - sed -e '1,36d' ${cffiVersionPatch} | patch -p1 - ''; - - preConfigure = ( if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib" - '' else "" ); - - propagatedBuildInputs = with self; [ pkgs.libgit2 six ] ++ optionals (!isPyPy) [ cffi ]; - - preCheck = '' - # disable tests that require networking - rm test/test_repository.py - rm test/test_credentials.py - rm test/test_submodule.py - ''; - - meta = { - homepage = https://pypi.python.org/pypi/pygit2; - description = "A set of Python bindings to the libgit2 shared library"; - license = licenses.gpl2; - platforms = platforms.all; - }; - }; + pygit2 = callPackage ../development/python-modules/pygit2 { }; Babel = buildPythonPackage (rec { name = "Babel-2.3.4"; @@ -16404,12 +15498,12 @@ in { pycdio = buildPythonPackage rec { - name = "pycdio-0.20"; + name = "pycdio-0.21"; disabled = !isPy27; src = pkgs.fetchurl { url = "mirror://pypi/p/pycdio/${name}.tar.gz"; - sha256 = "1mrh233pj584gf7la64d4xlmvdnfl4jwpxs95lnd3i4zd5drid14"; + sha256 = "1bkcmg838l2yffsw5lln93ap5f8ks3vmqwg02mygmdmay647rc3v"; }; prePatch = '' @@ -16424,8 +15518,6 @@ in { buildInputs = [ self.setuptools self.nose pkgs.swig pkgs.libcdio ] ++ stdenv.lib.optional stdenv.isDarwin pkgs.libiconv; - patches = [ ../development/python-modules/pycdio/add-cdtext-toc.patch ]; - # Run tests using nosetests but first need to install the binaries # to the root source directory where they can be found. checkPhase = '' @@ -16667,34 +15759,7 @@ in { }; }; - - pyev = buildPythonPackage rec { - name = "pyev-0.9.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyev/${name}.tar.gz"; - sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx"; - }; - - buildInputs = [ pkgs.libev ]; - - libEvSharedLibrary = - if !stdenv.isDarwin - then "${pkgs.libev}/lib/libev.so.4" - else "${pkgs.libev}/lib/libev.4.dylib"; - - postPatch = '' - test -f "${libEvSharedLibrary}" || { echo "ERROR: File ${libEvSharedLibrary} does not exist, please fix nix expression for pyev"; exit 1; } - sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"${libEvSharedLibrary}\"|" setup.py - ''; - - meta = { - description = "Python bindings for libev"; - homepage = https://code.google.com/p/pyev/; - license = licenses.gpl3; - maintainers = [ maintainers.bjornfor ]; - }; - }; + pyev = callPackage ../development/python-modules/pyev { }; pyexcelerator = buildPythonPackage rec { name = "pyexcelerator-${version}"; @@ -16739,8 +15804,6 @@ in { }; }; - pyfeed = callPackage ../development/python-modules/pyfeed { }; - pyfftw = callPackage ../development/python-modules/pyfftw { }; pyfiglet = callPackage ../development/python-modules/pyfiglet { }; @@ -17075,26 +16138,11 @@ in { }; }; + pyobjc = if stdenv.isDarwin + then callPackage ../development/python-modules/pyobjc {} + else throw "pyobjc can only be built on Mac OS"; - pyodbc = buildPythonPackage rec { - name = "pyodbc-3.0.7"; - disabled = isPyPy; # use pypypdbc instead - - src = pkgs.fetchurl { - url = "https://pyodbc.googlecode.com/files/${name}.zip"; - sha256 = "0ldkm8xws91j7zbvpqb413hvdz8r66bslr451q3qc0xi8cnmydfq"; - }; - - buildInputs = with self; [ pkgs.libiodbc ]; - - meta = { - description = "Python ODBC module to connect to almost any database"; - homepage = https://code.google.com/p/pyodbc/; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + pyodbc = callPackage ../development/python-modules/pyodbc { }; pyocr = callPackage ../development/python-modules/pyocr { }; @@ -17230,23 +16278,7 @@ in { }; }); - Pyro = buildPythonPackage (rec { - name = "Pyro-3.16"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/Pyro/${name}.tar.gz"; - sha256 = "1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578"; - }; - - meta = { - description = "Distributed object middleware for Python (IPC/RPC)"; - homepage = http://pythonhosted.org/Pyro/; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; - }; - }); + Pyro = callPackage ../development/python-modules/pyro { }; pyrsistent = buildPythonPackage (rec { name = "pyrsistent-0.11.12"; @@ -17380,7 +16412,7 @@ in { buildInputs = with self; [ pyasn1 pycrypto ]; }; - pyudev = callPackage ../development/python-modules/pyudev.nix { + pyudev = callPackage ../development/python-modules/pyudev { inherit (pkgs) fetchurl systemd; }; @@ -17445,29 +16477,11 @@ in { }; }); - ldap = callPackage ../development/python-modules/ldap.nix { + ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl openssl; }; - ldap3 = buildPythonPackage rec { - version = "1.0.4"; - name = "ldap3-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/ldap3/${name}.tar.gz"; - sha256 = "0j4qqj9vq022hy7wfqn8s0j4vm2g6paabbzas1vbyspawvcfai98"; - }; - - buildInputs = with self; [ gssapi ]; - - propagatedBuildInputs = with self; [ pyasn1 ]; - - meta = { - homepage = https://pypi.python.org/pypi/ldap3; - description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library"; - license = licenses.lgpl3; - }; - }; + ldap3 = callPackage ../development/python-modules/ldap3 {}; ptest = buildPythonPackage rec { name = pname + "-" + version; @@ -17502,25 +16516,7 @@ in { }; }; - pylibacl = buildPythonPackage (rec { - name = "pylibacl-0.5.1"; - - src = pkgs.fetchurl { - url = "https://github.com/downloads/iustin/pylibacl/${name}.tar.gz"; - sha256 = "1idks7j9bn62xzsaxkvhl7bdq6ws8kv8aa0wahfh7724qlbbcf1k"; - }; - - # ERROR: testExtended (tests.test_acls.AclExtensions) - # IOError: [Errno 0] Error - doCheck = false; - - buildInputs = with self; [ pkgs.acl ]; - - meta = { - description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them"; - license = licenses.lgpl21Plus; - }; - }); + pylibacl = callPackage ../development/python-modules/pylibacl { }; pyliblo = buildPythonPackage rec { name = "pyliblo-${version}"; @@ -17542,29 +16538,6 @@ in { }; }; - pymacs = buildPythonPackage rec { - version = "0.25"; - name = "pymacs-${version}"; - disabled = isPy3k || isPyPy; - - src = pkgs.fetchurl { - url = "https://github.com/pinard/Pymacs/tarball/v${version}"; - name = "${name}.tar.gz"; - sha256 = "1hmy76c5igm95rqbld7gvk0az24smvc8hplfwx2f5rhn6frj3p2i"; - }; - - configurePhase = "make"; - - doCheck = false; - - meta = { - description = "Emacs Lisp to Python interface"; - homepage = http://pymacs.progiciels-bpi.ca; - license = licenses.gpl2; - maintainers = with maintainers; [ goibhniu ]; - }; - }; - pypcap = callPackage ../development/python-modules/pypcap {}; pyplatec = buildPythonPackage rec { @@ -17767,9 +16740,9 @@ in { doCheck = false; }; - rackspace-novaclient = callPackage ../development/python-modules/rackspace-novaclient.nix { }; + rackspace-novaclient = callPackage ../development/python-modules/rackspace-novaclient { }; - pyrax = callPackage ../development/python-modules/pyrax.nix { + pyrax = callPackage ../development/python-modules/pyrax { glibcLocales = pkgs.glibcLocales; }; @@ -18110,25 +17083,7 @@ in { pywinrm = callPackage ../development/python-modules/pywinrm { }; - pyxattr = buildPythonPackage (rec { - name = "pyxattr-0.5.1"; - - src = pkgs.fetchurl { - url = "https://github.com/downloads/iustin/pyxattr/${name}.tar.gz"; - sha256 = "0jmkffik6hdzs7ng8c65bggss2ai40nm59jykswdf5lpd36cxddq"; - }; - - # error: invalid command 'test' - doCheck = false; - - buildInputs = with self; [ pkgs.attr ]; - - meta = { - description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems"; - license = licenses.lgpl21Plus; - }; - }); - + pyxattr = callPackage ../development/python-modules/pyxattr { }; pyaml = buildPythonPackage (rec { name = "pyaml-15.02.1"; @@ -18281,33 +17236,13 @@ in { # use requests, not requests_2 requests = callPackage ../development/python-modules/requests { }; - requests_download = buildPythonPackage rec { - pname = "requests_download"; - version = "0.1.1"; - name = "${pname}-${version}"; - - format = "wheel"; - - src = pkgs.fetchurl { - url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.1-py2.py3-none-any.whl; - sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; - }; - - propagatedBuildInputs = with self; [ requests ]; - - meta = { - description = "Download files using requests and save them to a target path"; - homepage = https://www.github.com/takluyver/requests_download; - license = licenses.mit; - maintainer = maintainers.fridh; - }; - }; + requests_download = callPackage ../development/python-modules/requests_download { }; requestsexceptions = callPackage ../development/python-modules/requestsexceptions {}; requests_ntlm = callPackage ../development/python-modules/requests_ntlm { }; - requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { }; + requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib { }; requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 @@ -18426,26 +17361,7 @@ in { rcssmin = callPackage ../development/python-modules/rcssmin { }; - recommonmark = buildPythonPackage rec { - name = "recommonmark-${version}"; - version = "0.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/recommonmark/${name}.tar.gz"; - sha256 = "6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d"; - }; - - buildInputs = with self; [ pytest sphinx ]; - propagatedBuildInputs = with self; [ CommonMark_54 docutils ]; - - meta = { - description = "A docutils-compatibility bridge to CommonMark"; - homepage = https://github.com/rtfd/recommonmark; - license = licenses.mit; - maintainers = with maintainers; [ fridh ]; - }; - - }; + recommonmark = callPackage ../development/python-modules/recommonmark { }; redis = callPackage ../development/python-modules/redis { }; @@ -18487,27 +17403,6 @@ in { }; }; - requests_oauth2 = buildPythonPackage rec { - name = "requests-oauth2-0.1.1"; - # python3 does not support relative imports - disabled = isPy3k; - - src = pkgs.fetchurl { - url = https://github.com/maraujop/requests-oauth2/archive/0.1.1.tar.gz; - sha256 = "1aij66qg9j5j4vzyh64nbg72y7pcafgjddxsi865racsay43xfqg"; - }; - - propagatedBuildInputs = with self; [ requests ]; - # no tests in tarball - doCheck = false; - - meta = { - description = "Python's Requests OAuth2 (Open Authentication) plugin"; - homepage = https://github.com/maraujop/requests-oauth2; - }; - }; - - restview = callPackage ../development/python-modules/restview { }; readme = buildPythonPackage rec { @@ -18713,52 +17608,9 @@ in { restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; - robomachine = buildPythonPackage rec { - name = "robomachine-0.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz"; - sha256 = "6c9a9bae7bffa272b2a09b05df06c29a3a776542c70cae8041a8975a061d2e54"; - }; - - propagatedBuildInputs = with self; [ pyparsing argparse robotframework ]; - - # Remove Windows .bat files - postInstall = '' - rm "$out/bin/"*.bat - ''; - - postPatch = '' - substituteInPlace setup.py --replace "argparse" "" - ''; - - meta = { - description = "Test data generator for Robot Framework"; - homepage = https://github.com/mkorpela/RoboMachine; - license = licenses.asl20; - maintainers = with maintainers; [ bjornfor ]; - }; - }; - - robotframework = buildPythonPackage rec { - version = "3.0.2"; - name = "robotframework-${version}"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/robotframework/${name}.tar.gz"; - sha256 = "1xqzxv00lxf9xi4vdxdsyd1bfmx18gi96vrnijpzj9w2aqrz4610"; - }; - - meta = { - description = "Generic test automation framework"; - homepage = http://robotframework.org/; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + robomachine = callPackage ../development/python-modules/robomachine { }; + robotframework = callPackage ../development/python-modules/robotframework { }; robotframework-selenium2library = buildPythonPackage rec { version = "1.6.0"; @@ -18801,60 +17653,9 @@ in { }; }; + robotsuite = callPackage ../development/python-modules/robotsuite { }; - robotsuite = buildPythonPackage rec { - version = "1.4.2"; - name = "robotsuite-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/robotsuite/${name}.zip"; - sha256 = "0sw09vrvwv3gzqb6jvhbrz09l6nzzj3i9av34qjddqfwq7cr1bla"; - }; - - # error: invalid command 'test' - #doCheck = false; - - buildInputs = with self; [ unittest2 ]; - propagatedBuildInputs = with self; [ robotframework lxml ]; - - meta = { - description = "Python unittest test suite for Robot Framework"; - homepage = http://github.com/collective/robotsuite/; - license = licenses.gpl3; - }; - }; - - - robotframework-ride = buildPythonPackage rec { - version = "1.2.3"; - name = "robotframework-ride-${version}"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz"; - sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j"; - }; - - propagatedBuildInputs = with self; [ pygments wxPython ]; - - # ride_postinstall.py checks that needed deps are installed and creates a - # desktop shortcut. We don't really need it and it clutters up bin/ so - # remove it. - postInstall = '' - rm -f "$out/bin/ride_postinstall.py" - ''; - - # error: invalid command 'test' - doCheck = false; - - meta = { - description = "Light-weight and intuitive editor for Robot Framework test case files"; - homepage = https://code.google.com/p/robotframework-ride/; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + robotframework-ride = callPackage ../development/python-modules/robotframework-ride { }; robotframework-requests = buildPythonPackage rec { version = "0.4.6"; @@ -18897,44 +17698,6 @@ in { }; }; - ropemacs = buildPythonPackage rec { - version = "0.7"; - name = "ropemacs-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/ropemacs/${name}.tar.gz"; - sha256 = "1x5qf1drcdz9jfiiakc60kzqkb3ahsg9j902c5byf3gjfacdrmqj"; - }; - - propagatedBuildInputs = with self; [ ropemode ]; - - meta = { - description = "A plugin for performing python refactorings in emacs"; - homepage = http://rope.sf.net/ropemacs.html; - maintainers = with maintainers; [ goibhniu ]; - license = licenses.gpl2; - }; - }; - - ropemode = buildPythonPackage rec { - version = "0.2"; - name = "ropemode-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/ropemode/${name}.tar.gz"; - sha256 = "0jw6h1wvk6wk0wknqdf7s9pw76m8472jv546lqdd88jbl2scgcjl"; - }; - - propagatedBuildInputs = with self; [ rope ]; - - meta = { - description = "A plugin for performing python refactorings in emacs"; - homepage = http://rope.sf.net; - maintainers = with maintainers; [ goibhniu ]; - license = licenses.gpl2; - }; - }; - ropper = callPackage ../development/python-modules/ropper { }; routes = buildPythonPackage rec { @@ -18957,24 +17720,7 @@ in { rpkg = callPackage ../development/python-modules/rpkg/default.nix {}; - rply = buildPythonPackage rec { - name = "rply-${version}"; - version = "0.7.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/rply/${name}.tar.gz"; - sha256 = "12rp1d9ba7nvd5rhaxi6xzx1rm67r1k1ylsrkzhpwnphqpb06cvj"; - }; - - buildInputs = with self; [ appdirs ]; - - meta = with pkgs.stdenv.lib; { - description = "A python Lex/Yacc that works with RPython"; - homepage = https://github.com/alex/rply; - license = licenses.bsd3; - maintainers = with maintainers; [ nixy ]; - }; - }; + rply = callPackage ../development/python-modules/rply/default.nix {}; rpm = (pkgs.rpm.override{inherit python;}); @@ -19148,22 +17894,6 @@ in { }; }; - rtslib_fb = buildPythonPackage rec { - version = "2.1.fb43"; - name = "rtslib-fb-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/agrover/rtslib-fb/archive/v${version}.tar.gz"; - sha256 = "1b59vyy12g6rix9l2fxx0hjiq33shkb79v57gwffs57vh74wc53v"; - }; - - meta = { - description = "A Python object API for managing the Linux LIO kernel target"; - homepage = "https://github.com/agrover/rtslib-fb"; - platforms = platforms.linux; - }; - }; - s3transfer = buildPythonPackage rec { version = "0.1.10"; name = "s3transfer-${version}"; @@ -19197,31 +17927,7 @@ in { }; }; - seqdiag = buildPythonPackage rec { - name = "seqdiag-0.9.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/seqdiag/${name}.tar.gz"; - sha256 = "1qa7d0m1wahvmrj95rxkb6128cbwd4w3gy8gbzncls66h46bifiz"; - }; - - buildInputs = with self; [ pep8 nose unittest2 docutils ]; - - propagatedBuildInputs = with self; [ blockdiag ]; - - # Tests fail: - # ... - # ERROR: Failure: OSError ([Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.9.0.drv-0/seqdiag-0.9.0/src/seqdiag/tests/diagrams/') - doCheck = false; - - meta = { - description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)"; - homepage = http://blockdiag.com/; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + seqdiag = callPackage ../development/python-modules/seqdiag { }; pysendfile = buildPythonPackage rec { name = "pysendfile-${version}"; @@ -19278,24 +17984,7 @@ in { sampledata = callPackage ../development/python-modules/sampledata { }; - scapy = buildPythonPackage rec { - name = "scapy-2.2.0"; - - disabled = isPy3k || isPyPy; - - src = pkgs.fetchurl { - url = "http://www.secdev.org/projects/scapy/files/${name}.tar.gz"; - sha256 = "1bqmp0xglkndrqgmybpwmzkv462mir8qlkfwsxwbvvzh9li3ndn5"; - }; - - meta = { - description = "Powerful interactive network packet manipulation program"; - homepage = http://www.secdev.org/projects/scapy/; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + scapy = callPackage ../development/python-modules/scapy { }; scipy = callPackage ../development/python-modules/scipy { }; @@ -19346,30 +18035,7 @@ in { }; }; - seaborn = buildPythonPackage rec { - name = "seaborn-0.7.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/seaborn/${name}.tar.gz"; - sha256 = "0pawrqc3mxpwd5g9pvi9gba02637bh5c8ldpp8izfwpfn52469zs"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ pandas matplotlib ]; - - checkPhase = '' - nosetests -v - ''; - - # Computationally very demanding tests - doCheck = false; - - meta = { - description = "Statisitical data visualization"; - homepage = "http://stanford.edu/~mwaskom/software/seaborn/"; - license = "BSD"; - maintainers = with maintainers; [ fridh ]; - }; - }; + seaborn = callPackage ../development/python-modules/seaborn { }; selenium = buildPythonPackage rec { name = "selenium-2.52.0"; @@ -20288,58 +18954,7 @@ in { }; - six = buildPythonPackage rec { - name = "six-1.10.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/six/${name}.tar.gz"; - sha256 = "0snmb8xffb3vsma0z67i0h0w2g2dy0p3gsgh9gi4i0kgc5l8spqh"; - }; - - buildInputs = with self; [ pytest ]; - - checkPhase = '' - py.test test_six.py - ''; - - meta = { - description = "A Python 2 and 3 compatibility library"; - homepage = http://pypi.python.org/pypi/six/; - }; - }; - - - skype4py = buildPythonPackage (rec { - name = "Skype4Py-1.0.32.0"; - disabled = isPy3k || isPyPy; - - src = pkgs.fetchurl { - url = mirror://sourceforge/skype4py/Skype4Py-1.0.32.0.tar.gz; - sha256 = "0cmkrv450wa8v50bng5dflpwkl5c1p9pzysjkb2956w5kvwh6f5b"; - }; - - unpackPhase = '' - tar xf $src - find . -type d -exec chmod +rx {} \; - sourceRoot=`pwd`/`ls -d S*` - ''; - - # error: invalid command 'test' - doCheck = false; - - propagatedBuildInputs = with self; [ pkgs.xorg.libX11 dbus-python pygobject2 ]; - - meta = { - description = "High-level, platform independent Skype API wrapper for Python"; - - # The advertisement says https://developer.skype.com/wiki/Skype4Py - # but that url does not work. This following web page points to the - # download link and has some information about the package. - homepage = http://pypi.python.org/pypi/Skype4Py/1.0.32.0; - broken = true; - license = "BSD"; - }; - }); + six = callPackage ../development/python-modules/six { }; smartdc = buildPythonPackage rec { name = "smartdc-0.1.12"; @@ -20946,6 +19561,8 @@ in { }; }; + sybil = callPackage ../development/python-modules/sybil { }; + syncthing-gtk = buildPythonPackage rec { version = "0.9.2.3"; name = "syncthing-gtk-${version}"; @@ -20991,80 +19608,7 @@ in { inherit (pkgs) pkgconfig systemd; }; - tabulate = buildPythonPackage rec { - version = "0.7.7"; - pname = "tabulate"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6"; - }; - - buildInputs = with self; [ nose ]; - - # Tests: cannot import common (relative import). - doCheck = false; - - meta = { - description = "Pretty-print tabular data"; - homepage = https://bitbucket.org/astanin/python-tabulate; - license = licenses.mit; - maintainers = with maintainers; [ fridh ]; - }; - - }; - - targetcli_fb = buildPythonPackage rec { - version = "2.1.fb33"; - name = "targetcli-fb-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/agrover/targetcli-fb/archive/v${version}.tar.gz"; - sha256 = "1zcm0agdpf866020b43fl8zyyyzz6r74mn1sz4xpaa0pinpwjk42"; - }; - - propagatedBuildInputs = with self; [ - configshell_fb - rtslib_fb - ]; - - meta = { - description = "A command shell for managing the Linux LIO kernel target"; - homepage = "https://github.com/agrover/targetcli-fb"; - platforms = platforms.linux; - }; - }; - - taskcoach = buildPythonPackage rec { - name = "TaskCoach-1.3.22"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://sourceforge/taskcoach/${name}.tar.gz"; - sha256 = "1ddx56bqmh347synhgjq625ijv5hqflr0apxg0nl4jqdsqk1zmxh"; - }; - - propagatedBuildInputs = with self; [ wxPython ]; - - # I don't know why I need to add these libraries. Shouldn't they - # be part of wxPython? - postInstall = '' - libspaths=${with pkgs.xorg; pkgs.lib.makeLibraryPath [ libSM libXScrnSaver ]} - wrapProgram $out/bin/taskcoach.py \ - --prefix LD_LIBRARY_PATH : $libspaths - ''; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://taskcoach.org/; - description = "Todo manager to keep track of personal tasks and todo lists"; - license = licenses.gpl3Plus; - broken = stdenv.isDarwin; - }; - }; + tabulate = callPackage ../development/python-modules/tabulate { }; taskw = buildPythonPackage rec { version = "1.0.3"; @@ -21262,32 +19806,7 @@ in { testtools = callPackage ../development/python-modules/testtools { }; - traitlets = buildPythonPackage rec { - pname = "traitlets"; - version = "4.3.2"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835"; - }; - - LC_ALL = "en_US.UTF-8"; - - buildInputs = with self; [ pkgs.glibcLocales pytest mock ]; - propagatedBuildInputs = with self; [ipython_genutils decorator enum34]; - - checkPhase = '' - py.test $out - ''; - - meta = { - description = "Traitlets Python config system"; - homepage = http://ipython.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + traitlets = callPackage ../development/python-modules/traitlets { }; python_mimeparse = buildPythonPackage rec { name = "python-mimeparse-${version}"; @@ -21421,30 +19940,7 @@ in { }; }; - toolz = buildPythonPackage rec{ - name = "toolz-${version}"; - version = "0.8.2"; - - src = pkgs.fetchurl{ - url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz"; - sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa"; - }; - - buildInputs = with self; [ nose ]; - - checkPhase = '' - # https://github.com/pytoolz/toolz/issues/357 - rm toolz/tests/test_serialization.py - nosetests toolz/tests - ''; - - meta = { - homepage = "http://github.com/pytoolz/toolz/"; - description = "List processing tools and functional utilities"; - license = "licenses.bsd3"; - maintainers = with maintainers; [ fridh ]; - }; - }; + toolz = callPackage ../development/python-modules/toolz { }; tox = buildPythonPackage rec { name = "tox-${version}"; @@ -21475,29 +19971,6 @@ in { }; }; - trac = buildPythonPackage { - name = "trac-1.0.1"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = http://ftp.edgewall.com/pub/trac/Trac-1.0.1.tar.gz; - sha256 = "1nqa95fcnkpyq4jk6az7l7sqgm3b3pjq3bx1n7y4v3bad5jr1m4x"; - }; - - # couple of failing tests - doCheck = false; - - PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - - propagatedBuildInputs = with self; [ genshi ]; - - meta = { - description = "Enhanced wiki and issue tracking system for software development projects"; - - license = "BSD"; - }; - }; - traits = buildPythonPackage rec { name = "traits-${version}"; version = "4.5.0"; @@ -21913,24 +20386,7 @@ in { }; }; - update_checker = buildPythonPackage rec { - name = "update_checker-0.11"; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/update_checker/${name}.tar.gz"; - sha256 = "681bc7c26cffd1564eb6f0f3170d975a31c2a9f2224a32f80fe954232b86f173"; - }; - - propagatedBuildInputs = with self; [ requests ]; - - doCheck = false; - - meta = { - description = "A python module that will check for package updates"; - homepage = https://github.com/bboe/update_checker; - license = licenses.bsd2; - }; - }; + update_checker = callPackage ../development/python-modules/update_checker {}; uritemplate = buildPythonPackage rec { name = "uritemplate-${version}"; @@ -21973,25 +20429,7 @@ in { urlgrabber = callPackage ../development/python-modules/urlgrabber {}; - urwid = buildPythonPackage (rec { - name = "urwid-1.3.1"; - - # multiple: NameError: name 'evl' is not defined - doCheck = false; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/urwid/${name}.tar.gz"; - sha256 = "18cnd1wdjcas08x5qwa5ayw6jsfcn33w4d9f7q3s29fy6qzc1kng"; - }; - - meta = { - description = "A full-featured console (xterm et al.) user interface library"; - homepage = http://excess.org/urwid; - repositories.git = git://github.com/wardi/urwid.git; - license = licenses.lgpl21; - maintainers = with maintainers; [ garbas ]; - }; - }); + urwid = callPackage ../development/python-modules/urwid {}; urwidtrees = buildPythonPackage rec { name = "urwidtrees-${rev}"; @@ -22417,26 +20855,6 @@ EOF widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; - - wokkel = buildPythonPackage (rec { - url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; - name = nameFromURL url ".tar"; - src = pkgs.fetchurl { - inherit url; - sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; - }; - - disabled = isPy3k; - - propagatedBuildInputs = with self; [twisted dateutil]; - - meta = { - description = "Some (mainly XMPP-related) additions to twisted"; - homepage = "http://wokkel.ik.nu/"; - license = licenses.mit; - }; - }); - magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; wsgiproxy2 = buildPythonPackage rec { @@ -22477,23 +20895,6 @@ EOF propagatedBuildInputs = with self; [ eventlib application ]; }; - xe = buildPythonPackage rec { - url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz"; - name = stdenv.lib.nameFromURL url ".tar"; - src = pkgs.fetchurl { - inherit url; - sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = "http://home.blarg.net/~steveha/xe.html"; - description = "XML elements"; - }; - }; - xlib = buildPythonPackage (rec { name = "xlib-${version}"; version = "0.17"; @@ -22625,25 +21026,7 @@ EOF }; }); - zipstream = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "zipstream"; - version = "1.1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/${pname}/${name}.tar.gz"; - sha256 = "01im5anqdyggmwkigqcjg0qw2a5bnn84h33mfaqjjd69a28lpwif"; - }; - - buildInputs = with self; [ nose ]; - - meta = { - description = "A zip archive generator"; - homepage = "https://github.com/allanlei/python-zipstream"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ primeos ]; - }; - }; + zipstream = callPackage ../development/python-modules/zipstream { }; zodb = callPackage ../development/python-modules/zodb {}; @@ -23239,30 +21622,7 @@ EOF }; }; - testfixtures = buildPythonPackage rec { - name = "testfixtures-${version}"; - version = "4.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/testfixtures/testfixtures-${version}.tar.gz"; - sha256 = "0my8zq9d27mc7j78pz9971cn5wz6zi4vxlqa50szr2vq9j2xxkll"; - }; - - buildInputs = with self; [ nose mock manuel ]; - - checkPhase = '' - nosetests -v - ''; - - # Test suite seems broken - # TypeError: TestSuite() missing 1 required positional argument: 'm' - # Haven't checked with newer version - doCheck = false; - - meta = with stdenv.lib; { - homepage = "https://github.com/Simplistix/testfixtures"; - }; - }; + testfixtures = callPackage ../development/python-modules/testfixtures {}; tissue = buildPythonPackage rec { name = "tissue-0.9.2"; @@ -23525,35 +21885,7 @@ EOF unidecode = callPackage ../development/python-modules/unidecode {}; - pyusb = buildPythonPackage rec { - name = "pyusb-1.0.0"; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/8a/19/66fb48a4905e472f5dfeda3a1bafac369fbf6d6fc5cf55b780864962652d/PyUSB-1.0.0.tar.gz"; - sha256 = "0s2k4z06fapd5vp1gnrlf8a9sjpc03p9974lzw5k6ky39akzyd2v"; - }; - - # Fix the USB backend library lookup - postPatch = - '' - libusb=${pkgs.libusb1.out}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary} - test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } - sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py - ''; - - propagatedBuildInputs = [ pkgs.libusb ]; - - # No tests included - doCheck = false; - - meta = { - description = "Python USB access module (wraps libusb 1.0)"; # can use other backends - homepage = http://pyusb.sourceforge.net/; - license = licenses.bsd3; - maintainers = with maintainers; [ bjornfor ]; - }; - }; - + pyusb = callPackage ../development/python-modules/pyusb {}; BlinkStick = buildPythonPackage rec { name = "BlinkStick-${version}"; @@ -23580,25 +21912,7 @@ EOF }; }; - - usbtmc = buildPythonPackage rec { - name = "usbtmc-${version}"; - version = "0.6"; - - src = pkgs.fetchurl { - url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz"; - sha256 = "1wnw6ndc3s1i8zpbikz5zc40ijvpraqdb0xn8zmqlyn95xxfizw2"; - }; - - propagatedBuildInputs = with self; [ pyusb ]; - - meta = { - description = "Python implementation of the USBTMC instrument control protocol"; - homepage = http://alexforencich.com/wiki/en/python-usbtmc/start; - license = licenses.mit; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + usbtmc = callPackage ../development/python-modules/usbtmc {}; txgithub = buildPythonPackage rec { name = "${pname}-${version}"; @@ -23700,7 +22014,11 @@ EOF }; }; - graphite_web = buildPythonPackage rec { + graphite_web = if + self.django != self.django_1_8 + || self.django_tagging != self.django_tagging_0_4_3 + then throw "graphite_web should be build with django_1_8 and django_tagging_0_4_3" + else buildPythonPackage rec { name = "graphite-web-${version}"; disabled = isPy3k; version = graphiteVersion; @@ -23711,7 +22029,7 @@ EOF }; propagatedBuildInputs = with self; [ - django_1_8 django_tagging_0_4_3 whisper pycairo cairocffi + django django_tagging whisper pycairo cairocffi ldap memcached pytz urllib3 scandir ]; @@ -23982,13 +22300,13 @@ EOF }; libvirt = let - version = "3.6.0"; + version = "3.8.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 = "1l0s9cx38qb6x5xj32r531xap11m93c3gag30idj8fzkn74cpfgc"; + sha256 = "02spx8kfcsnqwsshd7bk2plyic2lbpwzg16sf3csh0avck5akjsz"; }; nativeBuildInputs = [ pkgs.pkgconfig ]; @@ -24207,29 +22525,6 @@ EOF }; }; - - redNotebook = buildPythonPackage rec { - name = "rednotebook-1.8.1"; - - src = pkgs.fetchurl { - url = "mirror://sourceforge/rednotebook/${name}.tar.gz"; - sha256 = "00b7s4xpqpxsbzjvjx9qsx5d84m9pvn383c5di1nsfh35pig0rzn"; - }; - - # no tests available - doCheck = false; - - propagatedBuildInputs = with self; [ pygtk pywebkitgtk pyyaml chardet ]; - - meta = { - homepage = http://rednotebook.sourceforge.net/index.html; - description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds"; - license = licenses.gpl2; - maintainers = with maintainers; [ tstrobel ]; - }; - }; - - uncertainties = callPackage ../development/python-modules/uncertainties { }; funcy = buildPythonPackage rec { @@ -24676,22 +22971,7 @@ EOF }; }; - ofxclient = buildPythonPackage rec { - name = "ofxclient-1.3.8"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/ofxclient/${name}.tar.gz"; - sha256 = "99ab03bffdb30d9ec98724898f428f8e73129483417d5892799a0f0d2249f233"; - }; - - patchPhase = '' - substituteInPlace setup.py --replace '"argparse",' "" - ''; - - # ImportError: No module named tests - doCheck = false; - - propagatedBuildInputs = with self; [ ofxhome ofxparse beautifulsoup keyring ]; - }; + ofxclient = callPackage ../development/python-modules/ofxclient {}; ofxhome = buildPythonPackage rec { name = "ofxhome-0.3.1"; @@ -24797,7 +23077,7 @@ EOF }; }; - markdown2 = callPackage ../development/python-modules/markdown2.nix { }; + markdown2 = callPackage ../development/python-modules/markdown2 { }; evernote = buildPythonPackage rec { name = "evernote-${version}"; @@ -26405,25 +24685,7 @@ EOF }; }; - pwntools = buildPythonPackage rec { - name = "pwntools-${version}"; - version = "3.7.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pwntools/${name}.tar.gz"; - sha256 = "1c0n97cf3nql3n6sxpbp43x1byhkgfbpbl2b22h8nllgb8n0z9l0"; - }; - propagatedBuildInputs = with self; [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pkgs.pandoc unicorn intervaltree ]; - - disabled = isPy3k; - - meta = { - homepage = "http://pwntools.com"; - description = "CTF framework and exploit development library"; - license = licenses.mit; - maintainers = with maintainers; [ bennofs ]; - }; - }; + pwntools = callPackage ../development/python-modules/pwntools { }; ROPGadget = callPackage ../development/python-modules/ROPGadget { }; @@ -26507,31 +24769,7 @@ EOF zeroconf = callPackage ../development/python-modules/zeroconf { }; - zipfile36 = buildPythonPackage rec { - pname = "zipfile36"; - version = "0.1.3"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead"; - }; - - checkPhase = '' - ${python.interpreter} -m unittest test_zipfile.py - ''; - - # Only works with Python 3.x. - # Not supposed to be used with 3.6 and up. - disabled = !(isPy3k && (pythonOlder "3.6")); - - meta = { - description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; - homepage = https://gitlab.com/takluyver/zipfile36; - license = licenses.psfl; - maintainer = maintainers.fridh; - }; - }; + zipfile36 = callPackage ../development/python-modules/zipfile36 { }; todoist = callPackage ../development/python-modules/todoist { };