diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-15 15:45:37 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-15 15:45:37 +0200 |
| commit | b1916b45a374815c9f6101b9f6a30b35b7c92ecb (patch) | |
| tree | 08d7be26385fe1f69922cd985d7f2e68f27884f6 | |
| parent | 0a941e0b66ab86cf359d4f158bda86c9742c4b2b (diff) | |
| parent | 79e7f7af9a2262f8d8e6bea2b32d18f24b668a0c (diff) | |
Merge remote-tracking branch 'upstream/staging' into gcc-7
Conflicts: pkgs/development/libraries/libidn/default.nix pkgs/top-level/all-packages.nix
906 files changed, 20629 insertions, 10099 deletions
diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index 629db289ab1d0..764fae3ce9362 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -334,14 +334,10 @@ navigate there. Finally, you can run ```shell -hoogle server -p 8080 +hoogle server -p 8080 --local ``` and navigate to http://localhost:8080/ for your own local -[Hoogle](https://www.haskell.org/hoogle/). Note, however, that Firefox and -possibly other browsers disallow navigation from `http:` to `file:` URIs for -security reasons, which might be quite an inconvenience. See [this -page](http://kb.mozillazine.org/Links_to_local_pages_do_not_work) for -workarounds. +[Hoogle](https://www.haskell.org/hoogle/). ### How to build a Haskell project using Stack diff --git a/doc/package-notes.xml b/doc/package-notes.xml index b657f5809db96..2d6c87c3d07a8 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -660,6 +660,32 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el passing <command>-q</command> to the Emacs command. </para> +<para> + Sometimes <varname>emacsWithPackages</varname> is not enough, as + this package set has some priorities imposed on packages (with + the lowest priority assigned to Melpa Unstable, and the highest for + packages manually defined in + <filename>pkgs/top-level/emacs-packages.nix</filename>). But you + can't control this priorities when some package is installed as a + dependency. You can override it on per-package-basis, providing all + the required dependencies manually - but it's tedious and there is + always a possibility that an unwanted dependency will sneak in + through some other package. To completely override such a package + you can use <varname>overrideScope</varname>. +</para> + +<screen> +overrides = super: self: rec { + haskell-mode = self.melpaPackages.haskell-mode; + ... +}; +((emacsPackagesNgGen emacs).overrideScope overrides).emacsWithPackages (p: with p; [ + # here both these package will use haskell-mode of our own choice + ghc-mod + dante +]) +</screen> + </section> </section> diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 3a7b23baaa7e1..2a3316b8d0183 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1802,6 +1802,20 @@ addEnvHooks "$hostOffset" myBashFunction disabled or patched to work with PaX.</para></listitem> </varlistentry> + <varlistentry> + <term>autoPatchelfHook</term> + <listitem><para>This is a special setup hook which helps in packaging + proprietary software in that it automatically tries to find missing shared + library dependencies of ELF files. All packages within the + <envar>runtimeDependencies</envar> environment variable are unconditionally + added to executables, which is useful for programs that use + <citerefentry> + <refentrytitle>dlopen</refentrytitle> + <manvolnum>3</manvolnum> + </citerefentry> + to load libraries at runtime.</para></listitem> + </varlistentry> + </variablelist> </para> diff --git a/lib/default.nix b/lib/default.nix index 97d7c10192a7b..77cfa712557c7 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -56,7 +56,8 @@ let replaceStrings seq stringLength sub substring tail; inherit (trivial) id const concat or and boolToString mergeAttrs flip mapNullable inNixShell min max importJSON warn info - nixpkgsVersion mod functionArgs setFunctionArgs isFunction; + nixpkgsVersion mod compare splitByAndCompare + functionArgs setFunctionArgs isFunction; inherit (fixedPoints) fix fix' extends composeExtensions makeExtensible makeExtensibleWithCustomName; @@ -71,8 +72,8 @@ let inherit (lists) singleton foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count optional optionals toList range partition zipListsWith zipLists - reverseList listDfs toposort sort take drop sublist last init - crossLists unique intersectLists subtractLists + reverseList listDfs toposort sort compareLists take drop sublist + last init crossLists unique intersectLists subtractLists mutuallyExclusive; inherit (strings) concatStrings concatMapStrings concatImapStrings intersperse concatStringsSep concatMapStringsSep diff --git a/lib/licenses.nix b/lib/licenses.nix index 0086bd63ebd9b..2262ae9ebbcf2 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -79,6 +79,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = ''Beerware License''; }; + bsd0 = spdx { + spdxId = "0BSD"; + fullName = "BSD Zero Clause License"; + }; + bsd2 = spdx { spdxId = "BSD-2-Clause"; fullName = ''BSD 2-clause "Simplified" License''; @@ -482,6 +487,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "PostgreSQL License"; }; + postman = { + fullName = "Postman EULA"; + url = https://www.getpostman.com/licenses/postman_base_app; + free = false; + }; + psfl = spdx { spdxId = "Python-2.0"; fullName = "Python Software Foundation License version 2"; diff --git a/lib/lists.nix b/lib/lists.nix index 8f67c6bb0ca3b..424d2c57f5563 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -385,6 +385,30 @@ rec { if len < 2 then list else (sort strictLess pivot.left) ++ [ first ] ++ (sort strictLess pivot.right)); + /* Compare two lists element-by-element. + + Example: + compareLists compare [] [] + => 0 + compareLists compare [] [ "a" ] + => -1 + compareLists compare [ "a" ] [] + => 1 + compareLists compare [ "a" "b" ] [ "a" "c" ] + => 1 + */ + compareLists = cmp: a: b: + if a == [] + then if b == [] + then 0 + else -1 + else if b == [] + then 1 + else let rel = cmp (head a) (head b); in + if rel == 0 + then compareLists cmp (tail a) (tail b) + else rel; + /* Return the first (at most) N elements of a list. Example: @@ -440,8 +464,12 @@ rec { init = list: assert list != []; take (length list - 1) list; - /* FIXME(zimbatm) Not used anywhere - */ + /* return the image of the cross product of some lists by a function + + Example: + crossLists (x:y: "${toString x}${toString y}") [[1 2] [3 4]] + => [ "13" "14" "23" "24" ] + */ crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f]; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 9ff2d53b46683..afbe5a95508fb 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -47,6 +47,7 @@ andir = "Andreas Rammhold <andreas@rammhold.de>"; andres = "Andres Loeh <ksnixos@andres-loeh.de>"; andrestylianos = "Andre S. Ramos <andre.stylianos@gmail.com>"; + andrew-d = "Andrew Dunham <andrew@du.nham.ca>"; andrewrk = "Andrew Kelley <superjoe30@gmail.com>"; andsild = "Anders Sildnes <andsild@gmail.com>"; aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>"; @@ -225,6 +226,7 @@ ertes = "Ertugrul Söylemez <esz@posteo.de>"; ethercrow = "Dmitry Ivanov <ethercrow@gmail.com>"; etu = "Elis Hirwing <elis@hirwing.se>"; + exfalso = "Andras Slemmer <0slemi0@gmail.com>"; exi = "Reno Reckling <nixos@reckling.org>"; exlevan = "Alexey Levan <exlevan@gmail.com>"; expipiplus1 = "Joe Hermaszewski <nix@monoid.al>"; @@ -258,6 +260,7 @@ gavin = "Gavin Rogers <gavin@praxeology.co.uk>"; gebner = "Gabriel Ebner <gebner@gebner.org>"; geistesk = "Alvar Penning <post@0x21.biz>"; + genesis = "Ronan Bignaux <ronan@aimao.org>"; georgewhewell = "George Whewell <georgerw@gmail.com>"; gilligan = "Tobias Pflug <tobias.pflug@gmail.com>"; giogadi = "Luis G. Torres <lgtorres42@gmail.com>"; @@ -447,6 +450,7 @@ mirrexagon = "Andrew Abbott <mirrexagon@mirrexagon.com>"; mjanczyk = "Marcin Janczyk <m@dragonvr.pl>"; mjp = "Mike Playle <mike@mythik.co.uk>"; # github = "MikePlayle"; + mkg = "Mark K Gardner <mkg@vt.edu>"; mlieberman85 = "Michael Lieberman <mlieberman85@gmail.com>"; mmahut = "Marek Mahut <marek.mahut@gmail.com>"; moaxcp = "John Mercier <moaxcp@gmail.com>"; @@ -489,6 +493,7 @@ nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>"; nico202 = "Nicolò Balzarotti <anothersms@gmail.com>"; NikolaMandic = "Ratko Mladic <nikola@mandic.email>"; + nipav = "Niko Pavlinek <niko.pavlinek@gmail.com>"; nixy = "Andrew R. M. <nixy@nixy.moe>"; nmattia = "Nicolas Mattia <nicolas@nmattia.com>"; nocoolnametom = "Tom Doggett <nocoolnametom@gmail.com>"; @@ -549,7 +554,7 @@ pradeepchhetri = "Pradeep Chhetri <pradeep.chhetri89@gmail.com>"; prikhi = "Pavan Rikhi <pavan.rikhi@gmail.com>"; primeos = "Michael Weiss <dev.primeos@gmail.com>"; - profpatsch = "Profpatsch <mail@profpatsch.de>"; + Profpatsch = "Profpatsch <mail@profpatsch.de>"; proglodyte = "Proglodyte <proglodyte23@gmail.com>"; pshendry = "Paul Hendry <paul@pshendry.com>"; psibi = "Sibi <sibi@psibi.in>"; @@ -697,6 +702,7 @@ tomberek = "Thomas Bereknyei <tomberek@gmail.com>"; tomsmeets = "Tom Smeets <tom@tsmeets.nl>"; travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>"; + treemo = "Matthieu Chevrier <matthieu.chevrier@treemo.fr>"; trevorj = "Trevor Joynson <nix@trevor.joynson.io>"; trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>"; tstrobel = "Thomas Strobel <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>"; @@ -711,11 +717,13 @@ utdemir = "Utku Demir <me@utdemir.com>"; #urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012 uwap = "uwap <me@uwap.name>"; + va1entin = "Valentin Heidelberger <github@valentinsblog.com>"; vaibhavsagar = "Vaibhav Sagar <vaibhavsagar@gmail.com>"; valeriangalliat = "Valérian Galliat <val@codejam.info>"; vandenoever = "Jos van den Oever <jos@vandenoever.info>"; vanschelven = "Klaas van Schelven <klaas@vanschelven.com>"; vanzef = "Ivan Solyankin <vanzef@gmail.com>"; + varunpatro = "Varun Patro <varun.kumar.patro@gmail.com>"; vbgl = "Vincent Laporte <Vincent.Laporte@gmail.com>"; vbmithr = "Vincent Bernardoff <vb@luminar.eu.org>"; vcunat = "VladimÃr ÄŒunát <vcunat@gmail.com>"; @@ -757,6 +765,7 @@ y0no = "Yoann Ono <y0no@y0no.fr>"; yarr = "Dmitry V. <savraz@gmail.com>"; yegortimoshenko = "Yegor Timoshenko <yegortimoshenko@gmail.com>"; + yesbox = "Jesper Geertsen Jonsson <jesper.geertsen.jonsson@gmail.com>"; ylwghst = "Burim Augustin Berisa <ylwghst@onionmail.info>"; yochai = "Yochai <yochai@titat.info>"; yorickvp = "Yorick van Pelt <yorickvanpelt@gmail.com>"; diff --git a/lib/options.nix b/lib/options.nix index 769d3cc557234..9446eca36778b 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -14,6 +14,7 @@ rec { , defaultText ? null # Textual representation of the default, for in the manual. , example ? null # Example value used in the manual. , description ? null # String describing the option. + , relatedPackages ? null # Related packages used in the manual (see `genRelatedPackages` in ../nixos/doc/manual/default.nix). , type ? null # Option type, providing type-checking and value merging. , apply ? null # Function that converts the option value to something else. , internal ? null # Whether the option is for NixOS developers only. @@ -76,7 +77,6 @@ rec { getValues = map (x: x.value); getFiles = map (x: x.file); - # Generate documentation template from the list of option declaration like # the set generated with filterOptionSets. optionAttrSetToDocList = optionAttrSetToDocList' []; @@ -85,6 +85,7 @@ rec { concatMap (opt: let docOption = rec { + loc = opt.loc; name = showOption opt.loc; description = opt.description or (throw "Option `${name}' has no description."); declarations = filter (x: x != unknownModule) opt.declarations; @@ -93,9 +94,10 @@ rec { readOnly = opt.readOnly or false; type = opt.type.description or null; } - // (if opt ? example then { example = scrubOptionValue opt.example; } else {}) - // (if opt ? default then { default = scrubOptionValue opt.default; } else {}) - // (if opt ? defaultText then { default = opt.defaultText; } else {}); + // optionalAttrs (opt ? example) { example = scrubOptionValue opt.example; } + // optionalAttrs (opt ? default) { default = scrubOptionValue opt.default; } + // optionalAttrs (opt ? defaultText) { default = opt.defaultText; } + // optionalAttrs (opt ? relatedPackages && opt.relatedPackages != null) { inherit (opt) relatedPackages; }; subOptions = let ss = opt.type.getSubOptions opt.loc; diff --git a/lib/systems/default.nix b/lib/systems/default.nix index b1036b80c4dba..0729cc7ef2935 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -26,7 +26,8 @@ rec { libc = /**/ if final.isDarwin then "libSystem" else if final.isMinGW then "msvcrt" - else if final.isLinux then "glibc" + else if final.isMusl then "musl" + else if final.isLinux /* default */ then "glibc" # TODO(@Ericson2314) think more about other operating systems else "native/impure"; extensions = { diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 5fc36c5b056ad..f5562e28a09d2 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -13,7 +13,6 @@ rec { config = "armv5tel-unknown-linux-gnueabi"; arch = "armv5tel"; float = "soft"; - libc = "glibc"; platform = platforms.sheevaplug; }; @@ -22,7 +21,6 @@ rec { arch = "armv6l"; float = "hard"; fpu = "vfp"; - libc = "glibc"; platform = platforms.raspberrypi; }; @@ -31,14 +29,12 @@ rec { arch = "armv7-a"; float = "hard"; fpu = "vfpv3-d16"; - libc = "glibc"; platform = platforms.armv7l-hf-multiplatform; }; aarch64-multiplatform = rec { config = "aarch64-unknown-linux-gnu"; arch = "aarch64"; - libc = "glibc"; platform = platforms.aarch64-multiplatform; }; @@ -51,7 +47,6 @@ rec { arch = "armv5tel"; config = "armv5tel-unknown-linux-gnueabi"; float = "soft"; - libc = "glibc"; platform = platforms.pogoplug4; }; @@ -59,10 +54,20 @@ rec { config = "mips64el-unknown-linux-gnu"; arch = "mips"; float = "hard"; - libc = "glibc"; platform = platforms.fuloong2f_n32; }; + muslpi = raspberryPi // { + config = "armv6l-unknown-linux-musleabihf"; + }; + + aarch64-multiplatform-musl = aarch64-multiplatform // { + config = "aarch64-unknown-linux-musl"; + }; + + musl64 = { config = "x86_64-unknown-linux-musl"; }; + musl32 = { config = "i686-unknown-linux-musl"; }; + # # Darwin # diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 3f0335a0adf5f..0fce5254dcb47 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -33,6 +33,8 @@ rec { Windows = { kernel = kernels.windows; }; Cygwin = { kernel = kernels.windows; abi = abis.cygnus; }; MinGW = { kernel = kernels.windows; abi = abis.gnu; }; + + Musl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; }; matchAnyAttrs = patterns: diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 37a8c848c5d0e..95759b93ae080 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -180,6 +180,9 @@ rec { androideabi = {}; gnueabi = {}; gnueabihf = {}; + musleabi = {}; + musleabihf = {}; + musl = {}; unknown = {}; }; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index fd43ceaa0df2d..58a7afa7679d1 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -2,7 +2,6 @@ rec { pcBase = { name = "pc"; - kernelHeadersBaseConfig = "defconfig"; kernelBaseConfig = "defconfig"; # Build whatever possible as a module, if not stated in the extra config. kernelAutoModules = true; @@ -30,7 +29,6 @@ rec { }; kernelMajor = "2.6"; - kernelHeadersBaseConfig = "multi_v5_defconfig"; kernelBaseConfig = "multi_v5_defconfig"; kernelArch = "arm"; kernelAutoModules = false; @@ -54,7 +52,6 @@ rec { sheevaplug = { name = "sheevaplug"; kernelMajor = "2.6"; - kernelHeadersBaseConfig = "multi_v5_defconfig"; kernelBaseConfig = "multi_v5_defconfig"; kernelArch = "arm"; kernelAutoModules = false; @@ -168,7 +165,6 @@ rec { raspberrypi = { name = "raspberrypi"; kernelMajor = "2.6"; - kernelHeadersBaseConfig = "bcm2835_defconfig"; kernelBaseConfig = "bcmrpi_defconfig"; kernelDTB = true; kernelArch = "arm"; @@ -347,7 +343,6 @@ rec { utilite = { name = "utilite"; kernelMajor = "2.6"; - kernelHeadersBaseConfig = "multi_v7_defconfig"; kernelBaseConfig = "multi_v7_defconfig"; kernelArch = "arm"; kernelAutoModules = false; @@ -379,13 +374,11 @@ rec { # patch. kernelBaseConfig = "guruplug_defconfig"; - #kernelHeadersBaseConfig = "guruplug_defconfig"; }; fuloong2f_n32 = { name = "fuloong2f_n32"; kernelMajor = "2.6"; - kernelHeadersBaseConfig = "fuloong2e_defconfig"; kernelBaseConfig = "lemote2f_defconfig"; kernelArch = "mips"; kernelAutoModules = false; @@ -471,7 +464,6 @@ rec { armv7l-hf-multiplatform = { name = "armv7l-hf-multiplatform"; kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. - kernelHeadersBaseConfig = "multi_v7_defconfig"; kernelBaseConfig = "multi_v7_defconfig"; kernelArch = "arm"; kernelDTB = true; @@ -479,6 +471,11 @@ rec { kernelPreferBuiltin = true; kernelTarget = "zImage"; kernelExtraConfig = '' + # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig. + SERIAL_8250_BCM2835AUX y + SERIAL_8250_EXTENDED y + SERIAL_8250_SHARE_IRQ y + # Fix broken sunxi-sid nvmem driver. TI_CPTS y @@ -512,7 +509,6 @@ rec { aarch64-multiplatform = { name = "aarch64-multiplatform"; kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. - kernelHeadersBaseConfig = "defconfig"; kernelBaseConfig = "defconfig"; kernelArch = "arm64"; kernelDTB = true; diff --git a/lib/trivial.nix b/lib/trivial.nix index d8d51298143e5..a928e1dbca98c 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -81,6 +81,42 @@ rec { */ mod = base: int: base - (int * (builtins.div base int)); + /* C-style comparisons + + a < b, compare a b => -1 + a == b, compare a b => 0 + a > b, compare a b => 1 + */ + compare = a: b: + if a < b + then -1 + else if a > b + then 1 + else 0; + + /* Split type into two subtypes by predicate `p`, take all elements + of the first subtype to be less than all the elements of the + second subtype, compare elements of a single subtype with `yes` + and `no` respectively. + + Example: + + let cmp = splitByAndCompare (hasPrefix "foo") compare compare; in + + cmp "a" "z" => -1 + cmp "fooa" "fooz" => -1 + + cmp "f" "a" => 1 + cmp "fooa" "a" => -1 + # while + compare "fooa" "a" => 1 + + */ + splitByAndCompare = p: yes: no: a: b: + if p a + then if p b then yes a b else -1 + else if p b then 1 else no a b; + /* Reads a JSON file. */ importJSON = path: builtins.fromJSON (builtins.readFile path); diff --git a/lib/types.nix b/lib/types.nix index 88fc90d05970f..a334db5c7247b 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -256,6 +256,10 @@ rec { functor = (defaultFunctor name) // { wrapped = elemType; }; }; + nonEmptyListOf = elemType: + let list = addCheck (types.listOf elemType) (l: l != []); + in list // { description = "non-empty " + list.description; }; + attrsOf = elemType: mkOptionType rec { name = "attrsOf"; description = "attribute set of ${elemType.description}s"; diff --git a/nixos/default.nix b/nixos/default.nix index 0e45a1cd75e24..45da78e9261cc 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -9,8 +9,6 @@ let modules = [ configuration ]; }; - inherit (eval) pkgs; - # This is for `nixos-rebuild build-vm'. vmConfig = (import ./lib/eval-config.nix { inherit system; @@ -30,7 +28,7 @@ let in { - inherit (eval) config options; + inherit (eval) pkgs config options; system = eval.config.system.build.toplevel; diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 8079a2feb29fc..bbe82066aa0c1 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -6,7 +6,7 @@ let lib = pkgs.lib; # Remove invisible and internal options. - optionsList = lib.filter (opt: opt.visible && !opt.internal) (lib.optionAttrSetToDocList options); + optionsListVisible = lib.filter (opt: opt.visible && !opt.internal) (lib.optionAttrSetToDocList options); # Replace functions by the string <function> substFunction = x: @@ -15,13 +15,43 @@ let else if lib.isFunction x then "<function>" else x; - # Clean up declaration sites to not refer to the NixOS source tree. - optionsList' = lib.flip map optionsList (opt: opt // { + # Generate DocBook documentation for a list of packages. This is + # what `relatedPackages` option of `mkOption` from + # ../../../lib/options.nix influences. + # + # Each element of `relatedPackages` can be either + # - a string: that will be interpreted as an attribute name from `pkgs`, + # - a list: that will be interpreted as an attribute path from `pkgs`, + # - an attrset: that can specify `name`, `path`, `package`, `comment` + # (either of `name`, `path` is required, the rest are optional). + genRelatedPackages = packages: + let + unpack = p: if lib.isString p then { name = p; } + else if lib.isList p then { path = p; } + else p; + describe = args: + let + name = args.name or (lib.concatStringsSep "." args.path); + path = args.path or [ args.name ]; + package = args.package or (lib.attrByPath path (throw "Invalid package attribute path `${toString path}'") pkgs); + in "<listitem>" + + "<para><literal>pkgs.${name} (${package.meta.name})</literal>" + + lib.optionalString (!package.meta.evaluates) " <emphasis>[UNAVAILABLE]</emphasis>" + + ": ${package.meta.description or "???"}.</para>" + + lib.optionalString (args ? comment) "\n<para>${args.comment}</para>" + # Lots of `longDescription's break DocBook, so we just wrap them into <programlisting> + + lib.optionalString (package.meta ? longDescription) "\n<programlisting>${package.meta.longDescription}</programlisting>" + + "</listitem>"; + in "<itemizedlist>${lib.concatStringsSep "\n" (map (p: describe (unpack p)) packages)}</itemizedlist>"; + + optionsListDesc = lib.flip map optionsListVisible (opt: opt // { + # Clean up declaration sites to not refer to the NixOS source tree. declarations = map stripAnyPrefixes opt.declarations; } // lib.optionalAttrs (opt ? example) { example = substFunction opt.example; } // lib.optionalAttrs (opt ? default) { default = substFunction opt.default; } - // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; }); + // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; } + // lib.optionalAttrs (opt ? relatedPackages) { relatedPackages = genRelatedPackages opt.relatedPackages; }); # We need to strip references to /nix/store/* from options, # including any `extraSources` if some modules came from elsewhere, @@ -32,8 +62,21 @@ let prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources); stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip; + # Custom "less" that pushes up all the things ending in ".enable*" + # and ".package*" + optionLess = a: b: + let + ise = lib.hasPrefix "enable"; + isp = lib.hasPrefix "package"; + cmp = lib.splitByAndCompare ise lib.compare + (lib.splitByAndCompare isp lib.compare lib.compare); + in lib.compareLists cmp a.loc b.loc < 0; + + # Customly sort option list for the man page. + optionsList = lib.sort optionLess optionsListDesc; + # Convert the list of options into an XML file. - optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList'); + optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList); optionsDocBook = runCommand "options-db.xml" {} '' optionsXML=${optionsXML} @@ -191,7 +234,7 @@ in rec { mkdir -p $dst cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON - (builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList')))) + (builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList)))) } $dst/options.json mkdir -p $out/nix-support diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml index 75df307a1b7c8..4db9020b96064 100644 --- a/nixos/doc/manual/installation/changing-config.xml +++ b/nixos/doc/manual/installation/changing-config.xml @@ -70,9 +70,21 @@ $ ./result/bin/run-*-vm </screen> The VM does not have any data from your host system, so your existing -user accounts and home directories will not be available. You can -forward ports on the host to the guest. For instance, the following -will forward host port 2222 to guest port 22 (SSH): +user accounts and home directories will not be available unless you +have set <literal>mutableUsers = false</literal>. Another way is to +temporarily add the following to your configuration: + +<screen> +users.extraUsers.your-user.initialPassword = "test" +</screen> + +<emphasis>Important:</emphasis> delete the $hostname.qcow2 file if you +have started the virtual machine at least once without the right +users, otherwise the changes will not get picked up. + +You can forward ports on the host to the guest. For +instance, the following will forward host port 2222 to guest port 22 +(SSH): <screen> $ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl index 5387546b59828..7b45b233ab2a5 100644 --- a/nixos/doc/manual/options-to-docbook.xsl +++ b/nixos/doc/manual/options-to-docbook.xsl @@ -70,6 +70,15 @@ </para> </xsl:if> + <xsl:if test="attr[@name = 'relatedPackages']"> + <para> + <emphasis>Related packages:</emphasis> + <xsl:text> </xsl:text> + <xsl:value-of disable-output-escaping="yes" + select="attr[@name = 'relatedPackages']/string/@value" /> + </para> + </xsl:if> + <xsl:if test="count(attr[@name = 'declarations']/list/*) != 0"> <para> <emphasis>Declared by:</emphasis> diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 8391c550afab9..2494e487da151 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -38,6 +38,16 @@ has the following highlights: </para> </itemizedlist> </para> </listitem> + + <listitem> + <para> + The GNOME version is now 3.26. + </para> + </listitem> + + <listitem> + <para>PHP now defaults to PHP 7.2</para> + </listitem> </itemizedlist> </section> @@ -135,6 +145,17 @@ following incompatible changes:</para> </listitem> <listitem> <para> + The <literal>openssh</literal> package + now includes Kerberos support by default; + the <literal>openssh_with_kerberos</literal> package + is now a deprecated alias. + If you do not want Kerberos support, + you can do <literal>openssh.override { withKerboros = false; }</literal>. + Note, this also applies to the <literal>openssh_hpn</literal> package. + </para> + </listitem> + <listitem> + <para> <literal>cc-wrapper</literal> has been split in two; there is now also a <literal>bintools-wrapper</literal>. The most commonly used files in <filename>nix-support</filename> are now split between the two wrappers. Some commonly used ones, like <filename>nix-support/dynamic-linker</filename>, are duplicated for backwards compatability, even though they rightly belong only in <literal>bintools-wrapper</literal>. @@ -196,6 +217,20 @@ following incompatible changes:</para> </listitem> </itemizedlist> </listitem> + <listitem> + <para> + The <literal>jid</literal> package has been removed, due to maintenance + overhead of a go package having non-versioned dependencies. + </para> + </listitem> + <listitem> + <para> + When using <option>services.xserver.libinput</option> (enabled by default in GNOME), + it now handles all input devices, not just touchpads. As a result, you might need to + re-evaluate any custom Xorg configuration. In particular, + <literal>Option "XkbRules" "base"</literal> may result in broken keyboard layout. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index cf213d906f584..ddab23cce3937 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -29,7 +29,7 @@ rec { cp ${./test-driver/Logger.pm} $libDir/Logger.pm wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${lib.makeBinPath [ qemu vde2 netpbm coreutils ]}" \ + --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \ --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" ''; }; diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index f23275bc16d59..08903ba397a19 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -43,11 +43,18 @@ in sdImage = { populateBootCommands = let configTxt = pkgs.writeText "config.txt" '' + # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel + # when attempting to show low-voltage or overtemperature warnings. + avoid_warnings=1 + [pi2] kernel=u-boot-rpi2.bin [pi3] kernel=u-boot-rpi3.bin + + # U-Boot used to need this to work, regardless of whether UART is actually used or not. + # TODO: check when/if this can be removed. enable_uart=1 ''; in '' diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 28ed10a5ece6c..c0c6a6ef92444 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -303,6 +303,7 @@ restya-board = 284; mighttpd2 = 285; hass = 286; + monero = 287; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -574,6 +575,7 @@ restya-board = 284; mighttpd2 = 285; hass = 286; + monero = 287; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index c3e7ab9a666a4..e747fbc6755ca 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -3,6 +3,8 @@ with lib; let + cfg = config.nixpkgs; + isConfig = x: builtins.isAttrs x || lib.isFunction x; @@ -42,12 +44,51 @@ let merge = lib.mergeOneOption; }; - _pkgs = import ../../.. config.nixpkgs; + pkgsType = mkOptionType { + name = "nixpkgs"; + description = "An evaluation of Nixpkgs; the top level attribute set of packages"; + check = builtins.isAttrs; + }; in { options.nixpkgs = { + + pkgs = mkOption { + defaultText = literalExample + ''import "''${nixos}/.." { + inherit (config.nixpkgs) config overlays system; + } + ''; + default = import ../../.. { inherit (cfg) config overlays system; }; + type = pkgsType; + example = literalExample ''import <nixpkgs> {}''; + description = '' + This is the evaluation of Nixpkgs that will be provided to + all NixOS modules. Defining this option has the effect of + ignoring the other options that would otherwise be used to + evaluate Nixpkgs, because those are arguments to the default + value. The default value imports the Nixpkgs source files + relative to the location of this NixOS module, because + NixOS and Nixpkgs are distributed together for consistency, + so the <code>nixos</code> in the default value is in fact a + relative path. The <code>config</code>, <code>overlays</code> + and <code>system</code> come from this option's siblings. + + This option can be used by applications like NixOps to increase + the performance of evaluation, or to create packages that depend + on a container that should be built with the exact same evaluation + of Nixpkgs, for example. Applications like this should set + their default value using <code>lib.mkDefault</code>, so + user-provided configuration can override it without using + <code>lib</code>. + + Note that using a distinct version of Nixpkgs with NixOS may + be an unexpected source of problems. Use this option with care. + ''; + }; + config = mkOption { default = {}; example = literalExample @@ -59,6 +100,8 @@ in The configuration of the Nix Packages collection. (For details, see the Nixpkgs documentation.) It allows you to set package configuration options. + + Ignored when <code>nixpkgs.pkgs</code> is set. ''; }; @@ -82,6 +125,8 @@ in takes as an argument the <emphasis>original</emphasis> Nixpkgs. The first argument should be used for finding dependencies, and the second should be used for overriding recipes. + + Ignored when <code>nixpkgs.pkgs</code> is set. ''; }; @@ -93,14 +138,16 @@ in If unset, it defaults to the platform type of your host system. Specifying this option is useful when doing distributed multi-platform deployment, or when building virtual machines. + + Ignored when <code>nixpkgs.pkgs</code> is set. ''; }; }; config = { _module.args = { - pkgs = _pkgs; - pkgs_i686 = _pkgs.pkgsi686Linux; + pkgs = cfg.pkgs; + pkgs_i686 = cfg.pkgs.pkgsi686Linux; }; }; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2ec8b28c3fc4c..d8d6749f7965b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -111,8 +111,10 @@ ./programs/wireshark.nix ./programs/xfs_quota.nix ./programs/xonsh.nix + ./programs/yabar.nix ./programs/zsh/oh-my-zsh.nix ./programs/zsh/zsh.nix + ./programs/zsh/zsh-autoenv.nix ./programs/zsh/zsh-syntax-highlighting.nix ./rename.nix ./security/acme.nix @@ -200,6 +202,7 @@ ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix ./services/desktops/geoclue2.nix + ./services/desktops/pipewire.nix ./services/desktops/gnome3/at-spi2-core.nix ./services/desktops/gnome3/chrome-gnome-shell.nix ./services/desktops/gnome3/evolution-data-server.nix @@ -417,7 +420,8 @@ ./services/network-filesystems/ipfs.nix ./services/network-filesystems/netatalk.nix ./services/network-filesystems/nfsd.nix - ./services/network-filesystems/openafs-client/default.nix + ./services/network-filesystems/openafs/client.nix + ./services/network-filesystems/openafs/server.nix ./services/network-filesystems/rsyncd.nix ./services/network-filesystems/samba.nix ./services/network-filesystems/tahoe.nix @@ -491,6 +495,7 @@ ./services/networking/minidlna.nix ./services/networking/miniupnpd.nix ./services/networking/mosquitto.nix + ./services/networking/monero.nix ./services/networking/miredo.nix ./services/networking/mstpd.nix ./services/networking/murmur.nix @@ -528,6 +533,7 @@ ./services/networking/redsocks.nix ./services/networking/resilio.nix ./services/networking/rpcbind.nix + ./services/networking/rxe.nix ./services/networking/sabnzbd.nix ./services/networking/searx.nix ./services/networking/seeks.nix diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix index 18290555b79df..f648d70bd9fa4 100644 --- a/nixos/modules/programs/adb.nix +++ b/nixos/modules/programs/adb.nix @@ -16,6 +16,7 @@ with lib; To grant access to a user, it must be part of adbusers group: <code>users.extraUsers.alice.extraGroups = ["adbusers"];</code> ''; + relatedPackages = [ ["androidenv" "platformTools"] ]; }; }; }; diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix index 1eb6fa6bf2fa6..4a60403a2827e 100644 --- a/nixos/modules/programs/tmux.nix +++ b/nixos/modules/programs/tmux.nix @@ -61,7 +61,12 @@ in { options = { programs.tmux = { - enable = mkEnableOption "<command>tmux</command> - a <command>screen</command> replacement."; + enable = mkOption { + type = types.bool; + default = false; + description = "Whenever to configure <command>tmux</command> system-wide."; + relatedPackages = [ "tmux" ]; + }; aggressiveResize = mkOption { default = false; diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix new file mode 100644 index 0000000000000..a01083c3ace98 --- /dev/null +++ b/nixos/modules/programs/yabar.nix @@ -0,0 +1,149 @@ +{ lib, pkgs, config, ... }: + +with lib; + +let + cfg = config.programs.yabar; + + mapExtra = v: lib.concatStringsSep "\n" (mapAttrsToList ( + key: val: "${key} = ${if (isString val) then "\"${val}\"" else "${builtins.toString val}"};" + ) v); + + listKeys = r: concatStringsSep "," (map (n: "\"${n}\"") (attrNames r)); + + configFile = let + bars = mapAttrsToList ( + name: cfg: '' + ${name}: { + font: "${cfg.font}"; + position: "${cfg.position}"; + + ${mapExtra cfg.extra} + + block-list: [${listKeys cfg.indicators}] + + ${concatStringsSep "\n" (mapAttrsToList ( + name: cfg: '' + ${name}: { + exec: "${cfg.exec}"; + align: "${cfg.align}"; + ${mapExtra cfg.extra} + }; + '' + ) cfg.indicators)} + }; + '' + ) cfg.bars; + in pkgs.writeText "yabar.conf" '' + bar-list = [${listKeys cfg.bars}]; + ${concatStringsSep "\n" bars} + ''; +in + { + options.programs.yabar = { + enable = mkEnableOption "yabar"; + + package = mkOption { + default = pkgs.yabar; + example = literalExample "pkgs.yabar-unstable"; + type = types.package; + + description = '' + The package which contains the `yabar` binary. + + Nixpkgs provides the `yabar` and `yabar-unstable` + derivations since 18.03, so it's possible to choose. + ''; + }; + + bars = mkOption { + default = {}; + type = types.attrsOf(types.submodule { + options = { + font = mkOption { + default = "sans bold 9"; + example = "Droid Sans, FontAwesome Bold 9"; + type = types.string; + + description = '' + The font that will be used to draw the status bar. + ''; + }; + + position = mkOption { + default = "top"; + example = "bottom"; + type = types.enum [ "top" "bottom" ]; + + description = '' + The position where the bar will be rendered. + ''; + }; + + extra = mkOption { + default = {}; + type = types.attrsOf types.string; + + description = '' + An attribute set which contains further attributes of a bar. + ''; + }; + + indicators = mkOption { + default = {}; + type = types.attrsOf(types.submodule { + options.exec = mkOption { + example = "YABAR_DATE"; + type = types.string; + description = '' + The type of the indicator to be executed. + ''; + }; + + options.align = mkOption { + default = "left"; + example = "right"; + type = types.enum [ "left" "center" "right" ]; + + description = '' + Whether to align the indicator at the left or right of the bar. + ''; + }; + + options.extra = mkOption { + default = {}; + type = types.attrsOf (types.either types.string types.int); + + description = '' + An attribute set which contains further attributes of a indicator. + ''; + }; + }); + + description = '' + Indicators that should be rendered by yabar. + ''; + }; + }; + }); + + description = '' + List of bars that should be rendered by yabar. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.user.services.yabar = { + description = "yabar service"; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + + script = '' + ${cfg.package}/bin/yabar -c ${configFile} + ''; + + serviceConfig.Restart = "always"; + }; + }; + } diff --git a/nixos/modules/programs/zsh/zsh-autoenv.nix b/nixos/modules/programs/zsh/zsh-autoenv.nix new file mode 100644 index 0000000000000..630114bcda9f3 --- /dev/null +++ b/nixos/modules/programs/zsh/zsh-autoenv.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.zsh.zsh-autoenv; +in { + options = { + programs.zsh.zsh-autoenv = { + enable = mkEnableOption "zsh-autoenv"; + package = mkOption { + default = pkgs.zsh-autoenv; + defaultText = "pkgs.zsh-autoenv"; + description = '' + Package to install for `zsh-autoenv` usage. + ''; + + type = types.package; + }; + }; + }; + + config = mkIf cfg.enable { + programs.zsh.interactiveShellInit = '' + source ${cfg.package}/share/zsh-autoenv/autoenv.zsh + ''; + }; +} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 562be13a3f640..7351482f957ff 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -210,6 +210,7 @@ with lib; "Set the option `services.xserver.displayManager.sddm.package' instead.") (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") + (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.") # ZSH (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) @@ -220,5 +221,8 @@ with lib; (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "theme" ] [ "programs" "zsh" "ohMyZsh" "theme" ]) (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "custom" ] [ "programs" "zsh" "ohMyZsh" "custom" ]) (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "plugins" ] [ "programs" "zsh" "ohMyZsh" "plugins" ]) + + # Xen + (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ]) ]; } diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 5940f471883c3..0736239ed2cfb 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -6,10 +6,11 @@ let cfg = config.security.acme; - certOpts = { ... }: { + certOpts = { name, ... }: { options = { webroot = mkOption { type = types.str; + example = "/var/lib/acme/acme-challenges"; description = '' Where the webroot of the HTTP vhost is located. <filename>.well-known/acme-challenge/</filename> directory @@ -20,8 +21,8 @@ let }; domain = mkOption { - type = types.nullOr types.str; - default = null; + type = types.str; + default = name; description = "Domain to fetch certificate for (defaults to the entry name)"; }; @@ -48,7 +49,7 @@ let default = false; description = '' Give read permissions to the specified group - (<option>security.acme.group</option>) to read SSL private certificates. + (<option>security.acme.cert.<name>.group</option>) to read SSL private certificates. ''; }; @@ -87,7 +88,7 @@ let } ''; description = '' - Extra domain names for which certificates are to be issued, with their + A list of extra domain names, which are included in the one certificate to be issued, with their own server roots if needed. ''; }; @@ -193,10 +194,9 @@ in servicesLists = mapAttrsToList certToServices cfg.certs; certToServices = cert: data: let - domain = if data.domain != null then data.domain else cert; cpath = "${cfg.directory}/${cert}"; rights = if data.allowKeysForGroup then "750" else "700"; - cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin "--tos_sha256" cfg.tosHash ] + cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin "--tos_sha256" cfg.tosHash ] ++ optionals (data.email != null) [ "--email" data.email ] ++ concatMap (p: [ "-f" p ]) data.plugins ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 3fff9e78aa191..f39f64033ca7d 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -46,6 +46,18 @@ let ''; }; + googleAuthenticator = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + If set, users with enabled Google Authenticator (created + <filename>~/.google_authenticator</filename>) will be required + to provide Google Authenticator token to log in. + ''; + }; + }; + usbAuth = mkOption { default = config.security.pam.usb.enable; type = types.bool; @@ -284,7 +296,12 @@ let # prompts the user for password so we run it once with 'required' at an # earlier point and it will run again with 'sufficient' further down. # We use try_first_pass the second time to avoid prompting password twice - (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount || cfg.enableKwallet || cfg.enableGnomeKeyring)) '' + (optionalString (cfg.unixAuth && + (config.security.pam.enableEcryptfs + || cfg.pamMount + || cfg.enableKwallet + || cfg.enableGnomeKeyring + || cfg.googleAuthenticator.enable)) '' auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth ${optionalString config.security.pam.enableEcryptfs "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} @@ -295,6 +312,8 @@ let " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} ${optionalString cfg.enableGnomeKeyring ("auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so")} + ${optionalString cfg.googleAuthenticator.enable + "auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"} '') + '' ${optionalString cfg.unixAuth "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"} diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index fb91a29a40002..45d34f5b76f50 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -6,14 +6,20 @@ let cfg = config.services.slurm; # configuration file can be generated by http://slurm.schedmd.com/configurator.html - configFile = pkgs.writeText "slurm.conf" + configFile = pkgs.writeText "slurm.conf" '' ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''} ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''} ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''} ${optionalString (cfg.partitionName != null) ''partitionName=${cfg.partitionName}''} + PlugStackConfig=${plugStackConfig} ${cfg.extraConfig} ''; + + plugStackConfig = pkgs.writeText "plugstack.conf" + '' + ${optionalString cfg.enableSrunX11 ''optional ${pkgs.slurm-spank-x11}/lib/x11.so''} + ''; in { @@ -28,7 +34,7 @@ in enable = mkEnableOption "slurm control daemon"; }; - + client = { enable = mkEnableOption "slurm rlient daemon"; @@ -86,8 +92,19 @@ in ''; }; + enableSrunX11 = mkOption { + default = false; + type = types.bool; + description = '' + If enabled srun will accept the option "--x11" to allow for X11 forwarding + from within an interactive session or a batch job. This activates the + slurm-spank-x11 module. Note that this requires 'services.openssh.forwardX11' + to be enabled on the compute nodes. + ''; + }; + extraConfig = mkOption { - default = ""; + default = ""; type = types.lines; description = '' Extra configuration options that will be added verbatim at @@ -134,7 +151,8 @@ in environment.systemPackages = [ wrappedSlurm ]; systemd.services.slurmd = mkIf (cfg.client.enable) { - path = with pkgs; [ wrappedSlurm coreutils ]; + path = with pkgs; [ wrappedSlurm coreutils ] + ++ lib.optional cfg.enableSrunX11 slurm-spank-x11; wantedBy = [ "multi-user.target" ]; after = [ "systemd-tmpfiles-clean.service" ]; @@ -152,8 +170,9 @@ in }; systemd.services.slurmctld = mkIf (cfg.server.enable) { - path = with pkgs; [ wrappedSlurm munge coreutils ]; - + path = with pkgs; [ wrappedSlurm munge coreutils ] + ++ lib.optional cfg.enableSrunX11 slurm-spank-x11; + wantedBy = [ "multi-user.target" ]; after = [ "network.target" "munged.service" ]; requires = [ "munged.service" ]; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 36d5340a306fa..5b73905035520 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -289,10 +289,10 @@ in # Create initial databases if ! test -e "${cfg.dataDir}/${database.name}"; then echo "Creating initial database: ${database.name}" - ( echo "create database ${database.name};" + ( echo "create database `${database.name}`;" ${optionalString (database ? "schema") '' - echo "use ${database.name};" + echo "use `${database.name}`;" if [ -f "${database.schema}" ] then diff --git a/nixos/modules/services/desktops/pipewire.nix b/nixos/modules/services/desktops/pipewire.nix new file mode 100644 index 0000000000000..263a06156f84b --- /dev/null +++ b/nixos/modules/services/desktops/pipewire.nix @@ -0,0 +1,23 @@ +# pipewire service. +{ config, lib, pkgs, ... }: + +with lib; + +{ + ###### interface + options = { + services.pipewire = { + enable = mkEnableOption "pipewire service"; + }; + }; + + + ###### implementation + config = mkIf config.services.pipewire.enable { + environment.systemPackages = [ pkgs.pipewire ]; + + systemd.packages = [ pkgs.pipewire ]; + }; + + meta.maintainers = with lib.maintainers; [ jtojnar ]; +} diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix index bb17c8859d842..f69706ebff347 100644 --- a/nixos/modules/services/hardware/acpid.nix +++ b/nixos/modules/services/hardware/acpid.nix @@ -31,7 +31,7 @@ let '' fn=$out/${name} echo "event=${handler.event}" > $fn - echo "action=${pkgs.writeScript "${name}.sh" (concatStringsSep "\n" [ "#! ${pkgs.bash}/bin/sh" handler.action ])}" >> $fn + echo "action=${pkgs.writeShellScriptBin "${name}.sh" handler.action }/bin/${name}.sh '%e'" >> $fn ''; in concatStringsSep "\n" (mapAttrsToList f (canonicalHandlers // config.services.acpid.handlers)) } @@ -69,11 +69,33 @@ in }; }); - description = "Event handlers."; - default = {}; - example = { mute = { event = "button/mute.*"; action = "amixer set Master toggle"; }; }; - + description = '' + Event handlers. + <note><para> + Handler can be a single command. + </para></note> + ''; + default = {}; + example = { + ac-power = { + event = "ac_adapter/*"; + action = '' + vals=($1) # space separated string to array of multiple values + case ''${vals[3]} in + 00000000) + echo unplugged >> /tmp/acpi.log + ;; + 00000001) + echo plugged in >> /tmp/acpi.log + ;; + *) + echo unknown >> /tmp/acpi.log + ;; + esac + ''; + }; + }; }; powerEventCommands = mkOption { diff --git a/nixos/modules/services/hardware/nvidia-optimus.nix b/nixos/modules/services/hardware/nvidia-optimus.nix index 9fe4021c42474..eb1713baa140e 100644 --- a/nixos/modules/services/hardware/nvidia-optimus.nix +++ b/nixos/modules/services/hardware/nvidia-optimus.nix @@ -23,7 +23,7 @@ let kernel = config.boot.kernelPackages; in ###### implementation config = lib.mkIf config.hardware.nvidiaOptimus.disable { - boot.blacklistedKernelModules = ["nouveau" "nvidia" "nvidiafb"]; + boot.blacklistedKernelModules = ["nouveau" "nvidia" "nvidiafb" "nvidia-drm"]; boot.kernelModules = [ "bbswitch" ]; boot.extraModulePackages = [ kernel.bbswitch ]; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 18101a3122544..b42c73b866687 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -104,7 +104,7 @@ let }; mailboxConfig = mailbox: '' - mailbox ${mailbox.name} { + mailbox "${mailbox.name}" { auto = ${toString mailbox.auto} '' + optionalString (mailbox.specialUse != null) '' special_use = \${toString mailbox.specialUse} @@ -113,7 +113,7 @@ let mailboxes = { lib, pkgs, ... }: { options = { name = mkOption { - type = types.str; + type = types.strMatching ''[^"]+''; example = "Spam"; description = "The name of the mailbox."; }; diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index b80aa48f2c865..09fb587e74b56 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -1,14 +1,152 @@ -{ config, lib, pkgs, ... }: +{ config, options, pkgs, lib, ... }: with lib; let cfg = config.services.rspamd; + opts = options.services.rspamd; - mkBindSockets = socks: concatStringsSep "\n" (map (each: " bind_socket = \"${each}\"") socks); + bindSocketOpts = {options, config, ... }: { + options = { + socket = mkOption { + type = types.str; + example = "localhost:11333"; + description = '' + Socket for this worker to listen on in a format acceptable by rspamd. + ''; + }; + mode = mkOption { + type = types.str; + default = "0644"; + description = "Mode to set on unix socket"; + }; + owner = mkOption { + type = types.str; + default = "${cfg.user}"; + description = "Owner to set on unix socket"; + }; + group = mkOption { + type = types.str; + default = "${cfg.group}"; + description = "Group to set on unix socket"; + }; + rawEntry = mkOption { + type = types.str; + internal = true; + }; + }; + config.rawEntry = let + maybeOption = option: + optionalString options.${option}.isDefined " ${option}=${config.${option}}"; + in + if (!(hasPrefix "/" config.socket)) then "${config.socket}" + else "${config.socket}${maybeOption "mode"}${maybeOption "owner"}${maybeOption "group"}"; + }; - rspamdConfFile = pkgs.writeText "rspamd.conf" + workerOpts = { name, ... }: { + options = { + enable = mkOption { + type = types.nullOr types.bool; + default = null; + description = "Whether to run the rspamd worker."; + }; + name = mkOption { + type = types.nullOr types.str; + default = name; + description = "Name of the worker"; + }; + type = mkOption { + type = types.nullOr (types.enum [ + "normal" "controller" "fuzzy_storage" "proxy" "lua" + ]); + description = "The type of this worker"; + }; + bindSockets = mkOption { + type = types.listOf (types.either types.str (types.submodule bindSocketOpts)); + default = []; + description = '' + List of sockets to listen, in format acceptable by rspamd + ''; + example = [{ + socket = "/run/rspamd.sock"; + mode = "0666"; + owner = "rspamd"; + } "*:11333"]; + apply = value: map (each: if (isString each) + then if (isUnixSocket each) + then {socket = each; owner = cfg.user; group = cfg.group; mode = "0644"; rawEntry = "${each}";} + else {socket = each; rawEntry = "${each}";} + else each) value; + }; + count = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Number of worker instances to run + ''; + }; + includes = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of files to include in configuration + ''; + }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Additional entries to put verbatim into worker section of rspamd config file."; + }; + }; + config = mkIf (name == "normal" || name == "controller" || name == "fuzzy") { + type = mkDefault name; + includes = mkDefault [ "$CONFDIR/worker-${name}.inc" ]; + bindSockets = mkDefault (if name == "normal" + then [{ + socket = "/run/rspamd/rspamd.sock"; + mode = "0660"; + owner = cfg.user; + group = cfg.group; + }] + else if name == "controller" + then [ "localhost:11334" ] + else [] ); + }; + }; + + indexOf = default: start: list: e: + if list == [] + then default + else if (head list) == e then start + else (indexOf default (start + (length (listenStreams (head list).socket))) (tail list) e); + + systemdSocket = indexOf (abort "Socket not found") 0 allSockets; + + isUnixSocket = socket: hasPrefix "/" (if (isString socket) then socket else socket.socket); + isPort = hasPrefix "*:"; + isIPv4Socket = hasPrefix "*v4:"; + isIPv6Socket = hasPrefix "*v6:"; + isLocalHost = hasPrefix "localhost:"; + listenStreams = socket: + if (isLocalHost socket) then + let port = (removePrefix "localhost:" socket); + in [ "127.0.0.1:${port}" ] ++ (if config.networking.enableIPv6 then ["[::1]:${port}"] else []) + else if (isIPv6Socket socket) then [removePrefix "*v6:" socket] + else if (isPort socket) then [removePrefix "*:" socket] + else if (isIPv4Socket socket) then + throw "error: IPv4 only socket not supported in rspamd with socket activation" + else if (length (splitString " " socket)) != 1 then + throw "error: string options not supported in rspamd with socket activation" + else [socket]; + + mkBindSockets = enabled: socks: concatStringsSep "\n " (flatten (map (each: + if cfg.socketActivation && enabled != false then + let systemd = (systemdSocket each); + in (imap (idx: e: "bind_socket = \"systemd:${toString (systemd + idx - 1)}\";") (listenStreams each.socket)) + else "bind_socket = \"${each.rawEntry}\";") socks)); + + rspamdConfFile = pkgs.writeText "rspamd.conf" '' .include "$CONFDIR/common.conf" @@ -22,19 +160,33 @@ let .include "$CONFDIR/logging.inc" } - worker { - ${mkBindSockets cfg.bindSocket} - .include "$CONFDIR/worker-normal.inc" - } - - worker { - ${mkBindSockets cfg.bindUISocket} - .include "$CONFDIR/worker-controller.inc" - } + ${concatStringsSep "\n" (mapAttrsToList (name: value: '' + worker ${optionalString (value.name != "normal" && value.name != "controller") "${value.name}"} { + type = "${value.type}"; + ${optionalString (value.enable != null) + "enabled = ${if value.enable != false then "yes" else "no"};"} + ${mkBindSockets value.enable value.bindSockets} + ${optionalString (value.count != null) "count = ${toString value.count};"} + ${concatStringsSep "\n " (map (each: ".include \"${each}\"") value.includes)} + ${value.extraConfig} + } + '') cfg.workers)} ${cfg.extraConfig} ''; + allMappedSockets = flatten (mapAttrsToList (name: value: + if value.enable != false + then imap (idx: each: { + name = "${name}"; + index = idx; + value = each; + }) value.bindSockets + else []) cfg.workers); + allSockets = map (e: e.value) allMappedSockets; + + allSocketNames = map (each: "rspamd-${each.name}-${toString each.index}.socket") allMappedSockets; + in { @@ -48,36 +200,43 @@ in enable = mkEnableOption "Whether to run the rspamd daemon."; debug = mkOption { + type = types.bool; default = false; description = "Whether to run the rspamd daemon in debug mode."; }; - bindSocket = mkOption { - type = types.listOf types.str; - default = [ - "/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}" - ]; - defaultText = ''[ - "/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}" - ]''; + socketActivation = mkOption { + type = types.bool; description = '' - List of sockets to listen, in format acceptable by rspamd - ''; - example = '' - bindSocket = [ - "/run/rspamd.sock mode=0666 owner=rspamd" - "*:11333" - ]; + Enable systemd socket activation for rspamd. ''; }; - bindUISocket = mkOption { - type = types.listOf types.str; - default = [ - "localhost:11334" - ]; + workers = mkOption { + type = with types; attrsOf (submodule workerOpts); description = '' - List of sockets for web interface, in format acceptable by rspamd + Attribute set of workers to start. + ''; + default = { + normal = {}; + controller = {}; + }; + example = literalExample '' + { + normal = { + includes = [ "$CONFDIR/worker-normal.inc" ]; + bindSockets = [{ + socket = "/run/rspamd/rspamd.sock"; + mode = "0660"; + owner = "${cfg.user}"; + group = "${cfg.group}"; + }]; + }; + controller = { + includes = [ "$CONFDIR/worker-controller.inc" ]; + bindSockets = [ "[::1]:11334" ]; + }; + } ''; }; @@ -113,6 +272,13 @@ in config = mkIf cfg.enable { + services.rspamd.socketActivation = mkDefault (!opts.bindSocket.isDefined && !opts.bindUISocket.isDefined); + + assertions = [ { + assertion = !cfg.socketActivation || !(opts.bindSocket.isDefined || opts.bindUISocket.isDefined); + message = "Can't use socketActivation for rspamd when using renamed bind socket options"; + } ]; + # Allow users to run 'rspamc' and 'rspamadm'. environment.systemPackages = [ pkgs.rspamd ]; @@ -128,17 +294,22 @@ in gid = config.ids.gids.rspamd; }; + environment.etc."rspamd.conf".source = rspamdConfFile; + systemd.services.rspamd = { description = "Rspamd Service"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + wantedBy = mkIf (!cfg.socketActivation) [ "multi-user.target" ]; + after = [ "network.target" ] ++ + (if cfg.socketActivation then allSocketNames else []); + requires = mkIf cfg.socketActivation allSocketNames; serviceConfig = { ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c ${rspamdConfFile} -f"; Restart = "always"; RuntimeDirectory = "rspamd"; PrivateTmp = true; + Sockets = mkIf cfg.socketActivation (concatStringsSep " " allSocketNames); }; preStart = '' @@ -146,5 +317,25 @@ in ${pkgs.coreutils}/bin/chown ${cfg.user}:${cfg.group} /var/lib/rspamd ''; }; + systemd.sockets = mkIf cfg.socketActivation + (listToAttrs (map (each: { + name = "rspamd-${each.name}-${toString each.index}"; + value = { + description = "Rspamd socket ${toString each.index} for worker ${each.name}"; + wantedBy = [ "sockets.target" ]; + listenStreams = (listenStreams each.value.socket); + socketConfig = { + BindIPv6Only = mkIf (isIPv6Socket each.value.socket) "ipv6-only"; + Service = "rspamd.service"; + SocketUser = mkIf (isUnixSocket each.value.socket) each.value.owner; + SocketGroup = mkIf (isUnixSocket each.value.socket) each.value.group; + SocketMode = mkIf (isUnixSocket each.value.socket) each.value.mode; + }; + }; + }) allMappedSockets)); }; + imports = [ + (mkRenamedOptionModule [ "services" "rspamd" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ]) + (mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ]) + ]; } diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 666fa68b01ce6..cc60a143fa6c3 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -9,8 +9,27 @@ let availableComponents = pkgs.home-assistant.availableComponents; + # Given component "parentConfig.platform", returns whether config.parentConfig + # is a list containing a set with set.platform == "platform". + # + # For example, the component sensor.luftdaten is used as follows: + # config.sensor = [ { + # platform = "luftdaten"; + # ... + # } ]; + useComponentPlatform = component: + let + path = splitString "." component; + parentConfig = attrByPath (init path) null cfg.config; + platform = last path; + in isList parentConfig && any + (item: item.platform or null == platform) + parentConfig; + # Returns whether component is used in config - useComponent = component: hasAttrByPath (splitString "." component) cfg.config; + useComponent = component: + hasAttrByPath (splitString "." component) cfg.config + || useComponentPlatform component; # List of components used in config extraComponents = filter useComponent availableComponents; diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix index d85b5e4ec5076..91539592511c2 100644 --- a/nixos/modules/services/misc/zookeeper.nix +++ b/nixos/modules/services/misc/zookeeper.nix @@ -106,10 +106,19 @@ in { ''; }; + package = mkOption { + description = "The zookeeper package to use"; + default = pkgs.zookeeper; + defaultText = "pkgs.zookeeper"; + type = types.package; + }; + }; config = mkIf cfg.enable { + environment.systemPackages = [cfg.package]; + systemd.services.zookeeper = { description = "Zookeeper Daemon"; wantedBy = [ "multi-user.target" ]; @@ -118,7 +127,7 @@ in { serviceConfig = { ExecStart = '' ${pkgs.jre}/bin/java \ - -cp "${pkgs.zookeeper}/lib/*:${pkgs.zookeeper}/${pkgs.zookeeper.name}.jar:${configDir}" \ + -cp "${cfg.package}/lib/*:${cfg.package}/${cfg.package.name}.jar:${configDir}" \ ${escapeShellArgs cfg.extraCmdLineOptions} \ -Dzookeeper.datadir.autocreate=false \ ${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \ diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix index cf761edad9260..8a47c9f1e7d89 100644 --- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -111,11 +111,11 @@ in { after = [ "network.target" ]; script = '' ${pkgs.prometheus-alertmanager.bin}/bin/alertmanager \ - -config.file ${alertmanagerYml} \ - -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - -log.level ${cfg.logLevel} \ - ${optionalString (cfg.webExternalUrl != null) ''-web.external-url ${cfg.webExternalUrl} \''} - ${optionalString (cfg.logFormat != null) "-log.format ${cfg.logFormat}"} + --config.file ${alertmanagerYml} \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --log.level ${cfg.logLevel} \ + ${optionalString (cfg.webExternalUrl != null) ''--web.external-url ${cfg.webExternalUrl} \''} + ${optionalString (cfg.logFormat != null) "--log.format ${cfg.logFormat}"} ''; serviceConfig = { diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix deleted file mode 100644 index 0946e379e7967..0000000000000 --- a/nixos/modules/services/network-filesystems/openafs-client/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ config, pkgs, lib, ... }: - -let - inherit (lib) mkOption mkIf; - - cfg = config.services.openafsClient; - - cellServDB = pkgs.fetchurl { - url = http://dl.central.org/dl/cellservdb/CellServDB.2017-03-14; - sha256 = "1197z6c5xrijgf66rhaymnm5cvyg2yiy1i20y4ah4mrzmjx0m7sc"; - }; - - afsConfig = pkgs.runCommand "afsconfig" {} '' - mkdir -p $out - echo ${cfg.cellName} > $out/ThisCell - cp ${cellServDB} $out/CellServDB - echo "/afs:${cfg.cacheDirectory}:${cfg.cacheSize}" > $out/cacheinfo - ''; - - openafsPkgs = config.boot.kernelPackages.openafsClient; -in -{ - ###### interface - - options = { - - services.openafsClient = { - - enable = mkOption { - default = false; - description = "Whether to enable the OpenAFS client."; - }; - - cellName = mkOption { - default = "grand.central.org"; - description = "Cell name."; - }; - - cacheSize = mkOption { - default = "100000"; - description = "Cache size."; - }; - - cacheDirectory = mkOption { - default = "/var/cache/openafs"; - description = "Cache directory."; - }; - - crypt = mkOption { - default = false; - description = "Whether to enable (weak) protocol encryption."; - }; - - sparse = mkOption { - default = false; - description = "Minimal cell list in /afs."; - }; - - }; - }; - - - ###### implementation - - config = mkIf cfg.enable { - - environment.systemPackages = [ openafsPkgs ]; - - environment.etc = [ - { source = afsConfig; - target = "openafs"; - } - ]; - - systemd.services.afsd = { - description = "AFS client"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { RemainAfterExit = true; }; - - preStart = '' - mkdir -p -m 0755 /afs - mkdir -m 0700 -p ${cfg.cacheDirectory} - ${pkgs.kmod}/bin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true - ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} -fakestat -afsdb - ${openafsPkgs}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"} - ''; - - # Doing this in preStop, because after these commands AFS is basically - # stopped, so systemd has nothing to do, just noticing it. If done in - # postStop, then we get a hang + kernel oops, because AFS can't be - # stopped simply by sending signals to processes. - preStop = '' - ${pkgs.utillinux}/bin/umount /afs - ${openafsPkgs}/sbin/afsd -shutdown - ''; - }; - }; -} diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix new file mode 100644 index 0000000000000..3826fe3edfd03 --- /dev/null +++ b/nixos/modules/services/network-filesystems/openafs/client.nix @@ -0,0 +1,239 @@ +{ config, pkgs, lib, ... }: + +with import ./lib.nix { inherit lib; }; + +let + inherit (lib) getBin mkOption mkIf optionalString singleton types; + + cfg = config.services.openafsClient; + + cellServDB = pkgs.fetchurl { + url = http://dl.central.org/dl/cellservdb/CellServDB.2017-03-14; + sha256 = "1197z6c5xrijgf66rhaymnm5cvyg2yiy1i20y4ah4mrzmjx0m7sc"; + }; + + clientServDB = pkgs.writeText "client-cellServDB-${cfg.cellName}" (mkCellServDB cfg.cellName cfg.cellServDB); + + afsConfig = pkgs.runCommand "afsconfig" {} '' + mkdir -p $out + echo ${cfg.cellName} > $out/ThisCell + cat ${cellServDB} ${clientServDB} > $out/CellServDB + echo "${cfg.mountPoint}:${cfg.cache.directory}:${toString cfg.cache.blocks}" > $out/cacheinfo + ''; + + openafsMod = config.boot.kernelPackages.openafs; + openafsBin = lib.getBin pkgs.openafs; +in +{ + ###### interface + + options = { + + services.openafsClient = { + + enable = mkOption { + default = false; + type = types.bool; + description = "Whether to enable the OpenAFS client."; + }; + + afsdb = mkOption { + default = true; + type = types.bool; + description = "Resolve cells via AFSDB DNS records."; + }; + + cellName = mkOption { + default = ""; + type = types.str; + description = "Cell name."; + example = "grand.central.org"; + }; + + cellServDB = mkOption { + default = []; + type = with types; listOf (submodule { options = cellServDBConfig; }); + description = '' + This cell's database server records, added to the global + CellServDB. See CellServDB(5) man page for syntax. Ignored when + <literal>afsdb</literal> is set to <literal>true</literal>. + ''; + example = '' + [ { ip = "1.2.3.4"; dnsname = "first.afsdb.server.dns.fqdn.org"; } + { ip = "2.3.4.5"; dnsname = "second.afsdb.server.dns.fqdn.org"; } + ] + ''; + }; + + cache = { + blocks = mkOption { + default = 100000; + type = types.int; + description = "Cache size in 1KB blocks."; + }; + + chunksize = mkOption { + default = 0; + type = types.ints.between 0 30; + description = '' + Size of each cache chunk given in powers of + 2. <literal>0</literal> resets the chunk size to its default + values (13 (8 KB) for memcache, 18-20 (256 KB to 1 MB) for + diskcache). Maximum value is 30. Important performance + parameter. Set to higher values when dealing with large files. + ''; + }; + + directory = mkOption { + default = "/var/cache/openafs"; + type = types.str; + description = "Cache directory."; + }; + + diskless = mkOption { + default = false; + type = types.bool; + description = '' + Use in-memory cache for diskless machines. Has no real + performance benefit anymore. + ''; + }; + }; + + crypt = mkOption { + default = true; + type = types.bool; + description = "Whether to enable (weak) protocol encryption."; + }; + + daemons = mkOption { + default = 2; + type = types.int; + description = '' + Number of daemons to serve user requests. Numbers higher than 6 + usually do no increase performance. Default is sufficient for up + to five concurrent users. + ''; + }; + + fakestat = mkOption { + default = false; + type = types.bool; + description = '' + Return fake data on stat() calls. If <literal>true</literal>, + always do so. If <literal>false</literal>, only do so for + cross-cell mounts (as these are potentially expensive). + ''; + }; + + inumcalc = mkOption { + default = "compat"; + type = types.strMatching "compat|md5"; + description = '' + Inode calculation method. <literal>compat</literal> is + computationally less expensive, but <literal>md5</literal> greatly + reduces the likelihood of inode collisions in larger scenarios + involving multiple cells mounted into one AFS space. + ''; + }; + + mountPoint = mkOption { + default = "/afs"; + type = types.str; + description = '' + Mountpoint of the AFS file tree, conventionally + <literal>/afs</literal>. When set to a different value, only + cross-cells that use the same value can be accessed. + ''; + }; + + sparse = mkOption { + default = true; + type = types.bool; + description = "Minimal cell list in /afs."; + }; + + startDisconnected = mkOption { + default = false; + type = types.bool; + description = '' + Start up in disconnected mode. You need to execute + <literal>fs disco online</literal> (as root) to switch to + connected mode. Useful for roaming devices. + ''; + }; + + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + assertions = [ + { assertion = cfg.afsdb || cfg.cellServDB != []; + message = "You should specify all cell-local database servers in config.services.openafsClient.cellServDB or set config.services.openafsClient.afsdb."; + } + { assertion = cfg.cellName != ""; + message = "You must specify the local cell name in config.services.openafsClient.cellName."; + } + ]; + + environment.systemPackages = [ pkgs.openafs ]; + + environment.etc = { + clientCellServDB = { + source = pkgs.runCommand "CellServDB" {} '' + cat ${cellServDB} ${clientServDB} > $out + ''; + target = "openafs/CellServDB"; + mode = "0644"; + }; + clientCell = { + text = '' + ${cfg.cellName} + ''; + target = "openafs/ThisCell"; + mode = "0644"; + }; + }; + + systemd.services.afsd = { + description = "AFS client"; + wantedBy = [ "multi-user.target" ]; + after = singleton (if cfg.startDisconnected then "network.target" else "network-online.target"); + serviceConfig = { RemainAfterExit = true; }; + restartIfChanged = false; + + preStart = '' + mkdir -p -m 0755 ${cfg.mountPoint} + mkdir -m 0700 -p ${cfg.cache.directory} + ${pkgs.kmod}/bin/insmod ${openafsMod}/lib/modules/*/extra/openafs/libafs.ko.xz + ${openafsBin}/sbin/afsd \ + -mountdir ${cfg.mountPoint} \ + -confdir ${afsConfig} \ + ${optionalString (!cfg.cache.diskless) "-cachedir ${cfg.cache.directory}"} \ + -blocks ${toString cfg.cache.blocks} \ + -chunksize ${toString cfg.cache.chunksize} \ + ${optionalString cfg.cache.diskless "-memcache"} \ + -inumcalc ${cfg.inumcalc} \ + ${if cfg.fakestat then "-fakestat-all" else "-fakestat"} \ + ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} \ + ${optionalString cfg.afsdb "-afsdb"} + ${openafsBin}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"} + ${optionalString cfg.startDisconnected "${openafsBin}/bin/fs discon offline"} + ''; + + # Doing this in preStop, because after these commands AFS is basically + # stopped, so systemd has nothing to do, just noticing it. If done in + # postStop, then we get a hang + kernel oops, because AFS can't be + # stopped simply by sending signals to processes. + preStop = '' + ${pkgs.utillinux}/bin/umount ${cfg.mountPoint} + ${openafsBin}/sbin/afsd -shutdown + ${pkgs.kmod}/sbin/rmmod libafs + ''; + }; + }; +} diff --git a/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixos/modules/services/network-filesystems/openafs/lib.nix new file mode 100644 index 0000000000000..ecfc72d2eaf91 --- /dev/null +++ b/nixos/modules/services/network-filesystems/openafs/lib.nix @@ -0,0 +1,28 @@ +{ lib, ...}: + +let + inherit (lib) concatStringsSep mkOption types; + +in rec { + + mkCellServDB = cellName: db: '' + >${cellName} + '' + (concatStringsSep "\n" (map (dbm: if (dbm.ip != "" && dbm.dnsname != "") then dbm.ip + " #" + dbm.dnsname else "") + db)); + + # CellServDB configuration type + cellServDBConfig = { + ip = mkOption { + type = types.str; + default = ""; + example = "1.2.3.4"; + description = "IP Address of a database server"; + }; + dnsname = mkOption { + type = types.str; + default = ""; + example = "afs.example.org"; + description = "DNS full-qualified domain name of a database server"; + }; + }; +} diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix new file mode 100644 index 0000000000000..429eb945ac9e8 --- /dev/null +++ b/nixos/modules/services/network-filesystems/openafs/server.nix @@ -0,0 +1,260 @@ +{ config, pkgs, lib, ... }: + +with import ./lib.nix { inherit lib; }; + +let + inherit (lib) concatStringsSep intersperse mapAttrsToList mkForce mkIf mkMerge mkOption optionalString types; + + bosConfig = pkgs.writeText "BosConfig" ('' + restrictmode 1 + restarttime 16 0 0 0 0 + checkbintime 3 0 5 0 0 + '' + (optionalString cfg.roles.database.enable '' + bnode simple vlserver 1 + parm ${openafsBin}/libexec/openafs/vlserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} ${cfg.roles.database.vlserverArgs} + end + bnode simple ptserver 1 + parm ${openafsBin}/libexec/openafs/ptserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} ${cfg.roles.database.ptserverArgs} + end + '') + (optionalString cfg.roles.fileserver.enable '' + bnode dafs dafs 1 + parm ${openafsBin}/libexec/openafs/dafileserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} -udpsize ${udpSizeStr} ${cfg.roles.fileserver.fileserverArgs} + parm ${openafsBin}/libexec/openafs/davolserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} -udpsize ${udpSizeStr} ${cfg.roles.fileserver.volserverArgs} + parm ${openafsBin}/libexec/openafs/salvageserver ${cfg.roles.fileserver.salvageserverArgs} + parm ${openafsBin}/libexec/openafs/dasalvager ${cfg.roles.fileserver.salvagerArgs} + end + '') + (optionalString (cfg.roles.database.enable && cfg.roles.backup.enable) '' + bnode simple buserver 1 + parm ${openafsBin}/libexec/openafs/buserver ${cfg.roles.backup.buserverArgs} ${optionalString (cfg.roles.backup.cellServDB != []) "-cellservdb /etc/openafs/backup/"} + end + '')); + + netInfo = if (cfg.advertisedAddresses != []) then + pkgs.writeText "NetInfo" ((concatStringsSep "\nf " cfg.advertisedAddresses) + "\n") + else null; + + buCellServDB = pkgs.writeText "backup-cellServDB-${cfg.cellName}" (mkCellServDB cfg.cellName cfg.roles.backup.cellServDB); + + cfg = config.services.openafsServer; + + udpSizeStr = toString cfg.udpPacketSize; + + openafsBin = lib.getBin pkgs.openafs; + +in { + + options = { + + services.openafsServer = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable the OpenAFS server. An OpenAFS server needs a + complex setup. So, be aware that enabling this service and setting + some options does not give you a turn-key-ready solution. You need + at least a running Kerberos 5 setup, as OpenAFS relies on it for + authentication. See the Guide "QuickStartUnix" coming with + <literal>pkgs.openafs.doc</literal> for complete setup + instructions. + ''; + }; + + advertisedAddresses = mkOption { + default = []; + description = "List of IP addresses this server is advertised under. See NetInfo(5)"; + }; + + cellName = mkOption { + default = ""; + type = types.str; + description = "Cell name, this server will serve."; + example = "grand.central.org"; + }; + + cellServDB = mkOption { + default = []; + type = with types; listOf (submodule [ { options = cellServDBConfig;} ]); + description = "Definition of all cell-local database server machines."; + }; + + roles = { + fileserver = { + enable = mkOption { + default = true; + type = types.bool; + description = "Fileserver role, serves files and volumes from its local storage."; + }; + + fileserverArgs = mkOption { + default = "-vattachpar 128 -vhashsize 11 -L -rxpck 400 -cb 1000000"; + type = types.str; + description = "Arguments to the dafileserver process. See its man page."; + }; + + volserverArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the davolserver process. See its man page."; + example = "-sync never"; + }; + + salvageserverArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the salvageserver process. See its man page."; + example = "-showlog"; + }; + + salvagerArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the dasalvager process. See its man page."; + example = "-showlog -showmounts"; + }; + }; + + database = { + enable = mkOption { + default = true; + type = types.bool; + description = '' + Database server role, maintains the Volume Location Database, + Protection Database (and Backup Database, see + <literal>backup</literal> role). There can be multiple + servers in the database role for replication, which then need + reliable network connection to each other. + + Servers in this role appear in AFSDB DNS records or the + CellServDB. + ''; + }; + + vlserverArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the vlserver process. See its man page."; + example = "-rxbind"; + }; + + ptserverArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the ptserver process. See its man page."; + example = "-restricted -default_access S---- S-M---"; + }; + }; + + backup = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Backup server role. Use in conjunction with the + <literal>database</literal> role to maintain the Backup + Database. Normally only used in conjunction with tape storage + or IBM's Tivoli Storage Manager. + ''; + }; + + buserverArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the buserver process. See its man page."; + example = "-p 8"; + }; + + cellServDB = mkOption { + default = []; + type = with types; listOf (submodule [ { options = cellServDBConfig;} ]); + description = '' + Definition of all cell-local backup database server machines. + Use this when your cell uses less backup database servers than + other database server machines. + ''; + }; + }; + }; + + dottedPrincipals= mkOption { + default = false; + type = types.bool; + description = '' + If enabled, allow principal names containing (.) dots. Enabling + this has security implications! + ''; + }; + + udpPacketSize = mkOption { + default = 1310720; + type = types.int; + description = '' + UDP packet size to use in Bytes. Higher values can speed up + communications. The default of 1 MB is a sufficient in most + cases. Make sure to increase the kernel's UDP buffer size + accordingly via <literal>net.core(w|r|opt)mem_max</literal> + sysctl. + ''; + }; + + }; + + }; + + config = mkIf cfg.enable { + + assertions = [ + { assertion = cfg.cellServDB != []; + message = "You must specify all cell-local database servers in config.services.openafsServer.cellServDB."; + } + { assertion = cfg.cellName != ""; + message = "You must specify the local cell name in config.services.openafsServer.cellName."; + } + ]; + + environment.systemPackages = [ pkgs.openafs ]; + + environment.etc = { + bosConfig = { + source = bosConfig; + target = "openafs/BosConfig"; + mode = "0644"; + }; + cellServDB = { + text = mkCellServDB cfg.cellName cfg.cellServDB; + target = "openafs/server/CellServDB"; + mode = "0644"; + }; + thisCell = { + text = cfg.cellName; + target = "openafs/server/ThisCell"; + mode = "0644"; + }; + buCellServDB = { + enable = (cfg.roles.backup.cellServDB != []); + text = mkCellServDB cfg.cellName cfg.roles.backup.cellServDB; + target = "openafs/backup/CellServDB"; + }; + }; + + systemd.services = { + openafs-server = { + description = "OpenAFS server"; + after = [ "syslog.target" "network.target" ]; + wantedBy = [ "multi-user.target" ]; + restartIfChanged = false; + unitConfig.ConditionPathExists = [ "/etc/openafs/server/rxkad.keytab" ]; + preStart = '' + mkdir -m 0755 -p /var/openafs + ${optionalString (netInfo != null) "cp ${netInfo} /var/openafs/netInfo"} + ${optionalString (cfg.roles.backup.cellServDB != []) "cp ${buCellServDB}"} + ''; + serviceConfig = { + ExecStart = "${openafsBin}/bin/bosserver -nofork"; + ExecStop = "${openafsBin}/bin/bos shutdown localhost -wait -localauth"; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index 1a7a1e24b702d..c25bd0fdc5411 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -7,21 +7,27 @@ let let cfg = config.services.${variant}; pkg = pkgs.${variant}; + birdBin = if variant == "bird6" then "bird6" else "bird"; birdc = if variant == "bird6" then "birdc6" else "birdc"; + descr = + { bird = "1.9.x with IPv4 suport"; + bird6 = "1.9.x with IPv6 suport"; + bird2 = "2.x"; + }.${variant}; configFile = pkgs.stdenv.mkDerivation { name = "${variant}.conf"; text = cfg.config; preferLocalBuild = true; buildCommand = '' echo -n "$text" > $out - ${pkg}/bin/${variant} -d -p -c $out + ${pkg}/bin/${birdBin} -d -p -c $out ''; }; in { ###### interface options = { services.${variant} = { - enable = mkEnableOption "BIRD Internet Routing Daemon"; + enable = mkEnableOption "BIRD Internet Routing Daemon (${descr})"; config = mkOption { type = types.lines; description = '' @@ -36,12 +42,12 @@ let config = mkIf cfg.enable { environment.systemPackages = [ pkg ]; systemd.services.${variant} = { - description = "BIRD Internet Routing Daemon"; + description = "BIRD Internet Routing Daemon (${descr})"; wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "forking"; Restart = "on-failure"; - ExecStart = "${pkg}/bin/${variant} -c ${configFile} -u ${variant} -g ${variant}"; + ExecStart = "${pkg}/bin/${birdBin} -c ${configFile} -u ${variant} -g ${variant}"; ExecReload = "${pkg}/bin/${birdc} configure"; ExecStop = "${pkg}/bin/${birdc} down"; CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID" @@ -56,14 +62,15 @@ let users = { extraUsers.${variant} = { description = "BIRD Internet Routing Daemon user"; - group = "${variant}"; + group = variant; }; extraGroups.${variant} = {}; }; }; }; - inherit (config.services) bird bird6; -in { - imports = [(generic "bird") (generic "bird6")]; +in + +{ + imports = map generic [ "bird" "bird6" "bird2" ]; } diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix index 03ee54af43342..02cd53c6fa380 100644 --- a/nixos/modules/services/networking/gnunet.nix +++ b/nixos/modules/services/networking/gnunet.nix @@ -137,6 +137,8 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = [ pkgs.gnunet pkgs.miniupnpc ]; + environment.TMPDIR = "/tmp"; + serviceConfig.PrivateTemp = true; serviceConfig.ExecStart = "${pkgs.gnunet}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}"; serviceConfig.User = "gnunet"; serviceConfig.UMask = "0007"; diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index d0c19c4ecb71c..aac02b811d716 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -46,6 +46,15 @@ in What addresses the server should listen on. (UDP+TCP 53) ''; }; + listenTLS = mkOption { + type = with types; listOf str; + default = []; + example = [ "198.51.100.1:853" "[2001:db8::1]:853" "853" ]; + description = '' + Addresses on which kresd should provide DNS over TLS (see RFC 7858). + For detailed syntax see ListenStream in man systemd.socket. + ''; + }; # TODO: perhaps options for more common stuff like cache size or forwarding }; @@ -75,6 +84,18 @@ in socketConfig.FreeBind = true; }; + systemd.sockets.kresd-tls = mkIf (cfg.listenTLS != []) rec { + wantedBy = [ "sockets.target" ]; + before = wantedBy; + partOf = [ "kresd.socket" ]; + listenStreams = cfg.listenTLS; + socketConfig = { + FileDescriptorName = "tls"; + FreeBind = true; + Service = "kresd.service"; + }; + }; + systemd.sockets.kresd-control = rec { wantedBy = [ "sockets.target" ]; before = wantedBy; @@ -97,6 +118,8 @@ in Type = "notify"; WorkingDirectory = cfg.cacheDir; Restart = "on-failure"; + Sockets = [ "kresd.socket" "kresd-control.socket" ] + ++ optional (cfg.listenTLS != []) "kresd-tls.socket"; }; # Trust anchor goes from dns-root-data by default. diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix new file mode 100644 index 0000000000000..31379189f5de3 --- /dev/null +++ b/nixos/modules/services/networking/monero.nix @@ -0,0 +1,238 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.monero; + dataDir = "/var/lib/monero"; + + listToConf = option: list: + concatMapStrings (value: "${option}=${value}\n") list; + + login = (cfg.rpc.user != null && cfg.rpc.password != null); + + configFile = with cfg; pkgs.writeText "monero.conf" '' + log-file=/dev/stdout + data-dir=${dataDir} + + ${optionalString mining.enable '' + start-mining=${mining.address} + mining-threads=${toString mining.threads} + ''} + + rpc-bind-ip=${rpc.address} + rpc-bind-port=${toString rpc.port} + ${optionalString login '' + rpc-login=${rpc.user}:${rpc.password} + ''} + ${optionalString rpc.restricted '' + restrict-rpc=1 + ''} + + limit-rate-up=${toString limits.upload} + limit-rate-down=${toString limits.download} + max-concurrency=${toString limits.threads} + block-sync-size=${toString limits.syncSize} + + ${listToConf "add-peer" extraNodes} + ${listToConf "add-priority-node" priorityNodes} + ${listToConf "add-exclusive-node" exclusiveNodes} + + ${extraConfig} + ''; + +in + +{ + + ###### interface + + options = { + + services.monero = { + + enable = mkEnableOption "Monero node daemon."; + + mining.enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to mine moneroj. + ''; + }; + + mining.address = mkOption { + type = types.str; + default = ""; + description = '' + Monero address where to send mining rewards. + ''; + }; + + mining.threads = mkOption { + type = types.addCheck types.int (x: x>=0); + default = 0; + description = '' + Number of threads used for mining. + Set to <literal>0</literal> to use all available. + ''; + }; + + rpc.user = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + User name for RPC connections. + ''; + }; + + rpc.password = mkOption { + type = types.str; + default = null; + description = '' + Password for RPC connections. + ''; + }; + + rpc.address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + IP address the RPC server will bind to. + ''; + }; + + rpc.port = mkOption { + type = types.int; + default = 18081; + description = '' + Port the RPC server will bind to. + ''; + }; + + rpc.restricted = mkOption { + type = types.bool; + default = false; + description = '' + Whether to restrict RPC to view only commands. + ''; + }; + + limits.upload = mkOption { + type = types.addCheck types.int (x: x>=-1); + default = -1; + description = '' + Limit of the upload rate in kB/s. + Set to <literal>-1</literal> to leave unlimited. + ''; + }; + + limits.download = mkOption { + type = types.addCheck types.int (x: x>=-1); + default = -1; + description = '' + Limit of the download rate in kB/s. + Set to <literal>-1</literal> to leave unlimited. + ''; + }; + + limits.threads = mkOption { + type = types.addCheck types.int (x: x>=0); + default = 0; + description = '' + Maximum number of threads used for a parallel job. + Set to <literal>0</literal> to leave unlimited. + ''; + }; + + limits.syncSize = mkOption { + type = types.addCheck types.int (x: x>=0); + default = 0; + description = '' + Maximum number of blocks to sync at once. + Set to <literal>0</literal> for adaptive. + ''; + }; + + extraNodes = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + List of additional peer IP addresses to add to the local list. + ''; + }; + + priorityNodes = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + List of peer IP addresses to connect to and + attempt to keep the connection open. + ''; + }; + + exclusiveNodes = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + List of peer IP addresses to connect to *only*. + If given the other peer options will be ignored. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra lines to be added verbatim to monerod configuration. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + users.extraUsers = singleton { + name = "monero"; + uid = config.ids.uids.monero; + description = "Monero daemon user"; + home = dataDir; + createHome = true; + }; + + users.extraGroups = singleton { + name = "monero"; + gid = config.ids.gids.monero; + }; + + systemd.services.monero = { + description = "monero daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = "monero"; + Group = "monero"; + ExecStart = "${pkgs.monero}/bin/monerod --config-file=${configFile} --non-interactive"; + Restart = "always"; + SuccessExitStatus = [ 0 1 ]; + }; + }; + + assertions = singleton { + assertion = cfg.mining.enable -> cfg.mining.address != ""; + message = '' + You need a Monero address to receive mining rewards: + specify one using option monero.mining.address. + ''; + }; + + }; + +} + diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index 273ca797b98d4..d8135f4d0ffa4 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -212,7 +212,7 @@ in '' + concatStringsSep "\n" ( mapAttrsToList (n: c: if c.hashedPassword != null then - "echo '${n}:${c.hashedPassword}' > ${cfg.dataDir}/passwd" + "echo '${n}:${c.hashedPassword}' >> ${cfg.dataDir}/passwd" else optionalString (c.password != null) "${pkgs.mosquitto}/bin/mosquitto_passwd -b ${cfg.dataDir}/passwd ${n} ${c.password}" ) cfg.users); diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix index 0199502163a3b..85d7f9e4a41b8 100644 --- a/nixos/modules/services/networking/radvd.nix +++ b/nixos/modules/services/networking/radvd.nix @@ -59,24 +59,11 @@ in systemd.services.radvd = { description = "IPv6 Router Advertisement Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - path = [ pkgs.radvd ]; - - preStart = '' - mkdir -m 755 -p /run/radvd - chown radvd /run/radvd - ''; - serviceConfig = - { ExecStart = "@${pkgs.radvd}/sbin/radvd radvd" - + " -p /run/radvd/radvd.pid -m syslog -u radvd -C ${confFile}"; + { ExecStart = "@${pkgs.radvd}/bin/radvd radvd -n -u radvd -C ${confFile}"; Restart = "always"; - Type = "forking"; - PIDFile = "/run/radvd/radvd.pid"; }; }; diff --git a/nixos/modules/services/networking/rxe.nix b/nixos/modules/services/networking/rxe.nix new file mode 100644 index 0000000000000..a6a069ec50c06 --- /dev/null +++ b/nixos/modules/services/networking/rxe.nix @@ -0,0 +1,63 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.networking.rxe; + + runRxeCmd = cmd: ifcs: + concatStrings ( map (x: "${pkgs.rdma-core}/bin/rxe_cfg -n ${cmd} ${x};") ifcs); + + startScript = pkgs.writeShellScriptBin "rxe-start" '' + ${pkgs.rdma-core}/bin/rxe_cfg -n start + ${runRxeCmd "add" cfg.interfaces} + ${pkgs.rdma-core}/bin/rxe_cfg + ''; + + stopScript = pkgs.writeShellScriptBin "rxe-stop" '' + ${runRxeCmd "remove" cfg.interfaces } + ${pkgs.rdma-core}/bin/rxe_cfg -n stop + ''; + +in { + ###### interface + + options = { + networking.rxe = { + enable = mkEnableOption "RDMA over converged ethernet"; + interfaces = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "eth0" ]; + description = '' + Enable RDMA on the listed interfaces. The corresponding virtual + RDMA interfaces will be named rxe0 ... rxeN where the ordering + will be as they are named in the list. UDP port 4791 must be + open on the respective ethernet interfaces. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.rxe = { + path = with pkgs; [ kmod rdma-core ]; + description = "RoCE interfaces"; + + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-modules-load.service" "network-online.target" ]; + wants = [ "network-pre.target" ]; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${startScript}/bin/rxe-start"; + ExecStop = "${stopScript}/bin/rxe-stop"; + }; + }; + }; +} + diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index d9b12d2781606..e50c4dbacf36f 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -375,9 +375,6 @@ in # LogLevel VERBOSE logs user's key fingerprint on login. # Needed to have a clear audit track of which key was used to log in. LogLevel VERBOSE - - # Use kernel sandbox mechanisms where possible in unprivileged processes. - UsePrivilegeSeparation sandbox ''; assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix index 30224d7fc6bac..97fbd6aae6e02 100644 --- a/nixos/modules/services/security/physlock.nix +++ b/nixos/modules/services/security/physlock.nix @@ -30,6 +30,20 @@ in ''; }; + allowAnyUser = mkOption { + type = types.bool; + default = false; + description = '' + Whether to allow any user to lock the screen. This will install a + setuid wrapper to allow any user to start physlock as root, which + is a minor security risk. Call the physlock binary to use this instead + of using the systemd service. + + Note that you might need to relog to have the correct binary in your + PATH upon changing this option. + ''; + }; + disableSysRq = mkOption { type = types.bool; default = true; @@ -79,28 +93,36 @@ in ###### implementation - config = mkIf cfg.enable { - - # for physlock -l and physlock -L - environment.systemPackages = [ pkgs.physlock ]; - - systemd.services."physlock" = { - enable = true; - description = "Physlock"; - wantedBy = optional cfg.lockOn.suspend "suspend.target" - ++ optional cfg.lockOn.hibernate "hibernate.target" - ++ cfg.lockOn.extraTargets; - before = optional cfg.lockOn.suspend "systemd-suspend.service" - ++ optional cfg.lockOn.hibernate "systemd-hibernate.service" - ++ cfg.lockOn.extraTargets; - serviceConfig.Type = "forking"; - script = '' - ${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"} - ''; - }; + config = mkIf cfg.enable (mkMerge [ + { + + # for physlock -l and physlock -L + environment.systemPackages = [ pkgs.physlock ]; + + systemd.services."physlock" = { + enable = true; + description = "Physlock"; + wantedBy = optional cfg.lockOn.suspend "suspend.target" + ++ optional cfg.lockOn.hibernate "hibernate.target" + ++ cfg.lockOn.extraTargets; + before = optional cfg.lockOn.suspend "systemd-suspend.service" + ++ optional cfg.lockOn.hibernate "systemd-hibernate.service" + ++ cfg.lockOn.extraTargets; + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}"; + }; + }; - security.pam.services.physlock = {}; + security.pam.services.physlock = {}; - }; + } + + (mkIf cfg.allowAnyUser { + + security.wrappers.physlock = { source = "${pkgs.physlock}/bin/physlock"; user = "root"; }; + + }) + ]); } diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index fa4aeb22ae9de..fed91756e7696 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -88,6 +88,9 @@ let ${flip concatMapStrings v.map (p: '' HiddenServicePort ${toString p.port} ${p.destination} '')} + ${optionalString (v.authorizeClient != null) '' + HiddenServiceAuthorizeClient ${v.authorizeClient.authType} ${concatStringsSep "," v.authorizeClient.clientNames} + ''} '')) + cfg.extraConfig; @@ -619,6 +622,33 @@ in })); }; + authorizeClient = mkOption { + default = null; + description = "If configured, the hidden service is accessible for authorized clients only."; + type = types.nullOr (types.submodule ({config, ...}: { + + options = { + + authType = mkOption { + type = types.enum [ "basic" "stealth" ]; + description = '' + Either <literal>"basic"</literal> for a general-purpose authorization protocol + or <literal>"stealth"</literal> for a less scalable protocol + that also hides service activity from unauthorized clients. + ''; + }; + + clientNames = mkOption { + type = types.nonEmptyListOf (types.strMatching "[A-Za-z0-9+-_]+"); + description = '' + Only clients that are listed here are authorized to access the hidden service. + Generated authorization data can be found in <filename>${torDirectory}/onion/$name/hostname</filename>. + Clients need to put this authorization data in their configuration file using <literal>HidServAuth</literal>. + ''; + }; + }; + })); + }; }; config = { diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index 4ede4fc209670..b6c7fef21fb29 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -64,6 +64,16 @@ in { ''; }; + group = mkOption { + default = "traefik"; + type = types.string; + example = "docker"; + description = '' + Set the group that traefik runs under. + For the docker backend this needs to be set to <literal>docker</literal> instead. + ''; + }; + package = mkOption { default = pkgs.traefik; defaultText = "pkgs.traefik"; @@ -87,7 +97,7 @@ in { ]; Type = "simple"; User = "traefik"; - Group = "traefik"; + Group = cfg.group; Restart = "on-failure"; StartLimitInterval = 86400; StartLimitBurst = 5; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 4c76ce0bb1953..b794e2b12d733 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -66,6 +66,10 @@ in security.wrappers = { kcheckpass.source = "${lib.getBin plasma5.plasma-workspace}/lib/libexec/kcheckpass"; "start_kdeinit".source = "${lib.getBin pkgs.kinit}/lib/libexec/kf5/start_kdeinit"; + kwin_wayland = { + source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland"; + capabilities = "cap_sys_nice+ep"; + }; }; environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 9d2cea3ad165b..051c553938168 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -700,7 +700,6 @@ in systemd.additionalUpstreamSystemUnits = [ "systemd-networkd.service" "systemd-networkd-wait-online.service" - "org.freedesktop.network1.busname" ]; systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 2147d43c4f19a..4d9de020c84e2 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -126,7 +126,7 @@ in config = mkIf cfg.enable { systemd.additionalUpstreamSystemUnits = [ - "systemd-resolved.service" "org.freedesktop.resolve1.busname" + "systemd-resolved.service" ]; systemd.services.systemd-resolved = { diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index dd9ba71044858..aff46ea861a2f 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -14,7 +14,6 @@ let upstreamSystemUnits = [ # Targets. "basic.target" - "busnames.target" "sysinit.target" "sockets.target" "exit.target" @@ -47,6 +46,7 @@ let # Consoles. "getty.target" + "getty-pre.target" "getty@.service" "serial-getty@.service" "console-getty.service" @@ -63,10 +63,7 @@ let "systemd-logind.service" "autovt@.service" "systemd-user-sessions.service" - "dbus-org.freedesktop.login1.service" "dbus-org.freedesktop.machine1.service" - "org.freedesktop.login1.busname" - "org.freedesktop.machine1.busname" "user@.service" # Journal. @@ -99,7 +96,6 @@ let "swap.target" "dev-hugepages.mount" "dev-mqueue.mount" - "proc-sys-fs-binfmt_misc.mount" "sys-fs-fuse-connections.mount" "sys-kernel-config.mount" "sys-kernel-debug.mount" @@ -155,19 +151,16 @@ let "systemd-tmpfiles-setup-dev.service" # Misc. - "org.freedesktop.systemd1.busname" "systemd-sysctl.service" "dbus-org.freedesktop.timedate1.service" "dbus-org.freedesktop.locale1.service" "dbus-org.freedesktop.hostname1.service" - "org.freedesktop.timedate1.busname" - "org.freedesktop.locale1.busname" - "org.freedesktop.hostname1.busname" "systemd-timedated.service" "systemd-localed.service" "systemd-hostnamed.service" "systemd-binfmt.service" "systemd-exit.service" + "systemd-update-done.service" ] ++ cfg.additionalUpstreamSystemUnits; @@ -182,7 +175,6 @@ let upstreamUserUnits = [ "basic.target" "bluetooth.target" - "busnames.target" "default.target" "exit.target" "graphical-session-pre.target" @@ -789,8 +781,7 @@ in # Keep a persistent journal. Note that systemd-tmpfiles will # set proper ownership/permissions. - # FIXME: revert to 0700 with systemd v233. - mkdir -m 0750 -p /var/log/journal + mkdir -m 0700 -p /var/log/journal ''; users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network; @@ -887,7 +878,7 @@ in systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; - systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.automount" ]; + systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ]; # Don't bother with certain units in containers. systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container"; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 2c0a165887bd8..30c54ddd0e4e8 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -24,7 +24,11 @@ let kernel = config.boot.kernelPackages; - packages = if config.boot.zfs.enableUnstable then { + packages = if config.boot.zfs.enableLegacyCrypto then { + spl = kernel.splLegacyCrypto; + zfs = kernel.zfsLegacyCrypto; + zfsUser = pkgs.zfsLegacyCrypto; + } else if config.boot.zfs.enableUnstable then { spl = kernel.splUnstable; zfs = kernel.zfsUnstable; zfsUser = pkgs.zfsUnstable; @@ -75,6 +79,27 @@ in ''; }; + enableLegacyCrypto = mkOption { + type = types.bool; + default = false; + description = '' + Enabling this option will allow you to continue to use the old format for + encrypted datasets. With the inclusion of stability patches the format of + encrypted datasets has changed. They can still be accessed and mounted but + in read-only mode mounted. It is highly recommended to convert them to + the new format. + + This option is only for convenience to people that cannot convert their + datasets to the new format yet and it will be removed in due time. + + For migration strategies from old format to this new one, check the Wiki: + https://nixos.wiki/wiki/NixOS_on_ZFS#Encrypted_Dataset_Format_Change + + See https://github.com/zfsonlinux/zfs/pull/6864 for more details about + the stability patches. + ''; + }; + extraPools = mkOption { type = types.listOf types.str; default = []; diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index c7656bc309c0b..afc5a42f8b4e6 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -35,24 +35,19 @@ in description = '' The package used for Xen binary. ''; + relatedPackages = [ "xen" "xen-light" ]; }; - virtualisation.xen.qemu = mkOption { - type = types.path; - defaultText = "\${pkgs.xen}/lib/xen/bin/qemu-system-i386"; - example = literalExample "''${pkgs.qemu_xen-light}/bin/qemu-system-i386"; - description = '' - The qemu binary to use for Dom-0 backend. - ''; - }; - - virtualisation.xen.qemu-package = mkOption { + virtualisation.xen.package-qemu = mkOption { type = types.package; defaultText = "pkgs.xen"; example = literalExample "pkgs.qemu_xen-light"; description = '' - The package with qemu binaries for xendomains. + The package with qemu binaries for dom0 qemu and xendomains. ''; + relatedPackages = [ "xen" + { name = "qemu_xen-light"; comment = "For use with pkgs.xen-light."; } + ]; }; virtualisation.xen.bootParams = @@ -158,8 +153,7 @@ in } ]; virtualisation.xen.package = mkDefault pkgs.xen; - virtualisation.xen.qemu = mkDefault "${pkgs.xen}/lib/xen/bin/qemu-system-i386"; - virtualisation.xen.qemu-package = mkDefault pkgs.xen; + virtualisation.xen.package-qemu = mkDefault pkgs.xen; virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored"; environment.systemPackages = [ cfg.package ]; @@ -339,7 +333,8 @@ in after = [ "xen-console.service" ]; requires = [ "xen-store.service" ]; serviceConfig.ExecStart = '' - ${cfg.qemu} -xen-attach -xen-domid 0 -name dom0 -M xenpv \ + ${cfg.package-qemu}/${cfg.package-qemu.qemu-system-i386} \ + -xen-attach -xen-domid 0 -name dom0 -M xenpv \ -nographic -monitor /dev/null -serial /dev/null -parallel /dev/null ''; }; @@ -448,7 +443,7 @@ in before = [ "dhcpd.service" ]; restartIfChanged = false; serviceConfig.RemainAfterExit = "yes"; - path = [ cfg.package cfg.qemu-package ]; + path = [ cfg.package cfg.package-qemu ]; environment.XENDOM_CONFIG = "${cfg.package}/etc/sysconfig/xendomains"; preStart = "mkdir -p /var/lock/subsys -m 755"; serviceConfig.ExecStart = "${cfg.package}/etc/init.d/xendomains start"; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 3564e6298256f..9d4a551a958b8 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -2,7 +2,7 @@ # and nixos-14.04). The channel is updated every time the ‘tested’ job # succeeds, and all other jobs have finished (they may fail). -{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } +{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false , supportedSystems ? [ "x86_64-linux" ] , limitedSupportedSystems ? [ "i686-linux" ] @@ -52,7 +52,8 @@ in rec { (all nixos.dummy) (all nixos.manual) - (all nixos.iso_minimal) + nixos.iso_minimal.x86_64-linux + nixos.iso_minimal.i686-linux nixos.iso_graphical.x86_64-linux nixos.ova.x86_64-linux diff --git a/nixos/release-small.nix b/nixos/release-small.nix index e9f3cfb4de539..2b532c70763fa 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -2,7 +2,7 @@ # small subset of Nixpkgs, mostly useful for servers that need fast # security updates. -{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } +{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false , supportedSystems ? [ "x86_64-linux" ] # no i686-linux }: @@ -41,6 +41,7 @@ in rec { nfs3 openssh php-pcre + predictable-interface-names proxy simple; installer = { diff --git a/nixos/release.nix b/nixos/release.nix index a9c0aae7a5263..e473a0804244b 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -1,4 +1,4 @@ -{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } +{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false , supportedSystems ? [ "x86_64-linux" "aarch64-linux" ] }: @@ -244,6 +244,7 @@ in rec { tests.containers-macvlans = callTest tests/containers-macvlans.nix {}; tests.couchdb = callTest tests/couchdb.nix {}; tests.docker = callTestOnTheseSystems ["x86_64-linux"] tests/docker.nix {}; + tests.docker-tools = callTestOnTheseSystems ["x86_64-linux"] tests/docker-tools.nix {}; tests.docker-edge = callTestOnTheseSystems ["x86_64-linux"] tests/docker-edge.nix {}; tests.dovecot = callTest tests/dovecot.nix {}; tests.dnscrypt-proxy = callTestOnTheseSystems ["x86_64-linux"] tests/dnscrypt-proxy.nix {}; @@ -326,6 +327,7 @@ in rec { tests.pgmanage = callTest tests/pgmanage.nix {}; tests.postgis = callTest tests/postgis.nix {}; #tests.pgjwt = callTest tests/pgjwt.nix {}; + tests.predictable-interface-names = callSubTests tests/predictable-interface-names.nix {}; tests.printing = callTest tests/printing.nix {}; tests.prometheus = callTest tests/prometheus.nix {}; tests.proxy = callTest tests/proxy.nix {}; @@ -333,7 +335,9 @@ in rec { # tests.quagga = callTest tests/quagga.nix {}; tests.quake3 = callTest tests/quake3.nix {}; tests.radicale = callTest tests/radicale.nix {}; + tests.rspamd = callSubTests tests/rspamd.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; + tests.rxe = callTest tests/rxe.nix {}; tests.samba = callTest tests/samba.nix {}; tests.sddm = callSubTests tests/sddm.nix {}; tests.simple = callTest tests/simple.nix {}; @@ -351,6 +355,7 @@ in rec { tests.wordpress = callTest tests/wordpress.nix {}; tests.xfce = callTest tests/xfce.nix {}; tests.xmonad = callTest tests/xmonad.nix {}; + tests.yabar = callTest tests/yabar.nix {}; tests.zookeeper = callTest tests/zookeeper.nix {}; /* Build a bunch of typical closures so that Hydra can keep track of diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix new file mode 100644 index 0000000000000..e7f2588f681bb --- /dev/null +++ b/nixos/tests/docker-tools.nix @@ -0,0 +1,36 @@ +# this test creates a simple GNU image with docker tools and sees if it executes + +import ./make-test.nix ({ pkgs, ... }: { + name = "docker-tools"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ]; + }; + + nodes = { + docker = + { config, pkgs, ... }: { + virtualisation.docker.enable = true; + }; + }; + + testScript = + let + dockerImage = pkgs.dockerTools.buildImage { + name = "hello-docker"; + contents = [ pkgs.hello ]; + tag = "sometag"; + + # TODO: create another test checking whether runAsRoot works as intended. + + config = { + Cmd = [ "hello" ]; + }; + }; + + in '' + $docker->waitForUnit("sockets.target"); + $docker->succeed("docker load --input='${dockerImage}'"); + $docker->succeed("docker run hello-docker:sometag"); + ''; + +}) diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix new file mode 100644 index 0000000000000..b4c2039923cf0 --- /dev/null +++ b/nixos/tests/predictable-interface-names.nix @@ -0,0 +1,27 @@ +{ system ? builtins.currentSystem +, pkgs ? import ../.. { inherit system; } +}: +with import ../lib/testing.nix { inherit system; }; +let boolToString = x: if x then "yes" else "no"; in +let testWhenSetTo = predictable: withNetworkd: +makeTest { + name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}"; + meta = {}; + + machine = { config, pkgs, ... }: { + networking.usePredictableInterfaceNames = pkgs.stdenv.lib.mkForce predictable; + networking.useNetworkd = withNetworkd; + networking.dhcpcd.enable = !withNetworkd; + }; + + testScript = '' + print $machine->succeed("ip link"); + $machine->succeed("ip link show ${if predictable then "ens3" else "eth0"}"); + $machine->fail("ip link show ${if predictable then "eth0" else "ens3"}"); + ''; +}; in +with pkgs.stdenv.lib.lists; +with pkgs.stdenv.lib.attrsets; +listToAttrs (map (drv: nameValuePair drv.name drv) ( +crossLists testWhenSetTo [[true false] [true false]] +)) diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix new file mode 100644 index 0000000000000..6b2e2dd3a5317 --- /dev/null +++ b/nixos/tests/rspamd.nix @@ -0,0 +1,140 @@ +{ system ? builtins.currentSystem }: +with import ../lib/testing.nix { inherit system; }; +with pkgs.lib; +let + initMachine = '' + startAll + $machine->waitForUnit("rspamd.service"); + $machine->succeed("id \"rspamd\" >/dev/null"); + ''; + checkSocket = socket: user: group: mode: '' + $machine->succeed("ls ${socket} >/dev/null"); + $machine->succeed("[[ \"\$(stat -c %U ${socket})\" == \"${user}\" ]]"); + $machine->succeed("[[ \"\$(stat -c %G ${socket})\" == \"${group}\" ]]"); + $machine->succeed("[[ \"\$(stat -c %a ${socket})\" == \"${mode}\" ]]"); + ''; + simple = name: socketActivation: enableIPv6: makeTest { + name = "rspamd-${name}"; + machine = { + services.rspamd = { + enable = true; + socketActivation = socketActivation; + }; + networking.enableIPv6 = enableIPv6; + }; + testScript = '' + startAll + $machine->waitForUnit("multi-user.target"); + $machine->waitForOpenPort(11334); + $machine->waitForUnit("rspamd.service"); + $machine->succeed("id \"rspamd\" >/dev/null"); + ${checkSocket "/run/rspamd/rspamd.sock" "rspamd" "rspamd" "660" } + sleep 10; + $machine->log($machine->succeed("cat /etc/rspamd.conf")); + $machine->log($machine->succeed("systemctl cat rspamd.service")); + ${if socketActivation then '' + $machine->log($machine->succeed("systemctl cat rspamd-controller-1.socket")); + $machine->log($machine->succeed("systemctl cat rspamd-normal-1.socket")); + '' else '' + $machine->fail("systemctl cat rspamd-controller-1.socket"); + $machine->fail("systemctl cat rspamd-normal-1.socket"); + ''} + $machine->log($machine->succeed("curl http://localhost:11334/auth")); + $machine->log($machine->succeed("curl http://127.0.0.1:11334/auth")); + ${optionalString enableIPv6 '' + $machine->log($machine->succeed("curl http://[::1]:11334/auth")); + ''} + ''; + }; +in +{ + simple = simple "simple" false true; + ipv4only = simple "ipv4only" false false; + simple-socketActivated = simple "simple-socketActivated" true true; + ipv4only-socketActivated = simple "ipv4only-socketActivated" true false; + deprecated = makeTest { + name = "rspamd-deprecated"; + machine = { + services.rspamd = { + enable = true; + bindSocket = [ "/run/rspamd.sock mode=0600 user=root group=root" ]; + bindUISocket = [ "/run/rspamd-worker.sock mode=0666 user=root group=root" ]; + }; + }; + + testScript = '' + ${initMachine} + $machine->waitForFile("/run/rspamd.sock"); + ${checkSocket "/run/rspamd.sock" "root" "root" "600" } + ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } + $machine->log($machine->succeed("cat /etc/rspamd.conf")); + $machine->fail("systemctl cat rspamd-normal-1.socket"); + $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); + $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); + ''; + }; + + bindports = makeTest { + name = "rspamd-bindports"; + machine = { + services.rspamd = { + enable = true; + socketActivation = false; + workers.normal.bindSockets = [{ + socket = "/run/rspamd.sock"; + mode = "0600"; + owner = "root"; + group = "root"; + }]; + workers.controller.bindSockets = [{ + socket = "/run/rspamd-worker.sock"; + mode = "0666"; + owner = "root"; + group = "root"; + }]; + }; + }; + + testScript = '' + ${initMachine} + $machine->waitForFile("/run/rspamd.sock"); + ${checkSocket "/run/rspamd.sock" "root" "root" "600" } + ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } + $machine->log($machine->succeed("cat /etc/rspamd.conf")); + $machine->fail("systemctl cat rspamd-normal-1.socket"); + $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); + $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); + ''; + }; + socketActivated = makeTest { + name = "rspamd-socketActivated"; + machine = { + services.rspamd = { + enable = true; + workers.normal.bindSockets = [{ + socket = "/run/rspamd.sock"; + mode = "0600"; + owner = "root"; + group = "root"; + }]; + workers.controller.bindSockets = [{ + socket = "/run/rspamd-worker.sock"; + mode = "0666"; + owner = "root"; + group = "root"; + }]; + }; + }; + + testScript = '' + startAll + $machine->waitForFile("/run/rspamd.sock"); + ${checkSocket "/run/rspamd.sock" "root" "root" "600" } + ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } + $machine->log($machine->succeed("cat /etc/rspamd.conf")); + $machine->log($machine->succeed("systemctl cat rspamd-normal-1.socket")); + $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); + $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); + ''; + }; +} diff --git a/nixos/tests/rxe.nix b/nixos/tests/rxe.nix new file mode 100644 index 0000000000000..cfe64a75a6352 --- /dev/null +++ b/nixos/tests/rxe.nix @@ -0,0 +1,53 @@ +import ./make-test.nix ({ pkgs, ... } : + +let + node = { config, pkgs, lib, ... } : { + networking = { + firewall = { + allowedUDPPorts = [ 4791 ]; # open RoCE port + allowedTCPPorts = [ 4800 ]; # port for test utils + }; + rxe = { + enable = true; + interfaces = [ "eth1" ]; + }; + }; + + environment.systemPackages = with pkgs; [ rdma-core screen ]; + }; + +in { + name = "rxe"; + + nodes = { + server = node; + client = node; + }; + + testScript = '' + # Test if rxe interface comes up + $server->waitForUnit("default.target"); + $server->succeed("systemctl status rxe.service"); + $server->succeed("ibv_devices | grep rxe0"); + + $client->waitForUnit("default.target"); + + # ping pong test + $server->succeed("screen -dmS rc_pingpong ibv_rc_pingpong -p 4800 -g0"); + $client->succeed("sleep 2; ibv_rc_pingpong -p 4800 -g0 server"); + + $server->succeed("screen -dmS uc_pingpong ibv_uc_pingpong -p 4800 -g0"); + $client->succeed("sleep 2; ibv_uc_pingpong -p 4800 -g0 server"); + + $server->succeed("screen -dmS ud_pingpong ibv_ud_pingpong -p 4800 -s 1024 -g0"); + $client->succeed("sleep 2; ibv_ud_pingpong -p 4800 -s 1024 -g0 server"); + + $server->succeed("screen -dmS srq_pingpong ibv_srq_pingpong -p 4800 -g0"); + $client->succeed("sleep 2; ibv_srq_pingpong -p 4800 -g0 server"); + + $server->succeed("screen -dmS rping rping -s -a server -C 10"); + $client->succeed("sleep 2; rping -c -a server -C 10"); + ''; +}) + + diff --git a/nixos/tests/yabar.nix b/nixos/tests/yabar.nix new file mode 100644 index 0000000000000..40ca91e8064d5 --- /dev/null +++ b/nixos/tests/yabar.nix @@ -0,0 +1,25 @@ +import ./make-test.nix ({ pkgs, lib }: + +with lib; + +{ + name = "yabar"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; + + nodes.yabar = { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + + services.xserver.displayManager.auto.user = "bob"; + + programs.yabar.enable = true; + }; + + testScript = '' + $yabar->start; + $yabar->waitForX; + + $yabar->waitForUnit("yabar.service", "bob"); + ''; +}) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 757c6e276fdfd..37df75ae110e0 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -26,6 +26,8 @@ rec { dashpay = callPackage ./dashpay.nix { }; + dero = callPackage ./dero.nix { }; + dogecoin = callPackage ./dogecoin.nix { withGui = true; }; dogecoind = callPackage ./dogecoin.nix { withGui = false; }; @@ -59,6 +61,8 @@ rec { stellar-core = callPackage ./stellar-core.nix { }; + sumokoin = callPackage ./sumokoin.nix { }; + zcash = callPackage ./zcash { withGui = false; openssl = openssl_1_1_0; diff --git a/pkgs/applications/altcoins/dero.nix b/pkgs/applications/altcoins/dero.nix new file mode 100644 index 0000000000000..f3e24b6c015b9 --- /dev/null +++ b/pkgs/applications/altcoins/dero.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost +, libunwind, lmdb, miniupnpc, readline }: + +stdenv.mkDerivation rec { + name = "dero-${version}"; + version = "0.11.3"; + + src = fetchFromGitHub { + owner = "deroproject"; + repo = "dero"; + rev = "v${version}"; + sha256 = "0cv4yg2lkmkdhlc3753gnbg1nzldk2kxwdyizwhvanq3ycqban4b"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Secure, private blockchain with smart contracts based on Monero"; + homepage = "https://dero.io/"; + license = licenses.bsd3; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/altcoins/sumokoin.nix b/pkgs/applications/altcoins/sumokoin.nix new file mode 100644 index 0000000000000..026008b2761a9 --- /dev/null +++ b/pkgs/applications/altcoins/sumokoin.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, cmake, unbound, openssl, boost +, libunwind, lmdb, miniupnpc }: + +stdenv.mkDerivation rec { + name = "sumokoin-${version}"; + version = "0.2.0.0"; + + src = fetchFromGitHub { + owner = "sumoprojects"; + repo = "sumokoin"; + rev = "v${version}"; + sha256 = "0ndgcawhxh3qb3llrrilrwzhs36qpxv7f53rxgcansbff9b3za6n"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ unbound openssl boost libunwind lmdb miniupnpc ]; + + postPatch = '' + substituteInPlace src/blockchain_db/lmdb/db_lmdb.cpp --replace mdb_size_t size_t + ''; + + cmakeFlags = [ + "-DLMDB_INCLUDE=${lmdb}/include" + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Sumokoin is a fork of Monero and a truely fungible cryptocurrency"; + homepage = "https://www.sumokoin.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 34dba5e206fa4..d4d302f07d21a 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff"; sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad"; }) - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch; buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; diff --git a/pkgs/applications/audio/cdparanoia/utils.patch b/pkgs/applications/audio/cdparanoia/utils.patch new file mode 100644 index 0000000000000..338e5303dcd0c --- /dev/null +++ b/pkgs/applications/audio/cdparanoia/utils.patch @@ -0,0 +1,68 @@ +diff --git cdparanoia-III-10.2/interface/utils.h cdparanoia-III-10.2/interface/utils.h +index c9647da..68c1a3a 100644 +--- cdparanoia-III-10.2/interface/utils.h ++++ cdparanoia-III-10.2/interface/utils.h +@@ -1,4 +1,6 @@ +-#include <endian.h> ++#include <unistd.h> ++#include <stdint.h> ++#include <stdlib.h> + #include <stdio.h> + #include <errno.h> + #include <string.h> +@@ -14,15 +16,15 @@ static inline int bigendianp(void){ + } + + static inline int32_t swap32(int32_t x){ +- return((((u_int32_t)x & 0x000000ffU) << 24) | +- (((u_int32_t)x & 0x0000ff00U) << 8) | +- (((u_int32_t)x & 0x00ff0000U) >> 8) | +- (((u_int32_t)x & 0xff000000U) >> 24)); ++ return((((uint32_t)x & 0x000000ffU) << 24) | ++ (((uint32_t)x & 0x0000ff00U) << 8) | ++ (((uint32_t)x & 0x00ff0000U) >> 8) | ++ (((uint32_t)x & 0xff000000U) >> 24)); + } + + static inline int16_t swap16(int16_t x){ +- return((((u_int16_t)x & 0x00ffU) << 8) | +- (((u_int16_t)x & 0xff00U) >> 8)); ++ return((((uint16_t)x & 0x00ffU) << 8) | ++ (((uint16_t)x & 0xff00U) >> 8)); + } + + #if BYTE_ORDER == LITTLE_ENDIAN +diff --git cdparanoia-III-10.2/utils.h cdparanoia-III-10.2/utils.h +index 10dce58..6211ce3 100644 +--- cdparanoia-III-10.2/utils.h ++++ cdparanoia-III-10.2/utils.h +@@ -1,5 +1,6 @@ ++#include <unistd.h> ++#include <stdint.h> + #include <stdlib.h> +-#include <endian.h> + #include <stdio.h> + #include <errno.h> + #include <string.h> +@@ -18,15 +19,15 @@ static inline int bigendianp(void){ + } + + static inline int32_t swap32(int32_t x){ +- return((((u_int32_t)x & 0x000000ffU) << 24) | +- (((u_int32_t)x & 0x0000ff00U) << 8) | +- (((u_int32_t)x & 0x00ff0000U) >> 8) | +- (((u_int32_t)x & 0xff000000U) >> 24)); ++ return((((uint32_t)x & 0x000000ffU) << 24) | ++ (((uint32_t)x & 0x0000ff00U) << 8) | ++ (((uint32_t)x & 0x00ff0000U) >> 8) | ++ (((uint32_t)x & 0xff000000U) >> 24)); + } + + static inline int16_t swap16(int16_t x){ +- return((((u_int16_t)x & 0x00ffU) << 8) | +- (((u_int16_t)x & 0xff00U) >> 8)); ++ return((((uint16_t)x & 0x00ffU) << 8) | ++ (((uint16_t)x & 0xff00U) >> 8)); + } + + #if BYTE_ORDER == LITTLE_ENDIAN diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 460c9da7ac310..877bd26a5c1bf 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -16,13 +16,13 @@ with stdenv.lib.strings; let - version = "2.5.10"; + version = "2.5.21"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; - rev = "v${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "0sjhy7axa2dj1977iz6zmqvz9qzalcfnrx2fqx3xmk9hly847d6z"; + rev = "${version}"; + sha256 = "1kfrcfhpzkpjxsrvgwmc2valgwfb4b7gfwwnlnjq6f6dp56yflpz"; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix new file mode 100644 index 0000000000000..9fe0820e5d6f7 --- /dev/null +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: + +stdenv.mkDerivation rec { + name = "infamousPlugins-v${version}"; + version = "0.2.04"; + + src = fetchFromGitHub { + owner = "ssj71"; + repo = "infamousPlugins"; + rev = "v${version}"; + sha256 = "0hmqk80w4qxq09iag7b7srf2g0wigkyhzq0ywxvhz2iz0hq9k0dh"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ]; + + meta = with stdenv.lib; { + homepage = https://ssj71.github.io/infamousPlugins; + description = "A collection of open-source LV2 plugins"; + longDescription = '' + These are audio plugins in the LV2 format, developed for linux. Most are suitable for live use. + This collection contains: + * Cellular Automaton Synth - additive synthesizer, where 16 harmonics are added according to rules of elementary cellular automata + * Envelope Follower - a fully featured envelope follower plugin + * Hip2B - a distortion/destroyer plugin + * cheap distortion - another distortion plugin, but this one I wanted to get it as light as possible + * stuck - a clone of the electro-harmonix freeze + * power cut - this effect is commonly called tape stop + * power up - the opposite of the power cut + * ewham - a whammy style pitchshifter + * lushlife - a simulated double tracking plugin capable of everything from a thin beatle effect to thick lush choruses to weird outlandish effects + ''; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index 1f309c4503bfe..219b04b4ec41e 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.11.0"; + version = "3.12.4"; src = pythonPackages.fetchPypi { inherit version; pname = "Mopidy-Iris"; - sha256 = "1a9pn35vv1b9v0s30ajjg7gjjvcfjwgfyp7z61m567nv6cr37vhq"; + sha256 = "0k64rfnp5b4rybb396zzx12wnnca43a8l1s6s6dr6cflgk9aws87"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 9ac0c49ebc319..35c5dff271066 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -9,7 +9,7 @@ let # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ # Be careful not to pick the testing version. - version = "1.0.69.336.g7edcc575-39"; + version = "1.0.70.399.g5ffabd56-26"; deps = [ alsaLib @@ -54,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0bh2q7g478g7wj661fypxcbhrbq87zingfyigg7rz1shgsgwc3gd"; + sha256 = "0kpakz11xkyqqjvln4jkhc3z5my8zgpw8m6jx954cjdbc6vkxd29"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 4cd0553e4d2e5..725841e47b49c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -27,9 +27,9 @@ in rec { preview = mkStudio { pname = "android-studio-preview"; - version = "3.1.0.9"; # "Android Studio 3.1 Beta 1" - build = "173.4567466"; - sha256Hash = "01c6a46pk5zbhwk2w038nm68fkx86nafiw1v2i5rdr93mxvx9cag"; + version = "3.1.0.10"; # "Android Studio 3.1 Beta 2" + build = "173.4580418"; + sha256Hash = "0s56vbyq6b1q75ss6pqvhzwqzb6xbp6841f3y5cwhrch2xalxjkc"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 9d37287d84a71..7264dcb92a37c 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -768,10 +768,10 @@ el-search = callPackage ({ cl-print, elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.5.3.tar"; - sha256 = "095gpanpf88j65cbf4r6c787qxi07kqpvdsh0dsdpg9m3ivmxbra"; + url = "https://elpa.gnu.org/packages/el-search-1.5.4.tar"; + sha256 = "1k0makrk3p6hknpnr3kbiszqzw3rpw18gnx2m8scr9vv0wif4qmk"; }; packageRequires = [ cl-print emacs stream ]; meta = { @@ -1040,10 +1040,10 @@ }) {}; hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "hook-helpers"; - version = "1.1"; + version = "1.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/hook-helpers-1.1.tar"; - sha256 = "0xvabl0lfc0ijr98clsyh0bqk2fdi1ncl0knn58j2p30gn9958i5"; + url = "https://elpa.gnu.org/packages/hook-helpers-1.1.1.tar"; + sha256 = "05nqlshdqh32smav58hzqg8wp04h7w9sxr239qrz4wqxwlxlv9im"; }; packageRequires = [ emacs ]; meta = { @@ -1637,10 +1637,10 @@ }) {}; paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "paced"; - version = "1.0.1"; + version = "1.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/paced-1.0.1.tar"; - sha256 = "1y2sl3iqz2vjgkbc859sm3h9jhnrgla9ynazy9d5rql0nsb6sn8p"; + url = "https://elpa.gnu.org/packages/paced-1.1.2.tar"; + sha256 = "1hxbzlzmlndj2gs9n741whi7rj6vbcnxdn89lg2l0997pqmsx58y"; }; packageRequires = [ async emacs ]; meta = { @@ -2014,10 +2014,10 @@ }) {}; sql-indent = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "sql-indent"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sql-indent-1.0.tar"; - sha256 = "02cmi96mqk3bfmdh0xv5s0qx310cirs6kq0jqwk1ga41rpp596vl"; + url = "https://elpa.gnu.org/packages/sql-indent-1.1.tar"; + sha256 = "06q41msfir178f50nk8fnyc1rwgyq5iyy17pv8mq0zqbacjbp88z"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 468b40f118168..b66c988580e2b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -341,8 +341,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "ac-cider"; - rev = "d8670939bbf88079263d5ace2b8bc04cf325be36"; - sha256 = "01g1h2j0rfih8v0yvvr5gjh3abcj2mz3jmfbis8a60ivmngab732"; + rev = "fa13e067dd9c8c76151c7d140a2803da1d109b84"; + sha256 = "1pklmjldnm8bf34f5q8x983d1m72l3kf51ns9vh6z704mkhv658f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8adefaf2e284ef91baec3dbd3e10c868de69926/recipes/ac-cider"; @@ -761,8 +761,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "1ad972b0394f0ecbfebae8041af96a1fe2e24cf0"; - sha256 = "07hljgfl1d6dg50dflr467fdif39xxp0jap46x85gilrlw458hp6"; + rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; + sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -778,12 +778,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20180126.2015"; + version = "20180206.202"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "1ad972b0394f0ecbfebae8041af96a1fe2e24cf0"; - sha256 = "07hljgfl1d6dg50dflr467fdif39xxp0jap46x85gilrlw458hp6"; + rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; + sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -824,8 +824,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; - sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; + rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; + sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1197,12 +1197,12 @@ adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "adafruit-wisdom"; - version = "20180107.1521"; + version = "20180208.2316"; src = fetchFromGitHub { owner = "gonewest818"; repo = "adafruit-wisdom.el"; - rev = "f637f1b7cb397d4b993a20e94687663f6f09c615"; - sha256 = "0b5k8526p0c3xp2x5xbb5w0qgljasa1lywbbj5jqgnn64i7l5y2h"; + rev = "c0fdfcbbbc49927e0c93656f6d4a877cca774224"; + sha256 = "0vjx5aaj9ndpz399czhg5qsfwgibaycvb8j2acfc26mzhpycc2qy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom"; @@ -1447,12 +1447,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "20180126.2021"; + version = "20180130.1928"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "9367e4a277fdabde7433640fbae48407bab7c4da"; - sha256 = "0y71h25vi10qirn0q48csxd1xjhha17f9za9fdvfs7pcsqmkk8im"; + rev = "a038d91ec593d1f1b19ca66a0576d59bbc24c523"; + sha256 = "0f86xp7l8bv4z5dgf3pamjgqyiq3kfx9gbi9wcw0m6lbza8db15a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1771,12 +1771,12 @@ ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ample-theme"; - version = "20180115.627"; + version = "20180207.945"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "ample-theme"; - rev = "64845a6b67627e897dd42d8302c25c03ddce2aee"; - sha256 = "0fb5pq5242xqss02si4nlwgy073kpvf909avwdngvyg6apyk66p2"; + rev = "366698400c555211c2082962a5d74f3dd79a78c8"; + sha256 = "1kzb15aqy7n2wxibmnihya7n6ajs34jxp9iin96n758nza92m59c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme"; @@ -1810,22 +1810,22 @@ license = lib.licenses.free; }; }) {}; - amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "amx"; - version = "20170923.835"; + version = "20180203.1043"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "amx"; - rev = "88ab7ccb2a88b5cd3ecc4d703ae9373df3e4971c"; - sha256 = "1n1zsrlj272scl4xcbys86d6gxnaq08vp5frd96i47c1an75p0xw"; + rev = "356393033980746eccff950c84c6e3c2984cbae4"; + sha256 = "12ady1k621difw8b00x8ynhynkra02nkcm22s2cyzh9vv4m505zg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx"; sha256 = "1ikhjvkca0lsb9j719yf6spg6nwc0qaydkd8aax162sis7kp9fap"; name = "amx"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs s ]; meta = { homepage = "https://melpa.org/#/amx"; license = lib.licenses.free; @@ -1834,12 +1834,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "20171223.1118"; + version = "20180209.1147"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "e72e9beeb8c80acfee4d85748464d1c5147946ad"; - sha256 = "01p83h7a40v89xp4ar587xg97y86h8p641znlbd0sqckxkn087cs"; + rev = "8d5ff5e8a6d2e585b0f8f2765099e4e6357470ae"; + sha256 = "0483690q1qg3hlx04ngifmc9d3s47879x3nbz14g2xzc91pcni26"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1960,12 +1960,12 @@ anki-editor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anki-editor"; - version = "20180128.129"; + version = "20180210.633"; src = fetchFromGitHub { owner = "louietan"; repo = "anki-editor"; - rev = "690121ce582105239f8bf20a9c011b8c6bb1661a"; - sha256 = "168lixn9s3s1p33qw8x6wr5ll6mikkx3316xfsql0bdnz1rkk6cp"; + rev = "a4a018d49e7c1fb01386216be6b8572b5ca33f94"; + sha256 = "15mwbg0yrv8vs2wgn7vb2psk6qw29vivq778hxg7k9f4ak7kn7ls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8155d649e4b129d0c72da6bb2b1aac66c8483491/recipes/anki-editor"; @@ -2526,12 +2526,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "20180125.612"; + version = "20180201.637"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "dfb500b394cfb8332f40d8b9ba344f106fdb9370"; - sha256 = "1w6dfnrz3gi2d800k5ih2daak5krnpddkzjhmv92nyvgrn7x3hd3"; + rev = "44fe79d56bafaaf3a688e5441298ec5f7bbf419e"; + sha256 = "12i39kl4fj1xhzrdw24i4mi2m3aj2w3isxpcyr48z23d1x0grviq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2987,12 +2987,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20180116.1024"; + version = "20180201.1853"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "fbe026c64f53bf5afa27c55fda6118d45cea7d5e"; - sha256 = "0hg8drfcd6y6mis5xz9b0a43d5agfsrw39ri2i2p6gcm4mii1041"; + rev = "bf5b76e472d22577fa406c7088a1c2d99fe4b636"; + sha256 = "08hrnv7jyzcnh4iyf5r3b1y4wbynk4fraxhkdgwmxzr666aq7cn7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -3764,12 +3764,12 @@ autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autobookmarks"; - version = "20171021.1532"; + version = "20180131.535"; src = fetchFromGitHub { owner = "Fuco1"; repo = "autobookmarks"; - rev = "b40c69f2d1c419adad516bee81b07b99110e5cc3"; - sha256 = "0dailajx26dixlibqps5wfh224ps7azm453lmzxjc2d10mgapi5v"; + rev = "93610f22500ac207f86e159d411de15082a8befb"; + sha256 = "1ydqc2ry43sibf8xa99w2w6prxh5gmlmcinp0z67yhdcz4dh4v2v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks"; @@ -3974,12 +3974,12 @@ avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avk-emacs-themes"; - version = "20180121.246"; + version = "20180205.2254"; src = fetchFromGitHub { owner = "avkoval"; repo = "avk-emacs-themes"; - rev = "7f1da34f0d74e5a922400b05fcfada5df1c0e3ce"; - sha256 = "13pcd61a81f7cby5lk6hnasp95khhrgnqz8v738g2vwsqbfqbwyq"; + rev = "1a119d0b52f0755fa14ad4d8c6e00e2e720b7732"; + sha256 = "1im1bvrcy9163414328yfmsz2hb0whqxnd6wpmh8hvh6vpbmwaj7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/avk-emacs-themes"; @@ -4118,18 +4118,39 @@ license = lib.licenses.free; }; }) {}; + aws-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "aws-snippets"; + version = "20180207.622"; + src = fetchFromGitHub { + owner = "baron42bba"; + repo = "aws-snippets"; + rev = "a6e7d102c5b1143f4787a160cbf52c1e8ab48d09"; + sha256 = "08nbcddmi2fq6hf324qhywy29pwixlfd5lnd5qlfirzrvdyz7crv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/485aa401a6a14cd4a916474d9a7df12cdf45d591/recipes/aws-snippets"; + sha256 = "1p2il4ig3nafsapa87hgghw6ri9d5qqi0hl8zjyypa06rcnag9g9"; + name = "aws-snippets"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://melpa.org/#/aws-snippets"; + license = lib.licenses.free; + }; + }) {}; axiom-environment = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "axiom-environment"; version = "20171111.1152"; src = fetchgit { - url = "https://bitbucket.org/pdo/axiom-environment.git"; + url = "https://bitbucket.org/pdo/axiom-environment"; rev = "b4f0fa9cd013e107d2af8e2ebedff8a7f40be7b5"; sha256 = "0p2mg2824mw8l1zrfq5va1mnxg0ib5f960306vvsm6b3pi1w5kv0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9f07feb8686c76c330f282320b9f653dc16cadd5/recipes/axiom-environment"; - sha256 = "0lr2kdm6jr25mi6s6mpahb8r56d3800r7jgljjdiz4ab36zqvgz3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/axiom-environment"; + sha256 = "1hzfxdwhgv0z9136k7bdjhqjrkawsjmvqch6za6p7nkpd9ikr2zb"; name = "axiom-environment"; }; packageRequires = [ emacs ]; @@ -4313,15 +4334,36 @@ license = lib.licenses.free; }; }) {}; + bart-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bart-mode"; + version = "20180131.1829"; + src = fetchFromGitHub { + owner = "mschuldt"; + repo = "bart-mode"; + rev = "3d8573713b6dbaf52402de9c15cb34eb3c89a67b"; + sha256 = "0192fc8fnkmnpwjf1qncvp5h7m8n1hlc697mrsn8ls7pnna01phq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8f9cb09c07cb9fdef15de3e8dbfb6725d97dff6f/recipes/bart-mode"; + sha256 = "0wyfsf7kqfghnci9rlk9x0rkai6x7hy3vfzkgh7s2yz081p1kfam"; + name = "bart-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/bart-mode"; + license = lib.licenses.free; + }; + }) {}; base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20180114.1149"; + version = "20180211.1545"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "3492ce6613e974a329c8773e09a615c28b48aa10"; - sha256 = "140yxkg1gnfhmsw6pira2p0nq2ll1x8swi9rlngraxshldf0c6zv"; + rev = "2c3f8dc0f00446376ed1d1e7776d118337e42a41"; + sha256 = "03z477y26gwnrd1hy9ysmdqxih54adlkbvgd57m4s6zfcd6f9cyx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4608,12 +4650,12 @@ bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbyac"; - version = "20171214.2054"; + version = "20180206.641"; src = fetchFromGitHub { owner = "baohaojun"; repo = "bbyac"; - rev = "b355c87723746dc61da464afba2adf9d4ece1db0"; - sha256 = "18l6423s23w3vri49ncs7lpnfamgzc7xm0lqv3x1020030m0lzp2"; + rev = "9f0de9cad13801891ffb590dc09f51ff9a7cb225"; + sha256 = "0q0i1j8ljfd61rk6d5fys7wvdbym9pz5nhwyfvmm0ijmy19d1ppz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac"; @@ -4797,12 +4839,12 @@ better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "better-shell"; - version = "20170215.1020"; + version = "20180209.1207"; src = fetchFromGitHub { owner = "killdash9"; repo = "better-shell"; - rev = "4ee06b8791f7363a19109d9ea6c5ee95ce998d33"; - sha256 = "08w3z4srbz478rmnnzjmbbd5bknady417x7s0r3nxszkxfpn3iy5"; + rev = "2e9f2f3e7945c27988c50d8de43e681662d6a467"; + sha256 = "1ccvfpfdkqb1ga7jqq0kgvifa5gqnilb4nn8ghlbxik1901xvr5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/better-shell"; @@ -4906,8 +4948,8 @@ src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "41045e36a31782ecdfeb49918629fc4af94876e7"; - sha256 = "0isvmly7pslb9q7nvbkdwfja9aq9wa73azbncgsa63a2wxmwjqac"; + rev = "497c7e68df5e3b6b8c3ebaaf6edfce6b2d29b616"; + sha256 = "1j15dfg1mr21vyf7c9h3dij1pnikwvmxr3rs0vdrx8lz9x321amf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8308e72c4437237fded29db1f60b3eba0edd26/recipes/bibliothek"; @@ -5032,8 +5074,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; - sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; + rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a"; + sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/bind-chord"; @@ -5053,8 +5095,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; - sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; + rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a"; + sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -6560,12 +6602,12 @@ cal-china-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cal-china-x"; - version = "20170122.1100"; + version = "20180211.1101"; src = fetchFromGitHub { owner = "xwl"; repo = "cal-china-x"; - rev = "2e9f8e17969a32268fa1c69b500d28590338a98e"; - sha256 = "1qqy0phjxqc8nw7aijlnfqybqicnl559skgiag5syvgnfh4965f0"; + rev = "e9b309065829af3a9a0c526509bd64d9228fdced"; + sha256 = "0wipcsr0dry2r9sw7lcz5hw16b5gpax7qr2nbdlcwj3j9axqipyg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1098d34012fa72f8c8c30d5f0f495fdbe1d3d65/recipes/cal-china-x"; @@ -6774,8 +6816,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "261c7144e18d54dd38ec1b0b48ae6e7c46eccb02"; - sha256 = "1687rg64i64if3mm0k8sjjbblpkshdhf5aksm8gx24gm1vw3yid6"; + rev = "932f5db4425fdf7bae491d98e8cd702ab58e9667"; + sha256 = "1m1xm7vagjvc2zlh8iddvjfzlgxm4fgl76afzlpvjhxmwb8zkw5v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -7186,9 +7228,9 @@ license = lib.licenses.free; }; }) {}; - centered-window-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + centered-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "centered-window-mode"; + pname = "centered-window"; version = "20171127.149"; src = fetchFromGitHub { owner = "anler"; @@ -7197,13 +7239,13 @@ sha256 = "1z3zi6zy1z68g4sfiv21l998n04hbbqp660khind6ap8yjjn8ik8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/centered-window-mode"; - sha256 = "08pmk3rqgbk5fzhxx1kd8rp2k5r5vd2jc9k2phrqg75pf89h3zf4"; - name = "centered-window-mode"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/58bfd795d4d620f0c83384fb03008e129c71dc09/recipes/centered-window"; + sha256 = "0w6na4ld79bpmkiv6glbrphc32v6g2rcrpi28259i94jhgy1kxqk"; + name = "centered-window"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { - homepage = "https://melpa.org/#/centered-window-mode"; + homepage = "https://melpa.org/#/centered-window"; license = lib.licenses.free; }; }) {}; @@ -7277,8 +7319,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "e7f50592d1ff0c8e2fa175e56190566f447fbaf2"; - sha256 = "10f2an6pmz7a088rllf7k1kcyllak6xr4fhvxqgvyqm1h1jbqjbi"; + rev = "cc2c7d130d7ae5f1402c5edcad53237d9d63fe87"; + sha256 = "18s6bcddwc8h34bn59xq4hkrn1gyhrqrkwc8y2bz4zsffmjd99z7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7861,12 +7903,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20180129.1017"; + version = "20180211.538"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "c51903c8ba144ddb8e2b742db5daa572e09e6b97"; - sha256 = "066fvw3dgnrakl5bjpmkymnvv0nzhlbil15xhaywdygy2cylm00d"; + rev = "36f1934dc8ff9557e3abef9a93ac468ac453404c"; + sha256 = "0n3xk50jkj2k04j80p1wlxicagh1mrhgsxs4lfgdqsj4ypb9s1ay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8524,12 +8566,12 @@ clojure-cheatsheet = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "clojure-cheatsheet"; - version = "20161004.2328"; + version = "20180201.4"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-cheatsheet"; - rev = "57e877d9466934b5319989b542f93b42dffec9ae"; - sha256 = "1d61q50h4vxk8i3jwxf71rbqah7ydfsd0dny59zq0klszfz2q26b"; + rev = "85c382317a56bbdfac03ae95999c28fc0cde65d7"; + sha256 = "0w9l6nz583qyldz44jqdh4414rgm6n2fzbaj5hsr5j1bkdizq7xl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0569da79bd8145df334965c5d4364a50b6b548fa/recipes/clojure-cheatsheet"; @@ -8545,12 +8587,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20180121.1011"; + version = "20180202.922"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "59e9247d64ca82d1e01bb21ee49df1220120fb0e"; - sha256 = "1ngirh0kp53i2qcvzkf84av8fijp23rfjfhwzkwhiihs3zy63356"; + rev = "5cf0fd9360dc5a9a95464601319062673d213807"; + sha256 = "07ignia68340fjd0qnlrmgb7p6v15xysjx30xxfvd215slpjc4qw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8570,8 +8612,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "59e9247d64ca82d1e01bb21ee49df1220120fb0e"; - sha256 = "1ngirh0kp53i2qcvzkf84av8fijp23rfjfhwzkwhiihs3zy63356"; + rev = "5cf0fd9360dc5a9a95464601319062673d213807"; + sha256 = "07ignia68340fjd0qnlrmgb7p6v15xysjx30xxfvd215slpjc4qw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8629,12 +8671,12 @@ clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, simple-httpd }: melpaBuild { pname = "clomacs"; - version = "20180113.1550"; + version = "20180211.421"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "38240d15e4929a3c9f3788815f9743a855926812"; - sha256 = "0vql6hcraa6y6njxz62kwwfnkhl8l2gjs52bvpgsrgrkq471w48h"; + rev = "2fa47d068f4955424e810cbe94d861a103efc259"; + sha256 = "0m57hvq8s6cigv7ajmim71320bj06a2wk9v82pbvxpjqyyijpkym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -8776,12 +8818,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20180122.1301"; + version = "20180212.258"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "21c1ca99393ea0160f0503a6adb8f3606d33926a"; - sha256 = "11kqczlc8rwq9v9wk15h8hzhdffz9nxifr9laa07bx74yiddxmyj"; + rev = "91dd693dca350d0744fcbaa2b5a36029fb17adcb"; + sha256 = "1gy32n8xslgdsrw9riiy1rf5pxsqiwp7is71qc6z2qp2fn2dr83j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8801,8 +8843,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "92cd3d06772ada13935790d66927ab4663c7d628"; - sha256 = "03f04yn0gphcd4664w73pdpmq46ljkvxbv7xyg5s084j5mk263hx"; + rev = "0465d3c204e8cc7c677dd6a34d3ea884bc5e7954"; + sha256 = "08xv33w6ai51zfsqh73cfcyc6b2dalqqpgavqh4gxp7g34zncg5h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9242,8 +9284,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-solarized"; - rev = "74a7065808f82dbdd9638ae33ed0e4f7a55da35c"; - sha256 = "1af6j8qyzcm4x5p2wkhfh6f62n5i4fapjfrii3rl3l9im39fl8jc"; + rev = "6dd1d67a8e88a7bd586572cabe519b99a90fc3ee"; + sha256 = "08bxyrpx7shgzgnmklshgdfa457imdmn5rv4j3pyp8pfwf0zg9h5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-solarized"; @@ -9259,12 +9301,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20180122.1154"; + version = "20180210.2104"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "0358ee25ba27741a41c62414785308b417cdc308"; - sha256 = "1dqssw407f9d4bbaks9k921fzcs2fz7ccbwpcm22ly46krlzxfpi"; + rev = "17bfc80dec721914299b50ef48ce47a5c18bb6b0"; + sha256 = "1jlkpp027xfsgyw5kw9wigwxrlgihj01x76rpp2mly9pghggx6mb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9553,12 +9595,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20180123.1315"; + version = "20180211.1604"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "d789f2643c11f7c53fc47ed9d9b271bb6f6718a3"; - sha256 = "0kqpjxbv9gfkki5cz78dslfgwwf2n15y32dq059lmbfm4mg9f5n4"; + rev = "38ef92d6273113c2b3d2a302129ad37a30f98998"; + sha256 = "0l9hhflmirv1a0znjsg6ysvrsg270pwnkmhakihhqy39fgv3qdfa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9668,13 +9710,13 @@ pname = "company-axiom"; version = "20171024.1310"; src = fetchgit { - url = "https://bitbucket.org/pdo/axiom-environment.git"; + url = "https://bitbucket.org/pdo/axiom-environment"; rev = "b4f0fa9cd013e107d2af8e2ebedff8a7f40be7b5"; sha256 = "0p2mg2824mw8l1zrfq5va1mnxg0ib5f960306vvsm6b3pi1w5kv0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9f07feb8686c76c330f282320b9f653dc16cadd5/recipes/company-axiom"; - sha256 = "1qjy2idyfwa1a4z1v05ky26dzq8hs6aaszq4bifd7vymasvnamml"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/company-axiom"; + sha256 = "061n8zn11r5a9m96sqnw8kx252n1m401cmcyqla8n9valjbnvsag"; name = "company-axiom"; }; packageRequires = [ axiom-environment company emacs ]; @@ -9746,22 +9788,22 @@ license = lib.licenses.free; }; }) {}; - company-childframe = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + company-childframe = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, posframe }: melpaBuild { pname = "company-childframe"; - version = "20180124.1744"; + version = "20180205.2236"; src = fetchFromGitHub { owner = "tumashu"; repo = "company-childframe"; - rev = "bb3d778bb12d47c7f2311eecb17985a5695acd31"; - sha256 = "1b1xyy0f20ls7v695vg6m5g0vb3pn7v7vdbsziarf2jaqgc8ps57"; + rev = "fb799c3c8f8099a0ec7d21beb3b90136704c741e"; + sha256 = "121qqb797vfpfxxkk0gvh5x4p03lb6aarjfydl88ah6rw5087dij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4fda072eb1e3f4feb9ad9834104f748f5b749a0d/recipes/company-childframe"; sha256 = "1l8bd9fnw49apvwjgrlfywascbczavpaxns2ydymmb6ksj00rvzy"; name = "company-childframe"; }; - packageRequires = [ company emacs ]; + packageRequires = [ company emacs posframe ]; meta = { homepage = "https://melpa.org/#/company-childframe"; license = lib.licenses.free; @@ -9970,8 +10012,8 @@ src = fetchFromGitHub { owner = "PythonNut"; repo = "company-flx"; - rev = "05efcafb488f587bb6e60923078d97227462eb68"; - sha256 = "12cg8amyk1pg1d2n8fb0mmls14jzwx08hq6s6g7wyd9s7y96hkhb"; + rev = "16ca0d2f84e8e768bf2db8c5cfe421230a00bded"; + sha256 = "09zaaqi8587n1fv5pxnrdmdll319s8f66xkc41p51gcs2p7qa5w1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f27d718ee67f8c91b208a35adbbcdac67bbb89ce/recipes/company-flx"; @@ -10176,12 +10218,12 @@ company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "company-lsp"; - version = "20180122.1747"; + version = "20180211.2052"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "0f750d4cbde7063472b1f25b7cef7e632ae307cb"; - sha256 = "1xszd359y7f93azf1b8805v4s99ql4hfajbz9nzwkb5py1jqxxn0"; + rev = "b58c8c4cbfb0e01ee9020f09dfd25cfadda58cc1"; + sha256 = "1fs92qd0ni7bwbbccyjycrklcdb1nwms6yabfwr37aizkbrg28lw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; @@ -10306,8 +10348,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "1ad972b0394f0ecbfebae8041af96a1fe2e24cf0"; - sha256 = "07hljgfl1d6dg50dflr467fdif39xxp0jap46x85gilrlw458hp6"; + rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; + sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10459,8 +10501,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; - sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; + rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; + sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10494,6 +10536,27 @@ license = lib.licenses.free; }; }) {}; + company-solidity = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-solidity"; + version = "20180206.821"; + src = fetchFromGitHub { + owner = "ssmolkin1"; + repo = "company-solidity"; + rev = "0687c09671403888b88e27d58e70f1bc969d1425"; + sha256 = "1clxzxyvnnf6mvadlqslbn7is7g2b625mnb4c5k7iyflc081wpz2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ef246601ff6d92d6dfcd809f637e50d9838da0b8/recipes/company-solidity"; + sha256 = "076z5jqh486k2lkh9rgbhs71bws4fba68pjybr9yyf0sdc5m7kc6"; + name = "company-solidity"; + }; + packageRequires = [ cl-lib company ]; + meta = { + homepage = "https://melpa.org/#/company-solidity"; + license = lib.licenses.free; + }; + }) {}; company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }: melpaBuild { pname = "company-sourcekit"; @@ -10560,12 +10623,12 @@ company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }: melpaBuild { pname = "company-terraform"; - version = "20171215.546"; + version = "20180131.1503"; src = fetchFromGitHub { owner = "rafalcieslak"; repo = "emacs-company-terraform"; - rev = "1730e03aec5e67b751f50469c978e83326eae7f3"; - sha256 = "0ha98424vzb4sx03l88mc1mspjl9h5aypkj3jqyla7sxga8a3ifa"; + rev = "74dad245567e06e758e1112c0d75f3eccf48e32c"; + sha256 = "0y4giv3i947258j5pv6wpzk95zry8sn8ra66m1237lk0k9zhpfdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform"; @@ -10648,8 +10711,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "7f394d02f6f3149b215adcc96043c78d5f32d612"; - sha256 = "0q7y0cg2gw15sm0yi45gc81bsrybv8w8z58vjlq1qp0nxpcz3ipl"; + rev = "e21c99de8fd2992031adaa758df0d495e55d682a"; + sha256 = "1l9xsqlcqi25mdka806gz3h4y4x0dh00n6bajh3x908ayixjgf91"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -10875,12 +10938,12 @@ contextual-menubar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "contextual-menubar"; - version = "20170908.408"; + version = "20180204.2309"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "contextual-menubar"; - rev = "67ddb1c8eec62e2b26524c09585a4f25f03ebb11"; - sha256 = "06rfkv7q9brahjgaqvpixqb26v4a65hyphl7ymjx8qyyypzrzac5"; + rev = "f76f55232ac07df76ef9a334a0c527dfab97c40b"; + sha256 = "0zks4w99nbhz1xvr67isgg6yjghpzbh5s5wd839zi0ly30x4riqf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cba21d98f3abbf1f45d1fdd9164d4660b7d3e368/recipes/contextual-menubar"; @@ -11085,12 +11148,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20180114.1336"; + version = "20180211.1029"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "ffc34c666c2b214d01e3f722249f45d1672566bb"; - sha256 = "0gzf8l0clh2p86m6xcygykskhigr43cpwfvj1sl06mcq600fxavn"; + rev = "cc5197d5de78ba981df54815c8615d795e0ffdc5"; + sha256 = "0c8866mb2ca419b6zh153vp298dxwldj29lbrynwr1jlpjf1dbr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11232,12 +11295,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20180105.632"; + version = "20180204.1147"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "4d78ae8c90e8ebb903b8e70442989a69e46ff069"; - sha256 = "0s81jrmfql3cjh0bf6vfk3gpb94xqcpbkvjah11j0d0ijgw4y1dg"; + rev = "1c1e7eff065e1660981428ef326185c404488705"; + sha256 = "18b66rv73y6gx0hhjjfixywj0ig41rxb4k4ngpxap56cy7b8kfj9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -11484,12 +11547,12 @@ cquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "cquery"; - version = "20180129.1017"; + version = "20180204.912"; src = fetchFromGitHub { owner = "cquery-project"; repo = "emacs-cquery"; - rev = "275bf669d14bfcbd342833c245fa9129c5ff76a1"; - sha256 = "0rm0m35sqwas9ayx8lvq19g04y3ndnhfgl7mpfmmjqab9pcqdrjn"; + rev = "e3ce2127f9937eb0a7b7a22e81f205ff150f4ecd"; + sha256 = "1p3idygppqi5xgbjq9pr5pqpm4isw1cb8qq8szf5mb6ypq2dlszm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3cd3bffff0d2564c39735f844f9a02a660272caa/recipes/cquery"; @@ -11803,8 +11866,8 @@ src = fetchFromGitHub { owner = "kkweon"; repo = "emacs-css-autoprefixer"; - rev = "2b18f38978845a18c66218e1abf0db789137073f"; - sha256 = "00y3ip6n0w9w6cyfrf3xqlrx2gqzq3b61n8c0bgjlvw85drjz2pd"; + rev = "a694e7e725074da99d90b18dd166707f1649bfae"; + sha256 = "0cd4i9xbc7rqsmaa73gj4p9za3g6x6xv54ngnkf6vprpg3g7lb6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/122e3813a5b8a57303345e9cd855f4d85eced6f0/recipes/css-autoprefixer"; @@ -11992,8 +12055,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "682e9f66ce16daf166549c1a16dd3a110894a8ea"; - sha256 = "1mz3m4cs7bm8di8lgi7clkl2fjy4663ir54l32f8l73wjic6c90a"; + rev = "84053d1c023721706ac5cbecf152e2cc71080518"; + sha256 = "1v5ya14ayj719x98swbrv7spsa5rzcxzzh1k18fpal7mqmzvy6jz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -12244,8 +12307,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "eb17d235aade6e338841bf4e53108e1a7c832190"; - sha256 = "1rf73qcyxf48pfxdrnr2bhqy8k5zj001dhixmg1d35z28cwx975n"; + rev = "829d7bbef5173771bcf9ffdf2e7e30e96f98e99e"; + sha256 = "10671yczbixg90x5c8rgd838w5la21x9jqdm03vcrz03i2ccjs99"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12405,22 +12468,22 @@ license = lib.licenses.free; }; }) {}; - dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: + dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lcr, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20180125.116"; + version = "20180202.48"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "5fb1765fcf5ac896c8d439d7f2d4030672e7509c"; - sha256 = "11nj1x9yxdkwvpsz7lkc9msgnkbzkrcw088nfryic9398mnrrccf"; + rev = "c1c9bde9a83a87c46731466af56cd31262d057fa"; + sha256 = "01krdh3cz2ddhlhpyc072izm4y29qbpjkmwj0fq4vi5hcqzbalsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs"; name = "dante"; }; - packageRequires = [ dash emacs f flycheck haskell-mode s ]; + packageRequires = [ dash emacs f flycheck haskell-mode lcr s ]; meta = { homepage = "https://melpa.org/#/dante"; license = lib.licenses.free; @@ -12639,12 +12702,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20180118.743"; + version = "20180206.2124"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "c1991d4c22f356be21df6b3badd7233a94df7937"; - sha256 = "14d4jlsymqsggdw12drf1qi7kwad9f43iswkyccr3jwg51ax00r7"; + rev = "48a5015dd1314a8bcad48f2ad8866dd911001b01"; + sha256 = "0cs8l20fw34ilr7qir1p708wx925d3qkp7g4py2s2d8k1yf0kjmy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12685,8 +12748,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "c1991d4c22f356be21df6b3badd7233a94df7937"; - sha256 = "14d4jlsymqsggdw12drf1qi7kwad9f43iswkyccr3jwg51ax00r7"; + rev = "48a5015dd1314a8bcad48f2ad8866dd911001b01"; + sha256 = "0cs8l20fw34ilr7qir1p708wx925d3qkp7g4py2s2d8k1yf0kjmy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12762,22 +12825,22 @@ license = lib.licenses.free; }; }) {}; - datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + datetime = callPackage ({ emacs, extmap, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "20180118.837"; + version = "20180205.1445"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "d99e56785d750d6c7e416955f047fe057fae54a6"; - sha256 = "0s2pmj2wpprmdx1mppbch8i1srwhfl2pzyhsmczan75wmiblpqfj"; + rev = "2a92d80cdc7febf620cd184cf1204a68985d0e8b"; + sha256 = "0lzdgnmvkvap5j8hvn6pidfnc2ax317sj5r6b2nahllhh53mlr4j"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime"; - sha256 = "0mnkckibymc5dswmzd1glggna2fspk06ld71m7aaz6j78nfrm850"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime"; + sha256 = "0c000fnqg936dhjw5qij4lydzllw1x1jgnyy960zh6r61pk062xj"; name = "datetime"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs extmap ]; meta = { homepage = "https://melpa.org/#/datetime"; license = lib.licenses.free; @@ -13357,8 +13420,8 @@ src = fetchFromGitHub { owner = "cqql"; repo = "dictcc.el"; - rev = "a77cf1fadadcbde762466970b503c8a8916b35b2"; - sha256 = "0aaah14nc8ajqhbjmwp7257k2n8ay6g87spb734kxfs8irzg52fa"; + rev = "7b988413f7719820cd846827525142a23f401e50"; + sha256 = "0fiv0qgpqwp6ccakr1wh713pm2ylyvl2i54557fym80zgi9iff96"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e867df96915a0c4f22fdccd4e2096878895bda6/recipes/dictcc"; @@ -13395,12 +13458,12 @@ diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diff-hl"; - version = "20180123.1420"; + version = "20180201.355"; src = fetchFromGitHub { owner = "dgutov"; repo = "diff-hl"; - rev = "9ef21e4ea2389545417741e20a89d92bfd72d6ff"; - sha256 = "0fj4yjmvfbzqrcmngfbszvr1i8i17ap4lb99idyc9drgiq53xdw1"; + rev = "190622d3fa2c3237529ec073a8fa00aee06023a1"; + sha256 = "0jh270anr2ralixgwsc3wn48jnw3qwz6m18lg0sgwgzyajh0fpb9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl"; @@ -13583,12 +13646,12 @@ dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dimmer"; - version = "20180124.1822"; + version = "20180210.1348"; src = fetchFromGitHub { owner = "gonewest818"; repo = "dimmer.el"; - rev = "7dd76eb41f5684928365b28301412e8aff7235a9"; - sha256 = "14gf6z1pgy8rkxb2777yc7ng94y0yf3rppq3gfb98xfcl09ff06n"; + rev = "263d330d8f9e99c9c3d3235fe6cf90ecaca90e7c"; + sha256 = "1dg5pf54w9479br40i0b66y86xdn1xj99iq7rmagzva908q5rpyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer"; @@ -14171,12 +14234,12 @@ diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diredfl"; - version = "20171014.1402"; + version = "20180210.1814"; src = fetchFromGitHub { owner = "purcell"; repo = "diredfl"; - rev = "085eabf2e70590ec8e31c1e66931d652d8eab432"; - sha256 = "19gjs90ai6fv4q7rhssrgc45d9g4frg680p1jgmbxzrd9jdy013w"; + rev = "9b2a89951cee8bdf5c0cb67f9c3ad6ac73abf9cb"; + sha256 = "0x4qhxysmcwllkbia6xkfmlpddxhfxxvawywp57zs8c00193nn1z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl"; @@ -15102,12 +15165,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20180128.2355"; + version = "20180205.1204"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "f7c05d390fa733ec7998025d407608fe9f67c111"; - sha256 = "18c3347n3x327qnpd0ab8j74zqs4yb5rn6gz0x2y8kknzzn4h76q"; + rev = "d84a0172202243f4fe0ae5738d7ea9b1eb2d38c6"; + sha256 = "0za6cq7wr7zpqjq5g6ac7zqnzq544s0zkkhsc0djcwc2x67vr95g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15144,12 +15207,12 @@ dotenv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dotenv-mode"; - version = "20171123.649"; + version = "20180207.1114"; src = fetchFromGitHub { owner = "preetpalS"; repo = "emacs-dotenv-mode"; - rev = "8d45b98beb04f486eb13d71765589e7dccb8ffa9"; - sha256 = "00hm097m1jn3pb6k3r2jhkhn1zaf6skcwv1v4dxlvdx8by1md49q"; + rev = "f4c52bcd5313379b9f2460db7f7a33119dfa96ea"; + sha256 = "1fplkhxnsgdrg10iqsmw162zny2idz4vvv35spsb9j0hsk8imclc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fc022c54b90933e70dcedb6a85167c2d9d7ba79/recipes/dotenv-mode"; @@ -15522,12 +15585,12 @@ dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dtrt-indent"; - version = "20171001.1233"; + version = "20180211.946"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "7fd55af3b0311ea24b68397054e705c835fa5ef1"; - sha256 = "1sgmd1zqdwa1f6y8d6vaacyipkqn2ivvaim1xndbkihgmhyn4kf0"; + rev = "34f2e23de514deeb61888557e66ccc9790ff8eed"; + sha256 = "09fjr4m5cxgfdxpnrlc7hdvckz0l0lrx1vyglb7kwyyacyp1vdly"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; @@ -15983,12 +16046,12 @@ eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "eacl"; - version = "20171109.40"; + version = "20180204.1911"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "eacl"; - rev = "0ee57b495036b6c1b54d668e84be373f8a1c8d9a"; - sha256 = "1fizb09g0dc9rzlj34n26vi12h3gk4mn96iyrsa60in5c9yn9f04"; + rev = "ec601f3a8da331dd0a9e7a93d40ae3925bd06700"; + sha256 = "1kgayh2q97rxzds5ba1zc9ah08kbah9lqbwhmb7pxxgvgx9yfagg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; @@ -16050,8 +16113,8 @@ src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "62a79c5d359674c95719dd129260e4e1f6e760bd"; - sha256 = "084a99klm1lpjvsfls1m2zgwrh4wbwwj4fw7xb84qw5fzzy32ba1"; + rev = "abf4dfcddacfc90ee39aad3c9e2e4615fb74c6a1"; + sha256 = "1kxkqpf0xq6w1g8qvy32hjqy42mz17c36wrkqqwdbxhbq7d5ckyw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -16071,8 +16134,8 @@ src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "9a66d5c5dddac7d5b924df0c3bb414d3f797d8a5"; - sha256 = "0qx6lgpg2szjgy1a3a856klm7vh544braq8v2s7f81lq0ks2bjhj"; + rev = "b3176d34f1e2850ab96795e264da6e05e23e280b"; + sha256 = "175by3aswpd00lhin69f2jkb1aqi487vzk3qa6wqp41hjpga6fag"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; @@ -16193,12 +16256,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20180111.30"; + version = "20180204.1402"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "8c4735fbd7864a8420a16378ac2240fa60af5332"; - sha256 = "0g6prr8512dkr4mizqy1jkqc60w88i7kcx1lbarqi2mfkqdhhvg6"; + rev = "7212edd2f54f2e289230b8d884dfcb3155c65fcc"; + sha256 = "11fmi0pxx83qmhh62ilc6i2icrl7x8pj34rrkxlc5plyph8cczjd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -16655,12 +16718,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20171208.2036"; + version = "20180211.2028"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "15e26cf5a5a656735fa25bfa75164f0893f4688a"; - sha256 = "0fyncdkxvlbsr4lv686djy2a1wm5qpcnjrkc3zdsbrr6wq8ildgh"; + rev = "f52d2133f3948221ba84a396c693eff958fc0eb9"; + sha256 = "1ml9hgsyndzn03bz4a81yhalfg34mk5il56kqv4bhqkwjkl1axm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -16856,8 +16919,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "5eeb1b8c8d8e2f394724700f930c9063b9fd279d"; - sha256 = "1kx574bqjsgcri40qhkw8p2rg0rvcbwhbrmiyd5znprk5pz5x1ps"; + rev = "bbcd5d93f3cd61b593c4d565a374ccc8bafa9020"; + sha256 = "19am1hmi3gjpwqmjnlsqdnvwr225y212lr9ff37jkyhdfny71lnr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -17004,30 +17067,22 @@ license = lib.licenses.free; }; }) {}; - ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: + ejc-sql = callPackage ({ auto-complete, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20171227.259"; + version = "20180212.55"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "afb3e6f1e82abec5407c7a3335bf1c70fa3690d6"; - sha256 = "0q8c35jnxgxmbbbpz4iv3x45ylckq4qi0pq05am5rf5rywlw00v1"; + rev = "0981cdf3ecef13a6be1d15bfad303d71ba85e625"; + sha256 = "105y6rfyfcdgzc0xi3dy7y919dm51330sbg2acfpgsqkmiwpp6j7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; sha256 = "0v9mmwc2gm58nky81q7fibj93zi7zbxq1jzjw55dg6cb6qb87vnx"; name = "ejc-sql"; }; - packageRequires = [ - auto-complete - cider - clomacs - dash - direx - emacs - spinner - ]; + packageRequires = [ auto-complete clomacs dash direx emacs spinner ]; meta = { homepage = "https://melpa.org/#/ejc-sql"; license = lib.licenses.free; @@ -17061,8 +17116,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "67dcb92c972f67f81c0667ee95d97f05eaa1907b"; - sha256 = "0yhcpcp22n4mj8yq2m9p020mzcmjcv3fb1vw7bnbz8qc42g58xai"; + rev = "63fa39d86deba5d03ac8f7f9a103e94d6c80739d"; + sha256 = "15jxnkvgk700qi79d8jj96ss2mb7yfsgzhi0mama4dp5gancps27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -17330,12 +17385,12 @@ elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "elbank"; - version = "20180125.823"; + version = "20180206.701"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Elbank"; - rev = "0b39f801ff614dd2cf36532ed12327138ac36682"; - sha256 = "1yk9mbjcw13lh8cwmwwq6i9ma5hrv7aiqwfsj0rn4x9vygsxwhgi"; + rev = "817047305e9db1260956ae5ac6b60c9027868895"; + sha256 = "0i5nqfjm69kbvnkvrcvfv8gbz0608cldmi3zwq2vpld7p35d5d26"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank"; @@ -17348,19 +17403,40 @@ license = lib.licenses.free; }; }) {}; + elcontext = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, osx-location, uuidgen }: + melpaBuild { + pname = "elcontext"; + version = "20180204.138"; + src = fetchFromGitHub { + owner = "rollacaster"; + repo = "elcontext"; + rev = "c223476b62a55b80f6b85b2e016d3ec0d7ec9875"; + sha256 = "1ynwgr1g421liyfyfli2cgfdqx3gijm4z9hd0cmhndfwalrb1xq6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/12bcb0bfc89c1f235e4ac5d7e308e41905725dc6/recipes/elcontext"; + sha256 = "1firdsrag7r02qb3kjxc3j8l9psvh117z3qwycazhxdz82z0isw7"; + name = "elcontext"; + }; + packageRequires = [ emacs f ht hydra osx-location uuidgen ]; + meta = { + homepage = "https://melpa.org/#/elcontext"; + license = lib.licenses.free; + }; + }) {}; elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elcord"; - version = "20180125.659"; + version = "20180203.1417"; src = fetchFromGitHub { - owner = "Zulu-Inuoe"; + owner = "Mstrodl"; repo = "elcord"; - rev = "8fe9c8cd6b5f32aab28fa4e12e3af2c113c7c0eb"; - sha256 = "0ka732ij7ahrqx6xm6s7yncazlpw530ck9dxy06m2rax7gfm6l51"; + rev = "a97824ead7c63fb114a9f34ed46a8401407fb4ea"; + sha256 = "12mjmdr5kwmgpihnc943widbbw5pcp0gw1mcjf06v4lh0fpihk7h"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/36b64d0fead049df5ebd6606943a8f769324539e/recipes/elcord"; - sha256 = "044mwil9alh2v7bjj8yvx8azym2b7a5xb0c7y0r0k2vj72wiirjb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf2c52366a8f60b68a33a40ea92cc96e7f0933d2/recipes/elcord"; + sha256 = "0a1f99mahaixx6j3lylc7w2zlq8f614m6xhd0x927afv3a6n50l6"; name = "elcord"; }; packageRequires = [ emacs ]; @@ -17435,12 +17511,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20180114.1000"; + version = "20180204.1405"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "63661980cef82a8032108f5ce14d5bd4f44d1255"; - sha256 = "1wanfvhx3wv3iych0v93kaxapg86vzgbsd8l7r460s8l2nl5yybr"; + rev = "478a976db3ea764f9c88c3302fb3bea1ab41f1ca"; + sha256 = "08qzi8wvlf64xfhhndnmr9xksk3n9whzvjqaikf5kz1jrygncnrp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -17589,12 +17665,12 @@ elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed-protocol"; - version = "20171214.2319"; + version = "20180204.2003"; src = fetchFromGitHub { owner = "fasheng"; repo = "elfeed-protocol"; - rev = "97049eb980ce1cc2b871e4c7819133f1e4936a83"; - sha256 = "1d2i3jg5a2wd7mb4xfdy3wbx12yigqq4ykj3zbcamvx59siip591"; + rev = "e809a0f1c5b9713ec8d1932fa6412c57bc10150b"; + sha256 = "0ly7g9a85r5vm8fr45km43vdl9jbzdqyiy9a7d95wx63p6aip7vs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; @@ -18072,12 +18148,12 @@ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20180119.54"; + version = "20180210.1445"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "1fc5e18c3e26f085167201147f9fe2bfb6fd167a"; - sha256 = "03a1nai4l7lk7kh196wvpxnmhqvmqv6jkqgkr9jqk326k2d5mwnp"; + rev = "a86165de49f44013ba07d92d90f949a22ff9299a"; + sha256 = "0b2qpsxrda2h2x82sqqqg7vqi6a1hx1jagri4al7sl9s74axdkr4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -18311,12 +18387,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "20180129.124"; + version = "20180202.958"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "09bbb07688c0c14130c5e38837aa26b8d607829d"; - sha256 = "0623fzyjjx08i98zmxpq4mcamr83jqj76nfn8ck0ql9k3bss1zlv"; + rev = "99840665f3ffff36633d52b9970352fc523434a6"; + sha256 = "0hfpbfvk2f20sy1gia77aw7ndyxpc268bk4n2n6zlfb4j9jcp2sf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; @@ -18416,12 +18492,12 @@ emacsql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "20171218.1903"; + version = "20180205.1835"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "62d39157370219a1680265fa593f90ccd51457da"; - sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; + rev = "75ac0448a5965c82c616c862cab180c241110fd2"; + sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; @@ -18441,8 +18517,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "62d39157370219a1680265fa593f90ccd51457da"; - sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; + rev = "75ac0448a5965c82c616c862cab180c241110fd2"; + sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; @@ -18462,8 +18538,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "62d39157370219a1680265fa593f90ccd51457da"; - sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; + rev = "75ac0448a5965c82c616c862cab180c241110fd2"; + sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; @@ -18483,8 +18559,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "62d39157370219a1680265fa593f90ccd51457da"; - sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; + rev = "75ac0448a5965c82c616c862cab180c241110fd2"; + sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite"; @@ -18793,12 +18869,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "20170628.303"; + version = "20180210.310"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "8c72282c98f9b10601e9a6901277040cda4b33aa"; - sha256 = "1h37kqhsi1x5xgxfp1i72vfdx5c2klblzmphf6mih3fvw3pcyxi6"; + rev = "6d526fe618c3cebf7fbc5f0d3f0a225de16a76c7"; + sha256 = "0jq67lngpz7iqwqfsl95r5p26cnnq7ldcj534nm86hwm6jfij564"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -19225,12 +19301,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20171217.1730"; + version = "20180201.1340"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "3d3ab18436ad6089496b3bce1d49c64a86965431"; - sha256 = "0p821zwpiznjh736af5avnx9abssx0zbb9xhs74yhh1mcdi1whq7"; + rev = "2819a9c2ae2bc6d095887c2cbb6f9bd8617f1e52"; + sha256 = "1cfr9xs268nwjjhx7n00h5sssm479bzd5f7c847hg6x2hyqkfzxb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -19359,12 +19435,12 @@ epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; - version = "20180127.351"; + version = "20180205.1249"; src = fetchFromGitHub { owner = "cask"; repo = "epl"; - rev = "28af1ab1217c46367ab5f29d72a57fcc6d9cd45e"; - sha256 = "0hgqhzgbsi3gmnj0809mh1mqib4yrx16ibyn8j0h7v02dms4pk9q"; + rev = "78ab7a85c08222cd15582a298a364774e3282ce6"; + sha256 = "0ksilx9gzdazngxfni5i632jpb1nprcxplsbhgqirs2xdl53q8v8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl"; @@ -19547,12 +19623,12 @@ erc-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-image"; - version = "20180118.739"; + version = "20180206.941"; src = fetchFromGitHub { owner = "kidd"; repo = "erc-image.el"; - rev = "0fcfe9283f75ec657d513c901c35cdbd48c8d2b5"; - sha256 = "1byxpz6v272ilkbxf2br8qksczq7s7l1vjbcvwsii68r7s7lf1yl"; + rev = "9f4d7b93a3c7e12ac935b50943177923a8c01d22"; + sha256 = "0dd2v91rp3lai10258bszpd9wsa1lvx08xspsnijv64axh73yf7r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-image"; @@ -19908,8 +19984,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "fc6eb93ae081ac5ebf715e53d0d2519067fcea95"; - sha256 = "07fizaia7pvq4fzjmw7461qn4mkl0346377mr2nqnva1h8r48mz7"; + rev = "5e7286acceec0811fd95898c7337921ac91c97b4"; + sha256 = "0ccynwiajdcb3h2xhb2y91kgf61pj9i3h3h4g4d6142j3mr4anl4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19988,11 +20064,11 @@ ert-junit = callPackage ({ ert ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ert-junit"; - version = "20161018.1217"; + version = "20180207.1348"; src = fetchgit { url = "https://bitbucket.org/olanilsson/ert-junit"; - rev = "c4cd27b60f9e7ccd05fd8a2097cde947eb250599"; - sha256 = "0zm71kv4wxs6yf70qwrfavxc1845bg4aqqk36zypy17g1x40bms7"; + rev = "45a359a94dbeb00838df5dbee15ad42e061af431"; + sha256 = "05nwq8w7rczmn41bxz97sinn561rx8vb01dv0hsx0xllni7xwf59"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit"; @@ -20533,12 +20609,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20180128.1545"; + version = "20180211.1419"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "ec2c2f5649d01071ce9a7079072ef415f9426149"; - sha256 = "0sp1q6wrv3q0w8rlhj390v2584mdwswznj0nyp42bf8qdb74ba87"; + rev = "2622184dca12e76c856443251ee61066af5392ee"; + sha256 = "0w7c7g8kxni5bgaxmmjp57z5di7r500yvvcpldr0n4cjx7qf9gjg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20701,12 +20777,12 @@ eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: melpaBuild { pname = "eterm-256color"; - version = "20171221.1837"; + version = "20180202.1722"; src = fetchFromGitHub { owner = "dieggsy"; repo = "eterm-256color"; - rev = "a5560abfa81242dc45ab0342e41e33f6c7e6bc1e"; - sha256 = "0md53lhpxh1yqirfjgx8fq8vsh5zbl2v2hn63nkyh60rv3sc4jkm"; + rev = "72b2d650a173c39648f1cb0f2b68fab5a6886d79"; + sha256 = "15vj55l71v9yzl7cw4yw7lc71045xa3y6q0hn8a5pmakmb6fiwdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color"; @@ -21037,12 +21113,12 @@ evil-collection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-collection"; - version = "20180128.1213"; + version = "20180202.1722"; src = fetchFromGitHub { owner = "jojojames"; repo = "evil-collection"; - rev = "52462cb8bfc523f93e20aede2d1936c32fdf14b2"; - sha256 = "0h01pa5zwh3jf7kfdl4vy5f8lcv147m1pcsmkmkg51qn520qr7f7"; + rev = "f04fd5eef32728cb146d2dc5f3701b1d4733a2bf"; + sha256 = "12magy7l325cfi25b8y8gd5b9n3smhn3w07mxb4nbp3rfg7nv2db"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7538c9eb00b6826867891b037e7aa537ac5b160/recipes/evil-collection"; @@ -21289,12 +21365,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20180116.653"; + version = "20180210.938"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "a1a62d2b562b9fc2172868e3b172207948d84bbf"; - sha256 = "1h999mqc84dfq2ysy2n0g2cbrqp2va41z2pdga54imfy899p7hmb"; + rev = "deab4966d75321a9172947ee5cdf2329eb2c5a6b"; + sha256 = "1b4w40x23kbzry80d4rxxynasmrkbry9jj5jkc4l4rcj8lk3vbbi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -21520,12 +21596,12 @@ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "20180129.401"; + version = "20180131.502"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "50bb88241983f0bf06d35a455a87c04eddc11c83"; - sha256 = "1qn5nydh2pinjlyyplrdxrn2r828im6mgij95ahs8z14y9yxwcif"; + rev = "20270ab6b0a3a398942609f7acc3d0162b954591"; + sha256 = "0vnaplchyl1z9d8fhrc83157a6d97dgwdja4y0nm7bkgm1jqgbdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -21923,8 +21999,8 @@ src = fetchFromGitHub { owner = "ninrod"; repo = "evil-string-inflection"; - rev = "ac261bee68444c2cb9aaab25b58509e8f58efe35"; - sha256 = "1b9h7qpmaqwcdj742y76hrs31l7z9aynih9mkwdcnx5fi2a649la"; + rev = "f13a4aab75e5d50c0c63c126c4cbc0067d452d85"; + sha256 = "1i4vc8iqyhswa77awczgqi1vqaxx8png5is1hwisxf0j9ydsgw4c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection"; @@ -22359,12 +22435,12 @@ exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exotica-theme"; - version = "20180119.441"; + version = "20180211.1557"; src = fetchFromGitHub { owner = "jbharat"; repo = "exotica-theme"; - rev = "aca4fb0a6e460317ea1a04bdcb3e5175d30dc172"; - sha256 = "14iwsd1dck3pfa6hh2griwd3y02b432wi2pkknckzp61s912iz0y"; + rev = "e8e4fbb77008bbb50e6733571655e815cc30a5bf"; + sha256 = "1igbis1784f2hs2cdva87nhzjfxaj6h14n2k07r4fy3igfd9qfa0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; @@ -22503,6 +22579,27 @@ license = lib.licenses.free; }; }) {}; + extmap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "extmap"; + version = "20180205.1047"; + src = fetchFromGitHub { + owner = "doublep"; + repo = "extmap"; + rev = "3860b69fb19c962425d4e271ee0a24547b67d323"; + sha256 = "1vjwinb7m9l2bw324v4m1g4mc9yqjs84bfjci93m0a1ih8n4zdbr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/extmap"; + sha256 = "0c12gfd3480y4fc22ik02n7h85k6s70i5jv5i872h0yi68cgd01j"; + name = "extmap"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/extmap"; + license = lib.licenses.free; + }; + }) {}; exwm-surf = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exwm-surf"; @@ -22619,12 +22716,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "20171007.939"; + version = "20180208.628"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "909a84dc5959aac982d1c296e82d687d172d3ecd"; - sha256 = "0mw9h55f708mv0ngixmdn7976yrhqjcnzac80f6mzddpwavgrhd6"; + rev = "8891dc05b54c0ea848ee3bf7b42e759f73c1bb1a"; + sha256 = "1wi1qqzf630ffz0kkk12f81jmm8ii7cckf1wds3phpb67msn5ial"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -22661,12 +22758,12 @@ f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "f3"; - version = "20180109.2042"; + version = "20180130.358"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "f3"; - rev = "f896674c527f41fac8faea2ddeafb2757c7b9766"; - sha256 = "0w605iw5p4z8jzvzq0608jpcp0hdk9x48w1rvqz9hmjncsi3af8s"; + rev = "000009ce4adf7a57eae80512f29c4ec2a1391ce5"; + sha256 = "0q3ylw0i1bg7pzsv4gj72jcfjjfh57vsb3fnfnhhh5i5vladiqsf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3"; @@ -22892,12 +22989,12 @@ fasd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fasd"; - version = "20161216.831"; + version = "20180203.745"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "emacs-fasd"; - rev = "5940b84dfa1ea7225b740d3a8dd215290d964873"; - sha256 = "1wqh7x0c1i0w5lfh0j7xilvp5vmwvbsblp2jd6bz3n5j2ydgpc00"; + rev = "f6393895bddbe9a1c77d4f6963a7e7ec6ff18bc4"; + sha256 = "1bjb20p2sp1avjmr57b3zf15w01fi7h4dd46zahhap1lrk9sxgx9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f0fefb25f03677080c9adeeb48046d6ea163053/recipes/fasd"; @@ -22955,16 +23052,16 @@ faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faust-mode"; - version = "20171122.414"; + version = "20180205.126"; src = fetchFromGitHub { - owner = "magnetophon"; + owner = "rukano"; repo = "emacs-faust-mode"; - rev = "720fd8f5f48be27ceae3c6e3c612b39304484a03"; - sha256 = "0v5i0z90zdbclr0sf17qm95b0hwn5lps253bah1lbfkpsvzxk4if"; + rev = "7c31b22bdbfd2f8c16ec117d2975d56dd61ac15c"; + sha256 = "0a3p69ay88da13cz2cqx00r3qs2swnn7vkcvchcqyrdybfjs7y4z"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode"; - sha256 = "1lfn4q1wcc3vzazv2yzcnpvnmq6bqcczq8lpkz7w8yj8i5kpjvsc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b362e7daeabd07c726ad9770d7d4941dfffd5b19/recipes/faust-mode"; + sha256 = "0l8cbf5i6lv6i5vyqp6ngfmrm2y6z2070b8m10w4376kbbnr266z"; name = "faust-mode"; }; packageRequires = []; @@ -22983,8 +23080,8 @@ sha256 = "0dj35hwkm5v8758c4ssl873vkvplba5apjsh7l23nsmnzdji99zg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d7a6fc9f99241ff8e3a9c1fb12418d4d69d9e203/recipes/faustine"; - sha256 = "1hyvkd4y28smdp30bkky6bwmqwlxjrq136wp7112371w963iwjsb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/faustine"; + sha256 = "1blmz993xrwkyr7snj7rm07s07imgpdlfqi6wxkm4ns6iwa2q60s"; name = "faustine"; }; packageRequires = [ emacs faust-mode ]; @@ -23056,6 +23153,27 @@ license = lib.licenses.free; }; }) {}; + feebleline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "feebleline"; + version = "20180202.1420"; + src = fetchFromGitHub { + owner = "tautologyclub"; + repo = "feebleline"; + rev = "c6a8a955c0f441d4b4663fabd5cecdc92235b74b"; + sha256 = "09g67mkschca2vp73263xm5zf48831zfxlyyfcmkjpsvrgm83ii2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/782295d8c530878bd0e20cde7e7f7f8f640953dd/recipes/feebleline"; + sha256 = "0c604ahhv9c89r3hj7091zhhfpbykh4c23sn6ymqw4pp0dq4pgkj"; + name = "feebleline"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/feebleline"; + license = lib.licenses.free; + }; + }) {}; fetch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fetch"; @@ -23204,12 +23322,12 @@ find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: melpaBuild { pname = "find-by-pinyin-dired"; - version = "20170206.208"; + version = "20180209.1818"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "find-by-pinyin-dired"; - rev = "2c48434637bd63840fca4d2c6cf9ebd5dd44658f"; - sha256 = "0ial0lbvg0xbrwn8cm68xc5wxj3xgp110y2zgypkdpak8gkv8b5h"; + rev = "3b4781148dddc84a701ad76c0934ed991ecd59d5"; + sha256 = "03fw1si115padxss6zb9fr0dsyq1bxlhxikgh4i5swp4jd4331k5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0aa68b4603bf4071d7d12b40de0138ecab1989d7/recipes/find-by-pinyin-dired"; @@ -23225,12 +23343,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20180125.1859"; + version = "20180201.2102"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "7be14de3c737e70606d208d8d443b89e58cd646d"; - sha256 = "1sdnyqv69mipbgs9yax88m9b6crsa59rjhwrih197pifl4089awr"; + rev = "cf20dda6050b11bee871b55f758716d8daa07b46"; + sha256 = "0f4mkhdb56bnyp7wkg4bkv74rl51k4dxciv0zqf5x91lfzhz8jd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -23882,12 +24000,12 @@ flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flow-minor-mode"; - version = "20180104.1348"; + version = "20180204.141"; src = fetchFromGitHub { owner = "an-sh"; repo = "flow-minor-mode"; - rev = "50dded94ad201fdc9453656a8b15179981cd5acd"; - sha256 = "1vaqml0ypbc14mnwycgm9slkds3bgg6x5qz99kck98acbcfijxk6"; + rev = "9a90436f9208a8f4796ce0d5b08f9d1ba5dbbacf"; + sha256 = "012q3rdzg5zrqwx5ywq07h8bzpvv0lnldkv4p1wxlr9yzxxhrv4a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode"; @@ -23987,12 +24105,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20180123.1419"; + version = "20180211.911"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "31122714e1971d8403d9daf5815482bf5118c94d"; - sha256 = "0ag0ffh4lnnsiqfplnjlwd7lnvz3zjnw68a2pf17jgx28jwdqz64"; + rev = "b1c1ead1292b56fdb59916cf9a2e36312979f205"; + sha256 = "1dqkn8j0k2wiv7ycfxgqiblj2dnj95aj7yyy9ijbw1prqmr5dy06"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -24470,12 +24588,12 @@ flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; - version = "20180119.1220"; + version = "20180208.855"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "d4f6fde2ce5cbdbfef44b68affee394c9c891a1c"; - sha256 = "11wg0mgrw2sphfr8dm27x500lyw6lkf94yk8nmlxx2fb2ns1nlyk"; + rev = "0b374e5cd3cc87954e3b6193a671dbc060d88339"; + sha256 = "0g357wm84yc80g3cfxm6ffk15jw49za3qsfh60jij8619k1d6719"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; @@ -24659,12 +24777,12 @@ flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-haskell"; - version = "20180125.1531"; + version = "20180209.1357"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-haskell"; - rev = "f97cefa9b69235bdc9a406c54d223ea26fb33107"; - sha256 = "1kcm0lssjb5lqx556sxxw1v1pvp7hybw38a4sva2s0is3w9pxl1y"; + rev = "cbc4a54c0bb9ab0b9559a1e2b7eb1c02c2f38f14"; + sha256 = "1kxcc12vrxbcpc8wjf9srczlhqjqs8nxdi8z01zd7d5fxcafikwh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell"; @@ -24911,12 +25029,12 @@ flycheck-mmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-mmark"; - version = "20180118.328"; + version = "20180203.932"; src = fetchFromGitHub { owner = "mmark-md"; repo = "flycheck-mmark"; - rev = "b73b40cb9c5cf6bc6fa501aa87a4c30b210c0c5f"; - sha256 = "1w75accl67i0qwadwp7dgpxaj0i8zwckvv5isyn93vknzw5dz66x"; + rev = "7fdcc48ff6ffa5e7db126a76f4948ab08b9eb8d4"; + sha256 = "0g6a8nm5mxgca7psyi127ky68mal0lj7n486fgrwsg3bxglbsk5m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2fd10423ab80e32245bb494005c8f87a8987fffb/recipes/flycheck-mmark"; @@ -25272,8 +25390,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; - sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; + rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; + sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -25289,12 +25407,12 @@ flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-rust"; - version = "20170404.842"; + version = "20171021.151"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-rust"; - rev = "a89c0298f5e8fdcb0c33833ca1eca64632cec053"; - sha256 = "1h2n1y69fxj2naxlyl7056rhggbpmh13ny2rcf0jjr1qnrrq756n"; + rev = "c5838f51d41e1330ec69b46e09f25f9764be1d2a"; + sha256 = "1app3vcv1myabj8wmla5dpifh63c21bmljqvvykz8a9d7hagq3gc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust"; @@ -25331,12 +25449,12 @@ flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-status-emoji"; - version = "20170923.1439"; + version = "20180210.1000"; src = fetchFromGitHub { owner = "liblit"; repo = "flycheck-status-emoji"; - rev = "840e6469c5a83a2438c7e8c5833e3d22b8480f8a"; - sha256 = "0aq0yfa2fic8i364y7m779dsyxgd6mlp38hbl97f3hpsfwrkh34l"; + rev = "ca3d3993cd30d8881dabebd1c540d819967c0212"; + sha256 = "0nqw77q31k6y0lc5v7ly8vnnyl72k8y0jxj9dclqfiq9ch53y3c3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji"; @@ -25541,12 +25659,12 @@ flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; - version = "20170614.1434"; + version = "20180207.843"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "7f394d02f6f3149b215adcc96043c78d5f32d612"; - sha256 = "0q7y0cg2gw15sm0yi45gc81bsrybv8w8z58vjlq1qp0nxpcz3ipl"; + rev = "e21c99de8fd2992031adaa758df0d495e55d682a"; + sha256 = "1l9xsqlcqi25mdka806gz3h4y4x0dh00n6bajh3x908ayixjgf91"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -26637,8 +26755,8 @@ src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "41045e36a31782ecdfeb49918629fc4af94876e7"; - sha256 = "0isvmly7pslb9q7nvbkdwfja9aq9wa73azbncgsa63a2wxmwjqac"; + rev = "497c7e68df5e3b6b8c3ebaaf6edfce6b2d29b616"; + sha256 = "1j15dfg1mr21vyf7c9h3dij1pnikwvmxr3rs0vdrx8lz9x321amf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast"; @@ -26822,12 +26940,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20180107.2123"; + version = "20180211.2037"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "361f2a58151c9e6ab52b59cdd230a3add461a2bb"; - sha256 = "10sgscfw70yw6khzl4nr1w1zh28g7rh4fwr3p2q4ny4z1zsxvbl9"; + rev = "863e9a0d6753ce46e978819a624659ca8d4385a4"; + sha256 = "0smr5a19qvak45hx21j5g507jmrb1g5y19gz3n9yb82darlvpdh5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -27111,12 +27229,12 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20180129.312"; + version = "20180207.1149"; src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "5709e0b621dc56491d4b52782f190744be2ca0a1"; - sha256 = "0a29p14fa2xqbafdl0l5wgrch89klp0v5naqkrn2vii1gfkcyck6"; + rev = "5fb53c851ca2e37f9e71f165d5536d3fcd553466"; + sha256 = "1bqryhbz9hyjvfagss0rdffhpg0j1ay3c0al99dgs0gd3cx2dp42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -27241,8 +27359,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "e6406d573c58ac30eec0a263211ffb4f06437925"; - sha256 = "0ydfhnbn4z50l777y8c1b85mfvk71rvwbjrn43kyqxasxdry5n59"; + rev = "f3a37a6f749262dee56b4dbdac3a974b2413ff95"; + sha256 = "0pddsg1map44sxdljb1gnrzcb60iahxa7hzzffc5q2y1a8iqpd8d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -27300,12 +27418,12 @@ fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fwb-cmds"; - version = "20160523.535"; + version = "20180206.1549"; src = fetchFromGitHub { owner = "tarsius"; repo = "fwb-cmds"; - rev = "57973f99cf4a185b5cccbf941478fad25e8428c3"; - sha256 = "1c7h043lz10mw1hdsx9viksy6q79jipz2mm18y1inlbqhmg33n2b"; + rev = "7d4abf8aa13b2235e4e2f0bb9049ebd6b491f710"; + sha256 = "10xjs8gm9l3riffxip1ffg8xhcf8srffh01yn6ifyln5f70b063d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe40cdeb5e19628937820181479897acdad40200/recipes/fwb-cmds"; @@ -27550,12 +27668,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20180128.1821"; + version = "20180202.1825"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "33783307abab46433ce18273f562b3a729628e8e"; - sha256 = "1vzcfy9qw32xmi7h4g9vlnxp2z2f23s01nqgs5vp42vls5yzdirr"; + rev = "e1603edd6f64094495af34432f0d9be621173403"; + sha256 = "0qab1c3d9glp15sh1b1i40zlg50phhix5c2k0vr2i9j6wl8vc80b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -27571,12 +27689,12 @@ general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20180121.1539"; + version = "20180130.2055"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "cc9983470cc5152c9de584e971ffc8bd38413616"; - sha256 = "039vs972f6gwk9b1wpzs0qkznh6y0jw7cxlc7q5v6hmkx67bch0i"; + rev = "63333fcc7fc181949601b75a4296fd3a338f287c"; + sha256 = "11lfia2jx1vaizd1afln0v5s8y2czkhrrdgn01j1mq104kapxain"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -27865,12 +27983,12 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20180117.1249"; + version = "20180201.414"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "f1b647faf5ce5f033728236b9263e7ecee8f536f"; - sha256 = "1hk3ww1q5h1zywjwsprx7268bq2783d03b0ydzv97klpqniw7rs0"; + rev = "b267bb6c55b0c05aec4d3fe0e9385ab0e1139463"; + sha256 = "10rwl2nv8gk9bzj7cwmgzvcsscgb83aw5ag9jj7sv638w4acmn21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; @@ -27886,12 +28004,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "20180121.1435"; + version = "20180203.1017"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "8dfd995ca4b3b0f94dbf4cc09ec50b8ebedf5c0f"; - sha256 = "0vw4qszisjc07anzmgknxfcancldyq11i9z16w6rkdi1fb7in27l"; + rev = "80a8e9480839eddf1e4e48a23b03ae17d4dffe0d"; + sha256 = "1wdkniszcd5zaqvhfw5j82icf7hh6jy0fg0sifmcmfssvb7xx97n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -27907,12 +28025,12 @@ gift-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gift-mode"; - version = "20171121.653"; + version = "20180204.1358"; src = fetchFromGitHub { owner = "csrhodes"; repo = "gift-mode"; - rev = "f8c9a495e3c6a47dbfdcb719bcbd0f8522297340"; - sha256 = "1lpdx6lb2skjgqwsjcc8wzy6q85sp7d4y97xkibvvv4czchsg174"; + rev = "b8dcb86c7f83df0fbdc0da4f80c187423c936e50"; + sha256 = "01x87aam43xmhx7np9rvrdhln3pwn4zfn4d8s38rdpi77n9prw5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c4c9081a60bdbf4e5fe1ccc4809c0f6f396d11e4/recipes/gift-mode"; @@ -28009,6 +28127,27 @@ license = lib.licenses.free; }; }) {}; + git-attr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "git-attr"; + version = "20180204.15"; + src = fetchFromGitHub { + owner = "arnested"; + repo = "emacs-git-attr"; + rev = "c03078637a00ea301cbcc7ae301ae928b10af889"; + sha256 = "05wzy8g0yjkks0zmcvwn9dmr6kxk1bz91xic3c08b0j1z5lbsdv7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3417e4bc586df60b5e6239b1f7683b87953f5b7c/recipes/git-attr"; + sha256 = "084l3zdcgy1ka2wq1fz9d6ryhg38gxvr52njlv43gwibzvbqniyi"; + name = "git-attr"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/git-attr"; + license = lib.licenses.free; + }; + }) {}; git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-auto-commit-mode"; @@ -28075,12 +28214,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20180126.913"; + version = "20180202.321"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "275a32b8af950f59324d69c39f01d653948f6481"; - sha256 = "1cm1ryd4hidaybv323gjbrqpdaicwr18ar7bhzkfjnkakvrb35pj"; + rev = "10a1f08f39373bfc2ed86858cf02d82bfcdb7be8"; + sha256 = "1bk1a34yi37gsb6n7a68pkia100q0jyj2x5bs8hkf0q48rh4dvl3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -28327,12 +28466,12 @@ git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-timemachine"; - version = "20170325.220"; + version = "20180208.1342"; src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; - rev = "92f8ad4afc802d01c24426ff52ad6fefb3bb91be"; - sha256 = "1ljgc7jmll3534zj1r72gh4al909slhiriscqv9lmvqzdiy3l21g"; + rev = "8e85fff38a7aec727d29d93b79f57c2a9f95c488"; + sha256 = "0ds5pbg87r7ydip2dwdc3dagjby5j5q7rnrl14wpkzm3xq1zpjl3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; @@ -28915,12 +29054,12 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20180124.143"; + version = "20180129.2300"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "dc46c72e1a4e759c04d17c0411a8c53c2f9915f5"; - sha256 = "03ia362bwkkkysfp2wz5jpqlvsjvvzgl06i1gcrkb1aa8ssb82lc"; + rev = "fa569827c916ed46e410e9f28e4b4d28f8567654"; + sha256 = "0x1i1xcd3d34c9c87isd39d9ra69ywd01ag0hgkkgdzrk44znshj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -29776,12 +29915,12 @@ google-c-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-c-style"; - version = "20140929.1118"; + version = "20180130.936"; src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "9663cabfeeea8f1307b1acde59471f74953b8fa9"; - sha256 = "0277vsj0shrlgb96zgy8lln55l2klzkk6h28g4srbpgkwz5xxsx7"; + rev = "cfce3c3a866cfa9ec12fff08d5e575ca875f787b"; + sha256 = "0h35802dp9y29yvrqvkhd2b9x6jkqlwz46k5lgvabsiddqq4x2sn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -30053,8 +30192,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "406990cbb165af7510b6282f88742c005edd2aa1"; - sha256 = "1pm5ndfxf6qmq4dlvawd4v8j75ipl12vbw13yxzrc5q0rfqqqgdl"; + rev = "d9021ec5f7105414166ac8b535b7de9f1c115cfd"; + sha256 = "02vdb7xp3dgqv83qcandsyq60i8pxvz4yq0d3lk3xl15hi3l75ji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -30112,12 +30251,12 @@ grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grab-x-link"; - version = "20161130.2147"; + version = "20180205.346"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "grab-x-link"; - rev = "d2ef886097f59e1facc5cb5d8cd1c77bf340be76"; - sha256 = "1iny8ga9xb7pfd59l4ljlj6zvvxzr7bv468sibkhlaqvjljn2xq1"; + rev = "d19f0c0da0ddc55005a4c1cdc2b8c5de8bea1e8c"; + sha256 = "1l9jg2w8ym169b5dhg3k5vksbmicg4n1a55x7ddjysf8n887cpid"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link"; @@ -30217,12 +30356,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "20171230.440"; + version = "20180131.1439"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "c8f1dd4ceb3b752bcb4a0122af45e3a197c4fa99"; - sha256 = "1b0azylab54183kf9nmpx6qb8hrr91fsxladwfmiljrcpvf6pdh8"; + rev = "823232a83a51e8a3f7b4db09e23658fc1a1c93ca"; + sha256 = "0a1svfbxw7g31rnf3lcjsy2x21s14c2gpbrzjpl06qa0p3cnn4db"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -30646,12 +30785,12 @@ gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20171118.1312"; + version = "20180210.756"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "fb4f0a2dd3d146678fee3bf4d7bfce1c8e7cbd00"; - sha256 = "0n9z3m10sim28q2k760vhwczzdprla92hi0g8prpvv1g6bb8qrs7"; + rev = "156848895d16057c1dda2fdde5a7dde3053c9948"; + sha256 = "04szg56wxf0x7w8nvf98fmnry2s77kx7jg7j6gjkp16nr0asiqp8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -30793,12 +30932,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20180107.1303"; + version = "20180207.952"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "b4d897f7daafb5794809760340548b96b0a89ac3"; - sha256 = "1bl6k0vdjl9b10pz76afwnmagjjazp1pxl9rash4m1f6zry4hbj7"; + rev = "1d400fd2f4b21e8fd834887198fe6587933a9cc7"; + sha256 = "03q8rq74zxil5aws18wysiyk8zxyp9w0sqxcnk79d1p5hdgn09p2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -30961,12 +31100,12 @@ hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; - version = "20180117.1302"; + version = "20180206.1739"; src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; - rev = "fe0c7284f17f00cc6f1971a9bd565467faa0574e"; - sha256 = "0kxj49x16j7avbgry6advw4qixr76hdawfq6vy8rfj42kzmdj179"; + rev = "087af78262c40fddf9412fa73f7d4d8c6811282a"; + sha256 = "0s8hazfw1nd7sk7nky22d1lq8vqhfba5a2gm4y96s6g31h5wd71d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; @@ -31568,12 +31707,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20180127.2219"; + version = "20180209.2348"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5882f69be33e255b4f3cb182879c9cf5464364e6"; - sha256 = "0k4mlffs5a2k1g53dzrkqclhkcsyzvn9z1nmhwajhlrijx8z8ym9"; + rev = "749904ca3e49db17751b906a9781c3da0e4a2b43"; + sha256 = "0zx052y7pxa0zcrgxn2krv6xz4w8l4fcn6wxks64rwkci7n5ywim"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -32030,12 +32169,12 @@ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-cider"; - version = "20180120.1212"; + version = "20180202.1818"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "739589b6c6b3cedc71ca366da95fd1b147931c34"; - sha256 = "025z5dbrh5a9jwrfsckvmzd4nxq672m6bfikzcmhkvqs89kw1s2s"; + rev = "f498727b2a742560256942ea184dcb28c455fee2"; + sha256 = "1g7hy6fjym11yznzb8m5cn9bq5ys5iszf81hhwyia5n8qdvnlmm5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider"; @@ -32135,12 +32274,12 @@ helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-codesearch"; - version = "20180127.2237"; + version = "20180203.2033"; src = fetchFromGitHub { owner = "youngker"; repo = "helm-codesearch.el"; - rev = "1ccbd68acab682d2d348aaff81022123939e53fd"; - sha256 = "1afjvdjqp91n44ijfc5kh8x5lmkiyncin5l25rfpxcljkfixblcr"; + rev = "87a68168b7c1490769305db0df60035e47799a75"; + sha256 = "0wiyz0kh2m2mpjhnl2mvsx2gvhkmmk0xaw432mxr48zz9jjnlha9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch"; @@ -32198,12 +32337,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20180129.39"; + version = "20180206.10"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5882f69be33e255b4f3cb182879c9cf5464364e6"; - sha256 = "0k4mlffs5a2k1g53dzrkqclhkcsyzvn9z1nmhwajhlrijx8z8ym9"; + rev = "749904ca3e49db17751b906a9781c3da0e4a2b43"; + sha256 = "0zx052y7pxa0zcrgxn2krv6xz4w8l4fcn6wxks64rwkci7n5ywim"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -32975,12 +33114,12 @@ helm-google = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-google"; - version = "20171215.1159"; + version = "20180212.240"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "helm-google"; - rev = "bf3b04e04db5bc99b621b90b7d58a5438db14c66"; - sha256 = "06848hjbwj8bkdinbmmzh2sc92l9chzwbglyfl17bwxkcdbxd54i"; + rev = "6490074b81ecbc6d96df662fa076cf9194158f17"; + sha256 = "0xriaaz3qrxc9j68x0fm55hb8iwag5y03xx179yfa6884jx0iik7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google"; @@ -33668,12 +33807,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20180115.137"; + version = "20180207.1539"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "cd875b796e1a5d36ca99dede653a8e315a00029a"; - sha256 = "004sxd3v414ac7d85jkfq36nbicyr153gias0rbmlykv660xf5dy"; + rev = "81a84a071c9ec9313b9b13e0c89b9e499268436a"; + sha256 = "0ipz4r2cdvxsrzgsrcrxchj8vvgfqz7whd61smfn7h6sakljk2xm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -33731,12 +33870,12 @@ helm-pass = callPackage ({ auth-password-store, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }: melpaBuild { pname = "helm-pass"; - version = "20180103.1838"; + version = "20180208.1313"; src = fetchFromGitHub { owner = "jabranham"; repo = "helm-pass"; - rev = "986af08301476bc6a1c8645dc5d2302a31d5044d"; - sha256 = "1hbpwi4sbibsckrldlgny3wc9cw3y9qv7x98b4x3w78ldns50qpq"; + rev = "231c496eb2da4ecf26fcf8545de9a9819683a17f"; + sha256 = "1lv47cwb3j7lvx8qd4p5ripmvh3ixyd0x5bql143hja396wx12rr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass"; @@ -34085,6 +34224,27 @@ license = lib.licenses.free; }; }) {}; + helm-rg = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-rg"; + version = "20180205.2231"; + src = fetchFromGitHub { + owner = "cosmicexplorer"; + repo = "helm-rg"; + rev = "906aa2af60998b1ac2b37e30d7316f2059c9ea55"; + sha256 = "1yibmlx1na4ff0h9r6j4cqw55z2ggfrzj02b20m2bwm19pyxacm2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/958fbafdcb214f1ec89fd0d84c6600c89890e0cf/recipes/helm-rg"; + sha256 = "0gfq59540q9s6mr04q7dz638zqmqbqmbl1qaczddgmjn4vyjmf7v"; + name = "helm-rg"; + }; + packageRequires = [ cl-lib dash emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-rg"; + license = lib.licenses.free; + }; + }) {}; helm-rhythmbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-rhythmbox"; @@ -34155,8 +34315,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; - sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; + rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; + sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -34424,12 +34584,12 @@ helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: melpaBuild { pname = "helm-system-packages"; - version = "20180129.530"; + version = "20180210.1307"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-system-packages"; - rev = "2f5297294901d1845e2245bca76486c383f1c49c"; - sha256 = "03qb5al26qfn2sh3bwnvfyqxiwbxgmcwd4qkbad32nsk4s51d1z0"; + rev = "715a8ee0257d7d7138d4cd0cfdd61ee0ebb8ee08"; + sha256 = "0hc51ndn3jaxykflr5mkhwc7lajp5fsnzxpqwr17hqq4aa6g1sci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; @@ -34445,12 +34605,12 @@ helm-systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, with-editor }: melpaBuild { pname = "helm-systemd"; - version = "20160517.2333"; + version = "20180130.2034"; src = fetchFromGitHub { owner = "lompik"; repo = "helm-systemd"; - rev = "0892535baa405a2778be2f0f013bac768e72b1f9"; - sha256 = "1yqwq8a5pw3iaj69kqvlgn4hr18ssx39lnm4vycbmsg1bi2ygfzw"; + rev = "96f5cd3ee3412539c2f8d145201f47c4f8e53b4f"; + sha256 = "0wyabh76q2lighd7qxpkzp35fkblxlz8g7p4lpgfwvjid0ixmnvq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-systemd"; @@ -34694,22 +34854,22 @@ license = lib.licenses.free; }; }) {}; - helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: + helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "20180120.355"; + version = "20180209.1706"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "6530314def5685772387f67d118ff31cbb2fad7a"; - sha256 = "13lcyzy6c2lhlxflxhm3h1m755s3m1fm9qakicb8iklvbzmqycbd"; + rev = "874351d34d32f935e3f20485a544681de369c756"; + sha256 = "11mfk5bd1837ln8b2ryi9rksmjsg7lwkylzy8qxb054l5i94vc19"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2"; name = "helpful"; }; - packageRequires = [ dash dash-functional elisp-refs emacs s shut-up ]; + packageRequires = [ dash dash-functional elisp-refs emacs f s shut-up ]; meta = { homepage = "https://melpa.org/#/helpful"; license = lib.licenses.free; @@ -34970,12 +35130,12 @@ highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight"; - version = "20180125.1126"; + version = "20180131.1216"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "highlight.el"; - rev = "2371d6d134f07ac648d525b7eafd4eecfb0e36fe"; - sha256 = "0x0mr52fy1cc6f710ibqy0fh68jpfb1gj4ddg173q0azb76m2klq"; + rev = "bb8694b8e642a45f07ce8897de0785c5a776441c"; + sha256 = "0s4fkxnd4x3j864mgaiv95iwdjmps4xj2mlaljljc8y04k9q5l9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89c619b90665385c8f5408935105c52b4d0290ab/recipes/highlight"; @@ -35473,12 +35633,12 @@ historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "historian"; - version = "20180102.2118"; + version = "20180210.2119"; src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "ba560443a216befd4460fcf16dc6c7f23cb73d8d"; - sha256 = "1g1p02kx50nry4vm5bcp7kyjnn9lafc9a57nirnkf0gm41m6yj8q"; + rev = "ec3dfa8786473e52ffc5ca9be95dbc59a9a87ff7"; + sha256 = "1bxigdg3pmgc0s4il1spdw0p8y98k4hwwd89m4i3y97l43asy6p1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian"; @@ -35933,12 +36093,12 @@ ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ht"; - version = "20171213.1334"; + version = "20180129.1434"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ht.el"; - rev = "64af52688eb09eb42b7228a4e8e40d4a81cd983b"; - sha256 = "1qz1zynkb1nanyi0ylllv80gzkgl2bgx9y82g07w1rfa86qgaghg"; + rev = "5a665d00dc8fda77bad2a43277d8809c23e46ab8"; + sha256 = "0w0zi393ixgi154c6dq2i1kf3kraqyfw8alfxcn6fhhxy1g9p02y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht"; @@ -36273,8 +36433,8 @@ src = fetchFromGitHub { owner = "iquiw"; repo = "hyai"; - rev = "e9a7e945fed12d8e664e898cf8b434b0376d5d80"; - sha256 = "1sbn4h74crawdy8yjdjklxh1q6js5y9ip5qxf6dfi85h82qizpa8"; + rev = "286cece5ca187ebb9d5fba5ac86e452cc638b8d3"; + sha256 = "1gycq2jp6540kiggv3fhmgqsyqvc36jwbyydx1i6w1brpcwvc6dx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd9bd1cfd2f3b760b664a4677b0e4e617cbdfa6/recipes/hyai"; @@ -36332,12 +36492,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20171120.1042"; + version = "20180201.846"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "1deed8a00e6936903cace1dac123364b6c0cde90"; - sha256 = "0jraj3l7w0bw2c6qkq1bfdfa2zf7xssmk9cdkdgbjjip5xvq31ns"; + rev = "cf961400796aea8b385b64ac0ad31c1e2500cf6a"; + sha256 = "03ffjrq4hidvxb6m4kk0xp8rmi53al16nab6lbid5brky67hvpmq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -36393,12 +36553,12 @@ ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ialign"; - version = "20180120.304"; + version = "20180202.1447"; src = fetchFromGitHub { owner = "mkcms"; repo = "interactive-align"; - rev = "6afe9a62ae9dccf8e2348d73f9d5637a906b1cf6"; - sha256 = "0d4x74g8s4x9q434kwfwyn2rvw4myayh7dr7r1nbh8gnijwrnpsz"; + rev = "523df320197b587abd8c0ec4e9fbc763aeab1cf6"; + sha256 = "04jak5j4yywl7fn5sggc125yh6cy0livf55194mfxs2kmbs5wm0h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; @@ -37107,12 +37267,12 @@ idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }: melpaBuild { pname = "idris-mode"; - version = "20171212.759"; + version = "20180210.400"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = "2206501895668e1cd395119921bbcd2b16165600"; - sha256 = "1s185lkkbjh2811qs4grgq916x83m58ifl85g9ji9ll4vr3p1al5"; + rev = "cc35d124332aba84dc3e4da94433127a12459351"; + sha256 = "056yfgfqxzcfmlk2kj34r1dpjxi0xllcllkhrc9v8d9cib7hjqqf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode"; @@ -37149,12 +37309,12 @@ iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iedit"; - version = "20170916.1024"; + version = "20180207.219"; src = fetchFromGitHub { owner = "victorhge"; repo = "iedit"; - rev = "5b14cc9fcaef509c50f25cff872fba5d70b2c799"; - sha256 = "1vlfqh616id2kh35diwig6jswq5q5z22zwrpbdxkginag3sq8732"; + rev = "412490db4387ad9d040bfb5854f25de4c40c2146"; + sha256 = "1995j0yvvls5i7zfxw8zwfk05in8b0n82k05qdrap29v6nq2v4bx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit"; @@ -37671,12 +37831,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20180122.507"; + version = "20180131.943"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "b84d3553edc7db3d95fb1fe9a82a08a0661c72fb"; - sha256 = "0lqjkhidd2ambasvc52qkipjk88q4jivbm33r48bhw78bik7y8bz"; + rev = "71299e9bc0d3c75b25ef65e57e9a57c9a17294b4"; + sha256 = "0f9lnsz8fp68qr67l5rq2ippr1fc0rw8nk2f8cm9x90fd82fxwdl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -37713,12 +37873,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20180128.901"; + version = "20180129.1828"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "ec99211bbe9bef6d579a313ab6422694ef63b181"; - sha256 = "0d54m3g8ahz7xg06qb592ai25ydpjh0dzxxnhbp5jk2l0r0irwnq"; + rev = "630471b5141cb493305b623e6800c26bc91b3913"; + sha256 = "00jfx1bavyzla7cid9bhw6fcdfqw8bgnwr920kzg3wmfd8nfv5ry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -37857,6 +38017,27 @@ license = lib.licenses.free; }; }) {}; + info-colors = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "info-colors"; + version = "20180205.350"; + src = fetchFromGitHub { + owner = "ubolonton"; + repo = "info-colors"; + rev = "a8ebb7b8efa314c08ea8110d8b1876afb562bb45"; + sha256 = "0wvyf2w5s184kwacs6lbpjryx6hziayvdrl3crxir8gmg2kcv07m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d671ae8dc27439eea427e1848fc11c96ec5aee64/recipes/info-colors"; + sha256 = "1mbabrfdy9xn7lpqivqm8prp83qmdv5r0acijwvxqd3a52aadc2x"; + name = "info-colors"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/info-colors"; + license = lib.licenses.free; + }; + }) {}; inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inherit-local"; @@ -38195,12 +38376,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20180117.921"; + version = "20180210.937"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "b6ef262dee10a92bc31935644e087e83957f6d74"; - sha256 = "1hxfmrq10r39inysa1x104siwdladpdpcdjqbniml0hcpzrdcpd9"; + rev = "f85e1b47df3bb328be0de34120950cecb3465055"; + sha256 = "1zng4sliygg1l0jamprx9pfs85jiy19gwxpcy2hs3s4hc7yxjdds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -38636,12 +38817,12 @@ isortify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "isortify"; - version = "20171223.1812"; + version = "20180206.450"; src = fetchFromGitHub { owner = "proofit404"; repo = "isortify"; - rev = "2db50c1f585db8a8ec5fa28a90a8179516c16cd0"; - sha256 = "04wzq9cf1bzbyx3jn7anrzc1r64l23s073xqsfcqb8hgh2swcpl6"; + rev = "18c273ff401643fb903e90dff73c47a4b52268ef"; + sha256 = "18ziajgjij66g01fyrr1z95z4x2ynfvcyas92b2rvdc1dnsdhs10"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d4ad18492e7f4a56a1515873bc0b66fa49829bb/recipes/isortify"; @@ -38804,12 +38985,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20180124.1127"; + version = "20180211.1010"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "ffc34c666c2b214d01e3f722249f45d1672566bb"; - sha256 = "0gzf8l0clh2p86m6xcygykskhigr43cpwfvj1sl06mcq600fxavn"; + rev = "cc5197d5de78ba981df54815c8615d795e0ffdc5"; + sha256 = "0c8866mb2ca419b6zh153vp298dxwldj29lbrynwr1jlpjf1dbr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -38867,12 +39048,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20170709.2151"; + version = "20180201.427"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "acd6322571cb0820868a6febdc5326782a29b729"; - sha256 = "158cmxhky8nng43jj0d7w8126phx6zlr6r0kf9g2in5nkmbcbd33"; + rev = "9783970f7dc39aaa8263d420d9d1ed6912c8e19d"; + sha256 = "1fanxpynp3cigll0x3vknxr8r6plvsbyn34qs28zjfi0l062a8jv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -38934,8 +39115,8 @@ src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "ba560443a216befd4460fcf16dc6c7f23cb73d8d"; - sha256 = "1g1p02kx50nry4vm5bcp7kyjnn9lafc9a57nirnkf0gm41m6yj8q"; + rev = "ec3dfa8786473e52ffc5ca9be95dbc59a9a87ff7"; + sha256 = "1bxigdg3pmgc0s4il1spdw0p8y98k4hwwd89m4i3y97l43asy6p1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian"; @@ -38951,12 +39132,12 @@ ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-hydra"; - version = "20171130.1143"; + version = "20180208.912"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "ffc34c666c2b214d01e3f722249f45d1672566bb"; - sha256 = "0gzf8l0clh2p86m6xcygykskhigr43cpwfvj1sl06mcq600fxavn"; + rev = "cc5197d5de78ba981df54815c8615d795e0ffdc5"; + sha256 = "0c8866mb2ca419b6zh153vp298dxwldj29lbrynwr1jlpjf1dbr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -39056,12 +39237,12 @@ ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-rich"; - version = "20180109.1933"; + version = "20180129.2051"; src = fetchFromGitHub { owner = "yevgnen"; repo = "ivy-rich"; - rev = "efe35d2f579202ca14a90cfd46ecac624109558c"; - sha256 = "1vsgz2qg8mxd3lw590zzy9zn72lcvmrixp8j9h65gjqqdwz7xzwn"; + rev = "d5ce9e90003eeac54654d5ce1f19da55448b05f2"; + sha256 = "1jjlrz6af7mkdfg66qsrx6q879l4vxjsljl0fbkld77i9fnm005a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich"; @@ -39081,8 +39262,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; - sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; + rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; + sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -39140,12 +39321,12 @@ ivy-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-xref"; - version = "20171229.252"; + version = "20180201.1919"; src = fetchFromGitHub { owner = "alexmurray"; repo = "ivy-xref"; - rev = "aa97103ea8ce6ab8891e34deff7d43aa83fe36dd"; - sha256 = "1j4xnr16am5hz02y1jgiz516rqmn43564394qilckmzvi9clhny8"; + rev = "4d2c437b479733e4159a356c9909ed3e110403a1"; + sha256 = "19gzsphcmkzyihcijb0609ykv98ak24p3z4k0ifil5r40iss1d1n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4cd8724e8a4119b61950a97b88219bf56ce3945/recipes/ivy-xref"; @@ -40898,12 +41079,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "20180128.1459"; + version = "20180210.710"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "14d73a1ffce245b1ef4bb962bd9d9051e2a9fe1c"; - sha256 = "1b8669qc8hpz99ybdpz60mls00kxqj1fj6xy522jrhyij87dws7y"; + rev = "3cf42c74e05982f811417a8d5e7b359732462f8e"; + sha256 = "0p32zgmmdnsmvcjnkxfbbqq775n9f29w45q54bhdvw63gicnvdwg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -41406,8 +41587,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "8776f284f75f5589d3b0c6f1e82795d73e9f3c45"; - sha256 = "0zhdj13bjvs8yxq1jndgifbniigbmpq35r27fsn014wg3ih5k17q"; + rev = "1aa4315396c0ee15c282b94f227bbe54b53e7e0a"; + sha256 = "0w856f20brgakxzngvsikaywkhci961vnasnqyn4a4a5913aa8rw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -41486,12 +41667,12 @@ kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20180126.822"; + version = "20180205.1242"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "c49d137f10f8e07de915126a766eb1f59f7fd193"; - sha256 = "1sja17fd2gvl16jlya6cl2mj7lzg19vgl830yz1dc2iqvf3nnsfi"; + rev = "4be03d90ac8249ce31df3ef0edb71e0ca11b5ff3"; + sha256 = "19xg7xss7j1b8hq1wk3kvfprn1lsnym59728v144cxc2f801fh17"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; @@ -42157,12 +42338,12 @@ lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lcr"; - version = "20180127.1229"; + version = "20180202.112"; src = fetchFromGitHub { owner = "jyp"; repo = "lcr"; - rev = "8a6306a08066aa6b17cba1d1f278cb359d6b6c6a"; - sha256 = "12fc6k71cly9xznh461sdlfb6vlp0pddvv7p0vdzr03mspw4qa9s"; + rev = "071d23ee5453741a8724d7f8bfa7f5c20612a29d"; + sha256 = "05gvij9lgs9hh04wnxb90zx9ncsdjyp36fjbmrqrq07xbkxaw82a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr"; @@ -42241,12 +42422,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20180126.1808"; + version = "20180210.1940"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "e098be20cf603f48dfe18c6237546a8c49e1f97c"; - sha256 = "140hl7s2gxhh14yx34d9ys4ryqp87qckvcjscqllnc51qmkjwf1r"; + rev = "980e191e08db0b6719b324b131b3ba042f8487c8"; + sha256 = "0xb5x9wz7bg39x0xhy5fg3k91vdqym63a4r4p3h6n37rg0d0iwcf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -42816,12 +42997,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20180123.1255"; + version = "20180208.2204"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "aac21815d8fe833faf1043ee2ec582f96e56c4e5"; - sha256 = "1wmgpygadkkyrsxscrxvjdy314qdlrzgs3rg3kvmd5j9nhdiwnnv"; + rev = "9ac289883012a0c973addb0c8fe4db84259a8019"; + sha256 = "0gd9d9qid36vbr23npgnr9356av2mlkf13xcx0gq2xxck2p4gl58"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -43131,12 +43312,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20180126.2158"; + version = "20180129.2352"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "465c3f807c3ccd9af0af7032aec40c039d950ac0"; - sha256 = "1idn0bjxw5sgjb7p958fdxn8mg2rs8yjqsz8k56r9jjzr7z9jdfx"; + rev = "e0a5627e6591e1cbb9f93aabc44adbdc50b346c9"; + sha256 = "0dhm7gdd1smlibj5jmzps97kwkpzcigbdp0l26baa2mkc6155y66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -43695,12 +43876,12 @@ lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-haskell"; - version = "20171021.330"; + version = "20180131.459"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-haskell"; - rev = "778f816376c0a77d7404a123a5a1683e46394173"; - sha256 = "00j1b63q611qr76qf4nvkhlblcvbjakgljilwdh973k3zdc6a0v1"; + rev = "cf3739e96b623fe8b95617561bb29476d7553462"; + sha256 = "0739kclc6g80r38yjwwsyx7arc0z4jlmp4x7gmf30ijdpn32qb4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell"; @@ -43737,12 +43918,12 @@ lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "lsp-javacomp"; - version = "20171024.1547"; + version = "20180203.1204"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "lsp-javacomp"; - rev = "ed23aaeee27e6253bed5752fb8fbb7a5fa61967c"; - sha256 = "096rbyv0qwa454p1ns7g0py9lni5r6h1gw85wm5mwr00shjzq23n"; + rev = "57554723983c5d76c21a7a5c16534066de6dcf23"; + sha256 = "0n105j1i8gwayfzwvr9d37b9ra35l9prlgx7vqblvv167q4w9d63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp"; @@ -43758,12 +43939,12 @@ lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-javascript-typescript"; - version = "20180124.2058"; + version = "20180203.52"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-javascript"; - rev = "213dd077ec181eb3f5b8139ed02cde82398ed5ea"; - sha256 = "1zqvpk65m6hfgharjvrmjwp88n5nkvz32ra82k57d3jkgbslxsw6"; + rev = "8df90bc27852da2cf05951870d94ce7920d8c09f"; + sha256 = "0pqk8p0z30p0j7lc5i2mvy7vmg8k5hphgwp4djhgm1ickm9pcx20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript"; @@ -43779,12 +43960,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20180129.409"; + version = "20180210.441"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "111fcdb3929e015e95645548686687efabb3c7de"; - sha256 = "1hanr9njdyc5b6n5awfknb6rxnmskm7vikrpwbg3f6iiq56mzsbg"; + rev = "a38ce26c9ebd56a690085d29a80f4494843e53c3"; + sha256 = "0mlnz3aqa40gavb0lr7bzlyzfm58d1c4np546v1401ljdc95fcgi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -43881,22 +44062,22 @@ license = lib.licenses.free; }; }) {}; - lsp-ui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: + lsp-ui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-ui"; - version = "20180124.414"; + version = "20180209.1302"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ui"; - rev = "7aeff9326ec7664ab935cb4c4ada6062a0a26981"; - sha256 = "0v6jg9jna3bnxbkzx8k5d7is4fr0g1dfz6gyqqxpnd1gzjwq15w8"; + rev = "6a669ca3bb14b48ba61f87e32f3a4eddc95dbf9a"; + sha256 = "0p4lr98asfhz78pj9mq7m7lk7syfz8w16xhrfv012llr8412g8cw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j"; name = "lsp-ui"; }; - packageRequires = [ dash emacs flycheck lsp-mode markdown-mode ]; + packageRequires = [ dash emacs flycheck lsp-mode ]; meta = { homepage = "https://melpa.org/#/lsp-ui"; license = lib.licenses.free; @@ -43905,12 +44086,12 @@ lsp-vue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-vue"; - version = "20171202.917"; + version = "20180129.1805"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-vue"; - rev = "9085d6c7646d80728d14bf5e4ec9037dfb91e3d1"; - sha256 = "1y9gd20rdyxih823b1x8ika7s6mwiki0dggq67r4jdgpd9f5yabg"; + rev = "faf976ee9b333919653b4b98e2886b488707e866"; + sha256 = "1d6sw5jsjhwd5bbl2p8k6hdwpg1pmnsmvbq8g33h80qlg05fwj60"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9eb7699630fd7e11f38b4ba278a497633c9733/recipes/lsp-vue"; @@ -43926,12 +44107,12 @@ lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lua-mode"; - version = "20180104.626"; + version = "20180207.1216"; src = fetchFromGitHub { owner = "immerrr"; repo = "lua-mode"; - rev = "6c691839b7e784884ae5c390bf1927953cd2bde7"; - sha256 = "0fm1d85302q79r4zrzmdx4v5c1vvr53g687vm5frf9sv8gg6hx0w"; + rev = "7909513c056ac85fd637aece6d3773ffa3b9b6cd"; + sha256 = "0bmsvggmrvcaq6yw856dk9484w5pjpfkkgia0p4w0f5rvvnfr8j3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -44241,16 +44422,16 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20180129.629"; + version = "20180211.700"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "275a32b8af950f59324d69c39f01d653948f6481"; - sha256 = "1cm1ryd4hidaybv323gjbrqpdaicwr18ar7bhzkfjnkakvrb35pj"; + rev = "10a1f08f39373bfc2ed86858cf02d82bfcdb7be8"; + sha256 = "1bk1a34yi37gsb6n7a68pkia100q0jyj2x5bs8hkf0q48rh4dvl3"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit"; - sha256 = "03cmja9rcqc9250bsp1wwv94683mrcbnz1gjn8y7v62jlfi5qws5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit"; + sha256 = "1wbqz2s1ips0kbhy6jv0mm4vh110m5r65rx0ik11dsqv1fv3hwga"; name = "magit"; }; packageRequires = [ @@ -44586,12 +44767,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20180128.1035"; + version = "20180209.1711"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "f6273604ef87e1b513f69430af50600ee4b20deb"; - sha256 = "00cwc2qbspqjrxrz00vjfcfx4ydfj7q977d2gffsg2lkjyjspzpp"; + rev = "eb8a794df0db2e7edea1106a87bf03f94ec7e192"; + sha256 = "1q7s822ygqc8rz0b1fqgwdjnj5l0fhnqahlnf02aqz5by47sgaqg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -44922,12 +45103,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20171220.419"; + version = "20180207.2320"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "f993b7428c7e83efdbc6e6040d3eae9406d9b090"; - sha256 = "0731w64jxjmphsjpz4fz21h27q4y9afbkbpczspnc90vs1ighn4y"; + rev = "36fed6ea0ae45b36ef5618d5bd29f4a43c0e2c6d"; + sha256 = "1qsygc90sclk5r1qxsiszi72sg6ryhiw39vf99ixi0pxayljk8px"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -45864,8 +46045,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "meta-presenter"; - rev = "1f8d635301d1f9849416c551bf1530e87e31d235"; - sha256 = "19y4iwi24p86d64n9075zjrjj6i27vpvwi898qanw1ih7spgpg1q"; + rev = "4e7aae56e5abf6deaadbda84fd5ec4e3e19c22be"; + sha256 = "0nb64i9ikkcbb6s21rzc2d5i84dpy0zvqk7f3zynlprzaqy11b7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter"; @@ -46321,12 +46502,12 @@ minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minizinc-mode"; - version = "20180119.2348"; + version = "20180201.650"; src = fetchFromGitHub { owner = "m00nlight"; repo = "minizinc-mode"; - rev = "c6cd9614d84e26065852aeb1942e8339e08e382d"; - sha256 = "0ypid82lvh5np326csm8y6c9ac7drqj6gdmqyzqbrn1m6lz9xkkl"; + rev = "2512521ba7f8e263a06db88df663fc6b3cca7e16"; + sha256 = "1yrawvvn3ndzzrllh408v4a5n0y0n5p1jczdm9r8pbxqgyknbk1n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc86b4ba54fca6f1ebf1ae3557fe564e05c1e382/recipes/minizinc-mode"; @@ -46949,12 +47130,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20180104.429"; + version = "20180201.553"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "bb5cbbd5895b8b3fbc6af572b1fd0aacd4988a8a"; - sha256 = "1f0jl4a3b6i9skbcym0qzpszy620385m947l2ba2wxf1na7rc626"; + rev = "031849ab863a29e7576535af92b11d535e762440"; + sha256 = "1xl6b71r0j90n9r96f6hfvd9fzwzwy7rmn44c1p2r76inyxvlyil"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -46967,6 +47148,27 @@ license = lib.licenses.free; }; }) {}; + monotropic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "monotropic-theme"; + version = "20180205.2000"; + src = fetchFromGitHub { + owner = "caffo"; + repo = "monotropic-theme"; + rev = "a5dc696e79115f96a2482ba2e01f0569c5e4c4be"; + sha256 = "17985wdlgz4d45jznl9df34826mm5xc8h5xcar70rdrw4gqp4ccy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/38222d109ece0030b0bfafb242aa100694b2bfcf/recipes/monotropic-theme"; + sha256 = "129yqjh4gaab1kjijzkzbw50alzdiwmpv9cl3lsy04m8zk02shl8"; + name = "monotropic-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/monotropic-theme"; + license = lib.licenses.free; + }; + }) {}; monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monroe"; @@ -47390,12 +47592,12 @@ mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mtg-deck-mode"; - version = "20170925.1338"; + version = "20180129.1637"; src = fetchFromGitHub { owner = "mattiasb"; repo = "mtg-deck-mode"; - rev = "546a62ada70aa89d325cc3941c8c9379a4c21553"; - sha256 = "1gbgsfd04jdw6jrsp13h13jkkac5ndrn684pl18q0wjgx9kk11b6"; + rev = "4eeb1a5115d60d064dcd79b9e0dd48619cd2ee4c"; + sha256 = "16qmqqq7297idr2x4fr22ihhx6z91484x0hpmskbh6fn05bvls2y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode"; @@ -47432,12 +47634,12 @@ mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mu4e-alert"; - version = "20171222.2315"; + version = "20180211.2319"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "mu4e-alert"; - rev = "3095de457ec88e752f83ce086eff4aeb22399980"; - sha256 = "04y26r7cb0sza8wp45khk8la4mvj4h4ksxfm5z7ry77xi7j2894w"; + rev = "997ef1bfc7dc09d87f50ece80f0345782065eb92"; + sha256 = "0pc95w6idvrmdpiq6gmcmi31rmh0d94rfhwjafsxqqimmsm9fk0z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert"; @@ -47596,6 +47798,27 @@ license = lib.licenses.free; }; }) {}; + multi-run = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }: + melpaBuild { + pname = "multi-run"; + version = "20180122.709"; + src = fetchFromGitHub { + owner = "sagarjha"; + repo = "multi-run"; + rev = "87d9eed414999fd94685148d39e5308c099e65ca"; + sha256 = "0m4wk6sf01b7bq5agmyfcm9kpmwmd90wbvh7fkhs61mrs86s2zw8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e05ad99477bb97343232ded7083fddb810ae1781/recipes/multi-run"; + sha256 = "1iv4a49czdjl0slp8590f1ya0vm8g2ycnkwrdpqi3b55haaqp91h"; + name = "multi-run"; + }; + packageRequires = [ emacs window-layout ]; + meta = { + homepage = "https://melpa.org/#/multi-run"; + license = lib.licenses.free; + }; + }) {}; multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-term"; @@ -47981,8 +48204,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "myterminal-controls"; - rev = "eaa8c82b8e140f4c0f2e286ee14253b76e4639a6"; - sha256 = "1vy34f8gcaspjmgamz5dbxmjxjiixf0wmhgpr61fwd4vh5rvwcci"; + rev = "aae4f50f9f22d374eaaac2ce95e522f13dcc8fc0"; + sha256 = "08xgzrpp5l5d43j1b8ai3d41jzk9i70r2pqdcj53h79ml56bicgp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls"; @@ -48228,12 +48451,12 @@ naquadah-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "naquadah-theme"; - version = "20160819.121"; + version = "20180212.440"; src = fetchFromGitHub { owner = "jd"; repo = "naquadah-theme"; - rev = "37e822ccea0ff4a6eb79ea6615a1fd6dc6c72d51"; - sha256 = "1z6fy97x9753fprvrmnmplnqwr6xl8hgvwkpi6fp6awcb0wrza3d"; + rev = "999056526db5095ce600c83672fc80cb744bd93e"; + sha256 = "1f10598m4vcpr4md6hpdvv46zi6159rajxyzrrlkiz0g94v8y6rl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/naquadah-theme"; @@ -48690,12 +48913,12 @@ ng2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "ng2-mode"; - version = "20180128.1006"; + version = "20180206.1128"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ng2-mode"; - rev = "43179216c08958486ed7a8e7a3766d1df11d38d8"; - sha256 = "1biww57phq5mcd80is38fnishj3jmj09iwiqkn6j03p53kvgqchb"; + rev = "00822c2e43ff4793cf030fbbd67f83cfdb689b3a"; + sha256 = "19qbs0c0q98rp506a8sj7wkigrk8xzv0s87q9bcl5zxk9jx6m304"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode"; @@ -49232,6 +49455,27 @@ license = lib.licenses.free; }; }) {}; + nordless-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nordless-theme"; + version = "20180204.48"; + src = fetchFromGitHub { + owner = "lthms"; + repo = "nordless-theme.el"; + rev = "3fb123eaaf7f38d024effdda4b3e88cc66e67300"; + sha256 = "0i5b7qg97qcgvhk8vv7x5xpwps06q140jndkz4i2rakg5hr3z98g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3de9da6cb8c1a75ff1d41a69e156c21be00713b6/recipes/nordless-theme"; + sha256 = "1ylvqh5hf7asdx2mn57fsaa7ncfgfzq1ss50k9665k32zvv3zksx"; + name = "nordless-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/nordless-theme"; + license = lib.licenses.free; + }; + }) {}; nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nose"; version = "20140520.948"; @@ -49255,13 +49499,13 @@ pname = "notmuch"; version = "20180104.1635"; src = fetchgit { - url = "git://git.notmuchmail.org/git/notmuch"; - rev = "12541fea7fe333f7c154a4a12a1d40394c2d6364"; - sha256 = "1r5a5smg2mc28wy3iq4sp8p0rmpqsi5ajk31hwc9lhldklz2c0nj"; + url = "https://git.notmuchmail.org/git/notmuch"; + rev = "a9f1c7c294526afb2a2ac18003a654ea4c780b7b"; + sha256 = "0pv6rpymhf1m10011hw5plsfz18d7gm10w396dc2rm05c9szffjr"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; - sha256 = "173d1gf5rd4nbjwg91486ibg54n3qlpwgyvkcy4d30jm4vqwqrqv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch"; + sha256 = "0pznpl0aqybdg4b2qypq6k4jac64sssqhgz6rvk9g2nkqhkds1x7"; name = "notmuch"; }; packageRequires = []; @@ -49722,13 +49966,13 @@ pname = "ob-axiom"; version = "20171103.1548"; src = fetchgit { - url = "https://bitbucket.org/pdo/axiom-environment.git"; + url = "https://bitbucket.org/pdo/axiom-environment"; rev = "b4f0fa9cd013e107d2af8e2ebedff8a7f40be7b5"; sha256 = "0p2mg2824mw8l1zrfq5va1mnxg0ib5f960306vvsm6b3pi1w5kv0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9f07feb8686c76c330f282320b9f653dc16cadd5/recipes/ob-axiom"; - sha256 = "0ks0q4ych3770gqds7kmccvx27fay7gfygi3a9n7c01p4snfai8l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/ob-axiom"; + sha256 = "17qh4hsr3aw4d0p81px3qcbax6dv2zjhyn5n9pxqwcp2skm5vff5"; name = "ob-axiom"; }; packageRequires = [ axiom-environment emacs ]; @@ -49800,27 +50044,6 @@ license = lib.licenses.free; }; }) {}; - ob-clojure-literate = callPackage ({ cider, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { - pname = "ob-clojure-literate"; - version = "20180111.210"; - src = fetchFromGitHub { - owner = "stardiviner"; - repo = "ob-clojure-literate"; - rev = "7acb5d1e9a84c9caa1e8477cdbb60d9a5dbf2eaa"; - sha256 = "1n5w7c181x5zbkmcvnzk2hxi339p2mfjwlhkxnfh3i20hzgqxci6"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e958745861c9673248955443bcc2c76d504b32f7/recipes/ob-clojure-literate"; - sha256 = "0jprgnslkc9m404n32rr510is823yr9kziqcw70z828fy7wl2glk"; - name = "ob-clojure-literate"; - }; - packageRequires = [ cider dash emacs org ]; - meta = { - homepage = "https://melpa.org/#/ob-clojure-literate"; - license = lib.licenses.free; - }; - }) {}; ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-coffee"; @@ -50199,27 +50422,6 @@ license = lib.licenses.free; }; }) {}; - ob-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { - pname = "ob-php"; - version = "20180103.441"; - src = fetchFromGitHub { - owner = "stardiviner"; - repo = "ob-php"; - rev = "08b41282fba31abca030a387062c3f1eb25a723f"; - sha256 = "1anrqqd4g4pq2ngslgkqarxisgmn9i7nggj2m76ny7ga1hxi2agv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/940a22790c9e5fd2f7729c71efad907683cc392c/recipes/ob-php"; - sha256 = "0n6m6rpd0rsk6idhxs9qf5pb6p9ch2immczj5br7h5xf1bc7x2fp"; - name = "ob-php"; - }; - packageRequires = [ org ]; - meta = { - homepage = "https://melpa.org/#/ob-php"; - license = lib.licenses.free; - }; - }) {}; ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-prolog"; @@ -50241,27 +50443,6 @@ license = lib.licenses.free; }; }) {}; - ob-redis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { - pname = "ob-redis"; - version = "20160411.2013"; - src = fetchFromGitHub { - owner = "stardiviner"; - repo = "ob-redis"; - rev = "244a21569499a3d8cb39f651fbf00ce26accf983"; - sha256 = "1f8qz5bwz5yd3clvjc0zw3yf9m9fh5vn2gil69ay1a2n00qwkq78"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/26477b37952bc050d8904929b3a5b027a59842e6/recipes/ob-redis"; - sha256 = "1xsz4cc8cqx03ckpcwi7dc3l6v4c5mdbby37a9i0n5q6wd4r92mm"; - name = "ob-redis"; - }; - packageRequires = [ org ]; - meta = { - homepage = "https://melpa.org/#/ob-redis"; - license = lib.licenses.free; - }; - }) {}; ob-restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }: melpaBuild { pname = "ob-restclient"; @@ -50325,27 +50506,6 @@ license = lib.licenses.free; }; }) {}; - ob-smiles = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, smiles-mode }: - melpaBuild { - pname = "ob-smiles"; - version = "20160717.421"; - src = fetchFromGitHub { - owner = "stardiviner"; - repo = "ob-smiles"; - rev = "c23c318bf8bbe2e266967388221893fbecdd2fd5"; - sha256 = "1iz8dli9i027wcg39rfabr6fx2b45waplx9mzkk1ri787rmapkpn"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e377955c0c36459698aae429df0a78e84793798f/recipes/ob-smiles"; - sha256 = "0d07ph6mlbcwmw0rd18yfd35bx9w3f5mb3nifczjg7xwlm8gd7jb"; - name = "ob-smiles"; - }; - packageRequires = [ org smiles-mode ]; - meta = { - homepage = "https://melpa.org/#/ob-smiles"; - license = lib.licenses.free; - }; - }) {}; ob-sml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sml-mode }: melpaBuild { pname = "ob-sml"; @@ -50367,27 +50527,6 @@ license = lib.licenses.free; }; }) {}; - ob-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, spice-mode }: - melpaBuild { - pname = "ob-spice"; - version = "20170801.2222"; - src = fetchFromGitHub { - owner = "stardiviner"; - repo = "ob-spice"; - rev = "b296232e28f61366265084fafb2f47876d987069"; - sha256 = "1s2jyx75xkqbkm9g4i3h1f0rz9ms5dbs7zqavdiswq9mr8qx1kwq"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-spice"; - sha256 = "0nhdcvq7yvprz4323836k507w0g1lh3rdfr6dqrbj29yvsqfw0x2"; - name = "ob-spice"; - }; - packageRequires = [ org spice-mode ]; - meta = { - homepage = "https://melpa.org/#/ob-spice"; - license = lib.licenses.free; - }; - }) {}; ob-sql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-sql-mode"; @@ -50689,8 +50828,8 @@ src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "20517e96299e147ef349b9e8913f036a6c35399d"; - sha256 = "12wdqv5fkzrizl8ls9pbbzl6y0rf5pldsrxkfdl8k1ix2a03p8xd"; + rev = "764d8dfa931f2336fa9f469aea7d38bcb4990723"; + sha256 = "1h0rgcifhzqxb7glax7b7whxkcrrd1mmvsdn7z2xgwjla3qmx4w2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -50832,12 +50971,12 @@ olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "20171209.644"; + version = "20180205.2323"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "e824a21f5e284bc7e111b6f325258bba8396d9ec"; - sha256 = "07hz7nj81pj0vwql30ln8isypqyhwv4y36gfzs475hgjim2mvdh2"; + rev = "6893bef23e576fd776ca69517dbf0981a8dc4b2a"; + sha256 = "0jxqnc7cwrrl9kw0fng515kl9hblkqkd5yf2gqq7di09q3rccq65"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -50983,8 +51122,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "588b8482685adedbc56933cb13c58d9cc6a82456"; - sha256 = "1iqwxc19jvcb2gsm2aq59zblg1qjmbxgb2yl3h3aybqp968j3i00"; + rev = "7a6fe00e841106b17e7554f8a21f8457d12c5197"; + sha256 = "1vrgj2irm87pykfjyx27a46g5xam7rxwjdfqh4jl6p8cgzgprrrg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -51032,12 +51171,12 @@ on-parens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: melpaBuild { pname = "on-parens"; - version = "20150702.1506"; + version = "20180202.1441"; src = fetchFromGitHub { owner = "willghatch"; repo = "emacs-on-parens"; - rev = "16a145bf73550d5000ffbc2725c541a8458d0d3c"; - sha256 = "1616bdvrf1bawcqgj7balbxaw26waw81gxiw7yspnvpyb009j66y"; + rev = "7a41bc02bcffd265f8a69ed4b4e0df3c3009aaa4"; + sha256 = "0pkc05plbjqfxrw54amlm6pzg9gcsz0nvqzprplr6rhh7ss419zn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ea1eb5eb5a40e95ba06b0a4ac89ad8843c9cc2c/recipes/on-parens"; @@ -51513,12 +51652,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20180116.2216"; + version = "20180209.534"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "754adb19ee88cba2757f0dd214abc85a6b05491f"; - sha256 = "1f581785rkvy1qjriwpjc3xqsz2a4jvbzi3ghzz76zz3j36yisln"; + rev = "7f96d1417fa3b676d402524b2de92447174cc101"; + sha256 = "1lrvi15qzqbdgkar2mxzsjhna8wbhr95hnym93rwvksgmn8dgivg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -52373,12 +52512,12 @@ org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-noter"; - version = "20180129.840"; + version = "20180210.1836"; src = fetchFromGitHub { owner = "weirdNox"; repo = "org-noter"; - rev = "107fae73d5149a774d8c3a5d8a05c7355160388e"; - sha256 = "04269kll3dfh0jd8s6w6xdp90c9hbyfy68ifv1z30x67mz18chbx"; + rev = "8841704afc019c0ebd66795343562be8b8fa77f1"; + sha256 = "1ba2l0nyxxg0x9kn53xif7nzn4di0dp3dkni6qihns9v0n8vl56s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; @@ -52785,12 +52924,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20180129.719"; + version = "20180207.1846"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "3b16a4f7c98bcccd54a2d41d5ff7b5796b87a42d"; - sha256 = "0qiflgczhvav2wlgpy6fxm7vdh21ai75hdh00qs8b6d0d4i2mqhy"; + rev = "e828a32d00b24af2c6c657481c3ad163de6c8e02"; + sha256 = "0inmayxdhfdh5lnjzqxkm65f160p2inc0mz7m254wm81z50033km"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -54170,12 +54309,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "20171105.0"; + version = "20171202.1713"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "93bd7b42ad4a70d7008470820266546d261222d6"; - sha256 = "078ihlpwajmzb0l4h5pqqx1y9ak7qwbrh7kfrqwd0jn114fah1yd"; + rev = "3d958203e169cbfb2204c43cb4c5543befec0b9d"; + sha256 = "057sqmvm8hwkhcg3yd4i8zz2xlqsqrpyiklyiw750s3i5mxdn0k7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -54233,12 +54372,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20180129.1108"; + version = "20180211.2258"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "ebb670b73be1b8759ce093c4101b198f12b5cea2"; - sha256 = "0ks6q0fgbyz0bq222dqh88fivkr150hlhb5kkibdr644bjwmcwcy"; + rev = "a8ae44e692f30fa7d0c76c21ad2dd6ebf65da700"; + sha256 = "0856n634k43ingr7smcwvjjzd9h96mvh0d767q7qcg6h2f5lmgg7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -54338,12 +54477,12 @@ ox-minutes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-minutes"; - version = "20170323.835"; + version = "20180202.934"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-minutes"; - rev = "ad9632f35524ac546c6d55dfa827e8597669e1e1"; - sha256 = "07knwl6d85sygqyvc7pm23y7v4nraiq1wl1b7szkzi2knd8wzi0s"; + rev = "27c29f3fdb9181322ae56f8bace8d95e621230e5"; + sha256 = "10rw12gmg3d6fvkqijmjnk5bdpigvm8fy34435mwg7raw0gmlq75"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/162d0dacbb7252508147edb52fe33b1927a6bd69/recipes/ox-minutes"; @@ -54653,12 +54792,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "20171127.902"; + version = "20180205.1521"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "fc706968dc0bb60e06c5d21025a6ea82d3279e96"; - sha256 = "020cafc6mihkx6kzhlbxncyb8v7i3zs3l7gydivb6mhm5w36614q"; + rev = "d6f926e3688d1c8d3c9d06cbfdd5a31f85accf00"; + sha256 = "072dlzskl0w4xcnrzgy36gzn4sla4hw84yr82rv04akb9mg4ya9m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -54965,6 +55104,27 @@ license = lib.licenses.free; }; }) {}; + panda-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "panda-theme"; + version = "20180203.2318"; + src = fetchFromGitHub { + owner = "jamiecollinson"; + repo = "emacs-panda-theme"; + rev = "f93ad6ded20d71cab9bf29a0c7040e07e1ba4f05"; + sha256 = "1y9yppkprbnqf59p94kkpxsma2s7z8cp195na05mdgcs0pmbs6l7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a90ca1275ceab8e1ea4fdfa9049fbd24a5fd0bf5/recipes/panda-theme"; + sha256 = "1q3zp331hz8l54p8ym9jrs4f36aj15r8aka6bqqnalnk237xqxl7"; + name = "panda-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/panda-theme"; + license = lib.licenses.free; + }; + }) {}; pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pandoc"; @@ -55035,8 +55195,8 @@ src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "41045e36a31782ecdfeb49918629fc4af94876e7"; - sha256 = "0isvmly7pslb9q7nvbkdwfja9aq9wa73azbncgsa63a2wxmwjqac"; + rev = "497c7e68df5e3b6b8c3ebaaf6edfce6b2d29b616"; + sha256 = "1j15dfg1mr21vyf7c9h3dij1pnikwvmxr3rs0vdrx8lz9x321amf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme"; @@ -55218,12 +55378,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20170710.821"; + version = "20180208.1751"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "23ac701e2a1a1364ca96d267437c3413986a4497"; - sha256 = "1kbwmdhv8fpw613yk8sgh3yz4rcrh2aygqkv3c46d5fr0xm04a80"; + rev = "4e0d585e85a0e27c7703dc6c6edbadc1b4ce1ce0"; + sha256 = "0cq1jkizivjkr0mq0fmv0i9vp01g00w0l500s8r25v6npzjmgq6j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -55323,12 +55483,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, password-store-otp }: melpaBuild { pname = "pass"; - version = "20180109.201"; + version = "20180201.451"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "855e89446676f03065ed01e4a5c8dfba5eca3610"; - sha256 = "0s784pvv8jxiicvqcb9x0nynnpp0m431vw835qhp1pi1y4cfbbf8"; + rev = "da08fed8dbe1bac980088d47b01f90154dbb8d8b"; + sha256 = "1j5fdcqmqw62zvmwd80bjvkrr5vg59l5k6673hvvhjx77c8nvidv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -55432,8 +55592,8 @@ src = fetchFromGitHub { owner = "zx2c4"; repo = "password-store"; - rev = "bd1cadd5620279b5ee781434b4f0731eb9ad730d"; - sha256 = "017na2x0hrx4837w5xky3qnzrq3a36fi3mnjpdrv92pr06hbnc4n"; + rev = "ffef92ee0ed10551b20521f2d6e5637c8f9da798"; + sha256 = "12j2fjrhxpgha1ay0r4c5cjc6d16s350iclyrvcma35y5dqih2n9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store"; @@ -56707,12 +56867,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20180128.843"; + version = "20180211.751"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "ff86ba6e5e9b9b27539eeec61a4adde65bb59f6c"; - sha256 = "0nh9sw9ykbgw8ljs3cqcx3c8aq00zz6ywlin4l3sjbhrgc2lpdab"; + rev = "0d7f970dfffc6532814b5f2290d59391e1cabb78"; + sha256 = "16dvhamcy8a4c4g9k7vxgqaic1wz03adshvhbh4nqflwwyzz7ldp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -57082,6 +57242,27 @@ license = lib.licenses.free; }; }) {}; + pipenv = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "pipenv"; + version = "20180207.1216"; + src = fetchFromGitHub { + owner = "pwalsh"; + repo = "pipenv.el"; + rev = "cb10661cb11bed9f781c2aef01708f3304f83de1"; + sha256 = "1m8pdn3vyrzna0a1adwm4s22zgykr6cr9pp9p1v6q1ar80hxchrx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d46738976f5dfaf899ee778b1ba6dcee455fd271/recipes/pipenv"; + sha256 = "110ddg6yjglp49rgn1ck41rl97q92nm6zx86mxjmcqq35cxmc6g1"; + name = "pipenv"; + }; + packageRequires = [ emacs f s ]; + meta = { + homepage = "https://melpa.org/#/pipenv"; + license = lib.licenses.free; + }; + }) {}; pippel = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pippel"; @@ -57397,6 +57578,27 @@ license = lib.licenses.free; }; }) {}; + playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "playground"; + version = "20180207.1011"; + src = fetchFromGitHub { + owner = "akirak"; + repo = "emacs-playground"; + rev = "7e9452ddecc9560ed79cc13af4fe5046996549bb"; + sha256 = "1fbcyds94g0dllr2iq1mf6mxq6300160063zj8r4p3gp3h370sgf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f062a74fe1746129879ad19c1735621f58509d33/recipes/playground"; + sha256 = "1xjmxkl8h4l87fvv1sr478r6mkmy9gkzw2fxmzqn5fcsahzkyg4d"; + name = "playground"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/playground"; + license = lib.licenses.free; + }; + }) {}; plenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plenv"; @@ -58117,15 +58319,36 @@ license = lib.licenses.free; }; }) {}; + posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "posframe"; + version = "20180212.136"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "posframe"; + rev = "2073a1f7480aaee8a21405edf44ba28888f64aff"; + sha256 = "0in8nvdgjaj89rg2ckq828vpfpfswj9830zghi7xsky74wysc00k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe"; + sha256 = "02chwkc7gn7fxaaxsz9msmrhrd62bji5hhb71kdm019x8d84z06w"; + name = "posframe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/posframe"; + license = lib.licenses.free; + }; + }) {}; postcss-sorting = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "postcss-sorting"; - version = "20170531.1858"; + version = "20180211.156"; src = fetchFromGitHub { owner = "P233"; repo = "postcss-sorting.el"; - rev = "1320d74abd8ee7f0a09b5f7920d554650a7047a6"; - sha256 = "0071al1nwqazv8rhr7qm799rmizbqwgcrb5in3lm0sz88fbs9vnk"; + rev = "deb0c935d2904c11a965758a9aee5a0e905f21fc"; + sha256 = "03kng7i09px5vizvmmrar7rj3bk27y43bi8hlzxax0ja27k0c66c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fae97430f211786f615f7450936f823e2a04ec4/recipes/postcss-sorting"; @@ -58309,12 +58532,12 @@ preseed-generic-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "preseed-generic-mode"; - version = "20170802.1753"; + version = "20180209.2100"; src = fetchFromGitHub { owner = "suntong"; repo = "preseed-generic-mode"; - rev = "341d85f8ecdc8834956a0352ece542f45def88db"; - sha256 = "1p486absi0mlcangpbh6hs36wvlmm9s6f4ag0lzmw7w3ikhp88kn"; + rev = "3aa8806c4a659064baa01751400c53fbaf847f66"; + sha256 = "02yb5xkgwqxpwghhjmxf2gx0faifi04w2jd8cvfsiwzwqmqyhmv7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/preseed-generic-mode"; @@ -59194,8 +59417,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "da6b07a2e58cf6b6d5326b1f538e902aab3de5be"; - sha256 = "00baxp6nh6lskc0w5mm4w7m0pd0z6ai2sbpcl9ylcajqw0n4kknq"; + rev = "e34ec6077af141dd5dfc1c334ecdcce3c6b51612"; + sha256 = "15hvnhkj2ias3h9zkg713p0gixqpnhdxvjp6msbvnm8k99qxccw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -59284,12 +59507,12 @@ psession = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psession"; - version = "20171107.2313"; + version = "20180202.44"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "psession"; - rev = "d087644db226e2c66481d3c248e26afa9e4eb670"; - sha256 = "1hb8cs8kkqpd96fb5dc8fysgg29fvay0ky83n9nawwzq516396ag"; + rev = "0d5091ae1090bad41d8e10a2f3f94a9e87711610"; + sha256 = "1h60j33nygivwa9hgn98ibyvxmxr02p338iq80z0nhqqkhzg24rp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession"; @@ -59853,8 +60076,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "pyenv-mode"; - rev = "215b7f0ed3847e0c844adbff7d9b19057aa7c820"; - sha256 = "0wb9xgpp9bc045kkw0jg14qnxa1y7ydsv1zw4nmy0mw7acxpcjgn"; + rev = "eabb1c66f9e0c0500fef4d089508aad246d81dc0"; + sha256 = "1zmgm24d6s56jc4ix61058p1k0h95vdvdllr7fh1k3bq4mw22qn3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/pyenv-mode"; @@ -59930,22 +60153,22 @@ license = lib.licenses.free; }; }) {}; - pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }: + pyim = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "20180128.405"; + version = "20180206.1419"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "37be07e2e585d1cb5964d7187fca22e863714056"; - sha256 = "1kgf363a7g7kpy32qw0n7iwlpkr93k4g6h84r3f0g58d8ckargm3"; + rev = "c670df2a338ca956b6103fd388f81a551bfc33f8"; + sha256 = "1pkjwcwz6xagamigsv25bxydda1yxzphw0xfclpi21raqnr9f1s6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j"; name = "pyim"; }; - packageRequires = [ async cl-lib emacs popup pyim-basedict ]; + packageRequires = [ async emacs popup pyim-basedict ]; meta = { homepage = "https://melpa.org/#/pyim"; license = lib.licenses.free; @@ -60063,8 +60286,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "60d471c36f0f390b4f51744eacd73ed99aae164a"; - sha256 = "07bwknfcf148vp6hs9jq3f2ixkkiwwg1xy9jck4disfvym81kqz3"; + rev = "5e79774c5028eb492e59bed92d25088b081cf2db"; + sha256 = "14nxl62cnzab0nrf1j45a9p55sqmcy9mgmkh1wv9lb0v1fyi1x3k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -60077,6 +60300,27 @@ license = lib.licenses.free; }; }) {}; + pynt = callPackage ({ deferred, ein, emacs, epc, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "pynt"; + version = "20180203.2100"; + src = fetchFromGitHub { + owner = "ebanner"; + repo = "pynt"; + rev = "76fa85dd0c791a6493d59bd564ce5f6ec20ab40d"; + sha256 = "06rhaqf5wkwk6xl8mp2kyyncnyjclvykal06iqj9sbd4kn5nnq5p"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt"; + sha256 = "07c0zc68r3pskn3bac3a8x5nrsykl90a1h22865g3i5vil76vvg3"; + name = "pynt"; + }; + packageRequires = [ deferred ein emacs epc helm ]; + meta = { + homepage = "https://melpa.org/#/pynt"; + license = lib.licenses.free; + }; + }) {}; pytest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pytest"; @@ -60290,12 +60534,12 @@ pythonic = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pythonic"; - version = "20171219.810"; + version = "20180208.214"; src = fetchFromGitHub { owner = "proofit404"; repo = "pythonic"; - rev = "ce9c45564efa5553f6268c34f5f1ca2dfcb4d4da"; - sha256 = "0kv9iv3d5jdrl9c5pnay6lj3if3a0l3f8gc01mms7b8xdpk37xr7"; + rev = "e8102636cdd44a65638e3752fac9834a4ea87504"; + sha256 = "1v8qq9g9hdyia2hjkwwhsaikz528xkcirqpkgv6m9glbd3831h21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5589c55d459f15717914061d0f0f4caa32caa13c/recipes/pythonic"; @@ -60731,12 +60975,12 @@ railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-reloaded-theme"; - version = "20170314.146"; + version = "20180131.2246"; src = fetchFromGitHub { owner = "thegeorgeous"; repo = "railscasts-reloaded-theme"; - rev = "bd6e385752c89760fdee7bdf331e24d1d80ee7e9"; - sha256 = "17vr2mbz1v20w7r52iqb7hicy131yaqhifbksvknx8xnm6z27pnm"; + rev = "6312f01470dcc73537dbdaaccabd59c4d18d23a9"; + sha256 = "1fqpqgkpn36kj3fb4na0w4cjwln05rvy6w1q5czas8z37rk2bs33"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; @@ -60836,12 +61080,12 @@ rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rake"; - version = "20170921.801"; + version = "20180212.208"; src = fetchFromGitHub { owner = "asok"; repo = "rake"; - rev = "a27322262ebcce7765574b577000f6f939400206"; - sha256 = "1fzlll8s5vri5hmqsx5ilbrms73b0rsn3k6m5dgq6rhgn5z5k6r1"; + rev = "9c204334b03b4e899fadae6e59c20cf105404128"; + sha256 = "09k2fqkmqr6g19rvqr5x2kpj1cn3wkncxg50hz02vmsrbgmzmnja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0f84698dda02a5b84a244ee29a23a6faa9de68/recipes/rake"; @@ -61319,12 +61563,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20180115.127"; + version = "20180207.1330"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "a5853d53a63e8a23b7b4c2ae0faf575623637c8d"; - sha256 = "0yalj4nn42g32xjr2s5hvlhinyhz1jjyx74494c018prybs16z75"; + rev = "251eb8c971b2a706767326f4f8c6fc5221dd6bd8"; + sha256 = "0w00j3m73lwkwr2jv1bw8glbx50xk1h5vqnpb26zqk54nz310lw1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -61511,6 +61755,27 @@ license = lib.licenses.free; }; }) {}; + recentf-remove-sudo-tramp-prefix = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "recentf-remove-sudo-tramp-prefix"; + version = "20180204.2156"; + src = fetchFromGitHub { + owner = "ncaq"; + repo = "recentf-remove-sudo-tramp-prefix"; + rev = "6d23ebc3f52b0a66236c171c45cc77a4d3aba541"; + sha256 = "0rzs9fmy1iqips6px0v57wnplbxmm3sbnk6xcszwhkwwp563hk32"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0bf1761715ee4917ba0823adbda03859d5b8131a/recipes/recentf-remove-sudo-tramp-prefix"; + sha256 = "01kdpx7kqd39a5hjym5plcj5d8szzghigq9mq186mggayg8q44cr"; + name = "recentf-remove-sudo-tramp-prefix"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/recentf-remove-sudo-tramp-prefix"; + license = lib.licenses.free; + }; + }) {}; recompile-on-save = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "recompile-on-save"; @@ -61661,12 +61926,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20180112.838"; + version = "20180207.1002"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "6737a3dba0501aeb275c1e5ee8833ee3a9a35845"; - sha256 = "0vrrwiz02vi21h11907lhbbkbl367nqd7ccqjpv2g6rsswsfrnpy"; + rev = "113c07f5b7ae112d7e199aa33665352852ac7f12"; + sha256 = "106b8nmhdwwpg6l4p9s3jm55r2b9zlj49iklp7qfbjb2wv6qci8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -61724,12 +61989,12 @@ refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; - version = "20170322.1527"; + version = "20180205.956"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "55984dbd570c361e7d56d85f2d4ecfbcc567bda1"; - sha256 = "0amj5i69cgk0p0c3wlm68dgrav8in5n19msglnks210mbfd1vzhj"; + rev = "6b432bef019e7af38ee7145956fa28d512256420"; + sha256 = "0sf70cb3ahz42pb7lyp380w4k3698z6in9ng10pm47dv7j660llq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -62878,12 +63143,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20180107.2358"; + version = "20180130.942"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; - sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; + rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; + sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -63071,8 +63336,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "ruby-hash-syntax"; - rev = "bc05c3130a5d3237f04c6064297e56de5f73887d"; - sha256 = "1jwvyj3kqchd40h37m75ydl0gjrbm873dhfn1grqg4sgk60hr414"; + rev = "90e0fc89a2b28c527fcece7ee90d5783694a4406"; + sha256 = "1lkicxingcvs4inxvkrpxknylf09a506plbzx6bfiq9dicsnlw14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax"; @@ -63190,15 +63455,36 @@ license = lib.licenses.free; }; }) {}; + rum-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rum-mode"; + version = "20180126.1622"; + src = fetchFromGitHub { + owner = "rumlang"; + repo = "rum-mode"; + rev = "893b1a26244ef6ea82833a9afbc13cb82c0cfb53"; + sha256 = "0lgahv25a9b2dfgkcm9ipyziiqnr3sb9l2dvzm35khwf3m8dwxgq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9f8ce2dee376f1f34e89e9642c472a148fca77/recipes/rum-mode"; + sha256 = "1838w8rk5pgp1hn7a0m83mfw9jin4qv5mkyl68hl3gj7g9lhn7sd"; + name = "rum-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/rum-mode"; + license = lib.licenses.free; + }; + }) {}; run-stuff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "run-stuff"; - version = "20170813.1957"; + version = "20180208.2348"; src = fetchFromGitHub { owner = "ideasman42"; repo = "emacs-run-stuff"; - rev = "2e23a78c26f62141142c743febd57ec54c78c0e3"; - sha256 = "04m7hpda5hbmr0dni4cnpdjxwzk3sygpr5m158gswhbwh2p4r0j4"; + rev = "ed42a7bc9a197ccf1ca87f9937bf98f0a9ed3f92"; + sha256 = "1w49v868n3723q6887y4bc5q8spd7xync5d581vvxdpi75qgvr0z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6e9ce2acd859b887f7e161f4b9969be1a0b8ef/recipes/run-stuff"; @@ -63421,6 +63707,27 @@ license = lib.licenses.free; }; }) {}; + s3ed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "s3ed"; + version = "20180204.549"; + src = fetchFromGitHub { + owner = "mattusifer"; + repo = "s3ed"; + rev = "13503cb057bed29cb00a14dffe4472b5cb7748ad"; + sha256 = "1ak5nmay12s4ipmvm1a36kyny05xhzmj7wp6dry391db9n7g2wy0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/32ba78167bd6908b49f340f6da48643ac38f25f2/recipes/s3ed"; + sha256 = "08scv3aqnidz28rad5npz7b4pz9dx05rs72qkp3ybkk2vhqf2qwa"; + name = "s3ed"; + }; + packageRequires = [ dash emacs seq ]; + meta = { + homepage = "https://melpa.org/#/s3ed"; + license = lib.licenses.free; + }; + }) {}; sackspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sackspace"; @@ -63722,8 +64029,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "b635c493875e43e57102eb54bc80d008e3ca85b5"; - sha256 = "1vx7ybj4p5smal2sxa4j96dxfgzw184xxqn9m8y2s5lpwlndpz49"; + rev = "ec8aded3241766dda3b89e26fa914d07562de429"; + sha256 = "0lh9zlic3iyhxbbsa0pdxl96gi4s8z7x7nphr8hlzl4if3zb5fg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -64179,12 +64486,12 @@ sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }: melpaBuild { pname = "sdcv"; - version = "20171002.210"; + version = "20180211.833"; src = fetchFromGitHub { owner = "stardiviner"; repo = "sdcv.el"; - rev = "1aad9defb871dc07e27f603092bb81413be54cf2"; - sha256 = "1ij7inm1f59hmn9s1iqnywk1acfm0pqiim2s36vwrljy9lnb4ls8"; + rev = "7cb1f8ec0fa4bb25669534d62bff58df38a992a8"; + sha256 = "09i7zsizwq5k79wi5sgcfqdlbx0nazrnw3nd6hkn2vfrcffb7pf1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv"; @@ -64430,12 +64737,12 @@ semi = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }: melpaBuild { pname = "semi"; - version = "20160816.239"; + version = "20180204.1448"; src = fetchFromGitHub { owner = "wanderlust"; repo = "semi"; - rev = "6b9c62a76f22caf1476c837ee1976eaf0eaf38e7"; - sha256 = "0h0f6w13kiyy90vnsa4jlfdlsnd04wq6b0vrbmz74q1krfs8b0kz"; + rev = "44aa82ecf78273d8ff4c84f2121b885fb7149f41"; + sha256 = "1wl12gsz9pn4wzgbffv3ymr49kcxjggc2jx19kxqyjmwdnw004yf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78849c2d1df187b7f0ef4c34985a341e640ad3e/recipes/semi"; @@ -65543,12 +65850,12 @@ simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-httpd"; - version = "20171004.938"; + version = "20180205.1031"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-web-server"; - rev = "e7775d3bc5c6b73255814d0a62dc954e23a12c15"; - sha256 = "0pjhxhzzxrpcczwvd7b6a6q1nfmsr6m6mnlxn13nwf3r270grz87"; + rev = "be73a176a19fff8260369652f688a316e652fc03"; + sha256 = "1ifl1qsg6vxxmj3vysrvw94nn31x8krydin42vpp35w6pspx9f0z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd"; @@ -65585,12 +65892,12 @@ simple-paren = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-paren"; - version = "20180104.1016"; + version = "20180205.1141"; src = fetchFromGitHub { owner = "andreas-roehler"; repo = "simple-paren"; - rev = "6a8c33443a1e8d502d272584a4a09b23a2342679"; - sha256 = "01lr9rndk5l2ssdqvrxikwhl9sswcp3hn233bjsq9kv6i5f9r8ca"; + rev = "f5cc9b4325a07efe92379a11a1a61035c9a1e8c4"; + sha256 = "1p931vqdnh6agrrzxf55x34ikb1x53mz1a17kskzlqchlzfmc3da"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e8886feb4a034fddd40d7381508b09db79f608f/recipes/simple-paren"; @@ -65858,12 +66165,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20180125.450"; + version = "20180209.1923"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "8b92582a1b7567bd85de2996e5883982ef9c2f1b"; - sha256 = "1h7bd8dvcw0sqknh5wdnvci47l5ffhj539sz2vjf90fvmqhf51id"; + rev = "02ee1d7339e48c64946041f6f4e09447c3f53e82"; + sha256 = "0grx95xxf314m2k35m1kf20l2pwc6j11ibvrngx4pis7wqwjas3h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -65921,12 +66228,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20180126.1033"; + version = "20180208.323"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "ae3b7e7ed63a850e9cb5130e0ca5544150d74156"; - sha256 = "1q27jxagllhmnc44b3rg1lkas1w2q6xv91j3f020gvasnzmbv5gh"; + rev = "8511e9b1180589c307909c623aa5f558f697f203"; + sha256 = "0dbnmvrrd84syn96jz90rgddb3n1cfza2rmzw7p57fzknzmv349w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -66089,12 +66396,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20180128.435"; + version = "20180208.226"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "f6dda1ec006ee67122d864e6069e85194a628083"; - sha256 = "1g92nksifwh7yvrwkwqzrhrficrlkyi04nw9ydrf8mkvn3svybgy"; + rev = "cbf84c36c4eca8b032e3fd16177a7bc02df3ec4c"; + sha256 = "13dyhsravn591p7g6is01mp2ynzjnnj7pwgi57r6xqmd4611y9vh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -66613,12 +66920,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20180129.939"; + version = "20180212.202"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "05591f370ca31edc6c5ff0a762f8b03ebc1309df"; - sha256 = "1lb4j0gddzk6wb0wslhmvm09r2q1rl7vfwjraldyfzkfwspmb6r4"; + rev = "a03debdf4aeb3232ae54a9712790f6727a592538"; + sha256 = "027nam0jq6ldwgix200w78zj1hp2khqskhcvxavkhychpl8v501y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -68970,12 +69277,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20180115.1439"; + version = "20180206.1327"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "bcb2629e548de11d5eeca4a4f346b8a251b533c7"; - sha256 = "0rq93sljqa8r1vc47cwsrf2qnrl3rs1dixg6zkr9fr0clg5vz0jq"; + rev = "27c5c7722248baff572a0f3a672662618be4eebc"; + sha256 = "0pwd0cic3kj977171mpl0kkzas5l6cr806w1mhymcncgbybnr1pk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -69327,12 +69634,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20180124.1142"; + version = "20180211.1018"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "ffc34c666c2b214d01e3f722249f45d1672566bb"; - sha256 = "0gzf8l0clh2p86m6xcygykskhigr43cpwfvj1sl06mcq600fxavn"; + rev = "cc5197d5de78ba981df54815c8615d795e0ffdc5"; + sha256 = "0c8866mb2ca419b6zh153vp298dxwldj29lbrynwr1jlpjf1dbr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -69348,12 +69655,12 @@ swiper-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, swiper }: melpaBuild { pname = "swiper-helm"; - version = "20151116.330"; + version = "20180131.944"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper-helm"; - rev = "57012ab626486fcb3dfba0ee6720b0625e489b8c"; - sha256 = "1fr9vs0574g93mq88d25nmj93hrx4d4s2d0im6wk156k2yb8ha2b"; + rev = "93fb6db87bc6a5967898b5fd3286954cc72a0008"; + sha256 = "05n4h20lfyg1kis5rig72ajbz680ml5fmsy6l1w4g9jx2xybpll2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/674c709490e13267e09417e08953ff76bfbaddb7/recipes/swiper-helm"; @@ -69453,12 +69760,12 @@ sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "sx"; - version = "20180128.1705"; + version = "20180209.1414"; src = fetchFromGitHub { owner = "vermiculus"; repo = "sx.el"; - rev = "0bc0adf1b5c93795ca814f3f123405d2782088f8"; - sha256 = "0r54y80x44ydpbhsx4rgxwcf37x9w099wis0yy8cbb95asl7765j"; + rev = "95100fa3c933f6b00519baa3c7073b882a1b4603"; + sha256 = "010mlsry5s8xdah928zxy55xr51k91sqrbxv7fprir21y7nv044j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx"; @@ -69642,12 +69949,12 @@ syntactic-close = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "syntactic-close"; - version = "20180109.316"; + version = "20180211.538"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "syntactic-close"; - rev = "0118d3a041448dbf98c1ab8cc25ed75d7649ca17"; - sha256 = "0s1hamnrnh64v8sl816vd259y6j7r8rjy8avxwlfp65ah4xlcdcr"; + rev = "5ba592366b0b29b724b1cbda952cc8e25ef8b239"; + sha256 = "0b4lhvd3dsg95hpdnjmyhxrcaqkmigg7k5n98f9fb9b8k6gfdsan"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close"; @@ -69704,12 +70011,12 @@ system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "20180121.1007"; + version = "20180131.1624"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "466785ba8425308d00de1211bc79aebc0dd1ce75"; - sha256 = "16szrakal0l3p2aj133a16830zl7rcca357bbz0gj3n3vj9hiys9"; + rev = "ba902ce6602649aefda675e3c3cfcf20ac7995f2"; + sha256 = "017gif03773wlb0jfy45lsmq5vxqhghslxck9g6rgap22xn3xbcs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; @@ -70064,8 +70371,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "ba321af1103d463ee46cef68416cab635884cc7c"; - sha256 = "17038h6yxq8h0nb35vrjgxh0iwhqibbxympxlnxa1z2k46imzyhg"; + rev = "b6838add6e418eccb557f8261c49ea5d65a7068d"; + sha256 = "157gxkdryzh1zzcinljmzpbmb1vhrmkz37zfkbyl3ls8ibnw3lxb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -70480,12 +70787,12 @@ terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "terminal-here"; - version = "20171022.552"; + version = "20180208.944"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "terminal-here"; - rev = "b3659e13d3d41503b4fc59dd2c7ea622631fc3ec"; - sha256 = "1z3ngwgv8ybwq42lkpavk51a25zdkl6v9xdfi41njpxdpbfcmx8z"; + rev = "e769d3741d1023af4f965609f75e3567c89de6f0"; + sha256 = "0g0y8haw1476jr0pd1s9jckf78da11aigdkd9akzlawsvvx8z864"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here"; @@ -70862,8 +71169,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "theme-looper"; - rev = "d520d29a8bf4061b2f5f750122a0f87f4dc3da6e"; - sha256 = "1zfmmn2wiw2vb0c262nnn5pkfjm7md91rx18l65glcq4y7200ra0"; + rev = "875c2cfc84b3c143d3b14a7aba38905e35559157"; + sha256 = "145gbjizkkmdil1mmhsppmda22xg6blz81zqfsrd5aznwpiyw36q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper"; @@ -70988,8 +71295,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "3d556248a8b97310da49939195330691dfe9d9ad"; - sha256 = "0nz71cgi4ixs33x6f6lfdamsbn59sgjqn8x4z0ibssgb7ahahj2f"; + rev = "35d62edd6e9ff84b0fdd472e132a739b663a41c2"; + sha256 = "012sgyx7zqll08zfl2v1jkik5p4wxzvp40njm6h5kps5igx2wnal"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -71068,12 +71375,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20180125.418"; + version = "20180208.246"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "6a62e0709cf1f78c0596973217a167d233ad4a74"; - sha256 = "16f418sk0b7z2kq047pz1lxwx1yanbfcjyp7jlhxajklwmmsv43i"; + rev = "ca8a1c49eff59a07fefadb40d5bd60b4eee73605"; + sha256 = "0avxxgmgl1q23yj087y9vfi0r6w8ckm0l3pj9syd9yj1l05wbrwz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -71881,12 +72188,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20180116.854"; + version = "20180201.1506"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "cbdf6fe7a25f5ff7aee786fdda83ce0f2de2bd2c"; - sha256 = "1ddqk466fjxmy41w9dm7cxx89f18di9410aqmfzhivsi0ryl8q3i"; + rev = "03a36853f141387654b7cb9217c7417db096a083"; + sha256 = "0kvg2gawsgy440x1fsl2c4pkxwp3zirq9rzixanklk0ryijhd3ry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -71983,22 +72290,22 @@ license = lib.licenses.free; }; }) {}; - treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: + treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20180128.1312"; + version = "20180207.2220"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "16640850f4b9810e88236e81b7b64ca56a95e05c"; - sha256 = "0dxcpdw3jvfnij7pyy4d13wspfw7kxknxk8512q22ck51n0835ss"; + rev = "9ad516c8bd2a8db58ed9934420f6626921ab7b47"; + sha256 = "09qbz4ss5k6wd7r00y280kkhsp4dx57ghrzdld53fkx2gmhq6zr1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs"; sha256 = "0zbnw48wrbq9g7vlwxapxpq9xz8cqyr63814w0pqnh6j40ia7r2a"; name = "treemacs"; }; - packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ]; + packageRequires = [ ace-window cl-lib dash emacs f ht hydra pfuture s ]; meta = { homepage = "https://melpa.org/#/treemacs"; license = lib.licenses.free; @@ -72007,12 +72314,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "20180110.905"; + version = "20180203.416"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "16640850f4b9810e88236e81b7b64ca56a95e05c"; - sha256 = "0dxcpdw3jvfnij7pyy4d13wspfw7kxknxk8512q22ck51n0835ss"; + rev = "9ad516c8bd2a8db58ed9934420f6626921ab7b47"; + sha256 = "09qbz4ss5k6wd7r00y280kkhsp4dx57ghrzdld53fkx2gmhq6zr1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil"; @@ -72028,12 +72335,12 @@ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: melpaBuild { pname = "treemacs-projectile"; - version = "20171204.845"; + version = "20180203.416"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "16640850f4b9810e88236e81b7b64ca56a95e05c"; - sha256 = "0dxcpdw3jvfnij7pyy4d13wspfw7kxknxk8512q22ck51n0835ss"; + rev = "9ad516c8bd2a8db58ed9934420f6626921ab7b47"; + sha256 = "09qbz4ss5k6wd7r00y280kkhsp4dx57ghrzdld53fkx2gmhq6zr1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile"; @@ -72236,12 +72543,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20171204.1417"; + version = "20180207.836"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "a6d1589e256d861bfb51c59756b0aa25e88dfb89"; - sha256 = "0i9x6cvx61djavn35v8j4ildli0s9ixalxbwc4yb7sdax7379xhb"; + rev = "45f73c8fb4c6467fc54a5a905deea322ffae180c"; + sha256 = "1xhbnz0lv771bbpb6vizacdn2j47y2spdf42m72iv5iix6cgpnmq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -73317,12 +73624,12 @@ use-package = callPackage ({ bind-key, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20180127.1413"; + version = "20180206.1414"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; - sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; + rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a"; + sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package"; @@ -73342,8 +73649,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; - sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; + rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a"; + sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-chords"; @@ -73359,12 +73666,12 @@ use-package-el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: melpaBuild { pname = "use-package-el-get"; - version = "20180122.142"; + version = "20180130.2105"; src = fetchFromGitHub { owner = "edvorg"; repo = "use-package-el-get"; - rev = "34f9feec6db0d9cf0a95544b960cf5d5c6a33621"; - sha256 = "1sjvzhnl2nk2wq440mqbai01r2zxyflsl96vxbbz9g9z8ak47k8b"; + rev = "f33c448ed43ecb003b60ff601ee7ef9b08cff947"; + sha256 = "1wzn3h8k7aydj3hxxws64b0v4cr3b77cf7z128xh3v6xz2w62m4z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee4a96cf467bcab171a0adfd4ef754abec1a9971/recipes/use-package-el-get"; @@ -73384,8 +73691,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; - sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; + rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a"; + sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-ensure-system-package"; @@ -73398,6 +73705,27 @@ license = lib.licenses.free; }; }) {}; + usql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "usql"; + version = "20180204.1407"; + src = fetchFromGitHub { + owner = "nickbarnwell"; + repo = "usql.el"; + rev = "b6bd210ba3feec946576ab1f130d9f91ad2e2c44"; + sha256 = "1y1da6ipig7r5wcnb1v4pj0j56dsykvgy2pw0h4jxxibcr50pa42"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f6b968312a09d062fcc8f942d29c93df2a5a3c/recipes/usql"; + sha256 = "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84"; + name = "usql"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/usql"; + license = lib.licenses.free; + }; + }) {}; utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "utop"; @@ -73884,12 +74212,12 @@ vertica-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "vertica-snippets"; - version = "20180122.44"; + version = "20180208.154"; src = fetchFromGitHub { owner = "baron42bba"; repo = "vertica-snippets"; - rev = "61b33bb012801e6c883a72c829cddbbc4241590b"; - sha256 = "0n6gsblj6b3jnmjq9mgr0hx5jj5p4wg3b4mpvhilp3crw02zllw2"; + rev = "5959d86c77d4b8f67383f65f7f6ca3e0db2a9529"; + sha256 = "0hmvd2kly7k51qfhkg6rzcq0a5ksskr1r0x07i0imz0idm77g29z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c8cb5c0fdbb6820a08091d8936dd53a3c43c56/recipes/vertica-snippets"; @@ -74136,12 +74464,12 @@ virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "virtualenvwrapper"; - version = "20171119.1403"; + version = "20180211.1744"; src = fetchFromGitHub { owner = "porterjamesj"; repo = "virtualenvwrapper.el"; - rev = "fa49954d44cb47a46d7a2bd8566ea21dd0823dea"; - sha256 = "1d69bpx7q3x4z9d81iwapfna0p94krkfvlqr1fy3lq0g9537ahn2"; + rev = "bf13158dde071bdf4901709ed101aba6b8a25f7f"; + sha256 = "003nj9i6kfjyw1bdz1y3dssp3ff7irhsfq21r430xvdfnzrby4ky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper"; @@ -74203,8 +74531,8 @@ src = fetchFromGitHub { owner = "joostkremers"; repo = "visual-fill-column"; - rev = "57c2a72d46900117ea92e0a01b97e19481800503"; - sha256 = "086zfx4lh168rg50ndg8qzdh8vzc6sgfii7qzcn4mg4wa74hnp9y"; + rev = "d97017e9bcca79e6a0f3ef63414a954319feb879"; + sha256 = "11w3krp5z6yxchqlz45kqiqf0y9drplmanixw3q4r5cwaspx94qh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column"; @@ -74283,12 +74611,12 @@ vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vlf"; - version = "20170830.1148"; + version = "20180201.1454"; src = fetchFromGitHub { owner = "m00natic"; repo = "vlfi"; - rev = "a01e9ed416cd81ccddebebbf05d4ca80060b07dc"; - sha256 = "0ziz08ylhkqwj2rp6h1z1yi309f6791b9r91nvr255l2331481pm"; + rev = "31b292dc85a374fb343789e217015683bfbdf5f1"; + sha256 = "18ll47if9ajv0jj2aps8592bj7xqhxy74sbsqn07x9ywinxxi9mn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf"; @@ -74597,12 +74925,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20171209.227"; + version = "20180210.2213"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "2a058670d9f65e7c9e5b203b31d5946bcb2bf144"; - sha256 = "1kpw9al401x7mwzan273dz38699hirz5rdlpwihmrvccpa279r6p"; + rev = "7c70e6308242a8e9f175fca02da9b55a1805508c"; + sha256 = "0ipwchasw6ijykyl6ikxkghzigbxg8g10rdxqcy0250ra57afc2p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -74828,12 +75156,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20180120.1009"; + version = "20180211.945"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "716893f9fd4dc9612f00a5dfe4b2b8e8fdb19762"; - sha256 = "0jl36d40454h3qljc8hgqxjcdzvi1xfk7zhld7y0d4r4n77r08r0"; + rev = "d667edc2e35f5e4fe8cc4465e6359ee001a1516a"; + sha256 = "072x1kgzm9pp3bg1sq7zb1v95m19ksnnjdvf26ablwcldsgapncd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -75206,12 +75534,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20180108.1930"; + version = "20180131.606"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "1219622b756f149efe4b44c625f2140c5229f936"; - sha256 = "14wfaqlixiqg79q6vb89jjvgvxwfgcdkgxyqh2bqsjwam9xksmlp"; + rev = "fce520f8af727bd33861f8d0f7655c01ea84ad85"; + sha256 = "1sgaln0d6rslvln4bvznkp401sizngwp6ypscp4gn95ygq2aam39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -76423,12 +76751,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20180107.1546"; + version = "20180211.1348"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "c7ebabe6ccff0bce35cf7feb1cef34f4c69aee50"; - sha256 = "1r4ld1b8dd39bggjhzj6rd3wan3yhw5sm3zi623yad7w48c4xpna"; + rev = "b88e84bafc93b109c53cee2be88b8fd6517187be"; + sha256 = "1394v3mgmx7hwxi3slszhlc82hds6c4p0pfglyd2bf33c56shk6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -76885,12 +77213,12 @@ xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "20170102.1525"; + version = "20180202.1518"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "5873477fd7bd6e54142ab35fbc623ea9b55200aa"; - sha256 = "1328avc28barirwipasnhq81sn4nw6w6x6fffgqcxayv2r5bl1d8"; + rev = "42374a98f1039e105cad9f16ce585dffc96a3f1c"; + sha256 = "09mzzql76z3gn39qnfjspm8waps8msbkilmlk3n2zrizpbps6crj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -77137,12 +77465,12 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20170727.1531"; + version = "20180204.2333"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "28c34033194130d452d5c958b5241c88d42ca02b"; - sha256 = "1m3fr19sfkr7d94qzqkl7x1jmhpar2hnhq6mjscd3lfcqkifh6kv"; + rev = "7f4103736178fc6e3a9a9ba3b3d0516986ab8b71"; + sha256 = "0y153522yg5qmkdcbf7h87zcambgl9hf9bwk8dq22c0vgdc04v3i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; @@ -77368,12 +77696,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20180124.1445"; + version = "20180211.1442"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "8b421bc78d56263a2adc128337540e50a1c19c6a"; - sha256 = "0ryzk38gdz87cr44nqn31wz74qjyrjzcnqwnjsisvzzz3ivhpdqm"; + rev = "c9277d326e9c8b6052bbb35eb86467e43a7e9424"; + sha256 = "0hddvg7b3ba1irydhybr011d9dfxvnqj9km4km9l3xk9fx0kkqvw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -77432,13 +77760,13 @@ pname = "yatex"; version = "20180122.1744"; src = fetchhg { - url = "https://www.yatex.org/hgrepos/yatex/"; + url = "https://www.yatex.org/hgrepos/yatex"; rev = "b1896ef49747"; sha256 = "1a8qc1krskl5qdy4fikilrrzrwmrghs4h1yaj5lclzywpc67zi8b"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; - sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex"; + sha256 = "1qbqdsqf5s61hyyzx84csnby242n5sdcmcw55pa8r16j8kyzgrc0"; name = "yatex"; }; packageRequires = []; @@ -77496,8 +77824,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "7f394d02f6f3149b215adcc96043c78d5f32d612"; - sha256 = "0q7y0cg2gw15sm0yi45gc81bsrybv8w8z58vjlq1qp0nxpcz3ipl"; + rev = "e21c99de8fd2992031adaa758df0d495e55d682a"; + sha256 = "1l9xsqlcqi25mdka806gz3h4y4x0dh00n6bajh3x908ayixjgf91"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -77565,12 +77893,12 @@ yoficator = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yoficator"; - version = "20171206.1630"; + version = "20180129.1252"; src = fetchFromGitLab { owner = "link2xt"; repo = "yoficator"; - rev = "5ad60258097147cdd8d71147722cc4203a59a0b0"; - sha256 = "0b2xzkw0rxbxfk6rxapy82zl61k51cis9nsnw67v7h2s2423jhcr"; + rev = "e0dc076cb0d1999cb41585b5f36322681109fe86"; + sha256 = "1vq07ndxrdry26dx3ci4yz1a1qdcr20yznj62y2f0wkyccrai9y9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5156f01564978718dd99ab3a54f19b6512de5c3c/recipes/yoficator"; @@ -77649,12 +77977,12 @@ zeal-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zeal-at-point"; - version = "20170427.2042"; + version = "20180131.1554"; src = fetchFromGitHub { owner = "jinzhu"; repo = "zeal-at-point"; - rev = "50a1bd4240ff0db7c8f2046c3b00c5a8e14b9d2f"; - sha256 = "1xy9nbbk0fkd9dm8n0c0gy52vi34s6vgzbnab0hrghn6whs89ig8"; + rev = "0fc3263f44e95acd3e9d91057677621ce4d297ee"; + sha256 = "0aq9w9pjyzdgf63hwffhph6k43vv3cxmffklrjkjj3hqv796k8yd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bcb472b6b18b75acd9c68e1fc7ecce4c2a40d8f/recipes/zeal-at-point"; @@ -77756,13 +78084,13 @@ pname = "zenity-color-picker"; version = "20160302.354"; src = fetchgit { - url = "https://bitbucket.org/Soft/zenity-color-picker.el.git"; + url = "https://bitbucket.org/Soft/zenity-color-picker.el"; rev = "4f4f46676a461ebc881487fb70c8c181e323db5e"; sha256 = "14i2k52qz77dv04w39fyp9hfq983fwa3803anqragk608xgwpf4s"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e7c8f99ac93f2b828ded420a2fbcd18356ea641e/recipes/zenity-color-picker"; - sha256 = "1v6ks922paacdgpv5v8cpic1g66670x73ixsy2nixs5qdw241wzl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/zenity-color-picker"; + sha256 = "0rim1mbhlb2lj302c58rs5l7bd168nxg1jpir6cbpf8rp0k35ldb"; name = "zenity-color-picker"; }; packageRequires = [ emacs ]; @@ -77795,12 +78123,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20180125.739"; + version = "20180201.246"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "f22ea6ed957440dccbb4a21bacc545d27830423e"; - sha256 = "0p317q99js4aynjvkxanwlbq0hb10njhzl9s975p7pi6abfxfkkm"; + rev = "553ba2ba9907e56bda1d2ebf142ba7cbf9bd16f1"; + sha256 = "1d9fclil0nf06gc9734y3p6clkxpwxa8nqh9mk9kpj8k9b36lxcn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme"; @@ -78152,11 +78480,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }: melpaBuild { pname = "zpresent"; - version = "20171008.2152"; + version = "20180205.2109"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "eb6f5bf71b00"; - sha256 = "1q3xz4gwqb7ac49w0nq7zvl4n790wk6r97by1kldv54y2fj0ja9g"; + rev = "53a247d2c21b"; + sha256 = "1a45l3i1gg0pyka13z6hra3wyp6x564cz66gbi10sqly2jlwgxda"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; @@ -78172,12 +78500,12 @@ ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; - version = "20170223.1014"; + version = "20180210.717"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; - rev = "febc2d02373312ce69f56c9dbe54cabea3e0813c"; - sha256 = "0sj30f87gvxbqwi1k7xxqc1h0w7n53630d04csqayiwvc6a2z2sz"; + rev = "d078dafa74f4e2a001f1aeecf718c0716779d77e"; + sha256 = "1skhvq48f6pl1i53gaa1bplbwd1ik21a12vryby3gk3w5ccw3wng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 507e7bfcbe3b6..148099d1005de 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 = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; - sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; + rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; + sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; }; 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 = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; - sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; + rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; + sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -611,12 +611,12 @@ ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: melpaBuild { pname = "ac-rtags"; - version = "2.16"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -905,12 +905,12 @@ adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "adafruit-wisdom"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "gonewest818"; repo = "adafruit-wisdom.el"; - rev = "67e1fb17964c09514e7635dba85fb14b0926e49c"; - sha256 = "097r31l4fpj4yd2ajv6zwgwn35fwn3c83qg9yzm2rjz1rdcwxlrw"; + rev = "2b353f9029f359eb4eb4f0364bd2fbbedf081e42"; + sha256 = "0zyqnwmrj7yigk1z9baqxmzxnwhpxfjz9r1gl090harl69hdp67d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom"; @@ -2557,12 +2557,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "f6d3d45a88d8fa2d70eaa26d8ebcef741b370dd1"; - sha256 = "19jbvz07qc325mqdzk0q1ycvpibndw0mb7s7bpr0f0nblla0l0sv"; + rev = "10180e88d6d9434cec367b6c91222dd2fc3bd8ae"; + sha256 = "01w89g413s1da6rf94y1xnhw79cjy2bqb01yfjs58cy492cm0vr6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -2830,12 +2830,12 @@ better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "better-shell"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "killdash9"; repo = "better-shell"; - rev = "6ae157da700a4473734dca75925f6bf60e6b3ba7"; - sha256 = "14ym7gp57yflf86hxpsjnagxnc0z1jrdc4mbq7wcbh5z8kjkbfpd"; + rev = "f231404b6f8efce33b48e31e5b1566108d0ba000"; + sha256 = "1g5bljvigga856ksyvgix9hk0pp9nzic088kp0bqx0zqvcl82v0b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/better-shell"; @@ -3775,12 +3775,12 @@ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "4.6.1pre1"; + version = "4.6.1pre2"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "b50ba2e822ff3a780f9b5a323d48e40881a88fc7"; - sha256 = "10im6z3nrkn0yh8004jwk68gjl0lz7qq3dpj24q50nhhqabw9ah5"; + rev = "b057bd0758f63f41fd8853ee025c58368e33ed21"; + sha256 = "1s066clvar4ws0mingh68jrj87dak52grs8mnd2ibcf1kf21w08q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -3838,12 +3838,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "58f641960bcb152b33fcd27d41111291702e2da6"; - sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b"; + rev = "afdd191b97e76c8393f656336699419a2b39ca1a"; + sha256 = "10qiapg6kp890q8n2pamvnnpxwcgcldw20mp23pmwzh9nsvqrpbs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -5486,12 +5486,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; - sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; + rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; + sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -5555,12 +5555,12 @@ company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: melpaBuild { pname = "company-rtags"; - version = "2.16"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -6854,22 +6854,22 @@ license = lib.licenses.free; }; }) {}; - datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + datetime = callPackage ({ emacs, extmap, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "0.3.2"; + version = "0.4"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "d99e56785d750d6c7e416955f047fe057fae54a6"; - sha256 = "0s2pmj2wpprmdx1mppbch8i1srwhfl2pzyhsmczan75wmiblpqfj"; + rev = "2a92d80cdc7febf620cd184cf1204a68985d0e8b"; + sha256 = "0lzdgnmvkvap5j8hvn6pidfnc2ax317sj5r6b2nahllhh53mlr4j"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime"; - sha256 = "0mnkckibymc5dswmzd1glggna2fspk06ld71m7aaz6j78nfrm850"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime"; + sha256 = "0c000fnqg936dhjw5qij4lydzllw1x1jgnyy960zh6r61pk062xj"; name = "datetime"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs extmap ]; meta = { homepage = "https://melpa.org/#/datetime"; license = lib.licenses.free; @@ -7935,12 +7935,12 @@ dotenv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dotenv-mode"; - version = "0.2.1"; + version = "0.2.4"; src = fetchFromGitHub { owner = "preetpalS"; repo = "emacs-dotenv-mode"; - rev = "8d45b98beb04f486eb13d71765589e7dccb8ffa9"; - sha256 = "00hm097m1jn3pb6k3r2jhkhn1zaf6skcwv1v4dxlvdx8by1md49q"; + rev = "f4c52bcd5313379b9f2460db7f7a33119dfa96ea"; + sha256 = "1fplkhxnsgdrg10iqsmw162zny2idz4vvv35spsb9j0hsk8imclc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fc022c54b90933e70dcedb6a85167c2d9d7ba79/recipes/dotenv-mode"; @@ -8103,12 +8103,12 @@ dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dtrt-indent"; - version = "0.3"; + version = "0.5"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "69d0c5e143453708dbf0ebec4e368bc26fff683c"; - sha256 = "154m53hhzjawmrg2vlqjcg9npgq1igw9f0fz6gh7vscmbxl5dnjq"; + rev = "a87d3d9cf8d4d8cb6f108004e425f9a557683b75"; + sha256 = "0dia1xc8mng9bg987cpnhr2lciw4qbqsvzs4ayakrqfl2g3ny2qn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; @@ -8354,12 +8354,12 @@ eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "eacl"; - version = "1.0.3"; + version = "1.1.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "eacl"; - rev = "ef58d13fbff4b5c49f934cfb9e3fd6ee219ef4b2"; - sha256 = "0xxxzdr6iddxwx8z4lfay4n9r1ry8571lj2gadz5ycff6f6bxmhb"; + rev = "ec601f3a8da331dd0a9e7a93d40ae3925bd06700"; + sha256 = "1kgayh2q97rxzds5ba1zc9ah08kbah9lqbwhmb7pxxgvgx9yfagg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; @@ -9160,12 +9160,12 @@ elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "elbank"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Elbank"; - rev = "e4b532373a32889b8ab3389bd3e726dff5dd0bcf"; - sha256 = "0kqiwa5gr8q0rhr598v9p7dx88i3359j49j04crqwnc5y107s1xk"; + rev = "245cbc218e94793909ecede2e0d360c7d86f3122"; + sha256 = "1qcxh8v5dj2wcxxs3qcdny00p906nj33wsxyswwa4jbhh2vfxz12"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank"; @@ -9178,27 +9178,6 @@ license = lib.licenses.free; }; }) {}; - elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "elcord"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "Zulu-Inuoe"; - repo = "elcord"; - rev = "91c665fd832ef3b79c3eb810b7a6b08979a352cd"; - sha256 = "04nxyj94rmi22wfasi4lavn3lzkcpxpr5ksfqc8dfq9bllz4c9pa"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/36b64d0fead049df5ebd6606943a8f769324539e/recipes/elcord"; - sha256 = "044mwil9alh2v7bjj8yvx8azym2b7a5xb0c7y0r0k2vj72wiirjb"; - name = "elcord"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/elcord"; - license = lib.licenses.free; - }; - }) {}; eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eldoc-eval"; @@ -9286,12 +9265,12 @@ elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed-protocol"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "fasheng"; repo = "elfeed-protocol"; - rev = "97049eb980ce1cc2b871e4c7819133f1e4936a83"; - sha256 = "1d2i3jg5a2wd7mb4xfdy3wbx12yigqq4ykj3zbcamvx59siip591"; + rev = "e809a0f1c5b9713ec8d1932fa6412c57bc10150b"; + sha256 = "0ly7g9a85r5vm8fr45km43vdl9jbzdqyiy9a7d95wx63p6aip7vs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; @@ -9923,12 +9902,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "8c72282c98f9b10601e9a6901277040cda4b33aa"; - sha256 = "1h37kqhsi1x5xgxfp1i72vfdx5c2klblzmphf6mih3fvw3pcyxi6"; + rev = "6d526fe618c3cebf7fbc5f0d3f0a225de16a76c7"; + sha256 = "0jq67lngpz7iqwqfsl95r5p26cnnq7ldcj534nm86hwm6jfij564"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -10256,12 +10235,12 @@ epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "cask"; repo = "epl"; - rev = "a76ec344a7fee3ca7e7dfb98b86ebc3b8c1a3837"; - sha256 = "0sjxd5y5hxhrbgfkpwx6m724r3841b53hgc61a0g5zwispw5pmrr"; + rev = "fd906d3f92d58ecf24169055744409886ceb06ce"; + sha256 = "0d3z5z90ln8ipk1yds1n1p8fj9yyh2kpspqjs7agl38indra3nb4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl"; @@ -12035,6 +12014,27 @@ license = lib.licenses.free; }; }) {}; + extmap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "extmap"; + version = "1.0"; + src = fetchFromGitHub { + owner = "doublep"; + repo = "extmap"; + rev = "3860b69fb19c962425d4e271ee0a24547b67d323"; + sha256 = "1vjwinb7m9l2bw324v4m1g4mc9yqjs84bfjci93m0a1ih8n4zdbr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/extmap"; + sha256 = "0c12gfd3480y4fc22ik02n7h85k6s70i5jv5i872h0yi68cgd01j"; + name = "extmap"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/extmap"; + license = lib.licenses.free; + }; + }) {}; exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; @@ -12119,6 +12119,27 @@ license = lib.licenses.free; }; }) {}; + f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "f3"; + version = "0.1"; + src = fetchFromGitHub { + owner = "cosmicexplorer"; + repo = "f3"; + rev = "19120dda2d760d3dd6c6aa620121d1de0a40932d"; + sha256 = "1qg48zbjdjqimw4516ymrsilz41zkib9321q0caf9474s9xyp2bi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3"; + sha256 = "099wibgp9k6sgglaqigic5ay6qg7aqijnis5crwjl7b81ddqp610"; + name = "f3"; + }; + packageRequires = [ cl-lib emacs helm ]; + meta = { + homepage = "https://melpa.org/#/f3"; + license = lib.licenses.free; + }; + }) {}; fabric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fabric"; @@ -12248,16 +12269,16 @@ faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faust-mode"; - version = "0.4"; + version = "0.6"; src = fetchFromGitHub { - owner = "magnetophon"; + owner = "rukano"; repo = "emacs-faust-mode"; - rev = "85f67bc4daabe6fd8dc6f5195c470716b543faa1"; - sha256 = "0rmq6ca75x47hk2bpsk1j2ja62kpplgyanpiqq4hk6q259rd4lyv"; + rev = "7c31b22bdbfd2f8c16ec117d2975d56dd61ac15c"; + sha256 = "0a3p69ay88da13cz2cqx00r3qs2swnn7vkcvchcqyrdybfjs7y4z"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode"; - sha256 = "1lfn4q1wcc3vzazv2yzcnpvnmq6bqcczq8lpkz7w8yj8i5kpjvsc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b362e7daeabd07c726ad9770d7d4941dfffd5b19/recipes/faust-mode"; + sha256 = "0l8cbf5i6lv6i5vyqp6ngfmrm2y6z2070b8m10w4376kbbnr266z"; name = "faust-mode"; }; packageRequires = []; @@ -12276,8 +12297,8 @@ sha256 = "16p7qmljjki4svci3mxzydmvpxaprbnfq6794b3adyyixkmgr6k7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d7a6fc9f99241ff8e3a9c1fb12418d4d69d9e203/recipes/faustine"; - sha256 = "1hyvkd4y28smdp30bkky6bwmqwlxjrq136wp7112371w963iwjsb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/faustine"; + sha256 = "1blmz993xrwkyr7snj7rm07s07imgpdlfqi6wxkm4ns6iwa2q60s"; name = "faustine"; }; packageRequires = [ emacs faust-mode ]; @@ -12923,22 +12944,22 @@ license = lib.licenses.free; }; }) {}; - flycheck-dmd-dub = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; - version = "0.9"; + version = "0.12"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "e8744adaba010415055ac15c702f780dd6e13e14"; - sha256 = "1ap5hgvaccmf2xkfvyp7rqcfjwmiy6mhr6ccgahxm2z0vm51kpyh"; + rev = "41a839e18eb7159175c59a2f8b2f5f283191e33f"; + sha256 = "0a78np6nb9ciz440n9ks6kybwggkq99knzv7swbmvngvhg96khbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm"; name = "flycheck-dmd-dub"; }; - packageRequires = [ flycheck ]; + packageRequires = [ f flycheck ]; meta = { homepage = "https://melpa.org/#/flycheck-dmd-dub"; license = lib.licenses.free; @@ -13346,12 +13367,12 @@ flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }: melpaBuild { pname = "flycheck-rtags"; - version = "2.16"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -14228,12 +14249,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "f1dc9dff6779c0ce6ab0a1c0ae349df1194a314f"; - sha256 = "0j1s6qws773aq3si7pnc1xmlrh9x3v3sfdni6pnlsirv2sc7c4g9"; + rev = "e2878da13e7b87a824ebd6c842e9f552369b220c"; + sha256 = "091c8scwdxfrg710d1rkqad6l2y8hiw8f5jg4ayvrjm7d0s29hsa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -14446,12 +14467,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "e574976f5d8df1089672549a913a86c4039ab2cb"; - sha256 = "0p32sxswyjj22pg25i509d9a4j8k7c6xkbv55pd8jvjfxc2hdy3p"; + rev = "81b858a79b29622a1db732f97225cad705c4acf5"; + sha256 = "04zxal7j58whcy384sscwc7npcqdjlq01jjjn0i35pf2v7r045xy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -14509,12 +14530,12 @@ fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fwb-cmds"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "fwb-cmds"; - rev = "57973f99cf4a185b5cccbf941478fad25e8428c3"; - sha256 = "1c7h043lz10mw1hdsx9viksy6q79jipz2mm18y1inlbqhmg33n2b"; + rev = "7d4abf8aa13b2235e4e2f0bb9049ebd6b491f710"; + sha256 = "10xjs8gm9l3riffxip1ffg8xhcf8srffh01yn6ifyln5f70b063d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe40cdeb5e19628937820181479897acdad40200/recipes/fwb-cmds"; @@ -14947,6 +14968,27 @@ license = lib.licenses.free; }; }) {}; + git-attr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "git-attr"; + version = "0.0.3"; + src = fetchFromGitHub { + owner = "arnested"; + repo = "emacs-git-attr"; + rev = "c03078637a00ea301cbcc7ae301ae928b10af889"; + sha256 = "05wzy8g0yjkks0zmcvwn9dmr6kxk1bz91xic3c08b0j1z5lbsdv7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3417e4bc586df60b5e6239b1f7683b87953f5b7c/recipes/git-attr"; + sha256 = "084l3zdcgy1ka2wq1fz9d6ryhg38gxvr52njlv43gwibzvbqniyi"; + name = "git-attr"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/git-attr"; + license = lib.licenses.free; + }; + }) {}; git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-auto-commit-mode"; @@ -15199,22 +15241,22 @@ license = lib.licenses.free; }; }) {}; - git-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-timemachine"; - version = "3.0"; + version = "4.4"; src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; - rev = "7c66a878ee89861dcd59b5dfc598520daa156052"; - sha256 = "1brz9dc7ngywndlxbqbi3pbjbjydgqc9bjzf05lgx0pzr1ppc3w3"; + rev = "020d02cd77df6bf6f0efd4d4c597aad2083b6302"; + sha256 = "1g7gxa2snh8ya8r3wim834qszhcmpp154gnvqkc3b1gw8x7jdrql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq"; name = "git-timemachine"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/git-timemachine"; license = lib.licenses.free; @@ -16252,12 +16294,12 @@ grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grab-x-link"; - version = "0.4.1"; + version = "0.5"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "grab-x-link"; - rev = "d2ef886097f59e1facc5cb5d8cd1c77bf340be76"; - sha256 = "1iny8ga9xb7pfd59l4ljlj6zvvxzr7bv468sibkhlaqvjljn2xq1"; + rev = "d19f0c0da0ddc55005a4c1cdc2b8c5de8bea1e8c"; + sha256 = "1l9jg2w8ym169b5dhg3k5vksbmicg4n1a55x7ddjysf8n887cpid"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link"; @@ -18462,6 +18504,27 @@ license = lib.licenses.free; }; }) {}; + helm-rg = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-rg"; + version = "0.1"; + src = fetchFromGitHub { + owner = "cosmicexplorer"; + repo = "helm-rg"; + rev = "96dcbeb366caa0b158668384113458ee5f7c4dfd"; + sha256 = "1k9yv9iw694alf5w7555ygk2i1b26i90rqq7ny63a4nd3y5cbs5f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/958fbafdcb214f1ec89fd0d84c6600c89890e0cf/recipes/helm-rg"; + sha256 = "0gfq59540q9s6mr04q7dz638zqmqbqmbl1qaczddgmjn4vyjmf7v"; + name = "helm-rg"; + }; + packageRequires = [ cl-lib dash emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-rg"; + license = lib.licenses.free; + }; + }) {}; helm-robe = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-robe"; @@ -18486,12 +18549,12 @@ helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }: melpaBuild { pname = "helm-rtags"; - version = "2.16"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -18612,12 +18675,12 @@ helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: melpaBuild { pname = "helm-system-packages"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-system-packages"; - rev = "22ff951b092a3fbde8eadf284a24e86bb4694f6a"; - sha256 = "0argxi8dppgyfljwn654a7183lva74wnnwzkk3xlrvgngmir56kp"; + rev = "beb7e488454402a122b9dec9a019ea190b9b7dc3"; + sha256 = "0wclsv69v84d7bknnlralham94s7iqal7aczsvfxgj97hpwgywfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; @@ -18756,22 +18819,22 @@ license = lib.licenses.free; }; }) {}; - helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: + helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "e1b660e2a48b39b0a81119c2593362dd60076757"; - sha256 = "031hglxwlq8fryi8vs11hyflcrk09qc9qja28nqby0adn20z47mc"; + rev = "3ae20551fb0ce199deff47534a475cab50f19237"; + sha256 = "1zb2zfyflabhar8smvpxcdmkla7camaq2srq6dk2xc66226vj9rn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2"; name = "helpful"; }; - packageRequires = [ dash dash-functional elisp-refs emacs s shut-up ]; + packageRequires = [ dash dash-functional elisp-refs emacs f s shut-up ]; meta = { homepage = "https://melpa.org/#/helpful"; license = lib.licenses.free; @@ -19536,12 +19599,12 @@ ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ialign"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "mkcms"; repo = "interactive-align"; - rev = "1d00ab870d06b946d94e5e6d340b85a3e51fbfb1"; - sha256 = "191w5di4f0in49h60xmc5d6xaisbkv8y9f9bxzc3162c4b982qfr"; + rev = "523df320197b587abd8c0ec4e9fbc763aeab1cf6"; + sha256 = "04jak5j4yywl7fn5sggc125yh6cy0livf55194mfxs2kmbs5wm0h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; @@ -20394,6 +20457,27 @@ license = lib.licenses.free; }; }) {}; + info-colors = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "info-colors"; + version = "0.2"; + src = fetchFromGitHub { + owner = "ubolonton"; + repo = "info-colors"; + rev = "13dd9b6a7288e6bb692b210bcb9cd72016658dae"; + sha256 = "1h2q19574sc1lrxm9k78668pwcg3z17bnbgykmah01zlmbs264sx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d671ae8dc27439eea427e1848fc11c96ec5aee64/recipes/info-colors"; + sha256 = "1mbabrfdy9xn7lpqivqm8prp83qmdv5r0acijwvxqd3a52aadc2x"; + name = "info-colors"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/info-colors"; + license = lib.licenses.free; + }; + }) {}; inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inherit-local"; @@ -20606,12 +20690,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "0.1.23"; + version = "0.1.26"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "3865aad923559bee140eaede20c3510890979930"; - sha256 = "1q6q2hnqf78kxd61nic4zjx7crbv8p25p4aq0h4vihamm8r0v7vm"; + rev = "f85e1b47df3bb328be0de34120950cecb3465055"; + sha256 = "1zng4sliygg1l0jamprx9pfs85jiy19gwxpcy2hs3s4hc7yxjdds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -20942,12 +21026,12 @@ ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }: melpaBuild { pname = "ivy-rtags"; - version = "2.16"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -21759,12 +21843,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "56bafd9b1b022ebfd98cad022792957164ec56fb"; - sha256 = "02nmrdc2ldvfzyn3s9qrvq61nl93krc1vyr4ad1vkmbyqrwszyvd"; + rev = "d730208cff185ee86a81f8a5a6feadfea78ab9cc"; + sha256 = "0xfb8zi6jvwdivklc3lk5dzf8nnx05pm4fip44s4al6ajns8hgya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -22323,6 +22407,27 @@ license = lib.licenses.free; }; }) {}; + lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lcr"; + version = "0.9"; + src = fetchFromGitHub { + owner = "jyp"; + repo = "lcr"; + rev = "3bc341205bba437c8fec4fefefaf39793c0405ae"; + sha256 = "0jvdnb3fn33wq7ixb7ayrallq1j5gc9nh3i3nmy03yg11h60h1am"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr"; + sha256 = "07syirjlrw8g95zk273953mnmg9x4bv8jpyvvzghhin4saiiiw3k"; + name = "lcr"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/lcr"; + license = lib.licenses.free; + }; + }) {}; leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }: melpaBuild { pname = "leanote"; @@ -22753,12 +22858,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.21.0"; + version = "2.21.1"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "465c3f807c3ccd9af0af7032aec40c039d950ac0"; - sha256 = "1idn0bjxw5sgjb7p958fdxn8mg2rs8yjqsz8k56r9jjzr7z9jdfx"; + rev = "e0a5627e6591e1cbb9f93aabc44adbdc50b346c9"; + sha256 = "0dhm7gdd1smlibj5jmzps97kwkpzcigbdp0l26baa2mkc6155y66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -23138,8 +23243,8 @@ sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit"; - sha256 = "03cmja9rcqc9250bsp1wwv94683mrcbnz1gjn8y7v62jlfi5qws5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit"; + sha256 = "1wbqz2s1ips0kbhy6jv0mm4vh110m5r65rx0ik11dsqv1fv3hwga"; name = "magit"; }; packageRequires = [ @@ -23242,12 +23347,12 @@ magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }: melpaBuild { pname = "magit-gh-pulls"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "sigma"; repo = "magit-gh-pulls"; - rev = "e4a73781e3c1c7e4a09232b25e3474463cdf77b6"; - sha256 = "19iqa2kzarpa75xy34hqvpy1y7dzx84pj540wwkj04dnpb4fwj2z"; + rev = "d526f4c9ee1709c79f8a4630699ce1f25ae054e7"; + sha256 = "11fd3c7wnqy08khj6za8spbsm3k1rqqih21lbax2iwvxl8jv4dv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b54fe4f51820c2f707e1f5d8a1128fff19a319c/recipes/magit-gh-pulls"; @@ -25682,13 +25787,13 @@ pname = "notmuch"; version = "0.26"; src = fetchgit { - url = "git://git.notmuchmail.org/git/notmuch"; + url = "https://git.notmuchmail.org/git/notmuch"; rev = "3c4e64d976eb561ac5157df1bbe5882e3e65b583"; sha256 = "00a9ggrc63n88g7vp57c09r859pl2dbxnqgf543ks94lm0jzyz3f"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; - sha256 = "173d1gf5rd4nbjwg91486ibg54n3qlpwgyvkcy4d30jm4vqwqrqv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch"; + sha256 = "0pznpl0aqybdg4b2qypq6k4jac64sssqhgz6rvk9g2nkqhkds1x7"; name = "notmuch"; }; packageRequires = []; @@ -26075,27 +26180,6 @@ license = lib.licenses.free; }; }) {}; - ob-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, spice-mode }: - melpaBuild { - pname = "ob-spice"; - version = "0.4.2"; - src = fetchFromGitHub { - owner = "stardiviner"; - repo = "ob-spice"; - rev = "790faa67b0c57ca76e8814a1fa60b4dd774412c0"; - sha256 = "0rn3j88ry38500vfaj0myx148nd5kh1jwja6j221ydd6v5wqws6d"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-spice"; - sha256 = "0nhdcvq7yvprz4323836k507w0g1lh3rdfr6dqrbj29yvsqfw0x2"; - name = "ob-spice"; - }; - packageRequires = [ org spice-mode ]; - meta = { - homepage = "https://melpa.org/#/ob-spice"; - license = lib.licenses.free; - }; - }) {}; ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }: melpaBuild { pname = "ob-translate"; @@ -26376,8 +26460,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "588b8482685adedbc56933cb13c58d9cc6a82456"; - sha256 = "1iqwxc19jvcb2gsm2aq59zblg1qjmbxgb2yl3h3aybqp968j3i00"; + rev = "7a6fe00e841106b17e7554f8a21f8457d12c5197"; + sha256 = "1vrgj2irm87pykfjyx27a46g5xam7rxwjdfqh4jl6p8cgzgprrrg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -28019,12 +28103,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "0.2.4"; + version = "0.3"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "4b4585264a28152f2eda0f7e5ceed132f9d23e16"; - sha256 = "1k3lv4qqkp87piwlwl3gahac1zpjzv397f65g4khbpby2kgg8dpi"; + rev = "3d958203e169cbfb2204c43cb4c5543befec0b9d"; + sha256 = "057sqmvm8hwkhcg3yd4i8zz2xlqsqrpyiklyiw750s3i5mxdn0k7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -28331,6 +28415,27 @@ license = lib.licenses.free; }; }) {}; + panda-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "panda-theme"; + version = "0.1"; + src = fetchFromGitHub { + owner = "jamiecollinson"; + repo = "emacs-panda-theme"; + rev = "ae24179e7a8a9667b169f00dbd891257530c1d22"; + sha256 = "05vv4idl9h59jd089hpd09xcy1ix30bq0c4fif2b66170aychvii"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a90ca1275ceab8e1ea4fdfa9049fbd24a5fd0bf5/recipes/panda-theme"; + sha256 = "1q3zp331hz8l54p8ym9jrs4f36aj15r8aka6bqqnalnk237xqxl7"; + name = "panda-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/panda-theme"; + license = lib.licenses.free; + }; + }) {}; pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pandoc"; @@ -30811,6 +30916,27 @@ license = lib.licenses.free; }; }) {}; + pynt = callPackage ({ deferred, ein, emacs, epc, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "pynt"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "ebanner"; + repo = "pynt"; + rev = "bc750cd244141005ea3b7bb87f75c6f6c5a5778f"; + sha256 = "0mj8lkc40iv8d6afl4dba7gsbi0mgnx9ivanvczq6pxp5d4kgfsn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt"; + sha256 = "07c0zc68r3pskn3bac3a8x5nrsykl90a1h22865g3i5vil76vvg3"; + name = "pynt"; + }; + packageRequires = [ deferred ein emacs epc helm ]; + meta = { + homepage = "https://melpa.org/#/pynt"; + license = lib.licenses.free; + }; + }) {}; python-environment = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-environment"; @@ -32206,12 +32332,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "2.16"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -35248,12 +35374,12 @@ swiper-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, swiper }: melpaBuild { pname = "swiper-helm"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper-helm"; - rev = "f3d6dba865629eed8fb14f92dab1fad50734891b"; - sha256 = "1y2dbd3ikdpjvi8xz10jkrx2773h7cgr6jxm5b2bldm81lvi8x64"; + rev = "93fb6db87bc6a5967898b5fd3286954cc72a0008"; + sha256 = "05n4h20lfyg1kis5rig72ajbz680ml5fmsy6l1w4g9jx2xybpll2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/674c709490e13267e09417e08953ff76bfbaddb7/recipes/swiper-helm"; @@ -36192,12 +36318,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "2.6.2"; + version = "2.7.1"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "1ee2e6e5f6e22b180af08264e5654b26599f96fe"; - sha256 = "0gd149vlf3297lm595xw3hc9jd45wisbrpbr505qhkffrj60q1lq"; + rev = "6ca5319cdd581d323944584242a1ba45a115ee3d"; + sha256 = "1jcnzx8g742pfh9nv3gcsxdj31kfpjzl202by30pzg2xz54i48gb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -36380,12 +36506,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "0.12"; + version = "0.12.1"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "0de5a5fa2438890ae9c2ca61999042ab175df3e9"; - sha256 = "1wqlbbm71s1hvglsdp1qs7nvj6gnkjkai4rr8hhp1lliiyd5vmia"; + rev = "03a36853f141387654b7cb9217c7417db096a083"; + sha256 = "0kvg2gawsgy440x1fsl2c4pkxwp3zirq9rzixanklk0ryijhd3ry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -36419,22 +36545,22 @@ license = lib.licenses.free; }; }) {}; - treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: + treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.16.1"; + version = "1.18"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "ef7597d5e99d50efd014bfa9f01046956d0da95f"; - sha256 = "15379w0frxwl9p1xraqapn9r2wra75g8mjybj41jd1y65acjg9wg"; + rev = "2bab3bfb6e75d44d42e1055c4e9bb44400a46475"; + sha256 = "0zzm17cv1j25b2hj6vlqwi7iglqckijqbsvap0lkijimaipzpq52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs"; sha256 = "0zbnw48wrbq9g7vlwxapxpq9xz8cqyr63814w0pqnh6j40ia7r2a"; name = "treemacs"; }; - packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ]; + packageRequires = [ ace-window cl-lib dash emacs f ht hydra pfuture s ]; meta = { homepage = "https://melpa.org/#/treemacs"; license = lib.licenses.free; @@ -36443,12 +36569,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.16.1"; + version = "1.18"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "ef7597d5e99d50efd014bfa9f01046956d0da95f"; - sha256 = "15379w0frxwl9p1xraqapn9r2wra75g8mjybj41jd1y65acjg9wg"; + rev = "2bab3bfb6e75d44d42e1055c4e9bb44400a46475"; + sha256 = "0zzm17cv1j25b2hj6vlqwi7iglqckijqbsvap0lkijimaipzpq52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil"; @@ -36464,12 +36590,12 @@ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: melpaBuild { pname = "treemacs-projectile"; - version = "1.16.1"; + version = "1.18"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "ef7597d5e99d50efd014bfa9f01046956d0da95f"; - sha256 = "15379w0frxwl9p1xraqapn9r2wra75g8mjybj41jd1y65acjg9wg"; + rev = "2bab3bfb6e75d44d42e1055c4e9bb44400a46475"; + sha256 = "0zzm17cv1j25b2hj6vlqwi7iglqckijqbsvap0lkijimaipzpq52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile"; @@ -37118,6 +37244,27 @@ license = lib.licenses.free; }; }) {}; + usql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "usql"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "nickbarnwell"; + repo = "usql.el"; + rev = "4cd8f4cf5c2e75485343321f02d621915aef10e8"; + sha256 = "0cw25g8jvfjpzq3sabc3zbp0qynknzc0mq5psspcbxffk2qalbb9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f6b968312a09d062fcc8f942d29c93df2a5a3c/recipes/usql"; + sha256 = "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84"; + name = "usql"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/usql"; + license = lib.licenses.free; + }; + }) {}; utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "utop"; @@ -38863,12 +39010,12 @@ xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "ed3d0f4ccb2b28ff034192c50f244a97197d3911"; - sha256 = "0djh18lm3xn9h4fa5ra0jrlzdzwhvhcalipj73j5gmmfaif4ya9q"; + rev = "42374a98f1039e105cad9f16ce585dffc96a3f1c"; + sha256 = "09mzzql76z3gn39qnfjspm8waps8msbkilmlk3n2zrizpbps6crj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -39137,13 +39284,13 @@ pname = "yatex"; version = "1.80"; src = fetchhg { - url = "https://www.yatex.org/hgrepos/yatex/"; + url = "https://www.yatex.org/hgrepos/yatex"; rev = "b1896ef49747"; sha256 = "1a8qc1krskl5qdy4fikilrrzrwmrghs4h1yaj5lclzywpc67zi8b"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; - sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex"; + sha256 = "1qbqdsqf5s61hyyzx84csnby242n5sdcmcw55pa8r16j8kyzgrc0"; name = "yatex"; }; packageRequires = []; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index f74ae6ab3811f..a8815b4d3d875 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 = "20180129"; + version = "20180212"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20180129.tar"; - sha256 = "0cwxqr34c77qmv7flcpd46qwkn0nzli21s3m9km00mwc8xy308n4"; + url = "https://orgmode.org/elpa/org-20180212.tar"; + sha256 = "09wgmiavby009mkc5v2d0znrrs40fnmhzq252hni4zjy8kbgwfzk"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20180129"; + version = "20180212"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20180129.tar"; - sha256 = "1bk7jmizlvfbq2bbis3kal8nllxj752a8dkq7j68q6kfbc6w1z24"; + url = "https://orgmode.org/elpa/org-plus-contrib-20180212.tar"; + sha256 = "0wy9j2iagjzzjkqfsz1askxg4jmaxc0p0f42jbzx2ja7h4qkm9nj"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix index 1cdcb9b855446..de72b24f87acb 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (rec { name = "ProofGeneral-unstable-${version}"; - version = "2017-11-06"; + version = "2018-01-30"; src = fetchFromGitHub { owner = "ProofGeneral"; repo = "PG"; - rev = "2eab72c33751768c8a6cde36b978ea4a36b91843"; - sha256 = "1l3n48d6d4l5q3wkhdyp8dc6hzdw1ckdzr57dj8rdm78j87vh2cg"; + rev = "945cada601c5729edd16fcc989a3969c8b34d20a"; + sha256 = "1zjmbhq6c8g8b93nnsvr5pxx6mlcndb0fz152b2h80vfh9663cn8"; }; buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive; diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index b41ca92db086b..cc1ab1d0e3039 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -1,18 +1,39 @@ -;;; NixOS specific load-path -(setq load-path - (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) - (split-string (or (getenv "NIX_PROFILES") "")))) - load-path)) +(defun nix--profile-paths () + "Returns a list of all paths in the NIX_PROFILES environment +variable, ordered from more-specific (the user profile) to the +least specific (the system profile)" + (reverse (split-string (or (getenv "NIX_PROFILES") "")))) + +;;; Extend `load-path' to search for elisp files in subdirectories of +;;; all folders in `NIX_PROFILES'. Also search for one level of +;;; subdirectories in these directories to handle multi-file libraries +;;; like `mu4e'.' +(require 'seq) +(let* ((subdirectory-sites (lambda (site-lisp) + (when (file-exists-p site-lisp) + (seq-filter (lambda (f) (file-directory-p (file-truename f))) + ;; Returns all files in `site-lisp', excluding `.' and `..' + (directory-files site-lisp 'full "^\\([^.]\\|\\.[^.]\\|\\.\\..\\)"))))) + (paths (apply #'append + (mapcar (lambda (profile-dir) + (let ((site-lisp (concat profile-dir "/share/emacs/site-lisp/"))) + (cons site-lisp (funcall subdirectory-sites site-lisp)))) + (nix--profile-paths))))) + (setq load-path (append paths load-path))) + ;;; Make `woman' find the man pages (eval-after-load 'woman '(setq woman-manpath - (append (reverse (mapcar (lambda (x) (concat x "/share/man/")) - (split-string (or (getenv "NIX_PROFILES") "")))) + (append (mapcar (lambda (x) (concat x "/share/man/")) + (nix--profile-paths)) woman-manpath))) ;;; Make tramp work for remote NixOS machines (eval-after-load 'tramp + ;; TODO: We should also add the other `NIX_PROFILES' to this path. + ;; However, these are user-specific, so we would need to discover + ;; them dynamically after connecting via `tramp' '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) ;;; C source directory @@ -22,9 +43,9 @@ ;;; from: /nix/store/<hash>-emacs-<version>/share/emacs/site-lisp/site-start.el ;;; to: /nix/store/<hash>-emacs-<version>/share/emacs/<version>/src/ (let ((emacs - (file-name-directory ;; .../emacs/ - (directory-file-name ;; .../emacs/site-lisp - (file-name-directory load-file-name)))) ;; .../emacs/site-lisp/ + (file-name-directory ; .../emacs/ + (directory-file-name ; .../emacs/site-lisp + (file-name-directory load-file-name)))) ; .../emacs/site-lisp/ (version (file-name-as-directory (concat diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix new file mode 100644 index 0000000000000..491fc0ca2a8dd --- /dev/null +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, qmake, pkgconfig, qtwebkit, hunspell }: + +stdenv.mkDerivation rec { + pname = "ghostwriter"; + version = "1.5.0"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "wereturtle"; + repo = pname; + rev = "v${version}"; + sha256 = "0ixw2w2526836lwj4pc0vp7prp1gls7iq37v8m9ql1508b33b9pq"; + }; + + nativeBuildInputs = [ qmake pkgconfig ]; + + buildInputs = [ qtwebkit hunspell ]; + + meta = with stdenv.lib; { + description = "A cross-platform, aesthetic, distraction-free Markdown editor"; + homepage = src.meta.homepage; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 6cd68b6f21d5a..0e77094b819c7 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -234,12 +234,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2017.3.2"; /* updated by script */ + version = "2017.3.3"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0lv0nwfgm6h67mxhh0a2154ym7wcbm1qp3k1k1i00lg0lwig1rcw"; /* updated by script */ + sha256 = "0j090863y68ppw34qkldm8h4lpbhalhqn70gb0ifj9bglf17503d"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -273,12 +273,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2017.3.4"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1wxaz25609wri2d91s9wy00gngplyjg7gzix3mzdhgysm00qizf1"; /* updated by script */ + sha256 = "15qsfirzmmjhwzkhx36zr4n0z5lhs021n2n3wim01g309ymr4gl9"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; @@ -286,12 +286,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2017.3.4"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "01d5a6m927q9bnjlpz8va8bfjnj52k8q6i3im5ygj6lwadbzawyf"; /* updated by script */ + sha256 = "0f937s6zc1sv0gdlxf9kkc8l8rg78a5mxsfr2laab0g37rfy8c99"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; @@ -299,12 +299,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2017.3.4"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0mk4d2c41qvfz7sqxqw7adak86pm95wvhzxrfg32y01r5i5q0av7"; /* updated by script */ + sha256 = "1hxkn0p0lp021bbysypwn8s69iggb76iwq38jv5a1ql7v5r1nwvd"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PS2017.3"; @@ -364,12 +364,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2017.3.4"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1fhs13944928rqcqbv8d29qm1y0zzry4drr9gqqmj814y2vkbpnl"; /* updated by script */ + sha256 = "0d5whqa6c76l6g5yj0yq8a3k1x6d9kxwnac1dwsiy5dbr5jk0cyj"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WS_Release"; diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 067aff5ee69b4..dae30c5ac0c25 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, boost, asciidoc, docbook_xsl, libxslt }: +{ stdenv, fetchFromGitHub, ncurses, boost, asciidoc, docbook_xsl, libxslt, pkgconfig }: with stdenv.lib; @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { rev = "7482d117cc85523e840dff595134dcb9cdc62207"; sha256 = "08j611y192n9vln9i94ldlvz3k0sg79dkmfc0b1vczrmaxhpgpfh"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ]; postPatch = '' diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index e2218473d723e..187474de5b6f5 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -1,6 +1,5 @@ -{ stdenv, lib, makeDesktopItem, makeWrapper, lndir +{ stdenv, lib, makeDesktopItem, makeWrapper , vimUtils -, neovim , bundlerEnv, ruby , pythonPackages , python3Packages diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 6ff67728ea117..6b7881c490cf3 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -4,7 +4,10 @@ }: let - version = "1.1.414"; + verMajor = "1"; + verMinor = "1"; + verPatch = "423"; + version = "${verMajor}.${verMinor}.${verPatch}"; ginVer = "1.5"; gwtVer = "2.7.0"; in @@ -19,46 +22,30 @@ stdenv.mkDerivation rec { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "1rr2zkv53r8swhq5d745jpp0ivxpsizzh7srf34isqpkn5pgx3v8"; + sha256 = "02kpmzh0vr0gb5dhiwcm4gwjbc3biwz0km655mgzmx9j64cyd3nf"; }; # Hack RStudio to only use the input R. patches = [ ./r-location.patch ]; postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}"; - inherit ginVer; ginSrc = fetchurl { url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip"; sha256 = "155bjrgkf046b8ln6a55x06ryvm8agnnl7l8bkwwzqazbpmz8qgm"; }; - inherit gwtVer; gwtSrc = fetchurl { url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip"; sha256 = "1cs78z9a1jg698j2n35wsy07cy4fxcia9gi00x0r0qc3fcdhcrda"; }; - hunspellDictionaries = builtins.attrValues hunspellDicts; + hunspellDictionaries = with stdenv.lib; filter isDerivation (attrValues hunspellDicts); mathJaxSrc = fetchurl { url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip; sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk"; }; - rmarkdownSrc = fetchFromGitHub { - owner = "rstudio"; - repo = "rmarkdown"; - rev = "v1.8"; - sha256 = "1blqxdr1vp2z5wd52nmf8hq36sdd4s2pyms441dqj50v35f8girb"; - }; - - rsconnectSrc = fetchFromGitHub { - owner = "rstudio"; - repo = "rsconnect"; - rev = "953c945779dd180c1bfe68f41c173c13ec3e222d"; - sha256 = "1yxwd9v4mvddh7m5rbljicmssw7glh1lhin7a9f01vxxa92vpj7z"; - }; - rstudiolibclang = fetchurl { url = https://s3.amazonaws.com/rstudio-buildtools/libclang-3.5.zip; sha256 = "1sl5vb8misipwbbbykdymw172w9qrh8xv3p29g0bf3nzbnv6zc7c"; @@ -71,31 +58,31 @@ stdenv.mkDerivation rec { preConfigure = '' + export RSTUDIO_VERSION_MAJOR=${verMajor} + export RSTUDIO_VERSION_MINOR=${verMinor} + export RSTUDIO_VERSION_PATCH=${verPatch} + GWT_LIB_DIR=src/gwt/lib - mkdir -p $GWT_LIB_DIR/gin/$ginVer - unzip $ginSrc -d $GWT_LIB_DIR/gin/$ginVer + mkdir -p $GWT_LIB_DIR/gin/${ginVer} + unzip ${ginSrc} -d $GWT_LIB_DIR/gin/${ginVer} - unzip $gwtSrc + unzip ${gwtSrc} mkdir -p $GWT_LIB_DIR/gwt - mv gwt-$gwtVer $GWT_LIB_DIR/gwt/$gwtVer + mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer} mkdir dependencies/common/dictionaries - for dict in $hunspellDictionaries; do - for i in "$dict/share/hunspell/"* - do ln -sv $i dependencies/common/dictionaries/ - done + for dict in ${builtins.concatStringsSep " " hunspellDictionaries}; do + for i in "$dict/share/hunspell/"*; do + ln -sv $i dependencies/common/dictionaries/ + done done - unzip $mathJaxSrc -d dependencies/common/mathjax-26 - mkdir -p dependencies/common/rmarkdown - ln -s $rmarkdownSrc dependencies/common/rmarkdown/ - mkdir -p dependencies/common/rsconnect - ln -s $rsconnectSrc dependencies/common/rsconnect/ + unzip ${mathJaxSrc} -d dependencies/common/mathjax-26 mkdir -p dependencies/common/libclang/3.5 - unzip $rstudiolibclang -d dependencies/common/libclang/3.5 + unzip ${rstudiolibclang} -d dependencies/common/libclang/3.5 mkdir -p dependencies/common/libclang/builtin-headers - unzip $rstudiolibclangheaders -d dependencies/common/libclang/builtin-headers + unzip ${rstudiolibclangheaders} -d dependencies/common/libclang/builtin-headers mkdir -p dependencies/common/pandoc cp ${pandoc}/bin/pandoc dependencies/common/pandoc/ diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index fd973d4fbdee1..03505ec11a5f7 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig}: +{ stdenv, fetchurl, qt5, poppler_qt5, zlib, pkgconfig}: stdenv.mkDerivation rec { pname = "texstudio"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "18rxd7ra5k2f7s4c296b3v3pqhxjmfix9xpy9i1g4jm87ygqrbnd"; }; - nativeBuildInputs = [ qmake4Hook pkgconfig ]; - buildInputs = [ qt4 poppler_qt4 zlib ]; + nativeBuildInputs = [ qt5.qmake pkgconfig ]; + buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler_qt5 zlib ]; qmakeFlags = [ "NO_APPDATA=True" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; homepage = http://texstudio.sourceforge.net; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ cfouche ]; }; } diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 22e7c3d31b361..7c6d186b88302 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.41"; + version = "0.9.44"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "e4916f86c7c12aec8fd59b3ef79c2a4d3f77b02a0a9e962916c688871c9fda1d"; + sha256 = "9442c090bf2619d270890228abd7dabb9e217c0b200615f8ed3cb255efd122d5"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "18960fb4b2cd6cf9cb77025a4035a3258f1599b1d225fb673b49c1588fa272d6"; + sha256 = "ae228ca946d03940b85df30c995c4de3f942a780e32d4dcab872dec671c66ef3"; } ; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 144fb5428a51e..b6c03a57b561c 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -103,6 +103,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { + broken = true; # needs ruby 2.2 description = "Vim - the text editor - for macOS"; homepage = https://github.com/b4winckler/macvim; license = licenses.vim; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 5f1d5c50d4e54..8599ff8e93e4e 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.19.3"; + version = "1.20.0"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "0qaijcsjy9sysim19gyqmagg8rmxgamf0l74qj3ap0wsv2v7xixr"; - "x86_64-linux" = "1kvkcrr1hgnssy2z45h8fdgr9j6w94myr2hvlknwcahzxrnrwr7k"; - "x86_64-darwin" = "19vkv97yq0alnq4dvs62a2vx3f1mvfz1ic63114s9sd6smikrg0g"; + "i686-linux" = "0lhfljcdb05v0p3kc6zimgd2z057397blfp56bhr7v7wnsi6i40k"; + "x86_64-linux" = "138kvqa5cixry62yry0lwzxlk9fs8hb4zqzmsd8ag1jjfma8y45k"; + "x86_64-darwin" = "1adnwlqf2kw8wfjf86a3xg83j1yqnlsdckksw82b06x3j11g91i8"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index b7d9f4a81599f..f9ea2b9aa84e7 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, libpng, python3, boost, mesa, qtbase, ncurses, cmake, flex, lemon }: let - gitRev = "e8480c718e8c49ae3cc2d7af10ea93ea4c2fff9a"; + gitRev = "020910c25614a3752383511ede5a1f5551a8bd39"; gitBranch = "master"; - gitTag = "0.9.2"; -in + gitTag = "0.9.3"; +in stdenv.mkDerivation rec { name = "antimony-${version}"; version = gitTag; @@ -13,7 +13,7 @@ in owner = "mkeeter"; repo = "antimony"; rev = gitTag; - sha256 = "0fpgy5cb4knz2z9q078206k8wzxfs8b9g76mf4bz1ic77931ykjz"; + sha256 = "1vm5h5py8l3b8h4pbmm8s3wlxvlw492xfwnlwx0nvl0cjs8ba6r4"; }; patches = [ ./paths-fix.patch ]; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 787ddc72ec9ad..e9932b93fbe04 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -1,15 +1,10 @@ -{ stdenv, fetchurl, libsoup, graphicsmagick, SDL, json_glib -, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib -, libgnome_keyring, gtk3, ilmbase, intltool, lcms, lcms2 -, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg -, libpng, libpthreadstubs, librsvg, libtiff, libxcb -, openexr, osm-gps-map, pixman, pkgconfig, sqlite, bash, libxslt, openjpeg -, mesa, lua, pugixml, colord, colord-gtk, libxshmfence, libxkbcommon -, epoxy, at_spi2_core, libwebp, libsecret, wrapGAppsHook, gnome3 +{ stdenv, fetchurl, libsoup, graphicsmagick, json_glib, wrapGAppsHook +, cairo, cmake, ninja, curl, perl, llvm, desktop_file_utils, exiv2, glib +, ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg +, libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt +, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 }: -assert stdenv ? glibc; - stdenv.mkDerivation rec { version = "2.4.1"; name = "darktable-${version}"; @@ -19,16 +14,15 @@ stdenv.mkDerivation rec { sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32"; }; - buildInputs = - [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk3 - ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif - libglade libgphoto2 libjpeg libpng libpthreadstubs - librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt - libsoup graphicsmagick SDL json_glib openjpeg mesa lua pugixml - colord colord-gtk libxshmfence libxkbcommon epoxy at_spi2_core - libwebp libsecret wrapGAppsHook gnome3.adwaita-icon-theme - osm-gps-map - ]; + nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop_file_utils wrapGAppsHook ]; + + buildInputs = [ + cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libX11 libexif + libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt + libsoup graphicsmagick json_glib openjpeg lua pugixml + colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme + osm-gps-map + ]; cmakeFlags = [ "-DBUILD_USERMANUAL=False" diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 80f893e7c3c96..d517306c1d613 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts -, boost, zlib, python27Packages, swig, gfortran, soqt, libf2c, makeWrapper }: +, boost, zlib, python27Packages, swig, gfortran, soqt, libf2c, makeWrapper, makeDesktopItem }: let pythonPackages = python27Packages; @@ -32,8 +32,40 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \ --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 + + mkdir -p $out/share/mime/packages + cat << EOF > $out/share/mime/packages/freecad.xml + <?xml version="1.0" encoding="UTF-8"?> + <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> + <mime-type type="application/x-extension-fcstd"> + <sub-class-of type="application/zip"/> + <comment>FreeCAD Document</comment> + <glob pattern="*.fcstd"/> + </mime-type> + </mime-info> + EOF + + mkdir -p $out/share/applications + cp $desktopItem/share/applications/* $out/share/applications/ + for entry in $out/share/applications/*.desktop; do + substituteAllInPlace $entry + done ''; + desktopItem = makeDesktopItem { + name = "freecad"; + desktopName = "FreeCAD"; + genericName = "CAD Application"; + comment = meta.description; + exec = "@out@/bin/FreeCAD %F"; + categories = "Science;Education;Engineering;"; + startupNotify = "true"; + mimeType = "application/x-extension-fcstd;"; + extraEntries = '' + Path=@out@/share/freecad + ''; + }; + meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; homepage = https://www.freecadweb.org/; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 1c1a0102dd067..724f252907cb4 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/17.12.1/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/17.12.2/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 781a59786759c..ff6b1803e13a9 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1691 +3,1691 @@ { akonadi = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadi-17.12.1.tar.xz"; - sha256 = "0iaw6kmbi68wd728v6m5w90xy9v0nqgd66n026r5dy64pm08hj0x"; - name = "akonadi-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadi-17.12.2.tar.xz"; + sha256 = "03cz5jl5qywc39krjrzby7yxcrx4iaf94pkvzbkagx1c7bfgajkf"; + name = "akonadi-17.12.2.tar.xz"; }; }; akonadi-calendar = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadi-calendar-17.12.1.tar.xz"; - sha256 = "0j32xxglksya014c2199bn5k540zllmlsyvvr6jcmvbfpcilnl7d"; - name = "akonadi-calendar-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadi-calendar-17.12.2.tar.xz"; + sha256 = "1j2bs3ybl2lz3yr862kz4jnkiksawbyv96lsjvzgkalmri3y2jv9"; + name = "akonadi-calendar-17.12.2.tar.xz"; }; }; akonadi-calendar-tools = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadi-calendar-tools-17.12.1.tar.xz"; - sha256 = "0yk59hq0fflmv18w7i6jx48436ykhgc1q5agbjckfw9g9qfmaj04"; - name = "akonadi-calendar-tools-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadi-calendar-tools-17.12.2.tar.xz"; + sha256 = "0fh7zsf4ckmikqqwa3zqdd97i80s53r56bx8q0aj1dyxa5kzrid6"; + name = "akonadi-calendar-tools-17.12.2.tar.xz"; }; }; akonadiconsole = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadiconsole-17.12.1.tar.xz"; - sha256 = "1x1cazikj7a3paf93ms2wl9cbbqhr43jpk7ijb6wjnhzv0jx0yv0"; - name = "akonadiconsole-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadiconsole-17.12.2.tar.xz"; + sha256 = "00w21nxbq9a9h1cs4wl0641hj82i3w63r9ab5hb9kw33gi9ijali"; + name = "akonadiconsole-17.12.2.tar.xz"; }; }; akonadi-contacts = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadi-contacts-17.12.1.tar.xz"; - sha256 = "12gvzwxhazwz6cn07vz2v21nh31nnxq5ckvm9bw94amhxdcrhji1"; - name = "akonadi-contacts-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadi-contacts-17.12.2.tar.xz"; + sha256 = "1v8082walg47bl8rj6zcp2br4wr0mhrw82l0aw41gmcwi2vr4pr7"; + name = "akonadi-contacts-17.12.2.tar.xz"; }; }; akonadi-import-wizard = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadi-import-wizard-17.12.1.tar.xz"; - sha256 = "1v4sqmlbkvhi14bjpg88017slsmsingk3lcvl1hpi9wh5chhybs2"; - name = "akonadi-import-wizard-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadi-import-wizard-17.12.2.tar.xz"; + sha256 = "1yflksmvvysl3p3s37i0qc712cdzkzi501x74mk3c7sy1pw097g4"; + name = "akonadi-import-wizard-17.12.2.tar.xz"; }; }; akonadi-mime = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadi-mime-17.12.1.tar.xz"; - sha256 = "0y0s4qaa00240czq1mgm3p63cagdn4kv0njwhlh5va6jknb56rsq"; - name = "akonadi-mime-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadi-mime-17.12.2.tar.xz"; + sha256 = "0xsm87nph967293ixwnh1450qwrn0ghfcw34444fj8f4ciwbv0iv"; + name = "akonadi-mime-17.12.2.tar.xz"; }; }; akonadi-notes = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadi-notes-17.12.1.tar.xz"; - sha256 = "1ylbrz5p5y80j7carlqwpxw222faf1ri7lyhnl09j1xsiaw74jz1"; - name = "akonadi-notes-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadi-notes-17.12.2.tar.xz"; + sha256 = "06ac7b1n3aaad7y1cbby44jaq748xnxfjd51c1jh0p257q22qj85"; + name = "akonadi-notes-17.12.2.tar.xz"; }; }; akonadi-search = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadi-search-17.12.1.tar.xz"; - sha256 = "14blwxccz36qdmahwz14vnd7a5j01xpzijc3bbw768l1ifxac5sp"; - name = "akonadi-search-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadi-search-17.12.2.tar.xz"; + sha256 = "0g03z7xcbl25ylrflgkycfgyvny5hr8i38flirw9jidwy5zf1pny"; + name = "akonadi-search-17.12.2.tar.xz"; }; }; akregator = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akregator-17.12.1.tar.xz"; - sha256 = "03292r4l2wpsikrngldmkvjl75ijpy9sfwr14r2kk0rbkqpzn7gn"; - name = "akregator-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akregator-17.12.2.tar.xz"; + sha256 = "19grppwmspn7x84ygxscch3ydr5i6nanshi1pk4wr5z34g8qcxrc"; + name = "akregator-17.12.2.tar.xz"; }; }; analitza = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/analitza-17.12.1.tar.xz"; - sha256 = "1zp3xki1jppqzpsjxv0mif44hx5amdk9w9a8h1h9wbdwf9zn7038"; - name = "analitza-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/analitza-17.12.2.tar.xz"; + sha256 = "128qcnzizcvrc1mknb5qdzricymxai2mxlrxb5h93cc14jwiivg1"; + name = "analitza-17.12.2.tar.xz"; }; }; ark = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ark-17.12.1.tar.xz"; - sha256 = "0xxahw4qysynim32pi4f3kzvpn8fikii3nxdjk1f58cs7ylk7h9h"; - name = "ark-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ark-17.12.2.tar.xz"; + sha256 = "0xh60mf1ygyhcc06w8g4nnrhqyjf88ji3kf8d5vfpdijq8m6gg8b"; + name = "ark-17.12.2.tar.xz"; }; }; artikulate = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/artikulate-17.12.1.tar.xz"; - sha256 = "1f99gdjlrfxfii605d58566qkzg0vwbdj2sl7gaf2n8974qih26l"; - name = "artikulate-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/artikulate-17.12.2.tar.xz"; + sha256 = "0plc81c7sc47392x183q30x39ksjr1wnjhlwy0ixngj2q9nhi6nn"; + name = "artikulate-17.12.2.tar.xz"; }; }; audiocd-kio = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/audiocd-kio-17.12.1.tar.xz"; - sha256 = "1q5rl3h5vlqa16wsa2zqapqycnbqcsfskkgh47pklsbzi49p2b7w"; - name = "audiocd-kio-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/audiocd-kio-17.12.2.tar.xz"; + sha256 = "1n3n3ylwdm5yjv0hh43rmn3bn0q32xsbrl5wlbwgiijhpqd0ahkw"; + name = "audiocd-kio-17.12.2.tar.xz"; }; }; baloo-widgets = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/baloo-widgets-17.12.1.tar.xz"; - sha256 = "1w681fxjimwnywx6dbk7486ncwgq4izj7r4q5ahism10kxjyvy1i"; - name = "baloo-widgets-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/baloo-widgets-17.12.2.tar.xz"; + sha256 = "0pw153cy606dggkq2njk6fs5yp6a9jlkwpp7vckd9jl5s6pbsqd2"; + name = "baloo-widgets-17.12.2.tar.xz"; }; }; blinken = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/blinken-17.12.1.tar.xz"; - sha256 = "0935gyc499j1br0g1knkpzr73q44mqfr89rjnl5ax6cncs6kkwcd"; - name = "blinken-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/blinken-17.12.2.tar.xz"; + sha256 = "008pmr3g553xd4mcdmby0fqzp8vk651dji3c8zkad94560xysm71"; + name = "blinken-17.12.2.tar.xz"; }; }; bomber = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/bomber-17.12.1.tar.xz"; - sha256 = "1jmkzq07rq19dzci1p3zida12yamn3rsd1l7zy75skwm43q8210r"; - name = "bomber-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/bomber-17.12.2.tar.xz"; + sha256 = "1rdxr7w2p3r1gviqsmshx6n07gzsc3ymz6drhqk3kacqwgnnr72y"; + name = "bomber-17.12.2.tar.xz"; }; }; bovo = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/bovo-17.12.1.tar.xz"; - sha256 = "0fa0cp3w2khvsg5rvnhn9yrx7pg0qvgd3grk7dbzv9frs3nc8k8a"; - name = "bovo-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/bovo-17.12.2.tar.xz"; + sha256 = "0rhj0w7li1rsfjmrivr6g6z9ja408v59pk5rpci4344piaqglrqm"; + name = "bovo-17.12.2.tar.xz"; }; }; calendarsupport = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/calendarsupport-17.12.1.tar.xz"; - sha256 = "02g845mnyyjma9kadi9j1y774nb157qk4s9xfh414j35wa4n4ml0"; - name = "calendarsupport-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/calendarsupport-17.12.2.tar.xz"; + sha256 = "0c6i8gqjdgc9s3mz351qjxwv6fsk3098i7ni6x4bhh5shg863vnr"; + name = "calendarsupport-17.12.2.tar.xz"; }; }; cantor = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/cantor-17.12.1.tar.xz"; - sha256 = "1jxjv729js6na70nc8rmr65ah4bvly27qndv1g4grzyv1j5v9pwa"; - name = "cantor-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/cantor-17.12.2.tar.xz"; + sha256 = "1b055fcbpqs4fwwyj0pywv5y8pfpg3ha5382d4hhrpvpc8xwjn6c"; + name = "cantor-17.12.2.tar.xz"; }; }; cervisia = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/cervisia-17.12.1.tar.xz"; - sha256 = "1jjc2iarpl6vinav20rly9b2ha3d35ipm45mmn6hdqwrgh08x61a"; - name = "cervisia-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/cervisia-17.12.2.tar.xz"; + sha256 = "1iqkp7d3wkmi0wfxsx2k20qblkmk6m1ndh472bxn6vvfaii2dqmm"; + name = "cervisia-17.12.2.tar.xz"; }; }; dolphin = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/dolphin-17.12.1.tar.xz"; - sha256 = "0pyajijsadkl1yky0p66d0sglxp7ks1bl23x4xy5zhdv3clr5gzc"; - name = "dolphin-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/dolphin-17.12.2.tar.xz"; + sha256 = "1pmfix569996minfc8rrjdbfvybm1a5bnljk0gxybahlainxwjp4"; + name = "dolphin-17.12.2.tar.xz"; }; }; dolphin-plugins = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/dolphin-plugins-17.12.1.tar.xz"; - sha256 = "1igyk2jx2rsgy7rbxi84fkhi831a2v4fg0bc08ad36y43cm849zh"; - name = "dolphin-plugins-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/dolphin-plugins-17.12.2.tar.xz"; + sha256 = "03637pxjf0kjbw831vvdj3lk3msvn6y3gkildsr1490v60cl2f2c"; + name = "dolphin-plugins-17.12.2.tar.xz"; }; }; dragon = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/dragon-17.12.1.tar.xz"; - sha256 = "02apbhw98sq817660ldb1gdzna4jjb2v6379mvrb2d1qgigh1afd"; - name = "dragon-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/dragon-17.12.2.tar.xz"; + sha256 = "03z263agwrkpqf1l3xpfmgxjzqs6icwxv22bp5shzlyiq5dvmq0d"; + name = "dragon-17.12.2.tar.xz"; }; }; eventviews = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/eventviews-17.12.1.tar.xz"; - sha256 = "1cga2i941x1rgp4i8aff8vr7hlk4q312pynr44hfidx4vjig9ia9"; - name = "eventviews-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/eventviews-17.12.2.tar.xz"; + sha256 = "1y1d8flzmi3mm15gc2q2925f1z17lcm5b8difd65z7rji4ra9rg6"; + name = "eventviews-17.12.2.tar.xz"; }; }; ffmpegthumbs = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ffmpegthumbs-17.12.1.tar.xz"; - sha256 = "0lmd8papahnqr5c830wqz8bhkvdsads97b23dnzhnck78dinww2s"; - name = "ffmpegthumbs-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ffmpegthumbs-17.12.2.tar.xz"; + sha256 = "098w62hvjqkq9iixbipg1wl0091d0fnb49jm874k4d68mpvlmmf2"; + name = "ffmpegthumbs-17.12.2.tar.xz"; }; }; filelight = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/filelight-17.12.1.tar.xz"; - sha256 = "0c0fi9dziwf5v7069wsrqnqw95cfpicg4a6xp05hhpc9qqkvdngk"; - name = "filelight-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/filelight-17.12.2.tar.xz"; + sha256 = "1ysh5rb9irgha62iw1yiw5f4fxanym9swgc8sd9cdlmkqm6km27m"; + name = "filelight-17.12.2.tar.xz"; }; }; granatier = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/granatier-17.12.1.tar.xz"; - sha256 = "1ja7v2xr2yyw2qh7zkf2s7ym8qv5gfr1zbii54dk2r5k4a8slvi4"; - name = "granatier-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/granatier-17.12.2.tar.xz"; + sha256 = "1c86vh6jx991ig1n6n591r9va8rs029gd83m6y9appavi43aylkv"; + name = "granatier-17.12.2.tar.xz"; }; }; grantlee-editor = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/grantlee-editor-17.12.1.tar.xz"; - sha256 = "19w2f30rsk65xdc8kqr03fmkm0a743mgyj6gm6207nxsm5plr3nv"; - name = "grantlee-editor-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/grantlee-editor-17.12.2.tar.xz"; + sha256 = "1x4rn8liz083y8h3in743xrmk3caqcn75ba97f8ymaap0f48nly6"; + name = "grantlee-editor-17.12.2.tar.xz"; }; }; grantleetheme = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/grantleetheme-17.12.1.tar.xz"; - sha256 = "1nga48vvqysbh2g10wka02ibbyny77wrz8a1p336sycr76q1xmcz"; - name = "grantleetheme-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/grantleetheme-17.12.2.tar.xz"; + sha256 = "0cpmd8glpjpg62h2qcngaks6adahfcbf9aikm9y4gwqbsmglqjkx"; + name = "grantleetheme-17.12.2.tar.xz"; }; }; gwenview = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/gwenview-17.12.1.tar.xz"; - sha256 = "1a87b6wh2ga9j8r498zyf2dga77lhky41dl31ndkx94vm8ycdnlv"; - name = "gwenview-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/gwenview-17.12.2.tar.xz"; + sha256 = "0cpv7wlbkm20vch1d4m49kxk02by9zh9lbdcli5p6bgp8mnvpxgr"; + name = "gwenview-17.12.2.tar.xz"; }; }; incidenceeditor = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/incidenceeditor-17.12.1.tar.xz"; - sha256 = "0x7c3j8frzqmvgz6zn98h0qiays1fdvnlngdksi7gkm82bsvk7i2"; - name = "incidenceeditor-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/incidenceeditor-17.12.2.tar.xz"; + sha256 = "1qlghzfc4lg69p5014f3zj6k0lgy57n0lg063b804nqy0378xra2"; + name = "incidenceeditor-17.12.2.tar.xz"; }; }; juk = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/juk-17.12.1.tar.xz"; - sha256 = "13k7j7h62mggfj79a534m58rl9fd2vzhvv0wj7752n4nbiha6q3q"; - name = "juk-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/juk-17.12.2.tar.xz"; + sha256 = "1wa52sysy3hr7n5r59vb9qqnac73fcy2dc3zl51ba9da8lz8q0lj"; + name = "juk-17.12.2.tar.xz"; }; }; k3b = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/k3b-17.12.1.tar.xz"; - sha256 = "11jsfja3r9x6drs0v1nb4h9w6hl3ab7rxjcxm8czbwmx2897vgyg"; - name = "k3b-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/k3b-17.12.2.tar.xz"; + sha256 = "0ryzchkk37yzihfhra5xh5sj2k46bdlspi9i2zfs63q3n32jyfww"; + name = "k3b-17.12.2.tar.xz"; }; }; kaccounts-integration = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kaccounts-integration-17.12.1.tar.xz"; - sha256 = "1zfq6yknn8kjjnkp3s58gj15r5qd0xpmxl49c2615j08qjbbs5k2"; - name = "kaccounts-integration-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kaccounts-integration-17.12.2.tar.xz"; + sha256 = "14mipln6ppg88yipwvyc6ainj250ss6xynh9smxbji533wyg72c5"; + name = "kaccounts-integration-17.12.2.tar.xz"; }; }; kaccounts-providers = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kaccounts-providers-17.12.1.tar.xz"; - sha256 = "1mzh7brgd42fb4nnnn607nivqpb3hvy982dini32j54k1rls4810"; - name = "kaccounts-providers-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kaccounts-providers-17.12.2.tar.xz"; + sha256 = "1lapgxlgzymrdl8swn2prrlrmz5xgmkhmv7hx8fpxpc3cpfyvfsd"; + name = "kaccounts-providers-17.12.2.tar.xz"; }; }; kaddressbook = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kaddressbook-17.12.1.tar.xz"; - sha256 = "1ls02igrp4q6zbw62gyp3rkzbyv6jm0s46z1q3ifkqyxanm3mpbv"; - name = "kaddressbook-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kaddressbook-17.12.2.tar.xz"; + sha256 = "1b5a5ypmf0jr9si5cx01h52aql26v6cv16wzrrb6vhxqzksmwriw"; + name = "kaddressbook-17.12.2.tar.xz"; }; }; kajongg = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kajongg-17.12.1.tar.xz"; - sha256 = "05vakzhzrr7p8hdrmmvy8q0mj0z5xf7zyzm4lckaj9mpfvg9gnxm"; - name = "kajongg-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kajongg-17.12.2.tar.xz"; + sha256 = "15vnin2rg63c60injxqkx0jp5sy1hjmh5rys3qq40wy0bm41pwai"; + name = "kajongg-17.12.2.tar.xz"; }; }; kalarm = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kalarm-17.12.1.tar.xz"; - sha256 = "11aa89k44jzmkm3xrgi59y4fgk2vb68zhhrkm53r13wxv2k2z9d7"; - name = "kalarm-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kalarm-17.12.2.tar.xz"; + sha256 = "1vvayib91mh73kqc0linzqlwa1l9jlc2wsih80bzzglaaxbi4l7z"; + name = "kalarm-17.12.2.tar.xz"; }; }; kalarmcal = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kalarmcal-17.12.1.tar.xz"; - sha256 = "05ynq5rbcny5h0k43r13b019zkg8mfkpkfx6drnar7nif6ji3qg5"; - name = "kalarmcal-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kalarmcal-17.12.2.tar.xz"; + sha256 = "04js601j477jwa5lhqdxq9gaacd7bf5ladgy3k64dwns5mx1j762"; + name = "kalarmcal-17.12.2.tar.xz"; }; }; kalgebra = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kalgebra-17.12.1.tar.xz"; - sha256 = "10pn3b17ahxp99glza6yyj4fmn6f6mhjggfd1d612gj8jldqr7r4"; - name = "kalgebra-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kalgebra-17.12.2.tar.xz"; + sha256 = "10vfzwmz0l7yvmy8gjwcb3dnpqyfngj47knb5knvkibqzij6p4w4"; + name = "kalgebra-17.12.2.tar.xz"; }; }; kalzium = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kalzium-17.12.1.tar.xz"; - sha256 = "13h4134w97dbsxrg4f6bgq5l14shlzg4djzwyiad4m892hmyrajn"; - name = "kalzium-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kalzium-17.12.2.tar.xz"; + sha256 = "0rdq2cpq5mzl3qrj3ll1d0qixaiygl5x277wlr5fg9cngi51v58x"; + name = "kalzium-17.12.2.tar.xz"; }; }; kamera = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kamera-17.12.1.tar.xz"; - sha256 = "19ps2p6cwhgfw9ll8gjjdq7k88srcixsfmfsqk8jvi9jpfqcw9mn"; - name = "kamera-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kamera-17.12.2.tar.xz"; + sha256 = "070kvaij5chk8nkap9nm1rrilq3sc32q7ysnrld9bssbfi9m73v7"; + name = "kamera-17.12.2.tar.xz"; }; }; kanagram = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kanagram-17.12.1.tar.xz"; - sha256 = "0pq0iwd7qrd5rc5jgm3ll2hgdxrjb6rq1qzz1175lj4b9ackn7ad"; - name = "kanagram-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kanagram-17.12.2.tar.xz"; + sha256 = "1300wg5k6x6s1wgmavywcwyqgv68xv0qv6hkqawvzsd61zfhxcr3"; + name = "kanagram-17.12.2.tar.xz"; }; }; kapman = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kapman-17.12.1.tar.xz"; - sha256 = "1d0a36jj1prp6zsxhzxz081w6wr5p7hb6lx687nfrqhbiqkr9059"; - name = "kapman-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kapman-17.12.2.tar.xz"; + sha256 = "0njf1017dnf4xl801xinfgfmqqpjf3ifnpwchg35zm2qlrlwhmyi"; + name = "kapman-17.12.2.tar.xz"; }; }; kapptemplate = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kapptemplate-17.12.1.tar.xz"; - sha256 = "1gcb8gc4x6f1brxqxdsppq61n8r20p9a0qq0pp8g88q1n5r3irpc"; - name = "kapptemplate-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kapptemplate-17.12.2.tar.xz"; + sha256 = "16p63zil3vaa5q2q01010gshn6a58kbmayks27kdgvsfdavgdh51"; + name = "kapptemplate-17.12.2.tar.xz"; }; }; kate = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kate-17.12.1.tar.xz"; - sha256 = "0rnkp197ranq3hi9scw1k1nmqj05fhnifyk9gjbg4mp8wwn3zgcv"; - name = "kate-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kate-17.12.2.tar.xz"; + sha256 = "1w3pswd3gpjpa55xy98yq39nck775mfv5i9lcvm8y15x1233rr6p"; + name = "kate-17.12.2.tar.xz"; }; }; katomic = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/katomic-17.12.1.tar.xz"; - sha256 = "13xszrnc3bgz2vbzhhz00k1hzlzi7n7jvg61rjqg0frf0n4ccih0"; - name = "katomic-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/katomic-17.12.2.tar.xz"; + sha256 = "0jhmszbq0rslwg8b8aq0vjynjlkg491di661k2b6yrsfqr4vmngw"; + name = "katomic-17.12.2.tar.xz"; }; }; kblackbox = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kblackbox-17.12.1.tar.xz"; - sha256 = "1iish6qs2q7pn9y8k4v07gkyqs0jq6ppdvxc6jfrkzymcnnaq9by"; - name = "kblackbox-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kblackbox-17.12.2.tar.xz"; + sha256 = "07bvmcfm3r4dj41dvsaba4rig2i9yilshrzl3wwprsjajmx4j6rf"; + name = "kblackbox-17.12.2.tar.xz"; }; }; kblocks = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kblocks-17.12.1.tar.xz"; - sha256 = "11kfm99hp6a4dp5q6bapq3axgkjmwcp1cd284plm3nxsd15sv87b"; - name = "kblocks-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kblocks-17.12.2.tar.xz"; + sha256 = "019h8rxv9p1ynby7bshr2yzrcn415magwlzmyrwvh5hzjjp0bmm9"; + name = "kblocks-17.12.2.tar.xz"; }; }; kblog = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kblog-17.12.1.tar.xz"; - sha256 = "1f7ygzb3acgjr1ax768cv94l3li8lbq6230lkgqz6lms3x9plpdc"; - name = "kblog-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kblog-17.12.2.tar.xz"; + sha256 = "1s2py5ll879zxcl6l7y2jryy1z29wljwm8hrgr52f8xr22vspbjc"; + name = "kblog-17.12.2.tar.xz"; }; }; kbounce = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kbounce-17.12.1.tar.xz"; - sha256 = "18w0jxdfjkvrkz1g1k0f37ajjyxc7cazbp3qxg0m2pbrkllgs12v"; - name = "kbounce-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kbounce-17.12.2.tar.xz"; + sha256 = "0rb9p8q0zwwfx70cxfcdbr9h3i8gag0da8nql6nnd37v2wcr4i82"; + name = "kbounce-17.12.2.tar.xz"; }; }; kbreakout = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kbreakout-17.12.1.tar.xz"; - sha256 = "166ck3z0x77p6n065q41fwj3lvxyzsshpgmi7xavbjgjl6cb941r"; - name = "kbreakout-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kbreakout-17.12.2.tar.xz"; + sha256 = "1j9gfzgdjhfd4jz2x3qgbd4jwfix0m1qx5lnlbkbxnff5jkw68sh"; + name = "kbreakout-17.12.2.tar.xz"; }; }; kbruch = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kbruch-17.12.1.tar.xz"; - sha256 = "04ylr7jj1qz3clnavv195gqm4hi017jzrz3vbx0dg7jfqr9jvzxh"; - name = "kbruch-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kbruch-17.12.2.tar.xz"; + sha256 = "0q95i474lgbl6phshbw7f89kik8hk9k8j8vpbzy3cchwn7dmg3p3"; + name = "kbruch-17.12.2.tar.xz"; }; }; kcachegrind = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kcachegrind-17.12.1.tar.xz"; - sha256 = "1qiwv7xpcf01s08bm83n77nhwplg19dd0zaqcr6xagjhf9y165xf"; - name = "kcachegrind-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kcachegrind-17.12.2.tar.xz"; + sha256 = "02nx8vqvl62vdm311r4akcckzl1w4c47phl3ybswygrakik7vf2a"; + name = "kcachegrind-17.12.2.tar.xz"; }; }; kcalc = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kcalc-17.12.1.tar.xz"; - sha256 = "00asfczvfvfmfg0ffd0d2rh3nmqgzqf4f9bdkwq9z8gajfz3cjs1"; - name = "kcalc-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kcalc-17.12.2.tar.xz"; + sha256 = "13h4c97qz8g7z4r5kb4js6sjzdgr3s4mabzr16qkwmmg4lwvzcp8"; + name = "kcalc-17.12.2.tar.xz"; }; }; kcalcore = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kcalcore-17.12.1.tar.xz"; - sha256 = "0zyf3r3zwivjzqag76pi9wrbvzqzbcnraajbb0xksf9ik53gk3pd"; - name = "kcalcore-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kcalcore-17.12.2.tar.xz"; + sha256 = "06z7xd0a8pz75zx1l2hcban39rc6dmxhhwhgidfglkj3l2xzw927"; + name = "kcalcore-17.12.2.tar.xz"; }; }; kcalutils = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kcalutils-17.12.1.tar.xz"; - sha256 = "01djf24immjn62hxs2gsi5f27q54vh254wq3sqzgxz0vbfv97bza"; - name = "kcalutils-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kcalutils-17.12.2.tar.xz"; + sha256 = "11vp32f53by2gc7zv08zq0z591rw4srmmjmiafds8hvx76ry3dsl"; + name = "kcalutils-17.12.2.tar.xz"; }; }; kcharselect = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kcharselect-17.12.1.tar.xz"; - sha256 = "14bh4n4bqi5y7ya6xi7ykl398i2qdkmximp87r5qcimxgvxfczki"; - name = "kcharselect-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kcharselect-17.12.2.tar.xz"; + sha256 = "1gbr6gvp2vwgvns83pmg5idhwhixyw9yqyr6nn61qf43f97nkdiy"; + name = "kcharselect-17.12.2.tar.xz"; }; }; kcolorchooser = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kcolorchooser-17.12.1.tar.xz"; - sha256 = "1aqzwbw7ajb5nzj2k107m32naj0c6nsdhzmg0w0wrd80fz2qnpx3"; - name = "kcolorchooser-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kcolorchooser-17.12.2.tar.xz"; + sha256 = "0jjzpm82jy9f4qf5sf5v24vk50y4qq2sj42zn057v0kwlpwzvrr9"; + name = "kcolorchooser-17.12.2.tar.xz"; }; }; kcontacts = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kcontacts-17.12.1.tar.xz"; - sha256 = "152a9bhyya4rigmydfh6x932pp3vi4i1zya5sdlg9vr045ljgzwk"; - name = "kcontacts-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kcontacts-17.12.2.tar.xz"; + sha256 = "0hg442jg0rb7fsy67fg44551c02gx3i7znwl6cgr9nzlxj5srhyq"; + name = "kcontacts-17.12.2.tar.xz"; }; }; kcron = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kcron-17.12.1.tar.xz"; - sha256 = "0qzc8427l1hndisq163b4ppph8ividw38lxczirv186gm01xsgqk"; - name = "kcron-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kcron-17.12.2.tar.xz"; + sha256 = "1h1bkicvfbz7s0n36iw5pilqrv2vfzl3rwqx6r0wa10341sx8wc3"; + name = "kcron-17.12.2.tar.xz"; }; }; kdav = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdav-17.12.1.tar.xz"; - sha256 = "09q1d0yzhwr4gr4xfp1zbmqbdhrw827y379blqg1351k8mxvfhzi"; - name = "kdav-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdav-17.12.2.tar.xz"; + sha256 = "1jlw2l6jd2rhf7swl7bwlsphp1xddb0f9xzkpa6dxw4cimfz4r7l"; + name = "kdav-17.12.2.tar.xz"; }; }; kdebugsettings = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdebugsettings-17.12.1.tar.xz"; - sha256 = "0ac8mnjm7mvk9988ds0kvgxnjfkpv8iiwgaccsykiqgpnk8dx7qh"; - name = "kdebugsettings-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdebugsettings-17.12.2.tar.xz"; + sha256 = "1a9yy42x16maj60wh7x19248gp1x4diybj9k2gkmlf7hd8g82m4b"; + name = "kdebugsettings-17.12.2.tar.xz"; }; }; kde-dev-scripts = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kde-dev-scripts-17.12.1.tar.xz"; - sha256 = "1cxfjc4can7ggbrcdz03lsalq221fw5qmcw9y35kqs504wgc0g1w"; - name = "kde-dev-scripts-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kde-dev-scripts-17.12.2.tar.xz"; + sha256 = "181s9cf1kqx35w9cza40svgzbqvhz48f858r0rxvl6klzm7rrqmn"; + name = "kde-dev-scripts-17.12.2.tar.xz"; }; }; kde-dev-utils = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kde-dev-utils-17.12.1.tar.xz"; - sha256 = "0mnk6zzq0xa3fd32c46gyjsqsxji5p7ky5g7bly2myhl7f03hnc0"; - name = "kde-dev-utils-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kde-dev-utils-17.12.2.tar.xz"; + sha256 = "044w9az0jnc7lhlgyiqxsl5lgfzbnrfrdvsr2918idy2niif7cjq"; + name = "kde-dev-utils-17.12.2.tar.xz"; }; }; kdeedu-data = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdeedu-data-17.12.1.tar.xz"; - sha256 = "0i917gys8bpsmswm7rp2idbrwv5470cvp4xa0wxfnnq0y6nxj0w3"; - name = "kdeedu-data-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdeedu-data-17.12.2.tar.xz"; + sha256 = "1sdldx357ifv4sqwa8yrcjxyricb0kk21gvj9472bi28rcgyxqgv"; + name = "kdeedu-data-17.12.2.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdegraphics-mobipocket-17.12.1.tar.xz"; - sha256 = "09bh0qjzr27zkvz5cyrxpx5pkz9fldr2yxzc1f3hxs2fmqgj7rc6"; - name = "kdegraphics-mobipocket-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdegraphics-mobipocket-17.12.2.tar.xz"; + sha256 = "1jx5ir1q12s939m0nndhxwiarfr6r7ma79dy9fn5bbhdjgjqf7fq"; + name = "kdegraphics-mobipocket-17.12.2.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdegraphics-thumbnailers-17.12.1.tar.xz"; - sha256 = "0fm8vsbmaxibjlkjkbic7b8x3xrz8nrjn8r8ps4mka4hnsmkk2b9"; - name = "kdegraphics-thumbnailers-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdegraphics-thumbnailers-17.12.2.tar.xz"; + sha256 = "0d6cf2mhblxgnhv432x9rgk5k73fhpa20xajn6nfawxkmpkzngsy"; + name = "kdegraphics-thumbnailers-17.12.2.tar.xz"; }; }; kdenetwork-filesharing = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdenetwork-filesharing-17.12.1.tar.xz"; - sha256 = "10d0ayd3krkac0249smnxn8jfyj9rfy1jjx0d2sqs28jhq5z8892"; - name = "kdenetwork-filesharing-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdenetwork-filesharing-17.12.2.tar.xz"; + sha256 = "1ghdskmc0ynjb1a4qid9vjjcl8nmyqvr5x6aryzz9g1rmm6vv8l5"; + name = "kdenetwork-filesharing-17.12.2.tar.xz"; }; }; kdenlive = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdenlive-17.12.1.tar.xz"; - sha256 = "0rv52w6kccsz6796nhn5hw0x5x2jjwx7y8jxmglc7jbdlsf90bj1"; - name = "kdenlive-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdenlive-17.12.2.tar.xz"; + sha256 = "1l2sv78wwfwrya486sm4iszkm1hsj473a5gpkgay66h4qb968w70"; + name = "kdenlive-17.12.2.tar.xz"; }; }; kdepim-addons = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdepim-addons-17.12.1.tar.xz"; - sha256 = "19sn4j4ks5iqmcgnir1p2hgzvgncy2iqdvwq7p4ns7hy35bl59n3"; - name = "kdepim-addons-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdepim-addons-17.12.2.tar.xz"; + sha256 = "185qargpzlmphq5afzvw0pcmas8ska2cnnbv5rpicmg8q01ixnm7"; + name = "kdepim-addons-17.12.2.tar.xz"; }; }; kdepim-apps-libs = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdepim-apps-libs-17.12.1.tar.xz"; - sha256 = "1xy7wcz4wk9qcgmss3xfbkhyhvfp31c13n1wj7a4ar724s35sja9"; - name = "kdepim-apps-libs-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdepim-apps-libs-17.12.2.tar.xz"; + sha256 = "0zn620bv551lgl6sx9g4f8ncpv5hs231jbrzkiwqw6y74xw5qq7g"; + name = "kdepim-apps-libs-17.12.2.tar.xz"; }; }; kdepim-runtime = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdepim-runtime-17.12.1.tar.xz"; - sha256 = "0k2b52smz68b9ijcdawimnh471zzadqnfxhvkvprkah952p23z32"; - name = "kdepim-runtime-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdepim-runtime-17.12.2.tar.xz"; + sha256 = "1z11ac0l4n80nybsnfk716c88ah2l7g1fsz5xmzvv6pcmhm2q94j"; + name = "kdepim-runtime-17.12.2.tar.xz"; }; }; kdesdk-kioslaves = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdesdk-kioslaves-17.12.1.tar.xz"; - sha256 = "07zv4xkgqpirc0jzidbv0nc5bgqn5sywz9lvgs2v73v1pz1gy13m"; - name = "kdesdk-kioslaves-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdesdk-kioslaves-17.12.2.tar.xz"; + sha256 = "09r7iqqvil2sjfzdnq64075gmm7wxd705j00qxfch99ja3nf4961"; + name = "kdesdk-kioslaves-17.12.2.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdesdk-thumbnailers-17.12.1.tar.xz"; - sha256 = "0r2dpin3cf19qii0sfl4s8pj99n0fsxgc1l1lh3bnm94z7myld2c"; - name = "kdesdk-thumbnailers-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdesdk-thumbnailers-17.12.2.tar.xz"; + sha256 = "1j8gqwcs65cfpaqvny29yqzsgjbjmxrafnf4ggc1bjaz2p63blni"; + name = "kdesdk-thumbnailers-17.12.2.tar.xz"; }; }; kdf = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdf-17.12.1.tar.xz"; - sha256 = "0jk9i94mc0jb08z4vnnr3m6mlih6y877hll42p0iywliwsbnyz21"; - name = "kdf-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdf-17.12.2.tar.xz"; + sha256 = "07379lagrl7hhh05dixd4ldqiy9pwmw0yai8sgcbfi3kgcns9c6a"; + name = "kdf-17.12.2.tar.xz"; }; }; kdialog = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdialog-17.12.1.tar.xz"; - sha256 = "075xhg3bzyxaanixlzr740km2z84csx4jbq37gijdz6rllnxjxwl"; - name = "kdialog-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdialog-17.12.2.tar.xz"; + sha256 = "1pwicn5jsg3jwqqkrjhaxbcd9762k9fj4w51ahglby04c4cca38a"; + name = "kdialog-17.12.2.tar.xz"; }; }; kdiamond = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdiamond-17.12.1.tar.xz"; - sha256 = "08qw7gry0zdrslq5dpzm45blcr951xnrgfs75jpw3f7g9xy042kx"; - name = "kdiamond-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdiamond-17.12.2.tar.xz"; + sha256 = "03m91x6rgh3wd8mim41d08x1c06ndg9vkciyl6nkj4iyflwwy0rp"; + name = "kdiamond-17.12.2.tar.xz"; }; }; keditbookmarks = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/keditbookmarks-17.12.1.tar.xz"; - sha256 = "1ml3bl6f24c6cs4hfa87rvyax36wcjxkh94iy5xwlhfd176qcjnn"; - name = "keditbookmarks-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/keditbookmarks-17.12.2.tar.xz"; + sha256 = "1aqqd2lvdbqhnzz28axv9j84s7i7cxrs39zyaia7cwzbbgymkal1"; + name = "keditbookmarks-17.12.2.tar.xz"; }; }; kfind = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kfind-17.12.1.tar.xz"; - sha256 = "0z97w4p86ylkndq12dphpfa0r10ld2b5fvcj1xdfa9cic14lgfxk"; - name = "kfind-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kfind-17.12.2.tar.xz"; + sha256 = "0zxm5fjf6xzl871gjbs5nzp6h5j4qm47ygfq644jqbi9f3z2in74"; + name = "kfind-17.12.2.tar.xz"; }; }; kfloppy = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kfloppy-17.12.1.tar.xz"; - sha256 = "11gc0v1nkwg6f334ydsh289s5bgxr7ccdybbw3zq16q0vih9px3a"; - name = "kfloppy-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kfloppy-17.12.2.tar.xz"; + sha256 = "0s25jbngh6zipxm16kffvwyd1ircnf0xjsh20lm08i9kh4jcicgq"; + name = "kfloppy-17.12.2.tar.xz"; }; }; kfourinline = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kfourinline-17.12.1.tar.xz"; - sha256 = "0rb6z0siw8yhf4w3m9hrkv6csm4vdr8qj7754c41fqkrnlfa8w96"; - name = "kfourinline-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kfourinline-17.12.2.tar.xz"; + sha256 = "0cqlqab9sazhvvsdyvwzdzrjccvlbxwq2p1n6ki8g8i6707mx3hc"; + name = "kfourinline-17.12.2.tar.xz"; }; }; kgeography = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kgeography-17.12.1.tar.xz"; - sha256 = "1v6xyqv8d4faj0ix7jwq8ralr8s8vi8ryn6hy1i4lj3a06mvgk5z"; - name = "kgeography-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kgeography-17.12.2.tar.xz"; + sha256 = "1mf5zr4cwnnrvsad4mq0mr6p3v38payajagc2whfl1lmcg82f2wl"; + name = "kgeography-17.12.2.tar.xz"; }; }; kget = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kget-17.12.1.tar.xz"; - sha256 = "1n6z92fcbvnvzk3wwpfrf8ycx3kv8vnybpay6hmr63vnbgn7bssw"; - name = "kget-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kget-17.12.2.tar.xz"; + sha256 = "1fm5yzxxg7lihzgnl7207gfn9gz33ydk1axf8lmdhwwld14q25f9"; + name = "kget-17.12.2.tar.xz"; }; }; kgoldrunner = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kgoldrunner-17.12.1.tar.xz"; - sha256 = "01c2439a7vic3nxhnzhjph3qnfp6qm7yv6qcanxaf2jy7idbm5zq"; - name = "kgoldrunner-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kgoldrunner-17.12.2.tar.xz"; + sha256 = "0dddzimh41xm6fvz1spl58gwff9vlx12h52kbfxdb2wz60zkg8wb"; + name = "kgoldrunner-17.12.2.tar.xz"; }; }; kgpg = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kgpg-17.12.1.tar.xz"; - sha256 = "1h82gx0y7vm3n7idhqdawns47fmjv6szz3qivds4jj0wx9z2gc9f"; - name = "kgpg-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kgpg-17.12.2.tar.xz"; + sha256 = "0r604acqm255xqjqg4islk30g62f8p9mj6haqp0iyw82239hbkp0"; + name = "kgpg-17.12.2.tar.xz"; }; }; khangman = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/khangman-17.12.1.tar.xz"; - sha256 = "1a5ifxm2flkbxy1lqvkaz48ff57yvhqm49j3l637q60i7v2gd75q"; - name = "khangman-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/khangman-17.12.2.tar.xz"; + sha256 = "1wk0k4lbskgxrbv91032yg6n64ghir25128pphsy61m4v00jysg3"; + name = "khangman-17.12.2.tar.xz"; }; }; khelpcenter = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/khelpcenter-17.12.1.tar.xz"; - sha256 = "0y7axdqfmbd2sas5c6ncsi6bpbh95mgymsbpvp2gv7r7d3p11irj"; - name = "khelpcenter-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/khelpcenter-17.12.2.tar.xz"; + sha256 = "0871xxril7dllks46f4a31dkiwmgjc8ajm2jpn5hfm3g2cbawlsd"; + name = "khelpcenter-17.12.2.tar.xz"; }; }; kholidays = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kholidays-17.12.1.tar.xz"; - sha256 = "0595d7wbnz8kyq1bnivdrp20lwdp8ykvdll1fmb0fgm4q24z0cl8"; - name = "kholidays-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kholidays-17.12.2.tar.xz"; + sha256 = "0mn2bmjiy5k99g4yv0n61jklyp1105kmnvkf4ay28ha55zy95bbk"; + name = "kholidays-17.12.2.tar.xz"; }; }; kidentitymanagement = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kidentitymanagement-17.12.1.tar.xz"; - sha256 = "1hz1zawc3zmbj0ylhxc4p1qgffpjbpvzhj5mi4b5zvi0nblqsnk6"; - name = "kidentitymanagement-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kidentitymanagement-17.12.2.tar.xz"; + sha256 = "1s5xjgbp7vdww8k59s8h2mypi1d94n4kkphkgiybdq2gxpfq73pb"; + name = "kidentitymanagement-17.12.2.tar.xz"; }; }; kig = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kig-17.12.1.tar.xz"; - sha256 = "0nvsz4q51bjr380w8gfzfahigpxyap7bf54lnllhfbad673b897d"; - name = "kig-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kig-17.12.2.tar.xz"; + sha256 = "1cphrji1l3c32j8wdr88y40fzkr9s20q79hlk4c4rhzkym7jgzhp"; + name = "kig-17.12.2.tar.xz"; }; }; kigo = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kigo-17.12.1.tar.xz"; - sha256 = "01f0l6fs12v5m88hc9g788mq4k61irgdnf47h7hln4k62rn7yfp9"; - name = "kigo-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kigo-17.12.2.tar.xz"; + sha256 = "0xz8nmhgx8iadwmqkm6469vw8vn9n74mk2fhmciqn8xn66r11g9d"; + name = "kigo-17.12.2.tar.xz"; }; }; killbots = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/killbots-17.12.1.tar.xz"; - sha256 = "16x72i36vy8a2r7bsg5qmg7bs91cxk3r1yhk8ch8666jl8jvxlnx"; - name = "killbots-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/killbots-17.12.2.tar.xz"; + sha256 = "140v8mwbkhv9fkqi0781mrk51fk00q5p1ad3p1rqgmhy0pzfvkg4"; + name = "killbots-17.12.2.tar.xz"; }; }; kimagemapeditor = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kimagemapeditor-17.12.1.tar.xz"; - sha256 = "0zhrfr17596swxp7g53y74kh3pndgpjk8lrxfhpvxn45628wzb62"; - name = "kimagemapeditor-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kimagemapeditor-17.12.2.tar.xz"; + sha256 = "16wyb80al1vp3macr2lrkh0f1l42jzm126mv2l5gbhd5qiwj6yag"; + name = "kimagemapeditor-17.12.2.tar.xz"; }; }; kimap = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kimap-17.12.1.tar.xz"; - sha256 = "1isga4zz98qcgfhvvjmkm0fv8fm27japzc69il814bypd49bkvmb"; - name = "kimap-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kimap-17.12.2.tar.xz"; + sha256 = "15nbnjckmqa4kka012lvaziimgnr6vs5k361sjhdykvrvk4fhz13"; + name = "kimap-17.12.2.tar.xz"; }; }; kio-extras = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kio-extras-17.12.1.tar.xz"; - sha256 = "0vqzvd9linv6y6pfqdi9az79d9294wadz96pr03zwhbak0z5bw65"; - name = "kio-extras-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kio-extras-17.12.2.tar.xz"; + sha256 = "0vc8wwx9cqs48hn1hf49fmz99xa4c8vhcqq58wmpq3bg62vfipyp"; + name = "kio-extras-17.12.2.tar.xz"; }; }; kiriki = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kiriki-17.12.1.tar.xz"; - sha256 = "08xhsdxz0w0qw155zasyq49r1hfqqrbk916lxilmqgkxqww53wgw"; - name = "kiriki-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kiriki-17.12.2.tar.xz"; + sha256 = "1a427gja7y2s37a29jl1n4bx1xa2piqm7wwv7g7agaxm5j15qvx8"; + name = "kiriki-17.12.2.tar.xz"; }; }; kiten = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kiten-17.12.1.tar.xz"; - sha256 = "1mrlj80m1g7r9wwmyrz7iq0lz5lmx56h8fzwcg4nkpim571cn6ch"; - name = "kiten-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kiten-17.12.2.tar.xz"; + sha256 = "0bcb65pcs3xv5pmr78zlxcbicxknvbf30h83i4f4qjxrq6iw8sf4"; + name = "kiten-17.12.2.tar.xz"; }; }; kjumpingcube = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kjumpingcube-17.12.1.tar.xz"; - sha256 = "04bzxq4r7jr776g7hyf2wm08y7j9y5wy0c2war7mn2nc8an2rnna"; - name = "kjumpingcube-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kjumpingcube-17.12.2.tar.xz"; + sha256 = "0d2gdvjd0fxxdnpxfplw9gp69b1qx35w165srd79qcx17c2r7cdv"; + name = "kjumpingcube-17.12.2.tar.xz"; }; }; kldap = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kldap-17.12.1.tar.xz"; - sha256 = "0gn84blvrfspvw4gaqisrsdxp2051j5xva00cw3lv9n0vyrq8vqf"; - name = "kldap-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kldap-17.12.2.tar.xz"; + sha256 = "177xg8ng4636gnppf4jf0m2amadlrz0n9bdmc7f6xnijchmda2p4"; + name = "kldap-17.12.2.tar.xz"; }; }; kleopatra = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kleopatra-17.12.1.tar.xz"; - sha256 = "1rzil9m982iilwpz8qi6j8brrwvzcdrmzldrwaqdpa1v56sjq5f0"; - name = "kleopatra-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kleopatra-17.12.2.tar.xz"; + sha256 = "04c1w1la826dwjam19m12jg8l5c8641l7ad6injrbig1kja819v4"; + name = "kleopatra-17.12.2.tar.xz"; }; }; klettres = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/klettres-17.12.1.tar.xz"; - sha256 = "1ibrkwy9bb60cilmnv46zhw0zl4lv8sn9wddjg53havh38rwjgwc"; - name = "klettres-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/klettres-17.12.2.tar.xz"; + sha256 = "16pi5r4s67j6pq5jjbyap7jrxxx5wrg7dr77391yk06s955rcfr1"; + name = "klettres-17.12.2.tar.xz"; }; }; klickety = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/klickety-17.12.1.tar.xz"; - sha256 = "09d8mkca0p5fp93i5w30zbvz746j7cvz11wrscjbg2n6vi36pcbd"; - name = "klickety-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/klickety-17.12.2.tar.xz"; + sha256 = "0rwmswrmwjizv9vw3bivh75wisy09icbykvwsi43zsapar9hs89l"; + name = "klickety-17.12.2.tar.xz"; }; }; klines = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/klines-17.12.1.tar.xz"; - sha256 = "0b9srbianz3c5knbm9cwn9f5i88pg5v5gc1fnz1vgir2izlyx5pg"; - name = "klines-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/klines-17.12.2.tar.xz"; + sha256 = "0nl5w65m7c46hjh0hvd76x7zf5c9qlqxqn8b96dzgrab6s9f96wf"; + name = "klines-17.12.2.tar.xz"; }; }; kmag = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmag-17.12.1.tar.xz"; - sha256 = "04z02kyaf5xfb8j4fxq1i5b08hvl2j9dbik2liiykzdhv5kn8di8"; - name = "kmag-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmag-17.12.2.tar.xz"; + sha256 = "0yxh4y5l6l528j2nz4wl0w8zmydayrgh1aracy1lymv65ww8qax2"; + name = "kmag-17.12.2.tar.xz"; }; }; kmahjongg = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmahjongg-17.12.1.tar.xz"; - sha256 = "1d46d8dpx969sih2dlc6qf3kiqj9ry7w8jgqczsjnm1irh6l7gqd"; - name = "kmahjongg-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmahjongg-17.12.2.tar.xz"; + sha256 = "06skr41bs29q19dm6j79h0x1l2szbr6gz9kn6s47s23wmyjkqdqr"; + name = "kmahjongg-17.12.2.tar.xz"; }; }; kmail = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmail-17.12.1.tar.xz"; - sha256 = "0dfzgf0mpjanq43fwlv4165ggxi1iqv8dfxpgdf8vg1l8ckb86p0"; - name = "kmail-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmail-17.12.2.tar.xz"; + sha256 = "0kanmbb09x6cyswq7ws6cw7j117lqwqp3hvs9hipx7nyr38mhrlc"; + name = "kmail-17.12.2.tar.xz"; }; }; kmail-account-wizard = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmail-account-wizard-17.12.1.tar.xz"; - sha256 = "0swilpfry4fqkjpd4hwqxycxy2655znphppp67h5fjrnjbvpkyfv"; - name = "kmail-account-wizard-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmail-account-wizard-17.12.2.tar.xz"; + sha256 = "1l7szmbhxrqj93cqvpaywgyql319n1wmw8acnca1aym9l79pns0s"; + name = "kmail-account-wizard-17.12.2.tar.xz"; }; }; kmailtransport = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmailtransport-17.12.1.tar.xz"; - sha256 = "1yxxj93lxfb068z5f5dhz85jy3f0a76zifvxgh8ph05n2kr23rq3"; - name = "kmailtransport-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmailtransport-17.12.2.tar.xz"; + sha256 = "1prrw61vz52wp8yb587xz1kd5rm6s6dry8i9zcs66aha5g7r0wj8"; + name = "kmailtransport-17.12.2.tar.xz"; }; }; kmbox = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmbox-17.12.1.tar.xz"; - sha256 = "12ds7kzrjb885ip73drd9q40gb59d8yhr3y8pdkmz048z7495dh9"; - name = "kmbox-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmbox-17.12.2.tar.xz"; + sha256 = "0q6217br3cpdwns6hiw5klnvkwwx7sd8gbl003clf4wkfnxpgqsb"; + name = "kmbox-17.12.2.tar.xz"; }; }; kmime = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmime-17.12.1.tar.xz"; - sha256 = "1659ri4fxmfnkfa6nqbhkvpj349ynhcl254hwp43pngf1zmk280x"; - name = "kmime-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmime-17.12.2.tar.xz"; + sha256 = "097xzsd7lld01iz1nziy8b9vv97xaz6vsl52d5809h0kxfpixw99"; + name = "kmime-17.12.2.tar.xz"; }; }; kmines = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmines-17.12.1.tar.xz"; - sha256 = "0dhwda6gkjix0lmb3wcz6ds8fglzw7i8wg85a2ij6amc6am9014j"; - name = "kmines-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmines-17.12.2.tar.xz"; + sha256 = "00apcafaxh18rxk8d3r333mzjd0b6f7946kp6ffr1ps9c93mm3ab"; + name = "kmines-17.12.2.tar.xz"; }; }; kmix = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmix-17.12.1.tar.xz"; - sha256 = "1xf46qjn6ax5w8z7l78wcw4k4j59c40vncmrpqdb62kmr4zi0m7q"; - name = "kmix-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmix-17.12.2.tar.xz"; + sha256 = "096dbmywdhgcjzvm473sm0vjrmgfmb19cjx82066ws8pvn9fybdj"; + name = "kmix-17.12.2.tar.xz"; }; }; kmousetool = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmousetool-17.12.1.tar.xz"; - sha256 = "1qbxq4b892i4ssjbky0i5jk96q8zs4lr859y3190kz538g5jakh0"; - name = "kmousetool-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmousetool-17.12.2.tar.xz"; + sha256 = "08kv4j6r18wrl7n4j7apffyj52w77l8rkksvmdzlfg2nk87vaafj"; + name = "kmousetool-17.12.2.tar.xz"; }; }; kmouth = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmouth-17.12.1.tar.xz"; - sha256 = "1yn510zhcw9kw0qcy21k85ryhki56lvgzgzq2hjqbjq0ymzpmlmp"; - name = "kmouth-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmouth-17.12.2.tar.xz"; + sha256 = "12kdrwz3mxwz9y4srq5jjrrn0wg3905qhg1qbj8p583gk1n03g20"; + name = "kmouth-17.12.2.tar.xz"; }; }; kmplot = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmplot-17.12.1.tar.xz"; - sha256 = "06ybsjl9m9awjb70inm7i2hg92p34gqmb4vc5sn8jm2ckm5qsgc6"; - name = "kmplot-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmplot-17.12.2.tar.xz"; + sha256 = "1pws8lajpjm4nfichd0949lmsn975ivxh2b001gsif3vvadmp48l"; + name = "kmplot-17.12.2.tar.xz"; }; }; knavalbattle = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/knavalbattle-17.12.1.tar.xz"; - sha256 = "1yzf70lnjvyk63bv88ycjcwxnbwp0wh2lifqq7m34n3c51ifhd5g"; - name = "knavalbattle-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/knavalbattle-17.12.2.tar.xz"; + sha256 = "0iil9kw7xhjq8ll93hcvcm9apigrys89nj7j2bpvs00208dcyv9c"; + name = "knavalbattle-17.12.2.tar.xz"; }; }; knetwalk = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/knetwalk-17.12.1.tar.xz"; - sha256 = "078gzqyq33val8kvsfw63r0jhnh8q2lwv7p11a8z2qy44cp0bg25"; - name = "knetwalk-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/knetwalk-17.12.2.tar.xz"; + sha256 = "0l98h7grhgddawbn9apm0zifxpdssdkp29cdrcyv025h72dhj5ih"; + name = "knetwalk-17.12.2.tar.xz"; }; }; knotes = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/knotes-17.12.1.tar.xz"; - sha256 = "16bjbxc5l3nxcw6k7csq0phr2hamk4ps1b367s8j6x5w81y3gypw"; - name = "knotes-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/knotes-17.12.2.tar.xz"; + sha256 = "009mia832fxll0a5kl5n16zsy54jvvm9gr2zp4qy5xmimci48llj"; + name = "knotes-17.12.2.tar.xz"; }; }; kolf = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kolf-17.12.1.tar.xz"; - sha256 = "0sgn5702rf3kmflrb0dxlgvx0lb7ajfyq6izzqh147kkp9s8h44i"; - name = "kolf-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kolf-17.12.2.tar.xz"; + sha256 = "12zxqa88jsg4zf68ndw32gw7l6sjjzq6pkkj0a55wcwsdph59666"; + name = "kolf-17.12.2.tar.xz"; }; }; kollision = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kollision-17.12.1.tar.xz"; - sha256 = "08px3m7jl78cg4mbsfwp4xa0fm7kp0p12zb973iy2ipqnhp1wkqp"; - name = "kollision-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kollision-17.12.2.tar.xz"; + sha256 = "1lzc0gih4lcw5dbrkkz0411al1xsjnqi1xzdwa2cijlka1py028g"; + name = "kollision-17.12.2.tar.xz"; }; }; kolourpaint = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kolourpaint-17.12.1.tar.xz"; - sha256 = "1cdz7dhjmg757y70lzsxzsn1k2ih2q89vdcy8vgwggx9b47xgbar"; - name = "kolourpaint-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kolourpaint-17.12.2.tar.xz"; + sha256 = "0jd2r9jv0g1wrqvx7dwniv8an4miv3wjl3ym4rkczpdsjh3smc7c"; + name = "kolourpaint-17.12.2.tar.xz"; }; }; kompare = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kompare-17.12.1.tar.xz"; - sha256 = "09w9g20hkgnvdv7g27pmw3kb82f52ia30fbg9dswbv5snjr82db3"; - name = "kompare-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kompare-17.12.2.tar.xz"; + sha256 = "0cww2zhvf97zya2wpmc9hyk1vp3za8r8xvxc0l4whcm33w0fwgc9"; + name = "kompare-17.12.2.tar.xz"; }; }; konqueror = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/konqueror-17.12.1.tar.xz"; - sha256 = "0nfsfzyzd27m9sxrs2yx2rywkj31ip0qkna5frflsh4fa13jbnjw"; - name = "konqueror-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/konqueror-17.12.2.tar.xz"; + sha256 = "08yyxkrc4rx8y166p8r871rs3b6gxq6fkrnfbg9j4n3387rpg64f"; + name = "konqueror-17.12.2.tar.xz"; }; }; konquest = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/konquest-17.12.1.tar.xz"; - sha256 = "1yph9hp40v1z9kfz7n72hi7y17fbrsgfn7jqdyk0dc7j3ldhji5y"; - name = "konquest-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/konquest-17.12.2.tar.xz"; + sha256 = "18c30b1z0jalkwcgdg6w5y4nl1j2iapp7588qk1zip3nfvgbdpky"; + name = "konquest-17.12.2.tar.xz"; }; }; konsole = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/konsole-17.12.1.tar.xz"; - sha256 = "0k8d5am4qb5p1w02fbn164ffwlg1mg5hjxh5848dvrip8gxhhq40"; - name = "konsole-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/konsole-17.12.2.tar.xz"; + sha256 = "1dbsmfqw0d1f0nhmhz61rhy6spcfvv54j7v05axjhh870wyfmrpc"; + name = "konsole-17.12.2.tar.xz"; }; }; kontact = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kontact-17.12.1.tar.xz"; - sha256 = "1ml71112422sggpi7y3lyn0gs374k99hpy9g4991vsyx53z5yn53"; - name = "kontact-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kontact-17.12.2.tar.xz"; + sha256 = "0qn1iha7g6i85va7bvcagxjx3qk0g9lpaqikn2fvlz22sgv45a2q"; + name = "kontact-17.12.2.tar.xz"; }; }; kontactinterface = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kontactinterface-17.12.1.tar.xz"; - sha256 = "13a898b60mfbi6ara411ns0b7r57vfsq3wbdkq2c6fag5jsafaxl"; - name = "kontactinterface-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kontactinterface-17.12.2.tar.xz"; + sha256 = "044dys074cgahspx9h3bz8a807r5975b25pwjxwimr9vg4ln37d3"; + name = "kontactinterface-17.12.2.tar.xz"; }; }; korganizer = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/korganizer-17.12.1.tar.xz"; - sha256 = "0qrqmiv86f17w8ycfxk8dj3r5ajzyp667kd8cq9yz9xzzf76xhlh"; - name = "korganizer-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/korganizer-17.12.2.tar.xz"; + sha256 = "0ijw3dq0c21c11a4bhdpgd1ailamrhknim4bs4ix1fgriycwpz31"; + name = "korganizer-17.12.2.tar.xz"; }; }; kpat = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kpat-17.12.1.tar.xz"; - sha256 = "1f12jad1439zbrmya1hwbfsz6mxgjncchy94a1ynic5p8ixmja32"; - name = "kpat-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kpat-17.12.2.tar.xz"; + sha256 = "1yy81rv29wfym74709hrz67ms6af408ni5dbnpwjniz86fx2jnxs"; + name = "kpat-17.12.2.tar.xz"; }; }; kpimtextedit = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kpimtextedit-17.12.1.tar.xz"; - sha256 = "08qcrd6ii0hp8afjwk2g64lvxyndy36lnzklc8hszls82h5qablp"; - name = "kpimtextedit-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kpimtextedit-17.12.2.tar.xz"; + sha256 = "1bj3ccvccwg1x5px080w7c3adkjsl1z886bxdimdf84pdxj2fm65"; + name = "kpimtextedit-17.12.2.tar.xz"; }; }; kqtquickcharts = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kqtquickcharts-17.12.1.tar.xz"; - sha256 = "09ppnv95dxrl1wr4h9kmxjhrj8q3h40jjjz68k3d9nzhzb1lz7vi"; - name = "kqtquickcharts-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kqtquickcharts-17.12.2.tar.xz"; + sha256 = "05xsvc4ppncpjj0w5j7m5075ydxjnln8kjfd002c1m2a755brv5j"; + name = "kqtquickcharts-17.12.2.tar.xz"; }; }; krdc = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/krdc-17.12.1.tar.xz"; - sha256 = "1hs7f55s8r6f9h1f5g357zvdzn1dgw5y9pih9n3yxa2522bh0j7r"; - name = "krdc-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/krdc-17.12.2.tar.xz"; + sha256 = "0m9ij015cs8qb1sbiysy27jrz070x9dkrbkrsqy3a2n9dkv7jjz0"; + name = "krdc-17.12.2.tar.xz"; }; }; kreversi = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kreversi-17.12.1.tar.xz"; - sha256 = "0vgxwv0cpnpr4q2fdgc1nsrxrac59db558gwbw706a2yh3bn69dk"; - name = "kreversi-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kreversi-17.12.2.tar.xz"; + sha256 = "1qx0lv85pn98wbaskk0ihg3zywwfj9p0l30jjq67my254qlbaqpk"; + name = "kreversi-17.12.2.tar.xz"; }; }; krfb = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/krfb-17.12.1.tar.xz"; - sha256 = "101h35f8vk3fgbjpw3f32cs6nc184z43qd3q345cq564cmh6h7z3"; - name = "krfb-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/krfb-17.12.2.tar.xz"; + sha256 = "1ggi0rmb0jx9pkqcvml5q6gxzzng5mdpyj8m9knknhmdx0y19k1b"; + name = "krfb-17.12.2.tar.xz"; }; }; kross-interpreters = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kross-interpreters-17.12.1.tar.xz"; - sha256 = "1n9y7ynnkg8h61kyv894bwja3i2z1a5h2542flriny9788xfwwp0"; - name = "kross-interpreters-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kross-interpreters-17.12.2.tar.xz"; + sha256 = "05fd5cbgh81qmffbkmn3zanlrdjdqcgyafcw4jxsfvqb556wdvzv"; + name = "kross-interpreters-17.12.2.tar.xz"; }; }; kruler = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kruler-17.12.1.tar.xz"; - sha256 = "0yxyqrz901fimdqap20rdarikdlcd9rlxmsl7dbfgrgjygxdhwlf"; - name = "kruler-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kruler-17.12.2.tar.xz"; + sha256 = "1j39vrd98p3bxa5kggmg3ccx4wrn8hvd100p0njkd54wagm9r2m7"; + name = "kruler-17.12.2.tar.xz"; }; }; kshisen = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kshisen-17.12.1.tar.xz"; - sha256 = "1sx1dcjg1pbww3xx3r8ackswp61nmlawi5nf38ppgnpmcgz3b7md"; - name = "kshisen-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kshisen-17.12.2.tar.xz"; + sha256 = "02ihwa8zhaig97z14l3jx6c7swsm8aq5107n41h0z0lzf7sir47g"; + name = "kshisen-17.12.2.tar.xz"; }; }; ksirk = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ksirk-17.12.1.tar.xz"; - sha256 = "112m9liq8xfjqnz0fbb7qpi54vys4mcp3i0zvph8i7aidqch6jbk"; - name = "ksirk-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ksirk-17.12.2.tar.xz"; + sha256 = "049za390509m4gsmjybhidbq3p2qss47whwfmzcj6lpcxf0fsrja"; + name = "ksirk-17.12.2.tar.xz"; }; }; ksmtp = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ksmtp-17.12.1.tar.xz"; - sha256 = "11y0pwfy2pzjj678b53x222x0vzbxsng8j936s4afy1dbpx66ms2"; - name = "ksmtp-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ksmtp-17.12.2.tar.xz"; + sha256 = "0g6sjn5vkkwcdqjhpws86l5dhwilxrqqif50dndc2fyiak6x796n"; + name = "ksmtp-17.12.2.tar.xz"; }; }; ksnakeduel = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ksnakeduel-17.12.1.tar.xz"; - sha256 = "1py4zcn311kh4kjzmwrviy91i9gj94fivdqyvfhzkbis59hwvnf4"; - name = "ksnakeduel-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ksnakeduel-17.12.2.tar.xz"; + sha256 = "1gqgw47im2sifxskhbgmg5rr6clvswcz81sinqffmjmpwgrabif7"; + name = "ksnakeduel-17.12.2.tar.xz"; }; }; kspaceduel = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kspaceduel-17.12.1.tar.xz"; - sha256 = "16flrinzg2pysgab2mygijc9pb96ps28pk4ybnxc5bswzhkbhqyz"; - name = "kspaceduel-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kspaceduel-17.12.2.tar.xz"; + sha256 = "13636n466yna04wga7f206gw1scnjr3w3x59hwi4mdr0sghz9a7i"; + name = "kspaceduel-17.12.2.tar.xz"; }; }; ksquares = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ksquares-17.12.1.tar.xz"; - sha256 = "0ma162lsh0vgis1qgsbav6w3v628s29mj4hgs05hlhl576f7h1zw"; - name = "ksquares-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ksquares-17.12.2.tar.xz"; + sha256 = "1csw9kns4b258k1hwcshw01bxbzfa1kclbd4w5fail1qp5xs7x7d"; + name = "ksquares-17.12.2.tar.xz"; }; }; ksudoku = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ksudoku-17.12.1.tar.xz"; - sha256 = "16d2r0vwy1yzwlkvwq98by35zpg6w35j2npfzacjzmy5xxq2k63m"; - name = "ksudoku-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ksudoku-17.12.2.tar.xz"; + sha256 = "0rwgzg0i8s4b7af2dhzccaklbg3rj0khyjsiawijw66p9gs9cczy"; + name = "ksudoku-17.12.2.tar.xz"; }; }; ksystemlog = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ksystemlog-17.12.1.tar.xz"; - sha256 = "03f0pjxc8zbkn47csm45dqswl9sc37cfyawlmnl7pwjbsqmimpi6"; - name = "ksystemlog-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ksystemlog-17.12.2.tar.xz"; + sha256 = "1aw1m1kv3si3qqzhs5mdynmf2b8s2dpsjnb7h0c1l39kq7mbgc9i"; + name = "ksystemlog-17.12.2.tar.xz"; }; }; kteatime = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kteatime-17.12.1.tar.xz"; - sha256 = "0zvr3qkasnf26m6x2lg0pa7m3f2va4favz2sdav0g2ix9jdglqz6"; - name = "kteatime-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kteatime-17.12.2.tar.xz"; + sha256 = "13p1v7ic64rfff7md7f33xv9pl89sgjig35q78q31h5q42k6qzv9"; + name = "kteatime-17.12.2.tar.xz"; }; }; ktimer = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktimer-17.12.1.tar.xz"; - sha256 = "00v8za6dhs7lb2aynlsrfjdq1zzbrxcxk7hr6x5vrxw7q6wp730c"; - name = "ktimer-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktimer-17.12.2.tar.xz"; + sha256 = "1263bsqz23064v7qnrz51nbbckld3d2vz80cm6z43vcis236bvh2"; + name = "ktimer-17.12.2.tar.xz"; }; }; ktnef = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktnef-17.12.1.tar.xz"; - sha256 = "0b6axld4h9dr1a4cr650ibgm2avp1yynwvfyz1s8jaz58lpw8l1b"; - name = "ktnef-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktnef-17.12.2.tar.xz"; + sha256 = "05cj5lghqj8js0bd14w6kbpl29wslyh36yn57sdf5dfbgpnn9a7v"; + name = "ktnef-17.12.2.tar.xz"; }; }; ktouch = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktouch-17.12.1.tar.xz"; - sha256 = "006ng7ajz4x37k2zy2gk7i1wpw2f2yqwvx6lc7vny3s8hz61a8zr"; - name = "ktouch-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktouch-17.12.2.tar.xz"; + sha256 = "1jqc0i6n70vjy6ipgv4swnd8xp404d8frax6nfd4rv3gmn68l5q4"; + name = "ktouch-17.12.2.tar.xz"; }; }; ktp-accounts-kcm = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-accounts-kcm-17.12.1.tar.xz"; - sha256 = "003v1228nk2x8h9r8698fij1q461ibs76ycybgk2611r547jqwxm"; - name = "ktp-accounts-kcm-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-accounts-kcm-17.12.2.tar.xz"; + sha256 = "1qfq2sg2pzv2gkr87yb3r5j0xy0f1j56cxys8c1zijpglfy6a41z"; + name = "ktp-accounts-kcm-17.12.2.tar.xz"; }; }; ktp-approver = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-approver-17.12.1.tar.xz"; - sha256 = "0f3cqq005c2363b23c393qcml84g3h23906rsnc6id0b2zcdfkp3"; - name = "ktp-approver-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-approver-17.12.2.tar.xz"; + sha256 = "0jhzazj42qigdbzjidpnkqlsndv3ias80ik033hzks6m22c20bz6"; + name = "ktp-approver-17.12.2.tar.xz"; }; }; ktp-auth-handler = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-auth-handler-17.12.1.tar.xz"; - sha256 = "0z6c1p7v8zkj54knpxvcnk1xk88ncm751nd6j2lrzg3fxnk4kdyj"; - name = "ktp-auth-handler-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-auth-handler-17.12.2.tar.xz"; + sha256 = "0h81j79285k872wfyflabk6j4s3y7fi0nv41c9n6rnsdv91yvwpk"; + name = "ktp-auth-handler-17.12.2.tar.xz"; }; }; ktp-call-ui = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-call-ui-17.12.1.tar.xz"; - sha256 = "07x0n8b21sfrc01rvya51rg0shvbi265i2pzc0c3kv0d6di74bs1"; - name = "ktp-call-ui-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-call-ui-17.12.2.tar.xz"; + sha256 = "1nh6a7gf3qp3vgw32rbh196ik5pzgad4z6lgrn59x36ssvcpmmd2"; + name = "ktp-call-ui-17.12.2.tar.xz"; }; }; ktp-common-internals = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-common-internals-17.12.1.tar.xz"; - sha256 = "0h6vd98168rs1rcxpj43c7i57yd4lch95qxihy32l8nbyjxn0cc2"; - name = "ktp-common-internals-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-common-internals-17.12.2.tar.xz"; + sha256 = "18i311hnyd7lwvv6c08dk674w77q1sk3bggj5mp94r987507kns4"; + name = "ktp-common-internals-17.12.2.tar.xz"; }; }; ktp-contact-list = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-contact-list-17.12.1.tar.xz"; - sha256 = "1b8x9mxd00f9zvlni95q6arvv912srsshgdfrig6jl8l94aknhfz"; - name = "ktp-contact-list-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-contact-list-17.12.2.tar.xz"; + sha256 = "1fzw7mqk65ry16bpbrh9zp7rpcbdgjabcsw23xdz08dzl86gji24"; + name = "ktp-contact-list-17.12.2.tar.xz"; }; }; ktp-contact-runner = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-contact-runner-17.12.1.tar.xz"; - sha256 = "03bxpcgxazp4g44iidbc2y8a4i147bxvm9hqkglv5bdy86lvg0y3"; - name = "ktp-contact-runner-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-contact-runner-17.12.2.tar.xz"; + sha256 = "0qmwajxqhd2m2p9jnyqq5c8i1a02r8mc20limrikvg2m25cg8ii9"; + name = "ktp-contact-runner-17.12.2.tar.xz"; }; }; ktp-desktop-applets = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-desktop-applets-17.12.1.tar.xz"; - sha256 = "1qb54wpyh5pz4d0nan02gkf2n16cvq2cfj61vpi2xml6cb1yqypf"; - name = "ktp-desktop-applets-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-desktop-applets-17.12.2.tar.xz"; + sha256 = "02s5b2lgcsslr2zavijp457kngmdall03li9wlgg31kxyqwrycwc"; + name = "ktp-desktop-applets-17.12.2.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-filetransfer-handler-17.12.1.tar.xz"; - sha256 = "1976sjks028faahm6gha2kd0if0czbiyplj2vq9x1jnwh9fcbvcx"; - name = "ktp-filetransfer-handler-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-filetransfer-handler-17.12.2.tar.xz"; + sha256 = "1vc8w0aq16rfcwf48s3178y2qmz6r03bsdrgn2mkxscj8z4rv8j5"; + name = "ktp-filetransfer-handler-17.12.2.tar.xz"; }; }; ktp-kded-module = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-kded-module-17.12.1.tar.xz"; - sha256 = "1l8jkixyc41irmf8ak358nfkn6m7nab5a2hxzfhgzi4grr2cassc"; - name = "ktp-kded-module-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-kded-module-17.12.2.tar.xz"; + sha256 = "1is5l0ammvqqp4cz9hk9ra63rv5kphy58b1b1qh1vwdhbc74cdx6"; + name = "ktp-kded-module-17.12.2.tar.xz"; }; }; ktp-send-file = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-send-file-17.12.1.tar.xz"; - sha256 = "0fhqf15dl0rq1dlgb42na64dj5sr53hqdgk4fghjpma4lvr8qd4p"; - name = "ktp-send-file-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-send-file-17.12.2.tar.xz"; + sha256 = "13xq1slbr6qhjq135kxcxmv9lk5w68i6zkc47ffj76x40hdryh34"; + name = "ktp-send-file-17.12.2.tar.xz"; }; }; ktp-text-ui = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-text-ui-17.12.1.tar.xz"; - sha256 = "0zjvxncvr1cbis2amd0s5x3kxgd2dw4mcjbfnqgf30mjbg13bn5m"; - name = "ktp-text-ui-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-text-ui-17.12.2.tar.xz"; + sha256 = "166ya2nggpljf591rvscd2gqbi8fbr2zq06v512clraawfzgbrqa"; + name = "ktp-text-ui-17.12.2.tar.xz"; }; }; ktuberling = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktuberling-17.12.1.tar.xz"; - sha256 = "0b1wfmkd8lxh0cdalcniwz53wkv3iqlgfcb5wkp40xk4yzgm1i2g"; - name = "ktuberling-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktuberling-17.12.2.tar.xz"; + sha256 = "05h47my9f167gi811nzpdn6sdn0k7bdbr582rrm6j1gpjgay2d16"; + name = "ktuberling-17.12.2.tar.xz"; }; }; kturtle = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kturtle-17.12.1.tar.xz"; - sha256 = "1f1gij16s5501p41h6m9z5qf8ldix4avw7cgxcib0s273fds8wxl"; - name = "kturtle-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kturtle-17.12.2.tar.xz"; + sha256 = "0xk3dpnld7f58b9p1hgcv6afvay1yhcm285jq22qa29wi2ckhk6m"; + name = "kturtle-17.12.2.tar.xz"; }; }; kubrick = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kubrick-17.12.1.tar.xz"; - sha256 = "15vy1srmfsbxcjrm2jp0yqqn0x984jlblapma6jvgpcygxf2cxjg"; - name = "kubrick-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kubrick-17.12.2.tar.xz"; + sha256 = "0f5b3z91w4g8kl11wv43xn7n92dcfpmga51nw20wk4vsfmrwgpc9"; + name = "kubrick-17.12.2.tar.xz"; }; }; kwalletmanager = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kwalletmanager-17.12.1.tar.xz"; - sha256 = "00x122kr7vbf6wans95spq0qxlavnjnp25h1pqzxg4y4sqdgy88p"; - name = "kwalletmanager-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kwalletmanager-17.12.2.tar.xz"; + sha256 = "0aqdlm87hxw8d28jr9hhvpjcjs939595vxhg8p5bw5dzanj48zkv"; + name = "kwalletmanager-17.12.2.tar.xz"; }; }; kwave = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kwave-17.12.1.tar.xz"; - sha256 = "0ry9hgmkhs6sx9plqzyds5qn0b7qvq9g2hhxrycahsaj2q9kwk8a"; - name = "kwave-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kwave-17.12.2.tar.xz"; + sha256 = "1l5mdy1qdzw3lmrmvylcjj4wc9xg6brcd7qd20fsanzfv7w8if6k"; + name = "kwave-17.12.2.tar.xz"; }; }; kwordquiz = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kwordquiz-17.12.1.tar.xz"; - sha256 = "1a427jy3vyqc3jadrlwfvq8gh8zx6mfwrnwwaf4skixlwgnpwcp4"; - name = "kwordquiz-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kwordquiz-17.12.2.tar.xz"; + sha256 = "175cf0qvw7qiifbqbgsg036n125gqpbpw7v1qq81hfg8nl0zpy2h"; + name = "kwordquiz-17.12.2.tar.xz"; }; }; libgravatar = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libgravatar-17.12.1.tar.xz"; - sha256 = "0v0xnmfv272hppv7ccdj3ccq6g344v1n883pcp0fbsppkhrfwbwq"; - name = "libgravatar-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libgravatar-17.12.2.tar.xz"; + sha256 = "1vps67mbjh31y7q19wr1km0n35drimc7gi4xyhfx17l8k87nrx7a"; + name = "libgravatar-17.12.2.tar.xz"; }; }; libkcddb = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkcddb-17.12.1.tar.xz"; - sha256 = "03iz1cf69pzk0vfgjkdfwlp3iq2zj3ybzqp8mds9m7725qad35bq"; - name = "libkcddb-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkcddb-17.12.2.tar.xz"; + sha256 = "1hqrpnfy5gzknvvcfmbp2axx4qbk0qkl47rmhr8gmpdvlkh33cny"; + name = "libkcddb-17.12.2.tar.xz"; }; }; libkcompactdisc = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkcompactdisc-17.12.1.tar.xz"; - sha256 = "19ifymhr3wbf3bcsdhdbjqwnnbqrdhkxc6bq35av2n40b7395avc"; - name = "libkcompactdisc-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkcompactdisc-17.12.2.tar.xz"; + sha256 = "12dcyxjr6b6i8zfk3i17ah0kc3x0d9ixy65wj3zw1gf4mmdzgpbk"; + name = "libkcompactdisc-17.12.2.tar.xz"; }; }; libkdcraw = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkdcraw-17.12.1.tar.xz"; - sha256 = "05ji1s7p5sdcvrzmivp7dw98kxl6zm8vsfb6wc41x1syp18xvbxj"; - name = "libkdcraw-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkdcraw-17.12.2.tar.xz"; + sha256 = "1qfzyy4952b2lc3619bbzqffvrphqsq16z89bxb4pn1ad796zn62"; + name = "libkdcraw-17.12.2.tar.xz"; }; }; libkdegames = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkdegames-17.12.1.tar.xz"; - sha256 = "0sqiq3xsfigd77czw3mrgrdn4bhz6f08ibv0yy4vfvgzx5ldysbp"; - name = "libkdegames-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkdegames-17.12.2.tar.xz"; + sha256 = "1v3a9240crfpjdwpbz0bdwv06572s99h80l53vf3zwmqw5yk05z4"; + name = "libkdegames-17.12.2.tar.xz"; }; }; libkdepim = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkdepim-17.12.1.tar.xz"; - sha256 = "1h6gcn1lsk9zd2q4m4w4gwgx2nawf7iqzxq4liyrx9s0j980v9vy"; - name = "libkdepim-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkdepim-17.12.2.tar.xz"; + sha256 = "069x28ia6d95rm1g3mr339v7rdvlmiz20y4kddp2acja53b0sagg"; + name = "libkdepim-17.12.2.tar.xz"; }; }; libkeduvocdocument = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkeduvocdocument-17.12.1.tar.xz"; - sha256 = "0qfhfhy18w5fa8989hjqrk9910sb3j99xpp55zkwvfssxjnrwwxj"; - name = "libkeduvocdocument-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkeduvocdocument-17.12.2.tar.xz"; + sha256 = "1g4zldr9ys7ddxqfkkhlyqgq623q303011ifaraid5zpiql092qd"; + name = "libkeduvocdocument-17.12.2.tar.xz"; }; }; libkexiv2 = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkexiv2-17.12.1.tar.xz"; - sha256 = "18has05apcfw2qvyzkk4ywi0vbx46k0abvk6ai2rpag9kqw877i9"; - name = "libkexiv2-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkexiv2-17.12.2.tar.xz"; + sha256 = "0jr9wpnl80xala60yz4zd5j9nd1bv56y688fldr5dxx25ljavn24"; + name = "libkexiv2-17.12.2.tar.xz"; }; }; libkgapi = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkgapi-17.12.1.tar.xz"; - sha256 = "177m12jfswilb1qfi7zyhymscxrz52wplm8nzlrmwv7pr3brnmnl"; - name = "libkgapi-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkgapi-17.12.2.tar.xz"; + sha256 = "1vki4sxb7dzg202waqqyvjwsx8yhx8cfp2wk4b6p81hfaq8a1syd"; + name = "libkgapi-17.12.2.tar.xz"; }; }; libkgeomap = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkgeomap-17.12.1.tar.xz"; - sha256 = "0zixbp0vkmf8nrlzhwkbsgn0bxpwx6xcgslhjrl5q8w1bvp2hfjp"; - name = "libkgeomap-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkgeomap-17.12.2.tar.xz"; + sha256 = "1spq6g56ih6wlc2qasf3fkpkn7m4gsbn14p6ja60cr1gvf4p9j79"; + name = "libkgeomap-17.12.2.tar.xz"; }; }; libkipi = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkipi-17.12.1.tar.xz"; - sha256 = "11438klx8lj16py2vvyahs1pf0as0dx1523bsrxy8hmyx5gsivas"; - name = "libkipi-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkipi-17.12.2.tar.xz"; + sha256 = "180yg24iqh02nkcv7jbvm10lr7z7qagapjh8zarpmh6r2s3c0nh5"; + name = "libkipi-17.12.2.tar.xz"; }; }; libkleo = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkleo-17.12.1.tar.xz"; - sha256 = "1mbiljd4xpzlmf7xmf21pr2ka0cz5sg4f38z0m9if61903ag2bcc"; - name = "libkleo-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkleo-17.12.2.tar.xz"; + sha256 = "00nlspwnh9nvxarm34y9hdis3af2zkjf2flla4qwks5nhl7fgi8g"; + name = "libkleo-17.12.2.tar.xz"; }; }; libkmahjongg = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkmahjongg-17.12.1.tar.xz"; - sha256 = "1x8zbldp66my0pn4p44pg2wxybh7hq221bda91p2andaqa72nswq"; - name = "libkmahjongg-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkmahjongg-17.12.2.tar.xz"; + sha256 = "0l8krpiyzlsn9awp8za10n9qhbac8nf98jiz7dxzn4qpniv45px5"; + name = "libkmahjongg-17.12.2.tar.xz"; }; }; libkomparediff2 = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkomparediff2-17.12.1.tar.xz"; - sha256 = "0jd700pjw51vyan5d22k6j60jgb95pfn2nvwz2nfs2f4xlsly1hz"; - name = "libkomparediff2-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkomparediff2-17.12.2.tar.xz"; + sha256 = "07is7vn9wrivxpyd4s19371ffylj2x3s5zi14y8zr778nq68wrzq"; + name = "libkomparediff2-17.12.2.tar.xz"; }; }; libksane = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libksane-17.12.1.tar.xz"; - sha256 = "1jglv4b5zqgs3qysadcrizfwlzwv39w369hhj4180xjjc07kxjw0"; - name = "libksane-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libksane-17.12.2.tar.xz"; + sha256 = "01d182hnrj6n8qmh85pkwmjdyhfy0n946zp40r9r6avh9ajrx5nd"; + name = "libksane-17.12.2.tar.xz"; }; }; libksieve = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libksieve-17.12.1.tar.xz"; - sha256 = "1w3cqhig1nwy5q98503f0s6i0vibsrq35js8y9vqqa22hyksy8xb"; - name = "libksieve-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libksieve-17.12.2.tar.xz"; + sha256 = "1nfy96ykaxdm5h67bhykgdcmlidsjgvbsf52qs5f7j7iyl3w4nhr"; + name = "libksieve-17.12.2.tar.xz"; }; }; lokalize = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/lokalize-17.12.1.tar.xz"; - sha256 = "0ygsz8mbind93sc148rd3asdpzlki1ps7xkc6y2zgf069ikrp504"; - name = "lokalize-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/lokalize-17.12.2.tar.xz"; + sha256 = "18nama2dafhp5v1lvxibm92cxwdldkxs778s948qnb7xh65mxvsb"; + name = "lokalize-17.12.2.tar.xz"; }; }; lskat = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/lskat-17.12.1.tar.xz"; - sha256 = "036lhwx0d49cb2ml514rawbcngrrxhly4cjrrhf21yw8apxfwa92"; - name = "lskat-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/lskat-17.12.2.tar.xz"; + sha256 = "0a4gch1krd7xpvxkscy7prsfb72dcg78alk4vz2z70nfn11zrzv3"; + name = "lskat-17.12.2.tar.xz"; }; }; mailcommon = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/mailcommon-17.12.1.tar.xz"; - sha256 = "0m9ng8mj0hwj5zg9da5cqy8paa80q2v92qn6a6b1wm34ylbdfhsm"; - name = "mailcommon-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/mailcommon-17.12.2.tar.xz"; + sha256 = "0ikmbg91f4p7d4qb7nx05n5mlbmmcdwzgw0xvdsib7vkj5cfrxp2"; + name = "mailcommon-17.12.2.tar.xz"; }; }; mailimporter = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/mailimporter-17.12.1.tar.xz"; - sha256 = "1rd55alsa502v1vrp2fbmfxyf29h248n78d9wcw93grwg50sabdn"; - name = "mailimporter-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/mailimporter-17.12.2.tar.xz"; + sha256 = "1p4dc7xwk6wx1j6xk3h5w5cnzm665pzrmc70v8l5898025i94ml5"; + name = "mailimporter-17.12.2.tar.xz"; }; }; marble = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/marble-17.12.1.tar.xz"; - sha256 = "0g4vr27ggc3xdr274apcmv8ys9584lzxxc78ssr16snb1rkrb9my"; - name = "marble-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/marble-17.12.2.tar.xz"; + sha256 = "1y6wbh571g2d8gzg9pwdbsc4a4bl67fmvnkf65acs182zfc2x7jy"; + name = "marble-17.12.2.tar.xz"; }; }; mbox-importer = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/mbox-importer-17.12.1.tar.xz"; - sha256 = "1vm0f2yb5adrnsdl6dy34bb7zggrh6xd89n0cvz1grq5fsrb3ilk"; - name = "mbox-importer-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/mbox-importer-17.12.2.tar.xz"; + sha256 = "0f1zvp31m6i20jd7xi9hxks8759mvbsj57r2nciwhc47r3m9wi3l"; + name = "mbox-importer-17.12.2.tar.xz"; }; }; messagelib = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/messagelib-17.12.1.tar.xz"; - sha256 = "1nc6vh68fy26kcisqbr4lvhwxx3dzmjdawgzhy7jnbhdx36siw3b"; - name = "messagelib-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/messagelib-17.12.2.tar.xz"; + sha256 = "17fayacl3m7p0w0rf724fhdm287dz8n03pyliapsxybldgp2rlaz"; + name = "messagelib-17.12.2.tar.xz"; }; }; minuet = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/minuet-17.12.1.tar.xz"; - sha256 = "1y7l1qh3vwhhkv9mp165kyhf3ps4xzclnmbml3kpczhgxs0hzw47"; - name = "minuet-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/minuet-17.12.2.tar.xz"; + sha256 = "17gwnh0bd2a7fvxbjhwadh0gvb0zly71lwv8znkb18dwsyd38v3r"; + name = "minuet-17.12.2.tar.xz"; }; }; okteta = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/okteta-17.12.1.tar.xz"; - sha256 = "1ryaqbccqlir910v628wcv7gwp85w82d6f1lwwg92dh55zmlx6a4"; - name = "okteta-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/okteta-17.12.2.tar.xz"; + sha256 = "1k4b2m5pvrv1zxvm6pwmkl0ahh0ynkssa8z1v51a3hxlvw593b4d"; + name = "okteta-17.12.2.tar.xz"; }; }; okular = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/okular-17.12.1.tar.xz"; - sha256 = "0rai5m7alks6lri2fwg07s842azd6q9xizwsk0ib4pnw07hj2fqj"; - name = "okular-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/okular-17.12.2.tar.xz"; + sha256 = "10rkrwp3rwccvqsw7njcmggw3jkj84fb90vkvqp8k2lmhnrz1ypx"; + name = "okular-17.12.2.tar.xz"; }; }; palapeli = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/palapeli-17.12.1.tar.xz"; - sha256 = "0xbcfsrzlj41wr2fx0awgmvdxdd6y890sigf42nzi8mizvd70b5v"; - name = "palapeli-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/palapeli-17.12.2.tar.xz"; + sha256 = "0j9b4a6x3bp9bki2p79ksn86l16niixa2x8xx24vdnd9y71lp2yb"; + name = "palapeli-17.12.2.tar.xz"; }; }; parley = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/parley-17.12.1.tar.xz"; - sha256 = "199qkhsrgcviyi3hfaazr8acd1xji1rraqvwlrb8b1bsrdnknbfs"; - name = "parley-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/parley-17.12.2.tar.xz"; + sha256 = "0kqvj1gwsv9kdac0zsv6cda34h8qx8xr43mgwk343c8pcwm1r2r5"; + name = "parley-17.12.2.tar.xz"; }; }; picmi = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/picmi-17.12.1.tar.xz"; - sha256 = "024bia05vczjaz2df0lg4jqkjn8l7x36cjr6jkr0c77p37vm3w6k"; - name = "picmi-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/picmi-17.12.2.tar.xz"; + sha256 = "0ry4vvspa2mdvxrxvbqihkdh7qvsxhl9v7i07ycx3qs7sybf1rx4"; + name = "picmi-17.12.2.tar.xz"; }; }; pimcommon = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/pimcommon-17.12.1.tar.xz"; - sha256 = "0wmlzx43730zgdvgnw1ljplspbg19r5i88s0nvz53s0fa70nbga2"; - name = "pimcommon-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/pimcommon-17.12.2.tar.xz"; + sha256 = "0frgn2shd2qzf4rbix9k4psy81b2yzsyy0sisy0ngc68gk5mdj8a"; + name = "pimcommon-17.12.2.tar.xz"; }; }; pim-data-exporter = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/pim-data-exporter-17.12.1.tar.xz"; - sha256 = "0ryw03lb5lhj5k6g7rqnmmqfgrd6004im7p3wwf9v3ynmjbkx0v7"; - name = "pim-data-exporter-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/pim-data-exporter-17.12.2.tar.xz"; + sha256 = "1fbpz4sw4gn01yc7vzlj9v15wp3b6acbcd6xs9nsp3bfpb9mqd16"; + name = "pim-data-exporter-17.12.2.tar.xz"; }; }; pim-sieve-editor = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/pim-sieve-editor-17.12.1.tar.xz"; - sha256 = "1adz9whyvqz0fw2ggkr7g8xd67m779vyymqbyx3h05kwmdy6kims"; - name = "pim-sieve-editor-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/pim-sieve-editor-17.12.2.tar.xz"; + sha256 = "1jwjgywqp23c17g08c18ajbl2dzq3h9vm94bmbjcan64isd03jr4"; + name = "pim-sieve-editor-17.12.2.tar.xz"; }; }; poxml = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/poxml-17.12.1.tar.xz"; - sha256 = "1ynycpwvsx2514rar3ycvmyv6fj2ac1adxx2gcip9vkb4chija6b"; - name = "poxml-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/poxml-17.12.2.tar.xz"; + sha256 = "0amb095qjv8d22ny86rs6wj280b2ag2zpk7bzs5834m75wlmpg6w"; + name = "poxml-17.12.2.tar.xz"; }; }; print-manager = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/print-manager-17.12.1.tar.xz"; - sha256 = "024hzc2ja1cb6wvag0w040q3ifrpzlb6s23d75hvkpyqqgi1qq5d"; - name = "print-manager-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/print-manager-17.12.2.tar.xz"; + sha256 = "0sz7xqcjc5ddxkc7gbl1h673ywp3ffhmx985jzpd296n6sjppc2v"; + name = "print-manager-17.12.2.tar.xz"; }; }; rocs = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/rocs-17.12.1.tar.xz"; - sha256 = "04v3khfyz7gg7krn3v3j5885ivmf0avmgl5xwyqh8vy7zwxajvq7"; - name = "rocs-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/rocs-17.12.2.tar.xz"; + sha256 = "08flyrla2kqkdc94hd8w2inzmnmzvczcgwl9hzqxxzf3fsjnnfdl"; + name = "rocs-17.12.2.tar.xz"; }; }; signon-kwallet-extension = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/signon-kwallet-extension-17.12.1.tar.xz"; - sha256 = "05w8hpxc2fmm5w1fj8df8dqj8hag62f154mpyiq5zy04a0j69mbl"; - name = "signon-kwallet-extension-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/signon-kwallet-extension-17.12.2.tar.xz"; + sha256 = "06l1mynl7wp1r3gmy5919dm0p19p23harsh6qwdvbi9lffy7ascp"; + name = "signon-kwallet-extension-17.12.2.tar.xz"; }; }; spectacle = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/spectacle-17.12.1.tar.xz"; - sha256 = "0zl2wr9n5lb6ry5xp33wv73r5xkadm4zm1bnric85q383qzwzhvd"; - name = "spectacle-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/spectacle-17.12.2.tar.xz"; + sha256 = "0qhhnpdk4rqzpg3npj183nl7k1n4mvhcb97hydwaq51yh51r4gvj"; + name = "spectacle-17.12.2.tar.xz"; }; }; step = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/step-17.12.1.tar.xz"; - sha256 = "027czrw3dkvcbw74jrh8qwi577zxb7hzbzmnpd7b01qal486qj0f"; - name = "step-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/step-17.12.2.tar.xz"; + sha256 = "1n9gd2sq2lvfmgvjdb8yn5g25j58jcb24qh8l41k1y0hgcbaxly7"; + name = "step-17.12.2.tar.xz"; }; }; svgpart = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/svgpart-17.12.1.tar.xz"; - sha256 = "13g89s83y7wwwkx06zxcghcv9rdpziyq5f2lc81y583qsqg6j6lh"; - name = "svgpart-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/svgpart-17.12.2.tar.xz"; + sha256 = "1d7yrpnxc3sm3381fd9m3fiipi664vl8cz2li8dlw2y4pbgpx28g"; + name = "svgpart-17.12.2.tar.xz"; }; }; sweeper = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/sweeper-17.12.1.tar.xz"; - sha256 = "0rhn2ia3sxjlig9vp15jdvi7ij5xgyn4bz8cbh5g93an79z4mi59"; - name = "sweeper-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/sweeper-17.12.2.tar.xz"; + sha256 = "1qi4kfd4p8xnykv3zn3sqkx4b605mwbnr6m9l6cr0v26c01yjq3k"; + name = "sweeper-17.12.2.tar.xz"; }; }; syndication = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/syndication-17.12.1.tar.xz"; - sha256 = "1y8nsrbdc69cyh0rhjfvi99qx2fgvpvfsixpqjsyis1xhkxc3901"; - name = "syndication-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/syndication-17.12.2.tar.xz"; + sha256 = "1hcdk0apdrppfrjyfjm4cn0iyb1yrf7zq2wb2ipmxzca1hfgw4c0"; + name = "syndication-17.12.2.tar.xz"; }; }; umbrello = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/umbrello-17.12.1.tar.xz"; - sha256 = "13krbjzg840rhr74zwday4p5min0zwrpxri6k1sdz7mhqm4lbj19"; - name = "umbrello-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/umbrello-17.12.2.tar.xz"; + sha256 = "1sm0drfsyyslls5n66mvjy2knbwykws34g74c6rn1mmmdpyp7b94"; + name = "umbrello-17.12.2.tar.xz"; }; }; zeroconf-ioslave = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/zeroconf-ioslave-17.12.1.tar.xz"; - sha256 = "10n0zyr2by91d0985r8cq6d8p0h3pxxq3kckrz2pmafr0q7l1zqx"; - name = "zeroconf-ioslave-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/zeroconf-ioslave-17.12.2.tar.xz"; + sha256 = "09p55dmrsi8jyvs793ya2xzfbhm6f6gwg8ldri15v9n3if7crpzx"; + name = "zeroconf-ioslave-17.12.2.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 7bfcc6e72c89e..0f629aace4563 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -30,18 +30,18 @@ let ]; in buildRustPackage rec { name = "alacritty-unstable-${version}"; - version = "2017-12-29"; + version = "2018-01-31"; # At the moment we cannot handle git dependencies in buildRustPackage. # This fork only replaces rust-fontconfig/libfontconfig with a git submodules. src = fetchgit { url = https://github.com/Mic92/alacritty.git; rev = "rev-${version}"; - sha256 = "0pk4b8kfxixmd9985v2fya1m7np8ggws8d9msw210drc0grwbfkd"; + sha256 = "0jc8haijd6f8r5fqiknrvqnwc9q4cp93852lr2p7zak7dv29v45p"; fetchSubmodules = true; }; - cargoSha256 = "0acj526cx4xl52vbcbd3hp1klh4p756j6alxqqz3x715zi2dqkzf"; + cargoSha256 = "0023jpc6krilmp5wzbbwapxafsi6m1k13mvjh4zlvls1nyyhk808"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix new file mode 100644 index 0000000000000..467c2b3c2d59d --- /dev/null +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }: + +let + wxInputs = + if stdenv.isDarwin then + [ wxmac darwin.apple_sdk.frameworks.Cocoa ] + else + [ wxGTK ]; +in +stdenv.mkDerivation rec { + name = "diff-pdf-${version}"; + version = "2017-12-30"; + + src = fetchFromGitHub { + owner = "vslavik"; + repo = "diff-pdf"; + rev = "c4d67226ec4c29b30a7399e75f80636ff8a6f9fc"; + sha256 = "1c3ig7ckrg37p5vzvgjnsfdzdad328wwsx0r31lbs1d8pkjkgq3m"; + }; + + nativeBuildInputs = [ autoconf automake pkgconfig ]; + buildInputs = [ cairo poppler ] ++ wxInputs; + + preConfigure = "./bootstrap"; + + meta = with stdenv.lib; { + homepage = http://vslavik.github.io/diff-pdf; + description = "Simple tool for visually comparing two PDF files"; + license = licenses.gpl2; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index fd3d0b35729e2..144e1fa566cad 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, poppler_qt4, qmake4Hook }: +{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler_qt5 }: stdenv.mkDerivation rec { version = "2.1.3"; @@ -9,13 +9,19 @@ stdenv.mkDerivation rec { sha256 = "0cr468fi0d512jjj23r5flfzx957vibc9c25gwwhi0d773h2w566"; }; - patches = [ ./fix_path_poppler_qt4.patch ]; + patches = [ + (fetchpatch { + url = https://raw.githubusercontent.com/gentoo/gentoo/9b971631588ff46e7c2d501bc35cd0d9ce2d98e2/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch; + sha256 = "0sax8gcqcmzf74hmdr3rarqs4nsxmml9qmh6pqyjmgl3lypxhafg"; + }) + ./fix_path_poppler_qt5.patch + ]; - buildInputs = [ qt4 poppler_qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtbase poppler_qt5 ]; preConfigure = '' - substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4.dev} + substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler_qt5.dev} lrelease diffpdf.pro ''; diff --git a/pkgs/applications/misc/diffpdf/fix_path_poppler_qt4.patch b/pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch index e72cad8b7a25a..9535ea2c6b0d9 100644 --- a/pkgs/applications/misc/diffpdf/fix_path_poppler_qt4.patch +++ b/pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch @@ -2,15 +2,15 @@ diff -uNr diffpdf-2.1.3/diffpdf.pro diffpdf-2.1.3-new/diffpdf.pro --- diffpdf-2.1.3/diffpdf.pro 2013-10-15 09:01:22.000000000 +0200 +++ diffpdf-2.1.3-new/diffpdf.pro 2015-07-07 23:13:36.445572148 +0200 @@ -47,9 +47,9 @@ - INCLUDEPATH += /c/poppler_lib/include/poppler/qt4 + INCLUDEPATH += /c/poppler_lib/include/poppler/qt5 LIBS += -Wl,-rpath -Wl,/c/poppler_lib/bin -Wl,-L/c/poppler_lib/bin } else { -- exists(/usr/include/poppler/qt4) { +- exists(/usr/include/poppler/qt5) { - INCLUDEPATH += /usr/include/poppler/cpp -- INCLUDEPATH += /usr/include/poppler/qt4 -+ exists(@@NIX_POPPLER_QT4@@/include/poppler/qt4) { -+ INCLUDEPATH += @@NIX_POPPLER_QT4@@/include/poppler/cpp -+ INCLUDEPATH += @@NIX_POPPLER_QT4@@/include/poppler/qt4 +- INCLUDEPATH += /usr/include/poppler/qt5 ++ exists(@@NIX_POPPLER_QT5@@/include/poppler/qt5) { ++ INCLUDEPATH += @@NIX_POPPLER_QT5@@/include/poppler/cpp ++ INCLUDEPATH += @@NIX_POPPLER_QT5@@/include/poppler/qt5 } else { INCLUDEPATH += /usr/local/include/poppler/cpp - INCLUDEPATH += /usr/local/include/poppler/qt4 + INCLUDEPATH += /usr/local/include/poppler/qt5 diff --git a/pkgs/applications/misc/dump1090/default.nix b/pkgs/applications/misc/dump1090/default.nix index 3e9fe133d93c0..29f6c60856028 100644 --- a/pkgs/applications/misc/dump1090/default.nix +++ b/pkgs/applications/misc/dump1090/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { buildInputs = [ libusb rtl-sdr ]; - makeFlags = [ "PREFIX=$out" ]; + makeFlags = [ "PREFIX=$(out)" ]; installPhase = '' mkdir -p $out/bin $out/share - cp -v dump1090 $out/bin/dump1090 + cp -v dump1090 view1090 $out/bin cp -vr public_html $out/share/dump1090 ''; diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix index bde8d5b81e3e9..c98efa547b393 100644 --- a/pkgs/applications/misc/electrum-dash/default.nix +++ b/pkgs/applications/misc/electrum-dash/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { + version = "2.9.3.1"; name = "electrum-dash-${version}"; - version = "2.4.1"; src = fetchurl { - url = "https://github.com/dashpay/electrum-dash/releases/download/v${version}/Electrum-DASH-${version}.tar.gz"; - sha256 = "02k7m7fyn0cvlgmwxr2gag7rf2knllkch1ma58shysp7zx9jb000"; + url = "https://github.com/akhavr/electrum-dash/releases/download/${version}/Electrum-DASH-${version}.tar.gz"; + #"https://github.com/dashpay/electrum-dash/releases/download/v${version}/Electrum-DASH-${version}.tar.gz"; + sha256 = "9b7ac205f63fd4bfb15d77a34a4451ef82caecf096f31048a7603bd276dfc33e"; }; propagatedBuildInputs = with python2Packages; [ @@ -20,10 +21,11 @@ python2Packages.buildPythonApplication rec { pyqt4 qrcode requests - slowaes + pyaes tlslite x11_hash mnemonic + jsonrpclib # plugins trezor diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index caa050581bf70..6835db35b6066 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "06z0a5p1jg93jialphslip8d72q9yg3651qqaf494gs3h9kw1sv1"; + sha256 = "01dnqiazjl2avrmdiq68absjvcfv24446y759z2s9dwk8ywzjkrg"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/gnuradio/wrapper.nix b/pkgs/applications/misc/gnuradio/wrapper.nix index db2b453913f44..ffed3da03187e 100644 --- a/pkgs/applications/misc/gnuradio/wrapper.nix +++ b/pkgs/applications/misc/gnuradio/wrapper.nix @@ -1,7 +1,6 @@ -{ stdenv, gnuradio, makeWrapper, python -, extraPackages ? [] }: +{ stdenv, gnuradio, makeWrapper, python, extraPackages ? [] }: -with stdenv.lib; +with { inherit (stdenv.lib) appendToName makeSearchPath; }; stdenv.mkDerivation { name = (appendToName "with-packages" gnuradio).name; @@ -11,13 +10,15 @@ stdenv.mkDerivation { mkdir -p $out/bin ln -s "${gnuradio}"/bin/* $out/bin/ - for file in $(find $out/bin -type f -executable); do - wrapProgram "$file" \ - --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":" - (map (path: "$(toPythonPath ${path})") extraPackages)} \ - --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages} + for file in $(find -L $out/bin -type f); do + if test -x "$(readlink -f "$file")"; then + wrapProgram "$file" \ + --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":" + (map (path: "$(toPythonPath ${path})") extraPackages)} \ + --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages} + fi done - ''; + inherit (gnuradio) meta; } diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 49e4711550dae..bee86cb0ed39a 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -8,34 +8,17 @@ # plugin derivations in the Nix store and nowhere else. with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.37"; + version = "2.38"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "1wfbpfjng1blzkbjnxsdnny544297bm9869ianbr6l0hrvcgv3qx"; + sha256 = "0m33gfpvv01xc28k4rrc8llbyk6qanm9rsqcnv8ydms0cr78dbbk"; }; sourceRoot = "."; buildInputs = [ unzip makeWrapper icoutils ]; - pluginLoadPathsPatch = - let outputLc = toString (add 7 (length plugins)); - patchTemplate = readFile ./keepass-plugins.patch; - loadTemplate = readFile ./keepass-plugins-load.patch; - loads = - lib.concatStrings - (map - (p: replaceStrings ["$PATH$"] [ (unsafeDiscardStringContext (toString p)) ] loadTemplate) - plugins); - in replaceStrings ["$OUTPUT_LC$" "$DO_LOADS$"] [outputLc loads] patchTemplate; - - passAsFile = [ "pluginLoadPathsPatch" ]; - postPatch = '' - sed -i 's/\r*$//' KeePass/Forms/MainForm.cs - patch -p1 <$pluginLoadPathsPatchPath - ''; - preConfigure = '' rm -rvf Build/* find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \; diff --git a/pkgs/applications/misc/keepass/keepass-plugins-load.patch b/pkgs/applications/misc/keepass/keepass-plugins-load.patch deleted file mode 100644 index b7bea38e4c81b..0000000000000 --- a/pkgs/applications/misc/keepass/keepass-plugins-load.patch +++ /dev/null @@ -1 +0,0 @@ -+ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", SearchOption.TopDirectoryOnly, new string[] {}); diff --git a/pkgs/applications/misc/keepass/keepass-plugins.patch b/pkgs/applications/misc/keepass/keepass-plugins.patch deleted file mode 100644 index 1793f04a1708f..0000000000000 --- a/pkgs/applications/misc/keepass/keepass-plugins.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- old/KeePass/Forms/MainForm.cs -+++ new/KeePass/Forms/MainForm.cs -@@ -386,42 +386,$OUTPUT_LC$ @@ namespace KeePass.Forms - m_pluginManager.UnloadAllPlugins(); - if(AppPolicy.Current.Plugins) - { -- string[] vExclNames = new string[] { -- AppDefs.FileNames.Program, AppDefs.FileNames.XmlSerializers, -- AppDefs.FileNames.NativeLib32, AppDefs.FileNames.NativeLib64, -- AppDefs.FileNames.ShInstUtil -- }; -- -- string strPlgRoot = UrlUtil.GetFileDirectory( -- WinUtil.GetExecutable(), false, true); -- m_pluginManager.LoadAllPlugins(strPlgRoot, SearchOption.TopDirectoryOnly, -- vExclNames); -- -- if(!NativeLib.IsUnix()) -- { -- string strPlgSub = UrlUtil.EnsureTerminatingSeparator(strPlgRoot, -- false) + AppDefs.PluginsDir; -- m_pluginManager.LoadAllPlugins(strPlgSub, SearchOption.AllDirectories, -- vExclNames); -- } -- else // Unix -- { -- try -- { -- DirectoryInfo diPlgRoot = new DirectoryInfo(strPlgRoot); -- foreach(DirectoryInfo diSub in diPlgRoot.GetDirectories()) -- { -- if(diSub == null) { Debug.Assert(false); continue; } -- -- if(string.Equals(diSub.Name, AppDefs.PluginsDir, -- StrUtil.CaseIgnoreCmp)) -- m_pluginManager.LoadAllPlugins(diSub.FullName, -- SearchOption.AllDirectories, vExclNames); -- } -- } -- catch(Exception) { Debug.Assert(false); } -- } -- } -$DO_LOADS$+ } - - // Delete old files *after* loading plugins (when timestamps - // of loaded plugins have been updated already) diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index 3729978dddb00..36527cdbe7c3b 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; homepage = http://lilyterm.luna.com.tw/; license = licenses.gpl3; - maintainers = with maintainers; [ AndersonTorres profpatsch ]; + maintainers = with maintainers; [ AndersonTorres Profpatsch ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index 6d0a348b1f76e..1085fed095653 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { # homepage needed you to login to download the tarball - url = "http://pkgs.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2" + url = "http://src.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2" + "/fe3d3da50371b1773dfe29bf870dbc5b/pinfo-0.6.10.tar.bz2"; sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j"; }; diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index bc909742c6df9..763435da564db 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -1,8 +1,9 @@ -{ mkDerivation, stdenv, lib, fetchFromGitHub, procps ? null +{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps ? null , qtbase, qtwebengine, qtwebkit , cmake , syncthing, syncthing-inotify ? null -, preferQWebView ? false }: +, preferQWebView ? false +, preferNative ? true }: mkDerivation rec { version = "0.5.8"; @@ -16,11 +17,18 @@ mkDerivation rec { }; buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit; + nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1"; + cmakeFlags = [ ] + ++ lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1" + ++ lib.optional preferNative "-DQST_BUILD_NATIVEBROWSER=1"; - patches = [ ./qsyncthingtray-0.5.8-qt-5.6.3.patch ]; + patches = [ (fetchpatch { + name = "support_native_browser.patch"; + url = "https://patch-diff.githubusercontent.com/raw/sieren/QSyncthingTray/pull/225.patch"; + sha256 = "0w665xdlsbjxs977pdpzaclxpswf7xys1q3rxriz181lhk2y66yy"; + }) ] ++ lib.optional (!preferQWebView && !preferNative) ./qsyncthingtray-0.5.8-qt-5.6.3.patch; postPatch = '' ${lib.optionalString stdenv.isLinux '' @@ -60,6 +68,8 @@ mkDerivation rec { maintainers = with maintainers; [ zraexy peterhoeg ]; platforms = platforms.all; # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8 - broken = builtins.compareVersions qtbase.version "5.7.0" >= 0; + # but qt > 5.6 works when only using the native browser + # https://github.com/sieren/QSyncthingTray/issues/223 + broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative); }; } diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix new file mode 100644 index 0000000000000..29e01da1b5b13 --- /dev/null +++ b/pkgs/applications/misc/slade/git.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: + +stdenv.mkDerivation { + name = "slade-git-3.1.2.2018.01.29"; + + src = fetchFromGitHub { + owner = "sirjuddington"; + repo = "SLADE"; + rev = "f7409c504b40c4962f419038db934c32688ddd2e"; + sha256 = "14icxiy0r9rlcc10skqs1ylnxm1f0f3irhzfmx4sazq0pjv5ivld"; + }; + + cmakeFlags = ["-DNO_WEBVIEW=1"]; + nativeBuildInputs = [ cmake pkgconfig zip ]; + buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Doom editor"; + homepage = http://slade.mancubus.net/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ertes ]; + }; +} diff --git a/pkgs/applications/misc/slic3r-prusa3d/default.nix b/pkgs/applications/misc/slic3r-prusa3d/default.nix new file mode 100644 index 0000000000000..ef8bfb1b2be53 --- /dev/null +++ b/pkgs/applications/misc/slic3r-prusa3d/default.nix @@ -0,0 +1,93 @@ +{ stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, + boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, mesa_glu }: +let + AlienWxWidgets = perlPackages.buildPerlPackage rec { + name = "Alien-wxWidgets-0.69"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; + sha256 = "075m880klf66pbcfk0la2nl60vd37jljizqndrklh5y4zvzdy1nr"; + }; + propagatedBuildInputs = [ + pkgconfig perlPackages.ModulePluggable perlPackages.ModuleBuild + gtk2 gtk3 wxGTK30 + ]; + }; + + Wx = perlPackages.Wx.overrideAttrs (oldAttrs: { + propagatedBuildInputs = [ + perlPackages.ExtUtilsXSpp + AlienWxWidgets + ]; + }); + + WxGLCanvas = perlPackages.buildPerlPackage rec { + name = "Wx-GLCanvas-0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz"; + sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; + }; + propagatedBuildInputs = [ Wx perlPackages.OpenGL mesa_glu ]; + doCheck = false; + }; +in +stdenv.mkDerivation rec { + name = "slic3r-prusa-edition-${version}"; + version = "1.38.7"; + + buildInputs = [ + cmake + perl + makeWrapper + tbb + which + Wx + WxGLCanvas + ] ++ (with perlPackages; [ + boost + ClassXSAccessor + EncodeLocale + ExtUtilsMakeMaker + ExtUtilsXSpp + GrowlGNTP + ImportInto + IOStringy + locallib + LWP + MathClipper + MathConvexHullMonotoneChain + MathGeometryVoronoi + MathPlanePath + ModuleBuild + Moo + NetDBus + OpenGL + threads + XMLSAX + ]); + + postInstall = '' + echo 'postInstall' + wrapProgram "$out/bin/slic3r-prusa3d" \ + --prefix PERL5LIB : "$out/lib/slic3r-prusa3d:$PERL5LIB" + + # it seems we need to copy the icons... + mkdir -p $out/bin/var + cp ../resources/icons/* $out/bin/var/ + cp -r ../resources $out/bin/ + ''; + + src = fetchFromGitHub { + owner = "prusa3d"; + repo = "Slic3r"; + sha256 = "1nrryd2bxmk4y59bq5fp7n2alyvc5a9xvnbx5j4fg4mqr91ccs5c"; + rev = "version_${version}"; + }; + + meta = with stdenv.lib; { + description = "G-code generator for 3D printer"; + homepage = https://github.com/prusa3d/Slic3r; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ tweber ]; + }; +} diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index 23252d0c48073..c5429b6c8510b 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -7,6 +7,7 @@ bundlerEnv { gemdir = ./.; meta = { + broken = true; # needs ruby 2.0 description = "A modern and powerful project management tool"; homepage = http://taskjuggler.org/; license = lib.licenses.gpl2; diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 1b3ca7dfc03c0..0deda8ce35a35 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -1,48 +1,42 @@ -{ stdenv, fetchurl, taskwarrior, perl, ncurses }: +{ stdenv, fetchFromGitHub, makeWrapper, perl, ncurses, taskwarrior }: stdenv.mkDerivation rec { - version = "0.8"; + version = "2017-05-15"; name = "tasknc-${version}"; - src = fetchurl { - url = "https://github.com/mjheagle8/tasknc/archive/v${version}.tar.gz"; - sha256 = "0max5schga9hmf3vfqk2ic91dr6raxglyyjcqchzla280kxn5c28"; + src = fetchFromGitHub { + owner = "lharding"; + repo = "tasknc"; + rev = "c41d0240e9b848e432f01de735f28de93b934ae7"; + sha256 = "0f7l7fy06p33vw6f6sjnjxfhw951664pmwhjl573jvmh6gi2h1yr"; }; + nativeBuildInputs = [ + makeWrapper + perl # For generating the man pages with pod2man + ]; + + buildInputs = [ ncurses ]; + hardeningDisable = [ "format" ]; - # - # I know this is ugly, but the Makefile does strange things in this package, - # so we have to: - # - # 1. Remove the "doc" task dependency from the "all" target - # 2. Remove the "tasknc.1" task dependency from the "install" target - # 3. Remove the installing of the tasknc.1 file from the install target as - # we just removed the build target for it. - # - # TODO : One could also provide a patch for the doc/manual.pod file so it - # actually builds, but I'm not familiar with this, so this is the faster - # approach for me. We have no manpage, though. - # - preConfigure = '' - sed -i -r 's,(all)(.*)doc,\1\2,' Makefile - sed -i -r 's,(install)(.*)tasknc\.1,\1\2,' Makefile - sed -i -r 's,install\ -D\ -m644\ tasknc\.1\ (.*),,' Makefile - ''; + buildFlags = [ "VERSION=${version}" ]; installPhase = '' - mkdir $out/bin/ -p - mkdir $out/share/man1 -p - mkdir $out/share/tasknc -p - DESTDIR=$out PREFIX= MANPREFIX=share make install + mkdir -p $out/bin/ + mkdir -p $out/share/man/man1 + mkdir -p $out/share/tasknc + + DESTDIR=$out PREFIX= MANPREFIX=/share/man make install + + wrapProgram $out/bin/tasknc --prefix PATH : ${taskwarrior}/bin ''; - buildInputs = [ taskwarrior perl ncurses ]; - meta = { - homepage = https://github.com/mjheagle8/tasknc; + meta = with stdenv.lib; { + homepage = https://github.com/lharding/tasknc; description = "A ncurses wrapper around taskwarrior"; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = stdenv.lib.platforms.linux; # Cannot test others + maintainers = with maintainers; [ matthiasbeyer infinisil ]; + platforms = platforms.linux; # Cannot test others }; } diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index c43ec5efbaff6..ebc951c5bb931 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "vifm-${version}"; - version = "0.9"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"; - sha256 = "1zd72vcgir3g9rhs2iyca13qf5fc0b1f22y20f5gy92c3sfwj45b"; + sha256 = "1cz7vjjmghgdxd1lvsdwv85gvx4kz8idq14qijpwkpfrf2va9f98"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 2d2c2e2bff257..c783985d505df 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,15 +1,13 @@ { mkDerivation, lib, fetchurl, pkgconfig, which , libtool, openssl, qtbase, qttools }: -with lib; - mkDerivation rec { name = "xca-${version}"; - version = "1.3.2"; + version = "1.4.0"; src = fetchurl { url = "mirror://sourceforge/xca/${name}.tar.gz"; - sha256 = "1r2w9gpahjv221j963bd4vn0gj4cxmb9j42f3cd9qdn890hizw84"; + sha256 = "1gygj6kljj3r1y0pg67mks36vfcz4vizjsqnqdvrk6zlgqjbzm7z"; }; enableParallelBuilding = true; @@ -22,10 +20,9 @@ mkDerivation rec { meta = with lib; { description = "Interface for managing asymetric keys like RSA or DSA"; - homepage = http://xca.sourceforge.net/; - platforms = platforms.all; - license = licenses.bsd3; + homepage = http://xca.sourceforge.net/; + license = licenses.bsd3; maintainers = with maintainers; [ offline peterhoeg ]; - broken = builtins.compareVersions qtbase.version "5.7.0" == 0; + platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 838043881e44a..d807e8eb9ed50 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper +{ stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper , enableDecLocator ? true }: @@ -20,7 +20,12 @@ stdenv.mkDerivation rec { patches = [ ./sixel-256.support.patch - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl + (fetchpatch { + name = "posix-ptys.patch"; + url = "https://git.alpinelinux.org/cgit/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; + sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr"; + }); configureFlags = [ "--enable-wide-chars" diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix new file mode 100644 index 0000000000000..dec861009eb4e --- /dev/null +++ b/pkgs/applications/misc/yokadi/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, buildPythonApplication, dateutil, + sqlalchemy, setproctitle, icalendar, pycrypto }: + +buildPythonApplication rec { + pname = "yokadi"; + version = "1.1.1"; + + src = fetchurl { + url = "https://yokadi.github.io/download/${pname}-${version}.tar.bz2"; + sha256 = "af201da66fd3a8435b2ccd932082ab9ff13f5f2e3d6cd3624f1ab81c577aaf17"; + }; + + propagatedBuildInputs = [ + dateutil + sqlalchemy + setproctitle + icalendar + pycrypto + ]; + + # Yokadi doesn't have any tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A command line oriented, sqlite powered, todo-list"; + homepage = https://yokadi.github.io/index.html; + license = licenses.gpl3Plus; + maintainers = [ maintainers.nipav ]; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 5749689bfb1f7..bac4a361a19be 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -98,12 +98,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "28.0.0.137"; + version = "28.0.0.161"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1776jjv2abzrwhgff8c75wm9dh3gfsihv9c5vzllhdys21zvravy"; + sha256 = "0xhfr2mqmg71dxnsq4x716hzkryj2dmmlzgyi8hf7s999p7x8djw"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index ccdbdabc76472..a44d2e477be58 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b6"; + version = "59.0b9"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ach/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ach/firefox-59.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "3a18ca13a211bc1b88fb37992b3aee43c6782d2fc5032c9ca469b28561e36dea81390e1c1d5c66d5c0a7c75c18c4f0cd65da6059969123d82a46ed10654dddd7"; + sha512 = "d0b824f7b892a33e37bc3b05be2b52edf6b3c47687179a652c76f30ca55215926278e7507db9738b057cd73b33f4d021c7cc02d00ebdc569836646de20083418"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/af/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/af/firefox-59.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "db896d865820a91e6627a6b7ef55bd1e05858df0a57f7089b5695ee9bb259c9d611511c3f6429e1d090c0bf84c078c0f5a7539a40b34566df6692a55e49f5db6"; + sha512 = "7a2e1ee92deed065ae5bda9abcb9fd35d7845ee39e1a7b58359eeca212e6d71fcb2199da6eebc38ef464d0f1bc037c650667e76da5caef74d406a060f2361d87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/an/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/an/firefox-59.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "395410c7104f398d76b69af355573c150b192fc943ef3474923f67c6d82445941b8e4908af9fe77de45f091cec3924fa62d205f3c69aa40df2dc0bd4cac10782"; + sha512 = "9bd4f6b7946d5bcdf6bc82b47dd058da80d17ac9e81ff2c591e0f584389e88c7bfebd65f2a1667b4cc96cfec008b75d31a4b074b83f69b423718321798bfd509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ar/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ar/firefox-59.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "c0b4943bd521ac1311a23f44c86d89d0a63d07aaa6e918576a6efd2d097801f1051eaa52d170bc84cb7d80869e7bbc89a3ea655436879854e9572094a91c3067"; + sha512 = "b995c3676c43f35e435d32b1f26f959e97b3996bc14817f4e32c2b99f5031623ee43319a8f7fba1491d5631614c9648ef599643429a5b9a56b85dcc604fce0d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/as/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/as/firefox-59.0b9.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "4be3a37453179f2a4784fa9df0634bd59d85dee27087d117204e6da059573c6a786a1c422ee0b7731f7fd5300b42dd42d0aaf741482f61239674ecee35e85145"; + sha512 = "4d0ab07fccd92d75cedaa92e760771b0a12e5e16fd126ca827387f8e98c147e716a7858621c99b42dfb0775baffc12f99af07ae0525a21dca750a7c0f7760944"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ast/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ast/firefox-59.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "9949ee9172d3004dbb28fef6216b7716568f98b4b52096479cdc4c85c12b0da6fc0774c6c169103b86cb3b60d0da36ed998058e86e473213a19977c4d2bdbf8c"; + sha512 = "74d9e4aba1954561de6aaef0b4c2c409613beaf2f4288a805d45d531bdeb11a44a75f9fd9158733494ce23ce37b10e9948a6907c94fdb2413ad817d6338c0f49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/az/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/az/firefox-59.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "de5d19ea82dcbe4b53f78d33474249342ec659dcc263f44725ec92b491e9b43158809d6df87a9d6c86395e5e3fbd1e09b3bba7c5feff85c4b46438fce7318a7d"; + sha512 = "85f1db5f476f5aaceac30775ed61def35fdc894a668f3c5b7bd99e85ad5fc497c6f6e681337734df2d0fcc62f4717d541b5d54ae7d1e63f2f42bb2f4079cca40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/be/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/be/firefox-59.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "97437da34da251863b2bf1426eacaea62845f00916d81db48220dca540195d24d1d890a60ec6ca816c0fa5d22966e2095afba03ec242059ddc0e3e297a5a3084"; + sha512 = "67b400a6f2ec3e15971da1ccb34ac411aa3df0bbe407a54c68d2b638248f89c156c5cf4ae58e1573f861e311a5d738f4b578a933fb5e8bf4df773d12d6276d78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/bg/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/bg/firefox-59.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a003a5c23c011c696552ed83e0672e6a066bfac9a3aa4e13feaff472cb27e0a858b0e5986022f4c7db343ab056a2fad46176be08658f0bb595deca08ec06058a"; + sha512 = "bbaaaf9376914270378802f23d7afbafd6ef7ceac3b4265eda8276df46eeebeec8df1f79cb13b008666ae9ac90d90a4723b8eaee78ac574570f794f8099b8552"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/bn-BD/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/bn-BD/firefox-59.0b9.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "404377cff86dc5fbc8db67567565cd64ce79d1a322547c70b2a210a034c5a6a0669a82e717a21fe33340f34838da2352be7615bd7752cfbd300825f161101ef5"; + sha512 = "08ed6fde269a11e6bb349930193e8f0dbebed18d67ff378a2cc0ee4164da96e562ef4d568fbd20ca449cfa5f38ddbd4d0ee5676b710cbe816c0e6cf4510af2d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/bn-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/bn-IN/firefox-59.0b9.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "dcea89eefbbef9a54002cdb85d2589511e00ba06b729574106f03447ebde36202ce70f8648de433337a3da8945c26c7834c240d64a7fd11b032c234c7e2fcaa5"; + sha512 = "605f3a23c5db5c7db771fa946bbf9a5135bddb2e64b6a9789c3451d49bc60682b247a5174059165fa295fd75d215b4ed553de54cbdf8e987b6ba572d5bd1b7f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/br/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/br/firefox-59.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "69dce79cf9cb72dc9f32db11932b8d542aaccdd96baf4b20cb425f395580db51382cb8c48338c292ced1df5ff0a83c80bf9b7176cbd9efef69a48f3bae01f51a"; + sha512 = "a49b83fe9181136b66a9a84ba94e84e2316f0cc57e58f0c20cc49f2d239e14d11c3bc74892180a61af2d7fce2527b46e753128d1a7f5a6cdd1d06f635e95bd37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/bs/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/bs/firefox-59.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fde4ad44e5de766ad5ebcace976f134fb1cffcb99669913e7d8ecddd986637c30cab3e06cacda26eb4bcfd4c7077d7fb6fe67a2eaf8f3c06f7d74cf322f4a5a0"; + sha512 = "dd5e833a3556866737955b7474387ac5f646910afd32064bbea348d7a6d37cb39f83967aec106cb75cfd6bec3bfdb17462448069da24eb90b0395111ebc3d770"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ca/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ca/firefox-59.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "17373f55bb22c42b9b3fd2b82a1e8cc3258e33c924f2afbcc6f881a928e96587e76a705cada437b5ab83478b48e0fdefbff226b65efe1e94a34b1019f6e8e673"; + sha512 = "27f57c541fe249e0e0e6319ce0f798f87355a8977cac464522a415723fe88277ce9f01a14917ac806c8a498765da9a23bbdb2a2a598e25e7d2cd902a6bcb990c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/cak/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/cak/firefox-59.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "a946c519d1e8f6e87da9524c3082248eb799e225ecafe61df145c315a9525fccc24495d148bbc081127735e301e70cb5f8ee7d44f54835d95cd0814e5b92fbd1"; + sha512 = "e609f4ec07316135db36325e68e25255e47af476b7376eb75f352fb6b8a1f7fe80b856784196ef1b21ec20bc3dc70735bfdc7a4caa39b4a226104494eae66b61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/cs/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/cs/firefox-59.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "4eb26d3c2c4e7122aeffc7a1ffb41f2d2ac91fb10193d0bca336f2a78f635b5644caa0c63dcdf4051d6863189c157fbc755f636570348162562478e4e743b937"; + sha512 = "b22dcf1bf20260d217195ec797d511b0700b99a7b25b9abe89320729b57937f598c47acc29fdf7ec9fe800263bd4bc064fd4c912f86c3a803ab85343e4918214"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/cy/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/cy/firefox-59.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "a55e9419142eefd3229835e028a05c75d10371ba079a092cf8c380c4c66aa8215825dc7959df52153c3ec90ae9fb15d94f212b5e8f5353efd887b5f21252eb25"; + sha512 = "6db8c21a38c8ee55288110bafe1f7cad35107debc5cd2969031fb2e6c99fd1c177c929c477178ecbfea9691b98bc7da3dce1d65654ca2299657322a2b60cfbde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/da/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/da/firefox-59.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "d0f444e429feed08b6ef4d559c158ee5ecb6dc6f6e18da5b04f31e27db0bfbb35b9b5221c8308f4ff83a9a895810198298580041397e39c8538a2306ec105bc0"; + sha512 = "7a3b18aaed7cb6187363d0a27613436c07bd9a73ae99a3f899fc31f44e667754fe4bf1cc5a86e18ab7c89fd47a9adc9a74caa6c5d3e4cd4859f6cf9a39518e93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/de/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/de/firefox-59.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "ac8feb9d54eecc49f7091f558b64032132aa29acd3bc6936d42c376a4dbc3d5c14a7ea673d4aad0b107be7891fb17efcfb09b7696d2201c8f492519800a812ee"; + sha512 = "8b1324cb0be071fc26165a1eafa3b0d039a5b344aaf1db243a8baba72d1287531f055f8112b78ae373e062dac2deed6fcc4fae815d81560226e23482126df911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/dsb/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/dsb/firefox-59.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "70458cba5023661bc407f291df1f2d6a1134be50268e1e07c7daf3e3f8ea14dc0ffb49796d4d63855713aed4939033a3aeba6af6e526af28a37cf7f0786442fa"; + sha512 = "80c5ff404c7c92895a80796ffc2c4277f9573ac7995c3446626492135229ff00eeb55b1aefc8cdbf4da500b8e647d6422c8c31ccc909d0f64eb30e3b70381126"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/el/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/el/firefox-59.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "6eef9891adaa4cdf02a986c03efde0766827cf41a988d73b9d68b40bbd4006713c250166d5b9b879da0b38830e3f65a007ee6172f8deaabaaf096ac7a17f2aa6"; + sha512 = "275660ce5fb0a2c049a25e076d7b07fc499a74a298e09b126fd4de69d57598b0c0625a1ad59e046411df1f30b923595ffb751364f2d1b7ff0b0e0b59b0682bec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/en-GB/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/en-GB/firefox-59.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "a89e247620943907c1b42c3d24c327fd68f1e6daf71f83e589baf2996c9cdeb2b28b5286d335c87d66a781e39001a76252b88206de03f8e37354fef64f756cb7"; + sha512 = "c1e30bbeb97e61cffba3c0a18dafaa9761fd71d3477b36e27063ab004dbb67eae0ab850e03a7fca4e01c22eea052810ecfc231745b631703b5c6e24dfa9ff12c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/en-US/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/en-US/firefox-59.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d79b2292ac77f1edd7fb8c0b1d779454b7b82b97d25bb7558ac6416df2d499a97370b537d70457e7fd9096c0087c86aaca755c694b3968d081f2211837b87002"; + sha512 = "91c4c1cd3013f7d6ed7a576fbe39dd0c4af0c7c4838e54aa712962e7f1a2fe5e08864b675060956d7608472a95eed762fc0e1608febfad8a42eb25484d8edf48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/en-ZA/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/en-ZA/firefox-59.0b9.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "e6efecdd6508759d390554775ee3201eca560bb31b468b4a53a9f2e39d059656cc2aa3b23068ea376eaa9a8921f9a6532b8325be0c6b41aeaf3bff3cf6aca5f2"; + sha512 = "8c582b975127f0a3fceec2ee73b8ce4aef316747989fe712ebb9213de004f2612603b54282b91b653301416f5d1c974aac064610531af0f4845da093dabd8e96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/eo/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/eo/firefox-59.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "eb23bde124ab1f6f169d8e7489887c4a09251ccee9b99cc0eaa6fc914c8cc239ace351245625c5cac225ee35f5c5d2839ee3286b60360c2476dbe94748f52312"; + sha512 = "4985b986e8cc467607fb9ab8577baa98084f9442d51131bcba7744fb883d0b9df8d69b6793a05da49b98faa06476175fa2997d152687c65cd108c86334f224a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/es-AR/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/es-AR/firefox-59.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "1ac5abe11415d8d2525cb7552d0d42bc9cbf1d76652d315a65916fbac77c13e839fe21cffcc9aae610a9b0d8d6e183a546c43b545bf9c81f44437adda34c3a8e"; + sha512 = "591c4cbe1bfb17ddabe3c3193bc71581c4ec14cefec028ff298257ca63e0e1778fc1badefbe3f58609b7b837a674cec80b0e7e6383c33d313193897e9ef08af5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/es-CL/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/es-CL/firefox-59.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "e1939280beefd553f9062c07c97196826ed910ad205a76b69fb58513b50cb98eec80e3350b5fd82208c3bf696806cbf8f99b755b08baed32f7357d4f09610c10"; + sha512 = "ead4b2fcb6a69485301b2bb5d55abbb771545f576fed35d373908da512a973af9cdf53d7e34135ec82c499ae6279148b7cf53b643f48c356d5514084d93b6148"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/es-ES/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/es-ES/firefox-59.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "0439ba49de9bae85f3baa1849fa04a31945448371cdfab0e34432ebd9b8de9e71d73c80119b552f373c9d18ff64714d1f29fe1c8db3a60a8f81e0d2d3c3fe0c5"; + sha512 = "780d2362def55f093d77efc6a53b1c07a27804ce571a937f2efbb85a2ab3b25195f0a95a33aecb1f45e75914db61ae7fcc4336699701d15e76eecb7982e219bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/es-MX/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/es-MX/firefox-59.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "bcd4626159388909d38377b593ceeb505c56a335c8967d5ec8a8871395134a77f639cb134a0295c6a07416daadd5b72f7ca4d3ef5ac6e09421c02d7d1982007a"; + sha512 = "487d64b959ba69da2dcf8b2be8c07be5cfe1a8ef4831206a5943d40bbdae626adf5ac4b291b28a00b5938133926c449838bac1511cefa4a20c3cd6cf7ebd5288"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/et/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/et/firefox-59.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d589915cae325e6a78cf75a49229819873a7451cab4e6fb82744e83e3c1a0476e61f75b7f0433745f460cce0a8588fdca113e2805554aca92fb33962468c2814"; + sha512 = "9734419e61f89e62be79b6796fdcb1f5da8a265d2004ccbc8372141a456fa151580811e12dc3cb16c29a7742fbd7e8c91ee8b14d4bda4f81401e945d42200617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/eu/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/eu/firefox-59.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "7fcabb04d73d485287b9dfbcc5311616d6ab7a762102b7c7a7cdc241ecb304bf26c0d2f0d8c3a7bc36579ebfdcbd75d98924689995c78452c5e73f713d8066cc"; + sha512 = "54f021e8d28c06aadf87f42d92130fa4fa841683591254a9bf76e17f10233347d30d01c0df5e300312c849b5f3b8872e3901413e553f63ae67c0175ce8e17bcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/fa/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/fa/firefox-59.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "dc11ad29ee9cd33b6c35215151665782485801bff4fb6db73e011f6cfd3935c900380d74624b180b29cefac07fd779a316e7eb4d4c806ae4a981ad249858ac9b"; + sha512 = "2157aa64ab820b2702077dcae6a9813f39f5f38a1072de0bdf81dd86344b30f2ec5cb84885d12e3e8f575755a4fb4bcbf83ee543bfbb944c3ddab4214cf387f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ff/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ff/firefox-59.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "cb38b54caf810e8b0a85a8f51ceab3527fc5bf915a16538b6e5655b49df44dbb369d356888ae5f9c13006bfc1c641709c1f5e11cf7efe16b75676e7766b93b9f"; + sha512 = "d111fb2faf6fe9d4d9b5efbd7afa5f15d820d2f3536bc8395f199ae0de39dc5c96b428d7a967edd2cc6af3c178ef86938f3e0d1c2019939fae46c10ee32b7200"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/fi/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/fi/firefox-59.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "d4aa61d1c0fe71cc1ae12718f7f1c3226259592ba7a3b4bebe78383b29220028816b2489d237119f94ff583bc1ace1f218c3831009122470a791a3681f804584"; + sha512 = "526de8bb77b5e891bbe7cee7b4190dbf2ab009f274a14796fd0ebf50d9bbffc8786b913dc5041bc5e12e44e67c669ff573ef3aed9bfa9044e151f090b83c0af1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/fr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/fr/firefox-59.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "de15b09970066ba64b56a01940c8c31593e5277d0b95042519bf65ef79eb1fed122dc2013a6d0de8e16832f75f9f135e0d737a6d9ffd72dfbe212965b1752d8e"; + sha512 = "2fe0b2b1e6ed63154bf80fde9286514e09fd7cb6d66159446003984fe2ea8a79cee872052b39ddb893c6584bba8767c1e6b3aedc4d84ad813f7c64f3288d97e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/fy-NL/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/fy-NL/firefox-59.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "3ba6ef5eaf244ff9f8049835366e904fe8e8e13ee42cdab5c9463a5e5f8523f9f0d5387dc64d980f3dfddca3e799461eddfecd8b12fd4674fcf45e10f385be97"; + sha512 = "5675c90ff4d7e34e854c51ae8ff10a38f542da4102c3f4e1d9a01b125ca5329f70bfd2916fbdb4572e86b46151e95d3eee0ffeacadf589aed33a003ee7aa3b9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ga-IE/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ga-IE/firefox-59.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "c7e47e5d37c8cbdd96440a0247d2428f8638dd4fe2fdced93fac5222e2aefca47863957efc3a0031cd6160732e1d1f4e46a850d964dad97ac42f44422927a4c1"; + sha512 = "960c5e56085f794d729dadcc1acade326941dd2ef12882e70cad516ea1ebaaf2b51377a474344a2d16c33ceb207301a85b9616c2c61ee253f9df628a790f31ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/gd/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/gd/firefox-59.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "58b306dab4cb1244bfdc2cd707d70fd600427e4758ed0c2373ffa296618406d814320dd4be0ee4bbdfd396d432a945e0944a9da8a9c44a189844b2f7d21d67b4"; + sha512 = "a0d619233d4262760612f810c2d484c6e7219c73ee5892a5f675e5b43f3f75d75a085ae26d805246dcbd93b6e715307b22c790686c06d48591d7c87d8e609f33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/gl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/gl/firefox-59.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "cc71cb150df0bc38e26313224c826b089e133782b26fb903a8ac38bed15dd67d7813cce19947acdf962f7587209e26ed1d4731abfedcad07c468ff69bae94940"; + sha512 = "b8cbe091d195065e0292f032d35320b7a8256dae389b8053d45c9e7741a04b3567d9bee1d0ffbba785d5e6280f664a239953bf9ae5c1966b0ec05f47bcc7e182"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/gn/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/gn/firefox-59.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "4b58193020a1d85103e3a5014f3ad9252293813f52d588392dc262c1a29ca0fc873f2397aeab62db493a97d96f26fbe8b753001dac97e33c203beea8675825e2"; + sha512 = "75c3a248dce6596e2615c17f4d1a322df27499c994c8ce99e17fa5e48dea4772ac88e4824822ec9005aa2a7492913d6f6c651ab603a7585a0b35954478d72eaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/gu-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/gu-IN/firefox-59.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "d39ed52652cc39bb9fb74b469d69ac4be87aa5b220b711687032d711d5d2a245160aba305fa7b3797799e030ee31816fddcc6cdec090acdc1b894c23515aa2f3"; + sha512 = "9695443c1c770bc6ede69711d1d3ca8e9eb28a2947a76a3e4c38acab9f3398ca3e10146715fc7f4c14fb496b798a5466ff2c6f948fa5b4a4ba512c9a60e4adc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/he/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/he/firefox-59.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "efe709b15dc4bfc5787a0ef1e3f1cd95fec8fb87dab188ea557bab6447d76f7bd4d543250b6b0583f08ad6c64ae0959ce3a18c124c4b510fcc7849a2439b5a24"; + sha512 = "0e0e06f07e3ac011a4ef619be65a9f463fb15fc3d554e37021ea203258b6b0aa32229d686392d97fd26b8ebb6617fbc420fa458f63b7746ebfdea4f5f3de19da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/hi-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/hi-IN/firefox-59.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f057052c8785839c1831f4c707bc78b4f416edcc4417527007de75f5c1bbddd3a4adbe76497e74741eee86de66870f79d5d0b716a0e149a9ce15ea912f4863ab"; + sha512 = "23925b04301e013d057bc672d6d7816c206a62db03afb372d78bbd3f9d38d28c74e9b48404dd89da83c802025288d756177a50d6f54c8a18a2f9dbdfd1a66fac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/hr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/hr/firefox-59.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "e8502da3ed7d93249e75c96e82986d874c461a39ff96e0132e0ad5b479bae26ebdcff7dc9cf404dbeb253c1fd63e544f7dbc1e52cd54004b2bc840b14875d503"; + sha512 = "31d9b7ceeb0e61aebb6c105c1f9150e525edeea98cf230fd5eb24fddec748b9fdf5913febcb23bdbc25cb7abb3793da00a37e2dabf78da0b6e0f04f1129e6d22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/hsb/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/hsb/firefox-59.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "c854066fb4e1117b7911f3e47c38af8d674f70de42d9497ad0a3dfb602159bf81de858d70da931370386d228de54317caaa8729e356fc6fcd8bd59199a974eb0"; + sha512 = "d377f70d7153258c1ea486b32a2b174b64f1643610af28ccea2b38b969b47e1684f198eb1d515a198e52bc1a3c9614964730352118001a6d7030f70d4b4e7aea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/hu/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/hu/firefox-59.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "586af0c143ce23b2eb67421651e537edd25af4ef08944f43956b93ae38a761c9aadbd8bf597fedbc059ea5d5e5c18aff0534ae14728a757cd206e035fa114945"; + sha512 = "21bbf2cfa8113819a9fabb571d2a04de9094237879fb853b8657138f01a258432456c6034d8ffebb37af6c0489725d5d5643220292d9d566536fd6f85bdf731e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/hy-AM/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/hy-AM/firefox-59.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "9238e5352cb87c738bf41306093c294bce00dffe0522cf44e3aebb5f1260b9898e8046942841fffa7fafd2400c05e7b5616c4e5196dccd46299a5b2e5ca6c040"; + sha512 = "353bd2022bb33a2cfd4d590e585ec8460385abe23797853fc44d75d6e9ac0bb782aa98a3e39e8660a49348ba97fcacb98531095b34fb718abd135aa06f381851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ia/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ia/firefox-59.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "b7bf282acfb553eff7e400b76e75b5b26ca1c727ac65d4db78fe7bea41da533e4a31f6d9d9c65d5410f738f21d0a21b6ba31dac465eea698a5871812c3ca44ea"; + sha512 = "d731b958ee0b847520123c29cd7aa85f05b86de3971b765245a69e8009029728e7a9a11ba48b351cf21dddb9e913b4bd690c581ae1bd4d920dc10052636bcb2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/id/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/id/firefox-59.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "50a0800c1b88ab2edd38b696f5fa47ffb68dfa0bacd566f0d43bfb3fe6e86384cd736f300520202fc2a85616c38885a5ccd9215d51f8c85bc935633615667531"; + sha512 = "1a8fa7688c4fc4683f2822e94a18bd3effee322c17400f2a9622fb8f962da1f59ffd292f580cd2592b10ce18345697bb6d4fe9cd43c7620649a4721335628a62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/is/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/is/firefox-59.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "dd59dab53c7869d2c353c002d455ac5b30491051697f417bc8c16a9e79c2e5198394c6470d2843d4698052528ff4cf8e5dd4ed77379415471512379c2cf312c0"; + sha512 = "e04ab7a86bdf3768fd6b540a601d148a9d4283d2ab084c79c0e94638dc66f021b7864e269c1dd7e1fd34f83a9023170890372014e2e133cd5cfd9fdf8e84ce0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/it/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/it/firefox-59.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "2eb4c38ec5190dbfe15c671b9c8df6bc224b6a820d3cefd88c737ee1a6a20546200fa3b499a8e9670b394d7cdbc2eec6afa0505e52f503b700a1bffd1f5089c1"; + sha512 = "170af026205cecf0adb2f1a4a98f3cfce731c4e493df7d01839989fb483f1477d239bbad4987c70e00cdabe8e9c74a0c37abbff460e132b06fe1fb04e152592e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ja/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ja/firefox-59.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "ca02dbc95eb53ca8b8e70afb539acb3d3efc339ddd0b4b4a594cf98f2330fda1bea42ba4e616ad6868cb9c1099d7fe441603b61c2d3f602d01cda9fc953504e1"; + sha512 = "d7ec1e94f5c158f2fe6be3afc358617eef421c40d3c0b0aaf1b865101538db8ae0d2863781374c355b62844ed72d78eb6e216a208ba6e227bfb2794ab296df27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ka/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ka/firefox-59.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "81b55418121cf91f524d4b26fcc6e919de8b86cf50c283c367244b1707c389aa18f969f4d26e24d1e5a2055c4bc6aac69b0692375f63c99ca8b425922cd0ed25"; + sha512 = "e8cda6ac07e488ffb7138d7bd668f1c31156518aed44374fa3dbc9008477beae620dd49062311662570dae991871eca3db9f796cec57053084246335b2dacced"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/kab/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/kab/firefox-59.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "479ea71fac233895ef1acdbaed08d5e5471d5302df06c028ee5406832d941cce2fb56eb4cfa528e07a184de1c5bd9fda91effcab4cda4e6a98ef6535600477ca"; + sha512 = "798c4c711aba504a4355620da64258ac3d0913e3d476dbde83debc6795583b38926fe6d62bb74469d8fa98b02aa1e22b3800bd15b3fc95ea3c173376753462da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/kk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/kk/firefox-59.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "426edc66d052828485f1ca18c81bc36a8b9a9373b580fd5aff135bcafba88849b0fa45d308eef80b48b459b4a251350fa292632b1e4d8f639dada9850b3786d9"; + sha512 = "1666cd700b1898f9cde89ddb8f8f95b737effe25f3d896fd16788b823035e318d8938b86dff5394767e33685bbe12b81a6354d1cadb5b74832fa7d5d5038010f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/km/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/km/firefox-59.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "d4416cec8788b988dd854382ba2ad3d8f6a47f966fd45e9639b0756135c6d7d3067b82692c5fa190d6b9c3e7f4eb02350c63096b737cb172194f8e8246e57bf6"; + sha512 = "846bef3917e03032bb18b0ac9ea6e9b22eb69c166a817baa94f599c531509c05733af152afdb3f188d697a9b7887e5c093a1c7e74d55b0e0bdf04d522aea0deb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/kn/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/kn/firefox-59.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "6e9a27b9459ce9a11b67f8a54fc962dc8eb845270d91aaaeca6698895eb4d7ae7ff760f7b2be8506599bea62077eab7ca29c2d35118cf7631e98cfe3cc0a3b02"; + sha512 = "46d362d8bf22d66d12173c16b4a841acd24d03a62cab8fec64b9a0f451e066b7d6ba440bd9dcb88c105ef1448f55c0ead828a6c03909f98e3261ac0b7075b64e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ko/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ko/firefox-59.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d31646237319080c608749425fb77a70de36689e3211d4975b065ebc6a282f4a82fef2275b42e51805d1a2be1553968b64294666c11fb7c9e857af9b09397c34"; + sha512 = "89fb9c6682e6bbfb362801b138714a243d88e3df56a0e2441b3f152be883f3f755cba23468b34c13065688a46695414988bbda3a79c87b98191c69142801d8f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/lij/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/lij/firefox-59.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "6cb52b9a5acd18df0aca62ac719e73cc2c4462a2501fc0f104d0181ac989bd54a2cee209cc3af41ad666b857e014d15adb9fbf00c18843962f7bd9ddbffe2c2b"; + sha512 = "b7e56c3b9c16365d9bf84a04aa05b87110f2b98baeb809b18c14bd5c72b18f735668607be13146edf0a26811cdd7e48839119ecb12220b204e30bd4823e8a905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/lt/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/lt/firefox-59.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "64a31dec1bddb6d0355d2b30cba9b500fe12b75c8e0b43a1dc340213ed560b005c21fdc0620334935dcd1e138a9f14f1ebb03b9ccfaf007fdc823ebde0f39638"; + sha512 = "642d8751fe7a370c1aa26c80c1b1d178c0e169739c8ce3bf2f21c22e30de2de107248af59ee640a3d9f18a64c0f88b930ecafd4c75772b0d9bc2b1276123508b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/lv/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/lv/firefox-59.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "843a3aa53f01703b848dd2774d448dfd04d4e73839117b8a1d78bd25221814182391f0bb7e3bfbbe5fb9ea4eff030fba8f7bee6730e12ca151f7ce3fc5108173"; + sha512 = "34f183861186258e27c401fbef8f88dce95c4065787cdc27c6ea83069a3b405ca6c3b6f80c69c1eddb2be655440870f5bf981b9ecd98e40b13811d71c90be965"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/mai/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/mai/firefox-59.0b9.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "b0bd010e6ec2c6e75785efdcea348a98afb935934f346aa615a86fa488d5b824c612b4ba9a1ca75a7f4e7ef75f0b25970be193ffd81fff6bdd2b4fc7989c4a7a"; + sha512 = "cb2700f60e82863e35d63b368078af80d9680ddf5ff9b9db5a9de2d669ad621cbe61d6c402a27f61279f11723779ab2cb6d366db836b85a35dcc603c63bd26ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/mk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/mk/firefox-59.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f23a48ca15f3bccece9ce771a4a99049ef843a03eb21914b57424872c6ab411732da8fb2162e59c1fdb28d54a4e51d13fef0b428db3e92f5fa87497c81b917c3"; + sha512 = "d8a1bb34dc7aa854112d1669680822eadabb4a6a0e60939e17460d55cb105f394bd7fb913c4a6883c8a8c663d9b76169dc0a7b5d032ea961a53138a9718e68a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ml/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ml/firefox-59.0b9.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "741bf5dd0989e7288c836ac738901e0a2b10eb75a47abb4d01eff6ee941e8bea28229b333ff59d798e781da6170343d3ec80e4c4633faf5f2b4c6898f7adfb71"; + sha512 = "df0e2d93c70b23fb7a2739b31ef9bfe3f6a1266d4d9aec32491e8964200375c4074ca1804d7da578039c6b34784a2f4600fd541fcb29ed3663afe54254b3f46a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/mr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/mr/firefox-59.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "fbf2226029386276defe4169b2595814f69073a9fdfa5c0748dc1ff806cade2565f4821afa3cfeff4f8cb9021bed8bb29dfead4ea6bd9e524c935d88306b040e"; + sha512 = "12631b346454c48e84a771d52d9e8c8e7eb7c310f0d0f078542070c81682834de1bd00b39ee000f5c13f2e1c91b5e99a9a47d90d65b19d26b3d32164f893cdb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ms/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ms/firefox-59.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ac405b0472e4febd43e8c725a855a6b75711637dd594a3a6ed1578f2bf042396b7f4c062efe3107db4e8a255ec02fc0eaaf5a329fc5538e5638bf3289b9cab31"; + sha512 = "54b16ae46a5ea3ae32646e113caf9533a973feb8462fc1c18667ecf2059668ac37eb744fab69a7da29b2de1145c3a8577bf5f2ed271dbde42f646c39e1805c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/my/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/my/firefox-59.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "a46de7ec5ea0ed1ae0551cf927a3d7b93136d7738663e2c7a3926fdbb50db128ce10520e4393ca5cf8091ef1f763e112115123953aed18f117d2db6b78e8d8cc"; + sha512 = "0913fe1a481f849107d38b84917e000c0c818f4cc4d58d9e0066fcff0e6535e6bb31beef8759c8d2f51d422b7cfbc69cd427624f276dbe778d1b308d9c36c930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/nb-NO/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/nb-NO/firefox-59.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "8a21fc028964d49a85e5fd4fce5c341b154a1da99bd0d7005b6754d9da6c0c7272ac2bb5a55fe4671c92288a06b77ffebb308a659ef72d6d87de894aa580c192"; + sha512 = "41ed256ec0c84c8a23e692912c8f7c9c775bfa8e9aa0adbdac9abd2e6530dbb85083147bb1bce616830b45f956b37e5de00cbe6e5fd0dca8f6e899e481ad9526"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ne-NP/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ne-NP/firefox-59.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "237634fdd47842c26175a3b9cf0c56feccffd835cdc514fd7e3108b8ae1100e258e5297677ef1e22c112f799036223569e3ed2fc17fe21ed23d5853e4f05fa5e"; + sha512 = "4367b6ad8749feab909a96a9edf2a0c2f1a9b1de1b07c415311cea1ed53d1ed3ed93ca80147fba4ebdeb3dbc1658572a374557e51ff4818af85a97ebdac9c95f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/nl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/nl/firefox-59.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "839b656dc93cfd0900bae78b71b6a967838ff01aee51d7a8223ea78f5110c415624ac893d0dfe94be3827a1731b716a26bed9b07bfc158577b54d89da1aad28f"; + sha512 = "d58aab30b306d633158ec21082a78b799f84695ddd9c86e649e5023ffd5f4ed446c86ec71e0091369cd079b13c812084487a1c9f3baf54c17a1c72bfc9ae45c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/nn-NO/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/nn-NO/firefox-59.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "f747ad8eab3a3b2bbd03788ec6104e024512d259193dadba02f4798a4933a191dafe7754fac5fa1b143c8cec35b180979ba1b7304ed4f823768ef6b0766b724f"; + sha512 = "321ac6f37195cf02d2ed5188adba5f156f4be90f2e211b1ae56e3ce580a1f59076eb0321961f4a64c125a6d4b250cf0e44e274b1c1154a7640f954855ff8c8c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/or/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/or/firefox-59.0b9.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "23ee26d90e934127d2e4647e4833ab1e0788c3eec3ef66e981de5b7fa5a98947346e07221ba6ef4718ab0eb3ac0ac14ebaf8c4dcd322a05db0c1e0ef6665a478"; + sha512 = "5f70ade64d062cb8d0f16d9ed8b950809098de5597ac414b8c5e5dfc8f055f7c957152e9009a0029f15233d3577d36b0ccbe7e0f0b36c5b55b95cbc7fa553a93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/pa-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/pa-IN/firefox-59.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f04f51e205776e552c02659c191cbbcb95b836a7a762196417d04107b7e6016d49fbafb15a9744959deee561559231fb370b51f4c583329335d350aa16d7b6f7"; + sha512 = "057718c46c7bc6137d2f86939ea259859631d2ffff51d6f3fc6e8125a98e0f1e118dec3b827855e6f5c9d04a4887f8616e1fbf9b02423e047575fa6b9bf3a97a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/pl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/pl/firefox-59.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "190a3b3300c97be0265e69839ab3bd160b9ec5d6705c27247eb8f4a6adef25c7654713e1e27e37367367fec87c113ed7c004816d274374a3e7975ac21fc4c769"; + sha512 = "23b89d7d5b2a7bf8f9b23e918bd58074eb4c6f1e3e63cc8c3418003b06de90e106dcf490fb35fd07f5d09592e824d8d1aa755c4ea9046f930f0fb5c571ed13ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/pt-BR/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/pt-BR/firefox-59.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "b3e36749ee3e88f698320540202552fadeb33ce8e29333a0c1842f2c0074d8d198dabf321e4135f976de9e88464a0afd8b7a2712b62277bebc051a2ed7494e0b"; + sha512 = "70699b077852ab4551907bcb6c0f278da6dc2ddd8eb0577577af5ef82add6262c8563c266e51b0f00a63863b43c625a3c88597e46e1a24760dcc8fcfb5a8d8de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/pt-PT/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/pt-PT/firefox-59.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "69cef4d5a6ef9868f0648727a8c58fc38e137b36a87a02c55d2b46d82cbabf6b8487a13102f28ecc08b8fd082b215fca0cdd088a0706f9147f443040e77335be"; + sha512 = "f5ae50ed82e25a3bf0ebec23ba459590c4ed8ae5ed1281ccfd12e8a0f381836137b2b6eb2e3ac8de2036f7ae71fe19fa2e39af2905370b9c7bc4b5837d41aa3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/rm/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/rm/firefox-59.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "8107c2b28d39502656e41628ee9e359b12981a53556e757011ed09c7fc53211d9974392e94d10a20301ccf3943c7147532859fe0070ced83e21f205afcd97b10"; + sha512 = "f1033bb8c46ecd72796c040a08d9f5fd687fdeef00ef7058d583a16b4c8a0fded1b453b6649b2499a666634acbd69072b04425975767d446735baebe261ecdc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ro/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ro/firefox-59.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "8a023f3d5c45bf2617fadde60f74aae3d3740f1069264891c6bdf98adb242d7ddb6de0eb7b6ba76f72fdab9a58a1d746a69971f25584da170b54424469d16c0b"; + sha512 = "bb25d1a3e2401ae384cf9295c2c61aa3d12b97a655cc45583be8baade89fbb7a5705b4603299d5fd8918c4e708dd7454e4d97ad2179a36911c0857a53b3f97e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ru/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ru/firefox-59.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "f7a99fc43cbf30c68568e3b67b1cb93f4d243720d5ab752aa289612b090285b3438912bc2336c0d62c2ffcd8fc86a8389916d62f0ea90917242b056ab89b8b65"; + sha512 = "ac15a7a92864c7e1078c2b9dcc1c49d306188edef2dc04b1a55ee2cc507cc989d224bdd20a5985d83c23bce63973031fa5b2b20fb833a676e4a1d6d46a61ce88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/si/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/si/firefox-59.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "3195a7feb306d2dd694fcd8fbfca12493dc485e5b5f8ed6ef1d61c36030fc13ea64587471bc6686a29ecb8d05e38b554412285722bdfd16f65d146d9f9314600"; + sha512 = "4c498fdffb167f4d5ce77ac3329080e5bd10766d3648d5ecbfb1a2535c9c0991399cd7aeb78978d239623b8cbf61a91de505b17644b0b4414ac26f40b8a79fce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/sk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/sk/firefox-59.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "c7279949739e3d35277e671245e94c77507096e1a8d0f25718787363bb5801912adfc2ad92ee4a6b4626bc919e1a9ecd52da4ef61f91dff3c36a3af79c88c813"; + sha512 = "8aa412871a5ec065e43153df859f340d1e2d04102ade4141849c385d9c2b051d525bda971840296210a24ee1327ffd4c9869ec1904f920f97d07a93ac67e188e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/sl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/sl/firefox-59.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "2c114b10ace20f92eeca48ef667532261659d9e604e8394d885eb75ad6885839c895311d4766969f6f9b32c689df68dbd3780049e05a086dde7cf956d92cb81f"; + sha512 = "bf480809ca43829cbeb993e1cc1e619d2306fc3784db84575128905d4c81017a397b7951878b8fce22d34ffe03d2fa3c728e4dfec7799b18999221b4b8d71f6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/son/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/son/firefox-59.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "bf98308718a80c3f333463ffa41924969dd6dddc6123132b23fe2298bfa7e01704af56eab400c12c65975c092cd4f4d88df071cb5c71c0f47b849434f1182be8"; + sha512 = "ef60a643cbab2337e2f9ba6a9faabb5574687cc588043b4f98d93a7af12d15be549cdde57ff5b1f8384fae155723023d1b5d1425951305530de0a35e765c9fc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/sq/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/sq/firefox-59.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "ede1bd64c9109a6bf75eb0d8881935c30d8a14d3ebd074e9f0b8aa300f6287fb27826821ef49175b8a1605ec9e58b14639a6738748bc6e33acbdb95c73c82823"; + sha512 = "408b87c1f055b9a53918f6bacd4d734b6129ab8b871b90c0244bd751be90e1abf7cc7c65d99ba44efbe738afd5c5c156b7e2771d762b28b227fafca3be9a08a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/sr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/sr/firefox-59.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "d2786f91ed17b225cbba148d7f54c348a6d6034700b9f6d2dd1b372805287c4d7f82b15ae9b907f035589f8fd29f2532003dba15b4de7eae31c26f06be7e829f"; + sha512 = "474e3eda5ab4f7b303c5c03b0d5750882244f929b1d1acb53f945194c90337cdf7ad7a21dcbfd9bcd4a2fc656233cf5fd6df339ed3e61ecd5194b2ac5783d13a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/sv-SE/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/sv-SE/firefox-59.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "5ce5f0abc1abd8bab2a1a22d9ff49957d258efd40f2c8e3b57eea85dd061cb1fe84377fcb108d8edf1cac0b2b450d082553f60fc1f33636c164064ceea584141"; + sha512 = "bdf7f8c0b0395d67d2440cbea97a8eb575a1991ec9821b7019b90d01c1590ca916a6a83f55c2717c58cadc4e625d9eff73ace44ef5309caeece7e7dd4e1f169a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ta/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ta/firefox-59.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "cb7ae41b395cc80010f9f327e38caa479308a1e09290eb96382b4bd9f2412aab661c5385a080106a47ee0e7cd5476baec7889b58463488fb912b827efeb00264"; + sha512 = "a77214a5fac9f5c94b46a92776a6e31d83a42e506e4d2ca7e8aef8f14e764b921309963dfedfba7e06d1173262e7d1603a69989d7165daaa4921f04cf1bc7cf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/te/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/te/firefox-59.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "aaf074a19ef45b6d0d126e285796587863c8944daa79a713fe79fa157cf6d77e25a0c1db138f5481b379cb0269e70c1654515ad38e5a88398641917772a3e199"; + sha512 = "14721ce3b33ecaf10c6fc3d6fd304bab00587bc94851a08a4b1aadc46b87fbaf1a4f7caa37b89f8068f6c15e6d94c01c73b23fb1ed80707ac3bc12da7c443ad2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/th/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/th/firefox-59.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "0dd9562d385df65c50f68a639b3e0f3a6dfc8108645d6d9c7a2c872b42cb33d8510ff182a0c2693d31837348fe0017be190bdb3979919dacf4bcf2516eaedbd5"; + sha512 = "9089175f670e061f66058af660a8380f8e9eb296a4cefe1aa8f9c73317c8aa7a0c592f0e4cad090b74886136eab0f974a2723b4930cfcbef764fc23552d53f88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/tr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/tr/firefox-59.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "e714ad21aaa8807167e7d114971458783db6903cf0969fc3408b746b5b5f82fc46c7bbf1dd93e65f9cce60db3bc22d466109ab01ef7549a36b7e8c12901929e9"; + sha512 = "073a8a0694f4b1c480731c2a673a034cb8d5293d58ba5cbded74c96f39ecc226d9c503b91490b0b94753bbf94d1397f58fc54f43f6ab06fdf85bee3f6de9ca77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/uk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/uk/firefox-59.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "5c7dafdf0639b1e491e219543993fe66230f8dfb02eea5735a6933ed09369c53b3690a3bff9e0976f534333f2cb81a176791760d35c981ea21a8dac980dc0ea2"; + sha512 = "df6071801ef922afdb91f9ce413bd840829dfaa0c984b78e61811f5b76f8fa15205636c4cae2ab024f917a4207b4ffbee27eb4bbc699a21adc5a04bed6873aa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ur/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ur/firefox-59.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2243cc3523bcaa9d6500ef1e32ab5947df3c5b233e9ffd15cf8aebbede666144dbcef7e41c997e2773786313fa05a580ee3db44cbd3eef180367ad6586f9d19b"; + sha512 = "dbdec8a48060d534cca448394b06ab613efa5276b54e1e343a0f4addfac9299991394c0b98e5b2b9b16d07ae1098c3d62c2abf4966d963cfd3ead7c0ef54b7d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/uz/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/uz/firefox-59.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "35cba02319ea1831c8a09d403f2613d6eb5ad0a59873a12ca072ec543dd85482e6979991b9b329568db65552d923800858b1218aa1f90512a243c22cddcb9a68"; + sha512 = "d742c0d9bc929654e67af2dafd1c1cfdbd0e6ca7e41944644a91e3acd01bbaea4365e3851cce964b9c073d448cae430133c675b52524e4c2faaf36b84455da32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/vi/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/vi/firefox-59.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "af3f387f85604d3a6d4cc756d2bc9f0fbfaaf2ab986a56be9fa96c6a49e23fda07a3586dc45ddec88b334d0150aa8338beb38b78c3b2a78563cf33fd2da20655"; + sha512 = "c3609513673f8204991b7a96515a988da5d858b0e1f89fb3f83014c46eb13cb870507fbf043fdad8ca16af9e1d8aa476b7bcfb6b53b08e5673326ee1b49ad16d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/xh/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/xh/firefox-59.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "607763b3ae4e17c346ba203c0c23374f698e96a43728d7aa2e5d4736555199f2db2d06ea8e5db41892b6dea2618f3e1e72ed6e5dc24e524bfc8a1d118ea4e781"; + sha512 = "1063702590acb172db8991e5f468ca16390b58937142045dfb74f32d636b2aea85dda874e7a98b206cfb9123305d896b5e74d9ff094a7cbbe2e2dcba184ccbbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/zh-CN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/zh-CN/firefox-59.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "62f570593c7f83169f1739ae4b03fddd2fcca5721e6cbe1c3f5220a57ac7e12d464bcf2bb3f4584f72e0fe8e9d0b540b0d5e0fa99d808d5673c8eb98c60753e9"; + sha512 = "9e8bbc1bf967a952c8f0236b877d4ca2b9cb6df7eaea676c243807d13e5a7d37ee9e1b9e7a62bb5f33fd0c103dfecc9569be271fa9df3fa0a0b2059cdc0801c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/zh-TW/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/zh-TW/firefox-59.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "c19b81134c15e7849e3b389f05f98f5f75938a3b4ee2d347ac6ede35dfbcf606a716e80c26e14bdb12bac3a5fa0554d74e9e93cba9ee610951bb90723cbf0330"; + sha512 = "aad2b03100adc216f9db9a67b1b191f18c457f73f6370dde6b8ddb0a20550fb8cf05807857654d7c221bc02ab34c2fc4e6802d02793b517eec7d298fdb332f86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ach/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ach/firefox-59.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "50af4a771523571e0f2567c28522a36018f8a53d80a01648d2af7c2e3924d3feb2cfdfecf85036c38aa48bd33cae7470281010c73cbabe020d9fc6efe7c6f5bd"; + sha512 = "16cdcfae8fd185c36dc7b776b9e8ae9187009993a7954a39e0241a759b128a70c6af13288eabb30217c63b8a20462ce424f66771f7307077c90fb3aaef290619"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/af/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/af/firefox-59.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "2f80f8ba2adc1d3a8a30a05d549335f160321400ebfbc5576901a544a6dde7c19152b8a5fab66e23c6083942e982fe6c236ff8545a7f0457c0e3700067d3c61c"; + sha512 = "9a6de409b160d530f4215dd7377626175e08f97d07da4c818c140029eb4bc095ae63de3cf29c959f925550cbbff9b9d4abbddeacfba25b942bad222377e25d46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/an/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/an/firefox-59.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "4473c1437b7f07c8917d0b40e0b214baf649262531c329c5bf7f1434693070cf8b6bff39169dd40d5394ef59dcb106f0023c76e69e7b48103012de4fa7f7e1f3"; + sha512 = "c01ccb442b54c66789d5c8a83abdd07681a0fb4c0a5dc89b484a080ec541364919f933a5c15d6548d6da71119e6e39a5e77998693565a9b35acbfa7fddce6031"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ar/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ar/firefox-59.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "f8f9626ace5bb47f7f4815cf5360e9e55b73e2ee8472c4f24e4c6d26cac2985f5ff56473561981354b0202309b37e2210c7bd14f8b50fe11cd9f27aa144ab331"; + sha512 = "7a091aebf08965aa6710f4a3e62f3b97e528da63674e80e06eb2040a7b3f3ff8b43205d4e2f8623495a85cab874f6f960ca1137dd8f94cbd63ab5deee875f983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/as/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/as/firefox-59.0b9.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "9f54057fa5e4307bb4e54e600528d6207a8fe63690fef4b101e9f1d73ee6efa91ffc808e2adf7883a6a77dd4458967ae736de561c251181b8586638bde29b1ec"; + sha512 = "e77170c8a24a08b7d6f1be2fa33ac5517f1ecd2782bed6d27994ff81f95ce9c2de27e3f3f088bee402187fbfe5429ab697bb34551caf7d61ec9563357cbdcecb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ast/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ast/firefox-59.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3055bdd5a77f86aaf34ae618200834fc0b63469fe2c5f0c35b66a549c58e15d5d1e66e2ba772fc2ef9f7c8285ce3b642913ab40bf9a2bc0f9bdf42dc70daa5c8"; + sha512 = "3955b2ef1d58a67f9d9adc069869733864c7c97daf5117297e02750c81e67466af2ffb6e18e349bcbeecba27473313018e11cfd2bfff9d98969c761bc741a688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/az/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/az/firefox-59.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "8e025def60a934711f4e41246d8f1fe5dc3406df1ab2e3b6495a29d9a76519fb7cfe1b43b5d8cfb8f7c8546d3ebf66298502e44aadc28d001ceffd6439ff2299"; + sha512 = "71501be0ccc1692b848783f532b9465e611a0f3f86358a8623f0ada5776a57e44d11a6cc4bbc8676aa25b3d583bdafcb48532a4315732b93a64aff1ed4915810"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/be/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/be/firefox-59.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "b581ff43eb98fcc606e8f70e1eb794ef63f22be03f2495507b0a08210a672040d9db8ab87c52073de099666e828a65bce91aa86f3722ab5c3230f00f5fd52556"; + sha512 = "dd460bae5afece025c2cec2dadecd007ed3f336419e989a2d62d9d6f10747e4c822cf409fbfc9f7320884f296830bf2fc31589d6b9c168276883af9365a2b42e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/bg/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/bg/firefox-59.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "5272200ae8c27912783f5fa81188fc5bf8439bc57fd72c560e798f679f679ac8e21a8fc0d1e00a89f1b82125be100308b65d2fd5dee3e5d93353596a11869bcb"; + sha512 = "edd8c95113131cc48b165ee0b4152885b374b4b01a2ba12d3b63b6640a0f14cc3c5d788d7ffcf1865a3a8832d62ef71c0feaa22b980b2e98e94155584cb8abcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/bn-BD/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/bn-BD/firefox-59.0b9.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "ac3f2322889dc4f6a8fd73c8b627a616295c00ec18924636b2ae2efdfebacac614a21acdfcc7874ea760eb356363d46a3f081aadc21426a45b298bde2981d494"; + sha512 = "69718622ed47a50a5f58397097515b1bd349341a816d9bb646bd40bd6ad96a391379c2bc593cb6fc11c253a2a9da7924db7adf702f90e0f77fc5b4de68f47f62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/bn-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/bn-IN/firefox-59.0b9.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "9944a84d0af70dce2d0ad45201daba1c76984fab4f0ae1ce538d1be2d70428fd09212b41541ddfbcd0f0173ba8e57cce033ab657a87747000511cec593bb692a"; + sha512 = "5c69514b6c919e9fb53f1f13c6e13e79b47e4169fb91a532101d3878e5401e88f382bd965f835f152e6e6c4f0723e2e604d01d85b58cd58ec72042ecdfed01d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/br/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/br/firefox-59.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "cf600ee3b064459a932e2fe4cb46fd15243e9770b90426e579f5042feb0946a6af77647925b3c90c5185570ae686e8d9fb8e33573e8d464b0c67b15c1e178f41"; + sha512 = "67844d13ced74f4916ee684acd5f40af391099141721fe463fd0c781966f16be11c04be1d8d8f1128576a3c8987392d70d92dbc6028453851be0473a770a233e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/bs/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/bs/firefox-59.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "3d7beb15a28b46d50f6c5ec7058519acc50ff37a1a806f3ec19dc45212c970a25a2c6912cfd6f10bec3ba9868cb36756557d01e97be46227f7aeb5a49218ae70"; + sha512 = "a6342c9dc7f10c10308cdf8a4c974661a9aba90fe88a8de4945b438ea44a404c0bfca5af0ba361026a275e39828b6bbd4fe4fa7edba292440816b076b630a927"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ca/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ca/firefox-59.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "bd980ce8afa64cdd8eede8c183bb286d4c799663007e4f9bae99545bfbbc22a1f6e7fdd52ed8364f97ec1eb178ecfd703726a03f8af7e3450ee112c49d1f3d76"; + sha512 = "44d001522f432884aa9a8aa9ac85244bd74605be09865a72a15bda297a2cd9b80c8380842bd6e85d444d9d3e1c518942e47ba58641146dab2d7d17fb2bd8a377"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/cak/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/cak/firefox-59.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "2232425a6a80c4248c0ef47c16a47af60c319e3e63b3607f25f11f884c63d21710233b048ce9a34df248e8d33bc35e188752a0ffd2f834bf5c87dbe5bd44191f"; + sha512 = "8f9e1a6d100a98afda2e355ac117839a196899356aaa47881ef0fe4f236a68f6fbbc1446c6ae03324d05d91879791878ebef40341d133ef9ae55a0478663ac5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/cs/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/cs/firefox-59.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "0826a880a40291fd9648fa01129a134945b146b5a50c841ecad8eab4615c0e4674e6d81cd8990f0732b5d830bbc5fffbb54febdd43cc9050a35e99b133587b79"; + sha512 = "26110672c5f1ada5a26ca2422a1c42c44579a8d69f612a628993bd0a7bcd7bfbe43e9cf913a010eff929c159b3eef4d4e7c4e165d8f855361fe0fac6934313ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/cy/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/cy/firefox-59.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "802643ddc521e3898de3813a1fe489682d129147dcb9c3ef0b4e2bae1b80bfbc80ead1de49bdf1c6eddb7cc0e012505915184957ea55a750a7a0874278e316e0"; + sha512 = "98fdcf7351cc9d0b2e856200bc188ba0915012ef69122ea6cf7404cbbb5781c57e45632d366d2bbf71b1be2600152e60a42b9831cb242ecf031f65d869bb9f01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/da/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/da/firefox-59.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "a49d1e583d78692ffc2510912eb30a78169809034aeef77442d830b3237173b9ed915de7b642aa3b9f36866deed1ed336ef0f90cab5c0253e1a20221599edf5b"; + sha512 = "8d6b7f0778d0cac258374a1b74cf48c899d68d0b6ed8a4a289ef5b4e4ab704ba29c692ed33933c785b91dcd5df28afd8ec998825c581e669b6ed8997f12bf46d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/de/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/de/firefox-59.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "2d67605da7337dbffda4cde7e4390aa194e1639f657f5b1e27fd857d7643f5b87e930823f337dd87c40601ebc07aa8111f2b98d273a105f20831a5a6d6189656"; + sha512 = "82f232d47ec06cb7497b5ddf895c838ba3a74c19cf3438a70486bb3d1a4fabb6b283b6a193ef34bff80f993552e04ca2b94b130100b42d47f1609a4af16a19dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/dsb/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/dsb/firefox-59.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "59d28e4f25b287757d21ab27b057758b93d5b2138303cdc5d64050ffd56809f1063423182c1e523123d24379019cbd4f8f1e7ad7b5afe4f86fb512bca172921b"; + sha512 = "f0f647ededa2848c33bd1e05d9d97ce606b93659a74abd24fd8cd230f4b765606a519f123b944888fcb3c9de2764bfff580739df71d683e000a9fa799976329d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/el/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/el/firefox-59.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "09efb6532ccaa2e18be96fa3bd284d8f9b707c388cc8c37a149cd08b427a93dcac8f1d95fd554bfdf594d0ea58a216b938153d0078999f475b80cdcd4be0c7c5"; + sha512 = "e57db46a1bca9715219e57c64c631855b31c77a111fbd727c546655df250c9edba649627aca64f51070e5b0c590469b0fa24b028e12311aa905dcff27105522c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/en-GB/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/en-GB/firefox-59.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "d1f3c7634e4cfac8e4d59bd5a68acfd272f4f4d7b6a9b300d635b8bbe4eb168eca5f7fe07d49aba5fb1695c11be45cefc33349444a49029fc42d9975baa3ebab"; + sha512 = "300b2c6a04188660e3db120ed7e7dd9ef7f1b862698cb67eed0bf679e3b85abb1eb0b4b01d615c9ab48d4ce3c399f905c291f74ea1ac7268da15cd6f78bba4d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/en-US/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/en-US/firefox-59.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "82b9c2639a38642e9e6a573a23b8d4f104254006bcac51d8583981baf685c4e2afe2da71783fcc8c6396788b8d0b27c6cebd016894efe5e5deea80a616552c04"; + sha512 = "45a9aabdb3cd3eaa50057e796d3878fd54eee6ff5a06ae05616467614add5395adf002b8eeed3828723ccaeb09ebe50fb4da86d32e891edc7f90d34c67a27d60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/en-ZA/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/en-ZA/firefox-59.0b9.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "d3d59ca990a5b2797aed4a8b69aba6ffcfc93ae56fd7ead3e66fa6c4aea89d9417eb15099afd9725ab1b347670a67b8ac4c9e10a717fb5648b11fe1fe17c1e74"; + sha512 = "003228e421cb69e4a6d14f357f85f024857b0c685aecad342cd8dc603b26f77db68d8faf20aaf78cf8600abf55881c2dd7f475b213a4b40059df877647077b25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/eo/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/eo/firefox-59.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "f7070f4af84c7077c9c64f7ce9ca4da8106e46b0061cd2f18bf477a196c323cf0a0561bb4ae592a418a899d1091f70e8510157d16fe5ef06cf108930b7187c7e"; + sha512 = "be38114d551f5d38b15933c53bd5c2a0f14a7b719210f71b9e2bc73e5cf35f4ba5b88e75e516732335c18b7c38ebb1c78c0e9f2743f78dd45b631460abf02e74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/es-AR/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/es-AR/firefox-59.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "e29b8c845eefb189afe33767b413d5fccaf38db71e8abfeb8e5b4877e54729e816cdf5d5a1458dada961636accc079c13cac01625a8ca7b722f0defaf85bfaf6"; + sha512 = "3d4c31b75cd52ffa705d9f4eece4d0162ab002be4b9a6934668be98f60c4a1cf1b697d052a1355e5977f4c86dbd6ec0bc1de015f06c779406cbc0486086ee095"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/es-CL/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/es-CL/firefox-59.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "1ca0c7a0d768f48f214f053baff7f10f96c17687cb61cc2f0a78b9214f0dcafed1d2cfed5c086465f99c6e0cec092aa1d617f311e1021a258aaa5eba9f9981e8"; + sha512 = "ee03cbf35b4c9f00e1c5fd91437e8fa5738e96de02b5b98498f8914aa4f97111e07b4e5fd9b07d19e56ea5038521cf8946c95cc8a0e1964c41c7ec3b3525b315"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/es-ES/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/es-ES/firefox-59.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c0a12ca65e1e1c023092fd9a75dc6c959094364047d6e627ff33ccd8f613d005cb2fc08dc22687dd9f52998cae6191c5a7ab8ea75009b6c9f0fedd88c7db740c"; + sha512 = "8173a9a80a281c933bced8c7eeaaefeb131c650de6af2ca4694a5e5eb4ad7312ac99642bb7fabc70d5652bacb04069927ff76d11a7f765fcd1b7292243a62f97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/es-MX/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/es-MX/firefox-59.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "7341c24a0bfcd29ad57108be3ab535db79fdb65e43de92d87b867b65e122c4ae25bdded92469697d9b0656e6a4517c01b98318f8bc31fc265b66a77428fd5c7e"; + sha512 = "c5f92fae20e0220e6a2cdb158e266f0033ab7edb21c1903c17b722e21f2c0a070fcbca94c4f204a7f818def8fa6ae6429a20b9e63d9a5544537d0744d551b210"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/et/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/et/firefox-59.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "19af1a005fe57fb038525e98b5b73a9024ba79c0027c56b55df085a4036c9010d14c268ddd09b6f3db81841440538421324195f2eb44e1931c41e530da93b978"; + sha512 = "d23400c74303899a05b4fd8ad27337e8acf913a2fd1aedc6cee4d3f0650720f4bbc1df9a723579120ef859d4454a290a3e1607803be430e6e8f41e2bfebe4286"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/eu/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/eu/firefox-59.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "1d78b098217b562f2c9b6b6ccb06d0658e6c183e336b47d3ebcd4bce8f6859aa7767258f612454ba0bbf6087e7c3b536944606ea0add7a7cd5467cdbbeb6bc29"; + sha512 = "77d6836b724f41382e11c57f940e35c6e78127e1bab2b2dddb80d6f3b9b92b1a1c6353e230f9cdb743eeafad421f05b0f398b0f15a6f09330dd2d7191bc0cd3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/fa/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/fa/firefox-59.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "7b587961e1bf0cb84c80fbbadcda8f058168729e1c6daf9ad3b30753414a29462c82aec6217a3fef130e59acb4c6b7b65d29d1ccda2f50cf53b510e53580e68b"; + sha512 = "8d3798658ebedb5aa8240d69ccd838bdf506bc6a8b1d916846b5aaa2f2d02e75f871e7efcca416b6729756bdf024c5edd6de60abe1720b70640db9881c964431"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ff/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ff/firefox-59.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "aa7caf7b0d54fcdf84a3a493293a9ab84646d3337d6b1032598f27aa3affc340446bd7f1fa69cbd613be003edc17cffdfeebbf7cf3c11b68239a77a46e25ec0b"; + sha512 = "9d19ad35f48f9d9c8e7df2f1ae31f5141f89b69f77f9e7194d551763f77259b763bdad5c88f1b02fdeeccb96ea8e18022faba9853ee58c4749e12b220044d88c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/fi/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/fi/firefox-59.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "de9eb2145a68b693995424335c3e96eecd4ae6716cb366ff341282d8e6fac9d1506018c87ad285637b29b2d607d73a44bb15e024866150f5ab99b57affb761d4"; + sha512 = "1b0c74cbf7cbcc6c4711696fde9d292462acdd3038b4fb95f8ebc3d8d60efcb6bedcf4b7fa7676a31bbcff5508ef4b6c7ecc5e43387e55c7a7b535d37d1a30ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/fr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/fr/firefox-59.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "6880f1207359bfd7d2be69416aa6a668355f6b9776eb69a8f93f8efef804d8a5aac984fedb553c8564498c0a22dd4d9011ef968502c7c5f142f14c038be7b8c4"; + sha512 = "71aedcc83cab05936a3f5a1108969720da1bba80c3fb69da91121039c0de6afc7663b3c220bb25cc35bb883e47067c67117a2f231aa2fae1f3636aa31f37e491"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/fy-NL/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/fy-NL/firefox-59.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "bac16eac70b8d92487627a11a915fc6f111d1942bddc45fb746fcc04b76e199335adba858f599a8acf0e5cd90384f5f814c49242cc2bc8903ac769acb6440356"; + sha512 = "78c8de461444c1fde5344ada624255e1b384798de7b4a937a9208aac0515b9d27c97e39fb7cdf369a38b38252c800235ca4c507deeeb24d9db78b1296d27a544"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ga-IE/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ga-IE/firefox-59.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7017d19904f1a534d51bc527b496df5a11d913fc50f506af9202cb51e73adefd72bafc0cbdb6c5582cd7479042d5b40a5b73ee19466eae98758f626735b58e43"; + sha512 = "e30b5aa9815c45c890abbb08a2347b2040cf90be53b7c85289c5c44fb260ea712b726b4ae1e0e2ce1e6236958e812e96269c92d4d3685f33d0386b606aecf916"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/gd/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/gd/firefox-59.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "501af97549bfb5ddfb6df26cfa3336d6b2391d943eea4953638aa38650c58408fd554c22d17fbfd9db1675871eb77af8c409e68e415bc7c3b943497e51e38a70"; + sha512 = "e5fefdc0be186fa4201858ec239c8275a2d8c5565e86c2973175cfb40f46be5aec8bde8986868b95ebd83fb6633cf5c857704d624af23141a6a797cc0b8cb75d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/gl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/gl/firefox-59.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "ea02e0ff19b20401f62f2b65d023c3337f876fd3d1906d7a1cba8c353a16b4fbab2c135daa449b5020ba332fc98e0dc6045171f3db94f7ab9f7a65cee81fd0e4"; + sha512 = "a0c28cae5da059fa648c919542ea7b5a76f14a8bf57a911efad4a5e362f7cd92322d760caaf3260efbde334e3366c234d4baee08de3e5f85d0b58989ef5f2277"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/gn/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/gn/firefox-59.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "8fbccb828fde85404cfe8980e7620ea2c9f9378d30656c2c75b9b4d50f5769bb888fb4f36465ccc2e291a2e92b57e53bb88e8ba7123b27b9347ebb37bc6f764f"; + sha512 = "a085a51943870fa0c5addeea3d1132415a838ae004edd8ccc05f2da587b8f6fd0354300ff2a97d3e9bbcccc3e2337822a30638957566953a50f7600391e16e59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/gu-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/gu-IN/firefox-59.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "2816e1d9b7a3c75c14427049023b203ef3f183f69cff30cd0543f0993814b58429a6d3d062b991a06dd021435f97de17e85cf797423cf69fb8bbff2818907881"; + sha512 = "5c2e2c48973ff021c4549345bc10ee9d60153279bdca93b18e58518c98702e9e7a57bd5729e5235a15e191292239d0d69f2272d4f10d5bb3c726c9c332ff8a05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/he/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/he/firefox-59.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "23a965bb88e207d63db79e9bc4b49943d4db1062a5f9947bf5ba6941e4c309bbd2acb7c6e53a258ae8984a1976a28e08e325fedc786d5930095411ad7c0acc90"; + sha512 = "27c6c567a84269c64d347accd646e39504c44c7a6b60766ad9cbe1b2d5af23c33abbfcf3182fc8a730405b8e45dae96a19acbd96dc45d8b8d81b52493c75e5d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/hi-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/hi-IN/firefox-59.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "5d2e1099ba22062884a590dc3218fa94ceeb111e16ea9441b7b73911b8c93fb1f5cf4c1576699a48dd3d55e0ae460c430d388347b72de449cce851ddbc94cc7e"; + sha512 = "1a440b4588a965010455e40f9c5ffe75066a5e13a322d7b33ca579266d5fe8ba8966b58ad1a1c547ce2323f962da88aee0d8f75fb2826cce40802147ac35054e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/hr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/hr/firefox-59.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "b196238fc825486f377b5f82fa8df76fa0d958d7b7185f9770dcd66b8bef30b8b0f2eaa975ab0fb1dabf5e6d7be8d8068873108fe2b7ef914920177a727aee91"; + sha512 = "a673683f09f63c1020d0d4517f14d4333cb17f77685f1e3a20ced519a29f17701cb4451e951672bee6f473b7884e08f59d2f9e3beaaab613537f7637abdcad81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/hsb/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/hsb/firefox-59.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "15c26b9d93cc78d37059b14768173b8b55d379e48d0d134e8d33d357575062afb70614b0ed268c3aa3ca992a893abdc0dd820a22667511ff5b9d91d1718cadfd"; + sha512 = "5a85f81113a3c3cccc93e98a129b8d21e29151533ca22a0454fd46ec8f5146ae5441d3592b3cceffb874d8264acadd28c36660c5a50e9517a622522c2eda9229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/hu/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/hu/firefox-59.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "8a50a6c20791dca3226d612c39bc65d51631c07ec12210359c2fe449e4bb6340a307ff82e174094a410f163bbbbc9102f04b8c88f09e02821f06250fe34c3853"; + sha512 = "0eed12553cc29c218c89c5444b1f2bd8cc2911f7dbaca52afdf49dcbde66132d7d5b241ae71b2fc36b622d2f9eaf0de86245e5cab74a085f36ec70de31d7201f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/hy-AM/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/hy-AM/firefox-59.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "255a3f1624278bd0956047a8f58ff2c5509c8dc05c9b1be666742747d7262a34d492351baaf2bae69ad60343e5f843be07456d8de2901e10726b736704faf7d4"; + sha512 = "874706c361ec7d9d3e1730476a71d339d6bea18c873a78b420615f95d7c640fd4040a1c8e8dcc5b99f45d625ca1a7f9524c321e76d0f0300b23f97bb6d7f4d34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ia/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ia/firefox-59.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "8f32345861f5c6a4e719326bc7d6f3af2f179bb6b3e97f98b1d9f7d77dd4eea2276cd590d7fb4f2742441dcb507971165655cefa4b34f9bd99dd98b2845f2b78"; + sha512 = "28ee6c4ed8a1bb1b4c1323a41e9d1d1661317d8fb9888c0d7a0a5dd28ac9ec54742f97fb85e8cc34763c4eb1acc156be605b193d6bca7a3ce27f0b7d37415d11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/id/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/id/firefox-59.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "9be74f1f2990c0116f74e60454d0912e4ef352a3990b421a849717067c8d2000e6a2f7455c2dc3e40dcf295216ebcc3ebd3e544e185d099a52767002a08869fc"; + sha512 = "335499158c340bb855fabbc2188dc610cf6c8dfa39dd7cf8b52cef9e415a62a121c3f341dca219de4595d6fbd0feedfed16fabc8c5d69a9834d928a0a718951c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/is/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/is/firefox-59.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b6f80571985184ab274857caf365210112d244a50387179c7876560c4994c155c09c73ef6c790d1ce11c3ecadc8f78dc65d3bd2781fc25469d6b4d935d647203"; + sha512 = "594a8d34c2254234b375d92601eafbd3c15594af392798f1a39e01dacd431fc4da93658e23cd3c2e2d0f0c5677bf26dbfca0afd3a9322c65b9093a992454b5bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/it/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/it/firefox-59.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "2a2d9414242382e5b057f87afcce742ce7e1be6c5688cfbf6a24805dae87212958ede18e4572f820c4b459449dbcdd6ff865152e905ca670f2c748c080758013"; + sha512 = "c49268d4641de170cda8e24ea449747f345d4f32ebb9acc916e7db15fc5ff88418109dd6f01dd8ff648ae6bde61efe76f0e4024b5c8b5ef0460e56fabdef5faa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ja/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ja/firefox-59.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "8ca32678624f811754549dabd6482c4ce09e9733f0679fbb8f44ca3222972d702f1c1f2aaaae75fede073c21e4f457b2e4974c0eb70519f612b2ed43a54ff0a1"; + sha512 = "dc196487f3005bab86c3feb9d6b91db02429f0a19ccff6773ed79ab7539332e30a36a34c3ec973520ad877d5d6f6a060166e05ce462571eb2db206b511836c94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ka/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ka/firefox-59.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "330dfada0f80a3b762dcacf1bfcefc5eda492617547dda4360eb8ed5833532988ed0d64d803ba1a0d5f37e867250704e38d1d5c84182975bc2de6c286afe0034"; + sha512 = "fc3b491df9c014b2f8b19990e26d581dcfed014a57fcd6668d4ce8a7008f6875bf4310c5ba3a891b0b261a87faeddc0b4d076bee61f4be9759c44feaa8eb6a4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/kab/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/kab/firefox-59.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "7c264bbfc2f898174dabb33d540ae1bc5c0d3de9f4792d734634c0360d3e9415fe31968a5a1749316f98bfff15b3380887d8e550e03b2ef8a07b67ebc65222db"; + sha512 = "4bc6823f0fa52ffc4b9b8b06a86d996786666cca4b752a17ed63928f07b810f99cfe2f2edaf6dfa51be0f986a21616928e2c5cacce4c04869eadc71df83a7c67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/kk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/kk/firefox-59.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "eb39b7099cba0ab95ea57d5652737e0d911a06a7ccbe8f134d1e165bd0e275bfd2b9b5f5a7b8e2dcb8efca52d797b5ebfe88ce424a8d4ca5153b0e14d1196b86"; + sha512 = "f29c52e225abb3c9201555887d87d23e24e97634fa8dd3efed74b0f9045778c9892d23ff2e2819a5a49126cec69c9a006d456f35c7552352d3dc83d5be800500"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/km/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/km/firefox-59.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "fee1e73f4a550409f13b1e6ede1f18cef99f8b16dc62f294c9450e4e55b5f478b3bc6714ed8da7610eaf213e3180e4c95ef81ad97621c5127c2cec5d0ac1fe84"; + sha512 = "a5ef092dca22b204a1e2cb28410d79fdb04bf37529fb1b66417a7ca55ba40b42c5765a24d05af3b8b8093acea62ce8a39e9596da0dfd6e70139c5384aa60cf29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/kn/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/kn/firefox-59.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "9b7807a6c0b7cd89e402ec6b972879b08b714002d1f105b937926175d15496a4e3aed588cc247dee2de05ed36757f1de13691742654c5621c60b3755eab46ccb"; + sha512 = "d1fd86071521fa8dbbae1c458bff768def5b804179911efee344000f70473acf4a17bf9797fa43952491cc101b0c6658c57a1163d89214ccc070378d4dc1a274"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ko/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ko/firefox-59.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "84208107bbd8fffe856165da5db41cfd0ef05a683253a11cc0c0f043a5034a6477eb5f7e2a7513a319344b43dde11f2ac3ef5eb14ecce4f965420674397d62cb"; + sha512 = "973d9e47a567e9c82f156a8badc10afd4697801dfd375248d73ef425f7f7a020d0985ad771b273157b17807d2689d96665018869d653207cd7c813aa1fe397d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/lij/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/lij/firefox-59.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "b7e4daec2720f2163522f4257c3622d9a424807e2997452f50853a8c227d6672d538d03d44a59274ff1a58d6b6efecdf3cb817963adde039fadca73c41decb08"; + sha512 = "9081a2b3cd31887609d11838ebf04c7c6316efe96c922c27f7a2021d9ee090063e61ca8949f8658d53e470044aab3f730184617f07386801bc252cdb61f77ab6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/lt/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/lt/firefox-59.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "5085f82bb167ea2f9bd50e7e78b1a26a490f559134ca049e1edff7ec4797c622360fcca726229b52320744ae88f15a6d728ce50e257d0cf999d0179b2718a220"; + sha512 = "4c1ba961d6da588d82d061b2f6b1b27d0885491450ed8e8c747f2150b43c576af99a9d498ba761f7273e30ab897ebaadf62a927b7654116cd01d9553be7f8657"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/lv/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/lv/firefox-59.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "662fb0a02e1e8ba8a28d8eb2dffda77ecfd3c4da75873b5cdad8bb6d85206b82f5acb2f55ae5bcdce75ef1427969e2dd2b3f58b86017c13e2ae0afa06e5d52c5"; + sha512 = "725ef29e18cd01d55133f293747e365a055083a16a3a0972b7f3336a1bcfdb2f70ffb215bc53f95d037e3e9e42918c5255b89203e9e18a71abeb7e01a0ec8f50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/mai/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/mai/firefox-59.0b9.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "b97ad4d8093a402c957e27691b29baef01cd587f3fa2210f47707c6f846f46916d92eed3ba0208c8a659a7931aad7ed63dafcb7d41451a08561f74a62c057696"; + sha512 = "557ac856be89700220cbb91baf0eba6c8dbb99167e981c0c70caab77405f261a81c4aa51e71e2aa249d105c49a034f2bdfffbedf65531ab64af69c312eb97591"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/mk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/mk/firefox-59.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "f44ddf9d274a2e095ce3ae56edd23b379bb47502f1c9ee8e66aaac385a25ee05e6c442c173a77e9a75749d3785aa6402a76dfff8255c101aebd178de0ed43d2b"; + sha512 = "1d86dd693c51f13ce93f66525ce086b3e4556044ad757d0f1dbb2fbae838b3bf540057db249cedc3ed5a0b339fba0208863172f891155f46c0239fa35a8739df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ml/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ml/firefox-59.0b9.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "a449e12812850153caa7edfe64d58132d47690df7825b9dd732b55792a6e7842f51361dbb8e5792855336f4267cbf30a6c12c69375b0c1368155a3deb06e80f3"; + sha512 = "a7315761acf610859798613aba1152ebf680cb03d06ff4f878427fd5392014c7d86bb3e89f6e43e39f07ee8aa8a5ef9f126b206d38c649f32d8e8d3ece2b2780"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/mr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/mr/firefox-59.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "585ce21eee30af73b1d23804158490d3189e7e1b8dac0b27832fb4e9149ed62bae28b9f38141de2dfd131e4c65a2ace93d944ad0e3cdffd96a3673f69ed66c11"; + sha512 = "cb06a7848f51ba74c855c3a433361818daaf784530643e7c660883d7bbf16de6c02ad5e94681ee20784bfdcb5fa9e98bcd40554e59ba72523b4889e152d17e83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ms/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ms/firefox-59.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "d300051710a6a4a25407e36aa0326609939fbe6561fd3dead01bdf9f7987c7604089302b9343b946a896f7693deb7b1999f35a6c8146d9558ca085c602ea7555"; + sha512 = "7bcbe813839ddc817d02536840201aae2b971cfb05bfb4059727efc4b7fcf3ffb9107ed9220ec18968a0bce29cbc051d9fcd3fd122f7b988b58093afb7a72d98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/my/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/my/firefox-59.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "82d789949ddd47a038e271e38ff3951047ba054a318eb072708acc6b39e34ee878b350f87e491b8aafe9429a7889f41bb03982156fe8bbae66dd0f7231560dfa"; + sha512 = "e3243d3411bdba7602bd61eac32cb5f9f2d3ae93f524e7faf1ad506a6917c616e3d0cf4772c0676ca7ce7e6649fbfff173a3443a7281e9fae16ef527a8fae3ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/nb-NO/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/nb-NO/firefox-59.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "6e17057590b82690d7078f07b87242307b4579008a6f6b4b3c22afb05df7cc70af96c75b639e0852a1fd94b08bdf33849ddc7250cce80f9d0b6d5bea6e000efa"; + sha512 = "1c8a1dcf25c732654605af8f545aa7fc9010be083ba1306463616d69e16c1d707f5f9a415724b4fa025006783d093f58ab8c29259205ab67b0f9424a7d2fe480"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ne-NP/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ne-NP/firefox-59.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "6d0d4952b2b926d32d2b20ec6703bf989d31f44921cb7f4cedeaaf1fe7220ae82059b0412354e3520ba77c5d72cc0354d57e3ed87d61bd37e01d89cb572b46fc"; + sha512 = "1dcfe0b5d8b59e16869130103b5a8b86dab18421c66fb08dae348d74530517eeb10694744d0f6758a8b67d80892c5110067f18bfea8bbe137cb3e051fc3f6b8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/nl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/nl/firefox-59.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "4f01f262f66f14822c1f506d57ed5acae783e4108f9201e29b34b2114f1ee502c1d8cee8021cd09ccb2ee8181448a9727e04f6cf69ffb769f949a95108b52d70"; + sha512 = "63d3586ae6872e6c8d107e40ca7fb88f37dd6ef49dab4d7bb784981b4a0bc3ed660701c3b6d6785ad837d5effed8635ce9cb9424d17b67f96d38eec83327af8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/nn-NO/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/nn-NO/firefox-59.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "408c006e374b3d8d4123aef1667f80c831dd764bf0b1747addace652b01bd8d66d5cd5be1ad0cd3c29704049e253e1aae69f4dde05ba9f11011a5c9537168bc2"; + sha512 = "2b6b4178b442e37fb9dbc62fcaba972ef8d999832f656572171d5e58de7a4bc81ea2d3502e5e8b391c0de509d5013987d4ddb80852b2f650afc90a2e32b24714"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/or/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/or/firefox-59.0b9.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "35ec6f9200e52262f8320237f006b24b4be290b303d5d3222338fac1d6adc91c3c86417d808d33929ead01890681a4335b75801d9c5b44adc70be85c9f41e18c"; + sha512 = "284347f6a03bdd4cc4909ab051c265df577a1ff362877d1364e81c526b88c37ae5e124a5d2db62f2aa91825aa5ba9f478f77952df216d8216014c28c45aaaa42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/pa-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/pa-IN/firefox-59.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "0abf82d1f4fd3a1da22ce0341c57d3c2fcf46d6f051f8d76da6685e32614eefce105565cc72b019934d6cce624968dbe8f2ff47a4d8bf344f317fbce11dfa833"; + sha512 = "b740844ce2308e86d5fa17a054d3c1ae6c52925d9832287e73b7c659271f38824bbf2cc37e13687d52246f840de501d929bb86cb2962adffff233a54135b9299"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/pl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/pl/firefox-59.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "96d61e9be18cccad5f92d049afa1c0e034c5ed7c80b6618db1566127a12aa77da156c1a8a65e381f12a6be261c479c66d5cf4b0697bddc507eb4a507cd5b33f0"; + sha512 = "c6e3db290157767d97293992258bb51d7048c221bd6a02f3ad1df84034a459e985a7e1309028287f8dcfc744d05968b01d989c61dd1e430d0875e8cabd0163b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/pt-BR/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/pt-BR/firefox-59.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "fc57bc34db3fde2ab4c2521a70db33418b96c1bffa025d6cf7841048a50f9d959bbd0da5adcc8b68cd72f28bb97930984634231623ce78860b086c4e2884715f"; + sha512 = "85598285f1efeed867b684351c9553e670e451eba50d843a7e15cd06adf8de361c26fb731a53833fbcf756641a236f0ae9d1d981f1ec872f8601570b058b94d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/pt-PT/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/pt-PT/firefox-59.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "ff89521bafa15aa8990598ae1985ef53c9a5a401281f04b6c0a0270e9f6d394a09e2c5df69cd47ff602c7b6f3fcb8565932d0c59bd8f2707219e06dc1be8ae2f"; + sha512 = "bbd1d55ae42e84d0f1c0ee47c34096ce91114d323509a94703bfa5dc42186b8e7d1337d7ddd88ba67a10f5a4b25e07d53bd512d31a0cd248df1c487e3cb90ff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/rm/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/rm/firefox-59.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "b259e19fab6bf234bf7df2a17f2ee12c7d04e8e8cf64e1fe22ec67e26a6e0ba1115ad7bffb410a1c11d9f17414123c4e856706b0a8f443136bae9192be87c63d"; + sha512 = "44f1cd1e279e8d1abe73fd98688ec639cb8fdfa40484e7273fd7301974477ce30c2a49dc69508f564865f96fd70b686e1c7f1c24ad0b919113deb2769034ab56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ro/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ro/firefox-59.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "2131c7ac80966498fd673c04432d6fdaac0da9a061d9181dcca8e9b86229764a4872d39d1dab48a7e5f2c4ff1f085adab19dc961cf62813e8f3145909971369b"; + sha512 = "f1514b8d1d1ea2600241ae36b0a5f40993b781bd7f9c8d75a6dafafe11b3a87b1256f33ba8014b7bec8bd5b9fd2e52bb06ddab400ed88dd00fcadd7dde36ffad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ru/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ru/firefox-59.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "8f4bd39ccd6e71ae33c616da55307b8ce718842f3e451fe79d3a7517a6ea211a6a87aa0755e2d916e3e3b74bbf5f4935418cab4eabb397fea31552b1e758acc3"; + sha512 = "46be3e87169f3c3bd24116ef282a9997277682b6601586b0bd041314c9030b77903d8f3e2a3bff6e7cd9d73cff1394537e96aa4a46fa2ffe807ec3947f099021"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/si/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/si/firefox-59.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "78bd2a0ee4ca72e709ed227640b85818a762f836798c38cc327ad31d1677eb0308f01232580b4c94aafa7c19482eaae36af1bdf9cbbd1c477be743f0f08b12be"; + sha512 = "9568653aa064facd613bf67782fac72a4654116f7cb9418ce21f1990601416c36096694e061d941bc853dd9a2072a9f713c3f12cf5f88891223ddc4d1ef02034"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/sk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/sk/firefox-59.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "60735bd53c852cb3517434ebcf0565ae7ecd175277e1e9095ad1e017b9b39ef42bf9cd88008fbfe9db457d82f5e27d6b927362766b115af5dd2bb8bd4966cb79"; + sha512 = "4cfc9cafc1a3fbc34183634fbdeee908c6723e32fae3680101f9cd00f22262f5624116cd2e15ed3f0a1e9c0ac8c829d023fdf651d09b3aad2856b518576f1a5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/sl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/sl/firefox-59.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "bcc903cd0c1cadaa91b515d6f744122bc76173b1c526d7e534e2abe1c32776649e003911c87473837a3f50459801d7a99c3ca99dd46c06559c8903db03f5a115"; + sha512 = "741d63fb0cb28116ff03aaf89a4ac6cae05b1ee6232f3d5b7a03fc20f3c7502908b2865694d5972c96275f1bed82a9545c22ac150a176e2bc7323cd46df4ae53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/son/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/son/firefox-59.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "f4ee6fab131300dc12c4ff04d211f405b09f952070ba833da8298424a505cb1b878061d13696db55f7e598a42c92698cf474819db7ac7885fc9b54529ab233cb"; + sha512 = "89293ff544dc2426681f0474705e09be6bf764e96ce751c5336fcde5cb1eaf873ce7ca1f53324178342be901f6701405e48de75a8ee0805aef462f2948f40148"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/sq/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/sq/firefox-59.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "3bf50ed9c0a5a056650cb23aa4c4b598b56cce144ed1f3801e5024ffdb1f5a976614a876632ad0c4bc75e85e781be3d941496b2047e92405cab03abd5aab2bce"; + sha512 = "d0d1bf1409615491f999ec7a17e98d10fa25fcc16036da9c3aa6579fa5fa63e0f0e6dcb365dc5157ae763dda978b5b5219165842045142e5e36fc0d49eb14f3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/sr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/sr/firefox-59.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "47a1e0fd0e9fa4eff50cdd480cfbd74e1afa50cf5c5da01f38def27ad84c0c69ccca70ef3fa5fe93116154fa045e14f437220970930169ba73a376b6a9a85bbd"; + sha512 = "ca57a0b0f5a473a6a76a674646aee7c2bae6c957cdf0469fee29ee3a57eb05210cd9bb3262ce4239173ee9075401d42dbf52059e9bfb33e3d04d0dd65148e1d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/sv-SE/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/sv-SE/firefox-59.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "a605236ce010d83913db4ad8061e8b3993b6cedcc3f54044796e0a0d3f073e5ce5d7587081428544efd7938eccf302190313f895f2603785cc60284c16dd7b08"; + sha512 = "c65474c1eb6849834d655ccf0ad25eb914b0e93b6396a09024d8a6b4e3af423b930e9d022de0a3ce1da047455e522e7fb018ed82e5bc6586b26599e71ce9bc09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ta/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ta/firefox-59.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "9b5e7e42570272989156f48dbb22b26f3dc4dfe2298c97b1ad1ed60f0def7a886c32a7260d450776653b72793dbdaf774c05198dcdb0b1a7812be9563e0666c2"; + sha512 = "68a41fe71bcac5dbb4ad473c83d58b683790dd8a1d63a11f5191727261d1a6d1f6cb61de3bee2141286ac5820f7c7a0305d2fcfb1420c95726b418b8cf27d27f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/te/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/te/firefox-59.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "82dd8b225f1eb515ac4ff5b2fba68028233f773d04f119bf9e4181017692b72557c46a73a463834e8ed52a81b02f5501f5bc3af8d9eec84aedffb361b8ddbc39"; + sha512 = "921650bae38434e6344406d7490dbccf1186fbb243a9f14b9aeaab60fccf24ec8dd403b5d58e5e7352f95d93688a4670fa42449f259e68796600afb9941031be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/th/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/th/firefox-59.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "8b29b3b7157624d304a00238f3f49ebc9a202a818c4e6bd87596256926d0ee9047ae48db734bc6040ce6f2c94f800fc88b06a6f96788933482275c0bc1d01bbd"; + sha512 = "b9152da49d77ac480845e505fcbd422bc81ac04ace5e1cf51110cb43972b54c60eb1e08a57dbe7ce4628ebd302da213440469d3ed3a6fc8c61408e14d59ef036"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/tr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/tr/firefox-59.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "727405e1d1fb9e4c84b9ddac65bd7a95c837f2ba9239220e5f4684161a2a0e25cf8fa87c5cf0d924fe0f7ed4286e7ff6ccb05fb2041796226b346066831de618"; + sha512 = "8b6feca15b9a73f9ae2ec101a8d82cb83003041d57536a0a5fb461cd28d9a1bee7e7dfd4abb054e4944a41f5316a59f496c6bb68ad04dccd4e721cffe370eadb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/uk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/uk/firefox-59.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "3ae3e87414e521332856a9be9b6f9a7f1df08e48779693dd4494cf950eeb89aaeb552d2819cd2c71f19f08a17fa01b092b66fa79930d9de6551161adef7391ce"; + sha512 = "28fcdda0280e362942788dd87c0c5ae960a33ce676d286660ef123c344fca40771745eb6b0351843ed969f8262c4e1f39a4b28f802a45f443e20a13581aa8859"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ur/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ur/firefox-59.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "3984c7f849dd16298360ee2071568dfc9a77b2650fb4cb1c6092038144a12726d912ba28eb64f4a3e3e65b8d1221044eef66aac066f66d097b63bce6f85d2b3d"; + sha512 = "54d96e58c99716b4268f4ad4c9d2e07ad21755d793840902dcca9c4aad8a4df34d1e8b15d08627f0dc41f7c7b1e23aa6485563dc40b4b538be7d3bc7a507dc9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/uz/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/uz/firefox-59.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "6e8ab925ac86895b870797dc5ec52019f0248a7629a22838a053f9442e120e95e16007a35063e71cd30f64b1678c6542f1b2ac96504183a1ebac2843cb455d74"; + sha512 = "e3cb090eb23eaa08ed37201518e40c2375c9b4df91874fdca59182b19dd4973855795024e0cb08821d61035fad930258d434cdcf752efe85b6705ef2e92ee3b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/vi/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/vi/firefox-59.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "caf650ee27dbaddfd098288db30541392d9f54e4818775f9a63da86db1811b3ff0f4e8547b77ac428f774fa28e6b3d873f04ae196c72df5a08dea0655f26060b"; + sha512 = "cacd6f810cd5c1737082519fa489ca0b67c355088b064000dc03ed54724678231ba7586943947d1a35025a1608f938600b7bd10ada47e994d6918a29667b912b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/xh/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/xh/firefox-59.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "655eedc85fa84d37dfaec42d53088c811c6c5c4703591e3ee5b67e6dc590d5a8c4553bd460908a004cb3d287c10c1929b528867b5b0b7d99bfb7d705d1797827"; + sha512 = "305706a89783ba89a51c0d838d7e99a80017a9fe05d46376102ac7141d300ea8612982cf32762b55922645aa7252cfbb0b213d6ff3b3f0d64186c1c596d0ce55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/zh-CN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/zh-CN/firefox-59.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "1c60d2929783eaadcb02e5ac30fff179a5aca67e6a8c618dda4a0696ea70a7f82b035db2b94134fa701c4f1ec1861cac664dd7ca2a4a05305f9337cf6c602146"; + sha512 = "afea7e354fe29d301bbd1a6ca6067c37a741fcf0cdf58407b284794591b189be365800511f8ffc0ed2d4f0d9da23d2da1f06c0d667cb048bf98c4e54a8d08311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/zh-TW/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/zh-TW/firefox-59.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "110a2e0e50e41646ebb9f601905ccacae7ca1a7028e063a671cef97828ac9637eab741fef10254aa121062fc33bb6d75f907ae7e306fe755d4f199516d1ac7ae"; + sha512 = "318d839841b0bf4958b65b53746c2b4414e2adab2f84fba73638be88b1c32c74468fdfc1b626bf1e81dd1a1f5128ee27332abc3f49869ff50d02812dab71d181"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 889f19994c494..39a1a7225d64e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b6"; + version = "59.0b9"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ach/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ach/firefox-59.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "595b5d322cf2472f3e6e7849a70007f501e7e4de0bf1395518c484b4e6494333949574392655ea2df9f4f00ec6b2accc95564a76791844b2ac2a3c366e2500e4"; + sha512 = "f79f18b17c3aacc1bc94c2ff9e46f56712a60e4dd34c36032190bd566cf3f46e71f186b12b42e371e4503e03f7b601a6c59ab50ddcc5111d10d07bd849b28b74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/af/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/af/firefox-59.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "fa60ceb7ecf2d84211b763313a7491e5514f78f9765c55b95a213604b686e9da2d8b10c1b6d18e27553353303e00a04e5ae01365e2ca9be98fb7c6b45f531798"; + sha512 = "8c380fa7156dc0d206b5861ae2250e4cc7e6010975be62b369b838b7dcb0e05f3083e3d455a24698d0ae39291e2498afb32c103881084aa4e27b36ae083c4f84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/an/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/an/firefox-59.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "c9baf0badc2ec9677be906a9bd2b457987589f82f6efee189f692adc3ffc602dc961d8c539304fb63c3330064751a4bf9da7d732629181ee3ed916a656202a11"; + sha512 = "10218e9a5c7e0bae6f33856fb7aa923f5f9de055f45d57112820428ba7a20714dd8e86e4b316b44a0ac0d33a4cbb82b333a7af2e2d013bd8b393c9cc09056c9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ar/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ar/firefox-59.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "5c5b7762e2194b87c4b7f0fda75fe3975fbcfc28e1cc6aa5a242f319aeb95ca0da8297ad7d1c075c59cf580cca246712e88fe0b0465e09780b3a571a0ce02583"; + sha512 = "15927b3818137bca03604da5122b2330da423b4f3d603c82c516e12c9557427bdd3a7d1ef25157ec29720fe1cc54791de6baec815552bfbe6d8df26275d94c19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/as/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/as/firefox-59.0b9.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "68ff3acc5022156676200acf9c4497c63aa5b678d7d0907207fe1171b1e0ed48da929338ceccbe841866c9e3a17d156f7da55bb2ae65d47774dad5044de4f3a7"; + sha512 = "dc661ec289c3a4d047e149fe2868c0c8a2a2cd8f8de9d4aaec9d584bf8a11573e6f45fc9d7abafde0f6be933a49420d5b6ddd34d5c2d3bf4582454854ced4e03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ast/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ast/firefox-59.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "dd5e47f5477a4024ecf501e74175224c9494fd28aee3fa15dff5e04db6f72bfbcbd7514085def809481cd26e0d158de03bd02dc59c2c054ab82d8e0b18409642"; + sha512 = "f4d56be3eb7bbd4e64f0c563fd9cbd22d97c9fa8bfae0e97d99b5de481be3de5c7f5b8c05cf760ef6059845ed53b91cca792ba36008d17731ffb9d6341d7dbdf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/az/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/az/firefox-59.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "2f78b1459d80543b7bdbd402498fd401394785dbe7d8e11bbbb04c96dea25990565b95786b2204941628f15fc8105f6ded439a00b1a0ff1d010df2e86985df87"; + sha512 = "9b11ccaa42f898aded3e4e1c64f5c3bfc85a39674d02b4728eff783f1e053e41041ff0415f44c992c9c489a92ab97381c1899c6656154d9ae557fd33a1af5473"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/be/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/be/firefox-59.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "b1f13f7fca082ac33fb64e177089228864a8d19e0eb02e21915126213039fa8ec6396ba514fbfa0029fdad9481dd26d513fa106553aab7be69879c93bfaa7783"; + sha512 = "abd7441d3d66670bedebe288770f360705054b1fa9c3579b465d58efa2b9a8849c9388046c108510af862b798000f48f44e13d11c9c8e8bcbe88a0671a908675"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/bg/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/bg/firefox-59.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "73c15deb8b3f9beb26c446465388fce708b610de2735036ab6fc80cf104e9fb440c6745b497e72bccaa5a61e2dce6edbd0c69d841528d0ab4678bbba5adb296c"; + sha512 = "0ad70dc2d21a3a62efa55125715c888fbb1809016c53d9718fbb92ddf5cb1874c092f50ec556b00a20b65404936bca520bf9206384941cd2428d1212d007781a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/bn-BD/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/bn-BD/firefox-59.0b9.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "f2ba031b25cf93c7da7048c58d8bdf4d8430c42dcb082627b9b45b37ed2ef924110edb2864d876dece6a1326a3e24ff0502f51077dd96140e760ad63f858e9f4"; + sha512 = "ad5547a09ab746f0c547b5fa4ae2b07943b833bd6076d80a3424c044a9a45f84d8054f403b4c6633cff6a6ba96870e8bad8324608c8a136d46330a2b983a7e2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/bn-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/bn-IN/firefox-59.0b9.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "defa9a78675a42778b18f38ff447ef5b81d09ba54f174133913a072347d96b05c9bc637c7fa0a81014fabe7f11a49d6a366437fef37459276bcca764487c7cf3"; + sha512 = "8116c0f47163f602ba7088be28566c6535be319e4573f471f4eee4ab3519cff34e283171d50b6d3a594a659c6b4b0b383255ac4061f08fbb036d562ecbea60bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/br/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/br/firefox-59.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "26fd5ae4427c44565f31ceee81fab2a6d930afd603cf60342d8400133e53357f5c1b1b718ae8d8a1856aa67d1bd503a1b4527c2a1aff0d089d941f30071db251"; + sha512 = "aa8a1a667f01ad5049cb85c4c7add81ad9b164878bfd13d945ce1ea44a2cb8e262d5c9d0a959497695ea6dd9dc391c40bd3777fc0f6f90b6ec402a5f0f0fa8a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/bs/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/bs/firefox-59.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "9855150263394d24dc25f40384b756906664491c84538572d467304dbbfe9151a82a0d7aca0ac07e952ba82765c2042ee5fc4a47d541b4a8f7efd5879c4ee75b"; + sha512 = "666df119858f714a9602dc7d6a0a658ebf8ad24a32a9b44d2b3d8dda61735adeda5785ad143c1631e42e8231cf7d34e4789c512ee644f16f5b060aafa97a86ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ca/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ca/firefox-59.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "369eec4c1e5f56aec23538cec89b55f9706ce7adcb06777472189801c4c708cd0f38ce5741bd1b06187aa1fa71b5f8682ea8d1a2675b5404f4fec2a124f3ec7e"; + sha512 = "fb706397b98a4fc538561db01cc7f029de8bf6abb95d438ed9313c96fb6a68e45ad70926027cd2b4722f450d42bede3ed00e1681d94dde538f42b39955b35494"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/cak/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/cak/firefox-59.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "42fcab30bf9a3706270e531fa91e7e52e6a0cb6eaa05b53b718b4708da1f1014a27ae94e5bd4092197565263733feca589cd6beaaf0d47b758f337175dad2e24"; + sha512 = "6b535fc25f2756b100f00c60b12d9eca3f4972d5d02c5cb2ce7f1c2e2f3b4675c36ef99e9bb227101fa6e50e515f0608dae9c901ffed08a8eb75d1da2ee74e54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/cs/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/cs/firefox-59.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "80cd387e50ba97f387c1ee04b123436efb02aed9eb492e5a91a4a78bb70e20bc0893a4f646a339e470e830910e5c0d0c34ba09725957ef033a6c31bd6e4c2af8"; + sha512 = "c657a938873bb9af219b7328546621999077cca6f5d71143d55ae34048714b0e3a296c1c0f44eca499f22d54f591758aa945478d28eea37b662882b10b9a70b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/cy/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/cy/firefox-59.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "4f4be4af205e9b04b9ee611bafa936d2a8f6c9bde2c5fcfb865a8e2d065321713f4a810f30dc1432b35adf736e95d3b00977e029ad5dc3e26c0a5e03ab803ee1"; + sha512 = "38037a46300b824625e356e41aab2fe98f99312c763ec0e5c0423273018c1a15744da3f4b60f9ad8877711309ecd3eaeebfc9f39590ccac239c2e05f4128bd76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/da/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/da/firefox-59.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "912056fc39ae349a345d541ced2ae8959d02ccb10a4c7aee95a6c1ee5c854a5fb73fa44a13ef6ab51a20d882e44711d790f0f15c9b1cb07fa5b7d3d5d36631ca"; + sha512 = "03f4a4946328f407dbd0212ba6e9b54119d23bd7434af2cbcc3cc0af97223e7681f731f54c42643db612d728d70fc564da1e78c459c5afeed3d794b96ef1130b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/de/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/de/firefox-59.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "5acf637b84ef5f98e5f8156703576e24880c8c8041bc8f5474cfd4331c4de8a104adcce4d127c13720f17105bf2635facec4b5609ca88a7fbf2ae662ca3d3343"; + sha512 = "aed265b3d00c9898b373669deff951fb5622e3d4519ebf49123136e3006abace922f28019ef3ce669b80ddfa8a2ae69d4a8a5206ff31c6bdabd647c2922d8731"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/dsb/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/dsb/firefox-59.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "33c88b9286dfacdcbd2eef4e2ed380263bcac4ceead661a3f49f16610f19f2dcbef0b4ca53cf54ef898b807568eb2a72a157477b134764f767d1ae64567bfa13"; + sha512 = "81672abe102040b86bd0bad90e054e9372f56ac0239d8a801da0a6961c1bdcfe298bc8f1f6b458d22ef41d9f1e8178a4e419121326195a165d1b7d48610ebdaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/el/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/el/firefox-59.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "f7e26ff1e985f33ea23fa10b7917ad5ac25992653050e3708801d0aa1949fe5a9c8829a82f5df061dbfa0cc642baa65bac3a1d1b52dc888f72aecbfabbb51b6e"; + sha512 = "a2336c16140cfe5665661a46641441c72e84c0c6bcec1455af4c33ebb504993efd50cd7ffc398f66e14c26d471e565566835f2c0b6be826b0e2b1dc4470b9b82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/en-GB/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/en-GB/firefox-59.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "769a867c351673c95ca1b57a72eb1138be5429194f37c40d741cd839896124f9272a835edb1801e1301c6a384619974317ceee4ac3a1f7c710a388420b0ac8d2"; + sha512 = "888e5c0d0ad754857f9307c5bb1779a16081792925a535ffcb2788f78aa571a987d2436e43b66e2ea22d4ed33593f51e9571bbc783c8f05c3798272e29e8e66b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/en-US/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/en-US/firefox-59.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "7a843b23ef5bd8fbfb12ede433ecde84e7dc12c212e1eba4cc6180b7794e7436829096ff7dcaa22d44496898240769ddfdf590ae846b6501fa4476b33ee8614e"; + sha512 = "51580f83eb2913d662faa040f5c9c9aae0ebbe38a7f36b641f740e6e1898a5d751b053a5b876fe1680ba704c8dcab5ac0c2228fc253215aaedfba30a3a6ce5bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/en-ZA/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/en-ZA/firefox-59.0b9.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "8499792422ba7561e28c5841b4b78c63ce77125a2ca4ba961e50144173f00e36c506521ef2fb961d6bbc79b6f7b0f5ea8295da455d3c6e9eac371541362bf794"; + sha512 = "743bc804ee7bc38dad5453a4749d34bd838bbeb1a02b9ba25d06f4bba511e59a3f4fd90f7be8a35f418544a96786908730c417e5c560605b98f35c80a79f30a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/eo/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/eo/firefox-59.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "29db43bb944e5273c8a0b20329e6690a79d244c963f3da2074293f18cf3e0cd0944cbde10ee4f103a7d3f1a6ce0333d999b2307d14270c0fdea1b2ed584aee6e"; + sha512 = "75da101a6282eb49362d6a6e42e0a2a88ba20b408bd6bf55914ef87e4941b01ab1dff5619c54545e0bcd252cbc7f7d6fb93723a76750b0d7a12423865f057c3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/es-AR/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/es-AR/firefox-59.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "9171f4e4cc61b6515769b38d6e0e8a2de883fc3d132ab9e51f75f25cda47c16cc677a5f4ef4806c00f1513c19633358f6d4e47c219a56955923e045918fba41c"; + sha512 = "bd95836ecb1aca653ccc086007fd745138cc117d585343951ce633d4b5c55f692c0ee7e8ddac51781bc0ef3cad71d4a3880b080c89644313092913cfbcc39e93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/es-CL/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/es-CL/firefox-59.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "5c9f4059f809273a35e039b1bc439c22623b1340f148469e878590a95caef6efbbc37910afb1b6c203b4f0f6f757aee98f9bbae92a777be88d8974e71c6561cf"; + sha512 = "73d5da905def6a1b48e3dedb9b50c7a38feae0ec59523707f9bca9aa31824b820809cac27adef4814571a0edec279d8ff5f4ff1e3d3e0dc5eeb424e0da1bd06c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/es-ES/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/es-ES/firefox-59.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "bf95d16a2cd20732b99c31c72021b1a33d363bb6236eeda3ce39a6034db85dc20706f10fa9f5b99a59344919476018ce00e85b038e6675b21b8d88e65df37a29"; + sha512 = "21a23ddf2d2e1fe71404607b60add5437f5ee604404777b105e82ad425f780d27b879d049ad6d8dd4b7103d1ec77ed7a777981846713aec7150eda6fe3ac001d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/es-MX/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/es-MX/firefox-59.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "3746486e435831eaf82fbebaa6e25a8a9fd1fb65660107cc9c9b3818b746cbc640c30cd0a793d3dcb86382c522d912bd8758ccaab9c9aadf56485372a00cdd18"; + sha512 = "be36db28266ec188552eff73719bb866dea7f4d25a4ce5f5992042c0d91f64536a607868cf084951bf270ea84bce73fd1075c69bce9c1ed46ad7119082d3fd4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/et/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/et/firefox-59.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "5065889bf032c85070c5f1a426a0914568266206464ff60841fb0f08efed7c52ce2770ddcc9d486bb9395231e332691910816f0bcbbc49724be346e6ffbcce75"; + sha512 = "4e5d48a1cbdf36f789ab325b6bb7d4e47d525a7c77877f572040999000101145793a48c2985fff846dbeb7b2fedc43144ffb246dc5fd278226b1ae01f845f7ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/eu/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/eu/firefox-59.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "12790d229217a9cdd66fdc03b460dc409c3fab9a12e6492491a5aac115fb396901f7b6ea0b48ad3f667239d3cb6dd5d3726fcd9ecf2eaf2b9d69ec47f7813d3e"; + sha512 = "582fa690504c1f7502a01c2773d698d8513e3769d15a9b10bd27f9e945ce8c76782b26a0a05df8644c5dff2a8d31a30ebed1ffa282ae065ea51fa400b93051d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/fa/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/fa/firefox-59.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "6209e9b4bbb29e783ef0817be91e32c6d31fa0407e5d78a1466e3dc32ea8058261bedce370b8e5e647bd89b7ef6c1e6064cb8cc786643adc405a50768fcc124e"; + sha512 = "ad34dde1a8f1c1aac3f08894b3dc5f4c7e0309793254e4eca257ded6b3d961e408f6e036ba4e347f5075e23b1257330de1649c932754c0b9218c3685d4acd190"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ff/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ff/firefox-59.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "5f3fc2665b6b5cf63999a1cb47e30ad266907276910446069dfe5c7cb944b5131ead06bbacd2fdf2f2843ce55cb360aa6c17509bc9f8fc3f94cd1debfeee97a9"; + sha512 = "4920d85f8180225fceb9e167b65bf5777e9e10886a963376df82383523c88ed6c90def6b95e153ebd3be442944f46b277a99b798988a4d902da85fb504421485"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/fi/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/fi/firefox-59.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "532c2715c67531508875307264d03ae65fb168463b82be507550136b61250e0c9031894dfdd0662bba0de9d7de703c289806166d9292737fcbdbaec41f7a6276"; + sha512 = "053531f894f71ca4b435d02edfed0afc5b0c68624da93c50d3955def7b85ba72b2fa26b801baddcd77afdde16ad34e3aa63d8d9cf58a764413eba0c9beac81ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/fr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/fr/firefox-59.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "ee337c590300b765b41d55e8227409eb62b80b233a4576a838e9572a952addbf76ad1267b2aa5e9fdf0da2c22797e754eb0c13dc51e4b8220f8d53e95f49e601"; + sha512 = "d8f049e01868f5da4c721d1447d8fe829c1a2b0082c8f2003bdb2040f0c951650aedaeabec848c163fb9c23cf7197db10f6503abb87768262d195c7e3152e8b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/fy-NL/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/fy-NL/firefox-59.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "ba5cbda964b89d6c2752f5a69218bf907a5d79438afd50bf6ff465c97f2e59bb0afab88662f69d656fde8776584287edb1f931ded4e8462f4d1a6bf6067dbc1a"; + sha512 = "cfd705a059231b10f4e9d8e137ba16041b218e58e269c66931e0bbe828804b83bebbfef5cb08f22116de0052bed0d7c9d2d860d178cf893baafc594ebc31c311"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ga-IE/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ga-IE/firefox-59.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "6ef1c7b0d4607a01a6b96fc85c7438ecca85b1171a4c06049282a0670c00755b4dacd42b64d46553a0002fcfe4e9ac8a6f57f89e025b291ac3a39ff52a22bc39"; + sha512 = "bda2388829d1b6e7058eeb4a96c18026dff1795490e7d9a5893cd4e835a2f303cf1053ed16d59df993d96d26d7e17916e25722c9ed006e4d5a5ce6ecc813a31e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/gd/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/gd/firefox-59.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "86f1b629e99cf4e3ac00317a3c92e734ad7385cf9ed5016330d08eed80ffec8d516ca05ec843a029a8478949d989b38a65bb47e93c9f3bf47144cd9f128b1a00"; + sha512 = "c7649115373e0546dde15b88db328c73157998631200a6d8a22c69bcbf0c12f2f97912b4d18ab004ee44edc763ad9b94ca3c2a1626f1f9ba008f59fff0a89bea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/gl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/gl/firefox-59.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "245fa4ac9b37c9fc2e903e4eeb7ed5e4c992730dd6d32a21ec32370b4c1cdf1ba796ac9699f96fa94efd687ba06492d4bf3cb8d2db23226660f041e4f5ffedc9"; + sha512 = "c065548613c85e4d3500b81df997a2bceb0f128c2ecc7cde2a8df871b0ca7c456652ac8c9d41f435b94411f748c1522edac891219f9414671b6f4061cac4e4df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/gn/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/gn/firefox-59.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "9a9a34cd51fcb104fe4f59a1dad2b0641be345e24794facbc37fc9139fd7574c818c48d66b37179bf41fb42918ccd174407f4e651a59a1055dbbfe3aa48ea9e3"; + sha512 = "114f9f9992bd350275f20ae0e1e6a751383bb8c95113c3ee40e44fa31d46fb0cf510d0c3367ed3d49187d5de811e8b86e3d8fe043f65ffb418899365d7b6debd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/gu-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/gu-IN/firefox-59.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "60d8de8eef96240bcb19ef862efe6be7b502d263edc543e927707f7fed3fd37f863f6e177a020eefc96071e6cf9363af052a053cc449204c57b990607a835e16"; + sha512 = "a2fff289a40aa72a5de11ae8b336c2da8585cd8b4d0a825ad0f8c44c50de7996df3ce6f06f2b0b56c68f80d9f94e3f3753f58dc9e77142b227f8ca488ac91348"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/he/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/he/firefox-59.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "622cc6eee35804c5aba73c88328c98c92166b84520f4d38f0168118abc979b23b8d99955251da1861178ac43c25d97688c6890251d206342f15f21e692ab4689"; + sha512 = "2d280405c992faf12156a6903c90d3ff3b0446894e65f58926463bbbebd0b27dc85c96c9d51bf5151ca4a97ab21c863276de3104b642b56614a51066d5cac8d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/hi-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/hi-IN/firefox-59.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "2bfb9fce937f5972a5a85a627f05b5321517f94a55bf39f162444857e4db6dddf3c7758d8147d2f0da75f140aa8061e9afe08451ef3b9a3701fc75c3408a26f8"; + sha512 = "a3ff1d09cda26932603e094ad3685fa6ea5fd343bede244ac5151004be367c91a35a339ec156a30878ac3a1a97aa0e708bf0228d0d96e64d9186fb57c3c18bcf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/hr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/hr/firefox-59.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "3c9cea617d8e9814e7662a6aa8add1315639c9ef09224b03d516942ca8a244ce1bc84539b4b103d12385f7aa156062e5915c285c4eace96896a098352228162c"; + sha512 = "0dfe708a3e569723af81e6dc7d4367243d43d130ac25d3d333d2b107e84a4926dd8ff22fdc731e55bfabad0bea09b833fb576d7e69dcd4fed9f520993b79cf1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/hsb/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/hsb/firefox-59.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "1b341021ac94c4d673c0ad62c031d0c2021d275faa32da7607aa93ed036bb90c6e591cca8aeb7ca0a0d3a1958c3070d5637ed695a25cf775302db0bd5d24a921"; + sha512 = "41296fae3a6d61ebf952afa336401024c9f7b5d9c29e5b0c42a5705e997a3aa05c304b3a96beb172de72ad38a70281ce049d3142bd03bfb8abf4e126e8bfca64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/hu/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/hu/firefox-59.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "898a792eb5eea12bb196f8f930787e0bed085bb49e93cddb08415d6b9e5ea63a28f6a5b48a2075d6ca595fca3dba69a91fdcb0f031eeadf14bd9f8da477245b9"; + sha512 = "6ca0711cb7b314300a5747bf162177d80f6540747810bb4b234718115a62153d57119df545910c6ceb8860b256d443350fbdbb0733241ffb8b7f02223e8459f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/hy-AM/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/hy-AM/firefox-59.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "8d83670cc2451f866030948f888dae2edd6badcbd557b077893b145949f7958b2635c644b7fa5dbe7bc4a82ef07dcd871f3f91b530bb19a576af62a80c4c0120"; + sha512 = "c0313347fee393102e220dd1e7e14b4e2192ffae6357402e93d201a82147474ba4ff4686d3cbf2bd1459f0b743ae8509200af4cd708e184143a0cfe273c4b665"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ia/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ia/firefox-59.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "a7745e00279e8fa9ef39f9f5d16ebfd3a0fc20f208e4aeab80e60e9fa07ca22d32a4c88238c05aa25ac2149df93e7bb3ec639ca2c2b99128c8cdbe65c350b6ce"; + sha512 = "3805b1e6dd955ebf7244ca6900c6e435d0fd06c2f36b49f08e4afbf9cb799792862a8f77324e11705d68be66df7d29f23d23ca103a07712545defee690c3c477"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/id/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/id/firefox-59.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "c35fcf5b0b7449a2ded6811f1f85604ee0e99ea0df9350cc429c5c3b673cd46ddf075ce2e270e3195cf42c93bf7a81fc55db08edf57874e961e037149fc4afc2"; + sha512 = "7720f35ce0d6f4abcfb4ea27c59e315e030f8655d27ae978f2978bd22e8e92848bfcbf516e5e452ec1dfc8489ee475507e9a77f7fdef9d2d4fcb6d2e342dbf06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/is/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/is/firefox-59.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "da8877007e3404b4a66de56194b34b77dd481e223074f528d0cb8a15071b78ed2a9f73f653775e30c84c77a042dedf142a771621468580fecfbf6fb134bf691f"; + sha512 = "bde4e29fb7623ce2058400c0c826fe222aa63613da5574f22973f005c946b18d7fef7a54b0b31d2ef8eb01f93eaefe6a6cc2ffc9e0545e8e247844e592f105c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/it/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/it/firefox-59.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "7c0e8dc1bfd60233f2b5079f25bbcb0268f2d512e1e4b3cdcdb1edb9f54ee45897b2806cde424537da7c4557e744401078cb4c53f84996408d2ac3f1d8d29d86"; + sha512 = "ffea57a5fcfb42af408a76e176d92a5d3579237a1d59f4f6eecd6294d12e50c33bd5a3d1ed29c9417f75c3ff152280ea7a0e034f9697e2268a861a428ed994fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ja/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ja/firefox-59.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "0d0018b47da9d99c1ddd902b4aeb00fcd454ddf159d40528d8219ed5409ada1e307e1faacc14a52e9102233c7ae87692096e0c5195ca56a925843c2af10c56e9"; + sha512 = "eb7ccbf29f51f011fa2b6c4bcab62c077a681f500dca66bc5ee739ac8583721cc07a440f1f72db6b64dda98b0f90e19d00aba8f8e264b86ce4640e1acb8a7823"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ka/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ka/firefox-59.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "3ddc19fe92dd64ba4c49eee37b74f6a8a64555635b2484a64de949782a3ad22ce9fcd133f415a2cb0f10be07121f73b09556f4088b32e6cb5df0b9578657cadb"; + sha512 = "5f450891622327d2e26f1432df42e462da7727414cc1ef0d034f1adcd472e7403c30a05411a8c094a8a3fa7e68c90e86aca0a2c5ca91cabc734e2c6853fa53dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/kab/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/kab/firefox-59.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d90b759fe466dbd421f4931c086e2240f4d0f478914acd2de95da7b09288b386b880cac2cf8756993dc3502c0adbc7b3c54bf056dcd1248650648fc8ad139e6e"; + sha512 = "68b124386573828ce9efd2d0ac83fc591ac7dd149a290cac55a0f6d8211ffab341b99cf43f22ac9825133cb5bd4e95bde2233fb9f5acdca9e7b7f5381d4686ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/kk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/kk/firefox-59.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "ada95551bca162ee09233c0b69bd9216a9f91a1621964e758ce37792d87b3244842a330c09f46a4bc83c91fb683c49d4f8ca7a982053ec1b08e8d361e7aaa00d"; + sha512 = "030a64f6191ade2a037ce84ada7eb22cc2ff03677a273d47906a311d41430c1b8107bf41d98b50b824d39773efffbb81e79c54e32a6392cc51189171cf4a9e32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/km/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/km/firefox-59.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "6701c09a3cf14d7de5f2843a944116746a5626b43eddcdcb3aa7949c7b5414d1860d1650e349ee4fbc8ae5628c112d9bc57d0203901913c5112e701d0ab03e8b"; + sha512 = "3db0058d254928b509cd61a82d3ae5aa8e0909c4f2ad71b0c53d86144747a6f4bb32bdbb9e9ac7b171c8827f424cc255e491473bf8d88c1117eaf606551a79a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/kn/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/kn/firefox-59.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "e315e704d2228bc02ab0054bd205d2cb0d11b1ffb292dfe1f04f0590778a94981dbf7f9d0c137c4d515d6f1616925c61668a5ebde8b408e6bb5d0111e243e1de"; + sha512 = "5122ece64598d92045c17b8e7bd43415d27253049c7ba5626c92777ae9ca248cc1d4fe9a99239fe8f1acc0fc0913d8c5551af0a00c7e2f513913d770206b5658"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ko/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ko/firefox-59.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "ea81ef5c69a5e89aae22d538c6105cc72b4ead95129ebdeea47e58039a1f949196e96a90858300440f0eec5344044df71e522d2b37b98281d7ce461bfb2fcf1d"; + sha512 = "89ebaf7d01d7f78e93764a23c5b34ef9b2b1f2b7a943acb5cdf11fd0e3227a08efd6b5255d2d8411a6b8de25842ef480c256591e95f790a48e6a046c16587ca6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/lij/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/lij/firefox-59.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "74f531103b8de8ff7e2c6efd7d3ae18e9a6929f3ccdee7ff10d0e6d608035185d5e74e64bacc3b191e719b0533fb3ed78828cdf081141e9db30c2f7043264223"; + sha512 = "3d9b105318102b0b46062e0a51f34b4ec019373013ee8bb5db027e662f28c56a5c5562db3ada621b24dc3b93d7fecfa453b362b666affeb31e5108312beb2821"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/lt/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/lt/firefox-59.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "c7ff5a95f3ce857c64625e9e5f841eaee9473edd570da6958aadb92496c44827e0c8a9aaa7895afb17bf00752e65d9024693d7e4e28c38cc8e0c07e00d2037aa"; + sha512 = "5766b601925af62763ae0a3f00725255910758ac019c457a27dcc94e905300255e2eaaf5cb92f263ad9182d2925311e649b57732551c5dc2983a1c2ab3d7340b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/lv/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/lv/firefox-59.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "0aa35ff6dae6ab41e5ee8ce8865e652d4e849f1a36d831090f3f48087bbfab97a4d2d5e09819ee15cd603056230d4512ce957f42115f23135f49b732252c8ea8"; + sha512 = "243c545fefd8856a5a6afb915b3b7460a38aa57656ca173b02bff1a70a7f2ad9550e9eea60a5f72551d487597d94ddb6a93cb4b833bc558b265a37c2d01b9671"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/mai/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/mai/firefox-59.0b9.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "3fdf9ea7ab6bad0a4d50b050641fa28ebb4136ad18d200ae6563de7a398cf4231465a72aff7418b401a291263c23758cf9a42ef3a249c62f2888c8cab63f321d"; + sha512 = "ca4ca3fef3413a58f1b724b3654751daa3ecae2f4dab175258c47dc3a0dd6ef6a7595a9c94e4f8d5cd2316af54b3c42d037670e46747eebad0a7943ccbd344a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/mk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/mk/firefox-59.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "73448b1c969f869d56a068b48c7d91f1b2ac16a3a5cb4ae8aed099d6792c230c9d818b962b3be04141ff0c561fe7f9a50a7f36340fae793faf4edfb2177082a0"; + sha512 = "ab12a990fdcbef69f90a546114f299c93936290cc07e6f205c8ee7122021a6ea5bd648f74a38ed6113f6f2bb65f273b9270715f40252ba80c3aa775f823b95b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ml/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ml/firefox-59.0b9.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "fee8a3b301a302268dce12ddbcce3e778c138074da7a29030ecc886d3bb39623da75b75078a9c9a1756344c85aaad4e73e936e54a0509d96370548bb0daff551"; + sha512 = "641cee2b75d89f7be38a57686fd7adb4c9028a576d61e07d0c1114e296cc486a2b992a52722b2b368d3ac16ab6bf45b3d9fefda38e64ff67e61aa06874a47d83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/mr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/mr/firefox-59.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "00231d12298e856126b8e6a7df2bf57689c4c705edc4e03868ff06b0d11b58a38ad312b7bde8d60dcb505b1726e82f98c124150be08246f97f7087cca3d5d7bc"; + sha512 = "20e02fdef1b47f4ebe2ab2b0faa719b419c992ad43a8e04dff6b25b58e8d2e8028d53bf4624a101c887d8e817caf3cafc5fb8d78ef5544db1b2c1295e74412ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ms/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ms/firefox-59.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "74cbd7e895aafc688a696c56d4a8d572a62dfc6761f8092b90fb6f7bbfdc54c9a17bb1ad373b193e745080b2609575672f023d9862bff4cbae3ae975aeaf470c"; + sha512 = "9104e0787e898baf8b915810b7d39d574eb47f361ec5e36fbf0fbf62b2c86dca5c745e4e9c0d9eacefb0e140c38f589e91773956450cd2314a0f3a4b88e7d970"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/my/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/my/firefox-59.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "1dc1ff38282d7c2ff1bc9c7725d02394d2d35a3cb976f3cd59d8c64cc3001ba6c8af6171fbdef7835a86f9c234cc51be7d8e955119b531adfaf67b0681bbecc9"; + sha512 = "d1734782ceb8e9b9b4bfcaa33462c33da6f22ec13f71db2f91966b8480684290654b12de8a15b2f2450585f43ebd6c3d9244f59641cb9d7132db663899686302"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/nb-NO/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/nb-NO/firefox-59.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "ce23f71118c2fee3e4fa6218a0cf14fb34088fde93f9cbe97205fe547541c96fe78784d6b18c50b800dc4882ae7e056095cabf57819cc60c8171203f8052b2fb"; + sha512 = "34f8ab467bfa03f3fa2ba5427c09bab633a356dca97495ea644fd9c1e691a0132b260fd7100ff37cd8f633fe1d822b76ad1ee22dd14a42c50c8d28d81be3efcc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ne-NP/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ne-NP/firefox-59.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "fdc930a0edd60e243079ed15354aa2783c9cf668fe3eaa2e19ac0846e3a100f7fc745d23001c450321cfc7b76847a5ce0a0e1e09885096d29bd838e730d9a2e0"; + sha512 = "068b6f917de942d72b31fae5ad6ae2f01a376077132687080cd583f2a9e02d62f8795a17f5fe59a58f24437dc2b2a6133628d2c21d4f9d26080969c33ee35ff7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/nl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/nl/firefox-59.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "1372c266828bef521ea932e147fdc8315a68cf93fca386e8f2607823efd6c62d96169d86d4bcfbd0b2fd21c2223efb780f425607aa603f16326ac7b43517c5bb"; + sha512 = "ad51ecdf1cf6a3219e242618fed8797cc2de4717da0972940fa3ed21aa11974015f31c8b26c0a098d4db2484f033d304ad1bef755108a9a16aa9d64acc09ddc4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/nn-NO/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/nn-NO/firefox-59.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "fd439410e60ea25bc622831678939aca419edd24d4b5077f5233be44e1aa0207d8112c7415155a7f96ac9aabe65d7114e2c8b461c1870613006a381e233e6285"; + sha512 = "85a965e137e050a8a127c7aaad34fa9e3c02cbb9cf97d61ea674e27d437451950bedc2355bbc5d7e2d6364481285d406748d8bb539061f01ca8ac1daac98c5e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/or/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/or/firefox-59.0b9.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "775edede88b773d07a70e6743994c6cb1c864a3695a57c482535fee8a8a25eea2bf4559c9bd66a7b599fc1d780cc8ea89d71ee37a04c28718ba6cd8d0d3d941f"; + sha512 = "0ec72f677c5eea74bf24d9130d0a2b45a0ba1e45a9be957a308a3cf5325583aa982e0424ec8b0cf018da5d0084844f978905c0a34fd9312e24e1c1bfe2ba91c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/pa-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/pa-IN/firefox-59.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "d4a06a885d3d898b046b994e95ef23a92d5c35e47d341ddc93bc504eec54123993721800f7b43c3739ec09238d158671b8af0e06085a318436d4b8bb622868ef"; + sha512 = "0e14fccb544fcef5ead3628ffc3214df906ca83bb97ab278754fb92240991cdb944b72456ac80b8814713ed8a2eb4b5deb38c06cde13666c528808e7bd9fabc3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/pl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/pl/firefox-59.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "da0d744b94d05520cfad3c6bc48225cea76be9e402ad13e59b7e0e24cc96a3a5ce02a1512f394c62d911b7b41283a7d33d397ac49d37bb9b5bb986c6959f9d90"; + sha512 = "8a487558a858030e204cd7e118f450c467a034ae3efa7684e5c888876bd279407f1275a496248049fb4d4708629984bb71480645f1e2ac15f981ea8b7e869364"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/pt-BR/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/pt-BR/firefox-59.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "84a642792eafc5fcfb4b89953f0d7f2480043c413ecc7629ce7f9db759f9a0d58017f4b19f5fd099ab0a8e0c7e1136dc0e4dbe94de5b6d2a48368e9a57ae1e88"; + sha512 = "c01bad11611c6b960d84a0a5064453103ea664d87108e73ee5865111d3950399426bc8dc8f9c5a69265ec585d6a99287dfe03facd1c02fd26195eb7f7f4faf0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/pt-PT/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/pt-PT/firefox-59.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "282cd700e10069da00df6b95e1d497383c23a6b0a6f0f3ea02738eb3a3ebca07f7757aeb11baf1373fedb4d6975e85ff2d45d607c42a939ccf43bb80b735ea29"; + sha512 = "5f6062c929a29a08a7fce372a135ef7853e4270123dc11a0f24ea6526c9689e1d69d394f7d7b7d75b1a6bf0d04fc88bba1cbaeb8eb4306be589c49ab8e9a3416"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/rm/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/rm/firefox-59.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "c56721b5d1080f605769f190c26ff734de9067d028ca1bf8b48b216e4d9e87009d856f4652dc5a654508738d3983ed350cad0cfcf91544a6a5c2120c497a6e21"; + sha512 = "b1910c968e2e16673e117f3af83b9e09757c00f4b1e6e1decbe97d0ad18d3c4688efbf0ae1832ea7b046e0e5689317a0081c163b467c20ece239e2f860a994a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ro/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ro/firefox-59.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "856f7f48133f78f18b5834e7faa3ae30b000b20b137f935a5783c042533cdcd481fde575541752116cdf86c32e645be667f77d5f886573852d1ebce2bf4e230f"; + sha512 = "b8e3309bab60c923901af42c7c00676ad849dbc83abb0b5eee2fc3d1ab034fc74e268e634f8a1db64274aaa6554e5c91ed934a5bcaed653b89af63325d5583ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ru/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ru/firefox-59.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "204068402e15071585efc1ceeca07bd253723b53e9bd1ca14642a5c5fecafe1c325e6bf12b4f3a51d8e8590a46d930f337ac6fb2839ec92d2d4cafd9e67f16df"; + sha512 = "80f24f999213489db46f6cc2dc374ac1e2cd2ba4f2c3b4a29ebab87881a4bb2aa8272df4b4bdeb48fa2ffbfd667ac07b35f3ee521e4d3ba4d583200bf265fa50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/si/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/si/firefox-59.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b905b59403aeb3d863904b552ccf5597cce6c333c1acd46a20742eed8518b60eb96e39a47d7cdb43f50995c017bcfda52e152f2ff5d4952cbec5f641ba45c565"; + sha512 = "a169026825ef057b19ba42f5e4aa107bdc98719366874bf9ede8dd67ab634dfeae317e850e92c6705ee701b0e82cd66289486f15ebcaa1031ac30276f97035f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/sk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/sk/firefox-59.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "7f512292aca54210c16cbfbebe8b093d5a26293aaaba39dafc226d67a7999b0f9ba03168e3aaac7045e51b3ba2dd03657f0b121fd4cc6612849d245561c5e5f9"; + sha512 = "e68e8a264adb37d84db65814371929dca7aecae65f870861bcb8938bfe96749467246d9985e3370688791650e434914191c6e5ea3edefd3f8012ce1d5e929853"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/sl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/sl/firefox-59.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "e40500d7cc1bc2b429917bdab687025d77bc530c77081d8289a65d00b7f29b6bf8181d13c8f5959c81031c7355096aaa05aa105cc511c8eef1f71f6418bd9c44"; + sha512 = "82dc42228f9e48ac8b71545452a5d23bdc54f1bf127e8aed76cbaff531ed8155b2c8a1a1ba4ebe2b41c1a4880f95f5effd5500f245044d31eb974560fb45fbf2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/son/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/son/firefox-59.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "e3b59a646edfa4cfc99eaa66cc540c374ddb1c5424e1aad7f158efda317f4a8c1edd7f36f6ce54b937e7c5d3801b53446580cf90344f35846d437a0c245d978d"; + sha512 = "ef05653691c5691c3a41f9d66a7c508b982e4379bb2a46ee90166a295f1667323364c66855e1b0b74a0a0b951c136ab66d18df51bbc94ebbc146e0dfb4d42ca1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/sq/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/sq/firefox-59.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "9dbf9e77d61e7ce26bdcaa8536b725fec8c57d3c5e3e7e6870bb686520e3af55cb0bcf2f5b8525fc24cb72fd7976d3d8b466adf18f2e7fdc29f586d912cd7bd4"; + sha512 = "5379a3cdc5fa7ec597fef79dbc2c2059f298548b1ea027c8d57ba1988f7c2321dfdf5b117e9173e0269c07c8f21a29091f30ac7c0a69c575b2c2e54427d40490"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/sr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/sr/firefox-59.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "d6e0f12dace67c6260e3b766393e898e7fbe394d34e14366594050294fa2cc6931886d4cecfc23f4d921fdff961c38c6d6356760d5887a5570d5039912e193d2"; + sha512 = "23dfdbed936b8b03dcc43b3b486a717aca6e302ff16f32144d7e4601995510ffcadb9bb4ed6a76ccac301cd235e5fa394b388a7c1dc13d49529d0f67852334c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/sv-SE/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/sv-SE/firefox-59.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "388fdc10907befedb9a3a871be53799aa1cb1f9662b2e18e5fef1de8d6805ea6ef01d95c5225f06fe009c4800b7a5214a24db3529fe53a60be56f724dca12086"; + sha512 = "0a61bbafa70984db998e0ba9e7798a5946fdd914562b3bbbc3809b7c5e1757ce40ec5b0b585b163dcd7acc18833dd1eab0bb355332e83033088691c56760cbd1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ta/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ta/firefox-59.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "d52d69694a2ac1cfba8d568342c3da47932f9d5744eb03ed20b1a5c8b4739e3daefce25146180b39e360e3c90b2dac99e7c9ae9740b2abf580120149db2aeca1"; + sha512 = "25105fa99f1dd1b66bc730d824768d590dbf0765ce916dc15daba03d7c2829a603d55204b639bd65b49099e544e9c05ec2b5bf7426523d91fafcadb8dfc48a94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/te/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/te/firefox-59.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "19f82aefeb7ef6281278ecfe55c052b4ee24ee0d4d16ef6bd06b3e192e801ee22f034406ff224acab92117e4b4e63e98d7a636513012dd625de5a5d77615ad91"; + sha512 = "8d7d84c6599e96d4ac0b3713c625bc65fa41423a876b799a4d9f90499b116b041451fc39f0ea3fe386e091845f88c7d8fbd920f3d114008d9cad6350fedf8fc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/th/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/th/firefox-59.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "3fc491d1f70adcd5ea0c479bfc32400c898f2709674a1ed59da76521cc006a1683c31af260155ec008f1f8ec08ea971e91465574c7060e9568313433d2b7e372"; + sha512 = "51f48d747176f7c98bacbf28386a21551ebba7d2f3d9af706b421826387ba3f0d9046a1fe8818cecdfbf0b7e87e70710a662c3af53705f0be2e3c4bc1b6ef457"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/tr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/tr/firefox-59.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "7fbc87f38b07bbedd644c89ac5b42d9e00114ff79dd0b02f25c227c4944e32c353ed9c4491ef9f3981f4c565e03afd175907cfec5243832a1c82a12dc4f96b90"; + sha512 = "cef8767c353fb0496e8bf15d2044a9cc28ea16ef6928799fe1bab772c6a87b84e80225512cd465b69b4e1f33d0721bc1c43b2b16f694b44d2634e9968b2203ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/uk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/uk/firefox-59.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "e0ebdb71ad23527be68a3cc0e70291b803bbb5d43ecbc334ba92c48215ae8017ad79e78692eb39da8d5403b64a9b17e127c73bffd2592df8a5d4cf6ad46710c9"; + sha512 = "de1ed906e7b591d77e1e9aee28d4d593c5b0ce1aacd58df57e9c5e8f4f64876f5a2ec9cb58e655f429caea19091734fecac73ed9d133bd6bf98453559f33112d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ur/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ur/firefox-59.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e8bce7cba9c56db4a74b00d9f149704ef0eb308441e70a4f6ff4919b4d54c5dbcd0e7446fc0a23fcaccc5cf44f1a6238e7012f2e3acfb4c1f26a5f8724eeb4e6"; + sha512 = "37b5dca13427565d0c07478421ad201f9323cb6fcda02ab0bf187b53a716dd9d9d9c049fb7688a77f9379da2352aeaa3f8974cf64a3b8de153060c3b7a880a22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/uz/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/uz/firefox-59.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "def047a3437914a7ea7e0e8680fc12a198181f2adcf6000879ef63eaa061fad85db8a1f64fb6dfe6d44c063accfca4e846b5624339e52dc2663ef0cbeff03787"; + sha512 = "75cdf2b5e0b8412377e4c37fe459d55bee5182ca30e048c76250f746e39d66a713ccdec5399b274ad46ad000b272164394db62849436ad14d9f704b3fe18324c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/vi/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/vi/firefox-59.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "dc534f00d41b4e11f7e620c3568cde029784d86a11bef65b629d5d32bae62df9d1d45043d0be0e511e8be735e7478857bb5be0c4afb47a2aafb5c75e6a32831c"; + sha512 = "3aad5f888f5bcb16e269eab0652944b4cff3bd557d93a60d1d6b03c3dc0750cf49a39f7526d4db9ae47b28efed4225a55a6fbbb4b8f3b05cee1d5c4ee40729d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/xh/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/xh/firefox-59.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "6275723b0ff3f66f6631f7b5fed7ce73a2a72c77fa4229ec21b7609e43490c8619f099a20706658fffe693330919dcd65eb52b83328614b4c25000b97cea807e"; + sha512 = "c48ce50cff576fd77e511d6f924dcd0990c84e3df117eeb8fe2cad40f0d802989f10e445986b60bb73a63abd1d9f9ec26976ee167e7dd74237b3a46dc034b82a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/zh-CN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/zh-CN/firefox-59.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e511d5091cc89560c213ffba002f55a25271fd36b436c35e2a90ef84ed1e6a20371d9aa2e61446787be7e4f611686071ef9309a8646f1c4123bdb8d256a5edf3"; + sha512 = "be6ef0ea1047d53b3fadeb842a7874ce43a56ab21f93235dee8f13b5c6b4078c19245ba5920bd68e517f53eb2a476a026022d896dcae3236fc5009eed6389198"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/zh-TW/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/zh-TW/firefox-59.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "c2bc92e48d464211f2a936983f2016d4c155a8dbc5f636876303615643096a5dbc3f7ecd674586e51b56aa28f4ed8f41e1708a5997047ef13f8ee6e7362f5414"; + sha512 = "92fc867ffe7cd1491a6f7c6b4a4dbd20a515de0d77d02f17b9d7d1ce5f50f97d28bf0b3ce6cb74c2fdb670ca1f8ac35b6a296a99dd7d39f3cf36321213b4487c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ach/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ach/firefox-59.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "4499d6425f3d16788d829575772435ac0c2a3e2ace072012624492e0398292cc5e7641dd36e0b2d58e1e6b796d3fac7fd8a57eff4a9e48adf3c093b6328b4595"; + sha512 = "9394863e8459a12acca2b5d3beda97547928177c5f448ec2d657de66589915145e9a92e5c69b6f152d92caf30defd2de2ea4a7d63c0c5cc1f3210edd32603954"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/af/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/af/firefox-59.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "fffac356b873b58d275e04ed508ea501e43f20be51b6967637d49d4a4a14788c04c9865aadaf0c1c4ecf4a3707bdeb460adbe40226f13916faa748bc773f7336"; + sha512 = "9bb896d984dab375ee00a883bc4bcf5dc010b662664d6b990173ab4ee0877bd5368d3c3561fc0f86a939dd2761edde29d2d01fb17994e5f807f1bffec52e3f5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/an/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/an/firefox-59.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "05b688f115a9c324fb92a1234cd3138af1068e6dbb89a4aade27af830fd5b897e58d07f9876f9f9688bcee2a98ea1c4158a585755169ffdab9ed8a9927a2e108"; + sha512 = "6817cb770a554c5bcc4b967b1ab02ce9f5c0c3f8f8d119574b895824df88ae2c3f7148b9eb642865f2663f778ca58b2530cbee187922eb830178a41fbf55c482"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ar/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ar/firefox-59.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "2bfc35a015148d04968b1f0f5e8d4ece02f448590ca45fde0cca37b31357f4bb58e0f0f4f5542c77ebf2632c3ac3340de5514d5c999d97b95abfc548486d666b"; + sha512 = "d3f8cf030296017295f2cb32b0653e5657393e38b47ead24b24d274e42efb3555d870072782ae648dea2f1da8d65a0aa573bbb0e33d715c1c14aa52d54cda8be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/as/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/as/firefox-59.0b9.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "baed84fa6256bb002dda19a46a32d9b46ba64f30c466d5ae31dbaf87feaec051595164dfc355d4433403485cfbfef8533a55e2291fe940f2343d9f30bcb373c4"; + sha512 = "7388810d9db0a29d306cd63c4812e33bfa0c8dee68908a3217b5f634149c2b9d7ff2674dc678106e9964409cb8b31ab1ad1d1a2a2687dd4c82b4defdbfdabba1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ast/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ast/firefox-59.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "08f3957c23dcfef80f89fbfe4bd4314254b74fd998741358f5d03ff16728b260768185968e5f9645f54a3d77bda95ca4122e7ac80f6a00f95409b3fea8205a74"; + sha512 = "f98a6e81b4628c60f0e082f7a0a2ddc193ae75005bfc5f07cac493086c9772dd6a4d45fd85ec4bb05551d95250cb0da0de93c898221fe6a883554649c7671e17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/az/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/az/firefox-59.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "b443e25e0c2fed05b5ea32416d3808f2236a7c37c15d755612f394dab17d849bd3c93d3b2272b422a7cdba7bb4f7de2cb37cf19b507904360ceb4e6beb522844"; + sha512 = "899465a9d9de16995890a18899df752ffb871d3533b691ec964707c95e5008cc5db278495ab1ee96c73b738f6a384d24434786da81b50add0dfa10af1774af6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/be/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/be/firefox-59.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "52da8342a683f875334a1fdf493700019992162fbd983efb6484dfe3af8918def29746164c93445bfc0c306431ae252a16f5cb0fb525e5381184221b80f4a7bc"; + sha512 = "9727a425a867c5b020a71d9341e23ef93751ef03dc2fe4dc80746155f7a7ee7220a682cdc624945d83132dff6f4b9d604c1916364fef1fa5b4c0c693d637e276"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/bg/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/bg/firefox-59.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "303b784f519eb9b2370b9b06d523f2554ac2c326d024d0812228193268f8778bd0036d572fc57574a3ed5270edb64f09253aca9cbf90322bbb3ccab54c62e638"; + sha512 = "ed7f88373abdb170301b8f44042c2a2a6044ba315378eea4193d742f4faef3695148648268904a7e32cf446592088355db00eceff98840edbb2e96edaf337156"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/bn-BD/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/bn-BD/firefox-59.0b9.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "8e902ce41ab242c081c5593f9f27912721d358e78006b364c74e0ab718260825c98214db4a65f35bbb0717326f0608aad5089703b74a964523f3230675ad77e3"; + sha512 = "62b4d5d9d6172edc3f131f68f092aa28424db5f6e163e0a0d5b243d6015721f16afe0c3a7b1c49978abdba3b5bd7eebb8af06d9fcb107bc1199b9158bb2af14c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/bn-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/bn-IN/firefox-59.0b9.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "037400dd174f16f7a34074dfdb49e88f0892092dcad6c27581321295023c9ce564b56a22eefa5b35381a8a01f42b26826c1a376bf05be3e34feb4eb5b02f9231"; + sha512 = "1cae0dbd5c320c6a0290af25ce25b27d76f97b2e2201205e07dfca024fcfb42b586969c7c3dad11cd01fef9d617453714485117b33c40d8b910d5b9049b5322c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/br/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/br/firefox-59.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "f9b49aefa070204f8b95094a6e8793b6ab00fd8fb4f400075516cd697cf4ca5ea89fe267eaa477984ae82d966368027cadff04d0efc1be81b63a399413ae83c2"; + sha512 = "5192dd2a8fa9a39767e677a202443b532e67ec463f55062019895e5cec26966b8545562b593a28f86a7f6de502c9ddd994e28d5a6a3e06094ba8d6fadaa04346"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/bs/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/bs/firefox-59.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "35538a5a5ded9568a2dbe09cd5ecda77226584a5f9b7eb7b9356c720a9b784767c5a69ee74990a7ecd72ef660833236d2d6b4267c091ae89a2f9750ca1332753"; + sha512 = "2800b2ff9303fc52b8c48a17717595bc5d713da47696ea4778bc2998556867e1acafe082e200401bd70646385c3272aa543f9cbc769457191cbbf097f199b957"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ca/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ca/firefox-59.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "71cea9ff69b435419c1ee8ab0ec121de13686a7f0d29f10bd308cd5c6681115d1afe035a50f25180daf6067da9fc6edc1ee31980bbf102f8e654b79f62aae1f8"; + sha512 = "6a645131267baf7b3607a1ff600f6ec8a608de1fde3e188cfcdc6f4f8bb31ff52bf94f52a6a46fdae581f50762c52bc218f848b8808487c4c5e3b524863e4e39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/cak/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/cak/firefox-59.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "ffaab8ef22b584c4b147358b39999632ae9ffc0eab6d46ec5f2d705264c11cec7051d42ff2ed8ba46fd1c977d4df4fb4fbf28d970bdd0e8abd9038a59bc139be"; + sha512 = "639f0c8aa05b346b81e7e82ed2fcf6ef583fca7f5fe8005583cfa6ea9390d54c8e119b9189492ee732ae1af343a47355ddc8bf12d6aa33c6c3ae1bdcb6d64e14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/cs/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/cs/firefox-59.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "065eb584812b3c66a31920e0efbb31b900b101fb84613bc8b7e6b18cd544133199deabfc5773823cc7c7a3be03c3a8dae41204a65421e18e1ed0c8ccc6c7fa99"; + sha512 = "89543022fbbf8ae2ba713b4a8dfe566593bf21c07d464bad98cab6d185162eb29af68a69e1a1c9896780b8ae3bb781fb5941aa1c9fc562b1fc6c6a7d16f06c5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/cy/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/cy/firefox-59.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7176e87ad5d6551ce67e2b158647599b67e322a1a8cc35457cd8b682b132f25f4dcf4be187dcfed4e0d304e6dd8ed24a9cafbe0dc4fef261445bacae50a2feaf"; + sha512 = "fe07033400aa8feac50a35c2d799178b6847927e25cf8a4b93f4f8f2b0a3590dba69940bf5d37ae50d49e8f9158fa6e4f4641c79cf36afb6700b435fe67d8e94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/da/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/da/firefox-59.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "1c02a54a801080d6d8f770ca17db139d2ec1911f9e93283714d01b5bb7230dfc84623a2737344ee46c06fb2c3e68c0b863624293c48da71a6e0fa702f0060ed5"; + sha512 = "b8692fc265d595c24b5ac992cb7f6bcfd1f21ad9ecdccd41222427217e110b6440a42f6bf5de627b2f09a26cb2d2acbfa0a1bc9ffe429b5d06c59122b189ac60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/de/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/de/firefox-59.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "a9fdce31be17eba18388eab51241fa2afe71557ebec8ec8e7fe27daf405c20676d3b9baa7826a5d9a7e6a113823d7ed50ae958df6b2412ed712f00e0bfd99dbd"; + sha512 = "0bc1aca4e31fcea6eff45fdab2cb608c2bcc5bef13814370d9804b3905f9092883b4f99020d79b58eb1a4efb39a9098b470af310d04ff9114cbca6b9227a4a73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/dsb/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/dsb/firefox-59.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "0a962b8ddb4698ecbd979d48fa21f91c7d39f7d55096473e6557296fb8e849f27417060751034e9906270c771918b956755082d23c5fa73c06128766a706763b"; + sha512 = "612e691fc261397b9b8cfc0ff5db422ee745c439ee94077acfe88a065efd81f1b554507bbeafe013d6dcd716f85727579844921e4b39a28039cb883b7fd7ab27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/el/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/el/firefox-59.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "fc14290342ef91d29a93707cf672d362ef0790641783b7d7187d7db71bc774bee20d506d7f42b704abd101b040eec95b8aff5caa572e20ce18c0dc56103d0c42"; + sha512 = "322c3f68c2eb01587d28bd7510c923119cea07f91a8f12e86be1a49392620b1af2f45c88d2e71e51e0ba4414dbf65048e4c4e3e679905a138ba16ca88b63ebb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/en-GB/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/en-GB/firefox-59.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "abd3837fb2e1e69c8ec2bbe59647116d45942f4de1dea7fc437f73e609d9296a3bbb0790fd92d41f9771c71cb466f3aee96f30a1163fa986e72ad0db43301ae2"; + sha512 = "b0e5d67f95565d2df209440ff2e36ea88db35ebb5effc03b848d5feed01d5265910666d580297ec696b2a99fa2464ef32c2b85df6639ef6ec721cc2468d34b18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/en-US/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/en-US/firefox-59.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "080b12824d252875c5c62692d652d3dc4dc908937e833c3e99cac58e0347a3bcc2cb9ce2a12d1419f22cdf2545d5fca947d35504e89f7a05f67b7988304cecf8"; + sha512 = "d306f8120fae7e76c36293732687ab9ba14fdc86df1341813846416ce16896fb8c888a049284da1f22c9a9944a3a75623937f6aec8f4635f7858ce55a6559b4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/en-ZA/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/en-ZA/firefox-59.0b9.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "6f9b9f66e79d39b57c05c2fda451be7390321d847bcd19bde3b3fa5f80cbe38f25ea0aeb971dd7122313761878bc297061881fef43cfc068d28c33f11ddcd774"; + sha512 = "24ef351d23e63356354c26ffc266c86790db819654f6372e09431e4e999b71bb1cf9d60cdd169136c1d5f49b17284e24da02c2e0514edf87f10eb5d463fc65a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/eo/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/eo/firefox-59.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "a5cc94f8abd0dec22825e3bf242abd452440793958e35ed547a01c8a7987061889e219a59341ab8d7faa7335ff0b35aa80a61e5bd6dc2b3c0e4c202edf262d00"; + sha512 = "746a1a49b8ed341742e1330e0a2c56163f1f033f0fc3c5577028eb25c8adfc00d18c8a3178fc387b2385f8687f7e230680d181bc7e66d0233009c3e519097a64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/es-AR/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/es-AR/firefox-59.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "25f24c1de811fb2371f9aadaa9f8b2dfdb542000914124d82610fa77556e01aa93c491d0c1bd6a1f5164efcc0c7e90832d36b6b8c7706e61f36b3359e756f6ec"; + sha512 = "38a8ca393cda8418c63126888af2ce589672d96c7c7154c1b09e73eba5a4d6e8615d5621a3e5f4291517a8582727792050fbc112b3d5d4b5704f13625e09843c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/es-CL/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/es-CL/firefox-59.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "602b58f4abb6c021a6b0b286eed2d5b8ef007e158f63dcefd107e3bfa8978b6127bbc167a36e4b7758ff13a482aeda8a70ae69a84a9ef78eb96a3dac08eb7d86"; + sha512 = "9cf9d141802124165c4838012a92f50bd3cea3a90d3b94349c4d1513eefbfe0e1b87f010d6323373913b7ede4848137c999961ee2bcf7aaa79d0065eb7cbdadd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/es-ES/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/es-ES/firefox-59.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "171d14ac46f598e40864dc51ffa8d46b0fa72d722c388c1341895c7492f1f984f169e511c3940a1216406ab131ce7e371943ef8d055704019dfe57e39e84b282"; + sha512 = "3795996e046f1bf199099ebbf5d9fdadc6b079da79deebacabde4aa9412649c8e01940d14ddb88ac4164251349158f6bec6cb6a35629c5e9c69effa4fc58e2a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/es-MX/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/es-MX/firefox-59.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "be66bc35b023ee9236b4bddbf7d00299cc99aac0bbfcb05c900fd8b34d024fb29079ab3012c045431c887edf5b5424bd7373b13c8cc2ee4e4d2a58c4d2136740"; + sha512 = "f077a716b8e6efe6c65f62e6877898e0c4974bdae7d95f861cfc49f2bd0eabdde7fe80260925880a25611803ec015f01b937c3cdae41e5af160a2921cb72ba8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/et/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/et/firefox-59.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "46adfdc992b1c445f1aca0ed8e3c0852a44875da4f09d365f104598b71e070cd671ff637d9804fbae2cf04f1eb43578e3b22c0e55bec39d9f581937d503af420"; + sha512 = "7af0c1c615865d62b5ea1f8f1c50d282142a0ff948d5282ac1817c5f0528a16110fc4420e47ec1cf93bcd9db2dab5a0e9952861e84e1a52be433d5858f47b44d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/eu/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/eu/firefox-59.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "b602ab66829a98fc1ad342f1b7d646e4e0ccf39d898c0cb1f8dc20eb55f1da9c086ca47783abd658dc73aafe2d8b0557a3a59de5aa772ff76312ec93a6aff8da"; + sha512 = "ea12896bae6b614336b57033c24eb0dcf306168217fd4b974f2afd7f482b00f7905aa48ca5a1340fbca01f7842dacc6b4440cc8d5ea402519bcfe9d7cb8aa4f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/fa/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/fa/firefox-59.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "b78a501a3130928de22bb06261c361fc07646024511081dd034204d1529e758b81b4bf31a05e20eeeca649a089a20947caa7ae08e6f61a996186d18067cd6030"; + sha512 = "84dc8d39055392c781ba4a3efd3b0237f8b8f77312fccb8b7ab2f624e55cb8a1cd2f29130cb7ccc6e5f1fd3050a8c0f7e5209dc2d55d42a6f83d66e87c9db73d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ff/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ff/firefox-59.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "825e9f87019ed6f7c77c059292736eaf2ffc96d7029da168f02953cfd0d30eaca1bb193eacc81a49fd5e094d88ed8daa36db8562680977187458db5e36192ed3"; + sha512 = "c8d0e3f502f544e3508a716de5f6585fde15d48701d437741881a8c669dd893e4f28caf94431d5dc65dfe56bcbc0f465bfcac9338bc9cc483467feca511cc433"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/fi/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/fi/firefox-59.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "08b94b2c2fe976bc8eecd8a92a5cbcd6645883e27c4ac807c961e204b59412a55a359207fe1553e66e48846a1dc1fa999f2992f5489292b2f0dd2d650734bddd"; + sha512 = "1694f8d3c051752e1a515c7cd8097b65c0b98fc9d9a9c4a79203ee46fb8985f5f59f664aa86d9965081e625a8d5fe3397a0da1eec5c053c881dda654b1f162d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/fr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/fr/firefox-59.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "6f327a4688107610f89db61dfd61a0ad4186e21e9fdbd8daef48d7d6ca9a97b905f27695e37dcad888495c1d38532546afaab85e9d39250f69f961f06fc7f3d1"; + sha512 = "a525783f55bf894a65ae4cb17031e37863fad6b9f4512c8663e49737114161ba532d10565ca458dc9f21e4c5b06fac13767234e86a9c9d0bc9667d5a2f95a489"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/fy-NL/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/fy-NL/firefox-59.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "97f65158c6fc3b885194c4c94022f43f1adcab609b1e6168991e3fed1edc23eb2de5692d353173d73533d2428cea9898c2c907f85ad7e2c344e34548620c977a"; + sha512 = "42db8068bcaa4b7725fbd4e8525f4473dfd3081ecdb5e53d4d927638fe95429273449eb3ca9c3a4bf1e8d3fbca05d65becdfffedd740af8761be563c4f3667bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ga-IE/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ga-IE/firefox-59.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "56b71aa21687b6ff108b2dcf1c4853115a29209ac5b9b228f3041385bbd6e0abeb170d13a7bd3d5001cc83f58fc4bc872707d6e9e086abe6d73ff288f93f5fcd"; + sha512 = "faf4f2abb020d5f3e9147de6d33b2cbcd819c172cadbf1d12569a3779ebcaa40ed469b40bd77293e68aceb72f773b8895a2f5b6d83c996af3fd0e9c662f8dd1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/gd/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/gd/firefox-59.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "5727a4de97cf52fcd69fe7260460c1fa2cc208bb53c52d7d9efebc9bd9d115b4fb33149372a4a79ad51511c13a9ba8ae1ff83356c65ed566d6e4894dad555f3b"; + sha512 = "8d3f662d27f727930ee5cde2c066044b90de424eb167d654eee9f6b9c79fffc67f516eb0fbc664d88e1f49feeac1a82f7cba185622164bac7f8584e0bd7b7ddd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/gl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/gl/firefox-59.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "2481ff0b2095b8787cc9b5c00f59b027fa1ba0d0ce94010d38f07ddfaf23bb0bff74bceb989fcd4cfd5969cc705191c4ec37b0a47b17f46736df0f7f7354f1e8"; + sha512 = "eb6c41a56c96cb93b2533c7b7750b9d7699e6296e9541397525a4f535316c232dc48936f7113d52f723f7a2aa0c1efe4c0c29f92528e32113a41eca68a9d0e89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/gn/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/gn/firefox-59.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "4e8bbbea63db7e39c421f8a6d9ab7c8459331995010c2bbbf45ca74154ca9919d9591a5a7c8f1266205abbe04818a7763ddade1972ba45b678b0e65e76092830"; + sha512 = "73f1db522616841dd7a36296f4e5133fbfe2c32e2a0b31eba052b737b48730108765667449dc75dc87f7491ff62b1c3391949f5e825e321fb8d9d9ae7e80f125"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/gu-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/gu-IN/firefox-59.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "eb7dee2ec3cce8e2ca965e6bf5f0c6db8f777f771b04188f150f53bbd79a187fa2cbff3a5639a14275c19262c684177262c130523f52b44539cd0d7f826e8eae"; + sha512 = "369e0d80f41fe7f8c6586a634496e4ed1b12f01355b9da2277dbe3dcc2f3e5219d88934c1170843bf7c89e905c810bd670ac21a7f9556d3eb7477a7c899575e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/he/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/he/firefox-59.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "6a33ffc534a2d740a60a104a680a200c5fd056f11d53db22d8ccde52a28b9686600a03a4a030c2c90233ffba1241d4ae9599b1688fcad96450951417c5b86f48"; + sha512 = "2d557737afd4efaa2c8d400e1a4af3dae7c67b4c88eb0b34115236a2eba12612538dc8cfc61118fb2e9cf5e81569a895eb36ca80349d8a0087c5f3d08303c42b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/hi-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/hi-IN/firefox-59.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "64fe64b3c5f8178f9e534aead47bfa044407216d3daf7fcb1a135f72d72eae327dba5b235a724491aa16bb7dbb2e5bcaedc49ed4219f06796fd5f8a9fbe84fcc"; + sha512 = "8259a5b722410b5800158937e85c996f083efd14c193c078dfd839767aec2357ef70ed5ad270c83d9e405e1bb9c7637a4743e49a8104f87f0bed4eac8d1f81df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/hr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/hr/firefox-59.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "0791d6fafec7769966c9aa2233d0580ccd203a1baf851fd8567defd58bb43403bbce5763ab27cccd22d67dbb6afe2fa795557376182588a1d00bba6c9462fe30"; + sha512 = "55a539c562edc8f75c388d0348b329c3d0e96199d9726f496aed4874f30d452600ecffdff8be78e9620301fa3e354dfd43130d3b39994f895bffa3ac9d685f4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/hsb/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/hsb/firefox-59.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "fbc6143334fd5f5b8b44d7927396b83aea34be5d783b948eece034168298aa046eab1131e38f7b71c022ab1f200c3d0182c854ca6bd45f5c835d0eb2632234a4"; + sha512 = "db63012675d589f38e462a68ce7947d7de992ca649e37cbee73a84b2762319c7d037172869717ad5f6a7e685983f702f5cbb44352c6a5dbeff8fa94a3721c3b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/hu/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/hu/firefox-59.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "3b0a8fefc165ba016b6666da429aea75d3c19c40db87847ae782f9412ac98d0f06e834a7a83d3a3bd38a410a4e32b38f8c7a310275950a8676b64f9bc1991022"; + sha512 = "be7995425076aad97886ee769da37fd5b120d8929788854e3838e6f1d89e2f480b0d8a6d8420c45c35e2983b462f56a7824313d90d08c8315f46e87eb2108bc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/hy-AM/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/hy-AM/firefox-59.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "fd706b556a9691708d65d1b3a6926f7294341966ab8f9cea3175334459dd230e0d9d6b4d18b965a39bc60de467ec3719672a65985804ee56e9dac0660903f231"; + sha512 = "460ae88c733f5cb557ce32dc604f07433c6c1a2618de59aad01f1442d58af0ced9bfa5515de3b9404f52f124eed63ce5d3fb4422bf4040c9cc82ef875024681d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ia/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ia/firefox-59.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "508ef8e011e201b74362770a03c40adb39648fbfe5fa099f3f0605beea0904b5e10bf6c2b66eb5ff1e061ec214add46372d6409d2f29f6d7b5a3e6bd0db9dc19"; + sha512 = "2dbffd4253b4f5f76c87c34fad89cc277b7b46e1b042b714523e54ea9216389dc6b4987104bf717e99a0d967e8e6aace91b34fb1f54b764ce592d33a13552b29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/id/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/id/firefox-59.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "871188e46c62523b5fccc4400930c15b1616fb02eb9becffa305f5964644ad749792b95d59df3324ccea38393ab3695d93135cc93ab720a29bb4fd1ede9d5459"; + sha512 = "f8a29ff306fde814c4f928baa89c43fac30a64d341a9d2ddaf0e50bacd0726cff3992142db4c037da08bc89c24bd14246a696eb3bfc8602a2bc60d726280066e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/is/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/is/firefox-59.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "9006ecb02cbdacaa5fb156b774ede6991be42c09fb32039f41497d83ec4337fac4ceff1a9597f14b50c5385919462c11d117486fe4eb5a706910f0ab12b8e95d"; + sha512 = "7725603b6844aec94e5b5b66a2da33043f5b10143b85c8e845b5888a0f6e4c9e417f20d48de5565e2c75147c4ab98754b53486e61489432989e1983f78e7054d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/it/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/it/firefox-59.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "d2f1525225cbc4201b25776821b45362cf3de58ba66b8ffe70ee9c1f2d06b87fd80269fe775ab50e64f02bd6aa95d88085d17e003f59de578868c0b3f34548b3"; + sha512 = "fcfc5fd9ef1e81642497a5108e8af4efa1b34e206aa00295522ba439a8d4db6d7c35d6e816f04a228a4375d1c02e02ac85627c05df6a781f6257bea5ab5803cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ja/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ja/firefox-59.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "e6a2c7993933101ae2ed4f6222ffeb5750bf012b593c80cb96de99bb2911c7736e42b3e67c085591b89f0fe635119204aabc43148f24a16c7a24e1d2fc83fc84"; + sha512 = "ee23c1c8a41aa07659edab9ee1ed40138c60c16f4dda625a4c37cd90b4ab3be3a6fae213dd6ba90451dec79fb55009fb41f95943384620c113245c9c210c3f72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ka/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ka/firefox-59.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "cc6350ac1b36ecbf71b82fb2cb12745fc11e3ffda92ce32be6568e0175e0e563073502381837b1bc48176033637e8ecaacbfe380badeb9beb45d03707fb1a3d7"; + sha512 = "1361630278daf002466d223080311db31ed58abd9b2255ca7c66c073639b84ada919240ae2c2f34d27ad57b4b633ddd2629b6f5fdfa022254c29937263b769bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/kab/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/kab/firefox-59.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "529130c7ef17259485887db4e63efd99dd99bf1863ebddb4f23d046cf5f7d44554ff35905665d5426a7961403402095e0e50208fbb3f51200820621907cadfc7"; + sha512 = "874438b560aaeb324bcae0dc7171ab5394f0fab93c49d45fd1c54e87b16962c0cb1f6ee3279c69fc9fd9173bf4edfcc1813c697e88bbc93e2af376a9dae1adec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/kk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/kk/firefox-59.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "19789148defa05a2707c30d53356d918b0a1629ac5dea1e04d78680f2cfaa307a147484b0ca8c6a72147768184a0097e288e3261c4322960c85c05f5495f8eca"; + sha512 = "6f09ade7005bef3db6840e50ed47037b140c368270a2b302bc463a3f1d1114df978676e459e6a92b90a4e793cc64a18c47096ffeca216df839c6087de044de59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/km/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/km/firefox-59.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "65bd3e500d3f0c1a0f728fdea563563ac1729f101945fba6cb453a2d0d40d6a7291244a6dff81d708db230fbe478dbaf8c9cc410f075f7d71bf316703206c66a"; + sha512 = "96e7ee1b83d28a2cbabb106aaad4e900ea69a42111a53c7f360741e51e0e829bf7ba130e8477a67a1d98c4c23e29fad6e2d2704a58a75bca79fdabf0b3bbed84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/kn/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/kn/firefox-59.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "fbefba8c9313a15f0003b646df86a44924589bc168df68f128bc7773a97cf14c0bf5fe36f953b32dd2d154ce899db7d0a28ceb6d97114d89143f0e872bf314ec"; + sha512 = "f431e3e66f46d50b6c7af75514534fd4d9d71d7b9cfe98b04ff99f80bc53d896d3e7f5e87d9fd81ceefbbda64779a73431ff29c3072af5ea29dee98c1f66c224"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ko/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ko/firefox-59.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "91e62f8789efb1d147b923800a2f4aed54bda2882089d3d9eb8fcc309ee0ecf82efb017ff4de577ee7b3db24c600650428858d7f2ba89c52d6758e010f657b24"; + sha512 = "297b5ab13f213fd1113fed8195cd124a28836d600d59f1e1464f456d782eb39988e17f3aa032877072b4a843cb2c8790377f1842825344917caabf659a716309"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/lij/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/lij/firefox-59.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "a5f25adfc9b5b8708d8188ba2fc7ebaf001b8daa1ba3478f1fa757c3c4bb7079581a86d32c2a99af58f46579e347327ab5b0f40b5d716f88004577b317ff80a9"; + sha512 = "fe44c403b0294f0f7aec93727f2c958b416a5adb6d677af0edfcf0fb7e08310527ba295f5640d2fbb7538841e6157bda0e1db9165e9a6e7655bfff3ad7ced85d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/lt/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/lt/firefox-59.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "29f4a6dd33a6f3667ede1448e7375124037767417cba73cf35c0d35e546e26b0d31eab1640a897eece8e752bdf8fea931023fef8c0f25263dfc7893712aaac6e"; + sha512 = "7791a8562dead380253be7b18b0f67b27346c868ed7638df9d53f112295d6637448a7092bef5ea7e82b68ad662f6b69fec93f6cc419d073d9374176f5fb46773"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/lv/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/lv/firefox-59.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "740ef5034f0609c1060a2ed154318d33e017bc6247e3195b61420e50db7994bd247e1ae3c7367c96b0b325d7bf11d90c2f3e66d199a1d8914f068a33e1b6c2cc"; + sha512 = "f012bc53e80a3de602ce04e60206758cf8b991c68db22cdb822a056cd562c4762fee03d3ae14bd54e1de24bf09e16dadc33b54fe408b6698e6a584ec6242edeb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/mai/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/mai/firefox-59.0b9.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "7a0504265fdc7b8e9dd8e02bb7dbb51bc6a8baf7d1b4263f8d174da277f87c9579451ce4e50ab5aee21969de1aadbe4c1bd6e1262ab925091d516ede981fdfa6"; + sha512 = "7266993340bf341d3e7207e0832d8b0d0e47f0737185c5a1c0f1e3c23e75686835dde771c8a3cf1e41fdec384673c22fc2514f057b07edf0eaac84600c30a23d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/mk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/mk/firefox-59.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "1f08eb3edfcdd0b0b2aa40e3e9ac59256d8b0e7c10043a8847e5880369717ac61abd289356edcf5388a2fb3e41543561ebe85c9767fe4dda860e00c113220994"; + sha512 = "011c66bfd975e0fa5dad697030cc77327ece7fb0560ab2bfb07e976b1fbcd8ad017b3998247fb0800200408679e8f8ea209428c2e8d8f1f0fc71f073e6ca4252"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ml/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ml/firefox-59.0b9.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "507498b1f30bceb26e9cf65dab1e06f64178353587e32257ee7cd57395eb8c62034f272dffd35ff46d87844b74c73ac3b9a0ce39bb0866ea5b9b9a923e839be5"; + sha512 = "13efb21bc57b2f915b54b631fc29aea78c4160cee247b714efeda1111494da9cdd82e338446220ca566e7ed2f136496909c38f1095006c8abedf9accb885f4a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/mr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/mr/firefox-59.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "5093a2a5b7cfe9b2c5b8dc93522aee7d14d60c07e6a80a032cf69cee775d4dfa537a119f931741b7ea86e94aec18bc868f894c017cde4e2cd7ec1397b8395adc"; + sha512 = "555a023464b88f35ab0d194eb51c7a6f2b8cf1246130f04e24465e20cd5c56b59fff0a9513f39e2ab66538cbb0f2bf2414ae2909f3494bb2e75b16e9efc475da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ms/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ms/firefox-59.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "12b1fdd4bce5aaf8f488777556c958bb07cc00ed0370651f198f87b495b2b036e9ae337031c7230a083ab4d067e4c325ce3529f2ee751f4c05e6738ccfe4c8ed"; + sha512 = "9c738b808d7173f1bc67f2e0626e135bed034096f727f2b29154645db858b7d60716664c7d9f97f583e662465ed86487effa31d45bb2177af238aca07fe3234a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/my/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/my/firefox-59.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "684eca0739d3f186edfc0b3bab57fb4b4fa8696619fcefee2f46b453227c543f3b5775615b6983be134410030bde01850e339ee54026bbe898202ba42c91bdaf"; + sha512 = "e870fbc6fa6091904315e2e2e9cc57fd982a96c75a882f2e6c08aab2c1d6ae895f9e4ad1bc396282ae664b03661da0e5ff3dd11f21b9c05cf3e6167e8263b96a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/nb-NO/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/nb-NO/firefox-59.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "5173a44c41092d29fff5468d3133a2791977f079f82e1a82ef424cbdeae7198e7e7382cf16715c5a67916a06ac865ff8a2bb1707fceebb0b4d60e2232e34c351"; + sha512 = "c1507d300fc41adbaabb7db2166f8968a68da47dc99372df9d0ab60b3af75d0ce5a9e353fef2d38f2f14dce6c0490a9e5bf551546977836e7854b26595848204"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ne-NP/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ne-NP/firefox-59.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "73d5c22d8af86f93dedc037978fc3096f0ac453eeb7cdc16d108c24f3a889df7c600da9c1a998af19d2023d9f33f3b93bc1dfe7fd10a1737bc8252c162240182"; + sha512 = "0c5771c97bbce4cf361efbea22dd707c6675d0cdb22d540fe5d7b914cd4517ddd7699ca21f446c8a2a74457356d51ed2cc70d677bcbc1d5a5d4f64e05f20ef35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/nl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/nl/firefox-59.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c77b8b70acfab1aa5f96e3ff1919b04a05d961cde124925722213cbb51c3defecbabc73a937d3ac703dd7367f6d2133534419aa846bc50b6a0785b76283541a2"; + sha512 = "317c66c3fb2acfd2acb7e0148042824040474dcee07a45a26c4b372f283eb0bddbd58d030943f8e4ddd3826fb74cf486cf3c4b83be56d91369c6fcd69b464184"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/nn-NO/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/nn-NO/firefox-59.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "79d725afdefe19ce53b44d658867febdb6127564b85fdb048690fa917caf87ddd4cd43a2fc4fdb40276831a176ae07c47765746b3c50589c5e4b9032493ca55e"; + sha512 = "1145977f9fdee6bbe64732544066c894e8b2f8c28bd6e09d28dbc655bbbd5c777d3844fd20f5893eeea653152a46697c9108db3a83c3c94683e3796a3ada21d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/or/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/or/firefox-59.0b9.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "3af4761495ccd1457b1ae9864bbe1fd4903e6c38e3df9ea9571074998968365deb5ac3b738e5cee24aed2c42a36c8fef3f959f370b2fa42295179110be85a165"; + sha512 = "0a6cf1c8df3a9ed98470b58fa4c7e0ef9f993c8eb97d113b8b0a1f6bca45bff0c8a8fa3155221f73f2027a58de7c049b391e9354dfa853c334928010e619904c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/pa-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/pa-IN/firefox-59.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "1aafdc04b1c4ca43dbd9e89f09afb48ccd0e799f669d6cb2526a9ef5858bdd548a40b53da695ba1246b18d86ac1c3c5a4b8989ff2c840d465e19f6505229c70d"; + sha512 = "3cc42839a5831a97ce300c959dbb40cb91d1fd689aeb8ff0e162a726b36cd3eaa474d544e40291cf049cdd624e776f548b9e0e3642254f43355856a31f2d90f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/pl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/pl/firefox-59.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "16d3cc9cfd18d19bfdb4451b489f921e8c4904d2c47362f9e66e689daba6635204a692a227b8fbc397555671fa40e1195d5c48a1630695e7de5bf0810c00d0f8"; + sha512 = "b5088ed353c3e539b5eb7606dfb1d9dbdf312c77c63d8b290e4cf2b3bc5442300f76b786965f850084e70b8f41ee7dc49c77cc8213cf44e7c7a5204627c1bfc3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/pt-BR/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/pt-BR/firefox-59.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "3fcfa87d8bcec7e6b0c09883a81bee06e56cb5728be74c9e82dfd8db89cf7e18e06e3c8d037a86be63bec3b517425460c2446ed1ee50a98f28cea2699e9b93ba"; + sha512 = "c00b77260782976d795eb523e35034caddac8aa227725179ab87d0db17e9e77a94ffa444410486833ece208e97b6f7060cc7d674f1f6fda68501c8b9cb10b1d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/pt-PT/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/pt-PT/firefox-59.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "4dc9f130aeb8fcdd4861ef4e737c0ba1ab58eb58298c44227c5e7c8d0ff51e307c20bf066f88950bac28a75171251cd3366fd144da4bf11c8e2d12a1cfd9c355"; + sha512 = "6811c1dde13b92179d5b51f0773733e4499e92b6d73082c7cf669026ba06889b8475f6b3133d2093666b087120bd0dad7c23a86066498c7e344239a67ab76bf3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/rm/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/rm/firefox-59.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "fb805da4320ea91c219122e184542a32011e3eb08bab42be173308b0fb3098d2fa0d8adbf4b874ee05f336f1894a24c7ebb9a23ab4b6c50de8b9766964b4b9b8"; + sha512 = "f9aa79280b3a73999cd9e054982629779eecd2c65c38b369d041084e0f936d08139137239951d6c02f2fc340584132f0dd9054388c26f72b6b80081e3ea76894"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ro/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ro/firefox-59.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "5d21af81884cd02cfe18f42bfa1c19b4772274885215aa12902b86dde4f4daa1e1c6f565bfdff64cd8d60014641e5abcc6b7fb9caede2c2c77f01044c44fb504"; + sha512 = "721e05651e1f93f74220dabd9d8624f573de1c3cccd2cd01fea510d6ce511e915e6dca06ab7c1c44610b82d9bd024048a680d3d6b6808e8dbadc0de44eb6ac3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ru/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ru/firefox-59.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "f8e2469d3e5e0702b82bfa9528ca3811a3223c5a753d2952c8a61ef36b1997d1fb4f19ab829ce41485a75fc6fd5f1665409324706b7b1678e7191423dc2966b8"; + sha512 = "b854f3ca801e52a45d34f9c79abe39c365417c612b53ff5929763da3417f0e41e5f9164ae474851d20024e7f7677b92802d1acce53291c7cc54f9cdd61c6c226"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/si/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/si/firefox-59.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "d33d4ad60d2aa0e6aa0751407348c22f4975ee05ae788809acc2cbb7d23f19324138509dbd77a7fc7d4798de265f0fa4117bf4eb896204cae3695cc8c3762213"; + sha512 = "af2e9f61395caeef167f689119f552f850e41233a4a794df669695a6bf422c2a6b450e6c7aa41bb5799912c5ce3da14e6819747affaffbe54f396c895897faa2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/sk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/sk/firefox-59.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "859e5be2c7c383b02a296573e0c4f597de5c7f456febe63cef5a433a3ae7174264032d751ba39b353a4783658ba8bf382453631252579ae0259dc0d95c777b2a"; + sha512 = "d730e3f88a8053fbf9e18d0d7a3e1b86fcd1a0cee6a1ea854ca713809485217df6585da918448cea4b0942c0add7a7b0dbcbf38145c9287fe58b5160baffbce0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/sl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/sl/firefox-59.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "22aa6cacf170b34e12e84f23de8a91f86c64a5e257affb47ad48dbb150c07fb704c06b87f147b272ea0ba706d2355f1237b7e8df882b0f31eb0f8af4a40d1f04"; + sha512 = "ccbe23bbc6da716ad5025a8be3cad89c6c37af7cb740d7da8317b0fa5aeebfd9e1f2b726f04c990675d5fe23af698b5afc09e567b73315ad316a65eb5589246d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/son/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/son/firefox-59.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "d5a1f99c78eca9edb4ce9f5d3c8cc052e013c11088f4b1de42f4af60ecf8e6ecd590318d3cb735c4042eaf4456a8218d8ba479b8164515067a917d9afd7e07e5"; + sha512 = "6db830f248e7c1477ce597d3efea55eda7fb7826097b923ac3e27a2a60300043f56efe2060b13b8b9c98938561310bd9739d13676960ee271a4b42b7ea4c09b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/sq/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/sq/firefox-59.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ce2162089d87c0ed484670f15c8692b9f748bc9c8b5eacd1883c1930a9d1635ccd3228ab6402957563708fd31d13d509c0037a502b51628dc381a6afa787ab97"; + sha512 = "0b1141dbdb96dafd23cbd2a0bb962ac9d41fdb74d915f0480352ca12f1494a5d4eb8465bf2cb44a706fc812d91279095cf6b44abc877e008a4e4dedba5838426"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/sr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/sr/firefox-59.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "36a552b06f5f0e6ed2f60f40f63673706b84da9d2a6fdece3066da5497a0fb93e48d3997ead07c981cce37d59f2a3857350e3de2ef013afd8613368afe9e687d"; + sha512 = "11b2bd7fd025ea46f34703bc000541d759111b39dc0b2359f0f173cdf1f86aad6ff68bdcd346c41281e69e60ce290806f931eaa12598470dc43157d06989d9c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/sv-SE/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/sv-SE/firefox-59.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "f75061addb23de8c846dd4a406392c05d955b161031dbc350bfa9258e0441b53d17400059c8eceff7afd646620923d50a74a46c30bac9a6dcbaaa4b438c65ed7"; + sha512 = "83942b1ec1da58199ee5bc1ae3adc560a8add9505396c8e4fa053a9d9cbdbf6968b436546d3c6ee226f987f6e9555e93d5807138f3801db158349fb11358206e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ta/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ta/firefox-59.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "0a9a047a8985d8bf9c215d08b19be055772f7ca862141f01df78eb8cee4e9d21f39b6640c2031dab9b74c97417c13e69499bb38f3a6dcf5d57aa74b0163e82d6"; + sha512 = "89590ff0ab933826cc4f48b086c0d9515ed8b1cc35f97eb43de1b6cfde1a04b1c60b357c552ff15f6125b0c5103df0d7493a9d4cd62a7a636713d9708d048be6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/te/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/te/firefox-59.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "8a74ab67a8473140a7d54f6eeed871aef3dafe98cea1f983c8dc6f0193b2ab87c6188c276299ad8c9703d35afe6d99c2da3314d764ddfb24b19ea792adf06d92"; + sha512 = "741ab5f836ffb3156a89bafb2e507713a007c5107f3307e50ade2ef700e980cf4712cedb7022111ae387d3dca2bf6787b9bfa3a0e1d92b6993aed55c08f70b8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/th/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/th/firefox-59.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "0c0250960e85cb1521dccb9cc1dcab81a69b8979822acb425fcbfb6b891ed10eab377180fd2bb992da9612803f90e5238e009be9bd8704782e315f4778e3224a"; + sha512 = "02d32ee9682cb161127f578c23e8a6cafb2acaec2faac5af57eb158947b9cd00dcc47564eca1142c6ed240ccd591718e5557bef608c8614ebd7761abc6da696f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/tr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/tr/firefox-59.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "a09aa8abf7cd3da53b079ecb31925c0b9d29defcc79a59fa7d0d0cee7f9e2e797ad396afea73aa567a63c5a282682afb60494d96751e387fec01a271d43c02e6"; + sha512 = "821d3ce320499f6ae048223bb45abfb962d38180edf44e4958c82d3cd3578015c10fbc9a12dbea2a19b9f9bdce81afa2e084ce1b2e1ae4f150a409c168097ebf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/uk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/uk/firefox-59.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "3ef5452b3ebeb18585780b315851a0bc666e3fd6f70ed0d12f7b2a3c1db8c4ce98c15b73491d89f600f9066d1a2cf110bc3f974efe7f8cbc44db9d00f8783654"; + sha512 = "b01917536ac7329cbd8560830d232d0ae4cfba71470a6ba7bdddba0acb0a2315cdae7592b6be2014691b0a9ec932460cede4de97bc65827c2e992aee25556c87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ur/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ur/firefox-59.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "571235d2376472bcf4bce379fa066d6d671d21f3edf87088552be4daeae5dbd8f5674878f5bf5c8f47bbfe3bb6d0e08d53e0d683c69e655a94bf39eae10df4c2"; + sha512 = "5ddcec95a40fed0b9144aa47a2bcd221c1024dc6499442a6bc2a8e9d51d1ba1e14922153c6b1b8eb8caf6d130cecaded8cd3638bf2f162d236e4fc14c99e92b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/uz/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/uz/firefox-59.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "e3e3490431e88e7ad326526f1415feeeeb1f6db788d3fd1c5788a90aea015121c62ae6aa2697e490dd39bc1c67442ecd1bae9a6cdec8162bd389b72b0cf35f75"; + sha512 = "d818d822ca7beadfda32a85b0f27861975a34e82b261ff4f199268e9401e2d4418457c26fc8f718bdef776785a9060b0a2f482787efc9ad08cc59d12650d908f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/vi/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/vi/firefox-59.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "d507fdbfdfde7eea5139ede5528d343bc4e993268d92f710c6bce409eb1c983ed83e2b97630b982fa525eceb020a34e7b4f63f3764fea11d3b0e8f95ce25e04f"; + sha512 = "4aef450810df8dfaf9231e6c226bb0eab357b4aa81b7b3b9854865adb4cf09442c790c1a0810975527e39d5ccc7d9f28f7da367810b7b3755ed5f0046f0a38ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/xh/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/xh/firefox-59.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "1eec3a1e2a4d64c4f28e1145f1ea76b477bcd12e394c1bb6f9e776ef3d8fa288d7daf377945b84189f6d6def6725d4b176db54bb4132ddbb63ad20ba8227aab5"; + sha512 = "bc8a2e6e7b9950f07da39eeb37a0222a8c1b44bd3d652f757b07ae73d6a9afe0a4a9cbdc37d20ca831e6a0b12e9626b2148ba615e037f16fb7bc77754d85324e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/zh-CN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/zh-CN/firefox-59.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "7e9ca87faad561adacc86fc89fde2d16d4e68f07e88bea28bca692244045664c888c6d8ebfd8aa4d29e9c2b368dc7d5706d3f622ec720f9e5e5ef9529722f3b1"; + sha512 = "c61183482ee9ed60ce99e1efe20aa90cf7c8ffe0873f884880ed1f47f4737f82746ad47eedc060f6bf2b4b13b2eda01bee668d4edabba5312db828a5e7a63e5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/zh-TW/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/zh-TW/firefox-59.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "e9a95b406bf91651c8efb22ea569a5e2bf056a18ae7fb9a2bd472416b1e26100b3fb1fa9132cf1b96c228b585c30e3f158ffae1ef8dd272408afffa4283a18d1"; + sha512 = "3558599544d654652d4dfdd58d628134093a7142a22a0a643668a07bd2a773fa0ee350f6ce18d81bbbccf474a26ce643a3a910399687da61461c336e6e08c6c0"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 2221100f21c11..0fbe6d749c2f6 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "58.0.1"; + version = "58.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ach/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ach/firefox-58.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "7b32498fed47b1e0a58b399436c54ccb784a870ec0e8ab7f789218b17a168d0968666bb01abb456c4d0f6350a7769e05eaf2a3a6a5f3827a42725bf7704ac941"; + sha512 = "4f974e90d5db09a02c61a634f7309ba479f8699d1d61f4c21a7bb6ae5f520332292031ce0988605f8e727da5161de1b3a055da59d5f8bf220c1b369f9c453f17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/af/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/af/firefox-58.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "12ca5365ea453af0ad4cd4c296c05b3dd99e713e46aa618544573c1023a7e1b6596d91d90fd9bd5a6a332624d985637bb12ffab20548dc808c5dccc0909e3fae"; + sha512 = "d821bf5c1fa1bc38f64195d1bfbc7ce5205b50139710fde6e1db37c4a429a0df16ede8411a618d8e339f369dac699a38651c3aec9952d7c20fb84e1eaf1f59de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/an/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/an/firefox-58.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "7da1af63fdfa939724aac8c9def9b179bd2fdb37f2034e9758f4578a682c22bcd0803fc2e67412d2339b722eb269cffa96863b819d6e390ac01009152b00c90e"; + sha512 = "7238e49735bab7983a478c217b128d7cc8b07e90fc5e2739eaf07e35be054a354c5c0006bae6fdb29ef71855c33ea531e84c1617832412315eb2e07ad7310d14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ar/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ar/firefox-58.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "1e2d9ae0ce968803b6ea6fdf9841328a561c90576a5849e3ef1e89a6f5ea0aa70b2179ca0c04fd89b829ce21f45d3eecdca607a07d64e6c16a8aa06cda8333ec"; + sha512 = "f505930eed9262e595a8969dc86ed43c04f32ba62301b2fa8d1246ef956f3075d5633112e6129707ddb02d3047b93a5c9f5ce16f958a06ad928c59d64c8a1e75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/as/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/as/firefox-58.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "c40af34a01fe616e0924993b267cbf498a21962f77139b5aecebd6e1b6d17464685c44f435a18be018a00761e40ff3473a205d55c111be954f379ff6540645c9"; + sha512 = "e1b876dee0ac09a391c53f066f5bf56fa6b0b4bcb389beb0844670a7f14ff422a230f58389f3c3d2a1f8b7486fe528a7abbe3b6abfb86c330ea13cab0cc67a7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ast/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ast/firefox-58.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "81898690a8c7bbeddc0c89a2e6c91082e37016d86815a79b2488adc36cbea3c0b669221fa9951e4fe4880f777c5c0be9e9728549d01c77e592c8b1afdb4a629d"; + sha512 = "1c47fae696cfcbdd4f7fbbc8ddeacbfa1ae1b9a624bec9f512527b99c7ddd63c99fd55b60ae9a3ea1104fb5b943c8c029b19b93e6426de793788c2a5354a0d57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/az/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/az/firefox-58.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "73ff9c0be45cd7d5f70abcb8e397e9adc777383b793a78c6907396724c78f9fea5794a8a138c9c19f2d0ab46a0133da69f6e5c98a15a8b120567c22bebefcd27"; + sha512 = "5c3bab4ba81967b957c14152f6461ccb129396562ece07a34644f88b67185f9d6639ce3bd709a463816efe531c6e8bf3aa6414828feb37ae54564d1c9ae237fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/be/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/be/firefox-58.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "19b581888cf07fe9cbabba66832fd62a803920f2a39b195bffd8316b3100edb4b0c628d0563e3d6ab76b097f8e038310079d5d1a2bc2722bb78ee5a51b4bfdcd"; + sha512 = "8c719a8fcaef9f2f3ae50d0ecd999972649b5814c1bab45a418c474b6090bbcb47d58a32012f3ccb6c785ca9a1c76cb2f69e370714e1533349806c3db0364dd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/bg/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bg/firefox-58.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "bb440c3132a75a7fdb0c3886af57b0650609adf3992b086d9ded68be5525c6dea292de0ff51dbab42968348eb8ce8c918869fa40ab26126cfe775b69a40fc5dc"; + sha512 = "b871aa3dc5e4721174e73081e4c551f802a16cb54690ea1850e549c37c1160000b9eb0e312fe03e43d8e254cfc063d971625624a6d0d7a8de14f731d1e139135"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/bn-BD/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bn-BD/firefox-58.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "5d7f7a98bcd0f927d1911e4d1a7eb79640912b2944f7c335ba6c81eb6e8310edb26917b9944272205ab2e90aecc28bd9208ffcd4049aa0a491f3e5671f21be8f"; + sha512 = "53cfa7aa2bcdebb6770d1d993d71a0fd039eb540884d0dbe3d0fc953260a850bcdf72b20eb67d11630aafa9f282cab279776fa9d5cb45aeb7280dfd064b0199b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/bn-IN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bn-IN/firefox-58.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "96ed7a7c7cef4f88591f6b1f2c4d683d1b39220c8ffdbee9db9b9b470cca1e1902b042b10e62555ec614cb2b0ba560972042c4e65f5b17a2b8bad78d3c456744"; + sha512 = "a47f5c6bb46f6f4a2af27a8dd1556339ba5efd1b2c23494b0913033580dc735097eeefd58a6c0253d74c8fab30fa628d106a0f4111b0b5af5f98b1dd2d9d111d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/br/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/br/firefox-58.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "9537b2f8edc30d76649e7be50f1ef9576ebd8dbde45c6a0c685d846ad2ee8634b80060449f01ea60926040e1bc6b8d8c49346bcc69fc276c4c6d3142e9dd8d06"; + sha512 = "b4dade4de1e40f8ef6c1af9fa260f7e06bbae6790a87813032c35317fa462f15905fa8b66c8b08bae640186f1fe6d10c15c87d64085d6fd23e5dd7a33cb9326d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/bs/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bs/firefox-58.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b9cc1e8d570173f283a77b552ed99fd4546fb1f55a1a5e766d6f441e2589e615445c45317c39043d98ae8c4f77a75d80d0fef9bc20944690fa7c75ffd4bc5ed4"; + sha512 = "d32cd117524343cf451b30526466b84f84a7ab99f6e716ccff5c1c7e768003409723df93ee8839ca00d3e0a52cd9cba270f78033124809e4d18942bae9c736e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ca/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ca/firefox-58.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "dc263ccc27c14d7aaa9fb66a9b9398df48d3685b2e2c3493627f279d5509884293121316cc8ffe3aaeb200287d1e0438852dc9e4c02f2aa525c2f16f9a2b510e"; + sha512 = "c4063632526c6936e71e50a898077568cf678a8f9275258311bda91ca0a150b7c30b19b86cb12bbf786624675ed3f383ba21b52545b36f8ef7032ef9001136e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/cak/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/cak/firefox-58.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "69026c93cb0e48c3b8790978694642cd6e854203a2d78bba48ac922906cf938781bf1c1dc5316eb887c89b9933132253d378233c3669954a1182d1d7d4145e3b"; + sha512 = "cb1f2142d698226ff881e9b3a1037ddbea1bc3ffca8ae98a7526bc3a6b728a3e30957196d809d523a638d7482db3e60b774de8f7f274c76982962026cebc0b9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/cs/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/cs/firefox-58.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "4dc64d4fa8424b85713a566b0cd7373e352624799055ee7bc0879ebb93008ca6aec9f39f0aa657809f7c7a70f8473e731279ef7b3ffa16ea5132d01c83e5aaed"; + sha512 = "8b17ed6a66081f445319a6e329710350f79751388e1cc6eb6f5945e0c0e6145053904ee2a1c1a562407299518eb8d97a52d86a0d4807f8711ee3ba6521f23820"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/cy/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/cy/firefox-58.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "85b7c7210429d5ac6120629a033347f1c13de5998b83276f3b735ace1f4a62cd0f201e2312e0be6d7f0607062688402f687e593b93e92439fbda14367efaad66"; + sha512 = "a679e779b6afda954fde1bfdf079eca62e4541bb5c0398e8fe797e3ab8341922c279d1eb5d4f237995d01d39261f9b6f814540532c646558b10cef178870d5bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/da/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/da/firefox-58.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "d902f11e93a23dbc4a4e2340926134fadb2a251bb4b00de1d79bbccc9d21de35f99bc2d4469cee812b15d95dbeff6f4388649d27fea020a54b24a59ef3084634"; + sha512 = "81771c6a78ff9349ac8086dce32900544d0a8b79eca55a61bc1efde34788a77fd41607c43403bf1df18f2f6aee8b61460e113ee301c2888494a970600fb4a371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/de/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/de/firefox-58.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "558502bf31db14744aac18c3efb8e2b0189a118cdf080621910c9cf15a05b1bd28fe1b2f5e2acad678ccbe9769ceabe9dec0b7016f1570ae888f9c3fad7fd6b8"; + sha512 = "cef7eebf9dd55af3d7245161c6f41153b99cefdb73e71c5cfaab1d8f1037c8da7ee2f36836e51416c36f7a7472b113bab23fa6a35ce30269733889ecd4aa1d5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/dsb/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/dsb/firefox-58.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "89ad64c3a489a0ef30099581370fffd3743c1857d12fbff65f6387ecf1503e6e394ee91d744847b6db3611800fa195de2e4d1df4a2ec9424436348c36b6731c0"; + sha512 = "986c25e9f994ab766f4017f664304c03cc0a26c8ea50f892d48ff571322aeaa6b76eb1f4c7f1133a68783a9f55ce0e56a6cc599fb6eae0431e5bccec639504d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/el/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/el/firefox-58.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "c7f77728e18d63745cc6385f7923e673483df76b6e8e2ba8f39cf635bb94d8243f9ac1728c4ddb5b94e316ebab026a52871e9fad86276dd885e48481a6dc1edb"; + sha512 = "8d352b56ef049e2bb94952ebaca276dbfa4d7ea34ad368907406b67391d618e8aa2f908c19f3c7210220237d3721021686bc8fa0702c748680035a48b9ff2c4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/en-GB/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/en-GB/firefox-58.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "f76ea7e2d15016ca779a5b2f1bcdeb3cf1607ba4b570142cebb60caba5728be65ef05179ee7c5a3029ae8e21e26ea759e7b754b3670a0b6debd0da4528720078"; + sha512 = "318a67d7d875a350e561a2a4e0f2d6278ce3a9f7e2db9ce307c58b5a2ffd40753edbfce01438c7b02421efa84129f95caf3887ca2929271ce5fe95f9321db11a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/en-US/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/en-US/firefox-58.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "ad5b2b66a8579ad2f3a9ff97425af7e9c7ab4235cf44a5684ad481879ea953492f0639fc79121be9f808bedba80e3c0205e43433b99a1c8809544fbd1bb3808c"; + sha512 = "71f5d1d3779eab4025ab57aef1795f9d6c509a50c5397df6a8ec741584d441acb9f7cbf8c8c002cb367c9c42b72dd6d29710fcf0cfead3a4525f2ccf39f3b930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/en-ZA/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/en-ZA/firefox-58.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "aaca4fc5bb264e0f2c8a5d783b3e1e53786403d01c157d8ca3a87642a3668e839fb0d5e204e96371dc442f21bd66e589ed55b6a76d3f50271dc0345da8059eb5"; + sha512 = "07604a360c8a932fdc161b4c2762e953812eef7cca765db29bcf0514027a8db3c22bbd879de6a1222eadbfb817540ef55e136df0df858a21c55ab4150cb3d5a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/eo/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/eo/firefox-58.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "f49f89c5c6fbfee70e47a6b632de5b92981a23b54e8e9d7b47ac83ef18bf45d98417c73cfbd06b277b67f94f138c37ebbdea4f1c756e4229d8842f49da6a34c1"; + sha512 = "cdcb32f4b5e14a11033f62ec7e4ba00fab689dde93978cec405d55a497fb6a59a9c06839e04b8cd550557d37f1801bc6f9a9440e4a59f3d4b32cd2a27ddbac9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/es-AR/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-AR/firefox-58.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "d04e9a28755ec6de2021b20f72b32ad6aca151cbe8300a54ace876878d8df043923b6afb3b186e5ae3db6345216eeebe9f97978a4e50d9a0a854207e5503a3ce"; + sha512 = "aaf28d1b93d1eba50eafdc112f51fe261a0a38bb9e28ba4d86c12cb1f509d5fb375986e7a7e7a81483aa64bcf16f09620ff325674c29738ff62335d8ad1d1c7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/es-CL/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-CL/firefox-58.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "0251f56864a79cb38ce5c5cb3908bd1691d2dc15b1198d901a6907f47f1a15385c931538b022d45f75ac3ed0eec7244a081b79c1292bee7a35beb24ccc307dc6"; + sha512 = "f30c318fa51c551fc03bf9f962cad8fce4795094d1389c1a35096e8e229fd1d78dae43cfb6c01f2600e7f5fd8efd02345f2c18578e3bc0378fedb947abf5904a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/es-ES/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-ES/firefox-58.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "93a405ef018010d5097ade9f08c228e31b50e76573b75cd2d04205d89f61363d0b8f24585f4e08b93eb8424367d90213dd32fc85ee2f7e28a1ef2742c1c31b3c"; + sha512 = "08fc4a475fdf2e91550de0b5127df679f4011cc79af6125fb117aec44f97936f794fc0135fd381abaae4370b7343c200308e0cc659828fa8f8e665f39c4109cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/es-MX/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-MX/firefox-58.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "4286767ce5866ea0b6f1b41804d92e54361e4defa8fa59b7721abeeba402b07ec3fef051005c083d65f6fb32dd37edd2253cf8ffcd28ea9109963500e4fa3332"; + sha512 = "baf9277fe32334b88be4bb6aa5b714e86d6d316866088173d0bfb221ab989708e3b67dfdd934c0df80ddbbcef8b2d78c35b33b1420332b094442b31aa62b6ca7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/et/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/et/firefox-58.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "f9a11e6b738a09a9f1eb8834f4932535b828bb1c8dde449b14794ac03ba4a37089ecb45b015daa2dbdde2adc2531ded5d9eec83e70b1ded4eb642e4dbaf118fe"; + sha512 = "eed1be0068e6efba0130658c7fe5104ca0fd9c7485da0715113ac82665a153836e6d0eed083c91a89b4f8c11eec0fe2c0f8ef161f2bf7f565b6689f5978a454a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/eu/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/eu/firefox-58.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c6015ccc4598bb2f0d5bfd12a962d457a3868552853ae6b053c3e40c1668fdf140a2bb791ecb6c2fbe283371f8c1e8789fa315e5a6c05b9b593c413dfaba1351"; + sha512 = "d0bd609308813d99a79b393dc4fe0960da01ab032ada1d4c2933c89acdc7a1016ac25ca67205aa29106ca12b34fe7dee42316ed457a4e0cee9fc43e3acc2011e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/fa/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fa/firefox-58.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "4bfa551b23e62ce7a92136afd09e233763abbf36b536340667ba487e3c491a269bbc5e508d196771edbd1745a294a14d3f51ad3d4d79adcda86394ca2e7e5ad8"; + sha512 = "cde046bc147e860c40f979f8fe1bb39cc3391939f2b04f572d6db5a61be8be9574c1ddde1a400d16c06c2c6dd87a9b19830f2591809439820a27349d10860801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ff/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ff/firefox-58.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "e24f247816b7a633c814275a1a858f0580e274285a3875e0509ca65027bf7f39d2f56709af6454187326a7b0a5b20408582b4f16993c3580c5bd67473726d902"; + sha512 = "047d9b2af90da36699cec77ba419db42cf6ac63fd3d9185150973fa6aaa20cb4bf23538e50154f03bb3edee4f16985baa4332e247ccf7d756f358f81afb2c329"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/fi/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fi/firefox-58.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "5ff4c6daa231072927b0af6482992859adbfad7645c5c75666c4de69930bb809541c756031b4309fe81b776a434af19badbb285f0f68ebfef4a25a117448e813"; + sha512 = "5c2955e5c1e54bc0b2bfa08051ec61745765b7d9c970c7ea905e41d4ccb22b32caa3011a64a152d997db1f0b6451b10116060914c601aaa7a240f23cecff166c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/fr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fr/firefox-58.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "7ca09555e939136ab336b70343f889832f3dc585aac2f6b3853b628b5db5686f56b97a7c9abba22b5ed7ac0d2eb9bf93ab2fde8ba992d9b9f3d2790130817e43"; + sha512 = "e32448bc068d0c816c16ec1b4c53d462da430ca7ebca484dd363253e9d47277a0eb40ef0291b58e7dadd3457f49fd69d452c2e7728e45a1473472a2523c24028"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/fy-NL/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fy-NL/firefox-58.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a5d2b78ad7cd9e1677cddb3889d74598383585caad7914ee08333e96c7e66b4b81d5d2ac13432f694dfb3ed5f8515473839317b68f06f4b3708fd02994240da8"; + sha512 = "9501fc459c883b3d7c3299243288aa5210755d78238af2f6d79e15104ba575b4a7cffebc9c067dc23bbc0941bc5f4a786909a194bac9f1f59244715f8b3cea2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ga-IE/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ga-IE/firefox-58.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "e1b28c3f064c190bb723373326f1f023821a2192836d619f23dc6cbb424e10376d307a895bfb1db5062a85037f78c3877b684ea1014da205caa4bd284370803c"; + sha512 = "d7696ae4b38bfdcd93ffc6796bb2fdd6b952a5892a4a753b0a0717c0448ff59263516896dac2830aabc7b2df5719856f077450d29a48e25fec77bde00cb25d4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/gd/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gd/firefox-58.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "14b98f08cfdbb6ca0c18afef9fbe4d1f283ea2a2635069aa8426ef8075c2e63d4b348c591d556832b3ed8a68dae6e54d9e82dcb9e1dec1b26d6de3189ec6cb9f"; + sha512 = "ebe7526f32d43572538bde521b4df30aff91eb1a30148e20a164cfa044d7391bd7259486c72e68f9c110745e9013f36fa8c1f5be7519551c303cfdb06d4b6008"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/gl/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gl/firefox-58.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "61473be66b6109a156c6fdf73222167825990dc1b85614ca7ec20c10948ed5a3fe6752361255ed73f31c6f1013265aed5d59a5ae0e184d818edf388cf5a33fb0"; + sha512 = "a071ecc811b90c102dd5c7b4174d6cd65e7e07bed16566e71740cc3d29446757f220330910aa3a321809de3417a64641ee74b788bd27975c7ad75cc4e777116a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/gn/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gn/firefox-58.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "b1706bee4fbc84365a26f733ead82f95db6865c2d042fc40f97e9e1e2ecd9cdead2bbc8ee3acbf62cf288f5c907ca4b9be5eeba0ad92dd9c25355491c0849696"; + sha512 = "1bc8f57884cd4af64e1a99defaca501561d84a70aaa3f4ee71c3c1497a4829248e2f5fea5b09c89eaf8d3701fd4f9753bdb50f6133850d2baa1708e942d8281a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/gu-IN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gu-IN/firefox-58.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "7a04ad824559b04709431e21197aa9c93a6afae05893ed29922b039b4a4c24ed27e1b091d06e948cd83f1b7f25df0a67477e22b9ce288dfb9ad805b3f43f3cd4"; + sha512 = "230b2c609b5ff96385b93ece8ac197910fe332ca76300dada12a0687b025ee7781ded47bb1a13816bb2fbd6c7e250bd0af8f4b40dd78c1d75a77a66391d7bccf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/he/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/he/firefox-58.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "3f00ef9afa945f41b8d84c45c314a76abb2bdd219ab228387c3ac1b548948d9ee6037f1df6cb5b0de294a7920e77c3a16d2c687727087e8c422b2f37ec3beaa4"; + sha512 = "f52add938bcf862c8d417709298eae9e502aa5845d01a349b9a8d29ab790ed342b7bbbe615fee6db7e939150a15a2e46895d162544ce4028806bd68c0c832186"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hi-IN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hi-IN/firefox-58.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "068bbfdf10900f244349c65913772e3565510d73805cdb658ec346c4eab670c91e8c886ad085a469df74bbabbf5a1cce5a9b845c24a9b155f96e2b9749856f15"; + sha512 = "10406b782c3343fcb63420cf98690ac6eb1eaf9024eff226066587c356edf32006e288e8ce6373f6fc1475dd08c30da2b38cd284ccfd610c33c3726c91dc7691"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hr/firefox-58.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b965b136811d174ee69ab3424fb15b24f39a59b3261eabe83d988cbc8dd639d4b0ec82285163a33cea1be52a3671e2763e7892eccf176cd286cebc8e9453fbb4"; + sha512 = "8fdfd613b9ee56a9da8f8c1ed1e9c9a6ece04bbffb1dc197120c9d3aeef2c36d9d660a44539f4c1820273be91dcc30d89652a9d9ecabe9bfa88b146fdaef18a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hsb/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hsb/firefox-58.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "4b3d92d245f9d93980325080b0394ce9877e0a6e4e2337cf941e5e72becc0125e984166ee30e81b45f95ba9a562b040a26f4cb05114beb5ab18dbbcf968a32eb"; + sha512 = "4e1cce7f55a3b66b21c0f8f16661855b2946a403d6f29e3725aa300fce49bc065dd7719b9203e79b3ead73dc92220a40d2f99d9079eecc8ae44a38b87086394d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hu/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hu/firefox-58.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "42b70cff446c60a2e8388fb16ef3d2829e46f420169b73b4849069ccc75812a10d4a74af7ab19ea78566731e51cd86aae0c047f66fa5c9eaafa169dd520900ab"; + sha512 = "b636ff6691834dbab712be03bd3dfa92f8a0bcf5e4807ef77e81d0a602acfd1f5df37e0c5a2237518305e4a9150fa592204f84e93ef83273f84a4ec34f65d3f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hy-AM/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hy-AM/firefox-58.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "84f001a101ea71e8675b4ed7c359a8fcf8b1dea72bb73ff08c6e5a2383abca2e98da32f9d5da31d86291a5ee7f156c04b033259b538656fa17a60b3f66dccfef"; + sha512 = "909f565a687d6676175105584b2042af8cea66a2da1a2d529954c1a3f5f98807f655a20b1b16d1d80a9af05c02997d543055bd2edcffaec4fb0df0da6e610ab7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/id/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/id/firefox-58.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "5285ae283ea21e24b0ab04c767bfac4d4db9be66a2716934476ca03755634c333c0e96c367889760137e584b2a58c8cb6e9689996038149ee5b568c2e4eb499c"; + sha512 = "1338acae5fb5d477f51d09c8e49bf29ea4a7ac1a86d2b8bbfd431af2faa7a2db19fe5ae61650127c0f10a40b37a464bf7c67e4a4d2930bdb0dd04160013f5ead"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/is/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/is/firefox-58.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f1e8eab99c650cf0e4c0d836c5143033b7cb2a9f87f81ba5057c511dfe61ac08778db8762a683b38dbaf2fccbb70a38a0650fc01dfdf8d59ea12d7b31235ca39"; + sha512 = "6bf296d0e64ded43518b30f2b064cc99ddad031e8ff6129a6a9bda4736e93cfee1d2a9c0df96e86754762cc0ef38fa9cf7d79caf154c1db8c5ba57d88abfce0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/it/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/it/firefox-58.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "ac877c6b0783c90ce4c44f96144d28d416af43710fe8ad6ac6c56a4847c748c2411dd817b1809801e4d96dddd301466886f45030e74f7ac1f2afefd162e47dc2"; + sha512 = "c46ab44a51aa21b23b50763a6f35c5418a03a847584a1aad3560f62a828d2f859c912ead26d1a1206cfde73d411bad31bc87f19c5203850712bae911dc86fa44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ja/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ja/firefox-58.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8ee911c05a31230df94d7044de5dcc549b5fdb9779fe0acff0d0095fe45caa13fbbbaf6e8018389222281bfd9ae0a416754836105e1f153467abb1e1db6b8245"; + sha512 = "4765ad23e91c8599b6d1144533b7b24cac68b77a91c197e6e505a3be0bdb74f60bec2c49b7e7338ba994619d3969c00e5b9c7ba872da4958be37ab69b772d786"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ka/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ka/firefox-58.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "3d5399531290e30c746657286d0a01c03009d08b777b0155ff4a7a5ccb4ed8036d7d6d79de8495e75753aa573c4ab14c1462fc73ca4a0cc93cb5a5095cdc5454"; + sha512 = "2a8aee12fead92872c5c94a319926aec87a95e891fa280588737b66814aa7378c5d7240a3c5f50145ff23c7673767037160d043b655b2a96ccdded6015254f4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/kab/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/kab/firefox-58.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "690cbbbaa4fe9947189623853ef4a1a4d0df2d73ff50118dab40ddbe57ca772d59d85988d8d30216bfba835b827cc33eb96567ff9f2916514497b76a8e4c1c93"; + sha512 = "6518ac1276db195c2435160e619dbc1ec7494e51b06971fe409f46ead4af6367567a99356f6b5e353c024a8b9e51d2c2f99983d50709fba2e12342b0084c39f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/kk/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/kk/firefox-58.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "75199857516c970b0ef13808b2a0a13a837643188c3030378bcb010dbfc8c970c4195af4507e32fe17f94b9e1f12b41ddf80f914ba24b1431e6cd0975a334420"; + sha512 = "2d515605c00f1cf2e76b26dfba3d4fbca00da18bddc5ed39f66d15568b15a2bbee0f1676d2b1b5058e11399ecb3e7cc593ff040757fce76d82ca859ca7b9ce81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/km/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/km/firefox-58.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "3733a9367ebe2a2082e2d7d1a5e09c13a1a587b13e7cb0bff3b4fa1d9c4fec5077e3b9c5156affae4c90ac035a94acaa3ca5666d6dd59ac6d2dfc6a4e9141f28"; + sha512 = "6bcba0015fd5753f7ab6725197fc164723d64de0790927115a0c06d0d1d92fd39bd41d83ffe59a5e9eaec48224c24e39f26cab3ac1bef6265eff8ad9a70c46c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/kn/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/kn/firefox-58.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "767521f281d9a369569c639cf14618f79fcda275cd2f11a6950e91d0d88843a70dfe6845bc9dabce4229597b92e8562a15af2caaaa511e578601cade1a5dd057"; + sha512 = "5fbbffed20a48328d2b199626a9810dfa6bf9cc84f358d429e7986d813c1ffa37fc95eb20a37b10bbf728e4bddd3ce8635c096b7fc4a4dabe462a32606a6dd96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ko/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ko/firefox-58.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "113a28ea22d0a2e79f66680471f8d5974abbca440197590cfee0a934f40403d704ed35bca5be9a4164b740e0eba8292f6e0096707a288735d34a2b77604b8d85"; + sha512 = "2e7f5b385fb65b167ef1784288a68fdde29a3345ade9eb873a6e07a340c5bf76df5769c7771fbf9049eb31bfc5978e20c143a2e753614237b25a065e0735313d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/lij/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/lij/firefox-58.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "36f284f3605e55ceef29eb4e88205524df8ef1e92f7d1851427c4a4fbf6859721d6918dd4184315743b7a8108a1b85aa40d90189d46f3763c3fdf6d5b73e0279"; + sha512 = "fe436e3ab07f3b139460ff385e73147572a1becbda1ccacc0da6a6cf1c49ab3e1424e9b9d8e26a14a2748e5ac9b0c67fc8970f14f5d64975ace3c6e9949f702a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/lt/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/lt/firefox-58.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "d56da7e01024210a5ec486c410da70c63728a890c319e4496f6cc33efae41c554aad552c081f3b4777f1fefeec7b6b6d331000608ae4c7b128bcfc726d6be5fc"; + sha512 = "b6e3d248f7a76c4a202c767710151067031e34a08ebcc460f4d6bd95fb395533414d6267daa1d9d8172097aa4ae0155ae693e027757c93b1cba50ad9a94f3cc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/lv/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/lv/firefox-58.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "d5a0f538a1a5860229e1a07d89cd0a7ba6b78ec049d71978bc0791bdb1e3861b8459962e8bdadee996d2abada552abad4f81002e7b042dbe136feee3367fe3e8"; + sha512 = "7bd3844aedf8112d396f07e1d57ec915e48bec1c375c8489057d7a3f2aa5f93c738d2d361848b977243b95b79a821848c2b27b3117a26fce9054d26e4621522e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/mai/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/mai/firefox-58.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "2c96217b38ec9fc78d025ea79a934e10d1d1553e39480d1dbbd878ef774aacec5ecbd63baaae1c834c44acae417605aaad5e748ca74f5814af83f862812d1d8c"; + sha512 = "d5e6a53c7744ab267404d9107665e6f55acf584c11123d0e9b4a82f6572ef815fb87f52ce9e0be9352ed7c4af901819fa186ed57e4a313349ddee680727b0343"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/mk/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/mk/firefox-58.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "64fd2f8f140dab2786063218f1b6074d8c8f9c5dd506a737676afb9a68edf06d9800e3c9bad3dfad8fceb82c321531ca6fff6a97856c952dced721f0d0915913"; + sha512 = "7c49cc95a233c4662265e3fe57e87f4320ed120309599f0f78655a9e70b87ae36dad915afad2445cbf55c84e906c3fd2df4b7f84db59323f4629f662f6f2af31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ml/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ml/firefox-58.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "59036ccacdeff45c27a1b737913e54c0e06ddb12a670c1549ba26da4b1d99fd2338a133e1b15b1fbb673df2471b5cd5d5d4061ce56c631e37c429351da2cbceb"; + sha512 = "d1aed7e78433d3b427c215ed0b2c8455a8a0374bd4e2d88d7dca59c2a3d0402ce1670f1dc1c8675cf7953416fd4be584df59ab646783240f3aef14cb9474c91c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/mr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/mr/firefox-58.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "2fbac808598aa7ce028f2d922fa55b49174507b5ff6e66e1951c3f579cdd051ae4bcd28edfaabd2319dd7286b08d35a0fe33ac2f63c628d217b8f43b89dc23d0"; + sha512 = "3244354a154372149da8b0564645ac5b827176c6eb79a88a2a182d2ae7a5e320fc1f843c1576eee86dec62d2866f6648403bc9c687322eade1f943717b655771"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ms/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ms/firefox-58.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "52f6857cdb97b86cd25b0926d509405a1548dfe310fe088c3b27ca77e87fab585faf4893e8562d55fd2ecff43eff5535ede306abcb57bc2ee31a4890530a27af"; + sha512 = "3f753476dcd5f128d7a660dfb9e1003f706ba2b2a135df629bdd68c8580e9bd47f23b5fe3ef77136c8e6611f434bc502f96eef4b7f7d6185ce7630bfd1f32e24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/my/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/my/firefox-58.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "1e89a3a595ff4b6a1f1044788e34266af60bd6b6e0cf94c64af5e50ad074e7a2d405ead7210e1b55622aeeca3255f966f7f500e38e639fc2677502385e4ababb"; + sha512 = "b83f6807c08c08e7245bc1c5309e2bb2d3d434a577f672a9ea9e95017b61993acbd0df9c339a4fff4c5e65c589d939c57477ba206194e7d09ff140a8882d2e52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/nb-NO/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/nb-NO/firefox-58.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "b14c55689f787e4a6d4edb504e701d63b36512ae49008249f1fa34cc7961d58ad0b0c7f1aa76933afbcdb76b8830bbc7620580347502acc0712b500dcfa34f70"; + sha512 = "e59931df86dff00b3ee55f93b01e4828a60de0f693de412c4825dfe7957c0bda8b9644040657036d5228fd7b6f4e3a93273d561f14fc5e9d3d81cc5c708f0f84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ne-NP/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ne-NP/firefox-58.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "20426cd45c9c2c5517587eb2c6d04426eb6c2d8f7370d690549dcf44ae2d9bfa823ed359655a75be83916cab2505759f1212abb4d5672a2b70d81ec573d1e5e3"; + sha512 = "4dc88c6895264f50639e17eddd5df76de7689208d6094b0d4a51586fa45b359a0ebddc2d58cffbb952cda0a3c199ca287dac278f2a9cd517b923c60398fea449"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/nl/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/nl/firefox-58.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "a98a214fd2c4cdffc5a85fcc074b8516d90c5d79e23c80f0ad464931b8288395d953ac46e575f66bcf0b0e5cf862fbe16f07060be73d9c7fd28930983ceea72c"; + sha512 = "30f623d07fba2688b8f4c4958817ca208bb8981d1c5a64a232568c301aa8b95dec9406bc064b5c629c357381b5c41bcaed9d652d7e25b3a4f537717d79302361"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/nn-NO/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/nn-NO/firefox-58.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "ab5ba866afc67caa89f6794bd93981067ff12684cc307f6fca9f8cb4eb352f96282fd745ef20ff5b2d9911c75f99f78784753d4755623ed3496488a98797db70"; + sha512 = "ddb85b71a86ad20a363edbdc9e0e79f6c485b4da02cb803142a717d297e58c10a4ada476a57dee01d5834246a53051b9e65b95eafae081b5b43648b2ac914acd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/or/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/or/firefox-58.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "6c32d13fc0ff2cf68e784d4e4a58e6befca6bbf1aa77a6dea64825a1e9d6c3c3705d6a60e31fb0fbc4b87147e954eedeab4cf194e0f2b500d8aa3462b95adb30"; + sha512 = "8161a5ccf70f5b370d1bdfb9b849a2761eb4c25f6d821d39e63f45cd29d9be82be81f523bdb9b1f1b2ea134a8672b9153ff14ece3af6ed7e5a2339c9a43d71a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/pa-IN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pa-IN/firefox-58.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "483f1b53af7900dcafeba88872ed5b5c5d0d3c703e83d3e080df92ba66467656f43161851474362b8d3a4bfd48ae19a2a21ae244717e55aebbbbed3b55488b96"; + sha512 = "fc0424027788746b0c8b68c553b7d989e60af2a29e4fa733bea440f31d277c1e64fba06a74c915986dfb3c8da13405689121a8771fb0a47f091e27185cfd7a28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/pl/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pl/firefox-58.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "bf580678caf2fd653022ed5120f461b87beb47defb323836e40c0e1755adad1e893930a39afa9bf9137a2bbd197d5918b715871056df3cfa9574e684f80fd56b"; + sha512 = "f39a26cbc41739b250bb92bf2daf6ba835639e5751e1dd0893013e1541ec43de7e747b3ec754894a56362263b3ace8d5f105ace5654c30657ad9e44195cd42ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/pt-BR/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pt-BR/firefox-58.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "8036559e9d83540cfefcc5217550f401d988c626117e42db66d4ccd9c31afd8aa4224bbadd7293c44b3973df7646d36ade1728d24fde3f5e7cbab19e3e83832b"; + sha512 = "2d3fb878c286a750fa10413545f0d2ce5efeebea5f8c4192dd5b53131edcaa6a54940f242ea002d9a79f41a14e70095cc79526773dc95d3550bc0e0291185a5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/pt-PT/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pt-PT/firefox-58.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "afa6bdcffd36065c94bb1984ac9734d1091c14bf065e68c2a650e28fb49a5f7d52f19aa83078973dafb7446c2a01aa9fde7ef43e26a7f26963863329b868841f"; + sha512 = "a2eb5b43c3d87ea8193fdb1f0ecb0e1a317a71f10af4f3184484536dfc1f7f09fdfb498bbf073f68847f7c2cbf9383adf9ad9e92371c8a835e4e3651a0546ce7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/rm/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/rm/firefox-58.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "26b71c4b734bb2bcd7141247894721b2d35e521c5e9da2cd9fa455646f234fec97b55467e80f8d6b36bae62c807c79e7e12a395e65e4c59d464f7b4c3115f3e8"; + sha512 = "8dd38ae11781013a03fae2b3cd5fc1b033c45050ed4245fca2302e1818135f1e754cb6c8ecbc535d253104ebafc0792dbabe78f7f336f12297b7b4b8c4a9f2a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ro/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ro/firefox-58.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "e0a3358a71ae65166bca792a8e60c6319f9a4c277c8369a2563a084dd9fe8b68952df87d1f9ce5270420090d5ac7a6dbb207cd7063b488dae4d0efc8006e46a7"; + sha512 = "e9958818254c1b5577a83960e1136541c8ebf2cd4f43ba06d73c2e40990fb6da958aeb423c640ae988057d3782db145ba8e8cd7816b8aac8dfb7f58c2eb0060a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ru/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ru/firefox-58.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "adfe22866b6123b537ddaf1dd81d397478e7894c021ad74327c922d85bee8ec132f410509a147bd7f1300df778922ab940c36385db2659c8a356914b908ce9ce"; + sha512 = "abcd9a548335648d84ed3856a89275c62ef7d883e18d52dca053b4d8f80deff8fdab7336a2aa9382e55e110ded2d4bd9cf147b3f482f3b0ebb972ac696562645"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/si/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/si/firefox-58.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "94892e878fc9feeb9e208aff8096496423e40e42bc22ede273cc5e3e549564861ec31ef9935f1e29d68b51abe79b17a9c6b1e5763917111fe94c95f27c3826b3"; + sha512 = "53a7b139ba28103b88359eb450c033fbc8bd3a0c95048aadbd058e505ec85b652054968304d113826a5fcdb6abcb47e8498d9750023a899fd83d5c0dc8b3ed63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sk/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sk/firefox-58.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "26985d29d4cef9fa987d83b873da188b7a776929533aecfd1f1639bc0b7c4393bd9e04cfeb3f7f9f2cfb7b43b5ee14a421791a6024b2eea3707b7c3699594e83"; + sha512 = "05d4f52e87bf24884caa888c14dbb6e46bce2de967fa4524090df63b2d9f2f4f82b926842544d2ce7ee46f0196a62e8dbe26e7b07176f5c13886ab2a1b2cd184"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sl/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sl/firefox-58.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "c8796f686d147774ed4205a04521fb1375d1189575e855b6eeb0db7c35da96aba70803cd477656118f6137658f71d53c188d10653d67f121942d95d81a6a05a5"; + sha512 = "655b4fae25e42cd1678e49b555508ddba2da83a24f04d7d66f5d25a124fa2818368adc851258dd78915a2998272cf8e7bb7a5e918e01228e735d3ad0caa8edc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/son/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/son/firefox-58.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "56f8b81bc5619b88234feef3e17c1a80ce06effc78880b4c9da083530c7f9c037015b6a940914bada62e98711065d6a0c556d90b60125af357ade797403885cd"; + sha512 = "cb555d1465c5ce0a7db10e5117081e682425aaf00221b93a66d23ca9217cb2cd2b3835007961f572a39d93a02d12f9a62acc75f1ce3d8c3bd6cd057afd750f79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sq/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sq/firefox-58.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "1bd75656650f34ddcffd38eae46ba84eb18fecd79b9cd7972f96d0906862d37013c48046355530baf5f253985b65922d386ffcaa25339e964db16fca6bf85505"; + sha512 = "5afe4996a2c66d220d038cc041fba4a3bb5e411c0d1c4962b2a3f28ee16c5f23d1d8609a7d492a10b16d508c2781b7bdfb884d810ae5d8c5fdadee8120a34659"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sr/firefox-58.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "abbfc2f50567f4506dabcf8500ca56b369fe6e6502147ced5a52cb2d506c6b28248adeb6564a6a092ae96632ed2fd43356507cc53c6c4a53756df2ae2f6dc735"; + sha512 = "641e3173693e73018154f5f3fdeefc0b0fdc0b1939ccac19b73769476a8827b7244a4088cc83fc651694e9c82fa5231b114fc05c80371469e63926494906aa83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sv-SE/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sv-SE/firefox-58.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "5f19b531d37c8774142a86cf83c678e0ab889c5f22aa792c6bfa881ad9441c02aced2324077137c8ec75c18a1e7a93243b9b87604036b5d29ae4e93871540ea5"; + sha512 = "873f11216e002fc9eb4bd6389774c21d1f3aa17baf0f38770c18db541b30334a84cf2c33b478d009227b1ef48a7c45183d7df9991878daee78c139f6964c8b3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ta/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ta/firefox-58.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "f503d38e25cd403f8dca12992258265cd3abd50219655eb51867ee455790e1864dea2a26cb0d72bc311c3685e79836df9c0c1794b499d13fb54689ab9408d484"; + sha512 = "1d91749d41fdd5d5f3988803563e083f3d65ed6c70fed197f38fffa7847c10d2b0f355fd46a1fb7f84d8c94dce096d2b84ff692fc6f5f33be4ee1dc63a4efcd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/te/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/te/firefox-58.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "3f68679d85cc1c844fcffccb371424c38406df074c8e21a200e04bcc5fbbfb1199d2202487c660c95ff1941b433d22ef3474580a0de0909dc251092e139b4bf3"; + sha512 = "2b779beaee906278903dc12bf679f0d8ed51d622a1f790a956d039faa71c11abf1b4d462527e330dfb92dabd87aaaa70b3d84a295f21e1a701b4a308c85dc821"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/th/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/th/firefox-58.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "b3ea54ed6c65b68f39eedad3d4500030de3f53c6b603a15f63a82b2766e023f552869d5d0e05cc5a4ec4eeafeb3dc124ff6ed09a5adc53e44068034247ac0bf9"; + sha512 = "82bf20ace51794807f6460ae4142869fc2efb1b4bcef66cc5d68fe8812d4cb89578a45cfe0cb7927c45ab0d1e057f30d4388093678213187bbbb6f209babad2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/tr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/tr/firefox-58.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "644ffebe355085ccaffe266c2ff50440200adf95a46aa1822f21a160dc982bbdbc8157d9231e1b96c11c573409c620bcff113865d55eba3c3b7f3cea7faf29a7"; + sha512 = "65766e0207ea300dae4d95023ddc732cf5f59662a894689e87620e6e08a3f658234293b666467eb1f76afffda29716b128d72286b1c9cd68cf574f7121b71792"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/uk/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/uk/firefox-58.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "20579b4afeb36f5fb07a3a93e4c5837919df959f9ae98e25c39597e2f1446347952fedaa776d40bd606264cf935ff343cf69431e8c8f978dc8fcc60020f669a6"; + sha512 = "01aab08b333c16ac7156ca35580fc6502aaccdc269c6be29e20ea3ecf97104a3d0214d16bb65f1e3e7aab5b17ef3c637d948a2767594c36ab920c7086e11607d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ur/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ur/firefox-58.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "4466d3f53a1d68df8e7bf6074c2639d84e5a7bcbee32db522f8d3a771266454c1d0c9bad1baf52b27c91a6fbb779c41fbea50a84675e9530ce33b1bafe722c96"; + sha512 = "b282916667060259bb90452d08a2bb65cb1225cc45494c2c18c4982e710abbd345744b08bb9c2bd200073c2b470c3b3bddf7f9b6d652563e3c4a8cf6a6248391"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/uz/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/uz/firefox-58.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "4234f1c10daec449867a4357a123be7d04ed3456b98a2d2e82a3ec3d85f7da167e5dab95ed6c4f4f1f44b9481608a80cb1ff1713bd0abe06606a15bce7df6d6d"; + sha512 = "9339ec640a3d4920fba39e69520477d9c00cdda5f1617067f19fb13b1c17cabd1cf1917001a49604686cd835839adcf3f206dcde14e7c4a98d579c7d8a19386d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/vi/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/vi/firefox-58.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "fa5b72aec8b5a845ffe37588424059037ed1121f35047b123d39e7b6b11f0ff54731a974b7ceb3406adaa1705e14477a7ef189ce53305add2712cc7d433daf82"; + sha512 = "c318398809637623e4ecb187f4b531bfc1b9abe093cfecfefe2faa75990dad09b505d8f88e2556476c92cdfda491161af8e7fc27c68c8bbedf5d4abee8eda941"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/xh/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/xh/firefox-58.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "17db5a14e2e9e4a022a6d1048f72e734f41de485f72ce45a6848b69db1a96bbafef25809b79a3f85fa70c6e7f43c9f1fb6f16472c294f13f1b77fcbb45d84dfc"; + sha512 = "08caf6844c3900624093ada61c92f7c74dc5533818745b8e85b15a093b640eda9686bb0d5d86cfec0c90df49e782c942693d4e0a169b7cdfecfd13827ae27ea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/zh-CN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/zh-CN/firefox-58.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e8570e0c589e298e84653302c85ccc46ef7b9362b5449a09a43eaaccaf2d3ba1b55475c5fb190067d596f85d9ac3cc037e5ad400454a2d49c8e9ad878bd8e04a"; + sha512 = "3046e58285f220ef7ecaea81c44063b8573f59ffc64dc12f698a184ad2f11bed3a4cb5d03a2bc105083b0fd84335d7477f81d3eac4bb28b961d38d9c886a9376"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/zh-TW/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/zh-TW/firefox-58.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "51243e1c7a330f0043988904759fa8d7fb67e287ed47a6b6a18a12ade989346f4939874dbc6b15670217436f8132126b29fb641d60e8f338bb8985ee5411498e"; + sha512 = "cc453128e4720181d147552fe2452b5142b959e3e0cfd3e340159def69be169d272980066f9a34206da5f815ea54b8e4a062bf95ec4b1cd7ec7b3b83e2ae13b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ach/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ach/firefox-58.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a36499123874af16bf33d80ccf2a84dbd21f641155ded9d58e0c064a8cc5d9f034fb64d154f0ab46cebff191e9c9cc46c820026c53408329810a318556be6210"; + sha512 = "c26386414dd416bee1e4fe505da524a4c1de34ba8c25b2978a20c66a09f8e3c7339dfc4b5fa00f0d2c052fea1574e5ef1a5d74e67d39c7e717b54439d7dbb852"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/af/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/af/firefox-58.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "4c42737bcd7af2f9f0b6ae3415a56d82d360998f8bd0ab01b6b0cd5f72bbc84fff4045b3553a1a87f0c3258f46b526f9e9eb0c3dc8c8c66a2a22d5430fc38499"; + sha512 = "a8c4485e579f127882c0f00a4a90bff5d02bee5f28642257bfe0d6638fe9156ab10a00dfd48052aa4995dcecbe10b7247f1d4e6d9b424bf06e431a782b46b95c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/an/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/an/firefox-58.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "e821fd76b262744b740ee1a42092b954df2a6a552cfe305ab88e6ca8b2538045654f64f4e1a0e1446906f91896486f204518836148eebf19d306b4af0c2b4d6c"; + sha512 = "29e91d4e5ff020241ac81b810b893bdea9fc194090c78fc857d507d7bec8651f15a3c70f3fc245f0d5faa21a3cc44b6327c1a32444eeff3ae4d93a723e230e16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ar/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ar/firefox-58.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "de178b0791074179c76a9e0334b5c5f2bb3599e67ccf4c8ab1d9964952b17c2ec0c509e8e37d83332d1cef7b74ee3081eb4092001023c3a2f14d906a8c0e48e8"; + sha512 = "d1d936284a12f1718b69b279334aecd49a68e5dbabc65a5ade2af277ac7b8ea342ba4b580df95040ae057525d28a7c1852222ab2bd273c2aae74409a5533f74b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/as/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/as/firefox-58.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "a6f3ff8f5f31b5bea725175a27fac0872765f584a91877adc01dd42811b059b61706c53f64e4d1a0b7782c26998bbb2f73e865bed4f4e992762b5f90993265b8"; + sha512 = "49f8e1e8cbe6910a9fc8a812b3dcb7e694c2785fca1c65639d70a5d0fc82dcda9630a1e311df9bdf148d684c2173c761b6aa3926a425730dc35fe99b14124992"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ast/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ast/firefox-58.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "dcc47a42af28f1814541f71650e24c653b5f99958b495aac3d0408ddd27aeb8d689d6244633c5a397d5f304dad3e8d2778e5a3573497e47c895a9f46365c40ef"; + sha512 = "a01eb17a9952055aedc3eb29126a826ef812c75f5f5b5a22af3125ab37b63e3e0ad6de0a5f68d0a5bf0b3d1c8fb1f721d4331f1afd30b6a3ee94a502d5931ff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/az/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/az/firefox-58.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "41212665cbd529e935af5dcb8582b152e84bac8c7055b02f2a43dc6fe53e33bb882908feb71faaa8f34a026a64117a286e59422ba110bff8c04e18229bc418aa"; + sha512 = "7117993a67c2d0f3c0438afcbd87f22ce141063dbc66a1fea997f5145603f8e9d28b62473add81475bdfbad350d6e683d0c483ec2287f0a47f4e9b3bfbe92ec7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/be/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/be/firefox-58.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "681e9c68187d9b53880494ab08300bc28b8536f5aae320dc9da6abfc8642c8aea2e2613b48d32c25309589f737743c733b361c543525106ed9373ecd3b40b891"; + sha512 = "9b3486fdb08f0aae375a74701e7904dc13b1e4db7a1489c4538d523bd4af91b882b9785fc4fbc3da2f6ac67745216ffaf7c48c173f840288c6e39b2fb8e78b62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/bg/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bg/firefox-58.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "742cebc1e646a2d9f5d9d6c406ca1903f81faf21c4a38df0ce6edad8f7b96ee8b22d7ada34fbc24461f5e7644417d37b4dcac6a5a10f8b0ce11fdbfda9c01508"; + sha512 = "a917bd437926c8854786b4169ddb2a132bf4ca0e51c17a99a3cb814a1c1fa7fbc7c2ca46a0c7c91ada117ce4b2e89c955e1d60502c6eaefc9c57e0011459609e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/bn-BD/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bn-BD/firefox-58.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "0562b8bc93c1c768ca49e94a6285206e3402b45d9217c6679eec7f30395cfa500c35da7ab0e560a5fff3db5eb60e6085845a6a7b2ba7b695ebdf09990bdce5e7"; + sha512 = "51032301e619fdf9e9ac99c52f771e39425e9e8f063f71c491f0802f02993bda668e0e18196f4d10125ffc66fec760df0f98c19713f8b54b5b05c502067fa4ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/bn-IN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bn-IN/firefox-58.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "d459a21206cf140acff54ccf6d7557090ffb3eb752f62b91ea56a4c4138858ed9146d3edb6ee3252ebdd548f3435cb973c284cd0008207d46dfe5b8b12a6bf55"; + sha512 = "b76ea76976ade5df4866c2c54bef553924ec9d3bc229cc7513530ca81c4c4e118bbbbadbea8a64f27a061d0ccb061d7ec0e1a398a428892a2c59761b0a7392e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/br/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/br/firefox-58.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "c23ee525c1c989264fbd1e00834cd0a1da1c470a54bebb5caf18502499f16917697f3b6de55ecdb9270ae11741420dd1def626603f2f945f2fea8ec6279f4b8e"; + sha512 = "7ba73fb0068862700bf64248987796837c44bb59ffec052638956fe205bb52780bf2ce9bc6b1a5347b173255e893de8b9380dbbb245d8a3552dfd1a6fb73f7cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/bs/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bs/firefox-58.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "dc254689e74cf7038fefe2b6b911cb75b96fbee105a44713828f8f7c9f1a9fd8624f5ce62205f26b4d287f73004edfde73d4fcc4431d2e4464d36e822f4667ca"; + sha512 = "5f2aa4be25f279212541716777012f87f5e65a57deb3b4dd84d4187d84db80ef3f8dede2adf971dae1fd9f4e6398db81f956f59df2f51f35f1893f581266fe0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ca/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ca/firefox-58.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "3f358d601c182bdca9e82221e9e6061ee5d610cd42caf722e1597c6e3e47ea005949ce52d0e38d160a02e4f02f210328d631fc095b0a49af71e92919aeddbb37"; + sha512 = "2995ed991ab118d5e318f085a340113a0e71801cb2b781890dec674bf3a8142b9bd8b0bc23ee23bed72b1b7bdc7f0181abd4f4d23fc88b7930f710934d2943c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/cak/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/cak/firefox-58.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "274ebb0800585fd06dee02bb4a2a88cb4a64d39198e23fe481061b0cd96c281c2bc9983516614eea980c118fb98db01be2c0a387a8cc595da7a2144215f27230"; + sha512 = "dce6a70f1c59b01a2d3ac65c6f44adb9baa8e483dba84989e40d7388f9ffaea894e3107cc4a82ba6aa730770c681bd73b50d0ae2f248477f0b63192c45f142d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/cs/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/cs/firefox-58.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "dc688379b955cb619e1780c66368ebf5a09415a3b31c8d116c1182051281bec251a06ff15b54816e5f0f11f1c0246f33d2db42009035a7254702bd73d13ca83a"; + sha512 = "3c84b185de63520d430ef541cc95290868fb8ccb09829ef8887ee0559fc5da8182e890155e3d1bf4e82966c82837d05253fdf2d2115f376c4bb0d09c21cef339"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/cy/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/cy/firefox-58.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "f20ad279750ec9281ee9a800971a4538e43dc3587df35afe676e7980e965522dba2b6a9deb2d0b9acac31308de3a8a167ec8dcb05934503602483a6eeadf00f9"; + sha512 = "1561488521608643f3ce97da23052b8e968c1b8ad7ca38b966fd088368932976be0f503942ef65617248d3ae572afa4ecda3499c427845de32572d163d577c9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/da/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/da/firefox-58.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "b9fea0a664a02698423099a963787f8b5aa89f3aae8ce6be9962d9d8316e01547d2d3fe54f05116ad1fc6d7a68d6f72d65adcbe63de98bd4b16c8689190510c7"; + sha512 = "fda58e6fbf5243d5fed1b386ac8014efefa856ea3f8cdfca4e723f646dda2a8825356818bc8f06183a57337a5449ae3907bb3ac4c81bd7f9590d94bbc32749a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/de/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/de/firefox-58.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "13407206fe0fdd88793406c349e4f7a66132f2edbc32af12b7d30026d22cf721970c8e8494228fc80602cd57feb3dcdf17f0490580b2e33806f0b3bf03fc7ff0"; + sha512 = "d56395a97002f31ead2523179eec912dea7035a86c80a8788b21f272c6e6ac4095caff5520feed261f5ab5a2a2366cd12e223b23d276e01d1ef318b8c15db860"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/dsb/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/dsb/firefox-58.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6d6661cc82de4eb37b0326f8cdbc55feaaf85cc44137af1bc217d609f42d97216402927021dbacf81cfe704ec8c1e42c3dd18f39bc1f7e6665984ccf3bd678ec"; + sha512 = "97538fdf8a2a1cc3c485210583d9c80db10b2d599d2b34bfffd5e3b29c092a8573f100cee5c69dbbc69fe67ba6e2c648715fbb9271704dc26e6b2fa98a8512c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/el/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/el/firefox-58.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "2e8d1ad194159f6d7e56a461d594b1cf998f073da332a1f1bfba46ccd76e0e5733a691608a16ee08207f45d16ca59766e774534024239b8d5b3be9156942b31b"; + sha512 = "4a12302d67b830098e74ecc5a2e785829c1602dfc3cdc20c1e4be5a2e58854128a68ef9fe459dc4baf7f1f87e8ac2a065061a259c9625f09098b364c6d12a393"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/en-GB/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/en-GB/firefox-58.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "f45ccaa1b6684558a1c9b5e43907fb59be0ca466260950d701091e6bc1c6a9d18d1a8dd2b2dec77381450f61f99b632cb0f3c0269ff309321750e16577df697c"; + sha512 = "0ef9e96b43154f3b6d8e620183c092d38b8a5dfd7b762416b090e2754baee4564f6876bba9765cbf7499f5c658f2d352bb45769d852a683fd528573b53eff2d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/en-US/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/en-US/firefox-58.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "e3d289363aa63cb459e1a1f4f18e893617bfc6f972a49308aacf126698d2dde0baffb3dacaeffae9471a8111eb332c753f376ebbe31aebfbce52c5ea84122a16"; + sha512 = "05046233531db36a9c9c16cf6247401ec662254e8e1b896abf557bb2f4043ee2ec1f83a04c9b1199877d66b50b41d47bef1ebe6236e21998406616b8251001ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/en-ZA/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/en-ZA/firefox-58.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "a4c56c45280faf3dc65bba6de159f65b121972da5831664a70369b446aeda44f7614d01dde6a070df058a4bc2d42f32772e1003f64d277cc5bf8361f76fa2816"; + sha512 = "7ff1777a3aab71e9bdac1d41f777837cf91ca5f9ae353e6289812899fd10a4f58c13938cef0f33cb3d3a0e80b42c70034f7af22783e0b22495fe279cc497fa5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/eo/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/eo/firefox-58.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "d79405fa9fa01f13a4a98797b3192f1feda51b26568e89746f6b25fed6b73c1f45f3e6bd69427547da19c7eb70508fdea0ff6db21e8d15211faf8da03b088e85"; + sha512 = "3b4a8b0fb29abbebb224cbdc4dd9ca62457d88394f653388915898fba9eed6d1cbed43f6b8fb7bebbf18963d368fbea6aeef5bf681c14d2d5e09747fbd42fbe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/es-AR/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-AR/firefox-58.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "f5751dc82ceeff378d78717ee5850edb4f160f3ae26c0efd70557014c96c765fe789fec2a8650f65c9fad67cf1253c00f4bdb75387162db1c914ed45dfb7164d"; + sha512 = "9409072b8aaffe4ed914832d0b545fefd20b9930e0529c38255f19a0ad524b66127d9704eae2b8623696560fb78169aa66d1b5bde358885dad4d00e010189841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/es-CL/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-CL/firefox-58.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "592c5f9a70e28521f75e16b79fa0852815f34b9570ecbab610a96892d9b13fae609a9050a4dd0867bee7b811cac67188c9a756bccc2d6d99821f9ce9db48a509"; + sha512 = "0bcdfe996b3a8f4810d464bbca0690d12f6262032a21e0716f86f793faa4e707d3c308e79aac5657d619ebca204d5f67667c6d3d09e405e887c338a859ea1faf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/es-ES/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-ES/firefox-58.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "e3fd1f13087eac51a830acc760b83ff9459cf6a1a14136c43c8ab7395b22b01cb2627b077c5f50968023c47f31484818ccf18245d109610dd04e3e5627fdb65f"; + sha512 = "1f2aa1ec1c97cfdaff07b7aabf75b5e1bfc628fd8ee71c988af5471e570574453889a7bf40f9d3a4ec06889a4672518c986c3bc6fd35d7436d45c5c74507d801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/es-MX/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-MX/firefox-58.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "35ea8599e66c29f7fdf1f2ab5a400a0ccae4d0ded4bb3d509d0caf7a6449bb7944c794fe080b1364be055eedc8bac017b8281bd9a76b1d76def573d3191cd011"; + sha512 = "366dc93d1e6508b00987163e44ac2d6fd318bc9c80487a13d581926be7d3a88a6fbc6438effcefcfbe6a1a9794f2a692c385fec7503ea96feeabc5fe10cc7a4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/et/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/et/firefox-58.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "29e6013843c56fde01478cc871fe15c2f1485d41e87af30daf97e5c0f4e80ae14368601a2df43bbe3618fc878e7503007708b760d1f2a571b4993a99c2411f17"; + sha512 = "82b25a2e1ab4d61d89f5944495f69fcc7db33b3a7bb7822758b588ea7c3fe9ce3d728ba838760b93975cc52b105de77cd980d20997f642839680a20ccd5e1d4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/eu/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/eu/firefox-58.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "3f6ef7db13d1b8c8eaded290430a8462aab2172c4e813c9bf2f11f0e417485d88872a66628130987a37286ba474e8bddb9ef01e120dc2c6baf49bf9b5c5e67ce"; + sha512 = "6eacc4b6069f6bda6b08fca871c7cf08bd666f974bedff6c511652801e3718ef60ab97425c8ce6d1cf5aaac1b5b9a62990ab086ebfd9e76f646d491a19325b34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/fa/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fa/firefox-58.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "14dc9bfa351de740e46a8a3d59c99d0de7ec5d890783f03a8b260217a02d1cf03a94c6a0d7411698f789e9b77c2e1def24b74d9754be821b1104964308a6322e"; + sha512 = "e3f4c57555c415a4d3830a6751c5444e07987fdf85ed0e122312bc4bfd0fbaf841cda7aeeb6aa161d48070844aaab316ffc163755481479f5d421ab8967aac15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ff/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ff/firefox-58.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "273b3a3c6d32f63de9a8b47cc6eedb7239e42cbf5b8e48191b2d9f9d88731a5da6957ad9bbadfc6bc52e591328a2a89540c4ff880cefda455ce1e5beb35492fb"; + sha512 = "695b44de161563727097da1d969c0a98fdbda51613ae8631a757410a502ab25038a9c356338b1178f7d35e0110e9772b3e2fb705e20d81787317b528ffd709c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/fi/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fi/firefox-58.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "1d71f85cb661c87bbf1c64c2711b45ce912aca629638d2b7953d0ee3256e7e50c920f400c2bcf92ce171be44134a66b28a34a3b38580da3ce2436dae1b0dd44a"; + sha512 = "1227a6e57a68c0ffc60f6d9eda20a41fe70e7da130bc705fa15e428539e0380e1f65739e791ec699f216588ba54e558ddb6242862396837229c3ef3b028a6346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/fr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fr/firefox-58.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "ef15d841348c23f35c2fd6cf93d86657d6e3308bc03935505b99ba1119a02846c2ca2c5c55cc0cde992d4e8af50bc612e086be34cfa61711858f11e6e256f7d4"; + sha512 = "c15980e0a1b4b9709416d362e36a3dab26502af4788b7c74d68e0ebd2f3ada6039d10af1e1d49885604c4c3b41356519e53c278f04b14729502d8044bc106384"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/fy-NL/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fy-NL/firefox-58.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "f42e5dbb7d16828aa2d5fb45faf44ef92b8ef29e5c49dc8a75540959cf6c153f7d423255c4eda765a9db69dbbc18e7b8a04bd3ec1329314c1d69bfa41ea32f93"; + sha512 = "dd38e22a986b558aea005900c2da53cbf28ea68a77bff428aea6ebaa09318439232cc2d5c8d0599fd8512ee4ca2488080297ffa61f2cac9547fd5257a01abd3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ga-IE/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ga-IE/firefox-58.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "4fea194d08121ce95dc6891b18cbbb031e64f402f31c83b92c9044c8d9337f2b50d76017f4ecfa616f51e8188e6705e8e940fc2fed95b7d21d4c8385b656ece3"; + sha512 = "97ff02536814db1310bcf53adac31fd9e84a5e39d58f9d81dc2f70d40e6b608c450dbdb38edc83abbaeb0535f1a1c0b1511c77a161e6d0ec22b8cde71501be08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/gd/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gd/firefox-58.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "614811dae0bd10f809ae048d47543fbdf0459320a8f9926280bdd8467b2859646b7201355777081638b46b77d3def96f8052b55c243ff524a22d2db4e20db864"; + sha512 = "7e8d8dc8c341ab3990b550392f92029b70f6d947119de13843e11a8067c2edcd10a02dc088396beb52b1d069e8f42732db8c514f822706de3f309061e649caa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/gl/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gl/firefox-58.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "a20e1f54fd12acd5480bff14d24993c2d58a33618170813980a8a1f0b810140a99c7157d8c8eed3d56f8daaf2fbbd525c1df98e1a90cd0f6f89ec253e4b5b73e"; + sha512 = "31b57462e13e43e31e0e9073b353e1f5a3c32ffcf5c5fded188a1a61a973510479d5e04dc26437eba5445baca51f82311ee9470e3bed9a6309d40cd456da4763"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/gn/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gn/firefox-58.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "ccd057d636e8f3884db25ed91186a5c995b02eca0c3c7e07616364ce7d95e42dc1f3d1c6e9eb844c6bab4088127232bdd85e3f33898f681f837c3887ab0415e5"; + sha512 = "d54e50b52870747013ba457d205fd9d2632302309b9850171b968d66dc537357bf747e322420e70e5c029532b053e557da86076a25fe8c5f1a3491acc9906b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/gu-IN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gu-IN/firefox-58.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "fadc9a802e9322e2ab0f6b66bf8d938a5e3bfc67a1ac901c0d41d5ea82bd87be0165f50b2c5ce7a75c68f8db45eec8b0e7ea3de237f6c6f79d72cdf386cf3e00"; + sha512 = "d18427e64b54eb6aa1a1ee7ebfe4bdc3b219af28e7cedde55ae384d475ba88b83b9c6fe701ff849aeec32f8e6b184f2e3f910b407a9d200fd45ceaa18fc7d61f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/he/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/he/firefox-58.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "9fd2d1f4087b247814282e2edab633fd865ebe94fc73906bad065e0af927f298f46306dbe7f36c98875b57bbb66aa5e51f37f5a5308f024eaa9a62f968916c0c"; + sha512 = "a7ac2db737ddeb870bbd136f8dea08306e8bc7158d7e880655cf15541ed26382086d270a6ff2bbfb332fcc3e53c7348a403bb889aa8ae5dd1cc6fd1b7844e768"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hi-IN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hi-IN/firefox-58.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "7a07dc67e58c295309768e84b2489413b6d8ff71a786d249b977a7bbba245f74c6d88e33beb934444a34de88a205233953f0b7be3a3628950b0c851c35c593d1"; + sha512 = "18263b33d5fff4154db809fed79fc2ae20590cc2ad609e2abe90b036420bcd38fda629c613750432ca4c06684c772cf567368ba2bf098719b501e329e55caf51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hr/firefox-58.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "5db4c7e305856d96899270e20b41c6db2c130abf25bd5eb47cbd2683e8097fb41d37bbd3c577253601c99d2bcedf42472bfce74cc4155a01de3998160b3a139c"; + sha512 = "f75aa782b03335b0197cbea1446cca56cedeb4be0282dff8bc0f1d6f6c8bf596113edcab650b6c8b7bf5a9ffe6bd14e0e29f2e82002a5c720cbf82f9dfca1b08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hsb/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hsb/firefox-58.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "5729719fa57723f4c87c5f63f9c08b552e374d9ed9cc9f39aec49223be7b85d550074f680511c79c5b47cc0219dff687c7ac288781822a5bd10f4365cea88825"; + sha512 = "c0b987b299ba764ff5418be38e68c52b7caaf61480edc34d575ef58807b5289fabc25cb22d7d87dc8ba708d6fa4157d46237e0a31dafcbbe5f463fc945a620e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hu/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hu/firefox-58.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "b0334bd7fdfe6737ca5fa1166c37204a6f0205f6756af31b8aa34da6df759f487a3c1aa88bc9cf2dcab4be8724a203e3d35509af4fcf03581c8c59023db532a1"; + sha512 = "58c7c346d0fdb16efee21d8802d3bc668ff4fd9497ceef1b7a96cb8bff01df647c32819a5606891e2b7a9283677bfa9624e33423f7ed1a9c6acd1c19414276fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hy-AM/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hy-AM/firefox-58.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "33ac9a2a7a554c4662a9285124fb8050894c921ec72d7d3655197923e2fe3fadee007afb54a25bafb9ab8c9a0d898af52102bf629a604563d10f462001f08853"; + sha512 = "79e733f8be50ce4cab74d80dd8e4ea667ac9b2973bce27fc1f70a37b879e19b52ee423c2b360433d1e5e15a4143050e7943a3bdcbf709bc34e89302bb0ad7f35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/id/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/id/firefox-58.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "7bc77cb0cecd1cb993b158670e448fd22bf982ecec84213c8c32634df32ba538fbee8eb834719dd99ef1087b6f8955effbe1776a3e150bf5fd2ccc90606bc215"; + sha512 = "5f49f449fd68cd4513ccbb541d3884e190b2a9897ba6267f348f4e7df9415a63e58a254d18f116cecd33f0e34a9022f4e34472bf2486e29b0ff17702f4790e0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/is/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/is/firefox-58.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "8a3fd3e89f503fe4c74b85e8ef87e1e332646cd150c95ff8685071bcc456bdeb09de46e256d13a53f5f8f4cd3172a12ec6c8096dbe54a9cf018be857b4997e94"; + sha512 = "6c5028ec47a18d9de6bfb4d99d54815b174ed51ccb74f84e0e1d69ad10940847d4655eb76b13281296575fdbb972d32df34e8e9849c8db4fd46a6dac4b4f0d62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/it/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/it/firefox-58.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "8babf797e0b804e4e8b98a6261dfed27c93832966a66de71ba6794ffd3bf7d3b41ceff7ac4308ec9f978fab310baba5a87dec82f710014cc9dd6f27a520ceaff"; + sha512 = "dd4e79563c63cfcd76906dad9b28162bc9df443964a10fb0be7c2a201621d394d45ace33dbdf85d7acd040175528d58da243333d06ced80bfa96f8c6226aa3de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ja/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ja/firefox-58.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f3fd18b97b2880b3627e100ae20527eb998c7b9d11b2c38b628fd1372f7811cd40662cb5d199f12982fa35f8fb9e6923e2c8b1ecaf5634b6989e8b89480ff252"; + sha512 = "472f544038dce535691db40eae8cb06dcd77a468059a261cfe04186bedb4403ca209efd51a5b5efdedca323f70f4a69140614d13380fae0e01b49c85e5fffb8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ka/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ka/firefox-58.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "4f69cc6927a6aea8496283c1c47961a38ed621b4a4563346506e4c138714824cd5bcba2f0c4d1226c643412ac071838693c0b3a2acd6fc9602a6f12060955f75"; + sha512 = "8337bbc594e6d7c0f862a99b8ad67fa7b86e55d372c5db850657eb7952f9abe2640c7bccf69568790099c8f9e7dcda65ecb28bbf2c18eeeb6760f3274f343513"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/kab/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/kab/firefox-58.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "93fb1351b4c6271cbbf04e8bc8750569f5e3a4375559512055f4bdc68b7ef1c7f78c9354d5168e54d49bb0a529a380eacfb25a109e7f7ef2fdddb1bcd7bb9fcc"; + sha512 = "8d46fdff00c65f503f87b1d478b71621a2051c7ea7c24747f0793f6f6b7ebccaa39e8a61b35299078e2b49f07a17f7c4f744c97ee3767f598503faf7bae4a17d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/kk/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/kk/firefox-58.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "e4d849284c358bd297b07f557ae304cf9ae681733ee2acd232eda28abb9bfc38ad97916b00f257f56a9a514bfaff9b440ced15194dc3abf56b0af209221a7272"; + sha512 = "617ce9bd37cd1ef36251cae9a0738ab93bfc4eeac2f54912011343905047ea5d181c25fc891b8abe178f3632189fe62c38ea00910a1c4bea3d47907c0a2caa07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/km/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/km/firefox-58.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "0fa3bcf4b054c8033ca4ace9446b6062114889a9b3affa730ebf3ee23fdff470676919cc7086b5a13a215ef87b73aae306e667d0b1c18437b6265d5622972a8d"; + sha512 = "38ee6522276cd186ae63053fb15978f6eb5bfa8b2e78b3f2e4233d58ef53ac32307c936c454eb76e86e9f5d4845632a7b58e6209851a775c93629d0bad1473d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/kn/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/kn/firefox-58.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "7ff42d342f103c2b6f4f4050c7c79dd0687f87105e31dd80efedec34dea27dc5c9eeda16b79ea676d43f78a85e55a1e47c400e0faff9006bfefa55f183efb82b"; + sha512 = "462349b1bf91686f8212deb580166a3e0ca5dafb947c74b9786809626af68e43c4ac6e51c8351d028acb3c86d1f687ea9f94cf34c9b5085801c242d136a19383"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ko/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ko/firefox-58.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "9fff35314fcb6031923b51db50e779564b7e5aea3068165bec73c6d8833b18579f87e676291a6570827aed29a1074ba54f08255c6125333da2f040c9ac404bb6"; + sha512 = "78e8eb72d89173676a0b65d7295f37b656791595c4def454604a83ad76e2fdf8ce40976bc91ee17219a320242e9a41568157f3754719ab9f9e0a7ce6cb4f66ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/lij/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/lij/firefox-58.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "d574c03667da40589736295bad53fe22cc67d3f6dbc5281feba5d76138ecbace6daf7d39145d11ea794730c3606f6586fa58d3058fa7eb3f0d1336acf7958cf2"; + sha512 = "f51136d2e8e29af14aee4cc20e3fba6546effa40c681d3831a9ced7008a845e27e9bb80ada996d0d77c2c9ecc0825f6c7bbf1063797f71a153fe298be06e7da4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/lt/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/lt/firefox-58.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "4c38dd3f72be96b2a7bec60a55e7ac0a75c13036c3b62d4805ac3f32efb6422b2a74807cefb87a3ad10f25d41c14d00055cdf09092ad9068bcddd5a46dded650"; + sha512 = "e1ba1b26612c2622853987fb802c4fd5e7433481b6721950813f76b6463b1320484383b25574733d75c5c4e547b52b3ad9d8687c1a28b511b07bacb9186f22f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/lv/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/lv/firefox-58.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "fca51f322300f18b3e5c988f883fb352593c40988e5f0203008b71c725a162da0a15e67434a91af0e8dc63ad869280f6ead6714e2da1b4b6b83284fc56790688"; + sha512 = "894b82ffe22425e1c95c4e148c7dd58f5b14e2ec11a5a27594e0a00b8d5d57364080caf4da38f73c0af3962600d0051f6d6d436687f485cc178e6eab1d5733d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/mai/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/mai/firefox-58.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "650b729a0dc938c2a0375e967e89a2d6e95595bd9c0f8f0e9940dbb51be4ee80257ab7c7006eb933b4d21fb4cad053a4e55e2dee673c8f976a1f038e3ba5c1d3"; + sha512 = "7240f90b5a4b6cd68135b3436fa796de0e799316b8abc06c1c62bbe22ef9b6ae38bdcf1c60a5df97354ec5b0b69f64635ad6a88321a34a6b15e035bbee19fd53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/mk/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/mk/firefox-58.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "3c15491a97cf61676c6dd1705a281b2f85b4e2e4446645b20d7fd46b5968248591d11ec344544b42c00643a9a21bc3cc57665b7effcd03f9a8105d6a89fd876f"; + sha512 = "30769e066f1c0cc71f0e5139c893b3e887f4618640b762b666f85c208fc8bdddc53afd7f0beb0421e9c84f82a6b332321840c93ecc9635dff784185f2122527c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ml/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ml/firefox-58.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "d76726b4d18d114ef391fa65e3396bef3e5d7896b90264e89e82673d0ee8be69633d831220908da30852994f1d5f782e6d6f221b0a93b028f543aa9899d2234d"; + sha512 = "6c3f77d4fd7fbc05b7812eff2e8c5ebb75d4fd97a1cb8797260da5d2e53e10def88cfe107131097e6b72968b4c827b998abc42df0443c24330be3a0b0622b715"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/mr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/mr/firefox-58.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "b789f8e68a2020902bddcb95daf854cc784cc2a3319c2a145a5cb877755780699010b4162ffb124d0f5945e722ee6d7b0f0a1baedf277bd8d3c429b9d7870b42"; + sha512 = "60d8c8824ee7b414ada656310218cc87ad347b36e7192196b2d5c6a5e0958f9786589a3c3f896f1a99b19aa2419431e6aaafaf69b877240872f9ea89178ea699"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ms/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ms/firefox-58.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "76fe657a616e786926740bd10bb8332cc520e08aa6944ecefe98824e5f0d059c6c93cf0e5968c11b153e55bc445a79939ef0b2a765daa69d6c72b8e25010f4ab"; + sha512 = "114c337fdceec43c1482ee60467526d7fc422f720400e2cd66259cb11c1aed46fc800b1b3fc32ca5e08ad85667bdff31cb31ecd19f66e63d29bdf8696f8e4477"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/my/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/my/firefox-58.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "618224cff81d80523150cae7c020e8a29569fc7310fa031076ace7006bd8f8efcc4773b450de4ae4965445b277770603a7793287cb85714f0aa057584e636116"; + sha512 = "430ed92df431653d7c2f3750c6a7e3987424d9bc49359dcbe6f9c2b66c601e263cdb26f2428c9a1948de78ea51a78e0f1e6fc1538c4cdbc39a126c76050ea51d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/nb-NO/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/nb-NO/firefox-58.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "7f33f1f49e6ac31a022d1ba856e23d1b10a23aa2501550d5ffbdeed05c752c27b3345704bb9d15d8eead5115085b0ed00d5b5d53de9cf2290e753f04a4f3fc1d"; + sha512 = "c0b00789726e8020a5d8f853b73280720ba650f81cb4559e17578c862ab3d45aadd6a1948ff26e502bacd34d8c0cffa8d46ad6fd35d968ddcb4f8300dfcf44b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ne-NP/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ne-NP/firefox-58.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "892223856ff20d4cf7c601066ba6f3620b39fbf4e56fd89207f3d18b10b39bebc236d5eddabde57585f0e0c906dc035ed030d49b53bc346ce630581b9288654f"; + sha512 = "b90dc1fd628689c45f06800b3cadee034d6da54a3695959a927ac0466ba70378f4197bc5b17b39d9572a8369897aebb589d1ce7d2dcc0972a371100938704f9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/nl/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/nl/firefox-58.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "f139e9420300a0276f9ff7b70fb1839ae9e2aaf089ccaddca782b8dd1797df80873cb8ebc91d37399c39772d5b381b30ddda8c41395065d2424defb709eae21d"; + sha512 = "ab802fa78343b4a2074d2a09187cc96b66c03a26d26f21eb158e90b30bbbafe6dd40d563c9a65c3b6c99f79edcca3615e1322dd9a4fe3ddf1ea527ae41b4b25d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/nn-NO/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/nn-NO/firefox-58.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "50cd63ddb3f83f7c62916299d910d940930f046da612e3cce890310d271822acd87f971b5aee56aebc4011b1c414574c7c96cced936ba6f89a21bb93ea9bd356"; + sha512 = "4ca2889f2e0a7f19ff1e1f7fa95ef692188f78289e1830df5c72e27db761f599dc1022ce1f9b8c8f30eab92aa70381a1e721deff07fe130b1685e968cd3aaa68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/or/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/or/firefox-58.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "ef73a14c8210d1b82e0ed33109027099a8d5dc3961476eedc31a92bd855a529e2be6411b196d0c4df97124c5be69ec4b6a245a936de1c0e8c609a0d17d51d8d1"; + sha512 = "f2da13fc423beccb7044af1b8ad8ae5b8728aeff5ad0bccf52625936b59040aa6db6fd8fec112be8cfa0baf5448ff4b9d0e179b35302c235e6b4dae01500660d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/pa-IN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pa-IN/firefox-58.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "53fc6c822192bf96db817d32ea46f0570a83e296b1e4cdfa585503b02b961346b21751e22d50c056a6411ace168844df019e6dcb96346e02bc9deada71c5e237"; + sha512 = "ab193a72db52ab2208f7c6b5b5eca4756231cc31a7fc9f6adf434169ece5df5cca8800c952bca285f989dd2b5c8d7f825b0a0e99d2fa6a698a70a11fc63b1602"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/pl/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pl/firefox-58.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "a009db74e155f4a089501ab96d7c72c2baa2e2ad0e555ffe0ee0baf6b259b5bfbf422ed6bca4b012f7b1799db02dd0d13323b39e6f73c7e5877e8ea080f62335"; + sha512 = "31954e6be8bc114fab04c45f5ffa1f38c74ca147d790bf63130dac4fbc6f8213cf485216d5f50ceb87e60d587fbdb82fe7034c04182017b8120ec6995a9278a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/pt-BR/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pt-BR/firefox-58.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "c77a8c87942045b959058319fcccc35ff8d054842fc8d7332171f110e82595886746597614ec4884915ba8397c63ebce597dbab648d2f823a1fd803f8c662382"; + sha512 = "5cfe1e7d703cfa42a1033df3509db3e91788160079c9396d55356b3c7f0b848b59e6a8f704866dd14f2f0714e89830ad541da615c7d4209249ccc46b01eb11ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/pt-PT/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pt-PT/firefox-58.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "6c09645104219be720c843f3065617184ac5731f354d4217347c662d2cc7cf66060b7805e16b032914f20e75ebddc72de06c3f7b520656bf7d5afd9c4ca517d1"; + sha512 = "124ce2632b461e53b2cd3474e4fbcb92554006bee72498356886a451800a15d91ffe32ac87451b61d32e6f9d60b04dd14f4ba081a535124c7e2816edc11ac287"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/rm/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/rm/firefox-58.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "a232ea477b7b0841eb5dce7efb722b81da8136ec974bbdd7739d0700b163953f0b07e9509b973afa3c09af75b0b08523fe94dee21aec919f40f57e2ffd9dd6f3"; + sha512 = "847f41ff0293f82425bfba1af30deb4858c066f738f0f9d3db5303092406358e9b11f6207ed732903b860f60c1c1b1f622c5c1d2113eed073d70d039dac4a6bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ro/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ro/firefox-58.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "887a70aa19415abe5bb2bb10f4e66e293177713612186567e9691b715e8b7b7ec3487509a111e8d9053241bc74d1bc9bcbf930931a14050b7c8b513076ed385d"; + sha512 = "ccd5ac724cd810dec2e1ddb3e48139d9f5768d56ded09c0e6576c0dae898df310a4c5815635f646c0aa91caaad696c0ec6338bf21dacde33b4675f320fb4bca8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ru/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ru/firefox-58.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "efb8f8746d07a387d094e23c10f8a2ae3697e854b26a9ec78013f4fb2284a359bfa6cac686779fb8e1d72114c59e191f86240f02b61f4c748909dfcea45368a3"; + sha512 = "d003f707e4a481ddaeab11dffccbc46d0d7173afb081a5007b3efbb6e1ce8d081a4eb23017b87d7e22fc3741e117bdcddbd2393b578bae2d07a2c2c2bbe2d0a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/si/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/si/firefox-58.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "9b469c23762a85e1f536928d78df87da8cf2661f78e5a558d8caeaf504ef7ae54c54eb2c3b6ea00381fc2e83348e9f403bd1c106cb518148ebccd113b5e5f442"; + sha512 = "80e0e8c1ee6483a5b70140e4a6c0eb694f24dbce0a638700866ea8759063bba3f42c33ffaf465c7e8266fc764fe2983a2d6b098356dc6f4420eff9089c22331a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sk/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sk/firefox-58.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "1ff839d7c631fba2510534032345fcf6397f694d035daff179382270a7889b6c2046b4b2bd6d7666c6e298146ef47cc9fac2b7c525d7c8f563b58b7fe11a5dea"; + sha512 = "9aec4b3085ac757137a8ead6829bee1ae26cc02a494f60a3aa44daa56f5cbe1201c7588a60682b3bdccccad75782bade43d092352c015213e5f16212f9fb2800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sl/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sl/firefox-58.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "766e06e574d0f4933f8bf3e50521b5025915797f25712a29f0961759410272fda59aeb869d4d84cad961b277f5fc8ec78b8c333ee0e60e52e07fbb99822973b7"; + sha512 = "2dc5d855eaedd125f8a3d828d85bc12ae47123f2f4be2bbf1e262c678cbd2607ee48c61e6fa70402da5e7ad549e2580e7d9a0a696e89ac5fee1da2154443f289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/son/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/son/firefox-58.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "60df99153af07b88fd888b232b570eeeb4cafe01ed1c85cd536774b03e121523689d6de3fa3d6335fe7e0c9534273ce571d7a3fa00034e1681b78f4012a8fe7b"; + sha512 = "7a1c4f86a4e459e80725b250b3a54be7c78397bd909c7a2081723571378578b7e672af380305ff9dae714e911fb209833833fd7cb3fb8a850f9d6a3b14f41cba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sq/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sq/firefox-58.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "97263478fbeeada0ff397723bd8c4e0935c88c25cfc259bb2906e8d0a2ecce8101f4cb5ea9457b8b0b3276de475e0a8fbe995faa1edb33ced17b98404ac1021b"; + sha512 = "45d20dcd82c6648c0429dfa0009aaf2d807efb7e9468ded4491a04dced5957d3bc9c1491c09c7f85ea63991283e2c38b2c906ebb338dffba1d0db4748e56246a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sr/firefox-58.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b822f5077378b3c41951aafed6f6b3ab174d9240058d69a05905803c2b8ab74791abfc1ce59550585f0eca9fd97e3c0325c9bfeef47d14b8eca039959ebbbd1c"; + sha512 = "799f0548e18cbf77a6daf6ec0f9c12e904fde3235e9d8a5564e06df45bc037f4a04de0f5bfb9e74f9fa7053e8fc7b39b5c55b03dba5e78cf4e1400c033077f5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sv-SE/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sv-SE/firefox-58.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "20555a59e733f49b3714cd4517aa952a0e9306681f5ea1f33d9464ee50705187ad0e745ebfa00a64e4cd0aac4d7c3c3257cf04681e74e18037684e675b05df7b"; + sha512 = "c2c693ab974b4c26a0c786955cff61f3b0689bd272b00fe4cbdbd7701a57481724f0ebf8aeb8427c7b50f4419875e9ca10d79c534c0e3ca8db132bcf6436e013"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ta/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ta/firefox-58.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "2d5721bc3519b766dc70163b8f91988b49512e4709d998239691c382a006bb06fd82b793fce843f976a55cffa8a0ff06711917e35233629945539c1f27453d02"; + sha512 = "0771a9cbb44102291142fab34dbfd704461da5c6c013b48c1ee22cd7cc92ebfaad7ccac5b87bf764489d66e8cec2e4056e9fcd62c3ddb734753a48022f7f8914"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/te/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/te/firefox-58.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "28ff1470be8a12212ef2467daa9a363ef929fe8f6741678b5d17ccfa149b122bc2dd74478bb96e721725c87d6a3000878dd7b51d1e38e6242e6e286c3621b25f"; + sha512 = "699d8d52cc8e1bac02fbca3caa6504a028100d76fc9fe2492dfe214c5a96f0d3425bf541d2873133dd00e501dcc9d27894e613c44fc3cf9adedc0e08104524f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/th/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/th/firefox-58.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "935a7354cca219695f58592b1d6668ee3d305559ad9c30cfc274b63952bb133429528e38bda10d5cdeddb428133712da74ba621e2c831ae14329c22530f9ff91"; + sha512 = "13cf7e1740ab2f508983617ce27f991db8049070061cb4d31299b372a801abf7292edd185fafc73dd58c46d009c32a6b5103a77834b2ddb0cc420cd98f747e9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/tr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/tr/firefox-58.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "9f30bcd90b0c5ae5b55dc74a1e4adf8b029d8b87ba4f2961a4eb47ff4c61decff4abfac4f4664f1e99653f05a1749a17c775ba323ac322ec1fe3e104a4c57cc0"; + sha512 = "a3439d157762eddcc1c09c4b687028b97004ac49144a3f26ea2a05a8eccc0a8b04659147ae7e8972ac16299d262586cc1d0c1bc69e5a309a0c82086cf61202ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/uk/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/uk/firefox-58.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "eca33af02a5f2d7363688aa2636d407822dfe9b70fa003d085ca6b9c3089adb49d080204c5e94d89178ff952dc5ca6a9402446610eb3e4460e55cdb066b965e3"; + sha512 = "7767a4549265131e29a142c6f2a914b8699f2042a9da5831192668300acc564fbfe94009b3ea33a7bedc469a7585029685fa91dc752b46d7d7be5425776bc7c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ur/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ur/firefox-58.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "6dc7bb3693fa86305bb50be09c7945f199450c286867f56e66721944a27894e3de7a6452801ef4d04b0339403900b46effb7d2282a81c0b042ccf4c49f758a47"; + sha512 = "b85f5c3067cf897079ff1de7c0de84756fb2224f703ec6825108efff52bed3a6e780b8410a58ed756e926a6033cd10c888743642f997b9c9d7390096c3b5e7c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/uz/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/uz/firefox-58.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "1ab8b3aefedc0c50c76169c0890cc5e3c381b7f743bb901c5573103761ae67985deae20ac2ef5b5d0f85f848a82a8d60bc87336205e462ddd2f040ba3586f258"; + sha512 = "3febb16ceabdcf7395196f1aef6c5ecc6a09f45e63485207816e95dd5ec0ac9729c3644b8afa75d68241ad203459239bd7f5693c6d8aa7e59afb1a1f661015ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/vi/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/vi/firefox-58.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "cca1d12e5f34b78f930d7b7b53afce55567be0e9e6894b2af1d20a5c2c11df0531d06945d812bec956904fbd3ecb4921c282f8a9a520661c4988d2147d370dd8"; + sha512 = "d117eca28279af133e2dde8dc25d3f7c4dcdc97f683f4570aa9cb8965200dfd8799271958ed6113b9bee488fc3e17d772b1aa4a4d657a49f72914890752af13c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/xh/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/xh/firefox-58.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "8ed571a58fe104ef53aa785d10481371adcdf4a38f449bdbc65f6ab532797d9c4d301f6f75868645aca291cdc10ae3b5b8d2fd1f8f116f9ef21b9d91e4264f24"; + sha512 = "4ce7c4627a7db67ebe85ddb134cadca8cc4ecd3a01d8895dcb8b691f85e01911818404cc7243b4f5e1df0133a204a1ce5289168cae0b7e1b0b2674a659fc6684"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/zh-CN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/zh-CN/firefox-58.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "ca63b214cdd67857d69ba86263e3efeadddbfc0f35a6c13ba9308959bc158d481cd6930246f3b59b7c335399ccfcfe5fbbff5fd1cd62aa1316c1da96403dfae8"; + sha512 = "d0a73f00af50d70b055a1b2e89dc942b56d8d6e3a297407060a88a994dfcbd52fd60ec221e3afd9b6036500d27d861415ab0b25ceb443210321823e4e3b189e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/zh-TW/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/zh-TW/firefox-58.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "35bcec66fb184dddc9aab83fd91c561c396b6ae48bb9e027e4a64aa7aa60fd264ce4da917255370736ffb08fc42362bba61844ee0295c6b7adf721fb70d93136"; + sha512 = "a855e8de90b5b26e8d4fed05b48c5efd6626c9d793f30c1f0b71d9b062a4e253b8c417a44e581ea8edd7babf5bd536b4384dd494dbb2fa36d7f585e555cdd655"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 91b86a18375cc..69e935d78762d 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -59,7 +59,7 @@ , enableOfficialBranding ? true }: -assert stdenv.cc ? libc && stdenv.cc.libc != null; +assert stdenv.cc.libc or null != null; let flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")]; @@ -100,29 +100,25 @@ stdenv.mkDerivation (rec { rm -f configure rm -f js/src/configure rm -f .mozconfig* + '' + (if lib.versionAtLeast version "58" + # this will run autoconf213 + then '' + configureScript="$(realpath ./mach) configure" + '' else '' + make -f client.mk configure-files + configureScript="$(realpath ./configure)" + '') + '' + cxxLib=$( echo -n ${gcc}/include/c++/* ) + archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine ) - '' + lib.optionalString (stdenv.lib.versionAtLeast version "58.0.0") '' - cat >.mozconfig <<END_MOZCONFIG - ${lib.concatStringsSep "\n" (map (flag: "ac_add_options ${flag}") configureFlags)} - ${lib.optionalString googleAPISupport "ac_add_options --with-google-api-keyfile=$TMPDIR/ga"} - END_MOZCONFIG + test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml '' + lib.optionalString googleAPISupport '' # Google API key used by Chromium and Firefox. # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, # please get your own set of keys. echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/ga configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga") - '' + '' - # this will run autoconf213 - ${if (stdenv.lib.versionAtLeast version "58.0.0") then "./mach configure" else "make -f client.mk configure-files"} - - configureScript="$(realpath ./configure)" - - cxxLib=$( echo -n ${gcc}/include/c++/* ) - archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine ) - - test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml - + '' + lib.optionalString (lib.versionOlder version "58") '' cd obj-* ''; @@ -150,12 +146,12 @@ stdenv.mkDerivation (rec { "--disable-gconf" "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}" ] - ++ lib.optionals (stdenv.lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ + ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ # on i686-linux: --with-libclang-path is not available in this configuration "--with-libclang-path=${llvmPackages.libclang}/lib" "--with-clang-path=${llvmPackages.clang}/bin/clang" ] - ++ lib.optionals (stdenv.lib.versionAtLeast version "57") [ + ++ lib.optionals (lib.versionAtLeast version "57") [ "--enable-webrender=build" ] @@ -196,6 +192,16 @@ stdenv.mkDerivation (rec { ++ lib.optional enableOfficialBranding "--enable-official-branding" ++ extraConfigureFlags; + # Before 58 we have to run `make -f client.mk configure-files` at + # the top level, and then run `./configure` in the obj-* dir (see + # above), but in 58 we have to instead run `./mach configure` at the + # top level and then run `make` in obj-*. (We can also run the + # `make` at the top level in 58, but then we would have to `cd` to + # `make install` anyway. This is ugly, but simple.) + postConfigure = lib.optionalString (lib.versionAtLeast version "58") '' + cd obj-* + ''; + preBuild = lib.optionalString (enableOfficialBranding && isTorBrowserLike) '' buildFlagsArray=("MOZ_APP_DISPLAYNAME=Tor Browser") ''; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 930f0877412dd..4cb997031cf7b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -6,10 +6,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "58.0.1"; + version = "58.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "08xgv1qm2xx5wjczqg1ldf0yqm939zsghhr4acbkwnymv5apfak3vx0kcr9iwqkmdqjdjmggxz439kjn510f92fik33zjfsjn7sd9k5"; + sha512 = "ff748780492fc66b3e44c7e7641f16206e4c09514224c62d37efac2c59877bdf428a3670bfb50407166d7b505d4e2ea020626fd776b87f6abb6bc5d2e54c773f"; }; patches = @@ -99,44 +99,42 @@ rec { in rec { - tor-browser-6-5 = common (rec { + tor-browser-7-0 = common (rec { pname = "tor-browser"; - version = "6.5.2"; + version = "7.0.1"; isTorBrowserLike = true; - extraConfigureFlags = [ "--disable-loop" ]; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; - repo = "tor-browser"; - # branch "tor-browser-45.8.0esr-6.5-2-slnos" - rev = "e4140ea01b9906934f0347e95f860cec207ea824"; - sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60"; + repo = "tor-browser"; + # branch "tor-browser-52.5.0esr-7.0-1-slnos"; + rev = "830ff8d622ef20345d83f386174f790b0fc2440d"; + sha256 = "169mjkr0bp80yv9nzza7kay7y2k03lpnx71h4ybcv9ygxgzdgax5"; }; - } // commonAttrs) { - stdenv = overrideCC stdenv gcc5; - ffmpegSupport = false; - gssSupport = false; - }; - tor-browser-7-0 = common (rec { + patches = + [ ./env_var_for_system_dir.patch ]; + } // commonAttrs) {}; + + tor-browser-7-5 = common (rec { pname = "tor-browser"; - version = "7.0.1"; + version = "7.5.2"; isTorBrowserLike = true; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-52.5.0esr-7.0-1-slnos"; - rev = "830ff8d622ef20345d83f386174f790b0fc2440d"; - sha256 = "169mjkr0bp80yv9nzza7kay7y2k03lpnx71h4ybcv9ygxgzdgax5"; + # branch "tor-browser-52.6.2esr-7.5-2-slnos"; + rev = "cf1a504aaa26af962ae909a3811c0038db2d2eec"; + sha256 = "0llbk7skh1n7yj137gv7rnxfasxsnvfjp4ss7h1fbdnw19yba115"; }; patches = [ ./env_var_for_system_dir.patch ]; } // commonAttrs) {}; - tor-browser = tor-browser-7-0; + tor-browser = tor-browser-7-5; }) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 614f55d01d6d4..dc9c33585526f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "28.0.0.137"; + version = "28.0.0.161"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1hj3sfrspdkhq967fmnpgamgiq90k263cqfas94gp3dzslmkingw" + "0dsgq39c2d0kkdcd9j4nddqn3qiq5pvm2r67ji4m4wyv9chn518m" else - "1v4k6hzngm23xwxnh6ngplp2m0ga480sbcm668bpcj61krmi6xy4" + "0x26qi9qr01rppji5l4nwvmrhmq6qy83dsppbb7jqjmgyvknq5jd" else if arch == "x86_64" then - "0ijmrk6262a1xcf98g94vdlqxnik9f7igjy08j3a2i4b5bikq479" + "1s62gx2a9q962w3gc847x2xwlzkq4dkzbmvf74x5k5c2k2l9hhg0" else - "10a17dba4zy29padvi3fnv2s8v71q698ffqjp8ggsla42pjyhvkh"; + "1m5pcgz2w9f3jkm3hpvysc8ap20y458xnba7j51d7h7fjy6md89x"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index d5c4f993d8ba7..4528dd70cbd3b 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "28.0.0.137"; + version = "28.0.0.161"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0xr3hf828sm0xdnmk2kavxmvzc6m0mw369khrxyfwrbxvdsibwn8" + "0934vs3c51fjz9pr846wg9xn7h2qybswayfkhz0pnzcfnng2rrf1" else - "1wr0avjpshrj51svb1sfnshz39xxla1brqs8pbcgfgyqjh350rgn"; + "0pwi7pbfldiqiwc7yfy7psyr93679r025vjxmiybs2ap69vly4v0"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix new file mode 100644 index 0000000000000..93cf220e49961 --- /dev/null +++ b/pkgs/applications/networking/browsers/otter/default.nix @@ -0,0 +1,25 @@ +{ stdenv, cmake, openssl, gst_all_1, fetchFromGitHub +, qtbase, qtmultimedia, qtwebengine +, version ? "0.9.94" +, sourceSha ? "19mfm0f6qqkd78aa6q4nq1y9gnlasqiyk68zgqjp1i03g70h08k5" +}: +stdenv.mkDerivation { + name = "otter-browser-${version}"; + + src = fetchFromGitHub { + owner = "OtterBrowser"; + repo = "otter-browser"; + rev = "v${version}"; + sha256 = sourceSha; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qtbase qtmultimedia qtwebengine ]; + + meta = with stdenv.lib; { + license = licenses.gpl3Plus; + description = "Browser aiming to recreate the best aspects of the classic Opera (12.x) UI using Qt5"; + maintainers = with maintainers; [ lheckemann ]; + }; +} diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 00db16a8cf160..2612df3efcfff 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -4,7 +4,7 @@ , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, xz , gstreamer, gst-plugins-base, libxml2 -, glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3 +, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at_spi2_atk, gnome3 , nss, nspr , patchelf, makeWrapper , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "1.13.1008.34-1"; + version = "1.14.1077.45-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "18p5n87n5rkd6dhdsf2lvcyhg6ipn0k4p6a79dy93vsgjmk4bvw2"; + sha256 = "0b4iviar927jx6xqyrzgzb3p4p617zm4an1np8jnldadq2a0p56d"; }; unpackPhase = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd + atk at_spi2_atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 83819761e9bbe..c71ccdf8a0d20 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -53,8 +53,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - configureFlags = "--with-ssl=${openssl.dev} --with-gc=${boehmgc.dev}" - + optionalString graphicsSupport " --enable-image=${optionalString x11Support "x11,"}fb"; + configureFlags = + [ "--with-ssl=${openssl.dev}" "--with-gc=${boehmgc.dev}" ] + ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "ac_cv_func_setpgrp_void=yes" + ] + ++ optional graphicsSupport "--enable-image=${optionalString x11Support "x11,"}fb"; preConfigure = '' substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 408019eeb4b2a..173402144ccc6 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, kubernetes }: +{ stdenv, fetchurl, kubectl }: let arch = if stdenv.isLinux then "linux-amd64" else "darwin-amd64"; checksum = if stdenv.isLinux - then "9f04c4824fc751d6c932ae5b93f7336eae06e78315352aa80241066aa1d66c49" - else "5058142bcd6e16b7e01695a8f258d27ae0b6469caf227ddf6aa2181405e6aa8e"; + then "19sbvpll947y4dxn2dj26by2bwhcxa5nbkrq7x3cikn7z5bmj7vf" + else "0jllj13jv8yil6iqi4xcs5v4z388h7i7hcnv98gc14spkyjshf3d"; pname = "helm"; - version = "2.7.2"; + version = "2.8.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ ]; - propagatedBuildInputs = [ kubernetes ]; + propagatedBuildInputs = [ kubectl ]; phases = [ "buildPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index 6a8fe2834912a..1c2e2ccac27be 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { + broken = true; # needs ruby 2.1 homepage = https://github.com/CenturyLinkLabs/panamax-api; description = "The API behind The Panamax UI"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix index 4a6481e3e5ee2..2f60942f014ba 100644 --- a/pkgs/applications/networking/cluster/panamax/ui/default.nix +++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { + broken = true; # needs ruby 2.1 homepage = https://github.com/CenturyLinkLabs/panamax-ui; description = "The Web GUI for Panamax"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile new file mode 100644 index 0000000000000..c4f9a5511de94 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'terraform_landscape' diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock new file mode 100644 index 0000000000000..047ddaadad072 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock @@ -0,0 +1,25 @@ +GEM + remote: https://rubygems.org/ + specs: + colorize (0.8.1) + commander (4.4.4) + highline (~> 1.7.2) + diffy (3.2.0) + highline (1.7.10) + polyglot (0.3.5) + terraform_landscape (0.1.17) + colorize (~> 0.7) + commander (~> 4.4) + diffy (~> 3.0) + treetop (~> 1.6) + treetop (1.6.9) + polyglot (~> 0.3) + +PLATFORMS + ruby + +DEPENDENCIES + terraform_landscape + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/applications/networking/cluster/terraform-landscape/default.nix b/pkgs/applications/networking/cluster/terraform-landscape/default.nix new file mode 100644 index 0000000000000..a0dca341ff3e3 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-landscape/default.nix @@ -0,0 +1,19 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + name = "terraform-landscape-${version}"; + + version = (import gemset).terraform_landscape.version; + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "Improve Terraform's plan output to be easier to read and understand"; + homepage = https://github.com/coinbase/terraform-landscape; + license = with licenses; apsl20; + maintainers = with maintainers; [ mbode ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix new file mode 100644 index 0000000000000..38321b9d37aaf --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix @@ -0,0 +1,61 @@ +{ + colorize = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b"; + type = "gem"; + }; + version = "0.8.1"; + }; + commander = { + dependencies = ["highline"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "165yr8qzan3gnk241mnwxsvdfwp6p1afg13z0mqdily6lh95acl9"; + type = "gem"; + }; + version = "4.4.4"; + }; + diffy = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "015nn9zaciqj43mfpjlw619r5dvnfkrjcka8nsa6j260v6qya941"; + type = "gem"; + }; + version = "3.2.0"; + }; + highline = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; + type = "gem"; + }; + version = "1.7.10"; + }; + polyglot = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; + type = "gem"; + }; + version = "0.3.5"; + }; + terraform_landscape = { + dependencies = ["colorize" "commander" "diffy" "treetop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bx8nfqbpxb2hnxnnl1m4sq6jlzf451c85m047jfq04b6w9691fl"; + type = "gem"; + }; + version = "0.1.17"; + }; + treetop = { + dependencies = ["polyglot"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sdkd1v2h8dhj9ncsnpywmqv7w1mdwsyc5jwyxlxwriacv8qz8bd"; + type = "gem"; + }; + version = "1.6.9"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix index 72da1dd77d574..40117b4585506 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix @@ -11,6 +11,10 @@ let inherit owner repo sha256; rev = "v${version}"; }; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/${repo}{,_v${version}}"; }; maybeDrv = name: data: diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index 93ff39bde64f7..62fe4e2e662e1 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Mini Web server that let others upload files to your computer"; homepage = http://stackp.online.fr/droopy; license = licenses.bsd3; - maintainers = [ maintainers.profpatsch ]; + maintainers = [ maintainers.Profpatsch ]; }; } diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 99517b478c32a..017f9c0c95a0e 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -24,6 +24,6 @@ buildPythonApplication rec { description = "A tool that converts RSS/Atom newsfeeds to email."; homepage = https://pypi.python.org/pypi/rss2email; license = licenses.gpl2; - maintainers = with maintainers; [ jb55 profpatsch ]; + maintainers = with maintainers; [ jb55 Profpatsch ]; }; } diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 105239aca0244..585e0c847da29 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -75,5 +75,6 @@ buildPythonApplication rec { description = "Multipurpose automation tool for content like torrents"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ domenkozar tari ]; + broken = true; # as of 2018-02-09 }; } diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index b01c6497fb238..42c510495574c 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,9 +1,6 @@ { stdenv, fetchurl, autoreconfHook, python, intltool, pkgconfig, libX11 , ldns, pythonPackages -# Test requirements -, xvfb_run - , enableJingle ? true, farstream ? null, gst-plugins-bad ? null , libnice ? null , enableE2E ? true @@ -25,13 +22,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gajim-${version}"; - version = "0.16.8"; + version = "0.16.9"; src = fetchurl { name = "${name}.tar.bz2"; url = "https://dev.gajim.org/gajim/gajim/repository/archive.tar.bz2?" + "ref=${name}"; - sha256 = "009cpzqh4zy7hc9pq3r5m4lgagwawhjab13rjzavb0n9ggijcscb"; + sha256 = "121dh906zya9n7npyk7b5xama0z3ycy9jl7l5jm39pc86h1winh3"; }; patches = let @@ -46,8 +43,7 @@ stdenv.mkDerivation rec { name = "gajim-${name}.patch"; url = "https://dev.gajim.org/gajim/gajim/commit/${rev}.diff"; inherit sha256; - }) cherries) - ++ [./fix-tests.patch]; # https://dev.gajim.org/gajim/gajim/issues/8660 + }) cherries); postPatch = '' sed -i -e '0,/^[^#]/ { @@ -74,8 +70,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pythonPackages.wrapPython intltool pkgconfig - # Test dependencies - xvfb_run ]; autoreconfPhase = '' @@ -114,9 +108,8 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = '' - XDG_DATA_DIRS="$out/share/gajim''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS" \ PYTHONPATH="test:$out/share/gajim/src:''${PYTHONPATH:+:}$PYTHONPATH" \ - xvfb-run make test + make test_nogui ''; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch b/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch deleted file mode 100644 index cb866bb2d7392..0000000000000 --- a/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/common/gajim.py b/src/common/gajim.py -index 4a5d884b6..95d401b67 100644 ---- a/src/common/gajim.py -+++ b/src/common/gajim.py -@@ -415,7 +415,7 @@ def get_jid_from_account(account_name, full=False): - jid = name + '@' + hostname - if full: - resource = connections[account_name].server_resource -- jid += '/' + resource -+ jid += '/' + str(resource) - return jid - - def get_our_jids(): diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 770c2fc02c5e4..3caa75acb0702 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.30.2.1665"; + version = "4.30.3.1670"; 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 = "0gk1h2p5apppw94353378b2z93c5kllhgadb91z1g3mczczsbm0n"; + sha256 = "0alqzay6bvi7ybrrdk5r0xkg4sx6qjsqbgmr16bkqxncxhb215ay"; } else throw "HipChat is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 55187f335981c..e0aecd2c81028 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,29 +1,33 @@ { stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev -, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip +, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp , mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake , libmatroska, bcunit, doxygen, gdk_pixbuf, glib, cairo, pango, polarssl +, python, graphviz, belcard }: stdenv.mkDerivation rec { baseName = "linphone"; - version = "3.10.2"; + version = "3.12.0"; name = "${baseName}-${version}"; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "053gad4amdbq5za8f2n9j5q59nkky0w098zbsa3dvpcqvv7ar16p"; + sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j"; }; buildInputs = [ readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11 polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip - bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango + bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango bzrtp belcard ]; - nativeBuildInputs = [ intltool pkgconfig makeWrapper cmake doxygen ]; + nativeBuildInputs = [ + intltool pkgconfig makeWrapper cmake doxygen graphviz + (python.withPackages (ps: [ ps.pystache ps.six ])) + ]; NIX_CFLAGS_COMPILE = " -Wno-error -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include -I${gtk2.dev}/include/gtk-2.0/ diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 0e052e847ccb9..654c343caa8b5 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "04sgns9qczzw2152gqdr6bjyy4fmgs26cz8n3qck94l0j51rxhz8"; }; - propagatedBuildInputs = with pythonPackages; [ msgpack pyqt4 numpy pyopencl ] ++ [ openssl ]; + propagatedBuildInputs = with pythonPackages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ]; preConfigure = '' # Remove interaction and misleading output diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 0632e787c700e..38bc58d8b1038 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -77,7 +77,7 @@ let "${patchdir}/pjproject/add_dtls_transport.patch" ]; CFLAGS = "-g -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000"; - }); + }); in stdenv.mkDerivation rec { name = "ring-daemon-${version}"; @@ -145,5 +145,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ taeer olynch ]; platforms = platforms.linux; + # pjsip' fails to compile with the supplied patch set, see: https://hydra.nixos.org/build/68667921/nixlog/4 + broken = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 92960e3812333..ea88745481559 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.13.3"; + version = "0.13.5"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0acim3kad6lv5ni4blg75phb3njyk9s5h6x7fsn151h1pvsc5mmw"; + sha256 = "1ap62ksi3dg7qijxxysjpnlmngzgh2jdldvb8s1jx14avanccch6"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index b7dfdb3e34134..ea2030e964b9a 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { name = "teamspeak-client-${version}"; - version = "3.1.7"; + version = "3.1.8"; src = fetchurl { urls = [ @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run" ]; sha256 = if stdenv.is64bit - then "1ww20805b7iphkh1ra3py6f7l7s321cg70sfl9iw69n05l3313fn" - else "0yvhmbhliraakn9k4bij6rnai7hn50g4z6mfjsyliizf6437x4nr"; + then "0yav71sfklqg2k3ayd0bllsixd486l0587s5ygjlc9gnchw3zg6z" + else "1agf6jf5hkyxazxqcnvcjfb263p5532ahi7h4rkifnnvqay36v5i"; }; # grab the plugin sdk for the desktop icon @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { free = false; }; maintainers = [ stdenv.lib.maintainers.lhvwb ]; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix index 29026ccdc5ad8..77a8d57f8b6ff 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { description = "Telegram client forked from sigram"; homepage = http://aseman.co/en/products/cutegram/; license = licenses.gpl3; - maintainers = with maintainers; [ profpatsch AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } -#TODO: appindicator, for system tray plugin (by @profpatsch) +#TODO: appindicator, for system tray plugin diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix index ec2e65dc4997b..49368da708e9a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "A fork of libqtelegram by Aseman, using qmake"; homepage = src.meta.homepage; license = licenses.gpl3; - maintainers = [ maintainers.profpatsch ]; + maintainers = [ maintainers.Profpatsch ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix index c8d24c9b28c1e..0efa7bee1d0ba 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Telegram API tools for QtQml and Qml"; homepage = src.meta.homepage; license = licenses.gpl3; - maintainers = [ maintainers.profpatsch ]; + maintainers = [ maintainers.Profpatsch ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index 7fbdf0f6a64c5..e2b3d073dd332 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -2,17 +2,17 @@ pythonPackages.buildPythonApplication rec { pname = "afew"; - version = "1.2.0"; + version = "1.3.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "121w7bd53xyibllxxbfykjj76n81kn1vgjqd22izyh67y8qyyk5r"; + sha256 = "0105glmlkpkjqbz350dxxasvlfx9dk0him9vwbl86andzi106ygz"; }; buildInputs = with pythonPackages; [ setuptools_scm ]; propagatedBuildInputs = with pythonPackages; [ - pythonPackages.notmuch chardet + pythonPackages.notmuch chardet dkimpy ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32; makeWrapperArgs = [ diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 9c2ab08babcf2..36dc94951d5c8 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,27 +1,39 @@ -{ stdenv, fetchgit, python2Packages, gnupg1orig, makeWrapper, openssl }: +{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, makeWrapper, openssl, git }: python2Packages.buildPythonApplication rec { name = "mailpile-${version}"; - version = "0.4.1"; + version = "1.0.0rc2"; - src = fetchgit { - url = "git://github.com/pagekite/Mailpile"; - rev = "refs/tags/${version}"; - sha256 = "118b5zwfwmzj38p0mkj3r1s09jxg8x38y0a42b21imzpmli5vpb5"; + src = fetchFromGitHub { + owner = "mailpile"; + repo = "Mailpile"; + rev = "${version}"; + sha256 = "1z5psh00fjr8gnl4yjcl4m9ywfj24y1ffa2rfb5q8hq4ksjblbdj"; }; - patchPhase = '' - substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${python2Packages.python.libPrefix}/site-packages/' + dir" + postPatch = '' + patchShebangs scripts ''; + nativeBuildInputs = with python2Packages; [ pbr git ]; + PBR_VERSION=version; + propagatedBuildInputs = with python2Packages; [ - makeWrapper pillow jinja2 spambayes python2Packages.lxml - pgpdump gnupg1orig + appdirs + cryptography + fasteners + gnupg1orig + jinja2 + pgpdump + pillow + python2Packages.lxml + spambayes ]; postInstall = '' wrapProgram $out/bin/mailpile \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}" + --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}" \ + --set-default MAILPILE_SHARED "$out/share/mailpile" ''; # No tests were found diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 6cfac41676ccd..dac9475665f5f 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "mblaze-${version}"; - version = "0.3"; + version = "0.3.1"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "chneukirchen"; repo = "mblaze"; rev = "v${version}"; - sha256 = "1jrn81rvw6qanlfppc12dkvpbmidzrq1lx3rfhvcsna55k3gjyw9"; + sha256 = "1a4rqadq3dm6r11v7akng1qy88zpiq5qbqdryb8df3pxkv62nm1a"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch deleted file mode 100644 index be094c9a397f6..0000000000000 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a736c0dfd22cd4ab0da86c30a664c91843df1b98 Mon Sep 17 00:00:00 2001 -From: Adam Ruzicka <a.ruzicka@outlook.com> -Date: Sat, 29 Jul 2017 12:16:29 +0200 -Subject: [PATCH] notmuch-0.25 compatibility fix - ---- - notmuch-addrlookup.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/notmuch-addrlookup.c b/notmuch-addrlookup.c -index c5cf5b4..a95ded0 100644 ---- a/notmuch-addrlookup.c -+++ b/notmuch-addrlookup.c -@@ -171,6 +171,13 @@ create_queries (notmuch_database_t *db, - count += tmp; - if (notmuch_query_count_messages_st (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS) - count += tmp; -+#elif LIBNOTMUCH_MAJOR_VERSION >= 5 -+ unsigned int count = 0; -+ unsigned int tmp; -+ if (notmuch_query_count_messages (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS) -+ count += tmp; -+ if (notmuch_query_count_messages (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS) -+ count += tmp; - #else - unsigned int count = notmuch_query_count_messages (queries[0]) - + notmuch_query_count_messages (queries[1]); -@@ -233,6 +240,13 @@ run_queries (notmuch_database_t *db, - #if LIBNOTMUCH_MAJOR_VERSION >= 4 && LIBNOTMUCH_MINOR_VERSION >= 3 - if (notmuch_query_search_messages_st (queries[i], &messages) != NOTMUCH_STATUS_SUCCESS) - continue; -+#elif LIBNOTMUCH_MAJOR_VERSION >= 5 -+ unsigned int count = 0; -+ unsigned int tmp; -+ if (notmuch_query_count_messages (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS) -+ count += tmp; -+ if (notmuch_query_count_messages (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS) -+ count += tmp; - #else - if (!(messages = notmuch_query_search_messages (queries[i]))) - continue; --- -2.13.3 - diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index f5d48d03c96ae..c2cce227576a5 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -1,32 +1,28 @@ { stdenv, fetchFromGitHub, pkgconfig, glib, notmuch }: +let + version = "9"; +in stdenv.mkDerivation rec { name = "notmuch-addrlookup-${version}"; - version = "7"; src = fetchFromGitHub { owner = "aperezdc"; repo = "notmuch-addrlookup-c"; rev ="v${version}"; - sha256 = "0mz0llf1ggl1k46brgrqj3i8qlg1ycmkc5a3a0kg8fg4s1c1m6xk"; + sha256 = "1j3zdx161i1x4w0nic14ix5i8hd501rb31daf8api0k8855sx4rc"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib notmuch ]; - # Required until notmuch-addrlookup can be compiled against notmuch >= 0.25 - patches = [ ./0001-notmuch-0.25-compatibility-fix.patch ]; - - installPhase = '' - mkdir -p "$out/bin" - cp notmuch-addrlookup "$out/bin" - ''; + installPhase = "install -D notmuch-addrlookup $out/bin/notmuch-addrlookup"; meta = with stdenv.lib; { description = "Address lookup tool for Notmuch in C"; homepage = https://github.com/aperezdc/notmuch-addrlookup-c; maintainers = with maintainers; [ mog garbas ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; }; } diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 0c0f55e633706..c23c264559f86 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { [[ -s "$lib" ]] || die "couldn't find libnotmuch" badname="$(otool -L "$prg" | awk '$1 ~ /libtalloc/ { print $1 }')" - goodname="$(find "${talloc}/lib" -name 'libtalloc.?.?.?.dylib')" + goodname="$(find "${talloc}/lib" -name 'libtalloc.*.*.*.dylib')" [[ -n "$badname" ]] || die "couldn't find libtalloc reference in binary" [[ -n "$goodname" ]] || die "couldn't find libtalloc in nix store" diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index 75ed084c28534..af6a4dfddc1b6 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -8,18 +8,14 @@ stdenv.mkDerivation { cp offrss $out/bin ''; - crossAttrs = { - propagatedBuildInputs = [ curl.crossDrv libmrss.crossDrv ]; - preConfigure = '' - sed 's/^PDF/#PDF/' -i Makefile - ''; - }; - - buildInputs = [ curl libmrss podofo ] + buildInputs = [ curl libmrss ] + ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; configurePhase = stdenv.lib.optionalString (!stdenv.isLinux) '' sed 's/#EXTRA/EXTRA/' -i Makefile + '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + sed 's/^PDF/#PDF/' -i Makefile ''; src = fetchurl { diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 5556a58ec5641..84e10fb18bcac 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -40,7 +40,13 @@ in stdenv.mkDerivation { ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; - patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; + patches = [ ./wireshark-lookup-dumpcap-in-path.patch ] + # https://code.wireshark.org/review/#/c/23728/ + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + name = "fix-timeout.patch"; + url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=8b5b843fcbc3e03e0fc45f3caf8cf5fc477e8613;hp=94af9724d140fd132896b650d10c4d060788e4f0"; + sha256 = "1g2dm7lwsnanwp68b9xr9swspx7hfj4v3z44sz3yrfmynygk8zlv"; + }); postInstall = optionalString (withQt || withGtk) '' ${optionalString withGtk '' diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 1a79e31a05d88..f5e8876e2b345 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }: stdenv.mkDerivation rec { - version = "0.14.43"; + version = "0.14.44"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1n09zmp9dqrl3y0fa0l1gx6f09j9mm3xdf7b58y03znspsg7mxhi"; + sha256 = "1gdkx6lbzmdz2hqc9slbq41rwgkxmdisnj0iywx4mppmc2b4v6wh"; }; buildInputs = [ go removeReferencesTo ]; diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix deleted file mode 100644 index cd6fcc28a50a1..0000000000000 --- a/pkgs/applications/networking/syncthing012/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - name = "syncthing-${version}"; - version = "0.12.15"; - rev = "v${version}"; - - goPackagePath = "github.com/syncthing/syncthing"; - - src = fetchFromGitHub { - inherit rev; - owner = "syncthing"; - repo = "syncthing"; - sha256 = "0g4sj509h45iq6g7b0pl88rbbn7c7s01774yjc6bl376x1xrl6a1"; - }; - - goDeps = ./deps.nix; - - postPatch = '' - # Mostly a cosmetic change - sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go - ''; - - preBuild = '' - export buildFlagsArray+=("-tags" "noupgrade release") - ''; - - meta = { - knownVulnerabilities = [ "CVE-2017-1000420" ]; - homepage = https://www.syncthing.net/; - description = "Open Source Continuous File Synchronization"; - license = stdenv.lib.licenses.mpl20; - platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd; - }; -} diff --git a/pkgs/applications/networking/syncthing012/deps.nix b/pkgs/applications/networking/syncthing012/deps.nix deleted file mode 100644 index 44e18c2f606dc..0000000000000 --- a/pkgs/applications/networking/syncthing012/deps.nix +++ /dev/null @@ -1,128 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; - sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; - sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; - }; - } - { - goPackagePath = "github.com/bkaradzic/go-lz4"; - fetch = { - type = "git"; - url = "https://github.com/bkaradzic/go-lz4"; - rev = "74ddf82598bc4745b965729e9c6a463bedd33049"; - sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1"; - }; - } - { - goPackagePath = "github.com/calmh/luhn"; - fetch = { - type = "git"; - url = "https://github.com/calmh/luhn"; - rev = "0c8388ff95fa92d4094011e5a04fc99dea3d1632"; - sha256 = "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; - sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; - }; - } - { - goPackagePath = "github.com/vitrun/qart"; - fetch = { - type = "git"; - url = "https://github.com/vitrun/qart"; - rev = "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0"; - sha256 = "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8"; - }; - } - { - goPackagePath = "github.com/calmh/du"; - fetch = { - type = "git"; - url = "https://github.com/calmh/du"; - rev = "3c0690cca16228b97741327b1b6781397afbdb24"; - sha256 = "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa"; - }; - } - { - goPackagePath = "github.com/calmh/xdr"; - fetch = { - type = "git"; - url = "https://github.com/calmh/xdr"; - rev = "e467b5aeb65ca8516fb3925c84991bf1d7cc935e"; - sha256 = "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra"; - }; - } - { - goPackagePath = "github.com/juju/ratelimit"; - fetch = { - type = "git"; - url = "https://github.com/juju/ratelimit"; - rev = "772f5c38e468398c4511514f4f6aa9a4185bc0a0"; - sha256 = "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p"; - }; - } - { - goPackagePath = "github.com/thejerf/suture"; - fetch = { - type = "git"; - url = "https://github.com/thejerf/suture"; - rev = "99c1f2d613756768fc4299acd9dc621e11ed3fd7"; - sha256 = "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "723cc1e459b8eea2dea4583200fd60757d40097a"; - sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h"; - }; - } - { - goPackagePath = "github.com/syndtr/goleveldb"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/goleveldb"; - rev = "1a9d62f03ea92815b46fcaab357cfd4df264b1a0"; - sha256 = "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb"; - }; - } -] diff --git a/pkgs/applications/networking/syncthing013/default.nix b/pkgs/applications/networking/syncthing013/default.nix deleted file mode 100644 index e1a0dc38c11f7..0000000000000 --- a/pkgs/applications/networking/syncthing013/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchgit, go }: - -stdenv.mkDerivation rec { - version = "0.13.10"; - name = "syncthing-${version}"; - - src = fetchgit { - url = https://github.com/syncthing/syncthing; - rev = "refs/tags/v${version}"; - sha256 = "07q3j6mnrza719rnvbkdsmvlkyr2pch5sj2l204m5iy5mxaghpx7"; - }; - - buildInputs = [ go ]; - - buildPhase = '' - mkdir -p src/github.com/syncthing - ln -s $(pwd) src/github.com/syncthing/syncthing - export GOPATH=$(pwd) - - # Syncthing's build.go script expects this working directory - cd src/github.com/syncthing/syncthing - - go run build.go -no-upgrade -version v${version} install all - ''; - - installPhase = '' - mkdir -p $out/bin - cp bin/* $out/bin - ''; - - meta = { - knownVulnerabilities = [ "CVE-2017-1000420" ]; - homepage = https://www.syncthing.net/; - description = "Open Source Continuous File Synchronization"; - license = stdenv.lib.licenses.mpl20; - maintainers = with stdenv.lib.maintainers; [pshendry]; - platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd; - }; -} diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix new file mode 100644 index 0000000000000..88b65be076566 --- /dev/null +++ b/pkgs/applications/office/spice-up/default.nix @@ -0,0 +1,61 @@ +{ stdenv +, fetchFromGitHub +, gettext +, libxml2 +, pkgconfig +, gtk3 +, granite +, gnome3 +, json_glib +, cmake +, ninja +, libgudev +, libevdev +, vala +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "spice-up-${version}"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "Philip-Scott"; + repo = "Spice-up"; + rev = version; + sha256 = "0cbyhi6d99blv33183j6nakzcqxz5hqy9ijykiasbmdycfd5q0fh"; + }; + USER = "nix-build-user"; + + XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [ + "${granite}/share" + "${gnome3.libgee}/share" + ]; + + nativeBuildInputs = [ + pkgconfig + wrapGAppsHook + vala + cmake + ninja + gettext + libxml2 + ]; + buildInputs = [ + gtk3 + granite + gnome3.libgee + json_glib + libgudev + libevdev + gnome3.gnome_themes_standard + ]; + + meta = with stdenv.lib; { + description = "Create simple and beautiful presentations on the Linux desktop"; + homepage = https://github.com/Philip-Scott/Spice-up; + maintainers = with maintainers; [ samdroid-apps ]; + platforms = platforms.linux; + # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+ + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index da096acc27fcc..be5ac7a2f2bed 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "LUA_INCLUDE=${lua52Packages.lua}/include" "LUA_LIB=${lua52Packages.lua}/lib/liblua.so" - "XFT_PACKAGE=--libs=\{-lX11 -lXft\}" - ]; + ] ++ stdenv.lib.optional stdenv.isLinux "XFT_PACKAGE=--libs=\{-lX11 -lXft\}"; dontUseNinjaBuild = true; dontUseNinjaInstall = true; @@ -37,11 +36,12 @@ stdenv.mkDerivation rec { ]; # To be able to find <Xft.h> - NIX_CFLAGS_COMPILE = "-I${libXft.dev}/include/X11"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isLinux "-I${libXft.dev}/include/X11"; # Binaries look for LuaFileSystem library (lfs.so) at runtime postInstall = '' wrapProgram $out/bin/wordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; + '' + stdenv.lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; ''; @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = https://cowlark.com/wordgrinder; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix new file mode 100644 index 0000000000000..0bac6c778049a --- /dev/null +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, fetchFromGitHub +, zlib +, pkgs +, mpi ? false +}: + +stdenv.mkDerivation rec { + pname = "RAxML"; + version = "8.2.11"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "stamatak"; + repo = "standard-${pname}"; + rev = "v${version}"; + sha256 = "08fmqrr7y5a2fmmrgfz2p0hmn4mn71l5yspxfcwwsqbw6vmdfkhg"; + }; + + buildInputs = if mpi then [ pkgs.openmpi ] else []; + + # TODO darwin, AVX and AVX2 makefile targets + buildPhase = if mpi then '' + make -f Makefile.MPI.gcc + '' else '' + make -f Makefile.SSE3.PTHREADS.gcc + ''; + + installPhase = if mpi then '' + mkdir -p $out/bin && cp raxmlHPC-MPI $out/bin + '' else '' + mkdir -p $out/bin && cp raxmlHPC-PTHREADS-SSE3 $out/bin + ''; + + meta = with stdenv.lib; { + description = "A tool for Phylogenetic Analysis and Post-Analysis of Large Phylogenies"; + license = licenses.gpl3; + homepage = https://sco.h-its.org/exelixis/web/software/raxml/; + maintainers = [ maintainers.unode ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 640f32671bbd2..365057414e996 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "samtools"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2"; - sha256 = "17p4vdj2j2qr3b2c0v4100h6cg4jj3zrb4dmdnd9d9aqs74d4p7f"; + sha256 = "e7b09673176aa32937abd80f95f432809e722f141b5342186dfef6a53df64ca1"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch b/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch new file mode 100644 index 0000000000000..a7782a1a0264c --- /dev/null +++ b/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch @@ -0,0 +1,22 @@ +diff --git a/Makefile b/Makefile +index 2f51bfc..395d6f1 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + CC= gcc + CFLAGS= -g -Wall -O2 + #LDFLAGS= -Wl,-rpath,\$$ORIGIN/../lib +-DFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_USE_KNETFILE -D_CURSES_LIB=1 ++DFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_USE_KNETFILE # -D_CURSES_LIB=1 + KNETFILE_O= knetfile.o + LOBJS= bgzf.o kstring.o bam_aux.o bam.o bam_import.o sam.o bam_index.o \ + bam_pileup.o bam_lpileup.o bam_md.o razf.o faidx.o bedidx.o \ +@@ -15,7 +15,7 @@ PROG= samtools + INCLUDES= -I. + SUBDIRS= . bcftools misc + LIBPATH= +-LIBCURSES= -lcurses # -lXCurses ++LIBCURSES= # -lcurses # -lXCurses + + .SUFFIXES:.c .o + .PHONY: all lib diff --git a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix new file mode 100644 index 0000000000000..a811bc4412f2b --- /dev/null +++ b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, zlib }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "samtools"; + version = "0.1.19"; + + src = fetchurl { + url = "mirror://sourceforge/samtools/${name}.tar.bz2"; + sha256 = "d080c9d356e5f0ad334007e4461cbcee3c4ca97b8a7a5a48c44883cf9dee63d4"; + }; + + patches = [ + ./samtools-0.1.19-no-curses.patch + ]; + + buildInputs = [ zlib ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man + + cp samtools $out/bin + cp samtools.1 $out/share/man + ''; + + meta = with stdenv.lib; { + description = "Tools for manipulating SAM/BAM/CRAM format"; + license = licenses.mit; + homepage = http://samtools.sourceforge.net/; + platforms = platforms.unix; + maintainers = [ maintainers.unode ]; + }; +} diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix new file mode 100644 index 0000000000000..2ff20fef40e89 --- /dev/null +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, symlinkJoin, gfortran, perl, procps +, libyaml, libxc, fftw, openblas, gsl +}: + +let + version = "7.2"; + fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; }; + +in stdenv.mkDerivation { + name = "octopus-${version}"; + + src = fetchurl { + url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz"; + sha256 = "03zzmq72zdnjkhifbmlxs7ig7x6sf6mv8zv9mxhakm9hzwa9yn7m"; + }; + + nativeBuildInputs = [ perl procps fftw.dev ]; + buildInputs = [ libyaml gfortran libxc openblas gsl fftw.out ]; + + configureFlags = '' + --with-yaml-prefix=${libyaml} + --with-blas=-lopenblas + --with-lapack=-lopenblas + --with-fftw-prefix=${fftwAll} + --with-gsl-prefix=${gsl} + --with-libxc-prefix=${libxc} + ''; + + doCheck = false; + checkTarget = "check-short"; + + postPatch = '' + patchShebangs ./ + ''; + + postConfigure = '' + patchShebangs testsuite/oct-run_testsuite.sh + ''; + + meta = with stdenv.lib; { + description = "Real-space time dependent density-functional theory code"; + homepage = http://octopus-code.org; + maintainers = with maintainers; [ markuskowa ]; + license = licenses.gpl2; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 379224c73f89f..218006e15d5c6 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -12,7 +12,25 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake zlib boost.out boost.dev ]; - NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ] + # Squelch endless stream of warnings on same few things + ++ stdenv.lib.optionals stdenv.cc.isClang [ + "-Wno-empty-body" + "-Wno-tautological-compare" + "-Wc++11-compat-deprecated-writable-strings" + "-Wno-deprecated" + ]; + + prePatch = '' + sed -i -e '1i#include <stdint.h>' abc/src/bdd/dsd/dsd.h + substituteInPlace abc/src/bdd/dsd/dsd.h --replace \ + '((Child = Dsd_NodeReadDec(Node,Index))>=0);' \ + '((intptr_t)(Child = Dsd_NodeReadDec(Node,Index))>=0);' + + patch -p1 -d minisat -i ${./minisat-fenv.patch} + patch -p1 -d glucose -i ${./glucose-fenv.patch} + ''; + patches = [ ./0001-no-static-boost-libs.patch ]; diff --git a/pkgs/applications/science/logic/avy/glucose-fenv.patch b/pkgs/applications/science/logic/avy/glucose-fenv.patch new file mode 100644 index 0000000000000..dd19f7ec80e7b --- /dev/null +++ b/pkgs/applications/science/logic/avy/glucose-fenv.patch @@ -0,0 +1,65 @@ +From d6e0cb60270e8653bda3f339e3a07ce2cd2d6eb0 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Tue, 17 Oct 2017 23:01:36 -0500 +Subject: [PATCH] glucose: use fenv to set double precision + +--- + core/Main.cc | 8 ++++++-- + simp/Main.cc | 8 ++++++-- + utils/System.h | 2 +- + 3 files changed, 13 insertions(+), 5 deletions(-) + +diff --git a/core/Main.cc b/core/Main.cc +index c96aadd..994132b 100644 +--- a/core/Main.cc ++++ b/core/Main.cc +@@ -96,8 +96,12 @@ int main(int argc, char** argv) + // printf("This is MiniSat 2.0 beta\n"); + + #if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("c WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/simp/Main.cc b/simp/Main.cc +index 4f4772d..70c2e4b 100644 +--- a/simp/Main.cc ++++ b/simp/Main.cc +@@ -97,8 +97,12 @@ int main(int argc, char** argv) + + + #if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/utils/System.h b/utils/System.h +index 004d498..a768e99 100644 +--- a/utils/System.h ++++ b/utils/System.h +@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA + #define Glucose_System_h + + #if defined(__linux__) +-#include <fpu_control.h> ++#include <fenv.h> + #endif + + #include "glucose/mtl/IntTypes.h" +-- +2.14.2 + diff --git a/pkgs/applications/science/logic/avy/minisat-fenv.patch b/pkgs/applications/science/logic/avy/minisat-fenv.patch new file mode 100644 index 0000000000000..686d5a1c5b499 --- /dev/null +++ b/pkgs/applications/science/logic/avy/minisat-fenv.patch @@ -0,0 +1,65 @@ +From 7f1016ceab9b0f57a935bd51ca6df3d18439b472 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Tue, 17 Oct 2017 22:57:02 -0500 +Subject: [PATCH] use fenv instead of non-standard fpu_control + +--- + core/Main.cc | 8 ++++++-- + simp/Main.cc | 8 ++++++-- + utils/System.h | 2 +- + 3 files changed, 13 insertions(+), 5 deletions(-) + +diff --git a/core/Main.cc b/core/Main.cc +index 2b0d97b..8ad95fb 100644 +--- a/core/Main.cc ++++ b/core/Main.cc +@@ -78,8 +78,12 @@ int main(int argc, char** argv) + // printf("This is MiniSat 2.0 beta\n"); + + #if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/simp/Main.cc b/simp/Main.cc +index 2804d7f..39bfb71 100644 +--- a/simp/Main.cc ++++ b/simp/Main.cc +@@ -79,8 +79,12 @@ int main(int argc, char** argv) + // printf("This is MiniSat 2.0 beta\n"); + + #if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/utils/System.h b/utils/System.h +index 1758192..c0ad13a 100644 +--- a/utils/System.h ++++ b/utils/System.h +@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA + #define Minisat_System_h + + #if defined(__linux__) +-#include <fpu_control.h> ++#include <fenv.h> + #endif + + #include "mtl/IntTypes.h" +-- +2.14.2 + diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 2b40995b74338..aa815e48db411 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, writeShellScriptBin }: stdenv.mkDerivation rec { name = "boolector-${version}"; @@ -8,6 +8,24 @@ stdenv.mkDerivation rec { sha256 = "0mdf7hwix237pvknvrpazcx6s3ininj5k7vhysqjqgxa7lxgq045"; }; + prePatch = + let + lingelingPatch = writeShellScriptBin "lingeling-patch" '' + sed -i -e "1i#include <stdint.h>" lingeling/lglib.h + + ${crossFix}/bin/crossFix lingeling + ''; + crossFix = writeShellScriptBin "crossFix" '' + # substituteInPlace not available here + sed -i $1/makefile.in \ + -e 's@ar rc@$(AR) rc@' \ + -e 's@ranlib@$(RANLIB)@' + ''; + in '' + sed -i -e 's@mv lingeling\* lingeling@\0 \&\& ${lingelingPatch}/bin/lingeling-patch@' makefile + sed -i -e 's@mv boolector\* boolector@\0 \&\& ${crossFix}/bin/crossFix boolector@' makefile + ''; + installPhase = '' mkdir $out mv boolector/bin $out diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 6b213226635db..403eff216f53c 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -22,10 +22,17 @@ stdenv.mkDerivation rec { "--with-boost=${boost.dev}" ]; + prePatch = '' + patch -p1 -i ${./minisat-fenv.patch} -d src/prop/minisat + patch -p1 -i ${./minisat-fenv.patch} -d src/prop/bvminisat + ''; + preConfigure = '' patchShebangs ./src/ ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A high-performance theorem prover and SMT solver"; homepage = http://cvc4.cs.nyu.edu/web/; diff --git a/pkgs/applications/science/logic/cvc4/minisat-fenv.patch b/pkgs/applications/science/logic/cvc4/minisat-fenv.patch new file mode 100644 index 0000000000000..686d5a1c5b499 --- /dev/null +++ b/pkgs/applications/science/logic/cvc4/minisat-fenv.patch @@ -0,0 +1,65 @@ +From 7f1016ceab9b0f57a935bd51ca6df3d18439b472 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Tue, 17 Oct 2017 22:57:02 -0500 +Subject: [PATCH] use fenv instead of non-standard fpu_control + +--- + core/Main.cc | 8 ++++++-- + simp/Main.cc | 8 ++++++-- + utils/System.h | 2 +- + 3 files changed, 13 insertions(+), 5 deletions(-) + +diff --git a/core/Main.cc b/core/Main.cc +index 2b0d97b..8ad95fb 100644 +--- a/core/Main.cc ++++ b/core/Main.cc +@@ -78,8 +78,12 @@ int main(int argc, char** argv) + // printf("This is MiniSat 2.0 beta\n"); + + #if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/simp/Main.cc b/simp/Main.cc +index 2804d7f..39bfb71 100644 +--- a/simp/Main.cc ++++ b/simp/Main.cc +@@ -79,8 +79,12 @@ int main(int argc, char** argv) + // printf("This is MiniSat 2.0 beta\n"); + + #if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/utils/System.h b/utils/System.h +index 1758192..c0ad13a 100644 +--- a/utils/System.h ++++ b/utils/System.h +@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA + #define Minisat_System_h + + #if defined(__linux__) +-#include <fpu_control.h> ++#include <fenv.h> + #endif + + #include "mtl/IntTypes.h" +-- +2.14.2 + diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index e026cfad218ee..db252f97916a0 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0m578rpa5rdn08d10kr4lbsdwp4402hpavrz6n7n53xs517rn5hm"; }; + prePatch = '' + substituteInPlace picosat.c --replace "sys/unistd.h" "unistd.h" + + substituteInPlace makefile.in \ + --replace 'ar rc' '$(AR) rc' \ + --replace 'ranlib' '$(RANLIB)' + ''; + configurePhase = "./configure.sh --shared --trace"; installPhase = '' diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 532df11209b80..5eda2da605661 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -1,8 +1,6 @@ -{ stdenv, fetchFromGitHub, python2, fixDarwinDylibNames }: +{ stdenv, fetchFromGitHub, python, fixDarwinDylibNames }: -let - python = python2; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "z3-${version}"; version = "4.6.0"; @@ -14,6 +12,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ python fixDarwinDylibNames ]; + propagatedBuildInputs = [ python.pkgs.setuptools ]; enableParallelBuilding = true; configurePhase = '' diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 725b3f342c3e2..7bd19cfc520e1 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib , less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas -, curl, Cocoa, Foundation, cf-private, libobjc, tzdata, fetchpatch +, curl, Cocoa, Foundation, cf-private, libobjc, libcxx, tzdata, fetchpatch , withRecommendedPackages ? true , enableStrictBarrier ? false }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pango pcre perl readline texLive xz zlib less texinfo graphviz icu pkgconfig bison imake which jdk openblas curl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ ./no-usr-local-search-paths.patch ]; @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { --without-aqua --disable-R-framework OBJC="clang" + CPPFLAGS="-isystem ${libcxx}/include/c++/v1" + LDFLAGS="-L${libcxx}/lib" '' + '' ) echo >>etc/Renviron.in "TCLLIBPATH=${tk}/lib" diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 686e93b5d5e22..ee646fee2c257 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -29,6 +29,7 @@ , texlive , texinfo , hevea +, buildDocs ? false }: stdenv.mkDerivation rec { @@ -87,7 +88,7 @@ stdenv.mkDerivation rec { # Sage installs during first `make`, `make install` is no-op and just takes time. ''; - outputs = [ "out" "doc" ]; + outputs = [ "out" ] ++ stdenv.lib.optionals (buildDocs) [ "doc" ]; buildInputs = [ bash # needed for the build @@ -135,13 +136,16 @@ stdenv.mkDerivation rec { # TODO could be patched with `sed s|printf(ctime(\(.*\)))|%s... or fixed upstream ]; + configureFlags = stdenv.lib.optionals(buildDocs) [ "--docdir=$(doc)" ]; preConfigure = '' - export SAGE_NUM_THREADS=$NIX_BUILD_CORES + export SAGE_NUM_THREADS="$NIX_BUILD_CORES" export SAGE_ATLAS_ARCH=fast - export HOME=$out/sage-home - mkdir -p $out/sage-home + export HOME=/tmp/sage-home + export SAGE_ROOT="$PWD" + export SAGE_SRC="$PWD" + mkdir -p "$HOME" mkdir -p "$out" # we need to keep the source around @@ -150,12 +154,18 @@ stdenv.mkDerivation rec { mv "$dir" "$out/sage-root" cd "$out/sage-root" # build in target dir, since `make` is also `make install` + '' + + stdenv.lib.optionalString (buildDocs) '' + mkdir -p "$doc" + export SAGE_DOC="$doc" + export SAGE_DOCBUILD_OPTS="--no-pdf-links -k" + export SAGE_SPKG_INSTALL_DOCS='no' ''; + buildFlags = if (buildDocs) then "doc" else "build"; + # for reference: http://doc.sagemath.org/html/en/installation/source.html preBuild = '' - # TODO do this conditionally - export SAGE_SPKG_INSTALL_DOCS='no' # symlink python to make sure the shebangs are patched to the sage path # while still being able to use python before building it # (this is important because otherwise sage will try to install python @@ -167,10 +177,15 @@ stdenv.mkDerivation rec { ''; postBuild = '' + # Clean up rm -r "$out/sage-root/upstream" # don't keep the sources of all the spkgs - rm -r "$out/sage-root/src/build" - rm -rf "$out/sage-root/src/.git" + rm -rf "$out/sage-root/src/build" + rm -rf "$out/sage-root/src/autom4te.cache" + rm -rf "$out/sage-root/src/config" + rm -rf "$out/sage-root/src/m4" + rm -rf "$out/sage-root/.git" rm -r "$out/sage-root/logs" + rm -r "$out"/lib/python*/test # Fix dependency cycle between out and doc rm -f "$out/sage-root/config.log" rm -f "$out/sage-root/config.status" diff --git a/pkgs/applications/science/math/sage/spkg-giac.patch b/pkgs/applications/science/math/sage/spkg-giac.patch index 15b91433d2544..c79d4422133d7 100644 --- a/pkgs/applications/science/math/sage/spkg-giac.patch +++ b/pkgs/applications/science/math/sage/spkg-giac.patch @@ -1,10 +1,19 @@ ---- old/build/pkgs/giac/spkg-install 2017-07-21 14:10:00.000000000 -0500 -+++ new/build/pkgs/giac/spkg-install 2017-10-15 15:55:55.321237645 -0500 -@@ -4,6 +4,8 @@ +diff --git a/build/pkgs/giac/spkg-install b/build/pkgs/giac/spkg-install +index bdd8df6cb8..3fd7a3ef8a 100644 +--- a/build/pkgs/giac/spkg-install ++++ b/build/pkgs/giac/spkg-install +@@ -2,6 +2,15 @@ ## Giac ########################################### -+find . -type f -exec sed -e 's@/bin/cp@cp@g' -i '{}' ';' && echo "Patching input parser" && find . -iname 'input_parser.cc' ++# Fix hardcoded paths, while making sure to only update timestamps of actually ++# changed files (otherwise confuses make) ++grep -rlF '/bin/cp' . | while read file ++do ++ sed -e 's@/bin/cp@cp@g' -i "$file" ++done ++ ++# Fix input parser syntax +sed -e 's@yylex (&yylval)@yylex (\&yyval, scanner)@gp' -i 'src/src/input_parser.cc' if [ "$SAGE_LOCAL" = "" ]; then diff --git a/pkgs/applications/science/math/sage/spkg-git.patch b/pkgs/applications/science/math/sage/spkg-git.patch index ff9a7b2e491a2..74f552dd3c369 100644 --- a/pkgs/applications/science/math/sage/spkg-git.patch +++ b/pkgs/applications/science/math/sage/spkg-git.patch @@ -1,12 +1,17 @@ diff --git a/build/pkgs/git/spkg-install b/build/pkgs/git/spkg-install -index 8469cb58c2..d0dc9a1db9 100755 +index 87874de3d8..b0906245fa 100644 --- a/build/pkgs/git/spkg-install +++ b/build/pkgs/git/spkg-install -@@ -35,6 +35,8 @@ fi +@@ -33,6 +33,13 @@ fi cd src -+find . -type f -exec sed -e 's@/usr/bin/perl@perl@g' -i '{}' ';' ++# Fix hardcoded paths, while making sure to only update timestamps of actually ++# changed files (otherwise confuses make) ++grep -rlF '/usr/bin/perl' . | while read file ++do ++ sed -e 's@/usr/bin/perl@perl@g' -i "$file" ++done + # We don't want to think about Fink or Macports export NO_FINK=1 diff --git a/pkgs/applications/science/math/sage/spkg-singular.patch b/pkgs/applications/science/math/sage/spkg-singular.patch index d561768600b4b..606ffcd3ad4ed 100644 --- a/pkgs/applications/science/math/sage/spkg-singular.patch +++ b/pkgs/applications/science/math/sage/spkg-singular.patch @@ -1,11 +1,17 @@ ---- old/build/pkgs/singular/spkg-install 2017-10-15 10:35:41.826540964 -0500 -+++ new/build/pkgs/singular/spkg-install 2017-10-15 10:36:40.613743443 -0500 -@@ -4,6 +4,9 @@ +diff --git a/build/pkgs/singular/spkg-install b/build/pkgs/singular/spkg-install +index 8caafb1699..3c34e6608a 100644 +--- a/build/pkgs/singular/spkg-install ++++ b/build/pkgs/singular/spkg-install +@@ -2,6 +2,13 @@ ## Singular ########################################### -+find . -type f -exec sed -e 's@/bin/rm@rm@g' -i '{}' ';' -+#echo '#!/usr/bin/env bash\nIgnoring missing $1' > src/build-aux/missing ++# Fix hardcoded paths, while making sure to only update timestamps of actually ++# changed files (otherwise confuses make) ++grep -rlF '/bin/rm' . | while read file ++do ++ sed -e 's@/bin/rm@rm@g' -i "$file" ++done + if [ -z "$SAGE_LOCAL" ]; then echo >&2 "Error: SAGE_LOCAL undefined -- exiting..." diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 0952b61551e31..04a5def81e697 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchPypi, unzip, buildPythonApplication, makeDesktopItem # mandatory -, qtpy, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil -, pyflakes, rope, sphinx, nbconvert, mccabe +, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil +, pyflakes, rope, sphinx, nbconvert, mccabe, pyopengl, cloudpickle # optional , numpy ? null, scipy ? null, matplotlib ? null # optional @@ -10,17 +10,21 @@ buildPythonApplication rec { pname = "spyder"; - version = "3.2.4"; - namePrefix = ""; + version = "3.2.6"; src = fetchPypi { inherit pname version; - sha256 = "028hg71gfq2yrplwhhl7hl4rbwji1l0zxzghblwmb0i443ki10v3"; + sha256 = "87d6a4f5ee1aac4284461ee3584c3ade50cb53feb3fe35abebfdfb9be18c526a"; }; + # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing? + postPatch = '' + substituteInPlace setup.py --replace 'pyqt5;python_version>="3"' ' ' + ''; + propagatedBuildInputs = [ - jedi pycodestyle psutil qtpy pyflakes rope numpy scipy matplotlib pylint - numpydoc qtconsole qtawesome nbconvert mccabe + jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint + numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle ]; # There is no test for spyder diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index f6df5fc496d79..c355b193dfd13 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/applications/search/catfish/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, file, which, intltool, findutils, xdg_utils, - gnome3, pythonPackages, wrapGAppsHook }: +{ stdenv, fetchurl, file, which, intltool, gobjectIntrospection, + findutils, xdg_utils, gnome3, pythonPackages, hicolor_icon_theme, + wrapGAppsHook +}: pythonPackages.buildPythonApplication rec { majorver = "1.4"; - minorver = "2"; + minorver = "4"; version = "${majorver}.${minorver}"; - name = "catfish-${version}"; + pname = "catfish"; src = fetchurl { - url = "https://launchpad.net/catfish-search/${majorver}/${version}/+download/${name}.tar.bz2"; - sha256 = "0j3by9yfs4j9za3s5qdxrsm7idmps69pimc9d0mjyakvviy0izm3"; + url = "https://launchpad.net/catfish-search/${majorver}/${version}/+download/${pname}-${version}.tar.gz"; + sha256 = "1mw7py6si6y88jblmzm04hf049bpww7h87k2wypq07zm1dw55m52"; }; nativeBuildInputs = [ @@ -17,6 +19,7 @@ pythonPackages.buildPythonApplication rec { file which intltool + gobjectIntrospection wrapGAppsHook ]; @@ -26,6 +29,7 @@ pythonPackages.buildPythonApplication rec { pythonPackages.pyxdg pythonPackages.ptyprocess pythonPackages.pycairo + hicolor_icon_theme ]; propagatedBuildInputs = [ @@ -35,17 +39,20 @@ pythonPackages.buildPythonApplication rec { findutils ]; - preFixup = '' - rm "$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.pyc" - for f in \ - "$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.py" \ - "$out/share/applications/catfish.desktop" - do - substituteInPlace $f --replace "${pythonPackages.python}" "$out" - done + # Explicitly set the prefix dir in "setup.py" because setuptools is + # not using "$out" as the prefix when installing catfish data. In + # particular the variable "__catfish_data_directory__" in + # "catfishconfig.py" is being set to a subdirectory in the python + # path in the store. + postPatch = '' + sed -i "/^ if self.root/i\\ self.prefix = \"$out\"" setup.py ''; + # Disable check because there is no test in the source distribution + doCheck = false; + meta = with stdenv.lib; { + homepage = https://launchpad.net/catfish-search; description = "A handy file search tool"; longDescription = '' Catfish is a handy file searching tool. The interface is @@ -53,7 +60,6 @@ pythonPackages.buildPythonApplication rec { You can configure it to your needs by using several command line options. ''; - homepage = https://launchpad.net/catfish-search; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index b2a4bc66c6992..7bf83b5621b5c 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: let - version = "1.12.15"; + version = "1.13.0"; jarName = "bfg-${version}.jar"; mavenUrl = "http://central.maven.org/maven2/com/madgag/bfg/${version}/${jarName}"; in @@ -12,7 +12,7 @@ in src = fetchurl { url = mavenUrl; - sha256 = "17dh25jambkk55khknlhy8wa9s1i1xmh9hdgj72j1lzyl0ag42ik"; + sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 96e2220f58279..e5e36e998aceb 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -117,7 +117,7 @@ rec { git = gitSVN; }; - svn2git_kde = callPackage ./svn2git-kde { }; + svn_all_fast_export = libsForQt5.callPackage ./svn-all-fast-export { }; tig = callPackage ./tig { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 6fb9f5e36f1ad..d810499515224 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -41,6 +41,6 @@ buildRustPackage rec { inherit (src.meta) homepage; description = "Decentralized Issue Tracking for git"; license = licenses.gpl2; - maintainers = with maintainers; [ profpatsch matthiasbeyer ]; + maintainers = with maintainers; [ Profpatsch matthiasbeyer ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 8b64e2d375bb3..afb3716f04ce1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -57,7 +57,10 @@ stdenv.mkDerivation { makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "") - + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ "); + + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ") + # XXX: USE_PCRE2 might be useful in general, look into it + # XXX other alpine options? + + (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else ""); # build git-credential-osxkeychain if darwin postBuild = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index cbcf4cd9aeb7f..be5b58c573341 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_25, ncurses, pkgconfig, readline }: let - version = "0.1.1"; + version = "0.1.2"; in buildGoPackage { name = "grv-${version}"; @@ -10,15 +10,16 @@ buildGoPackage { goPackagePath = "github.com/rgburke/grv"; - goDeps = ./deps.nix; - src = fetchFromGitHub { owner = "rgburke"; repo = "grv"; rev = "v${version}"; - sha256 = "0q9gvxfw48d4kjpb2jx7lg577vazjg0n961y6ija5saja5n16mk2"; + sha256 = "1i8cr5xxdacpby60nqfyj8ijyc0h62029kbds2lq26rb8nn9qih2"; + fetchSubmodules = true; }; + buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ]; + meta = with stdenv.lib; { description = " GRV is a terminal interface for viewing git repositories"; homepage = https://github.com/rgburke/grv; diff --git a/pkgs/applications/version-management/git-and-tools/grv/deps.nix b/pkgs/applications/version-management/git-and-tools/grv/deps.nix deleted file mode 100644 index 8de555df2e8f9..0000000000000 --- a/pkgs/applications/version-management/git-and-tools/grv/deps.nix +++ /dev/null @@ -1,102 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/Sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/Sirupsen/logrus"; - rev = "768a92a02685ee7535069fc1581341b41bab9b72"; - sha256 = "1m67cxb6p0zgq0xba63qb4vvy6z5d78alya0vnx5djfixygiij53"; - }; - } - { - goPackagePath = "github.com/bradfitz/slice"; - fetch = { - type = "git"; - url = "https://github.com/bradfitz/slice"; - rev = "d9036e2120b5ddfa53f3ebccd618c4af275f47da"; - sha256 = "189h48w3ppvx2kqyxq0s55kxv629lljjxbyqjnlrgg8fy6ya8wgy"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "51eb1ee00b6d931c66d229ceeb7c31b985563420"; - sha256 = "090wzpwsjana1qas8ipwh1pj959gvc4b7vwybzi01f3bmd79jwlp"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; - sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; - }; - } - { - goPackagePath = "github.com/rgburke/goncurses"; - fetch = { - type = "git"; - url = "https://github.com/rgburke/goncurses"; - rev = "9a788ac9d81e61c6a2ca6205ee8d72d738ed12b9"; - sha256 = "0xqwxscdszbybriyzqmsd2zkzda9anckx56q8gksfy3gwj286gpb"; - }; - } - { - goPackagePath = "github.com/rjeczalik/notify"; - fetch = { - type = "git"; - url = "https://github.com/rjeczalik/notify"; - rev = "27b537f07230b3f917421af6dcf044038dbe57e2"; - sha256 = "05alsqjz2x8jzz2yp8r20zwglcg7y1ywq60zy6icj18qs3abmlp0"; - }; - } - { - goPackagePath = "github.com/tchap/go-patricia"; - fetch = { - type = "git"; - url = "https://github.com/tchap/go-patricia"; - rev = "5ad6cdb7538b0097d5598c7e57f0a24072adf7dc"; - sha256 = "0351x63zqympgfsnjl78cgvqhvipl3kfs1i15hfaw91hqin6dykr"; - }; - } - { - goPackagePath = "go4.org"; - fetch = { - type = "git"; - url = "https://github.com/camlistore/go4"; - rev = "fba789b7e39ba524b9e60c45c37a50fae63a2a09"; - sha256 = "01irxqy8na646b4zbw7v3zwy3yx9m7flhim5c3z4lzq5hiy2h75i"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "1875d0a70c90e57f11972aefd42276df65e895b9"; - sha256 = "1kprrdzr4i4biqn7r9gfxzsmijya06i9838skprvincdb1pm0q2q"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "3dbebcf8efb6a5011a60c2b4591c1022a759af8a"; - sha256 = "02pwjyimpm13km3fk0rg2l9p37w7qycdwp74piawwgcgh80qnww9"; - }; - } - { - goPackagePath = "gopkg.in/libgit2/git2go.v25"; - fetch = { - type = "git"; - url = "https://gopkg.in/libgit2/git2go.v25"; - rev = "334260d743d713a55ff3c097ec6707f2bb39e9d5"; - sha256 = "0hfya9z2pg29zbc0s92hj241rnbk7d90jzj34q0dp8b7akz6r1rc"; - }; - } -] diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix new file mode 100644 index 0000000000000..fbafc5257d7bd --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qttools, subversion, apr }: + +let + version = "1.0.11"; +in +stdenv.mkDerivation { + name = "svn-all-fast-export-${version}"; + + src = fetchFromGitHub { + owner = "svn-all-fast-export"; + repo = "svn2git"; + rev = version; + sha256 = "0lhnw8f15j4wkpswhrjd7bp9xkhbk32zmszaxayzfhbdl0g7pzwj"; + }; + + # https://github.com/svn-all-fast-export/svn2git/pull/40 + patches = [ + (fetchpatch { + name = "pr40.patch"; + sha256 = "1qndhk5csf7kddk3giailx7r0cdipq46lj73nkcws43n4n93synk"; + url = https://github.com/svn-all-fast-export/svn2git/pull/40.diff; + }) + ]; + + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ apr.dev subversion.dev qtbase ]; + + qmakeFlags = [ + "VERSION=${version}" + "APR_INCLUDE=${apr.dev}/include/apr-1" + "SVN_INCLUDE=${subversion.dev}/include/subversion-1" + ]; + + installPhase = "make install INSTALL_ROOT=$out"; + + meta = with stdenv.lib; { + homepage = https://github.com/svn-all-fast-export/svn2git; + description = "A fast-import based converter for an svn repo to git repos"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.flokli ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix deleted file mode 100644 index e52fdb6375bfd..0000000000000 --- a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchgit, qt4, qmake4Hook, subversion, apr }: - -stdenv.mkDerivation rec { - name = "svn2git-kde-1.0.5"; - - src = fetchgit { - url = http://git.gitorious.org/svn2git/svn2git.git; - rev = "149d6c6e14a1724c96999328683a9264fc508264"; - sha256 = "0gjxhnraizlwyidn66rczwc01f6sfx4ndmsj86ssqml3p0d4sl6q"; - }; - - NIX_CFLAGS_COMPILE = [ "-I${apr.dev}/include/apr-1" "-I${subversion.dev}/include/subversion-1" "-DVER=\"${src.rev}\"" ]; - - patchPhase = '' - sed -i 's|/bin/cat|cat|' ./src/repository.cpp - ''; - - installPhase = '' - mkdir -p $out/bin - cp svn-all-fast-export $out/bin - ''; - - buildInputs = [ subversion apr qt4 ]; - - nativeBuildInputs = [ qmake4Hook ]; - - meta.broken = true; -} diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index c2006e9dd6bf6..c24d80e3f2efa 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -22,15 +22,15 @@ stdenv.mkDerivation rec { patchFlags = ["-p0"]; patches = [ (fetchurl { - url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-dot.patch"; + url = "http://src.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-dot.patch"; sha256 = "0risfy8iqmkr209hmnvpv57ywbd3rvchzzd0jy2lfyqrrrm6zknw"; }) (fetchurl { - url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-new-stdio.patch"; + url = "http://src.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-new-stdio.patch"; sha256 = "16bj0ppzqd45an154dr7sifjra7lv4m9anxfw3c56y763jq7fafa"; }) (fetchurl { - url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-typefix.patch"; + url = "http://src.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-typefix.patch"; sha256 = "1gfp82rc7pawb5x4hh2wf7xh1l1l54ib75930xgd1y437la4703r"; }) ]; diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index d39c814001003..a34afbab55e6c 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "smartgithg-${version}"; - version = "17_1_1"; + version = "17_1_4"; src = fetchurl { - url = "http://www.syntevo.com/static/smart/download/smartgit/smartgit-linux-${version}.tar.gz"; - sha256 = "1zc1cs9gxv9498jp1nhi9z70dv9dzv0yh5f3bd89wi5zvcwly3d0"; + url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${version}.tar.gz"; + sha256 = "1x8s1mdxg7m3fy3izgnb1smrn4ng3q31x0sqnjlchkb5vx7gp5rh"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix index 424a402780af9..4d41cad0d8e66 100644 --- a/pkgs/applications/version-management/tailor/default.nix +++ b/pkgs/applications/version-management/tailor/default.nix @@ -7,7 +7,7 @@ python2Packages.buildPythonApplication rec { src = fetchurl { urls = [ "http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz" - "http://pkgs.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz" + "http://src.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz" ]; sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh"; }; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index dcbafd8594d3d..403fc7e4ee117 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -95,6 +95,11 @@ in stdenv.mkDerivation rec { url = "https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f.patch"; sha256 = "1sr0770rvhsgz8d7ysr9qqp4g9gwdhgj8g3rgnz90wl49lgrykhb"; }) + (fetchpatch { + name = "CVE-2018-6360.patch"; + url = https://salsa.debian.org/multimedia-team/mpv/raw/ddface85a1adfdfe02ffb25b5ac7fac715213b97/debian/patches/09_ytdl-hook-whitelist-protocols.patch; + sha256 = "1gb1lkjbr8rv4v9ji6w5z97kbxbi16dbwk2255ajbvngjrc7vivv"; + }) ]; postPatch = '' diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index d8f18f97ad9a8..cf77e3dfe663d 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Convert parts of a video while you are watching it in mpv"; homepage = https://gist.github.com/Zehkul/25ea7ae77b30af959be0; - maintainers = [ lib.maintainers.profpatsch ]; + maintainers = [ lib.maintainers.Profpatsch ]; longDescription = '' When this script is loaded into mpv, you can hit Alt+W to mark the beginning and Alt+W again to mark the end of the clip. Then a settings window opens. diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 64bdbd21686f6..1c7a72d95ae1f 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -29,13 +29,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "20.1.3"; + version = "21.0.2"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "0qdpa2xxiiw53ksvlrf80jm8gz6kxsn56sffv2v2ijxvy7kw5zcg"; + sha256 = "1yyvxqzxy9dz6rmjcrdn90nfaff4f38mfz2gsq535cr59sg3f8jc"; }; patches = [ ./find-xcb.patch ]; diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix new file mode 100644 index 0000000000000..13f93800f6e24 --- /dev/null +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "QMediathekView"; + version = "2017-04-16"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "adamreichold"; + repo = pname; + rev = "8c69892b95bf6825bd06a8c594168a98fe7cb2d1"; + sha256 = "1wca1w4iywd3hmiwcqx6fv79p3x5n1cgbw2liw3hs24ch3z54ckm"; + }; + + postPatch = '' + substituteInPlace ${pname}.pro \ + --replace /usr "" + ''; + + buildInputs = [ qtbase qttools xz boost ]; + + nativeBuildInputs = [ qmake pkgconfig ]; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + meta = with stdenv.lib; { + description = "An alternative Qt-based front-end for the database maintained by the MediathekView project"; + inherit (src.meta) homepage; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix new file mode 100644 index 0000000000000..32bd731f16e94 --- /dev/null +++ b/pkgs/applications/video/subdl/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, python3 }: + +stdenv.mkDerivation rec { + name = "subdl-0.0pre.2017.11.06"; + + src = fetchFromGitHub { + owner = "alexanderwink"; + repo = "subdl"; + rev = "4cf5789b11f0ff3f863b704b336190bf968cd471"; + sha256 = "0kmk5ck1j49q4ww0lvas2767kwnzhkq0vdwkmjypdx5zkxz73fn8"; + }; + + meta = { + homepage = https://github.com/alexanderwink/subdl; + description = "A command-line tool to download subtitles from opensubtitles.org"; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.exfalso ]; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + install -vD subdl $out/bin/subdl + ''; +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 56436d047f2e2..339d3e8490d9b 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -209,14 +209,14 @@ rec { tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; - docker_18_01 = dockerGen rec { - version = "18.01.0-ce"; - rev = "03596f51b120095326d2004d676e97228a21014d"; # git commit - sha256 = "1zffaxwkfz8ca76f5ql5z76mcjx37jbgv2kk75i68487yg16x0md"; - runcRev = "b2567b37d7b75eb4cf325b77297b140ea686ce8f"; - runcSha256 = "0zarsrbfcm1yp6mdl6rcrigdf7nb70xmv2cbggndz0qqyrw0mk0l"; - containerdRev = "89623f28b87a6004d4b785663257362d1658a729"; - containerdSha256 = "0irx7ps6rhq7z69cr3gspxdr7ywrv6dz62gkr1z2723cki9hsxma"; + docker_18_02 = dockerGen rec { + version = "18.02.0-ce"; + rev = "fc4de447b563498eb4da89f56fb858bbe761d91b"; # git commit + sha256 = "1025cwv2niiwg5pc30nb1qky1raisvd9ix2qw6rdib232hwq9k8m"; + runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e"; + runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln"; + containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55"; + containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index 16be0cc5b6d2a..e9cee2503851d 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = https://looking-glass.hostfission.com/; license = licenses.gpl2Plus; maintainers = [ maintainers.pneumaticat ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 91b02f7ad1f0d..68ab979ecfbe1 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -101,6 +101,10 @@ stdenv.mkDerivation rec { else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else ""; + passthru = { + qemu-system-i386 = "bin/qemu-system-i386"; + }; + meta = with stdenv.lib; { homepage = http://www.qemu.org/; description = "A generic and open source machine emulator and virtualizer"; diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index ec3fe9ccf221a..22799a7af8e79 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -248,4 +248,10 @@ callPackage (import ./generic.nix (rec { -i tools/libxl/libxl_device.c ''; + passthru = { + qemu-system-i386 = if withInternalQemu + then "lib/xen/bin/qemu-system-i386" + else throw "this xen has no qemu builtin"; + }; + })) ({ ocamlPackages = ocamlPackages_4_02; } // args) diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 6eedca18960b3..44a52a1026afc 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -176,4 +176,10 @@ callPackage (import ./generic.nix (rec { -i tools/libxl/libxl_device.c ''; + passthru = { + qemu-system-i386 = if withInternalQemu + then "lib/xen/bin/qemu-system-i386" + else throw "this xen has no qemu builtin"; + }; + })) args diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index bb0e6b82aa5d3..48fd8665cb47d 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -51,6 +51,7 @@ let # shell glob that ought to match it. dynamicLinker = /**/ if libc == null then null + else if targetPlatform.libc == "musl" then "${libc_lib}/lib/ld-musl-*" else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" # ARM with a wildcard, which can be "" or "-armhf". diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 68b803f6e3ccf..c40b096e20886 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -476,8 +476,6 @@ rec { cp ${layer}/* temp/ chmod ug+w temp/* - echo "$(dirname ${storeDir})" >> layerFiles - echo '${storeDir}' >> layerFiles for dep in $(cat $layerClosure); do find $dep >> layerFiles done diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix index 75e660d021436..550163ddd6966 100644 --- a/pkgs/build-support/emacs/buffer.nix +++ b/pkgs/build-support/emacs/buffer.nix @@ -4,7 +4,8 @@ { lib, writeText, inherit-local }: rec { - withPackages = pkgs: let + withPackages = pkgs': let + pkgs = builtins.filter (x: x != null) pkgs'; extras = map (x: x.emacsBufferSetup pkgs) (builtins.filter (builtins.hasAttr "emacsBufferSetup") pkgs); in writeText "dir-locals.el" '' (require 'inherit-local "${inherit-local}/share/emacs/site-lisp/elpa/inherit-local-${inherit-local.version}/inherit-local.elc") diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix index e36fab36bf975..f1f344ca3c7dd 100644 --- a/pkgs/build-support/rust/build-rust-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -291,6 +291,7 @@ let buildCrate = { crateName, crateVersion, crateAuthors, buildDependencies, mkdir -p $out/bin cp -P target/bin/* $out/bin # */ fi + runHook postInstall ''; in diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 658548135aaff..346fd0e7908fd 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,5 +1,6 @@ { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2, - openssl, sqlite, zlib, dbus_libs, dbus_glib, gdk_pixbuf, cairo, python3, ... }: + openssl, sqlite, zlib, dbus_libs, dbus_glib, gdk_pixbuf, cairo, python3, + libsodium, postgresql, ... }: let inherit (darwin.apple_sdk.frameworks) CoreFoundation; @@ -36,6 +37,7 @@ in openssl-sys = attrs: { buildInputs = [ pkgconfig openssl ]; }; + dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; }; @@ -60,4 +62,11 @@ in xcb = attrs: { buildInputs = [ python3 ]; }; + + thrussh-libsodium = attrs: { + buildInputs = [ pkgconfig libsodium ]; + }; + pq-sys = attr: { + buildInputs = [ pkgconfig postgresql ]; + }; } diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh new file mode 100644 index 0000000000000..0f9d7603d48fb --- /dev/null +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -0,0 +1,174 @@ +declare -a autoPatchelfLibs + +gatherLibraries() { + autoPatchelfLibs+=("$1/lib") +} + +addEnvHooks "$targetOffset" gatherLibraries + +isExecutable() { + [ "$(file -b -N --mime-type "$1")" = application/x-executable ] +} + +findElfs() { + find "$1" -type f -exec "$SHELL" -c ' + while [ -n "$1" ]; do + mimeType="$(file -b -N --mime-type "$1")" + if [ "$mimeType" = application/x-executable \ + -o "$mimeType" = application/x-sharedlib ]; then + echo "$1" + fi + shift + done + ' -- {} + +} + +# We cache dependencies so that we don't need to search through all of them on +# every consecutive call to findDependency. +declare -a cachedDependencies + +addToDepCache() { + local existing + for existing in "${cachedDependencies[@]}"; do + if [ "$existing" = "$1" ]; then return; fi + done + cachedDependencies+=("$1") +} + +declare -gi depCacheInitialised=0 +declare -gi doneRecursiveSearch=0 +declare -g foundDependency + +getDepsFromSo() { + ldd "$1" 2> /dev/null | sed -n -e 's/[^=]*=> *\(.\+\) \+([^)]*)$/\1/p' +} + +populateCacheWithRecursiveDeps() { + local so found foundso + for so in "${cachedDependencies[@]}"; do + for found in $(getDepsFromSo "$so"); do + local libdir="${found%/*}" + local base="${found##*/}" + local soname="${base%.so*}" + for foundso in "${found%/*}/$soname".so*; do + addToDepCache "$foundso" + done + done + done +} + +getSoArch() { + objdump -f "$1" | sed -ne 's/^architecture: *\([^,]\+\).*/\1/p' +} + +# NOTE: If you want to use this function outside of the autoPatchelf function, +# keep in mind that the dependency cache is only valid inside the subshell +# spawned by the autoPatchelf function, so invoking this directly will possibly +# rebuild the dependency cache. See the autoPatchelf function below for more +# information. +findDependency() { + local filename="$1" + local arch="$2" + local lib dep + + if [ $depCacheInitialised -eq 0 ]; then + for lib in "${autoPatchelfLibs[@]}"; do + for so in "$lib/"*.so*; do addToDepCache "$so"; done + done + depCacheInitialised=1 + fi + + for dep in "${cachedDependencies[@]}"; do + if [ "$filename" = "${dep##*/}" ]; then + if [ "$(getSoArch "$dep")" = "$arch" ]; then + foundDependency="$dep" + return 0 + fi + fi + done + + # Populate the dependency cache with recursive dependencies *only* if we + # didn't find the right dependency so far and afterwards run findDependency + # again, but this time with $doneRecursiveSearch set to 1 so that it won't + # recurse again (and thus infinitely). + if [ $doneRecursiveSearch -eq 0 ]; then + populateCacheWithRecursiveDeps + doneRecursiveSearch=1 + findDependency "$filename" "$arch" || return 1 + return 0 + fi + return 1 +} + +autoPatchelfFile() { + local dep rpath="" toPatch="$1" + + local interpreter="$(< "$NIX_CC/nix-support/dynamic-linker")" + if isExecutable "$toPatch"; then + patchelf --set-interpreter "$interpreter" "$toPatch" + if [ -n "$runtimeDependencies" ]; then + for dep in $runtimeDependencies; do + rpath="$rpath${rpath:+:}$dep/lib" + done + fi + fi + + echo "searching for dependencies of $toPatch" >&2 + + # We're going to find all dependencies based on ldd output, so we need to + # clear the RPATH first. + patchelf --remove-rpath "$toPatch" + + local missing="$( + ldd "$toPatch" 2> /dev/null | \ + sed -n -e 's/^[\t ]*\([^ ]\+\) => not found.*/\1/p' + )" + + # This ensures that we get the output of all missing dependencies instead + # of failing at the first one, because it's more useful when working on a + # new package where you don't yet know its dependencies. + local -i depNotFound=0 + + for dep in $missing; do + echo -n " $dep -> " >&2 + if findDependency "$dep" "$(getSoArch "$toPatch")"; then + rpath="$rpath${rpath:+:}${foundDependency%/*}" + echo "found: $foundDependency" >&2 + else + echo "not found!" >&2 + depNotFound=1 + fi + done + + # This makes sure the builder fails if we didn't find a dependency, because + # the stdenv setup script is run with set -e. The actual error is emitted + # earlier in the previous loop. + [ $depNotFound -eq 0 ] + + if [ -n "$rpath" ]; then + echo "setting RPATH to: $rpath" >&2 + patchelf --set-rpath "$rpath" "$toPatch" + fi +} + +autoPatchelf() { + echo "automatically fixing dependencies for ELF files" >&2 + + # Add all shared objects of the current output path to the start of + # cachedDependencies so that it's choosen first in findDependency. + cachedDependencies+=( + $(find "$prefix" \! -type d \( -name '*.so' -o -name '*.so.*' \)) + ) + local elffile + + # Here we actually have a subshell, which also means that + # $cachedDependencies is final at this point, so whenever we want to run + # findDependency outside of this, the dependency cache needs to be rebuilt + # from scratch, so keep this in mind if you want to run findDependency + # outside of this function. + findElfs "$prefix" | while read -r elffile; do + autoPatchelfFile "$elffile" + done +} + +fixupOutputHooks+=(autoPatchelf) diff --git a/pkgs/build-support/setup-hooks/gog-unpack.sh b/pkgs/build-support/setup-hooks/gog-unpack.sh new file mode 100644 index 0000000000000..559b543fadfce --- /dev/null +++ b/pkgs/build-support/setup-hooks/gog-unpack.sh @@ -0,0 +1,11 @@ +unpackPhase="unpackGog" + +unpackGog() { + runHook preUnpackGog + + innoextract --silent --extract --exclude-temp "${src}" + + find . -depth -print -execdir rename -f 'y/A-Z/a-z/' '{}' \; + + runHook postUnpackGog +} diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/data/documentation/bgnet/default.nix index e205129db194c..51ebe704beac8 100644 --- a/pkgs/data/documentation/bgnet/default.nix +++ b/pkgs/data/documentation/bgnet/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = https://beej.us/guide/bgnet/; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ profpatsch ]; + maintainers = with lib.maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/data/documentation/mustache-spec/default.nix b/pkgs/data/documentation/mustache-spec/default.nix index 5659cac6703d8..08690b7cecfcb 100644 --- a/pkgs/data/documentation/mustache-spec/default.nix +++ b/pkgs/data/documentation/mustache-spec/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://mustache.github.io/; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ profpatsch ]; + maintainers = with lib.maintainers; [ Profpatsch ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix index c19fbccb14201..624616bdd5802 100644 --- a/pkgs/data/fonts/fira-code/symbols.nix +++ b/pkgs/data/fonts/fira-code/symbols.nix @@ -20,7 +20,7 @@ fetchzip { See https://github.com/tonsky/FiraCode/issues/211. ''; license = licenses.ofl; - maintainers = [ maintainers.profpatsch ]; + maintainers = [ maintainers.Profpatsch ]; homepage = "https://github.com/tonsky/FiraCode/issues/211#issuecomment-239058632"; }; } diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix index 96af2e573a2f1..de7dd5834e4ba 100644 --- a/pkgs/data/fonts/hasklig/default.nix +++ b/pkgs/data/fonts/hasklig/default.nix @@ -20,6 +20,6 @@ in fetchzip { description = "A font with ligatures for Haskell code based off Source Code Pro"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ davidrusu profpatsch ]; + maintainers = with maintainers; [ davidrusu Profpatsch ]; }; } diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 3ac8bd339a08d..1571f8e573deb 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "1.13.3"; + version = "1.14.0"; in fetchzip rec { name = "iosevka-bin-${version}"; @@ -12,7 +12,7 @@ in fetchzip rec { unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka ''; - sha256 = "0103rjxcp2sis42xp7fh7g8i03h5snvs8n78lgsf79g8ssw0p9d4"; + sha256 = "03zgh5dfx58sxrprhqi8cyc18sh05k84yc262bn81vavl6lm14ns"; meta = with stdenv.lib; { homepage = https://be5invis.github.io/Iosevka/; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index bf36d23e5c2f0..7c1676ed8b68a 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -7,6 +7,7 @@ # Custom font set options. # See https://github.com/be5invis/Iosevka#build-your-own-style design ? [], upright ? [], italic ? [], oblique ? [], + family ? null, weights ? [], # Custom font set name. Required if any custom settings above. set ? null }: @@ -15,6 +16,8 @@ assert (design != []) -> set != null; assert (upright != []) -> set != null; assert (italic != []) -> set != null; assert (oblique != []) -> set != null; +assert (family != null) -> set != null; +assert (weights != []) -> set != null; let installPackageLock = import ./package-lock.nix { inherit fetchurl lib; }; @@ -23,13 +26,13 @@ in let pname = if set != null then "iosevka-${set}" else "iosevka"; in let - version = "1.13.3"; + version = "1.14.0"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "be5invis"; repo ="Iosevka"; rev = "v${version}"; - sha256 = "0wfhfiahllq8ngn0mybvp29cfcm7b8ndk3fyhizd620wrj50bazf"; + sha256 = "0mmdlrd9a0rhmmdqwkk6v7cdvbi23djr5kkiyv38llk11j3w0clp"; }; in @@ -44,8 +47,11 @@ let (param "upright" upright) (param "italic" italic) (param "oblique" oblique) + (if family != null then "family='${family}'" else null) + (param "weights" weights) ]); - custom = design != [] || upright != [] || italic != [] || oblique != []; + custom = design != [] || upright != [] || italic != [] || oblique != [] + || family != null || weights != []; in stdenv.mkDerivation { diff --git a/pkgs/data/fonts/iosevka/package-lock.json b/pkgs/data/fonts/iosevka/package-lock.json index 4e8a9be8807cc..54de11a1f4225 100644 --- a/pkgs/data/fonts/iosevka/package-lock.json +++ b/pkgs/data/fonts/iosevka/package-lock.json @@ -1,13 +1,13 @@ { "name": "iosevka", - "version": "1.13.3", + "version": "1.14.0", "lockfileVersion": 1, "requires": true, "dependencies": { "JSONStream": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz", - "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz", + "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=", "requires": { "jsonparse": "1.3.1", "through": "2.3.8" @@ -24,9 +24,9 @@ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "bezier-js": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.3.tgz", - "integrity": "sha1-xVdBFqSjVkpxU41z4LDVFdqN3sU=" + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.5.tgz", + "integrity": "sha512-HGh+GevPguxrAmnWF2/A+8c8FEatnKcE6WttpYWA5fn1CfpJz4reFbr11DuyFs2gwaIo9vF7aVXW2xg1iaqvyg==" }, "builtin-modules": { "version": "1.1.1", @@ -39,11 +39,11 @@ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" }, "caryll-shapeops": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.2.1.tgz", - "integrity": "sha1-uEBMpQ5pAMB6vJNXubsAhbQEa8s=", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz", + "integrity": "sha512-3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==", "requires": { - "bezier-js": "2.2.3", + "bezier-js": "2.2.5", "clipper-lib": "1.0.0" } }, @@ -54,7 +54,7 @@ "requires": { "cross-spawn": "4.0.2", "node-version": "1.1.0", - "promise-polyfill": "6.0.2" + "promise-polyfill": "6.1.0" } }, "clipper-lib": { @@ -457,7 +457,7 @@ "resolved": "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz", "integrity": "sha512-lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==", "requires": { - "JSONStream": "1.3.1", + "JSONStream": "1.3.2", "child-process-promise": "2.2.1", "cubic2quad": "1.1.1", "fs-extra": "3.0.1", @@ -469,13 +469,13 @@ "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "requires": { - "mimic-fn": "1.1.0" + "mimic-fn": "1.2.0" } }, "mimic-fn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", - "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" }, "node-version": { "version": "1.1.0", @@ -489,7 +489,7 @@ "requires": { "hosted-git-info": "2.5.0", "is-builtin-module": "1.0.0", - "semver": "5.4.1", + "semver": "5.5.0", "validate-npm-package-license": "3.0.1" } }, @@ -538,18 +538,26 @@ "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, "p-limit": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", - "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", + "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", + "requires": { + "p-try": "1.0.0" + } }, "p-locate": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "requires": { - "p-limit": "1.1.0" + "p-limit": "1.2.0" } }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" + }, "pad": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/pad/-/pad-1.2.1.tgz", @@ -661,9 +669,9 @@ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" }, "promise-polyfill": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.0.2.tgz", - "integrity": "sha1-2chtPcTcLfkBboiUbe/Wm0m0EWI=" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", + "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=" }, "pseudomap": { "version": "1.0.2", @@ -708,9 +716,9 @@ } }, "semver": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" }, "set-blocking": { "version": "2.0.0", diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix index b798557899819..5657b8380a969 100644 --- a/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.ofl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ bergey profpatsch ]; + maintainers = with stdenv.lib.maintainers; [ bergey Profpatsch ]; }; } diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index 2ba9069d48bee..009295c586913 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -35,6 +35,6 @@ in fetchzip { homepage = https://github.com/impallari/Raleway; license = stdenv.lib.licenses.ofl; - maintainers = with stdenv.lib.maintainers; [ profpatsch ]; + maintainers = with stdenv.lib.maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 39b2438a8f020..e1343d9977d7b 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 , pango, cogl, clutter, libstartup_notification, zenity, libcanberra_gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput -, libgudev, libwacom, xwayland, autoreconfHook }: +, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-x" "--disable-static" + "--enable-remote-desktop" "--enable-shape" "--enable-sm" "--enable-startup-notification" @@ -18,6 +19,15 @@ stdenv.mkDerivation rec { "--with-xwayland-path=${xwayland}/bin/Xwayland" ]; + patches = [ + # Pipewire 0.1.8 compatibility + (fetchurl { + name = "mutter-pipewire-0.1.8-compat.patch"; + url = https://bugzilla.gnome.org/attachment.cgi?id=367356; + sha256 = "10bx5zf11wwhhy686w11ggikk56pbxydpbk9fbd947ir385x92cz"; + }) + ]; + propagatedBuildInputs = [ # required for pkgconfig to detect mutter-clutter libXtst @@ -30,7 +40,7 @@ stdenv.mkDerivation rec { gnome_desktop cairo pango cogl clutter zenity libstartup_notification gnome3.geocode_glib libinput libgudev libwacom libcanberra_gtk3 zenity xkeyboard_config libxkbfile - libxkbcommon + libxkbcommon pipewire ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix new file mode 100644 index 0000000000000..42cd6d217de77 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-remove-dropdown-arrows-${version}"; + version = "9"; + + src = fetchFromGitHub { + owner = "mpdeimos"; + repo = "gnome-shell-remove-dropdown-arrows"; + rev = "version/${version}"; + sha256 = "1z9icxr75rd3cas28xjlmsbbd3j3sm1qvj6mp95jhfaqj821q665"; + }; + + # This package has a Makefile, but it's used for publishing and linting, not + # for building. Disable the build phase so installing doesn't attempt to + # publish the extension. + dontBuild = true; + + uuid = "remove-dropdown-arrows@mpdeimos.com"; + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp extension.js $out/share/gnome-shell/extensions/${uuid} + cp metadata.json $out/share/gnome-shell/extensions/${uuid} + ''; + + meta = with stdenv.lib; { + description = "Remove dropdown arrows from GNOME Shell Menus"; + license = licenses.gpl3; + maintainers = with maintainers; [ jonafato ]; + homepage = https://github.com/mpdeimos/gnome-shell-remove-dropdown-arrows; + }; +} diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index ab00cdce67143..c6607dad29021 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, caja, mate-desktop, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, hicolor_icon_theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "atril-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.19"; - minor-ver = "0"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0v829yvr738y5s2knyvimcgqv351qzb0rpw5il19qc27rbzyri1r"; + url = "https://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1639jxcdhcn5wvb4gj9xncdj5d5c3rnyydwwsgqj66cmfmb53l1n"; }; nativeBuildInputs = [ @@ -23,8 +21,8 @@ stdenv.mkDerivation rec { libsecret libxml2 poppler - caja - mate-desktop + mate.caja + mate.mate-desktop hicolor_icon_theme ]; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index da5200eb3b322..f84fe2fef2eb1 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, caja, pythonPackages }: +{ stdenv, fetchurl, pkgconfig, gtk3, mate, pythonPackages }: stdenv.mkDerivation rec { name = "caja-dropbox-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "0"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "18wd8abjaxa68n1yjmvh9az1m8lqa2wing73xdymz0d5gmxmk25g"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0xjqcfi5n6hsfyw77blplkn30as0slkfzngxid1n6z7jz5yjq7vj"; }; nativeBuildInputs = [ @@ -17,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - caja + mate.caja pythonPackages.python pythonPackages.pygtk pythonPackages.docutils diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 9bd86d962ecbe..1aef8d3d184f1 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, caja, mate-desktop, imagemagick, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, mate, imagemagick, wrapGAppsHook }: stdenv.mkDerivation rec { name = "caja-extensions-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "065j3dyk7zp35rfvxxsdglx30i3xrma4d4saf7mn1rn1akdfgaba"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1abi7s31mx7v8x0f747bmb3s8hrv8fv007pflv2n545yvn0m1dpj"; }; nativeBuildInputs = [ @@ -21,8 +19,8 @@ stdenv.mkDerivation rec { gtk3 dbus_glib gupnp - caja - mate-desktop + mate.caja + mate.mate-desktop imagemagick ]; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 3c872e72091f0..a80f89feff293 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -2,13 +2,11 @@ stdenv.mkDerivation rec { name = "caja-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "5"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1ild2bslvnvxvl5q2xc1sa8bz1lyr4q4ksw3bwxrj0ymc16h7p50"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "05shyqqapqbz4w0gbhx0i3kj6xg7rcj80hkaq7wf5pyj91wmkxqg"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 0c495fd190e5b..7441a8f73ae7f 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -5,6 +5,9 @@ let self = rec { + getRelease = version: + pkgs.stdenv.lib.concatStringsSep "." (pkgs.stdenv.lib.take 2 (pkgs.stdenv.lib.splitString "." version)); + atril = callPackage ./atril { }; caja = callPackage ./caja { }; caja-dropbox = callPackage ./caja-dropbox { }; @@ -82,7 +85,7 @@ let mate-system-monitor mate-terminal mate-user-guide - #mate-user-share + # mate-user-share mate-utils mozo pluma diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index b6b60fa243802..8e46102cf5a6d 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -2,13 +2,11 @@ stdenv.mkDerivation rec { name = "engrampa-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "3"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1ms6kz8k86hsj9zk5w3087l749022y0j5ba2s9hz8ah6gfx0mvn5"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1pk053i14a0r5s9qkipwnp4qjg76b763203z64ymnpkslrrarnnm"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index e4d52183ab40c..c3af73282e5c3 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -2,13 +2,11 @@ stdenv.mkDerivation rec { name = "eom-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "3"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1zr85ilv0f4x8iky002qvh00qhsq1vsfm5z1954gf31hi57z2j25"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0320ph6cyh0m4cfyvky10j9prk2hry6rpm4jzgcn7ig03dnj4y0s"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index a02f605b470c4..209edf1f363bc 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, libxklavier }: stdenv.mkDerivation rec { name = "libmatekbd-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "030bl18qbjm7l92bp1bhs7v82bp8j3mv7c1j1a4gd89iz4611pq3"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1n2zphb3g6ai54nfr0r9s06vn3bmm361xpjga88hmq947fvbpx19"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 20cf71c7554d4..10a690546f766 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib +{ stdenv, fetchurl, pkgconfig, intltool, glib, mate , alsaSupport ? stdenv.isLinux, alsaLib , pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio , ossSupport ? false @@ -6,13 +6,11 @@ stdenv.mkDerivation rec { name = "libmatemixer-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "0"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "09vyxnlnalws318gsafdfi5c6jwpp92pbafn1ddlqqds23ihk4mr"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0jpfaqbspn2mjv6ysgzdmzhb07gx61yiiiwmrw94qymld2igrzb5"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 3ddbb8f6a02a2..7efad3a5e3ae8 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata, mate }: stdenv.mkDerivation rec { name = "libmateweather-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1q3rvmm533cgiif9hbdp6a92dm727g5i2dv5d8krfa0nl36i468y"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1c8mvydb0h7z3zn0qahwlp15z5wl6nrv24q4z7ldhm340jnxsvh7"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 522485fd22c29..9a926b78c3d7e 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra_gtk3, libgtop, gnome2, gnome3, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra_gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "marco-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "173g9mrnkcgjc6a1maln13iqdl0cqcnca8ydr8767xrn9dlkx9f5"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "07asf8i15ih6ajkp5yapk720qyssi2cinxwg2z5q5j9m6mxax6lr"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index ba5ef927fb6fe..f56d594303c9f 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus_glib, polkit, upower, wirelesstools, libmateweather, mate-panel, pythonPackages, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus_glib, polkit, upower, wirelesstools, mate, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-applets-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "045cl62nnfsl14vnfydwqjssdakgdrahh5h0xiz5afmdcbq6cqgw"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1jmhswfcbawp9ax5p5h2dj8pyajadjdyxa0ac7ldvh7viv8qy52s"; }; nativeBuildInputs = [ @@ -26,14 +24,11 @@ stdenv.mkDerivation rec { libgtop libxml2 libnotify - dbus_glib polkit upower wirelesstools - libmateweather - mate-panel - pythonPackages.python - pythonPackages.pygobject3 + mate.libmateweather + mate.mate-panel hicolor_icon_theme ]; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 6ce78491d0373..79a322ccb0a5b 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, intltool }: +{ stdenv, fetchurl, intltool, mate }: stdenv.mkDerivation rec { name = "mate-backgrounds-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "0"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "06q8ksjisijps2wn959arywsimhzd3j35mqkr048c26ck24d60zi"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0pcnjcw00y8hf2bwfrb5sbk2511cbg4fr8vgvgqswcwjp9y15cjp"; }; nativeBuildInputs = [ intltool ]; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index b00bcc27ac519..efe8adae678ec 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-calc-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "1"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1h6kr9qb1kaw8jvfm7xmqm1wqnxsw2iwha5vl38b986x4zm2b712"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "03cma6b00chd4026pbnh5i0ckpl8b1l7i1ppvcmbfbx0s3vpbc73"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index a433104b1fa7d..63adb1849dac8 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, mate }: stdenv.mkDerivation rec { name = "mate-common-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "0"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1005laf3z1h8qczm7pmwr40r842665cv6ykhjg7r93vldra48z6p"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0h8s2qhc6f5flslx05cd3xxg243c67vv03spjiag14p8kqqrqvb1"; }; meta = { diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 3b04d4b48aa1b..e9b789bdc4e98 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -5,13 +5,11 @@ stdenv.mkDerivation rec { name = "mate-control-center-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0flnn0h8f5aqyccwrlv7qxchvr3kqmlfdga6wq28d55zkpv5m7dl"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0qq3ln40w7lxa7qvbvbsgdq1c5ybzqw3bw2x4z6y6brl4c77sbh7"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 039c3732d11df..56c0ae4632ca7 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gnome3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-desktop-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "0"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "12iv2y4dan962fs7vkkxbjkp77pbvjnwfa43ggr0zkdsc3ydjbbg"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0y5172sbj6f4dvimf4pmz74b9cfidbpmnwwb9f6vlc6fa0kp5l1n"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 05edfc1dd6d41..6e1f9778e3136 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -2,13 +2,11 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-faenza-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "1"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0vc3wg9l5yrxm0xmligz4lw2g3nqj1dz8fwv90xvym8pbjds2849"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index b1c5e82da9954..a42116a63af5e 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor_icon_theme, gtk3 }: +{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor_icon_theme, gtk3, mate }: stdenv.mkDerivation rec { name = "mate-icon-theme-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0si3li3kza7s45zhasjvqn5f85zpkn0x8i4kq1dlnqvjjqzkg4ch"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0lmsmsamgg1s6qrk19qwa76ld7x1k3pwhy4vs1ixn1as4iaaddk5"; }; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 7d863a929e7ac..4ff636c3c7340 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate-panel, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-indicator-applet-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "1"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1h77f1gbz1a8l9xyq5fk75bs58mcwx6pbk6db33v0v1mwq6cidiv"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1fc6j5dnxghpgz8xbf5p8j2jprk97q4q3ajkh6sg5l71gqlnampg"; }; nativeBuildInputs = [ @@ -20,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libindicator-gtk3 - mate-panel + mate.mate-panel hicolor_icon_theme ]; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 0586a2e54ebf2..f4ee94b4bd376 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -2,13 +2,11 @@ stdenv.mkDerivation rec { name = "mate-media-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "07v37jvrl8m5rhlasrdziwy15gcpn561d7zn5q1yfla2d5ddy0b1"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "09vbw7nc91ljnxm5sbrch0w7zzn2i6qjb1b50q402niwr5b0zicr"; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 6f4bf48c672ac..51263f0d74e71 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection, python }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection, python, mate }: stdenv.mkDerivation rec { name = "mate-menus-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "1"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "03fwv0fvg073dmdbrcbpwjhxpj98aqna804m9nqybhvj3cfyhaz6"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1w1k6kdabmabhpqvkizk1si6ri4rmspsbj0252ki834ml0dxpnhg"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 0a2a0e4720207..508e1d359c9a3 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate-panel, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-netbook-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0xy5mhkg0xfgyr7gnnjrfzqhmdnhyqscrl2h496p06cflknm17vb"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1w92kny1fnlwbq4b8y50n5s1vsvvl4xrvspsp9lqfxyz3jxiwbrz"; }; nativeBuildInputs = [ @@ -22,7 +20,7 @@ stdenv.mkDerivation rec { libwnck3 libfakekey libXtst - mate-panel + mate.mate-panel ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index c5e53cf579146..53b441a293a67 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, pkgconfig, intltool, dbus_glib, libcanberra_gtk3, - libnotify, libwnck3, gnome3, wrapGAppsHook }: + libnotify, libwnck3, gnome3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-notification-daemon-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "1"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "102nmd6mnf1fwvw11ggdlgcblq612nd4aar3gdjzqn1fw37591i5"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0dq457npzid20yfwigdh8gfqgf5wv8p6jhbxfnzybam9xidlqc5f"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index ec934b1fc637a..b05a9a68af043 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -2,13 +2,11 @@ stdenv.mkDerivation rec { name = "mate-panel-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "7"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1m0fxyzbvg239dddmz3ksd8871lhkd7n3fxvdgdf4hv9rlvm1klv"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0cz1pfwvsmrjcd0wa83cid9yjcygla6rhigyr7f75d75kiknlcm7"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 94fb5ef43e8a2..3db773af9fc5f 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gobjectIntrospection, libappindicator-gtk3, libindicator-gtk3, polkit }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gobjectIntrospection, libappindicator-gtk3, libindicator-gtk3, polkit, mate }: stdenv.mkDerivation rec { name = "mate-polkit-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "01mxl7wj1501d3clrwlwa54970vpkahp5968xpaxwfb2zbnqgjbd"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "00c1rmi31gv1a3lk7smjp489kd3wrj0d6npagnb8p1rz0g88ha94"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 8b60226d9590a..df38485fbc757 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -2,13 +2,11 @@ stdenv.mkDerivation rec { name = "mate-power-manager-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "1"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1sybc4j9bdnb2axmvpbbm85ixhdfa1k1yh769gns56ix0ryd9nr5"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "038c2q5kqvqmkp1i93p4pp9x8p6a9i7lyn3nv522mq06qsbynbww"; }; buildInputs = [ @@ -21,7 +19,6 @@ stdenv.mkDerivation rec { libnotify dbus_glib upower - mate.mate-panel ]; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index dbaebb4c7be43..e1ae6b4ae1dc6 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, libXScrnSaver, libnotify, pam, systemd, mate-desktop, mate-menus, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-screensaver-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "03za7ssww095i49braaq0di5ir9g6wxh1n5hfgy6b3w9nb0j1y2p"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1698608m6kf4dn91xdwy7l809yagz02h1k594smj75wvnhr7x4k9"; }; nativeBuildInputs = [ @@ -24,8 +22,8 @@ stdenv.mkDerivation rec { libnotify pam systemd - mate-desktop - mate-menus + mate.mate-desktop + mate.mate-menus ]; configureFlags = "--without-console-kit"; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index ed98ffaa645be..130db2420ef12 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, dbus_glib, lm_sensors, mate-panel, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, dbus_glib, lm_sensors, mate, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-sensors-applet-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "3"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1nm68rhp73kgvs7wwsgs5zbvq3lzaanl5s5nnn28saiknjbz1mcx"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1yj8zr9w0a1h4bpd27w7ssg97vnrz7yr10jqhx67yyb900ccr3ik"; }; nativeBuildInputs = [ @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { libnotify dbus_glib lm_sensors - mate-panel + mate.mate-panel hicolor_icon_theme ]; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index f15a78120cba5..d154b80263c69 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus_glib, systemd, - libSM, libXtst, gtk3, mate-desktop, hicolor_icon_theme, + libSM, libXtst, gtk3, hicolor_icon_theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-session-manager-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "11ii7azl8rn9mfymcmcbpysyd12vrxp4s8l3l6yk4mwlr3gvzxj0"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0vzr6y9shw4zb3ddfrj0nn7yqggpq9sv6h33p0xxdx71ydl40p2g"; }; nativeBuildInputs = [ @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { libSM libXtst gtk3 - mate-desktop + mate.mate-desktop hicolor_icon_theme ]; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 86eec907651cc..dc1272115b8e7 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -4,13 +4,11 @@ stdenv.mkDerivation rec { name = "mate-settings-daemon-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0v2kdzfmfqq0avlrxnxysmkawy83g7sanmyhivisi5vg4rzsr0a4"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0p4fr2sgkjcjsrmkdy579xmk20dl0sa6az40rzvm6fb2w6693sf5"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 1378cc7f3ba53..8c67044a42206 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-system-monitor-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "1"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1xhz7d9045xfh431rn27kh1sd1clbzkfrw1zkjgfnpad6v3aaaks"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "059aryj0gz4sic719nsmckhkjl4yhqxmyplvh78clf5khh4apwn5"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 590ae7c7f8133..b90211ae06111 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -2,13 +2,11 @@ stdenv.mkDerivation rec { name = "mate-terminal-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "2"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "053jdcjalywcq4fvqlb145sfp5hmnd6yyk9ckzvkh6fl3gyp54gc"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "03366hs7mxazn6m6y53ppkb1din4jywljg0lx8zw101qg6car0az"; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index c29c0560cd1d6..c68b8b7d9bd80 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -3,20 +3,11 @@ stdenv.mkDerivation rec { name = "mate-themes-${version}"; - version = "${major-ver}.${minor-ver}"; - # There is no 3.24 release. - major-ver = if stdenv.lib.versionOlder gnome3.version "3.23" then gnome3.version else "3.22"; - minor-ver = { - "3.20" = "23"; - "3.22" = "14"; - }."${major-ver}"; + version = "3.22.15"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz"; - sha256 = { - "3.20" = "0xmcm1kmkhbakhwy5vvx3gll5v2gvihwnbf0gyjf75fys6h3818g"; - "3.22" = "09fqvlnmrvc73arl7jv9ygkxi46lw7c1q8qra6w3ap7x83f9zdak"; - }."${major-ver}"; + url = "http://pub.mate-desktop.org/releases/themes/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0cmlbj6vlkavdirc5xnsgwmy0m11bj9yrbv1dkq46n1s23rvv6wg"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index ce8029fb21526..55cd82eecdc74 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, intltool, itstool, libxml2, yelp }: +{ stdenv, fetchurl, intltool, itstool, libxml2, yelp, mate }: stdenv.mkDerivation rec { name = "mate-user-guide-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "0"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0f3b46r9a3cywm7rpj08xlkfnlfr9db58xfcpix8i33qp50fxqmb"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1n1rlvymz8k7vvjmd9qkv26wz3770w1ywsa41kbisbfp9x7mr0w2"; }; nativeBuildInputs = [ itstool intltool libxml2 ]; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index afacad5277823..f5393cad0b888 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus_glib, libnotify, libxml2, libcanberra_gtk3, caja, mod_dnssd, apacheHttpd, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus_glib, libnotify, libxml2, libcanberra_gtk3, mod_dnssd, apacheHttpd, hicolor_icon_theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-user-share-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "0"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0w7r7jmm12n41hcxj1pfk3f0xy69cddx7ga490x191rdpcb3ry1n"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0lv5ndjk2br4w7cw8gsgj7aa2iadxv7m4wii4c49pajmd950iff2"; }; nativeBuildInputs = [ @@ -24,7 +22,7 @@ stdenv.mkDerivation rec { libnotify libcanberra_gtk3 libxml2 - caja + mate.caja hicolor_icon_theme # Should mod_dnssd and apacheHttpd be runtime dependencies? # In gnome-user-share they are not. diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 281fef42e6123..946dc3efd2533 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra_gtk3, mate-panel, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra_gtk3, mate, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-utils-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "3"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1nw8rcq3x67v73cmy44zz6r2ikz46wsx834qzkbq4i2ac96kdkfz"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "10a6k8gi7cajlkbj1jbvk3s633hw58lan3rc85v8jlrkwm7wmhpl"; }; nativeBuildInputs = [ @@ -23,7 +21,7 @@ stdenv.mkDerivation rec { libgtop libcanberra_gtk3 libxml2 - mate-panel + mate.mate-panel hicolor_icon_theme ]; diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index b376736c473dd..e98d16d774e27 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, intltool, mate-menus, pythonPackages }: +{ stdenv, fetchurl, pkgconfig, intltool, mate, pythonPackages }: stdenv.mkDerivation rec { name = "mozo-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "0"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "04yn9bw64q5a5kvpmkb7rb3mlp11pmnvkbphficsgb0368fj895b"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "1108avdappfjadd46ld7clhh5m9f4b5khl5y33l377m8ky9dy87g"; }; - pythonPath = [ mate-menus pythonPackages.pygobject3 ]; + pythonPath = [ mate.mate-menus pythonPackages.pygobject3 ]; nativeBuildInputs = [ pkgconfig intltool pythonPackages.wrapPython ]; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index d6d3d46f7cd6a..d951c9f9bbd0c 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -2,13 +2,11 @@ stdenv.mkDerivation rec { name = "pluma-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "3"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1bz2jvjfz761hcvhcbkz8sc4xf0iyixh5w0k7bx69qkwwdc0gxi0"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0w2x270n11rfa321cdlycfhcgncwxqpikjyl3lwmn4vkx8nhgq5f"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index 4eb9b72b8b5f9..566245c4441de 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, caja, pythonPackages }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, pythonPackages }: stdenv.mkDerivation rec { name = "python-caja-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.18"; - minor-ver = "1"; + version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0n43cvvv29gq31hgrsf9al184cr87c3hzskrh2593rid52kwyz44"; + url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; + sha256 = "0bcgg3p01zik53l5ns48575yw0k88fyc044yvp9fvwy5jqqg1ykk"; }; nativeBuildInputs = [ @@ -19,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - caja + mate.caja pythonPackages.python pythonPackages.pygobject3 ]; diff --git a/pkgs/desktops/mate/update.sh b/pkgs/desktops/mate/update.sh new file mode 100755 index 0000000000000..736bcbd34fc63 --- /dev/null +++ b/pkgs/desktops/mate/update.sh @@ -0,0 +1,54 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p libarchive curl common-updater-scripts + +set -eu -o pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" +root=../../.. +export NIXPKGS_ALLOW_UNFREE=1 + +mate_version=1.20 +theme_version=3.22 +materepo=https://pub.mate-desktop.org/releases/${mate_version} +themerepo=https://pub.mate-desktop.org/releases/themes/${theme_version} + +version() { + (cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"') +} + +update_package() { + local p=$1 + echo $p + + local repo + if [ "$p" = "mate-themes" ]; then + repo=$themerepo + else + repo=$materepo + fi + + local p_version_old=$(version mate.$p) + local p_versions=$(curl -sS ${repo}/ | sed -rne "s/.*\"$p-([0-9]+\\.[0-9]+\\.[0-9]+)\\.tar\\.xz.*/\\1/p") + local p_version=$(echo $p_versions | sed -e 's/ /\n/g' | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -n1) + + if [[ "$p_version" = "$p_version_old" ]]; then + echo "nothing to do, $p $p_version is current" + echo + return + fi + + # Download package and save hash and file path. + local url="$repo/$p-${p_version}.tar.xz" + mapfile -t prefetch < <(nix-prefetch-url --print-path "$url") + local hash=${prefetch[0]} + local path=${prefetch[1]} + echo "$p: $p_version_old -> $p_version" + (cd "$root" && update-source-version mate.$p "$p_version" "$hash") + echo +} + +for d in $(ls -A --indicator-style=none); do + if [ -d $d ]; then + update_package $d + fi +done diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 81f42a2adbe04..baa4b028d0134 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -26,7 +26,7 @@ existing packages here and modify it as necessary. { libsForQt5, lib, fetchurl, - gconf, + gconf, gsettings_desktop_schemas, debug ? false, }: @@ -105,7 +105,7 @@ let breeze-plymouth = callPackage ./breeze-plymouth {}; kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; kde-cli-tools = callPackage ./kde-cli-tools.nix {}; - kde-gtk-config = callPackage ./kde-gtk-config {}; + kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings_desktop_schemas; }; kdecoration = callPackage ./kdecoration.nix {}; kdeplasma-addons = callPackage ./kdeplasma-addons.nix {}; kgamma5 = callPackage ./kgamma5.nix {}; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 921441c029229..e42fe3db85cf1 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.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.1/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index 38bab58c829e5..f792f3b939f4c 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio, - knewstuff + knewstuff, gsettings_desktop_schemas }: mkDerivation { @@ -10,11 +10,12 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - knewstuff + knewstuff gsettings_desktop_schemas ]; patches = [ ./0001-follow-symlinks.patch ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" + "-DGLIB_SCHEMAS_DIR=${gsettings_desktop_schemas.out}/" ]; } diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 8b8a5fe72ea2b..87a25885b40ff 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -11,7 +11,7 @@ kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, - plasma-framework, + plasma-framework, qtsensors, libcap }: mkDerivation { @@ -21,22 +21,22 @@ mkDerivation { epoxy libICE libSM libinput libxkbcommon udev wayland xcb-util-cursor xwayland - qtdeclarative qtmultimedia qtscript qtx11extras + qtdeclarative qtmultimedia qtscript qtx11extras qtsensors breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework + libcap ]; outputs = [ "bin" "dev" "out" ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) - ++ [(fetchpatch { - name = "cmake-3.10.diff"; - # included upstream for kwin >= 5.11.95 - url = "https://github.com/KDE/kwin/commit/cd544890ced4192.diff"; - sha256 = "0z5nbcg712v10mskb7r9v0jcx5h8q4ixb7fjbb0kicmzsc266yd5"; - })] - ; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) ++ [ + # This patch should be removed in 5.12.2 + (fetchpatch { + url = "https://github.com/KDE/kwin/commit/6e5f5d92daab4c60f7bf241d90a91b3bea27acfd.patch"; + sha256 = "1yq9wjvch46z7qx051s0ws0gyqbqhkvx7xl4pymd97vz8v6gnx4x"; + }) + ]; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' ]; diff --git a/pkgs/desktops/plasma-5/kwin/no-setcap-install.patch b/pkgs/desktops/plasma-5/kwin/no-setcap-install.patch new file mode 100644 index 0000000000000..80aacacc6ca00 --- /dev/null +++ b/pkgs/desktops/plasma-5/kwin/no-setcap-install.patch @@ -0,0 +1,24 @@ +Dont set capabilities on kwin_wayland executable at build time + +This is handled by security.wrappers on NixOS + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 48cbcdbfe..93b410ed8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -674,15 +674,6 @@ if (HAVE_LIBCAP) + endif() + + install(TARGETS kwin_wayland ${INSTALL_TARGETS_DEFAULT_ARGS} ) +-if (HAVE_LIBCAP) +- install( +- CODE "execute_process( +- COMMAND +- ${SETCAP_EXECUTABLE} +- CAP_SYS_NICE=+ep +- \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/kwin_wayland)" +- ) +-endif() + + add_subdirectory(platformsupport) + add_subdirectory(plugins) diff --git a/pkgs/desktops/plasma-5/kwin/series b/pkgs/desktops/plasma-5/kwin/series index 9dbc88f499752..8efb74eabd67d 100644 --- a/pkgs/desktops/plasma-5/kwin/series +++ b/pkgs/desktops/plasma-5/kwin/series @@ -1,2 +1,3 @@ follow-symlinks.patch xwayland.patch +no-setcap-install.patch diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 318d416d88599..32bd5f3a9f288 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -12,7 +12,7 @@ kdeclarative, kded, kdelibs4support, kemoticons, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig, kpeople, krunner, kscreenlocker, ksysguard, kwallet, kwin, phonon, plasma-framework, - plasma-workspace, + plasma-workspace, xf86inputlibinput }: mkDerivation rec { @@ -41,6 +41,7 @@ mkDerivation rec { cmakeFlags = [ "-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg" "-DSynaptics_INCLUDE_DIRS=${lib.getDev xf86inputsynaptics}/include/xorg" + "-DXORGLIBINPUT_INCLUDE_DIRS=${lib.getDev xf86inputlibinput}/include/xorg" ]; postInstall = '' # Display ~/Desktop contents on the desktop by default. diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index d951c03b5d3d1..e012537e4028a 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -1,5 +1,5 @@ diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml -index 7e2d9758..40a5797b 100644 +index 7e2d975..40a5797 100644 --- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml +++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml @@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents @@ -12,7 +12,7 @@ index 7e2d9758..40a5797b 100644 Item { id: batteryItem diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml -index ae6d5919..c2f99c86 100644 +index 50deee5..45b6b37 100644 --- a/applets/batterymonitor/package/contents/ui/batterymonitor.qml +++ b/applets/batterymonitor/package/contents/ui/batterymonitor.qml @@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0 @@ -25,7 +25,7 @@ index ae6d5919..c2f99c86 100644 Item { id: batterymonitor diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml -index 80e7e53b..0083cf01 100644 +index 80e7e53..0083cf0 100644 --- a/applets/lock_logout/contents/ui/lockout.qml +++ b/applets/lock_logout/contents/ui/lockout.qml @@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0 @@ -38,7 +38,7 @@ index 80e7e53b..0083cf01 100644 Flow { id: lockout diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml -index acdda88f..989de8ab 100644 +index cb15cfa..a6976ba 100644 --- a/applets/notifications/package/contents/ui/main.qml +++ b/applets/notifications/package/contents/ui/main.qml @@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras @@ -51,7 +51,7 @@ index acdda88f..989de8ab 100644 MouseEventListener { id: notificationsApplet diff --git a/krunner/dbus/org.kde.krunner.service.in b/krunner/dbus/org.kde.krunner.service.in -index 85715214..294eab08 100644 +index 8571521..294eab0 100644 --- a/krunner/dbus/org.kde.krunner.service.in +++ b/krunner/dbus/org.kde.krunner.service.in @@ -1,4 +1,4 @@ @@ -61,7 +61,7 @@ index 85715214..294eab08 100644 +Exec=@CMAKE_INSTALL_FULL_BINDIR@/krunner diff --git a/kuiserver/org.kde.kuiserver.service.in b/kuiserver/org.kde.kuiserver.service.in -index 7a86d07f..5b3030cc 100644 +index 7a86d07..5b3030c 100644 --- a/kuiserver/org.kde.kuiserver.service.in +++ b/kuiserver/org.kde.kuiserver.service.in @@ -1,3 +1,3 @@ @@ -70,7 +70,7 @@ index 7a86d07f..5b3030cc 100644 -Exec=@CMAKE_INSTALL_PREFIX@/bin/kuiserver5 +Exec=@CMAKE_INSTALL_FULL_BINDIR@/kuiserver5 diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt -index fe29f57a..247db953 100644 +index fe29f57..247db95 100644 --- a/startkde/CMakeLists.txt +++ b/startkde/CMakeLists.txt @@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig) @@ -86,7 +86,7 @@ index fe29f57a..247db953 100644 configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor @ONLY) configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma @ONLY) diff --git a/startkde/kstartupconfig/kstartupconfig.cpp b/startkde/kstartupconfig/kstartupconfig.cpp -index c9927855..bd506ce2 100644 +index c992785..bd506ce 100644 --- a/startkde/kstartupconfig/kstartupconfig.cpp +++ b/startkde/kstartupconfig/kstartupconfig.cpp @@ -147,5 +147,5 @@ int main() @@ -97,7 +97,7 @@ index c9927855..bd506ce2 100644 + return system( NIXPKGS_KDOSTARTUPCONFIG5 ); } diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index e9fa0bee..79e50a96 100644 +index b3117b4..e70110e 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,22 +1,31 @@ @@ -142,11 +142,10 @@ index e9fa0bee..79e50a96 100644 fi # Boot sequence: -@@ -33,59 +42,132 @@ fi +@@ -33,61 +42,133 @@ fi # # * Then ksmserver is started which takes control of the rest of the startup sequence --# We need to create config folder so we can write startupconfigkeys -if [ ${XDG_CONFIG_HOME} ]; then - configDir=$XDG_CONFIG_HOME; -else @@ -174,7 +173,9 @@ index e9fa0bee..79e50a96 100644 +if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then + @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf fi + sysConfigDirs=${XDG_CONFIG_DIRS:-/etc/xdg} +-# We need to create config folder so we can write startupconfigkeys -mkdir -p $configDir +@NIXPKGS_KBUILDSYCOCA5@ + @@ -297,13 +298,14 @@ index e9fa0bee..79e50a96 100644 exit 1 fi -[ -r $configDir/startupconfig ] && . $configDir/startupconfig +- +if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then + . "$XDG_CONFIG_HOME/startupconfig" +fi - if [ "$kdeglobals_kscreen_screenscalefactors" ]; then - export QT_SCREEN_SCALE_FACTORS="$kdeglobals_kscreen_screenscalefactors" -@@ -94,26 +176,33 @@ fi + #Do not sync any of this section with the wayland versions as there scale factors are + #sent properly over wl_output +@@ -99,26 +180,33 @@ fi #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us export QT_AUTO_SCREEN_SCALE_FACTOR=0 @@ -350,7 +352,7 @@ index e9fa0bee..79e50a96 100644 Xft.dpi: $kcmfonts_general_forcefontdpi EOF fi -@@ -122,11 +211,11 @@ dl=$DESKTOP_LOCKED +@@ -127,11 +215,11 @@ dl=$DESKTOP_LOCKED unset DESKTOP_LOCKED # Don't want it in the environment ksplash_pid= @@ -364,14 +366,13 @@ index e9fa0bee..79e50a96 100644 ;; None) ;; -@@ -135,71 +224,6 @@ if test -z "$dl"; then +@@ -140,69 +228,6 @@ if test -z "$dl"; then esac fi -# Source scripts found in <config locations>/plasma-workspace/env/*.sh -# (where <config locations> correspond to the system and user's configuration --# directories, as identified by Qt's qtpaths, e.g. $HOME/.config --# and /etc/xdg/ on Linux) +-# directory. -# -# This is where you can define environment variables that will be available to -# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` @@ -382,11 +383,10 @@ index e9fa0bee..79e50a96 100644 -# For anything else (that doesn't set env vars, or that needs a window manager), -# better use the Autostart folder. - --scriptpath=`qtpaths --locate-dirs GenericConfigLocation plasma-workspace | tr ':' '\n'` +-scriptpath=`echo "$configDir:$sysConfigDirs" | tr ':' '\n'` - --# Add /env/ to the directory to locate the scripts to be sourced -for prefix in `echo $scriptpath`; do -- for file in "$prefix"/env/*.sh; do +- for file in "$prefix"/plasma-workspace/env/*.sh; do - test -r "$file" && . "$file" || true - done -done @@ -436,7 +436,7 @@ index e9fa0bee..79e50a96 100644 # Set a left cursor instead of the standard X11 "X" cursor, since I've heard # from some users that they're confused and don't know what to do. This is # especially necessary on slow machines, where starting KDE takes one or two -@@ -208,28 +232,10 @@ xset fp rehash +@@ -211,28 +236,10 @@ xset fp rehash # If the user has overwritten fonts, the cursor font may be different now # so don't move this up. # @@ -466,7 +466,7 @@ index e9fa0bee..79e50a96 100644 # Mark that full KDE session is running (e.g. Konqueror preloading works only # with full KDE running). The KDE_FULL_SESSION property can be detected by # any X client connected to the same X session, even if not launched -@@ -254,44 +260,65 @@ export XDG_DATA_DIRS +@@ -257,44 +264,65 @@ export XDG_DATA_DIRS # KDE_FULL_SESSION=true export KDE_FULL_SESSION @@ -545,7 +545,7 @@ index e9fa0bee..79e50a96 100644 # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -303,34 +330,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & +@@ -306,34 +334,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & # We only check for 255 which means that the ksmserver process could not be # started, any problems thereafter, e.g. ksmserver failing to initialize, # will remain undetected. @@ -594,7 +594,7 @@ index e9fa0bee..79e50a96 100644 done break fi -@@ -339,15 +369,17 @@ fi +@@ -342,15 +373,17 @@ fi echo 'startkde: Shutting down...' 1>&2 # just in case @@ -617,7 +617,7 @@ index e9fa0bee..79e50a96 100644 echo 'startkde: Done.' 1>&2 diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake -index 9f875110..2a7a2a70 100644 +index a5d09fa..d42c284 100644 --- a/startkde/startplasma.cmake +++ b/startkde/startplasma.cmake @@ -1,6 +1,6 @@ @@ -714,7 +714,7 @@ index 9f875110..2a7a2a70 100644 # Set a left cursor instead of the standard X11 "X" cursor, since I've heard # from some users that they're confused and don't know what to do. This is # especially necessary on slow machines, where starting KDE takes one or two -@@ -100,35 +56,25 @@ xset fp rehash +@@ -100,22 +56,13 @@ xset fp rehash # If the user has overwritten fonts, the cursor font may be different now # so don't move this up. # @@ -738,6 +738,10 @@ index 9f875110..2a7a2a70 100644 +@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true +@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 + # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment + if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then +@@ -131,16 +78,15 @@ fi + # We set LD_BIND_NOW to increase the efficiency of kdeinit. # kdeinit unsets this variable before loading applications. -LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup @@ -755,17 +759,8 @@ index 9f875110..2a7a2a70 100644 # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -143,27 +89,26 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit - # If the session should be locked from the start (locked autologin), - # lock now and do the rest of the KDE startup underneath the locker. - KSMSERVEROPTIONS=" --no-lockscreen" --kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS -+@NIXPKGS_KWRAPPER5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS - if test $? -eq 255; then - # Startup error - echo 'startplasma: Could not start ksmserver. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." +@@ -163,19 +109,19 @@ if test $? -eq 255; then + xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." fi -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` @@ -791,13 +786,13 @@ index 9f875110..2a7a2a70 100644 done break fi -@@ -172,15 +117,17 @@ fi +@@ -184,15 +130,17 @@ fi echo 'startplasma: Shutting down...' 1>&2 # just in case -test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +if [ -n "$ksplash_pid" ]; then -+ kill "$ksplash_pid" 2>/dev/null ++ "$ksplash_pid" 2>/dev/null +fi # Clean up @@ -814,27 +809,21 @@ index 9f875110..2a7a2a70 100644 echo 'startplasma: Done.' 1>&2 diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake -index 417a87d4..3f62745a 100644 +index 8ac47aa..49970ef 100644 --- a/startkde/startplasmacompositor.cmake +++ b/startkde/startplasmacompositor.cmake -@@ -1,173 +1,171 @@ +@@ -1,118 +1,165 @@ #!/bin/sh # -# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) +# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) # --# in case we have been started with full pathname spec without being in PATH --bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` --if [ -n "$bindir" ]; then -- qbindir=`qtpaths --binaries-dir` -- qdbus=$qbindir/qdbus -- case $PATH in -- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; -- *) PATH=$bindir:$PATH; export PATH;; -- esac +-# We need to create config folder so we can write startupconfigkeys +-if [ ${XDG_CONFIG_HOME} ]; then +- configDir=$XDG_CONFIG_HOME; -else -- qdbus=qdbus +- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html +# we have to unset this for Darwin since it will screw up KDE's dynamic-loading +unset DYLD_FORCE_FLAT_NAMESPACE + @@ -860,13 +849,8 @@ index 417a87d4..3f62745a 100644 +# Qt from doing this wackiness in the first place. +if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then + @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf - fi - --# We need to create config folder so we can write startupconfigkeys --if [ ${XDG_CONFIG_HOME} ]; then -- configDir=$XDG_CONFIG_HOME; --else -- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html ++fi ++ +@NIXPKGS_KBUILDSYCOCA5@ + +# Set the default GTK 2 theme @@ -891,7 +875,9 @@ index 417a87d4..3f62745a 100644 +gtk-button-images=1 +EOF fi + sysConfigDirs=${XDG_CONFIG_DIRS:-/etc/xdg} +-# We need to create config folder so we can write startupconfigkeys -mkdir -p $configDir +# Set the default GTK 3 theme +gtk3_settings="$XDG_CONFIG_HOME/gtk-3.0/settings.ini" @@ -1012,8 +998,8 @@ index 417a87d4..3f62745a 100644 - } fi --kstartupconfig5 --returncode=$? + kstartupconfig5 + returncode=$? -if test $returncode -ne 0; then +if ! @CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5; then exit 1 @@ -1047,7 +1033,7 @@ index 417a87d4..3f62745a 100644 - XCURSOR_THEME="$kcminputrc_mouse_cursortheme" - export XCURSOR_THEME +if [ -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ]; then -+ kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" ++ #kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" + if [ $? -eq 10 ]; then + export XCURSOR_THEME=breeze_cursors + elif [ -n "$kcminputrc_mouse_cursortheme" ]; then @@ -1066,6 +1052,23 @@ index 417a87d4..3f62745a 100644 export QT_WAYLAND_FORCE_DPI=$kcmfonts_general_forcefontdpiwayland else export QT_WAYLAND_FORCE_DPI=96 +@@ -120,12 +167,12 @@ fi + + # Get a property value from org.freedesktop.locale1 + queryLocale1() { +- qdbus --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1" ++ @NIXPKGS_QDBUS@ --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1" + } + + # Query whether org.freedesktop.locale1 is available. If it is, try to + # set XKB_DEFAULT_{MODEL,LAYOUT,VARIANT,OPTIONS} accordingly. +-if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then ++if @NIXPKGS_QDBUS@ --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then + # Do not overwrite existing values. There is no point in setting only some + # of them as then they would not match anymore. + if [ -z "${XKB_DEFAULT_MODEL}" -a -z "${XKB_DEFAULT_LAYOUT}" -a \ +@@ -141,41 +188,10 @@ if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then + fi fi -# Source scripts found in <config locations>/plasma-workspace/env/*.sh @@ -1082,13 +1085,11 @@ index 417a87d4..3f62745a 100644 -# For anything else (that doesn't set env vars, or that needs a window manager), -# better use the Autostart folder. - --# TODO: Use GenericConfigLocation once we depend on Qt 5.4 --scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` +-scriptpath=`echo "$configDir:$sysConfigDirs" | tr ':' '\n'` - --# Add /env/ to the directory to locate the scripts to be sourced -for prefix in `echo $scriptpath`; do -- for file in "$prefix"/env/*.sh; do -- test -r "$file" && . "$file" +- for file in "$prefix"/plasma-workspace/env/*.sh; do +- test -r "$file" && . "$file" || true - done -done - @@ -1104,14 +1105,12 @@ index 417a87d4..3f62745a 100644 -export XDG_DATA_DIRS - # Make sure that D-Bus is running --if $qdbus >/dev/null 2>/dev/null; then -- : # ok --else -+if ! @NIXPKGS_QDBUS@ >/dev/null 2>/dev/null; then +-if qdbus >/dev/null 2>/dev/null; then ++if @NIXPKGS_QDBUS@ >/dev/null 2>/dev/null; then + : # ok + else echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - exit 1 -@@ -202,7 +200,7 @@ export KDE_FULL_SESSION +@@ -212,7 +228,7 @@ export KDE_FULL_SESSION KDE_SESSION_VERSION=5 export KDE_SESSION_VERSION @@ -1120,7 +1119,7 @@ index 417a87d4..3f62745a 100644 export KDE_SESSION_UID XDG_CURRENT_DESKTOP=KDE -@@ -212,26 +210,47 @@ export XDG_CURRENT_DESKTOP +@@ -222,20 +238,41 @@ export XDG_CURRENT_DESKTOP QT_QPA_PLATFORM=wayland export QT_QPA_PLATFORM @@ -1148,7 +1147,8 @@ index 417a87d4..3f62745a 100644 + done +done + - # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment + # kwin_wayland can possibly also start dbus-activated services which need env variables. + # In that case, the update in startplasma might be too late. -if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then - dbus-update-activation-environment --systemd --all -else @@ -1171,17 +1171,8 @@ index 417a87d4..3f62745a 100644 echo 'startplasmacompositor: Shutting down...' 1>&2 - unset KDE_FULL_SESSION --xprop -root -remove KDE_FULL_SESSION -+@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION - unset KDE_SESSION_VERSION --xprop -root -remove KDE_SESSION_VERSION -+@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION - unset KDE_SESSION_UID - - echo 'startplasmacompositor: Done.' 1>&2 diff --git a/startkde/waitforname/org.kde.plasma.Notifications.service.in b/startkde/waitforname/org.kde.plasma.Notifications.service.in -index 0a51b84b..f48b5d8a 100644 +index 0a51b84..f48b5d8 100644 --- a/startkde/waitforname/org.kde.plasma.Notifications.service.in +++ b/startkde/waitforname/org.kde.plasma.Notifications.service.in @@ -1,3 +1,3 @@ diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index ee605bdba8a28..38ffffe3047ef 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,355 +3,355 @@ { bluedevil = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/bluedevil-5.11.5.tar.xz"; - sha256 = "0xzdf1qrf2nlpvn2hr9zk72hw027i318s9pnzgmqg1lwhdr276h5"; - name = "bluedevil-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/bluedevil-5.12.1.tar.xz"; + sha256 = "0qdqbykphala7np333l3a0r94nrd8zg2dh7iqw6k7mc1mxkh92b7"; + name = "bluedevil-5.12.1.tar.xz"; }; }; breeze = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/breeze-5.11.5.tar.xz"; - sha256 = "0xxwnhxpkdf4nyc1rvsjrnqsv1cgzs3a88mwfwpvci4snfva8jp1"; - name = "breeze-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/breeze-5.12.1.tar.xz"; + sha256 = "0hi3z4jrs6a0sm58726v6v0hvb0v313qihi06mm6fayiijh0s5zs"; + name = "breeze-5.12.1.tar.xz"; }; }; breeze-grub = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/breeze-grub-5.11.5.tar.xz"; - sha256 = "1l3dv1acgs6ssydg985d90136p9n4h0xry3xlx12g5wg07i8s89g"; - name = "breeze-grub-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/breeze-grub-5.12.1.tar.xz"; + sha256 = "0i7w9i2m9sxywag46dhr22ksw9zb2cjm6vk2019m3kpg9pq8yx68"; + name = "breeze-grub-5.12.1.tar.xz"; }; }; breeze-gtk = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/breeze-gtk-5.11.5.tar.xz"; - sha256 = "0mkd1gqih5irmabxly2y744sr1iwxy7r7hx68jrd452nbvqvyrqq"; - name = "breeze-gtk-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/breeze-gtk-5.12.1.tar.xz"; + sha256 = "0bal2zf2xg32hxbabf4kzlm2lhir9sn67nfzrf9zb0hb0b7ya01d"; + name = "breeze-gtk-5.12.1.tar.xz"; }; }; breeze-plymouth = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/breeze-plymouth-5.11.5.tar.xz"; - sha256 = "0ydfrrsqvzn71j9x1f26771x99yiq59h745k476dcqajj2m0ari3"; - name = "breeze-plymouth-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/breeze-plymouth-5.12.1.tar.xz"; + sha256 = "0535igi9ms4dyz25sygkrmg310s90vy3srx5qdrdzfinah5m8qz7"; + name = "breeze-plymouth-5.12.1.tar.xz"; }; }; discover = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/discover-5.11.5.tar.xz"; - sha256 = "0yxsp4jimyrsxf72hinqa51ycg4hmfxrxdicm9n8qfz47srcgkml"; - name = "discover-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/discover-5.12.1.tar.xz"; + sha256 = "07jdx01qz9339w652ixk0hjb25s1bf4rc5gs872i0hv77vxy161b"; + name = "discover-5.12.1.tar.xz"; }; }; drkonqi = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/drkonqi-5.11.5.tar.xz"; - sha256 = "1kngafr1hdq6r02mpd4bj5lgbgzk2cd10f5zqsvdfgsirz91vfsf"; - name = "drkonqi-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/drkonqi-5.12.1.tar.xz"; + sha256 = "056qqhp8jh2v9jrghdb2n2ljq3s4vyrfdfligkvxvviwrd1r3wyk"; + name = "drkonqi-5.12.1.tar.xz"; }; }; kactivitymanagerd = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/kactivitymanagerd-5.11.5.tar.xz"; - sha256 = "11nnmqpw4kq96912rys2a539yzgncc5vp7b52wgc4is9i5czsr50"; - name = "kactivitymanagerd-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/kactivitymanagerd-5.12.1.tar.xz"; + sha256 = "0hfkcy27mpick1sfwvw4x6323bsq9ks2ac066560wm5xy6svhmid"; + name = "kactivitymanagerd-5.12.1.tar.xz"; }; }; kde-cli-tools = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/kde-cli-tools-5.11.5.tar.xz"; - sha256 = "0d4d360pq6winykjp6lgq77k9yc435d5g71dj7bivkyilqc4cp8c"; - name = "kde-cli-tools-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/kde-cli-tools-5.12.1.tar.xz"; + sha256 = "0l6bky92j1hpgn4ikfxwrpsrcvx673g8vk2n3lff1cyy4j0ayg6v"; + name = "kde-cli-tools-5.12.1.tar.xz"; }; }; kdecoration = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/kdecoration-5.11.5.tar.xz"; - sha256 = "0hl9mqwyfkh1r5nbl46g5axi446fdf7fw09b7v6l3jg9c5xbx89d"; - name = "kdecoration-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/kdecoration-5.12.1.tar.xz"; + sha256 = "08x87kcgphb1jknyp3fsimgb2al919s039kkhimijmm0n1z16fiy"; + name = "kdecoration-5.12.1.tar.xz"; }; }; kde-gtk-config = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/kde-gtk-config-5.11.5.tar.xz"; - sha256 = "1y9ji82qlvp2z00xw0l32zj8asbg85n6azw8ringg2l6376r01l6"; - name = "kde-gtk-config-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/kde-gtk-config-5.12.1.tar.xz"; + sha256 = "1a10nxivnfnm9634z98r6jgp887vf1zynyp9hi75pw9jbm4zf1kw"; + name = "kde-gtk-config-5.12.1.tar.xz"; }; }; kdeplasma-addons = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/kdeplasma-addons-5.11.5.tar.xz"; - sha256 = "1vp9r7ia5wriw5srpyq89nqdp82akz3jnh7dcbh2h0gdagw7hb94"; - name = "kdeplasma-addons-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/kdeplasma-addons-5.12.1.tar.xz"; + sha256 = "123daj7q8jgw6zsq9c0mdd28qf9r20hlbzs71zz48r7736njaw98"; + name = "kdeplasma-addons-5.12.1.tar.xz"; }; }; kgamma5 = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/kgamma5-5.11.5.tar.xz"; - sha256 = "16vlx51n52j5q1nfsz4ji6bz4x6sfagxzn6q3r6ckj41rkwmp9gg"; - name = "kgamma5-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/kgamma5-5.12.1.tar.xz"; + sha256 = "0cgkrc4b0x50ih4x0zfvcydnhqryd37d5sqj3p0k3b6p2r9mnqkb"; + name = "kgamma5-5.12.1.tar.xz"; }; }; khotkeys = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/khotkeys-5.11.5.tar.xz"; - sha256 = "051yjqkf5bigz6cz2qbq0lggw9i6ydfaxrvy4xh40mw2c6x3xmvh"; - name = "khotkeys-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/khotkeys-5.12.1.tar.xz"; + sha256 = "1acjg51ikp9gdabdjbg6i9znxrfs11md9zhi7rls9b5p06l38ckj"; + name = "khotkeys-5.12.1.tar.xz"; }; }; kinfocenter = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/kinfocenter-5.11.5.tar.xz"; - sha256 = "0ym7i64k48x8dcln0lajj0379blp3c3a0axfcjibp3ya2xcaqdif"; - name = "kinfocenter-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/kinfocenter-5.12.1.tar.xz"; + sha256 = "1wb7gag22ssaril3rl5r3y62rszvihrr4y1ph7nmhrg14sifg16k"; + name = "kinfocenter-5.12.1.tar.xz"; }; }; kmenuedit = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/kmenuedit-5.11.5.tar.xz"; - sha256 = "0wh4hk51k2mz1gqm9brvdy16gp2ap2iz5b6yjiqbkpz6giy88kwc"; - name = "kmenuedit-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/kmenuedit-5.12.1.tar.xz"; + sha256 = "13liv9qj8h4b17h8864bhxqahjwaz7bbh1gx53mhkbn59g5kh39d"; + name = "kmenuedit-5.12.1.tar.xz"; }; }; kscreen = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/kscreen-5.11.5.tar.xz"; - sha256 = "0qa23qs8v8hm91190ssdnlg7dyljra7csgykb7d8la30yxa9vzc7"; - name = "kscreen-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/kscreen-5.12.1.tar.xz"; + sha256 = "18v0gzv4j9w0jyf05ibi5iwmw1wp231q7hi098sps614hz38zmh2"; + name = "kscreen-5.12.1.tar.xz"; }; }; kscreenlocker = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/kscreenlocker-5.11.5.tar.xz"; - sha256 = "0qrby8jxmvmnr1abkry8h5xapdswabj27n35s9l71d9lp9p96naz"; - name = "kscreenlocker-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/kscreenlocker-5.12.1.tar.xz"; + sha256 = "1s3k51k05g3nhq1c32631ryr754zk40fnrw4zi2x69bvx3mj40hq"; + name = "kscreenlocker-5.12.1.tar.xz"; }; }; ksshaskpass = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/ksshaskpass-5.11.5.tar.xz"; - sha256 = "08jf6f1i9xn0zsz2j2czgdzcr203wrlj1nlam26dakrphhaj8vm2"; - name = "ksshaskpass-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/ksshaskpass-5.12.1.tar.xz"; + sha256 = "1zj7ka6wfisjbx7lbpw7acjdgr590596zgy4al7if4rznva1zsh7"; + name = "ksshaskpass-5.12.1.tar.xz"; }; }; ksysguard = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/ksysguard-5.11.5.tar.xz"; - sha256 = "161bcmsw4bjlsgkr3izfsqbiwambmm3za8mln3m96nf70gpqpa6i"; - name = "ksysguard-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/ksysguard-5.12.1.tar.xz"; + sha256 = "1dh84wzn1iyc59yvzqjah16rp05wl6cf3lgiiycza09d9k4m0j5m"; + name = "ksysguard-5.12.1.tar.xz"; }; }; kwallet-pam = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/kwallet-pam-5.11.5.tar.xz"; - sha256 = "0wqnaszvwclz2gn74nmhqmci39525hwvpc3igxzjhdccnkfb5ac4"; - name = "kwallet-pam-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/kwallet-pam-5.12.1.tar.xz"; + sha256 = "0x7w945ifmdczynyr45xid8ymq7m0djapacb815bgy7xzr3y3glm"; + name = "kwallet-pam-5.12.1.tar.xz"; }; }; kwayland-integration = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/kwayland-integration-5.11.5.tar.xz"; - sha256 = "0xisgzymlhmbngvmv3dkh6a51dqnhcwrjj2480f0yxsmhvknxrps"; - name = "kwayland-integration-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/kwayland-integration-5.12.1.tar.xz"; + sha256 = "00fncsp9ihg9f9n9a63rnx6n7jfld6bya3wymppwxnzxp1awx8s0"; + name = "kwayland-integration-5.12.1.tar.xz"; }; }; kwin = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/kwin-5.11.5.tar.xz"; - sha256 = "06bz2vm78i1x0i0ljdqd2a0bnnrfwz9zvlg7r86qlmhkzn2dpc4z"; - name = "kwin-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/kwin-5.12.1.tar.xz"; + sha256 = "13wdqhyhnnk64bd1vyxk7rm6bkn7z2cpcxigqdyy3iqkkpz16mfy"; + name = "kwin-5.12.1.tar.xz"; }; }; kwrited = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/kwrited-5.11.5.tar.xz"; - sha256 = "0sx5v1apambb8w6mndkkp2lvwlqwzbpxxp5d5zsz96lxndjx6sbv"; - name = "kwrited-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/kwrited-5.12.1.tar.xz"; + sha256 = "1blbv41mm74bhp1fkdc0f24pk990xr8ppmwnif9g5ygsisw6mwbl"; + name = "kwrited-5.12.1.tar.xz"; }; }; libkscreen = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/libkscreen-5.11.5.tar.xz"; - sha256 = "03cnr7z74j2kjwbg1ddavmj0l8hpxg7bg2ipglirnzvp2ihv1wzg"; - name = "libkscreen-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/libkscreen-5.12.1.tar.xz"; + sha256 = "01j9rvhsgn57jqqhznqwpmq6x2jrfrkv9svhch3akp9qz580wzjf"; + name = "libkscreen-5.12.1.tar.xz"; }; }; libksysguard = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/libksysguard-5.11.5.tar.xz"; - sha256 = "0f2py4zkqzpxxf3mqaij0q8ka0v3nschj17dv6rbzzmr5mjv825f"; - name = "libksysguard-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/libksysguard-5.12.1.tar.xz"; + sha256 = "0xfbh0fndld6ab12770fj3szfc66zgfzh0al36lif8rvdgyqymfl"; + name = "libksysguard-5.12.1.tar.xz"; }; }; milou = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/milou-5.11.5.tar.xz"; - sha256 = "0ja7a668wv67vb3mgsd2nbjdcp0lm7aix5dpc496wr1jy47pxv8a"; - name = "milou-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/milou-5.12.1.tar.xz"; + sha256 = "1k6v0lbadvmclw6mpq2xdh3w4scjjhzj6jsgq7v3g27mjf4pdjc2"; + name = "milou-5.12.1.tar.xz"; }; }; oxygen = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/oxygen-5.11.5.tar.xz"; - sha256 = "1n2xr3a0002xfiy99gjqlny76nxjlss1d3sgcj8adpza44j91228"; - name = "oxygen-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/oxygen-5.12.1.tar.xz"; + sha256 = "1pmw26aihk63zscxzwacp6yfqg1siamvjcgc4b81xafcby5w1xyz"; + name = "oxygen-5.12.1.tar.xz"; }; }; plasma-desktop = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/plasma-desktop-5.11.5.tar.xz"; - sha256 = "0djzs80mr0radmhai3k7jnlwlp76maf7vvrgkfckzs63n1jhdhb3"; - name = "plasma-desktop-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/plasma-desktop-5.12.1.tar.xz"; + sha256 = "1mjwjvv0dmvvpghckqw56s2khdxbgqvs0n68c06v56hcnsvxpadw"; + name = "plasma-desktop-5.12.1.tar.xz"; }; }; plasma-integration = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/plasma-integration-5.11.5.tar.xz"; - sha256 = "1rmq8i0flrvqcl21fnn94d58zyw55scagrzbjw92p34i1mllhif1"; - name = "plasma-integration-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/plasma-integration-5.12.1.tar.xz"; + sha256 = "0ljdwfw2b8nk5nsxhhhx4vh9mrdvchrzr39y6wx7yq0hk8ldspkf"; + name = "plasma-integration-5.12.1.tar.xz"; }; }; plasma-nm = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/plasma-nm-5.11.5.tar.xz"; - sha256 = "11lw26nd1rp2wbmqlf37wgk8qzv4fcc5x04g1i1h7c6hmjf5svqv"; - name = "plasma-nm-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/plasma-nm-5.12.1.tar.xz"; + sha256 = "023v1v8c6zqddnms82xyym99x7faxf3g304q8zd5hk1xmwxfydmq"; + name = "plasma-nm-5.12.1.tar.xz"; }; }; plasma-pa = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/plasma-pa-5.11.5.tar.xz"; - sha256 = "1gdkz9yx21skg3c95nwh1mwacvrklgpfl0cspsmyyfnbnv93cz94"; - name = "plasma-pa-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/plasma-pa-5.12.1.tar.xz"; + sha256 = "19qfmrqsxf4h59ayy2cr8qixk04wlh9gg5f6aqlrbd81611pnmss"; + name = "plasma-pa-5.12.1.tar.xz"; }; }; plasma-sdk = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/plasma-sdk-5.11.5.tar.xz"; - sha256 = "013dc8dg0nhgdjlflgpqi28jsyparnwrj5am8lzvc0kkd9f69yhk"; - name = "plasma-sdk-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/plasma-sdk-5.12.1.tar.xz"; + sha256 = "11irkik3ppvcxfv4cd4jyim0qrr0i8y1911vw9h8gppg4bihiibr"; + name = "plasma-sdk-5.12.1.tar.xz"; }; }; plasma-tests = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/plasma-tests-5.11.5.tar.xz"; - sha256 = "00n1i6s1811w5h37i2iyy924495d2w24vfsl348cxplfxpxhcqf0"; - name = "plasma-tests-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/plasma-tests-5.12.1.tar.xz"; + sha256 = "1vk4c61839ggwdjxnmv6f5l5rcml4q6sjhrxykw9sx2fk43b7aqc"; + name = "plasma-tests-5.12.1.tar.xz"; }; }; plasma-vault = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/plasma-vault-5.11.5.tar.xz"; - sha256 = "1pg891fahslnjn5jdsjjlw8i2l71ddznxjg96l9wycvh6nn7k0v6"; - name = "plasma-vault-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/plasma-vault-5.12.1.tar.xz"; + sha256 = "13ph0npgjc8mx1jn1pszj0hv3332lyamiq4wrpc7qgj6cx81qygz"; + name = "plasma-vault-5.12.1.tar.xz"; }; }; plasma-workspace = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/plasma-workspace-5.11.5.tar.xz"; - sha256 = "1ipklc6v2ml095sy80rgq4123vkk3famjwf8s3rgkk172s76qm98"; - name = "plasma-workspace-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/plasma-workspace-5.12.1.tar.xz"; + sha256 = "1ijnafbsyrv9n0mldf77mipq03k29db2ad57iwvr310xpr0sckfq"; + name = "plasma-workspace-5.12.1.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/plasma-workspace-wallpapers-5.11.5.tar.xz"; - sha256 = "0zhcpbb74phnmr24kxcp0k6gr7gjzdfbrrv4xjjb2qpg2d00l3pm"; - name = "plasma-workspace-wallpapers-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/plasma-workspace-wallpapers-5.12.1.tar.xz"; + sha256 = "0lsczs68w9ygzc9m7q2r6fziddzgraavyf2vf49d7543lym21k8n"; + name = "plasma-workspace-wallpapers-5.12.1.tar.xz"; }; }; plymouth-kcm = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/plymouth-kcm-5.11.5.tar.xz"; - sha256 = "152fyg5hc3rzvqw0z88pgapnhc64jx34vcqgsslsfja8mwk9h0ql"; - name = "plymouth-kcm-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/plymouth-kcm-5.12.1.tar.xz"; + sha256 = "1wqqxxmcn49gryr7pyn5hq3jyl92r0m8dxns2wn2mgy2cz0xz5yk"; + name = "plymouth-kcm-5.12.1.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.11.5"; + version = "1-5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/polkit-kde-agent-1-5.11.5.tar.xz"; - sha256 = "0bwv567czi9h3rxgn19aw10nq5c674zd8wgk9nj006km1yyxrgy6"; - name = "polkit-kde-agent-1-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/polkit-kde-agent-1-5.12.1.tar.xz"; + sha256 = "1hsy14xprgpfh0zgn1z9c8j8qs41wfizm38wr7nbnhk81k25kr96"; + name = "polkit-kde-agent-1-5.12.1.tar.xz"; }; }; powerdevil = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/powerdevil-5.11.5.tar.xz"; - sha256 = "0jqf85bain8vj5plxvvbdwiwc2jyb1r6idajhr6igcpjryfa75hj"; - name = "powerdevil-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/powerdevil-5.12.1.tar.xz"; + sha256 = "09c8snaf236cbxp8ifv8zwy1zifld3gsszvvzyvwdhbpz3gr41hm"; + name = "powerdevil-5.12.1.tar.xz"; }; }; sddm-kcm = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/sddm-kcm-5.11.5.tar.xz"; - sha256 = "1ln1h4r614rg4w6b7g5l7yqqijkaaj04s4g4m41d8rg8z5ywq4v0"; - name = "sddm-kcm-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/sddm-kcm-5.12.1.tar.xz"; + sha256 = "1ij90cjjnb8318v6s4m56xfhs6cvi9p09mwmgqsh5463ya74x7dy"; + name = "sddm-kcm-5.12.1.tar.xz"; }; }; systemsettings = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/systemsettings-5.11.5.tar.xz"; - sha256 = "0ycdfl585853481bjix63nnj7qvg767qpbyr015k32c1v3vllx8y"; - name = "systemsettings-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/systemsettings-5.12.1.tar.xz"; + sha256 = "1nzscbs8v22wa8adlxcvhr2qhibpq3dm584774ma3rmzvagjl6hv"; + name = "systemsettings-5.12.1.tar.xz"; }; }; user-manager = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/user-manager-5.11.5.tar.xz"; - sha256 = "1r4q411g2r6cz4z6bm5jwygfbvrfrl8dawdd69s6h93ixs7697s4"; - name = "user-manager-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/user-manager-5.12.1.tar.xz"; + sha256 = "0db8lgh6sxfbc9v68yqq0g68rznkk8ml88h8zxrw5khicazg2n62"; + name = "user-manager-5.12.1.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.11.5"; + version = "5.12.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.5/xdg-desktop-portal-kde-5.11.5.tar.xz"; - sha256 = "07xwb4zbf0cp4a672vs631dh9cqyvn0j9wwlknc21jzr619mnkap"; - name = "xdg-desktop-portal-kde-5.11.5.tar.xz"; + url = "${mirror}/stable/plasma/5.12.1/xdg-desktop-portal-kde-5.12.1.tar.xz"; + sha256 = "0xnryki83vmm1jmzkwfkxga0s1qfrl939rg6bb5h44j6665sv2bl"; + name = "xdg-desktop-portal-kde-5.12.1.tar.xz"; }; }; } diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index 4c449aa2703cd..a6199d9fbef2a 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2, - kactivities, kactivities-stats, kirigami2 + kactivities, kactivities-stats, kirigami2, kcrash }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { buildInputs = [ kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 - kactivities kactivities-stats kirigami2 + kactivities kactivities-stats kirigami2 kcrash ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index e91a3ab25ee90..e9f6240cbdfe3 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification , makeWrapper, xfce4mixer, hicolor_icon_theme -, withGtk3 ? false, gtk3, gettext +, withGtk3 ? false, gtk3, gettext, glib_networking }: let inherit (stdenv.lib) optional; @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xfce4-panel" \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix index 419efbcbf95aa..0af0e62244fd3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; p_name = "xfce4-weather-plugin"; ver_maj = "0.8"; - ver_min = "7"; + ver_min = "10"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1c35iqqiphazkfdabbjdynk0qkc3r8vxhmk2jc6dkiv8d08727h7"; + sha256 = "1f7ac2zr5s5w6krdpgsq252wxhhmcblia3j783132ilh8k246vgf"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index a37206192417b..69182c3aa0d89 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -1,18 +1,7 @@ -{ lib, buildFHSUserEnv, platformio, stdenv }: - -buildFHSUserEnv { - name = "platformio"; - - targetPkgs = pkgs: (with pkgs; - [ - python27Packages.python - python27Packages.setuptools - python27Packages.pip - python27Packages.bottle - python27Packages.platformio - zlib - ]); - multiPkgs = pkgs: (with pkgs; +{ stdenv, lib, buildFHSUserEnv +}: +let + pio-pkgs = pkgs: (with pkgs; [ python27Packages.python python27Packages.setuptools @@ -21,6 +10,12 @@ buildFHSUserEnv { python27Packages.platformio zlib ]); +in +buildFHSUserEnv { + name = "platformio"; + + targetPkgs = pio-pkgs; + multiPkgs = pio-pkgs; meta = with stdenv.lib; { description = "An open source ecosystem for IoT development"; diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 8dcebbf442b17..97eb8e8b6421c 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -1,21 +1,29 @@ { stdenv, fetchFromGitHub, icestorm }: +with builtins; + stdenv.mkDerivation rec { name = "arachne-pnr-${version}"; - version = "2018.02.04"; + version = "2018.02.14"; src = fetchFromGitHub { owner = "cseed"; repo = "arachne-pnr"; - rev = "c21df0062c6ee13e8c8280cefbb7c017823336c0"; - sha256 = "1ah1gn07av3ff5lnay4p7dahaacbyj0mfakbx7g5fs3p1m1m8p1k"; + rev = "b54675413f9aac1d9a1fb0a8e9354bec2a2a8f3c"; + sha256 = "06slsb239qk1r2g96n1g37yp8314cy7yi4g1yf86fr87fr11ml8l"; }; enableParallelBuilding = true; makeFlags = - [ "PREFIX=$(out)" "ICEBOX=${icestorm}/share/icebox" + [ "PREFIX=$(out)" + "ICEBOX=${icestorm}/share/icebox" ]; + patchPhase = '' + substituteInPlace ./Makefile \ + --replace 'echo UNKNOWN' 'echo ${substring 0 10 src.rev}' + ''; + meta = { description = "Place and route tool for FPGAs"; longDescription = '' diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 72eaae9987790..3f9ee17ca2792 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,14 +1,14 @@ { stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "33"; + version = "42"; rev = "version_${version}"; name = "binaryen-${version}"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; - sha256 = "0zijs2mcgfv0iynwdb0l4zykm0891b1zccf6r8w35ipxvcdwbsbp"; + sha256 = "0b8qc9cd7ncshgfjwv4hfapmwa81gmniaycnxmdkihq9bpm26x2k"; inherit rev; }; diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index f238e5f8fb506..3ffd024305dea 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -2,8 +2,7 @@ stdenv.mkDerivation rec { name = "chez-scheme-${version}"; - version = "9.5-${dver}"; - dver = "20171109"; + version = "9.5.1"; src = fetchgit { url = "https://github.com/cisco/chezscheme.git"; @@ -13,10 +12,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ coreutils ] ++ stdenv.lib.optional stdenv.isDarwin cctools; - buildInputs = [ ncurses libiconv libX11 ]; - /* We patch out a very annoying 'feature' in ./configure, which + enableParallelBuilding = true; + + /* + ** We patch out a very annoying 'feature' in ./configure, which ** tries to use 'git' to update submodules. ** ** We have to also fix a few occurrences to tools with absolute @@ -38,19 +39,47 @@ stdenv.mkDerivation rec { --replace "/usr/bin/libtool" libtool ''; - /* Don't use configureFlags, since that just implicitly appends + /* + ** Don't use configureFlags, since that just implicitly appends ** everything onto a --prefix flag, which ./configure gets very angry ** about. + ** + ** Also, carefully set a manual workarea argument, so that we + ** can later easily find the machine type that we built Chez + ** for. */ configurePhase = '' - ./configure --threads --installprefix=$out --installman=$out/share/man + ./configure --threads \ + --installprefix=$out --installman=$out/share/man \ + --workarea=work ''; - enableParallelBuilding = true; + /* + ** Install the kernel.o file, so we can compile C applications that + ** link directly to the Chez runtime (for booting their own files, or + ** embedding.) + ** + ** Ideally in the future this would be less of a hack and could be + ** done by Chez itself. Alternatively, there could just be a big + ** case statement matching to the different stdenv.platform values... + */ + postInstall = '' + m="$(ls ./work/boot)" + if [ "x''${m[1]}" != "x" ]; then + >&2 echo "ERROR: more than one bootfile build found; this is a nixpkgs error" + exit 1 + fi + + kernel=./work/boot/$m/kernel.o + kerneldest=$out/lib/csv${version}/$m/ + + echo installing $kernel to $kerneldest + cp $kernel $kerneldest/kernel.o + ''; meta = { description = "A powerful and incredibly fast R6RS Scheme compiler"; - homepage = "http://www.scheme.com"; + homepage = https://cisco.github.io/ChezScheme/; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index a12f1c42ba619..07b205f6dfe81 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -7,11 +7,11 @@ assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02"; stdenv.mkDerivation rec { name = "compcert-${version}"; - version = "3.1"; + version = "3.2"; src = fetchurl { url = "http://compcert.inria.fr/release/${name}.tgz"; - sha256 = "0irfwlw2chalp0g2gw0makc699hn3z37sha1a239p9d90mzx03cx"; + sha256 = "11q4121s0rxva63njjwya7syfx9w0p4hzr6avh8s57vfbrcakc93"; }; buildInputs = [ coq ] @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configurePhase = '' - substituteInPlace VERSION --replace '3.0.1' '3.1' substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' + (if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"); diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 0105a159877a0..36adfd075df29 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -169,7 +169,7 @@ let version = "4.8.5"; # To keep ABI compatibility with upstream mingw-w64 "--enable-fully-dynamic-string" ] else - optionals (targetPlatform.libc == "uclibc") [ + optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [ # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. "--disable-libgomp" diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 1b1492686d0ea..c436da678fd9d 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -160,7 +160,7 @@ let version = "4.9.4"; # To keep ABI compatibility with upstream mingw-w64 "--enable-fully-dynamic-string" ] else - optionals (targetPlatform.libc == "uclibc") [ + optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [ # libsanitizer requires netrom/netrom.h which is not # available in uclibc. "--disable-libsanitizer" diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 0636ce7381aee..b9ca8696d4e37 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, noSysDirs +{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langObjC ? targetPlatform.isDarwin , langObjCpp ? targetPlatform.isDarwin @@ -74,7 +74,11 @@ let version = "5.5.0"; # This could be applied unconditionally but I don't want to cause a full # Linux rebuild. - ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch; + ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch + ++ optional stdenv.hostPlatform.isMusl (fetchpatch { + url = https://raw.githubusercontent.com/richfelker/musl-cross-make/e84b1bd1fc12a3def33111ca6df522cd6e5ec361/patches/gcc-5.3.0/0001-musl.diff; + sha256 = "0pppbf8myi2kjhm3z3479ihn1cm60kycfv60gj8yy1bs0pl1qcfm"; + }); javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -160,7 +164,7 @@ let version = "5.5.0"; # To keep ABI compatibility with upstream mingw-w64 "--enable-fully-dynamic-string" ] else - optionals (targetPlatform.libc == "uclibc") [ + optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [ # libsanitizer requires netrom/netrom.h which is not # available in uclibc. "--disable-libsanitizer" @@ -258,15 +262,22 @@ stdenv.mkDerivation ({ let libc = if libcCross != null then libcCross else stdenv.cc.libc; in - '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." + ( + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h do - grep -q LIBC_DYNAMIC_LINKER "$header" || continue + grep -q _DYNAMIC_LINKER "$header" || continue echo " fixing \`$header'..." sed -i "$header" \ - -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ + -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' done '' + + stdenv.lib.optionalString (targetPlatform.libc == "musl") + '' + sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' + '' + ) else null; # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, @@ -396,6 +407,7 @@ stdenv.mkDerivation ({ # On Illumos/Solaris GNU as is preferred "--with-gnu-as" "--without-gnu-ld" ] + ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer" ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 2614e96e1b7c1..df0c1578daeda 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -142,6 +142,9 @@ let version = "6.4.0"; "--disable-shared" "--disable-libatomic" # libatomic requires libc "--disable-decimal-float" # libdecnumber requires libc + # maybe only needed on musl, PATH_MAX + # https://github.com/richfelker/musl-cross-make/blob/0867cdf300618d1e3e87a0a939fa4427207ad9d7/litecross/Makefile#L62 + "--disable-libmpx" ] else [ (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot" else "--with-headers=${getDev libcCross}/include") @@ -158,13 +161,15 @@ let version = "6.4.0"; # To keep ABI compatibility with upstream mingw-w64 "--enable-fully-dynamic-string" ] else - optionals (targetPlatform.libc == "uclibc") [ + optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [ # libsanitizer requires netrom/netrom.h which is not # available in uclibc. "--disable-libsanitizer" # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. "--disable-libgomp" + # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865 + "--disable-libmpx" ] ++ [ "--enable-threads=posix" "--enable-nls" @@ -257,15 +262,22 @@ stdenv.mkDerivation ({ let libc = if libcCross != null then libcCross else stdenv.cc.libc; in - '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." + ( + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h do - grep -q LIBC_DYNAMIC_LINKER "$header" || continue + grep -q _DYNAMIC_LINKER "$header" || continue echo " fixing \`$header'..." sed -i "$header" \ - -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ + -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' done '' + + stdenv.lib.optionalString (targetPlatform.libc == "musl") + '' + sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' + '' + ) else null; # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, @@ -399,6 +411,7 @@ stdenv.mkDerivation ({ # On Illumos/Solaris GNU as is preferred "--with-gnu-as" "--without-gnu-ld" ] + ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer" ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; diff --git a/pkgs/development/compilers/gcc/6/fix-objdump-check.patch b/pkgs/development/compilers/gcc/6/fix-objdump-check.patch new file mode 100644 index 0000000000000..f9adbe9eb1ca5 --- /dev/null +++ b/pkgs/development/compilers/gcc/6/fix-objdump-check.patch @@ -0,0 +1,43 @@ +commit 4c38abe0967bad78dd6baa61c86923e4d4b346d3 +Author: Ben Gamari <ben@smart-cactus.org> +Date: Sun Nov 5 13:14:19 2017 -0500 + + Fix it + +diff --git a/config/gcc-plugin.m4 b/config/gcc-plugin.m4 +index dd06a58..f4435b8 100644 +--- a/config/gcc-plugin.m4 ++++ b/config/gcc-plugin.m4 +@@ -13,6 +13,32 @@ dnl the same distribution terms as the rest of that program. + # Sets the shell variables enable_plugin and pluginlibs. + AC_DEFUN([GCC_ENABLE_PLUGINS], + [# Check for plugin support ++ ++ # Figure out what objdump we will be using. ++ AS_VAR_SET_IF(gcc_cv_objdump,, [ ++ if test -f $gcc_cv_binutils_srcdir/configure.ac \ ++ && test -f ../binutils/Makefile \ ++ && test x$build = x$host; then ++ # Single tree build which includes binutils. ++ gcc_cv_objdump=../binutils/objdump$build_exeext ++ elif test -x objdump$build_exeext; then ++ gcc_cv_objdump=./objdump$build_exeext ++ elif ( set dummy $OBJDUMP_FOR_TARGET; test -x $[2] ); then ++ gcc_cv_objdump="$OBJDUMP_FOR_TARGET" ++ else ++ AC_PATH_PROG(gcc_cv_objdump, $OBJDUMP_FOR_TARGET) ++ fi]) ++ ++ AC_MSG_CHECKING(what objdump to use) ++ if test "$gcc_cv_objdump" = ../binutils/objdump$build_exeext; then ++ # Single tree build which includes binutils. ++ AC_MSG_RESULT(newly built objdump) ++ elif test x$gcc_cv_objdump = x; then ++ AC_MSG_RESULT(not found) ++ else ++ AC_MSG_RESULT($gcc_cv_objdump) ++ fi ++ + AC_ARG_ENABLE(plugin, + [AS_HELP_STRING([--enable-plugin], [enable plugin support])], + enable_plugin=$enableval, diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 15ddd9e700917..bbf87eccac752 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, noSysDirs +{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langObjC ? targetPlatform.isDarwin , langObjCpp ? targetPlatform.isDarwin @@ -66,6 +66,10 @@ let version = "7.3.0"; [ ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch + ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied + url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; + sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs"; + }) # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. ++ optional langAda ../gnat-cflags.patch @@ -155,7 +159,7 @@ let version = "7.3.0"; # To keep ABI compatibility with upstream mingw-w64 "--enable-fully-dynamic-string" ] else - optionals (targetPlatform.libc == "uclibc") [ + optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [ # libsanitizer requires netrom/netrom.h which is not # available in uclibc. "--disable-libsanitizer" @@ -253,15 +257,22 @@ stdenv.mkDerivation ({ let libc = if libcCross != null then libcCross else stdenv.cc.libc; in - '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." + ( + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h do - grep -q LIBC_DYNAMIC_LINKER "$header" || continue + grep -q _DYNAMIC_LINKER "$header" || continue echo " fixing \`$header'..." sed -i "$header" \ - -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ + -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' done '' + + stdenv.lib.optionalString (hostPlatform.libc == "musl") + '' + sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' + '' + ) else null; # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, @@ -391,6 +402,7 @@ stdenv.mkDerivation ({ # On Illumos/Solaris GNU as is preferred "--with-gnu-as" "--without-gnu-ld" ] + ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer" ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 8b62bbffcc84b..f4aa2de3241e2 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -26,6 +26,10 @@ !(targetPlatform.isDarwin # On iOS, dynamic linking is not supported && (targetPlatform.isAarch64 || targetPlatform.isArm)) +, # Whether to backport https://phabricator.haskell.org/D4388 for + # deterministic profiling symbol names, at the cost of a slightly + # non-standard GHC API + deterministicProfiling ? false }: assert !enableIntegerSimple -> gmp != null; @@ -85,7 +89,11 @@ stdenv.mkDerivation rec { url = "https://git.haskell.org/ghc.git/commitdiff_plain/2fc8ce5f0c8c81771c26266ac0b150ca9b75c5f3"; sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f"; }) - ]; + ] ++ stdenv.lib.optional deterministicProfiling + (fetchpatch { # Backport of https://phabricator.haskell.org/D4388 for more determinism + url = "https://github.com/shlevy/ghc/commit/fec1b8d3555c447c0d8da0e96b659be67c8bb4bc.patch"; + sha256 = "1lyysz6hfd1njcigpm8xppbnkadqfs0kvrp7s8vqgb38pjswj5hg"; + }); postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index 17dc24e567f46..e7ec9be16b697 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -3,7 +3,7 @@ # build-tools , bootPkgs, alex, happy -, autoconf, automake, coreutils, fetchgit, perl, python3 +, autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3 , libffi, libiconv ? null, ncurses @@ -24,7 +24,11 @@ # platform). Static libs are always built. enableShared ? true -, version ? "8.4.20180122" +, version ? "8.4.0.20180204" +, # Whether to backport https://phabricator.haskell.org/D4388 for + # deterministic profiling symbol names, at the cost of a slightly + # non-standard GHC API + deterministicProfiling ? false }: assert !enableIntegerSimple -> gmp != null; @@ -73,14 +77,20 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.haskell.org/ghc.git"; - rev = "61db0b8941cfb7ed8941ed29bdb04bd8ef3b71a5"; - sha256 = "15sbpgkal4854jc1xn3sprvpnxwdj0fyy43y5am0h9vja3pjhjyi"; + rev = "111737cd218751f06ea58d3cf2c7c144265b5dfc"; + sha256 = "0ksp0k3sp928aq2cv6whgbfmjnr7l2j10diha13nncksp4byf0s9"; }; enableParallelBuilding = true; outputs = [ "out" "doc" ]; + patches = stdenv.lib.optional deterministicProfiling + (fetchpatch { # https://phabricator.haskell.org/D4388 for more determinism + url = "https://github.com/shlevy/ghc/commit/8b2dbd869d1a64de3e99fa8b1c9bb1140eee7099.patch"; + sha256 = "0hxpiwhbg64rsyjdr4psh6dwyp58b96mad3adccvfr0x8hc6ba2m"; + }); + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index ee71d2aabad68..7775a17a646c8 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -25,20 +25,21 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.8.5"; + version = "1.8.7"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "1ab021l3v29ciaxp738cjpbkh1chlsl6928672q3i82anmdzn5m5"; + sha256 = "06v83fb75079dy2dc1927sr9bwvcpkkzl9d4wcw10scj70vj4a0x"; }; # perl is used for testing go vet nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ] ++ optionals stdenv.isLinux [ procps ]; buildInputs = [ cacert pcre ] - ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index b226cd7a7ebc8..f1017d4a48c42 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -25,20 +25,21 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "0ivb6z30d6qrrkwjm9fdz9jfs567q4b6dljwwxc9shmdr2l9chah"; + sha256 = "15d9lfiy1cjfz6nqnig5884ykqckx58cynd1bva1xna7bwcwwp2r"; }; # perl is used for testing go vet nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ] ++ optionals stdenv.isLinux [ procps ]; buildInputs = [ cacert pcre ] - ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 17a25889e64f9..ceaa45fe8d730 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -65,7 +65,7 @@ in stdenv.mkDerivation (rec { 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 < ${ diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 1f55e6c54e7dc..1067fa886bcb9 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation (rec { mv compiler-rt-* $sourceRoot/projects/compiler-rt ''; - outputs = [ "out" ] + outputs = [ "out" "python" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; nativeBuildInputs = [ cmake python ] @@ -120,7 +120,11 @@ in stdenv.mkDerivation (rec { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib ''; - postInstall = stdenv.lib.optionalString enableSharedLibraries '' + postInstall = '' + mkdir -p $python/share + mv $out/share/opt-viewer $python/share/opt-viewer + '' + + stdenv.lib.optionalString enableSharedLibraries '' moveToOutput "lib/libLLVM-*" "$lib" moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 5e298dbf2ceec..451722aea0604 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -22,5 +22,5 @@ mkDerivation rec { description = "An experimental package manager for PureScript"; license = licenses.bsd3; - maintainers = with lib.maintainers; [ profpatsch ]; + maintainers = with lib.maintainers; [ Profpatsch ]; } diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 9d6f641bc46c7..efed388ce4ca1 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation { # Disable fragile tests. rm -vr src/test/run-make/linker-output-non-utf8 || true - rm -vr src/test/run-make/issue-26092.rs || true + rm -vr src/test/run-make/issue-26092 || true # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 rm -vr src/test/run-pass/issue-36023.rs || true diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index 60cb3e9a20291..bff73337e9e85 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "0.4.0-RC1"; + version = "0.6.0-RC1"; name = "dotty-bare-${version}"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz"; - sha256 = "1d1ab08b85bd6898ce6273fa50818de0d314fc6e5377fb6ee05494827043321b"; + sha256 = "de1f5e72fb0e0b4c377d6cec93f565eff49769698cd8be01b420705fe8475ca4"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index eb96acafb9e19..063fd71c0433d 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -2,18 +2,24 @@ , pkgconfig, tcl, readline, libffi, python3, bison, flex }: +with builtins; + stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2018.02.04"; + version = "2018.02.14"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "0659d9eac7b546ee6f5acab46dbc83c91d556a34"; - sha256 = "1hy21gxcp3q3hlbh5sh46h2340r11fwalkb9if9sbpc9y3279njj"; + rev = "c1abd3b02cab235334342f3520e2535eb74c5792"; + sha256 = "0pzrplv4p0qzy115rg19lxv4w274iby337zfd7hhlinnpx3gzqvw"; name = "yosys"; }) + + # NOTE: the version of abc used here is synchronized with + # the one in the yosys Makefile of the version above; + # keep them the same for quality purposes. (fetchFromBitbucket { owner = "alanmi"; repo = "abc"; @@ -27,6 +33,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ tcl readline libffi python3 bison flex ]; + + patchPhase = '' + substituteInPlace ./Makefile \ + --replace 'echo UNKNOWN' 'echo ${substring 0 10 (elemAt srcs 0).rev}' + ''; + preBuild = '' chmod -R u+w ../yosys-abc ln -s ../yosys-abc abc diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index 6f0c6d19e4508..cffc683f9e7bc 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages_5, llvm_5 }: +{ stdenv, fetchFromGitHub, cmake, llvmPackages }: stdenv.mkDerivation rec { version = "0.1.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06"; }; - buildInputs = [ cmake llvmPackages_5.clang-unwrapped llvm_5 ]; + buildInputs = [ cmake llvmPackages.clang-unwrapped llvmPackages.llvm ]; cmakeFlags = [ "-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include" diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b46da64c3421b..3b36c6d6318df 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -281,6 +281,7 @@ self: super: { hashed-storage = dontCheck super.hashed-storage; hashring = dontCheck super.hashring; hath = dontCheck super.hath; + haxl = dontCheck super.haxl; # non-deterministic failure https://github.com/facebook/Haxl/issues/85 haxl-facebook = dontCheck super.haxl-facebook; # needs facebook credentials for testing hdbi-postgresql = dontCheck super.hdbi-postgresql; hedis = dontCheck super.hedis; @@ -606,7 +607,7 @@ self: super: { }; # Need newer versions of their dependencies than the ones we have in LTS-10.x. - cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_24_0; }; + cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_25_0; }; hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_1; }); # https://github.com/bos/configurator/issues/22 @@ -949,7 +950,7 @@ self: super: { ChasingBottoms = dontCheck super.ChasingBottoms; # Add support for https://github.com/haskell-hvr/multi-ghc-travis. - multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis { ShellCheck = self.ShellCheck_0_4_6; }; + multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis {}; # https://github.com/yesodweb/Shelly.hs/issues/162 shelly = dontCheck super.shelly; @@ -965,38 +966,55 @@ self: super: { hledger = overrideCabal super.hledger (drv: { postInstall = '' for i in $(seq 1 9); do - for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do + for j in $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/*-${self.ghc.name}/*/.otherdocs/*.$i; do mkdir -p $out/share/man/man$i cp $j $out/share/man/man$i/ done done - mkdir $out/share/info - cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/ + mkdir -p $out/share/info + cp $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.info $out/share/info/ ''; }); hledger-ui = overrideCabal super.hledger-ui (drv: { postInstall = '' for i in $(seq 1 9); do - for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do + for j in $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/*-${self.ghc.name}/*/.otherdocs/*.$i; do mkdir -p $out/share/man/man$i cp $j $out/share/man/man$i/ done done - mkdir $out/share/info - cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/ + mkdir -p $out/share/info + cp $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.info $out/share/info/ ''; }); hledger-web = overrideCabal super.hledger-web (drv: { postInstall = '' for i in $(seq 1 9); do - for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do + for j in $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/*-${self.ghc.name}/*/.otherdocs/*.$i; do mkdir -p $out/share/man/man$i cp $j $out/share/man/man$i/ done done - mkdir $out/share/info - cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/ + mkdir -p $out/share/info + cp $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.info $out/share/info/ ''; }); + # Add a flag to enable building against GHC with D4388 applied (the + # deterministic profiling symbols patch). The flag is disabled by + # default, so we can apply this patch globally. + # + # https://github.com/ucsd-progsys/liquidhaskell/pull/1233 + liquidhaskell = + let patch = pkgs.fetchpatch + { url = https://github.com/ucsd-progsys/liquidhaskell/commit/1aeef1871760b2be46cc1cabd51311997d1d0bc0.patch; + sha256 = "0i55n6p3x9as648as0lvxy2alqb1n7c10xv9gp15cvq7zx6c8ydg"; + }; + in appendPatch super.liquidhaskell patch; + + # https://github.com/nick8325/twee/pull/1 + twee-lib = dontHaddock super.twee-lib; + + # Needs older hlint + hpio = dontCheck super.hpio; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index fc41fc0b3d300..56f61fddb33e2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -186,6 +186,7 @@ self: super: { attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]); bytes = addBuildDepend super.bytes self.doctest; case-insensitive = addBuildDepend super.case-insensitive self.semigroups; + contravariant = addBuildDepend super.contravariant self.semigroups; dependent-map = addBuildDepend super.dependent-map self.semigroups; distributive = addBuildDepend (dontCheck super.distributive) self.semigroups; Glob = addBuildDepends super.Glob (with self; [semigroups]); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 49c8ac0d00509..488d3206c78cb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -43,7 +43,876 @@ self: super: { xhtml = null; # GHC 8.4.x needs newer versions than LTS-10.x offers by default. - hspec = dontCheck super.hspec_2_4_7; # test suite causes an infinite loop - test-framework = self.test-framework_0_8_2_0; + ## haddock: panic! (the 'impossible' happened) + ## (GHC version 8.4.20180122 for x86_64-unknown-linux): + ## extractDecl + ## Ambiguous decl for Arg in class: + ## class Example e where + ## type Arg e :: * + ## {-# MINIMAL evaluateExample #-} + ## evaluateExample :: + ## e + ## -> Params + ## -> ActionWith Arg e -> IO () -> ProgressCallback -> IO Result + ## Matches: + ## [] + ## Call stack: + ## CallStack (from HasCallStack): + ## callStackDoc, called at compiler/utils/Outputable.hs:1150:37 in ghc:Outputable + ## pprPanic, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1013:16 in main:Haddock.Interface.Create + ## Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug + hspec = dontHaddock (dontCheck super.hspec_2_4_8); # test suite causes an infinite loop + ## Setup: Encountered missing dependencies: + ## QuickCheck >=2.3 && <2.10 + ## builder for ‘/nix/store/d60y5jwn5bpgk2p8ps23c129dcw7whg6-test-framework-0.8.2.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/d60y5jwn5bpgk2p8ps23c129dcw7whg6-test-framework-0.8.2.0.drv’ failed + test-framework = dontCheck self.test-framework_0_8_2_0; + + # Undo the override in `configuration-common.nix`: GHC 8.4 bumps Cabal to 2.1: + # Distribution/Simple/CCompiler.hs:64:10: error: + # • No instance for (Semigroup CDialect) + # arising from the superclasses of an instance declaration + # • In the instance declaration for ‘Monoid CDialect’ + # | + # 64 | instance Monoid CDialect where + # | ^^^^^^^^^^^^^^^ + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal; }; #pkgs.haskell.packages.ghc822.jailbreak-cabal; + + ## Shadowed: + + ## Needs bump to a versioned attribute + ## + ## • Could not deduce (Semigroup (Dict a)) + ## arising from the superclasses of an instance declaration + ## from the context: a + constraints = super.constraints_0_10; + + hspec-core = overrideCabal super.hspec-core_2_4_8 (drv: { + ## Needs bump to a versioned attribute + ## + ## • No instance for (Semigroup Summary) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Summary’ + doCheck = false; + }); + + ## Needs bump to a versioned attribute + ## + ## breaks hspec: + ## Setup: Encountered missing dependencies: + ## hspec-discover ==2.4.7 + hspec-discover = super.hspec-discover_2_4_8; + + ## Needs bump to a versioned attribute + ## + ## • No instance for (Semigroup Metadatas) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Metadatas’ + JuicyPixels = super.JuicyPixels_3_2_9_4; + + ## Needs bump to a versioned attribute + ## + ## • Could not deduce (Semigroup (a :->: b)) + ## arising from the superclasses of an instance declaration + ## from the context: (HasTrie a, Monoid b) + MemoTrie = super.MemoTrie_0_6_9; + + semigroupoids = overrideCabal super.semigroupoids_5_2_2 (drv: { + ## Needs bump to a versioned attribute + ## + ## • Variable not in scope: mappend :: Seq a -> Seq a -> Seq a + ## CABAL-MISSING-DEPS + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## builder for ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed + doCheck = false; + }); + + ## Needs bump to a versioned attribute + ## + ## • Could not deduce (Semigroup (Traversal f)) + ## arising from the superclasses of an instance declaration + ## from the context: Applicative f + tasty = super.tasty_1_0_0_1; + + ## Needs bump to a versioned attribute + ## + ## Setup: Encountered missing dependencies: + ## template-haskell >=2.4 && <2.13 + ## builder for ‘/nix/store/sq6cc33h4zk1wns2fsyv8cj6clcf6hwi-th-lift-0.7.7.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/sq6cc33h4zk1wns2fsyv8cj6clcf6hwi-th-lift-0.7.7.drv’ failed + th-lift = super.th-lift_0_7_8; + + + ## On Hackage: + + happy = overrideCabal super.happy (drv: { + ## On Hackage, awaiting for import + ## + ## Ambiguous occurrence ‘<>’ + ## It could refer to either ‘Prelude.<>’, + ## imported from ‘Prelude’ at src/PrettyGrammar.hs:1:8-20 + version = "1.19.9"; + sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y"; + }); + + + ## Upstreamed + + free = overrideCabal super.free (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## • Could not deduce (Semigroup (IterT m a)) + ## arising from the superclasses of an instance declaration + ## from the context: (Monad m, Monoid a) + src = pkgs.fetchFromGitHub { + owner = "ekmett"; + repo = "free"; + rev = "fcefc71ed302f2eaf60f020046bad392338b3109"; + sha256 = "0mfrd7y97pgqmb2i66jn5xwjpcrgnfcqq8dzkxqgx1b5wjdydq70"; + }; + ## Setup: Encountered missing dependencies: + ## transformers-base <0.5 + ## builder for ‘/nix/store/3yvaqx5qcg1fb3nnyc273fkhgfh73pgv-free-4.12.4.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/3yvaqx5qcg1fb3nnyc273fkhgfh73pgv-free-4.12.4.drv’ failed + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.transformers-base ]; + }); + + haskell-gi = overrideCabal super.haskell-gi (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## Setup: Encountered missing dependencies: + ## haskell-gi-base ==0.20.* + ## builder for ‘/nix/store/q0qkq2gzmdnkvdz6xl7svv5305chbr4b-haskell-gi-0.20.3.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/q0qkq2gzmdnkvdz6xl7svv5305chbr4b-haskell-gi-0.20.3.drv’ failed + src = pkgs.fetchFromGitHub { + owner = "haskell-gi"; + repo = "haskell-gi"; + rev = "30d2e6415c5b57760f8754cd3003eb07483d60e6"; + sha256 = "1l3qm97gcjih695hhj80rbpnd72prnc81lg5y373yj8jk9f6ypbr"; + }; + ## CABAL-MISSING-DEPS + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## builder for ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed + doCheck = false; + }); + + haskell-gi-base = overrideCabal super.haskell-gi-base (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## breaks haskell-gi: + ## Setup: Encountered missing dependencies: + ## haskell-gi-base ==0.21.* + src = pkgs.fetchFromGitHub { + owner = "haskell-gi"; + repo = "haskell-gi"; + rev = "30d2e6415c5b57760f8754cd3003eb07483d60e6"; + sha256 = "1l3qm97gcjih695hhj80rbpnd72prnc81lg5y373yj8jk9f6ypbr"; + }; + ## Setup: Encountered missing dependencies: + ## attoparsec ==0.13.*, + ## doctest >=0.8, + ## haskell-gi-base ==0.21.*, + ## pretty-show -any, + ## regex-tdfa >=1.2, + prePatch = "cd base; "; + }); + + haskell-src-exts = overrideCabal super.haskell-src-exts (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## • Could not deduce (Semigroup (ParseResult m)) + ## arising from the superclasses of an instance declaration + ## from the context: Monoid m + src = pkgs.fetchFromGitHub { + owner = "haskell-suite"; + repo = "haskell-src-exts"; + rev = "935f6f0915e89c314b686bdbdc6980c72335ba3c"; + sha256 = "1v3c1bd5q07qncqfbikvs8h3r4dr500blm5xv3b4jqqv69f0iam9"; + }; + }); + + hedgehog = overrideCabal super.hedgehog (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## /nix/store/78sxg2kvl2klplqfx22s6b42lds7qq23-stdenv/setup: line 99: cd: hedgehog: No such file or directory + src = pkgs.fetchFromGitHub { + owner = "hedgehogqa"; + repo = "haskell-hedgehog"; + rev = "7a4fab73670bc33838f2b5f25eb824ee550079ce"; + sha256 = "1l8maassmklf6wgairk7llxvlbwxngv0dzx0fwnqx6hsb32sms05"; + }; + ## jailbreak-cabal: dieVerbatim: user error (jailbreak-cabal: Error Parsing: file "hedgehog.cabal" doesn't exist. Cannot + prePatch = "cd hedgehog; "; + }); + + lambdacube-compiler = overrideCabal super.lambdacube-compiler (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## Setup: Encountered missing dependencies: + ## aeson >=0.9 && <0.12, + ## base >=4.7 && <4.10, + ## directory ==1.2.*, + ## megaparsec ==5.0.*, + ## vector ==0.11.* + src = pkgs.fetchFromGitHub { + owner = "lambdacube3d"; + repo = "lambdacube-compiler"; + rev = "ff6e3b136eede172f20ea8a0f7017ad1ecd029b8"; + sha256 = "0srzrq5s7pdbygn7vdipxl12a3gbyb6bpa7frbh8zwhb9fz0jx5m"; + }; + }); + + lambdacube-ir = overrideCabal super.lambdacube-ir (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## /nix/store/78sxg2kvl2klplqfx22s6b42lds7qq23-stdenv/setup: line 99: cd: lambdacube-ir.haskell: No such file or directory + src = pkgs.fetchFromGitHub { + owner = "lambdacube3d"; + repo = "lambdacube-ir"; + rev = "b86318b510ef59606c5b7c882cad33af52ce257c"; + sha256 = "0j4r6b32lcm6jg653xzg9ijxkfjahlb4x026mv5dhs18kvgqhr8x"; + }; + ## Setup: No cabal file found. + prePatch = "cd lambdacube-ir.haskell; "; + }); + + lens = overrideCabal super.lens (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## • Could not deduce (Apply f) + ## arising from the superclasses of an instance declaration + ## from the context: (Contravariant f, Applicative f) + src = pkgs.fetchFromGitHub { + owner = "ekmett"; + repo = "lens"; + rev = "4ad49eaf2448d856f0433fe5a4232f1e8fa87eb0"; + sha256 = "0sd08v6syadplhk5d21yi7qffbjncn8z1bqlwz9nyyb0xja8s8wa"; + }; + ## CABAL-MISSING-DEPS + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## builder for ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed + doCheck = false; + ## Setup: Encountered missing dependencies: + ## template-haskell >=2.4 && <2.13 + ## builder for ‘/nix/store/fvrc4s96ym33i74y794nap7xai9p69fa-lens-4.15.4.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/fvrc4s96ym33i74y794nap7xai9p69fa-lens-4.15.4.drv’ failed + jailbreak = true; + }); + + simple-reflect = overrideCabal super.simple-reflect (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## • No instance for (Semigroup Expr) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Expr’ + src = pkgs.fetchFromGitHub { + owner = "twanvl"; + repo = "simple-reflect"; + rev = "c357e55da9a712dc5dbbfe6e36394e4ada2db310"; + sha256 = "15q41b00l8y51xzhbj5zhddyh3gi7gvml033w8mm2fih458jf6yq"; + }; + }); + + singletons = overrideCabal super.singletons (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## Setup: Encountered missing dependencies: + ## th-desugar ==1.7.* + ## builder for ‘/nix/store/g5jl22kpq8fnrg8ldphxndri759nxwzf-singletons-2.3.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/g5jl22kpq8fnrg8ldphxndri759nxwzf-singletons-2.3.1.drv’ failed + src = pkgs.fetchFromGitHub { + owner = "goldfirere"; + repo = "singletons"; + rev = "23aa4bdaf05ce025a2493b35ec3c26cc94e3fdce"; + sha256 = "0hw12v4z8jxmykc3j8z6g27swmfpxv40bgnx7nl0ialpwbz9mz27"; + }; + }); + + stringbuilder = overrideCabal super.stringbuilder (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## • No instance for (Semigroup Builder) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Builder’ + src = pkgs.fetchFromGitHub { + owner = "sol"; + repo = "stringbuilder"; + rev = "4a1b689d3c8a462b28e0d21224b96165f622e6f7"; + sha256 = "0h3nva4mwxkdg7hh7b7a3v561wi1bvmj0pshhd3sl7dy3lpvnrah"; + }; + }); + + th-desugar = overrideCabal super.th-desugar (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## • Could not deduce (MonadIO (DsM q)) + ## arising from the 'deriving' clause of a data type declaration + ## from the context: Quasi q + src = pkgs.fetchFromGitHub { + owner = "goldfirere"; + repo = "th-desugar"; + rev = "4ca98c6492015e6ad063d3ad1a2ad6c4f0a56837"; + sha256 = "1n3myd3gia9qsgdvrwqa023d3g7wkrhyv0wc8czwzz0lj9xzh7lw"; + }; + }); + + unordered-containers = overrideCabal super.unordered-containers (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## Module ‘Data.Semigroup’ does not export ‘Monoid(..)’ + ## | + ## 80 | import Data.Semigroup (Semigroup(..), Monoid(..)) + src = pkgs.fetchFromGitHub { + owner = "tibbe"; + repo = "unordered-containers"; + rev = "0a6b84ec103e28b73458f385ef846a7e2d3ea42f"; + sha256 = "128q8k4py2wr1v0gmyvqvzikk6sksl9aqj0lxzf46763lis8x9my"; + }; + }); + + websockets = overrideCabal super.websockets (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## • No instance for (Semigroup SizeLimit) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid SizeLimit’ + src = pkgs.fetchFromGitHub { + owner = "jaspervdj"; + repo = "websockets"; + rev = "11ba6d15cf47bace1936b13a58192e37908b0300"; + sha256 = "1swphhnqvs5kh0wlqpjjgx9q91yxi6lasid8akdxp3gqll5ii2hf"; + }; + }); + + + ## Unmerged + + blaze-builder = overrideCabal super.blaze-builder (drv: { + ## Unmerged. PR: https://github.com/lpsmith/blaze-builder/pull/10 + ## + ## • No instance for (Semigroup Poke) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Poke’ + src = pkgs.fetchFromGitHub { + owner = "bgamari"; + repo = "blaze-builder"; + rev = "b7195f160795a081adbb9013810d843f1ba5e062"; + sha256 = "1g351fdpsvn2lbqiy9bg2s0wwrdccb8q1zh7gvpsx5nnj24b1c00"; + }; + }); + + bytestring-trie = overrideCabal super.bytestring-trie (drv: { + ## Unmerged. PR: https://github.com/wrengr/bytestring-trie/pull/3 + ## + ## • Could not deduce (Semigroup (Trie a)) + ## arising from the superclasses of an instance declaration + ## from the context: Monoid a + src = pkgs.fetchFromGitHub { + owner = "RyanGlScott"; + repo = "bytestring-trie"; + rev = "e0ae0cb1ad40dedd560090d69cc36f9760797e29"; + sha256 = "1jkdchvrca7dgpij5k4h1dy4qr1rli3fzbsqajwxmx9865rgiksl"; + }; + ## Setup: Encountered missing dependencies: + ## HUnit >=1.3.1.1 && <1.7, + ## QuickCheck >=2.4.1 && <2.11, + ## lazysmallcheck ==0.6.*, + ## smallcheck >=1.1.1 && <1.2 + doCheck = false; + ## Setup: Encountered missing dependencies: + ## data-or ==1.0.* + ## builder for ‘/nix/store/iw3xsljnygsv9q2jglcv54mqd94fig7n-bytestring-trie-0.2.4.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/iw3xsljnygsv9q2jglcv54mqd94fig7n-bytestring-trie-0.2.4.1.drv’ failed + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.data-or ]; + }); + + gtk2hs-buildtools = overrideCabal super.gtk2hs-buildtools (drv: { + ## Unmerged. PR: https://github.com/gtk2hs/gtk2hs/pull/233 + ## + ## /nix/store/78sxg2kvl2klplqfx22s6b42lds7qq23-stdenv/setup: line 99: cd: tools: No such file or directory + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "gtk2hs"; + rev = "08c68d5afc22dd5761ec2c92ebf49c6d252e545b"; + sha256 = "06prn5wqq8x225n9wlbyk60f50jyjj8fm2hf181dyqjpf8wq75xa"; + }; + ## Setup: No cabal file found. + prePatch = "cd tools; "; + }); + + hashtables = overrideCabal super.hashtables (drv: { + ## Unmerged. PR: https://github.com/gregorycollins/hashtables/pull/46 + ## + ## • No instance for (Semigroup Slot) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Slot’ + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "hashtables"; + rev = "b9eb4b10a50bd6250330422afecc065339a32412"; + sha256 = "0l4nplpvnzzf397zyh7j2k6yiqb46k6bdy00m4zzvhlfp7p1xkaw"; + }; + }); + + language-c = overrideCabal super.language-c (drv: { + ## Unmerged. PR: https://github.com/visq/language-c/pull/45 + ## + ## Ambiguous occurrence ‘<>’ + ## It could refer to either ‘Prelude.<>’, + ## imported from ‘Prelude’ at src/Language/C/Pretty.hs:15:8-24 + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "language-c"; + rev = "03b120c64c12946d134017f4922b55c6ab4f52f8"; + sha256 = "1mcv46fq37kkd20rhhdbn837han5knjdsgc7ckqp5r2r9m3vy89r"; + }; + ## /bin/sh: cabal: command not found + doCheck = false; + }); + + language-c_0_7_0 = overrideCabal super.language-c_0_7_0 (drv: { + ## Unmerged. PR: https://github.com/visq/language-c/pull/45 + ## + ## Ambiguous occurrence ‘<>’ + ## It could refer to either ‘Prelude.<>’, + ## imported from ‘Prelude’ at src/Language/C/Pretty.hs:15:8-24 + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "language-c"; + rev = "03b120c64c12946d134017f4922b55c6ab4f52f8"; + sha256 = "1mcv46fq37kkd20rhhdbn837han5knjdsgc7ckqp5r2r9m3vy89r"; + }; + ## /bin/sh: cabal: command not found + doCheck = false; + }); + + monadplus = overrideCabal super.monadplus (drv: { + ## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3 + ## + ## • No instance for (Semigroup (Partial a b)) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid (Partial a b)’ + src = pkgs.fetchFromGitHub { + owner = "asr"; + repo = "monadplus"; + rev = "aa09f2473e2c906f2707b8a3fdb0a087405fd6fb"; + sha256 = "0g37s3rih4i3vrn4kjwj12nq5lkpckmjw33xviva9gly2vg6p3xc"; + }; + }); + + reflex = overrideCabal super.reflex (drv: { + ## Unmerged. PR: https://github.com/reflex-frp/reflex/pull/158 + ## + ## • Could not deduce (Semigroup (Event t a)) + ## arising from the superclasses of an instance declaration + ## from the context: (Semigroup a, Reflex t) + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "reflex"; + rev = "4fb50139db45a37493b91973eeaad9885b4c63ca"; + sha256 = "0i7pp6cw394m2vbwcqv9z5ngdarp01sabqr1jkkgchxdkkii94nx"; + }; + ## mergeIncrementalWithMove :: + ## GCompare k => + ## Incremental t (PatchDMapWithMove k (Event t)) + ## -> Event t (DMap k Identity) + ## currentIncremental :: + ## Patch p => Incremental t p -> Behavior t (PatchTarget p) + ## updatedIncremental :: Patch p => Incremental t p -> Event t p + ## incrementalToDynamic :: + ## Patch p => Incremental t p -> Dynamic t (PatchTarget p) + ## behaviorCoercion :: + ## Coercion a b -> Coercion (Behavior t a) (Behavior t b) + ## eventCoercion :: Coercion a b -> Coercion (Event t a) (Event t b) + ## dynamicCoercion :: + ## Coercion a b -> Coercion (Dynamic t a) (Dynamic t b) + ## mergeIntIncremental :: + ## Incremental t (PatchIntMap (Event t a)) -> Event t (IntMap a) + ## fanInt :: Event t (IntMap a) -> EventSelectorInt t a + ## {-# MINIMAL never, constant, push, pushCheap, pull, merge, fan, + ## switch, coincidence, current, updated, unsafeBuildDynamic, + ## unsafeBuildIncremental, mergeIncremental, mergeIncrementalWithMove, + ## currentIncremental, updatedIncremental, incrementalToDynamic, + ## behaviorCoercion, eventCoercion, dynamicCoercion, + ## mergeIntIncremental, fanInt #-} + ## Matches: + ## [] + ## Call stack: + ## CallStack (from HasCallStack): + ## callStackDoc, called at compiler/utils/Outputable.hs:1150:37 in ghc:Outputable + ## pprPanic, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1013:16 in main:Haddock.Interface.Create + ## Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug + doHaddock = false; + ## Setup: Encountered missing dependencies: + ## base >=4.7 && <4.11, bifunctors >=5.2 && <5.5 + ## builder for ‘/nix/store/93ka24600m4mipsgn2cq8fwk124q97ca-reflex-0.4.0.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/93ka24600m4mipsgn2cq8fwk124q97ca-reflex-0.4.0.1.drv’ failed + jailbreak = true; + ## Setup: Encountered missing dependencies: + ## data-default -any, + ## lens -any, + ## monad-control -any, + ## prim-uniq -any, + ## reflection -any, + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.data-default self.haskell-src-exts self.lens self.monad-control self.prim-uniq self.reflection self.split self.template-haskell self.unbounded-delays ]; + }); + + regex-tdfa = overrideCabal super.regex-tdfa (drv: { + ## Unmerged. PR: https://github.com/ChrisKuklewicz/regex-tdfa/pull/13 + ## + ## • No instance for (Semigroup (CharMap a)) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid (CharMap a)’ + src = pkgs.fetchFromGitHub { + owner = "bgamari"; + repo = "regex-tdfa"; + rev = "34f4593a520176a917b74b8c7fcbbfbd72fb8178"; + sha256 = "1aiklvf08w1hx2jn9n3sm61mfvdx4fkabszkjliapih2yjpmi3hq"; + }; + }); + + text-format = overrideCabal super.text-format (drv: { + ## Unmerged. PR: https://github.com/bos/text-format/pull/21 + ## + ## • No instance for (Semigroup Format) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Format’ + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "text-format"; + rev = "a1cda87c222d422816f956c7272e752ea12dbe19"; + sha256 = "0lyrx4l57v15rvazrmw0nfka9iyxs4wyaasjj9y1525va9s1z4fr"; + }; + }); + + wl-pprint-text = overrideCabal super.wl-pprint-text (drv: { + ## Unmerged. PR: https://github.com/ivan-m/wl-pprint-text/pull/17 + ## + ## Ambiguous occurrence ‘<>’ + ## It could refer to either ‘PP.<>’, + ## imported from ‘Prelude.Compat’ at Text/PrettyPrint/Leijen/Text/Monadic.hs:73:1-36 + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "wl-pprint-text"; + rev = "615b83d1e5be52d1448aa1ab2517b431a617027b"; + sha256 = "1p67v9s878br0r152h4n37smqhkg78v8zxhf4qm6d035s4rzj76i"; + }; + }); + + + ## Non-code, configuration-only change + + adjunctions = overrideCabal super.adjunctions (drv: { + ## Setup: Encountered missing dependencies: + ## free ==4.* + ## builder for ‘/nix/store/64pvqslahgby4jlg9rpz29n8w4njb670-adjunctions-4.3.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/64pvqslahgby4jlg9rpz29n8w4njb670-adjunctions-4.3.drv’ failed + jailbreak = true; + }); + + async = overrideCabal super.async (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.3 && <4.11 + ## builder for ‘/nix/store/2xf491hgsmckz2akrn765kvvy2k8crbd-async-2.1.1.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/2xf491hgsmckz2akrn765kvvy2k8crbd-async-2.1.1.1.drv’ failed + jailbreak = true; + }); + + bifunctors = overrideCabal super.bifunctors (drv: { + ## Setup: Encountered missing dependencies: + ## template-haskell >=2.4 && <2.13 + ## builder for ‘/nix/store/dy1hzdy14pz96cvx37yggbv6a88sgxq4-bifunctors-5.5.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/dy1hzdy14pz96cvx37yggbv6a88sgxq4-bifunctors-5.5.drv’ failed + jailbreak = true; + }); + + bindings-GLFW = overrideCabal super.bindings-GLFW (drv: { + ## Setup: Encountered missing dependencies: + ## template-haskell >=2.10 && <2.13 + ## builder for ‘/nix/store/ykc786r2bby5kkbpqjg0y10wb9jhmsa9-bindings-GLFW-3.1.2.3.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/ykc786r2bby5kkbpqjg0y10wb9jhmsa9-bindings-GLFW-3.1.2.3.drv’ failed + jailbreak = true; + }); + + bytes = overrideCabal super.bytes (drv: { + ## CABAL-MISSING-DEPS + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## builder for ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed + doCheck = false; + }); + + cabal-doctest = overrideCabal super.cabal-doctest (drv: { + ## Setup: Encountered missing dependencies: + ## Cabal >=1.10 && <2.1, base >=4.3 && <4.11 + ## builder for ‘/nix/store/zy3l0ll0r9dq29lgxajv12rz1jzjdkrn-cabal-doctest-1.0.5.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/zy3l0ll0r9dq29lgxajv12rz1jzjdkrn-cabal-doctest-1.0.5.drv’ failed + jailbreak = true; + }); + + ChasingBottoms = overrideCabal super.ChasingBottoms (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.2 && <4.11 + ## builder for ‘/nix/store/wsyjjf4x6pmx84kxnjaka7zwakyrca03-ChasingBottoms-1.3.1.3.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/wsyjjf4x6pmx84kxnjaka7zwakyrca03-ChasingBottoms-1.3.1.3.drv’ failed + jailbreak = true; + }); + + comonad = overrideCabal super.comonad (drv: { + ## CABAL-MISSING-DEPS + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## builder for ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed + doCheck = false; + }); + + distributive = overrideCabal super.distributive (drv: { + ## CABAL-MISSING-DEPS + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## builder for ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed + doCheck = false; + }); + + exception-transformers = overrideCabal super.exception-transformers (drv: { + ## Setup: Encountered missing dependencies: + ## HUnit >=1.2 && <1.6 + ## builder for ‘/nix/store/qs4g7lzq1ixcgg5rw4xb5545g7r34md8-exception-transformers-0.4.0.5.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/qs4g7lzq1ixcgg5rw4xb5545g7r34md8-exception-transformers-0.4.0.5.drv’ failed + jailbreak = true; + }); + + hashable = overrideCabal super.hashable (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.4 && <4.11 + ## builder for ‘/nix/store/4qlxxypfhbwcv227cmsja1asgqnq37gf-hashable-1.2.6.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/4qlxxypfhbwcv227cmsja1asgqnq37gf-hashable-1.2.6.1.drv’ failed + jailbreak = true; + }); + + hashable-time = overrideCabal super.hashable-time (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.7 && <4.11 + ## builder for ‘/nix/store/38dllcgxpmkd2fgvs6wd7ji86py0wbnh-hashable-time-0.2.0.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/38dllcgxpmkd2fgvs6wd7ji86py0wbnh-hashable-time-0.2.0.1.drv’ failed + jailbreak = true; + }); + + haskell-src-meta = overrideCabal super.haskell-src-meta (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.6 && <4.11, template-haskell >=2.8 && <2.13 + ## builder for ‘/nix/store/g5wkb14sydvyv484agvaa7hxl84a0wr9-haskell-src-meta-0.8.0.2.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/g5wkb14sydvyv484agvaa7hxl84a0wr9-haskell-src-meta-0.8.0.2.drv’ failed + jailbreak = true; + }); + + hspec-meta = overrideCabal super.hspec-meta (drv: { + ## Linking dist/build/hspec-meta-discover/hspec-meta-discover ... + ## running tests + ## Package has no test suites. + ## haddockPhase + ## Running hscolour for hspec-meta-2.4.6... + ## Preprocessing library for hspec-meta-2.4.6.. + ## Preprocessing executable 'hspec-meta-discover' for hspec-meta-2.4.6.. + ## Preprocessing library for hspec-meta-2.4.6.. + ## Running Haddock on library for hspec-meta-2.4.6.. + ## Haddock coverage: + ## haddock: panic! (the 'impossible' happened) + ## (GHC version 8.4.20180122 for x86_64-unknown-linux): + ## extractDecl + ## Ambiguous decl for Arg in class: + ## class Example e where + ## type Arg e + ## type Arg e = () + ## evaluateExample :: + ## e + ## -> Params + ## -> (ActionWith (Arg e) -> IO ()) -> ProgressCallback -> IO Result + ## {-# MINIMAL evaluateExample #-} + ## Matches: + ## [] + ## Call stack: + ## CallStack (from HasCallStack): + ## callStackDoc, called at compiler/utils/Outputable.hs:1150:37 in ghc:Outputable + ## pprPanic, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1013:16 in main:Haddock.Interface.Create + ## Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug + doHaddock = false; + }); + + integer-logarithms = overrideCabal super.integer-logarithms (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.3 && <4.11 + ## builder for ‘/nix/store/zdiicv0jmjsw6bprs8wxxaq5m0z0a75f-integer-logarithms-1.0.2.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/zdiicv0jmjsw6bprs8wxxaq5m0z0a75f-integer-logarithms-1.0.2.drv’ failed + jailbreak = true; + }); + + kan-extensions = overrideCabal super.kan-extensions (drv: { + ## Setup: Encountered missing dependencies: + ## free ==4.* + ## builder for ‘/nix/store/kvnlcj6zdqi2d2yq988l784hswjwkk4c-kan-extensions-5.0.2.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/kvnlcj6zdqi2d2yq988l784hswjwkk4c-kan-extensions-5.0.2.drv’ failed + jailbreak = true; + }); + + keys = overrideCabal super.keys (drv: { + ## Setup: Encountered missing dependencies: + ## free ==4.* + ## builder for ‘/nix/store/khkbn7wmjr10nyq0wwkmn888bj1l4fmh-keys-3.11.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/khkbn7wmjr10nyq0wwkmn888bj1l4fmh-keys-3.11.drv’ failed + jailbreak = true; + }); + + lambdacube-gl = overrideCabal super.lambdacube-gl (drv: { + ## Setup: Encountered missing dependencies: + ## vector ==0.11.* + ## builder for ‘/nix/store/a98830jm4yywfg1d6264p4yngbiyvssp-lambdacube-gl-0.5.2.4.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/a98830jm4yywfg1d6264p4yngbiyvssp-lambdacube-gl-0.5.2.4.drv’ failed + jailbreak = true; + }); + + lifted-async = overrideCabal super.lifted-async (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 + ## builder for ‘/nix/store/l3000vil24jyq66a5kfqvxfdmy7agwic-lifted-async-0.9.3.3.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/l3000vil24jyq66a5kfqvxfdmy7agwic-lifted-async-0.9.3.3.drv’ failed + jailbreak = true; + }); + + linear = overrideCabal super.linear (drv: { + ## CABAL-MISSING-DEPS + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## builder for ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed + doCheck = false; + }); + + newtype-generics = overrideCabal super.newtype-generics (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.6 && <4.11 + ## builder for ‘/nix/store/l3rzsjbwys4rjrpv1703iv5zwbd4bwy6-newtype-generics-0.5.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/l3rzsjbwys4rjrpv1703iv5zwbd4bwy6-newtype-generics-0.5.1.drv’ failed + jailbreak = true; + }); + + parallel = overrideCabal super.parallel (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.3 && <4.11 + ## builder for ‘/nix/store/c16gcgn7d7gql8bbjqngx7wbw907hnwb-parallel-3.2.1.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/c16gcgn7d7gql8bbjqngx7wbw907hnwb-parallel-3.2.1.1.drv’ failed + jailbreak = true; + }); + + quickcheck-instances = overrideCabal super.quickcheck-instances (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 + ## builder for ‘/nix/store/r3fx9f7ksp41wfn6cp4id3mzgv04pwij-quickcheck-instances-0.3.16.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/r3fx9f7ksp41wfn6cp4id3mzgv04pwij-quickcheck-instances-0.3.16.1.drv’ failed + jailbreak = true; + }); + + tasty-ant-xml = overrideCabal super.tasty-ant-xml (drv: { + ## Setup: Encountered missing dependencies: + ## tasty >=0.10 && <1.0 + ## builder for ‘/nix/store/86dlb96cdw9jpq95xbndf4axj1z542d6-tasty-ant-xml-1.1.2.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/86dlb96cdw9jpq95xbndf4axj1z542d6-tasty-ant-xml-1.1.2.drv’ failed + jailbreak = true; + }); + + tasty-expected-failure = overrideCabal super.tasty-expected-failure (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 + ## builder for ‘/nix/store/gdm01qb8ppxgrl6dgzhlj8fzmk4x8dj3-tasty-expected-failure-0.11.0.4.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/gdm01qb8ppxgrl6dgzhlj8fzmk4x8dj3-tasty-expected-failure-0.11.0.4.drv’ failed + jailbreak = true; + }); + + tasty-hedgehog = overrideCabal super.tasty-hedgehog (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.8 && <4.11, tasty ==0.11.* + ## builder for ‘/nix/store/bpxyzzbmb03n88l4xz4k2rllj4227fwv-tasty-hedgehog-0.1.0.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/bpxyzzbmb03n88l4xz4k2rllj4227fwv-tasty-hedgehog-0.1.0.1.drv’ failed + jailbreak = true; + }); + + text-lens = overrideCabal super.text-lens (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.9.0.0 && <4.10, + ## extra >=1.4.10 && <1.5, + ## hspec >=2.2.4 && <2.3, + ## lens ==4.14.* + jailbreak = true; + }); + + th-abstraction = overrideCabal super.th-abstraction (drv: { + ## Setup: Encountered missing dependencies: + ## template-haskell >=2.5 && <2.13 + ## builder for ‘/nix/store/la3zdphp3nqzl590n25zyrgj62ga8cl6-th-abstraction-0.2.6.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/la3zdphp3nqzl590n25zyrgj62ga8cl6-th-abstraction-0.2.6.0.drv’ failed + jailbreak = true; + }); + + these = overrideCabal super.these (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 + ## builder for ‘/nix/store/1wwqq67pinjj95fgqg13bchh0kbyrb83-these-0.7.4.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/1wwqq67pinjj95fgqg13bchh0kbyrb83-these-0.7.4.drv’ failed + jailbreak = true; + }); + + trifecta = overrideCabal super.trifecta (drv: { + ## CABAL-MISSING-DEPS + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## builder for ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed + doCheck = false; + }); + + unliftio-core = overrideCabal super.unliftio-core (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 + ## builder for ‘/nix/store/bn8w06wlq7zzli0858hfwlai7wbj6dmq-unliftio-core-0.1.1.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/bn8w06wlq7zzli0858hfwlai7wbj6dmq-unliftio-core-0.1.1.0.drv’ failed + jailbreak = true; + }); + + vector-algorithms = overrideCabal super.vector-algorithms (drv: { + ## • Ambiguous type variable ‘mv0’ + doCheck = false; + }); + + wavefront = overrideCabal super.wavefront (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.8 && <4.11 + ## builder for ‘/nix/store/iy6ccxh4dvp6plalx4ww81qrnhxm7jgr-wavefront-0.7.1.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/iy6ccxh4dvp6plalx4ww81qrnhxm7jgr-wavefront-0.7.1.1.drv’ failed + jailbreak = true; + }); + + # Needed for (<>) in prelude + funcmp = super.funcmp_1_9; + + # https://github.com/haskell-hvr/deepseq-generics/pull/4 + deepseq-generics = doJailbreak super.deepseq-generics; + + # SMP compat + # https://github.com/vincenthz/hs-securemem/pull/12 + securemem = + let patch = pkgs.fetchpatch + { url = https://github.com/vincenthz/hs-securemem/commit/6168d90b00bfc6a559d3b9160732343644ef60fb.patch; + sha256 = "0pfjmq57kcvxq7mhljd40whg2g77vdlvjyycdqmxxzz1crb6pipf"; + }; + in appendPatch super.securemem patch; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b8839184c31f2..02286e7762aef 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 10.4 + # LTS Haskell 10.5 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -64,7 +64,7 @@ default-package-overrides: - adler32 ==0.1.1.0 - aern2-mp ==0.1.2.0 - aern2-real ==0.1.1.0 - - aeson ==1.2.3.0 + - aeson ==1.2.4.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.1.0.5 - aeson-compat ==0.3.7.1 @@ -256,8 +256,9 @@ default-package-overrides: - bencode ==0.6.0.0 - bento ==0.1.0 - between ==0.11.0.0 + - bhoogle ==0.1.2.5 - bibtex ==0.1.0.6 - - bifunctors ==5.5 + - bifunctors ==5.5.2 - bimap ==0.3.3 - bimap-server ==0.1.0.1 - binary-bits ==0.5 @@ -305,7 +306,7 @@ default-package-overrides: - blaze-markup ==0.8.2.0 - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - - bloodhound ==0.15.0.1 + - bloodhound ==0.15.0.2 - bloomfilter ==2.0.1.0 - blosum ==0.1.1.4 - bmp ==1.2.6.3 @@ -348,10 +349,10 @@ default-package-overrides: - bzlib-conduit ==0.2.1.5 - c2hs ==0.28.3 - Cabal ==2.0.1.1 - - cabal-doctest ==1.0.5 + - cabal-doctest ==1.0.6 - cabal-file-th ==0.2.4 - cabal-rpm ==0.12 - - cabal-toolkit ==0.0.4 + - cabal-toolkit ==0.0.5 - cache ==0.1.0.1 - cairo ==0.13.4.2 - calendar-recycling ==0.0 @@ -428,7 +429,7 @@ default-package-overrides: - combinatorial ==0.0 - comfort-graph ==0.0.2.1 - commutative ==0.0.1.4 - - comonad ==5.0.2 + - comonad ==5.0.3 - comonads-fd ==4.0 - comonad-transformers ==4.0 - compact ==0.1.0.1 @@ -439,19 +440,19 @@ default-package-overrides: - composable-associations-aeson ==0.1.0.0 - composition ==1.0.2.1 - composition-extra ==2.0.0 - - concise ==0.1.0.0 + - concise ==0.1.0.1 - concurrency ==1.2.3.0 - concurrent-extra ==0.7.0.11 - - concurrent-output ==1.10.2 + - concurrent-output ==1.10.3 - concurrent-split ==0.0.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - conduit ==1.2.13 - conduit-algorithms ==0.0.7.1 - conduit-combinators ==1.1.2 - - conduit-connection ==0.1.0.3 + - conduit-connection ==0.1.0.4 - conduit-extra ==1.2.3.2 - - conduit-iconv ==0.1.1.2 + - conduit-iconv ==0.1.1.3 - conduit-parse ==0.1.2.2 - conduit-throttle ==0.3.1.0 - ConfigFile ==1.1.4 @@ -508,7 +509,7 @@ default-package-overrides: - crypt-sha512 ==0 - csp ==1.3.1 - css-syntax ==0.0.5 - - css-text ==0.1.2.2 + - css-text ==0.1.3.0 - csv ==0.1.2 - csv-conduit ==0.6.7 - ctrie ==0.2 @@ -560,7 +561,7 @@ default-package-overrides: - data-textual ==0.3.0.2 - data-tree-print ==0.1.0.0 - dataurl ==0.1.0.0 - - DAV ==1.3.1 + - DAV ==1.3.2 - dawg-ord ==0.5.1.0 - dbcleaner ==0.1.3 - dbus ==0.10.15 @@ -581,7 +582,7 @@ default-package-overrides: - dhall-bash ==1.0.6 - dhall-json ==1.0.9 - dhall-nix ==1.0.9 - - dhall-text ==1.0.4 + - dhall-text ==1.0.5 - diagrams ==1.4 - diagrams-builder ==0.8.0.2 - diagrams-cairo ==1.4 @@ -607,7 +608,7 @@ default-package-overrides: - disk-free-space ==0.1.0.1 - disposable ==0.2.0.4 - distance ==0.1.0.0 - - distributed-closure ==0.3.4.0 + - distributed-closure ==0.3.5 - distributed-process ==0.7.3 - distributed-process-simplelocalnet ==0.2.4 - distributed-process-tests ==0.4.11 @@ -709,7 +710,7 @@ default-package-overrides: - eventstore ==0.15.0.2 - every ==0.0.1 - exact-combinatorics ==0.2.0.8 - - exact-pi ==0.4.1.2 + - exact-pi ==0.4.1.3 - exceptional ==0.3.0.0 - exception-mtl ==0.4.0.1 - exceptions ==0.8.3 @@ -731,7 +732,7 @@ default-package-overrides: - fasta ==0.10.4.2 - fast-builder ==0.0.1.0 - fast-digits ==0.2.1.0 - - fast-logger ==2.4.10 + - fast-logger ==2.4.11 - fast-math ==1.0.2 - fb ==1.1.1 - fclabels ==2.0.3.2 @@ -773,7 +774,7 @@ default-package-overrides: - focus ==0.1.5.2 - fold-debounce ==0.2.0.6 - fold-debounce-conduit ==0.1.0.5 - - foldl ==1.3.5 + - foldl ==1.3.7 - folds ==0.7.4 - follow-file ==0.0.2 - FontyFruity ==0.5.3.3 @@ -788,7 +789,7 @@ default-package-overrides: - Frames ==0.3.0.2 - free ==4.12.4 - freenect ==1.2.1 - - freer-simple ==1.0.0.0 + - freer-simple ==1.0.1.1 - freetype2 ==0.1.2 - free-vl ==0.1.4 - friday ==0.2.3.1 @@ -802,7 +803,7 @@ default-package-overrides: - funcmp ==1.8 - functor-classes-compat ==1 - fuzzcheck ==0.1.1 - - fuzzyset ==0.1.0.4 + - fuzzyset ==0.1.0.6 - gauge ==0.1.3 - gd ==3000.7.3 - gdax ==0.6.0.0 @@ -818,7 +819,7 @@ default-package-overrides: - generics-sop ==0.3.2.0 - generics-sop-lens ==0.1.2.1 - generic-xmlpickler ==0.1.0.5 - - geniplate-mirror ==0.7.5 + - geniplate-mirror ==0.7.6 - genvalidity ==0.4.0.4 - genvalidity-aeson ==0.1.0.0 - genvalidity-bytestring ==0.1.0.0 @@ -840,15 +841,15 @@ default-package-overrides: - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - ghc-events ==0.7.0 - - ghc-exactprint ==0.5.5.0 - - ghcid ==0.6.9 + - ghc-exactprint ==0.5.6.0 + - ghcid ==0.6.10 - ghcjs-base-stub ==0.1.0.4 - ghcjs-codemirror ==0.0.0.1 - ghcjs-dom ==0.9.2.0 - ghcjs-dom-jsaddle ==0.9.2.0 - ghcjs-perch ==0.3.3.2 - ghc-paths ==0.1.0.9 - - ghc-prof ==1.4.0.4 + - ghc-prof ==1.4.1 - ghc-syb-utils ==0.2.3.3 - ghc-tcplugins-extra ==0.2.2 - ghc-typelits-extra ==0.2.4 @@ -864,7 +865,7 @@ default-package-overrides: - giphy-api ==0.5.2.0 - git ==0.2.1 - github ==0.18 - - github-release ==1.1.2 + - github-release ==1.1.3 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 - github-webhook-handler-snap ==0.0.7 @@ -1027,12 +1028,12 @@ default-package-overrides: - hamlet ==1.2.0 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.5.1 + - hapistrano ==0.3.5.2 - happstack-hsp ==7.3.7.3 - happstack-jmacro ==7.0.12 - happstack-server ==7.5.0.1 - - happstack-server-tls ==7.1.6.4 - - happy ==1.19.8 + - happstack-server-tls ==7.1.6.5 + - happy ==1.19.9 - harp ==0.4.3 - hasbolt ==0.1.3.0 - hashable ==1.2.6.1 @@ -1094,7 +1095,7 @@ default-package-overrides: - heaps ==0.3.6 - heatshrink ==0.1.0.0 - hebrew-time ==0.1.1 - - hedgehog ==0.5.1 + - hedgehog ==0.5.2 - hedgehog-quickcheck ==0.1 - hedis ==0.9.12 - here ==1.2.12 @@ -1144,13 +1145,13 @@ default-package-overrides: - hosc ==0.16 - hostname ==1.0 - hostname-validate ==1.0.0 - - hourglass ==0.2.10 + - hourglass ==0.2.11 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.8.0.2 - hpack ==0.21.2 - hpc-coveralls ==1.0.10 - HPDF ==1.4.10 - - hpio ==0.9.0.3 + - hpio ==0.9.0.5 - hpp ==0.5.1 - hpqtypes ==1.5.1.1 - hprotoc ==2.4.6 @@ -1162,12 +1163,12 @@ default-package-overrides: - hsb2hs ==0.3.1 - hs-bibutils ==6.2.0.1 - hscolour ==1.24.2 - - hsdns ==1.7 + - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hse-cpp ==0.2 - hsemail ==2 - - HSet ==0.0.1 - hset ==2.2.0 + - HSet ==0.0.1 - hsexif ==0.6.1.5 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -1203,7 +1204,7 @@ default-package-overrides: - hstatsd ==0.1 - HStringTemplate ==0.8.6 - HSvm ==0.1.0.3.22 - - hsx2hs ==0.14.1.1 + - hsx2hs ==0.14.1.2 - hsx-jmacro ==7.3.8 - hsyslog ==5.0.1 - hsyslog-udp ==0.2.0 @@ -1216,15 +1217,15 @@ default-package-overrides: - htoml ==1.0.0.3 - HTTP ==4000.3.9 - http2 ==1.6.3 - - http-api-data ==0.3.7.1 - - http-client ==0.5.9 + - http-api-data ==0.3.7.2 + - http-client ==0.5.10 - http-client-openssl ==0.2.1.1 - - http-client-tls ==0.3.5.1 + - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - http-conduit ==2.2.4 - http-date ==0.0.6.1 - http-link-header ==1.0.3 - - http-media ==0.7.1.1 + - http-media ==0.7.1.2 - http-reverse-proxy ==0.4.5 - http-streams ==0.8.5.5 - http-types ==0.9.1 @@ -1274,7 +1275,7 @@ default-package-overrides: - IfElse ==0.85 - iff ==0.0.6 - ignore ==0.1.1.0 - - ihs ==0.1.0.1 + - ihs ==0.1.0.2 - ilist ==0.3.1.0 - imagesize-conduit ==1.1 - Imlib ==0.1.2 @@ -1286,7 +1287,7 @@ default-package-overrides: - indentation-parsec ==0.0.0.1 - indents ==0.4.0.1 - inflections ==0.4.0.1 - - influxdb ==1.2.2.2 + - influxdb ==1.2.2.3 - ini ==0.3.5 - inline-c ==0.6.0.5 - inline-c-cpp ==0.2.1.0 @@ -1300,8 +1301,8 @@ default-package-overrides: - intern ==0.9.1.4 - interpolate ==0.1.1 - interpolatedstring-perl6 ==1.0.0 - - interpolation ==0.1.0.2 - Interpolation ==0.3.0 + - interpolation ==0.1.0.2 - IntervalMap ==0.5.3.1 - intervals ==0.8.1 - intro ==0.3.1.0 @@ -1322,8 +1323,8 @@ default-package-overrides: - IPv6DB ==0.2.4 - ipython-kernel ==0.9.0.1 - irc ==0.6.1.0 - - irc-client ==1.0.1.0 - - irc-conduit ==0.2.2.4 + - irc-client ==1.0.1.1 + - irc-conduit ==0.2.2.5 - irc-ctcp ==0.1.3.0 - irc-dcc ==2.0.1 - islink ==0.1.0.0 @@ -1354,7 +1355,7 @@ default-package-overrides: - json-rpc-generic ==0.2.1.3 - json-schema ==0.7.4.1 - json-stream ==0.4.1.5 - - JuicyPixels ==3.2.9.3 + - JuicyPixels ==3.2.9.4 - JuicyPixels-extra ==0.2.2 - JuicyPixels-scale-dct ==0.1.1.2 - justified-containers ==0.2.0.1 @@ -1364,7 +1365,7 @@ default-package-overrides: - kanji ==3.0.2 - kansas-comet ==0.4 - katip ==0.5.2.0 - - katip-elasticsearch ==0.4.0.3 + - katip-elasticsearch ==0.4.0.4 - katydid ==0.1.1.0 - kawhi ==0.3.0 - kdt ==0.2.4 @@ -1386,7 +1387,7 @@ default-package-overrides: - language-haskell-extract ==0.2.4 - language-java ==0.2.8 - language-javascript ==0.6.0.10 - - language-puppet ==1.3.13 + - language-puppet ==1.3.14 - lapack-carray ==0.0 - lapack-ffi ==0.0 - lapack-ffi-tools ==0.0.0.1 @@ -1396,7 +1397,7 @@ default-package-overrides: - lattices ==1.7 - lazyio ==0.1.0.4 - lazysmallcheck ==0.6 - - lca ==0.3 + - lca ==0.3.1 - leancheck ==0.7.0 - leapseconds-announced ==2017.1.0.1 - lens ==4.15.4 @@ -1448,10 +1449,10 @@ default-package-overrides: - log-elasticsearch ==0.9.1.0 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - - logging-effect ==1.2.1 - - logging-effect-extra ==1.2.1 - - logging-effect-extra-file ==1.1.1 - - logging-effect-extra-handler ==1.1.1 + - logging-effect ==1.2.3 + - logging-effect-extra ==1.2.2 + - logging-effect-extra-file ==1.1.2 + - logging-effect-extra-handler ==1.1.2 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - logict ==0.6.0.2 @@ -1498,7 +1499,7 @@ default-package-overrides: - megaparsec ==6.3.0 - mega-sdist ==0.3.0.6 - memory ==0.14.11 - - MemoTrie ==0.6.8 + - MemoTrie ==0.6.9 - mercury-api ==0.1.0.1 - mersenne-random-pure64 ==0.2.2.0 - messagepack ==0.5.4 @@ -1520,7 +1521,7 @@ default-package-overrides: - midi ==0.2.2.1 - midi-music-box ==0.0.0.4 - mighty-metropolis ==1.2.0 - - milena ==0.5.2.0 + - milena ==0.5.2.1 - mime-mail ==0.4.14 - mime-mail-ses ==0.4.0.0 - mime-types ==0.1.0.7 @@ -1556,7 +1557,7 @@ default-package-overrides: - monadloc ==0.7.1 - monad-logger ==0.3.28.1 - monad-logger-json ==0.1.0.0 - - monad-logger-prefix ==0.1.6 + - monad-logger-prefix ==0.1.7 - monad-logger-syslog ==0.1.4.0 - monad-loops ==0.4.3 - monad-memo ==0.4.1 @@ -1578,7 +1579,7 @@ default-package-overrides: - monad-time ==0.2 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - - mongoDB ==2.3.0.1 + - mongoDB ==2.3.0.2 - monoidal-containers ==0.3.0.2 - monoid-extras ==0.4.2 - monoid-subclasses ==0.4.4 @@ -1599,7 +1600,7 @@ default-package-overrides: - murmur-hash ==0.1.0.9 - MusicBrainz ==0.3.1 - mustache ==2.3.0 - - mutable-containers ==0.3.3 + - mutable-containers ==0.3.4 - mwc-probability ==1.3.0 - mwc-random ==0.13.6.0 - mwc-random-accelerate ==0.1.0.0 @@ -1614,7 +1615,7 @@ default-package-overrides: - nano-erl ==0.1.0.1 - nanospec ==0.2.2 - naqsha ==0.2.0.1 - - nats ==1.1.1 + - nats ==1.1.2 - natural-sort ==0.1.2 - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 @@ -1630,7 +1631,7 @@ default-package-overrides: - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 - - network-carbon ==1.0.10 + - network-carbon ==1.0.11 - network-conduit-tls ==1.2.2 - network-house ==0.1.0.2 - network-info ==0.2.0.9 @@ -1684,7 +1685,7 @@ default-package-overrides: - once ==0.2 - one-liner ==0.9.2 - OneTuple ==0.2.1 - - online ==0.2.0 + - online ==0.2.1.0 - Only ==0.1 - oo-prototypes ==0.1.0.0 - opaleye ==0.6.0.0 @@ -1721,7 +1722,7 @@ default-package-overrides: - parallel ==3.2.1.1 - parallel-io ==0.3.3 - parseargs ==0.2.0.8 - - parsec ==3.1.11 + - parsec ==3.1.13.0 - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - parser-combinators ==0.4.0 @@ -1760,7 +1761,7 @@ default-package-overrides: - persistent-postgresql ==2.6.3 - persistent-refs ==0.4 - persistent-sqlite ==2.6.4 - - persistent-template ==2.5.3 + - persistent-template ==2.5.3.1 - pgp-wordlist ==0.1.0.2 - pg-transact ==0.1.0.1 - phantom-state ==0.2.1.2 @@ -1775,7 +1776,7 @@ default-package-overrides: - pipes-attoparsec ==0.5.1.5 - pipes-bytestring ==2.1.6 - pipes-category ==0.3.0.0 - - pipes-concurrency ==2.0.8 + - pipes-concurrency ==2.0.9 - pipes-csv ==1.4.3 - pipes-extras ==1.0.12 - pipes-fastx ==0.3.0.0 @@ -1842,7 +1843,7 @@ default-package-overrides: - primitive ==0.6.3.0 - printcess ==0.1.0.3 - probability ==0.2.5.1 - - process-extras ==0.7.3 + - process-extras ==0.7.4 - product-isomorphic ==0.0.3.1 - product-profunctors ==0.8.0.3 - profiterole ==0.1 @@ -1876,7 +1877,7 @@ default-package-overrides: - pure-io ==0.2.1 - pureMD5 ==2.1.3 - purescript-bridge ==0.11.1.2 - - pusher-http-haskell ==1.5.1.0 + - pusher-http-haskell ==1.5.1.2 - pwstore-fast ==2.4.4 - qchas ==1.0.1.0 - qm-interpolated-string ==0.2.1.0 @@ -1885,7 +1886,7 @@ default-package-overrides: - QuickCheck ==2.10.1 - quickcheck-arbitrary-adt ==0.2.0.0 - quickcheck-assertions ==0.3.0 - - quickcheck-classes ==0.3.1 + - quickcheck-classes ==0.3.2 - quickcheck-combinators ==0.0.2 - quickcheck-instances ==0.3.16.1 - quickcheck-io ==0.2.0 @@ -1979,7 +1980,7 @@ default-package-overrides: - rest-wai ==0.2.0.1 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - - retry ==0.7.5.1 + - retry ==0.7.6.0 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - riak ==1.1.2.3 @@ -2007,8 +2008,8 @@ default-package-overrides: - say ==0.1.0.0 - sbp ==2.3.6 - sbv ==7.4 - - SCalendar ==1.1.0 - scalendar ==1.2.0 + - SCalendar ==1.1.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -2029,11 +2030,11 @@ default-package-overrides: - selda-sqlite ==0.1.6.0 - semigroupoid-extras ==5 - semigroupoids ==5.2.1 - - semigroups ==0.18.3 + - semigroups ==0.18.4 - semiring-simple ==1.0.0.1 - semver ==0.3.3.1 - sendfile ==0.7.9 - - sensu-run ==0.4.0.3 + - sensu-run ==0.4.0.4 - seqalign ==0.2.0.4 - seqloc ==0.6.1.1 - serf ==0.1.1.0 @@ -2079,7 +2080,7 @@ default-package-overrides: - SHA ==1.6.4.2 - shake ==0.16 - shake-language-c ==0.11.0 - - shakespeare ==2.0.14.1 + - shakespeare ==2.0.15 - shell-conduit ==4.6.1 - shell-escape ==0.2.0 - shelly ==1.7.0.1 @@ -2092,7 +2093,7 @@ default-package-overrides: - simple ==0.11.2 - simple-log ==0.9.3 - simple-reflect ==0.3.2 - - simple-sendfile ==0.2.26 + - simple-sendfile ==0.2.27 - simple-session ==0.10.1.1 - simple-templates ==0.8.0.1 - singleton-bool ==0.1.2.0 @@ -2156,7 +2157,7 @@ default-package-overrides: - StateVar ==1.1.0.4 - stateWriter ==0.2.10 - statistics ==0.14.0.2 - - stm ==2.4.4.1 + - stm ==2.4.5.0 - stm-chans ==3.0.0.4 - stm-conduit ==3.0.0 - stm-containers ==0.2.16 @@ -2179,7 +2180,7 @@ default-package-overrides: - Stream ==0.4.7.2 - streaming ==0.2.0.0 - streaming-bytestring ==0.1.5 - - streaming-commons ==0.1.18 + - streaming-commons ==0.1.19 - streamly ==0.1.0 - streamproc ==1.6.2 - streams ==3.3 @@ -2211,7 +2212,7 @@ default-package-overrides: - svg-tree ==0.6.2.1 - swagger ==0.3.0 - swagger2 ==2.2 - - swagger-petstore ==0.0.1.7 + - swagger-petstore ==0.0.1.8 - swish ==0.9.1.10 - syb ==0.7 - syb-with-class ==0.6.1.8 @@ -2233,7 +2234,7 @@ default-package-overrides: - tar-conduit ==0.1.1 - tardis ==0.4.1.0 - tasty ==0.11.3 - - tasty-ant-xml ==1.1.2 + - tasty-ant-xml ==1.1.3 - tasty-auto ==0.2.0.0 - tasty-dejafu ==0.7.1.1 - tasty-discover ==4.1.3 @@ -2247,7 +2248,7 @@ default-package-overrides: - tasty-kat ==0.0.3 - tasty-program ==1.0.5 - tasty-quickcheck ==0.9.1 - - tasty-rerun ==1.1.9 + - tasty-rerun ==1.1.10 - tasty-silver ==3.1.11 - tasty-smallcheck ==0.8.1 - tasty-stats ==0.2.0.3 @@ -2282,7 +2283,7 @@ default-package-overrides: - text-generic-pretty ==1.2.1 - text-icu ==0.7.0.1 - text-latin1 ==0.3 - - text-ldap ==0.1.1.10 + - text-ldap ==0.1.1.11 - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 @@ -2301,7 +2302,7 @@ default-package-overrides: - these ==0.7.4 - th-expand-syns ==0.4.4.0 - th-extras ==0.0.0.4 - - th-lift ==0.7.7 + - th-lift ==0.7.8 - th-lift-instances ==0.1.11 - th-orphans ==0.13.5 - thread-hierarchy ==0.3.0.0 @@ -2385,7 +2386,7 @@ default-package-overrides: - type-level-kv-list ==1.1.0 - type-level-numbers ==0.1.1.1 - typelits-witnesses ==0.2.3.0 - - type-of-html ==1.3.2.1 + - type-of-html ==1.3.3.0 - type-operators ==0.1.0.4 - type-spec ==0.3.0.1 - typography-geometry ==1.0.0.1 @@ -2409,8 +2410,8 @@ default-package-overrides: - union-find ==0.2 - uniplate ==1.6.12 - uniq-deep ==1.1.0.0 - - unique ==0 - Unique ==0.4.7.2 + - unique ==0 - unit-constraint ==0.0.0 - units-parser ==0.1.1.2 - universe ==1.0 @@ -2465,7 +2466,7 @@ default-package-overrides: - vcswrapper ==0.1.6 - vector ==0.12.0.1 - vector-algorithms ==0.7.0.1 - - vector-binary-instances ==0.2.3.5 + - vector-binary-instances ==0.2.4 - vector-buffer ==0.4.1 - vector-builder ==0.3.4.1 - vector-fftw ==0.1.3.8 @@ -2504,7 +2505,7 @@ default-package-overrides: - wai-middleware-crowd ==0.1.4.2 - wai-middleware-metrics ==0.2.4 - wai-middleware-prometheus ==0.3.0 - - wai-middleware-rollbar ==0.8.2 + - wai-middleware-rollbar ==0.8.3 - wai-middleware-static ==0.8.1 - wai-middleware-throttle ==0.2.2.0 - wai-predicates ==0.10.0 @@ -2523,12 +2524,12 @@ default-package-overrides: - webdriver-angular ==0.1.11 - webpage ==0.0.5 - web-plugins ==0.2.9 - - web-routes ==0.27.13 + - web-routes ==0.27.14 - web-routes-boomerang ==0.28.4.2 - web-routes-happstack ==0.23.11 - web-routes-hsp ==0.24.6.1 - web-routes-th ==0.22.6.2 - - web-routes-wai ==0.24.3 + - web-routes-wai ==0.24.3.1 - webrtc-vad ==0.1.0.3 - websockets ==0.12.3.1 - websockets-rpc ==0.6.0 @@ -2542,7 +2543,7 @@ default-package-overrides: - Win32 ==2.5.4.1 - Win32-notify ==0.3.0.3 - wire-streams ==0.1.1.0 - - withdependencies ==0.2.4.1 + - withdependencies ==0.2.4.2 - witherable ==0.2 - with-location ==0.1.0 - witness ==0.4 @@ -2580,7 +2581,7 @@ default-package-overrides: - xeno ==0.3.2 - xenstore ==0.1.1 - xhtml ==3000.2.2 - - xls ==0.1.0 + - xls ==0.1.1 - xlsx ==0.6.0 - xlsx-tabular ==0.2.2 - xml ==1.3.14 @@ -2705,7 +2706,6 @@ extra-packages: - QuickCheck < 2 # required by test-framework-quickcheck and its users - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - - ShellCheck == 0.4.6 # required by multi-ghc-travis - split < 0.2 # newer versions don't work with GHC 6.12.3 - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x - transformers == 0.4.3.* # the latest version isn't supported by mtl yet @@ -2979,6 +2979,7 @@ dont-distribute-packages: 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-typescript: [ 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 ] affine-invariant-ensemble-mcmc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3042,6 +3043,7 @@ dont-distribute-packages: angle: [ i686-linux, x86_64-linux, x86_64-darwin ] Animas: [ i686-linux, x86_64-linux, x86_64-darwin ] animate-example: [ i686-linux, x86_64-linux, x86_64-darwin ] + animate: [ i686-linux, x86_64-linux, x86_64-darwin ] annah: [ i686-linux, x86_64-linux, x86_64-darwin ] anonymous-sums-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] anonymous-sums: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3138,6 +3140,7 @@ dont-distribute-packages: atomo: [ i686-linux, x86_64-linux, x86_64-darwin ] atp-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ats-format: [ i686-linux, x86_64-linux, x86_64-darwin ] + ats-pkg: [ i686-linux, x86_64-linux, x86_64-darwin ] attic-schedule: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoBencode: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoJson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3784,6 +3787,7 @@ dont-distribute-packages: conductive-base: [ i686-linux, x86_64-linux, x86_64-darwin ] conductive-hsc3: [ i686-linux, x86_64-linux, x86_64-darwin ] conductive-song: [ i686-linux, x86_64-linux, x86_64-darwin ] + conduit-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-lame: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-samplerate: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-find: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3947,6 +3951,7 @@ dont-distribute-packages: d3js: [ i686-linux, x86_64-linux, x86_64-darwin ] DAG-Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] dag: [ i686-linux, x86_64-linux, x86_64-darwin ] + damnpacket: [ i686-linux, x86_64-linux, x86_64-darwin ] Dangerous: [ i686-linux, x86_64-linux, x86_64-darwin ] dao: [ i686-linux, x86_64-linux, x86_64-darwin ] Dao: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4550,6 +4555,7 @@ dont-distribute-packages: fixed-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-storable-array: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-width: [ i686-linux, x86_64-linux, x86_64-darwin ] + fixer: [ i686-linux, x86_64-linux, x86_64-darwin ] fixfile: [ i686-linux, x86_64-linux, x86_64-darwin ] fixie: [ i686-linux, x86_64-linux, x86_64-darwin ] fizzbuzz-as-a-service: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4713,6 +4719,7 @@ dont-distribute-packages: general-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] GeneralTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] generators: [ i686-linux, x86_64-linux, x86_64-darwin ] + generic-accessors: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-church: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-enum: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4772,6 +4779,7 @@ dont-distribute-packages: ghc-exactprint: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-generic-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-justdoit: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-man-completion: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-mod: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4981,6 +4989,7 @@ dont-distribute-packages: gsl-random: [ i686-linux, x86_64-linux, x86_64-darwin ] gssapi-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] gssapi: [ i686-linux, x86_64-linux, x86_64-darwin ] + gstorable: [ i686-linux, x86_64-linux, x86_64-darwin ] gstreamer: [ i686-linux, x86_64-linux, x86_64-darwin ] GTALib: [ i686-linux, x86_64-linux, x86_64-darwin ] gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5141,6 +5150,7 @@ dont-distribute-packages: happybara-webkit-server: [ i686-linux, x86_64-linux, x86_64-darwin ] happybara-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] happybara: [ i686-linux, x86_64-linux, x86_64-darwin ] + HappyTree: [ i686-linux, x86_64-linux, x86_64-darwin ] hapstone: [ i686-linux, x86_64-linux, x86_64-darwin ] HaPy: [ i686-linux, x86_64-linux, x86_64-darwin ] haquery: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5577,6 +5587,7 @@ dont-distribute-packages: hocker: [ i686-linux, x86_64-linux, x86_64-darwin ] hodatime: [ i686-linux, x86_64-linux, x86_64-darwin ] HODE: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hoed: [ i686-linux, x86_64-linux, x86_64-darwin ] hofix-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] hog: [ i686-linux, x86_64-linux, x86_64-darwin ] hogg: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5624,6 +5635,7 @@ dont-distribute-packages: hp2any-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] hp2any-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] hpack-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpack-dhall: [ i686-linux, x86_64-linux, x86_64-darwin ] hpaco-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] hpaco: [ i686-linux, x86_64-linux, x86_64-darwin ] hpage: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5688,6 +5700,7 @@ dont-distribute-packages: hs-twitterarchiver: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-watchman: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs2ats: [ i686-linux, x86_64-linux, x86_64-darwin ] hs2bf: [ i686-linux, x86_64-linux, x86_64-darwin ] hs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] Hs2lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5747,6 +5760,7 @@ dont-distribute-packages: HSlippyMap: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogger-reader: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogstash: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsluv-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmagick: [ i686-linux, x86_64-linux, x86_64-darwin ] HSmarty: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsmtlib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5817,6 +5831,7 @@ dont-distribute-packages: htestu: [ i686-linux, x86_64-linux, x86_64-darwin ] HTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] htlset: [ i686-linux, x86_64-linux, x86_64-darwin ] + html-entities: [ i686-linux, x86_64-linux, x86_64-darwin ] html-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] html-tokenizer: [ i686-linux, x86_64-linux, x86_64-darwin ] hts: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6141,6 +6156,7 @@ dont-distribute-packages: jsontsv: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonxlsx: [ i686-linux, x86_64-linux, x86_64-darwin ] jspath: [ i686-linux, x86_64-linux, x86_64-darwin ] + judge: [ i686-linux, x86_64-linux, x86_64-darwin ] judy: [ i686-linux, x86_64-linux, x86_64-darwin ] juicy-gcode: [ i686-linux, x86_64-linux, x86_64-darwin ] JuicyPixels-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6918,6 +6934,7 @@ dont-distribute-packages: netease-fm: [ i686-linux, x86_64-linux, x86_64-darwin ] netlines: [ i686-linux, x86_64-linux, x86_64-darwin ] netrc: [ i686-linux, x86_64-linux, x86_64-darwin ] + netrium: [ i686-linux, x86_64-linux, x86_64-darwin ] NetSNMP: [ i686-linux, x86_64-linux, x86_64-darwin ] netspec: [ i686-linux, x86_64-linux, x86_64-darwin ] netstring-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6999,6 +7016,7 @@ dont-distribute-packages: noodle: [ i686-linux, x86_64-linux, x86_64-darwin ] NoSlow: [ i686-linux, x86_64-linux, x86_64-darwin ] not-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + not-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] notcpp: [ i686-linux, x86_64-linux, x86_64-darwin ] notmuch-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] notmuch-web: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7221,6 +7239,7 @@ dont-distribute-packages: peg: [ i686-linux, x86_64-linux, x86_64-darwin ] peggy: [ i686-linux, x86_64-linux, x86_64-darwin ] pell: [ i686-linux, x86_64-linux, x86_64-darwin ] + pencil: [ i686-linux, x86_64-linux, x86_64-darwin ] penny-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] penny-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] penny: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7247,6 +7266,7 @@ dont-distribute-packages: persistent-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-relational-record: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-test: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] persona-idp: [ i686-linux, x86_64-linux, x86_64-darwin ] persona: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7327,6 +7347,7 @@ dont-distribute-packages: plivo: [ i686-linux, x86_64-linux, x86_64-darwin ] plocketed: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] + Plot-ho-matic: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-light: [ i686-linux, x86_64-linux, x86_64-darwin ] ploton: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7404,6 +7425,7 @@ dont-distribute-packages: potoki-core: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki: [ i686-linux, x86_64-linux, x86_64-darwin ] powerpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + powerqueue-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] PPrinter: [ i686-linux, x86_64-linux, x86_64-darwin ] pqc: [ i686-linux, x86_64-linux, x86_64-darwin ] pqueue-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7622,6 +7644,7 @@ dont-distribute-packages: rasa: [ i686-linux, x86_64-linux, x86_64-darwin ] rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] + rattletrap: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ] rawr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7972,6 +7995,7 @@ dont-distribute-packages: semiring-num: [ i686-linux, x86_64-linux, x86_64-darwin ] semiring: [ i686-linux, x86_64-linux, x86_64-darwin ] semver-range: [ i686-linux, x86_64-linux, x86_64-darwin ] + sendgrid-v3: [ i686-linux, x86_64-linux, x86_64-darwin ] sensei: [ i686-linux, x86_64-linux, x86_64-darwin ] sensenet: [ i686-linux, x86_64-linux, x86_64-darwin ] sentence-jp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8015,6 +8039,7 @@ dont-distribute-packages: servant-pushbullet-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-py: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-router: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-ruby: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8050,6 +8075,7 @@ dont-distribute-packages: shadowsocks: [ i686-linux, x86_64-linux, x86_64-darwin ] shady-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] shady-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] + shake-ats: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-cabal-build: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-minify: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8111,6 +8137,7 @@ dont-distribute-packages: simple-sql-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-tabular: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-tar: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-vec3: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleargs: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleGL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8276,6 +8303,7 @@ dont-distribute-packages: sparsebit: [ i686-linux, x86_64-linux, x86_64-darwin ] sparsecheck: [ i686-linux, x86_64-linux, x86_64-darwin ] spata: [ i686-linux, x86_64-linux, x86_64-darwin ] + spatial-math: [ i686-linux, x86_64-linux, x86_64-darwin ] special-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] specialize-th: [ i686-linux, x86_64-linux, x86_64-darwin ] spelling-suggest: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8409,6 +8437,7 @@ dont-distribute-packages: strelka: [ i686-linux, x86_64-linux, x86_64-darwin ] StrictBench: [ i686-linux, x86_64-linux, x86_64-darwin ] strictly: [ i686-linux, x86_64-linux, x86_64-darwin ] + string-isos: [ i686-linux, x86_64-linux, x86_64-darwin ] string-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] stringlike: [ i686-linux, x86_64-linux, x86_64-darwin ] stringprep: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8798,6 +8827,7 @@ dont-distribute-packages: twhs: [ i686-linux, x86_64-linux, x86_64-darwin ] twidge: [ i686-linux, x86_64-linux, x86_64-darwin ] twilight-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] + twilio: [ i686-linux, x86_64-linux, x86_64-darwin ] twill: [ i686-linux, x86_64-linux, x86_64-darwin ] twiml: [ i686-linux, x86_64-linux, x86_64-darwin ] twine: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9148,6 +9178,7 @@ dont-distribute-packages: ws: [ i686-linux, x86_64-linux, x86_64-darwin ] wsdl: [ i686-linux, x86_64-linux, x86_64-darwin ] wsedit: [ i686-linux, x86_64-linux, x86_64-darwin ] + wsjtx-udp: [ i686-linux, x86_64-linux, x86_64-darwin ] wtk-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] wtk: [ i686-linux, x86_64-linux, x86_64-darwin ] wumpus-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2320d6a8752a8..edec2724d84d5 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -258,7 +258,7 @@ self: super: builtins.intersectAttrs super { } ); - llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_5; }; + llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm; }; # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index eb66a6f892236..14a8a628b58c2 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -72,8 +72,7 @@ assert enableSplitObjs == null; let inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast - concatStringsSep enableFeature optionalAttrs toUpper - filter makeLibraryPath; + concatStringsSep enableFeature optionalAttrs toUpper; isGhcjs = ghc.isGhcjs or false; isHaLVM = ghc.isHaLVM or false; @@ -384,7 +383,7 @@ stdenv.mkDerivation ({ env = stdenv.mkDerivation { name = "interactive-${pname}-${version}-environment"; buildInputs = systemBuildInputs; - nativeBuildInputs = [ ghcEnv ]; + nativeBuildInputs = [ ghcEnv ] ++ nativeBuildInputs; LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; shellHook = '' @@ -392,9 +391,6 @@ stdenv.mkDerivation ({ export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg" # TODO: is this still valid? export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html" - export LD_LIBRARY_PATH="''${LD_LIBRARY_PATH:+''${LD_LIBRARY_PATH}:}${ - makeLibraryPath (filter (x: !isNull x) systemBuildInputs) - }" ${if isHaLVM then ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/HaLVM-${ghc.version}"'' else ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"''} diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 796cc5262dc2b..773664efb4289 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -543,9 +543,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ANum"; - version = "0.1.1.0"; - sha256 = "0ilgz1akz66cwwvxd8dkz2fq9gyplc4m206jpmp380ys5n37b4q9"; + version = "0.2.0.2"; + sha256 = "06mvkp9b0hxlp1w2yp7bb6340l88mzs15azx7nma401icqdhvbpn"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; homepage = "https://github.com/DanBurton/ANum#readme"; description = "Num instance for Applicatives provided via the ANum newtype"; license = stdenv.lib.licenses.bsd3; @@ -753,8 +754,8 @@ self: { pname = "Agda"; version = "2.5.3"; sha256 = "0r80vw7vnvbgq47y50v050malv7zvv2p2kg6f47i04r0b2ix855a"; - revision = "3"; - editedCabalFile = "1hd1viy4wj7fyskjmmf5hqziyvk5qxjr0zcnbp5zdyacng0yyafi"; + revision = "5"; + editedCabalFile = "0cly9p549phqv86dlqacxrs2w50y5jmsw21657gpn84ryz3cmjbs"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -1869,8 +1870,8 @@ self: { }: mkDerivation { pname = "Blogdown"; - version = "0.2.3"; - sha256 = "0xdlcx82nfm74n88fghbg5f6fnjvrajpsz52hrc4bl5afxx63bpx"; + version = "0.2.4"; + sha256 = "04ll74z2yqb99jydz9bw4p602hvpmk03sgix8rzwg0qb38lwvjvm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -3533,36 +3534,6 @@ self: { }: mkDerivation { pname = "DAV"; - version = "1.3.1"; - sha256 = "02f03grgwsazvlkyn743k6hjck9s7brbcgbzvyxv9gwbiyjzm02w"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring case-insensitive containers data-default exceptions - http-client http-client-tls http-types lens mtl transformers - transformers-base transformers-compat utf8-string xml-conduit - xml-hamlet - ]; - executableHaskellDepends = [ - base bytestring case-insensitive containers data-default exceptions - haskeline http-client http-client-tls http-types lens mtl network - network-uri optparse-applicative transformers transformers-base - transformers-compat utf8-string xml-conduit xml-hamlet - ]; - homepage = "http://floss.scru.org/hDAV"; - description = "RFC 4918 WebDAV support"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "DAV_1_3_2" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , data-default, exceptions, haskeline, http-client, http-client-tls - , http-types, lens, mtl, network, network-uri, optparse-applicative - , transformers, transformers-base, transformers-compat, utf8-string - , xml-conduit, xml-hamlet - }: - mkDerivation { - pname = "DAV"; version = "1.3.2"; sha256 = "0sai0b7bxwif5czmmdik5dx318drx18inid87wfrxckrflsi8cv1"; isLibrary = true; @@ -3582,7 +3553,6 @@ self: { homepage = "http://floss.scru.org/hDAV"; description = "RFC 4918 WebDAV support"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DBlimited" = callPackage @@ -9180,6 +9150,7 @@ self: { homepage = "https://github.com/MarisaKirisame/HappyTree#readme"; description = "Type Safe and End to End Decision Tree"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HarmTrace" = callPackage @@ -9763,6 +9734,7 @@ self: { homepage = "https://github.com/MaartenFaddegon/Hoed"; description = "Lightweight algorithmic debugging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Hoed_0_5_0" = callPackage @@ -10408,6 +10380,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "IPv6DB_0_2_5" = 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.5"; + sha256 = "0n8998fkdp6p1gr5j7kg0xfkh88cxmqiwxzh75q0xmkasphx4yfq"; + 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; + }) {}; + "IcoGrid" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -10805,23 +10807,6 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.9.3"; - sha256 = "14s57fgf6kd5n5al2kcvk1aaxbq1ph0r5h8blflrjkx83yl6r8yn"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq mtl primitive - transformers vector zlib - ]; - homepage = "https://github.com/Twinside/Juicy.Pixels"; - description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "JuicyPixels_3_2_9_4" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl - , primitive, transformers, vector, zlib - }: - mkDerivation { - pname = "JuicyPixels"; version = "3.2.9.4"; sha256 = "1mlj3zcr3c49mjv0sddsfdzvzv3m0cbv56fbrkarygs5dxyh8dgz"; libraryHaskellDepends = [ @@ -10831,7 +10816,6 @@ self: { homepage = "https://github.com/Twinside/Juicy.Pixels"; description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-canvas" = callPackage @@ -10864,6 +10848,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels-extra_0_3_0" = callPackage + ({ mkDerivation, base, criterion, hspec, JuicyPixels }: + mkDerivation { + pname = "JuicyPixels-extra"; + version = "0.3.0"; + sha256 = "08hf3dklz3zaczbffq11z1yjk3hqf53rnz3g9n989ndw8ybkm865"; + 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 { @@ -11537,8 +11537,10 @@ self: { ({ mkDerivation, base, hmatrix, vector }: mkDerivation { pname = "Learning"; - version = "0.0.0"; - sha256 = "18fh7gbpb4pm3cfsz3sxynippg6khf9cj4ijbk6q0xa107czy9w6"; + version = "0.0.1"; + sha256 = "10sdnhi3pr3x3fjj90nwz1lij64wjxss805xcskqqad2j4lygwxz"; + revision = "1"; + editedCabalFile = "1z5ka7gjkv0ir6f011rigzndsjrh05i9zryn4m7855dsk3bxysab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hmatrix vector ]; @@ -12278,21 +12280,6 @@ self: { ({ mkDerivation, base, newtype-generics }: mkDerivation { pname = "MemoTrie"; - version = "0.6.8"; - sha256 = "194x8a1x8ch5xwpxaagrmpsjca92x1zjiq6dlqdgckyr49blknaz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base newtype-generics ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/conal/MemoTrie"; - description = "Trie-based memo functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "MemoTrie_0_6_9" = callPackage - ({ mkDerivation, base, newtype-generics }: - mkDerivation { - pname = "MemoTrie"; version = "0.6.9"; sha256 = "157p0pi6rrq74a35mq6zkkycv4ah7xhkbrcmnkb9xf7pznw4aq0x"; isLibrary = true; @@ -12302,7 +12289,6 @@ self: { homepage = "https://github.com/conal/MemoTrie"; description = "Trie-based memo functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MetaHDBC" = callPackage @@ -13073,6 +13059,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Naperian" = callPackage + ({ mkDerivation, base, containers, ghc-prim, vector }: + mkDerivation { + pname = "Naperian"; + version = "0.1.0.1"; + sha256 = "0h8kijw9y0p7bpy6qr1334xzbkcici3jrnk16w0cm4mxykrqjhwc"; + libraryHaskellDepends = [ base containers ghc-prim vector ]; + homepage = "https://github.com/idontgetoutmuch/Naperian"; + description = "Naperian Functors for APL-like programming"; + license = "unknown"; + }) {}; + "NaturalLanguageAlphabets" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, cereal , containers, criterion, deepseq, file-embed, hashtables @@ -14669,6 +14667,7 @@ self: { executableHaskellDepends = [ base containers generic-accessors ]; description = "Real-time line plotter for generic data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PlslTools" = callPackage @@ -19600,22 +19599,24 @@ self: { }) {}; "XSaiga" = callPackage - ({ mkDerivation, base, cgi, containers, hsparql, network, pretty - , rdf4h, text + ({ mkDerivation, base, bifunctors, bytestring, cgi, containers + , hsparql, mtl, network, pretty, rdf4h, text }: mkDerivation { pname = "XSaiga"; - version = "1.5.0.0"; - sha256 = "0v4f1z8xhwyiq5y2p8dxdxmdg4y2ik02zmamjff5mb7d22bqwpir"; + version = "1.6.0.0"; + sha256 = "1kc48pdqhxiqmmp7fhlidx5lqzr57b34d6sln1hxpvkl862sfmr5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers hsparql network pretty rdf4h text + base bifunctors bytestring cgi containers hsparql mtl network + pretty rdf4h text ]; executableHaskellDepends = [ - base cgi containers hsparql network pretty rdf4h text + base bifunctors bytestring cgi containers hsparql mtl network + pretty rdf4h text ]; - homepage = "http://hafiz.myweb.cs.uwindsor.ca/proHome.html"; + homepage = "http://speechweb2.cs.uwindsor.ca/solarman4/demo_sparql.html"; description = "An implementation of a polynomial-time top-down parser suitable for NLP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -21789,39 +21790,6 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.2.3.0"; - sha256 = "1gwwqpbj6j93nlm6rvhdmvs0sq8rn17cwpyw7wdphanwjn9cdkda"; - libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq dlist - ghc-prim hashable scientific tagged template-haskell text - th-abstraction time time-locale-compat unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - attoparsec base base-compat base-orphans base16-bytestring - bytestring containers directory dlist filepath generic-deriving - ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck - quickcheck-instances scientific tagged template-haskell - test-framework test-framework-hunit test-framework-quickcheck2 text - time time-locale-compat unordered-containers uuid-types vector - ]; - homepage = "https://github.com/bos/aeson"; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson_1_2_4_0" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, base-orphans - , base16-bytestring, bytestring, containers, deepseq, directory - , dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, HUnit, integer-logarithms, QuickCheck - , quickcheck-instances, scientific, tagged, template-haskell - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, th-abstraction, time, time-locale-compat - , unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "aeson"; version = "1.2.4.0"; sha256 = "16zwpd07cmhs58wwsqbhxy3b58gqw8w5nr7nf6lwi4nvznjdn09l"; libraryHaskellDepends = [ @@ -21841,7 +21809,6 @@ self: { homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-applicative" = callPackage @@ -22203,8 +22170,8 @@ self: { ({ mkDerivation, aeson, base, hspec, lens, lens-aeson, text }: mkDerivation { pname = "aeson-picker"; - version = "0.1.0.0"; - sha256 = "1976cf67y0077gd1s13vrfws5w5mcak94dc6ygnl1pir6ysanaf7"; + version = "0.1.0.1"; + sha256 = "080grn544k035kbinrimar2d2vx6h59dqjhl7irll708dvpfphcv"; libraryHaskellDepends = [ aeson base lens lens-aeson text ]; testHaskellDepends = [ base hspec text ]; homepage = "https://github.com/ozzzzz/aeson-picker#readme"; @@ -22302,8 +22269,8 @@ self: { }: mkDerivation { pname = "aeson-quick"; - version = "0.1.1.2"; - sha256 = "0b1pp0hl543pmjkhmcq112xxivd8njnfpgklayllyrxdrbrafrp6"; + version = "0.1.2.0"; + sha256 = "18a5gwfyx382dxlhr4gch8yd39kgiamp2fpxsvvgi7bfyc55pq1h"; libraryHaskellDepends = [ aeson attoparsec base deepseq text unordered-containers vector ]; @@ -22472,6 +22439,7 @@ self: { homepage = "https://github.com/codedownio/aeson-typescript#readme"; description = "Generate TypeScript definition files from your ADTs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-utils" = callPackage @@ -24489,8 +24457,8 @@ self: { pname = "amazonka-core"; version = "1.5.0"; sha256 = "173mdmk3p9jqnskjf5g9r1kr568plrmshb6p17cq11n1wnngkxnk"; - revision = "1"; - editedCabalFile = "0w04b2cpshrv1r8nkw70y0n70wshzmnl0lp1khpj8qzzj1zxl1i2"; + revision = "2"; + editedCabalFile = "1y1ian4wimsbng4c3ix8jd3pn3b0xhydzwv87blck4sgl41w83vl"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit conduit-extra cryptonite deepseq exceptions hashable @@ -24994,6 +24962,27 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "amazonka-iam-policy" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bytestring, doctest, hspec, profunctors, scientific, text, time + }: + mkDerivation { + pname = "amazonka-iam-policy"; + version = "0.0.1"; + sha256 = "1mjc5ym604n9bi9fl7b0581i5z7vy12ri99lz3imz1k3dhr6xwga"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring profunctors scientific text + time + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring doctest hspec + ]; + homepage = "https://github.com/brendanhay/amazonka-iam-policy"; + description = "Amazon IAM Policy Document DSL and Combinators"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "amazonka-importexport" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers @@ -26380,8 +26369,8 @@ self: { }: mkDerivation { pname = "animate"; - version = "0.4.0"; - sha256 = "1mzjvnr1q8lj380ijhqpnqpbqfz34bcv4frg1phsr478j55x17v4"; + version = "0.6.0"; + sha256 = "14fbxn3v4l5z6krqsycpg9ylx91y1xwzwqcxpqy5ihjba2g2r23a"; libraryHaskellDepends = [ aeson base bytestring containers text vector ]; @@ -26389,6 +26378,7 @@ self: { homepage = "https://github.com/jxv/animate#readme"; description = "Animation for sprites"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "animate-example" = callPackage @@ -26397,8 +26387,8 @@ self: { }: mkDerivation { pname = "animate-example"; - version = "0.0.0"; - sha256 = "14i5jav4p7hwj8d7z611mzhdwqmxsikrs56kn10lxww6m9i4fvf5"; + version = "0.2.0"; + sha256 = "07jqlqjdza4jxjc4hic2v0gh1n3jcvz1dnsm54m6y68k1ww68vrz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -28975,6 +28965,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async_2_2_1" = callPackage + ({ mkDerivation, base, hashable, HUnit, stm, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "async"; + version = "2.2.1"; + sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hashable stm ]; + executableHaskellDepends = [ base stm ]; + testHaskellDepends = [ + base HUnit stm test-framework test-framework-hunit + ]; + homepage = "https://github.com/simonmar/async"; + description = "Run IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-ajax" = callPackage ({ mkDerivation, async, base, ghcjs-ajax, text }: mkDerivation { @@ -29148,6 +29159,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-timer_0_1_4_1" = callPackage + ({ mkDerivation, base, containers, criterion, HUnit, lifted-async + , lifted-base, monad-control, safe-exceptions, test-framework + , test-framework-hunit, transformers-base + }: + mkDerivation { + pname = "async-timer"; + version = "0.1.4.1"; + sha256 = "1653hcx4a265drbgp0js9bhg3zfaspqxkx12f4v22vrfg64lvan2"; + libraryHaskellDepends = [ + base lifted-async lifted-base monad-control safe-exceptions + transformers-base + ]; + testHaskellDepends = [ + base containers criterion HUnit lifted-async test-framework + test-framework-hunit + ]; + homepage = "https://github.com/mtesseract/async-timer#readme"; + description = "Provides API for timer based execution of IO actions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "asynchronous-exceptions" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -29401,10 +29435,10 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "atomic-modify"; - version = "0.1.0.0"; - sha256 = "138nm3mgrr8yk4dlk4zlrxzrqp250wxl0sj3qbb3n1vyx5mhw02y"; + version = "0.1.0.1"; + sha256 = "0kkfbm7jkarzj42ja7093i1j1h4klg362pfz1cvldvdhzjgs009r"; libraryHaskellDepends = [ base stm ]; - homepage = "https://github.com/chris-martin/haskell-libraries"; + homepage = "https://github.com/chris-martin/atomic-modify"; description = "A typeclass for mutable references that have an atomic modify operation"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -29533,71 +29567,87 @@ self: { }) {}; "ats-format" = callPackage - ({ mkDerivation, alex, ansi-wl-pprint, base, Cabal, cli-setup - , directory, file-embed, happy, htoml-megaparsec, language-ats - , optparse-applicative, process, text, unordered-containers + ({ mkDerivation, ansi-wl-pprint, base, Cabal, cli-setup, directory + , file-embed, htoml-megaparsec, language-ats, optparse-applicative + , process, text, unordered-containers }: mkDerivation { pname = "ats-format"; - version = "0.2.0.9"; - sha256 = "07vbqwdlhnbqman07yh53s3fsdvpvphbj6s5cr9cr7pb6l3s3m13"; - isLibrary = true; + version = "0.2.0.17"; + sha256 = "13bxd28pyxyna8vv3vg8d29wmyi6iv296jqbcjh0p12jicxgf4i8"; + isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cli-setup ]; - libraryHaskellDepends = [ + executableHaskellDepends = [ ansi-wl-pprint base directory file-embed htoml-megaparsec language-ats optparse-applicative process text unordered-containers ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base ]; description = "A source-code formatter for ATS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ats-pkg" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Cabal - , cli-setup, composition-prelude, dhall, directory, filemanip - , http-client, http-client-tls, lens, optparse-applicative - , parallel-io, process, shake, shake-ats, shake-ext, tar, temporary - , text, unix, zlib + ({ mkDerivation, ansi-wl-pprint, ats-setup, base, binary + , bytestring, bzlib, Cabal, cli-setup, composition-prelude + , containers, dependency, dhall, directory, file-embed, http-client + , http-client-tls, lens, lzma, optparse-applicative, parallel-io + , process, shake, shake-ats, shake-ext, tar, temporary, text, unix + , zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "2.1.0.8"; - sha256 = "05ipwj3ihds2q8amvxxj02jzqpbmyjvd55a69z7bmx9vmz8j3pal"; + version = "2.4.0.0"; + sha256 = "1dhspgnyds4r08jqnabaal12xv6vvrk7mkgwhiwl4z0mb6zi0kry"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ - ansi-wl-pprint base binary bytestring composition-prelude dhall - directory filemanip http-client http-client-tls lens + ansi-wl-pprint ats-setup base binary bytestring bzlib + composition-prelude containers dependency dhall directory + file-embed http-client http-client-tls lens lzma optparse-applicative parallel-io process shake shake-ats shake-ext - tar temporary text unix zlib + tar temporary text unix zip-archive zlib ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/atspkg#readme"; - description = "Package manager for ATS"; + description = "A build tool for ATS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ats-setup" = callPackage - ({ mkDerivation, base, Cabal, directory, http-client - , http-client-tls, parallel-io, tar, zlib + ({ mkDerivation, base, bytestring, Cabal, dependency, directory + , filemanip, http-client, http-client-tls, parallel-io, process + , tar, unix, zlib }: mkDerivation { pname = "ats-setup"; - version = "0.2.0.0"; - sha256 = "1jkavd5dvsk6nbkik9xcdnlp3ry6jcmvkdk0lhm94f53cwz23xi5"; + version = "0.3.0.2"; + sha256 = "1fxk1602kh4i2dgfdjalnwfp37w8r775vd21431pkwf5xcf9ax0g"; libraryHaskellDepends = [ - base Cabal directory http-client http-client-tls parallel-io tar - zlib + base bytestring Cabal dependency directory filemanip http-client + http-client-tls parallel-io process tar unix zlib ]; description = "ATS scripts for Cabal builds"; license = stdenv.lib.licenses.bsd3; }) {}; + "ats-storable" = callPackage + ({ mkDerivation, base, bytestring, composition-prelude, text }: + mkDerivation { + pname = "ats-storable"; + version = "0.2.1.0"; + sha256 = "1d374jkiifyn6hqr584waqhk4kirqibycs0fszf1v21dkk14jyvx"; + libraryHaskellDepends = [ + base bytestring composition-prelude text + ]; + homepage = "https://github.com//ats-generic#readme"; + description = "Marshal ATS types into Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "attempt" = callPackage ({ mkDerivation, base, failure }: mkDerivation { @@ -30564,14 +30614,14 @@ self: { "avro" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary , bytestring, containers, data-binary-ieee754, entropy, extra, fail - , hashable, hspec, mtl, pure-zlib, QuickCheck, scientific - , semigroups, tagged, template-haskell, text, unordered-containers - , vector + , hashable, hspec, lens, lens-aeson, mtl, pure-zlib, QuickCheck + , scientific, semigroups, tagged, template-haskell, text + , transformers, unordered-containers, vector }: mkDerivation { pname = "avro"; - version = "0.2.0.0"; - sha256 = "1bs2fpka2pz58hj1x8pv27vm2sdap7rp83fasali228iigvlp9cc"; + version = "0.2.1.0"; + sha256 = "07gqi33aadb9c94b19z1166ayyi0s95ykda77l53vc2al43sa3bl"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific @@ -30579,9 +30629,9 @@ self: { ]; testHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers - entropy extra fail hashable hspec mtl pure-zlib QuickCheck - scientific semigroups tagged template-haskell text - unordered-containers vector + entropy extra fail hashable hspec lens lens-aeson mtl pure-zlib + QuickCheck scientific semigroups tagged template-haskell text + transformers unordered-containers vector ]; homepage = "https://github.com/haskell-works/hw-haskell-avro.git"; description = "Avro serialization support for Haskell"; @@ -30701,6 +30751,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aws_0_19" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , base64-bytestring, blaze-builder, byteable, bytestring + , case-insensitive, cereal, conduit, conduit-combinators + , conduit-extra, containers, cryptonite, data-default, directory + , errors, filepath, http-client, http-client-tls, http-conduit + , http-types, lifted-base, memory, monad-control, mtl, network + , old-locale, QuickCheck, quickcheck-instances, resourcet, safe + , scientific, tagged, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, transformers-base, unordered-containers + , utf8-string, vector, xml-conduit + }: + mkDerivation { + pname = "aws"; + version = "0.19"; + sha256 = "0ykpnm2kyhjf1rf5ldhv0c7zy3zq7jgqmb6xwywk8b2s80ai4fxl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring base64-bytestring + blaze-builder byteable bytestring case-insensitive cereal conduit + conduit-extra containers cryptonite data-default directory filepath + http-conduit http-types lifted-base memory monad-control mtl + network old-locale resourcet safe scientific tagged text time + transformers unordered-containers utf8-string vector xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring conduit-combinators errors http-client + http-client-tls http-types lifted-base monad-control mtl QuickCheck + quickcheck-instances resourcet tagged tasty tasty-hunit + tasty-quickcheck text time transformers transformers-base + ]; + homepage = "http://github.com/aristidb/aws"; + description = "Amazon Web Services (AWS) for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aws-cloudfront-signer" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring , bytestring, crypto-pubkey-types, RSA, time @@ -31485,6 +31573,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "backprop_0_1_2_0" = callPackage + ({ mkDerivation, base, bifunctors, criterion, deepseq, directory + , hmatrix, lens, microlens, mnist-idx, mwc-random, primitive + , reflection, time, transformers, type-combinators, vector + }: + mkDerivation { + pname = "backprop"; + version = "0.1.2.0"; + sha256 = "1f4q1mj0q9721i85fccl8wpi1mkcr8m1r8q67wsg2s7490zdnjvv"; + libraryHaskellDepends = [ + base deepseq microlens primitive reflection transformers + type-combinators vector + ]; + benchmarkHaskellDepends = [ + base bifunctors criterion deepseq directory hmatrix lens mnist-idx + mwc-random time transformers vector + ]; + homepage = "https://github.com/mstksg/backprop#readme"; + description = "Heterogeneous automatic differentation (backpropagation)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "backtracking-exceptions" = callPackage ({ mkDerivation, base, either, free, kan-extensions, mtl , semigroupoids, semigroups, transformers @@ -32149,6 +32260,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base64-bytestring-type" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , binary, bytestring, cereal, deepseq, hashable, QuickCheck, tasty + , tasty-quickcheck, text + }: + mkDerivation { + pname = "base64-bytestring-type"; + version = "1"; + sha256 = "0h74c0qhf4n0pamrl29ha5hgf940bay0dhl8rifaw4l03z8rn0bl"; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring binary bytestring cereal + deepseq hashable QuickCheck text + ]; + testHaskellDepends = [ + aeson base binary bytestring cereal tasty tasty-quickcheck + ]; + homepage = "https://github.com/futurice/haskell-base64-bytestring-type#readme"; + description = "A newtype around ByteString, for base64 encoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "base64-conduit" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, conduit , hspec, QuickCheck, transformers @@ -32548,17 +32680,17 @@ self: { , codec-rpm, cond, conduit, conduit-combinators, conduit-extra , containers, content-store, cpio-conduit, cryptonite, directory , esqueleto, exceptions, filepath, gi-gio, gi-glib, gi-ostree - , gitrev, hspec, http-conduit, HUnit, memory, monad-control - , monad-logger, monad-loops, mtl, network-uri, ostree, parsec - , parsec-numbers, persistent, persistent-sqlite + , gitrev, hspec, http-conduit, HUnit, listsafe, memory + , monad-control, monad-logger, monad-loops, mtl, network-uri + , ostree, parsec, parsec-numbers, persistent, persistent-sqlite , persistent-template, process, regex-pcre, resourcet, split, tar , tar-conduit, temporary, text, time, unix, unordered-containers , xml-conduit }: mkDerivation { pname = "bdcs"; - version = "0.1.1"; - sha256 = "1sxksvn852glnq181cj8y2pw2gkfg7afvhxx4rshvkxb7y58v8w9"; + version = "0.2.0"; + sha256 = "1a7cnxfvgrwi966kfccd29s45246dspqnd1fn953xfid4zfqy5s1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -32567,7 +32699,7 @@ self: { aeson base bytestring codec-rpm cond conduit conduit-combinators conduit-extra containers content-store cpio-conduit cryptonite directory esqueleto exceptions filepath gi-gio gi-glib gi-ostree - gitrev http-conduit memory monad-control monad-logger mtl + gitrev http-conduit listsafe memory monad-control monad-logger mtl network-uri parsec parsec-numbers persistent persistent-sqlite persistent-template process regex-pcre resourcet split tar tar-conduit temporary text time unix unordered-containers @@ -32582,8 +32714,8 @@ self: { testHaskellDepends = [ aeson base bytestring codec-rpm cond conduit conduit-combinators containers directory esqueleto filepath gi-gio gi-glib hspec HUnit - monad-logger mtl parsec parsec-numbers persistent persistent-sqlite - persistent-template resourcet text time unix + listsafe monad-logger mtl parsec parsec-numbers persistent + persistent-sqlite persistent-template resourcet text time unix ]; homepage = "https://github.com/weldr/bdcs"; description = "Tools for managing a content store of software packages"; @@ -33293,13 +33425,13 @@ self: { "bifunctors" = callPackage ({ mkDerivation, base, base-orphans, comonad, containers, hspec - , QuickCheck, semigroups, tagged, template-haskell, th-abstraction - , transformers, transformers-compat + , hspec-discover, QuickCheck, semigroups, tagged, template-haskell + , th-abstraction, transformers, transformers-compat }: mkDerivation { pname = "bifunctors"; - version = "5.5"; - sha256 = "0a5y85p1dhcvkagpdci6ah5kczc2jpwsj7ywkd9cg0nqcyzq3icj"; + version = "5.5.2"; + sha256 = "04fbsysm6zl8kmvqgffmrqa9bxl9dl2gibrd51asqzg737mb4ark"; libraryHaskellDepends = [ base base-orphans comonad containers semigroups tagged template-haskell th-abstraction transformers transformers-compat @@ -33308,6 +33440,7 @@ self: { base hspec QuickCheck template-haskell transformers transformers-compat ]; + testToolDepends = [ hspec-discover ]; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; @@ -36738,35 +36871,6 @@ self: { }: mkDerivation { pname = "bloodhound"; - version = "0.15.0.1"; - sha256 = "0g85fp2vppx6p1zbx506jnsfcik8q7nmc98fwrhcckgvkbdpi2v8"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring containers data-default-class - exceptions hashable http-client http-types mtl mtl-compat - network-uri scientific semigroups text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers errors exceptions generics-sop - hspec http-client http-types mtl network-uri QuickCheck - quickcheck-properties semigroups temporary text time unix-compat - unordered-containers vector - ]; - homepage = "https://github.com/bitemyapp/bloodhound"; - description = "ElasticSearch client library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bloodhound_0_15_0_2" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers - , data-default-class, errors, exceptions, generics-sop, hashable - , hspec, http-client, http-types, mtl, mtl-compat, network-uri - , QuickCheck, quickcheck-properties, scientific, semigroups - , temporary, text, time, transformers, unix-compat - , unordered-containers, vector - }: - mkDerivation { - pname = "bloodhound"; version = "0.15.0.2"; sha256 = "17xw085k72dmw1q4cbqjs07gvvwwfsijcs9lsb3smxxhri1s229i"; libraryHaskellDepends = [ @@ -36784,7 +36888,6 @@ self: { homepage = "https://github.com/bitemyapp/bloodhound"; description = "ElasticSearch client library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bloodhound-amazonka-auth" = callPackage @@ -37941,7 +38044,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_33" = callPackage + "brick_0_34" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, stm, template-haskell, text, text-zipper @@ -37949,8 +38052,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.33"; - sha256 = "0052hdwvqrprf5911axikxpigbc1iv3h4kq3zhrnvpy038wjbis1"; + version = "0.34"; + sha256 = "1n835ma8a73zcb4q0r066d9ql4071qf1d30cpv2xhwqc5p4c2i41"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37986,16 +38089,23 @@ self: { }) {}; "bricks" = callPackage - ({ mkDerivation, base, containers, doctest, hedgehog, parsec - , template-haskell, text + ({ mkDerivation, base, bricks-internal, bricks-internal-test + , bricks-parsec, bricks-rendering, bricks-syntax, containers + , doctest, hedgehog, mtl, parsec, template-haskell, text + , transformers }: mkDerivation { pname = "bricks"; - version = "0.0.0.2"; - sha256 = "1iyf9dkifl064x74vxnqdlv096qxiyhvqn91jmj090i4r6m4jlhw"; - libraryHaskellDepends = [ base containers parsec text ]; + version = "0.0.0.4"; + sha256 = "018cp48bm3hk20kfq544hm50s6bik37lv1hnsdpkg6ibgz6a9i4v"; + libraryHaskellDepends = [ + base bricks-internal bricks-parsec bricks-rendering bricks-syntax + containers mtl parsec text transformers + ]; testHaskellDepends = [ - base containers doctest hedgehog parsec template-haskell text + base bricks-internal bricks-internal-test bricks-parsec + bricks-rendering bricks-syntax containers doctest hedgehog mtl + parsec template-haskell text transformers ]; homepage = "https://github.com/chris-martin/bricks#readme"; description = "Bricks is a lazy functional language based on Nix"; @@ -38003,6 +38113,104 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bricks-internal" = callPackage + ({ mkDerivation, base, containers, doctest, either-list-functions + , text + }: + mkDerivation { + pname = "bricks-internal"; + version = "0.0.0.4"; + sha256 = "1c4nav1ak6nz06ps6pwsrd6ci8ly3xqi6yd8clsvrhqi1r4cwz80"; + libraryHaskellDepends = [ + base containers either-list-functions text + ]; + testHaskellDepends = [ + base containers doctest either-list-functions text + ]; + homepage = "https://github.com/chris-martin/bricks#readme"; + description = "..."; + license = stdenv.lib.licenses.asl20; + }) {}; + + "bricks-internal-test" = callPackage + ({ mkDerivation, base, bricks-internal, containers, hedgehog + , template-haskell, text + }: + mkDerivation { + pname = "bricks-internal-test"; + version = "0.0.0.4"; + sha256 = "1kvhvwi7qd1rxqn6zxz0vmzqnq2w5fzm1dld5yy08v6jr3f7ri8a"; + libraryHaskellDepends = [ + base bricks-internal containers hedgehog template-haskell text + ]; + homepage = "https://github.com/chris-martin/bricks#readme"; + description = "..."; + license = stdenv.lib.licenses.asl20; + }) {}; + + "bricks-parsec" = callPackage + ({ mkDerivation, base, bricks-internal, bricks-internal-test + , bricks-rendering, bricks-syntax, containers, doctest, hedgehog + , parsec, text + }: + mkDerivation { + pname = "bricks-parsec"; + version = "0.0.0.4"; + sha256 = "1rgcrdn4h4pmq9sa7fbzlmv93j6g80mhirnrx6f5iqgmshlg4cq0"; + libraryHaskellDepends = [ + base bricks-internal bricks-syntax containers parsec text + ]; + testHaskellDepends = [ + base bricks-internal bricks-internal-test bricks-rendering + bricks-syntax containers doctest hedgehog parsec text + ]; + homepage = "https://github.com/chris-martin/bricks#readme"; + description = "..."; + license = stdenv.lib.licenses.asl20; + }) {}; + + "bricks-rendering" = callPackage + ({ mkDerivation, base, bricks-internal, bricks-internal-test + , bricks-syntax, containers, doctest, hedgehog, template-haskell + , text + }: + mkDerivation { + pname = "bricks-rendering"; + version = "0.0.0.4"; + sha256 = "1ixg8qsima8hp547ms3jid4hcr0l605ha353r0bngwjxc5h3ixj4"; + libraryHaskellDepends = [ + base bricks-internal bricks-syntax containers text + ]; + testHaskellDepends = [ + base bricks-internal bricks-internal-test bricks-syntax containers + doctest hedgehog template-haskell text + ]; + homepage = "https://github.com/chris-martin/bricks#readme"; + description = "..."; + license = stdenv.lib.licenses.asl20; + }) {}; + + "bricks-syntax" = callPackage + ({ mkDerivation, base, bricks-internal, containers, doctest + , either-list-functions, exceptions, hint, text + }: + mkDerivation { + pname = "bricks-syntax"; + version = "0.0.0.4"; + sha256 = "0bg4vx32fh9fn5lvccayr9dfzynpql08x6ffi0xrw1rkpn2hz415"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bricks-internal containers either-list-functions text + ]; + testHaskellDepends = [ + base bricks-internal containers doctest either-list-functions + exceptions hint text + ]; + homepage = "https://github.com/chris-martin/bricks#readme"; + description = "..."; + license = stdenv.lib.licenses.asl20; + }) {}; + "brillig" = callPackage ({ mkDerivation, base, binary, cmdargs, containers, directory , filepath, ListZipper, text @@ -38312,8 +38520,8 @@ self: { }: mkDerivation { pname = "buchhaltung"; - version = "0.0.5"; - sha256 = "0sbmabig0b5z71c8v71p0fb5wagm0a8vb40c829w6q337q23m9iq"; + version = "0.0.7"; + sha256 = "1hkiiah2h64gkb9y6bagg5q182rylysdqwqlkn5lvmym4akp8zlb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38777,6 +38985,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "butcher_1_3_0_0" = callPackage + ({ mkDerivation, base, bifunctors, containers, deque, extra, free + , microlens, microlens-th, mtl, multistate, pretty, transformers + , unsafe, void + }: + mkDerivation { + pname = "butcher"; + version = "1.3.0.0"; + sha256 = "0v85ganhfljxyqy9sfmhbqnfdazikmy8a3mpg1w1y827l4a3nkng"; + libraryHaskellDepends = [ + base bifunctors containers deque extra free microlens microlens-th + mtl multistate pretty transformers unsafe void + ]; + testHaskellDepends = [ + base containers deque extra free microlens microlens-th mtl + multistate pretty transformers unsafe + ]; + homepage = "https://github.com/lspitzner/butcher/"; + description = "Chops a command or program invocation into digestable pieces"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "butterflies" = callPackage ({ mkDerivation, base, bytestring, gl-capture, GLUT, OpenGLRaw , OpenGLRaw21, repa, repa-devil @@ -39048,6 +39279,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bytestring-encodings" = callPackage + ({ mkDerivation, base, bytestring, gauge, ghc-prim, hedgehog, text + }: + mkDerivation { + pname = "bytestring-encodings"; + version = "0.1.0.0"; + sha256 = "070n1203shbfkimkrxr5xs5znpljbb61v7npwp9lgfpj4h8gyaq7"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + testHaskellDepends = [ base bytestring hedgehog ]; + benchmarkHaskellDepends = [ base bytestring gauge text ]; + description = "checks to see if a given bytestring adheres to a certain encoding"; + license = stdenv.lib.licenses.mit; + }) {}; + "bytestring-from" = callPackage ({ mkDerivation, attoparsec, base, bytestring, QuickCheck, tasty , tasty-quickcheck, text @@ -39391,6 +39636,8 @@ self: { pname = "bzlib-conduit"; version = "0.2.1.5"; sha256 = "1bv78qr6fbf6lg1dx06g3r2904fjnpvb87mlqv6np2kpyzjc11an"; + revision = "1"; + editedCabalFile = "1pz462dij6rizmbi7dw6qz50f9xgnzzw2z08cjlvbqzn05cpgdv6"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bindings-DSL bytestring conduit conduit-extra data-default mtl @@ -39407,6 +39654,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) bzip2;}; + "bzlib-conduit_0_3_0" = callPackage + ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit + , data-default, hspec, mtl, random, resourcet + }: + mkDerivation { + pname = "bzlib-conduit"; + version = "0.3.0"; + sha256 = "11nz2lkrv39rb7ayhnqlpjrxsprnv92ygwwvgmp3i32l9fakwhpw"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bindings-DSL bytestring conduit data-default mtl resourcet + ]; + librarySystemDepends = [ bzip2 ]; + testHaskellDepends = [ + base bindings-DSL bytestring conduit data-default hspec mtl random + resourcet + ]; + benchmarkHaskellDepends = [ + base bindings-DSL bytestring conduit data-default mtl resourcet + ]; + homepage = "https://github.com/snoyberg/bzlib-conduit#readme"; + description = "Streaming compression/decompression via conduits"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) bzip2;}; + "c-dsl" = callPackage ({ mkDerivation, base, language-c }: mkDerivation { @@ -39437,8 +39710,8 @@ self: { }: mkDerivation { pname = "c-mosquitto"; - version = "0.1.2.0"; - sha256 = "1q2g7wv11d8p5ykbh0m7xd8jx4lvm73i503rz5pvsgmgm39fwy98"; + version = "0.1.3.0"; + sha256 = "0l7vyiynn7wzsf4yvm2f6wn9qmhvi3aj46vwxvgwk33bskhwkr64"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39823,25 +40096,12 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "cabal-doctest"; - version = "1.0.5"; - sha256 = "0x3m97q3xjmvf601vzkx4a8sl77x1y8jf0lwbq67181s37jp9asm"; - 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; - }) {}; - - "cabal-doctest_1_0_6" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "cabal-doctest"; version = "1.0.6"; sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny"; 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 @@ -39918,8 +40178,8 @@ self: { }: mkDerivation { pname = "cabal-helper"; - version = "0.8.0.0"; - sha256 = "050g5y74ldpv8haj8grqpk2cw72l3gm0hypza72f556dl9j5hz2m"; + version = "0.8.0.2"; + sha256 = "0yhsyq2z660qj5vp38lak2cz90r5jy69ifvz6dfipj6miyh2vmm6"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -40401,8 +40661,8 @@ self: { }: mkDerivation { pname = "cabal-toolkit"; - version = "0.0.4"; - sha256 = "04afwsbbqsw9lj7flbnrfwy3qbv1c9nkwm65ylspy2nzf9v06ljj"; + version = "0.0.5"; + sha256 = "1w3c75avp12ig1bmakgjsp10rb8bnnibxi1sbg96y6gx4g3krbcq"; libraryHaskellDepends = [ base binary bytestring Cabal containers ghc template-haskell ]; @@ -41396,8 +41656,8 @@ self: { }: mkDerivation { pname = "capataz"; - version = "0.1.0.0"; - sha256 = "1bz9yazxwdasbdbr9hrfpvjaqd4lax8kqinlj4rxyiq1517rsqrk"; + version = "0.1.0.1"; + sha256 = "0ldxnm5mib9gg7qhf29psifkcfzfcrbnfzk93hvnb08lfrdc8d1d"; libraryHaskellDepends = [ async base bytestring data-default microlens protolude safe-exceptions stm teardown text time unordered-containers uuid @@ -42489,6 +42749,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cayley-client_0_4_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring + , exceptions, hspec, http-client, http-conduit, lens, lens-aeson + , mtl, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "cayley-client"; + version = "0.4.3"; + sha256 = "119jihcnrv197a8v6xciav7dlkq6lagwhp3bw2aviyz49bhsq1j6"; + libraryHaskellDepends = [ + aeson attoparsec base binary bytestring exceptions http-client + http-conduit lens lens-aeson mtl text transformers + unordered-containers vector + ]; + testHaskellDepends = [ aeson base hspec unordered-containers ]; + homepage = "https://github.com/MichelBoucey/cayley-client"; + description = "A Haskell client for the Cayley graph database"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cayley-dickson" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -42831,6 +43112,8 @@ self: { pname = "cereal-conduit"; version = "0.8.0"; sha256 = "1srr7agvgfw78q5s1npjq5sgynvhjgllpihiv37ylkwqm4c4ap6r"; + revision = "1"; + editedCabalFile = "1imyl3g2bni8bc6kajr857xh94fscphksj3286pxfpa8yp9vqqpc"; libraryHaskellDepends = [ base bytestring cereal conduit resourcet transformers ]; @@ -45445,8 +45728,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.10"; - sha256 = "0ijwfl4wj0pjv6hfac6fbrvcg3all9p2wx2w1lirjvn5kgwjj5r2"; + version = "0.4.3.11"; + sha256 = "1xqlpdg511m5wif9cz01v0fgam1lsvl50sqigxrcjc9n6fivn61x"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -47895,10 +48178,8 @@ self: { }: mkDerivation { pname = "comonad"; - version = "5.0.2"; - sha256 = "115pai560rllsmym76bj787kwz5xx19y8bl6262005nddqwzxc0v"; - revision = "2"; - editedCabalFile = "1ngks9bym68rw0xdq43n14nay4kxdxv2n7alwfd9wcpismfz009g"; + version = "5.0.3"; + sha256 = "1xjdwm0xvkcqrpyivl6v569dj8xgivw103bzahy14la0cd6mix57"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers contravariant distributive semigroups tagged @@ -48702,14 +48983,14 @@ self: { }: mkDerivation { pname = "concise"; - version = "0.1.0.0"; - sha256 = "0ga10djxmc5n37cf5iazkwivfxipav0q2gb8mbkbg3wnn1qhqxmm"; + version = "0.1.0.1"; + sha256 = "09crgc6gjfidlad6263253xx1di6wfhc9awhira21s0z7rddy9sw"; libraryHaskellDepends = [ base bytestring lens text ]; testHaskellDepends = [ base bytestring lens QuickCheck quickcheck-instances tasty tasty-quickcheck text ]; - homepage = "https://github.com/frasertweedal/hs-concise"; + homepage = "https://github.com/frasertweedale/hs-concise"; description = "Utilities for Control.Lens.Cons"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -49016,8 +49297,8 @@ self: { }: mkDerivation { pname = "concurrent-machines"; - version = "0.3.1.1"; - sha256 = "109c202sqhsx6fr8m0zkwgzsy7pnnaps2nhyykp7cd6rw0ak6i28"; + version = "0.3.1.2"; + sha256 = "1qvd452najs0i3a2k2m493zs1jclsiisr1wv318kvkh0k42sb2m6"; libraryHaskellDepends = [ async base containers lifted-async machines monad-control semigroups time transformers transformers-base @@ -49037,8 +49318,8 @@ self: { }: mkDerivation { pname = "concurrent-output"; - version = "1.10.2"; - sha256 = "02kfg61f7lm8796n4pdi7yvscg8n869vhl9i6rd9rpyb4l9myzd1"; + version = "1.10.3"; + sha256 = "0sp5mc7pxw48k0hv17l553bcjr7s5dp9vznm2n6400nyhgmxdha8"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions process stm terminal-size text transformers unix @@ -49331,6 +49612,7 @@ self: { homepage = "https://github.com/luispedro/conduit-algorithms#readme"; description = "Conduit-based algorithms"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-audio" = callPackage @@ -49449,8 +49731,8 @@ self: { }: mkDerivation { pname = "conduit-connection"; - version = "0.1.0.3"; - sha256 = "16j3h318i7s3nr9cz6n1v27d7nkmz5s6dp4fbahziy1pgb4bk3kr"; + version = "0.1.0.4"; + sha256 = "1z11r3rf6hmz5b00w4xymp6x0s00acyvbyw6n99wd3b9ycbl2y2y"; libraryHaskellDepends = [ base bytestring conduit connection resourcet transformers ]; @@ -49566,8 +49848,8 @@ self: { }: mkDerivation { pname = "conduit-iconv"; - version = "0.1.1.2"; - sha256 = "02s5jyr6mii45q4nar5fzqr4hsf7b6rw9fyc6g1jrqjr76xk6vsw"; + version = "0.1.1.3"; + sha256 = "1dmcsdx0nz0b9sans2fr8lmrii2n0fsjh41jhwlrlng4h93k0w8w"; libraryHaskellDepends = [ base bytestring conduit ]; testHaskellDepends = [ base bytestring conduit mtl QuickCheck test-framework @@ -51068,8 +51350,8 @@ self: { }: mkDerivation { pname = "convert-annotation"; - version = "0.5.0.1"; - sha256 = "198zkisa1j01wi23z168wkw9xk2xm7z45akj2yxjiz82iy6yp8hi"; + version = "0.5.1.0"; + sha256 = "1m6b5b7drgxb6cc4qqhi9s5k93rpsny7yf83a9m5q0a585nwmk0q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52386,20 +52668,22 @@ self: { }) {}; "crdt" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, mtl - , network-info, QuickCheck, quickcheck-instances, safe, stm, tasty - , tasty-discover, tasty-quickcheck, time + ({ mkDerivation, base, binary, bytestring, containers, Diff + , hashable, mtl, network-info, QuickCheck, QuickCheck-GenT + , quickcheck-instances, safe, stm, tasty, tasty-discover + , tasty-quickcheck, time, vector }: mkDerivation { pname = "crdt"; - version = "6.2"; - sha256 = "0d88s8wj3679v4hjgh2jzhsp3iscbh8ph8vkc2rv528abkxfrqfv"; + version = "9.0"; + sha256 = "099rpmwwla68vyw366xmzpdyv39hxcpidpkg1l0lx2mjz2jxm6zc"; libraryHaskellDepends = [ - base binary bytestring containers mtl network-info safe stm time + base binary bytestring containers Diff hashable mtl network-info + safe stm time vector ]; testHaskellDepends = [ - base containers QuickCheck quickcheck-instances tasty - tasty-discover tasty-quickcheck + base containers mtl QuickCheck QuickCheck-GenT quickcheck-instances + tasty tasty-discover tasty-quickcheck vector ]; homepage = "https://github.com/cblp/crdt#readme"; description = "Conflict-free replicated data types"; @@ -53561,6 +53845,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptonite_0_25" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, gauge + , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit + , tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.25"; + sha256 = "131wbbdr5yavs5k1ah9sz6fqx1ffyvaxf66pwjzsfc47mwc1mgl9"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim integer-gmp memory + ]; + testHaskellDepends = [ + base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge memory random + ]; + homepage = "https://github.com/haskell-crypto/cryptonite"; + description = "Cryptography Primitives sink"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cryptonite-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, cryptonite, exceptions, memory, resourcet, tasty @@ -53828,11 +54136,11 @@ self: { ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }: mkDerivation { pname = "css-text"; - version = "0.1.2.2"; - sha256 = "11qrwrjqk2k4bm3bz1qcyscp146raz1hgpzynkd50yaq12n69xfz"; + version = "0.1.3.0"; + sha256 = "0ynd9f4hn2sfwqzbsa0y7phmxq8za7jiblpjwx0ry8b372zhgxaz"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec QuickCheck text ]; - homepage = "http://www.yesodweb.com/"; + homepage = "https://github.com/yesodweb/css-text.git#readme"; description = "CSS parser and renderer"; license = stdenv.lib.licenses.mit; }) {}; @@ -54724,6 +55032,7 @@ self: { testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ]; description = "Parsing dAmn messages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "danibot" = callPackage @@ -56045,8 +56354,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "data-forest"; - version = "0.1.0.5"; - sha256 = "05hpi0xr4bp7jigb6qa48n02widxxcn9npjh1y876mkgsdpd4x01"; + version = "0.1.0.6"; + sha256 = "11iisc82cgma5pp6apnjg112dd4cvqxclwf09zh9rh50lzkml9dk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/chris-martin/data-forest"; @@ -56128,6 +56437,8 @@ self: { pname = "data-interval"; version = "1.3.0"; sha256 = "1i00cci7lzvkxqd1l8dacn7i0mrnccbs23mdciz6nrhlvlgsfiy9"; + revision = "1"; + editedCabalFile = "09n6gklg64lgn4x1f48ga9ynssyl4fm8x376blls1mx1xg6kgbz6"; libraryHaskellDepends = [ base containers deepseq extended-reals hashable lattices ]; @@ -57115,8 +57426,8 @@ self: { ({ mkDerivation, base, dates, hspec, QuickCheck, time }: mkDerivation { pname = "date-conversions"; - version = "0.2.0.0"; - sha256 = "1bx8r66wfghrfbmcyddsi6z5b66kc9skrq0hnk2mvz4gx2cl0gdq"; + version = "0.3.0.0"; + sha256 = "086vmgq58n2gcmz93idngh2hq1zfz8d231qazjzv19p08np5j3zm"; libraryHaskellDepends = [ base dates time ]; testHaskellDepends = [ base dates hspec QuickCheck time ]; homepage = "https://github.com/thoughtbot/date-conversions#readme"; @@ -58780,6 +59091,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dependency" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, binary, composition-prelude + , containers, criterion, deepseq, hspec, microlens + , recursion-schemes + }: + mkDerivation { + pname = "dependency"; + version = "0.1.0.5"; + sha256 = "0b1v2vx4yyn90195f02i6dj4phzrb0a1wfb9mj1kq568pl02w3q3"; + libraryHaskellDepends = [ + ansi-wl-pprint base binary composition-prelude containers deepseq + microlens recursion-schemes + ]; + testHaskellDepends = [ base containers hspec ]; + benchmarkHaskellDepends = [ base containers criterion ]; + description = "Dependency resolution for package management"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dependent-map" = callPackage ({ mkDerivation, base, containers, dependent-sum }: mkDerivation { @@ -59103,16 +59433,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "deriving-compat_0_4" = callPackage + "deriving-compat_0_4_1" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers - , ghc-boot-th, ghc-prim, hspec, QuickCheck, tagged + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged , template-haskell, th-abstraction, transformers , transformers-compat }: mkDerivation { pname = "deriving-compat"; - version = "0.4"; - sha256 = "1jza92p1x3dbm4gx891miaihq3ly30mlz20ddwdsz0xyk7c1wk15"; + version = "0.4.1"; + sha256 = "0lzcbnvzcnrrvr61mrqdx4i8fylknf4jwrpncxr9lhpxgp4fqqk4"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -59121,6 +59451,7 @@ self: { base base-compat base-orphans hspec QuickCheck tagged template-haskell transformers transformers-compat ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/haskell-compat/deriving-compat"; description = "Backports of GHC deriving extensions"; license = stdenv.lib.licenses.bsd3; @@ -59583,19 +59914,6 @@ self: { ({ mkDerivation, base, dhall, optparse-generic, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.4"; - sha256 = "1ba2sljiq016jhgx7ifh5vjrwxd1czv2gm56h2pig3p0x45ds2wm"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ base dhall optparse-generic text ]; - description = "Template text using Dhall"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dhall-text_1_0_5" = callPackage - ({ mkDerivation, base, dhall, optparse-generic, text }: - mkDerivation { - pname = "dhall-text"; version = "1.0.5"; sha256 = "195nfflpk787m8jjmspw2x4rb2s7vd0z5wz5s0bzfwdl6c7xgg27"; isLibrary = false; @@ -59603,7 +59921,6 @@ self: { executableHaskellDepends = [ base dhall optparse-generic text ]; description = "Template text using Dhall"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhcp-lease-parser" = callPackage @@ -59808,6 +60125,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-contrib_1_4_2_1" = callPackage + ({ mkDerivation, base, circle-packing, colour, containers + , cubicbezier, data-default, data-default-class, diagrams-core + , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens + , linear, mfsolve, MonadRandom, monoid-extras, mtl, mtl-compat + , parsec, QuickCheck, random, semigroups, split, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "diagrams-contrib"; + version = "1.4.2.1"; + sha256 = "1l7xz360chrqj9by6l5v0vwpvy81lniif600r3b6vf9ckyj747yz"; + libraryHaskellDepends = [ + base circle-packing colour containers cubicbezier data-default + data-default-class diagrams-core diagrams-lib diagrams-solve + force-layout hashable lens linear mfsolve MonadRandom monoid-extras + mtl mtl-compat parsec random semigroups split text + ]; + testHaskellDepends = [ + base containers diagrams-lib HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "Collection of user contributions to diagrams EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-core" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive , dual-tree, lens, linear, monoid-extras, mtl, profunctors @@ -61494,12 +61839,12 @@ self: { }) {}; "display" = callPackage - ({ mkDerivation, base, bytestring }: + ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "display"; - version = "0.0.0"; - sha256 = "1z5spl8l4n2x17szlyra2m1973ppgd9xqw851zgnmrvlp79gr0ls"; - libraryHaskellDepends = [ base bytestring ]; + version = "0.0.1"; + sha256 = "0hn1zdis621h87r4mr35vic9473iwqcdjnmmfgs1j5dfsh62kd6b"; + libraryHaskellDepends = [ base bytestring text ]; homepage = "https://github.com/chrisdone/display#readme"; description = "Display things for humans to read"; license = stdenv.lib.licenses.bsd3; @@ -61577,8 +61922,8 @@ self: { }: mkDerivation { pname = "distributed-closure"; - version = "0.3.4.0"; - sha256 = "1c7jf2czaaf24l22aw1j4yj9nksycvsvj708vzj9lb50zhdbpdgg"; + version = "0.3.5"; + sha256 = "0mm3w8l63n9lbifrj32kv5xbb79fiwd4swi2kv2lbnc67b6ig43h"; libraryHaskellDepends = [ base binary bytestring constraints syb template-haskell ]; @@ -61588,14 +61933,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "distributed-closure_0_3_5" = callPackage + "distributed-closure_0_4_0" = callPackage ({ mkDerivation, base, binary, bytestring, constraints, hspec , QuickCheck, syb, template-haskell }: mkDerivation { pname = "distributed-closure"; - version = "0.3.5"; - sha256 = "0mm3w8l63n9lbifrj32kv5xbb79fiwd4swi2kv2lbnc67b6ig43h"; + version = "0.4.0"; + sha256 = "1r2ymmnm0misz92x4iz58yqyb4maf3kq8blsvxmclc0d77hblsnm"; libraryHaskellDepends = [ base binary bytestring constraints syb template-haskell ]; @@ -62884,6 +63229,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "doctest_0_14_0" = callPackage + ({ mkDerivation, base, base-compat, code-page, deepseq, directory + , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process + , QuickCheck, setenv, silently, stringbuilder, syb, transformers + , with-location + }: + mkDerivation { + pname = "doctest"; + version = "0.14.0"; + sha256 = "18qia153653fib1jdrdyvxa3wjcfhdn371r97mwv03q915i4bm3g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat code-page deepseq directory filepath ghc ghc-paths + process syb transformers + ]; + executableHaskellDepends = [ + base base-compat code-page deepseq directory filepath ghc ghc-paths + process syb transformers + ]; + testHaskellDepends = [ + base base-compat code-page deepseq directory filepath ghc ghc-paths + hspec HUnit mockery process QuickCheck setenv silently + stringbuilder syb transformers with-location + ]; + homepage = "https://github.com/sol/doctest#readme"; + description = "Test interactive Haskell examples"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "doctest-discover" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , filepath @@ -65707,8 +66083,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "either-list-functions"; - version = "0.0.0.1"; - sha256 = "1k5zpyii5wkzr1xzfbkl015sj91pghl93ifjs6shgyysyh6b62z5"; + version = "0.0.0.2"; + sha256 = "0m7fkf8r1i0z3zrfmnqsdzk0fc9mhanqmx7x6rjiisjiaf91yr8d"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/chris-martin/either-list-functions#readme"; @@ -67058,8 +67434,8 @@ self: { }: mkDerivation { pname = "engine-io-wai"; - version = "1.0.7"; - sha256 = "13aa7x94z32c2gfzwjxh9808alcwqhxmxgn42r4jyqfylis2p73a"; + version = "1.0.8"; + sha256 = "0mph6pg3j81kwwl73dn5hdbw3mndfxi2wqdgwb727znh058xh7zb"; libraryHaskellDepends = [ attoparsec base bytestring either engine-io http-types mtl text transformers transformers-compat unordered-containers wai @@ -69162,18 +69538,6 @@ self: { }) {}; "exact-pi" = callPackage - ({ mkDerivation, base, numtype-dk }: - mkDerivation { - pname = "exact-pi"; - version = "0.4.1.2"; - sha256 = "1qs5zi9c87sypnxdwncdj7dnrylly7s2yvjhm7rx4fxsbxrfdfxj"; - libraryHaskellDepends = [ base numtype-dk ]; - homepage = "https://github.com/dmcclean/exact-pi/"; - description = "Exact rational multiples of pi (and integer powers of pi)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "exact-pi_0_4_1_3" = callPackage ({ mkDerivation, base, numtype-dk, semigroups }: mkDerivation { pname = "exact-pi"; @@ -69183,7 +69547,6 @@ self: { homepage = "https://github.com/dmcclean/exact-pi/"; description = "Exact rational multiples of pi (and integer powers of pi)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exact-real" = callPackage @@ -69908,19 +70271,17 @@ self: { }) {}; "expressions" = callPackage - ({ mkDerivation, attoparsec, base, containers, lattices, QuickCheck - , singletons, tasty, tasty-quickcheck, text, transformers + ({ mkDerivation, attoparsec, base, containers, lattices, singletons + , text, transformers }: mkDerivation { pname = "expressions"; - version = "0.1.4"; - sha256 = "1dxkg5yc2njq7dpv7vgkmrs73x5np5w1ahi79my6ysamnc2w8a04"; + version = "0.1.5"; + sha256 = "1iw6i922wjvs844gqqvmvhvfaq8c06lxlca806s6rbk0sxq40nmz"; libraryHaskellDepends = [ attoparsec base containers lattices singletons text transformers ]; - testHaskellDepends = [ - base QuickCheck singletons tasty tasty-quickcheck text - ]; + testHaskellDepends = [ base singletons text ]; description = "Expressions and Formulae a la carte"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -69931,8 +70292,8 @@ self: { }: mkDerivation { pname = "expressions-z3"; - version = "0.1.1"; - sha256 = "0hk8qhkvlh4v210k7d845krg31px72ma44fmwahbycn6pgy32659"; + version = "0.1.2"; + sha256 = "0q3fnljdsqh1937a8s9a62cmcg1nc787725jp0j32jlmbwwhkfyv"; libraryHaskellDepends = [ base containers expressions singletons transformers z3 ]; @@ -70005,8 +70366,8 @@ self: { pname = "extended-reals"; version = "0.2.2.0"; sha256 = "14wskq0m3sclb2c1m3aqsaj26rijbzyy021qkvxjdpzskz13higj"; - revision = "2"; - editedCabalFile = "1vsh115lals5sqp2rkj7gp9b1jc0rg92x5fb51p8jckqr4f43pma"; + revision = "3"; + editedCabalFile = "14jmdqapr01l0gb0g10296shz01nfvv14l5bpbzsc8zwh5zb4cvx"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base deepseq HUnit QuickCheck test-framework test-framework-hunit @@ -70560,17 +70921,14 @@ self: { "fast-arithmetic" = callPackage ({ mkDerivation, arithmoi, ats-setup, base, Cabal, combinat - , composition-prelude, criterion, hspec, QuickCheck - , recursion-schemes + , composition-prelude, criterion, gmpint, hspec, QuickCheck }: mkDerivation { pname = "fast-arithmetic"; - version = "0.3.2.4"; - sha256 = "0dvrwlcpfsrrw8la5brvhjc78k48s2kaz08cg6xqx82vkrzipm63"; + version = "0.3.2.5"; + sha256 = "0sln2am6xrm73y3731gy1wabc8cdvnrksgzvrl0qwlinshc4pd74"; setupHaskellDepends = [ ats-setup base Cabal ]; - libraryHaskellDepends = [ - base composition-prelude recursion-schemes - ]; + libraryHaskellDepends = [ base composition-prelude gmpint ]; testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ]; benchmarkHaskellDepends = [ arithmoi base combinat criterion ]; homepage = "https://github.com/vmchale/fast-arithmetic#readme"; @@ -70645,8 +71003,8 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "2.4.10"; - sha256 = "13b7rrv8dw574k6lbl96nar67fx81058gvilsc42v0lgm38sbi6y"; + version = "2.4.11"; + sha256 = "1ad2vq4nifdxshqk9yrmghqizhkgybfz134kpr6padglb2mxxrdv"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath text unix unix-time @@ -72661,6 +73019,8 @@ self: { pname = "finite-field"; version = "0.9.0"; sha256 = "026l5qrc7vsm2s19z10xx30lrsfkwwcymyznyy5hrcrwqj9wf643"; + revision = "1"; + editedCabalFile = "0npwa4gv94b87y4bam9valnjlsy3rbhk7n7hdc1mx1bwkn4acyds"; libraryHaskellDepends = [ base deepseq hashable singletons template-haskell ]; @@ -73124,6 +73484,7 @@ self: { homepage = "https://github.com/NorfairKing/fixer#readme"; description = "A Haskell client for http://fixer.io/"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixfile" = callPackage @@ -73266,8 +73627,8 @@ self: { }: mkDerivation { pname = "fizzbuzz-as-a-service"; - version = "0.1.0.1"; - sha256 = "1m2pyvhdj8phj2f1zka6v1p72hzhmaigw2v0n1zwkh3k4hkq90kg"; + version = "0.1.0.2"; + sha256 = "0bskyv1zyk469bikh4rh6ad1i8d5ym9s89a88aw34cpphy0vq1zk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -74269,26 +74630,6 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.3.5"; - sha256 = "10qsp7dj2xsq4q2xm6x6b12y5pq32qf7my41hnkmdwwbccvhdxb2"; - libraryHaskellDepends = [ - base bytestring comonad containers contravariant hashable - mwc-random primitive profunctors semigroups text transformers - unordered-containers vector vector-builder - ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Composable, streaming, and efficient left folds"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "foldl_1_3_7" = callPackage - ({ mkDerivation, base, bytestring, comonad, containers - , contravariant, criterion, hashable, mwc-random, primitive - , profunctors, semigroups, text, transformers, unordered-containers - , vector, vector-builder - }: - mkDerivation { - pname = "foldl"; version = "1.3.7"; sha256 = "113966zyk1jj8l1k1izfix8bc1hmpr9w1zahkz592f56wmvmy8kn"; libraryHaskellDepends = [ @@ -74299,7 +74640,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Composable, streaming, and efficient left folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foldl-incremental" = callPackage @@ -75866,32 +76206,6 @@ self: { }: mkDerivation { pname = "freer-simple"; - version = "1.0.0.0"; - sha256 = "11nh0majlmn6aw5qzv5jfs6jx9vxk7jn72568frmryvymn2aqax8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base natural-transformation transformers-base - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base criterion extensible-effects free mtl - ]; - homepage = "https://github.com/lexi-lambda/freer-simple#readme"; - description = "Implementation of a friendly effect system for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "freer-simple_1_0_1_1" = callPackage - ({ mkDerivation, base, criterion, extensible-effects, free, mtl - , natural-transformation, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, transformers-base - }: - mkDerivation { - pname = "freer-simple"; version = "1.0.1.1"; sha256 = "1fdxj1iyh8jl2nghrm51r7gvlk1qwzrjjhj13f0akwrm2s0la1jb"; isLibrary = true; @@ -75909,7 +76223,6 @@ self: { homepage = "https://github.com/lexi-lambda/freer-simple#readme"; description = "Implementation of a friendly effect system for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freesect" = callPackage @@ -77139,29 +77452,8 @@ self: { }: mkDerivation { pname = "fuzzyset"; - version = "0.1.0.4"; - sha256 = "1nk3qrjcg5q4mnv2lzbw08ikgibix0ns6910z9xixcfq5kgij6my"; - 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; - }) {}; - - "fuzzyset_0_1_0_5" = callPackage - ({ mkDerivation, base, base-unicode-symbols, data-default, hspec - , ieee754, lens, text, text-metrics, unordered-containers, vector - }: - mkDerivation { - pname = "fuzzyset"; - version = "0.1.0.5"; - sha256 = "12cl135ph7qjnfm0x36yw3mvjilsw4pm509yvh7i5whsafs3kakq"; + version = "0.1.0.6"; + sha256 = "18v1zsmdgy5if7l23vciip6dbbhbpgvn0dy0ray0pqwdcw9yh6kk"; libraryHaskellDepends = [ base base-unicode-symbols data-default lens text text-metrics unordered-containers vector @@ -77173,7 +77465,6 @@ self: { homepage = "https://github.com/laserpants/fuzzyset-haskell"; description = "Fuzzy set for approximate string matching"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fuzzytime" = callPackage @@ -77748,18 +78039,18 @@ self: { }) {}; "gedcom" = callPackage - ({ mkDerivation, array, base, bytestring, containers, megaparsec - , monad-loops, mtl, text-all, time + ({ mkDerivation, array, base, bytestring, containers, hspec + , megaparsec, monad-loops, mtl, text-all, time }: mkDerivation { pname = "gedcom"; - version = "0.1.0.0"; - sha256 = "099y6vgw81v31aijyl81hdijs5vry77jg4qy2gl8w7scn2zp2p58"; + version = "0.2.0.0"; + sha256 = "1hwjrljmwr7ywi213lxvfp6c98ydlxngr7hrhcx7ylngw165al7y"; libraryHaskellDepends = [ array base bytestring containers megaparsec monad-loops mtl text-all time ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec megaparsec text-all ]; homepage = "https://github.com/CLowcay/hs-gedcom"; description = "Parser for the GEDCOM genealogy file format"; license = stdenv.lib.licenses.bsd3; @@ -78076,6 +78367,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "general-games_1_1_1" = callPackage + ({ mkDerivation, base, hspec, HUnit, monad-loops, MonadRandom + , random, random-shuffle + }: + mkDerivation { + pname = "general-games"; + version = "1.1.1"; + sha256 = "1h2h6dbd12xzvgwm7a26scpjyfkcwkmpdkw98nkmb2vk8qsrx3lb"; + libraryHaskellDepends = [ + base monad-loops MonadRandom random random-shuffle + ]; + testHaskellDepends = [ base hspec HUnit MonadRandom ]; + homepage = "https://github.com/cgorski/general-games"; + description = "Library supporting simulation of a number of games"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "general-prelude" = callPackage ({ mkDerivation, base, lens, pointless-fun, strict, system-filepath }: @@ -78133,6 +78442,7 @@ self: { ]; description = "stringly-named getters for generic data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-aeson" = callPackage @@ -78685,8 +78995,8 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; - version = "0.7.5"; - sha256 = "17vjps2118s5z3k39ij00lkmkxv3mqf8h59wv6qdamlgmhyr36si"; + version = "0.7.6"; + sha256 = "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb"; libraryHaskellDepends = [ base mtl template-haskell ]; homepage = "https://github.com/danr/geniplate"; description = "Use Template Haskell to generate Uniplate-like functions"; @@ -79281,10 +79591,10 @@ self: { }: mkDerivation { pname = "geos"; - version = "0.1.0.0"; - sha256 = "02r9c063kkqalyadfqwhhwfb42kky7nkfp5k968l1qidyx6aha5j"; + version = "0.1.1.1"; + sha256 = "0z4kqlgqg016233f8smj6jzjd6n7cgsvyff0npnghv1gdlr9pfwc"; libraryHaskellDepends = [ - base bytestring cassava mtl transformers vector + base bytestring mtl transformers vector ]; librarySystemDepends = [ geos_c ]; testHaskellDepends = [ base bytestring cassava hspec mtl vector ]; @@ -79692,30 +80002,6 @@ self: { }: mkDerivation { pname = "ghc-exactprint"; - version = "0.5.5.0"; - sha256 = "0k3y39k1cwb3bs85333gj7fi6l5p9nr950vgzbyswgj13qb4g7b1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers directory filepath free ghc ghc-boot - ghc-paths mtl syb - ]; - testHaskellDepends = [ - base bytestring containers Diff directory filemanip filepath ghc - ghc-boot ghc-paths HUnit mtl silently syb - ]; - description = "ExactPrint for GHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "ghc-exactprint_0_5_6_0" = callPackage - ({ mkDerivation, base, bytestring, containers, Diff, directory - , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl - , silently, syb - }: - mkDerivation { - pname = "ghc-exactprint"; version = "0.5.6.0"; sha256 = "0fbq7p2kykqq2pzf0mld0brj3pdrgxb1zvpa05pqxsfs66czlbsg"; isLibrary = true; @@ -79848,6 +80134,7 @@ self: { homepage = "https://github.com/nomeata/ghc-justdoit"; description = "A magic typeclass that just does it"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-make" = callPackage @@ -80076,8 +80363,8 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.4.0.4"; - sha256 = "037g6ianbij9gx1324fbdmamqjkn6mmw9nvqh5bwpz33srf30lpn"; + version = "1.4.1"; + sha256 = "1jpf2pn37vgwqcnsm799g9s9d7qbxk9d305b6i2k12573cv1x8r4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80488,8 +80775,8 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.6.9"; - sha256 = "0bkhbzjjp4n97dsf8q4ggphsfh0rxwgdn4kmg8l87zbrih41gdpc"; + version = "0.6.10"; + sha256 = "1qqd619pwdlcxvkgfawsqq19a5kl1584ra35ib8769874i6y9awj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82435,27 +82722,6 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.1.2"; - sha256 = "0czc53xwg21jvd7g4ggjva0nzc2rpyf36rc4876dss9lckcc2p93"; - 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_1_3" = 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.1.3"; sha256 = "040yd8npjv54xfh4fv4i1p9x6qsa5qj1m5wblr7xjf0w090sblf0"; isLibrary = true; @@ -82468,7 +82734,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 @@ -83251,6 +83516,8 @@ self: { pname = "glirc"; version = "2.25"; sha256 = "1hh6zqkk1cm50n7d17i2490q2xh7hzy63krpj58rwhgpmn3ps5sb"; + revision = "1"; + editedCabalFile = "13bf4rcwik6lq4rv1ci9i01hpmvvbqd1xs7fixrk10qsjm31cakw"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -83782,6 +84049,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gmpint" = callPackage + ({ mkDerivation, base, recursion-schemes }: + mkDerivation { + pname = "gmpint"; + version = "0.1.0.4"; + sha256 = "023acr1a69b9r380zlk8bsgfjw0l4h381pk7bwar7mbv3zzsnmxn"; + libraryHaskellDepends = [ base recursion-schemes ]; + homepage = "https://github.com/vmchale/gmpint#readme"; + description = "GMP integer conversions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gnome-desktop" = callPackage ({ mkDerivation, base, directory, gconf, glib, gtk, random }: mkDerivation { @@ -86768,8 +87047,8 @@ self: { }: mkDerivation { pname = "graphql-api"; - version = "0.2.0"; - sha256 = "08hsrqh4v7fmkmilwnmxpii8iqkhc0affcv3mmjmp3my0qi79xrl"; + version = "0.3.0"; + sha256 = "1rn47xxyz3wkflz2ji0d496r8w0jcf1a0al14gclflbyd4bzkpwy"; libraryHaskellDepends = [ aeson attoparsec base containers exceptions ghc-prim protolude QuickCheck scientific text transformers @@ -86781,8 +87060,8 @@ self: { benchmarkHaskellDepends = [ attoparsec base criterion exceptions protolude transformers ]; - homepage = "https://github.com/jml/graphql-api#readme"; - description = "Sketch of GraphQL stuff"; + homepage = "https://github.com/haskell-graphql/graphql-api#readme"; + description = "GraphQL API"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -87665,6 +87944,7 @@ self: { ]; description = "Generic implementation of Storable"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gstreamer" = callPackage @@ -90166,8 +90446,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.3.0"; - sha256 = "13z78q36x28h7yn282k03568hj0lvava678d7hhhp5hrbk6ni8xv"; + version = "1.4.0"; + sha256 = "006mg9i15ldksydkr6c9wd7p7a3j0ia1bcxi96y9l66wp31hg36w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90858,6 +91138,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hakyll-dir-list" = callPackage + ({ mkDerivation, base, containers, filepath, hakyll }: + mkDerivation { + pname = "hakyll-dir-list"; + version = "0.1.1.0"; + sha256 = "0j5amghlsjdnvi4klag6ifwwzy05v17bsf7j6lzl32hcx66a62qb"; + libraryHaskellDepends = [ base containers filepath hakyll ]; + homepage = "http://github.com/freylax/hakyll-dir-list"; + description = "Allow Hakyll to create hierarchical menues from directories"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hakyll-elm" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, Elm, hakyll, mtl }: @@ -91597,8 +91889,8 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.3.5.1"; - sha256 = "1zpvwdq9dzfkq9jh1bpc5x8vh41508x0wph5a020q31rknc8llad"; + version = "0.3.5.2"; + sha256 = "0qabrvx93l8wmir4a0rg2iddsal455fx34vvdxj1ngbya25fspw4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -92182,25 +92474,6 @@ self: { }: mkDerivation { pname = "happstack-server-tls"; - version = "7.1.6.4"; - sha256 = "1wn0yv4x619sl70fy3ffby78lfjiq9d73d4rsp3mkgr6d3kn45wj"; - libraryHaskellDepends = [ - base bytestring extensible-exceptions happstack-server hslogger - HsOpenSSL network sendfile time unix - ]; - librarySystemDepends = [ openssl ]; - homepage = "http://www.happstack.com/"; - description = "extend happstack-server with https:// support (TLS/SSL)"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) openssl;}; - - "happstack-server-tls_7_1_6_5" = callPackage - ({ mkDerivation, base, bytestring, extensible-exceptions - , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile - , time, unix - }: - mkDerivation { - pname = "happstack-server-tls"; version = "7.1.6.5"; sha256 = "0hp13wxaghs6ldqpbpyf8agph7b1y488fc516z1n6bvbpzcbhbvq"; libraryHaskellDepends = [ @@ -92211,7 +92484,6 @@ self: { homepage = "http://www.happstack.com/"; description = "extend happstack-server with https:// support (TLS/SSL)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "happstack-server-tls-cryptonite" = callPackage @@ -92344,8 +92616,10 @@ self: { }: mkDerivation { pname = "happy"; - version = "1.19.8"; - sha256 = "186ky3bly0i3cc56qk3r7j7pxh2108aackq4n2lli7jmbnb3kxsd"; + version = "1.19.9"; + sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y"; + revision = "1"; + editedCabalFile = "1lm706nv64cvfi3ccg7hc3217642sg0z9f9xz2ivbpzvzwwn8gj6"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -93054,6 +93328,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hashids_1_0_2_4" = callPackage + ({ mkDerivation, base, bytestring, containers, split }: + mkDerivation { + pname = "hashids"; + version = "1.0.2.4"; + sha256 = "1kzkyni9hfwpvyq9rdv62iziwiax5avzd05ghsh7dgnylv41z697"; + libraryHaskellDepends = [ base bytestring containers split ]; + testHaskellDepends = [ base bytestring containers split ]; + homepage = "http://hashids.org/"; + description = "Hashids generates short, unique, non-sequential ids from numbers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashing" = callPackage ({ mkDerivation, array, base, bytestring, cryptonite, mtl , QuickCheck, template-haskell @@ -96370,6 +96658,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskyapi" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, containers + , directory, http-conduit, markdown, mtl, network, parsec + , persistent, persistent-sqlite, persistent-template, split + , tagsoup, text, time, utf8-string + }: + mkDerivation { + pname = "haskyapi"; + version = "0.0.0.2"; + sha256 = "1s5krzzmrl8p97xg8p1dimijqmyjbrdfm4i0dpp7jiipj2hzvqyq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-html bytestring containers directory http-conduit + markdown mtl network parsec persistent persistent-sqlite + persistent-template split tagsoup text time utf8-string + ]; + executableHaskellDepends = [ + aeson base blaze-html bytestring containers directory http-conduit + markdown mtl network parsec persistent persistent-sqlite + persistent-template split tagsoup text time utf8-string + ]; + testHaskellDepends = [ + aeson base blaze-html bytestring containers directory http-conduit + markdown mtl network parsec persistent persistent-sqlite + persistent-template split tagsoup text time utf8-string + ]; + homepage = "https://github.com/okue/haskyapi#readme"; + description = "HTTP server"; + license = stdenv.lib.licenses.mit; + }) {}; + "haslo" = callPackage ({ mkDerivation, base, mtl, old-time, QuickCheck, time, wtk }: mkDerivation { @@ -96510,23 +96830,22 @@ self: { }) {}; "hasql-class" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant - , data-default-class, doctest, generics-eot, Glob, hasql, hspec - , process, QuickCheck, quickcheck-instances, string-qq, text, time - , vector, yaml + ({ mkDerivation, base, bytestring, contravariant + , data-default-class, generics-eot, hasql, hspec, process + , QuickCheck, quickcheck-instances, string-qq, text, time, vector }: mkDerivation { pname = "hasql-class"; - version = "0.0.1.0"; - sha256 = "10d61avgsma6104d1bh3sfs1i4hrbpr0rhb7ihgi43xshg6wjvgl"; + version = "0.1.0.0"; + sha256 = "00va6klddkkr60zl9i9mx7lmryn71qbc4qfhw4q8fcwbw69bzc0f"; libraryHaskellDepends = [ base bytestring contravariant data-default-class generics-eot hasql text time vector ]; testHaskellDepends = [ - base bytestring containers contravariant data-default-class doctest - generics-eot Glob hasql hspec process QuickCheck - quickcheck-instances string-qq text time vector yaml + base bytestring contravariant data-default-class generics-eot hasql + hspec process QuickCheck quickcheck-instances string-qq text time + vector ]; homepage = "http://github.com/turingjump/hasql-class#readme"; description = "Encodable and Decodable classes for hasql"; @@ -96774,6 +97093,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hasql-transaction_0_6" = callPackage + ({ mkDerivation, async, base, base-prelude, bytestring + , bytestring-tree-builder, contravariant, contravariant-extras + , hasql, mtl, rebase, transformers + }: + mkDerivation { + pname = "hasql-transaction"; + version = "0.6"; + sha256 = "00dxm78wscj88zb6wbyg48ps4a5cc41jbbknjrmxlgp0iw4hr06b"; + 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 @@ -98473,22 +98812,23 @@ self: { ({ mkDerivation, ansi-terminal, async, base, bytestring , concurrent-output, containers, directory, exceptions , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive - , random, resourcet, stm, template-haskell, text, th-lift, time - , transformers, transformers-base, unix, wl-pprint-annotated + , random, resourcet, semigroups, stm, template-haskell, text + , th-lift, time, transformers, transformers-base, unix + , wl-pprint-annotated }: mkDerivation { pname = "hedgehog"; - version = "0.5.1"; - sha256 = "0fx3dq45azxrhihhq6hlb89zkj3y8fmnfdrsz1wbvih9a3dhiwx7"; + version = "0.5.2"; + sha256 = "1nl6q4hlsqbwqjk3ywpd6hdyi3qyz34agrp9533lmkx7120jfblh"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers directory exceptions lifted-async mmorph monad-control mtl - pretty-show primitive random resourcet stm template-haskell text - th-lift time transformers transformers-base unix - wl-pprint-annotated + pretty-show primitive random resourcet semigroups stm + template-haskell text th-lift time transformers transformers-base + unix wl-pprint-annotated ]; testHaskellDepends = [ - base containers pretty-show text transformers + base containers pretty-show semigroups text transformers ]; homepage = "https://hedgehog.qa"; description = "Hedgehog will eat all your bugs"; @@ -102186,8 +102526,8 @@ self: { pname = "hledger-iadd"; version = "1.3.1"; sha256 = "0z7f9bm7xkq8a9kbhf3bd6fxhfaab08ddgghpbg5z460l4lhcczv"; - revision = "1"; - editedCabalFile = "1kwncys0n2xbvbq6a5rgfxg955726xk8av6v9221qx8zpndf2di4"; + revision = "2"; + editedCabalFile = "03cc91bzxmk3hffkmda3w87rgwarpdjbs1kwafix65avhw03g7ga"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102454,8 +102794,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.0.15"; - sha256 = "0k9y9dj9sq8rwkjnca4s6wv0ncba536lmcpq10vpyvy47x5dzs2d"; + version = "2.1"; + sha256 = "13chm0dhh1fn2iy3flnh7ahc3yzh8q0v10qxwd1739sywhykayg9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -102631,6 +102971,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openblasCompat;}; + "hmatrix-backprop" = callPackage + ({ mkDerivation, ANum, backprop, base, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog + , hmatrix, hmatrix-vector-sized, microlens, microlens-platform + , vector, vector-sized + }: + mkDerivation { + pname = "hmatrix-backprop"; + version = "0.1.0.0"; + sha256 = "088spv7149788iwda2pyf6fc9i40vq4dfziqldgxjrnngxw9z8iv"; + libraryHaskellDepends = [ + ANum backprop base ghc-typelits-knownnat ghc-typelits-natnormalise + hmatrix hmatrix-vector-sized microlens vector vector-sized + ]; + testHaskellDepends = [ + backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized + microlens microlens-platform vector-sized + ]; + homepage = "https://github.com/mstksg/hmatrix-backprop#readme"; + description = "hmatrix operations lifted for backprop"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hmatrix-banded" = callPackage ({ mkDerivation, base, hmatrix, liblapack, transformers }: mkDerivation { @@ -102872,6 +103235,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hmatrix-vector-sized" = callPackage + ({ mkDerivation, base, ghc-typelits-knownnat, hedgehog, hmatrix + , vector, vector-sized + }: + mkDerivation { + pname = "hmatrix-vector-sized"; + version = "0.1.1.0"; + sha256 = "079vq2n3w3f32dnlyxa8kn6dif0dd6nr8n1g9lnfw0d339cxqklb"; + libraryHaskellDepends = [ base hmatrix vector vector-sized ]; + testHaskellDepends = [ + base ghc-typelits-knownnat hedgehog hmatrix vector vector-sized + ]; + homepage = "https://github.com/mstksg/hmatrix-vector-sized#readme"; + description = "Conversions between hmatrix and vector-sized types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hmeap" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-lexing , delimited-text, parsec @@ -103350,15 +103730,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoauth2_1_6_2" = callPackage + "hoauth2_1_6_3" = 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.6.2"; - sha256 = "185yia9mdjhmhian83rrd0hm3wjpja7hawnyvzq25rnhh2g4l2ay"; + version = "1.6.3"; + sha256 = "165xaw7k8ii9g8ig0ifvs8c76q2s760n8g0hxyhhprz1gj586913"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103474,10 +103854,11 @@ self: { }: mkDerivation { pname = "hocker"; - version = "1.0.4"; - sha256 = "1lf8m6cd54vc436krl3j4kanmnd86r4ri45a1qp7y4qqlpplcnpf"; + version = "1.0.5"; + sha256 = "0xv22kiw44y72asrnk027h9gxpfhjzgdm8sbcy70s4ipn8n62hha"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-wl-pprint async base bytestring concurrentoutput containers cryptonite data-fix deepseq directory @@ -104809,19 +105190,19 @@ self: { }) {}; "hourglass" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, mtl - , old-locale, tasty, tasty-hunit, tasty-quickcheck, time + ({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale + , tasty, tasty-hunit, tasty-quickcheck, time }: mkDerivation { pname = "hourglass"; - version = "0.2.10"; - sha256 = "104d1yd84hclprg740nkz60vx589mnm094zriw6zczbgg8nkclym"; + version = "0.2.11"; + sha256 = "0lag9sgj7ndrbfmab6jhszlv413agg0zzaj5r9f2fmf07wqbp9hq"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time ]; benchmarkHaskellDepends = [ - base bytestring criterion deepseq mtl old-locale time + base bytestring deepseq gauge mtl old-locale time ]; homepage = "https://github.com/vincenthz/hs-hourglass"; description = "simple performant time related library"; @@ -105018,7 +105399,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hpack_0_24_0" = callPackage + "hpack_0_25_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec , http-client, http-client-tls, http-types, HUnit, interpolate @@ -105027,8 +105408,10 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.24.0"; - sha256 = "074pzminhv59br5w2xy3d8mhi2cwj5m10lwlqkq990w0gfcfhy46"; + version = "0.25.0"; + sha256 = "0nz8hrfw59pcd685qqkhikwwzrg5aaiynlxlsga8gqfzx0gsjwip"; + revision = "1"; + editedCabalFile = "0z4bnrikf4mnf9slij1f58y2lkayag5ni1s027rimayjgpdigds1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105097,8 +105480,8 @@ self: { pname = "hpack-dhall"; version = "0.1.0"; sha256 = "1yz1ypq88lmxdz9728w8q0ag1whwzlkwcdvx8dhyav5k3ifgp2x0"; - revision = "1"; - editedCabalFile = "1432yrvrd0dlnn4lzyb4s5akvb85mx0anbxd1j9b4l1zl37d2bmn"; + revision = "2"; + editedCabalFile = "15h2891c34qhxqj9rv90662fq8r7dsp4skmmxpk88gcqvs9fl084"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105111,6 +105494,7 @@ self: { homepage = "https://github.com/sol/hpack-dhall#readme"; description = "Dhall support for Hpack"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpaco" = callPackage @@ -105366,45 +105750,14 @@ self: { "hpio" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory - , doctest, exceptions, filepath, hlint, hspec, monad-control - , monad-logger, mtl, optparse-applicative, protolude, QuickCheck - , text, transformers, transformers-base, unix, unix-bytestring - }: - mkDerivation { - pname = "hpio"; - version = "0.9.0.3"; - sha256 = "0cz7dxxxxfr142gr3hrq1k1x8axdgvyw7bsjsd1v9spka2i03rcd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers directory exceptions filepath - monad-control monad-logger mtl protolude QuickCheck text - transformers transformers-base unix unix-bytestring - ]; - executableHaskellDepends = [ - async base exceptions mtl optparse-applicative protolude text - transformers - ]; - testHaskellDepends = [ - base containers directory doctest exceptions filepath hlint hspec - protolude QuickCheck - ]; - homepage = "https://github.com/quixoftic/hpio#readme"; - description = "Monads for GPIO in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hpio_0_9_0_4" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory , doctest, exceptions, filepath, hspec, monad-control, monad-logger , mtl, optparse-applicative, protolude, QuickCheck, text , transformers, transformers-base, unix, unix-bytestring }: mkDerivation { pname = "hpio"; - version = "0.9.0.4"; - sha256 = "18j60xiwh18s01bbapi95h8g6ixr9brqh375qlhg600cgf0yzirx"; + version = "0.9.0.5"; + sha256 = "0k1n2la7c5ld13nr0j2hc1ia2i9gy4aacs2cna4rkmcnyamgg38i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105587,6 +105940,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hprotoc_2_4_7" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , directory, filepath, haskell-src-exts, mtl, parsec + , protocol-buffers, protocol-buffers-descriptor, utf8-string + }: + mkDerivation { + pname = "hprotoc"; + version = "2.4.7"; + sha256 = "0rbifp2n2vb2bhk8wgdkmp0q2dqv7vlcwsqgpl8b7xhkfn706ps5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath + haskell-src-exts mtl parsec protocol-buffers + protocol-buffers-descriptor utf8-string + ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ + array base binary bytestring containers directory filepath + haskell-src-exts mtl parsec protocol-buffers + protocol-buffers-descriptor utf8-string + ]; + executableToolDepends = [ alex ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Parse Google Protocol Buffer specifications"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hprotoc-fork" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , directory, filepath, haskell-src-exts, mtl, parsec @@ -106558,27 +106940,29 @@ self: { "hs2ats" = callPackage ({ mkDerivation, ansi-wl-pprint, base, cases, composition-prelude - , criterion, deepseq, haskell-src-exts, hspec, hspec-dirstream - , language-ats, lens, optparse-generic, system-filepath, text + , cpphs, criterion, deepseq, haskell-src-exts, hspec + , hspec-dirstream, language-ats, lens, optparse-generic + , system-filepath, text }: mkDerivation { pname = "hs2ats"; - version = "0.2.0.4"; - sha256 = "0yji8np53qgwfhmamfkmc4bbvkivwhrkjrwr9aqly9gyadbsw89m"; + version = "0.2.1.5"; + sha256 = "0jxyj9pggs4m2ypw12z5xjrc5r0cq5gxi3dllbmvvablxlwzfkv1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base cases composition-prelude deepseq + ansi-wl-pprint base cases composition-prelude cpphs deepseq haskell-src-exts language-ats lens optparse-generic text ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base hspec hspec-dirstream language-ats system-filepath + base hspec hspec-dirstream system-filepath ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/vmchale/hs2ats#readme"; description = "Create ATS types from Haskell types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs2bf" = callPackage @@ -107440,8 +107824,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.3.1.1"; - sha256 = "1bj9zhkikspf73xha8vcx3ads5fp33f1ail0fns9iyra5zl0g612"; + version = "0.3.1.2"; + sha256 = "1abwv4987xznfv6sx8sfhk04f4s7dpjvgzwzjzi8rwxibm8az09p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107504,23 +107888,6 @@ self: { ({ mkDerivation, adns, base, containers, network }: mkDerivation { pname = "hsdns"; - version = "1.7"; - sha256 = "1lsw422k64b8m7s98j1i6qxll1kyzpv3bb0a2wwf7lghw74hm5j8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers network ]; - librarySystemDepends = [ adns ]; - executableHaskellDepends = [ base network ]; - homepage = "http://github.com/peti/hsdns"; - description = "Asynchronous DNS Resolver"; - license = stdenv.lib.licenses.lgpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) adns;}; - - "hsdns_1_7_1" = callPackage - ({ mkDerivation, adns, base, containers, network }: - mkDerivation { - pname = "hsdns"; version = "1.7.1"; sha256 = "0i50p31zxsrkx9hv3mqcl2042lf922b1fsswmd99d66ybkl01kag"; isLibrary = true; @@ -107530,7 +107897,6 @@ self: { homepage = "http://github.com/peti/hsdns"; description = "Asynchronous DNS Resolver"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) adns;}; @@ -108098,6 +108464,7 @@ self: { testHaskellDepends = [ aeson base bytestring colour containers ]; description = "HSLuv conversion utility"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsmagick" = callPackage @@ -108146,6 +108513,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsmodetweaks" = callPackage + ({ mkDerivation, base, containers, directory, hpack, protolude + , text + }: + mkDerivation { + pname = "hsmodetweaks"; + version = "0.1.0.1"; + sha256 = "1nwmfd6wvwis58z97amgzix42mcqj5nsj915593w2cw7j5sv5y17"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers directory hpack protolude text + ]; + homepage = "https://github.com/mwotton/scriptable/#hsmodetweaks"; + description = "Tool for generating .dir-locals.el for intero"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsmtpclient" = callPackage ({ mkDerivation, array, base, directory, network, old-time }: mkDerivation { @@ -108450,15 +108835,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec_2_4_7" = callPackage + "hspec_2_4_8" = callPackage ({ mkDerivation, base, call-stack, directory, hspec-core , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck , stringbuilder, transformers }: mkDerivation { pname = "hspec"; - version = "2.4.7"; - sha256 = "1jvf7x43gkch4b8nxqdascqlh4rh2d1qvl44skwqkz0gw154ldan"; + version = "2.4.8"; + sha256 = "18pddkfz661b1nr1nziq8cnmlzxiqzzmrcrk3iwn476vi3bf1m4l"; libraryHaskellDepends = [ base call-stack hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -108549,25 +108934,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-core_2_4_7" = callPackage - ({ mkDerivation, ansi-terminal, array, async, base, call-stack - , deepseq, directory, filepath, hspec-expectations, hspec-meta - , HUnit, process, QuickCheck, quickcheck-io, random, setenv - , silently, temporary, tf-random, time, transformers + "hspec-core_2_4_8" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq + , directory, filepath, hspec-expectations, hspec-meta, HUnit + , process, QuickCheck, quickcheck-io, random, setenv, silently, stm + , temporary, tf-random, time, transformers }: mkDerivation { pname = "hspec-core"; - version = "2.4.7"; - sha256 = "0syjbx3s62shwddp75qj0nfwmfjn0yflja4bh23x161xpx1g0igx"; + version = "2.4.8"; + sha256 = "02zr6n7mqdncvf1braf38zjdplaxrkg11x9k8717k4yg57585ji4"; libraryHaskellDepends = [ - ansi-terminal array async base call-stack deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv tf-random time transformers + ansi-terminal array base call-stack deepseq directory filepath + hspec-expectations HUnit QuickCheck quickcheck-io random setenv stm + tf-random time transformers ]; testHaskellDepends = [ - ansi-terminal array async base call-stack deepseq directory - filepath hspec-expectations hspec-meta HUnit process QuickCheck - quickcheck-io random setenv silently temporary tf-random time + ansi-terminal array base call-stack deepseq directory filepath + hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently stm temporary tf-random time transformers ]; testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; @@ -108612,13 +108997,13 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-discover_2_4_7" = callPackage + "hspec-discover_2_4_8" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.4.7"; - sha256 = "1cgj6c6f5vpn36jg2j7v80nr87x1dsf7qyvxvjw8qimjdxrcx0ba"; + version = "2.4.8"; + sha256 = "0llwdfpjgfpi7dr8caw0fldb9maqznmqh4awkvx72bz538gqmlka"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -109982,25 +110367,6 @@ self: { }: mkDerivation { pname = "hsx2hs"; - version = "0.14.1.1"; - sha256 = "0hymdradb2vsx7gpdwrlmkv1qg4p2r5l6pfiqc4ijyn152jrgr7b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring haskell-src-exts haskell-src-meta mtl - template-haskell utf8-string - ]; - homepage = "https://github.com/seereason/hsx2hs"; - description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hsx2hs_0_14_1_2" = callPackage - ({ mkDerivation, base, bytestring, haskell-src-exts - , haskell-src-meta, mtl, template-haskell, utf8-string - }: - mkDerivation { - pname = "hsx2hs"; version = "0.14.1.2"; sha256 = "06j2nc2yg8a8pp3c2ayxrm76fj2w2w5d2ilq91hvwwb1ikrklg5b"; isLibrary = true; @@ -110012,7 +110378,6 @@ self: { homepage = "https://github.com/seereason/hsx2hs"; description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsyscall" = callPackage @@ -110314,6 +110679,7 @@ self: { homepage = "https://github.com/nikita-volkov/html-entities"; description = "A codec library for HTML-escaped text and HTML-entities"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "html-entity-map" = callPackage @@ -110403,8 +110769,8 @@ self: { }: mkDerivation { pname = "html-tokenizer"; - version = "0.6.3"; - sha256 = "0vwjqv2fqz63ip6q2j62f54phcyrdwghsbs4c4ziz7dh35nh4ahx"; + version = "0.6.4"; + sha256 = "1ws1y05qxyz5zx3y7lwj10giiviqzlka9h2bqj4y3wpzjdbrd4rk"; libraryHaskellDepends = [ attoparsec base base-prelude html-entities semigroups text text-builder vector vector-builder @@ -110649,34 +111015,6 @@ self: { "http-api-data" = callPackage ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring , Cabal, cabal-doctest, containers, directory, doctest, filepath - , hashable, hspec, http-types, HUnit, QuickCheck - , quickcheck-instances, text, time, time-locale-compat - , unordered-containers, uri-bytestring, uuid, uuid-types - }: - mkDerivation { - pname = "http-api-data"; - version = "0.3.7.1"; - sha256 = "1zbmf0kkfsw7pfznisi205gh7jd284gfarxsyiavd2iw26akwqwc"; - revision = "1"; - editedCabalFile = "0g57k71bssf81yba6xf9fcxlys8m5ax5kvrs4gvckahf5ihdxds6"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - attoparsec attoparsec-iso8601 base bytestring containers hashable - http-types text time time-locale-compat unordered-containers - uri-bytestring uuid-types - ]; - testHaskellDepends = [ - base bytestring directory doctest filepath hspec HUnit QuickCheck - quickcheck-instances text time unordered-containers uuid - ]; - homepage = "http://github.com/fizruk/http-api-data"; - description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-api-data_0_3_7_2" = callPackage - ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring - , Cabal, cabal-doctest, containers, directory, doctest, filepath , hashable, hspec, hspec-discover, http-types, HUnit, QuickCheck , quickcheck-instances, text, time, time-locale-compat , unordered-containers, uri-bytestring, uuid, uuid-types @@ -110699,7 +111037,6 @@ self: { homepage = "http://github.com/fizruk/http-api-data"; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-attoparsec" = callPackage @@ -110724,35 +111061,6 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.9"; - sha256 = "0bccpvinzc7z5v83grjzvd3g3kdz2q5h2206l7x9jh4bvz9prblf"; - libraryHaskellDepends = [ - array base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie deepseq exceptions filepath - ghc-prim http-types mime-types network network-uri random stm - streaming-commons text time transformers - ]; - testHaskellDepends = [ - async base base64-bytestring blaze-builder bytestring - case-insensitive containers deepseq directory hspec http-types - monad-control network network-uri streaming-commons text time - transformers zlib - ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "An HTTP client engine"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client_0_5_10" = callPackage - ({ mkDerivation, array, async, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , deepseq, directory, exceptions, filepath, ghc-prim, hspec - , http-types, mime-types, monad-control, network, network-uri - , random, stm, streaming-commons, text, time, transformers, zlib - }: - mkDerivation { - pname = "http-client"; version = "0.5.10"; sha256 = "1hmshs97smigqy334rfkgv3vri5fas3cj8zz2gqlby9jsrp6kygm"; libraryHaskellDepends = [ @@ -110771,7 +111079,6 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-auth" = callPackage @@ -110926,37 +111233,14 @@ self: { "http-client-tls" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, connection - , containers, criterion, cryptonite, data-default-class, exceptions - , hspec, http-client, http-types, memory, network, network-uri - , text, tls, transformers - }: - mkDerivation { - pname = "http-client-tls"; - version = "0.3.5.1"; - sha256 = "0n4mi8z77qaggfyq17z79cl304nf1f4h6gag60v4wjwghvmj7yn1"; - libraryHaskellDepends = [ - base bytestring case-insensitive connection containers cryptonite - data-default-class exceptions http-client http-types memory network - network-uri text tls transformers - ]; - testHaskellDepends = [ base hspec http-client http-types ]; - benchmarkHaskellDepends = [ base criterion http-client ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "http-client backend using the connection package and tls library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client-tls_0_3_5_2" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, connection , containers, cryptonite, data-default-class, exceptions, gauge , hspec, http-client, http-types, memory, network, network-uri , text, tls, transformers }: mkDerivation { pname = "http-client-tls"; - version = "0.3.5.2"; - sha256 = "1ynkwm77sb7djfflnz7v6gfli8zh1sdw4yjqpnb74slrh112ngh9"; + version = "0.3.5.3"; + sha256 = "0qj3pcpgbsfsc4m52dz35khhl4hf1i0nmcpa445z82d9567vy6j7"; libraryHaskellDepends = [ base bytestring case-insensitive connection containers cryptonite data-default-class exceptions http-client http-types memory network @@ -110970,7 +111254,6 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "http-client backend using the connection package and tls library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-common" = callPackage @@ -111282,8 +111565,8 @@ self: { }: mkDerivation { pname = "http-media"; - version = "0.7.1.1"; - sha256 = "0k58368im14jwsd4wpyw9kl166zbi14ccl3adjigx8yf8k61n7zz"; + version = "0.7.1.2"; + sha256 = "01vvrd6yb2aykha7y1c13ylnkyws2wy68vqbdb7kmbzwbdxdb4zy"; libraryHaskellDepends = [ base bytestring case-insensitive containers utf8-string ]; @@ -112010,8 +112293,8 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "human-parse"; - version = "0.1.0.2"; - sha256 = "1p7r26b3845fbdp2lxv6pqbqrlfzna8qsh7k3b1rkj3qlbw64rym"; + version = "0.1.0.3"; + sha256 = "0lr2m5gci1k0x7w1i49cb6nhbnnkym4raaagn916ahf79y05jv7d"; libraryHaskellDepends = [ base text ]; homepage = "https://github.com/chris-martin/human"; description = "A lawless typeclass for parsing text entered by humans"; @@ -112037,8 +112320,8 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "human-text"; - version = "0.1.0.2"; - sha256 = "1jq9ksszwiy0bddw5c0zx037ig0gvsc5k030h6znkvmkpcvg096q"; + version = "0.1.0.3"; + sha256 = "0v6wrs9mcmiwk9ladjcibw1yqpbbl0y6v9i3ni39v0byby0a2zpa"; libraryHaskellDepends = [ base text ]; homepage = "https://github.com/chris-martin/human"; description = "A lawless typeclass for converting values to human-friendly text"; @@ -112754,13 +113037,13 @@ self: { "hw-kafka-client" = callPackage ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers - , either, hspec, monad-loops, rdkafka, regex-posix, temporary - , transformers, unix + , either, hspec, monad-loops, rdkafka, temporary, transformers + , unix }: mkDerivation { pname = "hw-kafka-client"; - version = "2.3.1"; - sha256 = "0sjr3xqpx47lwzm6kk1rjinc9k39i9zjm74160ly9i68gnjgx69i"; + version = "2.3.3"; + sha256 = "14g0mqwj6fr8sdq62sljzih0a9km1hxqm1zqmr9jv58znmj9f2x1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112773,7 +113056,6 @@ self: { ]; testHaskellDepends = [ base bifunctors bytestring containers either hspec monad-loops - regex-posix ]; homepage = "https://github.com/haskell-works/hw-kafka-client"; description = "Kafka bindings for Haskell"; @@ -115269,8 +115551,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "ihs"; - version = "0.1.0.1"; - sha256 = "0q7wa5pgf4ga7pmjwjxacqmdbhqricsv9xkzfrcg314lag8wvdgb"; + version = "0.1.0.2"; + sha256 = "0cprv8g7kz07s5954020ac9yfggf3d2wmwp4xa61q4sz5rs7wiwq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process ]; @@ -116265,6 +116547,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "indexed-list-literals" = callPackage + ({ mkDerivation, base, OneTuple }: + mkDerivation { + pname = "indexed-list-literals"; + version = "0.1.0.1"; + sha256 = "1l38x0s90gfsrfz43k9sx0xbv4pg93m2pfm6hy3rk52wdxrw0qad"; + libraryHaskellDepends = [ base OneTuple ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/davidm-d/indexed-list-literals"; + description = "Type safe indexed list literals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "indextype" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -116470,37 +116765,6 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.2.2.2"; - sha256 = "18aijaz7lv64zqkpydmny8nga48fg5lsbmphlk7b92hcfbp8vw4f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clock containers foldl http-client - http-types lens network optional-args scientific text time - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring containers foldl http-client lens mwc-random - network optional-args text time vector - ]; - testHaskellDepends = [ - base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck - tasty-th text vector - ]; - homepage = "https://github.com/maoe/influxdb-haskell"; - description = "Haskell client library for InfluxDB"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "influxdb_1_2_2_3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, clock - , containers, foldl, http-client, http-types, HUnit, lens, mtl - , mwc-random, network, optional-args, scientific, tasty - , tasty-hunit, tasty-quickcheck, tasty-th, text, time - , unordered-containers, vector - }: - mkDerivation { - pname = "influxdb"; version = "1.2.2.3"; sha256 = "14454644vlkyd27ywhsvkczxdxdwqkl917zcb51ay68gdnrrwm1i"; isLibrary = true; @@ -116521,7 +116785,6 @@ self: { homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -117312,18 +117575,20 @@ self: { "intero" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, ghc, ghc-boot-th, ghc-paths, ghci, haskeline, hspec - , process, regex-compat, syb, temporary, time, transformers, unix + , network, process, random, regex-compat, syb, temporary, time + , transformers, unix }: mkDerivation { pname = "intero"; - version = "0.1.24"; - sha256 = "022ad802z5h55az357047sf6fngp08by7ms71r2kiqkzbccldqgv"; + version = "0.1.26"; + sha256 = "1f00ma72hmhb3cd9pfhkcks3878ni690bcqw53lrbp6f6b4r5p5v"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot-th - ghc-paths ghci haskeline process syb time transformers unix + ghc-paths ghci haskeline network process random syb time + transformers unix ]; testHaskellDepends = [ base directory filepath hspec process regex-compat temporary @@ -118297,17 +118562,17 @@ self: { "irc-client" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, containers , contravariant, exceptions, irc-conduit, irc-ctcp, mtl - , network-conduit-tls, old-locale, profunctors, stm, stm-conduit + , network-conduit-tls, old-locale, profunctors, stm, stm-chans , text, time, tls, transformers, x509, x509-store, x509-validation }: mkDerivation { pname = "irc-client"; - version = "1.0.1.0"; - sha256 = "0c0vzmzpryjfv22kxinnqjf7rkj51dz7shi1gn8ivgcmnhf9hl57"; + version = "1.0.1.1"; + sha256 = "1d5xy2q5pkyn4i6d9myw27wr75xci05s446l23kdjli2ldh0g4nx"; libraryHaskellDepends = [ base bytestring conduit connection containers contravariant exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale - profunctors stm stm-conduit text time tls transformers x509 + profunctors stm stm-chans text time tls transformers x509 x509-store x509-validation ]; homepage = "https://github.com/barrucadu/irc-client"; @@ -118355,8 +118620,8 @@ self: { }: mkDerivation { pname = "irc-conduit"; - version = "0.2.2.4"; - sha256 = "118ksbf8kh0bmwk5m32qv609kggwssm3a56zc14f8bg67bkdkrc4"; + version = "0.2.2.5"; + sha256 = "1f9dvs4z15wym2a7dpm9h7m3ffpj8d089k6q28my6yx10mi93ksj"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls profunctors text time tls transformers @@ -118367,15 +118632,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "irc-conduit_0_3_0_0" = callPackage + "irc-conduit_0_3_0_1" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text , time, tls, transformers, x509-validation }: mkDerivation { pname = "irc-conduit"; - version = "0.3.0.0"; - sha256 = "166p6a3kxrr2cgkdw39pdkc9myzn60411bpg2v23bs01np0336j4"; + version = "0.3.0.1"; + sha256 = "0lividbrrc2yydqp55xqji8q6wigb49skrzw9vki6iivxcszka5h"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls profunctors text time tls transformers @@ -118395,6 +118660,8 @@ self: { pname = "irc-core"; version = "2.3.0"; sha256 = "08nbdnszdakbam1x0fps3n3ziqv21d8ndhmrc7za69pm97wkicjf"; + revision = "1"; + editedCabalFile = "1cqc9as84bckjh6yjcfh3pkj11sw35bkj848wzcv6qwjcn8kvcv9"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -118427,8 +118694,8 @@ self: { pname = "irc-dcc"; version = "2.0.1"; sha256 = "1pyj4ngh6rw0k1cd9nlrhwb6rr3jmpiwaxs6crik8gbl6f3s4234"; - revision = "5"; - editedCabalFile = "1m0p5pyaghwjz9rwh4jmm02hrax2yz4z0nlgjij8673hjr8ggdzz"; + revision = "6"; + editedCabalFile = "0fcgif6mcmp97plvvf1daiizwg2h9bniya50ldfd6ya932yh8b3c"; libraryHaskellDepends = [ attoparsec base binary bytestring io-streams iproute irc-ctcp mtl network path safe-exceptions transformers utf8-string @@ -118570,20 +118837,21 @@ self: { "iri" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring - , contravariant, ip, profunctors, ptr, punycode, QuickCheck - , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, text-builder, th-lift - , th-lift-instances, unordered-containers, vector, vector-builder + , contravariant, hashable, ip, profunctors, ptr, punycode + , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text + , text-builder, th-lift, th-lift-instances, unordered-containers + , vector, vector-builder, vector-instances }: mkDerivation { pname = "iri"; - version = "0.3"; - sha256 = "008ydrls1gyh0jvcjc51zlgzbkq7ajd8pvyfc4zqgprv9naym9zm"; + version = "0.3.3"; + sha256 = "10apl3d1rxc36i50zvfigwqfdk79rg15ir0ga7x9bxa8kjy6szp1"; libraryHaskellDepends = [ - attoparsec base base-prelude bug bytestring contravariant ip - profunctors ptr punycode semigroups template-haskell text + attoparsec base base-prelude bug bytestring contravariant hashable + ip profunctors ptr punycode semigroups template-haskell text text-builder th-lift th-lift-instances unordered-containers vector - vector-builder + vector-builder vector-instances ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -119917,16 +120185,17 @@ self: { "jbi" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, Cabal, directory - , filepath, optparse-applicative, process, tagged, text + , filepath, monad-parallel, optparse-applicative, process, tagged + , text }: mkDerivation { pname = "jbi"; - version = "0.1.0.0"; - sha256 = "13jswxfka5v8n2sdxg0p75ykhgvb351cih2zlid8x05lpiqlw87c"; + version = "0.2.0.0"; + sha256 = "0h08p1lra76yx0grxr08z2q83al1yn4a8rbpcahpz47cxxydwry4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base Cabal directory filepath process tagged + aeson base Cabal directory filepath monad-parallel process tagged ]; executableHaskellDepends = [ aeson-pretty base optparse-applicative text @@ -120689,6 +120958,8 @@ self: { pname = "json-autotype"; version = "1.0.18"; sha256 = "0h2aiq7k6s2qw81mrj77i86vfaci0387cwm6lbfzfag3r4993w7h"; + revision = "1"; + editedCabalFile = "0f67frvi5jsn47w02kqi834mkjy4kz451fic5m4i24lyykw19kvm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121521,6 +121792,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "judge" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , bytestring, containers, directory, filepath, mtl + , optparse-applicative, pointedlist, terminal-size, texmath, text + , transformers, unordered-containers, utf8-string, vector, yaml + }: + mkDerivation { + pname = "judge"; + version = "0.1.2.0"; + sha256 = "14lrqrzw70cjzz0skihh9w9kfgah6rb7023dbgmcqbx0m8xjiiaw"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base bytestring containers mtl + pointedlist terminal-size texmath text transformers + unordered-containers utf8-string vector yaml + ]; + executableHaskellDepends = [ + ansi-wl-pprint attoparsec base directory filepath + optparse-applicative text unordered-containers yaml + ]; + homepage = "https://github.com/slakkenhuis/judge#readme"; + description = "Tableau-based theorem prover"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "judy" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, hspec, Judy , QuickCheck @@ -121565,8 +121864,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.3.1"; - sha256 = "0dg54vbn9cxcskyc92grz39zp863ki6da8kwdz0nfkfm5xzsxlrs"; + version = "0.3.2"; + sha256 = "098vli26hrgkjxw3y1sfc7fi3wj72ka1dqy1k49z22rigisffbwj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121652,6 +121951,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "justified-containers_0_3_0_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, QuickCheck + , roles, should-not-typecheck + }: + mkDerivation { + pname = "justified-containers"; + version = "0.3.0.0"; + sha256 = "11ryff281gbn46zz7vax97h0qn5xn1mk7gdjpb38xs9ns36c0c6q"; + libraryHaskellDepends = [ base containers roles ]; + testHaskellDepends = [ + base containers ghc-prim hspec QuickCheck should-not-typecheck + ]; + homepage = "https://github.com/matt-noonan/justified-containers"; + description = "Keyed container types with type-checked proofs of key presence"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jvm" = callPackage ({ mkDerivation, base, bytestring, choice, constraints, criterion , deepseq, distributed-closure, exceptions, hspec, jni, singletons @@ -122240,39 +122557,6 @@ self: { }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.4.0.3"; - sha256 = "0aji0738dz7i0lry30y6rpfbhvcpc79mfqc77nlvaplb3plw0m51"; - libraryHaskellDepends = [ - aeson async base bloodhound bytestring enclosed-exceptions - exceptions http-client http-types katip retry scientific stm - stm-chans text time transformers unordered-containers uuid - ]; - testHaskellDepends = [ - aeson base bloodhound bytestring containers http-client http-types - katip lens lens-aeson quickcheck-instances scientific stm tagged - tasty tasty-hunit tasty-quickcheck text time transformers - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - 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; - }) {}; - - "katip-elasticsearch_0_4_0_4" = callPackage - ({ mkDerivation, aeson, async, base, bloodhound, bytestring - , containers, criterion, deepseq, enclosed-exceptions, exceptions - , http-client, http-types, katip, lens, lens-aeson - , 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.4"; sha256 = "0zg0f5czqff9zd0rnkj68bmxmizrl01q4wbvz43hj5j8mj0jzybj"; libraryHaskellDepends = [ @@ -122977,8 +123261,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "key-state"; - version = "0.0.0"; - sha256 = "182j5kmaxwvnhaa98bkiwb62ga8ylrdyyjs9vkvh2rvm4vjildrp"; + version = "0.1.0"; + sha256 = "0q5pfayi02xhka2xdn2nwng1cms0lyh6pbysvpxsmbiwzq80p4kp"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/jxv/key-state#readme"; @@ -124734,8 +125018,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "0.1.1.18"; - sha256 = "0ahby04g56wgz73r8k51v8afrvwn898crdbx9scbklh0by5cjfpj"; + version = "0.3.0.1"; + sha256 = "0afp2r77h8z0fx5qxxadb4vxnrj76varfisr12p7r0nm4ljy6vmz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base composition-prelude deepseq @@ -125557,14 +125841,14 @@ self: { , lens-aeson, megaparsec, memory, mtl, neat-interpolation , operational, optparse-applicative, parallel-io, parsec , pcre-utils, process, protolude, random, regex-pcre-builtin - , scientific, semigroups, servant, servant-client, split, stm + , scientific, servant, servant-client, split, stm , strict-base-types, temporary, text, time, transformers, unix , unordered-containers, vector, yaml }: mkDerivation { pname = "language-puppet"; - version = "1.3.13"; - sha256 = "1qngbjpyxd7m4jawc40095v84a8bgk4xk7an9lb1yzp739nvcln1"; + version = "1.3.14"; + sha256 = "1vf80dfdi2w5kwkbpqjqd9iahi7fg8qw5h243x8j286hzg3hx59d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -125574,15 +125858,15 @@ self: { filecache filepath formatting hashable hruby hslogger hspec http-api-data http-client lens lens-aeson megaparsec memory mtl operational parsec pcre-utils process protolude random - regex-pcre-builtin scientific semigroups servant servant-client - split stm strict-base-types text time transformers unix - unordered-containers vector yaml + regex-pcre-builtin scientific servant servant-client split stm + strict-base-types text time transformers unix unordered-containers + vector yaml ]; executableHaskellDepends = [ aeson ansi-wl-pprint base bytestring containers Glob hslogger http-client lens megaparsec mtl optparse-applicative parallel-io - regex-pcre-builtin servant-client strict-base-types text - transformers unordered-containers vector yaml + regex-pcre-builtin strict-base-types text transformers + unordered-containers vector yaml ]; testHaskellDepends = [ ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens @@ -126404,15 +126688,16 @@ self: { }) {}; "lca" = callPackage - ({ mkDerivation, base, doctest }: + ({ mkDerivation, base, Cabal, cabal-doctest, doctest }: mkDerivation { pname = "lca"; - version = "0.3"; - sha256 = "081fk0ci5vb84w4zwah6qwbr0i78v2pr6m6nn1y226vv5w3kakza"; + version = "0.3.1"; + sha256 = "0kj3zsmzckczp51w70x1aqayk2fay4vcqwz8j6sdv0hdw1d093ca"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "http://github.com/ekmett/lca/"; - description = "O(log n) persistent on-line lowest common ancestor calculation without preprocessing"; + description = "O(log n) persistent online lowest common ancestor search without preprocessing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -128513,6 +128798,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lifted-async_0_10_0" = callPackage + ({ mkDerivation, async, base, constraints, criterion, deepseq + , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit + , tasty-th, transformers-base + }: + mkDerivation { + pname = "lifted-async"; + version = "0.10.0"; + sha256 = "0w6xgyw2d3mcv8n7wnnma5dx2slz2ngis5k45x68dh7nv1azzs37"; + libraryHaskellDepends = [ + async base constraints lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ + async base HUnit lifted-base monad-control mtl tasty tasty-hunit + tasty-th + ]; + benchmarkHaskellDepends = [ async base criterion deepseq ]; + homepage = "https://github.com/maoe/lifted-async"; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lifted-base" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel , test-framework, test-framework-hunit, transformers @@ -129875,15 +130183,15 @@ self: { }) {}; "list-t-libcurl" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, curlhs, either - , list-t, mtl-prelude, resource-pool, stm + ({ mkDerivation, base, base-prelude, bytestring, curlhs, list-t + , mtl-prelude, resource-pool, stm }: mkDerivation { pname = "list-t-libcurl"; - version = "0.3.1"; - sha256 = "0bfyz3k38ns8zak1lyyz4bkl6gd8yylwqpgwddxdpdbk9n4smj7h"; + version = "0.3.3"; + sha256 = "0sm1aflzh5ahnpyp0rbrx6c7pl53agd1170hffn3y9w45zp3dpq2"; libraryHaskellDepends = [ - base base-prelude bytestring curlhs either list-t mtl-prelude + base base-prelude bytestring curlhs list-t mtl-prelude resource-pool stm ]; homepage = "https://github.com/nikita-volkov/list-t-libcurl"; @@ -131272,31 +131580,8 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.2.1"; - sha256 = "1jjw2ach3mni7pnfcw29z2fw5vffhq8i8qh8sn4n4jcya2mfp7xd"; - libraryHaskellDepends = [ - async base exceptions free monad-control mtl semigroups stm - stm-delay text time transformers transformers-base wl-pprint-text - ]; - benchmarkHaskellDepends = [ - base bytestring criterion fast-logger lifted-async monad-logger - text time wl-pprint-text - ]; - homepage = "https://github.com/ocharles/logging-effect"; - description = "A mtl-style monad transformer for general purpose & compositional logging"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "logging-effect_1_2_2" = callPackage - ({ mkDerivation, async, base, bytestring, criterion, exceptions - , fast-logger, free, lifted-async, monad-control, monad-logger, mtl - , semigroups, stm, stm-delay, text, time, transformers - , transformers-base, wl-pprint-text - }: - mkDerivation { - pname = "logging-effect"; - version = "1.2.2"; - sha256 = "1p0czcwph777dncidsrn0nbrmhhv7f8c5ic86mnrkxj7hzym0dfw"; + version = "1.2.3"; + sha256 = "0822ifll474q3aqh5jjavhryrlz331p2zc5hh4zi47wviyfm8brk"; libraryHaskellDepends = [ async base exceptions free monad-control mtl semigroups stm stm-delay text time transformers transformers-base wl-pprint-text @@ -131308,7 +131593,6 @@ self: { homepage = "https://github.com/ocharles/logging-effect"; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-effect-extra" = callPackage @@ -131317,26 +131601,6 @@ self: { }: mkDerivation { pname = "logging-effect-extra"; - version = "1.2.1"; - sha256 = "0sk4wagknvspn45lll1sy5jx3vz1ljsjj3yabyx7cnlyf5bl3k61"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base logging-effect logging-effect-extra-file - logging-effect-extra-handler wl-pprint-text - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/jship/logging-effect-extra#readme"; - description = "Supplemental packages for `logging-effect`"; - license = stdenv.lib.licenses.mit; - }) {}; - - "logging-effect-extra_1_2_2" = callPackage - ({ mkDerivation, base, logging-effect, logging-effect-extra-file - , logging-effect-extra-handler, wl-pprint-text - }: - mkDerivation { - pname = "logging-effect-extra"; version = "1.2.2"; sha256 = "0jra1fxz3880ds8pip1mlibiss8ihd1a9dpi3mv1py7lnc6ikjzw"; isLibrary = true; @@ -131349,7 +131613,6 @@ self: { homepage = "https://github.com/jship/logging-effect-extra#readme"; description = "Supplemental packages for `logging-effect`"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-effect-extra-file" = callPackage @@ -131358,25 +131621,6 @@ self: { }: mkDerivation { pname = "logging-effect-extra-file"; - version = "1.1.1"; - sha256 = "198mil2v6z13gv7m37lqhqpdfsgk3l231rm9anq9pj7z2x4xqcpw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base logging-effect template-haskell wl-pprint-text - ]; - executableHaskellDepends = [ base logging-effect wl-pprint-text ]; - homepage = "https://github.com/jship/logging-effect-extra#readme"; - description = "TH splices to augment log messages with file info"; - license = stdenv.lib.licenses.mit; - }) {}; - - "logging-effect-extra-file_1_1_2" = callPackage - ({ mkDerivation, base, logging-effect, template-haskell - , wl-pprint-text - }: - mkDerivation { - pname = "logging-effect-extra-file"; version = "1.1.2"; sha256 = "1dxi4rq734zmjf2ljlh771ivr45i2cwz94vym3gw38ji4s0k8cym"; isLibrary = true; @@ -131388,7 +131632,6 @@ self: { homepage = "https://github.com/jship/logging-effect-extra#readme"; description = "TH splices to augment log messages with file info"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-effect-extra-handler" = callPackage @@ -131397,25 +131640,6 @@ self: { }: mkDerivation { pname = "logging-effect-extra-handler"; - version = "1.1.1"; - sha256 = "1g73xyd1skh7paamnsia0x3cdayd34s12xvvxqaifm3wm19jy1rf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base exceptions logging-effect time wl-pprint-text - ]; - executableHaskellDepends = [ base logging-effect wl-pprint-text ]; - homepage = "https://github.com/jship/logging-effect-extra#readme"; - description = "Handy logging handler combinators"; - license = stdenv.lib.licenses.mit; - }) {}; - - "logging-effect-extra-handler_1_1_2" = callPackage - ({ mkDerivation, base, exceptions, logging-effect, time - , wl-pprint-text - }: - mkDerivation { - pname = "logging-effect-extra-handler"; version = "1.1.2"; sha256 = "1688vdlzyy8ikz2r96czyk0ganpv6h37x02sp930fmrj2qlwbvql"; isLibrary = true; @@ -131427,7 +131651,6 @@ self: { homepage = "https://github.com/jship/logging-effect-extra#readme"; description = "Handy logging handler combinators"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-facade" = callPackage @@ -132910,6 +133133,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lzma-conduit_1_2_1" = callPackage + ({ mkDerivation, base, base-compat, bytestring, conduit, HUnit + , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "lzma-conduit"; + version = "1.2.1"; + sha256 = "0hm72da7xk9l3zxjh274yg444vf405djxqbkf3q3p2qhicmxlmg9"; + libraryHaskellDepends = [ + base bytestring conduit lzma resourcet transformers + ]; + testHaskellDepends = [ + base base-compat bytestring conduit HUnit QuickCheck resourcet + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://github.com/alphaHeavy/lzma-conduit"; + description = "Conduit interface for lzma/xz compression"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lzma-enumerator" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, enumerator, HUnit , lzma, mtl, QuickCheck, test-framework, test-framework-hunit @@ -133042,18 +133287,18 @@ self: { }) {}; "machinecell" = callPackage - ({ mkDerivation, base, free, hspec, mtl, profunctors, QuickCheck - , semigroups, transformers + ({ mkDerivation, base, doctest, free, hspec, mtl, profunctors + , QuickCheck, semigroups, transformers }: mkDerivation { pname = "machinecell"; - version = "3.3.2"; - sha256 = "0gjzn4i9iwclgpki599g52dvsipzc3iplpr8pz4d2s85nm54c9b6"; + version = "4.0.0"; + sha256 = "1wwrgd1ag104kdx97vii3rh9lj9lg1vg04rr98ldi2ikb90jbgwb"; libraryHaskellDepends = [ base free mtl profunctors semigroups transformers ]; testHaskellDepends = [ - base hspec mtl profunctors QuickCheck semigroups + base doctest hspec mtl profunctors QuickCheck semigroups ]; homepage = "http://github.com/as-capabl/machinecell"; description = "Arrow based stream transducers"; @@ -134346,6 +134591,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mapquest-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, req, text }: + mkDerivation { + pname = "mapquest-api"; + version = "0.2.0.0"; + sha256 = "1x48lv6grbs34iv994yj2bhz3hi86lqa01vwx7bvxlbfn7jn3jqk"; + libraryHaskellDepends = [ + aeson base bytestring exceptions req text + ]; + homepage = "https://github.com/ocramz/mapquest-api"; + description = "Bindings to the MapQuest API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "marionetta" = callPackage ({ mkDerivation, base, containers, gloss, mtl, splines, vector , vector-space @@ -135109,28 +135368,30 @@ self: { "matterhorn" = callPackage ({ mkDerivation, aeson, aspell-pipe, async, base, base-compat - , brick, bytestring, cheapskate, checkers, config-ini, connection - , containers, directory, filepath, gitrev, hashable, Hclip - , mattermost-api, mattermost-api-qc, microlens-platform, mtl - , process, quickcheck-text, semigroups, skylighting, stm, stm-delay - , strict, string-conversions, tasty, tasty-hunit, tasty-quickcheck - , temporary, text, text-zipper, time, timezone-olson - , timezone-series, transformers, Unique, unix, unordered-containers - , utf8-string, vector, vty, word-wrap, xdg-basedir + , brick, brick-skylighting, bytestring, cheapskate, checkers + , config-ini, connection, containers, directory, filepath, gitrev + , hashable, Hclip, mattermost-api, mattermost-api-qc + , microlens-platform, mtl, process, quickcheck-text, semigroups + , skylighting, stm, stm-delay, strict, string-conversions, tasty + , tasty-hunit, tasty-quickcheck, temporary, text, text-zipper, time + , timezone-olson, timezone-series, transformers, Unique, unix + , unordered-containers, utf8-string, vector, vty, word-wrap + , xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "40600.0.0"; - sha256 = "0niha43l1p00af3qjkz5j43ksdl0a0sgagra584c8j34cl1f9akv"; + version = "40600.1.0"; + sha256 = "1cxbvs6w2iv4n2ig3hfy79gwcc76mv48q16r8w4jag0dswv5ry92"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson aspell-pipe async base base-compat brick bytestring - cheapskate config-ini connection containers directory filepath - gitrev hashable Hclip mattermost-api microlens-platform mtl process - semigroups skylighting stm stm-delay strict temporary text - text-zipper time timezone-olson timezone-series transformers unix - unordered-containers utf8-string vector vty word-wrap xdg-basedir + aeson aspell-pipe async base base-compat brick brick-skylighting + bytestring cheapskate config-ini connection containers directory + filepath gitrev hashable Hclip mattermost-api microlens-platform + mtl process semigroups skylighting stm stm-delay strict temporary + text text-zipper time timezone-olson timezone-series transformers + unix unordered-containers utf8-string vector vty word-wrap + xdg-basedir ]; testHaskellDepends = [ base base-compat brick bytestring cheapskate checkers config-ini @@ -135155,8 +135416,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "40600.0.0"; - sha256 = "0s27n9a7s6bgbara2rzh689234ykl3vfpm84yg1nvc61wsrxbkql"; + version = "40600.1.0"; + sha256 = "00c2vbf73gg14cpjdbnly0h8dszys31n5ymmf0c43zgrv3z5wb4i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135182,8 +135443,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "40600.0.0"; - sha256 = "0pfmf4ja4a7vc9bnr4kc604j0b8dmcm1ggddg4m64jf355mw6nxm"; + version = "40600.1.0"; + sha256 = "1n2gfq4f0lmb3hbnja49j70ryrgmwkr0h69zwls3zcd7mdx5v1fr"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -136019,17 +136280,19 @@ self: { }) {}; "mellon-core" = callPackage - ({ mkDerivation, async, base, doctest, hlint, hspec, mtl + ({ mkDerivation, async, base, doctest, hspec, mtl, protolude , QuickCheck, quickcheck-instances, time, transformers }: mkDerivation { pname = "mellon-core"; - version = "0.8.0.4"; - sha256 = "03gh3ks6k3y11sga15bnknqw7j29kfhgw8zvfz87vgw5xlsva3j2"; - libraryHaskellDepends = [ async base mtl time transformers ]; + version = "0.8.0.6"; + sha256 = "07dhbqw0x7vbwzkhf1wh083h4b8xrw8sv75db2s72zgjrh8igpfm"; + libraryHaskellDepends = [ + async base mtl protolude time transformers + ]; testHaskellDepends = [ - async base doctest hlint hspec mtl QuickCheck quickcheck-instances - time transformers + async base doctest hspec mtl protolude QuickCheck + quickcheck-instances time transformers ]; homepage = "https://github.com/quixoftic/mellon#readme"; description = "Control physical access devices"; @@ -136038,13 +136301,12 @@ self: { }) {}; "mellon-gpio" = callPackage - ({ mkDerivation, base, hlint, hpio, mellon-core }: + ({ mkDerivation, base, hpio, mellon-core, protolude }: mkDerivation { pname = "mellon-gpio"; - version = "0.8.0.4"; - sha256 = "0b12wvv11ny3rdrd8wg236zn8yy3szm85n7qjdyiiznx2jf33rm7"; - libraryHaskellDepends = [ base hpio mellon-core ]; - testHaskellDepends = [ base hlint ]; + version = "0.8.0.6"; + sha256 = "08mr37wmg1paigbhs1wv7rpdxkhy2jiba8nd22rg1lhscc04k7g1"; + libraryHaskellDepends = [ base hpio mellon-core protolude ]; homepage = "https://github.com/quixoftic/mellon#readme"; description = "GPIO support for mellon"; license = stdenv.lib.licenses.bsd3; @@ -136053,35 +136315,35 @@ self: { "mellon-web" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, doctest - , exceptions, hlint, hpio, hspec, hspec-wai, http-client - , http-client-tls, http-types, lens, lucid, mellon-core - , mellon-gpio, mtl, network, optparse-applicative, QuickCheck - , quickcheck-instances, servant, servant-client, servant-docs - , servant-lucid, servant-server, servant-swagger - , servant-swagger-ui, swagger2, text, time, transformers, wai - , wai-extra, warp + , exceptions, hpio, hspec, hspec-wai, http-client, http-client-tls + , http-types, lens, lucid, mellon-core, mellon-gpio, mtl, network + , optparse-applicative, protolude, QuickCheck, quickcheck-instances + , servant, servant-client, servant-docs, servant-lucid + , servant-server, servant-swagger, servant-swagger-ui, swagger2 + , text, time, transformers, wai, wai-extra, warp }: mkDerivation { pname = "mellon-web"; - version = "0.8.0.4"; - sha256 = "1fyd8vkdym9rm54dbcnn9821jdmbvdyl942339m6prnc2188hkcc"; + version = "0.8.0.6"; + sha256 = "0hfb2gkfn9kdg8a5n6l8c7jky8d4545qqlpdzl2qv63500nr4wz3"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring http-client http-types lens - lucid mellon-core servant servant-client servant-docs servant-lucid - servant-server servant-swagger servant-swagger-ui swagger2 text - time transformers wai warp + lucid mellon-core protolude servant servant-client servant-docs + servant-lucid servant-server servant-swagger servant-swagger-ui + swagger2 text time transformers wai warp ]; executableHaskellDepends = [ base bytestring exceptions hpio http-client http-client-tls http-types mellon-core mellon-gpio mtl network optparse-applicative - servant-client time transformers warp + protolude servant-client time transformers warp ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring doctest hlint hspec hspec-wai - http-client http-types lens lucid mellon-core network QuickCheck - quickcheck-instances servant servant-client servant-docs + aeson aeson-pretty base bytestring doctest hspec hspec-wai + http-client http-types lens lucid mellon-core network protolude + QuickCheck quickcheck-instances servant servant-client servant-docs servant-lucid servant-server servant-swagger servant-swagger-ui swagger2 text time transformers wai wai-extra warp ]; @@ -137477,30 +137739,6 @@ self: { }: mkDerivation { pname = "milena"; - 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 - semigroups transformers zlib - ]; - testHaskellDepends = [ - 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; - }) {}; - - "milena_0_5_2_1" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, digest, lens - , lifted-base, monad-control, mtl, murmur-hash, network, QuickCheck - , random, resource-pool, semigroups, tasty, tasty-hspec - , tasty-quickcheck, transformers, zlib - }: - mkDerivation { - pname = "milena"; version = "0.5.2.1"; sha256 = "1mylkqp8vha9gq7li5cir5h3i27zb573alxgxnvr1y938z2nimf2"; libraryHaskellDepends = [ @@ -137515,7 +137753,6 @@ self: { homepage = "https://github.com/adamflott/milena.git#readme"; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime" = callPackage @@ -138283,7 +138520,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mmark_0_0_5_4" = callPackage + "mmark_0_0_5_5" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers , criterion, data-default-class, deepseq, dlist, email-validate , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid @@ -138293,8 +138530,8 @@ self: { }: mkDerivation { pname = "mmark"; - version = "0.0.5.4"; - sha256 = "0qzw37cj7481vpix8wfgv3ljv10jinfymjpcbzxi4m67fxxjmsf7"; + version = "0.0.5.5"; + sha256 = "1j1ci1zwnp7q6bnk1cqz5g2zx4c02yr8s87v9wf8j898bky8cgwj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -138790,6 +139027,30 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "moesocks_1_0_0_44" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring + , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens + , lens-aeson, mtl, network, optparse-applicative, random, stm + , strict, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "moesocks"; + version = "1.0.0.44"; + sha256 = "1j7181sjj5p6r419z9j8b8ikshhcgm2zwfbl4f1brbpyvwvs4ddz"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async attoparsec base binary bytestring containers cryptohash + hslogger HsOpenSSL iproute lens lens-aeson mtl network + optparse-applicative random stm strict text time transformers + unordered-containers + ]; + homepage = "https://github.com/nfjinjing/moesocks"; + description = "A functional firewall killer"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mohws" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , directory, explicit-exception, filepath, html, HTTP, network @@ -139324,15 +139585,15 @@ self: { }: mkDerivation { pname = "monad-logger-prefix"; - version = "0.1.6"; - sha256 = "14jdx72wx6yavjjaaxx5p270vy5cdshynfbp5ss4mdi3h84rfxpv"; + version = "0.1.7"; + sha256 = "0k8npx31vqck3zz1kirv36ljp6i9sy7banj0xkcpw8z7siqx64vd"; libraryHaskellDepends = [ base exceptions monad-control monad-logger mtl resourcet text transformers transformers-base ]; testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion monad-logger ]; - homepage = "https://github.com/sellerlabs/monad-logger-prefix#readme"; + homepage = "https://github.com/parsonsmatt/monad-logger-prefix#readme"; description = "Add prefixes to your monad-logger output"; license = stdenv.lib.licenses.asl20; }) {}; @@ -140301,8 +140562,8 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.3.0.1"; - sha256 = "1snr144yk05p5l9ck5gfs4zawg2l8fd8slmzxsrd29w2x6pk7iqv"; + version = "2.3.0.2"; + sha256 = "10gl9116hkjvm12ysgr1pi1vlk4d9jbkxgrcql6qhyvpsgv7s7bd"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson bytestring conduit conduit-extra containers cryptohash @@ -140322,7 +140583,7 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "mongoDB_2_3_0_2" = callPackage + "mongoDB_2_3_0_4" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring , binary, bson, bytestring, conduit, conduit-extra, containers , criterion, cryptohash, data-default-class, hashtables, hspec @@ -140332,8 +140593,8 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.3.0.2"; - sha256 = "10gl9116hkjvm12ysgr1pi1vlk4d9jbkxgrcql6qhyvpsgv7s7bd"; + version = "2.3.0.4"; + sha256 = "0qxwk154wd2ir3z7qjn8b7p6lx34ga5r7gcpmf4yp1z8vzsbxn57"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson bytestring conduit conduit-extra containers cryptohash @@ -140344,9 +140605,9 @@ self: { testHaskellDepends = [ base hspec mtl old-locale text time ]; benchmarkHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson - bytestring containers criterion cryptohash hashtables lifted-base - monad-control mtl network nonce parsec random random-shuffle text - transformers-base + bytestring containers criterion cryptohash data-default-class + hashtables lifted-base monad-control mtl network nonce parsec + random random-shuffle text transformers-base ]; homepage = "https://github.com/mongodb-haskell/mongodb"; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; @@ -141858,8 +142119,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "multi-instance"; - version = "0.0.0.1"; - sha256 = "09kqgh966z2n54mkrm1hbllfl8cws6s8caqlld1p8z502axmy5sk"; + version = "0.0.0.2"; + sha256 = "11r7wy143zy9drjrz7l57bdsbaj2fd3sjwbiz7pcmcdr1bxxga63"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/chris-martin/multi-instance#readme"; @@ -142752,26 +143013,6 @@ self: { }) {}; "mutable-containers" = callPackage - ({ mkDerivation, base, containers, criterion, ghc-prim, hspec - , mono-traversable, primitive, QuickCheck, vector - }: - mkDerivation { - pname = "mutable-containers"; - version = "0.3.3"; - sha256 = "1svwa54prfdmhdlmv118lnkwv3jx3rx7v5x30wbdsy39n75kjyks"; - libraryHaskellDepends = [ - base containers ghc-prim mono-traversable primitive vector - ]; - testHaskellDepends = [ - base containers hspec primitive QuickCheck vector - ]; - benchmarkHaskellDepends = [ base containers criterion ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Abstactions and concrete implementations of mutable containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mutable-containers_0_3_4" = callPackage ({ mkDerivation, base, containers, gauge, ghc-prim, hspec , mono-traversable, primitive, QuickCheck, vector }: @@ -142789,7 +143030,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "Abstactions and concrete implementations of mutable containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mutable-iter" = callPackage @@ -142833,10 +143073,10 @@ self: { ({ mkDerivation, base, safe-exceptions }: mkDerivation { pname = "mvar-lock"; - version = "0.1.0.0"; - sha256 = "1j38hjj7nqz9f8qs0a2kvgh9v80l7ip16fm9qjl675hj479z668p"; + version = "0.1.0.1"; + sha256 = "0kdf7811kxwfj032d8g18za0nn9jlssh7dpvvr8kzjk01b77804r"; libraryHaskellDepends = [ base safe-exceptions ]; - homepage = "https://github.com/chris-martin/haskell-libraries"; + homepage = "https://github.com/chris-martin/mvar-lock"; description = "A trivial lock based on MVar"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -143004,6 +143244,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mxnet-nn" = callPackage + ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring + , exceptions, ghc-prim, lens, mmorph, mtl, mxnet, resourcet + , streaming, streaming-bytestring, streaming-utils + , unordered-containers, vector + }: + mkDerivation { + pname = "mxnet-nn"; + version = "0.0.1.1"; + sha256 = "16clpl3sn4cf106hjigsyhgh15l9269yg838qarvbpigppkgb2sv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base lens mtl mxnet resourcet unordered-containers vector + ]; + executableHaskellDepends = [ + attoparsec attoparsec-binary base bytestring exceptions ghc-prim + mmorph mtl mxnet resourcet streaming streaming-bytestring + streaming-utils unordered-containers vector + ]; + homepage = "http://github.com/pierric/mxnet-nn"; + description = "Train a neural network with MXNet in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mxnet-nnvm" = callPackage ({ mkDerivation, base, c2hs, c2hs-extra, mxnet }: mkDerivation { @@ -143536,6 +143801,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "named" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "named"; + version = "0.1.0.0"; + sha256 = "0n26085hhqcqazwb02j5ippicl04caln935dbsq8sgkaj1imryp7"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Named parameters (keyword arguments) for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "named-formlet" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers, mtl , text, transformers @@ -143933,8 +144210,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "nats"; - version = "1.1.1"; - sha256 = "1kfl2yy97nb7q0j17v96rl73xvi3z4db9bk0xychc76dax41n78k"; + version = "1.1.2"; + sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr"; doHaddock = false; homepage = "http://github.com/ekmett/nats/"; description = "Natural numbers"; @@ -144761,6 +145038,7 @@ self: { ]; description = "Contract normaliser and simulator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netspec" = callPackage @@ -145204,20 +145482,6 @@ self: { ({ mkDerivation, base, bytestring, network, text, time, vector }: mkDerivation { pname = "network-carbon"; - version = "1.0.10"; - sha256 = "0fl6dxsarfrj0da3a1ajzisrnrgcjfwpag1997b0byvvkw47kspc"; - libraryHaskellDepends = [ - base bytestring network text time vector - ]; - homepage = "http://github.com/ocharles/network-carbon"; - description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-carbon_1_0_11" = callPackage - ({ mkDerivation, base, bytestring, network, text, time, vector }: - mkDerivation { - pname = "network-carbon"; version = "1.0.11"; sha256 = "1nkyj9114k2b6gwdd93yfrmf9zbziymbnbh3wxnz0vnk1hl2j5yq"; libraryHaskellDepends = [ @@ -145226,7 +145490,6 @@ self: { homepage = "http://github.com/ocharles/network-carbon"; description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-conduit" = callPackage @@ -145511,6 +145774,8 @@ self: { pname = "network-msgpack-rpc"; version = "0.0.4"; sha256 = "0b9llxfgl2lcjlcz9ai6k6yhrlip6shd0wd56mfgbvv3lbd5n62r"; + revision = "1"; + editedCabalFile = "0v08258721mv2bih7h03ss0jvjx2b87kclvjn15xrksf93nbrbq2"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra data-default-class data-default-instances-base data-msgpack @@ -146474,6 +146739,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nirum" = callPackage + ({ mkDerivation, base, cmdargs, containers, directory, filepath + , hlint, hspec, hspec-core, hspec-meta, interpolatedstring-perl6 + , megaparsec, mtl, process, semigroups, semver, temporary, text + }: + mkDerivation { + pname = "nirum"; + version = "0.2.0"; + sha256 = "1bn9sifnp4m7jd4ps27j1rniwb9v7wrycdb8mabimn7n7ir7hjkw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cmdargs containers directory filepath interpolatedstring-perl6 + megaparsec mtl semver text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers directory filepath hlint hspec hspec-core + hspec-meta interpolatedstring-perl6 megaparsec mtl process + semigroups semver temporary text + ]; + homepage = "https://github.com/spoqa/nirum"; + description = "IDL compiler and RPC/distributed object framework for microservices"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "nist-beacon" = callPackage ({ mkDerivation, base, bytestring, http-conduit, xml }: mkDerivation { @@ -147124,8 +147415,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "nonfree"; - version = "0.1.0.2"; - sha256 = "1wmh8bp06rxzakcri25sg5vpmjqci8nz6dg158c5vbs6vizj1hz0"; + version = "0.1.0.3"; + sha256 = "1qdrzc0r37sw2knfgr9yqp7j8bcp1fayprjjg9xwkgxsjfsqp30b"; libraryHaskellDepends = [ base ]; description = "Free structures sans laws"; license = stdenv.lib.licenses.mit; @@ -147152,6 +147443,8 @@ self: { pname = "nonlinear-optimization-ad"; version = "0.2.2"; sha256 = "07a80ggl8wxjllam1cqlamwmh61lkxag1410gj8n53hdd55slqxj"; + revision = "1"; + editedCabalFile = "038242cdiddjck2m995622862wd8ykla1asl9c8njbr1k0iacgbf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147245,6 +147538,7 @@ self: { ]; description = "Painless 3D graphics, no affiliation with gloss"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "not-gloss-examples" = callPackage @@ -148217,21 +148511,21 @@ self: { }) {}; "o-clock" = callPackage - ({ mkDerivation, base, deepseq, gauge, ghc-prim, hedgehog - , markdown-unlit, tasty, tasty-hedgehog, tasty-hspec, tiempo - , time-units, transformers, type-spec + ({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob + , hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec + , tiempo, time-units, transformers, type-spec }: mkDerivation { pname = "o-clock"; - version = "0.0.0"; - sha256 = "0nswlj9anwmhl6vgw5gpdd924niiw15plwb46wwmzrv7jsmbaiyj"; + version = "0.1.0"; + sha256 = "18rqy00hkqqqbhmsgkhza9blm2fl6kb29fs78ifkr2hqsya17fh6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc-prim transformers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base hedgehog markdown-unlit tasty tasty-hedgehog tasty-hspec - type-spec + base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog + tasty-hspec type-spec ]; benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ]; homepage = "https://github.com/serokell/o-clock"; @@ -148453,17 +148747,16 @@ self: { }) {}; "ocaml-export" = callPackage - ({ mkDerivation, aeson, base, bytestring, constraints, containers - , directory, file-embed, filepath, formatting, hspec - , hspec-golden-aeson, mtl, process, QuickCheck - , quickcheck-arbitrary-adt, servant, servant-server, split - , template-haskell, text, time, typelits-witnesses, wai, wai-extra - , warp, wl-pprint-text + ({ mkDerivation, aeson, base, bytestring, containers, directory + , file-embed, filepath, formatting, hspec, hspec-golden-aeson, mtl + , process, QuickCheck, quickcheck-arbitrary-adt, servant + , servant-server, split, template-haskell, text, time + , typelits-witnesses, wai, wai-extra, warp, wl-pprint-text }: mkDerivation { pname = "ocaml-export"; - version = "0.5.0.0"; - sha256 = "0xp4aiqn5p1c3frl83axjchbs5dwh4ibqqyiixvi0i1wpbi9fqka"; + version = "0.6.0.0"; + sha256 = "197d1sqnq7085jpynhbck0923hm1ci9sca59gklxbzk45siml58m"; libraryHaskellDepends = [ aeson base bytestring containers directory file-embed filepath formatting hspec-golden-aeson mtl QuickCheck @@ -148471,10 +148764,10 @@ self: { template-haskell text time typelits-witnesses wl-pprint-text ]; testHaskellDepends = [ - aeson base bytestring constraints containers directory filepath - hspec hspec-golden-aeson process QuickCheck - quickcheck-arbitrary-adt servant servant-server template-haskell - text time typelits-witnesses wai wai-extra warp + aeson base bytestring containers directory filepath hspec + hspec-golden-aeson process QuickCheck quickcheck-arbitrary-adt + servant servant-server template-haskell text time + typelits-witnesses wai wai-extra warp ]; homepage = "https://github.com/plow-technologies/ocaml-export#readme"; description = "Convert Haskell types in OCaml types"; @@ -149043,8 +149336,8 @@ self: { ({ mkDerivation, base, one-liner }: mkDerivation { pname = "one-liner-instances"; - version = "0.1.0.0"; - sha256 = "1v5a4szk3497razn7r2d3664w7bxbdcw9bacsc4y7vj3kim4nhca"; + version = "0.1.1.0"; + sha256 = "0yb5rdy735lalwrxvmvvjnpyikdqs2y2fjldjcbjj0r3d912azxn"; libraryHaskellDepends = [ base one-liner ]; homepage = "https://github.com/mstksg/one-liner-instances#readme"; description = "Generics-based implementations for common typeclasses"; @@ -149096,23 +149389,6 @@ self: { }) {}; "online" = callPackage - ({ mkDerivation, base, foldl, numhask, protolude, tdigest, vector - , vector-algorithms - }: - mkDerivation { - pname = "online"; - version = "0.2.0"; - sha256 = "13vg34h09ds49r5j6dg8kqh90iqhbadr6jv57y0766h1pmr5i8kh"; - libraryHaskellDepends = [ - base foldl numhask protolude tdigest vector vector-algorithms - ]; - homepage = "https://github.com/tonyday567/online"; - description = "online statistics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "online_0_2_1_0" = callPackage ({ mkDerivation, base, doctest, foldl, formatting, numhask , optparse-generic, perf, protolude, scientific, tasty, tdigest , text, vector, vector-algorithms @@ -151850,20 +152126,24 @@ self: { }) {}; "pandoc-include-code" = callPackage - ({ mkDerivation, base, filepath, mtl, pandoc-types, process, tasty - , tasty-hunit, text, unordered-containers + ({ mkDerivation, base, filepath, hspec, hspec-expectations, mtl + , pandoc-types, process, tasty, tasty-hspec, tasty-hunit, text + , unordered-containers }: mkDerivation { pname = "pandoc-include-code"; - version = "1.2.0.2"; - sha256 = "0mnk6ld2d1bka2wmz9718k8rfdbzhp4ym3axn4js4m0ka51w50h9"; + version = "1.3.0.0"; + sha256 = "1klmshyakhli0g9prqnllyrh9hsj67lps5b1cxh3jjlb6mxg5ic4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filepath mtl pandoc-types process text unordered-containers ]; executableHaskellDepends = [ base pandoc-types ]; - testHaskellDepends = [ base pandoc-types tasty tasty-hunit ]; + testHaskellDepends = [ + base hspec hspec-expectations pandoc-types tasty tasty-hspec + tasty-hunit + ]; homepage = "https://github.com/owickstrom/pandoc-include-code"; description = "A Pandoc filter for including code from source files"; license = stdenv.lib.licenses.mpl20; @@ -152970,35 +153250,15 @@ self: { }: mkDerivation { pname = "parsec"; - version = "3.1.11"; - sha256 = "0vk7q9j2128q191zf1sg0ylj9s9djwayqk9747k0a5fin4f2b1vg"; - revision = "1"; - editedCabalFile = "0prqjj2gxlwh2qhpcck5k6cgk4har9xqxc67yzjqd44mr2xgl7ir"; - libraryHaskellDepends = [ base bytestring mtl text ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - ]; - homepage = "https://github.com/aslatter/parsec"; - description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "parsec_3_1_12_0" = callPackage - ({ mkDerivation, base, bytestring, HUnit, mtl, test-framework - , test-framework-hunit, text - }: - mkDerivation { - pname = "parsec"; - version = "3.1.12.0"; - sha256 = "0jav9a1hb156qd29n3sclxrb7bk477n89jshqpmlym2z2h880bc2"; + version = "3.1.13.0"; + sha256 = "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq"; libraryHaskellDepends = [ base bytestring mtl text ]; testHaskellDepends = [ base HUnit mtl test-framework test-framework-hunit ]; - homepage = "https://github.com/haskell/parsec"; + homepage = "https://github.com/hvr/parsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parsec-extra" = callPackage @@ -153397,6 +153657,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "partial-handler_1_0_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "partial-handler"; + version = "1.0.3"; + sha256 = "0cf1748zyr07zv0ffi44rf5b9f7ygdybbdcl7m7c0zj14kq2miwl"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/nikita-volkov/partial-handler"; + description = "A composable exception handler"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "partial-isomorphisms" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -154719,8 +154992,8 @@ self: { }: mkDerivation { pname = "pencil"; - version = "0.1.1"; - sha256 = "0k1lcmllfcqnlyidla6icvzx41q0wsykwc7ak68m9lbri1d7g5ry"; + version = "0.1.2"; + sha256 = "0wgs79vsz52cnmbcfzbb3avn98ciadnispgr98h6kwhgj5pmaxbm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154733,6 +155006,7 @@ self: { homepage = "https://github.com/elben/pencil"; description = "Static site generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "penn-treebank" = callPackage @@ -155180,7 +155454,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent_2_8_0" = callPackage + "persistent_2_8_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers , fast-logger, haskell-src-meta, hspec, http-api-data @@ -155191,8 +155465,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.8.0"; - sha256 = "07x73s1icxj3wbw197f7qbj1pk9gg30vk4f7yz1hxs27lzximjfh"; + version = "2.8.1"; + sha256 = "1mfk6mxicg12vnvc9049k55dgvcx4ss4z2219qr8wy89m2z72l1k"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers fast-logger haskell-src-meta @@ -155411,15 +155685,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "persistent-mysql_2_8_0" = callPackage + "persistent-mysql_2_8_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-logger, mysql, mysql-simple, persistent , resource-pool, resourcet, text, transformers, unliftio-core }: mkDerivation { pname = "persistent-mysql"; - version = "2.8.0"; - sha256 = "0sy9gl2604f3qargvgkqnhdfbnwrq81y2hrhmx4fsknpfkkypya4"; + version = "2.8.1"; + sha256 = "0m76hsrgv118bg6sawna6xwg30q8vl84zqa8qc9kll4hzbw2kk40"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text @@ -155457,6 +155731,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-mysql-haskell_0_4_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , io-streams, monad-logger, mysql-haskell, network, persistent + , persistent-template, resource-pool, resourcet, text, time, tls + , transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql-haskell"; + version = "0.4.0"; + sha256 = "1gcvfvyg0xf4m6qm78czdkqabqnx07wqkr6b6myfwy2g1frdhb0d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers io-streams monad-logger + mysql-haskell network persistent resource-pool resourcet text time + tls transformers unliftio-core + ]; + executableHaskellDepends = [ + base monad-logger persistent persistent-template transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "A pure haskell backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-odbc" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , convertible, HDBC, HDBC-odbc, monad-control, monad-logger @@ -155512,7 +155812,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-postgresql_2_8_0" = callPackage + "persistent-postgresql_2_8_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-logger, persistent, postgresql-libpq , postgresql-simple, resource-pool, resourcet, text, time @@ -155520,8 +155820,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.8.0"; - sha256 = "0dqdgw4sayq76hdib7sf27nzwcg1lbgr4l50kdyq8xlvi8yb5mk8"; + version = "2.8.1"; + sha256 = "01mpmr51f0r4a00gbxyd0ih66czq1dlnr7h49x3wnlqdnwbsv334"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger persistent postgresql-libpq postgresql-simple resource-pool @@ -155655,7 +155955,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-sqlite_2_8_0" = callPackage + "persistent-sqlite_2_8_1" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, microlens-th, monad-logger, old-locale, persistent , persistent-template, resource-pool, resourcet, temporary, text @@ -155663,8 +155963,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.8.0"; - sha256 = "1vdsb271d17b0ip7z6mkbcw4iggafpaaimz6zzknjc4l409yswnb"; + version = "2.8.1"; + sha256 = "19iqpa99r4s14r2qmimqpv3b8qz3wm9arbkniccrj8bxlw1c8a4d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155692,30 +155992,6 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.5.3"; - sha256 = "1b8n99l2dh4ng1pf86541q5s2is30scnsx3p3vzh0kif9myrk5cy"; - libraryHaskellDepends = [ - aeson aeson-compat base bytestring containers ghc-prim - http-api-data monad-control monad-logger path-pieces persistent - tagged template-haskell text transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec persistent QuickCheck text transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Type-safe, non-relational, multi-backend persistence"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-template_2_5_3_1" = callPackage - ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers - , ghc-prim, hspec, http-api-data, monad-control, monad-logger - , path-pieces, persistent, QuickCheck, tagged, template-haskell - , text, transformers, unordered-containers - }: - mkDerivation { - pname = "persistent-template"; version = "2.5.3.1"; sha256 = "0449piw3n02q7dag7k1pakfmzmf3ms4wk1qmnagczpm1ckajinwd"; libraryHaskellDepends = [ @@ -155729,7 +156005,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -155770,6 +156045,7 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Tests for Persistent"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-vector" = callPackage @@ -156271,20 +156547,22 @@ self: { "phoityne-vscode" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, cmdargs, conduit - , conduit-extra, ConfigFile, containers, directory, filepath - , fsnotify, hslogger, MissingH, mtl, parsec, process, resourcet - , safe, split, text, transformers + , conduit-extra, ConfigFile, containers, data-default, directory + , filepath, fsnotify, hslogger, lens, MissingH, mtl, parsec + , process, resourcet, safe, safe-exceptions, split, text + , transformers }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.20.0"; - sha256 = "1k9vh2xyk2nwck1g86lxvbrab7ap5p8p9vhh7pj98a56wkvxmv7y"; + version = "0.0.21.0"; + sha256 = "190gqa5zi99a9rrazbcg2xmzx5bl304vb95w8z4qilggngq1y7df"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring Cabal cmdargs conduit conduit-extra - ConfigFile containers directory filepath fsnotify hslogger MissingH - mtl parsec process resourcet safe split text transformers + ConfigFile containers data-default directory filepath fsnotify + hslogger lens MissingH mtl parsec process resourcet safe + safe-exceptions split text transformers ]; homepage = "https://github.com/phoityne/phoityne-vscode"; description = "Haskell Debug Adapter for Visual Studio Code"; @@ -156823,6 +157101,45 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "pinpon" = callPackage + ({ mkDerivation, aeson, aeson-pretty, amazonka, amazonka-core + , amazonka-sns, base, bytestring, containers, doctest, exceptions + , hpio, hspec, http-client, http-client-tls, http-types, lens + , lucid, mtl, network, optparse-applicative, optparse-text + , protolude, QuickCheck, quickcheck-instances, resourcet, servant + , servant-client, servant-docs, servant-lucid, servant-server + , servant-swagger, servant-swagger-ui, swagger2, text, time + , transformers, transformers-base, wai, warp + }: + mkDerivation { + pname = "pinpon"; + version = "0.2.0.1"; + sha256 = "0l21lh66iwqk5bq2zxpjxp04gypcpy74xj4xnxmgbj7qzcxp9xha"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty amazonka amazonka-core amazonka-sns base + bytestring containers exceptions http-client http-types lens lucid + mtl protolude resourcet servant servant-client servant-docs + servant-lucid servant-server servant-swagger servant-swagger-ui + swagger2 text time transformers transformers-base wai warp + ]; + executableHaskellDepends = [ + amazonka amazonka-sns base bytestring containers exceptions hpio + http-client http-client-tls http-types lens mtl network + optparse-applicative optparse-text protolude servant-client text + time transformers warp + ]; + testHaskellDepends = [ + aeson base bytestring doctest exceptions hspec protolude QuickCheck + quickcheck-instances servant-swagger + ]; + homepage = "https://github.com/quixoftic/pinpon#readme"; + description = "A gateway for various cloud notification services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipe-enumerator" = callPackage ({ mkDerivation, base, enumerator, pipes, transformers }: mkDerivation { @@ -157165,8 +157482,8 @@ self: { ({ mkDerivation, async, base, contravariant, pipes, stm, void }: mkDerivation { pname = "pipes-concurrency"; - version = "2.0.8"; - sha256 = "0ak6vnjl12q4615waifbpdxbm96yz5yzqzwjj1zwvvb2jfk5snwz"; + version = "2.0.9"; + sha256 = "1br0cssp4rdfh6lhvjql9ppjvcn0v6kpg1h1f1hi8vqb0c87nvb4"; libraryHaskellDepends = [ async base contravariant pipes stm void ]; @@ -160635,19 +160952,18 @@ self: { }) {}; "potoki" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + ({ mkDerivation, attoparsec, base, base-prelude, bytestring , directory, foldl, hashable, potoki-core, profunctors, QuickCheck , quickcheck-instances, random, rerebase, tasty, tasty-hunit , tasty-quickcheck, text, unagi-chan, unordered-containers, vector }: mkDerivation { pname = "potoki"; - version = "0.6.4"; - sha256 = "1w05m47cl9x7riy27jzaxkwpaigs09bfikpqaqa6ghvx20mgx4vl"; + version = "0.7.2"; + sha256 = "10yl08hcfgn0l15hr6n5ga91cla050lys7jyj4w0j3s3c9k2w3gd"; libraryHaskellDepends = [ - attoparsec base base-prelude bug bytestring directory foldl - hashable potoki-core profunctors text unagi-chan - unordered-containers vector + attoparsec base base-prelude bytestring directory foldl hashable + potoki-core profunctors text unagi-chan unordered-containers vector ]; testHaskellDepends = [ attoparsec QuickCheck quickcheck-instances random rerebase tasty @@ -160665,8 +160981,8 @@ self: { }: mkDerivation { pname = "potoki-cereal"; - version = "0.1"; - sha256 = "04qfs8j2kgvavacpz7x9zdza0yfl4yw56g0bca28wh7q837y073y"; + version = "0.1.3"; + sha256 = "1r7plcki29gr9jx61qjx752zc9zh9yy47kznrs36q7jgjhnj6mqx"; libraryHaskellDepends = [ base base-prelude bytestring cereal potoki potoki-core text ]; @@ -160683,8 +160999,8 @@ self: { }: mkDerivation { pname = "potoki-core"; - version = "1.2"; - sha256 = "06d9hs15r6gr5yj9rcpw4klj3lxfjdd09nc0zwvmg1h3klqrqfxy"; + version = "1.3"; + sha256 = "0z6ld13kmkvamn8y39zqw0z4mkg5wi9mmh7kdav31wy46im03b9l"; libraryHaskellDepends = [ base deque profunctors stm ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -160785,6 +161101,7 @@ self: { homepage = "https://github.com/agrafix/powerqueue#readme"; description = "A distributed worker backend for powerqueu"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "powerqueue-levelmem" = callPackage @@ -160887,6 +161204,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pqueue_1_4_1_1" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck }: + mkDerivation { + pname = "pqueue"; + version = "1.4.1.1"; + sha256 = "1zvwm1zcqqq5n101s1brjhgbay8rf9fviq6gxbplf40i63m57p1x"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base deepseq QuickCheck ]; + description = "Reliable, persistent, fast priority queues"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pqueue-mtl" = callPackage ({ mkDerivation, base, containers, ghc-prim, MaybeT, mtl , stateful-mtl, uvector @@ -162166,10 +162496,8 @@ self: { }: mkDerivation { pname = "probable"; - version = "0.1.2"; - sha256 = "0lypxz3lz4gj5x98k7mwg3xagjld0qhzrxdk8l4gjxj77m00hkfz"; - revision = "1"; - editedCabalFile = "1iwv4ygfm53q3jyiiniqhsixps549h9c2apif10pjg5jib04yv85"; + version = "0.1.3"; + sha256 = "196m3v30818q034x7jdnqdwfqffx5pfj64yyw0q2blhwzkhc0f9n"; libraryHaskellDepends = [ base mtl mwc-random primitive statistics transformers vector ]; @@ -162256,24 +162584,6 @@ self: { }: mkDerivation { pname = "process-extras"; - version = "0.7.3"; - sha256 = "0hyrqz2dinvql6r9ldd2q35zkavjwqadw13zqzcwrdhq8myhawzb"; - libraryHaskellDepends = [ - base bytestring data-default deepseq generic-deriving ListLike mtl - process text - ]; - testHaskellDepends = [ base HUnit ]; - homepage = "https://github.com/seereason/process-extras"; - description = "Process extras"; - license = stdenv.lib.licenses.mit; - }) {}; - - "process-extras_0_7_4" = callPackage - ({ mkDerivation, base, bytestring, data-default, deepseq - , generic-deriving, HUnit, ListLike, mtl, process, text - }: - mkDerivation { - pname = "process-extras"; version = "0.7.4"; sha256 = "0klqgr37f1z2z6i0a9b0giapmq0p35l5k9kz1p7f0k1597w7agi9"; libraryHaskellDepends = [ @@ -162284,7 +162594,6 @@ self: { homepage = "https://github.com/seereason/process-extras"; description = "Process extras"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "process-iterio" = callPackage @@ -163162,8 +163471,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.3.0"; - sha256 = "09qkh6d2jbn8f5miaqh5mlxh36146wpfm61k4xdz3kdxmg78s140"; + version = "5.3.1"; + sha256 = "1mcs593ynn5x4i5qcdkbkqx3cyqmza0jz6vl8q5a3x8fydmq6n98"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163497,6 +163806,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers_2_4_7" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , directory, filepath, mtl, parsec, syb, utf8-string + }: + mkDerivation { + pname = "protocol-buffers"; + version = "2.4.7"; + sha256 = "1db2r961qmrcvcqs53imjw16cawn7hjcicxhygszk0mg538v7rh9"; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath mtl + parsec syb utf8-string + ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Parse Google Protocol Buffer specifications"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { @@ -163512,6 +163839,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers-descriptor_2_4_7" = callPackage + ({ mkDerivation, base, bytestring, containers, protocol-buffers }: + mkDerivation { + pname = "protocol-buffers-descriptor"; + version = "2.4.7"; + sha256 = "1k11bgwg2345y4a7ib6h3410y6088whlxc6s9iy0whpbkhwi7lq0"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers protocol-buffers + ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor-fork" = callPackage ({ mkDerivation, base, bytestring, containers , protocol-buffers-fork @@ -163590,6 +163933,8 @@ self: { pname = "protolude"; version = "0.2.1"; sha256 = "1r2baxx6q4z75sswirlqsnyynk4i7amfmpzajggh31fbz13hxgxx"; + revision = "1"; + editedCabalFile = "03kaarc0k64zrkqkh9q38919pcaya7ngzjhb3pbapbjm7np2ynpd"; libraryHaskellDepends = [ array async base bytestring containers deepseq ghc-prim hashable mtl mtl-compat safe stm text transformers transformers-compat @@ -163746,6 +164091,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.6.0"; sha256 = "1v28vbhcrx0mvciazlanwyaxwav0gfjc7sxz7adgims7mj64g1ra"; + revision = "1"; + editedCabalFile = "11n7wcfpahbyg8lmq90vvq11fm2ls4761qf9q7pkbvd7vkm6by2n"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -164597,8 +164944,8 @@ self: { }: mkDerivation { pname = "pushbullet-types"; - version = "0.4.0.0"; - sha256 = "0fds6lhkmyfs8hrnaq29fbglcmampa4n8j93x1jkynxbp1in66z6"; + version = "0.4.0.2"; + sha256 = "0r6cg0g98b7zzf4sjl4mrpnwmffhz2dnba9bgjw3943xf06afnn1"; libraryHaskellDepends = [ aeson base http-api-data microlens microlens-th scientific text time unordered-containers @@ -164634,34 +164981,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.1.0"; - sha256 = "1mnigsf10jxqsvjr1vbizxjrf97w3cx54xy850mj3b8i34929bmh"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hashable - http-client http-types memory text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hspec - http-client http-types QuickCheck scientific text time transformers - unordered-containers vector - ]; - homepage = "https://github.com/pusher-community/pusher-http-haskell"; - description = "Haskell client library for the Pusher HTTP API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "pusher-http-haskell_1_5_1_1" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, hashable, hspec, http-client, http-types, memory - , QuickCheck, scientific, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "pusher-http-haskell"; - version = "1.5.1.1"; - sha256 = "0j8gsarczvdidri63s162flzdkb6w0sysawairlxmmgcdbybfci5"; + version = "1.5.1.2"; + sha256 = "1jrb0ni157a9wa5mbqz1dmd1i7nkjh1nhjyvx52mbk530hslcnnn"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-types memory text time transformers @@ -165133,6 +165454,24 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "qm-interpolated-string_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, haskell-src-meta, hspec + , template-haskell, text + }: + mkDerivation { + pname = "qm-interpolated-string"; + version = "0.3.0.0"; + sha256 = "1brbs4qwvb16bkmcg51spjjrzc83hwgi1fbsix25vrri2myk6sz8"; + libraryHaskellDepends = [ + base bytestring haskell-src-meta template-haskell text + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/unclechu/haskell-qm-interpolated-string"; + description = "Implementation of interpolated multiline strings"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "qq-literals" = callPackage ({ mkDerivation, base, network-uri, template-haskell }: mkDerivation { @@ -165749,6 +166088,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "quickcheck-arbitrary-template" = callPackage + ({ mkDerivation, base, QuickCheck, safe, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell + }: + mkDerivation { + pname = "quickcheck-arbitrary-template"; + version = "0.2.0.0"; + sha256 = "1bn0g3gg7cpjwap1vgvahw91yjn0v8sy1hiy60w54gdg5rrll5j9"; + libraryHaskellDepends = [ base QuickCheck safe template-haskell ]; + testHaskellDepends = [ + base QuickCheck safe tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell + ]; + homepage = "https://github.com/plow-technologies/quickcheck-arbitrary-adt#readme"; + description = "Generate QuickCheck Gen for Sum Types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quickcheck-assertions" = callPackage ({ mkDerivation, base, hspec, ieee754, pretty-show, QuickCheck }: mkDerivation { @@ -165768,23 +166125,6 @@ self: { }: mkDerivation { pname = "quickcheck-classes"; - version = "0.3.1"; - sha256 = "0xcjm55aprds4x1jlrj3izgwxpqv8z19sbiqfn8lvx6b8yc61f7f"; - libraryHaskellDepends = [ - aeson base prim-array primitive QuickCheck transformers - ]; - testHaskellDepends = [ aeson base primitive QuickCheck vector ]; - homepage = "https://github.com/andrewthad/quickcheck-classes#readme"; - description = "QuickCheck common typeclasses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-classes_0_3_2" = callPackage - ({ mkDerivation, aeson, base, prim-array, primitive, QuickCheck - , transformers, vector - }: - mkDerivation { - pname = "quickcheck-classes"; version = "0.3.2"; sha256 = "10z65dxm0jply0zbx1kpxpiir3z85c9133hkiqnra6sqz13njdz4"; libraryHaskellDepends = [ @@ -165794,7 +166134,6 @@ self: { homepage = "https://github.com/andrewthad/quickcheck-classes#readme"; description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-combinators" = callPackage @@ -167425,8 +167764,8 @@ self: { ({ mkDerivation, async, base, containers, foreign-store, stm }: mkDerivation { pname = "rapid"; - version = "0.1.3"; - sha256 = "0n4py9ndri6xy3n2rkr78f0y146didxg3625nhm72jsqcd1qjfhn"; + version = "0.1.4"; + sha256 = "0f86j4r3sm74w49v9x9s58wahgcgick6z7awl6piq83iqaiy4sh7"; libraryHaskellDepends = [ async base containers foreign-store stm ]; @@ -167854,6 +168193,7 @@ self: { homepage = "https://github.com/tfausak/rattletrap#readme"; description = "Parse and generate Rocket League replays"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rattletrap_4_0_5" = callPackage @@ -168110,10 +168450,8 @@ self: { }: mkDerivation { pname = "rcu"; - version = "0.2.1"; - sha256 = "114w0nhlcg6wd9v6xg0ax74y5xbwb408b37hdkra863xr7dibdp0"; - revision = "1"; - editedCabalFile = "138vbjy6z2lh4x4icdssh0xz0rcwiw4lczcb3w375cnyjjn3b6ly"; + version = "0.2.2"; + sha256 = "0lj88xif38zh1qkpfzyarm36khzavqsl8chjma062b1pvhhlc9lk"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -171884,6 +172222,8 @@ self: { pname = "req"; version = "1.0.0"; sha256 = "1s2yd61pw316llxyap7qwi18vrqxl6hhsmbgr79chjv5g119c087"; + revision = "1"; + editedCabalFile = "18bs1mcr454dgczzv8ahxps5lhba8wgls34cccg5aqdfhglprphk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -172687,18 +173027,19 @@ self: { "retry" = callPackage ({ mkDerivation, base, data-default-class, exceptions, ghc-prim - , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers + , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog + , tasty-hunit, time, transformers }: mkDerivation { pname = "retry"; - version = "0.7.5.1"; - sha256 = "116fjfxdyqrk3079hqcil0dv7r2fw6x64pjwfxhckpxqavxza7sk"; + version = "0.7.6.0"; + sha256 = "1p6x6djd6cvsf03pxd9ky7rpzrzs0jcapmyap8z55aziasr3xk7n"; libraryHaskellDepends = [ base data-default-class exceptions ghc-prim random transformers ]; testHaskellDepends = [ - base data-default-class exceptions ghc-prim hspec HUnit mtl - QuickCheck random stm time transformers + base data-default-class exceptions ghc-prim hedgehog HUnit mtl + random stm tasty tasty-hedgehog tasty-hunit time transformers ]; homepage = "http://github.com/Soostone/retry"; description = "Retry combinators for monadic actions that may fail"; @@ -172868,27 +173209,29 @@ self: { }) {}; "rfc" = callPackage - ({ mkDerivation, aeson, aeson-diff, async, base, bifunctors, binary - , blaze-html, classy-prelude, containers, data-default, exceptions - , hedis, http-api-data, http-client-tls, http-types, lens - , lifted-async, markdown, monad-control, postgresql-simple - , resource-pool, servant, servant-blaze, servant-client - , servant-docs, servant-server, servant-swagger, simple-logger - , string-conversions, swagger2, temporary, text, time-units + ({ mkDerivation, aeson, aeson-diff, base, bifunctors, binary + , blaze-html, classy-prelude, containers, data-default + , freer-simple, hedis, http-api-data, http-client, http-client-tls + , http-types, lens, lifted-async, markdown, monad-control + , natural-transformation, postgresql-simple, resource-pool, servant + , servant-blaze, servant-client, servant-docs, servant-server + , servant-swagger, simple-logger, string-conversions, swagger2 + , temporary, text, time-units, unliftio, unliftio-core , unordered-containers, url, uuid-types, vector, wai, wai-cors , wai-extra, wreq }: mkDerivation { pname = "rfc"; - version = "0.0.0.17"; - sha256 = "0aqw2b2ivk16h156baj21jg5x5via9dn645500zl53zn05py6bng"; - libraryHaskellDepends = [ - aeson aeson-diff async base bifunctors binary blaze-html - classy-prelude containers data-default exceptions hedis - http-api-data http-client-tls http-types lens lifted-async markdown - monad-control postgresql-simple resource-pool servant servant-blaze - servant-client servant-docs servant-server servant-swagger - simple-logger string-conversions swagger2 temporary text time-units + version = "0.0.0.21"; + sha256 = "1s3ni2gsvhxrxhmyahc22frrh4flzvwrnv33car14wv1jldbywfi"; + libraryHaskellDepends = [ + aeson aeson-diff base bifunctors binary blaze-html classy-prelude + containers data-default freer-simple hedis http-api-data + http-client http-client-tls http-types lens lifted-async markdown + monad-control natural-transformation postgresql-simple + resource-pool servant servant-blaze servant-client servant-docs + servant-server servant-swagger simple-logger string-conversions + swagger2 temporary text time-units unliftio unliftio-core unordered-containers url uuid-types vector wai wai-cors wai-extra wreq ]; @@ -173212,17 +173555,23 @@ self: { "rio" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, hashable, microlens, mtl, text, time - , typed-process, unix, unliftio, unordered-containers, vector + , exceptions, filepath, hashable, hspec, microlens, mtl, primitive + , text, time, typed-process, unix, unliftio, unordered-containers + , vector }: mkDerivation { pname = "rio"; - version = "0.0.1.0"; - sha256 = "006avzlv6ghwang3dhllxj7absa32sxw2qss2wdf3hxqbij6fy0b"; + version = "0.0.2.0"; + sha256 = "0iyfbqrgj0kcs72ibd5wm4gr51agvmqr5jg0vhay5srg86wc248l"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath - hashable microlens mtl text time typed-process unix unliftio - unordered-containers vector + hashable microlens mtl primitive text time typed-process unix + unliftio unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable hspec microlens mtl primitive text time typed-process unix + unliftio unordered-containers vector ]; homepage = "https://github.com/commercialhaskell/rio#readme"; description = "A standard library for Haskell"; @@ -173923,6 +174272,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rope-utf16-splay" = callPackage + ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "rope-utf16-splay"; + version = "0.2.0.0"; + sha256 = "078hkv21maydvks57pz6z3qyz0r4s1c6ypdmlr4xlmakyldrdlc3"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck text + ]; + homepage = "https://github.com/ollef/rope-utf16-splay"; + description = "Ropes optimised for updating using UTF-16 code units and row/column pairs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rosa" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, lens , namecoin-update, optparse-applicative, text, unordered-containers @@ -174276,6 +174642,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "row-types" = callPackage + ({ mkDerivation, base, criterion, deepseq, hashable, text + , unordered-containers + }: + mkDerivation { + pname = "row-types"; + version = "0.2.0.0"; + sha256 = "158k4q6b1ca7d8fkznl09mdd29z7w5clxh48i3b3m1bcmhjmcfmh"; + libraryHaskellDepends = [ + base deepseq hashable text unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "Open Records and Variants"; + license = stdenv.lib.licenses.mit; + }) {}; + "rowrecord" = callPackage ({ mkDerivation, base, containers, template-haskell }: mkDerivation { @@ -175718,6 +176100,8 @@ self: { pname = "sandi"; version = "0.4.1"; sha256 = "08y691z8m79qm4ajx5csmgv8f9x8q4r0bcfm8gb8x88lvg19493j"; + revision = "1"; + editedCabalFile = "1gk6vwydqdgz1s5glv4jlkaph7g19aqdf7yxbyq0m1afaj1rvjq9"; libraryHaskellDepends = [ base bytestring conduit exceptions stringsearch ]; @@ -177006,8 +177390,8 @@ self: { }: mkDerivation { pname = "scotty-resource"; - version = "0.2.0.0"; - sha256 = "0210zl0ad80scjcl1dlz5z55g2rf0ybr7vj2qdl83niri8511794"; + version = "0.2.0.1"; + sha256 = "0y39sxvin9ljwk2jxnb18wr79d0ap9363vr2mh8xbc4llq0yjavj"; libraryHaskellDepends = [ base containers http-types scotty text transformers wai ]; @@ -178185,25 +178569,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "semigroups"; - version = "0.18.3"; - sha256 = "1jm9wnb5jmwdk4i9qbwfay69ydi76xi0qqi9zqp6wh3jd2c7qa9m"; - libraryHaskellDepends = [ base ]; - homepage = "http://github.com/ekmett/semigroups/"; - description = "Anything that associates"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "semigroups_0_18_4" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "semigroups"; version = "0.18.4"; sha256 = "09sxd17h1kcjsjaf1am2nwpb4vaq8d0q718fbkxwysws691317jq"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/ekmett/semigroups/"; description = "Anything that associates"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semigroups-actions" = callPackage @@ -178357,6 +178728,7 @@ self: { homepage = "https://github.com/marcelbuesing/sendgrid-v3"; description = "Sendgrid v3 API library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sensei" = callPackage @@ -178414,27 +178786,6 @@ self: { }: mkDerivation { pname = "sensu-run"; - version = "0.4.0.3"; - sha256 = "05gl6dannlfx49f24lhspyygq8j37wmsyp8nrlcpcsqbrbd3k82g"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring filepath http-client http-types lens network - optparse-applicative process temporary text time unix unix-compat - vector wreq - ]; - homepage = "https://github.com/maoe/sensu-run#readme"; - description = "A tool to send command execution results to Sensu"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sensu-run_0_4_0_4" = 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.4"; sha256 = "1pgzfa6ns67fq5cx7qizwjfb2gw6awx012iwhskx8s4wg9snbq5y"; isLibrary = false; @@ -178447,7 +178798,6 @@ self: { homepage = "https://github.com/maoe/sensu-run#readme"; description = "A tool to send command execution results to Sensu"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sentence-jp" = callPackage @@ -178968,30 +179318,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant_0_12_1" = callPackage + "servant_0_13" = callPackage ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat - , bytestring, Cabal, cabal-doctest, case-insensitive, directory - , doctest, filemanip, filepath, hspec, hspec-discover - , http-api-data, http-media, http-types, mmorph, mtl - , natural-transformation, network-uri, QuickCheck - , quickcheck-instances, string-conversions, tagged, text, url - , vault + , bytestring, Cabal, cabal-doctest, case-insensitive, doctest + , hspec, hspec-discover, http-api-data, http-media, http-types + , mmorph, mtl, natural-transformation, network-uri, QuickCheck + , quickcheck-instances, singleton-bool, string-conversions, tagged + , text, vault }: mkDerivation { pname = "servant"; - version = "0.12.1"; - sha256 = "1aknvflz1zlvnmg9ik8zbnbckcy3ai89h7an2rbfm7ygqhmnh0rh"; + version = "0.13"; + sha256 = "0fmwcrkjlq1rnlbzdn918z54pqbwrjpgwy2isxmfykb31m2pn230"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring case-insensitive http-api-data http-media http-types mmorph mtl - natural-transformation network-uri string-conversions tagged text - vault + natural-transformation network-uri singleton-bool + string-conversions tagged text vault ]; testHaskellDepends = [ - aeson aeson-compat attoparsec base base-compat bytestring directory - doctest filemanip filepath hspec QuickCheck quickcheck-instances - string-conversions text url + aeson aeson-compat attoparsec base base-compat bytestring doctest + hspec QuickCheck quickcheck-instances string-conversions text ]; testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; @@ -179271,8 +179619,8 @@ self: { }: mkDerivation { pname = "servant-auth-token"; - version = "0.5.1.0"; - sha256 = "113pjs52nvi94bfx1ys4lanyvzkrlmb1p2y8sxhhb4bal917xki1"; + version = "0.5.2.0"; + sha256 = "1rgv88yh91v7b6kq28agijqx7ds9ghwla0npdi5i194p6w7c2mla"; libraryHaskellDepends = [ aeson-injector base bytestring containers http-api-data mtl pwstore-fast servant servant-auth-token-api servant-server text @@ -179293,8 +179641,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-acid"; - version = "0.5.1.0"; - sha256 = "1kxmgdj7bz2bbs6n9kfp28y9a9cvc2xk8345jnd4ks0iw43xjwr3"; + version = "0.5.2.0"; + sha256 = "1gv054fvjnx52c5l6bljf1dk3cgi9283nkqxwmg6s968y73z8pxf"; libraryHaskellDepends = [ acid-state aeson-injector base bytestring containers ghc-prim monad-control mtl safe safecopy servant-auth-token @@ -179334,8 +179682,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-leveldb"; - version = "0.5.1.0"; - sha256 = "0bkprvi9zwc599ynkabjsk1m9wpbvfpmhzjx6rqj92m1nki62264"; + version = "0.5.2.0"; + sha256 = "1xzrrmpvwvba9xwgvvrbwxkhiqg6cs2vp9fbk1as1zfas1sk2kiy"; libraryHaskellDepends = [ aeson-injector base bytestring concurrent-extra containers exceptions lens leveldb-haskell monad-control mtl resourcet safe @@ -179357,8 +179705,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-persistent"; - version = "0.6.1.0"; - sha256 = "1ni74vk121ncfkdjksf15g6686c2acbg22dn1srzwyngx5iwjcnc"; + version = "0.6.2.0"; + sha256 = "08z15sfpn6rsws80rdnh7yifkyq994gx6a9l2yhb1pqxl6g2vf2c"; libraryHaskellDepends = [ aeson-injector base bytestring containers monad-control mtl persistent persistent-template servant-auth-token @@ -179380,8 +179728,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-rocksdb"; - version = "0.5.1.0"; - sha256 = "1xbnqv3b64r1xnzra2pdysjg5r9kxwxaya5rfrcgl8fz1b4n4hbb"; + version = "0.5.2.0"; + sha256 = "13fcjqbw30rcf123d47hjy8xinrqnii0yyj9zdnfn14yi9gk2lr1"; libraryHaskellDepends = [ aeson-injector base bytestring concurrent-extra containers exceptions lens monad-control mtl resourcet rocksdb-haskell safe @@ -179409,6 +179757,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-blaze_0_8" = callPackage + ({ mkDerivation, base, blaze-html, http-media, servant + , servant-server, wai, warp + }: + mkDerivation { + pname = "servant-blaze"; + version = "0.8"; + sha256 = "155f20pizgkhn0hczwpxwxw1i99h0l6kfwwhs2r6bmr305aqisj6"; + libraryHaskellDepends = [ base blaze-html http-media servant ]; + testHaskellDepends = [ base blaze-html servant-server wai warp ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "Blaze-html support for servant"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-cassava" = callPackage ({ mkDerivation, base, base-compat, bytestring, cassava, http-media , servant, servant-server, vector, wai, warp @@ -179417,6 +179781,8 @@ self: { pname = "servant-cassava"; version = "0.10"; sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v"; + revision = "1"; + editedCabalFile = "165q0rvbk09z4k5zwhpx6380gakqbbz2xwvw40ahpjf46p0k9159"; libraryHaskellDepends = [ base base-compat bytestring cassava http-media servant vector ]; @@ -179495,25 +179861,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-client_0_12_0_1" = callPackage + "servant-client_0_13" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , containers, deepseq, exceptions, generics-sop, hspec , hspec-discover, http-api-data, http-client, http-client-tls , http-media, http-types, HUnit, monad-control, mtl, network , QuickCheck, semigroupoids, servant, servant-client-core - , servant-server, text, transformers, transformers-base + , servant-server, stm, text, time, transformers, transformers-base , transformers-compat, wai, warp }: mkDerivation { pname = "servant-client"; - version = "0.12.0.1"; - sha256 = "12apsxsxqxc9xxcpn6l4y69x3q22407gni3ixxa7c0afcr5jnani"; - revision = "1"; - editedCabalFile = "1gwzjxlml8fyhn0acs6pyy1sp34dv2zxsm7pcp8kxck6h1n9x9yq"; + version = "0.13"; + sha256 = "0bfrc3j2b6mbsvbv66l7mh3klkrrfdjvaq5s834jiivaavc6zf93"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring containers exceptions http-client http-client-tls http-media http-types monad-control mtl - semigroupoids servant-client-core text transformers + semigroupoids servant-client-core stm text time transformers transformers-base transformers-compat ]; testHaskellDepends = [ @@ -179537,10 +179901,8 @@ self: { }: mkDerivation { pname = "servant-client-core"; - version = "0.12"; - sha256 = "0wb36sgirhyfqa32zjs6gz3fwzcim6qvhb6w6a3anpi2nlfaq355"; - revision = "1"; - editedCabalFile = "0sfj0sj66f4wi2r4g9hr6p0010jc8l2h05mi23r0217ncwh8y3xm"; + version = "0.13"; + sha256 = "1n7s47cqvahzfyyb4cwnq72a0qyrk8ybx4yj3g4lw9va2zlj78vp"; libraryHaskellDepends = [ base base-compat base64-bytestring bytestring containers exceptions generics-sop http-api-data http-media http-types mtl network-uri @@ -179646,7 +180008,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-docs_0_11_1" = callPackage + "servant-docs_0_11_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , case-insensitive, control-monad-omega, hashable, hspec , hspec-discover, http-media, http-types, lens, servant @@ -179654,8 +180016,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.11.1"; - sha256 = "1i2680jzgrlcajxmakcg1hvddkbx6fbz4vvrbz0ca660hil2vlb2"; + version = "0.11.2"; + sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179807,15 +180169,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-foreign_0_10_2" = callPackage - ({ mkDerivation, base, hspec, hspec-discover, http-types, lens - , servant, text + "servant-foreign_0_11" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , http-types, lens, servant, text }: mkDerivation { pname = "servant-foreign"; - version = "0.10.2"; - sha256 = "16r42df628jsw9khv5kjwb702ajwmxg4kya19acm10660c0gxygs"; - libraryHaskellDepends = [ base http-types lens servant text ]; + version = "0.11"; + sha256 = "1n8cjlk16m24wdxicyp0js1lsshqf27bk5a6qykc2f8kiriw5jcf"; + libraryHaskellDepends = [ + base base-compat http-types lens servant text + ]; testHaskellDepends = [ base hspec servant ]; testToolDepends = [ hspec-discover ]; description = "Helpers for generating clients for servant APIs in any programming language"; @@ -179987,6 +180351,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-js_0_9_3_2" = callPackage + ({ mkDerivation, aeson, base, base-compat, charset, filepath, hspec + , hspec-discover, hspec-expectations, language-ecmascript, lens + , QuickCheck, servant, servant-foreign, servant-server, stm, text + , transformers, warp + }: + mkDerivation { + pname = "servant-js"; + version = "0.9.3.2"; + sha256 = "1p37520x85rg7rnhazby0x6qas2sh5d79gygmaa5f7jalhkyrq02"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat charset lens servant servant-foreign text + ]; + executableHaskellDepends = [ + aeson base filepath lens servant servant-server stm transformers + warp + ]; + testHaskellDepends = [ + base base-compat hspec hspec-expectations language-ecmascript lens + QuickCheck servant text + ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "Automatically derive javascript functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-kotlin" = callPackage ({ mkDerivation, aeson, base, containers, directory, formatting , hspec, http-api-data, lens, servant, servant-foreign, shelly @@ -180027,6 +180421,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-lucid_0_8" = callPackage + ({ mkDerivation, base, http-media, lucid, servant, servant-server + , wai, warp + }: + mkDerivation { + pname = "servant-lucid"; + version = "0.8"; + sha256 = "0vkhh6n51672l3cvd64xdddnzr351j9hd80j7raqkq6k1wrygfi5"; + libraryHaskellDepends = [ base http-media lucid servant ]; + testHaskellDepends = [ base lucid servant-server wai warp ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "Servant support for lucid"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-match" = callPackage ({ mkDerivation, base, bytestring, hspec, http-types, network-uri , servant, text, utf8-string @@ -180097,6 +180507,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-mock_0_8_4" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring + , bytestring-conversion, hspec, hspec-discover, hspec-wai + , http-types, QuickCheck, servant, servant-server, transformers + , wai, warp + }: + mkDerivation { + pname = "servant-mock"; + version = "0.8.4"; + sha256 = "1705fw63lrzw79w1ypcdlf35d8qxx247q8isiqh28wzmc4j3kmnr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat bytestring http-types QuickCheck servant + servant-server transformers wai + ]; + executableHaskellDepends = [ + aeson base QuickCheck servant-server warp + ]; + testHaskellDepends = [ + aeson base bytestring-conversion hspec hspec-wai QuickCheck servant + servant-server wai + ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "Derive a mock server for free from your servant API types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-multipart" = callPackage ({ mkDerivation, base, bytestring, directory, http-client , http-media, lens, network, resourcet, servant, servant-docs @@ -180104,8 +180544,8 @@ self: { }: mkDerivation { pname = "servant-multipart"; - version = "0.11"; - sha256 = "1m3mzqsg09mcdkr88rba2fq4j19kqrgmrq9nd70dwivfqbh5nvpj"; + version = "0.11.1"; + sha256 = "06wnmazi4f2lgk2ziyh0wjnjl5gs88rsb0f6bpphxkv7wy3agv4q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180156,6 +180596,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "servant-pagination" = callPackage + ({ mkDerivation, aeson, base, safe, servant, servant-server, text + , warp + }: + mkDerivation { + pname = "servant-pagination"; + version = "1.0.0"; + sha256 = "1cxd9sqryk619ss7x55w8xh4y3dkxl0gcdr3kawryzcm64qlgyja"; + revision = "1"; + editedCabalFile = "0y9mg8jaag07f89krsk2n3y635rjgmcym1kx130s7hb3h3ly7713"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base safe servant servant-server text ]; + executableHaskellDepends = [ + aeson base servant servant-server warp + ]; + homepage = "https://github.com/chordify/haskell-servant-pagination"; + description = "Type-safe pagination for Servant APIs"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "servant-pandoc" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, http-media , lens, pandoc-types, servant-docs, string-conversions, text @@ -180280,8 +180741,8 @@ self: { }: mkDerivation { pname = "servant-pushbullet-client"; - version = "0.4.0.0"; - sha256 = "0v2mkriwh7lara66w02kkzwlnr5y8ahb6djpsnhvch1asa5klsnk"; + version = "0.5.0.0"; + sha256 = "1pdqb2kff033zga35n9ycgnw3zb42b5hpap3f4fjkxfbxz5cq3zz"; libraryHaskellDepends = [ aeson base http-api-data http-client http-client-tls microlens microlens-th pushbullet-types scientific servant servant-client @@ -180331,8 +180792,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.5.0"; - sha256 = "1867dcdm87gzq9gzz02rc9h6vcwpi24lxcxyij0aazgvfgsya6m6"; + version = "0.0.6.0"; + sha256 = "1llhxqnbrydikrxdd10cfk4shgbfpxvlsym0lvvvbva4vci1k8wj"; libraryHaskellDepends = [ aeson base base-compat bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -180342,7 +180803,7 @@ self: { testHaskellDepends = [ aeson base base-compat blaze-html bytestring hspec hspec-core http-client QuickCheck quickcheck-io servant servant-blaze - servant-client servant-server transformers warp + servant-client servant-server text transformers warp ]; testToolDepends = [ hspec-discover ]; description = "QuickCheck entire APIs"; @@ -180430,6 +180891,23 @@ self: { homepage = "https://github.com/joneshf/servant-ruby#readme"; description = "Generate a Ruby client from a Servant API with Net::HTTP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "servant-ruby_0_6_0_0" = callPackage + ({ mkDerivation, base, casing, doctest, lens, QuickCheck + , servant-foreign, text + }: + mkDerivation { + pname = "servant-ruby"; + version = "0.6.0.0"; + sha256 = "0cm0s44x71vbfzl5ky7s1ml88gnympr4n0lfg6w0z17lr95myrm8"; + libraryHaskellDepends = [ base casing lens servant-foreign text ]; + testHaskellDepends = [ base doctest QuickCheck ]; + homepage = "https://github.com/joneshf/servant-ruby#readme"; + description = "Generate a Ruby client from a Servant API with Net::HTTP"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-scotty" = callPackage @@ -180491,29 +180969,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-server_0_12" = callPackage + "servant-server_0_13" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat , base64-bytestring, bytestring, Cabal, cabal-doctest, containers - , directory, doctest, exceptions, filemanip, filepath, hspec - , hspec-discover, hspec-wai, http-api-data, http-types - , monad-control, mtl, network, network-uri, parsec, QuickCheck - , resourcet, safe, servant, should-not-typecheck, split - , string-conversions, system-filepath, tagged, temporary, text - , transformers, transformers-base, transformers-compat, wai - , wai-app-static, wai-extra, warp, word8 + , directory, doctest, exceptions, filepath, hspec, hspec-discover + , hspec-wai, http-api-data, http-media, http-types, monad-control + , mtl, network, network-uri, parsec, QuickCheck, resourcet, safe + , servant, should-not-typecheck, split, string-conversions + , system-filepath, tagged, temporary, text, transformers + , transformers-base, transformers-compat, wai, wai-app-static + , wai-extra, warp, word8 }: mkDerivation { pname = "servant-server"; - version = "0.12"; - sha256 = "1iiwk4d945z4xkxm3hn4d9ybi04n1ig4niip7vk3xp0wzikk7wk5"; - revision = "1"; - editedCabalFile = "1b0vqzbaaz3bqzdh640rss5xsyl0s5q42xccfdmzmpn559w3p81r"; + version = "0.13"; + sha256 = "09hqihij87h031qcr4swsn82fsv8v1qklqc2hl0is8rd8bzi2cjy"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring - containers exceptions filepath http-api-data http-types + containers exceptions filepath http-api-data http-media http-types monad-control mtl network network-uri resourcet safe servant split string-conversions system-filepath tagged text transformers transformers-base transformers-compat wai wai-app-static warp word8 @@ -180521,10 +180997,10 @@ self: { executableHaskellDepends = [ aeson base servant text wai warp ]; testHaskellDepends = [ aeson base base-compat base64-bytestring bytestring directory - doctest exceptions filemanip filepath hspec hspec-wai http-types - mtl network parsec QuickCheck resourcet safe servant - should-not-typecheck string-conversions temporary text transformers - transformers-compat wai wai-extra warp + doctest exceptions hspec hspec-wai http-types mtl network parsec + QuickCheck resourcet safe servant should-not-typecheck + string-conversions temporary text transformers transformers-compat + wai wai-extra warp ]; testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; @@ -180675,6 +181151,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-swagger_1_1_5" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal + , cabal-doctest, directory, doctest, filepath, hspec + , hspec-discover, http-media, insert-ordered-containers, lens + , QuickCheck, servant, singleton-bool, swagger2, text, time + , unordered-containers + }: + mkDerivation { + pname = "servant-swagger"; + version = "1.1.5"; + sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base bytestring hspec http-media insert-ordered-containers + lens QuickCheck servant singleton-bool swagger2 text + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base directory doctest filepath hspec lens + QuickCheck servant swagger2 text time + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/haskell-servant/servant-swagger"; + description = "Generate Swagger specification for your servant API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-swagger-ui" = callPackage ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring , directory, file-embed, filepath, http-media, lens, servant @@ -180703,6 +181207,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-swagger-ui_0_2_5_3_9_1" = callPackage + ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring + , directory, file-embed, filepath, http-media, lens, servant + , servant-blaze, servant-server, servant-swagger, swagger2 + , template-haskell, text, transformers, transformers-compat, wai + , wai-app-static, warp + }: + mkDerivation { + pname = "servant-swagger-ui"; + version = "0.2.5.3.9.1"; + sha256 = "1fbznhlzh9xnnhxsazan46w5x439a31lglb8mh7j945axyh7l09m"; + libraryHaskellDepends = [ + base blaze-markup bytestring directory file-embed filepath + http-media servant servant-blaze servant-server servant-swagger + swagger2 template-haskell text transformers transformers-compat + wai-app-static + ]; + testHaskellDepends = [ + aeson base base-compat lens servant servant-server servant-swagger + swagger2 text transformers transformers-compat wai warp + ]; + homepage = "https://github.com/phadej/servant-swagger-ui#readme"; + description = "Servant swagger ui"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-websockets" = callPackage ({ mkDerivation, aeson, async, base, bytestring, conduit , exceptions, resourcet, servant-server, text, wai, wai-websockets @@ -180758,8 +181289,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.0"; sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9"; - revision = "17"; - editedCabalFile = "1525b9dm2g8r2xrisciypi0ihm3rmbs3g3f9nvg01qwa3q1sxf70"; + revision = "18"; + editedCabalFile = "038paj9z77rx6jc06vg5f4f9gvwaq73ggw7ppgrw6vwhsl4nd84q"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -181778,20 +182309,56 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shake_0_16_1" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, directory + , extra, filepath, hashable, js-flot, js-jquery, primitive, process + , QuickCheck, random, time, transformers, unix + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "shake"; + version = "0.16.1"; + sha256 = "14f9ai58i83wy5kr28gl1a3a1jbl89j6i25qi79nf3fbdca05s75"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary bytestring deepseq directory extra filepath hashable + js-flot js-jquery primitive process random time transformers unix + unordered-containers utf8-string + ]; + executableHaskellDepends = [ + base binary bytestring deepseq directory extra filepath hashable + js-flot js-jquery primitive process random time transformers unix + unordered-containers utf8-string + ]; + testHaskellDepends = [ + base binary bytestring deepseq directory extra filepath hashable + js-flot js-jquery primitive process QuickCheck random time + transformers unix unordered-containers utf8-string + ]; + homepage = "http://shakebuild.com"; + description = "Build system library, like Make, but more accurate dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shake-ats" = callPackage - ({ mkDerivation, base, binary, directory, hs2ats, language-ats - , shake, shake-ext, text + ({ mkDerivation, base, binary, dependency, directory, hs2ats + , language-ats, microlens, shake, shake-ext, text }: mkDerivation { pname = "shake-ats"; - version = "1.1.0.2"; - sha256 = "0k15mpd72mmlnshgm2df042kqwzgk49ylf5rb99sdb9sjn0yrdbm"; + version = "1.4.0.0"; + sha256 = "06x8aclhhsr6gg1qj9hbv8bk4f21i55akni7i3fl117qn2bq8wp6"; libraryHaskellDepends = [ - base binary directory hs2ats language-ats shake shake-ext text + base binary dependency directory hs2ats language-ats microlens + shake shake-ext text ]; homepage = "https://github.com/vmchale/shake-ats#readme"; description = "Utilities for building ATS projects with shake"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-cabal-build" = callPackage @@ -181813,15 +182380,15 @@ self: { "shake-ext" = callPackage ({ mkDerivation, base, Cabal, composition-prelude, directory - , language-ats, mtl, shake, text + , language-ats, mtl, shake, template-haskell, text }: mkDerivation { pname = "shake-ext"; - version = "2.1.0.2"; - sha256 = "0ii1l76ms3b2c6pgclrgpfgpjsmxw5ax9gi7g60jyby9s5cgbgmc"; + version = "2.3.0.1"; + sha256 = "0g8hadbq4db6kx611hlhcpnna9rwdwwsch83vl3vv1417f84gjl5"; libraryHaskellDepends = [ base Cabal composition-prelude directory language-ats mtl shake - text + template-haskell text ]; homepage = "https://hub.darcs.net/vmchale/shake-ext"; description = "Helper functions for linting with shake"; @@ -181982,8 +182549,8 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.0.14.1"; - sha256 = "02pahbvibll4jmbq6p5vxr2r4mmrfx3h0c8v6qbj4rlq96lc6a23"; + version = "2.0.15"; + sha256 = "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers directory exceptions ghc-prim parsec process scientific template-haskell text @@ -182376,6 +182943,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shellout" = callPackage + ({ mkDerivation, async, base, stm, text, typed-process }: + mkDerivation { + pname = "shellout"; + version = "0.1.0.0"; + sha256 = "0cinrxwr4jclx37c3h9r1swkj6l78z7fmja6242z53ai1kjqj9kp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ async base stm text typed-process ]; + executableHaskellDepends = [ async base stm text typed-process ]; + homepage = "https://github.com/loganmac/shellout#readme"; + description = "A threaded manager for Haskell that can run and stream external process output/err/exits"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shelltestrunner" = callPackage ({ mkDerivation, base, cmdargs, Diff, directory, filemanip , filepath, HUnit, parsec, pretty-show, process, regex-tdfa, safe @@ -182954,6 +183536,8 @@ self: { pname = "sign"; version = "0.4.3"; sha256 = "0i3m3zylss4nxmf290wmc8ldck0pnx0m5z4y8nhxnz51adlmp1bp"; + revision = "1"; + editedCabalFile = "112xj46k2fzhxiqsnh2fs7fmfrhs6k4q65jxw8mkn58mwl9sr86f"; libraryHaskellDepends = [ base containers deepseq hashable lattices universe-base ]; @@ -183611,23 +184195,6 @@ self: { }: mkDerivation { pname = "simple-sendfile"; - version = "0.2.26"; - sha256 = "0z2r971bjy9wwv9rhnzh0ldd0z9zvqwyrq9yhz7m4lnf0k0wqq6z"; - libraryHaskellDepends = [ base bytestring network unix ]; - testHaskellDepends = [ - base bytestring conduit conduit-extra directory hspec HUnit network - process resourcet unix - ]; - description = "Cross platform library for the sendfile system call"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-sendfile_0_2_27" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , directory, hspec, HUnit, network, process, resourcet, unix - }: - mkDerivation { - pname = "simple-sendfile"; version = "0.2.27"; sha256 = "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn"; libraryHaskellDepends = [ base bytestring network unix ]; @@ -183637,7 +184204,6 @@ self: { ]; description = "Cross platform library for the sendfile system call"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-server" = callPackage @@ -183819,6 +184385,7 @@ self: { homepage = "https://github.com/dzhus/simple-vec3#readme"; description = "Three-dimensional vectors of doubles with basic operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-zipper" = callPackage @@ -184107,6 +184674,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singleton-bool_0_1_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "singleton-bool"; + version = "0.1.3"; + sha256 = "1i29dl0f45rk280qfrcjcfbkshb7h3y0s2ndw2d7drwlcbl4p2if"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/phadej/singleton-bool#readme"; + description = "Type level booleans"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singleton-dict" = callPackage ({ mkDerivation, base, singletons }: mkDerivation { @@ -185553,6 +186133,8 @@ self: { pname = "snap"; version = "1.1.0.0"; sha256 = "166ilpc4dd4020mmqn2lrfs3j5dl4a2mvqag1sz4mx7jcndrjbc8"; + revision = "2"; + editedCabalFile = "05k5fgb31xvz733j3d4hqbhzbjlglv1m4f020mdnm1q7qg4a81nq"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist filepath hashable heist @@ -185701,18 +186283,14 @@ self: { }) {}; "snap-cors" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, case-insensitive - , hashable, network, network-uri, snap, text, unordered-containers - }: + ({ mkDerivation, snap-core }: mkDerivation { pname = "snap-cors"; - version = "1.2.11"; - sha256 = "0d5gmii970z9nr4fp911xar6b6798dmjhnxhvids420why5k3gc1"; - libraryHaskellDepends = [ - attoparsec base bytestring case-insensitive hashable network - network-uri snap text unordered-containers - ]; - homepage = "http://github.com/ocharles/snap-cors"; + version = "1.3.0"; + sha256 = "182l2wfkjanxa5n2g5ypsvdgvigfnk5f4n0am37c26lgk3n6zi9a"; + libraryHaskellDepends = [ snap-core ]; + doHaddock = false; + homepage = "https://github.com/ocharles/snap-cors"; description = "Add CORS headers to Snap applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -185740,8 +186318,8 @@ self: { }: mkDerivation { pname = "snap-error-collector"; - version = "1.1.4"; - sha256 = "0k9nddbqdd6c12vrl5pqsl02pv38bhcxk5j02sq8lx7pk05w0mam"; + version = "1.1.5"; + sha256 = "0xpz24f2h1rzqs9j15skz1cmk18mh472zsix620shp3qjlma3da4"; libraryHaskellDepends = [ async base containers lifted-base monad-loops snap stm time transformers @@ -187908,21 +188486,21 @@ self: { "sparkle" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, choice - , distributed-closure, filepath, inline-java, jni, jvm + , constraints, distributed-closure, filepath, inline-java, jni, jvm , jvm-streaming, process, regex-tdfa, singletons, streaming, text , vector, zip-archive }: mkDerivation { pname = "sparkle"; - version = "0.7.2.1"; - sha256 = "1bfgj1a43aj4nwzq1471l2sb9il7sh0czc22fhmd8mhpbz6wlnsp"; + version = "0.7.3"; + sha256 = "1wxp0wdmcvkypnayv128f2bgcdh7ka1b6ap7w5743v1gpxzkqb8b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal inline-java ]; libraryHaskellDepends = [ - base binary bytestring choice distributed-closure inline-java jni - jvm jvm-streaming singletons streaming text vector + base binary bytestring choice constraints distributed-closure + inline-java jni jvm jvm-streaming singletons streaming text vector ]; executableHaskellDepends = [ base bytestring filepath process regex-tdfa text zip-archive @@ -188093,6 +188671,7 @@ self: { ]; description = "3d math including quaternions/euler angles/dcms and utility functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spawn" = callPackage @@ -190228,8 +190807,8 @@ self: { }: mkDerivation { pname = "stackage2nix"; - version = "0.5.0"; - sha256 = "0nqn2sbzig6n3jdzzi8p8kpfmd8npawn448aw9x7zixxav10xz9x"; + version = "0.6.0"; + sha256 = "0v39d39ijc15n6k96g9ii02xlgyw8dvlfghkavlqcsny3jqfa49d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191115,26 +191694,12 @@ self: { ({ mkDerivation, array, base }: mkDerivation { pname = "stm"; - version = "2.4.4.1"; - sha256 = "111kpy1d6f5c0bggh6hyfm86q5p8bq1qbqf6dw2x4l4dxnar16cg"; - revision = "1"; - editedCabalFile = "0kzw4rw9fgmc4qyxmm1lwifdyrx5r1356150xm14vy4mp86diks9"; - libraryHaskellDepends = [ array base ]; - description = "Software Transactional Memory"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stm_2_4_5_0" = callPackage - ({ mkDerivation, array, base }: - mkDerivation { - pname = "stm"; version = "2.4.5.0"; sha256 = "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri"; libraryHaskellDepends = [ array base ]; homepage = "https://wiki.haskell.org/Software_transactional_memory"; description = "Software Transactional Memory"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-channelize" = callPackage @@ -191771,28 +192336,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_15_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable - , hspec, hspec-discover, lens, template-haskell, text + "stratosphere_0_15_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.15.1"; - sha256 = "13221ynzcaj6hilvbcllnjf1ixv6zmsp7jnhp1ishmj42z5qarbl"; + version = "0.15.2"; + sha256 = "00mna9w4021a1ydxyysx0wd333hby4sx3fpl1vygmcyjfibwiqmc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring hashable lens template-haskell - text unordered-containers + aeson aeson-pretty base bytestring containers hashable lens + template-haskell text unordered-containers ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring hashable lens template-haskell - text unordered-containers + aeson aeson-pretty base bytestring containers hashable lens + template-haskell text unordered-containers ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring hashable hspec hspec-discover - lens template-haskell text unordered-containers + aeson aeson-pretty base bytestring containers hashable hspec + hspec-discover lens template-haskell text unordered-containers ]; homepage = "https://github.com/frontrowed/stratosphere#readme"; description = "EDSL for AWS CloudFormation"; @@ -192058,31 +192623,6 @@ self: { "streaming-commons" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring - , criterion, deepseq, directory, hspec, network, process - , QuickCheck, random, stm, text, transformers, unix, zlib - }: - mkDerivation { - pname = "streaming-commons"; - version = "0.1.18"; - sha256 = "1jw3y3clh2l0kmsrkhhn6n1b8i8gnwz5cwbczj1kq00sj3xjxbr7"; - libraryHaskellDepends = [ - array async base blaze-builder bytestring directory network process - random stm text transformers unix zlib - ]; - testHaskellDepends = [ - array async base blaze-builder bytestring deepseq hspec network - QuickCheck text unix zlib - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq text - ]; - homepage = "https://github.com/fpco/streaming-commons"; - description = "Common lower-level functions needed by various streaming data libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "streaming-commons_0_1_19" = callPackage - ({ mkDerivation, array, async, base, blaze-builder, bytestring , deepseq, directory, gauge, hspec, network, process, QuickCheck , random, stm, text, transformers, unix, zlib }: @@ -192104,7 +192644,6 @@ self: { homepage = "https://github.com/fpco/streaming-commons"; description = "Common lower-level functions needed by various streaming data libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-concurrency" = callPackage @@ -192134,8 +192673,8 @@ self: { }: mkDerivation { pname = "streaming-conduit"; - version = "0.1.2.0"; - sha256 = "1vzw0lfj8l4ic1fcw0iqiwygg4zrfxw9xdjbl7qpkfsjsbjqyg2q"; + version = "0.1.2.2"; + sha256 = "0g2x8a6gksc1na3qn1fnd9c7cckn4r54x11x4rxnmy2v04sv0h8z"; libraryHaskellDepends = [ base bytestring conduit streaming streaming-bytestring transformers ]; @@ -192291,8 +192830,8 @@ self: { }: mkDerivation { pname = "streaming-with"; - version = "0.2.0.0"; - sha256 = "02cdjmq7dxqfpqs73v7c63iwavbwb56fdd3pk4qs91vm6d0lfbrp"; + version = "0.2.1.0"; + sha256 = "04i4k7n37qblf9yxdj0bl1qr0arpkv2l06kx7f8aqf1xa7vvxz9i"; libraryHaskellDepends = [ base exceptions managed streaming-bytestring temporary transformers ]; @@ -192454,14 +192993,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "strict-base-types_0_6_0" = callPackage + "strict-base-types_0_6_1" = callPackage ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim , hashable, lens, QuickCheck, strict }: mkDerivation { pname = "strict-base-types"; - version = "0.6.0"; - sha256 = "01i8v4l47xp5f4i9czlwg1kk4lvnfmxhgqlcnacirrp0pfjmrq7p"; + version = "0.6.1"; + sha256 = "0yihvjijag9g55ihrgqj0vwn6ksvscj3r0n2zzxz2qbxrhx6m1pq"; libraryHaskellDepends = [ aeson base bifunctors binary deepseq ghc-prim hashable lens QuickCheck strict @@ -192699,6 +193238,7 @@ self: { ]; description = "Tools for working with isomorphisms of strings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "string-qq" = callPackage @@ -192779,6 +193319,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "string-transform_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , tasty-smallcheck, text, utf8-string + }: + mkDerivation { + pname = "string-transform"; + version = "1.0.0"; + sha256 = "0556blv06jl973pnkcab36bsa3kjzjhzs396q31qmkqnqlpday4d"; + libraryHaskellDepends = [ base bytestring text utf8-string ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string + ]; + homepage = "https://github.com/ncaq/string-transform#readme"; + description = "simple and easy haskell string transform wrapper"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "string-typelits" = callPackage ({ mkDerivation, base, template-haskell, type-combinators , type-combinators-quote @@ -192819,6 +193377,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stringbuilder_0_5_1" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "stringbuilder"; + version = "0.5.1"; + sha256 = "1fh3csx1wcssn8xyvl4ip4aprh9l4qyz2kk8mgjvqvc0vb2bsy6q"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "A writer monad for multi-line string literals"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stringlike" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, quickcheck-instances , test-framework, test-framework-quickcheck2, text @@ -194303,34 +194874,6 @@ self: { }: mkDerivation { pname = "swagger-petstore"; - version = "0.0.1.7"; - sha256 = "07p2hd35wg5g1r3lmhffvjch5vy6idmhdv21k1g8v3131apgjpxy"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive containers - deepseq exceptions http-api-data http-client http-client-tls - http-media http-types iso8601-time katip microlens mtl network - random safe-exceptions text time transformers unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base bytestring containers hspec iso8601-time mtl QuickCheck - semigroups text time transformers unordered-containers vector - ]; - homepage = "https://github.com/swagger-api/swagger-codegen#readme"; - description = "Auto-generated swagger-petstore API Client"; - license = stdenv.lib.licenses.mit; - }) {}; - - "swagger-petstore_0_0_1_8" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , case-insensitive, containers, deepseq, exceptions, hspec - , http-api-data, http-client, http-client-tls, http-media - , http-types, iso8601-time, katip, microlens, mtl, network - , QuickCheck, random, safe-exceptions, semigroups, text, time - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "swagger-petstore"; version = "0.0.1.8"; sha256 = "1rslv21lg7jfc6vb8yyb6kkg3cma2300h4hld3m8zwfxgzcq79h7"; libraryHaskellDepends = [ @@ -194347,7 +194890,6 @@ self: { homepage = "https://github.com/swagger-api/swagger-codegen#readme"; description = "Auto-generated swagger-petstore API Client"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swagger-test" = callPackage @@ -194392,6 +194934,8 @@ self: { pname = "swagger2"; version = "2.2"; sha256 = "0byzfz52mbnxcmspmk4s43bhprfwrjnh2mkpyfrdir64axqx7yf6"; + revision = "1"; + editedCabalFile = "0dhs44zhb2yh4yxw88yvlijcd255ppm1ch7dz7pn7sdv1wr6kxq5"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base-compat bytestring containers generics-sop hashable @@ -195489,8 +196033,8 @@ self: { ({ mkDerivation, attoparsec, base, process, text }: mkDerivation { pname = "system-info"; - version = "0.1.0.13"; - sha256 = "0ym1j9bjjv7aa3v1zqklljfyq19agv3imghglfii0qk7mrlyya9d"; + version = "0.3.0.0"; + sha256 = "05zp1kddydl9fqbhfpkjvxqfi6l9i1qhif5sziz3d0mymnyrzvpp"; libraryHaskellDepends = [ attoparsec base process text ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; @@ -196742,21 +197286,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tar-conduit_0_2_1" = callPackage + "tar-conduit_0_2_3" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , containers, criterion, deepseq, directory, filepath, hspec, unix - , weigh + , containers, criterion, deepseq, directory, filepath, hspec + , QuickCheck, safe-exceptions, text, unix, weigh }: mkDerivation { pname = "tar-conduit"; - version = "0.2.1"; - sha256 = "09mpkr05f6vwhrk3r8fafs8rsgc10dkkgws356ciy3rz9y8xfjw2"; + version = "0.2.3"; + sha256 = "1is2q5662zrrxgb2dm2n1qa1aqdrwf4g7il5jdpxhri28m7pp7jp"; libraryHaskellDepends = [ - base bytestring conduit-combinators directory filepath unix + base bytestring conduit conduit-combinators directory filepath + safe-exceptions text unix ]; testHaskellDepends = [ base bytestring conduit conduit-combinators containers deepseq - directory filepath hspec weigh + directory filepath hspec QuickCheck weigh ]; benchmarkHaskellDepends = [ base bytestring conduit conduit-combinators containers criterion @@ -196965,24 +197510,6 @@ self: { }: mkDerivation { pname = "tasty-ant-xml"; - version = "1.1.2"; - sha256 = "10k8092iz8klx7wa3ajfny8zvrxv3clz330v3qz3k7dmbj596nhq"; - libraryHaskellDepends = [ - base containers directory filepath generic-deriving ghc-prim mtl - stm tagged tasty transformers xml - ]; - homepage = "http://github.com/ocharles/tasty-ant-xml"; - description = "Render tasty output to XML for Jenkins"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-ant-xml_1_1_3" = callPackage - ({ mkDerivation, base, containers, directory, filepath - , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers - , xml - }: - mkDerivation { - pname = "tasty-ant-xml"; version = "1.1.3"; sha256 = "0nxrvxk83mv29yhywswg21q156zdzs02xrwqambnz78pldsrbk4n"; libraryHaskellDepends = [ @@ -196992,7 +197519,6 @@ self: { homepage = "http://github.com/ocharles/tasty-ant-xml"; description = "Render tasty output to XML for Jenkins"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-auto" = callPackage @@ -197159,6 +197685,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-hedgehog_0_1_0_2" = callPackage + ({ mkDerivation, base, hedgehog, tagged, tasty + , tasty-expected-failure + }: + mkDerivation { + pname = "tasty-hedgehog"; + version = "0.1.0.2"; + sha256 = "0cjdi0kpwpb4m5ad1y47x52336xfza4m82h5zg76r75f7fvzzh8x"; + libraryHaskellDepends = [ base hedgehog tagged tasty ]; + testHaskellDepends = [ + base hedgehog tasty tasty-expected-failure + ]; + homepage = "https://github.com/qfpl/tasty-hedghog"; + description = "Integrates the hedgehog testing library with the tasty testing framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-hspec" = callPackage ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty , tasty-quickcheck, tasty-smallcheck @@ -197389,23 +197933,6 @@ self: { }: mkDerivation { pname = "tasty-rerun"; - version = "1.1.9"; - sha256 = "0piwv5nrqvwnzp76xpsjlncrl2cd9jsxxb1ghkaijn2fi2c63akd"; - libraryHaskellDepends = [ - base containers mtl optparse-applicative reducers split stm tagged - tasty transformers - ]; - homepage = "http://github.com/ocharles/tasty-rerun"; - description = "Run tests by filtering the test tree depending on the result of previous test runs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-rerun_1_1_10" = callPackage - ({ mkDerivation, base, containers, mtl, optparse-applicative - , reducers, split, stm, tagged, tasty, transformers - }: - mkDerivation { - pname = "tasty-rerun"; version = "1.1.10"; sha256 = "1776fx700wlc9spn0dh3x4nh44x2yg33z9zyqzqlpwrhrkpaz91b"; libraryHaskellDepends = [ @@ -197415,7 +197942,6 @@ self: { homepage = "http://github.com/ocharles/tasty-rerun"; description = "Run tests by filtering the test tree depending on the result of previous test runs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-silver" = callPackage @@ -199247,20 +199773,20 @@ self: { "testbench" = callPackage ({ mkDerivation, base, bytestring, cassava, containers, criterion - , deepseq, dlist, HUnit, optparse-applicative, process, resourcet - , statistics, streaming, streaming-bytestring, streaming-cassava - , temporary, transformers, weigh + , deepseq, dlist, HUnit, optparse-applicative, process, statistics + , streaming, streaming-cassava, streaming-with, temporary + , transformers, weigh }: mkDerivation { pname = "testbench"; - version = "0.2.1.0"; - sha256 = "0pka1vmzh4x0pzwlrxzzsjaxjd7py43m5ph3barwfrbjkqbyjzj6"; + version = "0.2.1.1"; + sha256 = "0ps4q86258j41iv3xisxw3154xgxg0dmk3khc4ibr1k0dbvkr8r6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cassava criterion deepseq dlist HUnit - optparse-applicative process resourcet statistics streaming - streaming-bytestring streaming-cassava temporary transformers weigh + optparse-applicative process statistics streaming streaming-cassava + streaming-with temporary transformers weigh ]; executableHaskellDepends = [ base bytestring containers criterion HUnit @@ -199801,29 +200327,6 @@ self: { }) {}; "text-ldap" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring - , containers, dlist, QuickCheck, quickcheck-simple, random - , transformers - }: - mkDerivation { - pname = "text-ldap"; - version = "0.1.1.10"; - sha256 = "13wjarsshp64cc632bqmckx664a57w7cnlm8gs7rfp1bcm7vdnjk"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base base64-bytestring bytestring containers dlist - transformers - ]; - executableHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - base bytestring QuickCheck quickcheck-simple random - ]; - description = "Parser and Printer for LDAP text data stream"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-ldap_0_1_1_11" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, dlist , memory, QuickCheck, quickcheck-simple, random, transformers }: @@ -199842,7 +200345,6 @@ self: { ]; description = "Parser and Printer for LDAP text data stream"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-lens" = callPackage @@ -200812,19 +201314,6 @@ self: { ({ mkDerivation, base, ghc-prim, template-haskell }: mkDerivation { pname = "th-lift"; - version = "0.7.7"; - sha256 = "1dfb0z42vrmdx579lkam07ic03d3v5y19339a3ca0bwpprpzmihn"; - libraryHaskellDepends = [ base ghc-prim template-haskell ]; - testHaskellDepends = [ base ghc-prim template-haskell ]; - homepage = "http://github.com/mboes/th-lift"; - description = "Derive Template Haskell's Lift class for datatypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-lift_0_7_8" = callPackage - ({ mkDerivation, base, ghc-prim, template-haskell }: - mkDerivation { - pname = "th-lift"; version = "0.7.8"; sha256 = "0ay10b78x3969rpqqrgzy8srkl6iby2cljbf3mm17na8x22k7y1c"; libraryHaskellDepends = [ base ghc-prim template-haskell ]; @@ -200832,7 +201321,6 @@ self: { homepage = "http://github.com/mboes/th-lift"; description = "Derive Template Haskell's Lift class for datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-lift-instances" = callPackage @@ -200883,20 +201371,23 @@ self: { }) {}; "th-printf" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hspec, HUnit - , QuickCheck, template-haskell, text, transformers + ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bytestring + , charset, containers, criterion, hspec, HUnit, QuickCheck + , template-haskell, text, transformers, trifecta, utf8-string }: mkDerivation { pname = "th-printf"; - version = "0.3.1"; - sha256 = "089grlpavvqv90graa9rdwg9x1ph484g5bj7sfjklqy8mgwwqg7a"; + version = "0.5.0"; + sha256 = "1fn1l503x3y5dgv8wsgyxhm66dyvdvfalzmwmsqf86sy643qjpw6"; libraryHaskellDepends = [ - attoparsec base bytestring template-haskell text transformers + ansi-wl-pprint attoparsec base charset containers template-haskell + text transformers trifecta utf8-string ]; testHaskellDepends = [ base bytestring hspec HUnit QuickCheck template-haskell text ]; - homepage = "https://github.com/joelteon/th-printf"; + benchmarkHaskellDepends = [ base criterion text ]; + homepage = "https://github.com/pikajude/th-printf"; description = "Compile-time printf"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -205410,23 +205901,23 @@ self: { }) {}; "tttool" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , directory, executable-path, filepath, hashable, haskeline, HPDF - , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec - , process, random, split, spool, template-haskell, time, vector - , yaml, zlib + ({ mkDerivation, aeson, base, base64-bytestring, binary, blaze-svg + , bytestring, containers, directory, executable-path, filepath + , hashable, haskeline, HPDF, JuicyPixels, mtl, natural-sort + , optparse-applicative, parsec, process, random, split, spool + , template-haskell, text, time, vector, yaml, zlib }: mkDerivation { pname = "tttool"; - version = "1.7.0.3"; - sha256 = "0r8ha8wgzlf2ymyxylj16hfshf8w5dl13cwmdkl6ih2niwkzk9ch"; + version = "1.8"; + sha256 = "0j4lgkjg28i7wlz5rnlrii6mzx2bqsagrg3wiiw1z2ncik6qm472"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base binary bytestring containers directory executable-path - filepath hashable haskeline HPDF JuicyPixels mtl natural-sort - optparse-applicative parsec process random split spool - template-haskell time vector yaml zlib + aeson base base64-bytestring binary blaze-svg bytestring containers + directory executable-path filepath hashable haskeline HPDF + JuicyPixels mtl natural-sort optparse-applicative parsec process + random split spool template-haskell text time vector yaml zlib ]; homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; @@ -205721,7 +206212,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "turtle_1_5_1" = callPackage + "turtle_1_5_2" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , containers, criterion, directory, doctest, exceptions, foldl , hostname, managed, optional-args, optparse-applicative, process @@ -205730,8 +206221,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.1"; - sha256 = "06yya57w3i598b6h3gkhv8zs0a3f1az12x8viy16sgdbgwph8scm"; + version = "1.5.2"; + sha256 = "1h44b1r7kcfbsziq0c2ldc35mgsyaxa4pkzqs529ibd5pridm8vd"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -205790,20 +206281,16 @@ self: { }) {}; "twee" = callPackage - ({ mkDerivation, base, containers, dlist, ghc-prim, jukebox, pretty - , primitive, split, transformers + ({ mkDerivation, base, containers, jukebox, pretty, split, twee-lib }: mkDerivation { pname = "twee"; - version = "2.0"; - sha256 = "18raccm4glf0gysj625wiwkk2b295863g0hgypc9335cxb65n8k0"; - isLibrary = true; + version = "2.1"; + sha256 = "0g73siwd6hrqsfnvhy51d3q20whad130ai356qv9kv8myi2z8ii4"; + isLibrary = false; isExecutable = true; - libraryHaskellDepends = [ - base containers dlist ghc-prim pretty primitive transformers - ]; executableHaskellDepends = [ - base containers jukebox pretty split + base containers jukebox pretty split twee-lib ]; homepage = "http://github.com/nick8325/twee"; description = "An equational theorem prover"; @@ -205811,6 +206298,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "twee-lib" = callPackage + ({ mkDerivation, base, containers, dlist, ghc-prim, pretty + , primitive, transformers, vector + }: + mkDerivation { + pname = "twee-lib"; + version = "2.1"; + sha256 = "0h1wb1jiqd9xcyjg0mdp7kb45bsk3q3mksz4jv8kiqpxi3gjk2fl"; + libraryHaskellDepends = [ + base containers dlist ghc-prim pretty primitive transformers vector + ]; + homepage = "http://github.com/nick8325/twee"; + description = "An equational theorem prover"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tweet-hs" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition-prelude, containers, criterion @@ -206098,6 +206601,7 @@ self: { homepage = "https://github.com/markandrus/twilio-haskell"; description = "Twilio REST API library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twill" = callPackage @@ -206694,8 +207198,8 @@ self: { ({ mkDerivation, base, data-default, nats, numericpeano, text }: mkDerivation { pname = "type-iso"; - version = "0.1.0.0"; - sha256 = "03qs8frsj0a2jxpk1rrmhaivf68hg8dhjn4s3q85h4zrsxwfskjx"; + version = "1.0.0.0"; + sha256 = "11xcadzvvp9y7gm54k0nfsnx0hfr3g5bd8g8f8mlfqy24p0mq1m1"; libraryHaskellDepends = [ base data-default nats numericpeano text ]; @@ -206883,8 +207387,8 @@ self: { }: mkDerivation { pname = "type-of-html"; - version = "1.3.2.1"; - sha256 = "1c7yj9fh9dxkif2f116cjjgz2prdz1a3xaqni5m9gmvy2y5gvbdn"; + version = "1.3.3.0"; + sha256 = "0q3r2imr63nv7l08w6q850xqak4gwzvk43qv1vq8x9qwdaf1nisv"; libraryHaskellDepends = [ base bytestring double-conversion ghc-prim text ]; @@ -209263,6 +209767,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unordered-containers_0_2_9_0" = callPackage + ({ mkDerivation, base, bytestring, ChasingBottoms, containers + , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit + , mtl, QuickCheck, random, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.9.0"; + sha256 = "0l4264p0av12cc6i8gls13q8y27x12z2ar4x34n3x59y99fcnc37"; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ + base ChasingBottoms containers hashable HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq deepseq-generics + hashable hashmap mtl random + ]; + homepage = "https://github.com/tibbe/unordered-containers"; + description = "Efficient hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unordered-containers-rematch" = callPackage ({ mkDerivation, base, hashable, hspec, HUnit, rematch , unordered-containers @@ -210992,6 +211521,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity_0_4_0_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "validity"; + version = "0.4.0.4"; + sha256 = "1iva60sfaqnkwdk5b2w6skvsg6096x24bjyd5h057n9dlbimiblx"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity typeclass"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-aeson" = callPackage ({ mkDerivation, aeson, base, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector @@ -211069,6 +211611,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-text_0_2_0_1" = callPackage + ({ mkDerivation, base, bytestring, text, validity }: + mkDerivation { + pname = "validity-text"; + version = "0.2.0.1"; + sha256 = "1r96nn0y7hgm49y79kf3n86960z7gbz2mw4wcnsi9qlccnjq5qk4"; + libraryHaskellDepends = [ base bytestring text validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for text"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-time" = callPackage ({ mkDerivation, base, time, validity }: mkDerivation { @@ -211658,26 +212213,6 @@ self: { }: mkDerivation { pname = "vector-binary-instances"; - version = "0.2.3.5"; - sha256 = "0niad09lbxz3cj20qllyj92lwbc013ihw4lby8fv07x5xjx5a4p1"; - revision = "1"; - editedCabalFile = "0yk61mifvcc31vancsfsd0vskqh5k3a3znx1rbz8wzcs4ijjzh48"; - libraryHaskellDepends = [ base binary vector ]; - testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; - benchmarkHaskellDepends = [ - base binary bytestring criterion deepseq vector - ]; - homepage = "https://github.com/bos/vector-binary-instances"; - description = "Instances of Data.Binary and Data.Serialize for vector"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-binary-instances_0_2_4" = callPackage - ({ mkDerivation, base, binary, bytestring, criterion, deepseq - , tasty, tasty-quickcheck, vector - }: - mkDerivation { - pname = "vector-binary-instances"; version = "0.2.4"; sha256 = "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb"; libraryHaskellDepends = [ base binary vector ]; @@ -211688,7 +212223,6 @@ self: { homepage = "https://github.com/bos/vector-binary-instances"; description = "Instances of Data.Binary and Data.Serialize for vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-buffer" = callPackage @@ -212948,6 +213482,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vty_5_20" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers + , deepseq, directory, filepath, hashable, HUnit, microlens + , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck + , quickcheck-assertions, random, smallcheck, stm, string-qq + , terminfo, test-framework, test-framework-hunit + , test-framework-smallcheck, text, transformers, unix, utf8-string + , vector + }: + mkDerivation { + pname = "vty"; + version = "5.20"; + sha256 = "0l9xlk4z8xlkd7qzhzkj4l0qb2gwl27mabr2hhkpz3yfv7z6j0a3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring containers deepseq directory filepath + hashable microlens microlens-mtl microlens-th mtl parallel parsec + stm terminfo text transformers unix utf8-string vector + ]; + executableHaskellDepends = [ + base containers microlens microlens-mtl mtl + ]; + testHaskellDepends = [ + base blaze-builder bytestring Cabal containers deepseq HUnit + microlens microlens-mtl mtl QuickCheck quickcheck-assertions random + smallcheck stm string-qq terminfo test-framework + test-framework-hunit test-framework-smallcheck text unix + utf8-string vector + ]; + homepage = "https://github.com/jtdaugherty/vty"; + description = "A simple terminal UI library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -213157,8 +213727,8 @@ self: { }: mkDerivation { pname = "wai-app-file-cgi"; - version = "3.1.3"; - sha256 = "0fxgan4r10rvq2mwh7d66shxmxmyqs7z824f3s0yzyl4gysivkkg"; + version = "3.1.4"; + sha256 = "1gcrfcvll4lpd8qrpcai00cn2zs8ql46z1chlqkbi7jk31r14qy0"; libraryHaskellDepends = [ array attoparsec attoparsec-conduit base blaze-builder blaze-html bytestring case-insensitive conduit conduit-extra containers @@ -214150,8 +214720,8 @@ self: { }: mkDerivation { pname = "wai-middleware-rollbar"; - version = "0.8.2"; - sha256 = "08bzikcfgrni328mmxwxsr4kbsc5bjjacbxm18hs74b8n4g5f1qd"; + version = "0.8.3"; + sha256 = "17ys7ddpfa0sbjh79k240zqk2v7nlh0v7hrgr7kanal3pk7mvwvm"; libraryHaskellDepends = [ aeson base bytestring case-insensitive hostname http-client http-conduit http-types network text time unordered-containers uuid @@ -214166,7 +214736,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wai-middleware-rollbar_0_8_3" = callPackage + "wai-middleware-rollbar_0_8_4" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, hostname, hspec, hspec-golden-aeson, http-client , http-conduit, http-types, lens, lens-aeson, network, QuickCheck @@ -214174,8 +214744,8 @@ self: { }: mkDerivation { pname = "wai-middleware-rollbar"; - version = "0.8.3"; - sha256 = "17ys7ddpfa0sbjh79k240zqk2v7nlh0v7hrgr7kanal3pk7mvwvm"; + version = "0.8.4"; + sha256 = "1yycbkcc7jq8mlv6jslnq2j0w8yhv4859fds34pg2k1fg7ccb1iw"; libraryHaskellDepends = [ aeson base bytestring case-insensitive hostname http-client http-conduit http-types network text time unordered-containers uuid @@ -215036,6 +215606,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "warped" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, http-types + , lifted-async, monad-control, preamble, shakers, uuid, wai + , wai-conduit, wai-cors, warp + }: + mkDerivation { + pname = "warped"; + version = "0.0.1"; + sha256 = "1p90qkvryj5ah8knxrng4wfzzy73bailgj001g3s48qf7b6a46qm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder conduit http-types lifted-async monad-control + preamble uuid wai wai-conduit wai-cors warp + ]; + executableHaskellDepends = [ base shakers ]; + homepage = "https://github.com/swift-nav/warped"; + description = "Warp and Wai Library"; + license = stdenv.lib.licenses.mit; + }) {}; + "watchdog" = callPackage ({ mkDerivation, base, mtl, time }: mkDerivation { @@ -215425,27 +216016,6 @@ self: { }: mkDerivation { pname = "web-routes"; - version = "0.27.13"; - sha256 = "10b0hs7mmvs9ay3ik93s8xd7zlx8pyz20626nrha4mwyixgkmc59"; - revision = "1"; - editedCabalFile = "1s8ax7r8l0484730p36c3gn3n28zhl2p1nwjnprsbhcxd83yq4dh"; - libraryHaskellDepends = [ - base blaze-builder bytestring exceptions ghc-prim http-types mtl - parsec split text utf8-string - ]; - testHaskellDepends = [ base hspec HUnit QuickCheck text ]; - homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes"; - description = "portable, type-safe URL routing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "web-routes_0_27_14" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, exceptions - , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck - , split, text, utf8-string - }: - mkDerivation { - pname = "web-routes"; version = "0.27.14"; sha256 = "1m5ywqy2c9v478ybyrzqc407zdqcg18p5587mrq34v7bnjk27rak"; revision = "1"; @@ -215458,7 +216028,6 @@ self: { homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes"; description = "portable, type-safe URL routing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-routes-boomerang" = callPackage @@ -215573,21 +216142,6 @@ self: { }: mkDerivation { pname = "web-routes-wai"; - version = "0.24.3"; - sha256 = "070gldklv52gpvas676nw9igr4d3cd1f23prlmd2qjrjn3qvhdq7"; - libraryHaskellDepends = [ - base bytestring http-types text wai web-routes - ]; - description = "Library for maintaining correctness of URLs within an application"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "web-routes-wai_0_24_3_1" = callPackage - ({ mkDerivation, base, bytestring, http-types, text, wai - , web-routes - }: - mkDerivation { - pname = "web-routes-wai"; version = "0.24.3.1"; sha256 = "0j9h22nsj7zf5qpf4i07jdcih00r2fivdilvj8wsylk4d23x27wf"; libraryHaskellDepends = [ @@ -215595,7 +216149,6 @@ self: { ]; description = "Library for maintaining correctness of URLs within an application"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-routing" = callPackage @@ -216664,14 +217217,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wild-bind-x11_0_2_0_0" = callPackage + "wild-bind-x11_0_2_0_1" = callPackage ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl , semigroups, stm, text, time, transformers, wild-bind, X11 }: mkDerivation { pname = "wild-bind-x11"; - version = "0.2.0.0"; - sha256 = "0x7zy76x9zmh6pjv6yhkb53l6pkn4wh76x34adx538fyf6a8mk6b"; + version = "0.2.0.1"; + sha256 = "0g02kv710yr8qzh48dcwzyn1aak9hz3ny2pq7v24g40kc7c6pd4d"; libraryHaskellDepends = [ base containers fold-debounce mtl semigroups stm text transformers wild-bind X11 @@ -216874,23 +217427,6 @@ self: { }: mkDerivation { pname = "withdependencies"; - version = "0.2.4.1"; - sha256 = "16mxhm0as0598z4w4rhfqxbnasjnzlzsb5nj12b7m8hdg5cg3x6a"; - libraryHaskellDepends = [ - base conduit containers mtl profunctors - ]; - testHaskellDepends = [ base conduit hspec HUnit mtl ]; - homepage = "https://github.com/bartavelle/withdependencies"; - description = "Run computations that depend on one or more elements in a stream"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "withdependencies_0_2_4_2" = callPackage - ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl - , profunctors - }: - mkDerivation { - pname = "withdependencies"; version = "0.2.4.2"; sha256 = "04pk5giqlnls1p62fz9p0sb1288c9qk3ivsq2kb5207cjifyslgz"; libraryHaskellDepends = [ @@ -216900,7 +217436,6 @@ self: { homepage = "https://github.com/bartavelle/withdependencies"; description = "Run computations that depend on one or more elements in a stream"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "witherable" = callPackage @@ -218081,6 +218616,7 @@ self: { homepage = "https://github.com/MarcFontaine/wsjtx-udp"; description = "WSJT-X UDP protocol"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wtk" = callPackage @@ -219088,8 +219624,8 @@ self: { }: mkDerivation { pname = "xls"; - version = "0.1.0"; - sha256 = "1w23dqrzc532vgzsmjkks1hm1r0i4jnj1bfxak9c71j9svna50n5"; + version = "0.1.1"; + sha256 = "0a09zw90xiaklr68w932md38s95jzwid914lw7frnf3qd8j12xq9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -222257,7 +222793,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-core_1_6_0" = callPackage + "yesod-core_1_6_1" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, byteable, bytestring, case-insensitive, cereal , clientsession, conduit, conduit-extra, containers, cookie @@ -222271,8 +222807,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.0"; - sha256 = "0xhg4kjskjpwffnfykhszqyhg9d785r5pnziklswdi6g0qy0zv4z"; + version = "1.6.1"; + sha256 = "1dymck6s9a1cfpp6ib2smxhb4axklj4r08m10z4zqc05s63ch81r"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup byteable bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -222578,7 +223114,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-form_1_6_0" = callPackage + "yesod-form_1_6_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet @@ -222587,8 +223123,8 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.6.0"; - sha256 = "0vvj56pjfaqn7lys8gbb8p7bgnbi67l9a5786gqc3jc1q0b50x8n"; + version = "1.6.1"; + sha256 = "05pnsgnhcsq74w91r74p8psh567yxbmyhddj04mnrfzlzzm19zxq"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup byteable bytestring containers data-default email-validate @@ -222665,6 +223201,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-gitrepo_0_3_0" = callPackage + ({ mkDerivation, base, directory, http-types, process, temporary + , text, unliftio, wai, yesod-core + }: + mkDerivation { + pname = "yesod-gitrepo"; + version = "0.3.0"; + sha256 = "07lqhih9jcb5rdjdkjsrg7s9l5f3y9lrsxa1rc1c8gxw0v2nfg5h"; + libraryHaskellDepends = [ + base directory http-types process temporary text unliftio wai + yesod-core + ]; + homepage = "https://github.com/snoyberg/yesod-gitrepo#readme"; + description = "Host content provided by a Git repo"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-gitrev" = callPackage ({ mkDerivation, aeson, base, gitrev, template-haskell, yesod-core }: @@ -223575,23 +224129,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-test_1_6_0" = callPackage + "yesod-test_1_6_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, case-insensitive, conduit, containers , cookie, hspec, hspec-core, html-conduit, http-types, HUnit - , network, persistent, pretty-show, text, time, transformers - , unliftio, wai, wai-extra, xml-conduit, xml-types, yesod-core - , yesod-form + , network, persistent, pretty-show, semigroups, text, time + , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types + , yesod-core, yesod-form }: mkDerivation { pname = "yesod-test"; - version = "1.6.0"; - sha256 = "0xdl20qm0h6dx6cbzp0d9n0qmpfz3wrn5lwwy2zrpx7bgb967fq6"; + version = "1.6.1"; + sha256 = "1lwckkbm5i0fj8ixa396v7h683kdvbmxdrwc62y3qbi7hlz2iars"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit network persistent pretty-show text time - transformers wai wai-extra xml-conduit xml-types yesod-core + http-types HUnit network persistent pretty-show semigroups text + time transformers wai wai-extra xml-conduit xml-types yesod-core ]; testHaskellDepends = [ base bytestring containers hspec html-conduit http-types HUnit text @@ -225150,6 +225704,8 @@ self: { pname = "zip"; version = "0.2.0"; sha256 = "18r3n1q4acn8fp3hcb47zr43nmpiab3j7r5m06j7csgm17x93vsr"; + revision = "1"; + editedCabalFile = "1lq4v58kq4mwqczbdly4xnhg0pwsn4a5jmsdm38l2svri3by1hbb"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest exceptions filepath monad-control @@ -225165,6 +225721,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zip_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, containers, digest, directory + , dlist, exceptions, filepath, hspec, monad-control, mtl + , QuickCheck, resourcet, temporary, text, time, transformers + , transformers-base + }: + mkDerivation { + pname = "zip"; + version = "1.0.0"; + sha256 = "166iqyrmghlwwnka1gyxqjh875x7d3h0jnljlaslfvkfjhvb9ym9"; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra containers digest directory dlist exceptions filepath + monad-control mtl resourcet text time transformers + transformers-base + ]; + testHaskellDepends = [ + base bytestring conduit containers directory dlist exceptions + filepath hspec QuickCheck temporary text time transformers + ]; + homepage = "https://github.com/mrkkrp/zip"; + description = "Operations on zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty @@ -225191,6 +225774,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) unzip; inherit (pkgs) zip;}; + "zip-archive_0_3_2_3" = callPackage + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , digest, directory, filepath, HUnit, mtl, old-time, pretty + , process, temporary, text, time, unix, unzip, zip, zlib + }: + mkDerivation { + pname = "zip-archive"; + version = "0.3.2.3"; + sha256 = "1b3zll9j3w57kxnng09c5xcj0d18ldj9i3f8qks4kyyrsgyviw9x"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + array base binary bytestring containers digest directory filepath + mtl old-time pretty text time unix zlib + ]; + libraryToolDepends = [ unzip ]; + executableHaskellDepends = [ base bytestring directory ]; + testHaskellDepends = [ + base bytestring directory filepath HUnit old-time process temporary + time unix + ]; + testToolDepends = [ unzip zip ]; + homepage = "http://github.com/jgm/zip-archive"; + description = "Library for creating and modifying zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) unzip; inherit (pkgs) zip;}; + "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 0f866a96e71e6..2c628eff56224 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -112,7 +112,7 @@ let sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; in pkgs.buildPackages.stdenv.mkDerivation { name = "cabal2nix-${name}"; - nativeBuildInputs = [ pkgs.buildPackages.haskellPackages.cabal2nix ]; + nativeBuildInputs = [ pkgs.buildPackages.cabal2nix ]; preferLocalBuild = true; phases = ["installPhase"]; LANG = "en_US.UTF-8"; diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index aa0090e4cff53..d858787f43cd0 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -56,7 +56,6 @@ symlinkJoin { # as a dedicated drv attribute, like `compiler-name` name = ghc.name + "-with-packages"; paths = paths ++ [ghc]; - extraOutputsToInstall = [ "out" "doc" ]; postBuild = '' . ${makeWrapper}/nix-support/setup-hook diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix new file mode 100644 index 0000000000000..c54a9d204cba9 --- /dev/null +++ b/pkgs/development/interpreters/duktape/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "duktape-${version}"; + version = "2.2.0"; + src = fetchurl { + url = "http://duktape.org/duktape-${version}.tar.xz"; + sha256 = "050csp065ll67dck94s0vdad5r5ck4jwsz1fn1y0fcvn88325xv2"; + }; + + buildPhase = '' + make -f Makefile.sharedlibrary + make -f Makefile.cmdline + ''; + installPhase = '' + install -d $out/bin + install -m755 duk $out/bin/ + install -d $out/lib + install -m755 libduktape* $out/lib/ + ''; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "An embeddable Javascript engine, with a focus on portability and compact footprint"; + homepage = "http://duktape.org/"; + downloadPage = "http://duktape.org/download.html"; + license = licenses.mit; + maintainers = [ maintainers.fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 1981c15c5f3ee..1c4fcd2811d11 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2" LDFLAGS="" CC="$CC" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.5.1.5.dylib" INSTALL_DATA='cp -d' ) '' else '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDFLAGS="-fPIC" ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDFLAGS="-fPIC" CC="$CC" AR="$AR q" RANLIB="$RANLIB" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.5.1.5" INSTALL_DATA='cp -d' ) ''; diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index 12d17b2e83220..6a07a006c6b57 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -6,7 +6,7 @@ , wrapPython , setuptools , unzip -, ensureNewerSourcesHook +, ensureNewerSourcesForZipFilesHook , toPythonModule , namePrefix , bootstrapped-pip @@ -19,7 +19,7 @@ let wheel-specific = import ./build-python-package-wheel.nix { }; common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; }; mkPythonDerivation = import ./mk-python-derivation.nix { - inherit lib python wrapPython setuptools unzip ensureNewerSourcesHook toPythonModule namePrefix; + inherit lib python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix; }; in diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 1cb739b4d29fa..61f17a959bd95 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl +{ stdenv, hostPlatform, buildPlatform, buildPackages, fetchurl , bzip2 , gdbm , fetchpatch @@ -88,7 +88,6 @@ let # only works for GCC and Apple Clang. This makes distutils to call C++ # compiler when needed. ./python-2.7-distutils-C++.patch - ]; preConfigure = '' @@ -117,6 +116,28 @@ let "ac_cv_func_bind_textdomain_codeset=yes" ] ++ optionals stdenv.isDarwin [ "--disable-toolbox-glue" + ] ++ optionals (hostPlatform != buildPlatform) [ + "PYTHON_FOR_BUILD=${getBin buildPackages.python}/bin/python" + "ac_cv_buggy_getaddrinfo=no" + # Assume little-endian IEEE 754 floating point when cross compiling + "ac_cv_little_endian_double=yes" + "ac_cv_big_endian_double=no" + "ac_cv_mixed_endian_double=no" + "ac_cv_x87_double_rounding=yes" + "ac_cv_tanh_preserves_zero_sign=yes" + # Generally assume that things are present and work + "ac_cv_posix_semaphores_enabled=yes" + "ac_cv_broken_sem_getvalue=no" + "ac_cv_wchar_t_signed=yes" + "ac_cv_rshift_extends_sign=yes" + "ac_cv_broken_nice=no" + "ac_cv_broken_poll=no" + "ac_cv_working_tzset=yes" + "ac_cv_have_long_long_format=yes" + "ac_cv_have_size_t_format=yes" + "ac_cv_computed_gotos=yes" + "ac_cv_file__dev_ptmx=yes" + "ac_cv_file__dev_ptc=yes" ]; postConfigure = if hostPlatform.isCygwin then '' @@ -131,6 +152,9 @@ let ++ [ db gdbm ncurses sqlite readline ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] ++ optionals stdenv.isDarwin ([ CF ] ++ optional (configd != null) configd); + nativeBuildInputs = + optionals (hostPlatform != buildPlatform) + [ buildPackages.stdenv.cc buildPackages.python ]; mkPaths = paths: { C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; @@ -144,7 +168,7 @@ in stdenv.mkDerivation { name = "python-${version}"; pythonVersion = majorVersion; - inherit majorVersion version src patches buildInputs + inherit majorVersion version src patches buildInputs nativeBuildInputs preConfigure configureFlags; LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; @@ -187,7 +211,8 @@ in stdenv.mkDerivation { # Determinism: Windows installers were not deterministic. # We're also not interested in building Windows installers. find "$out" -name 'wininst*.exe' | xargs -r rm -f - + '' + optionalString (stdenv.hostPlatform == stdenv.buildPlatform) + '' # Determinism: rebuild all bytecode # We exclude lib2to3 because that's Python 2 code which fails # We rebuild three times, once for each optimization level diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index f48f2c19026c9..fb58d0871ecbf 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ stdenv, fetchurl, fetchpatch, buildPackages , glibc , bzip2 , expat @@ -39,12 +39,15 @@ let ++ optionals x11Support [ tcl tk libX11 xproto ] ++ optionals stdenv.isDarwin [ CF configd ]; + nativeBuildInputs = + optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.python3; + in stdenv.mkDerivation { name = "python3-${version}"; pythonVersion = majorVersion; inherit majorVersion version; - inherit buildInputs; + inherit buildInputs nativeBuildInputs; src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; @@ -87,6 +90,27 @@ in stdenv.mkDerivation { "--without-ensurepip" "--with-system-expat" "--with-system-ffi" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_buggy_getaddrinfo=no" + # Assume little-endian IEEE 754 floating point when cross compiling + "ac_cv_little_endian_double=yes" + "ac_cv_big_endian_double=no" + "ac_cv_mixed_endian_double=no" + "ac_cv_x87_double_rounding=yes" + "ac_cv_tanh_preserves_zero_sign=yes" + # Generally assume that things are present and work + "ac_cv_posix_semaphores_enabled=yes" + "ac_cv_broken_sem_getvalue=no" + "ac_cv_wchar_t_signed=yes" + "ac_cv_rshift_extends_sign=yes" + "ac_cv_broken_nice=no" + "ac_cv_broken_poll=no" + "ac_cv_working_tzset=yes" + "ac_cv_have_long_long_format=yes" + "ac_cv_have_size_t_format=yes" + "ac_cv_computed_gotos=yes" + "ac_cv_file__dev_ptmx=yes" + "ac_cv_file__dev_ptc=yes" ]; preConfigure = '' @@ -139,7 +163,7 @@ in stdenv.mkDerivation { for i in $out/lib/python${majorVersion}/_sysconfigdata*.py $out/lib/python${majorVersion}/config-${majorVersion}m*/Makefile; do sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g" done - + '' + optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # Determinism: rebuild all bytecode # We exclude lib2to3 because that's Python 2 code which fails # We rebuild three times, once for each optimization level diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index d9cff16f448f8..96a9cdf0c6158 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -5,7 +5,7 @@ , wrapPython , setuptools , unzip -, ensureNewerSourcesHook +, ensureNewerSourcesForZipFilesHook # Whether the derivation provides a Python module or not. , toPythonModule , namePrefix @@ -69,7 +69,7 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ name = namePrefix + name; - nativeBuildInputs = [ (ensureNewerSourcesHook { year = "1980"; }) ] + nativeBuildInputs = [ ensureNewerSourcesForZipFilesHook ] ++ nativeBuildInputs; buildInputs = [ wrapPython ] diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 9d82810900f0f..a53df02f9b9bc 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub +{ stdenv, buildPackages, lib +, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison , autoconf, darwin ? null , buildEnv, bundler, bundix, Foundation @@ -22,6 +23,12 @@ let # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; + # Needed during postInstall + buildRuby = + if stdenv.hostPlatform == stdenv.buildPlatform + then "$out/bin/ruby" + else "${buildPackages.ruby}/bin/ruby"; + generic = { version, sha256 }: let ver = version; tag = ver.gitTag; @@ -30,7 +37,8 @@ let isRuby25 = ver.majMin == "2.5"; baseruby = self.override { useRailsExpress = false; }; self = lib.makeOverridable ( - { stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub + { stdenv, buildPackages, lib + , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , useRailsExpress ? true , zlib, zlibSupport ? true , openssl, opensslSupport ? true @@ -65,9 +73,13 @@ let unpackdir rubySrc; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. - NROFF = "${groff}/bin/nroff"; + NROFF = if docSupport then "${groff}/bin/nroff" else null; - nativeBuildInputs = ops useRailsExpress [ autoreconfHook bison ]; + nativeBuildInputs = + ops useRailsExpress [ autoreconfHook bison ] + ++ ops (stdenv.buildPlatform != stdenv.hostPlatform) [ + buildPackages.ruby + ]; buildInputs = (op fiddleSupport libffi) ++ (ops cursesSupport [ ncurses readline ]) @@ -87,8 +99,6 @@ let enableParallelBuilding = true; - hardeningDisable = lib.optional isRuby20 "format"; - patches = (import ./patchsets.nix { inherit patchSet useRailsExpress ops; @@ -100,16 +110,9 @@ let pushd ${sourceRoot}/rubygems patch -p1 < ${rubygemsPatch} popd - '' + opString isRuby21 '' - rm "$sourceRoot/enc/unicode/name2ctype.h" ''; - postPatch = if isRuby21 then '' - rm tool/config_files.rb - cp ${config}/config.guess tool/ - cp ${config}/config.sub tool/ - '' - else if isRuby25 then '' + postPatch = if isRuby25 then '' sed -i configure.ac -e '/config.guess/d' cp ${config}/config.guess tool/ cp ${config}/config.sub tool/ @@ -129,14 +132,16 @@ let "--with-out-ext=tk" # on yosemite, "generating encdb.h" will hang for a very long time without this flag "--with-setjmp-type=setjmp" - ]; + ] + ++ op (stdenv.hostPlatform != stdenv.buildPlatform) + "--with-baseruby=${buildRuby}"; installFlags = stdenv.lib.optionalString docSupport "install-doc"; # Bundler tries to create this directory postInstall = '' # Update rubygems pushd rubygems - $out/bin/ruby setup.rb + ${buildRuby} setup.rb popd # Remove unnecessary groff reference from runtime closure, since it's big @@ -189,31 +194,7 @@ let ) args; in self; in { - ruby_2_0_0 = generic { - version = rubyVersion "2" "0" "0" "p648"; - sha256 = { - src = "1y3n4c6xw2wki7pyjpq5zpbgxnw5i3jc8mcpj6rk7hs995mvv446"; - git = "0ncjfq4hfqj9kcr8pbll6kypwnmcgs8w7l4466qqfyv7jj3yjd76"; - }; - }; - - ruby_2_1_10 = generic { - version = rubyVersion "2" "1" "10" ""; - sha256 = { - src = "086x66w51lg41abjn79xb7f6xsryymkcc3nvakmkjnjyg96labpv"; - git = "133phd5r5y0np5lc9nqif93l7yb13yd52aspyl6c46z5jhvhyvfi"; - }; - }; - - ruby_2_2_9 = generic { - version = rubyVersion "2" "2" "9" ""; - sha256 = { - src = "19m1ximl7vcrsvq595dgrjh4yb6kar944095wbywqh7waiqcfirg"; - git = "03qrjh55098wcqh2khxryzkzfqkznjrcdgwf27r2bgcycbg5ca5q"; - }; - }; - - ruby_2_3_6 = generic { + ruby_2_3 = generic { version = rubyVersion "2" "3" "6" ""; sha256 = { src = "07jpa7fw1gyf069m7alf2b0zm53qm08w2ns45mhzmvgrg4r528l3"; @@ -221,7 +202,7 @@ in { }; }; - ruby_2_4_3 = generic { + ruby_2_4 = generic { version = rubyVersion "2" "4" "3" ""; sha256 = { src = "161smb52q19r9lrzy22b3bhnkd0z8wjffm0qsfkml14j5ic7a0zx"; @@ -229,7 +210,7 @@ in { }; }; - ruby_2_5_0 = generic { + ruby_2_5 = generic { version = rubyVersion "2" "5" "0" ""; sha256 = { src = "1azj0d2lzziw6iml7bx3sxpxzcdmfwfq3yhm7djyp20q1xiz7rj6"; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 55f4a9ef237ba..fc79761252f28 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,29 +1,6 @@ { patchSet, useRailsExpress, ops, patchLevel }: rec { - "2.0.0" = [ - ./ssl_v3.patch - ./rand-egd.patch - ] ++ ops useRailsExpress [ - "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/01-zero-broken-tests.patch" - "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/02-railsexpress-gc.patch" - "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/03-display-more-detailed-stack-trace.patch" - "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" - ]; - "2.1.10" = [ - ./rand-egd.patch - ] ++ ops useRailsExpress [ - # 2.1.10 patchsets are not available, but 2.1.8 patchsets apply - "${patchSet}/patches/ruby/2.1.8/railsexpress/01-zero-broken-tests.patch" - "${patchSet}/patches/ruby/2.1.8/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.1.8/railsexpress/03-display-more-detailed-stack-trace.patch" - "${patchSet}/patches/ruby/2.1.8/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" - "${patchSet}/patches/ruby/2.1.8/railsexpress/05-funny-falcon-stc-density.patch" - "${patchSet}/patches/ruby/2.1.8/railsexpress/06-funny-falcon-stc-pool-allocation.patch" - "${patchSet}/patches/ruby/2.1.8/railsexpress/07-aman-opt-aset-aref-str.patch" - "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch" - "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch" - ]; "2.2.9" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch" "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch" diff --git a/pkgs/development/interpreters/ruby/rand-egd.patch b/pkgs/development/interpreters/ruby/rand-egd.patch deleted file mode 100644 index e4f6452000c22..0000000000000 --- a/pkgs/development/interpreters/ruby/rand-egd.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb -index e272cba..3a1fa71 100644 ---- a/ext/openssl/extconf.rb -+++ b/ext/openssl/extconf.rb -@@ -87,6 +87,7 @@ - have_func("PEM_def_callback") - have_func("PKCS5_PBKDF2_HMAC") - have_func("PKCS5_PBKDF2_HMAC_SHA1") -+have_func("RAND_egd") - have_func("X509V3_set_nconf") - have_func("X509V3_EXT_nconf_nid") - have_func("X509_CRL_add0_revoked") -diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c -index 29cbf8c..27466fe 100644 ---- a/ext/openssl/ossl_rand.c -+++ b/ext/openssl/ossl_rand.c -@@ -148,6 +148,7 @@ ossl_rand_pseudo_bytes(VALUE self, VALUE len) - return str; - } - -+#ifdef HAVE_RAND_EGD - /* - * call-seq: - * egd(filename) -> true -@@ -186,6 +187,7 @@ ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len) - } - return Qtrue; - } -+#endif /* HAVE_RAND_EGD */ - - /* - * call-seq: -@@ -219,7 +221,9 @@ Init_ossl_rand(void) - DEFMETH(mRandom, "write_random_file", ossl_rand_write_file, 1); - DEFMETH(mRandom, "random_bytes", ossl_rand_bytes, 1); - DEFMETH(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1); -+#ifdef HAVE_RAND_EGD - DEFMETH(mRandom, "egd", ossl_rand_egd, 1); - DEFMETH(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2); -+#endif /* HAVE_RAND_EGD */ - DEFMETH(mRandom, "status?", ossl_rand_status, 0) - } diff --git a/pkgs/development/interpreters/ruby/ssl_v3.patch b/pkgs/development/interpreters/ruby/ssl_v3.patch deleted file mode 100644 index faa4021657513..0000000000000 --- a/pkgs/development/interpreters/ruby/ssl_v3.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/ext/openssl/ossl_ssl.c 2015-11-26 16:41:03.775058140 +0000 -+++ b/ext/openssl/ossl_ssl.c 2015-11-26 16:40:56.191907346 +0000 -@@ -138,9 +138,12 @@ - OSSL_SSL_METHOD_ENTRY(SSLv2_server), - OSSL_SSL_METHOD_ENTRY(SSLv2_client), - #endif -+#if defined(HAVE_SSLV3_METHOD) && defined(HAVE_SSLV3_SERVER_METHOD) && \ -+ defined(HAVE_SSLV3_CLIENT_METHOD) - OSSL_SSL_METHOD_ENTRY(SSLv3), - OSSL_SSL_METHOD_ENTRY(SSLv3_server), - OSSL_SSL_METHOD_ENTRY(SSLv3_client), -+#endif - OSSL_SSL_METHOD_ENTRY(SSLv23), - OSSL_SSL_METHOD_ENTRY(SSLv23_server), - OSSL_SSL_METHOD_ENTRY(SSLv23_client), - diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index b3c3e1732e0d6..499b2c65b7700 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -13,8 +13,8 @@ in stdenv.mkDerivation rec { propagatedBuildInput = [ maven ] ++ flatDeps; - find = ''find ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}''; - copy = ''cp -rsfu ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/*") flatDeps)} $out/m2''; + find = ''find ${concatStringsSep " " (map (x: x + "/m2") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}''; + copy = ''cp -rsfu ${concatStringsSep " " (map (x: x + "/m2/*") flatDeps)} $out/m2''; phases = [ "unpackPhase" "buildPhase" ]; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index e71ad14b11fd1..82051854799c6 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap +{ stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv , openglSupport ? false, mesa_noglu, mesa_glu , alsaSupport ? true, alsaLib , x11Support ? hostPlatform == buildPlatform, libXext, libICE, libXrandr @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { buildInputs = let notMingw = !hostPlatform.isMinGW; in optional notMingw audiofile - ++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel ]; + ++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel ] + ++ [ libiconv ]; # XXX: By default, SDL wants to dlopen() PulseAudio, in which case # we must arrange to add it to its RPATH; however, `patchelf' seems @@ -78,7 +79,7 @@ stdenv.mkDerivation rec { # Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222 (fetchpatch { name = "SDL_SetGamma.patch"; - url = "http://pkgs.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d"; + url = "http://src.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d"; sha256 = "0x52s4328kilyq43i7psqkqg7chsfwh0aawr50j566nzd7j51dlv"; }) # Fix a build failure on OS X Mavericks diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index d75aea726e101..6b6c9599c2821 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -8,6 +8,7 @@ , ibusSupport ? false, ibus , pulseaudioSupport ? true, libpulseaudio , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL +, libiconv }: # OSS is no longer supported, for it's much crappier than ALSA and @@ -41,7 +42,8 @@ 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; + lib.optional pulseaudioSupport libpulseaudio + ++ [ libiconv ]; buildInputs = [ audiofile ] ++ lib.optional openglSupport mesa_noglu ++ diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 6a94cb0c0e239..34bf9aca974b5 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext }: +{ stdenv, fetchurl, gettext, hostPlatform }: stdenv.mkDerivation rec { name = "attr-2.4.47"; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { installTargets = "install install-lib install-dev"; + patches = if (hostPlatform.libc == "musl") then [ ./fix-headers-musl.patch ] else null; + meta = { homepage = http://savannah.nongnu.org/projects/attr/; description = "Library and tools for manipulating extended attributes"; diff --git a/pkgs/development/libraries/attr/fix-headers-musl.patch b/pkgs/development/libraries/attr/fix-headers-musl.patch new file mode 100644 index 0000000000000..e969f640eeeff --- /dev/null +++ b/pkgs/development/libraries/attr/fix-headers-musl.patch @@ -0,0 +1,54 @@ +--- attr-2.4.47/include/xattr.h ++++ attr-2.4.47/include/xattr.h +@@ -31,33 +31,37 @@ + #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ + + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + extern int setxattr (const char *__path, const char *__name, +- const void *__value, size_t __size, int __flags) __THROW; ++ const void *__value, size_t __size, int __flags); + extern int lsetxattr (const char *__path, const char *__name, +- const void *__value, size_t __size, int __flags) __THROW; ++ const void *__value, size_t __size, int __flags); + extern int fsetxattr (int __filedes, const char *__name, +- const void *__value, size_t __size, int __flags) __THROW; ++ const void *__value, size_t __size, int __flags); + + extern ssize_t getxattr (const char *__path, const char *__name, +- void *__value, size_t __size) __THROW; ++ void *__value, size_t __size); + extern ssize_t lgetxattr (const char *__path, const char *__name, +- void *__value, size_t __size) __THROW; ++ void *__value, size_t __size); + extern ssize_t fgetxattr (int __filedes, const char *__name, +- void *__value, size_t __size) __THROW; ++ void *__value, size_t __size); + + extern ssize_t listxattr (const char *__path, char *__list, +- size_t __size) __THROW; ++ size_t __size); + extern ssize_t llistxattr (const char *__path, char *__list, +- size_t __size) __THROW; ++ size_t __size); + extern ssize_t flistxattr (int __filedes, char *__list, +- size_t __size) __THROW; ++ size_t __size); + +-extern int removexattr (const char *__path, const char *__name) __THROW; +-extern int lremovexattr (const char *__path, const char *__name) __THROW; +-extern int fremovexattr (int __filedes, const char *__name) __THROW; ++extern int removexattr (const char *__path, const char *__name); ++extern int lremovexattr (const char *__path, const char *__name); ++extern int fremovexattr (int __filedes, const char *__name); + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif /* __XATTR_H__ */ diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 47d9e7dba4ce3..26511c22d0b62 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -33,6 +33,7 @@ in stdenv.mkDerivation rec { cmakeFlags = lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DENABLE_TESTING=OFF" ++ lib.optional (apis != ["*"]) "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 69faf913abfee..5439c7657e080 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "${baseName}-${version}"; baseName = "bctoolbox"; - version = "0.2.0"; + version = "0.6.0"; buildInputs = [cmake mbedtls bcunit srtp]; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "09mjqdfjxy4jy1z68b2i99hgkbnhhk7vnbfhj9sdpd1p3jk2ha33"; + sha256 = "1cxx243wyzkd4xnvpyqf97n0rjhfckpvw1vhwnbwshq3q6fra909"; }; meta = { diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix new file mode 100644 index 0000000000000..8805dc74a26c3 --- /dev/null +++ b/pkgs/development/libraries/belcard/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, belr }: + +stdenv.mkDerivation rec { + baseName = "belcard"; + version = "1.0.2"; + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "BelledonneCommunications"; + repo = "${baseName}"; + rev = "${version}"; + sha256 = "1pwji83vpsdrfma24rnj3rz1x0a0g6zk3v4xjnip7zf2ys3zcnlk"; + }; + + buildInputs = [ bctoolbox belr ]; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib;{ + description = "Belcard is a C++ library to manipulate VCard standard format"; + homepage = https://github.com/BelledonneCommunications/belcard; + license = licenses.lgpl21; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index b055b2358a540..003fce0ea8c31 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { baseName = "belle-sip"; - version = "1.5.0"; + version = "1.6.3"; name = "${baseName}-${version}"; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "0hnm64hwgq003wicz6c485fryjfhi820fgin8ndknq60kvwxsrzn"; + sha256 = "0q70db1klvhca1af29bm9paka3gyii5hfbzrj4178gclsg7cj8fk"; }; nativeBuildInputs = [ jre cmake ]; diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix new file mode 100644 index 0000000000000..214abb21f2cda --- /dev/null +++ b/pkgs/development/libraries/belr/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }: + +stdenv.mkDerivation rec { + baseName = "belr"; + version = "0.1.3"; + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "BelledonneCommunications"; + repo = "${baseName}"; + rev = "${version}"; + sha256 = "0mf8lsyq1z3b5p47c00lnwc8n7v9nzs1fd2g9c9hnz6fjd2ka44w"; + }; + + buildInputs = [ bctoolbox ]; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib;{ + description = "Belr is Belledonne Communications' language recognition library"; + homepage = https://github.com/BelledonneCommunications/belr; + license = licenses.lgpl21; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index b79900288c97f..c1bcb46bae6e4 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, pkgconfig, libatomic_ops, enableLargeConfig ? false +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops, enableLargeConfig ? false , buildPlatform, hostPlatform }: stdenv.mkDerivation rec { name = "boehm-gc-${version}"; - version = "7.6.2"; + version = "7.6.4"; src = fetchurl { urls = [ "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" ]; - sha256 = "07nli9hgdzc09qzw169sn7gchkrn5kqgyniv2rspcy1xaq2j04dx"; + sha256 = "076dzsqqyxd3nlzs0z277vvhqjp8nv5dqi763s0m90zr6ljiyk5r"; }; buildInputs = [ libatomic_ops ]; @@ -20,9 +20,19 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; separateDebugInfo = stdenv.isLinux; + preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' + export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" + ''; + + patches = [ (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/musl/85b6a600996bdd71162b357e9ba93d8559342432/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch"; + sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3"; + }) ]; + configureFlags = [ "--enable-cplusplus" ] - ++ lib.optional enableLargeConfig "--enable-large-config"; + ++ lib.optional enableLargeConfig "--enable-large-config" + ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static"; doCheck = true; # not cross; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index c2a59431ac041..14ea512afbd28 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -144,7 +144,7 @@ stdenv.mkDerivation { postFixup = '' # Make boost header paths relative so that they are not runtime dependencies - find "$dev/include" \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ + cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ -exec sed '1i#line 1 "{}"' -i '{}' \; '' + optionalString (hostPlatform.libc == "msvcrt") '' $RANLIB "$out/lib/"*.a diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix new file mode 100644 index 0000000000000..cdc660ca3f326 --- /dev/null +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, sqlite }: + +stdenv.mkDerivation rec { + baseName = "bzrtp"; + version = "1.0.6"; + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "BelledonneCommunications"; + repo = "${baseName}"; + rev = "${version}"; + sha256 = "0438zzxp82bj5fmvqnwlljkgrz9ab5qm5lgpwwgmg1cp78bp2l45"; + }; + + buildInputs = [ bctoolbox sqlite ]; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "BZRTP is an opensource implementation of ZRTP keys exchange protocol"; + homepage = https://github.com/BelledonneCommunications/bzrtp; + license = licenses.lgpl21; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix index eb19283caeaf3..ba1d02380e292 100644 --- a/pkgs/development/libraries/cutee/default.nix +++ b/pkgs/development/libraries/cutee/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ Unit Testing Easy Environment"; - homepage = http://codesink.org/cutee_unit_testing.html; + homepage = http://www.codesink.org/cutee_unit_testing.html; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 36c824c752873..701209971074d 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # all x86_64 have sse2 # however, not all float sizes fit ++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2" - ++ optional stdenv.cc.isGNU "--enable-openmp" + ++ optional (stdenv.cc.isGNU && !stdenv.hostPlatform.isMusl) "--enable-openmp" # doc generation causes Fortran wrapper generation which hard-codes gcc ++ optional (!withDoc) "--disable-doc"; diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 9aa1a905ec98e..8b534edd2498a 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -24,4 +24,8 @@ runCommand "fc-cache" mkdir -p $out fc-cache -sv + + # This is not a cache dir in the normal sense -- it won't be automatically + # recreated. + rm "$out/CACHEDIR.TAG" '' diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index e6b1875a9e0c2..2dd32b6f11000 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, glib }: +{ stdenv, fetchurl, fetchpatch, python, pkgconfig, glib }: stdenv.mkDerivation (rec { name = "gamin-0.1.10"; @@ -18,7 +18,12 @@ stdenv.mkDerivation (rec { patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix) - ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch; + ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + name = "fix-pthread-mutex.patch"; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; + sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; + }); meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix new file mode 100644 index 0000000000000..382bdb17247cd --- /dev/null +++ b/pkgs/development/libraries/getdns/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, libtool, unbound, libidn, m4, file +, openssl, doxygen, autoreconfHook, automake }: + +stdenv.mkDerivation rec { + pname = "getdns"; + name = "${pname}-${version}"; + version = "1.3.0"; + + src = fetchurl { + url = "https://getdnsapi.net/releases/${pname}-1-3-0/${pname}-${version}.tar.gz"; + sha256 = "920fa2e07c72fd0e5854db1820fa777108009fc5cb702f9aa5155ef58b12adb1"; + }; + + nativeBuildInputs = [ libtool m4 autoreconfHook automake file ]; + + buildInputs = [ unbound libidn openssl doxygen ]; + + patchPhase = '' + substituteInPlace m4/acx_openssl.m4 \ + --replace /usr/local/ssl ${openssl.dev} + ''; + + meta = with stdenv.lib; { + description = "A modern asynchronous DNS API"; + longDescription = '' + getdns is an implementation of a modern asynchronous DNS API; the + specification was originally edited by Paul Hoffman. It is intended to make all + types of DNS information easily available to application developers and non-DNS + experts. DNSSEC offers a unique global infrastructure for establishing and + enhancing cryptographic trust relations. With the development of this API the + developers intend to offer application developers a modern and flexible + interface that enables end-to-end trust in the DNS architecture, and which will + inspire application developers to implement innovative security solutions in + their applications. +''; + homepage = https://getdnsapi.net; + maintainers = with maintainers; [ leenaars ]; + license = licenses.bsd3; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index b17d4effb1eb2..d40733adf874c 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -222,6 +222,6 @@ stdenv.mkDerivation ({ # To avoid a dependency on the build system 'bash'. preFixup = '' - rm $bin/bin/{ldd,tzselect,catchsegv,xtrace} + rm -f $bin/bin/{ldd,tzselect,catchsegv,xtrace} ''; }) diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index debd7b39c86a0..7090c5ceceeca 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -6,7 +6,7 @@ https://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/SUPPORTED */ -{ stdenv, callPackage, writeText +{ stdenv, buildPackages, callPackage, writeText , allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ] }: @@ -26,7 +26,7 @@ callPackage ./common.nix { inherit stdenv; } { # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. buildPhase = '' - mkdir -p $TMPDIR/"${stdenv.cc.libc.out}/lib/locale" + mkdir -p $TMPDIR/"${buildPackages.stdenv.cc.libc.out}/lib/locale" # Hack to allow building of the locales (needed since glibc-2.12) sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index 0e8457a8c54b8..e7e0672490d0b 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { layer. It adds TLS-KDH ciphers: Kerberos + Diffie-Hellman. ''; - homepage = http://www.gnu.org/software/gnutls://github.com/arpa2/gnutls-kdh; + homepage = https://github.com/arpa2/gnutls-kdh; license = licenses.lgpl21Plus; maintainers = with maintainers; [ leenaars ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index 4e41545687a92..8243775c6bc17 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,22 +1,42 @@ -{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: +{ stdenv, fetchFromGitHub, perl, cmake, ninja, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: stdenv.mkDerivation rec { - majorVersion = "0.4"; - minorVersion = "1"; - name = "granite-${majorVersion}.${minorVersion}"; - src = fetchurl { - url = "https://launchpad.net/granite/${majorVersion}/${majorVersion}.${minorVersion}/+download/${name}.tar.xz"; - sha256 = "177h5h1q4qd7g99mzbczvz78j8c9jf4f1gwdj9f6imbc7r913d4b"; + name = "granite-${version}"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "granite"; + rev = version; + sha256 = "15l8z1jkqhvappnr8jww27lfy3dwqybgsxk5iccyvnvzpjdh2s0h"; }; - cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [perl cmake vala gobjectIntrospection glib gtk3 gnome3.libgee gettext]; - meta = { + + cmakeFlags = [ + "-DINTROSPECTION_GIRDIR=share/gir-1.0/" + "-DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0" + ]; + + nativeBuildInputs = [ + vala + pkgconfig + cmake + ninja + perl + gettext + gobjectIntrospection + ]; + buildInputs = [ + glib + gtk3 + gnome3.libgee + ]; + + meta = with stdenv.lib; { description = "An extension to GTK+ used by elementary OS"; longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; - homepage = https://launchpad.net/granite; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.vozz ]; + homepage = https://github.com/elementary/granite; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = [ maintainers.vozz ]; }; } diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 4e6fe783dc2cf..f33e52867c56e 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,19 +1,26 @@ { stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: -stdenv.mkDerivation rec - { name = "grpc-1.8.3"; - src = fetchurl - { url = "https://github.com/grpc/grpc/archive/v1.8.3.tar.gz"; - sha256 = "14ichjllvhkbv8sjh9j5njnagpqw2sl12n41ga90jnj7qvfwwjy1"; - }; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; - cmakeFlags = - [ "-DgRPC_ZLIB_PROVIDER=package" - "-DgRPC_CARES_PROVIDER=package" - "-DgRPC_SSL_PROVIDER=package" - "-DgRPC_PROTOBUF_PROVIDER=package" - "-DgRPC_GFLAGS_PROVIDER=package" - ]; - enableParallelBuilds = true; - } +stdenv.mkDerivation rec { + version = "1.9.1"; + name = "grpc-${version}"; + src = fetchurl { + url = "https://github.com/grpc/grpc/archive/v${version}.tar.gz"; + sha256 = "0h2w0dckxydngva9kl7dpilif8k9zi2ajnlanscr7s5kkza3dhps"; + }; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; + cmakeFlags = + [ "-DgRPC_ZLIB_PROVIDER=package" + "-DgRPC_CARES_PROVIDER=package" + "-DgRPC_SSL_PROVIDER=package" + "-DgRPC_PROTOBUF_PROVIDER=package" + "-DgRPC_GFLAGS_PROVIDER=package" + ]; + enableParallelBuilds = true; + + meta = with stdenv.lib; { + description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"; + license = licenses.asl20; + homepage = https://grpc.io/; + }; +} diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index dfb45aa598d78..ecbfbb7da0b85 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.6.1"; + version = "1.6.2"; name = "hunspell-${version}"; src = fetchurl { url = "https://github.com/hunspell/hunspell/archive/v${version}.tar.gz"; - sha256 = "0j9c20sj7bgd6f77193g1ihy8w905byk2gdhdc0r9dsh7irr7x9h"; + sha256 = "1i7lsv2cm0713ia3j5wjkcrhpfp3lqpjpwp4d3v18n7ycaqcxn9w"; }; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index c0745cb9e687b..ad39a4fde3192 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, pkgconfig, expat, ncurses, pciutils, numactl -, cairo, libX11 -, x11Support ? (!stdenv.isCygwin) +, x11Support ? false, libX11 ? null, cairo ? null }: +assert x11Support -> libX11 != null && cairo != null; + with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 6d9a9725cc2e9..2c8392c8bac88 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 - postPatch = if stdenv ? glibc + postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") then "substituteInPlace i18n/digitlst.cpp --replace '<xlocale.h>' '<locale.h>'" else null; # won't find locale_t on darwin diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix index 63140dba37f7c..e2d7d7ffd0342 100644 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ b/pkgs/development/libraries/isl/0.11.1.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08. src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2"; + url = "http://src.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2"; sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9"; }; diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index df4a19efd2c49..3b28c3a2bd570 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libmatthew-java-0.8"; src = fetchurl { - url = http://pkgs.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; + url = http://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; JAVA_HOME=jdk; diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 57eaf74d29081..935f52eeb71c2 100644 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { patches = [(fetchurl { name = "gcc6.patch"; - url = "http://pkgs.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch"; + url = "http://src.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch"; sha256 = "1h5k38mkiq7lz8nd2gbn7yvimcz49g3z7phn1cr560bzjih8rz23"; })]; diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 94369449ff3dd..827d3de79ea84 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pth, libgpgerror }: +{ fetchurl, stdenv, gettext, pth, libgpgerror }: stdenv.mkDerivation rec { name = "libassuan-2.5.1"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # libassuan-config - buildInputs = [ libgpgerror pth ]; + buildInputs = [ libgpgerror pth ] + ++ stdenv.lib.optional stdenv.isDarwin gettext; doCheck = true; @@ -20,18 +21,16 @@ stdenv.mkDerivation rec { sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $dev/include/assuan.h ''; - meta = { + meta = with stdenv.lib; { description = "IPC library used by GnuPG and related software"; - longDescription = '' Libassuan is a small library implementing the so-called Assuan protocol. This protocol is used for IPC between most newer GnuPG components. Both, server and client side functions are provided. ''; - homepage = http://gnupg.org; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl2Plus; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 5bcf243155b0e..018239a3e7788 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl, autoreconfHook264, bison, binutils-raw +, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-raw , libiberty, zlib }: @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { patches = binutils-raw.bintools.patches ++ [ ../../tools/misc/binutils/build-components-separately.patch + (fetchpatch { + url = "https://raw.githubusercontent.com/mxe/mxe/e1d4c144ee1994f70f86cf7fd8168fe69bd629c6/src/bfd-1-disable-subdir-doc.patch"; + sha256 = "0pzb3i74d1r7lhjan376h59a7kirw15j7swwm8pz3zy9lkdqkj6q"; + }) ]; # We just want to build libbfd @@ -18,6 +22,14 @@ stdenv.mkDerivation rec { cd bfd ''; + postAutoreconf = '' + echo "Updating config.guess and config.sub from ${gnu-config}" + cp -f ${gnu-config}/config.{guess,sub} ../ + ''; + + # We update these ourselves + dontUpdateAutotoolsGnuConfigScripts = true; + nativeBuildInputs = [ autoreconfHook264 bison ]; buildInputs = [ libiberty zlib ]; diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index c5ba65e7b6d73..a83a3c672c0fc 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -1,16 +1,22 @@ -{ stdenv, fetchFromGitHub, python2, llvm_4, clang }: +{ stdenv, fetchFromGitHub, python, llvmPackages }: + +let + llvm = llvmPackages.llvm; + clang = llvmPackages.clang; +in stdenv.mkDerivation { - name = "libclc-2017-02-25"; + name = "libclc-2017-11-29"; src = fetchFromGitHub { owner = "llvm-mirror"; repo = "libclc"; - rev = "17648cd846390e294feafef21c32c7106eac1e24"; - sha256 = "1c20jyh3sdwd9r37zs4vvppmsx8vhf2xbx0cxsrc27bhx5245p0s"; + rev = "d6384415ab854c68777dd77451aa2bc0d959da99"; + sha256 = "10fqrlnqlknh58x7pfsbg9r07fblfg2mgq2m4fr1jbb836ncn3wh"; }; - buildInputs = [ python2 llvm_4 clang ]; + nativeBuildInputs = [ python ]; + buildInputs = [ llvm clang ]; postPatch = '' sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py @@ -18,7 +24,7 @@ stdenv.mkDerivation { ''; configurePhase = '' - ${python2.interpreter} ./configure.py --prefix=$out + ${python.interpreter} ./configure.py --prefix=$out ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index af832a70a73bc..59e576fd39231 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "libdaemon-0.14"; src = fetchurl { @@ -24,4 +24,8 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.unix; maintainers = [ ]; }; -} +} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isMusl { + # This patch should be applied unconditionally, but doing so will cause mass rebuild. + patches = ./fix-includes.patch; +}) + diff --git a/pkgs/development/libraries/libdaemon/fix-includes.patch b/pkgs/development/libraries/libdaemon/fix-includes.patch new file mode 100644 index 0000000000000..51c5133afedef --- /dev/null +++ b/pkgs/development/libraries/libdaemon/fix-includes.patch @@ -0,0 +1,13 @@ +--- libdaemon-0.14.orig/examples/testd.c ++++ libdaemon-0.14/examples/testd.c +@@ -21,9 +21,9 @@ + #include <signal.h> + #include <errno.h> + #include <string.h> ++#include <unistd.h> + #include <sys/types.h> + #include <sys/time.h> +-#include <sys/unistd.h> + #include <sys/select.h> + + #include <libdaemon/dfork.h> diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix new file mode 100644 index 0000000000000..a61d51aa6b728 --- /dev/null +++ b/pkgs/development/libraries/libexecinfo/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, fetchpatch }: + +stdenv.mkDerivation rec { + name = "libexecinfo-${version}"; + version = "1.1"; + + src = fetchurl { + url = "http://distcache.freebsd.org/local-distfiles/itetcu/${name}.tar.bz2"; + sha256 = "07wvlpc1jk1sj4k5w53ml6wagh0zm9kv2l1jngv8xb7xww9ik8n9"; + }; + + patches = [ + (fetchpatch { + name = "10-execinfo.patch"; + url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/10-execinfo.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; + sha256 = "0lnphrad4vspyljnvmm62dyxj98vgp3wabj4w3vfzfph7j8piw7g"; + }) + (fetchpatch { + name = "20-define-gnu-source.patch"; + url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; + sha256 = "1mp8mc639b0h2s69m5z6s2h3q3n1zl298j9j0plzj7f979j76302"; + }) + (fetchpatch { + name = "30-linux-makefile.patch"; + url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; + sha256 = "1jwjz22z5cjy5h2bfghn62yl9ar8jiqhdvbwrcfavv17ihbhwcaf"; + }) + ]; + + makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ]; + + patchFlags = "-p0"; + + installPhase = '' + install -Dm644 execinfo.h stacktraverse.h -t $out/include + install -Dm755 libexecinfo.{a,so.1} -t $out/lib + ln -s $out/lib/libexecinfo.so{.1,} + ''; + + meta = with stdenv.lib; { + description = "Quick-n-dirty BSD licensed clone of the GNU libc backtrace facility"; + license = licenses.bsd2; + homepage = https://www.freshports.org/devel/libexecinfo; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index e48db6c9928be..1339be451c294 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, dejagnu, doCheck ? false +{ stdenv, fetchurl, fetchpatch, dejagnu, doCheck ? false , buildPlatform, hostPlatform }: @@ -10,11 +10,28 @@ stdenv.mkDerivation rec { sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh"; }; - patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch ++ - stdenv.lib.optional stdenv.isAarch64 (fetchurl { + patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch + ++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch { url = https://src.fedoraproject.org/rpms/libffi/raw/ccffc1700abfadb0969495a6e51b964117fc03f6/f/libffi-aarch64-rhbz1174037.patch; sha256 = "1vpirrgny43hp0885rswgv3xski8hg7791vskpbg3wdjdpb20wbc"; - }); + }) + ++ stdenv.lib.optional hostPlatform.isMusl (fetchpatch { + name = "gnu-linux-define.patch"; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/libffi/gnu-linux-define.patch?id=bb024fd8ec6f27a76d88396c9f7c5c4b5800d580"; + sha256 = "11pvy3xkhyvnjfyy293v51f1xjy3x0azrahv1nw9y9mw8bifa2j2"; + }) + ++ stdenv.lib.optionals stdenv.isMips [ + (fetchpatch { + name = "0001-mips-Use-compiler-internal-define-for-linux.patch"; + url = "http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch?id=318e33a708378652edcf61ce7d9d7f3a07743000"; + sha256 = "1gc53lw90p6hc0cmhj3csrwincfz7va5ss995ksw5gm0yrr9mrvb"; + }) + (fetchpatch { + name = "0001-mips-fix-MIPS-softfloat-build-issue.patch"; + url = "http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-support/libffi/libffi/0001-mips-fix-MIPS-softfloat-build-issue.patch?id=318e33a708378652edcf61ce7d9d7f3a07743000"; + sha256 = "0l8xgdciqalg4z9rcwyk87h8fdxpfv4hfqxwsy2agpnpszl5jjdq"; + }) + ]; outputs = [ "out" "dev" "man" "info" ]; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 397000fc7d245..45564d64861d5 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: +{ stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap }: assert enableCapabilities -> stdenv.isLinux; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; buildInputs = [ libgpgerror ] + ++ stdenv.lib.optional stdenv.isDarwin gettext ++ stdenv.lib.optional enableCapabilities libcap; # Make sure libraries are correct for .pc and .la files diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 9faf7a4045859..e6cb62330c4e7 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1li95ni122fzinzlmxbln63nmgij63irxfvi52ws4zfbzv3am4sg"; }; - postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure"; + postPatch = '' + sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h + ''; outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # deps want just the lib, most likely diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 8994651241001..21abf7f8c0795 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -2,7 +2,7 @@ , buildPlatform, hostPlatform }: -assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross +# assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross stdenv.mkDerivation rec { name = "libiconv-${version}"; diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index c6b7bcf84dffd..54d669f1913b1 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "info" "devdoc" ]; # broken with gcc-7 - #doCheck = (stdenv.buildPlatform == stdenv.hostPlatform) && !stdenv.isDarwin; + #doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isMusl; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 8bff5a21cd097..3f7a4bed9cc9b 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgpgerror }: +{ stdenv, fetchurl, gettext, libgpgerror }: stdenv.mkDerivation rec { name = "libksba-1.3.5"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; propagatedBuildInputs = [ libgpgerror ]; postInstall = '' diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 086ba8f32d213..6d895290e2c23 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb"; sha256 = "1gjf3vd7hiyzxjvlg2zfc3y2j0lyr6nhbws4xb5dmin3csyp8qb8"; - }); + }) + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch; buildInputs = [ libevent ]; propagatedBuildInputs = [ cyrus_sasl ]; diff --git a/pkgs/development/libraries/libmemcached/musl-fixes.patch b/pkgs/development/libraries/libmemcached/musl-fixes.patch new file mode 100644 index 0000000000000..eb2a6bc980eb2 --- /dev/null +++ b/pkgs/development/libraries/libmemcached/musl-fixes.patch @@ -0,0 +1,58 @@ +diff --git a/libhashkit/fnv_64.cc b/libhashkit/fnv_64.cc +index 68e4dd0..64656b7 100644 +--- a/libhashkit/fnv_64.cc ++++ b/libhashkit/fnv_64.cc +@@ -37,8 +37,9 @@ + + + #include <libhashkit/common.h> ++#include <limits.h> + +-#if __WORDSIZE == 64 && defined(HAVE_FNV64_HASH) ++#if (LONG_BITS == 64) && defined(HAVE_FNV64_HASH) + + /* FNV hash'es lifted from Dustin Sallings work */ + static uint64_t FNV_64_INIT= 0xcbf29ce484222325; +diff --git a/libhashkit/has.cc b/libhashkit/has.cc +index 843e32e..4153e5e 100644 +--- a/libhashkit/has.cc ++++ b/libhashkit/has.cc +@@ -37,6 +37,7 @@ + + + #include <libhashkit/common.h> ++#include <limits.h> + + bool libhashkit_has_algorithm(const hashkit_hash_algorithm_t algo) + { +@@ -44,7 +45,7 @@ bool libhashkit_has_algorithm(const hashkit_hash_algorithm_t algo) + { + case HASHKIT_HASH_FNV1_64: + case HASHKIT_HASH_FNV1A_64: +-#if __WORDSIZE == 64 && defined(HAVE_FNV64_HASH) ++#if (LONG_BITS == 64) && defined(HAVE_FNV64_HASH) + return true; + #else + return false; +diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc +index 29a22de..161c646 100644 +--- a/libtest/cmdline.cc ++++ b/libtest/cmdline.cc +@@ -61,7 +61,7 @@ using namespace libtest; + #include <algorithm> + #include <stdexcept> + +-#ifndef __USE_GNU ++#ifndef _GNU_SOURCE + static char **environ= NULL; + #endif + +@@ -201,7 +201,7 @@ Application::error_t Application::run(const char *args[]) + + fatal_assert(posix_spawnattr_setsigmask(&spawnattr, &mask) == 0); + +-#if defined(POSIX_SPAWN_USEVFORK) || defined(__linux__) ++#if defined(POSIX_SPAWN_USEVFORK) || defined(__GLIBC__) + // Use USEVFORK on linux + flags |= POSIX_SPAWN_USEVFORK; + #endif diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 97366d24c36e4..106f6fe6c37c1 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -1,23 +1,20 @@ { stdenv, fetchurl , gmp, mpfr -, buildPlatform, hostPlatform }: let - version = "1.0.3"; + version = "1.1.0"; in stdenv.mkDerivation rec { name = "libmpc-${version}"; # to avoid clash with the MPD client src = fetchurl { - url = "https://ftp.gnu.org/gnu/mpc/mpc-${version}.tar.gz"; - sha256 = "1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1"; + url = "mirror://gnu/mpc/mpc-${version}.tar.gz"; + sha256 = "0biwnhjm3rx3hc0rfpvyniky4lpzsvdcwhmcn7f0h4iw2hwcb1b9"; }; buildInputs = [ gmp mpfr ]; - CFLAGS = "-I${gmp.dev}/include"; - doCheck = true; # not cross; meta = { diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index a93c16d784de0..f642ad5ccfab8 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0qsapqa7dzq9f6lb19kzilif0pj82b64fjv5bq086hflb9w81hvj"; }; + patches = [ ./fix-includes.patch ]; + meta = with stdenv.lib; { homepage = https://github.com/sam-github/libnet; description = "Portable framework for low-level network packet construction"; diff --git a/pkgs/development/libraries/libnet/fix-includes.patch b/pkgs/development/libraries/libnet/fix-includes.patch new file mode 100644 index 0000000000000..5eb86bc37b79d --- /dev/null +++ b/pkgs/development/libraries/libnet/fix-includes.patch @@ -0,0 +1,29 @@ +--- libnet-1.1.6.orig/src/libnet_link_linux.c ++++ libnet-1.1.6/src/libnet_link_linux.c +@@ -30,26 +30,15 @@ + #include <sys/time.h> + + #include <net/if.h> +-#if (__GLIBC__) + #include <netinet/if_ether.h> + #include <net/if_arp.h> +-#else +-#include <linux/if_arp.h> +-#include <linux/if_ether.h> +-#endif + + #if (HAVE_PACKET_SOCKET) + #ifndef SOL_PACKET + #define SOL_PACKET 263 + #endif /* SOL_PACKET */ +-#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 + #include <netpacket/packet.h> + #include <net/ethernet.h> /* the L2 protocols */ +-#else +-#include <asm/types.h> +-#include <linux/if_packet.h> +-#include <linux/if_ether.h> /* The L2 protocols */ +-#endif + #endif /* HAVE_PACKET_SOCKET */ + + #include "../include/libnet.h" diff --git a/pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch b/pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch new file mode 100644 index 0000000000000..074bef42b97ab --- /dev/null +++ b/pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch @@ -0,0 +1,499 @@ +From patchwork Fri Apr 3 22:04:46 2015 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: Use stdlib uint* instead of u_int* +From: Nathan McSween <nwmcsween@gmail.com> +X-Patchwork-Id: 458131 +X-Patchwork-Delegate: pablo@netfilter.org +Message-Id: <1428098686-17843-1-git-send-email-nwmcsween@gmail.com> +To: netfilter-devel@vger.kernel.org +Cc: Nathan McSween <nwmcsween@gmail.com> +Date: Fri, 3 Apr 2015 22:04:46 +0000 + +Signed-off-by: Nathan McSween <nwmcsween@gmail.com> +--- + include/libnfnetlink/libnfnetlink.h | 25 +++++----- + include/libnfnetlink/linux_nfnetlink.h | 11 +++-- + include/libnfnetlink/linux_nfnetlink_compat.h | 6 ++- + src/iftable.c | 9 ++-- + src/iftable.h | 6 ++- + src/libnfnetlink.c | 71 ++++++++++++++------------- + src/rtnl.c | 5 +- + src/rtnl.h | 3 +- + 8 files changed, 73 insertions(+), 63 deletions(-) + +diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h +index 1d8c49d..cd0be3d 100644 +--- a/include/libnfnetlink/libnfnetlink.h ++++ b/include/libnfnetlink/libnfnetlink.h +@@ -15,6 +15,7 @@ + #define aligned_u64 unsigned long long __attribute__((aligned(8))) + #endif + ++#include <stdint.h> + #include <sys/socket.h> /* for sa_family_t */ + #include <linux/netlink.h> + #include <libnfnetlink/linux_nfnetlink.h> +@@ -55,7 +56,7 @@ struct nfnlhdr { + struct nfnl_callback { + int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data); + void *data; +- u_int16_t attr_count; ++ uint16_t attr_count; + }; + + struct nfnl_handle; +@@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(void); + extern int nfnl_close(struct nfnl_handle *); + + extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *, +- u_int8_t, u_int8_t, ++ uint8_t, uint8_t, + unsigned int); + extern void nfnl_subsys_close(struct nfnl_subsys_handle *); + +@@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfnl_handle *nfnlh, + const struct iovec *iov, unsigned int num, + unsigned int flags); + extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *, +- unsigned int, u_int8_t, u_int16_t, u_int16_t, +- u_int16_t); ++ unsigned int, uint8_t, uint16_t, uint16_t, ++ uint16_t); + extern __attribute__((deprecated)) int + nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t, + unsigned, struct nlmsghdr *, +@@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *, + /* receiving */ + extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len); + extern int nfnl_callback_register(struct nfnl_subsys_handle *, +- u_int8_t type, struct nfnl_callback *cb); +-extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type); ++ uint8_t type, struct nfnl_callback *cb); ++extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type); + extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len); + + /* parsing */ +@@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle *h, struct nlmsghdr *nlh); + + /* nfnl attribute handling functions */ + extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int); +-extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t); +-extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t); +-extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t); ++extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t); ++extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t); ++extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t); + extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int); +-extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t); +-extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t); ++extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t); ++extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t); + extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); + #define nfnl_parse_nested(tb, max, nfa) \ + nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa))) +@@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); + ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; }) + + extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, +- u_int16_t type, u_int32_t len, ++ uint16_t type, uint32_t len, + unsigned char *val); + extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, + unsigned int size); +diff --git a/include/libnfnetlink/linux_nfnetlink.h b/include/libnfnetlink/linux_nfnetlink.h +index 76a8550..7b843c6 100644 +--- a/include/libnfnetlink/linux_nfnetlink.h ++++ b/include/libnfnetlink/linux_nfnetlink.h +@@ -1,5 +1,6 @@ + #ifndef _NFNETLINK_H + #define _NFNETLINK_H ++#include <stdint.h> + #include <linux/types.h> + #include <libnfnetlink/linux_nfnetlink_compat.h> + +@@ -25,9 +26,9 @@ enum nfnetlink_groups { + /* General form of address family dependent message. + */ + struct nfgenmsg { +- u_int8_t nfgen_family; /* AF_xxx */ +- u_int8_t version; /* nfnetlink version */ +- u_int16_t res_id; /* resource id */ ++ uint8_t nfgen_family; /* AF_xxx */ ++ uint8_t version; /* nfnetlink version */ ++ uint16_t res_id; /* resource id */ + }; + + #define NFNETLINK_V0 0 +@@ -59,7 +60,7 @@ struct nfnl_callback + int (*call)(struct sock *nl, struct sk_buff *skb, + struct nlmsghdr *nlh, struct nlattr *cda[]); + const struct nla_policy *policy; /* netlink attribute policy */ +- const u_int16_t attr_count; /* number of nlattr's */ ++ const uint16_t attr_count; /* number of nlattr's */ + }; + + struct nfnetlink_subsystem +@@ -76,7 +77,7 @@ extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n); + extern int nfnetlink_has_listeners(unsigned int group); + extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, + int echo); +-extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags); ++extern int nfnetlink_unicast(struct sk_buff *skb, uint32_t pid, int flags); + + #define MODULE_ALIAS_NFNL_SUBSYS(subsys) \ + MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys)) +diff --git a/include/libnfnetlink/linux_nfnetlink_compat.h b/include/libnfnetlink/linux_nfnetlink_compat.h +index e145176..cd094fc 100644 +--- a/include/libnfnetlink/linux_nfnetlink_compat.h ++++ b/include/libnfnetlink/linux_nfnetlink_compat.h +@@ -3,6 +3,8 @@ + #ifndef __KERNEL__ + /* Old nfnetlink macros for userspace */ + ++#include <stdint.h> ++ + /* nfnetlink groups: Up to 32 maximum */ + #define NF_NETLINK_CONNTRACK_NEW 0x00000001 + #define NF_NETLINK_CONNTRACK_UPDATE 0x00000002 +@@ -20,8 +22,8 @@ + + struct nfattr + { +- u_int16_t nfa_len; +- u_int16_t nfa_type; /* we use 15 bits for the type, and the highest ++ uint16_t nfa_len; ++ uint16_t nfa_type; /* we use 15 bits for the type, and the highest + * bit to indicate whether the payload is nested */ + }; + +diff --git a/src/iftable.c b/src/iftable.c +index 5976ed8..3411c4c 100644 +--- a/src/iftable.c ++++ b/src/iftable.c +@@ -9,6 +9,7 @@ + /* IFINDEX handling */ + + #include <unistd.h> ++#include <stdint.h> + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +@@ -27,10 +28,10 @@ + struct ifindex_node { + struct list_head head; + +- u_int32_t index; +- u_int32_t type; +- u_int32_t alen; +- u_int32_t flags; ++ uint32_t index; ++ uint32_t type; ++ uint32_t alen; ++ uint32_t flags; + char addr[8]; + char name[16]; + }; +diff --git a/src/iftable.h b/src/iftable.h +index 8df7f24..0cc5335 100644 +--- a/src/iftable.h ++++ b/src/iftable.h +@@ -1,8 +1,10 @@ + #ifndef _IFTABLE_H + #define _IFTABLE_H + +-int iftable_delete(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); +-int iftable_insert(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); ++#include <stdint.h> ++ ++int iftable_delete(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); ++int iftable_insert(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); + + int iftable_init(void); + void iftable_fini(void); +diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c +index 398b7d7..b8958dc 100644 +--- a/src/libnfnetlink.c ++++ b/src/libnfnetlink.c +@@ -36,6 +36,7 @@ + * minor cleanups + */ + ++#include <stdint.h> + #include <stdlib.h> + #include <stdio.h> + #include <unistd.h> +@@ -72,9 +73,9 @@ + + struct nfnl_subsys_handle { + struct nfnl_handle *nfnlh; +- u_int32_t subscriptions; +- u_int8_t subsys_id; +- u_int8_t cb_count; ++ uint32_t subscriptions; ++ uint8_t subsys_id; ++ uint8_t cb_count; + struct nfnl_callback *cb; /* array of callbacks */ + }; + +@@ -86,11 +87,11 @@ struct nfnl_handle { + int fd; + struct sockaddr_nl local; + struct sockaddr_nl peer; +- u_int32_t subscriptions; +- u_int32_t seq; +- u_int32_t dump; +- u_int32_t rcv_buffer_size; /* for nfnl_catch */ +- u_int32_t flags; ++ uint32_t subscriptions; ++ uint32_t seq; ++ uint32_t dump; ++ uint32_t rcv_buffer_size; /* for nfnl_catch */ ++ uint32_t flags; + struct nlmsghdr *last_nlhdr; + struct nfnl_subsys_handle subsys[NFNL_MAX_SUBSYS+1]; + }; +@@ -145,7 +146,7 @@ unsigned int nfnl_portid(const struct nfnl_handle *h) + static int recalc_rebind_subscriptions(struct nfnl_handle *nfnlh) + { + int i, err; +- u_int32_t new_subscriptions = nfnlh->subscriptions; ++ uint32_t new_subscriptions = nfnlh->subscriptions; + + for (i = 0; i < NFNL_MAX_SUBSYS; i++) + new_subscriptions |= nfnlh->subsys[i].subscriptions; +@@ -273,8 +274,8 @@ void nfnl_set_rcv_buffer_size(struct nfnl_handle *h, unsigned int size) + * a valid address that points to a nfnl_subsys_handle structure is returned. + */ + struct nfnl_subsys_handle * +-nfnl_subsys_open(struct nfnl_handle *nfnlh, u_int8_t subsys_id, +- u_int8_t cb_count, u_int32_t subscriptions) ++nfnl_subsys_open(struct nfnl_handle *nfnlh, uint8_t subsys_id, ++ uint8_t cb_count, uint32_t subscriptions) + { + struct nfnl_subsys_handle *ssh; + +@@ -435,10 +436,10 @@ int nfnl_sendiov(const struct nfnl_handle *nfnlh, const struct iovec *iov, + */ + void nfnl_fill_hdr(struct nfnl_subsys_handle *ssh, + struct nlmsghdr *nlh, unsigned int len, +- u_int8_t family, +- u_int16_t res_id, +- u_int16_t msg_type, +- u_int16_t msg_flags) ++ uint8_t family, ++ uint16_t res_id, ++ uint16_t msg_type, ++ uint16_t msg_flags) + { + assert(ssh); + assert(nlh); +@@ -849,14 +850,14 @@ int nfnl_nfa_addattr_l(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr8 - Add u_int8_t attribute to nlmsghdr ++ * nfnl_addattr8 - Add uint8_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header + * @type: type of new attribute + * @data: content of new attribute + */ +-int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) ++int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, uint8_t data) + { + assert(n); + assert(maxlen > 0); +@@ -866,7 +867,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) + } + + /** +- * nfnl_nfa_addattr16 - Add u_int16_t attribute to struct nfattr ++ * nfnl_nfa_addattr16 - Add uint16_t attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -875,7 +876,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) + * + */ + int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, +- u_int16_t data) ++ uint16_t data) + { + assert(nfa); + assert(maxlen > 0); +@@ -885,7 +886,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr16 - Add u_int16_t attribute to nlmsghdr ++ * nfnl_addattr16 - Add uint16_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header +@@ -894,7 +895,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, + * + */ + int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, +- u_int16_t data) ++ uint16_t data) + { + assert(n); + assert(maxlen > 0); +@@ -904,7 +905,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, + } + + /** +- * nfnl_nfa_addattr32 - Add u_int32_t attribute to struct nfattr ++ * nfnl_nfa_addattr32 - Add uint32_t attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -913,7 +914,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, + * + */ + int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, +- u_int32_t data) ++ uint32_t data) + { + assert(nfa); + assert(maxlen > 0); +@@ -923,7 +924,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr32 - Add u_int32_t attribute to nlmsghdr ++ * nfnl_addattr32 - Add uint32_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header +@@ -932,7 +933,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, + * + */ + int nfnl_addattr32(struct nlmsghdr *n, int maxlen, int type, +- u_int32_t data) ++ uint32_t data) + { + assert(n); + assert(maxlen > 0); +@@ -980,7 +981,7 @@ int nfnl_parse_attr(struct nfattr *tb[], int max, struct nfattr *nfa, int len) + * + */ + void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, +- u_int16_t type, u_int32_t len, unsigned char *val) ++ uint16_t type, uint32_t len, unsigned char *val) + { + assert(iov); + assert(nfa); +@@ -1115,7 +1116,7 @@ struct nlmsghdr *nfnl_get_msg_next(struct nfnl_handle *h, + * appropiately. + */ + int nfnl_callback_register(struct nfnl_subsys_handle *ssh, +- u_int8_t type, struct nfnl_callback *cb) ++ uint8_t type, struct nfnl_callback *cb) + { + assert(ssh); + assert(cb); +@@ -1138,7 +1139,7 @@ int nfnl_callback_register(struct nfnl_subsys_handle *ssh, + * On sucess, 0 is returned. On error, -1 is returned and errno is + * set appropiately. + */ +-int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, u_int8_t type) ++int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, uint8_t type) + { + assert(ssh); + +@@ -1161,8 +1162,8 @@ int nfnl_check_attributes(const struct nfnl_handle *h, + assert(nfa); + + int min_len; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + const struct nfnl_subsys_handle *ssh; + struct nfnl_callback *cb; + +@@ -1212,8 +1213,8 @@ static int __nfnl_handle_msg(struct nfnl_handle *h, struct nlmsghdr *nlh, + int len) + { + struct nfnl_subsys_handle *ssh; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + int err = 0; + + if (subsys_id > NFNL_MAX_SUBSYS) +@@ -1243,7 +1244,7 @@ int nfnl_handle_packet(struct nfnl_handle *h, char *buf, int len) + { + + while (len >= NLMSG_SPACE(0)) { +- u_int32_t rlen; ++ uint32_t rlen; + struct nlmsghdr *nlh = (struct nlmsghdr *)buf; + + if (nlh->nlmsg_len < sizeof(struct nlmsghdr) +@@ -1285,8 +1286,8 @@ static int nfnl_is_error(struct nfnl_handle *h, struct nlmsghdr *nlh) + static int nfnl_step(struct nfnl_handle *h, struct nlmsghdr *nlh) + { + struct nfnl_subsys_handle *ssh; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + + /* Is this an error message? */ + if (nfnl_is_error(h, nlh)) { +diff --git a/src/rtnl.c b/src/rtnl.c +index 7b4ac7d..34802fe 100644 +--- a/src/rtnl.c ++++ b/src/rtnl.c +@@ -11,6 +11,7 @@ + /* rtnetlink - routing table netlink interface */ + + #include <unistd.h> ++#include <stdint.h> + #include <stdlib.h> + #include <string.h> + #include <errno.h> +@@ -30,7 +31,7 @@ + #define rtnl_log(x, ...) + + static inline struct rtnl_handler * +-find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) ++find_handler(struct rtnl_handle *rtnl_handle, uint16_t type) + { + struct rtnl_handler *h; + for (h = rtnl_handle->handlers; h; h = h->next) { +@@ -41,7 +42,7 @@ find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) + } + + static int call_handler(struct rtnl_handle *rtnl_handle, +- u_int16_t type, ++ uint16_t type, + struct nlmsghdr *hdr) + { + struct rtnl_handler *h = find_handler(rtnl_handle, type); +diff --git a/src/rtnl.h b/src/rtnl.h +index 0c403dc..9858ae5 100644 +--- a/src/rtnl.h ++++ b/src/rtnl.h +@@ -1,13 +1,14 @@ + #ifndef _RTNL_H + #define _RTNL_H + ++#include <stdint.h> + #include <linux/types.h> + #include <linux/rtnetlink.h> + + struct rtnl_handler { + struct rtnl_handler *next; + +- u_int16_t nlmsg_type; ++ uint16_t nlmsg_type; + int (*handlefn)(struct nlmsghdr *h, void *arg); + void *arg; + }; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index be60612a4ff2e..5395b5b2e99c8 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "06mm2x4b01k3m7wnrxblk9j0mybyr4pfz28ml7944xhjx6fy2w7j"; }; + patches = [ + ./Use-stdlib-uint-instead-of-u_int.patch + ]; + meta = { description = "Low-level library for netfilter related kernel/userspace communication"; longDescription = '' diff --git a/pkgs/development/libraries/libnsl/cdefs.patch b/pkgs/development/libraries/libnsl/cdefs.patch new file mode 100644 index 0000000000000..dbbe800a34795 --- /dev/null +++ b/pkgs/development/libraries/libnsl/cdefs.patch @@ -0,0 +1,30 @@ +--- a/src/rpcsvc/nislib.h ++++ b/src/rpcsvc/nislib.h +@@ -19,6 +19,7 @@ + #ifndef __RPCSVC_NISLIB_H__ + #define __RPCSVC_NISLIB_H__ + ++#include <sys/cdefs.h> + #include <features.h> + + __BEGIN_DECLS +--- a/src/rpcsvc/ypclnt.h ++++ b/src/rpcsvc/ypclnt.h +@@ -20,6 +20,7 @@ + #ifndef __RPCSVC_YPCLNT_H__ + #define __RPCSVC_YPCLNT_H__ + ++#include <sys/cdefs.h> + #include <features.h> + + /* Some defines */ +--- a/src/rpcsvc/ypupd.h ++++ b/src/rpcsvc/ypupd.h +@@ -33,6 +33,7 @@ + #ifndef __RPCSVC_YPUPD_H__ + #define __RPCSVC_YPUPD_H__ + ++#include <sys/cdefs.h> + #include <features.h> + + #include <rpc/rpc.h> diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix index d4af280c3cd8f..9e8a46b2e6b31 100644 --- a/pkgs/development/libraries/libnsl/default.nix +++ b/pkgs/development/libraries/libnsl/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libtirpc ]; + patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ./cdefs.patch ./nis_h.patch ]; + meta = with stdenv.lib; { description = "Client interface library for NIS(YP) and NIS+"; homepage = https://github.com/thkukuk/libnsl; diff --git a/pkgs/development/libraries/libnsl/nis_h.patch b/pkgs/development/libraries/libnsl/nis_h.patch new file mode 100644 index 0000000000000..199259df2e8dc --- /dev/null +++ b/pkgs/development/libraries/libnsl/nis_h.patch @@ -0,0 +1,45 @@ +--- a/src/rpcsvc/nis.h ++++ b/src/rpcsvc/nis.h +@@ -32,6 +32,7 @@ + #ifndef _RPCSVC_NIS_H + #define _RPCSVC_NIS_H 1 + ++#include <sys/cdefs.h> + #include <features.h> + #include <rpc/rpc.h> + #include <rpcsvc/nis_tags.h> +@@ -56,6 +57,34 @@ + * <kukuk@suse.de> + */ + ++#ifndef rawmemchr ++#define rawmemchr(s,c) memchr((s),(size_t)-1,(c)) ++#endif ++ ++#ifndef __asprintf ++#define __asprintf asprintf ++#endif ++ ++#ifndef __mempcpy ++#define __mempcpy mempcpy ++#endif ++ ++#ifndef __strtok_r ++#define __strtok_r strtok_r ++#endif ++ ++#ifndef __always_inline ++#define __always_inline __attribute__((__always_inline__)) ++#endif ++ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(exp) ({ \ ++typeof (exp) _rc; \ ++ do { \ ++ _rc = (exp); \ ++ } while (_rc == -1 && errno == EINTR); \ ++ _rc; }) ++#endif + + #ifndef __nis_object_h + #define __nis_object_h diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 614890e929f74..bf9e2d079cd6e 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake -, dbus, networkmanager, spidermonkey_38, pcre, python2, python3 }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, zlib +, dbus, networkmanager, spidermonkey_38, pcre, python2, python3 +, SystemConfiguration, CoreFoundation, JavaScriptCore }: stdenv.mkDerivation rec { name = "libproxy-${version}"; @@ -16,7 +17,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ dbus networkmanager spidermonkey_38 pcre python2 python3 ]; + buildInputs = [ pcre python2 python3 zlib ] + ++ (if stdenv.hostPlatform.isDarwin + then [ SystemConfiguration CoreFoundation JavaScriptCore ] + else [ spidermonkey_38 dbus networkmanager ]); preConfigure = '' cmakeFlagsArray+=( @@ -27,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl21; homepage = http://libproxy.github.io/libproxy/; description = "A library that provides automatic proxy configuration management"; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 09a0f4444b548..cf43bb9519296 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,16 +1,22 @@ { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf -, bzip2, libcroco, libintlOrEmpty, darwin +, bzip2, libcroco, libintlOrEmpty, darwin, rust , withGTK ? false, gtk3 ? null , gobjectIntrospection ? null, enableIntrospection ? false }: # no introspection by default, it's too big +let + version = "2.42.2"; + releaseVersion = (lib.concatStringsSep "." (lib.lists.take 2 + (lib.splitString "." version))); + +in stdenv.mkDerivation rec { - name = "librsvg-2.40.19"; + name = "librsvg-${version}"; src = fetchurl { - url = "mirror://gnome/sources/librsvg/2.40/librsvg-2.40.18.tar.xz"; - sha256 = "0k2nbd4g31qinkdfd8r5c5ih2ixl85fbkgkqqh9747lwr24c9j5z"; + url = "mirror://gnome/sources/librsvg/${releaseVersion}/${name}.tar.xz"; + sha256 = "0c550a0bffef768a436286116c03d9f6cd3f97f5021c13e7f093b550fac12562"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; @@ -22,7 +28,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index ccdc3aba61183..cc5b19f7a595a 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,21 +1,13 @@ { stdenv, fetchurl, perl, texinfo }: stdenv.mkDerivation rec { - name = "libtasn1-4.12"; + name = "libtasn1-4.13"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "0ls7jdq3y5fnrwg0pzhq11m21r8pshac2705bczz6mqjc8pdllv7"; + sha256 = "1jlc1iahj8k3haz28j55nzg7sgni5h41vqy461i1bpbx6668wlky"; }; - patches = [ - (fetchurl { - name = "CVE-2017-10790.patch"; - url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=d8d805e1f2e6799bb2dff4871a8598dc83088a39"; - sha256 = "1v5w0dazp9qc2v7pc8b6g7s4dz5ak10hzrn35hx66q76yzrrzp7i"; - }) - ]; - outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index e1b8c04b4ce58..8d1f5115bdf01 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "--with-libiconv-prefix=${libiconv}" ]; - doCheck = true; + doCheck = !stdenv.hostPlatform.isMusl; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch b/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch new file mode 100644 index 0000000000000..5fcaa72c0c013 --- /dev/null +++ b/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch @@ -0,0 +1,45 @@ +From 04437142399662b576bd55a85485c6dcc14d0812 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem at gmail.com> +Date: Thu, 31 Dec 2015 06:44:07 +0000 +Subject: [PATCH] backtrace: Use only with glibc and uclibc + +backtrace API is glibc specific not linux specific +so make it behave so. + +Signed-off-by: Khem Raj <raj.khem at gmail.com> +--- +Upstream-Status: Pending + + tests/test-coredump-unwind.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/test-coredump-unwind.c b/tests/test-coredump-unwind.c +index 5254708..8767b42 100644 +--- a/tests/test-coredump-unwind.c ++++ b/tests/test-coredump-unwind.c +@@ -57,7 +57,9 @@ + #include <grp.h> + + /* For SIGSEGV handler code */ ++#ifdef __GLIBC__ + #include <execinfo.h> ++#endif + #include <sys/ucontext.h> + + #include <libunwind-coredump.h> +@@ -238,11 +240,11 @@ void handle_sigsegv(int sig, siginfo_t *info, void *ucontext) + ip); + + { ++#ifdef __GLIBC__ + /* glibc extension */ + void *array[50]; + int size; + size = backtrace(array, 50); +-#ifdef __linux__ + backtrace_symbols_fd(array, size, 2); + #endif + } +-- +2.6.4 + diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 8565bc75ff9fb..6afdac3fdf5c3 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./version-1.2.1.patch + ./backtrace-only-with-glibc.patch ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix index 1fd3cb39bbff8..4704a1e5c331f 100644 --- a/pkgs/development/libraries/libusb/default.nix +++ b/pkgs/development/libraries/libusb/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { sha256 = "0nn5icrfm9lkhzw1xjvaks9bq3w6mjg86ggv3fn7kgi4nfvg8kj0"; }; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch; + meta = { platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libusb/fix-headers.patch b/pkgs/development/libraries/libusb/fix-headers.patch new file mode 100644 index 0000000000000..ea9cbc34978ed --- /dev/null +++ b/pkgs/development/libraries/libusb/fix-headers.patch @@ -0,0 +1,10 @@ +--- libusb-compat-0.1.5.orig/libusb/usb.h ++++ libusb-compat-0.1.5/libusb/usb.h +@@ -25,6 +25,7 @@ + #ifndef __USB_H__ + #define __USB_H__ + ++#include <sys/types.h> + #include <unistd.h> + #include <stdlib.h> + #include <limits.h> diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 4075505f8dd89..59fd95eefeee5 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,14 +2,14 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.18.0"; + version = "1.19.1"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "0s71c2y4ll3vp463hsdk74q4hr7wprkxc2a4agw3za2hhzcb95pd"; + sha256 = "020jap4xvjns1rgb2kvpf1nib3f2d5fyqh04afgkk32hiag0kn66"; }; postPatch = let diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index b19f4a2953f16..c4f3ff1efdd53 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -36,7 +36,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin; + doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin && + hostPlatform.libc != "musl"; crossAttrs = lib.optionalAttrs (hostPlatform.libc == "msvcrt") { # creating the DLL is broken ATM diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index f028437072659..fc4c280d47c21 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -2,28 +2,26 @@ stdenv.mkDerivation rec { name = "libyaml-cpp-${version}"; - version = "0.5.3"; + version = "0.6.1"; src = fetchFromGitHub { owner = "jbeder"; repo = "yaml-cpp"; - rev = "release-${version}"; - sha256 = "0qr286q8mwbr4cxz0y0rf045zc071qh3cb804by6w1ydlqciih8a"; + rev = "yaml-cpp-${version}"; + sha256 = "16x53p9gfch7gpyg865j7m1zhqsixx2hbbd206ffjv0ip8cjipjf"; }; outputs = [ "out" "dev" ]; - buildInputs = [ cmake boost ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = "-DBUILD_SHARED_LIBS=ON"; - enableParallelBuilding = true; - meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A YAML parser and emitter for C++"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ andir ]; }; } diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 06cc53abb564f..90f1543676430 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,22 +1,29 @@ { stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm , libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen -, python, libXext, libmatroska, openssl +, python, libXext, libmatroska, openssl, fetchpatch }: stdenv.mkDerivation rec { baseName = "mediastreamer2"; - version = "2.14.0"; + version = "2.16.1"; name = "${baseName}-${version}"; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "1b59rzsaw54mhy4pz9hndmim4rgidkn7s6c4iyl34mz58lwxpmqp"; + sha256 = "02745bzl2r1jqvdqzyv94fjd4w92zr976la4c4nfvsy52waqah7j"; }; - patches = [ ./plugins_dir.patch ]; + patches = [ + (fetchpatch { + name = "allow-build-without-git.patch"; + url = "https://github.com/BelledonneCommunications/mediastreamer2/commit/de3a24b795d7a78e78eab6b974e7ec5abf2259ac.patch"; + sha256 = "1zqkrab42n4dha0knfsyj4q0wc229ma125gk9grj67ps7r7ipscy"; + }) + ./plugins_dir.patch + ]; nativeBuildInputs = [ pkgconfig intltool cmake doxygen python ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 8df248e3e461f..fa3336c4cea00 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation { patches = [ ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch; outputs = [ "out" "dev" "drivers" "osmesa" ]; diff --git a/pkgs/development/libraries/mesa/musl-fixes.patch b/pkgs/development/libraries/mesa/musl-fixes.patch new file mode 100644 index 0000000000000..60140d445ae8a --- /dev/null +++ b/pkgs/development/libraries/mesa/musl-fixes.patch @@ -0,0 +1,22 @@ +--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig ++++ ./src/gallium/winsys/svga/drm/vmw_screen.h +@@ -34,7 +34,7 @@ + #ifndef VMW_SCREEN_H_ + #define VMW_SCREEN_H_ + +- ++#include <sys/stat.h> + #include "pipe/p_compiler.h" + #include "pipe/p_state.h" + +--- a/src/util/u_endian.h.orig 2016-11-04 12:16:00.480356454 +0100 ++++ b/src/util/u_endian.h 2016-11-04 12:16:11.984347944 +0100 +@@ -27,7 +27,7 @@ + #ifndef U_ENDIAN_H + #define U_ENDIAN_H + +-#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__) ++#if defined(__linux__) || defined(ANDROID) || defined(__CYGWIN__) + #include <endian.h> + + #if __BYTE_ORDER == __LITTLE_ENDIAN diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix index fc48c85f23c7c..7a06f9277c957 100644 --- a/pkgs/development/libraries/mimetic/default.nix +++ b/pkgs/development/libraries/mimetic/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MIME handling library"; - homepage = http://codesink.org/mimetic_mime_library.html; + homepage = http://www.codesink.org/mimetic_mime_library.html; license = licenses.mit; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index fe364f22f9a3e..4aac5a9270922 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, gmp -, buildPlatform, hostPlatform +, hostPlatform }: stdenv.mkDerivation rec { - name = "mpfr-3.1.3"; + name = "mpfr-3.1.6"; src = fetchurl { - url = "mirror://gnu/mpfr/${name}.tar.bz2"; - sha256 = "1z8akfw9wbmq91vrx04bw86mmnxw2sw5qm5cr8ix5b3w2mcv8fzn"; + url = "mirror://gnu/mpfr/${name}.tar.xz"; + sha256 = "0l598h9klpgkz2bp0rxiqb90mkqh9f2f81n5rpy191j00hdaqqks"; }; - patches = [ ./upstream.patch ]; - outputs = [ "out" "dev" "doc" "info" ]; # mpfr.h requires gmp.h diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index 9633dacd68f24..3af93469cf16c 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, gmp, gnum4 +{ stdenv, buildPackages, gmp, gnum4 # Version specific args , version, src @@ -12,7 +12,8 @@ stdenv.mkDerivation (rec { outputs = [ "out" "dev" ]; outputBin = "dev"; - buildInputs = [ gnum4 ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ gnum4 ]; propagatedBuildInputs = [ gmp ]; doCheck = (stdenv.system != "i686-cygwin" && !stdenv.isDarwin); diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 2dcc7e9a53dd1..8ccaf726e6b0d 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, nix, boehmgc }: -let version = "2.0.7"; in +{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig }: +let version = "3.0.1"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,12 +7,12 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "1q4ydp2w114wbfm41m4qgrabha7ifa17xyz5dr137vvnj6njp4vs"; + sha256 = "1pmk2m0kc6a3jqygm5cy1fl5gbcy0ghc2xs4ww0gh20walrys82r"; }; - buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" "GC_INCLUDE=${boehmgc.dev}/include" ]; + nativeBuildInputs = [ cmake pkgconfig ]; - installFlags = [ "PREFIX=$(out)" ]; + buildInputs = [ nix ]; meta = { description = "Collection of miscellaneous plugins for the nix expression language"; diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index dc4f4926e9d5c..a600938cdbb24 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1hmkkp6vzyrh8v01c2ynzf9vwikyagp7p1lxhbnr4ysk3w66jji9"; }; + doCheck = true; + meta = with stdenv.lib; { description = "The New GNU Portable Threads Library"; longDescription = '' diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index 6c3a77cfaf5ec..75dda07494d9b 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -9,14 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2"; }; - buildInputs = [ ruby opencl-headers ]; + nativeBuildInputs = [ ruby ]; + + buildInputs = [ opencl-headers ]; postPatch = '' sed -i 's,"/etc/OpenCL/vendors","${mesa_noglu.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c ''; meta = with stdenv.lib; { - description = "OpenCL ICD Loader"; + description = "OpenCL ICD Loader for ${opencl-headers.name}"; homepage = https://forge.imag.fr/projects/ocl-icd/; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 717bb5ad0eed8..9ce8bb618bf99 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub +, version # "12" for "1.2", "22" for "2.2" and so on +}: stdenv.mkDerivation rec { - name = "opencl-headers-2.1-2016-11-29"; + name = "opencl-headers-${version}-2017-07-18"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-Headers"; - rev = "abb29588550c77f8340a6c3683531407013bf26b"; - sha256 = "0zjznq65i4b2h4k36qfbbzq1acf2jdd9vygjv5az1yk7qgsp4jj7"; + rev = "f039db6764d52388658ef15c30b2237bbda49803"; + sha256 = "0z04i330zr8czak2624q71aajdcq7ly8mb5bgala5m235qjpsrh7"; }; installPhase = '' mkdir -p $out/include/CL - cp * $out/include/CL + cp opencl${version}/CL/* $out/include/CL ''; meta = with stdenv.lib; { - description = "Khronos OpenCL headers"; + description = "Khronos OpenCL headers version ${version}"; homepage = https://www.khronos.org/registry/cl/; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index c2f79753bd19a..3f764b1d84535 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gfortran, perl, rdma-core +{ stdenv, fetchurl, gfortran, perl, libnl, rdma-core, zlib # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -7,44 +7,48 @@ , enablePrefix ? false }: -with stdenv.lib; - let - majorVersion = "1.10"; + majorVersion = "3.0"; + minorVersion = "0"; in stdenv.mkDerivation rec { - name = "openmpi-${majorVersion}.7"; + name = "openmpi-${majorVersion}.${minorVersion}"; src = fetchurl { url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2"; - sha256 = "142s1vny9gllkq336yafxayjgcirj2jv0ddabj879jgya7hyr2d0"; + sha256 = "1mw2d94k6mp4scg1wnkj50vdh734fy5m2ygyrj65s4mh3prbz6gn"; }; - buildInputs = [ gfortran ] - ++ optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core; + postPatch = '' + patchShebangs ./ + ''; + + buildInputs = with stdenv; [ gfortran zlib ] + ++ lib.optional isLinux libnl + ++ lib.optional (isLinux || isFreeBSD) rdma-core; nativeBuildInputs = [ perl ]; - configureFlags = [] - ++ optional enableSGE "--with-sge" - ++ optional enablePrefix "--enable-mpirun-prefix-by-default" + configureFlags = with stdenv; [] + ++ lib.optional isLinux "--with-libnl=${libnl.dev}" + ++ lib.optional enableSGE "--with-sge" + ++ lib.optional enablePrefix "--enable-mpirun-prefix-by-default" ; enableParallelBuilding = true; - preBuild = '' - patchShebangs ompi/mpi/fortran/base/gen-mpi-sizeof.pl - ''; - postInstall = '' - rm -f $out/lib/*.la + rm -f $out/lib/*.la ''; - meta = { + doCheck = true; + + meta = with stdenv.lib; { homepage = http://www.open-mpi.org/; - description = "Open source MPI-2 implementation"; - longDescription = "The Open MPI Project is an open source MPI-2 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers."; - maintainers = [ ]; + description = "Open source MPI-3 implementation"; + longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers."; + maintainers = with maintainers; [ markuskowa ]; + license = licenses.bsd3; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 775e6056dffcb..af6a540b97c0f 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -24,6 +24,12 @@ let ++ optional (versionOlder version "1.0.2" && hostPlatform.isDarwin) ./darwin-arch.patch; + postPatch = if (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) then '' + substituteInPlace crypto/async/arch/async_posix.h \ + --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ + '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0' + '' else null; + outputs = [ "bin" "dev" "out" "man" ]; setOutputFlags = false; separateDebugInfo = hostPlatform.isLinux; @@ -49,6 +55,10 @@ let # TODO(@Ericson2314): Make unconditional on mass rebuild ${if buildPlatform != hostPlatform then "configurePlatforms" else null} = []; + preConfigure = '' + patchShebangs Configure + ''; + configureFlags = [ "shared" "--libdir=lib" diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index f05811f348132..5dc5df8e95b95 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { baseName = "ortp"; - version = "0.27.0"; + version = "1.0.2"; name = "${baseName}-${version}"; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "0gjaaph4pamay9gn1yn7ky5wyzhj93r53rwak7h8s48vf08fqyv7"; + sha256 = "12cwv593bsdnxs0zfcp07vwyk7ghlz2wv7vdbs1ksv293w3vj2rv"; }; buildInputs = [ bctoolbox ]; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix new file mode 100644 index 0000000000000..3bd94c977e842 --- /dev/null +++ b/pkgs/development/libraries/pipewire/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind +, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, libudev, libva, xlibs +, sbc, SDL2 +}: + +let + version = "0.1.8"; +in stdenv.mkDerivation rec { + name = "pipewire-${version}"; + + src = fetchFromGitHub { + owner = "PipeWire"; + repo = "pipewire"; + rev = version; + sha256 = "1nim8d1lsf6yxk97piwmsz686w84b09lk6cagbyjr9m3k2hwybqn"; + }; + + outputs = [ "out" "dev" "doc" ]; + + nativeBuildInputs = [ + meson ninja pkgconfig doxygen graphviz valgrind + ]; + buildInputs = [ + glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils + alsaLib ffmpeg libjack2 libudev libva xlibs.libX11 sbc SDL2 + ]; + + patches = [ + ./fix-paths.patch + ]; + + mesonFlags = [ + "-Denable_docs=true" + "-Denable_gstreamer=true" + ]; + + doCheck = true; + checkPhase = "meson test"; + + meta = with stdenv.lib; { + description = "Server and user space API to deal with multimedia pipelines"; + homepage = http://pipewire.org/; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/libraries/pipewire/fix-paths.patch b/pkgs/development/libraries/pipewire/fix-paths.patch new file mode 100644 index 0000000000000..5a07c6271e148 --- /dev/null +++ b/pkgs/development/libraries/pipewire/fix-paths.patch @@ -0,0 +1,8 @@ +--- a/src/daemon/systemd/user/meson.build ++++ b/src/daemon/systemd/user/meson.build +@@ -1,4 +1,4 @@ +-systemd_user_services_dir = systemd.get_pkgconfig_variable('systemduserunitdir') ++systemd_user_services_dir = join_paths(get_option('prefix'), 'etc', 'systemd', 'user') + + install_data(sources : 'pipewire.socket', install_dir : systemd_user_services_dir) + diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index dc378711d36ba..6b891bdb38c21 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,16 +1,25 @@ -{ fetchurl, stdenv, pkgconfig, libpng, glib /*just passthru*/ }: +{ stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { - name = "pixman-0.34.0"; + name = "pixman-${version}"; + version = "0.34.0"; src = fetchurl { url = "mirror://xorg/individual/lib/${name}.tar.bz2"; sha256 = "184lazwdpv67zrlxxswpxrdap85wminh1gmq1i5lcz6iycw39fir"; }; - patches = []; + patches = stdenv.lib.optionals stdenv.cc.isClang [ + (fetchpatch { + name = "builtin-shuffle.patch"; + url = https://patchwork.freedesktop.org/patch/177506/raw; + sha256 = "0rvraq93769dy2im2m022rz99fcdxprgc2fbmasnddcwrqy1x3xr"; + }) + ]; + + nativeBuildInputs = [ pkgconfig ] + ++ stdenv.lib.optionals stdenv.cc.isClang [ autoconf automake libtool ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = stdenv.lib.optional doCheck libpng; configureFlags = stdenv.lib.optional stdenv.isArm "--disable-arm-iwmmxt"; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index aef627f8f1fea..6bf9bcb954c19 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -26,18 +26,26 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-agent-leaks.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; + url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-agent-leaks.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; sha256 = "1cxnhj0y30g7ldqq1y6zwsbdwcx7h97d3mpd3h5jy7dhg3h9ym91"; }) (fetchpatch { - url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-polkitpermission-leak.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; + url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-polkitpermission-leak.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; sha256 = "1h1rkd4avqyyr8q6836zzr3w10jf521gcqnvhrhzwdpgp1ay4si7"; }) (fetchpatch { - url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-itstool.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; + url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-itstool.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; sha256 = "0bxmjwp8ahy1y5g1l0kxmld0l3mlvb2l0i5n1qabia3d5iyjkyfh"; }) - ]; + ] + # Could be applied uncondtionally but don't want to trigger rebuild + # https://bugs.freedesktop.org/show_bug.cgi?id=50145 + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + name = "netgroup-optional.patch"; + url = "https://bugs.freedesktop.org/attachment.cgi?id=118753"; + sha256 = "1zq51dhmqi9zi86bj9dq4i4pxlxm41k3k4a091j07bd78cjba038"; + }); + outputs = [ "bin" "dev" "out" ]; # small man pages in $bin diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index e2c80e445e761..42c4b028aa836 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libjpeg, zlib, perl }: -let version = "7.0.0"; +let version = "7.1.1"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "0py6p27fx4qrwq9mvcybna42b0bdi359x38lzmggxl5a9khqvl7y"; + sha256 = "1ypjxm74dhn9c4mj027zzkh0z4kpw9xiqwh3pjmmghm502hby3ca"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch b/pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch new file mode 100644 index 0000000000000..7b181f3ad896d --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch @@ -0,0 +1,13 @@ +diff --git a/src/gui/text/qfontengine_coretext.mm b/src/gui/text/qfontengine_coretext.mm +index 204d685..e05179e 100644 +--- a/src/gui/text/qfontengine_coretext.mm ++++ b/src/gui/text/qfontengine_coretext.mm +@@ -886,7 +886,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl + + QFixed QCoreTextFontEngine::emSquareSize() const + { +- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); ++ return QFixed(int(CTFontGetUnitsPerEm(ctfont))); + } + + QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 488306fc1ce25..46f24a08b5e1b 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { [ ./glib-2.32.patch ./libressl.patch ./parallel-configure.patch + ./clang-5-darwin.patch ./qt-4.8.7-unixmake-darwin.patch (substituteAll { src = ./dlopen-absolute-paths.diff; @@ -106,7 +107,13 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch { url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch"; sha256 = "1fbjh78nmafqmj7yk67qwjbhl3f6ylkp6x33b1dqxfw9gld8b3gl"; - }); + }) + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ./qt-musl.patch + ./qt-musl-iconv-no-bom.patch + ./patch-qthread-stacksize.diff + ./qsettings-recursive-global-mutex.patch + ]; preConfigure = '' export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" diff --git a/pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff b/pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff new file mode 100644 index 0000000000000..53a4c70ac3ae6 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff @@ -0,0 +1,54 @@ +--- a/src/corelib/thread/qthread_unix.cpp.orig 2015-11-23 19:05:40.000000000 +0100 ++++ b/src/corelib/thread/qthread_unix.cpp 2015-11-24 11:22:31.000000000 +0100 +@@ -79,6 +79,7 @@ + #endif + ++#include <sys/resource.h> // getrlimit/setrlimit + #if defined(Q_OS_MAC) + # ifdef qDebug + # define old_qDebug qDebug + # undef qDebug +@@ -649,6 +650,43 @@ + #endif // QT_HAS_THREAD_PRIORITY_SCHEDULING + + ++ if (d->stackSize == 0) { ++ // Fix the default (too small) stack size for threads on OS X, ++ // which also affects the thread pool. ++ // See also: ++ // https://bugreports.qt.io/browse/QTBUG-2568 ++ // This fix can also be found in Chromium: ++ // https://chromium.googlesource.com/chromium/src.git/+/master/base/threading/platform_thread_mac.mm#186 ++ ++ // The Mac OS X default for a pthread stack size is 512kB. ++ // Libc-594.1.4/pthreads/pthread.c's pthread_attr_init uses ++ // DEFAULT_STACK_SIZE for this purpose. ++ // ++ // 512kB isn't quite generous enough for some deeply recursive threads that ++ // otherwise request the default stack size by specifying 0. Here, adopt ++ // glibc's behavior as on Linux, which is to use the current stack size ++ // limit (ulimit -s) as the default stack size. See ++ // glibc-2.11.1/nptl/nptl-init.c's __pthread_initialize_minimal_internal. To ++ // avoid setting the limit below the Mac OS X default or the minimum usable ++ // stack size, these values are also considered. If any of these values ++ // can't be determined, or if stack size is unlimited (ulimit -s unlimited), ++ // stack_size is left at 0 to get the system default. ++ // ++ // Mac OS X normally only applies ulimit -s to the main thread stack. On ++ // contemporary OS X and Linux systems alike, this value is generally 8MB ++ // or in that neighborhood. ++ size_t default_stack_size = 0; ++ struct rlimit stack_rlimit; ++ if (pthread_attr_getstacksize(&attr, &default_stack_size) == 0 && ++ getrlimit(RLIMIT_STACK, &stack_rlimit) == 0 && ++ stack_rlimit.rlim_cur != RLIM_INFINITY) { ++ default_stack_size = ++ std::max(std::max(default_stack_size, ++ static_cast<size_t>(PTHREAD_STACK_MIN)), ++ static_cast<size_t>(stack_rlimit.rlim_cur)); ++ } ++ d->stackSize = default_stack_size; ++ } + if (d->stackSize > 0) { + #if defined(_POSIX_THREAD_ATTR_STACKSIZE) && (_POSIX_THREAD_ATTR_STACKSIZE-0 > 0) + int code = pthread_attr_setstacksize(&attr, d->stackSize); diff --git a/pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch b/pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch new file mode 100644 index 0000000000000..229123c54f763 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch @@ -0,0 +1,17 @@ +Calling qsettings before constructing qapplications causes a dead-lock. + +http://sourceforge.net/tracker/?func=detail&aid=3168620&group_id=4932&atid=104932 +http://developer.qt.nokia.com/forums/viewthread/10365 + + +--- ./src/corelib/io/qsettings.cpp.orig ++++ ./src/corelib/io/qsettings.cpp +@@ -122,7 +122,7 @@ + Q_GLOBAL_STATIC(ConfFileCache, unusedCacheFunc) + Q_GLOBAL_STATIC(PathHash, pathHashFunc) + Q_GLOBAL_STATIC(CustomFormatVector, customFormatVectorFunc) +-Q_GLOBAL_STATIC(QMutex, globalMutex) ++Q_GLOBAL_STATIC_WITH_ARGS(QMutex, globalMutex, (QMutex::Recursive)) + static QSettings::Format globalDefaultFormat = QSettings::NativeFormat; + + #ifndef Q_OS_WIN diff --git a/pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch b/pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch new file mode 100644 index 0000000000000..35380ad6714d6 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch @@ -0,0 +1,11 @@ +--- qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp.orig ++++ qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp +@@ -62,7 +62,7 @@ + #elif defined(Q_OS_AIX) + # define NO_BOM + # define UTF16 "UCS-2" +-#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) ++#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || (defined(Q_OS_LINUX) && !defined(__GLIBC__)) + # define NO_BOM + # if Q_BYTE_ORDER == Q_BIG_ENDIAN + # define UTF16 "UTF-16BE" diff --git a/pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch b/pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch new file mode 100644 index 0000000000000..90b9ccda08c92 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch @@ -0,0 +1,14 @@ +--- qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h.orig ++++ qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h +@@ -86,11 +86,7 @@ + + #undef QT_SOCKLEN_T + +-#if defined(__GLIBC__) && (__GLIBC__ >= 2) + #define QT_SOCKLEN_T socklen_t +-#else +-#define QT_SOCKLEN_T int +-#endif + + #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) + #define QT_SNPRINTF ::snprintf diff --git a/pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch index e85a284f3bb60..fa389fe55c2f9 100644 --- a/pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch +++ b/pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch @@ -1,3 +1,16 @@ +diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +index 66baf16..89794ef 100644 +--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm ++++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +@@ -830,7 +830,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl + + QFixed QCoreTextFontEngine::emSquareSize() const + { +- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); ++ return QFixed(int(CTFontGetUnitsPerEm(ctfont))); + } + + QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm index 341d3bccf2..3368234c26 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 9afa818c36e3f..e0dab34216271 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -37,7 +37,7 @@ let srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; patches = { - qtbase = [ ./qtbase.patch ]; + qtbase = [ ./qtbase.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch new file mode 100644 index 0000000000000..1c3a9b05cb245 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch @@ -0,0 +1,48 @@ +diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +index 66baf16..89794ef 100644 +--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm ++++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +@@ -830,7 +830,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl + + QFixed QCoreTextFontEngine::emSquareSize() const + { +- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); ++ return QFixed(int(CTFontGetUnitsPerEm(ctfont))); + } + + QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const +diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm +index 341d3bc..3368234 100644 +--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm ++++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm +@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations() + QMacAutoReleasePool pool; + userProfiles.clear(); + +- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames]; ++ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + for (NSString *ifName in wifiInterfaces) { + + CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName]; +@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate() + + QMacAutoReleasePool pool; + +- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames]; ++ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + for (NSString *ifName in wifiInterfaces) { + scanThread->interfaceName = QString::fromNSString(ifName); + scanThread->start(); +diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm +index 5cd4beb..84919e6 100644 +--- a/src/plugins/platforms/cocoa/qcocoawindow.mm ++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm +@@ -320,7 +320,7 @@ static void qt_closePopups() + + (void)applicationActivationChanged:(NSNotification*)notification + { + const id sender = self; +- NSEnumerator<NSWindow*> *windowEnumerator = nullptr; ++ NSEnumerator *windowEnumerator = nullptr; + NSApplication *application = [NSApplication sharedApplication]; + + #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12) diff --git a/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch b/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch index 0b02b00972526..8fe643e2c98f8 100644 --- a/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch +++ b/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch @@ -1,4 +1,4 @@ -Origin: http://pkgs.fedoraproject.org/gitweb/?p=qtscriptgenerator.git;a=blob_plain;f=qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch;h=f397b5ab13bcfc268e6d7b7ba4c6bc66ae38b5c0;hb=HEAD +Origin: http://src.fedoraproject.org/gitweb/?p=qtscriptgenerator.git;a=blob_plain;f=qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch;h=f397b5ab13bcfc268e6d7b7ba4c6bc66ae38b5c0;hb=HEAD diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml --- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent 2011-12-22 11:34:52.615149619 -0600 +++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml 2011-12-22 11:35:31.808659632 -0600 diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index a791c8994856b..b37a9bc04c398 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, fixDarwinDylibNames +{ stdenv +, fetchFromGitHub +, fixDarwinDylibNames +, which, perl # Optional Arguments , snappy ? null, google-gflags ? null, zlib ? null, bzip2 ? null, lz4 ? null @@ -15,15 +18,16 @@ let in stdenv.mkDerivation rec { name = "rocksdb-${version}"; - version = "5.1.2"; + version = "5.10.2"; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; rev = "v${version}"; - sha256 = "1smahz67gcd86nkdqaml78lci89dza131mlj5472r4sxjdxsx277"; + sha256 = "00qnd56v4qyzxg0b3ya3flf2jhbbfaibj1y53bd5ciaw3af6zxnd"; }; - + + nativeBuildInputs = [ which perl ]; buildInputs = [ snappy google-gflags zlib bzip2 lz4 malloc fixDarwinDylibNames ]; postPatch = '' @@ -39,16 +43,20 @@ stdenv.mkDerivation rec { ${if enableLite then "LIBNAME" else null} = "librocksdb_lite"; ${if enableLite then "CXXFLAGS" else null} = "-DROCKSDB_LITE=1"; - - buildFlags = [ + + buildAndInstallFlags = [ + "USE_RTTI=1" "DEBUG_LEVEL=0" + "DISABLE_WARNING_AS_ERROR=1" + ]; + + buildFlags = buildAndInstallFlags ++ [ "shared_lib" "static_lib" ]; - installFlags = [ + installFlags = buildAndInstallFlags ++ [ "INSTALL_PATH=\${out}" - "DEBUG_LEVEL=0" "install-shared" "install-static" ]; @@ -66,6 +74,6 @@ stdenv.mkDerivation rec { description = "A library that provides an embeddable, persistent key-value store for fast storage"; license = licenses.bsd3; platforms = platforms.allBut [ "i686-linux" ]; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ adev wkennington ]; }; } diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index b3c6d9f26d477..2144a7f789356 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "htslib"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2"; - sha256 = "1jsca3hg4rbr6iqq6imkj4lsvgl8g9768bcmny3hlff2w25vx24m"; + sha256 = "be3d4e25c256acdd41bebb8a7ad55e89bb18e2fc7fc336124b1e2c82ae8886c6"; }; # perl is only used during the check phase. diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 42eaf71942e73..07d2a04c5e20a 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, perl, which, config, coreutils +{ stdenv, fetchurl, fetchpatch, gfortran, perl, which, config, coreutils # Most packages depending on openblas expect integer width to match # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). @@ -115,9 +115,16 @@ stdenv.mkDerivation { "NUM_THREADS=64" "INTERFACE64=${if blas64 then "1" else "0"}" "NO_STATIC=1" - ] + ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1" ++ mapAttrsToList (var: val: var + "=" + val) config; + patches = stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc") + # https://github.com/xianyi/OpenBLAS/pull/1247 + (fetchpatch { + url = "https://github.com/xianyi/OpenBLAS/commit/88a35ff457f55e527e0e8a503a0dc61976c1846d.patch"; + sha256 = "1a3qrhvl5hp06c53fjqghq4zgf6ls7narm06l0shcvs57hznh09n"; + }); + doCheck = true; checkTarget = "tests"; diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 808bfd4f811d2..c8e98d3d28ed4 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { # the following three patches fix CVE-2016-9577 and CVE-2016-9578 (fetchpatch { name = "0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch"; - url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; + url = "http://src.fedoraproject.org/cgit/rpms/spice.git/plain/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; sha256 = "11x5566lx5zyl7f39glwsgpzkxb7hpcshx8va5ab3imrns07130q"; }) (fetchpatch { name = "0002-Prevent-integer-overflows-in-capability-checks.patch"; - url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0002-Prevent-integer-overflows-in-capability-checks.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; + url = "http://src.fedoraproject.org/cgit/rpms/spice.git/plain/0002-Prevent-integer-overflows-in-capability-checks.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; sha256 = "1r1bhq98w93cvvrlrz6jwdfsy261xl3xqs0ppchaa2igyxvxv5z5"; }) (fetchpatch { diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 1430c3aa9c295..8a8680a498a03 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { buildPhase = '' sed -i s/gcc/cc/g Makefile sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h - '' + ( stdenv.lib.optionalString stdenv.isDarwin '' + '' + stdenv.lib.optionalString (stdenv.hostPlatform.libc != "glibc") '' sed -i 's/LDLIBS += -lncursesw/LDLIBS += -lncursesw -liconv/' Makefile + '' + ( stdenv.lib.optionalString stdenv.isDarwin '' sed -i s/-soname/-install_name/ Makefile '' ) + '' make diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 13b1970866e75..182fbb35d499e 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -16,6 +16,8 @@ with stdenv.lib; stdenv.mkDerivation rec { optional (stdver != null) "stdver=${stdver}" ); + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch; + installPhase = '' mkdir -p $out/{lib,share/doc} cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ diff --git a/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch b/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch new file mode 100644 index 0000000000000..64056ecb14624 --- /dev/null +++ b/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch @@ -0,0 +1,43 @@ +From b577153a10c98f4e13405dc93ea2ab1a7b990e07 Mon Sep 17 00:00:00 2001 +From: David Huffman <storedbox+alpine@outlook.com> +Date: Wed, 6 Jan 2016 07:09:30 -0500 +Subject: [PATCH] hard-code glibc's definition of struct mallinfo + +--- + src/tbbmalloc/proxy.h | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/src/tbbmalloc/proxy.h b/src/tbbmalloc/proxy.h +index 781cadc..e1ea1ae 100644 +--- a/src/tbbmalloc/proxy.h ++++ b/src/tbbmalloc/proxy.h +@@ -32,6 +32,26 @@ + + #include <stddef.h> + ++// The following definition was taken from /usr/include/malloc.h as provided by ++// the glibc-devel-2.19-17.4.x86_64 package on openSUSE Leap 42.1; it is ++// made available under the GNU Lesser General Public License v2.1 or later. ++// See <https://www.gnu.org/licenses>. ++// ++// Copyright (C) 1996-2014 Free Software Foundation, Inc. ++struct mallinfo ++{ ++ int arena; /* non-mmapped space allocated from system */ ++ int ordblks; /* number of free chunks */ ++ int smblks; /* number of fastbin blocks */ ++ int hblks; /* number of mmapped regions */ ++ int hblkhd; /* space in mmapped regions */ ++ int usmblks; /* maximum total allocated space */ ++ int fsmblks; /* space available in freed fastbin blocks */ ++ int uordblks; /* total allocated space */ ++ int fordblks; /* total free space */ ++ int keepcost; /* top-most, releasable (via malloc_trim) space */ ++}; ++ + extern "C" { + void * scalable_malloc(size_t size); + void * scalable_calloc(size_t nobj, size_t size); +-- +2.6.2 + diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 0156c64306c7d..d34a6dca78329 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, autoreconfHook, libkrb5 }: +{ fetchurl, fetchpatch, stdenv, autoreconfHook, libkrb5 }: stdenv.mkDerivation rec { name = "libtirpc-1.0.2"; @@ -8,6 +8,12 @@ stdenv.mkDerivation rec { sha256 = "1xchbxy0xql7yl7z4n1icj8r7dmly46i22fvm00vdjq64zlmqg3j"; }; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl + (fetchpatch { + url = "https://raw.githubusercontent.com/openembedded/openembedded-core/2be873301420ec6ca2c70d899b7c49a7e2b0954d/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch"; + sha256 = "1jmbn0j2bnjp0j9z5vzz5xiwyv3kd28w5pixbqsy2lz6q8nii7cf"; + }); + postPatch = '' sed '1i#include <stdint.h>' -i src/xdr_sizeof.c ''; diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix index 9011d33e9222d..7f1b3ebcbf5b2 100644 --- a/pkgs/development/libraries/tinyxml-2/default.nix +++ b/pkgs/development/libraries/tinyxml-2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "tinyxml-2-${version}"; - version = "4.0.1"; + version = "6.0.0"; src = fetchFromGitHub { repo = "tinyxml2"; owner = "leethomason"; rev = version; - sha256 = "1a0skfi8rzk53qcxbv88qlvhlqzvsvg4hm20dnx4zw7vrn6anr9y"; + sha256 = "031fmhpah449h3rkyamzzdpzccrrfrvjb4qn6vx2vjm47jwc54qv"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index b8ffc16f9052d..b02ac8852371a 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -3,10 +3,10 @@ }: stdenv.mkDerivation rec { - name = "udunits-2.2.24"; + name = "udunits-2.2.26"; src = fetchurl { url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz"; - sha256 = "15bz2wv46wiwdzai8770gzy05prgj120x6j2hmihavv5y89cbfi0"; + sha256 = "0v9mqw4drnkzkm57331ail6yvs9485jmi37s40lhvmf7r5lli3rn"; }; nativeBuildInputs = [ bison flex file ]; diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index 53207f8554187..7c92e7224f9ef 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -1,21 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig }: +{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl }: stdenv.mkDerivation rec { name = "unibilium-${version}"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mauke"; repo = "unibilium"; rev = "v${version}"; - sha256 = "11mbfijdrvbmdlmxs8j4vij78ki0vna89yg3r9n9g1i6j45hiq2r"; + sha256 = "1wa9a32wzqnxqh1jh554afj13dzjr6mw2wzqzw8d08nza9pg2ra2"; }; makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ libtool ]; meta = with lib; { diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 6b5c48a6105da..9b4e3a74afe17 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uriparser-${version}"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "mirror://sourceforge/project/uriparser/Sources/${version}/${name}.tar.bz2"; - sha256 = "08vvcmg4mcpi2gyrq043c9mfcy3mbrw6lhp86698hx392fjcsz6f"; + sha256 = "1p9c6lr39rjl4bbzi7wl2nsg72gcz8qhicxh9v043qyr0dfcvsjq"; }; diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 6669b562400f0..18d20bf9c780c 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { ./quartz-webcore.patch ./libc++.patch ./plugin-none.patch + ] ++ optionals stdenv.hostPlatform.isMusl [ + ./fix-execinfo.patch ]; configureFlags = with stdenv.lib; [ diff --git a/pkgs/development/libraries/webkitgtk/fix-execinfo.patch b/pkgs/development/libraries/webkitgtk/fix-execinfo.patch new file mode 100644 index 0000000000000..eb825312f3be6 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/fix-execinfo.patch @@ -0,0 +1,20 @@ +--- webkitgtk-2.2.0.orig/Source/WTF/wtf/Assertions.cpp ++++ webkitgtk-2.2.0/Source/WTF/wtf/Assertions.cpp +@@ -64,7 +64,7 @@ + #include <windows.h> + #endif + +-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) ++#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) + #include <cxxabi.h> + #include <dlfcn.h> + #include <execinfo.h> +@@ -242,7 +242,7 @@ + + void WTFGetBacktrace(void** stack, int* size) + { +-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) ++#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) + *size = backtrace(stack, *size); + #elif OS(WINDOWS) && !OS(WINCE) + // The CaptureStackBackTrace function is available in XP, but it is not defined diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index f5d49290484f7..b5a3aed91d900 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { # signal_processing/filter_ar_fast_q12_armv7.S:88: Error: selected processor does not support `sbfx r11,r6,#12,#16' in ARM mode patchPhase = stdenv.lib.optionalString stdenv.isArm '' substituteInPlace configure --replace 'armv7*|armv8*' 'disabled' + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 9d22833e1c045..06a4e48827edc 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, alsaLib, freepats }: stdenv.mkDerivation rec { - name = "wildmidi-0.3.9"; + name = "wildmidi-0.4.2"; src = fetchurl { url = "https://github.com/Mindwerks/wildmidi/archive/${name}.tar.gz"; - sha256 = "1fbcsvzn8akvvy7vg6vmnikcc8gh405b4gp1r016bq7yginljwwp"; + sha256 = "178hm2wh5h7apkcb1a0dyla2ia8569php8ikz62rh0g6dp5l67am"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index d0731fc574ad6..c63a9b3a054d4 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -24,8 +24,8 @@ let lispPackages = rec { quicklispdist = pkgs.fetchurl { # Will usually be replaced with a fresh version anyway, but needs to be # a valid distinfo.txt - url = "http://beta.quicklisp.org/dist/quicklisp/2017-07-25/distinfo.txt"; - sha256 = "165fd4a10zc3mxyy7wr4i2r3n6fzd1wd2hgzfyp32xlc41qj2ajf"; + url = "http://beta.quicklisp.org/dist/quicklisp/2018-01-31/distinfo.txt"; + sha256 = "0z28yz205cl8pa8lbflw9072mywg69jx0gf091rhx2wjjf9h14qy"; }; buildPhase = '' true; ''; postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix index 6a40dda0c1cd9..a5fddd417fa1f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''_3bmd''; - version = ''20161204-git''; + version = ''20171019-git''; description = ''markdown processor in CL using esrap parser.''; deps = [ args."alexandria" args."esrap" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz''; - sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx''; + url = ''http://beta.quicklisp.org/archive/3bmd/2017-10-19/3bmd-20171019-git.tgz''; + sha256 = ''1lrh1ypn9wrjcayi9vc706knac1vsxlrzlsxq73apdc7jx4wzywz''; }; packageName = "3bmd"; @@ -18,12 +18,12 @@ rec { overrides = x: x; } /* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256 - 158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL - http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5 - b80864c74437e0cfb66663e9bbf08fed NAME 3bmd FILENAME _3bmd DEPS + 1lrh1ypn9wrjcayi9vc706knac1vsxlrzlsxq73apdc7jx4wzywz URL + http://beta.quicklisp.org/archive/3bmd/2017-10-19/3bmd-20171019-git.tgz MD5 + d691962a511f2edc15f4fc228ecdf546 NAME 3bmd FILENAME _3bmd DEPS ((NAME alexandria FILENAME alexandria) (NAME esrap FILENAME esrap) (NAME split-sequence FILENAME split-sequence)) - DEPENDENCIES (alexandria esrap split-sequence) VERSION 20161204-git + DEPENDENCIES (alexandria esrap split-sequence) VERSION 20171019-git SIBLINGS (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 334ff7e82d65c..9b9486e9758c7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''alexandria''; - version = ''20170630-git''; + version = ''20170830-git''; description = ''Alexandria is a collection of portable public domain utilities.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/alexandria/2017-06-30/alexandria-20170630-git.tgz''; - sha256 = ''1ch7987ijs5gz5dk3i02bqgb2bn7s9p3sfsrwq4fp1sxykwr9fis''; + url = ''http://beta.quicklisp.org/archive/alexandria/2017-08-30/alexandria-20170830-git.tgz''; + sha256 = ''0vprl8kg5qahwp8zyc26bk0qpdynga9hbv5qnlvk3cclfpvm8kl9''; }; packageName = "alexandria"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 - 1ch7987ijs5gz5dk3i02bqgb2bn7s9p3sfsrwq4fp1sxykwr9fis URL - http://beta.quicklisp.org/archive/alexandria/2017-06-30/alexandria-20170630-git.tgz - MD5 ce5427881c909981192f870cb52ff59f NAME alexandria FILENAME alexandria - DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (alexandria-tests) + 0vprl8kg5qahwp8zyc26bk0qpdynga9hbv5qnlvk3cclfpvm8kl9 URL + http://beta.quicklisp.org/archive/alexandria/2017-08-30/alexandria-20170830-git.tgz + MD5 13ea5af7055094a87dec1e45090f894a NAME alexandria FILENAME alexandria + DEPS NIL DEPENDENCIES NIL VERSION 20170830-git SIBLINGS (alexandria-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix index f7adf3b3494e2..7c618a9fffb25 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''array-utils''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A few utilities for working with arrays.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/array-utils/2017-06-30/array-utils-20170630-git.tgz''; - sha256 = ''1nj42w2q11qdg65cviaj514pcql1gi729mcsj5g2vy17pr298zgb''; + url = ''http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz''; + sha256 = ''01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0''; }; packageName = "array-utils"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. - SHA256 1nj42w2q11qdg65cviaj514pcql1gi729mcsj5g2vy17pr298zgb URL - http://beta.quicklisp.org/archive/array-utils/2017-06-30/array-utils-20170630-git.tgz - MD5 550b37bc0eccfafa889de00b59c422dc NAME array-utils FILENAME array-utils - DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (array-utils-test) + SHA256 01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0 URL + http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz + MD5 339670a03dd7d865cd045a6556d705c6 NAME array-utils FILENAME array-utils + DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS (array-utils-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix index e96c18a81209a..4f438eb734a8f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''babel-streams''; - version = ''babel-20170630-git''; + version = ''babel-20171227-git''; description = ''Some useful streams based on Babel's encoding code''; deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz''; - sha256 = ''0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx''; + url = ''http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz''; + sha256 = ''166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf''; }; packageName = "babel-streams"; @@ -19,12 +19,12 @@ rec { } /* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 - 0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx URL - http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz - MD5 aa7eff848b97bb7f7aa6bdb43a081964 NAME babel-streams FILENAME + 166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf URL + http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz + MD5 8ea39f73873847907a8bb67f99f16ecd NAME babel-streams FILENAME babel-streams DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria babel trivial-features trivial-gray-streams) - VERSION babel-20170630-git SIBLINGS (babel-tests babel) PARASITES NIL) */ + VERSION babel-20171227-git SIBLINGS (babel-tests babel) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix index d5b31daa33ab5..4cba3e86e0685 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''babel''; - version = ''20170630-git''; + version = ''20171227-git''; description = ''Babel, a charset conversion library.''; deps = [ args."alexandria" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz''; - sha256 = ''0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx''; + url = ''http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz''; + sha256 = ''166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf''; }; packageName = "babel"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 - 0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx URL - http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz - MD5 aa7eff848b97bb7f7aa6bdb43a081964 NAME babel FILENAME babel DEPS + 166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf URL + http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz + MD5 8ea39f73873847907a8bb67f99f16ecd NAME babel FILENAME babel DEPS ((NAME alexandria FILENAME alexandria) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria trivial-features) VERSION 20170630-git SIBLINGS + DEPENDENCIES (alexandria trivial-features) VERSION 20171227-git SIBLINGS (babel-streams babel-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix index 1c6dadb8fb414..e60f60a303bf6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''caveman''; - version = ''20170630-git''; + version = ''20171019-git''; description = ''Web Application Framework for Common Lisp''; - deps = [ args."anaphora" args."cl-emb" args."cl-ppcre" args."cl-project" args."cl-syntax" args."cl-syntax-annot" args."clack-v1-compat" args."do-urlencode" args."local-time" args."myway" ]; + deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."circular-streams" args."cl-annot" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack-v1-compat" args."dexador" args."do-urlencode" args."http-body" args."lack" args."let-plus" args."local-time" args."map-set" args."marshal" args."myway" args."named-readtables" args."prove" args."quri" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/caveman/2017-06-30/caveman-20170630-git.tgz''; - sha256 = ''0wpjnskcvrgvqn9gbr43yqnpcxfmdggbiyaxz9rrhgcis2rwjkj2''; + url = ''http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz''; + sha256 = ''0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra''; }; packageName = "caveman"; @@ -18,20 +18,42 @@ rec { overrides = x: x; } /* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 - 0wpjnskcvrgvqn9gbr43yqnpcxfmdggbiyaxz9rrhgcis2rwjkj2 URL - http://beta.quicklisp.org/archive/caveman/2017-06-30/caveman-20170630-git.tgz - MD5 774f85fa78792bde012bad78efff4b53 NAME caveman FILENAME caveman DEPS - ((NAME anaphora FILENAME anaphora) (NAME cl-emb FILENAME cl-emb) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-project FILENAME cl-project) - (NAME cl-syntax FILENAME cl-syntax) + 0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra URL + http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz + MD5 41318d26a0825e504042fa693959feaf NAME caveman FILENAME caveman DEPS + ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) + (NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME circular-streams FILENAME circular-streams) + (NAME cl-annot FILENAME cl-annot) + (NAME cl-ansi-text FILENAME cl-ansi-text) + (NAME cl-colors FILENAME cl-colors) (NAME cl-emb FILENAME cl-emb) + (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-project FILENAME cl-project) (NAME cl-syntax FILENAME cl-syntax) (NAME cl-syntax-annot FILENAME cl-syntax-annot) + (NAME cl-utilities FILENAME cl-utilities) (NAME clack-v1-compat FILENAME clack-v1-compat) - (NAME do-urlencode FILENAME do-urlencode) - (NAME local-time FILENAME local-time) (NAME myway FILENAME myway)) + (NAME dexador FILENAME dexador) (NAME do-urlencode FILENAME do-urlencode) + (NAME http-body FILENAME http-body) (NAME lack FILENAME lack) + (NAME let-plus FILENAME let-plus) (NAME local-time FILENAME local-time) + (NAME map-set FILENAME map-set) (NAME marshal FILENAME marshal) + (NAME myway FILENAME myway) + (NAME named-readtables FILENAME named-readtables) + (NAME prove FILENAME prove) (NAME quri FILENAME quri) + (NAME split-sequence FILENAME split-sequence) + (NAME trivial-backtrace FILENAME trivial-backtrace) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME trivial-types FILENAME trivial-types) + (NAME usocket FILENAME usocket)) DEPENDENCIES - (anaphora cl-emb cl-ppcre cl-project cl-syntax cl-syntax-annot - clack-v1-compat do-urlencode local-time myway) - VERSION 20170630-git SIBLINGS + (alexandria anaphora babel babel-streams bordeaux-threads circular-streams + cl-annot cl-ansi-text cl-colors cl-emb cl-fad cl-ppcre cl-project + cl-syntax cl-syntax-annot cl-utilities clack-v1-compat dexador + do-urlencode http-body lack let-plus local-time map-set marshal myway + named-readtables prove quri split-sequence trivial-backtrace + trivial-features trivial-gray-streams trivial-types usocket) + VERSION 20171019-git SIBLINGS (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test caveman2) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix index 6a4fd0defb99a..4a533220caf57 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''chunga''; - version = ''1.1.6''; + version = ''20180131-git''; description = ''''; deps = [ args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz''; - sha256 = ''1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg''; + url = ''http://beta.quicklisp.org/archive/chunga/2018-01-31/chunga-20180131-git.tgz''; + sha256 = ''0crlv6n6al7j9b40dpfjd13870ih5hzwra29xxfg3zg2zy2kdnrq''; }; packageName = "chunga"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM chunga DESCRIPTION NIL SHA256 - 1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg URL - http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz MD5 - 75f5c4f9dec3a8a181ed5ef7e5d700b5 NAME chunga FILENAME chunga DEPS + 0crlv6n6al7j9b40dpfjd13870ih5hzwra29xxfg3zg2zy2kdnrq URL + http://beta.quicklisp.org/archive/chunga/2018-01-31/chunga-20180131-git.tgz + MD5 044b684535b11b1eee1cf939bec6e14a NAME chunga FILENAME chunga DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES - (trivial-gray-streams) VERSION 1.1.6 SIBLINGS NIL PARASITES NIL) */ + (trivial-gray-streams) VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix index b25e131be5593..8d2254e4bdcb6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix @@ -5,7 +5,7 @@ rec { description = ''Circularly readable streams for Common Lisp''; - deps = [ args."alexandria" args."fast-io" args."static-vectors" args."trivial-gray-streams" ]; + deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz''; @@ -23,8 +23,13 @@ rec { http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz MD5 2383f3b82fa3335d9106e1354a678db8 NAME circular-streams FILENAME circular-streams DEPS - ((NAME alexandria FILENAME alexandria) (NAME fast-io FILENAME fast-io) + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME fast-io FILENAME fast-io) (NAME static-vectors FILENAME static-vectors) + (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (alexandria fast-io static-vectors trivial-gray-streams) + DEPENDENCIES + (alexandria babel cffi cffi-grovel fast-io static-vectors trivial-features + trivial-gray-streams) VERSION 20161204-git SIBLINGS (circular-streams-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix index 8a8a26a2e9bc7..0243709f3fe14 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl+ssl''; - version = ''cl+ssl-20170725-git''; + version = ''cl+ssl-20171227-git''; parasites = [ "openssl-1.1.0" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-07-25/cl+ssl-20170725-git.tgz''; - sha256 = ''1p5886l5bwz4bj2xy8mpsjswg103b8saqdnw050a4wk9shpj1j69''; + url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-12-27/cl+ssl-20171227-git.tgz''; + sha256 = ''1m6wcyccjyrz44mq0v1gvmpi44i9phknym5pimmicx3jvjyr37s4''; }; packageName = "cl+ssl"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 - 1p5886l5bwz4bj2xy8mpsjswg103b8saqdnw050a4wk9shpj1j69 URL - http://beta.quicklisp.org/archive/cl+ssl/2017-07-25/cl+ssl-20170725-git.tgz - MD5 3458c83f442395e0492c7e9b9720a1f2 NAME cl+ssl FILENAME cl+ssl DEPS + 1m6wcyccjyrz44mq0v1gvmpi44i9phknym5pimmicx3jvjyr37s4 URL + http://beta.quicklisp.org/archive/cl+ssl/2017-12-27/cl+ssl-20171227-git.tgz + MD5 d00ce843db6038e6ff33d19668b5e038 NAME cl+ssl FILENAME cl+ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams) @@ -33,5 +33,5 @@ rec { DEPENDENCIES (alexandria babel bordeaux-threads cffi flexi-streams trivial-features trivial-garbage trivial-gray-streams uiop) - VERSION cl+ssl-20170725-git SIBLINGS (cl+ssl.test) PARASITES + VERSION cl+ssl-20171227-git SIBLINGS (cl+ssl.test) PARASITES (openssl-1.1.0)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index 8a323e3dcc96b..9291be14e33ad 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async-repl''; - version = ''cl-async-20160825-git''; + version = ''cl-async-20171130-git''; description = ''REPL integration for CL-ASYNC.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; - sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; + url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz''; + sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm''; }; packageName = "cl-async-repl"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256 - 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL - http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz - MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-repl FILENAME + 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL + http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz + MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-repl FILENAME cl-async-repl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -38,5 +38,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cl-async cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams vom) - VERSION cl-async-20160825-git SIBLINGS + VERSION cl-async-20171130-git SIBLINGS (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index 7c040c7a4616f..4417d25be9f7e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async-ssl''; - version = ''cl-async-20160825-git''; + version = ''cl-async-20171130-git''; description = ''SSL Wrapper around cl-async socket implementation.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; - sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; + url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz''; + sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm''; }; packageName = "cl-async-ssl"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM cl-async-ssl DESCRIPTION SSL Wrapper around cl-async socket implementation. SHA256 - 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL - http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz - MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-ssl FILENAME + 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL + http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz + MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-ssl FILENAME cl-async-ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -39,5 +39,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cl-async cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams vom) - VERSION cl-async-20160825-git SIBLINGS + VERSION cl-async-20171130-git SIBLINGS (cl-async-repl cl-async-test cl-async) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index cc31b7a186f8c..6f62c9ff6b904 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async''; - version = ''20160825-git''; + version = ''20171130-git''; parasites = [ "cl-async-base" "cl-async-util" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; - sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; + url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz''; + sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm''; }; packageName = "cl-async"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256 - 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL - http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz - MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async FILENAME cl-async DEPS + 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL + http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz + MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async FILENAME cl-async DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -35,5 +35,5 @@ rec { DEPENDENCIES (alexandria babel bordeaux-threads cffi cffi-grovel cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop vom) - VERSION 20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) + VERSION 20171130-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) PARASITES (cl-async-base cl-async-util)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix index 3e1ef10ef9932..82571660280ad 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-csv''; - version = ''20170403-git''; + version = ''20180131-git''; - parasites = [ "cl-csv-test" ]; + parasites = [ "cl-csv/test" ]; description = ''Facilities for reading and writing CSV format files''; deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz''; - sha256 = ''1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h''; + url = ''http://beta.quicklisp.org/archive/cl-csv/2018-01-31/cl-csv-20180131-git.tgz''; + sha256 = ''0i912ch1mvms5iynmxrlxclzc325n3zsn3y9qdszh5lhpmw043wh''; }; packageName = "cl-csv"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM cl-csv DESCRIPTION Facilities for reading and writing CSV format files SHA256 - 1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h URL - http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz - MD5 1e71a90c5057371fab044d440c39f0a3 NAME cl-csv FILENAME cl-csv DEPS + 0i912ch1mvms5iynmxrlxclzc325n3zsn3y9qdszh5lhpmw043wh URL + http://beta.quicklisp.org/archive/cl-csv/2018-01-31/cl-csv-20180131-git.tgz + MD5 0be8956ee31e03436f8a2190387bad46 NAME cl-csv FILENAME cl-csv DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate lisp-unit2) - VERSION 20170403-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES - (cl-csv-test)) */ + VERSION 20180131-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES + (cl-csv/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index 4273869e62a4a..d485d276bab72 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-dbi''; - version = ''20170725-git''; + version = ''20180131-git''; description = ''''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; - sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; + sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; }; packageName = "cl-dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 - 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL - http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz - MD5 a9fe67b7fea2640cea9708342a1347bd NAME cl-dbi FILENAME cl-dbi DEPS + 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL + http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz + MD5 7dacf1c276fab38b952813795ff1f707 NAME cl-dbi FILENAME cl-dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop dbi named-readtables split-sequence trivial-types) - VERSION 20170725-git SIBLINGS + VERSION 20180131-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix index 25ad098f267f0..0bc8488b2a8cb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-fad''; - version = ''0.7.4''; + version = ''20171227-git''; parasites = [ "cl-fad-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."unit-test" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz''; - sha256 = ''1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x''; + url = ''http://beta.quicklisp.org/archive/cl-fad/2017-12-27/cl-fad-20171227-git.tgz''; + sha256 = ''0dl2c1klv55vk99j1b31f2s1rd1m9c94l1n0aly8spwxz3yd3za8''; }; packageName = "cl-fad"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256 - 1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x URL - http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz MD5 - 8ee53f2249eca9d7d54e268662b41845 NAME cl-fad FILENAME cl-fad DEPS + 0dl2c1klv55vk99j1b31f2s1rd1m9c94l1n0aly8spwxz3yd3za8 URL + http://beta.quicklisp.org/archive/cl-fad/2017-12-27/cl-fad-20171227-git.tgz + MD5 f6b34f61ebba1c68e8fe122bb7de3f77 NAME cl-fad FILENAME cl-fad DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-ppcre FILENAME cl-ppcre) (NAME unit-test FILENAME unit-test)) - DEPENDENCIES (alexandria bordeaux-threads cl-ppcre unit-test) VERSION 0.7.4 - SIBLINGS NIL PARASITES (cl-fad-test)) */ + DEPENDENCIES (alexandria bordeaux-threads cl-ppcre unit-test) VERSION + 20171227-git SIBLINGS NIL PARASITES (cl-fad-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix new file mode 100644 index 0000000000000..61a35f2b58c63 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-html-parse''; + version = ''20161031-git''; + + description = ''HTML Parser''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-html-parse/2016-10-31/cl-html-parse-20161031-git.tgz''; + sha256 = ''0i0nl630p9l6rqylydhfqrlqhl5sfq94a9wglx0dajk8gkkqjbnb''; + }; + + packageName = "cl-html-parse"; + + asdFilesToKeep = ["cl-html-parse.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-html-parse DESCRIPTION HTML Parser SHA256 + 0i0nl630p9l6rqylydhfqrlqhl5sfq94a9wglx0dajk8gkkqjbnb URL + http://beta.quicklisp.org/archive/cl-html-parse/2016-10-31/cl-html-parse-20161031-git.tgz + MD5 7fe933c461eaf2dd442da189d6827a72 NAME cl-html-parse FILENAME + cl-html-parse DEPS NIL DEPENDENCIES NIL VERSION 20161031-git SIBLINGS NIL + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix index 97c948507c498..d4ce8531291ef 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-interpol''; - version = ''0.2.6''; + version = ''20171227-git''; parasites = [ "cl-interpol-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz''; - sha256 = ''172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b''; + url = ''http://beta.quicklisp.org/archive/cl-interpol/2017-12-27/cl-interpol-20171227-git.tgz''; + sha256 = ''1m4vxw8hskgqi0mnkm7qknwbnri2m69ab7qyd4kbpm2igsi02kzy''; }; packageName = "cl-interpol"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-interpol DESCRIPTION NIL SHA256 - 172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b URL - http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz - MD5 1adc92924670601ebb92546ef8bdc6a7 NAME cl-interpol FILENAME cl-interpol + 1m4vxw8hskgqi0mnkm7qknwbnri2m69ab7qyd4kbpm2igsi02kzy URL + http://beta.quicklisp.org/archive/cl-interpol/2017-12-27/cl-interpol-20171227-git.tgz + MD5 e9d2f0238bb8f7a0c5b1ef1e6ef390ae NAME cl-interpol FILENAME cl-interpol DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode) (NAME flexi-streams FILENAME flexi-streams)) - DEPENDENCIES (cl-ppcre cl-unicode flexi-streams) VERSION 0.2.6 SIBLINGS NIL - PARASITES (cl-interpol-test)) */ + DEPENDENCIES (cl-ppcre cl-unicode flexi-streams) VERSION 20171227-git + SIBLINGS NIL PARASITES (cl-interpol-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix index fa4e18cdbfe9d..1590f2536e341 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-mysql''; - version = ''20160628-git''; + version = ''20171019-git''; description = ''Common Lisp MySQL library bindings''; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz''; - sha256 = ''1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319''; + url = ''http://beta.quicklisp.org/archive/cl-mysql/2017-10-19/cl-mysql-20171019-git.tgz''; + sha256 = ''1ga44gkwg6lm225gqpacpqpr6bpswszmw1ba9jhvjpjm09zinyc5''; }; packageName = "cl-mysql"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-mysql DESCRIPTION Common Lisp MySQL library bindings SHA256 - 1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319 URL - http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz - MD5 349615d041c2f2177b678088f9c22409 NAME cl-mysql FILENAME cl-mysql DEPS + 1ga44gkwg6lm225gqpacpqpr6bpswszmw1ba9jhvjpjm09zinyc5 URL + http://beta.quicklisp.org/archive/cl-mysql/2017-10-19/cl-mysql-20171019-git.tgz + MD5 e1021da4d35cbb584d4df4f0d7e2bbb9 NAME cl-mysql FILENAME cl-mysql DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION 20160628-git + DEPENDENCIES (alexandria babel cffi trivial-features) VERSION 20171019-git SIBLINGS (cl-mysql-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 485a2c3de22f7..721dbf61aa922 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-postgres''; - version = ''postmodern-20170403-git''; + version = ''postmodern-20180131-git''; - parasites = [ "cl-postgres-tests" ]; + parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; description = ''Low-level client library for PostgreSQL''; - deps = [ args."fiveam" args."md5" ]; + deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; - sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz''; + sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki''; }; packageName = "cl-postgres"; @@ -20,9 +20,14 @@ rec { overrides = x: x; } /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL - SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL - http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz - MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME cl-postgres FILENAME cl-postgres - DEPS ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5)) DEPENDENCIES - (fiveam md5) VERSION postmodern-20170403-git SIBLINGS - (postmodern s-sql simple-date) PARASITES (cl-postgres-tests)) */ + SHA256 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL + http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz + MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME cl-postgres FILENAME cl-postgres + DEPS + ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) + (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) + (NAME split-sequence FILENAME split-sequence) + (NAME usocket FILENAME usocket)) + DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket) + VERSION postmodern-20180131-git SIBLINGS (postmodern s-sql simple-date) + PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix index 92ede6007ef94..d2b3de9cae181 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre-template''; - version = ''cl-unification-20170630-git''; + version = ''cl-unification-20171227-git''; description = ''A system used to conditionally load the CL-PPCRE Template. @@ -12,8 +12,8 @@ REGULAR-EXPRESSION-TEMPLATE.''; deps = [ args."cl-ppcre" args."cl-unification" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz''; - sha256 = ''063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz''; + url = ''http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz''; + sha256 = ''0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p''; }; packageName = "cl-ppcre-template"; @@ -27,12 +27,12 @@ REGULAR-EXPRESSION-TEMPLATE.''; This system is not required and it is handled only if CL-PPCRE is available. If it is, then the library provides the REGULAR-EXPRESSION-TEMPLATE. - SHA256 063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz URL - http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz - MD5 f6bf197ca8c79c935efe3a3c25953044 NAME cl-ppcre-template FILENAME + SHA256 0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p URL + http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz + MD5 45bfd18f8e15d16222e0f747992a6ce6 NAME cl-ppcre-template FILENAME cl-ppcre-template DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unification FILENAME cl-unification)) - DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20170630-git + DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20171227-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix index 5f2b2e37e30d2..7853d5a279a2c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre-unicode''; - version = ''cl-ppcre-2.0.11''; + version = ''cl-ppcre-20171227-git''; parasites = [ "cl-ppcre-unicode-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz''; - sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2''; + url = ''http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz''; + sha256 = ''0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4''; }; packageName = "cl-ppcre-unicode"; @@ -21,13 +21,13 @@ rec { } /* (SYSTEM cl-ppcre-unicode DESCRIPTION Perl-compatible regular expression library (Unicode) SHA256 - 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL - http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz - MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre-unicode FILENAME + 0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4 URL + http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz + MD5 9d8ce62ef1a71a5e1e144a31be698d8c NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-ppcre-test FILENAME cl-ppcre-test) (NAME cl-unicode FILENAME cl-unicode) (NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (cl-ppcre cl-ppcre-test cl-unicode flexi-streams) VERSION - cl-ppcre-2.0.11 SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */ + cl-ppcre-20171227-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix index 74d74a9b114c4..cbdf3a471461b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre''; - version = ''2.0.11''; + version = ''20171227-git''; parasites = [ "cl-ppcre-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz''; - sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2''; + url = ''http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz''; + sha256 = ''0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4''; }; packageName = "cl-ppcre"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-ppcre DESCRIPTION Perl-compatible regular expression library - SHA256 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL - http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz - MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre FILENAME cl-ppcre DEPS + SHA256 0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4 URL + http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz + MD5 9d8ce62ef1a71a5e1e144a31be698d8c NAME cl-ppcre FILENAME cl-ppcre DEPS ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams) - VERSION 2.0.11 SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */ + VERSION 20171227-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix index bfaaabfbc2d7b..658ffdb51b82c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-project''; - version = ''20160531-git''; + version = ''20171019-git''; description = ''Generate a skeleton for modern project''; deps = [ args."alexandria" args."anaphora" args."bordeaux-threads" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz''; - sha256 = ''1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81''; + url = ''http://beta.quicklisp.org/archive/cl-project/2017-10-19/cl-project-20171019-git.tgz''; + sha256 = ''1phgpik46dvqxnd49kccy4fh653659qd86hv7km50m07nzm8fn7q''; }; packageName = "cl-project"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256 - 1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81 URL - http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz - MD5 63de5ce6f0f3e5f60094a86d32c2f1a9 NAME cl-project FILENAME cl-project + 1phgpik46dvqxnd49kccy4fh653659qd86hv7km50m07nzm8fn7q URL + http://beta.quicklisp.org/archive/cl-project/2017-10-19/cl-project-20171019-git.tgz + MD5 9dbfd7f9b0a83ca608031ebf32185a0f NAME cl-project FILENAME cl-project DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -32,4 +32,4 @@ rec { DEPENDENCIES (alexandria anaphora bordeaux-threads cl-ansi-text cl-colors cl-emb cl-fad cl-ppcre let-plus local-time prove uiop) - VERSION 20160531-git SIBLINGS (cl-project-test) PARASITES NIL) */ + VERSION 20171019-git SIBLINGS (cl-project-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix index 9cb69caaafd52..572e3eb4cb38e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-smtp''; - version = ''20160825-git''; + version = ''20180131-git''; description = ''Common Lisp smtp client.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl+ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz''; - sha256 = ''0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh''; + url = ''http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz''; + sha256 = ''0sjjynnynxmfxdfpvzl3jj1jz0dhj0bx4bv63q1icm2p9xzfzb61''; }; packageName = "cl-smtp"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256 - 0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh URL - http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz - MD5 e6bb60e66b0f7d9cc5e4f98aba56998a NAME cl-smtp FILENAME cl-smtp DEPS + 0sjjynnynxmfxdfpvzl3jj1jz0dhj0bx4bv63q1icm2p9xzfzb61 URL + http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz + MD5 0ce08f067f145ab4c7528f806f0b51ff NAME cl-smtp FILENAME cl-smtp DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl+ssl) @@ -35,4 +35,4 @@ rec { (alexandria babel bordeaux-threads cffi cl+ssl cl-base64 flexi-streams split-sequence trivial-features trivial-garbage trivial-gray-streams usocket) - VERSION 20160825-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix index 7425b7ce0a816..968f2972abfcb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-test-more''; - version = ''prove-20170403-git''; + version = ''prove-20171130-git''; description = ''''; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."prove" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz''; - sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl''; + url = ''http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz''; + sha256 = ''13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar''; }; packageName = "cl-test-more"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-test-more DESCRIPTION NIL SHA256 - 091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL - http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz - MD5 063b615692c8711d2392204ecf1b37b7 NAME cl-test-more FILENAME + 13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL + http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz + MD5 630df4367537f799570be40242f8ed52 NAME cl-test-more FILENAME cl-test-more DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME cl-ansi-text FILENAME cl-ansi-text) @@ -28,5 +28,5 @@ rec { (NAME let-plus FILENAME let-plus) (NAME prove FILENAME prove)) DEPENDENCIES (alexandria anaphora cl-ansi-text cl-colors cl-ppcre let-plus prove) - VERSION prove-20170403-git SIBLINGS (prove-asdf prove-test prove) PARASITES + VERSION prove-20171130-git SIBLINGS (prove-asdf prove-test prove) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix index e35645f6e98e8..25dfbbcae5f78 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-unicode''; - version = ''0.1.5''; + version = ''20180131-git''; parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-ppcre" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz''; - sha256 = ''1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n''; + url = ''http://beta.quicklisp.org/archive/cl-unicode/2018-01-31/cl-unicode-20180131-git.tgz''; + sha256 = ''113hsx22pw4ydwzkyr9y7l8a8jq3nkhwazs03wj3mh2dczwv28xa''; }; packageName = "cl-unicode"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256 - 1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n URL - http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz - MD5 2fd456537bd670126da84466226bc5c5 NAME cl-unicode FILENAME cl-unicode + 113hsx22pw4ydwzkyr9y7l8a8jq3nkhwazs03wj3mh2dczwv28xa URL + http://beta.quicklisp.org/archive/cl-unicode/2018-01-31/cl-unicode-20180131-git.tgz + MD5 653ba12d595599b32aa2a8c7c8b65c28 NAME cl-unicode FILENAME cl-unicode DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams)) - DEPENDENCIES (cl-ppcre flexi-streams) VERSION 0.1.5 SIBLINGS NIL PARASITES - (cl-unicode/base cl-unicode/build cl-unicode/test)) */ + DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20180131-git SIBLINGS NIL + PARASITES (cl-unicode/base cl-unicode/build cl-unicode/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index 39f3fccb7a7e3..6d284b7b01208 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-unification''; - version = ''20170630-git''; + version = ''20171227-git''; description = ''The CL-UNIFICATION system. @@ -10,8 +10,8 @@ The system contains the definitions for the 'unification' machinery.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz''; - sha256 = ''063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz''; + url = ''http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz''; + sha256 = ''0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p''; }; packageName = "cl-unification"; @@ -22,8 +22,8 @@ The system contains the definitions for the 'unification' machinery.''; /* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system. The system contains the definitions for the 'unification' machinery. - SHA256 063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz URL - http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz - MD5 f6bf197ca8c79c935efe3a3c25953044 NAME cl-unification FILENAME - cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS + SHA256 0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p URL + http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz + MD5 45bfd18f8e15d16222e0f747992a6ce6 NAME cl-unification FILENAME + cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20171227-git SIBLINGS (cl-unification-lib cl-unification-test cl-ppcre-template) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix index 32304139c5150..575e05aa074d2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-who''; - version = ''1.1.4''; + version = ''20171130-git''; parasites = [ "cl-who-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz''; - sha256 = ''0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq''; + url = ''http://beta.quicklisp.org/archive/cl-who/2017-11-30/cl-who-20171130-git.tgz''; + sha256 = ''1941kwnvqnqr81vjkv8fcpc16abz7hrrmz18xwxxprsi6wifzjzw''; }; packageName = "cl-who"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-who DESCRIPTION (X)HTML generation macros SHA256 - 0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq URL - http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz MD5 - a9e6f0b6a8aaa247dbf751de2cb550bf NAME cl-who FILENAME cl-who DEPS + 1941kwnvqnqr81vjkv8fcpc16abz7hrrmz18xwxxprsi6wifzjzw URL + http://beta.quicklisp.org/archive/cl-who/2017-11-30/cl-who-20171130-git.tgz + MD5 257a670166ff9d24d1570f44be0c7171 NAME cl-who FILENAME cl-who DEPS ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams) - VERSION 1.1.4 SIBLINGS NIL PARASITES (cl-who-test)) */ + VERSION 20171130-git SIBLINGS NIL PARASITES (cl-who-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index 3c15d7cf75392..3ecc0e1014987 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''closer-mop''; - version = ''20170725-git''; + version = ''20180131-git''; description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closer-mop/2017-07-25/closer-mop-20170725-git.tgz''; - sha256 = ''0qc4zh4zicv3zm4bw8c3s2r2bjbx2bp31j69lwiz1mdl9xg0nhsc''; + url = ''http://beta.quicklisp.org/archive/closer-mop/2018-01-31/closer-mop-20180131-git.tgz''; + sha256 = ''0lsfpxppbd8j4ayfrhd723ck367yb4amdywwaqj9yivh00zn4r6s''; }; packageName = "closer-mop"; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM closer-mop DESCRIPTION Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations. - SHA256 0qc4zh4zicv3zm4bw8c3s2r2bjbx2bp31j69lwiz1mdl9xg0nhsc URL - http://beta.quicklisp.org/archive/closer-mop/2017-07-25/closer-mop-20170725-git.tgz - MD5 308f9e8e4ea4573c7b6820055b6f171d NAME closer-mop FILENAME closer-mop - DEPS NIL DEPENDENCIES NIL VERSION 20170725-git SIBLINGS NIL PARASITES NIL) */ + SHA256 0lsfpxppbd8j4ayfrhd723ck367yb4amdywwaqj9yivh00zn4r6s URL + http://beta.quicklisp.org/archive/closer-mop/2018-01-31/closer-mop-20180131-git.tgz + MD5 d572109e102869d89f206a46619c2ed0 NAME closer-mop FILENAME closer-mop + DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix new file mode 100644 index 0000000000000..29c90369244a1 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''closure-html''; + version = ''20140826-git''; + + description = ''''; + + deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/closure-html/2014-08-26/closure-html-20140826-git.tgz''; + sha256 = ''1m07iv9r5ykj52fszwhwai5wv39mczk3m4zzh24gjhsprv35x8qb''; + }; + + packageName = "closure-html"; + + asdFilesToKeep = ["closure-html.asd"]; + overrides = x: x; +} +/* (SYSTEM closure-html DESCRIPTION NIL SHA256 + 1m07iv9r5ykj52fszwhwai5wv39mczk3m4zzh24gjhsprv35x8qb URL + http://beta.quicklisp.org/archive/closure-html/2014-08-26/closure-html-20140826-git.tgz + MD5 3f8d8a4fd54f915ca6cc5fdf29239d98 NAME closure-html FILENAME + closure-html DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME closure-common FILENAME closure-common) + (NAME flexi-streams FILENAME flexi-streams) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES + (alexandria babel closure-common flexi-streams trivial-features + trivial-gray-streams) + VERSION 20140826-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix index 11e723e0029c9..76f50463a6ae4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clss''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A DOM tree searching engine based on CSS selectors.''; - deps = [ args."array-utils" args."plump" ]; + deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clss/2017-06-30/clss-20170630-git.tgz''; - sha256 = ''0kdkzx7z997lzbf331p4fkqhri0ind7agknl9y992x917m9y4rn0''; + url = ''http://beta.quicklisp.org/archive/clss/2018-01-31/clss-20180131-git.tgz''; + sha256 = ''0d4sblafhm5syjkv89h45i98dykpznb0ga3q9a2cxlvl98yklg8r''; }; packageName = "clss"; @@ -18,9 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. - SHA256 0kdkzx7z997lzbf331p4fkqhri0ind7agknl9y992x917m9y4rn0 URL - http://beta.quicklisp.org/archive/clss/2017-06-30/clss-20170630-git.tgz MD5 - 61bbadf22391940813bfc66dfd59d304 NAME clss FILENAME clss DEPS - ((NAME array-utils FILENAME array-utils) (NAME plump FILENAME plump)) - DEPENDENCIES (array-utils plump) VERSION 20170630-git SIBLINGS NIL - PARASITES NIL) */ + SHA256 0d4sblafhm5syjkv89h45i98dykpznb0ga3q9a2cxlvl98yklg8r URL + http://beta.quicklisp.org/archive/clss/2018-01-31/clss-20180131-git.tgz MD5 + 138244b7871d8ea832832aa9cc5867e6 NAME clss FILENAME clss DEPS + ((NAME array-utils FILENAME array-utils) + (NAME documentation-utils FILENAME documentation-utils) + (NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES (array-utils documentation-utils plump trivial-indent) VERSION + 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index 2d802d3e48809..2a7ec984e7fbd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,15 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''clx''; - version = ''20170630-git''; + version = ''20171227-git''; + + parasites = [ "clx/test" ]; description = ''An implementation of the X Window System protocol in Lisp.''; - deps = [ ]; + deps = [ args."fiasco" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx/2017-06-30/clx-20170630-git.tgz''; - sha256 = ''0di8h3galjylgmy30qqwa4q8mb5505rcag0y4ia7mv7sls51jbp7''; + url = ''http://beta.quicklisp.org/archive/clx/2017-12-27/clx-20171227-git.tgz''; + sha256 = ''159kwwilyvaffjdz7sbwwd4cncfa8kxndc7n3adml9ivbvaz2wri''; }; packageName = "clx"; @@ -19,7 +21,8 @@ rec { } /* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 - 0di8h3galjylgmy30qqwa4q8mb5505rcag0y4ia7mv7sls51jbp7 URL - http://beta.quicklisp.org/archive/clx/2017-06-30/clx-20170630-git.tgz MD5 - ccfec3f35979df3bead0b73adc1d798a NAME clx FILENAME clx DEPS NIL - DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */ + 159kwwilyvaffjdz7sbwwd4cncfa8kxndc7n3adml9ivbvaz2wri URL + http://beta.quicklisp.org/archive/clx/2017-12-27/clx-20171227-git.tgz MD5 + 40642f49e26b88859376efe2e5330a24 NAME clx FILENAME clx DEPS + ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20171227-git + SIBLINGS NIL PARASITES (clx/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 80a936560d15b..52444db0e7988 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-mysql''; - version = ''cl-dbi-20170725-git''; + version = ''cl-dbi-20180131-git''; description = ''Database driver for MySQL.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; - sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; + sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; }; packageName = "dbd-mysql"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 - 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL - http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz - MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-mysql FILENAME dbd-mysql DEPS + 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL + http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz + MD5 7dacf1c276fab38b952813795ff1f707 NAME dbd-mysql FILENAME dbd-mysql DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot) @@ -35,5 +35,5 @@ rec { (alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax cl-syntax-annot closer-mop dbi named-readtables split-sequence trivial-features trivial-types) - VERSION cl-dbi-20170725-git SIBLINGS + VERSION cl-dbi-20180131-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index 1f7a784a5e6f7..4dc4683ff9a07 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-postgres''; - version = ''cl-dbi-20170725-git''; + version = ''cl-dbi-20180131-git''; description = ''Database driver for PostgreSQL.''; - deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; - sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; + sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; }; packageName = "dbd-postgres"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 - 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL - http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz - MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-postgres FILENAME + 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL + http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz + MD5 7dacf1c276fab38b952813795ff1f707 NAME dbd-postgres FILENAME dbd-postgres DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -31,10 +31,11 @@ rec { (NAME md5 FILENAME md5) (NAME named-readtables FILENAME named-readtables) (NAME split-sequence FILENAME split-sequence) (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-types FILENAME trivial-types)) + (NAME trivial-types FILENAME trivial-types) + (NAME usocket FILENAME usocket)) DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot closer-mop dbi md5 named-readtables split-sequence trivial-garbage - trivial-types) - VERSION cl-dbi-20170725-git SIBLINGS + trivial-types usocket) + VERSION cl-dbi-20180131-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index 1300aa476341d..cce90acfdf9c6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-sqlite3''; - version = ''cl-dbi-20170725-git''; + version = ''cl-dbi-20180131-git''; description = ''Database driver for SQLite3.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-types" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; - sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; + sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; }; packageName = "dbd-sqlite3"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 - 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL - http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz - MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-sqlite3 FILENAME dbd-sqlite3 + 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL + http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz + MD5 7dacf1c276fab38b952813795ff1f707 NAME dbd-sqlite3 FILENAME dbd-sqlite3 DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -38,5 +38,5 @@ rec { (alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot closer-mop dbi iterate named-readtables split-sequence sqlite trivial-features trivial-types uiop) - VERSION cl-dbi-20170725-git SIBLINGS + VERSION cl-dbi-20180131-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix index 6e7611fd97482..31a48ea807b42 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbi''; - version = ''cl-20170725-git''; + version = ''cl-20180131-git''; description = ''Database independent interface for Common Lisp''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz''; - sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; + sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; }; packageName = "dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp - SHA256 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL - http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz - MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbi FILENAME dbi DEPS + SHA256 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL + http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz + MD5 7dacf1c276fab38b952813795ff1f707 NAME dbi FILENAME dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop named-readtables split-sequence trivial-types) - VERSION cl-20170725-git SIBLINGS + VERSION cl-20180131-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index 047cd3c0ffa01..d6885fc58d8c6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dexador''; - version = ''20170725-git''; + version = ''20171130-git''; description = ''Yet another HTTP client for Common Lisp''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dexador/2017-07-25/dexador-20170725-git.tgz''; - sha256 = ''1x5jw07ydvc7rdw4jyzf3zb2dg2mspbkp9ysjaqpxlvkpdmqdmyl''; + url = ''http://beta.quicklisp.org/archive/dexador/2017-11-30/dexador-20171130-git.tgz''; + sha256 = ''0qg8jxij1s5j7jm2hxick9bvgc5nvq7fjalaah0rarynq70z61bd''; }; packageName = "dexador"; @@ -18,16 +18,16 @@ rec { overrides = x: x; } /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 - 1x5jw07ydvc7rdw4jyzf3zb2dg2mspbkp9ysjaqpxlvkpdmqdmyl URL - http://beta.quicklisp.org/archive/dexador/2017-07-25/dexador-20170725-git.tgz - MD5 1ab5cda1ba8d5c81859349e6a5b99b29 NAME dexador FILENAME dexador DEPS + 0qg8jxij1s5j7jm2hxick9bvgc5nvq7fjalaah0rarynq70z61bd URL + http://beta.quicklisp.org/archive/dexador/2017-11-30/dexador-20171130-git.tgz + MD5 e1b5154f2169708e2f351707a2bc135f NAME dexador FILENAME dexador DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) - (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) - (NAME cl-base64 FILENAME cl-base64) (NAME cl-cookie FILENAME cl-cookie) - (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-reexport FILENAME cl-reexport) + (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME chipz FILENAME chipz) (NAME chunga FILENAME chunga) + (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) + (NAME cl-cookie FILENAME cl-cookie) (NAME cl-fad FILENAME cl-fad) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport) (NAME cl-utilities FILENAME cl-utilities) (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) (NAME flexi-streams FILENAME flexi-streams) @@ -42,9 +42,9 @@ rec { (NAME trivial-mimes FILENAME trivial-mimes) (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (alexandria babel bordeaux-threads cffi chipz chunga cl+ssl cl-base64 - cl-cookie cl-fad cl-ppcre cl-reexport cl-utilities fast-http fast-io - flexi-streams local-time proc-parse quri smart-buffer split-sequence - static-vectors trivial-features trivial-garbage trivial-gray-streams - trivial-mimes usocket xsubseq) - VERSION 20170725-git SIBLINGS (dexador-test) PARASITES NIL) */ + (alexandria babel bordeaux-threads cffi cffi-grovel chipz chunga cl+ssl + cl-base64 cl-cookie cl-fad cl-ppcre cl-reexport cl-utilities fast-http + fast-io flexi-streams local-time proc-parse quri smart-buffer + split-sequence static-vectors trivial-features trivial-garbage + trivial-gray-streams trivial-mimes usocket xsubseq) + VERSION 20171130-git SIBLINGS (dexador-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix index 08521a07d740b..95d335493b7d3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''do-urlencode''; - version = ''20130720-git''; + version = ''20170830-git''; description = ''Percent Encoding (aka URL Encoding) library''; deps = [ args."alexandria" args."babel" args."babel-streams" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz''; - sha256 = ''19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa''; + url = ''http://beta.quicklisp.org/archive/do-urlencode/2017-08-30/do-urlencode-20170830-git.tgz''; + sha256 = ''1584prmmz601fp396qxrivylb7nrnclg9rnwrsnwiij79v6zz40n''; }; packageName = "do-urlencode"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM do-urlencode DESCRIPTION Percent Encoding (aka URL Encoding) library - SHA256 19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa URL - http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz - MD5 c8085e138711c225042acf83b4bf0507 NAME do-urlencode FILENAME + SHA256 1584prmmz601fp396qxrivylb7nrnclg9rnwrsnwiij79v6zz40n URL + http://beta.quicklisp.org/archive/do-urlencode/2017-08-30/do-urlencode-20170830-git.tgz + MD5 071a18bb58ed5c7d5184b34e672b5d91 NAME do-urlencode FILENAME do-urlencode DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams) @@ -28,4 +28,4 @@ rec { (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria babel babel-streams trivial-features trivial-gray-streams) - VERSION 20130720-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20170830-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix index 52c95b260e644..0c3470d755cfe 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''documentation-utils''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A few simple tools to help you with documenting your library.''; deps = [ args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/documentation-utils/2017-06-30/documentation-utils-20170630-git.tgz''; - sha256 = ''0iz3r5llv0rv8l37fdcjrx9zibbaqf9nd6xhy5n2hf024997bbks''; + url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-01-31/documentation-utils-20180131-git.tgz''; + sha256 = ''0kyxjcl7dvylymzvmrn90kdwaxgrzyzpi1mqpirsr3yyb8h71avm''; }; packageName = "documentation-utils"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256 - 0iz3r5llv0rv8l37fdcjrx9zibbaqf9nd6xhy5n2hf024997bbks URL - http://beta.quicklisp.org/archive/documentation-utils/2017-06-30/documentation-utils-20170630-git.tgz - MD5 7c0541d4207ba221a251c8c3ec7a8cac NAME documentation-utils FILENAME + 0kyxjcl7dvylymzvmrn90kdwaxgrzyzpi1mqpirsr3yyb8h71avm URL + http://beta.quicklisp.org/archive/documentation-utils/2018-01-31/documentation-utils-20180131-git.tgz + MD5 375dbb8ce48543fce1526eeea8d2a976 NAME documentation-utils FILENAME documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (trivial-indent) VERSION 20170630-git SIBLINGS NIL PARASITES + DEPENDENCIES (trivial-indent) VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index aac0560e6772f..44ce34a2cb336 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''drakma''; - version = ''v2.0.3''; + version = ''v2.0.4''; description = ''Full-featured http/https client based on usocket''; - deps = [ args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."usocket" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/drakma/2017-06-30/drakma-v2.0.3.tgz''; - sha256 = ''1xbbwd2gg17pq03bblj6imh7lq39z2w3yix6fm25509gyhs76ymd''; + url = ''http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz''; + sha256 = ''0i0dmw1b245yc0f8f8ww8cnhsji7vsnr7868p62c953ccwlcj5ga''; }; packageName = "drakma"; @@ -18,14 +18,22 @@ rec { overrides = x: x; } /* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket - SHA256 1xbbwd2gg17pq03bblj6imh7lq39z2w3yix6fm25509gyhs76ymd URL - http://beta.quicklisp.org/archive/drakma/2017-06-30/drakma-v2.0.3.tgz MD5 - 3578c67b445cf982414ff78b2fb8d295 NAME drakma FILENAME drakma DEPS - ((NAME chipz FILENAME chipz) (NAME chunga FILENAME chunga) - (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) - (NAME cl-ppcre FILENAME cl-ppcre) + SHA256 0i0dmw1b245yc0f8f8ww8cnhsji7vsnr7868p62c953ccwlcj5ga URL + http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz MD5 + 1c668721156beadeca4f6536677e143e NAME drakma FILENAME drakma DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) + (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) + (NAME cl-base64 FILENAME cl-base64) (NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams) (NAME puri FILENAME puri) + (NAME split-sequence FILENAME split-sequence) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME usocket FILENAME usocket)) DEPENDENCIES - (chipz chunga cl+ssl cl-base64 cl-ppcre flexi-streams puri usocket) VERSION - v2.0.3 SIBLINGS (drakma-test) PARASITES NIL) */ + (alexandria babel bordeaux-threads cffi chipz chunga cl+ssl cl-base64 + cl-ppcre flexi-streams puri split-sequence trivial-features + trivial-garbage trivial-gray-streams usocket) + VERSION v2.0.4 SIBLINGS (drakma-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index 2ef373aed8afe..b9f17a5d241fc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''esrap''; - version = ''20170630-git''; + version = ''20180131-git''; parasites = [ "esrap/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap/2017-06-30/esrap-20170630-git.tgz''; - sha256 = ''172ph55kb3yr0gciybza1rbi6khlnz4vriijvcjkn6m79kdnk1xh''; + url = ''http://beta.quicklisp.org/archive/esrap/2018-01-31/esrap-20180131-git.tgz''; + sha256 = ''1kgr77w1ya125c04h6szxhzkxnq578rdf8f399wadqkav6x9dpkc''; }; packageName = "esrap"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 - 172ph55kb3yr0gciybza1rbi6khlnz4vriijvcjkn6m79kdnk1xh URL - http://beta.quicklisp.org/archive/esrap/2017-06-30/esrap-20170630-git.tgz - MD5 bfabfebc5f5d49106df318ae2798ac45 NAME esrap FILENAME esrap DEPS + 1kgr77w1ya125c04h6szxhzkxnq578rdf8f399wadqkav6x9dpkc URL + http://beta.quicklisp.org/archive/esrap/2018-01-31/esrap-20180131-git.tgz + MD5 89b22e10575198b9f680e0c4e90bec2c NAME esrap FILENAME esrap DEPS ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria fiveam) VERSION 20170630-git SIBLINGS NIL + DEPENDENCIES (alexandria fiveam) VERSION 20180131-git SIBLINGS NIL PARASITES (esrap/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix index e890f4e81ffed..99792023bdd00 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''fast-http''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A fast HTTP protocol parser in Common Lisp''; - deps = [ args."alexandria" args."babel" args."cl-utilities" args."proc-parse" args."smart-buffer" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."cl-utilities" args."flexi-streams" args."proc-parse" args."smart-buffer" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-http/2017-06-30/fast-http-20170630-git.tgz''; - sha256 = ''0fkqwbwqc9a783ynjbszimcrannpqq4ja6wcf8ybgizr4zvsgj29''; + url = ''http://beta.quicklisp.org/archive/fast-http/2018-01-31/fast-http-20180131-git.tgz''; + sha256 = ''057wg23a1pfdr3522nzjpclxdrmx3azbnw57nkvdjmfp6fyb3rpg''; }; packageName = "fast-http"; @@ -18,13 +18,18 @@ rec { overrides = x: x; } /* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp - SHA256 0fkqwbwqc9a783ynjbszimcrannpqq4ja6wcf8ybgizr4zvsgj29 URL - http://beta.quicklisp.org/archive/fast-http/2017-06-30/fast-http-20170630-git.tgz - MD5 d117d59c1f71965e0c32b19e6790cf9a NAME fast-http FILENAME fast-http DEPS + SHA256 057wg23a1pfdr3522nzjpclxdrmx3azbnw57nkvdjmfp6fyb3rpg URL + http://beta.quicklisp.org/archive/fast-http/2018-01-31/fast-http-20180131-git.tgz + MD5 0722e935fb644d57d44e8604e41e689e NAME fast-http FILENAME fast-http DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-utilities FILENAME cl-utilities) + (NAME flexi-streams FILENAME flexi-streams) (NAME proc-parse FILENAME proc-parse) - (NAME smart-buffer FILENAME smart-buffer) (NAME xsubseq FILENAME xsubseq)) + (NAME smart-buffer FILENAME smart-buffer) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (alexandria babel cl-utilities proc-parse smart-buffer xsubseq) VERSION - 20170630-git SIBLINGS (fast-http-test) PARASITES NIL) */ + (alexandria babel cl-utilities flexi-streams proc-parse smart-buffer + trivial-features trivial-gray-streams xsubseq) + VERSION 20180131-git SIBLINGS (fast-http-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix index 8b9d5e5408b83..f78b7ae0cb690 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''fast-io''; - version = ''20170630-git''; + version = ''20171023-git''; description = ''Alternative I/O mechanism to a stream or vector''; - deps = [ args."alexandria" args."static-vectors" args."trivial-gray-streams" ]; + deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-io/2017-06-30/fast-io-20170630-git.tgz''; - sha256 = ''0wg40jv6hn4ijks026d2aaz5pr3zfxxzaakyzzjka6981g9rgkrg''; + url = ''http://beta.quicklisp.org/archive/fast-io/2017-10-23/fast-io-20171023-git.tgz''; + sha256 = ''09w4awnvw772s24ivgzx2irhy701nrsxbim6ip5rc70rfzbff8sl''; }; packageName = "fast-io"; @@ -18,11 +18,15 @@ rec { overrides = x: x; } /* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector - SHA256 0wg40jv6hn4ijks026d2aaz5pr3zfxxzaakyzzjka6981g9rgkrg URL - http://beta.quicklisp.org/archive/fast-io/2017-06-30/fast-io-20170630-git.tgz - MD5 34bfe5f306f2e0f6da128fe024ee242d NAME fast-io FILENAME fast-io DEPS - ((NAME alexandria FILENAME alexandria) + SHA256 09w4awnvw772s24ivgzx2irhy701nrsxbim6ip5rc70rfzbff8sl URL + http://beta.quicklisp.org/archive/fast-io/2017-10-23/fast-io-20171023-git.tgz + MD5 89105f8277f3bf3709fae1b789e3d5ad NAME fast-io FILENAME fast-io DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME static-vectors FILENAME static-vectors) + (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (alexandria static-vectors trivial-gray-streams) VERSION - 20170630-git SIBLINGS (fast-io-test) PARASITES NIL) */ + DEPENDENCIES + (alexandria babel cffi cffi-grovel static-vectors trivial-features + trivial-gray-streams) + VERSION 20171023-git SIBLINGS (fast-io-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix new file mode 100644 index 0000000000000..245ee8b394af2 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix @@ -0,0 +1,28 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''fiasco''; + version = ''20171227-git''; + + parasites = [ "fiasco-self-tests" ]; + + description = ''A Common Lisp test framework that treasures your failures, logical continuation of Stefil.''; + + deps = [ args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/fiasco/2017-12-27/fiasco-20171227-git.tgz''; + sha256 = ''1kv88yp4vjglahvknaxcdsp2kiwbs1nm94f857mkr2pmy87qbqx2''; + }; + + packageName = "fiasco"; + + asdFilesToKeep = ["fiasco.asd"]; + overrides = x: x; +} +/* (SYSTEM fiasco DESCRIPTION + A Common Lisp test framework that treasures your failures, logical continuation of Stefil. + SHA256 1kv88yp4vjglahvknaxcdsp2kiwbs1nm94f857mkr2pmy87qbqx2 URL + http://beta.quicklisp.org/archive/fiasco/2017-12-27/fiasco-20171227-git.tgz + MD5 3cc915e91f18617eb3d436b6fea9dd49 NAME fiasco FILENAME fiasco DEPS + ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION + 20171227-git SIBLINGS NIL PARASITES (fiasco-self-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix index 69aeecd8aa279..6e652e8b312ee 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''flexi-streams''; - version = ''1.0.15''; + version = ''20171227-git''; parasites = [ "flexi-streams-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz''; - sha256 = ''0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p''; + url = ''http://beta.quicklisp.org/archive/flexi-streams/2017-12-27/flexi-streams-20171227-git.tgz''; + sha256 = ''1hw3w8syz7pyggxz1fwskrvjjwz5518vz5clkkjxfshlzqhwxfyc''; }; packageName = "flexi-streams"; @@ -20,10 +20,10 @@ rec { overrides = x: x; } /* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp - SHA256 0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p URL - http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz - MD5 02dbb5a0c5f982e0c7a88aad9a25004e NAME flexi-streams FILENAME + SHA256 1hw3w8syz7pyggxz1fwskrvjjwz5518vz5clkkjxfshlzqhwxfyc URL + http://beta.quicklisp.org/archive/flexi-streams/2017-12-27/flexi-streams-20171227-git.tgz + MD5 583aa697051062a0d6a6a73923f865d3 NAME flexi-streams FILENAME flexi-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES - (trivial-gray-streams) VERSION 1.0.15 SIBLINGS NIL PARASITES + (trivial-gray-streams) VERSION 20171227-git SIBLINGS NIL PARASITES (flexi-streams-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix index 4847ee328d0e6..2aa5c07492508 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''form-fiddle''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A collection of utilities to destructure lambda forms.''; - deps = [ args."documentation-utils" ]; + deps = [ args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/form-fiddle/2017-06-30/form-fiddle-20170630-git.tgz''; - sha256 = ''0w4isi9y2h6vswq418hj50223aac89iadl71y86wxdlznm3kdvjf''; + url = ''http://beta.quicklisp.org/archive/form-fiddle/2018-01-31/form-fiddle-20180131-git.tgz''; + sha256 = ''1i7rzn4ilr46wpkd2i10q875bxy8b54v7rvqzcq752hilx15hiff''; }; packageName = "form-fiddle"; @@ -19,8 +19,11 @@ rec { } /* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 - 0w4isi9y2h6vswq418hj50223aac89iadl71y86wxdlznm3kdvjf URL - http://beta.quicklisp.org/archive/form-fiddle/2017-06-30/form-fiddle-20170630-git.tgz - MD5 9c8eb18dfedebcf43718cc259c910aa1 NAME form-fiddle FILENAME form-fiddle - DEPS ((NAME documentation-utils FILENAME documentation-utils)) DEPENDENCIES - (documentation-utils) VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */ + 1i7rzn4ilr46wpkd2i10q875bxy8b54v7rvqzcq752hilx15hiff URL + http://beta.quicklisp.org/archive/form-fiddle/2018-01-31/form-fiddle-20180131-git.tgz + MD5 a0cc2ea1af29889e4991f7fefac366dd NAME form-fiddle FILENAME form-fiddle + DEPS + ((NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES (documentation-utils trivial-indent) VERSION 20180131-git + SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix index 7b0ea1ff2ada4..d901df215a685 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''fset''; - version = ''20150113-git''; + version = ''20171019-git''; description = ''A functional set-theoretic collections library. See: http://www.ergy.com/FSet.html @@ -10,8 +10,8 @@ See: http://www.ergy.com/FSet.html deps = [ args."misc-extensions" args."mt19937" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fset/2015-01-13/fset-20150113-git.tgz''; - sha256 = ''1k9c48jahw8i4zhx6dc96n0jzxjy2ascr2wng9hmm8vjhhqs5sl0''; + url = ''http://beta.quicklisp.org/archive/fset/2017-10-19/fset-20171019-git.tgz''; + sha256 = ''07qxbj40kmjknmvvb47prj81mpi6j39150iw57hlrzdhlndvilwg''; }; packageName = "fset"; @@ -22,10 +22,10 @@ See: http://www.ergy.com/FSet.html /* (SYSTEM fset DESCRIPTION A functional set-theoretic collections library. See: http://www.ergy.com/FSet.html - SHA256 1k9c48jahw8i4zhx6dc96n0jzxjy2ascr2wng9hmm8vjhhqs5sl0 URL - http://beta.quicklisp.org/archive/fset/2015-01-13/fset-20150113-git.tgz MD5 - 89f958cc900e712aed0750b336efbe15 NAME fset FILENAME fset DEPS + SHA256 07qxbj40kmjknmvvb47prj81mpi6j39150iw57hlrzdhlndvilwg URL + http://beta.quicklisp.org/archive/fset/2017-10-19/fset-20171019-git.tgz MD5 + dc8de5917c513302dd0e135e6c133978 NAME fset FILENAME fset DEPS ((NAME misc-extensions FILENAME misc-extensions) (NAME mt19937 FILENAME mt19937)) - DEPENDENCIES (misc-extensions mt19937) VERSION 20150113-git SIBLINGS NIL + DEPENDENCIES (misc-extensions mt19937) VERSION 20171019-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix index 04e53bd3fc19c..604ccf0bdc730 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix @@ -5,7 +5,7 @@ rec { description = ''HTTP POST data parser for Common Lisp''; - deps = [ args."alexandria" args."babel" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."trivial-gray-streams" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz''; @@ -30,10 +30,11 @@ rec { (NAME jonathan FILENAME jonathan) (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri) (NAME smart-buffer FILENAME smart-buffer) (NAME split-sequence FILENAME split-sequence) + (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES (alexandria babel cl-annot cl-ppcre cl-syntax cl-utilities fast-http fast-io flexi-streams jonathan proc-parse quri smart-buffer split-sequence - trivial-gray-streams xsubseq) + trivial-features trivial-gray-streams xsubseq) VERSION 20161204-git SIBLINGS (http-body-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix index 5ce8459d9e2c0..6a103b5ac1c56 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''hunchentoot''; - version = ''v1.2.37''; + version = ''v1.2.38''; parasites = [ "hunchentoot-dev" "hunchentoot-test" ]; @@ -13,8 +13,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl+ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."cxml-stp" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."swank" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" args."xpath" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hunchentoot/2017-07-25/hunchentoot-v1.2.37.tgz''; - sha256 = ''1r0p8qasd2zy9a8l58jysz5bb1gj79cz2ikr93in0my8q44pg9lc''; + url = ''http://beta.quicklisp.org/archive/hunchentoot/2017-12-27/hunchentoot-v1.2.38.tgz''; + sha256 = ''1d3gnqbk2s3g9q51sx8mcsp2rmbvcfanbnljsf19npgfmz1ypsgd''; }; packageName = "hunchentoot"; @@ -27,9 +27,9 @@ rec { BORDEAUX-THREADS. It supports HTTP 1.1, serves static files, has a simple framework for user-defined handlers and can be extended through subclassing. - SHA256 1r0p8qasd2zy9a8l58jysz5bb1gj79cz2ikr93in0my8q44pg9lc URL - http://beta.quicklisp.org/archive/hunchentoot/2017-07-25/hunchentoot-v1.2.37.tgz - MD5 3fd6a6c4dd0d32db7b71828b52494325 NAME hunchentoot FILENAME hunchentoot + SHA256 1d3gnqbk2s3g9q51sx8mcsp2rmbvcfanbnljsf19npgfmz1ypsgd URL + http://beta.quicklisp.org/archive/hunchentoot/2017-12-27/hunchentoot-v1.2.38.tgz + MD5 878a7833eb34a53231011b78e998e2fa NAME hunchentoot FILENAME hunchentoot DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -50,4 +50,4 @@ rec { cl-ppcre cl-who cxml-stp drakma flexi-streams md5 rfc2388 split-sequence swank trivial-backtrace trivial-features trivial-garbage trivial-gray-streams usocket xpath) - VERSION v1.2.37 SIBLINGS NIL PARASITES (hunchentoot-dev hunchentoot-test)) */ + VERSION v1.2.38 SIBLINGS NIL PARASITES (hunchentoot-dev hunchentoot-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix index 3bb44ea2fc6ad..4211dfbc9194d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''ieee-floats''; - version = ''20160318-git''; + version = ''20170830-git''; parasites = [ "ieee-floats-tests" ]; - description = ''''; + description = ''Convert floating point values to IEEE 754 binary representation''; - deps = [ args."eos" ]; + deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ieee-floats/2016-03-18/ieee-floats-20160318-git.tgz''; - sha256 = ''0vw4q6q5yygfxfwx5bki4kl9lqszmhnplcl55qh8raxmb03alyx4''; + url = ''http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz''; + sha256 = ''15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk''; }; packageName = "ieee-floats"; @@ -19,9 +19,10 @@ rec { asdFilesToKeep = ["ieee-floats.asd"]; overrides = x: x; } -/* (SYSTEM ieee-floats DESCRIPTION NIL SHA256 - 0vw4q6q5yygfxfwx5bki4kl9lqszmhnplcl55qh8raxmb03alyx4 URL - http://beta.quicklisp.org/archive/ieee-floats/2016-03-18/ieee-floats-20160318-git.tgz - MD5 84d679a4dffddc3b0cff944adde623c5 NAME ieee-floats FILENAME ieee-floats - DEPS ((NAME eos FILENAME eos)) DEPENDENCIES (eos) VERSION 20160318-git - SIBLINGS NIL PARASITES (ieee-floats-tests)) */ +/* (SYSTEM ieee-floats DESCRIPTION + Convert floating point values to IEEE 754 binary representation SHA256 + 15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk URL + http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz + MD5 3434b4d91224ca6a817ced9d83f14bb6 NAME ieee-floats FILENAME ieee-floats + DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) VERSION + 20170830-git SIBLINGS NIL PARASITES (ieee-floats-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index 89301f90866fa..578b251ecec2d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''ironclad''; - version = ''v0.34''; + version = ''v0.37''; - parasites = [ "ironclad-tests" ]; + parasites = [ "ironclad/tests" ]; description = ''A cryptographic toolkit written in pure Common Lisp''; deps = [ args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ironclad/2017-06-30/ironclad-v0.34.tgz''; - sha256 = ''08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0''; + url = ''http://beta.quicklisp.org/archive/ironclad/2017-11-30/ironclad-v0.37.tgz''; + sha256 = ''061ln65yj9psch84nmsjrrlq41bkfv6iyg8sd9kpdc75lfc0vpi2''; }; packageName = "ironclad"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 - 08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0 URL - http://beta.quicklisp.org/archive/ironclad/2017-06-30/ironclad-v0.34.tgz - MD5 82db632975aa83b0dce3412c1aff4a80 NAME ironclad FILENAME ironclad DEPS - ((NAME nibbles FILENAME nibbles)) DEPENDENCIES (nibbles) VERSION v0.34 - SIBLINGS (ironclad-text) PARASITES (ironclad-tests)) */ + 061ln65yj9psch84nmsjrrlq41bkfv6iyg8sd9kpdc75lfc0vpi2 URL + http://beta.quicklisp.org/archive/ironclad/2017-11-30/ironclad-v0.37.tgz + MD5 9d8734764eead79f3a5d230b8e800d8f NAME ironclad FILENAME ironclad DEPS + ((NAME nibbles FILENAME nibbles)) DEPENDENCIES (nibbles) VERSION v0.37 + SIBLINGS (ironclad-text) PARASITES (ironclad/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix index 42980e0c91353..645048c719093 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''iterate''; - version = ''20160825-darcs''; + version = ''20180131-darcs''; parasites = [ "iterate/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz''; - sha256 = ''0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm''; + url = ''http://beta.quicklisp.org/archive/iterate/2018-01-31/iterate-20180131-darcs.tgz''; + sha256 = ''05jlwd59w13k4n9x7a0mszdv7i78cbmx93w2p1yzsi30593rh9hj''; }; packageName = "iterate"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM iterate DESCRIPTION Jonathan Amsterdam's iterator/gatherer/accumulator facility SHA256 - 0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm URL - http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz - MD5 e73ff4898ce4831ff2a28817f32de86e NAME iterate FILENAME iterate DEPS NIL - DEPENDENCIES NIL VERSION 20160825-darcs SIBLINGS NIL PARASITES + 05jlwd59w13k4n9x7a0mszdv7i78cbmx93w2p1yzsi30593rh9hj URL + http://beta.quicklisp.org/archive/iterate/2018-01-31/iterate-20180131-darcs.tgz + MD5 40a1776b445e42463c2c6f754468fb83 NAME iterate FILENAME iterate DEPS NIL + DEPENDENCIES NIL VERSION 20180131-darcs SIBLINGS NIL PARASITES (iterate/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index 9f99f99d4ce32..408ef5dfabc9d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-component''; - version = ''lack-20170725-git''; + version = ''lack-20180131-git''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz''; - sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp''; + url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz''; + sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl''; }; packageName = "lack-component"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM lack-component DESCRIPTION NIL SHA256 - 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL - http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 - ab71d36ac49e4759806e9a2ace50ae53 NAME lack-component FILENAME - lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20170725-git SIBLINGS + 17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL + http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5 + e1807a22a021ca27d8d1add9219091eb NAME lack-component FILENAME + lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180131-git SIBLINGS (lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index 2bbe5dcd33b4a..a6816fa75c5c9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-middleware-backtrace''; - version = ''lack-20170725-git''; + version = ''lack-20180131-git''; description = ''''; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz''; - sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp''; + url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz''; + sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl''; }; packageName = "lack-middleware-backtrace"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 - 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL - http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 - ab71d36ac49e4759806e9a2ace50ae53 NAME lack-middleware-backtrace FILENAME + 17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL + http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5 + e1807a22a021ca27d8d1add9219091eb NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES - (uiop) VERSION lack-20170725-git SIBLINGS + (uiop) VERSION lack-20180131-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index 38f834cd52b46..a056d9d0d146d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-util''; - version = ''lack-20170725-git''; + version = ''lack-20180131-git''; description = ''''; deps = [ args."ironclad" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz''; - sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp''; + url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz''; + sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl''; }; packageName = "lack-util"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-util DESCRIPTION NIL SHA256 - 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL - http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 - ab71d36ac49e4759806e9a2ace50ae53 NAME lack-util FILENAME lack-util DEPS + 17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL + http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5 + e1807a22a021ca27d8d1add9219091eb NAME lack-util FILENAME lack-util DEPS ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles)) - DEPENDENCIES (ironclad nibbles) VERSION lack-20170725-git SIBLINGS + DEPENDENCIES (ironclad nibbles) VERSION lack-20180131-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index 0d65d48cf0a52..1c3998a3025c0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack''; - version = ''20170725-git''; + version = ''20180131-git''; description = ''A minimal Clack''; deps = [ args."ironclad" args."lack-component" args."lack-util" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz''; - sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp''; + url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz''; + sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl''; }; packageName = "lack"; @@ -18,14 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 - 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL - http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 - ab71d36ac49e4759806e9a2ace50ae53 NAME lack FILENAME lack DEPS + 17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL + http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5 + e1807a22a021ca27d8d1add9219091eb NAME lack FILENAME lack DEPS ((NAME ironclad FILENAME ironclad) (NAME lack-component FILENAME lack-component) (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles)) DEPENDENCIES (ironclad lack-component lack-util nibbles) VERSION - 20170725-git SIBLINGS + 20180131-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix index a94c8439cf2a4..1f6a0709b0f43 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''let-plus''; - version = ''20170124-git''; + version = ''20171130-git''; - parasites = [ "let-plus-tests" ]; + parasites = [ "let-plus/tests" ]; description = ''Destructuring extension of LET*.''; deps = [ args."alexandria" args."anaphora" args."lift" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz''; - sha256 = ''1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8''; + url = ''http://beta.quicklisp.org/archive/let-plus/2017-11-30/let-plus-20171130-git.tgz''; + sha256 = ''1v8rp3ab6kp6v5kl58gi700wjs4qgmkxxkmhx2a1i6b2z934xkx7''; }; packageName = "let-plus"; @@ -20,10 +20,10 @@ rec { overrides = x: x; } /* (SYSTEM let-plus DESCRIPTION Destructuring extension of LET*. SHA256 - 1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8 URL - http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz - MD5 1180608e4da53f3866a99d4cca72e3b1 NAME let-plus FILENAME let-plus DEPS + 1v8rp3ab6kp6v5kl58gi700wjs4qgmkxxkmhx2a1i6b2z934xkx7 URL + http://beta.quicklisp.org/archive/let-plus/2017-11-30/let-plus-20171130-git.tgz + MD5 cd92097d436a513e7d0eac535617ca08 NAME let-plus FILENAME let-plus DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME lift FILENAME lift)) - DEPENDENCIES (alexandria anaphora lift) VERSION 20170124-git SIBLINGS NIL - PARASITES (let-plus-tests)) */ + DEPENDENCIES (alexandria anaphora lift) VERSION 20171130-git SIBLINGS NIL + PARASITES (let-plus/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix index 50bc9946ccaea..7f88beb974b05 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lisp-namespace''; - version = ''20170630-git''; + version = ''20171130-git''; description = ''Provides LISP-N --- extensible namespaces in Common Lisp.''; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lisp-namespace/2017-06-30/lisp-namespace-20170630-git.tgz''; - sha256 = ''06mdrzjwmfynzljcs8ym8dscjlxpbbkmjfg912v68v7p2xzq6d0n''; + url = ''http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz''; + sha256 = ''0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j''; }; packageName = "lisp-namespace"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM lisp-namespace DESCRIPTION Provides LISP-N --- extensible namespaces in Common Lisp. SHA256 - 06mdrzjwmfynzljcs8ym8dscjlxpbbkmjfg912v68v7p2xzq6d0n URL - http://beta.quicklisp.org/archive/lisp-namespace/2017-06-30/lisp-namespace-20170630-git.tgz - MD5 f3379a60f7cc896a7cff384ff25a1de5 NAME lisp-namespace FILENAME + 0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j URL + http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz + MD5 d3052a13db167c6a53487f31753b7467 NAME lisp-namespace FILENAME lisp-namespace DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES - (alexandria) VERSION 20170630-git SIBLINGS (lisp-namespace.test) PARASITES + (alexandria) VERSION 20171130-git SIBLINGS (lisp-namespace.test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix index 47e57ba1285a3..62197234305a1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''lisp-unit2''; - version = ''20160531-git''; + version = ''20180131-git''; parasites = [ "lisp-unit2-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."symbol-munger" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lisp-unit2/2016-05-31/lisp-unit2-20160531-git.tgz''; - sha256 = ''17frcygs515l611cwggm90xapl8xng9cylsrdh11ygmdxwwy59sv''; + url = ''http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz''; + sha256 = ''04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7''; }; packageName = "lisp-unit2"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM lisp-unit2 DESCRIPTION Common Lisp library that supports unit testing. SHA256 - 17frcygs515l611cwggm90xapl8xng9cylsrdh11ygmdxwwy59sv URL - http://beta.quicklisp.org/archive/lisp-unit2/2016-05-31/lisp-unit2-20160531-git.tgz - MD5 913675bff1f86453887681e72ae5914d NAME lisp-unit2 FILENAME lisp-unit2 + 04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7 URL + http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz + MD5 d061fa640837441a5d2eecbefd8b2e69 NAME lisp-unit2 FILENAME lisp-unit2 DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) @@ -34,4 +34,4 @@ rec { DEPENDENCIES (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate symbol-munger) - VERSION 20160531-git SIBLINGS NIL PARASITES (lisp-unit2-test)) */ + VERSION 20180131-git SIBLINGS NIL PARASITES (lisp-unit2-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index f5137a5e927d3..0b2556b2572de 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,15 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''local-time''; - version = ''20170725-git''; + version = ''20180131-git''; + + parasites = [ "local-time/test" ]; description = ''A library for manipulating dates and times, based on a paper by Erik Naggum''; - deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" args."stefil" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/local-time/2017-07-25/local-time-20170725-git.tgz''; - sha256 = ''05axwla93m5jml9lw6ljwzjhcl8pshfzxyqkvyj1w5l9klh569p9''; + url = ''http://beta.quicklisp.org/archive/local-time/2018-01-31/local-time-20180131-git.tgz''; + sha256 = ''1i8km0ndqk1kx914n0chi4c3kkk6m0zk0kplh87fgzwn4lh79rpr''; }; packageName = "local-time"; @@ -19,12 +21,12 @@ rec { } /* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum - SHA256 05axwla93m5jml9lw6ljwzjhcl8pshfzxyqkvyj1w5l9klh569p9 URL - http://beta.quicklisp.org/archive/local-time/2017-07-25/local-time-20170725-git.tgz - MD5 77a79ed1036bc3547f5174f2256c8e93 NAME local-time FILENAME local-time + SHA256 1i8km0ndqk1kx914n0chi4c3kkk6m0zk0kplh87fgzwn4lh79rpr URL + http://beta.quicklisp.org/archive/local-time/2018-01-31/local-time-20180131-git.tgz + MD5 61982a1f2b29793e00369d9c2b6d1b12 NAME local-time FILENAME local-time DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-fad FILENAME cl-fad)) - DEPENDENCIES (alexandria bordeaux-threads cl-fad) VERSION 20170725-git - SIBLINGS (cl-postgres+local-time local-time.test) PARASITES NIL) */ + (NAME cl-fad FILENAME cl-fad) (NAME stefil FILENAME stefil)) + DEPENDENCIES (alexandria bordeaux-threads cl-fad stefil) VERSION + 20180131-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index b8592e12490b3..1ca094d139db4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lquery''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A library to allow jQuery-like HTML/DOM manipulation.''; - deps = [ args."array-utils" args."clss" args."form-fiddle" args."plump" ]; + deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lquery/2017-06-30/lquery-20170630-git.tgz''; - sha256 = ''19lpzjidg31lw61b78vdsqzrsdw2js4a9s7zzr5049jpzbspszjm''; + url = ''http://beta.quicklisp.org/archive/lquery/2018-01-31/lquery-20180131-git.tgz''; + sha256 = ''1v5mmdx7a1ngydkcs3c5anmqrl0jxc52b8jisc2f0b5k0j1kgmm9''; }; packageName = "lquery"; @@ -19,10 +19,13 @@ rec { } /* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 - 19lpzjidg31lw61b78vdsqzrsdw2js4a9s7zzr5049jpzbspszjm URL - http://beta.quicklisp.org/archive/lquery/2017-06-30/lquery-20170630-git.tgz - MD5 aeb03cb5174d682092683da488531a9c NAME lquery FILENAME lquery DEPS + 1v5mmdx7a1ngydkcs3c5anmqrl0jxc52b8jisc2f0b5k0j1kgmm9 URL + http://beta.quicklisp.org/archive/lquery/2018-01-31/lquery-20180131-git.tgz + MD5 07e92aad32c4d12c4699956b57dbc9b8 NAME lquery FILENAME lquery DEPS ((NAME array-utils FILENAME array-utils) (NAME clss FILENAME clss) - (NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump)) - DEPENDENCIES (array-utils clss form-fiddle plump) VERSION 20170630-git - SIBLINGS (lquery-test) PARASITES NIL) */ + (NAME documentation-utils FILENAME documentation-utils) + (NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES + (array-utils clss documentation-utils form-fiddle plump trivial-indent) + VERSION 20180131-git SIBLINGS (lquery-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index b45b0a5da70cb..4d17bd6341f28 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''marshal''; - version = ''cl-20170124-git''; + version = ''cl-20170830-git''; description = ''marshal: Simple (de)serialization of Lisp datastructures.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz''; - sha256 = ''0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d''; + url = ''http://beta.quicklisp.org/archive/cl-marshal/2017-08-30/cl-marshal-20170830-git.tgz''; + sha256 = ''1yirhxyizfxsvsrmbh2dipzzlq09afahzmi2zlsbbv6cvijxnisp''; }; packageName = "marshal"; @@ -19,7 +19,8 @@ rec { } /* (SYSTEM marshal DESCRIPTION marshal: Simple (de)serialization of Lisp datastructures. SHA256 - 0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d URL - http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz - MD5 ebde1b0f1c1abeb409380884cc665351 NAME marshal FILENAME marshal DEPS NIL - DEPENDENCIES NIL VERSION cl-20170124-git SIBLINGS NIL PARASITES NIL) */ + 1yirhxyizfxsvsrmbh2dipzzlq09afahzmi2zlsbbv6cvijxnisp URL + http://beta.quicklisp.org/archive/cl-marshal/2017-08-30/cl-marshal-20170830-git.tgz + MD5 54bce031cdb215cd7624fdf3265b9bec NAME marshal FILENAME marshal DEPS NIL + DEPENDENCIES NIL VERSION cl-20170830-git SIBLINGS (marshal-tests) PARASITES + NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix index ac12468c88046..d72e0839d1e8b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''metabang-bind''; - version = ''20170124-git''; + version = ''20171130-git''; description = ''Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz''; - sha256 = ''1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc''; + url = ''http://beta.quicklisp.org/archive/metabang-bind/2017-11-30/metabang-bind-20171130-git.tgz''; + sha256 = ''0mjcg4281qljjwzq80r9j7nhvccf5k1069kzk2vljvvm2ai21j1a''; }; packageName = "metabang-bind"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM metabang-bind DESCRIPTION Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more. - SHA256 1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc URL - http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz - MD5 20c6a434308598ad7fa224d99f3bcbf6 NAME metabang-bind FILENAME - metabang-bind DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS + SHA256 0mjcg4281qljjwzq80r9j7nhvccf5k1069kzk2vljvvm2ai21j1a URL + http://beta.quicklisp.org/archive/metabang-bind/2017-11-30/metabang-bind-20171130-git.tgz + MD5 dfd06d3929c2f48ccbe1d00cdf9995a7 NAME metabang-bind FILENAME + metabang-bind DEPS NIL DEPENDENCIES NIL VERSION 20171130-git SIBLINGS (metabang-bind-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix index a239fe7e32b57..82d06b1c93b2f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -1,7 +1,9 @@ args @ { fetchurl, ... }: rec { baseName = ''named-readtables''; - version = ''20170124-git''; + version = ''20180131-git''; + + parasites = [ "named-readtables/test" ]; description = ''Library that creates a namespace for named readtable akin to the namespace of packages.''; @@ -9,8 +11,8 @@ rec { deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz''; - sha256 = ''1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45''; + url = ''http://beta.quicklisp.org/archive/named-readtables/2018-01-31/named-readtables-20180131-git.tgz''; + sha256 = ''1fhygm2q75m6my6appxmx097l7zlr3qxbgzbpa2mf9pr1qzwrgg5''; }; packageName = "named-readtables"; @@ -21,8 +23,8 @@ rec { /* (SYSTEM named-readtables DESCRIPTION Library that creates a namespace for named readtable akin to the namespace of packages. - SHA256 1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45 URL - http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz - MD5 1237a07f90e29939e48b595eaad2bd82 NAME named-readtables FILENAME - named-readtables DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS - NIL PARASITES NIL) */ + SHA256 1fhygm2q75m6my6appxmx097l7zlr3qxbgzbpa2mf9pr1qzwrgg5 URL + http://beta.quicklisp.org/archive/named-readtables/2018-01-31/named-readtables-20180131-git.tgz + MD5 46db18ba947dc0aba14c76471604448d NAME named-readtables FILENAME + named-readtables DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS + NIL PARASITES (named-readtables/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix index fbcfbe29164d5..9275e5583f56b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''nibbles''; - version = ''20170403-git''; + version = ''20171130-git''; - parasites = [ "nibbles-tests" ]; + parasites = [ "nibbles/tests" ]; description = ''A library for accessing octet-addressed blocks of data in big- and little-endian orders''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz''; - sha256 = ''0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4''; + url = ''http://beta.quicklisp.org/archive/nibbles/2017-11-30/nibbles-20171130-git.tgz''; + sha256 = ''05ykyniak1m0whr7pnbhg53yblr5mny0crmh72bmgnvpmkm345zn''; }; packageName = "nibbles"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM nibbles DESCRIPTION A library for accessing octet-addressed blocks of data in big- and little-endian orders - SHA256 0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4 URL - http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz - MD5 5683a0a5510860a036b2a272036cda87 NAME nibbles FILENAME nibbles DEPS NIL - DEPENDENCIES NIL VERSION 20170403-git SIBLINGS NIL PARASITES - (nibbles-tests)) */ + SHA256 05ykyniak1m0whr7pnbhg53yblr5mny0crmh72bmgnvpmkm345zn URL + http://beta.quicklisp.org/archive/nibbles/2017-11-30/nibbles-20171130-git.tgz + MD5 edce3702da9979fca3e40a4594fe36e6 NAME nibbles FILENAME nibbles DEPS NIL + DEPENDENCIES NIL VERSION 20171130-git SIBLINGS NIL PARASITES + (nibbles/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix index 07baf1539bc9b..da9fe306276f3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix @@ -5,10 +5,10 @@ rec { description = ''Load data into PostgreSQL''; - deps = [ args."abnf" args."alexandria" args."anaphora" args."asdf-system-connections" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-containers" args."cl-csv" args."cl-fad" args."cl-interpol" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."cl-unicode" args."cl-utilities" args."closer-mop" args."command-line-arguments" args."db3" args."drakma" args."dynamic-classes" args."esrap" args."flexi-streams" args."garbage-pools" args."ieee-floats" args."ironclad" args."iterate" args."ixf" args."list-of" args."local-time" args."lparallel" args."md5" args."metabang-bind" args."metatilities-base" args."mssql" args."nibbles" args."parse-number" args."postmodern" args."puri" args."py-configparser" args."qmynd" args."quri" args."s-sql" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."usocket" args."uuid" ]; + deps = [ args."abnf" args."alexandria" args."anaphora" args."asdf-finalizers" args."asdf-system-connections" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-containers" args."cl-csv" args."cl-fad" args."cl-interpol" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."cl-unicode" args."cl-utilities" args."closer-mop" args."command-line-arguments" args."db3" args."drakma" args."dynamic-classes" args."esrap" args."flexi-streams" args."garbage-pools" args."ieee-floats" args."ironclad" args."iterate" args."ixf" args."list-of" args."local-time" args."lparallel" args."md5" args."metabang-bind" args."metatilities-base" args."mssql" args."nibbles" args."parse-number" args."postmodern" args."puri" args."py-configparser" args."qmynd" args."quri" args."s-sql" args."salza2" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."usocket" args."uuid" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/pgloader/2017-07-25/pgloader-v3.4.1.tgz''; + url = ''http://beta.quicklisp.org/archive/pgloader/2017-08-30/pgloader-v3.4.1.tgz''; sha256 = ''1z6p7dz1ir9cg4gl1vkvbc1f7pv1yfv1jgwjkw29v57fdg4faz9v''; }; @@ -19,10 +19,11 @@ rec { } /* (SYSTEM pgloader DESCRIPTION Load data into PostgreSQL SHA256 1z6p7dz1ir9cg4gl1vkvbc1f7pv1yfv1jgwjkw29v57fdg4faz9v URL - http://beta.quicklisp.org/archive/pgloader/2017-07-25/pgloader-v3.4.1.tgz + http://beta.quicklisp.org/archive/pgloader/2017-08-30/pgloader-v3.4.1.tgz MD5 6741f8e7d2d416942d5c4a1971576d33 NAME pgloader FILENAME pgloader DEPS ((NAME abnf FILENAME abnf) (NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) + (NAME asdf-finalizers FILENAME asdf-finalizers) (NAME asdf-system-connections FILENAME asdf-system-connections) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -52,22 +53,24 @@ rec { (NAME postmodern FILENAME postmodern) (NAME puri FILENAME puri) (NAME py-configparser FILENAME py-configparser) (NAME qmynd FILENAME qmynd) (NAME quri FILENAME quri) - (NAME s-sql FILENAME s-sql) (NAME simple-date FILENAME simple-date) + (NAME s-sql FILENAME s-sql) (NAME salza2 FILENAME salza2) + (NAME simple-date FILENAME simple-date) (NAME split-sequence FILENAME split-sequence) (NAME sqlite FILENAME sqlite) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME uiop FILENAME uiop) (NAME usocket FILENAME usocket) (NAME uuid FILENAME uuid)) DEPENDENCIES - (abnf alexandria anaphora asdf-system-connections babel bordeaux-threads - cffi chipz chunga cl+ssl cl-base64 cl-containers cl-csv cl-fad cl-interpol - cl-log cl-markdown cl-postgres cl-ppcre cl-unicode cl-utilities closer-mop - command-line-arguments db3 drakma dynamic-classes esrap flexi-streams - garbage-pools ieee-floats ironclad iterate ixf list-of local-time - lparallel md5 metabang-bind metatilities-base mssql nibbles parse-number - postmodern puri py-configparser qmynd quri s-sql simple-date - split-sequence sqlite trivial-backtrace trivial-features - trivial-gray-streams trivial-utf-8 uiop usocket uuid) + (abnf alexandria anaphora asdf-finalizers asdf-system-connections babel + bordeaux-threads cffi chipz chunga cl+ssl cl-base64 cl-containers cl-csv + cl-fad cl-interpol cl-log cl-markdown cl-postgres cl-ppcre cl-unicode + cl-utilities closer-mop command-line-arguments db3 drakma dynamic-classes + esrap flexi-streams garbage-pools ieee-floats ironclad iterate ixf list-of + local-time lparallel md5 metabang-bind metatilities-base mssql nibbles + parse-number postmodern puri py-configparser qmynd quri s-sql salza2 + simple-date split-sequence sqlite trivial-backtrace trivial-features + trivial-garbage trivial-gray-streams trivial-utf-8 uiop usocket uuid) VERSION v3.4.1 SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 763677c677c2d..02bb16e0b78d1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''plump''; - version = ''20170725-git''; + version = ''20180131-git''; description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.''; - deps = [ args."array-utils" args."plump-dom" args."plump-lexer" args."plump-parser" args."trivial-indent" ]; + deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz''; - sha256 = ''118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72''; + url = ''http://beta.quicklisp.org/archive/plump/2018-01-31/plump-20180131-git.tgz''; + sha256 = ''12kawjp88kh7cl2f3s2rg3fp3m09pr477nl9nxcfhmfkbrprslis''; }; packageName = "plump"; @@ -19,14 +19,11 @@ rec { } /* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 - 118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72 URL - http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz - MD5 e5e92dd177711a14753ee86961710458 NAME plump FILENAME plump DEPS + 12kawjp88kh7cl2f3s2rg3fp3m09pr477nl9nxcfhmfkbrprslis URL + http://beta.quicklisp.org/archive/plump/2018-01-31/plump-20180131-git.tgz + MD5 b9e7e174b2322b6547bca7beddda6f3b NAME plump FILENAME plump DEPS ((NAME array-utils FILENAME array-utils) - (NAME plump-dom FILENAME plump-dom) - (NAME plump-lexer FILENAME plump-lexer) - (NAME plump-parser FILENAME plump-parser) + (NAME documentation-utils FILENAME documentation-utils) (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES - (array-utils plump-dom plump-lexer plump-parser trivial-indent) VERSION - 20170725-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ + DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION + 20180131-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix index bbc0ad6b15bd1..441f781710985 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''postmodern''; - version = ''20170403-git''; + version = ''20180131-git''; - parasites = [ "postmodern-tests" ]; + parasites = [ "postmodern/tests" ]; description = ''PostgreSQL programming API''; - deps = [ args."alexandria" args."bordeaux-threads" args."cl-postgres" args."cl-postgres-tests" args."closer-mop" args."fiveam" args."md5" args."s-sql" args."simple-date" args."simple-date-postgres-glue" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."cl-postgres" args."cl-postgres_slash_tests" args."closer-mop" args."fiveam" args."md5" args."s-sql" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; - sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz''; + sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki''; }; packageName = "postmodern"; @@ -20,20 +20,23 @@ rec { overrides = x: x; } /* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256 - 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL - http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz - MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME postmodern FILENAME postmodern + 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL + http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz + MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME postmodern FILENAME postmodern DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-postgres FILENAME cl-postgres) - (NAME cl-postgres-tests FILENAME cl-postgres-tests) + (NAME cl-postgres/tests FILENAME cl-postgres_slash_tests) (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) (NAME s-sql FILENAME s-sql) (NAME simple-date FILENAME simple-date) - (NAME simple-date-postgres-glue FILENAME simple-date-postgres-glue)) + (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) + (NAME split-sequence FILENAME split-sequence) + (NAME usocket FILENAME usocket)) DEPENDENCIES - (alexandria bordeaux-threads cl-postgres cl-postgres-tests closer-mop - fiveam md5 s-sql simple-date simple-date-postgres-glue) - VERSION 20170403-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES - (postmodern-tests)) */ + (alexandria bordeaux-threads cl-postgres cl-postgres/tests closer-mop + fiveam md5 s-sql simple-date simple-date/postgres-glue split-sequence + usocket) + VERSION 20180131-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES + (postmodern/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix index 7815efa4ecd33..a1542dc13cf65 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''prove''; - version = ''20170403-git''; + version = ''20171130-git''; description = ''''; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz''; - sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl''; + url = ''http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz''; + sha256 = ''13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar''; }; packageName = "prove"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM prove DESCRIPTION NIL SHA256 - 091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL - http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz - MD5 063b615692c8711d2392204ecf1b37b7 NAME prove FILENAME prove DEPS + 13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL + http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz + MD5 630df4367537f799570be40242f8ed52 NAME prove FILENAME prove DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME cl-ansi-text FILENAME cl-ansi-text) (NAME cl-colors FILENAME cl-colors) (NAME cl-ppcre FILENAME cl-ppcre) (NAME let-plus FILENAME let-plus) (NAME uiop FILENAME uiop)) DEPENDENCIES (alexandria anaphora cl-ansi-text cl-colors cl-ppcre let-plus uiop) VERSION - 20170403-git SIBLINGS (cl-test-more prove-asdf prove-test) PARASITES NIL) */ + 20171130-git SIBLINGS (cl-test-more prove-asdf prove-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix index 3b3d90d1a1e49..0eb4c0f5b9e6b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''py-configparser''; - version = ''20170725-svn''; + version = ''20170830-svn''; description = ''Common Lisp implementation of the Python ConfigParser module''; deps = [ args."parse-number" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/py-configparser/2017-07-25/py-configparser-20170725-svn.tgz''; - sha256 = ''08wfjlyhjqn54p3k0kv7ijsf72rsn4abdjnhd2bfkapr2a4jz6zr''; + url = ''http://beta.quicklisp.org/archive/py-configparser/2017-08-30/py-configparser-20170830-svn.tgz''; + sha256 = ''0lf062m6nrq61cxafi7jyfh3ianml1qqqzdfd5pm1wzakl2jqp9j''; }; packageName = "py-configparser"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM py-configparser DESCRIPTION Common Lisp implementation of the Python ConfigParser module SHA256 - 08wfjlyhjqn54p3k0kv7ijsf72rsn4abdjnhd2bfkapr2a4jz6zr URL - http://beta.quicklisp.org/archive/py-configparser/2017-07-25/py-configparser-20170725-svn.tgz - MD5 3486092bb1d56be05dab16036f288a74 NAME py-configparser FILENAME + 0lf062m6nrq61cxafi7jyfh3ianml1qqqzdfd5pm1wzakl2jqp9j URL + http://beta.quicklisp.org/archive/py-configparser/2017-08-30/py-configparser-20170830-svn.tgz + MD5 b6a9fc2a9c70760d6683cafe656f9e90 NAME py-configparser FILENAME py-configparser DEPS ((NAME parse-number FILENAME parse-number)) - DEPENDENCIES (parse-number) VERSION 20170725-svn SIBLINGS NIL PARASITES NIL) */ + DEPENDENCIES (parse-number) VERSION 20170830-svn SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix index d6d853413c25c..356c7ff686427 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''qmynd''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''MySQL Native Driver''; - deps = [ args."babel" args."flexi-streams" args."ironclad" args."list-of" args."trivial-gray-streams" args."usocket" ]; + deps = [ args."alexandria" args."asdf-finalizers" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."cl+ssl" args."flexi-streams" args."ironclad" args."list-of" args."nibbles" args."salza2" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/qmynd/2017-06-30/qmynd-20170630-git.tgz''; - sha256 = ''01rg2rm4n19f5g39z2gdjcfy68z7ir51r44524vzzs0x9na9y6bi''; + url = ''http://beta.quicklisp.org/archive/qmynd/2018-01-31/qmynd-20180131-git.tgz''; + sha256 = ''1ripapyrpzp36wsb2xf8w63nf0cjc13xh6xx296p8wgi01jwm61c''; }; packageName = "qmynd"; @@ -18,13 +18,24 @@ rec { overrides = x: x; } /* (SYSTEM qmynd DESCRIPTION MySQL Native Driver SHA256 - 01rg2rm4n19f5g39z2gdjcfy68z7ir51r44524vzzs0x9na9y6bi URL - http://beta.quicklisp.org/archive/qmynd/2017-06-30/qmynd-20170630-git.tgz - MD5 64776472d1e0c4c0e41a1b4a2a24167e NAME qmynd FILENAME qmynd DEPS - ((NAME babel FILENAME babel) (NAME flexi-streams FILENAME flexi-streams) + 1ripapyrpzp36wsb2xf8w63nf0cjc13xh6xx296p8wgi01jwm61c URL + http://beta.quicklisp.org/archive/qmynd/2018-01-31/qmynd-20180131-git.tgz + MD5 60177d28b1945234fd72760007194b3e NAME qmynd FILENAME qmynd DEPS + ((NAME alexandria FILENAME alexandria) + (NAME asdf-finalizers FILENAME asdf-finalizers) + (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) + (NAME cl+ssl FILENAME cl+ssl) (NAME flexi-streams FILENAME flexi-streams) (NAME ironclad FILENAME ironclad) (NAME list-of FILENAME list-of) + (NAME nibbles FILENAME nibbles) (NAME salza2 FILENAME salza2) + (NAME split-sequence FILENAME split-sequence) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME usocket FILENAME usocket)) DEPENDENCIES - (babel flexi-streams ironclad list-of trivial-gray-streams usocket) VERSION - 20170630-git SIBLINGS (qmynd-test) PARASITES NIL) */ + (alexandria asdf-finalizers babel bordeaux-threads cffi chipz cl+ssl + flexi-streams ironclad list-of nibbles salza2 split-sequence + trivial-features trivial-garbage trivial-gray-streams usocket) + VERSION 20180131-git SIBLINGS (qmynd-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix index f75e890760e88..83d835fe2dd8c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''s-sql''; - version = ''postmodern-20170403-git''; + version = ''postmodern-20180131-git''; description = ''''; - deps = [ args."cl-postgres" args."md5" ]; + deps = [ args."cl-postgres" args."md5" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; - sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz''; + sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki''; }; packageName = "s-sql"; @@ -18,9 +18,12 @@ rec { overrides = x: x; } /* (SYSTEM s-sql DESCRIPTION NIL SHA256 - 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL - http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz - MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME s-sql FILENAME s-sql DEPS - ((NAME cl-postgres FILENAME cl-postgres) (NAME md5 FILENAME md5)) - DEPENDENCIES (cl-postgres md5) VERSION postmodern-20170403-git SIBLINGS - (cl-postgres postmodern simple-date) PARASITES NIL) */ + 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL + http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz + MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME s-sql FILENAME s-sql DEPS + ((NAME cl-postgres FILENAME cl-postgres) (NAME md5 FILENAME md5) + (NAME split-sequence FILENAME split-sequence) + (NAME usocket FILENAME usocket)) + DEPENDENCIES (cl-postgres md5 split-sequence usocket) VERSION + postmodern-20180131-git SIBLINGS (cl-postgres postmodern simple-date) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index 31e70992a4cfc..d718b12931069 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''simple-date''; - version = ''postmodern-20170403-git''; + version = ''postmodern-20180131-git''; - parasites = [ "simple-date-postgres-glue" "simple-date-tests" ]; + parasites = [ "simple-date/postgres-glue" "simple-date/tests" ]; description = ''''; - deps = [ args."cl-postgres" args."fiveam" args."md5" ]; + deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; - sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz''; + sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki''; }; packageName = "simple-date"; @@ -20,12 +20,12 @@ rec { overrides = x: x; } /* (SYSTEM simple-date DESCRIPTION NIL SHA256 - 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL - http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz - MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME simple-date FILENAME simple-date + 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL + http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz + MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME simple-date FILENAME simple-date DEPS ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam) - (NAME md5 FILENAME md5)) - DEPENDENCIES (cl-postgres fiveam md5) VERSION postmodern-20170403-git - SIBLINGS (cl-postgres postmodern s-sql) PARASITES - (simple-date-postgres-glue simple-date-tests)) */ + (NAME md5 FILENAME md5) (NAME usocket FILENAME usocket)) + DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION + postmodern-20180131-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES + (simple-date/postgres-glue simple-date/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix index e18c0c325f1cf..b07feca16b004 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''static-vectors''; - version = ''v1.8.2''; + version = ''v1.8.3''; parasites = [ "static-vectors/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."fiveam" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz''; - sha256 = ''0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g''; + url = ''http://beta.quicklisp.org/archive/static-vectors/2017-10-19/static-vectors-v1.8.3.tgz''; + sha256 = ''084690v6xldb9xysgc4hg284j0j9ppxldz4gxwmfin1dzxq0g6xk''; }; packageName = "static-vectors"; @@ -21,13 +21,13 @@ rec { } /* (SYSTEM static-vectors DESCRIPTION Create vectors allocated in static memory. SHA256 - 0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g URL - http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz - MD5 fd3ebe4e79a71c49e32ac87d6a1bcaf4 NAME static-vectors FILENAME + 084690v6xldb9xysgc4hg284j0j9ppxldz4gxwmfin1dzxq0g6xk URL + http://beta.quicklisp.org/archive/static-vectors/2017-10-19/static-vectors-v1.8.3.tgz + MD5 cbad9e34904eedde61cd4cddcca6de29 NAME static-vectors FILENAME static-vectors DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME fiveam FILENAME fiveam) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cffi cffi-grovel fiveam trivial-features) - VERSION v1.8.2 SIBLINGS NIL PARASITES (static-vectors/test)) */ + VERSION v1.8.3 SIBLINGS NIL PARASITES (static-vectors/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix new file mode 100644 index 0000000000000..0dca605c1fdfd --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix @@ -0,0 +1,29 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''stefil''; + version = ''20101107-darcs''; + + parasites = [ "stefil-test" ]; + + description = ''Stefil - Simple Test Framework In Lisp''; + + deps = [ args."alexandria" args."iterate" args."metabang-bind" args."swank" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/stefil/2010-11-07/stefil-20101107-darcs.tgz''; + sha256 = ''0d81js0p02plv7wy1640xmghb4s06gay76pqw2k3dnamkglcglz3''; + }; + + packageName = "stefil"; + + asdFilesToKeep = ["stefil.asd"]; + overrides = x: x; +} +/* (SYSTEM stefil DESCRIPTION Stefil - Simple Test Framework In Lisp SHA256 + 0d81js0p02plv7wy1640xmghb4s06gay76pqw2k3dnamkglcglz3 URL + http://beta.quicklisp.org/archive/stefil/2010-11-07/stefil-20101107-darcs.tgz + MD5 8c56bc03e7679e4d42bb3bb3b101de80 NAME stefil FILENAME stefil DEPS + ((NAME alexandria FILENAME alexandria) (NAME iterate FILENAME iterate) + (NAME metabang-bind FILENAME metabang-bind) (NAME swank FILENAME swank)) + DEPENDENCIES (alexandria iterate metabang-bind swank) VERSION + 20101107-darcs SIBLINGS NIL PARASITES (stefil-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index c7f845a4cf46f..5191e2f336d8c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''stumpwm''; - version = ''20170725-git''; + version = ''20180131-git''; description = ''A tiling, keyboard driven window manager''; deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stumpwm/2017-07-25/stumpwm-20170725-git.tgz''; - sha256 = ''1hb01zlm4rk2n9b8lfpiary94pmg6qkw84zg54ws1if7z1yd2ss5''; + url = ''http://beta.quicklisp.org/archive/stumpwm/2018-01-31/stumpwm-20180131-git.tgz''; + sha256 = ''1mlwgs0b8hd64wqk9qcv2x08zzfvbnn81fsdza7v5rcb8mx5abg0''; }; packageName = "stumpwm"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 - 1hb01zlm4rk2n9b8lfpiary94pmg6qkw84zg54ws1if7z1yd2ss5 URL - http://beta.quicklisp.org/archive/stumpwm/2017-07-25/stumpwm-20170725-git.tgz - MD5 a7fb260c6572273c05b828299c0610ce NAME stumpwm FILENAME stumpwm DEPS + 1mlwgs0b8hd64wqk9qcv2x08zzfvbnn81fsdza7v5rcb8mx5abg0 URL + http://beta.quicklisp.org/archive/stumpwm/2018-01-31/stumpwm-20180131-git.tgz + MD5 252427acf3f2dbc2a5522598c4e37be1 NAME stumpwm FILENAME stumpwm DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) (NAME clx FILENAME clx)) - DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20170725-git SIBLINGS NIL + DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index 21fcaddf53597..1359e13b949ef 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''swank''; - version = ''slime-v2.19''; + version = ''slime-v2.20''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/slime/2017-02-27/slime-v2.19.tgz''; - sha256 = ''1w3xq4kiy06wbmk2sf30saqgy1qa9v2llbi6bqy7hrm956yh6dza''; + url = ''http://beta.quicklisp.org/archive/slime/2017-08-30/slime-v2.20.tgz''; + sha256 = ''0rl2ymqxcfkbvwkd8zfhyaaz8v2a927gmv9c43ganxnq6y473c26''; }; packageName = "swank"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM swank DESCRIPTION NIL SHA256 - 1w3xq4kiy06wbmk2sf30saqgy1qa9v2llbi6bqy7hrm956yh6dza URL - http://beta.quicklisp.org/archive/slime/2017-02-27/slime-v2.19.tgz MD5 - 7e1540ebb970db0f77b6e6cabb36ba41 NAME swank FILENAME swank DEPS NIL - DEPENDENCIES NIL VERSION slime-v2.19 SIBLINGS NIL PARASITES NIL) */ + 0rl2ymqxcfkbvwkd8zfhyaaz8v2a927gmv9c43ganxnq6y473c26 URL + http://beta.quicklisp.org/archive/slime/2017-08-30/slime-v2.20.tgz MD5 + 115188047b753ce1864586e114ecb46c NAME swank FILENAME swank DEPS NIL + DEPENDENCIES NIL VERSION slime-v2.20 SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index c0964c9731d00..4f4e1f812233d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-indent''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''A very simple library to allow indentation hints for SWANK.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-indent/2017-06-30/trivial-indent-20170630-git.tgz''; - sha256 = ''18zag7n2yfjx3x6nm8132cq8lz321i3f3zslb90j198wvpwyrnq7''; + url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-01-31/trivial-indent-20180131-git.tgz''; + sha256 = ''1y6m9nrhj923zj95824w7vsciqhv9cq7sq5x519x2ik0jfcaqp8w''; }; packageName = "trivial-indent"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 - 18zag7n2yfjx3x6nm8132cq8lz321i3f3zslb90j198wvpwyrnq7 URL - http://beta.quicklisp.org/archive/trivial-indent/2017-06-30/trivial-indent-20170630-git.tgz - MD5 9f11cc1014be3e3ae588a3cd07315be6 NAME trivial-indent FILENAME - trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL + 1y6m9nrhj923zj95824w7vsciqhv9cq7sq5x519x2ik0jfcaqp8w URL + http://beta.quicklisp.org/archive/trivial-indent/2018-01-31/trivial-indent-20180131-git.tgz + MD5 a915258466d07465da1f71476bf59d12 NAME trivial-indent FILENAME + trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index 080f854db43a1..56bbb58383775 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-mimes''; - version = ''20170630-git''; + version = ''20180131-git''; description = ''Tiny library to detect mime types in files.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-mimes/2017-06-30/trivial-mimes-20170630-git.tgz''; - sha256 = ''0rm667w7nfkcrfjqbb7blbdcrjxbr397a6nqmy35qq82fqjr4rvx''; + url = ''http://beta.quicklisp.org/archive/trivial-mimes/2018-01-31/trivial-mimes-20180131-git.tgz''; + sha256 = ''0wmnfiphrzr5br4mzds7lny36rqrdxv707r4frzygx7j0llrvs1b''; }; packageName = "trivial-mimes"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 - 0rm667w7nfkcrfjqbb7blbdcrjxbr397a6nqmy35qq82fqjr4rvx URL - http://beta.quicklisp.org/archive/trivial-mimes/2017-06-30/trivial-mimes-20170630-git.tgz - MD5 5aecea17e102bd2dab7e71fecd1f8e44 NAME trivial-mimes FILENAME - trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL + 0wmnfiphrzr5br4mzds7lny36rqrdxv707r4frzygx7j0llrvs1b URL + http://beta.quicklisp.org/archive/trivial-mimes/2018-01-31/trivial-mimes-20180131-git.tgz + MD5 9c91e72a8ee2455f9c5cbba1f7d2fcef NAME trivial-mimes FILENAME + trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index 998681d02ab3b..39c2060af0275 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''uiop''; - version = ''3.2.1''; + version = ''3.3.1''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uiop/2017-06-30/uiop-3.2.1.tgz''; - sha256 = ''1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v''; + url = ''http://beta.quicklisp.org/archive/uiop/2017-12-27/uiop-3.3.1.tgz''; + sha256 = ''0w9va40dr6l7fss9f7qlv7mp9f86sdjv5g2lz621a6wzi4911ghc''; }; packageName = "uiop"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM uiop DESCRIPTION NIL SHA256 - 1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v URL - http://beta.quicklisp.org/archive/uiop/2017-06-30/uiop-3.2.1.tgz MD5 - 3e9ef02ecf9005240b66552d85719700 NAME uiop FILENAME uiop DEPS NIL - DEPENDENCIES NIL VERSION 3.2.1 SIBLINGS (asdf-driver) PARASITES NIL) */ + 0w9va40dr6l7fss9f7qlv7mp9f86sdjv5g2lz621a6wzi4911ghc URL + http://beta.quicklisp.org/archive/uiop/2017-12-27/uiop-3.3.1.tgz MD5 + 7a90377c4fc96676d5fa5197d9e9ec11 NAME uiop FILENAME uiop DEPS NIL + DEPENDENCIES NIL VERSION 3.3.1 SIBLINGS (asdf-driver) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index 7e7e9b6acadc9..fb483662df53c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''woo''; - version = ''20170725-git''; + version = ''20170830-git''; description = ''An asynchronous HTTP server written in Common Lisp''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/woo/2017-07-25/woo-20170725-git.tgz''; - sha256 = ''11cnqd058mjhkgxppsivbmd687429r4b62v7z5iav0wpha78qfgg''; + url = ''http://beta.quicklisp.org/archive/woo/2017-08-30/woo-20170830-git.tgz''; + sha256 = ''130hgfp08gchn0fkfablpf18hsdi1k4hrc3iny5c8m1phjlknchv''; }; packageName = "woo"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp - SHA256 11cnqd058mjhkgxppsivbmd687429r4b62v7z5iav0wpha78qfgg URL - http://beta.quicklisp.org/archive/woo/2017-07-25/woo-20170725-git.tgz MD5 - bd901d8dfa7df3d19c6da73ea101f65b NAME woo FILENAME woo DEPS + SHA256 130hgfp08gchn0fkfablpf18hsdi1k4hrc3iny5c8m1phjlknchv URL + http://beta.quicklisp.org/archive/woo/2017-08-30/woo-20170830-git.tgz MD5 + 3f506a771b3d8f2c7fc97b049dcfdedf NAME woo FILENAME woo DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -42,4 +42,4 @@ rec { clack-socket fast-http fast-io flexi-streams lev proc-parse quri smart-buffer split-sequence static-vectors swap-bytes trivial-features trivial-gray-streams trivial-utf-8 uiop vom xsubseq) - VERSION 20170725-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ + VERSION 20170830-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix index 91598bf66626a..b9ab71744c3a1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''xsubseq''; - version = ''20150113-git''; + version = ''20170830-git''; description = ''Efficient way to manage "subseq"s in Common Lisp''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz''; - sha256 = ''0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q''; + url = ''http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz''; + sha256 = ''1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml''; }; packageName = "xsubseq"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM xsubseq DESCRIPTION Efficient way to manage "subseq"s in Common Lisp - SHA256 0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q URL - http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz - MD5 56f7a4ac1f05f10e7226e0e5b7b0bfa7 NAME xsubseq FILENAME xsubseq DEPS NIL - DEPENDENCIES NIL VERSION 20150113-git SIBLINGS (xsubseq-test) PARASITES NIL) */ + SHA256 1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml URL + http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz + MD5 960bb8f329649b6e4b820e065e6b38e8 NAME xsubseq FILENAME xsubseq DEPS NIL + DEPENDENCIES NIL VERSION 20170830-git SIBLINGS (xsubseq-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 4de4947c07331..9a7fb3e5d1b8d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -139,4 +139,19 @@ $out/lib/common-lisp/query-fs" "cl-unification-lib.asd" ]; }; + simple-date = x: { + deps = with quicklisp-to-nix-packages; [ + fiveam md5 usocket + ]; + parasites = [ + "simple-date/tests" + ]; + }; + cl-postgres = x: { + deps = pkgs.lib.filter (x: x.outPath != quicklisp-to-nix-packages.simple-date.outPath) x.deps; + parasites = (x.parasites or []) ++ [ + "simple-date" "simple-date/postgres-glue" + ]; + asdFilesToKeep = x.asdFilesToKeep ++ ["simple-date.asd"]; + }; } diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 49aa941094bde..ebf09c43a0e0f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -25,11 +25,13 @@ cl-dbi cl-emb cl-fuse cl-fuse-meta-fs +cl-html-parse cl-json cl-l10n cl-libuv cl-mysql closer-mop +closure-html cl-ppcre cl-ppcre-template cl-ppcre-unicode diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 86817e14f5532..e931c12f1e72f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -16,18 +16,7 @@ let quicklisp-to-nix-packages = rec { })); - "simple-date-postgres-glue" = quicklisp-to-nix-packages."simple-date"; - - - "cl-postgres-tests" = quicklisp-to-nix-packages."cl-postgres"; - - - "asdf-finalizers" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."asdf-finalizers" or (x: {})) - (import ./quicklisp-to-nix-output/asdf-finalizers.nix { - inherit fetchurl; - })); + "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres"; "lisp-unit2" = buildLispPackage @@ -73,6 +62,9 @@ let quicklisp-to-nix-packages = rec { })); + "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date"; + + "unit-test" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."unit-test" or (x: {})) @@ -81,26 +73,6 @@ let quicklisp-to-nix-packages = rec { })); - "map-set" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."map-set" or (x: {})) - (import ./quicklisp-to-nix-output/map-set.nix { - inherit fetchurl; - })); - - - "babel-streams" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."babel-streams" or (x: {})) - (import ./quicklisp-to-nix-output/babel-streams.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - })); - - "rt" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."rt" or (x: {})) @@ -117,35 +89,6 @@ let quicklisp-to-nix-packages = rec { })); - "plump-parser" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."plump-parser" or (x: {})) - (import ./quicklisp-to-nix-output/plump-parser.nix { - inherit fetchurl; - "array-utils" = quicklisp-to-nix-packages."array-utils"; - "plump-dom" = quicklisp-to-nix-packages."plump-dom"; - "plump-lexer" = quicklisp-to-nix-packages."plump-lexer"; - "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; - })); - - - "plump-lexer" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."plump-lexer" or (x: {})) - (import ./quicklisp-to-nix-output/plump-lexer.nix { - inherit fetchurl; - })); - - - "plump-dom" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."plump-dom" or (x: {})) - (import ./quicklisp-to-nix-output/plump-dom.nix { - inherit fetchurl; - "array-utils" = quicklisp-to-nix-packages."array-utils"; - })); - - "uuid" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."uuid" or (x: {})) @@ -165,6 +108,7 @@ let quicklisp-to-nix-packages = rec { "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; "fiveam" = quicklisp-to-nix-packages."fiveam"; "md5" = quicklisp-to-nix-packages."md5"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -175,6 +119,8 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; "md5" = quicklisp-to-nix-packages."md5"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -183,10 +129,21 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."qmynd" or (x: {})) (import ./quicklisp-to-nix-output/qmynd.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "asdf-finalizers" = quicklisp-to-nix-packages."asdf-finalizers"; "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "chipz" = quicklisp-to-nix-packages."chipz"; + "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "ironclad" = quicklisp-to-nix-packages."ironclad"; "list-of" = quicklisp-to-nix-packages."list-of"; + "nibbles" = quicklisp-to-nix-packages."nibbles"; + "salza2" = quicklisp-to-nix-packages."salza2"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -209,13 +166,15 @@ let quicklisp-to-nix-packages = rec { "alexandria" = quicklisp-to-nix-packages."alexandria"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; - "cl-postgres-tests" = quicklisp-to-nix-packages."cl-postgres-tests"; + "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres_slash_tests"; "closer-mop" = quicklisp-to-nix-packages."closer-mop"; "fiveam" = quicklisp-to-nix-packages."fiveam"; "md5" = quicklisp-to-nix-packages."md5"; "s-sql" = quicklisp-to-nix-packages."s-sql"; "simple-date" = quicklisp-to-nix-packages."simple-date"; - "simple-date-postgres-glue" = quicklisp-to-nix-packages."simple-date-postgres-glue"; + "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -358,6 +317,14 @@ let quicklisp-to-nix-packages = rec { })); + "asdf-finalizers" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."asdf-finalizers" or (x: {})) + (import ./quicklisp-to-nix-output/asdf-finalizers.nix { + inherit fetchurl; + })); + + "abnf" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."abnf" or (x: {})) @@ -369,6 +336,18 @@ let quicklisp-to-nix-packages = rec { })); + "stefil" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."stefil" or (x: {})) + (import ./quicklisp-to-nix-output/stefil.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "metabang-bind" = quicklisp-to-nix-packages."metabang-bind"; + "swank" = quicklisp-to-nix-packages."swank"; + })); + + "lack-component" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lack-component" or (x: {})) @@ -424,14 +403,6 @@ let quicklisp-to-nix-packages = rec { })); - "eos" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."eos" or (x: {})) - (import ./quicklisp-to-nix-output/eos.nix { - inherit fetchurl; - })); - - "xpath" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."xpath" or (x: {})) @@ -547,6 +518,9 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "fiveam" = quicklisp-to-nix-packages."fiveam"; "md5" = quicklisp-to-nix-packages."md5"; + "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -577,6 +551,15 @@ let quicklisp-to-nix-packages = rec { })); + "fiasco" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fiasco" or (x: {})) + (import ./quicklisp-to-nix-output/fiasco.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + "cl-paths" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-paths" or (x: {})) @@ -716,14 +699,6 @@ let quicklisp-to-nix-packages = rec { })); - "named-readtables" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."named-readtables" or (x: {})) - (import ./quicklisp-to-nix-output/named-readtables.nix { - inherit fetchurl; - })); - - "dbi" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."dbi" or (x: {})) @@ -741,27 +716,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-annot" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-annot" or (x: {})) - (import ./quicklisp-to-nix-output/cl-annot.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - })); - - - "cl-fad" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-fad" or (x: {})) - (import ./quicklisp-to-nix-output/cl-fad.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "unit-test" = quicklisp-to-nix-packages."unit-test"; - })); - - "lift" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lift" or (x: {})) @@ -824,14 +778,6 @@ let quicklisp-to-nix-packages = rec { })); - "trivial-gray-streams" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."trivial-gray-streams" or (x: {})) - (import ./quicklisp-to-nix-output/trivial-gray-streams.nix { - inherit fetchurl; - })); - - "cffi-toolchain" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cffi-toolchain" or (x: {})) @@ -852,6 +798,22 @@ let quicklisp-to-nix-packages = rec { })); + "trivial-gray-streams" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-gray-streams" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-gray-streams.nix { + inherit fetchurl; + })); + + + "named-readtables" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."named-readtables" or (x: {})) + (import ./quicklisp-to-nix-output/named-readtables.nix { + inherit fetchurl; + })); + + "myway" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."myway" or (x: {})) @@ -868,6 +830,14 @@ let quicklisp-to-nix-packages = rec { })); + "map-set" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."map-set" or (x: {})) + (import ./quicklisp-to-nix-output/map-set.nix { + inherit fetchurl; + })); + + "do-urlencode" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."do-urlencode" or (x: {})) @@ -911,6 +881,39 @@ let quicklisp-to-nix-packages = rec { })); + "cl-fad" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-fad" or (x: {})) + (import ./quicklisp-to-nix-output/cl-fad.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "unit-test" = quicklisp-to-nix-packages."unit-test"; + })); + + + "cl-annot" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-annot" or (x: {})) + (import ./quicklisp-to-nix-output/cl-annot.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "babel-streams" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."babel-streams" or (x: {})) + (import ./quicklisp-to-nix-output/babel-streams.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "anaphora" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."anaphora" or (x: {})) @@ -1213,9 +1216,7 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/plump.nix { inherit fetchurl; "array-utils" = quicklisp-to-nix-packages."array-utils"; - "plump-dom" = quicklisp-to-nix-packages."plump-dom"; - "plump-lexer" = quicklisp-to-nix-packages."plump-lexer"; - "plump-parser" = quicklisp-to-nix-packages."plump-parser"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; })); @@ -1228,6 +1229,7 @@ let quicklisp-to-nix-packages = rec { "abnf" = quicklisp-to-nix-packages."abnf"; "alexandria" = quicklisp-to-nix-packages."alexandria"; "anaphora" = quicklisp-to-nix-packages."anaphora"; + "asdf-finalizers" = quicklisp-to-nix-packages."asdf-finalizers"; "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections"; "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; @@ -1273,11 +1275,13 @@ let quicklisp-to-nix-packages = rec { "qmynd" = quicklisp-to-nix-packages."qmynd"; "quri" = quicklisp-to-nix-packages."quri"; "s-sql" = quicklisp-to-nix-packages."s-sql"; + "salza2" = quicklisp-to-nix-packages."salza2"; "simple-date" = quicklisp-to-nix-packages."simple-date"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "sqlite" = quicklisp-to-nix-packages."sqlite"; "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8"; "uiop" = quicklisp-to-nix-packages."uiop"; @@ -1358,8 +1362,10 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "array-utils" = quicklisp-to-nix-packages."array-utils"; "clss" = quicklisp-to-nix-packages."clss"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; "form-fiddle" = quicklisp-to-nix-packages."form-fiddle"; "plump" = quicklisp-to-nix-packages."plump"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; })); @@ -1371,6 +1377,7 @@ let quicklisp-to-nix-packages = rec { "alexandria" = quicklisp-to-nix-packages."alexandria"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "stefil" = quicklisp-to-nix-packages."stefil"; })); @@ -1460,7 +1467,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."ieee-floats" or (x: {})) (import ./quicklisp-to-nix-output/ieee-floats.nix { inherit fetchurl; - "eos" = quicklisp-to-nix-packages."eos"; + "fiveam" = quicklisp-to-nix-packages."fiveam"; })); @@ -1532,6 +1539,7 @@ let quicklisp-to-nix-packages = rec { "quri" = quicklisp-to-nix-packages."quri"; "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "xsubseq" = quicklisp-to-nix-packages."xsubseq"; })); @@ -1553,6 +1561,7 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/form-fiddle.nix { inherit fetchurl; "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; })); @@ -1582,7 +1591,11 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/fast-io.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; })); @@ -1595,8 +1608,11 @@ let quicklisp-to-nix-packages = rec { "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "proc-parse" = quicklisp-to-nix-packages."proc-parse"; "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "xsubseq" = quicklisp-to-nix-packages."xsubseq"; })); @@ -1638,6 +1654,10 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."drakma" or (x: {})) (import ./quicklisp-to-nix-output/drakma.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; @@ -1645,6 +1665,10 @@ let quicklisp-to-nix-packages = rec { "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -1667,6 +1691,7 @@ let quicklisp-to-nix-packages = rec { "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; @@ -1736,6 +1761,7 @@ let quicklisp-to-nix-packages = rec { "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -1814,6 +1840,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."clx" or (x: {})) (import ./quicklisp-to-nix-output/clx.nix { inherit fetchurl; + "fiasco" = quicklisp-to-nix-packages."fiasco"; })); @@ -1937,7 +1964,9 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/clss.nix { inherit fetchurl; "array-utils" = quicklisp-to-nix-packages."array-utils"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; "plump" = quicklisp-to-nix-packages."plump"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; })); @@ -2056,6 +2085,20 @@ let quicklisp-to-nix-packages = rec { })); + "closure-html" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closure-html" or (x: {})) + (import ./quicklisp-to-nix-output/closure-html.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "closer-mop" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."closer-mop" or (x: {})) @@ -2128,6 +2171,14 @@ let quicklisp-to-nix-packages = rec { })); + "cl-html-parse" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-html-parse" or (x: {})) + (import ./quicklisp-to-nix-output/cl-html-parse.nix { + inherit fetchurl; + })); + + "cl-fuse-meta-fs" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-fuse-meta-fs" or (x: {})) @@ -2378,8 +2429,12 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/circular-streams.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; "fast-io" = quicklisp-to-nix-packages."fast-io"; "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; })); @@ -2424,16 +2479,41 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."caveman" or (x: {})) (import ./quicklisp-to-nix-output/caveman.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; "anaphora" = quicklisp-to-nix-packages."anaphora"; + "babel" = quicklisp-to-nix-packages."babel"; + "babel-streams" = quicklisp-to-nix-packages."babel-streams"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "circular-streams" = quicklisp-to-nix-packages."circular-streams"; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; "cl-emb" = quicklisp-to-nix-packages."cl-emb"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "cl-project" = quicklisp-to-nix-packages."cl-project"; "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; "clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat"; + "dexador" = quicklisp-to-nix-packages."dexador"; "do-urlencode" = quicklisp-to-nix-packages."do-urlencode"; + "http-body" = quicklisp-to-nix-packages."http-body"; + "lack" = quicklisp-to-nix-packages."lack"; + "let-plus" = quicklisp-to-nix-packages."let-plus"; "local-time" = quicklisp-to-nix-packages."local-time"; + "map-set" = quicklisp-to-nix-packages."map-set"; + "marshal" = quicklisp-to-nix-packages."marshal"; "myway" = quicklisp-to-nix-packages."myway"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "prove" = quicklisp-to-nix-packages."prove"; + "quri" = quicklisp-to-nix-packages."quri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "usocket" = quicklisp-to-nix-packages."usocket"; })); diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp index 2623990856e39..63d6f3305194a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp @@ -98,7 +98,10 @@ will use it instead of re-computing the system data.") "Return the path to the file that (if it exists) contains pre-computed system data." (when *system-data-memoization-path* - (merge-pathnames (make-pathname :name system :type "txt") *system-data-memoization-path*))) + (merge-pathnames + (make-pathname + :name (escape-filename (string system)) + :type "txt") *system-data-memoization-path*))) (defun memoized-system-data (system) "Attempts to locate memoized system data in the path specified by diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix index d3cb7b36aeebe..9eba1e15b7996 100644 --- a/pkgs/development/lisp-modules/shell.nix +++ b/pkgs/development/lisp-modules/shell.nix @@ -10,6 +10,6 @@ self = rec { lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info ]; CPATH = "${libfixposix}/include"; - LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib"; + LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${mysql.connector-c}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib"; }; in stdenv.mkDerivation self diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index 091d1adfefbc4..18ad3048d832b 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Mount Android phones on Linux with adb, no root required"; inherit (src.meta) homepage; license = licenses.bsd3; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ Profpatsch ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 49380392bab56..ad9d79fd88ece 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -44,6 +44,7 @@ , "js-beautify" , "jsonlint" , "jsontool" +, "json-diff" , "json-refs" , "json-server" , "js-yaml" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 316693ecec0bb..90f5fd309d005 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -4135,6 +4135,15 @@ let sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; }; }; + "cli-color-0.1.7" = { + name = "cli-color"; + packageName = "cli-color"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-color/-/cli-color-0.1.7.tgz"; + sha1 = "adc3200fa471cc211b0da7f566b71e98b9d67347"; + }; + }; "cli-cursor-1.0.2" = { name = "cli-cursor"; packageName = "cli-cursor"; @@ -6998,6 +7007,15 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; + "difflib-0.2.4" = { + name = "difflib"; + packageName = "difflib"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz"; + sha1 = "b5e30361a6db023176d562892db85940a718f47e"; + }; + }; "director-1.2.7" = { name = "director"; packageName = "director"; @@ -7331,6 +7349,15 @@ let sha1 = "531319715b0e81ffcc22eb28478ba27643e12c6c"; }; }; + "dreamopt-0.6.0" = { + name = "dreamopt"; + packageName = "dreamopt"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dreamopt/-/dreamopt-0.6.0.tgz"; + sha1 = "d813ccdac8d39d8ad526775514a13dda664d6b4b"; + }; + }; "dtrace-provider-0.6.0" = { name = "dtrace-provider"; packageName = "dtrace-provider"; @@ -7890,6 +7917,15 @@ let sha512 = "0m7d1yd67hb93gsxv7790h9ayxg3pwf3vgih9v2kxqvsg073wim7jgwf3z57lksdczxnqv2d8gm4mfk4b29f6rc27a7c09vz9w348wc"; }; }; + "es5-ext-0.8.2" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.8.2.tgz"; + sha1 = "aba8d9e1943a895ac96837a62a39b3f55ecd94ab"; + }; + }; "es5class-2.3.1" = { name = "es5class"; packageName = "es5class"; @@ -11005,6 +11041,15 @@ let sha1 = "6e62fae668947f88184d5c156ede7c5695a7e9c8"; }; }; + "heap-0.2.6" = { + name = "heap"; + packageName = "heap"; + version = "0.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/heap/-/heap-0.2.6.tgz"; + sha1 = "087e1f10b046932fc8594dd9e6d378afc9d1e5ac"; + }; + }; "help-me-1.1.0" = { name = "help-me"; packageName = "help-me"; @@ -32651,6 +32696,30 @@ in production = true; bypassCache = false; }; + json-diff = nodeEnv.buildNodePackage { + name = "json-diff"; + packageName = "json-diff"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-diff/-/json-diff-0.5.2.tgz"; + sha512 = "03nqzpjpb0422fm5k7prlfcyb7wbs7dq7arwzq0za8zq3jy4wvbjjsbm25vr8ar5y6y87k9y1iqyc018zfysh2b675ql3qx6jjimfip"; + }; + dependencies = [ + sources."cli-color-0.1.7" + sources."difflib-0.2.4" + sources."dreamopt-0.6.0" + sources."es5-ext-0.8.2" + sources."heap-0.2.6" + sources."wordwrap-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "JSON diff"; + homepage = https://github.com/andreyvit/json-diff; + }; + production = true; + bypassCache = false; + }; json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index 49cc56a1db6a7..a965d6ed11630 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -1,26 +1,21 @@ -{ stdenv, fetchzip, fetchpatch, ocaml, findlib, ocamlbuild, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camlp4, uutf, markup, ppx_tools_versioned, re }: assert stdenv.lib.versionAtLeast ocaml.version "4.02"; stdenv.mkDerivation rec { pname = "tyxml"; - version = "4.0.1"; + version = "4.2.0"; name = "ocaml${ocaml.version}-${pname}-${version}"; src = fetchzip { url = "http://github.com/ocsigen/tyxml/archive/${version}.tar.gz"; - sha256 = "1mwkjvl78gvw7pvql5qp64cfjjca6aqsb04999qkllifyicaaq8y"; + sha256 = "1zrkrmxyj5a2cdh4b9zr9anwfk320wv3x0ynxnyxl5za2ix8sld8"; }; - patches = [ (fetchpatch { - url = https://github.com/dbuenzli/tyxml/commit/a2bf5ccc0b6e684e7b81274ff19df8d72e2def8d.diff; - sha256 = "11sidgiwz3zqw815vlslbfzb456z0lndkh425mlmvnmck4d2v2i3"; - })]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ppx_tools_versioned markup ]; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; - - propagatedBuildInputs = [uutf re ppx_tools markup]; + propagatedBuildInputs = [ uutf re ]; createFindlibDestdir = true; diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index a2a439b295b01..2737ad95d4b72 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -2,11 +2,11 @@ buildPerlPackage rec { name = "DBD-SQLite-${version}"; - version = "1.54"; + version = "1.55_07"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/${name}.tar.gz"; - sha256 = "3929a6dbd8d71630f0cb57f85dcef9588cd7ac4c9fa12db79df77b9d3a4d7269"; + url = "https://github.com/DBD-SQLite/DBD-SQLite/archive/${version}.tar.gz"; + sha256 = "0213a31eb7b5afc2d7b3775ca2d1717d07fc7e9ed21ae73b2513a8d54ca222d8"; }; propagatedBuildInputs = [ DBI ]; @@ -17,8 +17,7 @@ buildPerlPackage rec { ./external-sqlite.patch ]; - SQLITE_INC = sqlite.dev + "/include"; - SQLITE_LIB = sqlite.out + "/lib"; + makeMakerFlags = "SQLITE_INC=${sqlite.dev}/include SQLITE_LIB=${sqlite.out}/lib"; preBuild = '' diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 8f8d91c64d2f0..99cc4c3eab8ab 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -6,7 +6,7 @@ , glibcLocales , pytest , pytestcov -, pytest-mock +, mock , pygments , pillow , dateutil @@ -28,7 +28,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "Nikola"; version = "7.8.11"; @@ -37,7 +36,7 @@ buildPythonPackage rec { # other hand doesn't support Python 3.3). So, just disable Python 2. disabled = !isPy3k; - buildInputs = [ pytest pytestcov pytest-mock glibcLocales ]; + checkInputs = [ pytest pytestcov mock glibcLocales ]; propagatedBuildInputs = [ pygments pillow dateutil docutils Mako unidecode lxml Yapsy PyRSS2Gen diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index a1fb96673957f..bfd23ab584f95 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "adal"; - version = "0.4.7"; + version = "0.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "114046ac85d0054791c21b00922f26286822bc6f2ba3716db42e7e57f762ef20"; + sha256 = "120821f72ca9d59a7c7197fc14d0e27448ff8d331fae230f92d713b9b5c721f7"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index cb0113c22b3d1..b39df3959fae9 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "agate-excel"; - version = "0.2.1"; + version = "0.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1d28s01a0a8n8rdrd78w88cqgl3lawzy38h9afwm0iks618i0qn7"; + sha256 = "8923f71ee2b5b7b21e52fb314a769b28fb902f647534f5cbbb41991d8710f4c7"; }; propagatedBuildInputs = [ agate openpyxl xlrd ]; diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 0167b40ea43f1..34de9ea06e9c6 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "agate-sql"; - version = "0.5.2"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "0qlfwql6fnbs0r1rj7nxv4n5scad53b8dlh4qv6gyklvdk3wwn14"; + sha256 = "877b7b85adb5f0325455bba8d50a1623fa32af33680b554feca7c756a15ad9b4"; }; propagatedBuildInputs = [ agate sqlalchemy ]; diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix new file mode 100644 index 0000000000000..b865b5654964a --- /dev/null +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi }: + +# This package provides a binary "apython" which sometimes invokes +# [sys.executable, '-m', 'aioconsole'] as a subprocess. If apython is +# run directly out of this derivation, it won't work, because +# sys.executable will point to a Python binary that is not wrapped to +# be able to find aioconsole. +# However, apython will work fine when using python##.withPackages, +# because with python##.withPackages the sys.executable is already +# wrapped to be able to find aioconsole and any other packages. +buildPythonPackage rec { + pname = "aioconsole"; + version = "0.1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "17bnfcp0gacnmpdam6byb7rwhqibw57f736bbgk45w4cy2lglj3y"; + }; + + # hardcodes a test dependency on an old version of pytest-asyncio + doCheck = false; + + meta = { + description = "Asynchronous console and interfaces for asyncio"; + homepage = https://github.com/vxgmichel/aioconsole; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.catern ]; + }; +} diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index bea839f49e3df..f831679294a47 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -9,7 +9,6 @@ , idna-ssl , pytest , gunicorn -, pytest-raisesregexp , pytest-mock }: @@ -24,7 +23,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.4"; - checkInputs = [ pytest gunicorn pytest-raisesregexp pytest-mock ]; + checkInputs = [ pytest gunicorn pytest-mock ]; propagatedBuildInputs = [ async-timeout chardet multidict yarl ] ++ lib.optional (pythonOlder "3.7") idna-ssl; diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix index ca29b631f4712..26b182dfc08a0 100644 --- a/pkgs/development/python-modules/ansicolor/default.nix +++ b/pkgs/development/python-modules/ansicolor/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "ansicolor"; - version = "0.2.4"; + version = "0.2.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0zlkk9706xn5yshwzdn8xsfkim8iv44zsl6qjwg2f4gn62rqky1h"; + sha256 = "d17e1b07b9dd7ded31699fbca53ae6cd373584f9b6dcbc124d1f321ebad31f1d"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/arxiv2bib/default.nix b/pkgs/development/python-modules/arxiv2bib/default.nix new file mode 100644 index 0000000000000..1182c36fc0cae --- /dev/null +++ b/pkgs/development/python-modules/arxiv2bib/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, python, lib, fetchFromGitHub +, mock +}: + +buildPythonPackage rec { + pname = "arxiv2bib"; + version = "1.0.8"; + + # Missing tests on Pypi + src = fetchFromGitHub { + owner = "nathangrigg"; + repo = "arxiv2bib"; + rev = version; + sha256 = "1kp2iyx20lpc9dv4qg5fgwf83a1wx6f7hj1ldqyncg0kn9xcrhbg"; + }; + + # Required for tests only + checkInputs = [ mock ]; + + checkPhase = "${python.interpreter} -m unittest discover -s tests"; + + meta = with lib; { + description = "Get a BibTeX entry from an arXiv id number, using the arxiv.org API"; + homepage = http://nathangrigg.github.io/arxiv2bib/; + license = licenses.bsd3; + maintainers = [ maintainers.nico202 ]; + }; +} diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index d88f44149bf23..a2815fc0c86fa 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, six }: buildPythonPackage rec { - version = "2.1.0"; + version = "2.1.1"; pname = "asgiref"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/a/asgiref/${name}.tar.gz"; - sha256 = "2bfd70fcc51df4036768b91d7b13524090dc8f366d79fa44ba2b0aeb47306344"; + sha256 = "112828022d772925b47b22caf8108dadd3b26bb0af719eb01b2c3a807795429d"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 76dba87f9648b..c6a3ac47aa70f 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -2,12 +2,11 @@ buildPythonPackage rec { pname = "astral"; - version = "1.4"; + version = "1.5"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "1zm1ypc6w279gh7lbgsfbzfxk2x4gihlq3rfh59hj70hmhjwiwp7"; + sha256 = "527628fbfe90c1596c3950ff84ebd07ecc10c8fb1044c903a0519b5057700cb6"; }; propagatedBuildInputs = [ pytz ]; diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 862157f686a30..d22a10ec15021 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "astroid"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "71dadba2110008e2c03f9fde662ddd2053db3c0489d0e03c94e828a0399edd4f"; + sha256 = "f0a0e386dbca9f93ea9f3ea6f32b37a24720502b7baa9cb17c3976a680d43a06"; }; propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ] diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index 650517d44d92a..53010a2a031dd 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -1,22 +1,19 @@ { lib -, fetchurl +, fetchPypi , buildPythonPackage , pytestrunner , pythonOlder }: -let +buildPythonPackage rec { pname = "async-timeout"; version = "2.0.0"; -in buildPythonPackage rec { - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "c17d8ac2d735d59aa62737d76f2787a6c938f5a944ecf768a8c0ab70b0dea566"; }; - buildInputs = [ pytestrunner ]; # Circular dependency on aiohttp doCheck = false; @@ -27,4 +24,4 @@ in buildPythonPackage rec { homepage = https://github.com/aio-libs/async_timeout/; license = lib.licenses.asl20; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 06ad939cfa8b4..6e58e3485ab2a 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.3.3"; + version = "1.3.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0c1gl648g2xnz3j0rsp71ld4i32zlglmqjvqf4q8r08jp3zpny7z"; + sha256 = "c7be71ab0cb2f50c9c22c82f0c9acaafc6f57492c3fbfee9790c415005c2b9a5"; }; propagatedBuildInputs = [ pycodestyle ]; diff --git a/pkgs/development/python-modules/awesome-slugify/default.nix b/pkgs/development/python-modules/awesome-slugify/default.nix index 105c70c28b34d..945c941dec4ea 100644 --- a/pkgs/development/python-modules/awesome-slugify/default.nix +++ b/pkgs/development/python-modules/awesome-slugify/default.nix @@ -3,13 +3,17 @@ buildPythonPackage rec { pname = "awesome-slugify"; version = "1.6.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "0wgxrhr8s5vk2xmcz9s1z1aml4ppawmhkbggl9rp94c747xc7pmv"; }; + prePatch = '' + substituteInPlace setup.py \ + --replace 'Unidecode>=0.04.14,<0.05' 'Unidecode>=0.04.14' + ''; + patches = [ ./slugify_filename_test.patch # fixes broken test by new unidecode ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 8f9c0fd74e6b5..897e9c884072b 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "botocore"; - version = "1.8.33"; + version = "1.8.36"; src = fetchPypi { inherit pname version; - sha256 = "fa29ea54f26b1193682332d3b4cdde7aa79b4eaccb23f70e88672509c24546f4"; + sha256 = "b2c9e0fd6d14910f759a33c19f8315dddedbb3c5569472b7be7ceed4f001a675"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 43a0a42f8e933..c4cde583f05bd 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.10.0"; + version = "2.11.0"; name = "${pname}-nix-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; - sha256 = "00wi0f6wpfl2gywr02x2yqvx6i1k0ll5w4lhdl0khijk4g7mk8dq"; + sha256 = "092b0a147d5fb4e79ee0afde665570f85738e714463854f9e4f7f38d0b27ea82"; }; patches = [ ./nix.patch ]; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix new file mode 100644 index 0000000000000..44613dd4e5bcc --- /dev/null +++ b/pkgs/development/python-modules/celery/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect, + pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet +}: +buildPythonPackage rec { + pname = "celery"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0dcb0s6kdcd3vc9pwvazngppkdbhwpmpjmghq6rifsld34q3gzvp"; + }; + + # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox + preCheck = '' + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \ + LD_PRELOAD=${libredirect}/lib/libredirect.so + ''; + postCheck = '' + unset NIX_REDIRECTS LD_PRELOAD + ''; + + buildInputs = [ pytest case ]; + propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ]; + + meta = with stdenv.lib; { + homepage = https://github.com/celery/celery/; + description = "Distributed task queue"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch b/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch deleted file mode 100644 index 27caa80dd4ca9..0000000000000 --- a/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Fix endless loop in logger_isa (Python 3.6) -Author: George Psarakis <giwrgos.psarakis@gmail.com> -Origin: upstream, https://github.com/celery/celery/commit/9c950b47eca2b4e93fd2fe52cf80f158e6cf97ad -Forwarded: not-needed -Reviewed-By: Nishanth Aravamudan <nish.aravamudan@canonical.com> -Last-Update: 2017-06-12 - ---- celery-4.0.2.orig/celery/utils/log.py -+++ celery-4.0.2/celery/utils/log.py -@@ -82,7 +82,7 @@ def logger_isa(l, p, max=1000): - else: - if this in seen: - raise RuntimeError( -- 'Logger {0!r} parents recursive'.format(l), -+ 'Logger {0!r} parents recursive'.format(l.name), - ) - seen.add(this) - this = this.parent diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 28d4a36aca7e4..5e186a8f2f8d9 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -32,6 +32,7 @@ if isPyPy then null else buildPythonPackage rec { # The tests use -Werror but with python3.6 clang detects some unreachable code. NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ]; + doCheck = !stdenv.hostPlatform.isMusl; # TODO: Investigate checkPhase = '' py.test ''; diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 06a455176a2a9..b7a58f11a15bd 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "chainer"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0mbc8kwk7pvg03bf0j57a48gr6rsdg4lzmyj0dak8y2l4lmyskpw"; + sha256 = "0669375e5b09d687781a37d6c025ee0a6015f575b4d2c70a2ad09c33b8228f86"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index e5c92ffcde266..36191b95479bd 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "channels"; name = "${pname}-${version}"; - version = "1.1.8"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0gsy3hwn1vd709jkw8ay44qrm6aw7qggr312z8xwzq0x4ihjda02"; + sha256 = "c365492b90bd936c763e06cd76bda96cd3e70e5a5d2a196c25754e0c1d8da85a"; }; # Files are missing in the distribution diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index 7e50dca40660d..1f452fb461a4e 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -2,7 +2,6 @@ , pytest, pytestrunner, hypothesis }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "chardet"; version = "3.0.4"; @@ -11,7 +10,7 @@ buildPythonPackage rec { sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; }; - buildInputs = [ pytest pytestrunner hypothesis ]; + checkInputs = [ pytest pytestrunner hypothesis ]; meta = with stdenv.lib; { homepage = https://github.com/chardet/chardet; diff --git a/pkgs/development/python-modules/click-threading/default.nix b/pkgs/development/python-modules/click-threading/default.nix index 5be41007c6a95..3fe2af19fef91 100644 --- a/pkgs/development/python-modules/click-threading/default.nix +++ b/pkgs/development/python-modules/click-threading/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "click-threading"; - version = "0.4.2"; + version = "0.4.4"; src = fetchPypi { inherit pname version; - sha256 = "400b0bb63d9096b6bf2806efaf742a1cc8b6c88e0484f0afe7d7a7f0e9870609"; + sha256 = "b2b0fada5bf184b56afaccc99d0d2548d8ab07feb2e95e29e490f6b99c605de7"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix new file mode 100644 index 0000000000000..606b174a514d0 --- /dev/null +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, openssl +, cryptography_vectors +, darwin +, idna +, asn1crypto +, packaging +, six +, pythonOlder +, enum34 +, ipaddress +, isPyPy +, cffi +, pytest +, pretend +, iso8601 +, pytz +, hypothesis +}: + +let + version = "2.1.4"; +in assert version == cryptography_vectors.version; buildPythonPackage rec { + # also bump cryptography_vectors + pname = "cryptography"; + inherit version; + + src = fetchPypi { + inherit pname version; + sha256 = "e4d967371c5b6b2e67855066471d844c5d52d210c36c28d49a8507b96e2c5291"; + }; + + outputs = [ "out" "dev" ]; + + buildInputs = [ openssl cryptography_vectors ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + propagatedBuildInputs = [ + idna + asn1crypto + packaging + six + ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34 + ++ stdenv.lib.optional (pythonOlder "3.3") ipaddress + ++ stdenv.lib.optional (!isPyPy) cffi; + + checkInputs = [ + pytest + pretend + iso8601 + pytz + hypothesis + ]; + + # The test assumes that if we're on Sierra or higher, that we use `getentropy`, but for binary + # compatibility with pre-Sierra for binary caches, we hide that symbol so the library doesn't + # use it. This boils down to them checking compatibility with `getentropy` in two different places, + # so let's neuter the second test. + postPatch = '' + substituteInPlace ./tests/hazmat/backends/test_openssl.py --replace '"16.0"' '"99.0"' + ''; + + # IOKit's dependencies are inconsistent between OSX versions, so this is the best we + # can do until nix 1.11's release + __impureHostDeps = [ "/usr/lib" ]; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix new file mode 100644 index 0000000000000..ce272d29ca190 --- /dev/null +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -0,0 +1,18 @@ +{ buildPythonPackage +, fetchPypi +, cryptography +}: + +buildPythonPackage rec { + # also bump cryptography + pname = "cryptography_vectors"; + version = "2.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "78c4b4f3f84853ea5d038e2f53d355229dd8119fe9cf949c3e497c85c760a5ca"; + }; + + # No tests included + doCheck = false; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 6ac91c0aa2554..e020eafc04c83 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0si0ri8azxvxh3lpm4l4g60jf4nwzibi53yldbdbzb1svlqq060r"; + sha256 = "7426f6332cb01513d2a6a687792dfa17c678ff64dd1b19b04559ddd5672c833f"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index f819a234146be..6fec8bf882c74 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "daphne"; name = "${pname}-${version}"; - version = "1.4.2"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "302725f223853b05688f28c361e050f8db9568b1ce27340c76272c26b49e6d72"; + sha256 = "ecd43a2dd889fb74e16bf8b7f67c076c4ec1b36229ce782272e46c50d56174dd"; }; buildInputs = [ hypothesis ]; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index b73a1e9ec7fcf..fdc408e1c4c10 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -1,41 +1,40 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, isPy3k +{ lib, fetchPypi, buildPythonPackage, isPy3k , nose -, nose-parameterized +, parameterized , mock , glibcLocales , six , jdatetime -, pyyaml , dateutil , umalqurra , pytz , tzlocal , regex , ruamel_yaml }: + buildPythonPackage rec { pname = "dateparser"; - version = "0.6.0"; + version = "0.7.0"; - src = fetchFromGitHub { - owner = "scrapinghub"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "0q2vyzvlj46r6pr0s6m1a0md1cpg9nv1n3xw286l4x2cc7fj2g3y"; + src = fetchPypi { + inherit pname version; + sha256 = "940828183c937bcec530753211b70f673c0a9aab831e43273489b310538dff86"; }; - # Upstream Issue: https://github.com/scrapinghub/dateparser/issues/364 - disabled = isPy3k; - - checkInputs = [ nose nose-parameterized mock glibcLocales ]; + checkInputs = [ nose mock parameterized six glibcLocales ]; preCheck ='' # skip because of missing convertdate module, which is an extra requirement rm tests/test_jalali.py ''; - propagatedBuildInputs = [ six jdatetime pyyaml dateutil - umalqurra pytz tzlocal regex ruamel_yaml ]; + propagatedBuildInputs = [ + # install_requires + dateutil pytz regex tzlocal + # extra_requires + jdatetime ruamel_yaml umalqurra + ]; - meta = with stdenv.lib;{ + meta = with lib; { description = "Date parsing library designed to parse dates from HTML pages"; homepage = https://github.com/scrapinghub/dateparser; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix new file mode 100644 index 0000000000000..a455db96c22b9 --- /dev/null +++ b/pkgs/development/python-modules/dendropy/default.nix @@ -0,0 +1,34 @@ +{ lib +, pkgs +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "DendroPy"; + version = "4.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "bd5b35ce1a1c9253209b7b5f3939ac22beaa70e787f8129149b4f7ffe865d510"; + }; + + prePatch = '' + # Test removed/disabled and reported upstream: https://github.com/jeetsukumaran/DendroPy/issues/74 + rm -f dendropy/test/test_dataio_nexml_reader_tree_list.py + ''; + + preCheck = '' + # Needed for unicode python tests + export LC_ALL="en_US.UTF-8" + ''; + + checkInputs = [ pkgs.glibcLocales ]; + + meta = { + homepage = http://dendropy.org/; + description = "A Python library for phylogenetic computing"; + maintainers = with lib.maintainers; [ unode ]; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/dicttoxml/default.nix b/pkgs/development/python-modules/dicttoxml/default.nix new file mode 100644 index 0000000000000..7d30aad69c456 --- /dev/null +++ b/pkgs/development/python-modules/dicttoxml/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "dicttoxml"; + version = "1.7.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "ea44cc4ec6c0f85098c57a431a1ee891b3549347b07b7414c8a24611ecf37e45"; + }; + + # No tests in archive + doCheck = false; + + meta = { + description = "Converts a Python dictionary or other native data type into a valid XML string"; + homepage = https://github.com/quandyfactory/dicttoxml; + license = lib.licenses.gpl2; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index e2fedfdaaf3e3..1e3d60b765cd0 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "django-polymorphic"; - version = "1.3"; + version = "2.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "8737b465ebf5fad772b4c52272189c352f5904f468d298584a3469187e3207ad"; + sha256 = "78f666149ea10cdda08ac6c25ddf4b4e582ee380be87e7968bfed008ef39dfa5"; }; checkInputs = [ django ]; diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 4ce013ac79769..e0ab354173e3b 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,13 +3,13 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "2.7.0"; + version = "3.0.0"; pname = "docker"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/docker/${name}.tar.gz"; - sha256 = "144248308e8ea31c4863c6d74e1b55daf97cc190b61d0fe7b7313ab920d6a76c"; + sha256 = "4a1083656c6ac7615c19094d9b5e052f36e38d0b07e63d7e506c9b5b32c3abe2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index d29174209a9d7..b09bef9fec4e6 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.4"; + version = "1.3.5"; name = "${pname}-${version}"; disabled = !(isPy27 || pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "10d6d7886235f4b9fa4ba401daef87c27937a04d2763f507643d730e51de37b6"; + sha256 = "3818b39e77c26fc1a37767a74fdd5e7d02877d75ed901ead2f40bd03baaa109f"; }; # disabled for now due to Tensorflow trying to create files in $HOME: diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 5d617ba9369b0..46d26e80d563e 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.0.0"; + version = "3.0.4"; src = fetchPypi { inherit pname version; - sha256 = "b3ad481724adfb2280773edd95ce501e497e88fa4489c6e41e637ab3fd9a456c"; + sha256 = "011327d4ed939693a5b28c0fdf2fd9bda1f68614c1d6d0643a89382ce9843a71"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/fpdf/default.nix b/pkgs/development/python-modules/fpdf/default.nix new file mode 100644 index 0000000000000..c09d54ad55553 --- /dev/null +++ b/pkgs/development/python-modules/fpdf/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, writeText, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "fpdf"; + version = "1.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0yb73c2clv581sgak5jvlvkj4wy3jav6ms5ia8jx3rw969w40n0j"; + }; + + # No tests available + doCheck = false; + + meta = { + homepage = https://github.com/reingart/pyfpdf; + description = "Simple PDF generation for Python"; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ geistesk ]; + }; +} diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index e54531017f4c9..d88c894009c15 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 = "5.2.0"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b9f84a1437f68ad0bb964fd9da9f6b88d090113ec9e78f290f6d6d0221468e38"; + sha256 = "0ba702d5138f9b35df32b55920c9466208608108f1f3d5de1a68c17e3d68cb7f"; }; propagatedBuildInputs = [ html5lib wcwidth]; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 4edd9ac3e5517..0c1ffacd827ba 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 = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "db00b68c6567ba0598d400b917c889e8801adf249170ce0a80ec38187d1b0797"; + sha256 = "6b2a813887583e63c8cedd26a91782e5f1e416a11f85394a92ae3ff908e0be03"; }; propagatedBuildInputs = [ smart_open numpy six scipy diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index 796bd26febd0b..a388c0fa70cbd 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "0.30.0"; + version = "0.31.0"; src = fetchPypi { inherit pname version; - sha256 = "0ckigh6bfzhflhllqdnfygm8w0r6ncp0myf1midifx7sn880g4pa"; + sha256 = "b0f6a542165750e42b1c92e6c465e8dc35c38d138ae7f08174971ab9b0df2a71"; }; propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ]; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index c22f2c2f4d7b0..ea59bedc03592 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "grpcio"; - version = "1.8.4"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "88d87aab9c7889b3ab29dd74aac1a5493ed78b9bf5afba1c069c9dd5531f951d"; + sha256 = "b61d3a7c45aa08f15dfa735a6a8282b5097be91ff36ad347594d3945ffc12181"; }; propagatedBuildInputs = [ six protobuf ] diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index e9bae3f82060b..bdbdcdcc2e743 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, buildPythonPackage , numpy, hdf5, cython, six, pkgconfig -, mpi4py ? null }: +, mpi4py ? null, openssh }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -24,6 +24,10 @@ in buildPythonPackage rec { postConfigure = '' ${python.executable} setup.py configure ${configure_flags} + + # Needed to run the tests reliably. See: + # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30 + ${optionalString mpiSupport "export OMPI_MCA_rmaps_base_oversubscribe=yes"} ''; preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; @@ -33,7 +37,7 @@ in buildPythonPackage rec { ++ optional mpiSupport mpi ; propagatedBuildInputs = [ numpy six] - ++ optional mpiSupport mpi4py + ++ optionals mpiSupport [ mpi4py openssh ] ; meta = { diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix new file mode 100644 index 0000000000000..09d82d74f2b1a --- /dev/null +++ b/pkgs/development/python-modules/habanero/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage, lib, fetchFromGitHub +, requests +, nose, vcrpy +}: + +buildPythonPackage rec { + pname = "habanero"; + version = "0.6.0"; + + # Install from Pypi is failing because of a missing file (Changelog.rst) + src = fetchFromGitHub { + owner = "sckott"; + repo = pname; + rev = "v${version}"; + sha256 = "1l2cgl6iiq8jff2w2pib6w8dwaj8344crhwsni2zzq0p44dwi13d"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ nose vcrpy ]; + checkPhase = "make test"; + + meta = { + description = "Python interface to Library Genesis"; + homepage = http://habanero.readthedocs.io/en/latest/; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/development/python-modules/hglib/default.nix b/pkgs/development/python-modules/hglib/default.nix index 4e96f9389918a..8acaf9f063763 100644 --- a/pkgs/development/python-modules/hglib/default.nix +++ b/pkgs/development/python-modules/hglib/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "python-hglib"; - version = "2.4"; + version = "2.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0qll9cc9ndqizby00gxdcf6d0cysdhjkr8670a4ffrk55bcnwgb9"; + sha256 = "fee180bb6796e5d2d25158b2d3c9f048648e427dd28b23a58d369adb14dd67cb"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix new file mode 100644 index 0000000000000..492c4da6fcc9e --- /dev/null +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, enum-compat +, xorgserver, pytest, i3, python +}: + +buildPythonPackage rec { + pname = "i3ipc"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "acrisci"; + repo = "i3ipc-python"; + rev = "v${version}"; + sha256 = "15drq16ncmjrgsri6gjzp0qm8abycm92nicm78q3k7vy7rqpvfnh"; + }; + + propagatedBuildInputs = [ enum-compat ]; + + checkInputs = [ xorgserver pytest i3 ]; + + checkPhase = ''${python.interpreter} run-tests.py''; + + meta = with stdenv.lib; { + description = "An improved Python library to control i3wm"; + homepage = https://github.com/acrisci/i3ipc-python; + license = licenses.bsd3; + maintainers = with maintainers; [ vanzef ]; + }; +} diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index f77c3570c02f8..b41f70c073c04 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.1.0"; + version = "7.1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "3e2be7dea4f97c9a4df71ef065cad9f2e420dd901127bf7cb690fb56d2b34ea3"; + sha256 = "69e8c444e99601e6f9b9e9e596c87c19665fc73c2dd05cd507c94f35fba2959d"; }; # Tests are not distributed diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index cb0eb130a2f24..7432b3bb99c54 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -1,16 +1,13 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ stdenv, buildPythonPackage, fetchPypi , pytest, markupsafe }: buildPythonPackage rec { pname = "Jinja2"; - version = "2.9.6"; - name = "${pname}-${version}"; + version = "2.10"; - src = fetchFromGitHub { - owner = "pallets"; - repo = "jinja"; - rev = version; - sha256 = "1xxc5vdhz214aawmllv0fi4ak6d7zac662yb7gn1xfgqfz392pg5"; + src = fetchPypi { + inherit pname version; + sha256 = "f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"; }; checkInputs = [ pytest ]; @@ -29,7 +26,6 @@ buildPythonPackage rec { Django inspired non-XML syntax but supports inline expressions and an optional sandboxed environment. ''; - platforms = platforms.all; maintainers = with maintainers; [ pierron garbas sjourdois ]; }; } diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 42d7752eda3bc..d94842ade1268 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -11,19 +11,20 @@ , ipython , mock , pytest +, tornado }: buildPythonPackage rec { pname = "jupyter_client"; - version = "5.2.1"; + version = "5.2.2"; src = fetchPypi { inherit pname version; - sha256 = "462790d46b244f0a631ea5e3cd5cdbad6874d5d24cc0ff512deb7c16cdf8653d"; + sha256 = "83d5e23132f0d8f79ccd3939f53fb9fa97f88a896a85114dc48d0e86909b06c4"; }; checkInputs = [ ipykernel ipython mock pytest ]; - propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil] ++ lib.optional isPyPy py; + propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil tornado ] ++ lib.optional isPyPy py; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 0f99152766a32..8c97b18e9b614 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "keyring"; - version = "10.6.0"; + version = "11.0.0"; src = fetchPypi { inherit pname version; - sha256 = "69c2b69d66a0db1165c6875c1833c52f4dc62179959692b30c8c4a4b8390d895"; + sha256 = "b4607520a7c97be96be4ddc00f4b9dac65f47a45af4b4cd13ed5a8879641d646"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 672cad5bfe174..57f47ff5fd829 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "limits"; - version = "1.2.1"; + version = "1.3"; src = fetchPypi { inherit pname version; - sha256 = "0dfbrmqixsvhvzqgd4s8rfj933k1w5q4bm23pp9zyp70xlb0mfmd"; + sha256 = "a017b8d9e9da6761f4574642149c337f8f540d4edfe573fb91ad2c4001a2bc76"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix index 0e9386f667c54..4bc48810e71d6 100644 --- a/pkgs/development/python-modules/locustio/default.nix +++ b/pkgs/development/python-modules/locustio/default.nix @@ -2,7 +2,7 @@ , fetchPypi , mock , unittest2 -, msgpack +, msgpack-python , requests , flask , gevent @@ -22,7 +22,7 @@ buildPythonPackage rec { sed -i s/"pyzmq=="/"pyzmq>="/ setup.py ''; - propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ]; + propagatedBuildInputs = [ msgpack-python requests flask gevent pyzmq ]; buildInputs = [ mock unittest2 ]; meta = { diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index b21643b4547ad..6afe4cba00d4f 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.3"; + version = "0.10.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "48465d58f9c0d729dc586627cf280830e7ed59f9e7999946ae1d763c6b8db999"; + sha256 = "cd3105975e71bc6437848c7fc9f0b23ef0e0c625c8b19ec66a5ddc727c6d11ae"; }; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 49bdfa8dc087a..3579c22e92b98 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -21,13 +21,13 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt4 != null; buildPythonPackage rec { - version = "2.1.1"; + version = "2.1.2"; pname = "matplotlib"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; - sha256 = "659f5e1aa0e0f01488c61eff47560c43b8be511c6a29293d7f3896ae17bd8b23"; + sha256 = "725a3f12739d133adfa381e1b33bd70c6f64db453bfc536e148824816e568894"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index fcbca62ff9dfe..d4750f252ad0c 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, python, buildPythonPackage, mpi }: +{ stdenv, fetchPypi, python, buildPythonPackage, mpi, openssh }: buildPythonPackage rec { pname = "mpi4py"; @@ -14,6 +14,12 @@ buildPythonPackage rec { inherit mpi; }; + postPatch = '' + substituteInPlace test/test_spawn.py --replace \ + "unittest.skipMPI('openmpi(<3.0.0)')" \ + "unittest.skipMPI('openmpi')" + ''; + configurePhase = ""; installPhase = '' @@ -28,11 +34,15 @@ buildPythonPackage rec { # sometimes packages specify where files should be installed outside the usual # python lib prefix, we override that back so all infrastructure (setup hooks) # work as expected + + # Needed to run the tests reliably. See: + # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30 + export OMPI_MCA_rmaps_base_oversubscribe=yes ''; setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"]; - buildInputs = [ mpi ]; + buildInputs = [ mpi openssh ]; meta = { description = diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix new file mode 100644 index 0000000000000..2400a76bd6e10 --- /dev/null +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, fetchPypi +, pytest +, lib +}: + +buildPythonPackage rec { + pname = "msgpack"; + version = "0.5.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "13ckbs2qc4dww7fddnm9cw116j4spgxqab49ijmj6jr178ypwl80"; + }; + + checkPhase = '' + py.test + ''; + + checkInputs = [ pytest ]; + + meta = { + homepage = https://github.com/msgpack/msgpack-python; + description = "MessagePack serializer implementation for Python"; + license = lib.licenses.asl20; + # maintainers = ?? ; + }; +} diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 7eaa0962b44fb..38facc9665891 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,8 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, cython -, pytest, psutil, pytestrunner +, pytest, pytestrunner , isPy3k }: @@ -15,8 +14,7 @@ buildPythonPackage rec { sha256 = "0liazqlyk2nmr82nhiw2z72j7bjqxaisifkj476msw140d4i4i7v"; }; - buildInputs = [ cython ]; - checkInputs = [ pytest psutil pytestrunner ]; + checkInputs = [ pytest pytestrunner ]; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 26525adb1c966..295354003baf8 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "0.6.2"; + version = "0.6.3"; src = fetchPypi { inherit pname version; - sha256 = "10bfb12b083a7509779298c31b4b61e2ed7e78d1960cbcfb3de8d38f3b830991"; + sha256 = "dd66e701a4856e3cace8f4865837ccc9bcfcdb286df01f01aa19531f5d834a83"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/neovim/default.nix b/pkgs/development/python-modules/neovim/default.nix new file mode 100644 index 0000000000000..6fcd82aca9e54 --- /dev/null +++ b/pkgs/development/python-modules/neovim/default.nix @@ -0,0 +1,41 @@ +{ buildPythonPackage +, fetchPypi +, lib +, nose +, msgpack +, greenlet +, trollius +, pythonOlder +, isPyPy +}: + +buildPythonPackage rec { + pname = "neovim"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "16vzxmp7f6dl20n30j5cwwvrjj5h3c2ch8ldbss31anf36nirsdp"; + }; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests + ''; + + # Tests require pkgs.neovim, + # which we cannot add because of circular dependency. + doCheck = false; + + propagatedBuildInputs = [ msgpack ] + ++ lib.optional (!isPyPy) greenlet + ++ lib.optional (pythonOlder "3.4") trollius; + + meta = { + description = "Python client for Neovim"; + homepage = "https://github.com/neovim/python-client"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 8ee6eeb104b4c..a38f23d5536f6 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -29,11 +29,11 @@ assert !isPy3k -> configparser != null; buildPythonPackage rec { pname = "nipype"; - version = "0.14.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0airdrh93vwmbfkqxp5cqfzm0zzqcvjnvphv3zhg197y39xxpl1k"; + sha256 = "4c14c6cae1f530f89d76fa8136d52488b1daf3a02179da65121b76eaf4a6f0ea"; }; doCheck = false; # fails with TypeError: None is not callable diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 77ff31934c3ff..be5a798b6c6d3 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.3.1"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - sha256 = "12vk3shylx61whdchxbg71mdlwiw2l31vl227sqwpb0p67bbw2rq"; + sha256 = "dd431fad9bdd25aa9ff8265da096ef770475e21bf1d327982611a7de5cd904ca"; }; LC_ALL = "en_US.utf8"; diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix index 5cf51b8413293..23b470ed90ff6 100644 --- a/pkgs/development/python-modules/olefile/default.nix +++ b/pkgs/development/python-modules/olefile/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "olefile"; - version = "0.44"; + version = "0.45.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1bbk1xplmrhymqpk6rkb15sg7v9qfih7zh23p6g2fxxas06cmwk1"; + sha256 = "2b6575f5290de8ab1086f8c5490591f7e0885af682c7c1793bdaf6e64078d385"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 9a94848000cea..fe13b575afc18 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.9"; + version = "2.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "95e007f4d121f4fd73f39a6d74a883c75e9fa9d96de91d43c1641c103c3a9b18"; + sha256 = "0ff2e0c2c85cbf42e82dd223e7f2401a62dc73c18cd9e5dd7763dc6c8014ebde"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix new file mode 100644 index 0000000000000..3f37940ed8aeb --- /dev/null +++ b/pkgs/development/python-modules/ovh/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, nose +, mock +}: + +buildPythonPackage rec { + pname = "ovh"; + version = "0.4.8"; + + # Needs yanc + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "79fa4bdc61b9953af867676a9558d9e792b9fde568c980efe848a40565a217cd"; + }; + + meta = { + description = "Thin wrapper around OVH's APIs"; + homepage = http://api.ovh.com/; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.makefu ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix new file mode 100644 index 0000000000000..5811d510dff9d --- /dev/null +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, python +, fetchpatch +}: + +buildPythonPackage rec { + pname = "packet-python"; + version = "1.37.1"; + src = fetchPypi { + inherit pname version; + sha256 = "316941d2473c0f42ac17ac89e9aa63a023bb96f35cf8eafe9e091ea424892778"; + }; + propagatedBuildInputs = [ requests ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s test + ''; + + patches = [ + (fetchpatch { + url = https://github.com/packethost/packet-python/commit/361ad0c60d0bfce2a992eefd17e917f9dcf36400.patch; + sha256 = "1cmzyq0302y4cqmim6arnvn8n620qysq458g2w5aq4zj1vz1q9g1"; + }) + ]; + + # Not all test files are included in archive + doCheck = false; + + meta = { + description = "A Python client for the Packet API."; + homepage = "https://github.com/packethost/packet-python"; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ dipinhora ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/papis-python-rofi/default.nix b/pkgs/development/python-modules/papis-python-rofi/default.nix new file mode 100644 index 0000000000000..1344e1588cd52 --- /dev/null +++ b/pkgs/development/python-modules/papis-python-rofi/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, lib, fetchPypi }: + +buildPythonPackage rec { + pname = "papis-python-rofi"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "13k6mw2nq923zazs77hpmh2s96v6zv13g7p89510qqkvp6fiml1v"; + }; + + # No tests existing + doCheck = false; + + meta = { + description = "A Python module to make simple GUIs with Rofi"; + homepage = https://github.com/alejandrogallo/python-rofi; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/development/python-modules/nose-parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index 3c7cd077cdc08..14b41fe950bbd 100644 --- a/pkgs/development/python-modules/nose-parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }: buildPythonPackage rec { - pname = "nose-parameterized"; - version = "0.6.0"; + pname = "parameterized"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1khlabgib4161vn6alxsjaa8javriywgx9vydddi659gp9x6fpnk"; + sha256 = "1qj1939shm48d9ql6fm1nrdy4p7sdyj8clz1szh5swwpf1qqxxfa"; }; # Tests require some python3-isms but code works without. doCheck = isPy3k; - buildInputs = [ nose glibcLocales ]; + checkInputs = [ nose glibcLocales ]; propagatedBuildInputs = [ six ]; checkPhase = '' @@ -21,7 +21,8 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Parameterized testing with any Python test framework"; - homepage = https://pypi.python.org/pypi/nose-parameterized; + homepage = https://pypi.python.org/pypi/parameterized; license = licenses.bsd3; + maintainers = with maintainers; [ ma27 ]; }; } diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index b6e022640cbd2..3a49a32a8a0ee 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -15,17 +15,12 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pecan"; - version = "1.2.1"; - - patches = [ - ./python36_test_fix.patch - ]; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "0ikc32rd2hr8j2jxc0mllvdjvxydx3fwfp3z8sdxmkzdkixlb5cd"; + sha256 = "24f06cf88a488b75f433e62b33c1c97e4575d0cd91eec9eec841a81cecfd6de3"; }; propagatedBuildInputs = [ singledispatch logutils ]; diff --git a/pkgs/development/python-modules/pecan/python36_test_fix.patch b/pkgs/development/python-modules/pecan/python36_test_fix.patch deleted file mode 100644 index 65e0733ab06ee..0000000000000 --- a/pkgs/development/python-modules/pecan/python36_test_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pecan/tests/test_conf.py b/pecan/tests/test_conf.py -index 0573d84..7c98e16 100644 ---- a/pecan/tests/test_conf.py -+++ b/pecan/tests/test_conf.py -@@ -157,7 +157,7 @@ class TestConf(PecanTestCase): - - try: - configuration.conf_from_file(f.name) -- except (ValueError, SystemError) as e: -+ except (ValueError, SystemError, ImportError) as e: - assert 'relative import' in str(e) - else: - raise AssertionError( diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index e75a264de3db8..aa8e2d22b43ea 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pendulum"; - version = "1.3.2"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1j6hdsdhhw4d6fy9byr0vyxqnb53ap8bh2a0cibl7p0ks0zvb14j"; + sha256 = "e996c34fb101c9c6d88a839c19af74d7c067b92ed3371274efcf4d4b6dc160a6"; }; propagatedBuildInputs = [ dateutil pytzdata tzlocal ]; diff --git a/pkgs/development/python-modules/platformio/default.nix b/pkgs/development/python-modules/platformio/default.nix index 6ac9b7eacfcf1..01d47b4586066 100644 --- a/pkgs/development/python-modules/platformio/default.nix +++ b/pkgs/development/python-modules/platformio/default.nix @@ -3,6 +3,7 @@ , lockfile, pyserial, requests , semantic-version , isPy3k, isPyPy +, git }: buildPythonPackage rec { disabled = isPy3k || isPyPy; @@ -17,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - bottle click_5 colorama lockfile + bottle click_5 colorama git lockfile pyserial requests semantic-version ]; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 75f1b0600778e..bddff8e95f449 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.2.3"; + version = "2.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "dadd2263f1c0449b248fd3742a077d9594935921a9597529be76d6a841237ab0"; + sha256 = "95e72273699108f215886ab961dbf0890904d39583be39eabcd0788bc7ccf695"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix new file mode 100644 index 0000000000000..c81d60ced4dfa --- /dev/null +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage, stdenv, fetchPypi, parameterized, six, nose }: + +buildPythonPackage rec { + pname = "pybase64"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hggg69s5r8jyqdwyzri5sn3f19p7ayl0fjhjma0qzgfp7bk6zjc"; + }; + + propagatedBuildInputs = [ six ]; + checkInputs = [ parameterized nose ]; + + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/pybase64; + description = "Fast Base64 encoding/decoding"; + license = licenses.bsd2; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 9751eaf7ce795..a086658cd7b71 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, buildPythonPackage, gmp }: buildPythonPackage rec { - version = "3.4.7"; + version = "3.4.9"; pname = "pycryptodome"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pycryptodome/${name}.tar.gz"; - sha256 = "18d8dfe31bf0cb53d58694903e526be68f3cf48e6e3c6dfbbc1e7042b1693af7"; + sha256 = "00cc7767c7bbe91f15a65a1b2ebe7a08002b8ae8221c1dcecc5c5c9ab6f79753"; }; meta = { diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 35a7213306f9e..8cc22c986e250 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.7"; + version = "3.4.9"; meta = { description = "A self-contained cryptographic library for Python"; @@ -13,6 +13,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "52aa2e540d06d63636e4b5356957c520611e28a88386bad4d18980e4b00e0b5a"; + sha256 = "d078b67be76ccafa8b7cc391e87151b80b0ef9bfbeee8a95d286e522cc7537f7"; }; } diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix index 1004d70476c90..a7430c94b480e 100644 --- a/pkgs/development/python-modules/pyemd/default.nix +++ b/pkgs/development/python-modules/pyemd/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyemd"; - version = "0.4.4"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "13y06y7r1697cv4r430g45fxs40i2yk9xn0dk9nqlrpddw3a0mr4"; + sha256 = "fc81c2116f8573e559dfbb8d73e03d9f73c22d0770559f406516984302e07e70"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 094274cefec61..1191b09ec3893 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -1,19 +1,19 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchPypi }: +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub }: buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.38"; + version = "0.1.39"; disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "15b09ppn5sn3vpnwfb7gygrvn5v65k3zvahkfx2kqpk1xah0mqbf"; + # PyPI tarball does not include tests/ directory + src = fetchFromGitHub { + owner = "danielperna84"; + repo = pname; + rev = version; + sha256 = "1g181x2mrhxcaswr6vi2m7if97wv4rf2g2pny60334sciga8njfz"; }; - # Tests reuire network access - doCheck = false; - meta = with stdenv.lib; { description = "Python 3 Interface to interact with Homematic devices"; homepage = https://github.com/danielperna84/pyhomematic; diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix new file mode 100644 index 0000000000000..8db864cc869d4 --- /dev/null +++ b/pkgs/development/python-modules/pylibgen/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, python, lib, fetchPypi +, isPy3k +, requests +}: + +buildPythonPackage rec { + pname = "pylibgen"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rviqi3rf62b43cabdy8c2cdznjv034mp0qrfrzvkih4jlkhyfrh"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ requests ]; + + # It's not using unittest + checkPhase = "${python.interpreter} tests/test_pylibgen.py -c 'test_api_endpoints()'"; + + meta = { + description = "Python interface to Library Genesis"; + homepage = https://pypi.org/project/pylibgen/; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 79337663c627a..194d91341d8ab 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.8.1"; + version = "1.8.2"; src = fetchPypi { inherit pname version; - sha256 = "3035e44e37cd09919e9edad5573af01d7c6b9c52a0ebb4781185ae7ab690458b"; + sha256 = "4fe3b99da7e789545327b75548cee6b511e4faa98afe268130fea1af4b5ec022"; }; buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix new file mode 100644 index 0000000000000..c23a90c095b64 --- /dev/null +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, coverage, libsodium, cffi, six, hypothesis}: + +buildPythonPackage rec { + pname = "pynacl"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "pyca"; + repo = pname; + rev = version; + sha256 = "0z9i1z4hjzmp23igyhvg131gikbrr947506lwfb3fayf0agwfv8f"; + }; + + #remove deadline from tests, see https://github.com/pyca/pynacl/issues/370 + preCheck = '' + sed -i 's/deadline=1500, //' tests/test_pwhash.py + sed -i 's/deadline=1500, //' tests/test_aead.py + ''; + + checkInputs = [ pytest coverage hypothesis ]; + propagatedBuildInputs = [ libsodium cffi six ]; + + checkPhase = '' + coverage run --source nacl --branch -m pytest + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ va1entin ]; + description = "Python binding to the Networking and Cryptography (NaCl) library"; + homepage = https://github.com/pyca/pynacl/; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix new file mode 100644 index 0000000000000..f3054e3e4dd43 --- /dev/null +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, openssl +, cryptography +, pyasn1 +, idna +, pytest +, pretend +, flaky +, glibcLocales +}: + +buildPythonPackage rec { + pname = "pyOpenSSL"; + version = "17.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2c10cfba46a52c0b0950118981d61e72c1e5b1aac451ca1bc77de1a679456773"; + }; + + outputs = [ "out" "dev" ]; + + preCheck = '' + sed -i 's/test_set_default_verify_paths/noop/' tests/test_ssl.py + # https://github.com/pyca/pyopenssl/issues/692 + sed -i 's/test_fallback_default_verify_paths/noop/' tests/test_ssl.py + ''; + + checkPhase = '' + runHook preCheck + export LANG="en_US.UTF-8" + py.test + runHook postCheck + ''; + + # Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1 + # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. + doCheck = !stdenv.isDarwin; + + buildInputs = [ openssl ]; + propagatedBuildInputs = [ cryptography pyasn1 idna ]; + + checkInputs = [ pytest pretend flaky glibcLocales ]; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pyparser/default.nix b/pkgs/development/python-modules/pyparser/default.nix new file mode 100644 index 0000000000000..1c00d726eadc6 --- /dev/null +++ b/pkgs/development/python-modules/pyparser/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage, lib, fetchFromBitbucket +, parse +}: + +buildPythonPackage rec { + pname = "pyparser"; + version = "1.0"; + + # Missing tests on Pypi + src = fetchFromBitbucket { + owner = "rw_grim"; + repo = pname; + rev = "v${version}"; + sha256 = "0aplb4zdpgbpmaw9qj0vr7qip9q5w7sl1m1lp1nc9jmjfij9i0hf"; + }; + + postPatch = "sed -i 's/parse==/parse>=/' requirements.txt"; + + propagatedBuildInputs = [ parse ]; + + meta = { + description = "Simple library that makes it easier to parse files"; + homepage = https://bitbucket.org/rw_grim/pyparser; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 053824ef8e955..225da204e21a1 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -6,14 +6,13 @@ let pname = "PyQt"; - version = "5.9.2"; + version = "5.10"; inherit (pythonPackages) buildPythonPackage python dbus-python sip; in buildPythonPackage { pname = pname; version = version; format = "other"; - name = pname + "-" + version; meta = with lib; { description = "Python bindings for Qt5"; @@ -25,10 +24,10 @@ in buildPythonPackage { src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz"; - sha256 = "15439gxari6azbfql20ksz8h4gv23k3kfyjyr89h2yy9k32xm461"; + sha256 = "0l2zy6b7bfjxmg4bb8yikg6i8iy2xdwmvk7knfmrzfpqbmkycbrl"; }; - nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ lndir qtbase qtsvg qtwebkit qtwebengine dbus_libs @@ -43,10 +42,10 @@ in buildPythonPackage { lndir ${dbus-python} $out rm -rf "$out/nix-support" - export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages + export PYTHONPATH=$PYTHONPATH:$out/${python.sitePackages} substituteInPlace configure.py \ - --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" \ + --replace 'install_dir=pydbusmoddir' "install_dir='$out/${python.sitePackages}/dbus/mainloop'" \ --replace "ModuleMetadata(qmake_QT=['webkitwidgets'])" "ModuleMetadata(qmake_QT=['webkitwidgets', 'printsupport'])" ${python.executable} configure.py -w \ diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix new file mode 100644 index 0000000000000..9d6cbacc95895 --- /dev/null +++ b/pkgs/development/python-modules/pysam/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, bzip2 +, bcftools +, curl +, cython +, htslib +, lzma +, pytest +, samtools +, zlib +}: + +buildPythonPackage rec { + pname = "pysam"; + version = "0.13.0"; + + # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is + # missing some files which cause test failures. + # Tracked at: https://github.com/pysam-developers/pysam/issues/616 + src = fetchFromGitHub { + owner = "pysam-developers"; + repo = "pysam"; + rev = "v${version}"; + sha256 = "1lwbcl38w1x0gciw5psjp87msmv9zzkgiqikg9b83dqaw2y5az1i"; + }; + + buildInputs = [ bzip2 curl cython lzma zlib ]; + + checkInputs = [ pytest bcftools htslib samtools ]; + + checkPhase = "py.test"; + + preInstall = '' + export HOME=$(mktemp -d) + make -C tests/pysam_data + make -C tests/cbcf_data + ''; + + meta = { + homepage = http://pysam.readthedocs.io/; + description = "A python module for reading, manipulating and writing genome data sets"; + maintainers = with lib.maintainers; [ unode ]; + license = lib.licenses.mit; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix index fdd2b2316e298..4555479af43eb 100644 --- a/pkgs/development/python-modules/pytest-cram/default.nix +++ b/pkgs/development/python-modules/pytest-cram/default.nix @@ -1,8 +1,7 @@ {lib, buildPythonPackage, fetchPypi, pytest, cram, bash, writeText}: buildPythonPackage rec { - name = "${pname}-${version}"; - version = "0.1.1"; + version = "0.2.0"; pname = "pytest-cram"; buildInputs = [ pytest ]; @@ -10,7 +9,8 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0ad05999iqzyjay9y5lc0cnd3jv8qxqlzsvxzp76shslmhrv0c4f"; + sha256 = "006p5dr3q794sbwwmxmdls3nwq0fvnyrxxmc03pgq8n74chl71qn"; + extension = "zip"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index caa2c27e3f85d..cfa24fdfe528b 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -24,6 +24,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask decorator httpbin six requests ]; + checkPhase = '' + py.test + ''; + meta = { description = "Easily test your HTTP library against a local copy of httpbin.org"; homepage = https://github.com/kevin1024/pytest-httpbin; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix new file mode 100644 index 0000000000000..7cb5224c60b6e --- /dev/null +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, setuptools_scm }: + +buildPythonPackage rec { + pname = "pytest-mock"; + version = "1.6.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "920d1167af5c2c2ad3fa0717d0c6c52e97e97810160c15721ac895cac53abb1c"; + }; + + propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock; + nativeBuildInputs = [ setuptools_scm ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Thin-wrapper around the mock package for easier use with py.test."; + homepage = https://github.com/pytest-dev/pytest-mock; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index 2965d169599a8..a266b4617492c 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -1,17 +1,20 @@ { stdenv, buildPythonPackage, fetchPypi, termcolor, pytest }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pytest-sugar"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "11lni9kn0r1y896xg20qjv4yjcyr56h0hx9dprdgjnam4dqcl6lg"; + sha256 = "ab8cc42faf121344a4e9b13f39a51257f26f410e416c52ea11078cdd00d98a2c"; }; propagatedBuildInputs = [ termcolor pytest ]; + checkPhase = '' + py.test + ''; + meta = with stdenv.lib; { description = "A plugin that changes the default look and feel of py.test"; homepage = https://github.com/Frozenball/pytest-sugar; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index d671fd9654a4f..596ce38ed0ab7 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm, pytest-forked }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pytest-xdist"; version = "1.22.0"; @@ -10,21 +9,19 @@ buildPythonPackage rec { sha256 = "65228a859191f2c74ee68c127317eefe35eedd3d43fc1431f19240663b0cafcd"; }; - buildInputs = [ pytest setuptools_scm pytest-forked]; + nativeBuildInputs = [ setuptools_scm ]; + buildInputs = [ pytest pytest-forked ]; propagatedBuildInputs = [ execnet ]; - postPatch = '' - rm testing/acceptance_test.py testing/test_remote.py testing/test_slavemanage.py - ''; - checkPhase = '' - py.test testing + # Excluded tests access file system + py.test testing -k "not test_distribution_rsyncdirs_example \ + and not test_rsync_popen_with_path \ + and not test_popen_rsync_subdir \ + and not test_init_rsync_roots \ + and not test_rsyncignore" ''; - # Only test on 3.x - # INTERNALERROR> AttributeError: 'NoneType' object has no attribute 'getconsumer' - doCheck = isPy3k; - meta = with stdenv.lib; { description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; homepage = https://github.com/pytest-dev/pytest-xdist; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 91e22baa4ad16..9b7f5cc12de03 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -2,7 +2,7 @@ , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k }: buildPythonPackage rec { - version = "3.3.2"; + version = "3.4.0"; pname = "pytest"; preCheck = '' @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "53548280ede7818f4dc2ad96608b9f08ae2cc2ca3874f2ceb6f97e3583f25bc4"; + sha256 = "6074ea3b9c999bd6d0df5fa9d12dd95ccd23550df2a582f5f5b848331d2e82ca"; }; checkInputs = [ hypothesis ]; diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix new file mode 100644 index 0000000000000..56be2e3448aef --- /dev/null +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, lib, fetchPypi, file, stdenv }: + +buildPythonPackage rec { + pname = "python-magic"; + version = "0.4.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "128j9y30zih6cyjyjnxhghnvpjm8vw40a1q7pgmrp035yvkaqkk0"; + }; + + postPatch = '' + substituteInPlace magic.py --replace "ctypes.util.find_library('magic')" "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + doCheck = false; + + # TODO: tests are failing + #checkPhase = '' + # ${python}/bin/${python.executable} ./test.py + #''; + + meta = { + description = "A python interface to the libmagic file type identification library"; + homepage = https://github.com/ahupp/python-magic; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix new file mode 100644 index 0000000000000..d55472179101b --- /dev/null +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchPypi, buildPythonPackage, certifi, future, urllib3 }: + +buildPythonPackage rec { + pname = "python-telegram-bot"; + version = "9.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0a5b4wfc6ms7kblynw2h3ygpww98kyz5n8iibqbdyykwx8xj7hzm"; + }; + + prePatch = '' + rm -rf telegram/vendor + substituteInPlace telegram/utils/request.py \ + --replace "import telegram.vendor.ptb_urllib3.urllib3 as urllib3" "import urllib3 as urllib3" \ + --replace "import telegram.vendor.ptb_urllib3.urllib3.contrib.appengine as appengine" "import urllib3.contrib.appengine as appengine" \ + --replace "from telegram.vendor.ptb_urllib3.urllib3.connection import HTTPConnection" "from urllib3.connection import HTTPConnection" \ + --replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" + ''; + + propagatedBuildInputs = [ certifi future urllib3 ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "This library provides a pure Python interface for the Telegram Bot API."; + homepage = https://python-telegram-bot.org; + license = licenses.lgpl3; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix new file mode 100644 index 0000000000000..98f714c8d5383 --- /dev/null +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -0,0 +1,84 @@ +{ lib +, fetchPypi +, fetchNuGet +, buildPythonPackage +, python +, pytest +, pycparser +, pkgconfig +, dotnetbuildhelpers +, clang +, mono +}: + +let + + UnmanagedExports127 = fetchNuGet { + baseName = "UnmanagedExports"; + version = "1.2.7"; + sha256 = "0bfrhpmq556p0swd9ssapw4f2aafmgp930jgf00sy89hzg2bfijf"; + outputFiles = [ "*" ]; + }; + + NUnit360 = fetchNuGet { + baseName = "NUnit"; + version = "3.6.0"; + sha256 = "0wz4sb0hxlajdr09r22kcy9ya79lka71w0k1jv5q2qj3d6g2frz1"; + outputFiles = [ "*" ]; + }; + +in + +buildPythonPackage rec { + pname = "pythonnet"; + version = "2.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hxnkrfj8ark9sbamcxzd63p98vgljfvdwh79qj3ac8pqrgghq80"; + }; + + postPatch = '' + substituteInPlace setup.py --replace 'self._install_packages()' '#self._install_packages()' + ''; + + preConfigure = '' + [ -z "$dontPlacateNuget" ] && placate-nuget.sh + [ -z "$dontPlacatePaket" ] && placate-paket.sh + ''; + + nativeBuildInputs = [ + pytest + pycparser + + pkgconfig + dotnetbuildhelpers + clang + + NUnit360 + UnmanagedExports127 + ]; + + buildInputs = [ + mono + ]; + + preBuild = '' + rm -rf packages + mkdir packages + + ln -s ${NUnit360}/lib/dotnet/NUnit/ packages/NUnit.3.6.0 + ln -s ${UnmanagedExports127}/lib/dotnet/NUnit/ packages/UnmanagedExports.1.2.7 + ''; + + checkPhase = '' + ${python.interpreter} -m pytest + ''; + + meta = with lib; { + description = ".Net and Mono integration for Python"; + homepage = https://pythonnet.github.io; + license = licenses.mit; + maintainers = with maintainers; [ jraygauthier ]; + }; +} diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix new file mode 100644 index 0000000000000..65f3d80bdaa7b --- /dev/null +++ b/pkgs/development/python-modules/pytz/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, python }: + +buildPythonPackage rec { + pname = "pytz"; + version = "2018.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "410bcd1d6409026fbaa65d9ed33bf6dd8b1e94a499e32168acfc7b332e4095c0"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s pytz/tests + ''; + + meta = with lib; { + description = "World timezone definitions, modern and historical"; + homepage = "http://pythonhosted.org/pytz"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix index 6de0431edb36d..a7c6b6db6b25b 100644 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytzdata"; - version = "2017.3.1"; + version = "2018.3"; src = fetchPypi { inherit pname version; - sha256 = "1wi3jh39zsa9iiyyhynhj7w5b2p9wdyd0ppavpsrmf3wxvr7cwz8"; + sha256 = "4e2cceb54335cd6c28caea46b15cd592e2aec5e8b05b0241cbccfb1b23c02ae7"; }; # No tests diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix new file mode 100644 index 0000000000000..a4918bf352dca --- /dev/null +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, libyaml }: + +buildPythonPackage rec { + pname = "PyYAML"; + version = "3.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab"; + }; + + propagatedBuildInputs = [ libyaml ]; + + meta = with lib; { + description = "The next generation YAML parser and emitter for Python"; + homepage = https://github.com/yaml/pyyaml; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix new file mode 100644 index 0000000000000..e65329c1b6951 --- /dev/null +++ b/pkgs/development/python-modules/quantities/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, python +}: + +buildPythonPackage rec { + pname = "quantities"; + version = "0.12.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0a03e8511db603c57ca80dee851c43f08d0457f4d592bcac2e154570756cb934"; + }; + + propagatedBuildInputs = [ numpy ]; + + checkPhase = '' + ${python.interpreter} setup.py test -V 1 + ''; + + meta = { + description = "Quantities is designed to handle arithmetic and"; + homepage = http://python-quantities.readthedocs.io/; + license = lib.licenses.bsd2; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/requestsexceptions/default.nix b/pkgs/development/python-modules/requestsexceptions/default.nix index 0321f9abec2cf..87af0e78b1836 100644 --- a/pkgs/development/python-modules/requestsexceptions/default.nix +++ b/pkgs/development/python-modules/requestsexceptions/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "requestsexceptions"; - version = "1.3.0"; + version = "1.4.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0gim00vi7vfq16y8b9m1vpy01grqvrdrbh88jb98qx6n6sk1n54g"; + sha256 = "b095cbc77618f066d459a02b137b020c37da9f46d9b057704019c9f77dba3065"; }; propagatedBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index 3c61ea4ded249..a13df64cd03e9 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "restview"; name = "${pname}-${version}"; - version = "2.8.0"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "5f6f1523228eab3269f59dd03ac560f7d370cd81df6fdbcb4914b5e6bd896a11"; + sha256 = "45320b4e52945d23b3f1aeacc7ff97a3b798204fe625f8b81ed5322326d5bcd1"; }; propagatedBuildInputs = [ docutils readme_renderer pygments ]; diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index dab3542b809e4..7246205619f14 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.3"; + version = "1.6.4.post1"; src = fetchPypi { inherit pname version; - sha256 = "14152f111c7711fc6756fd538ec12fc8cdde7419f869b244922f71f61b2a6c6b"; + sha256 = "30df7572d311514802df8dc0e229d1660bc4cbdcf027a8281e79c5fc2fcf02f2"; }; buildInputs = [ geos glibcLocales cython ]; diff --git a/pkgs/development/python-modules/simplegeneric/default.nix b/pkgs/development/python-modules/simplegeneric/default.nix new file mode 100644 index 0000000000000..491e218154c02 --- /dev/null +++ b/pkgs/development/python-modules/simplegeneric/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "simplegeneric"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173"; + }; + + meta = { + description = "Simple generic functions"; + homepage = http://cheeseshop.python.org/pypi/simplegeneric; + license = lib.licenses.zpl21; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 175aa4a6c3abe..51856ec0da047 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.2.1"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "9ede7070d6fd18f28058be88296ed67893e2637465516d6a596cd9afea97b154"; + sha256 = "64b4720f0a8e033db0154d3824f5bf677cf2797e11d44743cf0aebd2a0499d9d"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix index f16310131522c..f73aba0a5f9a7 100644 --- a/pkgs/development/python-modules/supervise_api/default.nix +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "supervise_api"; - version = "0.3.0"; + version = "0.4.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "13gy2m14zh6lbdm45b40ffjnw8y3dapz9hvzpwk8vyvbxj4f1vaf"; + sha256 = "029h1mlfhkm9lw043rawh24ld8md620y94k6c1l9hs5vvyq4fs84"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index 1370c59ace844..31fd0977c1445 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "sybil"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "5bd7dd09eff68cbec9062e6950124fadfaaccbc0f50b23c1037f4d70ae86f0f1"; + sha256 = "86332553392f865403883e44695bd8d9d47fe3887c01e17591955237b8fd2d8f"; }; checkInputs = [ pytest nose ]; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix new file mode 100644 index 0000000000000..67c799e554ebd --- /dev/null +++ b/pkgs/development/python-modules/sympy/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, glibcLocales +, mpmath +}: + +buildPythonPackage rec { + pname = "sympy"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "ac5b57691bc43919dcc21167660a57cc51797c28a4301a6144eff07b751216a4"; + }; + + checkInputs = [ glibcLocales ]; + + propagatedBuildInputs = [ mpmath ]; + + # Bunch of failures including transients. + doCheck = false; + + preCheck = '' + export LANG="en_US.UTF-8" + ''; + + meta = { + description = "A Python library for symbolic mathematics"; + homepage = http://www.sympy.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lovek323 ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 498c722a0464b..933b4be1caf32 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "5.3.1"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - sha256 = "670ade9410b7132278209e6a2e893caf098b040c4ba4d5ea848367a9c5588728"; + sha256 = "338aed9695c432b7c9b8a271dabb521e3e7e2c96b11f7b4e60552f1c8408a8f0"; }; checkInputs = [ mock manuel pytest sybil zope_component ]; diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index eb6a6694b05c2..1a99378a541ba 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -4,33 +4,26 @@ , pbr , python_mimeparse , extras -, lxml , unittest2 , traceback2 -, isPy3k -, fixtures -, pyrsistent +, testscenarios }: - - buildPythonPackage rec { pname = "testtools"; version = "2.3.0"; - # Python 2 only judging from SyntaxError -# disabled = isPy3k; - src = fetchPypi { inherit pname version; sha256 = "5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559"; }; - propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 pyrsistent ]; + propagatedBuildInputs = [ pbr python_mimeparse extras unittest2 ]; buildInputs = [ traceback2 ]; - # No tests in archive + # testscenarios has a circular dependency on testtools doCheck = false; + checkInputs = [ testscenarios ]; # testtools 2.0.0 and up has a circular run-time dependency on futures postPatch = '' @@ -42,4 +35,4 @@ buildPythonPackage rec { homepage = https://pypi.python.org/pypi/testtools; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index 1a2aced6858b6..e4ed824d2302c 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.9.1"; + version = "3.9.2"; pname = "thespian"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0b303bv85176xd5mf3q5j549s28wi70ck2xxgj1cvpydh23dzipb"; + sha256 = "aec9793fecf45bb91fe919dc61b5c48a4aadfb9f94b06cd92883df7952eacf95"; }; # Do not run the test suite: it takes a long time and uses diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index b0c3131785f3e..12edef190dcc3 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "0.13.4"; + version = "0.13.5"; src = fetchPypi { inherit pname version; - sha256 = "43d3903e8ea4542aaa4759ec3683641555d3a15e68fa5a41aaf14cce4110641a"; + sha256 = "bca0fc9eaf609a27ebd99d8466e05d5a6e79389957f17582b70643dbca65e3d8"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 60947bc769c7c..cd2d6c9a3656b 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -26,8 +26,10 @@ buildPythonPackage rec { substituteInPlace requirements.txt --replace "ipaddress>=1.0.16" "" ''; + # Skip a failing test until fixed upstream: + # https://github.com/meejah/txtorcon/issues/250 checkPhase = '' - pytest . + pytest --ignore=test/test_util.py . ''; meta = { diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix new file mode 100644 index 0000000000000..d1a9185d5a149 --- /dev/null +++ b/pkgs/development/python-modules/typing/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, python }: + +let + testDir = if isPy3k then "src" else "python2"; + +in buildPythonPackage rec { + pname = "typing"; + version = "3.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "d400a9344254803a2368533e4533a4200d21eb7b6b729c173bc38201a74db3f2"; + }; + + # Error for Python3.6: ImportError: cannot import name 'ann_module' + # See https://github.com/python/typing/pull/280 + doCheck = pythonOlder "3.6"; + + checkPhase = '' + cd ${testDir} + ${python.interpreter} -m unittest discover + ''; + + meta = with lib; { + description = "Backport of typing module to Python versions older than 3.5"; + homepage = https://docs.python.org/3/library/typing.html; + license = licenses.psfl; + }; +} diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix new file mode 100644 index 0000000000000..c23bffaf142fa --- /dev/null +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "webcolors"; + version = "1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "e47e68644d41c0b1f1e4d939cfe4039bdf1ab31234df63c7a4f59d4766487206"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + meta = { + description = "Library for working with color names/values defined by the HTML and CSS specifications"; + homepage = https://bitbucket.org/ubernostrum/webcolors/overview/; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix new file mode 100644 index 0000000000000..b71e4d3a4ffff --- /dev/null +++ b/pkgs/development/python-modules/weboob/default.nix @@ -0,0 +1,38 @@ +{ buildPythonPackage, fetchurl, stdenv, isPy27 +, nose, pillow, prettytable, pyyaml, dateutil, gdata +, requests, mechanize, feedparser, lxml, gnupg, pyqt5 +, libyaml, simplejson, cssselect, futures, pdfminer +, termcolor, google_api_python_client, html2text +, unidecode +}: + +buildPythonPackage rec { + pname = "weboob"; + version = "1.3"; + disabled = ! isPy27; + + src = fetchurl { + url = "https://symlink.me/attachments/download/356/${pname}-${version}.tar.gz"; + sha256 = "0m5yh49lplvb57dfilczh65ky35fshp3g7ni31pwfxwqi1f7i4f9"; + }; + + setupPyBuildFlags = ["--qt" "--xdg"]; + + checkInputs = [ nose ]; + + propagatedBuildInputs = [ pillow prettytable pyyaml dateutil + gdata requests mechanize feedparser lxml gnupg pyqt5 libyaml + simplejson cssselect futures pdfminer termcolor google_api_python_client + html2text unidecode ]; + + checkPhase = '' + nosetests + ''; + + meta = { + homepage = http://weboob.org; + description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; + license = stdenv.lib.licenses.agpl3; + }; +} + diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index ab63b444af6d4..e455f23341108 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.1.0"; + version = "3.1.3"; src = fetchPypi { inherit pname version; - sha256 = "67fc28c3b9fede955d69bccbd92784e3f0c6d0dee3a71532cd3367c257feb178"; + sha256 = "02edabcaeaa247721df8027f660f3384c20f30c4865a7ea5dd80685c368736df"; }; propagatedBuildInputs = [ notebook ]; diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix index 5e8c412ce520d..958fcd72f84a2 100644 --- a/pkgs/development/python-modules/yolk/default.nix +++ b/pkgs/development/python-modules/yolk/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { meta = { description = "Command-line tool for querying PyPI and Python packages installed on your system"; homepage = https://github.com/cakebread/yolk; - maintainer = with maintainers; [ profpatsch ]; + maintainer = with maintainers; []; license = licenses.bsd3; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 4510308d3e563..ee1fb24b3098b 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -285,7 +285,7 @@ let pbdMPI = [ pkgs.openmpi ]; pbdNCDF4 = [ pkgs.netcdf ]; pbdPROF = [ pkgs.openmpi ]; - pbdZMQ = [ pkgs.which ]; + pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.which ]; pdftools = [ pkgs.poppler.dev ]; PKI = [ pkgs.openssl.dev ]; png = [ pkgs.libpng.dev ]; @@ -393,6 +393,7 @@ let nat = [ pkgs.which ]; nat_nblast = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; + pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.binutils.bintools ]; RMark = [ pkgs.which ]; RPushbullet = [ pkgs.which ]; qtpaint = [ pkgs.cmake ]; @@ -776,6 +777,14 @@ let PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; }); + pbdZMQ = old.pbdZMQ.overrideDerivation (attrs: { + postPatch = lib.optionalString stdenv.isDarwin '' + for file in R/*.{r,r.in}; do + sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.binutils.bintools}/bin/\1"#g' $file + done + ''; + }); + qtbase = old.qtbase.overrideDerivation (attrs: { patches = [ ./patches/qtbase.patch ]; }); diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index f90893ee79ded..69ca68351ba18 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -4,14 +4,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.64.0"; + version = "0.65.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1jvx2vx1d3n5z689zqm0gylmmjxim176avinwn3q8xla3gz3srp8"; + sha256 = "00m9wqfqpnv7p2kz0970254jfaqakb12lsnhk95hw47ghfyb2f7p"; }; installPhase = '' diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index 6b9dd6393cb69..f83353034a8f1 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -1,38 +1,43 @@ -{ stdenv, fetchgit, cmake, expat, qt5, boost }: +{ stdenv, fetchFromGitHub, cmake, qtbase }: stdenv.mkDerivation rec { name = "boomerang-${version}"; - version = "0.3.99-alpha-2016-11-02"; + version = "0.4.0-alpha-2018-01-18"; - src = fetchgit { - url = "https://github.com/nemerle/boomerang.git"; - rev = "f95d6436845e9036c8cfbd936731449475f79b7a"; - sha256 = "1q3q92lfj24ij5sxdbdhcqyan28r6db1w80yrks4csf9zjij1ixh"; + src = fetchFromGitHub { + owner = "ceeac"; + repo = "boomerang"; + rev = "b4ff8d573407a8ed6365d4bfe53d2d47d983e393"; + sha256 = "0x17vlm6y1paa49fi3pmzz7vzdqms19qkr274hkq32ql342b6i6x"; }; - buildInputs = [ cmake expat qt5.qtbase boost ]; - - patches = [ ./fix-install.patch ./fix-output.patch ]; - - postPatch = '' - substituteInPlace loader/BinaryFileFactory.cpp \ - --replace '"lib"' '"../lib"' - - substituteInPlace ui/DecompilerThread.cpp \ - --replace '"output"' '"./output"' - - substituteInPlace boomerang.cpp \ - --replace 'progPath("./")' "progPath(\"$out/share/boomerang/\")" - - substituteInPlace ui/commandlinedriver.cpp \ - --replace "QFileInfo(args[0]).absolutePath()" "\"$out/share/boomerang/\"" + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase ]; + + postPatch = + # Look in installation directory for required files, not relative to working directory + '' + substituteInPlace src/boomerang/core/Settings.cpp \ + --replace "setDataDirectory(\"../share/boomerang\");" \ + "setDataDirectory(\"$out/share/boomerang\");" \ + --replace "setPluginDirectory(\"../lib/boomerang/plugins\");" \ + "setPluginDirectory(\"$out/lib/boomerang/plugins\");" + '' + # Fixup version: + # * don't try to inspect with git + # (even if we kept .git and such it would be "dirty" because of patching) + # * use date so version is monotonically increasing moving forward + + '' + sed -i cmake-scripts/boomerang-version.cmake \ + -e 's/set(\(PROJECT\|BOOMERANG\)_VERSION ".*")/set(\1_VERSION "${version}")/' ''; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://boomerang.sourceforge.net/; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; description = "A general, open source, retargetable decompiler"; + maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/pkgs/development/tools/boomerang/fix-install.patch b/pkgs/development/tools/boomerang/fix-install.patch deleted file mode 100644 index bc656acfd6a5e..0000000000000 --- a/pkgs/development/tools/boomerang/fix-install.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 5851256422a4debc34c956439d8129a4d5f80722 Mon Sep 17 00:00:00 2001 -From: Will Dietz <w@wdtz.org> -Date: Thu, 30 Mar 2017 10:06:03 -0500 -Subject: [PATCH] cmake: add install bits - ---- - CMakeLists.txt | 3 +++ - loader/CMakeLists.txt | 2 ++ - ui/CMakeLists.txt | 2 ++ - 3 files changed, 7 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 826fe307..740861db 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -113,3 +113,6 @@ SET_PROPERTY(TARGET boom_base PROPERTY CXX_STANDARD_REQUIRED ON) - - ADD_SUBDIRECTORY(loader) - ADD_SUBDIRECTORY(ui) -+ -+INSTALL(DIRECTORY signatures DESTINATION share/boomerang) -+INSTALL(DIRECTORY frontend/machine DESTINATION share/boomerang/frontend) -diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt -index b371d366..dcf715fd 100644 ---- a/loader/CMakeLists.txt -+++ b/loader/CMakeLists.txt -@@ -6,6 +6,8 @@ macro(BOOMERANG_ADD_LOADER name) - endif() - qt5_use_modules(${target_name} Core) - set_target_properties(${target_name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/out/lib") -+ install(TARGETS "${target_name}" -+ LIBRARY DESTINATION lib) - endmacro() - - BOOMERANG_ADD_LOADER(Elf elf/ElfBinaryFile.cpp elf/ElfBinaryFile.h) -diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt -index f6fe3271..8729b522 100644 ---- a/ui/CMakeLists.txt -+++ b/ui/CMakeLists.txt -@@ -26,3 +26,5 @@ boom_base frontend db type boomerang_DSLs codegen util boom_base - ${CMAKE_THREAD_LIBS_INIT} boomerang_passes - ) - qt5_use_modules(boomerang Core Xml Widgets) -+ -+INSTALL(TARGETS boomerang DESTINATION bin) --- -2.11.0 - diff --git a/pkgs/development/tools/boomerang/fix-output.patch b/pkgs/development/tools/boomerang/fix-output.patch deleted file mode 100644 index 18fbe74177b3d..0000000000000 --- a/pkgs/development/tools/boomerang/fix-output.patch +++ /dev/null @@ -1,24 +0,0 @@ -From f3f5f888a1b1fe72ea8fc8cc96ef4ee386011e1c Mon Sep 17 00:00:00 2001 -From: Will Dietz <w@wdtz.org> -Date: Thu, 30 Mar 2017 11:21:38 -0500 -Subject: [PATCH] don't default to writing to program directory - ---- - boomerang.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/boomerang.cpp b/boomerang.cpp -index 5951ed91..b592f482 100644 ---- a/boomerang.cpp -+++ b/boomerang.cpp -@@ -601,7 +601,6 @@ int Boomerang::processCommand(QStringList &args) { - */ - void Boomerang::setProgPath(const QString &p) { - progPath = p + "/"; -- outputPath = progPath + "/output/"; // Default output path (can be overridden with -o below) - } - - /** --- -2.11.0 - diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 2bfec89aa6603..6afec72de5fd3 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bear-${version}"; - version = "2.2.1"; + version = "2.3.11"; src = fetchFromGitHub { owner = "rizsotto"; repo = "Bear"; rev = version; - sha256 = "1rwar5nvvhfqws4nwyifaysqs3nxpphp48lx9mdg5n6l4z7drz0n"; + sha256 = "0r6ykvclq9ws055ssd8w33dicmk5l9pisv0fpzkks700n8d3z9f3"; }; nativeBuildInputs = [ cmake ]; @@ -31,4 +31,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.vcunat ]; }; } - diff --git a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch index 16d7a9bfd3e4b..f70e3811f654f 100644 --- a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch +++ b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch @@ -1,31 +1,23 @@ ---- Bear-2.2.1-src/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 -+++ Bear-2.2.1-src-patch/bear/main.py.in 2016-11-02 20:23:38.050134984 +0100 -@@ -48,6 +48,7 @@ +--- Bear-2.3.11-src/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 ++++ Bear-2.3.11-src-patch/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 +@@ -49,6 +49,7 @@ import shutil import contextlib import logging +from distutils.spawn import find_executable - # Ignored compiler options map for compilation database creation. - # The map is used in `split_command` method. (Which does ignore and classify -@@ -447,7 +448,6 @@ - # do extra check on number of source files - return result if result.files else None + # Map of ignored compiler option for the creation of a compilation database. + # This map is used in _split_command method, which classifies the parameters +@@ -540,7 +541,11 @@ + any(pattern.match(cmd) for pattern in COMPILER_PATTERNS_CXX) -- - def split_compiler(command): - """ A predicate to decide the command is a compiler call or not. - -@@ -467,7 +467,11 @@ - for pattern in COMPILER_CPP_PATTERNS) - - if command: # not empty list will allow to index '0' and '1:' -- executable = os.path.basename(command[0]) -+ absolute_executable = os.path.realpath(find_executable(command[0])) -+ if 'wrapper' in absolute_executable: -+ return None + if command: # not empty list will allow to index '0' and '1:' +- executable = os.path.basename(command[0]) # type: str ++ absolute_executable = os.path.realpath(find_executable(command[0])) ++ if 'wrapper' in absolute_executable: ++ return None + -+ executable = os.path.basename(absolute_executable) - parameters = command[1:] - # 'wrapper' 'parameters' and - # 'wrapper' 'compiler' 'parameters' are valid. ++ executable = os.path.basename(absolute_executable) # type: str + parameters = command[1:] # type: List[str] + # 'wrapper' 'parameters' and + # 'wrapper' 'compiler' 'parameters' are valid. \ No newline at end of file diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index fed88561cf9cc..97c02cd9cc12f 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -83,11 +83,25 @@ stdenv.mkDerivation rec { configureFlags = [ "--docdir=share/doc/${name}" ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup ++ optional (useQt4 || withQt5) "--qt-gui" - ++ optionals (!useNcurses) [ "--" "-DBUILD_CursesDialog=OFF" ]; + ++ ["--"] + ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ] + ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++" + "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc" + "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" + "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" + "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" + # TODO: Why are ar and friends not provided by the bintools wrapper? + ]; dontUseCmakeConfigure = true; enableParallelBuilding = true; + # This isn't an autoconf configure script; triples are passed via + # CMAKE_SYSTEM_NAME, etc. + configurePlatforms = [ ]; + + meta = with stdenv.lib; { homepage = http://www.cmake.org/; description = "Cross-Platform Makefile Generator"; diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index a0f1cf00814c0..c796c31cb70a2 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -33,7 +33,15 @@ cmakeConfigurePhase() { # By now it supports linux builds only. We should set the proper # CMAKE_SYSTEM_NAME otherwise. # http://www.cmake.org/Wiki/CMake_Cross_Compiling - cmakeFlags="-DCMAKE_CXX_COMPILER=$crossConfig-g++ -DCMAKE_C_COMPILER=$crossConfig-gcc $cmakeFlags" + # + # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and + # strip. Otherwise they are taken to be relative to the source root of + # the package being built. + cmakeFlags="-DCMAKE_CXX_COMPILER=$crossConfig-c++ $cmakeFlags" + cmakeFlags="-DCMAKE_C_COMPILER=$crossConfig-cc $cmakeFlags" + cmakeFlags="-DCMAKE_AR=$(command -v $crossConfig-ar) $cmakeFlags" + cmakeFlags="-DCMAKE_RANLIB=$(command -v $crossConfig-ranlib) $cmakeFlags" + cmakeFlags="-DCMAKE_STRIP=$(command -v $crossConfig-strip) $cmakeFlags" fi # This installs shared libraries with a fully-specified install 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 7914d8ebb4f85..e175205143fc4 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ./pselect.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; buildInputs = stdenv.lib.optionals guileSupport [ guile ]; configureFlags = stdenv.lib.optional guileSupport "--with-guile"; diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 2744dac2500b8..5b455f267d823 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "icmake-${version}"; - version = "9.02.04"; + version = "9.02.06"; src = fetchFromGitHub { - sha256 = "0dkqdm7nc3l9kgwkkf545hfbxj7ibkxl7n49wz9m1rcq9pvpmrw3"; + sha256 = "1hs7fhqpkhlrjvjhfarf5bmxl8dw3r0immzdib27gwh3sfzgpx0b"; rev = version; repo = "icmake"; owner = "fbb-git"; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix new file mode 100644 index 0000000000000..5fdbd7766cf86 --- /dev/null +++ b/pkgs/development/tools/buildah/default.nix @@ -0,0 +1,49 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand +, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux +, go-md2man }: + +let + version = "0.11"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "projectatomic"; + repo = "buildah"; + sha256 = "0rq3dw6p9rcqc99jk93j0qwg1p8fh4pwqvzylcqlcyqhv46426zf"; + }; + goPackagePath = "github.com/projectatomic/buildah"; + +in buildGoPackage rec { + name = "buildah-${version}"; + inherit src; + + outputs = [ "bin" "man" "out" ]; + + inherit goPackagePath; + excludedPackages = [ "tests" ]; + + nativeBuildInputs = [ pkgconfig go-md2man.bin ]; + buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ]; + + # Copied from the skopeo package, doesn’t seem to make a difference? + # If something related to these libs failed, uncomment these lines. + /*preBuild = with lib; '' + export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include" + export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib" + '';*/ + + postBuild = '' + # depends on buildGoPackage not changing … + pushd ./go/src/${goPackagePath}/docs + make docs + make install PREFIX="$man" + popd + ''; + + meta = { + description = "A tool which facilitates building OCI images"; + homepage = https://github.com/projectatomic/buildah; + maintainers = with stdenv.lib.maintainers; [ Profpatsch ]; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix index bad35e2422b54..db7df2af7009a 100644 --- a/pkgs/development/tools/compile-daemon/default.nix +++ b/pkgs/development/tools/compile-daemon/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Very simple compile daemon for Go"; license = licenses.bsd2; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ ]; inherit (src.meta) homepage; }; } diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 642a6a97bc0b1..1586d63608779 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.103"; + version = "2.105"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "1d771q4xjjji7ydh6xjz3j6hz2mszxh0m3zqjh4khlzqhnvydlha"; + sha256 = "0q6xyjkqlrwjgf7rzmyy8m0w7lhqyavici76zzngg159xkyh5cfh"; }; buildCommand = '' diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 11932965af491..a7b9976be43c7 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { description = "Version Control for your database"; homepage = http://www.liquibase.org/; license = licenses.asl20; - maintainers = with maintainers; [ nequissimus profpatsch ]; + maintainers = with maintainers; [ nequissimus ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix new file mode 100644 index 0000000000000..ff03897edb293 --- /dev/null +++ b/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -0,0 +1,26 @@ +{ stdenv, glib, autoreconfHook, pkgconfig, libgsystem, fetchgit }: + +stdenv.mkDerivation rec { + version = "2016.1"; + name = "gnome-desktop-testing-${version}"; + + src = fetchgit { + url = https://git.gnome.org/browse/gnome-desktop-testing; + rev = "v${version}"; + sha256 = "18qhmsab6jc01qrfzjx8m4799gbs72c4jg830mp0p865rcbl68dc"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ glib libgsystem ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "GNOME OSTree testing code"; + homepage = https://live.gnome.org/Initiatives/GnomeGoals/InstalledTests; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = [ maintainers.jtojnar ]; + }; +} diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix new file mode 100644 index 0000000000000..fe159c85c3d64 --- /dev/null +++ b/pkgs/development/tools/go-outline/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "go-outline-${version}"; + version = "unstable-2017-08-04"; + rev = "9e9d089bb61a5ce4f8e0c8d8dc5b4e41b0e02a48"; + + goPackagePath = "github.com/ramya-rao-a/go-outline"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + inherit rev; + owner = "ramya-rao-a"; + repo = "go-outline"; + sha256 = "0kbkv4d6q9w0d41m00sqdm10l0sg56mv8y6rmidqs152mm2w13x0"; + }; + + meta = { + description = "Utility to extract JSON representation of declarations from a Go source file."; + homepage = https://github.com/ramya-rao-a/go-outline; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/tools/go-outline/deps.nix b/pkgs/development/tools/go-outline/deps.nix new file mode 100644 index 0000000000000..6a333b58bec6a --- /dev/null +++ b/pkgs/development/tools/go-outline/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://github.com/golang/tools"; + rev = "96b5a5404f303f074e6117d832a9873c439508f0"; + sha256 = "1h6r9xyp1v3w2x8d108vzghn65l6ia2h895irypmrwymfcp30y42"; + }; + } +] diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix new file mode 100644 index 0000000000000..9a8b592b038de --- /dev/null +++ b/pkgs/development/tools/go-symbols/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "go-symbols-${version}"; + version = "unstable-2017-02-06"; + rev = "5a7f75904fb552189036c640d04cd6afef664836"; + + goPackagePath = "github.com/acroca/go-symbols"; + goDeps = ./deps.nix; + + src = fetchgit { + inherit rev; + url = "https://github.com/acroca/go-symbols"; + sha256 = "0qh2jjhwwk48gi8yii0z031bah11anxfz81nwflsiww7n426a8bb"; + }; + + meta = { + description = "A utility for extracting a JSON representation of the package symbols from a go source tree."; + homepage = https://github.com/acroca/go-symbols; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/tools/go-symbols/deps.nix b/pkgs/development/tools/go-symbols/deps.nix new file mode 100644 index 0000000000000..6a333b58bec6a --- /dev/null +++ b/pkgs/development/tools/go-symbols/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://github.com/golang/tools"; + rev = "96b5a5404f303f074e6117d832a9873c439508f0"; + sha256 = "1h6r9xyp1v3w2x8d108vzghn65l6ia2h895irypmrwymfcp30y42"; + }; + } +] diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix new file mode 100644 index 0000000000000..f1452bc121148 --- /dev/null +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "gomodifytags-${version}"; + version = "unstable-2017-12-14"; + rev = "20644152db4fe0ac406d81f3848e8a15f0cdeefa"; + + goPackagePath = "github.com/fatih/gomodifytags"; + + src = fetchgit { + inherit rev; + url = "https://github.com/fatih/gomodifytags"; + sha256 = "0k0ly3mmm9zcaxwlzdbvdxr2gn7kvcqzk1bb7blgq7fkkzpp7i1q"; + }; + + meta = { + description = "Go tool to modify struct field tags."; + homepage = https://github.com/fatih/gomodifytags; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix new file mode 100644 index 0000000000000..298657fe38c57 --- /dev/null +++ b/pkgs/development/tools/gopkgs/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gopkgs-${version}"; + version = "unstable-2017-12-29"; + rev = "b2ea2ecd37740e6ce0e020317d90c729aab4dc6d"; + + goPackagePath = "github.com/uudashr/gopkgs"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + inherit rev; + owner = "uudashr"; + repo = "gopkgs"; + sha256 = "1hwzxrf2h8xjbbx6l86mjpjh4csxxsy17zkh8h3qzncyfnsnczzg"; + }; + + meta = { + description = "Tool to get list available Go packages."; + homepage = https://github.com/uudashr/gopkgs; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/tools/gopkgs/deps.nix b/pkgs/development/tools/gopkgs/deps.nix new file mode 100644 index 0000000000000..0f72ee3e5e0fc --- /dev/null +++ b/pkgs/development/tools/gopkgs/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/MichaelTJones/walk"; + fetch = { + type = "git"; + url = "https://github.com/MichaelTJones/walk"; + rev = "4748e29d5718c2df4028a6543edf86fd8cc0f881"; + sha256 = "03bc3cql3w8cx05xlnzxsff59c6679rcpx4njzk86k00blkkizv7"; + }; + } +] diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index c21d5595708af..ae78774f8f380 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -8,8 +8,8 @@ mkDerivation { src = fetchFromGitHub { owner = "hvr"; repo = "multi-ghc-travis"; - rev = "0d1b4089f6829659149747c9551712d24fd0b124"; - sha256 = "00dbg8hbncv74c2baskyhg4h0yv8wrz0fnkvw2bzcn0cjrz7xqwr"; + rev = "612a29439ba61b01efb98ea6d36b7ffd987dc5a0"; + sha256 = "0q416rzzwipbnvslhwmm43w38dwma3lks12fghb0svcwj5lzgxsf"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix new file mode 100644 index 0000000000000..e56502a4ad051 --- /dev/null +++ b/pkgs/development/tools/hcloud/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "hcloud-${version}"; + version = "1.3.0"; + goPackagePath = "github.com/hetznercloud/cli"; + + src = fetchFromGitHub { + owner = "hetznercloud"; + repo = "cli"; + rev = "v${version}"; + sha256 = "1216qz1kk38vkvfrznjwb65vsbhscqvvrsbp2i6pnf0i85p00pqm"; + }; + + buildFlagsArray = [ "-ldflags=" "-X github.com/hetznercloud/cli.Version=${version}" ]; + + meta = { + description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers"; + homepage = https://github.com/hetznercloud/cli; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.zauberpony ]; + }; +} diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 8b3cd17a7b27f..6351a01501d33 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -2,20 +2,18 @@ stdenv.mkDerivation rec { name = "icestorm-${version}"; - version = "2018.02.04"; + version = "2018.02.14"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "722790ad3cdb497e1b13cd1b4368d8380371eb37"; - sha256 = "0l04c6dshhhdcgqg1bdlw215wbn52fsg2fm2cvavhvf64c18lwd1"; + rev = "edbf5fce90ff0e71922a54241a1aec914cc3e230"; + sha256 = "01d6xv5c4x8w8lamc8n3vnqsyn7ykhh1ws7k96d6ij5fs52k94xb"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python3 libftdi ]; - preBuild = '' - makeFlags="PREFIX=$out $makeFlags" - ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = { description = "Documentation and tools for Lattice iCE40 FPGAs"; diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix deleted file mode 100644 index 9c52ac6155145..0000000000000 --- a/pkgs/development/tools/jid/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: - -buildGoPackage rec { - name = "jid-${version}"; - version = "0.7.1"; - rev = "${version}"; - - goPackagePath = "github.com/simeji/jid"; - - src = fetchFromGitHub { - owner = "simeji"; - repo = "jid"; - inherit rev; - sha256 = "08snlqqch91w88zysfcavmqsafq93zzpkdjqkq1y7hx516fdaz1w"; - }; - - goDeps = ./deps.nix; - - meta = with stdenv.lib; { - description = "Incremental JSON digger"; - license = licenses.mit; - maintainers = [ maintainers.profpatsch ]; - }; -} diff --git a/pkgs/development/tools/jid/deps.nix b/pkgs/development/tools/jid/deps.nix deleted file mode 100644 index c3ec502b2a998..0000000000000 --- a/pkgs/development/tools/jid/deps.nix +++ /dev/null @@ -1,75 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "github.com/bitly/go-simplejson"; - fetch = { - type = "git"; - url = "https://github.com/bitly/go-simplejson"; - rev = "aabad6e819789e569bd6aabf444c935aa9ba1e44"; - sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "e8e01ee22a7d4a91b49646e39245fe08e69c7878"; - sha256 = "1660g29qhshk6zxhpnc0f52m69jdqqdw2ccbkqw9y4kilnripfvl"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "d228849504861217f796da67fae4f6e347643f15"; - sha256 = "0ch5sfcpmqczsh8kjbwpzdw31lacbkfyzvpzh4disnhhydbxjq0d"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "30a891c33c7cde7b02a981314b4228ec99380cca"; - sha256 = "03gsxn89pgkj4jkxm9avnj4f0ckvcskc6fj2lcd98l3akrz50ndg"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "737072b4e32b7a5018b4a7125da8d12de90e8045"; - sha256 = "09ni8bmj6p2b774bdh6mfcxl03bh5sqk860z03xpb6hv6yfxqkjm"; - }; - } - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8"; - sha256 = "156i8apkga8b3272kjhapyqwspgcfkrr9kpqwc5lii43k4swghpv"; - }; - } - { - goPackagePath = "github.com/nwidger/jsoncolor"; - fetch = { - type = "git"; - url = "https://github.com/nwidger/jsoncolor"; - rev = "0192e84d44af834c3a90c8a17bf670483b91ad5a"; - sha256 = "17mndgd1d233c22bd19xv4v2l2i5k8kz7y6n4n54a9i7fi9d10al"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "248dadf4e9068a0b3e79f02ed0a610d935de5302"; - sha256 = "03l80r0i9bxl0vz363w62k4a8apzglgbrz6viwym3044sxkl1qks"; - }; - } -] diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/pkgs/development/tools/librarian-puppet-go/default.nix new file mode 100644 index 0000000000000..1e2a421a67025 --- /dev/null +++ b/pkgs/development/tools/librarian-puppet-go/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "librarian-puppet-go-${version}"; + version = "0.3.9"; + + goPackagePath = "github.com/tmtk75/librarian-puppet-go"; + + src = fetchFromGitHub { + owner = "tmtk75"; + repo = "librarian-puppet-go"; + rev = "v${version}"; + sha256 = "19x2hz3b8xkhy2nkyjg6s4qvs55mh84fvjwp157a86dmxwkdf45y"; + }; + + goDeps = ./deps.nix; + + meta = with lib; { + inherit (src.meta) homepage; + description = "librarian-puppet implementation in go."; + license = licenses.unfree; # still unspecified https://github.com/tmtk75/librarian-puppet-go/issues/5 + maintainers = with maintainers; [ womfoo ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/librarian-puppet-go/deps.nix b/pkgs/development/tools/librarian-puppet-go/deps.nix new file mode 100644 index 0000000000000..e5729707d8abd --- /dev/null +++ b/pkgs/development/tools/librarian-puppet-go/deps.nix @@ -0,0 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/jawher/mow.cli"; + fetch = { + type = "git"; + url = "https://github.com/jawher/mow.cli"; + rev = "3ff64ca21987cfa628bd8d1865162b7ccd6107d7"; + sha256 = "0vws79q4x3c9kjdsin3vw5200sinkxag3bfa0n9k69svsb222bij"; + }; + } +] diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index 1b19a1caff676..0225a3f81416c 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "autoconf-archive-${version}"; - version = "2017.03.21"; + version = "2017.09.28"; src = fetchurl { url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; - sha256 = "0rfpapadka2023qhy8294ca5awxpb8d4904js6kv7piby5ax8siq"; + sha256 = "00gsh9hkrgg291my98plkrwlcpxkfrpq64pglf18kciqbf2bb7sw"; }; buildInputs = [ xz ]; diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 472f437978bf5..579dea33df475 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4"; }; - buildInputs = [ m4 perl ]; + nativeBuildInputs = [ m4 perl ]; + buildInputs = [ m4 ]; # Work around a known issue in Cygwin. See # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 28034f9d54927..77944297a9728 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, pkgconfig, perl, guile, libxml2 }: +{ stdenv, buildPackages, fetchurl, which, pkgconfig, texinfo, perl, guile, libxml2 }: stdenv.mkDerivation rec { name = "autogen-${version}"; @@ -11,8 +11,21 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; - nativeBuildInputs = [ which pkgconfig perl ]; - buildInputs = [ guile libxml2 ]; + nativeBuildInputs = [ which pkgconfig perl ] + # autogen needs a build autogen when cross-compiling + ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + buildPackages.autogen buildPackages.texinfo ]; + buildInputs = [ + guile libxml2 + ]; + + configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--with-libxml2=${libxml2.dev}" + "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2" + # the configure check for regcomp wants to run a host program + "libopts_cv_with_libregex=yes" + #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo" + ]; postPatch = '' # Fix a broken sed expression used for detecting the minor diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index 8035388c5f062..bb81a461188a0 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { - name = "bossa-2014-08-18"; + name = "bossa-1.8"; src = fetchgit { url = https://github.com/shumatech/BOSSA; - rev = "0f0a41cb1c3a65e909c5c744d8ae664e896a08ac"; /* arduino branch */ - sha256 = "0xg79kli1ypw9zyl90mm6vfk909jinmk3lnl8sim6v2yn8shs9cn"; + rev = "3be622ca0aa6214a2fc51c1ec682c4a58a423d62"; + sha256 = "19ik86qbffcb04cgmi4mnascbkck4ynfj87ha65qdk6fmp5q35vm"; }; patches = [ ./bossa-no-applet-build.patch ]; diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index cdddad5155ff2..2b26383ed3101 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "fswatch-${version}"; - version = "1.9.3"; + version = "1.11.2"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "1g329aapdvbzhr39wyh295shpfq5f0nlzsqkjnr8l6zzak7f4yrg"; + sha256 = "05vgpd1fx9fy3vnnmq5gz236avgva82axix127xy98gaxrac52vq"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index aa6bd003ed3fc..224e0aba6ef72 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { patches = [ ./dfile.patch ]; + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1 + ''; + # Stop build scripts from searching global include paths LSOF_INCLUDE = "${stdenv.cc.libc}/include"; configurePhase = "LINUX_CONF_CC=$CC_FOR_BUILD LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB ./Configure -n ${dialect}"; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 827ddedaee325..bfdebec154ad3 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -20,11 +20,13 @@ stdenv.mkDerivation rec { sha256 = "1avx4p71g9m3zvynhhhysxnpkqyhhlv42xiv9502bvp3nwfkgnqs"; }; - buildInputs = [ liburcu python ]; + buildInputs = [ python ]; preConfigure = '' patchShebangs . ''; + + propagatedBuildInputs = [ liburcu ]; meta = with stdenv.lib; { description = "LTTng Userspace Tracer libraries"; diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 6264787986587..de68a4066d7dd 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { sha256 = "1f1s8q3as3nrhcc1a8qc2z7imm644jfz44msn9sfv4mdynp2m2yb"; }; + # Drop test that fails on musl (?) + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace tests/Makefile.am \ + --replace "set-rpath-library.sh" "" + ''; + setupHook = [ ./setup-hook.sh ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 8212eccc6d138..78195e994c947 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -7,18 +7,29 @@ # SUBSYSTEMS=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", MODE:="0666" # SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666" -stdenv.mkDerivation rec { - name = "uhd-${version}"; - version = "3.10.2.0"; +let + uhdVer = "003_010_003_000"; + ImgVer = stdenv.lib.replaceStrings ["_"] ["."] uhdVer; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... + version = "3.10.3.0"; + + # Firmware images are downloaded (pre-built) from: + # http://files.ettus.com/binaries/images/ + uhdImagesSrc = fetchurl { + url = "http://files.ettus.com/binaries/images/uhd-images_${ImgVer}-release.tar.gz"; + sha256 = "198awvw6zsh19ydgx5qry5yc6yahdval9wjrsqbyj51pnr6s5qvy"; + }; + +in stdenv.mkDerivation { + name = "uhd-${version}"; src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; - rev = "release_003_010_002_000"; - sha256 = "0g6f4amw7h0vr6faa1nc1zs3bc645binza0zqqx5cwgfxybv8cfy"; + rev = "release_${uhdVer}"; + sha256 = "1aj8qizbyz4shwawj3qlhl6pyyda59hhgm9cwrj7s5kfdi4vdlc3"; }; enableParallelBuilding = true; @@ -31,13 +42,6 @@ stdenv.mkDerivation rec { # Build only the host software preConfigure = "cd host"; - # Firmware images are downloaded (pre-built) - uhdImagesName = "uhd-images_003.007.003-release"; - uhdImagesSrc = fetchurl { - url = "http://files.ettus.com/binaries/maint_images/archive/${uhdImagesName}.tar.gz"; - sha256 = "1pv5c5902041494z0jfw623ca29pvylrw5klybbhklvn5wwlr6cv"; - }; - postPhases = [ "installFirmware" ]; installFirmware = '' diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 9f318afc67d76..84365889638cb 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz"; + url = "http://src.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz"; sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13"; }; patchFlags = "-p0"; diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix index e97ff61a0dc0c..f5f9a15dd00af 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchFromGitHub, cmake, extra-cmake-modules, - zlib, boost162, libunwind, elfutils, sparsehash, - qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, + zlib, boost, libunwind, elfutils, sparsehash, + qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, kdiagram }: stdenv.mkDerivation rec { name = "heaptrack-${version}"; - version = "2017-10-30"; + version = "2018-01-28"; src = fetchFromGitHub { owner = "KDE"; repo = "heaptrack"; - rev = "2bf49bc4fed144e004a9cabd40580a0f0889758f"; - sha256 = "0sqxk5cc8r2vsj5k2dj9jkd1f2x2yj3mxgsp65g7ls01bgga0i4d"; + rev = "a4534d52788ab9814efca1232d402b2eb319342c"; + sha256 = "00xfv51kavvcmwgfmcixx0k5vhd06gkj5q0mm8rwxiw6215xp41a"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ - zlib boost162 libunwind elfutils sparsehash - qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons + zlib boost libunwind elfutils sparsehash + qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons kdiagram ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/development/tools/redis-dump/default.nix index 054517ea547cc..88c975b573521 100644 --- a/pkgs/development/tools/redis-dump/default.nix +++ b/pkgs/development/tools/redis-dump/default.nix @@ -9,6 +9,7 @@ bundlerEnv { buildInputs = [ perl autoconf ]; meta = with lib; { + broken = true; # needs ruby 2.0 description = "Backup and restore your Redis data to and from JSON"; homepage = http://delanotes.com/redis-dump/; license = licenses.mit; diff --git a/pkgs/development/tools/rhc/default.nix b/pkgs/development/tools/rhc/default.nix index 634ca28aaf13e..46665e8b47ecf 100644 --- a/pkgs/development/tools/rhc/default.nix +++ b/pkgs/development/tools/rhc/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerEnv, ruby_2_2, stdenv, makeWrapper }: +{ lib, bundlerEnv, ruby, stdenv, makeWrapper }: stdenv.mkDerivation rec { name = "rhc-1.38.7"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { env = bundlerEnv { name = "rhc-1.38.7-gems"; - ruby = ruby_2_2; + inherit ruby; gemdir = ./.; }; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = true; # requires ruby 2.2 homepage = https://github.com/openshift/rhc; description = "OpenShift client tools"; license = licenses.asl20; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 61f5f93ebfaa1..554a5585f150e 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -4,19 +4,14 @@ }: let allSpecs = { - "i686-linux" = { - system = "linux32"; - sha256 = "13fngjg2v0l3vhlmjnffy785ckgk2kbpm7307li75vinkcly91cj"; - }; - "x86_64-linux" = { system = "linux64"; - sha256 = "0x5vnmnw6mws6iw9s0kcm4crx9gfgy0vjjpk1v0wk7jpn6d0bl47"; + sha256 = "13iyz6579yw4fk9dr4nf2pdj55v1iflj8yf9a4zz7qw5996d5yk7"; }; "x86_64-darwin" = { system = "mac64"; - sha256 = "09y8ijj75q5a7snzchxinxfq2ad2sw0f30zi0p3hqf1n88y28jq6"; + sha256 = "11xa31bxhrq0p7kd3j76dihp73abdbmbwdng5454m1wir6yj25f1"; }; }; @@ -33,7 +28,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.33"; + version = "2.35"; src = fetchurl { url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 0f720f1f7e328..de0d7fc54de2f 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,39 +1,38 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand +, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux }: with stdenv.lib; +let + version = "0.1.28"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "projectatomic"; + repo = "skopeo"; + sha256 = "068nwrr3nr27alravcq1sxyhdd5jjr24213vdgn1dqva3885gbi0"; + }; + + defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; + +in buildGoPackage rec { name = "skopeo-${version}"; - version = "0.1.27"; - rev = "v${version}"; + inherit src; goPackagePath = "github.com/projectatomic/skopeo"; excludedPackages = "integration"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree ]; + buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ]; - src = fetchFromGitHub { - inherit rev; - owner = "projectatomic"; - repo = "skopeo"; - sha256 = "1xwwzxjczz8qdk1rf0h78qd3vk9mxxb8yi6f8kfqvcdcsvkajd5g"; - }; - - patches = [ - ./path.patch - ]; + buildFlagsArray = "-ldflags= -X github.com/projectatomic/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile}"; preBuild = '' export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include" export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib" ''; - postInstall = '' - mkdir $bin/etc - cp -v ./go/src/github.com/projectatomic/skopeo/default-policy.json $bin/etc/default-policy.json - ''; - meta = { description = "A command line utility for various operations on container images and image repositories"; homepage = https://github.com/projectatomic/skopeo; diff --git a/pkgs/development/tools/skopeo/path.patch b/pkgs/development/tools/skopeo/path.patch deleted file mode 100644 index fe456b58e5483..0000000000000 --- a/pkgs/development/tools/skopeo/path.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/cmd/skopeo/main.go b/cmd/skopeo/main.go -index 50e29b2..7108df5 100644 ---- a/cmd/skopeo/main.go -+++ b/cmd/skopeo/main.go -@@ -3,6 +3,7 @@ package main - import ( - "fmt" - "os" -+ "path/filepath" - - "github.com/Sirupsen/logrus" - "github.com/containers/image/signature" -@@ -88,6 +89,11 @@ func getPolicyContext(c *cli.Context) (*signature.PolicyContext, error) { - policyPath := c.GlobalString("policy") - var policy *signature.Policy // This could be cached across calls, if we had an application context. - var err error -+ var dir string -+ if policyPath == "" { -+ dir, err = filepath.Abs(filepath.Dir(os.Args[0])) -+ policyPath = dir + "/../etc/default-policy.json" -+ } - if c.GlobalBool("insecure-policy") { - policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}} - } else if policyPath == "" { - diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix new file mode 100644 index 0000000000000..1a8d7f13aff5d --- /dev/null +++ b/pkgs/development/tools/yaml2json/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + + +buildGoPackage rec { + name = "yaml2json-${version}"; + version = "unstable-2017-05-03"; + goPackagePath = "github.com/bronze1man/yaml2json"; + + goDeps = ./deps.nix; + + src = fetchFromGitHub { + rev = "ee8196e587313e98831c040c26262693d48c1a0c"; + owner = "bronze1man"; + repo = "yaml2json"; + sha256 = "16a2sqzbam5adbhfvilnpdabzwncs7kgpr0cn4gp09h2imzsprzw"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/bronze1man/yaml2json; + description = "Convert yaml to json"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.adisbladis ]; + }; +} diff --git a/pkgs/development/tools/yaml2json/deps.nix b/pkgs/development/tools/yaml2json/deps.nix new file mode 100644 index 0000000000000..f907520cc872a --- /dev/null +++ b/pkgs/development/tools/yaml2json/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; + sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; + }; + } +] diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index 3688ee0b7ef05..98952801c1736 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "6.12.2"; - sha256 = "1z6sn4b973sxw0h9hd38rjq6cqdkzl5gsd48f793abvarwgpqrrk"; + version = "6.12.3"; + sha256 = "1p6w7ngp95lc3ksyklp1mwyq1f02vz62r1h60g1ri00pl8pnfn0s"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; } diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix index f93dba1aec480..79f364be20004 100644 --- a/pkgs/development/web/nodejs/v9.nix +++ b/pkgs/development/web/nodejs/v9.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "9.4.0"; - sha256 = "035j44xkji9dxddlqws6ykkbyphbkhwhz700arpgz20jz3qf20vm"; + version = "9.5.0"; + sha256 = "0v8lspfca820mf45dj9hb56q00syhrqw5wmqmy1vnrcb6wx4csv6"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; } diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix new file mode 100644 index 0000000000000..605e5de031192 --- /dev/null +++ b/pkgs/development/web/postman/default.nix @@ -0,0 +1,89 @@ +{ stdenv, lib, gnome2, fetchurl, pkgs, xlibs, udev, makeWrapper, makeDesktopItem }: + +stdenv.mkDerivation rec { + name = "postman-${version}"; + version = "5.5.2"; + + src = fetchurl { + url = "https://dl.pstmn.io/download/version/${version}/linux64"; + sha1 = "68886197A8375E860AB880547838FEFC9E12FC64"; + name = "${name}.tar.gz"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontPatchELF = true; + + buildPhase = ":"; # nothing to build + + desktopItem = makeDesktopItem { + name = "postman"; + exec = "postman"; + icon = "$out/share/postman/resources/app/assets/icon.png"; + comment = "API Development Environment"; + desktopName = "Postman"; + genericName = "Postman"; + categories = "Application;Development;"; + }; + + installPhase = '' + mkdir -p $out/share/postman + mkdir -p $out/share/applications + cp -R * $out/share/postman + mkdir -p $out/bin + ln -s $out/share/postman/Postman $out/bin/postman + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + ''; + + preFixup = let + libPath = lib.makeLibraryPath [ + stdenv.cc.cc.lib + gnome2.pango + gnome2.GConf + pkgs.atk + pkgs.alsaLib + pkgs.cairo + pkgs.cups + pkgs.dbus_daemon.lib + pkgs.expat + pkgs.gdk_pixbuf + pkgs.glib + pkgs.gtk2-x11 + pkgs.freetype + pkgs.fontconfig + pkgs.nss + pkgs.nspr + pkgs.udev.lib + xlibs.libX11 + xlibs.libxcb + xlibs.libXi + xlibs.libXcursor + xlibs.libXdamage + xlibs.libXrandr + xlibs.libXcomposite + xlibs.libXext + xlibs.libXfixes + xlibs.libXrender + xlibs.libX11 + xlibs.libXtst + xlibs.libXScrnSaver + ]; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:$out/share/postman" \ + $out/share/postman/Postman + patchelf --set-rpath "${libPath}" $out/share/postman/libnode.so + patchelf --set-rpath "${libPath}" $out/share/postman/libffmpeg.so + + wrapProgram $out/share/postman/Postman --prefix LD_LIBRARY_PATH : ${libPath} + ''; + + meta = with stdenv.lib; { + homepage = https://www.getpostman.com; + description = "API Development Environment"; + license = stdenv.lib.licenses.postman; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ xurei ]; + }; +} diff --git a/pkgs/games/2048-in-terminal/default.nix b/pkgs/games/2048-in-terminal/default.nix index 288c852b11e35..5d91bc04114bd 100644 --- a/pkgs/games/2048-in-terminal/default.nix +++ b/pkgs/games/2048-in-terminal/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; + prePatch = '' + sed -i '1i#include <fcntl.h>\n' save.c + ''; + enableParallelBuilding = true; preInstall = '' diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index 21f545100b313..0fb75b3d345b7 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation { NIX_LDFLAGS = [ "-lSDL_image" ]; + enableParallelBuilding = true; + configureFlags = [ "--disable-etc" ]; buildInputs = [ SDL SDL_image libxml2 libjpeg libpng mesa zlib ]; diff --git a/pkgs/games/assaultcube/assaultcube-next.patch b/pkgs/games/assaultcube/assaultcube-next.patch new file mode 100644 index 0000000000000..92fc799667077 --- /dev/null +++ b/pkgs/games/assaultcube/assaultcube-next.patch @@ -0,0 +1,11 @@ +--- 1.1.0.4/source/src/Makefile ++++ 1.1.0.4/source/src/Makefile +@@ -6,7 +6,7 @@ + # found to have been caused by the g++ compiler in the past. This seems to have + # been fixed now by relaxing the optimization that g++ does, so although we'll + # continue using clang++ (just in case), you can use g++ if you prefer. +-CXX=clang++ ++#CXX=clang++ + + # Changing this to ACDEBUG=yes will compile a debug version of AssaultCube. + ACDEBUG=no diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix new file mode 100644 index 0000000000000..cef48978b6d0f --- /dev/null +++ b/pkgs/games/assaultcube/default.nix @@ -0,0 +1,82 @@ +{ fetchFromGitHub, stdenv, makeDesktopItem, openal, pkgconfig, libogg, + libvorbis, SDL, SDL_image, makeWrapper, zlib, + client ? true, server ? true }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + + # master branch has legacy (1.2.0.2) protocol 1201 and gcc 6 fix. + pname = "assaultcube"; + version = "01052017"; + name = "${pname}-${version}"; + + meta = { + description = "Fast and fun first-person-shooter based on the Cube fps"; + homepage = http://assault.cubers.net; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; # should work on darwin with a little effort. + license = stdenv.lib.licenses.zlib; + }; + + src = fetchFromGitHub { + owner = "assaultcube"; + repo = "AC"; + rev = "9f537b0876a39d7686e773040469fbb1417de18b"; + sha256 = "0nvckn67mmfaa7x3j41xyxjllxqzfx1dxg8pnqsaak3kkzds34pl"; + }; + + # ${branch} not accepted as a value ? + # TODO: write a functional BUNDLED_ENET option and restore it in deps. + patches = [ ./assaultcube-next.patch ]; + + nativeBuildInputs = [ pkgconfig ]; + + # add optional for server only ? + buildInputs = [ makeWrapper openal SDL SDL_image libogg libvorbis zlib ]; + + #makeFlags = [ "CXX=g++" ]; + + targets = (optionalString server "server") + (optionalString client " client"); + buildPhase = '' + make -C source/src ${targets} + ''; + + desktop = makeDesktopItem { + name = "AssaultCube"; + desktopName = "AssaultCube"; + comment = "A multiplayer, first-person shooter game, based on the CUBE engine. Fast, arcade gameplay."; + genericName = "First-person shooter"; + categories = "Application;Game;ActionGame;Shooter"; + icon = "assaultcube.png"; + exec = "${pname}"; + }; + + gamedatadir = "/share/games/${pname}"; + + installPhase = '' + + bindir=$out/bin + + mkdir -p $bindir $out/$gamedatadir + + cp -r config packages $out/$gamedatadir + + # install custom script + substituteAll ${./launcher.sh} $bindir/assaultcube + chmod +x $bindir/assaultcube + + if (test -e source/src/ac_client) then + cp source/src/ac_client $bindir + mkdir -p $out/share/applications + cp ${desktop}/share/applications/* $out/share/applications + install -Dpm644 packages/misc/icon.png $out/share/icons/assaultcube.png + install -Dpm644 packages/misc/icon.png $out/share/pixmaps/assaultcube.png + fi + + if (test -e source/src/ac_server) then + cp source/src/ac_server $bindir + ln -s $bindir/${pname} $bindir/${pname}-server + fi + ''; +} diff --git a/pkgs/games/assaultcube/launcher.sh b/pkgs/games/assaultcube/launcher.sh new file mode 100644 index 0000000000000..331cb861f66cd --- /dev/null +++ b/pkgs/games/assaultcube/launcher.sh @@ -0,0 +1,20 @@ +#!@shell@ +# original scripts are very awful + +CUBE_DIR=@out@@gamedatadir@ + +case $(basename "$0") in + assaultcube-server) + CUBE_OPTIONS="-Cconfig/servercmdline.txt" + BINARYPATH=@out@/bin/ac_server + ;; + assaultcube) + CUBE_OPTIONS="--home=${HOME}/.assaultcube/v1.2next --init" + BINARYPATH=@out@/bin/ac_client + ;; + *) echo "$0" is not supported. + exit 1 +esac + +cd $CUBE_DIR +exec "${BINARYPATH}" ${CUBE_OPTIONS} "$@" diff --git a/pkgs/games/dxx-rebirth/assets.nix b/pkgs/games/dxx-rebirth/assets.nix new file mode 100644 index 0000000000000..1fd64f5b00d0f --- /dev/null +++ b/pkgs/games/dxx-rebirth/assets.nix @@ -0,0 +1,55 @@ +{ stdenv, requireFile, gogUnpackHook }: + +let + generic = ver: source: let + pname = "descent${toString ver}"; + in stdenv.mkDerivation rec { + name = "${pname}-assets-${version}"; + version = "2.0.0.7"; + + src = requireFile rec { + name = "setup_descent12_${version}.exe"; + sha256 = "1r1drbfda6czg21f9qqiiwgnkpszxgmcn5bafp5ljddh34swkn3f"; + message = '' + While the Descent ${toString ver} game engine is free, the game assets are not. + + Please purchase the game on gog.com and download the Windows installer. + + Once you have downloaded the file, please use the following command and re-run the + installation: + + nix-prefetch-url file://\$PWD/${name} + ''; + }; + + nativeBuildInputs = [ gogUnpackHook ]; + + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{games/${pname},doc/${pname}/examples} + pushd "app/${source}" + mv dosbox*.conf $out/share/doc/${pname}/examples + mv *.txt *.pdf $out/share/doc/${pname} + cp -r * $out/share/games/descent${toString ver} + popd + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Descent ${toString ver} assets from GOG"; + homepage = http://www.dxx-rebirth.com/; + license = licenses.unfree; + maintainers = with maintainers; [ peterhoeg ]; + hydraPlatforms = []; + }; + }; + +in { + descent1-assets = generic 1 "descent"; + descent2-assets = generic 2 "descent 2"; +} diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/games/dxx-rebirth/full.nix new file mode 100644 index 0000000000000..baf8b80add10c --- /dev/null +++ b/pkgs/games/dxx-rebirth/full.nix @@ -0,0 +1,30 @@ +{ stdenv, makeWrapper +, dxx-rebirth, descent1-assets, descent2-assets }: + +let + generic = ver: assets: stdenv.mkDerivation rec { + name = "d${toString ver}x-rebirth-full-${assets.version}"; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin + + makeWrapper ${dxx-rebirth}/bin/d${toString ver}x-rebirth $out/bin/descent${toString ver} \ + --add-flags "-hogdir ${assets}/share/games/descent${toString ver}" + ''; + + meta = with stdenv.lib; { + description = "Descent ${toString ver} using the DXX-Rebirth project engine and game assets from GOG"; + homepage = http://www.dxx-rebirth.com/; + license = with licenses; [ free unfree ]; + maintainers = with maintainers; [ peterhoeg ]; + platforms = with platforms; linux; + hydraPlatforms = []; + }; + }; + +in { + d1x-rebirth-full = generic 1 descent1-assets; + d2x-rebirth-full = generic 2 descent2-assets; +} diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix index b8550b3712e36..066cadb13b17d 100644 --- a/pkgs/games/garden-of-coloured-lights/default.nix +++ b/pkgs/games/garden-of-coloured-lights/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Old-school vertical shoot-em-up / bullet hell"; homepage = http://garden.sourceforge.net/drupal/; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ Profpatsch ]; license = licenses.gpl3; }; diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 02bd0ba78d18d..a5b349334923e 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -1,30 +1,40 @@ { stdenv , fetchurl -, pythonPackages +, python }: -let - version = "2.3.2"; -in pythonPackages.buildPythonApplication rec { - name = "mnemosyne-${version}"; + +python.pkgs.buildPythonApplication rec { + pname = "mnemosyne"; + version = "2.6"; + src = fetchurl { - url = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz"; - sha256 = "0jkrw45i4v24p6xyq94z7rz5948h7f5dspgs5mcdaslnlp2accfp"; + url = "mirror://sourceforge/project/mnemosyne-proj/mnemosyne/mnemosyne-${version}/Mnemosyne-${version}.tar.gz"; + sha256 = "0b7b5sk5bfbsg5cyybkv5xw9zw257v3khsn0lwlbxnlhakd0rsg4"; }; - propagatedBuildInputs = with pythonPackages; [ - pyqt4 + + propagatedBuildInputs = with python.pkgs; [ + pyqt5 matplotlib cherrypy + cheroot webob + pillow ]; - preConfigure = '' + + # No tests/ directrory in tarball + doCheck = false; + + prePatch = '' substituteInPlace setup.py --replace /usr $out find . -type f -exec grep -H sys.exec_prefix {} ';' | cut -d: -f1 | xargs sed -i s,sys.exec_prefix,\"$out\", ''; + postInstall = '' mkdir -p $out/share - mv $out/lib/python2.7/site-packages/$out/share/locale $out/share - rm -r $out/lib/python2.7/site-packages/nix + mv $out/${python.sitePackages}/$out/share/locale $out/share + rm -r $out/${python.sitePackages}/nix ''; + meta = { homepage = https://mnemosyne-proj.org/; description = "Spaced-repetition software"; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 65c2a42922b28..bf451af9ad732 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -1,22 +1,18 @@ -{stdenv, fetchurl, fetchpatch, cmake, mesa, zlib, openssl, libyamlcpp, boost +{stdenv, fetchFromGitHub, fetchpatch, cmake, mesa, zlib, openssl, libyamlcpp, boost , SDL, SDL_image, SDL_mixer, SDL_gfx }: -let version = "1.0.0"; in +let version = "1.0.0.2018.01.28"; in stdenv.mkDerivation { name = "openxcom-${version}"; - src = fetchurl { - url = http://openxcom.org/file/1726/; - sha256 = "1rmg10nklvf86ckbbssyvbg5cd4p7in5zq3mas2yyffdjk9i40v6"; - name = "openxcom-${version}.tar.gz"; + src = fetchFromGitHub { + owner = "SupSuper"; + repo = "OpenXcom"; + rev = "b148916268a6ce104c3b6b7eb4d9e0487cba5487"; + sha256 = "1128ip3g4aw59f3f23mvlyhl8xckhwjjw9rd7wn7xv51hxdh191c"; }; - buildInputs = [ cmake mesa zlib openssl libyamlcpp boost - SDL SDL_image SDL_mixer SDL_gfx ]; - - patches = [ (fetchpatch { - url = "https://github.com/SupSuper/OpenXcom/commit/49bec0851fc6e5365cac0f71b2c40a80ddf95e77.patch"; - sha256 = "156fk8wz4qc0nmqq3zjb6kw84qirabads2azr6xvlgb3lcn327v2"; - }) ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp mesa openssl zlib ]; meta = { description = "Open source clone of UFO: Enemy Unknown"; diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix new file mode 100644 index 0000000000000..675c2ab4b4d88 --- /dev/null +++ b/pkgs/games/quakespasm/vulkan.nix @@ -0,0 +1,47 @@ +{ stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-loader }: +stdenv.mkDerivation rec { + name = "vkquake-${version}"; + majorVersion = "0.97"; + version = "${majorVersion}.3"; + + src = fetchFromGitHub { + owner = "Novum"; + repo = "vkQuake"; + rev = version; + sha256 = "11z9k5aw9ip7ggmgjdnaq4g45pxqiy0xhd4jqqmgzpmfdbjk4x13"; + }; + + sourceRoot = "source/Quake"; + + buildInputs = [ + makeWrapper gzip SDL2 libvorbis libmad vulkan-loader.dev + ]; + + preInstall = '' + mkdir -p "$out/bin" + ''; + + makeFlags = [ "prefix=$(out) bindir=$(out)/bin" ]; + + postFixup = '' + wrapProgram $out/bin/vkquake --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + ''; + + enableParallelBuilding = true; + + meta = { + description = "Vulkan Quake port based on QuakeSpasm"; + homepage = src.meta.homepage; + longDescription = '' + vkQuake is a Quake 1 port using Vulkan instead of OpenGL for rendering. + It is based on the popular QuakeSpasm port and runs all mods compatible with it + like Arcane Dimensions or In The Shadows. vkQuake also serves as a Vulkan demo + application that shows basic usage of the API. For example it demonstrates render + passes & sub passes, pipeline barriers & synchronization, compute shaders, push & + specialization constants, CPU/GPU parallelism and memory pooling. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.gnidorah ]; + }; +} diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index b246a94715e45..05fd9ab523b6b 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ - "http://pkgs.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz" + "http://src.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz" "http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue5.4.4-src.tar.gz" "http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz" ]; diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index ce68f190992b6..67991987c3119 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -42,6 +42,6 @@ in stdenv.mkDerivation rec { homepage = http://ultrastardx.sourceforge.net/; description = "Free and open source karaoke game"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/games/zdoom/bcc-git.nix b/pkgs/games/zdoom/bcc-git.nix new file mode 100644 index 0000000000000..2a1219e66ea03 --- /dev/null +++ b/pkgs/games/zdoom/bcc-git.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "doom-bcc-git-0.8.0.2018.01.04"; + + src = fetchFromGitHub { + owner = "wormt"; + repo = "bcc"; + rev = "d58b44d9f18b28fd732c27113e5607a454506d19"; + sha256 = "1m83ip40ln61qrvb1fbgaqbld2xip9n3k817lwkk1936pml9zcrq"; + }; + + enableParallelBuilding = true; + makeFlags = ["CC=cc"]; + + patches = [ ./bcc-warning-fix.patch ]; + + installPhase = '' + mkdir -p $out/{bin,lib,share/doc} + install -m755 bcc $out/bin/bcc + cp -av doc $out/share/doc/bcc + cp -av lib $out/lib/bcc + ''; + + meta = with stdenv.lib; { + description = "Compiler for Doom/Hexen scripts (ACS, BCS)"; + homepage = https://github.com/wormt/bcc; + license = licenses.mit; + maintainers = with maintainers; [ertes]; + }; +} diff --git a/pkgs/games/zdoom/bcc-warning-fix.patch b/pkgs/games/zdoom/bcc-warning-fix.patch new file mode 100644 index 0000000000000..4a352cb1e471e --- /dev/null +++ b/pkgs/games/zdoom/bcc-warning-fix.patch @@ -0,0 +1,25 @@ +From c6ac05c96b7908ccd35f3908fc0f13650b0583c0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= <esz@posteo.de> +Date: Sat, 3 Feb 2018 17:08:54 +0100 +Subject: [PATCH] Remove -Werror + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index bbe2c75..3357d2d 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,7 @@ EXE=bcc + BUILD_DIR=build + CC=gcc + INCLUDE=-Isrc -I src/parse +-OPTIONS=-Wall -Werror -Wno-unused -std=c99 -pedantic -Wstrict-aliasing \ ++OPTIONS=-Wall -Wno-unused -std=c99 -pedantic -Wstrict-aliasing \ + -Wstrict-aliasing=2 -Wmissing-field-initializers -D_BSD_SOURCE \ + -D_DEFAULT_SOURCE $(INCLUDE) + VERSION_FILE=$(BUILD_DIR)/version.c +-- +2.15.1 + diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix index d669233e7593f..5a37b1b32c5be 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/misc/emulators/atari++/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, libSM, libX11, SDL }: +{ stdenv, fetchurl, libSM, libX11, libICE, SDL, alsaLib, gcc-unwrapped, libXext }: with stdenv.lib; stdenv.mkDerivation rec{ name = "atari++-${version}"; - version = "1.73"; + version = "1.81"; src = fetchurl { url = "http://www.xl-project.com/download/atari++_${version}.tar.gz"; - sha256 = "1y5kwh08717jsa5agxrvxnggnwxq36irrid9rzfhca1nnvp9a45l"; + sha256 = "1sv268dsjddirhx47zaqgqiahy6zjxj7xaiiksd1gjvs4lvf3cdg"; }; - buildInputs = [ libSM libX11 SDL ]; + buildInputs = [ libSM libX11 SDL libICE alsaLib gcc-unwrapped libXext ]; + + postFixup = '' + patchelf --set-rpath ${stdenv.lib.makeLibraryPath buildInputs} "$out/bin/atari++" + ''; meta = { homepage = http://www.xl-project.com/; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index d041d6de4f6f2..00f0995e32abd 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -52,6 +52,7 @@ rec { # aliasess "sourcemap.vim" = sourcemap; Colour_Sampler_Pack = Colour-Sampler-Pack; + Gundo = gundo-vim; # backwards compat, added 2015-10-03 YouCompleteMe = youcompleteme; airline = vim-airline; alternative = a-vim; # backwards compat, added 2014-10-21 @@ -61,30 +62,41 @@ rec { colors-solarized = Solarized; colorsamplerpack = Colour_Sampler_Pack; command_T = command-t; # backwards compat, added 2014-10-18 + committia = committia-vim-git; + concealedyank = concealedyank-vim; + context-filetype = context_filetype-vim; css_color_5056 = vim-css-color; ctrlp = ctrlp-vim; + cute-python = vim-cute-python-git; + denite = denite-nvim; easy-align = vim-easy-align; easymotion = vim-easymotion; + echodoc = echodoc-vim; eighties = vim-eighties; ghc-mod-vim = ghcmod; gist-vim = Gist; gitgutter = vim-gitgutter; gundo = gundo-vim; - Gundo = gundo-vim; # backwards compat, added 2015-10-03 haskellConceal = haskellconceal; # backwards compat, added 2014-10-18 - haskellconceal = vim-haskellconceal; haskellConcealPlus = vim-haskellConcealPlus; + haskellconceal = vim-haskellconceal; hier = vim-hier; hlint-refactor = hlint-refactor-vim; hoogle = Hoogle; ipython = vim-ipython; latex-live-preview = vim-latex-live-preview; + mayansmoke = mayansmoke-git; multiple-cursors = vim-multiple-cursors; necoGhc = neco-ghc; # backwards compat, added 2014-10-18 neocomplete = neocomplete-vim; + neoinclude = neoinclude-vim; + neomru = neomru-vim; neosnippet = neosnippet-vim; + neoyank = neoyank-vim-git; nerdcommenter = The_NERD_Commenter; nerdtree = The_NERD_tree; + open-browser = open-browser-vim; + peskcolor = peskcolor-vim-git; polyglot = vim-polyglot; quickrun = vim-quickrun; repeat = vim-repeat; @@ -94,6 +106,7 @@ rec { stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 supertab = Supertab; syntastic = Syntastic; + tabpagebuffer = tabpagebuffer-vim; tabular = Tabular; tagbar = Tagbar; thumbnail = thumbnail-vim; @@ -101,6 +114,8 @@ rec { tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18 tslime = tslime-vim; unite = unite-vim; + vim-grepper = vim-grepper-git; + vim-test = vim-test-git; vimproc = vimproc-vim; vimshell = vimshell-vim; watchdogs = vim-watchdogs; @@ -127,17 +142,6 @@ rec { # --- generated packages bellow this line --- - Auto_Pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Auto_Pairs-2017-07-03"; - src = fetchgit { - url = "git://github.com/jiangmiao/auto-pairs"; - rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda"; - sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6"; - }; - dependencies = []; - - }; - CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "CSApprox-2013-07-26"; src = fetchgit { @@ -553,6 +557,17 @@ rec { }; + peskcolor-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "peskcolor-vim-git-2016-06-11"; + src = fetchgit { + url = "https://github.com/andsild/peskcolor.vim.git"; + rev = "cba4fc739bbebacd503158f6509d9c226651f363"; + sha256 = "15hw3casr5y3ckgcn6aq8vhk6g2hym41w51nvgf34hbj9fx1nvkq"; + }; + dependencies = []; + + }; + flake8-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "flake8-vim-2017-02-17"; src = fetchgit { @@ -586,6 +601,17 @@ rec { }; + vim-bazel = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-bazel-2018-01-10"; + src = fetchgit { + url = "https://github.com/bazelbuild/vim-bazel"; + rev = "ecafb17d5d1d3756e5ac0bd9f4812a450b8c91a3"; + sha256 = "0ixhx9ssfygjy2v2ss02w28rcjxnvhj0caffj32cv3snwnpcz6fy"; + }; + dependencies = ["maktaba"]; + + }; + clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "clighter8-2017-11-30"; src = fetchgit { @@ -633,6 +659,50 @@ rec { }; + vim-toml = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-toml-2017-12-10"; + src = fetchgit { + url = "https://github.com/cespare/vim-toml"; + rev = "b531aac0d45aaa373070c4cc30d7ead91960f5a7"; + sha256 = "14g3zvyfvhilr5ka3jhja4jxjn99957sk6hlv13yfkg349f57dvg"; + }; + dependencies = []; + + }; + + denite-extra = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "denite-extra-2017-11-03"; + src = fetchgit { + url = "https://github.com/chemzqm/denite-extra"; + rev = "2cea3e857b51fcde425339adeec12854e6cecbb6"; + sha256 = "1qa0ajs6vix0vvm1z7rhxq9bfx4aggq97gxghrxpvsc059c7w9wv"; + }; + dependencies = []; + + }; + + denite-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "denite-git-2017-11-02"; + src = fetchgit { + url = "https://github.com/chemzqm/denite-git"; + rev = "d40026c9b2c0e53ecdd3883d26260f19c74c7dfe"; + sha256 = "0c9602pj67hqfkyvanz5gw1s6vlf8q7s9r55g4dws5aakvjbqc0g"; + }; + dependencies = []; + + }; + + concealedyank-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "concealedyank-vim-2013-03-24"; + src = fetchgit { + url = "https://github.com/chikatoike/concealedyank.vim"; + rev = "e7e65a395e0e6a266f3a808bc07441aa7d03ebbd"; + sha256 = "0z7i8dmwfjh6mcrmgrxv3j86ic867617fas9mv4gqsrhhvrrkzsb"; + }; + dependencies = []; + + }; + vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-sort-motion-2017-10-03"; src = fetchgit { @@ -765,6 +835,17 @@ rec { }; + vim-cute-python-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-cute-python-git-2016-04-04"; + src = fetchgit { + url = "https://github.com/ehamberg/vim-cute-python.git"; + rev = "d7a6163f794500447242df2bedbe20bd751b92da"; + sha256 = "1jrfd6z84cdzn3yxdfp0xfxygscq7s8kbzxk37hf9cf5pl9ln0qf"; + }; + dependencies = []; + + }; + acp = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "acp-2013-02-05"; src = fetchgit { @@ -798,12 +879,23 @@ rec { }; + vim-json = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-json-2018-01-10"; + src = fetchgit { + url = "https://github.com/elzr/vim-json"; + rev = "3727f089410e23ae113be6222e8a08dd2613ecf2"; + sha256 = "1c19pqrys45pzflj5jyrm4q6hcvs977lv6qsfvbnk7nm4skxrqp1"; + }; + dependencies = []; + + }; + vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2017-07-06"; + name = "vim-localvimrc-2018-01-04"; src = fetchgit { url = "https://github.com/embear/vim-localvimrc"; - rev = "48c01c214ea0312e8045aaa1a28b30850e98a194"; - sha256 = "158ajdg3n8j0cxk2ry8rmnpfvnzmznhl573v8ddw6xni58b7bg4d"; + rev = "b915ce29c619fb367ed41d4c95d57eaaaed31b39"; + sha256 = "13bc3davmw2pms663yniiha8bayzy1m08xjhyrnlqqb2dz77m5gy"; }; dependencies = []; @@ -974,6 +1066,17 @@ rec { }; + vim-gitbranch = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-gitbranch-2017-05-28"; + src = fetchgit { + url = "https://github.com/itchyny/vim-gitbranch"; + rev = "8118dc1cdd387bd609852be4bf350360ce881193"; + sha256 = "01gvd96mnzfc5s0951zzq122birg5svnximkldgb9kv5bmsnmh3j"; + }; + dependencies = []; + + }; + vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-ipython-2015-06-23"; src = fetchgit { @@ -985,6 +1088,17 @@ rec { }; + vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-test-git-2018-01-16"; + src = fetchgit { + url = "https://github.com/janko-m/vim-test.git"; + rev = "731ad6942f9449d2ed22f6d9ccc8d1ce613b1f19"; + sha256 = "14xwsc23zmkfl6ydvqiqf7l0gn5nxqdm62rvgiky5j5ii9iqj3hr"; + }; + dependencies = []; + + }; + vim-hier = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-hier-2011-08-27"; src = fetchgit { @@ -1150,6 +1264,50 @@ rec { }; + vim-niceblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-niceblock-2015-08-22"; + src = fetchgit { + url = "https://github.com/kana/vim-niceblock"; + rev = "03c59f648fcadd415fc91d7b100cf48bd0a55fac"; + sha256 = "05p3xr61v3infi07r9ahr30190kamgdjxkjjlawbqnrn8pv9fws4"; + }; + dependencies = []; + + }; + + vim-operator-replace = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-operator-replace-2015-02-25"; + src = fetchgit { + url = "https://github.com/kana/vim-operator-replace"; + rev = "1345a556a321a092716e149d4765a5e17c0e9f0f"; + sha256 = "07cibp61zwbzpjfxqdc77fzrgnz8jhimmdhhyjr0lvgrjgvsnv6q"; + }; + dependencies = []; + + }; + + vim-operator-user = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-operator-user-2015-02-17"; + src = fetchgit { + url = "https://github.com/kana/vim-operator-user"; + rev = "c3dfd41c1ed516b4b901c97562e644de62c367aa"; + sha256 = "16y2fyrmwg4vkcl85i8xg8s6m39ca2jvgi9qm36b3vzbnkcifafb"; + }; + dependencies = []; + + }; + + vim-textobj-user = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-textobj-user-2017-09-28"; + src = fetchgit { + url = "https://github.com/kana/vim-textobj-user"; + rev = "e231b65797b5765b3ee862d71077e9bd56f3ca3e"; + sha256 = "0zsgr2cn8s42d7jllnxw2cvqkl27lc921d1mkph7ny7jgnghaay9"; + }; + dependencies = []; + + }; + latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "latex-box-2015-06-01"; src = fetchgit { @@ -1297,12 +1455,23 @@ rec { }; + vim-grepper-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-grepper-git-2018-01-16"; + src = fetchgit { + url = "https://github.com/mhinz/vim-grepper.git"; + rev = "4fd6260c56ffa0642095143f802d1cbfceb7437d"; + sha256 = "11rhj6m85hxd4kf8yms4mab8553dcgl0yxm9r7nhdqpz6mljsir9"; + }; + dependencies = []; + + }; + vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2017-12-06"; + name = "vim-startify-2017-12-20"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "c905a0c9598c72cb4311ca88f3eb664d05e4d66b"; - sha256 = "1zdqr2lg1cf7dix6yvx7hmxcb698hb2zdimiqv2kgpdqlc40agcy"; + rev = "5e476d8e00da70bc33c54a174fd8cb18ed991868"; + sha256 = "07k7ddjqc2jisk0sh9k8w6r5xhh47cbzbxdnbkjz7bdskkwsdsay"; }; dependencies = []; @@ -1432,6 +1601,17 @@ rec { }; + vim-textobj-multiblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-textobj-multiblock-2014-06-02"; + src = fetchgit { + url = "https://github.com/osyo-manga/vim-textobj-multiblock"; + rev = "670a5ba57d73fcd793f480e262617c6eb0103355"; + sha256 = "1s71hdr73cl8yg9mrdflvzrdccpiv7qrlainai7gqw30r1hfhfzf"; + }; + dependencies = []; + + }; + vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-watchdogs-2017-12-03"; src = fetchgit { @@ -1487,6 +1667,28 @@ rec { }; + vim-wordy = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-wordy-2016-11-07"; + src = fetchgit { + url = "https://github.com/reedes/vim-wordy"; + rev = "bd37684a041fce85c34bb56c41c5a12c04a376ca"; + sha256 = "0lv3ff1yfqdz2vj6lwaygslds1ccidbb09f4x1cdwlawxdgh3w2v"; + }; + dependencies = []; + + }; + + committia-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "committia-vim-git-2017-12-04"; + src = fetchgit { + url = "https://github.com/rhysd/committia.vim.git"; + rev = "51aec02e5ab07c89fa5d5445cfe3a8e0098bec27"; + sha256 = "08nqncgnmbvhnn850s6hhp6p6scqg2iiwrl9air952yh9pl91h84"; + }; + dependencies = []; + + }; + vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-grammarous-2017-08-25"; src = fetchgit { @@ -1507,6 +1709,17 @@ rec { ]; }; + vim-operator-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-operator-surround-2017-12-23"; + src = fetchgit { + url = "https://github.com/rhysd/vim-operator-surround"; + rev = "001c0da077b5b38a723151b19760d220e02363db"; + sha256 = "0c6w6id57faw6sjf5wvw9qp2a4i7xj65q0c4hjs0spgzycv2wpkh"; + }; + dependencies = []; + + }; + vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-puppet-2017-08-25"; src = fetchgit { @@ -1595,6 +1808,50 @@ rec { }; + context_filetype-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "context_filetype-vim-2017-11-15"; + src = fetchgit { + url = "https://github.com/shougo/context_filetype.vim"; + rev = "6856503cd938d018c2d42277ee6ca896fd63f5a2"; + sha256 = "1s4nimpvc5ps602h8xb231nvmk9jbzs981an5kxr3idmmk44j5ms"; + }; + dependencies = []; + + }; + + denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "denite-nvim-2018-01-16"; + src = fetchgit { + url = "https://github.com/shougo/denite.nvim"; + rev = "0d48d8d498d410a5ea4403648d528e7267d87461"; + sha256 = "1npag0da8s3jv4jm8waqvsdfg0gnqhkc07r3m17zp2r2bh3b9bjc"; + }; + dependencies = []; + + }; + + echodoc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "echodoc-vim-2018-01-12"; + src = fetchgit { + url = "https://github.com/shougo/echodoc.vim"; + rev = "410ead5a9fa4400b51771cba3b7599722c9e65b1"; + sha256 = "01czpvn5rs37x0ml8bc5vwyhklm6fk3wl339smc3jvyr1w73rrf5"; + }; + dependencies = []; + + }; + + neco-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neco-syntax-2017-10-01"; + src = fetchgit { + url = "https://github.com/shougo/neco-syntax"; + rev = "98cba4a98a4f44dcff80216d0b4aa6f41c2ce3e3"; + sha256 = "1cjcbgx3h00g91ifgw30q5n97x4nprsr4kwirydws79fcs4vkgip"; + }; + dependencies = []; + + }; + neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "neco-vim-2017-10-01"; src = fetchgit { @@ -1617,6 +1874,28 @@ rec { }; + neoinclude-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neoinclude-vim-2017-10-01"; + src = fetchgit { + url = "https://github.com/shougo/neoinclude.vim"; + rev = "b5956ac824fdd60d6eacaa597c8d329252972d8b"; + sha256 = "07x7hxqhklcr5y8zkw9939cwx7rpiicjlc65bn526fkmhcc2hng6"; + }; + dependencies = []; + + }; + + neomru-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neomru-vim-2017-10-01"; + src = fetchgit { + url = "https://github.com/shougo/neomru.vim"; + rev = "97540f54fa20b94daf306f0c1f3cce983bbf7a1d"; + sha256 = "15d5hmh5v3hnjnfb5736n45rh5nyq41vqjp1cz4ls2rxmmfi3xa7"; + }; + dependencies = []; + + }; + neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "neosnippet-snippets-2017-09-26"; src = fetchgit { @@ -1639,6 +1918,28 @@ rec { }; + neoyank-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neoyank-vim-git-2017-12-19"; + src = fetchgit { + url = "https://github.com/shougo/neoyank.vim.git"; + rev = "5d6e6f80e1920fc38ab5cf779c424a1fdb49202d"; + sha256 = "0l2gfwyiyzppb0hs9sx3x7ndq9zzinppzqq3njwjzd1qgfv29jpq"; + }; + dependencies = []; + + }; + + tabpagebuffer-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tabpagebuffer-vim-2014-09-30"; + src = fetchgit { + url = "https://github.com/shougo/tabpagebuffer.vim"; + rev = "4d95c3e6fa5ad887498f4cbe486c11e39d4a1fbc"; + sha256 = "1z6zlpzkhwy1p2pmx9qrwb91dp9v4yi8jrdvm1if2k79ij4sl08f"; + }; + dependencies = []; + + }; + unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "unite-vim-2017-12-06"; src = fetchgit { @@ -1701,6 +2002,17 @@ rec { }; + vim-smalls = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-smalls-2015-05-02"; + src = fetchgit { + url = "https://github.com/t9md/vim-smalls"; + rev = "9619eae81626bd63f88165e0520c467698264e34"; + sha256 = "0s5z3zv220cg95yky2av6w0jmpc56ysyhsx0596ksvgz5jwhpbad"; + }; + dependencies = []; + + }; + vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-hardtime-2017-03-31"; src = fetchgit { @@ -1745,6 +2057,17 @@ rec { }; + vim-themis = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-themis-2017-12-28"; + src = fetchgit { + url = "https://github.com/thinca/vim-themis"; + rev = "691cd3912ba318dbd8d9fa0035fee629b424766d"; + sha256 = "1mrdaah3iyg35v6cgvr3jav3386czialfcinwa3y9jy14basbqhd"; + }; + dependencies = []; + + }; + molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "molokai-2015-11-11"; src = fetchgit { @@ -1833,6 +2156,17 @@ rec { }; + open-browser-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "open-browser-vim-2017-12-15"; + src = fetchgit { + url = "https://github.com/tyru/open-browser.vim"; + rev = "ee8decb2b26020320128eecd7a96383d995c8804"; + sha256 = "1a9j13h174lkp1gqd80idwdb8d74gdkyfgvb2l153jcqyvwpzcl2"; + }; + dependencies = []; + + }; + youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "youcompleteme-2017-12-03"; src = fetchgit { @@ -1914,6 +2248,17 @@ rec { }; + Improved-AnsiEsc = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Improved-AnsiEsc-2015-08-25"; + src = fetchgit { + url = "https://github.com/vim-scripts/Improved-AnsiEsc"; + rev = "e1c59a8e9203fab6b9150721f30548916da73351"; + sha256 = "1smjs4kz2kmzprzp9az4957675nakb43146hshbby39j5xz4jsbz"; + }; + dependencies = []; + + }; + Rename = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "Rename-2011-08-30"; src = fetchgit { @@ -1980,6 +2325,17 @@ rec { }; + mayansmoke-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "mayansmoke-git-2010-10-17"; + src = fetchgit { + url = "https://github.com/vim-scripts/mayansmoke.git"; + rev = "168883af7aec05f139af251f47eadd5dfb802c9d"; + sha256 = "1xxcky7i6sx7f1q8xka4gd2xg78w6sqjvqrdwgrdzv93fhf82rpd"; + }; + dependencies = []; + + }; + random-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "random-vim-2010-10-17"; src = fetchgit { @@ -2035,6 +2391,17 @@ rec { buildInputs = [ python ]; }; + targets-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "targets-vim-2017-12-03"; + src = fetchgit { + url = "https://github.com/wellle/targets.vim"; + rev = "6f809397526797f8f419a5d2b86d90e5aff68e66"; + sha256 = "0djjm7b41kgrkz447br7qi3w96ayz9lyxd164gyp082qqxxpz63q"; + }; + dependencies = []; + + }; + command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "command-t-2017-11-16"; src = fetchgit { @@ -2760,6 +3127,18 @@ rec { }; + vim-pencil = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-pencil-2017-06-14"; + src = fetchgit { + url = "git://github.com/reedes/vim-pencil"; + rev = "2dcd974b7255e4af83cf79a208f04a3489065e22"; + sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0"; + }; + dependencies = []; + + }; + + vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-ruby-2017-06-22"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 661917c955be3..04ccbb2a99d2d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -34,13 +34,19 @@ "github:ajh17/Spacegray.vim" "github:albfan/nerdtree-git-plugin" "github:alvan/vim-closetag" +"github:andsild/peskcolor.vim.git" "github:andviro/flake8-vim" "github:ap/vim-css-color" "github:autozimu/LanguageClient-neovim" +"github:bazelbuild/vim-bazel" "github:bbchung/clighter8" "github:benekastah/neomake" "github:bitc/vim-hdevtools" "github:bronson/vim-trailing-whitespace" +"github:cespare/vim-toml" +"github:chemzqm/denite-extra" +"github:chemzqm/denite-git" +"github:chikatoike/concealedyank.vim" "github:christoomey/vim-sort-motion" "github:christoomey/vim-tmux-navigator" "github:ctjhoa/spacevim" @@ -53,9 +59,11 @@ "github:drmingdrmer/xptemplate" "github:eagletmt/neco-ghc" "github:editorconfig/editorconfig-vim" +"github:ehamberg/vim-cute-python.git" "github:eikenb/acp" "github:elixir-lang/vim-elixir" "github:elmcast/elm-vim" +"github:elzr/vim-json" "github:embear/vim-localvimrc" "github:enomsg/vim-haskellConcealPlus" "github:ensime/ensime-vim" @@ -74,7 +82,9 @@ "github:itchyny/calendar.vim" "github:itchyny/lightline.vim" "github:itchyny/thumbnail.vim" +"github:itchyny/vim-gitbranch" "github:ivanov/vim-ipython" +"github:janko-m/vim-test.git" "github:jceb/vim-hier" "github:jceb/vim-orgmode" "github:jeetsukumaran/vim-buffergator" @@ -89,6 +99,9 @@ "github:junegunn/limelight.vim" "github:junegunn/vim-peekaboo" "github:justincampbell/vim-eighties" +"github:kana/vim-niceblock" +"github:kana/vim-operator-replace" +"github:kana/vim-operator-user" "github:latex-box-team/latex-box" "github:leafgarland/typescript-vim" "github:lepture/vim-jinja" @@ -102,6 +115,7 @@ "github:megaannum/forms" "github:megaannum/self" "github:mfukar/robotframework-vim" +"github:mhinz/vim-grepper.git" "github:mhinz/vim-startify" "github:michaeljsmith/vim-indent-object" "github:mileszs/ack.vim" @@ -113,33 +127,47 @@ "github:neovimhaskell/haskell-vim" "github:nixprime/cpsm" "github:osyo-manga/shabadou.vim" +"github:osyo-manga/vim-textobj-multiblock" "github:osyo-manga/vim-watchdogs" "github:plasticboy/vim-markdown" "github:python-mode/python-mode" "github:racer-rust/vim-racer" "github:raichoo/purescript-vim" +"github:reedes/vim-wordy" +"github:rhysd/committia.vim.git" "github:rhysd/vim-grammarous" +"github:rhysd/vim-operator-surround" "github:rodjek/vim-puppet" -"github:roxma/nvim-completion-manager" "github:roxma/nvim-cm-racer" -"github:ryanoasis/vim-devicons" +"github:roxma/nvim-completion-manager" "github:rust-lang/rust.vim" +"github:ryanoasis/vim-devicons" "github:sbdchd/neoformat" "github:sebastianmarkow/deoplete-rust" "github:sheerun/vim-polyglot" +"github:shougo/context_filetype.vim" +"github:shougo/denite.nvim" +"github:shougo/echodoc.vim" +"github:shougo/neco-syntax" "github:shougo/neco-vim" "github:shougo/neocomplete.vim" +"github:shougo/neoinclude.vim" +"github:shougo/neomru.vim" "github:shougo/neosnippet-snippets" "github:shougo/neosnippet.vim" +"github:shougo/neoyank.vim.git" +"github:shougo/tabpagebuffer.vim" "github:shougo/unite.vim" "github:shougo/vimproc.vim" "github:shougo/vimshell.vim" "github:sjl/gundo.vim" "github:slashmili/alchemist.vim" +"github:t9md/vim-smalls" "github:takac/vim-hardtime" "github:terryma/vim-expand-region" "github:tex/vimpreviewpandoc" "github:thinca/vim-quickrun" +"github:thinca/vim-themis" "github:tomasr/molokai" "github:tpope/vim-dispatch" "github:tpope/vim-eunuch" @@ -148,25 +176,29 @@ "github:tpope/vim-speeddating" "github:travitch/hasksyn" "github:twinside/vim-haskellconceal" +"github:tyru/open-browser.vim" "github:valloric/youcompleteme" "github:vim-airline/vim-airline-themes" "github:vim-pandoc/vim-pandoc" "github:vim-pandoc/vim-pandoc-after" "github:vim-pandoc/vim-pandoc-syntax" "github:vim-scripts/Colour-Sampler-Pack" +"github:vim-scripts/Improved-AnsiEsc" "github:vim-scripts/Rename" "github:vim-scripts/ReplaceWithRegister" "github:vim-scripts/a.vim" "github:vim-scripts/align" "github:vim-scripts/argtextobj.vim" "github:vim-scripts/changeColorScheme.vim" +"github:vim-scripts/mayansmoke.git" "github:vim-scripts/random.vim" "github:vim-scripts/tabmerge" "github:vim-scripts/wombat256.vim" "github:w0rp/ale" "github:wakatime/vim-wakatime" -"github:wincent/command-t" +"github:wellle/targets.vim" "github:will133/vim-dirdiff" +"github:wincent/command-t" "github:xolox/vim-easytags" "github:xolox/vim-misc" "github:zah/nim.vim" @@ -175,7 +207,6 @@ "github:zig-lang/zig.vim" "goyo" "gruvbox" -"jiangmiao-auto-pairs" "matchit.zip" "neco-look" "pathogen" @@ -216,17 +247,18 @@ "vim-airline" "vim-coffee-script" "vim-cursorword" -"vim-dashboard" "vim-easy-align" "vim-ft-diff_fold" "vim-gista" "vim-gitgutter" +"vim-github-dashboard" "vim-iced-coffee-script" "vim-javascript" "vim-jsbeautify" "vim-latex-live-preview" "vim-logreview" "vim-multiple-cursors" +"vim-pencil" "vim-ruby" "vim-scouter" "vim-signature" diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 23749fd4ce602..e11419846aeb8 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -325,11 +325,14 @@ rec { # add a customize option to a vim derivation makeCustomizable = vim: vim // { - customize = {name, vimrcConfig}: vimWithRC { + customize = { name, vimrcConfig }: vimWithRC { vimExecutable = "${vim}/bin/vim"; inherit name; vimrcFile = vimrcFile vimrcConfig; }; + + override = f: makeCustomizable (vim.override f); + overrideAttrs = f: makeCustomizable (vim.overrideAttrs f); }; pluginnames2Nix = {name, namefiles} : vim_configurable.customize { diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch b/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch new file mode 100644 index 0000000000000..fd9df8129407b --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch @@ -0,0 +1,22 @@ +diff --git a/icuSources/i18n/ucoleitr.cpp b/icuSources/i18n/ucoleitr.cpp +index ecc94c9..936452f 100644 +--- a/icuSources/i18n/ucoleitr.cpp ++++ b/icuSources/i18n/ucoleitr.cpp +@@ -320,7 +320,7 @@ ucol_nextProcessed(UCollationElements *elems, + int32_t *ixHigh, + UErrorCode *status) + { +- return (UCollationPCE::UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status); ++ return (UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status); + } + + +@@ -384,7 +384,7 @@ ucol_previousProcessed(UCollationElements *elems, + int32_t *ixHigh, + UErrorCode *status) + { +- return (UCollationPCE::UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status); ++ return (UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status); + } + + U_NAMESPACE_BEGIN diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix index 2d098418f030d..eef26f4b79a6b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix @@ -3,6 +3,8 @@ appleDerivation { nativeBuildInputs = [ cctools ]; + patches = [ ./clang-5.patch ]; + postPatch = '' substituteInPlace makefile \ --replace /usr/bin/ "" \ diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/pkgs/os-specific/darwin/lsusb/default.nix new file mode 100644 index 0000000000000..0b59ecb2299e8 --- /dev/null +++ b/pkgs/os-specific/darwin/lsusb/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "1.0"; + name = "lsusb-${version}"; + + src = fetchFromGitHub { + owner = "jlhonora"; + repo = "lsusb"; + rev = "8a6bd7084a55a58ade6584af5075c1db16afadd1"; + sha256 = "0p8pkcgvsx44dd56wgipa8pzi3298qk9h4rl9pwsw1939hjx6h0g"; + }; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man8 + install -m 0755 lsusb $out/bin + install -m 0444 man/lsusb.8 $out/share/man/man8 + ''; + + meta = { + homepage = https://github.com/jlhonora/lsusb; + description = "lsusb command for Mac OS X"; + platforms = stdenv.lib.platforms.darwin; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.varunpatro ]; + }; +} diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 29e1357d38a83..0bb5561e95724 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, autoreconfHook +{ stdenv, fetchurl, fetchpatch, makeWrapper, autoreconfHook , pkgconfig, which , flex, bison , linuxHeaders ? stdenv.cc.libc.linuxHeaders @@ -35,6 +35,27 @@ let substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man" ''; + # use 'if c then x else null' to avoid rebuilding + # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + patches = if stdenv.hostPlatform.isMusl then [ + (fetchpatch { + url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0002-Provide-missing-secure_getenv-and-scandirat-function.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; + name = "0002-Provide-missing-secure_getenv-and-scandirat-function.patch"; + sha256 = "0pj1bzifghxwxlc39j8hyy17dkjr9fk64kkj94ayymyprz4i4nac"; + }) + (fetchpatch { + url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; + name = "0003-Added-missing-typedef-definitions-on-parser.patch"; + sha256 = "0yyaqz8jlmn1bm37arggprqz0njb4lhjni2d9c8qfqj0kll0bam0"; + }) + (fetchpatch { + url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0007-Do-not-build-install-vim-file-with-utils-package.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; + name = "0007-Do-not-build-install-vim-file-with-utils-package.patch"; + sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4"; + }) + # (alpine patches {1,4,5,6,8} are needed for apparmor 2.11, but not 2.12) + ] else null; + # FIXME: convert these to a single multiple-outputs package? libapparmor = stdenv.mkDerivation { @@ -63,6 +84,8 @@ let substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${stdenv.cc.libc.dev}/include/netinet/in.h" substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${stdenv.cc.libc.dev}/include/netinet/in.h" ''; + inherit patches; + postPatch = "cd ./libraries/libapparmor"; configureFlags = "--with-python --with-perl"; @@ -90,6 +113,7 @@ let ]; prePatch = prePatchCommon; + inherit patches; postPatch = "cd ./utils"; makeFlags = ''LANGS=''; installFlags = ''DESTDIR=$(out) BINDIR=$(out)/bin VIM_INSTALL_PATH=$(out)/share PYPREFIX=''; @@ -145,6 +169,7 @@ let ## techdoc.pdf still doesn't build ... substituteInPlace ./parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages" ''; + inherit patches; postPatch = "cd ./parser"; makeFlags = ''LANGS= USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include''; installFlags = ''DESTDIR=$(out) DISTRO=unknown''; diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 4adc321d9308a..390bab849c28a 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -1,5 +1,5 @@ { - stdenv, buildPackages, fetchurl, + stdenv, buildPackages, fetchurl, fetchpatch, enablePython ? false, python ? null, }: @@ -27,6 +27,22 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [ + (fetchpatch { + url = "https://git.alpinelinux.org/cgit/aports/plain/main/audit/0002-auparse-remove-use-of-rawmemchr.patch?id=3e57180fdf3f90c30a25aea44f57846efc93a696"; + name = "0002-auparse-remove-use-of-rawmemchr.patch"; + sha256 = "1caaqbfgb2rq3ria5bz4n8x30ihgihln6w9w9a46k62ba0wh9rkz"; + }) + (fetchpatch { + url = "https://git.alpinelinux.org/cgit/aports/plain/main/audit/0003-all-get-rid-of-strndupa.patch?id=3e57180fdf3f90c30a25aea44f57846efc93a696"; + name = "0003-all-get-rid-of-strndupa.patch"; + sha256 = "1ddrm6a0ijrf7caw1wpw2kkbjp2lkxkmc16v51j5j7dvdalc6591"; + }) + ]; + + prePatch = '' + sed -i 's,#include <sys/poll.h>,#include <poll.h>\n#include <limits.h>,' audisp/audispd.c + ''; meta = { description = "Audit Library"; homepage = http://people.redhat.com/sgrubb/audit/; diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 23e8c1ca7d7e1..6725cec750a17 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages_5, kernel +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages, kernel , flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf, libelf }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - llvmPackages_5.llvm llvmPackages_5.clang-unwrapped kernel + llvmPackages.llvm llvmPackages.clang-unwrapped kernel elfutils python pythonPackages.netaddr luajit netperf iperf ]; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index a8d5ab48ac216..c83a526b2460d 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,11 +1,13 @@ { stdenv, lib, buildPackages, fetchurl, fetchpatch , enableStatic ? false , enableMinimal ? false -, useMusl ? false, musl +, useMusl ? stdenv.hostPlatform.libc == "musl", musl , extraConfig ? "" , buildPlatform, hostPlatform }: +assert stdenv.hostPlatform.libc == "musl" -> useMusl; + let configParser = '' function parseconfig { @@ -24,6 +26,10 @@ let } ''; + libcConfig = lib.optionalString useMusl '' + CONFIG_FEATURE_UTMP n + CONFIG_FEATURE_WTMP n + ''; in stdenv.mkDerivation rec { @@ -67,8 +73,12 @@ stdenv.mkDerivation rec { # Set paths for console fonts. CONFIG_DEFAULT_SETFONT_DIR "/etc/kbd" + # Bump from 4KB, much faster I/O + CONFIG_FEATURE_COPYBUF_KB 64 + ${extraConfig} CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.targetPrefix}" + ${libcConfig} EOF make oldconfig @@ -77,7 +87,7 @@ stdenv.mkDerivation rec { ''; postConfigure = lib.optionalString useMusl '' - makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") + makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib") ''; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/os-specific/linux/busybox/sandbox-shell.nix b/pkgs/os-specific/linux/busybox/sandbox-shell.nix new file mode 100644 index 0000000000000..1755bd4f3f747 --- /dev/null +++ b/pkgs/os-specific/linux/busybox/sandbox-shell.nix @@ -0,0 +1,26 @@ +{ busybox }: + +# Minimal shell for use as basic /bin/sh in sandbox builds +busybox.override { + useMusl = true; + enableStatic = true; + enableMinimal = true; + extraConfig = '' + CONFIG_FEATURE_FANCY_ECHO y + CONFIG_FEATURE_SH_MATH y + CONFIG_FEATURE_SH_MATH_64 y + + CONFIG_ASH y + CONFIG_ASH_OPTIMIZE_FOR_SIZE y + + CONFIG_ASH_ALIAS y + CONFIG_ASH_BASH_COMPAT y + CONFIG_ASH_CMDCMD y + CONFIG_ASH_ECHO y + CONFIG_ASH_GETOPTS y + CONFIG_ASH_INTERNAL_GLOB y + CONFIG_ASH_JOB_CONTROL y + CONFIG_ASH_PRINTF y + CONFIG_ASH_TEST y + ''; +} diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index ba2e9c8c52dca..d10b789f3e476 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl, kernel, coreutils, pciutils, gettext }: +{ stdenv, buildPackages, fetchurl, kernel, pciutils, gettext }: stdenv.mkDerivation { name = "cpupower-${kernel.version}"; src = kernel.src; - buildInputs = [ coreutils pciutils gettext ]; + nativeBuildInputs = [ gettext ]; + buildInputs = [ pciutils ]; postPatch = '' cd tools/power/cpupower - sed -i 's,/bin/true,${coreutils}/bin/true,' Makefile - sed -i 's,/bin/pwd,${coreutils}/bin/pwd,' Makefile - sed -i 's,/usr/bin/install,${coreutils}/bin/install,' Makefile + sed -i 's,/bin/true,${buildPackages.coreutils}/bin/true,' Makefile + sed -i 's,/bin/pwd,${buildPackages.coreutils}/bin/pwd,' Makefile + sed -i 's,/usr/bin/install,${buildPackages.coreutils}/bin/install,' Makefile ''; + makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" ]; + installFlags = [ "bindir=$(out)/bin" "sbindir=$(out)/sbin" diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 67ce39ddbd393..0ca85c7e50bcc 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="eudev"; - version = "3.2.4"; + version = "3.2.5"; name="${baseName}-${version}"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256 = "1vbg2k5mngyxdcdw4jkkzxbwdgrcr643hkby1whz7x91kg4g9p6x"; + sha256 = "1bwh72brp4dvr2dm6ng0lflic6abl87h8zk209im5lna0m0x1hj9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index c87023bf336d9..e8ab77a509ff4 100644 --- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "intel2200BGFirmware-${version}"; src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz"; + url = "http://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz"; sha256 = "c6818c11c18cc030d55ff83f64b2bad8feef485e7742f84f94a61d811a6258bd"; }; diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index 8efef4fac4bd5..267e31d427c6f 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -1,21 +1,21 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, libargon2, pam }: +{ stdenv, buildGoPackage, fetchFromGitHub, pam }: # Don't use this for anything important yet! buildGoPackage rec { name = "fscrypt-${version}"; - version = "0.2.2"; + version = "0.2.3"; goPackagePath = "github.com/google/fscrypt"; src = fetchFromGitHub { owner = "google"; repo = "fscrypt"; - rev = version; - sha256 = "0a85vj1zsybhzvvgdvlw6ywh2a6inmrmc95pfa1js4vkx0ixf1kh"; + rev = "v${version}"; + sha256 = "126bbxim4nj56kplvyv528i88mfray50r2rc6ysblkmaw6x0fd9c"; }; - buildInputs = [ libargon2 pam ]; + buildInputs = [ pam ]; meta = with stdenv.lib; { description = diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/os-specific/linux/fscryptctl/default.nix index 81cd95332c812..8622dc001a877 100644 --- a/pkgs/os-specific/linux/fscryptctl/default.nix +++ b/pkgs/os-specific/linux/fscryptctl/default.nix @@ -4,19 +4,17 @@ stdenv.mkDerivation rec { name = "fscryptctl-unstable-${version}"; - version = "2017-09-12"; + version = "2017-10-23"; goPackagePath = "github.com/google/fscrypt"; src = fetchFromGitHub { owner = "google"; repo = "fscryptctl"; - rev = "f037dcf4354ce8f25d0f371b58dfe7a7ac27576f"; - sha256 = "1dw1y6jbm2ibn7npvpw6cl28rcz0jz4as2yl6walz7ppmqbj9scf"; + rev = "142326810eb19d6794793db6d24d0775a15aa8e5"; + sha256 = "1853hlpklisbqnkb7a921dsf0vp2nr2im26zpmrs592cnpsvk3hb"; }; - patches = [ ./install.patch ]; - makeFlags = [ "DESTDIR=$(out)/bin" ]; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/fscryptctl/install.patch b/pkgs/os-specific/linux/fscryptctl/install.patch deleted file mode 100644 index 11f9843bbfb04..0000000000000 --- a/pkgs/os-specific/linux/fscryptctl/install.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Makefile 2017-09-24 22:48:19.322116085 +0200 -+++ b/Makefile 2017-09-24 22:50:07.655725022 +0200 -@@ -19,7 +19,7 @@ - CFLAGS += -O2 -Wall - - INSTALL = install --DESTDIR = /usr/local/bin -+DESTDIR ?= /usr/local/bin - - OBJECTS = $(NAME).o sha512.o - -@@ -38,8 +38,8 @@ - @python -m pytest test.py -s -q - - install: $(NAME) -- $(INSTALL) -d $(DEST_DIR) -- $(INSTALL) $(NAME) $(DEST_DIR) -+ $(INSTALL) -d $(DESTDIR) -+ $(INSTALL) $(NAME) $(DESTDIR) - - clean: - rm -f $(OBJECTS) diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index 7383db95c3753..521b81cd690de 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { #url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz; - url = http://pkgs.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz; + url = http://src.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz; sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49"; }; patches = [./gcc46-include-fix.patch ./config-paths.patch ]; diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index 0f794c315e541..87cb17329e8ca 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hdparm-9.53"; + name = "hdparm-9.54"; src = fetchurl { url = "mirror://sourceforge/hdparm/${name}.tar.gz"; - sha256 = "1rb5086gp4l1h1fn2nk10ziqxjxigsd0c1zczahwc5k9vy8zawr6"; + sha256 = "0ghnhdj7wfw6acfyhdawpfa5n9kvkvzgi1fw6i7sghgbjx5nhyjd"; }; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index be9be49208a43..269c59f5e6fe3 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,17 +1,19 @@ -{ fetchurl, stdenv, lib, flex, bison, db, iptables, pkgconfig }: +{ fetchurl, stdenv, lib, flex, bash, bison, db, iptables, pkgconfig }: stdenv.mkDerivation rec { name = "iproute2-${version}"; - version = "4.14.1"; + version = "4.15.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "0rq0n7yxb0hmk0s6wx5awzjgf7ikjbibd0a5ix20ldfcmxlc0fnl"; + sha256 = "0mc3g4kj7h3jhwz2b2gdf41gp6bhqn7axh4mnyvhkdnpk5m63m28"; }; preConfigure = '' patchShebangs ./configure sed -e '/ARPDDIR/d' -i Makefile + # Don't build netem tools--they're not installed and require HOSTCC + substituteInPlace Makefile --replace " netem " " " ''; makeFlags = [ @@ -37,6 +39,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + PATH=${bash}/bin:$PATH patchShebangs $out/sbin + ''; + meta = with stdenv.lib; { homepage = https://wiki.linuxfoundation.org/networking/iproute2; description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux"; diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index ee1d21ddf2b96..1668933db809b 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "iptables-${version}"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; - sha256 = "1x8c9y340x79djsq54bc1674ryv59jfphrk4f88i7qbvbnyxghhg"; + sha256 = "0crp0lvh5m2f15pr8cw97h8yb8zjj10x95zj06j46cr68vx2vl2m"; }; nativeBuildInputs = [ bison flex pkgconfig ]; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index dd5770744bf76..a7fbcce317534 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -4,8 +4,6 @@ , libidn, nettle , SGMLSpm, libgcrypt }: -assert stdenv ? glibc; - let time = "20161105"; in @@ -23,11 +21,12 @@ stdenv.mkDerivation rec { -i doc/Makefile ''; - makeFlags = "USE_GNUTLS=no"; + # Disable idn usage w/musl: https://github.com/iputils/iputils/pull/111 + makeFlags = [ "USE_GNUTLS=no" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "USE_IDN=no"; buildInputs = [ - libsysfs opensp openssl libcap docbook_sgml_dtd_31 SGMLSpm libgcrypt libidn nettle - ]; + libsysfs opensp openssl libcap docbook_sgml_dtd_31 SGMLSpm libgcrypt nettle + ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn; buildFlags = "man all ninfod"; diff --git a/pkgs/os-specific/linux/kernel-headers/4.4.nix b/pkgs/os-specific/linux/kernel-headers/4.4.nix deleted file mode 100644 index e8e041f48ebaa..0000000000000 --- a/pkgs/os-specific/linux/kernel-headers/4.4.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenvNoCC, lib, buildPackages -, buildPlatform, hostPlatform -, fetchurl, perl -}: - -assert hostPlatform.isLinux; - -let - version = "4.4.10"; - inherit (hostPlatform.platform) kernelHeadersBaseConfig; -in - -stdenvNoCC.mkDerivation { - name = "linux-headers-${version}"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1kpjvvd9q9wwr3314q5ymvxii4dv2d27295bzly225wlc552xhja"; - }; - - targetConfig = if hostPlatform != buildPlatform then hostPlatform.config else null; - - platform = hostPlatform.platform.kernelArch; - - # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc. - # We do this so we have a build->build, not build->host, C compiler. - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl ]; - - extraIncludeDirs = lib.optional hostPlatform.isPowerPC ["ppc"]; - - buildPhase = '' - if test -n "$targetConfig"; then - export ARCH=$platform - fi - make ${kernelHeadersBaseConfig} SHELL=bash - make mrproper headers_check SHELL=bash - ''; - - installPhase = '' - make INSTALL_HDR_PATH=$out headers_install - - # Some builds (e.g. KVM) want a kernel.release. - mkdir -p $out/include/config - echo "${version}-default" > $out/include/config/kernel.release - ''; - - # !!! hacky - fixupPhase = '' - ln -s asm $out/include/asm-$platform - if test "$platform" = "i386" -o "$platform" = "x86_64"; then - ln -s asm $out/include/asm-x86 - fi - ''; - - meta = with lib; { - description = "Header files and scripts for Linux kernel"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix new file mode 100644 index 0000000000000..b95013ab26dc2 --- /dev/null +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -0,0 +1,67 @@ +{ stdenvNoCC, lib, buildPackages +, buildPlatform, hostPlatform +, fetchurl, perl +}: + +assert hostPlatform.isLinux; + +let + common = { version, sha256, patches ? null }: stdenvNoCC.mkDerivation { + name = "linux-headers-${version}"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + inherit sha256; + }; + + ARCH = hostPlatform.platform.kernelArch; + + # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc. + # We do this so we have a build->build, not build->host, C compiler. + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ perl ]; + + extraIncludeDirs = lib.optional hostPlatform.isPowerPC ["ppc"]; + + # "patches" array defaults to 'null' to avoid changing hash + # and causing mass rebuild + inherit patches; + + buildPhase = '' + make mrproper headers_check SHELL=bash + ''; + + installPhase = '' + make INSTALL_HDR_PATH=$out headers_install + + # Some builds (e.g. KVM) want a kernel.release. + mkdir -p $out/include/config + echo "${version}-default" > $out/include/config/kernel.release + ''; + + # !!! hacky + fixupPhase = '' + ln -s asm $out/include/asm-$platform + if test "$platform" = "i386" -o "$platform" = "x86_64"; then + ln -s asm $out/include/asm-x86 + fi + ''; + + meta = with lib; { + description = "Header files and scripts for Linux kernel"; + license = licenses.gpl2; + platforms = platforms.linux; + }; + }; +in { + + linuxHeaders_4_4 = common { + version = "4.4.10"; + sha256 = "1kpjvvd9q9wwr3314q5ymvxii4dv2d27295bzly225wlc552xhja"; + }; + + linuxHeaders_4_15 = common { + version = "4.15"; + sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js"; + }; +} diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 82a092cd53933..8fb40475bd7bf 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -16,7 +16,7 @@ */ -{ stdenv, version, kernelPlatform, extraConfig, features }: +{ stdenv, version, extraConfig, features }: with stdenv.lib; @@ -682,6 +682,5 @@ with stdenv.lib; WW_MUTEX_SELFTEST? n ''} - ${kernelPlatform.kernelExtraConfig or ""} ${extraConfig} '' diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 5bce3af94293a..f886fcfdc3584 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -13,18 +13,18 @@ use strict; use IPC::Open2; use Cwd; -my $wd = getcwd; - +# exported via nix my $debug = $ENV{'DEBUG'}; my $autoModules = $ENV{'AUTO_MODULES'}; my $preferBuiltin = $ENV{'PREFER_BUILTIN'}; - +my $ignoreConfigErrors = $ENV{'ignoreConfigErrors'}; +my $buildRoot = $ENV{'BUILD_ROOT'}; $SIG{PIPE} = 'IGNORE'; # Read the answers. my %answers; my %requiredAnswers; -open ANSWERS, "<$ENV{KERNEL_CONFIG}" or die; +open ANSWERS, "<$ENV{KERNEL_CONFIG}" or die "Could not open answer file"; while (<ANSWERS>) { chomp; s/#.*//; @@ -40,7 +40,7 @@ close ANSWERS; sub runConfig { # Run `make config'. - my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$wd config SHELL=bash ARCH=$ENV{ARCH}"); + my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$buildRoot config SHELL=bash ARCH=$ENV{ARCH}"); # Parse the output, look for questions and then send an # appropriate answer. @@ -122,7 +122,7 @@ runConfig; # there. `make config' often overrides answers if later questions # cause options to be selected. my %config; -open CONFIG, "<.config" or die; +open CONFIG, "<$buildRoot/.config" or die "Could not read .config"; while (<CONFIG>) { chomp; if (/^CONFIG_([A-Za-z0-9_]+)="(.*)"$/) { @@ -137,7 +137,7 @@ while (<CONFIG>) { close CONFIG; foreach my $name (sort (keys %answers)) { - my $f = $requiredAnswers{$name} && $ENV{'ignoreConfigErrors'} ne "1" + my $f = $requiredAnswers{$name} && $ignoreConfigErrors ne "1" ? sub { die "error: " . $_[0]; } : sub { warn "warning: " . $_[0]; }; &$f("unused option: $name\n") unless defined $config{$name}; &$f("option not set correctly: $name (wanted '$answers{$name}', got '$config{$name}')\n") diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index e00bda692b3c5..0bed93d76edb6 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -1,5 +1,18 @@ +{ buildPackages, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, openssl +, ncurses +, libelf +, utillinux +, writeTextFile, ubootTools +, callPackage +, overrideCC, gcc7 +}: + { stdenv, buildPackages, perl, buildLinux +, # Allow really overriding even our gcc7 default. + # We want gcc >= 7.3 to enable the "retpoline" mitigation of security problems. + stdenvNoOverride ? overrideCC stdenv gcc7 + , # The kernel source tarball. src @@ -24,11 +37,13 @@ # optionally be compressed with gzip or bzip2. kernelPatches ? [] , ignoreConfigErrors ? hostPlatform.platform.name != "pc" || - hostPlatform != stdenv.buildPlatform + hostPlatform != stdenvNoOverride.buildPlatform , extraMeta ? {} , hostPlatform , ... -}: +} @ args: + +let stdenv = stdenvNoOverride; in # finish the rename assert stdenv.isLinux; @@ -45,8 +60,10 @@ let } // features) kernelPatches; config = import ./common-config.nix { - inherit stdenv version extraConfig; - kernelPlatform = hostPlatform; + inherit stdenv version ; + # append extraConfig for backwards compatibility but also means the user can't override the kernelExtraConfig part + extraConfig = extraConfig + lib.optionalString (hostPlatform.platform ? kernelExtraConfig) hostPlatform.platform.kernelExtraConfig; + features = kernelFeatures; # Ensure we know of all extra patches, etc. }; @@ -68,7 +85,9 @@ let nativeBuildInputs = [ perl ]; platformName = hostPlatform.platform.name; + # e.g. "defconfig" kernelBaseConfig = hostPlatform.platform.kernelBaseConfig; + # e.g. "bzImage" kernelTarget = hostPlatform.platform.kernelTarget; autoModules = hostPlatform.platform.kernelAutoModules; preferBuiltin = hostPlatform.platform.kernelPreferBuiltin or false; @@ -83,25 +102,25 @@ let inherit (kernel) src patches preUnpack; buildPhase = '' - cd $buildRoot + export buildRoot="''${buildRoot:-build}" # Get a basic config file for later refinement with $generateConfig. - make HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc -C ../$sourceRoot O=$PWD $kernelBaseConfig ARCH=$arch + make HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc -C . O="$buildRoot" $kernelBaseConfig ARCH=$arch # Create the config file. echo "generating kernel configuration..." - echo "$kernelConfig" > kernel-config - DEBUG=1 ARCH=$arch KERNEL_CONFIG=kernel-config AUTO_MODULES=$autoModules \ - PREFER_BUILTIN=$preferBuiltin SRC=../$sourceRoot perl -w $generateConfig + echo "$kernelConfig" > "$buildRoot/kernel-config" + DEBUG=1 ARCH=$arch KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \ + PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. perl -w $generateConfig ''; - installPhase = "mv .config $out"; + installPhase = "mv $buildRoot/.config $out"; enableParallelBuilding = true; }; - kernel = buildLinux { - inherit version modDirVersion src kernelPatches stdenv extraMeta configfile; + kernel = (callPackage ./manual-config.nix {}) { + inherit version modDirVersion src kernelPatches stdenv extraMeta configfile hostPlatform; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; }; diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index 506682479c7c0..e89222b2c6290 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: -import ./generic.nix (args // rec { +buildLinux (args // rec { version = "4.13.16"; extraMeta.branch = "4.13"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 413e3ea32dcfd..96aa426b12ea1 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -2,14 +2,14 @@ with stdenv.lib; -import ./generic.nix (args // rec { - version = "4.14.17"; +buildLinux (args // rec { + version = "4.14.19"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jqa86bnnlzv0r0bvzvmbj1c89a5m64zrjfvfrjlwg3vy63r9ii7"; + sha256 = "0gj7mq0dnb914mm4rari9z2cxbybskv1587606aq6f9nv1qp3kn5"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix index fa9d0b4bcdad7..83fbfa81bf356 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix @@ -2,8 +2,8 @@ with stdenv.lib; -import ./generic.nix (args // rec { - version = "4.15.1"; +buildLinux (args // rec { + version = "4.15.3"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ import ./generic.nix (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pxgs5wqmidwa5lz6q1m9gz6jyvhvlgy8r5bs48cm08b0vcwsvlq"; + sha256 = "055p02in09rj95z9hc1kjh4r12ydwdcl3ds2cp4dckhlnyhnxf4g"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index c1c989e28c841..4316ba4cf4bea 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: -import ./generic.nix (args // rec { +buildLinux (args // rec { version = "4.4.115"; extraMeta.branch = "4.4"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index cc02908fb89ac..2bb8ac1d948df 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: -import ./generic.nix (args // rec { - version = "4.9.80"; +buildLinux (args // rec { + version = "4.9.81"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ys74q9f93c42flqracaqnkh0qwcbnimhppd80rz5hxgq3686bly"; + sha256 = "1bjwca7m3ksab6d23a05ciphzaj6nv6qmc5n6dxrgim0yhjpmvk4"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-beagleboard.nix b/pkgs/os-specific/linux/kernel/linux-beagleboard.nix index 097408d61d982..4f0ff53c59ced 100644 --- a/pkgs/os-specific/linux/kernel/linux-beagleboard.nix +++ b/pkgs/os-specific/linux/kernel/linux-beagleboard.nix @@ -4,7 +4,7 @@ let modDirVersion = "4.14.12"; tag = "r23"; in -stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { +stdenv.lib.overrideDerivation (buildLinux (args // rec { version = "${modDirVersion}-ti-${tag}"; inherit modDirVersion; diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix index d87ed3e8082db..304c085f4aa72 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.15.1"; + version = "4.15.3"; revision = "a"; - sha256 = "1k9ng0110vzl29rzbglk3vmnpfqk04rd2mja5aqql81z5pb1x528"; + sha256 = "1fxdllg60hwlbmjijcj7w6c3xz0rf9268f12qy45diahmydyccgc"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -15,7 +15,7 @@ let modDirVersion = "${modVersion}-hardened"; in -import ./generic.nix (args // { +buildLinux (args // { inherit modDirVersion; version = "${version}-${revision}"; diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index 9720e3c0e4a85..c4bade2abeda7 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,9 +1,10 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: -import ./generic.nix (rec { +buildLinux (rec { mptcpVersion = "0.93"; modDirVersion = "4.9.60"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; + # autoModules= true; extraMeta = { branch = "4.4"; @@ -43,4 +44,4 @@ import ./generic.nix (rec { TCP_CONG_BALIA m '' + (args.extraConfig or ""); -} // args // (args.argsOverride or {})) +} // args) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 1efb11435e2f4..a96a910c68c9c 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -4,7 +4,7 @@ let modDirVersion = "4.9.59"; tag = "1.20171029"; in -stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { +stdenv.lib.overrideDerivation (buildLinux (args // rec { version = "${modDirVersion}-${tag}"; inherit modDirVersion; diff --git a/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix index c65182271dc35..442c896751193 100644 --- a/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ncurses, ... } @ args: -import ./generic.nix (args // rec { +buildLinux (args // rec { version = "4.12.2"; extraMeta.branch = "4.12-2"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index ac13835afdd4e..5aae37418ce80 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,15 +1,15 @@ { stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args: -import ./generic.nix (args // rec { - version = "4.11.2017.08.23"; - modDirVersion = "4.11.0"; +buildLinux (args // rec { + version = "4.15.2018.02.09"; + modDirVersion = "4.15.0"; extraMeta.branch = "master"; extraMeta.maintainers = [ stdenv.lib.maintainers.davidak ]; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "fb8082a13d49397346a04ce4d3904569b0287738"; - sha256 = "18csg2zb4lnhid27h5w95j3g8np29m8y3zfpfgjl1jr2jks64kid"; + rev = "4506cd5ead31209a6a646c2412cbc7be735ebda4"; + sha256 = "0fcyf3y27k2lga5na4dhdyc47br840gkqynv8gix297pqxgidrib"; }; extraConfig = '' @@ -20,4 +20,3 @@ import ./generic.nix (args // rec { extraMeta.hydraPlatforms = []; } // (args.argsOverride or {})) - diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 1a309ff6376ba..ab838f546c16e 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: -import ./generic.nix (args // rec { +buildLinux (args // rec { version = "4.15-rc9"; modDirVersion = "4.15.0-rc9"; extraMeta.branch = "4.15"; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 9a7e960941075..3dae37136a2e5 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,8 +1,8 @@ { buildPackages, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, openssl +, ncurses ? null , libelf , utillinux , writeTextFile, ubootTools -, hostPlatform }: let @@ -34,7 +34,9 @@ in { # Use defaultMeta // extraMeta extraMeta ? {}, # Whether to utilize the controversial import-from-derivation feature to parse the config - allowImportFromDerivation ? false + allowImportFromDerivation ? false, + + hostPlatform }: let @@ -80,14 +82,13 @@ let (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")); in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // { passthru = { - inherit version modDirVersion config kernelPatches configfile moduleBuildDependencies; + inherit version modDirVersion config kernelPatches configfile + moduleBuildDependencies stdenv; }; inherit src; preUnpack = '' - mkdir build - export buildRoot="$(pwd)/build" ''; patches = map (p: p.patch) kernelPatches; @@ -102,7 +103,25 @@ let configurePhase = '' runHook preConfigure + + mkdir build + export buildRoot="$(pwd)/build" + + echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD" + + if [[ -z "$buildRoot" || ! -d "$buildRoot" ]]; then + echo "set $buildRoot to the build folder please" + exit 1 + fi + + if [ -f "$buildRoot/.config" ]; then + echo "Could not link $buildRoot/.config : file exists" + exit 1 + fi ln -sv ${configfile} $buildRoot/.config + + # reads the existing .config file and prompts the user for options in + # the current kernel source that are not found in the file. make $makeFlags "''${makeFlagsArray[@]}" oldconfig runHook postConfigure @@ -115,6 +134,8 @@ let # Note: we can get rid of this once http://permalink.gmane.org/gmane.linux.kbuild.devel/13800 is merged. buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)") + + cd $buildRoot ''; buildFlags = [ @@ -136,7 +157,7 @@ let postInstall = '' mkdir -p $dev - cp $buildRoot/vmlinux $dev/ + cp vmlinux $dev/ '' + (optionalString installsFirmware '' mkdir -p $out/lib/firmware '') + (if (platform ? kernelDTB && platform.kernelDTB) then '' @@ -151,7 +172,7 @@ let unlink $out/lib/modules/${modDirVersion}/source mkdir -p $dev/lib/modules/${modDirVersion}/build - cp -dpR ../$sourceRoot $dev/lib/modules/${modDirVersion}/source + cp -dpR .. $dev/lib/modules/${modDirVersion}/source cd $dev/lib/modules/${modDirVersion}/source cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build @@ -170,7 +191,7 @@ let # from drivers/ in the future; it adds 50M to keep all of its # headers on 3.10 though. - chmod u+w -R ../source + chmod u+w -R .. arch=$(cd $dev/lib/modules/${modDirVersion}/build/arch; ls) # Remove unused arches @@ -216,7 +237,7 @@ let "The Linux kernel" + (if kernelPatches == [] then "" else " (with patches: " - + stdenv.lib.concatStrings (stdenv.lib.intersperse ", " (map (x: x.name) kernelPatches)) + + stdenv.lib.concatStringsSep ", " (map (x: x.name) kernelPatches) + ")"); license = stdenv.lib.licenses.gpl2; homepage = https://www.kernel.org/; @@ -245,8 +266,10 @@ stdenv.mkDerivation ((drvAttrs config hostPlatform.platform kernelPatches config hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ]; + # Absolute paths for compilers avoid any PATH-clobbering issues. makeFlags = commonMakeFlags ++ [ - "HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc" + "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" "ARCH=${stdenv.hostPlatform.platform.kernelArch}" ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh index d9db7f9f916cf..878c3c14fe473 100755 --- a/pkgs/os-specific/linux/kernel/update.sh +++ b/pkgs/os-specific/linux/kernel/update.sh @@ -50,13 +50,13 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do # Rewrite the expression sed -i -e '/version = /d' -e '/modDirVersion = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE if grep -q '^[0-9]\+.[0-9]\+$' <<< "$V"; then - sed -i "\#import ./generic.nix (args // rec {#a \ modDirVersion = \"${V}.0\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE + sed -i "\#buildLinux (args // rec {#a \ modDirVersion = \"${V}.0\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE fi - sed -i "\#import ./generic.nix (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE + sed -i "\#buildLinux (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE # Commit the changes git add -u $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE git commit -m "kernel: $OLDVER -> $V" >/dev/null 2>&1 - + echo "Updated $OLDVER -> $V" done diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 021353c47091e..c4c5b7cc3b91c 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ stdenv, buildPackages, fetchurl, zlib }: stdenv.mkDerivation rec { name = "kexec-tools-${version}"; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" "pic" "relro" ]; + configureFlags = [ "BUILD_CC=${buildPackages.stdenv.cc.targetPrefix}cc" ]; + nativeBuildInputs = [ buildPackages.stdenv.cc ]; buildInputs = [ zlib ]; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 17cd40e427b96..f00d6272902df 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, attr, perl, pam ? null }: +{ stdenv, buildPackages, fetchurl, attr, perl, pam ? null }: assert pam != null -> stdenv.isLinux; stdenv.mkDerivation rec { @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" "man" "doc" ] ++ stdenv.lib.optional (pam != null) "pam"; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; buildInputs = [ pam ]; @@ -22,6 +23,8 @@ stdenv.mkDerivation rec { makeFlags = [ "lib=lib" (stdenv.lib.optional (pam != null) "PAM_CAP=yes") + "BUILD_CC=$(CC_FOR_BUILD)" + "CC:=$(CC)" ]; prePatch = '' diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 81a3af54628e8..f66df8163ff17 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig }: let version = "3.3.0"; in stdenv.mkDerivation { @@ -13,6 +13,12 @@ stdenv.mkDerivation { outputs = [ "bin" "dev" "out" "man" ]; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/musl/48d2a28710ae40877fd3e178ead1fb1bb0baa62c/dev-libs/libnl/files/libnl-3.3.0_rc1-musl.patch"; + sha256 = "0dd7xxikib201i99k2if066hh7gwf2i4ffckrjplq6lr206jn00r"; + }); + nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 066946d8f0bcb..4f35d54653834 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2" - "http://pkgs.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2" + "http://src.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2" ]; sha256 = "07q6811l4pp0f7pxr8bk3s97ippb84mx5qdg7v92s9hs10b90mz0"; }; @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ bison flex which perl ] ++ stdenv.lib.optional sensord rrdtool; + patches = [ ./musl-fix-includes.patch ]; + preBuild = '' makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc ${stdenv.lib.optionalString sensord "PROG_EXTRA=sensord"}) diff --git a/pkgs/os-specific/linux/lm-sensors/musl-fix-includes.patch b/pkgs/os-specific/linux/lm-sensors/musl-fix-includes.patch new file mode 100644 index 0000000000000..501f2dd762c63 --- /dev/null +++ b/pkgs/os-specific/linux/lm-sensors/musl-fix-includes.patch @@ -0,0 +1,62 @@ +--- lm_sensors-3.3.4.orig/prog/dump/isadump.c ++++ lm_sensors-3.3.4/prog/dump/isadump.c +@@ -36,13 +36,7 @@ + #include "util.h" + #include "superio.h" + +- +-/* To keep glibc2 happy */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include <sys/io.h> +-#else +-#include <asm/io.h> +-#endif + + #ifdef __powerpc__ + unsigned long isa_io_base = 0; /* XXX for now */ +--- lm_sensors-3.3.4.orig/prog/dump/isaset.c ++++ lm_sensors-3.3.4/prog/dump/isaset.c +@@ -32,13 +32,7 @@ + #include <string.h> + #include "util.h" + +- +-/* To keep glibc2 happy */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include <sys/io.h> +-#else +-#include <asm/io.h> +-#endif + + #ifdef __powerpc__ + unsigned long isa_io_base = 0; /* XXX for now */ +--- lm_sensors-3.3.4.orig/prog/dump/superio.c ++++ lm_sensors-3.3.4/prog/dump/superio.c +@@ -20,12 +20,7 @@ + */ + + #include <stdlib.h> +- +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include <sys/io.h> +-#else +-#include <asm/io.h> +-#endif + + #include "superio.h" + +--- lm_sensors-3.3.4.orig/prog/dump/util.c ++++ lm_sensors-3.3.4/prog/dump/util.c +@@ -11,12 +11,7 @@ + #include <stdio.h> + #include "util.h" + +-/* To keep glibc2 happy */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include <sys/io.h> +-#else +-#include <asm/io.h> +-#endif + + /* Return 1 if we should continue, 0 if we should abort */ + int user_ack(int def) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index d6c1504fdf442..bd84e121a7d69 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid +{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid , thin-provisioning-tools, enable_dmeventd ? false }: let @@ -41,6 +41,23 @@ stdenv.mkDerivation { enableParallelBuilding = true; #patches = [ ./purity.patch ]; + patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + (fetchpatch { + name = "fix-stdio-usage.patch"; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; + sha256 = "0m6wr6qrvxqi2d2h054cnv974jq1v65lqxy05g1znz946ga73k3p"; + }) + (fetchpatch { + name = "mallinfo.patch"; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; + sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0"; + }) + (fetchpatch { + name = "mlockall-default-config.patch"; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/mlockall-default-config.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; + sha256 = "1ivbj3sphgf8n1ykfiv5rbw7s8dgnj5jcr9jl2v8cwf28lkacw5l"; + }) + ]; # To prevent make install from failing. preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\""; diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index aaef5315b0f0f..f74ac9c41eee3 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -1,11 +1,29 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, lib, fetchurl +, buildPackages +, linuxHeaders ? null +, useBSDCompatHeaders ? true +}: +let + cdefs_h = fetchurl { + url = "http://git.alpinelinux.org/cgit/aports/plain/main/libc-dev/sys-cdefs.h"; + sha256 = "16l3dqnfq0f20rzbkhc38v74nqcsh9n3f343bpczqq8b1rz6vfrh"; + }; + queue_h = fetchurl { + url = "http://git.alpinelinux.org/cgit/aports/plain/main/libc-dev/sys-queue.h"; + sha256 = "12qm82id7zys92a1qh2l1qf2wqgq6jr4qlbjmqyfffz3s3nhfd61"; + }; + tree_h = fetchurl { + url = "http://git.alpinelinux.org/cgit/aports/plain/main/libc-dev/sys-tree.h"; + sha256 = "14igk6k00bnpfw660qhswagyhvr0gfqg4q55dxvaaq7ikfkrir71"; + }; +in stdenv.mkDerivation rec { name = "musl-${version}"; version = "1.1.18"; src = fetchurl { - url = "http://www.musl-libc.org/releases/${name}.tar.gz"; + url = "http://www.musl-libc.org/releases/musl-${version}.tar.gz"; sha256 = "0651lnj5spckqjf83nz116s8qhhydgqdy3rkl4icbh5f05fyw5yh"; }; @@ -23,15 +41,40 @@ stdenv.mkDerivation rec { "--enable-shared" "--enable-static" "CFLAGS=-fstack-protector-strong" + # Fix cycle between outputs + "--disable-wrapper" ]; + outputs = [ "out" "dev" ]; + + patches = [ ./few-more-uapi-fixes.patch ]; + dontDisableStatic = true; + dontStrip = true; + + postInstall = + '' + # Not sure why, but link in all but scsi directory as that's what uclibc/glibc do. + # Apparently glibc provides scsi itself? + (cd $dev/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .) + '' + + '' + mkdir -p $out/bin + # Create 'ldd' symlink, builtin + ln -s $out/lib/libc.so $out/bin/ldd + '' + lib.optionalString useBSDCompatHeaders '' + install -D ${queue_h} $dev/include/sys/queue.h + install -D ${cdefs_h} $dev/include/sys/cdefs.h + install -D ${tree_h} $dev/include/sys/tree.h + ''; + + passthru.linuxHeaders = linuxHeaders; meta = { description = "An efficient, small, quality libc implementation"; homepage = "http://www.musl-libc.org"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/os-specific/linux/musl/few-more-uapi-fixes.patch b/pkgs/os-specific/linux/musl/few-more-uapi-fixes.patch new file mode 100644 index 0000000000000..f84ca2c5aec80 --- /dev/null +++ b/pkgs/os-specific/linux/musl/few-more-uapi-fixes.patch @@ -0,0 +1,71 @@ +http://www.openwall.com/lists/musl/2018/01/06/3 + +Date: Sat, 6 Jan 2018 23:32:52 +0100 +From: Hauke Mehrtens <hauke@...ke-m.de> +To: musl@...ts.openwall.com +Cc: felix.janda@...teo.de, + Hauke Mehrtens <hauke@...ke-m.de> +Subject: [PATCH v2] Add additional uapi guards for Linux kernel header files + +With Linux kernel 4.16 it will be possible to guard more parts of the +Linux header files from a libc. Make use of this in musl to guard all +the structures and other definitions from the Linux header files which +are also defined by the header files provided by musl. This will make +musl compile with the unmodified Linux kernel user space headers. + +This extends the definitions done in commit 04983f227238 ("make +netinet/in.h suppress clashing definitions from kernel headers") + +The needed patches were recently accepted into the netdev tree and will be integrated in Linux 4.16: +https://patchwork.ozlabs.org/patch/854342/ +https://patchwork.ozlabs.org/patch/855293/ +--- + include/net/if.h | 7 +++++++ + include/netinet/if_ether.h | 1 + + include/sys/xattr.h | 2 ++ + 3 files changed, 10 insertions(+) + +diff --git a/include/net/if.h b/include/net/if.h +index 2f2fcc10..0ee48cd7 100644 +--- a/include/net/if.h ++++ b/include/net/if.h +@@ -125,6 +125,13 @@ struct ifconf { + #define ifc_req ifc_ifcu.ifcu_req + #define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0) + ++#define __UAPI_DEF_IF_IFCONF 0 ++#define __UAPI_DEF_IF_IFMAP 0 ++#define __UAPI_DEF_IF_IFNAMSIZ 0 ++#define __UAPI_DEF_IF_IFREQ 0 ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++ + #endif + + #ifdef __cplusplus +diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h +index d9a131aa..c2c6e944 100644 +--- a/include/netinet/if_ether.h ++++ b/include/netinet/if_ether.h +@@ -133,5 +133,6 @@ do { \ + (enaddr)[5] = ((uint8_t *)ipaddr)[3]; \ + } while(0) + ++#define __UAPI_DEF_ETHHDR 0 + + #endif +diff --git a/include/sys/xattr.h b/include/sys/xattr.h +index 6479fcc6..52e3dd89 100644 +--- a/include/sys/xattr.h ++++ b/include/sys/xattr.h +@@ -24,6 +24,8 @@ int removexattr(const char *, const char *); + int lremovexattr(const char *, const char *); + int fremovexattr(int, const char *); + ++#define __UAPI_DEF_XATTR 0 ++ + #ifdef __cplusplus + } + #endif +-- +2.11.0 diff --git a/pkgs/os-specific/linux/musl/fts.nix b/pkgs/os-specific/linux/musl/fts.nix new file mode 100644 index 0000000000000..083541e5e935c --- /dev/null +++ b/pkgs/os-specific/linux/musl/fts.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: + +stdenv.mkDerivation rec { + name = "musl-fts-${version}"; + version = "2017-01-13"; + src = fetchFromGitHub { + owner = "pullmoll"; + repo = "musl-fts"; + rev = "0bde52df588e8969879a2cae51c3a4774ec62472"; + sha256 = "1q8cpzisziysrs08b89wj0rm4p6dsyl177cclpfa0f7spjm3jg03"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; +} diff --git a/pkgs/os-specific/linux/musl/getconf.nix b/pkgs/os-specific/linux/musl/getconf.nix new file mode 100644 index 0000000000000..dbfaca296bf9f --- /dev/null +++ b/pkgs/os-specific/linux/musl/getconf.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "musl-getconf"; + src = fetchurl { + url = "https://raw.githubusercontent.com/alpinelinux/aports/48b16204aeeda5bc1f87e49c6b8e23d9abb07c73/main/musl/getconf.c"; + sha256 = "0z14ml5343p5gapxw9fnbn2r72r7v2gk8662iifjrblh6sxhqzfq"; + }; + + unpackPhase = ":"; + + buildPhase = ''$CC $src -o getconf''; + installPhase = '' + mkdir -p $out/bin + cp getconf $out/bin/ + ''; +} + + diff --git a/pkgs/os-specific/linux/musl/getent.nix b/pkgs/os-specific/linux/musl/getent.nix new file mode 100644 index 0000000000000..6eed17a76b02e --- /dev/null +++ b/pkgs/os-specific/linux/musl/getent.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "musl-getent"; + src = fetchurl { + url = "https://raw.githubusercontent.com/alpinelinux/aports/89a718d88ec7466e721f3bbe9ede5ffe58061d78/main/musl/getent.c"; + sha256 = "0b4jqnsmv1hjgcz7db3vd61k682aphl59c3yhwya2q7mkc6g48xk"; + }; + + unpackPhase = ":"; + + buildPhase = ''$CC $src -o getent''; + installPhase = '' + mkdir -p $out/bin + cp getent $out/bin/ + ''; +} + diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index a5ed242e3230e..9928897ae4d49 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -1,15 +1,28 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { - name = "numactl-2.0.10"; + name = "numactl-${version}"; + version = "2.0.11"; - src = fetchurl { - url = "ftp://oss.sgi.com/www/projects/libnuma/download/${name}.tar.gz"; - sha256 = "0qfv2ks6d3gm0mw5sj4cbhsd7cbsb7qm58xvchl2wfzifkzcinnv"; + src = fetchFromGitHub { + owner = "numactl"; + repo = "numactl"; + rev = "v${version}"; + sha256 = "0bcffqawwbyrnza8np0whii25mfd0dria35zal9v3l55xcrya3j9"; }; nativeBuildInputs = [ autoreconfHook ]; + patches = [ + (fetchpatch { + url = https://raw.githubusercontent.com/gentoo/gentoo/b64d15e731e3d6a7671f0ec6c34a20203cf2609d/sys-process/numactl/files/numactl-2.0.11-sysmacros.patch; + sha256 = "05277kv3x12n2xlh3fgnmxclxfc384mkwb0v9pd91046khj6h843"; + }) + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + url = https://git.alpinelinux.org/cgit/aports/plain/testing/numactl/musl.patch?id=0592b128c71c3e70d493bc7a13caed0d7fae91dd; + sha256 = "080b0sygmg7104qbbh1amh3b322yyiajwi2d3d0vayffgva0720v"; + }); + meta = with stdenv.lib; { description = "Library and tools for non-uniform memory access (NUMA) machines"; homepage = http://oss.sgi.com/projects/libnuma/; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index a4d1629a68418..d0348bd67d45a 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -14,7 +14,7 @@ let sha256 = "18clfpw03g8dxm61bmdkmccyaxir3gnq451z6xqa2ilm3j820aa5"; }); in -{ +rec { # Policy: use the highest stable version as the default (on our master). stable = generic { version = "390.25"; @@ -24,13 +24,7 @@ in persistencedSha256 = "033azbhi50f1b0lw759sncgf7ckh2m2c0khj5v15sch9kl1fzk8i"; }; - beta = generic { - version = "381.22"; - sha256_32bit = "024x3c6hrivg2bkbzv1xd0585hvpa2kbn1y2gwvca7c73kpdczbv"; - sha256_64bit = "13fj9ndy5rmh410d0vi2b0crfl7rbsm6rn7cwms0frdzkyhshghs"; - settingsSha256 = "1gls187zfd201b29qfvwvqvl5gvp5wl9lq966vd28crwqh174jrh"; - persistencedSha256 = "08315rb9l932fgvy758an5vh3jgks0qc4g36xip4l32pkxd9k963"; - }; + beta = stable; # not enough interest to maintain beta ATM legacy_340 = generic { diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 3de7916bff691..5f92dfcc83903 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, cracklib }: +{ stdenv, buildPackages, hostPlatform, fetchurl, fetchpatch, flex, cracklib }: stdenv.mkDerivation rec { name = "linux-pam-${version}"; @@ -9,8 +9,24 @@ stdenv.mkDerivation rec { sha256 = "1fyi04d5nsh8ivd0rn2y0z83ylgc0licz7kifbb6xxi2ylgfs6i4"; }; + patches = stdenv.lib.optionals (hostPlatform.libc == "musl") [ + (fetchpatch { + url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; + sha256 = "1h5yp5h2mqp1fcwiwwklyfpa69a3i03ya32pivs60fd7g5bqa7sf"; + }) + (fetchpatch { + url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; + sha256 = "1ib6shhvgzinjsc603k2x1lxh9dic6qq449fnk110gc359m23j81"; + }) + (fetchpatch { + url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/musl-fix-pam_exec.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; + sha256 = "04dx6s9d8cxl40r7m7dc4si47ds4niaqm7902y1d6wcjvs11vrf0"; + }) + ]; + outputs = [ "out" "doc" "man" /* "modules" */ ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ flex ]; buildInputs = [ cracklib ]; @@ -20,7 +36,7 @@ stdenv.mkDerivation rec { crossAttrs = { propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ]; preConfigure = preConfigure + '' - ar x ${flex.crossDrv}/lib/libfl.a + $crossConfig-ar x ${flex.crossDrv}/lib/libfl.a mv libyywrap.o libyywrap-target.o ar x ${flex}/lib/libfl.a mv libyywrap.o libyywrap-host.o @@ -46,6 +62,12 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlags="$configureFlags --includedir=$out/include/security" + '' + stdenv.lib.optionalString (hostPlatform.libc == "musl") '' + # export ac_cv_search_crypt=no + # (taken from Alpine linux, apparently insecure but also doesn't build O:)) + # disable insecure modules + # sed -e 's/pam_rhosts//g' -i modules/Makefile.am + sed -e 's/pam_rhosts//g' -i modules/Makefile.in ''; meta = { diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 64d7a694fc146..8875d7ec4b3ee 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -9,7 +9,7 @@ let glibc = if hostPlatform != buildPlatform then glibcCross - else assert stdenv ? glibc; stdenv.glibc; + else assert hostPlatform.libc == "glibc"; stdenv.cc.libc; dots_in_usernames = fetchpatch { url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch; @@ -60,9 +60,10 @@ stdenv.mkDerivation rec { configureFlags="$configureFlags --with-xml-catalog=$PWD/xmlcatalog "; ''; - configureFlags = " --enable-man "; + configureFlags = " --enable-man " + + stdenv.lib.optionalString (hostPlatform.libc != "glibc") " --disable-nscd "; - preBuild = assert glibc != null; + preBuild = stdenv.lib.optionalString (hostPlatform.libc == "glibc") '' substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd ''; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index e0d1754dd7496..57698b5ad455f 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -61,13 +61,19 @@ in assert kernel != null; { splStable = common { - version = "0.7.5"; - sha256 = "0njb3274bc5pfr80pzj94sljq457pr71n50s0gsccbz8ghk28rlr"; + version = "0.7.6"; + sha256 = "1l641d89k48ngmarx9mxh8gw2zzrf7fw7n8zmslhz4h1152plddb"; }; splUnstable = common { - version = "2017-12-21"; - rev = "c9821f1ccc647dfbd506f381b736c664d862d126"; - sha256 = "08r6sa36jaj6n54ap18npm6w85v5yn3x8ljg792h37f49b8kir6c"; + version = "2018-01-24"; + rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771"; + sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h"; + }; + + splLegacyCrypto = common { + version = "2018-01-24"; + rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771"; + sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h"; }; } diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index aeda85584e79d..9085b1703c0a9 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,194 +1,225 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi -, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4 -, kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp -, iptables, gnu-efi +, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor +, audit, lz4, bzip2, kexectools, libmicrohttpd +, linuxHeaders ? stdenv.cc.libc.linuxHeaders +, libseccomp, iptables, gnu-efi , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 +, ninja, meson, python3Packages, glibcLocales +, patchelf +, getent }: assert stdenv.isLinux; -stdenv.mkDerivation rec { - version = "234"; - name = "systemd-${version}"; - - src = fetchFromGitHub { - owner = "nixos"; - repo = "systemd"; - rev = "eef5613fda5"; - sha256 = "0wgh5y319v56hcs82mhs58ipb100cz4x41vz3kh4bq1n7sx88cdz"; - }; - - outputs = [ "out" "lib" "man" "dev" ]; - - nativeBuildInputs = - [ pkgconfig intltool gperf libxslt - /* FIXME: we may be able to prevent the following dependencies - by generating an autoconf'd tarball, but that's probably not - worth it. */ - autoreconfHook gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 - ]; - buildInputs = - [ linuxHeaders libcap kmod xz pam acl - /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror - libmicrohttpd kexectools libseccomp libffi audit lz4 libapparmor - iptables gnu-efi - ]; - - configureFlags = - [ "--localstatedir=/var" - "--sysconfdir=/etc" - "--with-rootprefix=$(out)" - "--with-kbd-loadkeys=${kbd}/bin/loadkeys" - "--with-kbd-setfont=${kbd}/bin/setfont" - "--with-rootprefix=$(out)" - "--with-dbuspolicydir=$(out)/etc/dbus-1/system.d" - "--with-dbussystemservicedir=$(out)/share/dbus-1/system-services" - "--with-dbussessionservicedir=$(out)/share/dbus-1/services" - "--with-tty-gid=3" # tty in NixOS has gid 3 - "--disable-tests" - - "--enable-lz4" - "--enable-hostnamed" - "--enable-networkd" - "--disable-sysusers" - "--enable-timedated" - "--enable-timesyncd" - "--disable-firstboot" - "--enable-localed" - "--enable-resolved" - "--disable-split-usr" - "--disable-libcurl" - "--disable-libidn" - "--disable-quotacheck" - "--disable-ldconfig" - "--disable-smack" - - (if stdenv.isArm then "--disable-gnuefi" else "--enable-gnuefi") - "--with-efi-libdir=${gnu-efi}/lib" - "--with-efi-includedir=${gnu-efi}/include" - "--with-efi-ldsdir=${gnu-efi}/lib" - - "--with-sysvinit-path=" - "--with-sysvrcnd-path=" - "--with-rc-local-script-path-stop=/etc/halt.local" - ]; - - hardeningDisable = [ "stackprotector" ]; - - patches = [ - # TODO: Remove this patch when we have a systemd version - # with https://github.com/systemd/systemd/pull/6678 - (fetchpatch { - url = "https://github.com/systemd/systemd/commit/58a78ae77063eddfcd23ea272bd2e0ddc9ea3ff7.patch"; - sha256 = "0g3pvqigs69mciw6lj3zg12dmxnhwxndwxdjg78af52xrp0djfg8"; - }) - ]; - - preConfigure = - '' - unset RANLIB - - ./autogen.sh - - # FIXME: patch this in systemd properly (and send upstream). - for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do - test -e $i - substituteInPlace $i \ - --replace /usr/bin/getent ${stdenv.glibc.bin}/bin/getent \ - --replace /bin/mount ${utillinux.bin}/bin/mount \ - --replace /bin/umount ${utillinux.bin}/bin/umount \ - --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \ - --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \ - --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \ - --replace /bin/echo ${coreutils}/bin/echo \ - --replace /bin/cat ${coreutils}/bin/cat \ - --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \ - --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \ - --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency - done - - substituteInPlace src/journal/catalog.c \ - --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ - - configureFlagsArray+=("--with-ntp-servers=0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org") +let + pythonLxmlEnv = python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); + +in + + stdenv.mkDerivation rec { + version = "237"; + name = "systemd-${version}"; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "systemd"; + rev = "1e8830dfa77a7dc6976509f4a6edb7e012c50792"; + sha256 = "1cw1k0i68azmzpqzi3r8jm6mbi2wqlql78fhcg0vvnv1ly8bf7vq"; + }; + + outputs = [ "out" "lib" "man" "dev" ]; + + nativeBuildInputs = + [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 + ninja meson + coreutils # meson calls date, stat etc. + pythonLxmlEnv glibcLocales + patchelf getent + ]; + buildInputs = + [ linuxHeaders libcap kmod xz pam acl + /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror libidn2 + libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor + iptables gnu-efi + ]; + + #dontAddPrefix = true; + + mesonFlags = [ + "-Dloadkeys-path=${kbd}/bin/loadkeys" + "-Dsetfont-path=${kbd}/bin/setfont" + "-Dtty-gid=3" # tty in NixOS has gid 3 + # "-Dtests=" # TODO + "-Dlz4=true" + "-Dhostnamed=true" + "-Dnetworkd=true" + "-Dsysusers=false" + "-Dtimedated=true" + "-Dtimesyncd=true" + "-Dfirstboot=false" + "-Dlocaled=true" + "-Dresolve=true" + "-Dsplit-usr=false" + "-Dlibcurl=false" + "-Dlibidn=false" + "-Dlibidn2=true" + "-Dquotacheck=false" + "-Dldconfig=false" + "-Dsmack=true" + "-Dsystem-uid-max=499" #TODO: debug why awking around in /etc/login.defs doesn't work + "-Dsystem-gid-max=499" + # "-Dtime-epoch=1" + + (if stdenv.isArm then "-Dgnu-efi=false" else "-Dgnu-efi=true") + "-Defi-libdir=${gnu-efi}/lib" + "-Defi-includedir=${gnu-efi}/include/efi" + "-Defi-ldsdir=${gnu-efi}/lib" + + "-Dsysvinit-path=" + "-Dsysvrcnd-path=" + ]; + + preConfigure = + '' + mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org") + mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d) + mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services) + mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services) + mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d) + mesonFlagsArray+=(-Dsysconfdir=$out/etc) + mesonFlagsArray+=(-Drootprefix=$out) + mesonFlagsArray+=(-Dlibdir=$lib/lib) + mesonFlagsArray+=(-Drootlibdir=$lib/lib) + mesonFlagsArray+=(-Dmandir=$man/lib) + mesonFlagsArray+=(-Dincludedir=$dev/include) + mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig) + mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig) + + # FIXME: Why aren't includedir and libdir picked up from mesonFlags while other options are? + substituteInPlace meson.build \ + --replace "includedir = join_paths(prefixdir, get_option('includedir'))" \ + "includedir = '$dev/include'" \ + --replace "libdir = join_paths(prefixdir, get_option('libdir'))" \ + "libdir = '$lib/lib'" + + export LC_ALL="en_US.UTF-8"; + # FIXME: patch this in systemd properly (and send upstream). + # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount + for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do + test -e $i + substituteInPlace $i \ + --replace /usr/bin/getent ${getent}/bin/getent \ + --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \ + --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \ + --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \ + --replace /bin/echo ${coreutils}/bin/echo \ + --replace /bin/cat ${coreutils}/bin/cat \ + --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \ + --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \ + --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency + done + + for i in tools/xml_helper.py tools/make-directive-index.py tools/make-man-index.py test/sys-script.py; do + substituteInPlace $i \ + --replace "#!/usr/bin/env python" "#!${pythonLxmlEnv}/bin/python" + done + + for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do + substituteInPlace $i \ + --replace "#!/usr/bin/env python" "#!${python3Packages.python}/bin/python" + done + + substituteInPlace src/journal/catalog.c \ + --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ + ''; + + # These defines are overridden by CFLAGS and would trigger annoying + # warning messages + postConfigure = '' + substituteInPlace config.h \ + --replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \ + --replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \ + --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" ''; - PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python - - NIX_CFLAGS_COMPILE = - [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would - # lead to a cyclic dependency. - "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" - "-fno-stack-protector" - - # Set the release_agent on /sys/fs/cgroup/systemd to the - # currently running systemd (/run/current-system/systemd) so - # that we don't use an obsolete/garbage-collected release agent. - "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" - - "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" - ]; - - installFlags = - [ "localstatedir=$(TMPDIR)/var" - "sysconfdir=$(out)/etc" - "sysvinitdir=$(TMPDIR)/etc/init.d" - "pamconfdir=$(out)/etc/pam.d" - ]; - - postInstall = - '' - # sysinit.target: Don't depend on - # systemd-tmpfiles-setup.service. This interferes with NixOps's - # send-keys feature (since sshd.service depends indirectly on - # sysinit.target). - mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/ - - mkdir -p $out/example/systemd - mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example - mv $out/lib/systemd/{system,user} $out/example/systemd - - rm -rf $out/etc/systemd/system - - # Install SysV compatibility commands. - mkdir -p $out/sbin - ln -s $out/lib/systemd/systemd $out/sbin/telinit - for i in init halt poweroff runlevel reboot shutdown; do - ln -s $out/bin/systemctl $out/sbin/$i + hardeningDisable = [ "stackprotector" ]; + + NIX_CFLAGS_COMPILE = + [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would + # lead to a cyclic dependency. + "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" + + # Set the release_agent on /sys/fs/cgroup/systemd to the + # currently running systemd (/run/current-system/systemd) so + # that we don't use an obsolete/garbage-collected release agent. + "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" + + "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" + ]; + + postInstall = + '' + # sysinit.target: Don't depend on + # systemd-tmpfiles-setup.service. This interferes with NixOps's + # send-keys feature (since sshd.service depends indirectly on + # sysinit.target). + mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/ + + mkdir -p $out/example/systemd + mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example + mv $out/lib/systemd/{system,user} $out/example/systemd + + rm -rf $out/etc/systemd/system + + # Install SysV compatibility commands. + mkdir -p $out/sbin + ln -s $out/lib/systemd/systemd $out/sbin/telinit + for i in init halt poweroff runlevel reboot shutdown; do + ln -s $out/bin/systemctl $out/sbin/$i + done + + # Fix reference to /bin/false in the D-Bus services. + for i in $out/share/dbus-1/system-services/*.service; do + substituteInPlace $i --replace /bin/false ${coreutils}/bin/false + done + + rm -rf $out/etc/rpm + + # "kernel-install" shouldn't be used on NixOS. + find $out -name "*kernel-install*" -exec rm {} \; + + # Keep only libudev and libsystemd in the lib output. + mkdir -p $out/lib + mv $lib/lib/security $lib/lib/libnss* $out/lib/ + ''; # */ + + enableParallelBuilding = true; + + # The rpath to the shared systemd library is not added by meson. The + # functionality was removed by a nixpkgs patch because it would overwrite + # the existing rpath. + postFixup = '' + sharedLib=libsystemd-shared-${version}.so + for prog in `find $out -type f -executable`; do + (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && ( + patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog + ) || true done + ''; - # Fix reference to /bin/false in the D-Bus services. - for i in $out/share/dbus-1/system-services/*.service; do - substituteInPlace $i --replace /bin/false ${coreutils}/bin/false - done - - rm -rf $out/etc/rpm - - rm $lib/lib/*.la - - # "kernel-install" shouldn't be used on NixOS. - find $out -name "*kernel-install*" -exec rm {} \; - - # Keep only libudev and libsystemd in the lib output. - mkdir -p $out/lib - mv $lib/lib/security $lib/lib/libnss* $out/lib/ - ''; # */ - - enableParallelBuilding = true; - - # The interface version prevents NixOS from switching to an - # incompatible systemd at runtime. (Switching across reboots is - # fine, of course.) It should be increased whenever systemd changes - # in a backwards-incompatible way. If the interface version of two - # systemd builds is the same, then we can switch between them at - # runtime; otherwise we can't and we need to reboot. - passthru.interfaceVersion = 2; - - meta = { - homepage = http://www.freedesktop.org/wiki/Software/systemd; - description = "A system and service manager for Linux"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; + # The interface version prevents NixOS from switching to an + # incompatible systemd at runtime. (Switching across reboots is + # fine, of course.) It should be increased whenever systemd changes + # in a backwards-incompatible way. If the interface version of two + # systemd builds is the same, then we can switch between them at + # runtime; otherwise we can't and we need to reboot. + passthru.interfaceVersion = 2; + + meta = { + homepage = http://www.freedesktop.org/wiki/Software/systemd; + description = "A system and service manager for Linux"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; } diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index db8a510bb5925..c5461c06e830c 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.20180118"; + version = "0.0.20180202"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "18x8ndnr4lvl3in5sian6f9q69pk8h4xbwldmk7bfrpb5m03ngs6"; + sha256 = "ee3415b482265ad9e8721aa746aaffdf311058a2d1a4d80e7b6d11bbbf71c722"; }; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 5489bc5abbecd..868e354c7b55a 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -5,7 +5,7 @@ , zlib, libuuid, python, attr, openssl # Kernel dependencies -, kernel ? null, spl ? null, splUnstable ? null +, kernel ? null, spl ? null, splUnstable ? null, splLegacyCrypto ? null }: with stdenv.lib; @@ -19,6 +19,7 @@ let , spl , rev ? "zfs-${version}" , isUnstable ? false + , isLegacyCrypto ? false , incompatibleKernelVersion ? null } @ args: if buildKernel && (incompatibleKernelVersion != null) && @@ -43,7 +44,7 @@ let buildInputs = optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ] - ++ optionals (buildUser && isUnstable) [ openssl ]; + ++ optionals (buildUser && (isUnstable || isLegacyCrypto)) [ openssl ]; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_CFLAGS_LINK = "-lgcc_s"; @@ -141,9 +142,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.5"; + version = "0.7.6"; - sha256 = "086g4xjx05sy4fwn5709sm46m2yv35wb915xfmqjvpry46245nig"; + sha256 = "1k3a69zfdk4ia4z2l69lbz0mj26bwdanxd2wynkdpm2kl3zjj18h"; extraPatches = [ (fetchpatch { @@ -160,19 +161,41 @@ in { incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release - version = "2018-01-10"; + version = "2018-02-02"; - rev = "1d53657bf561564162e2ad6449f80fa0140f1dd6"; - sha256 = "0ibkhfz06cypgl2c869dzdbdx2i3m8ywwdmnzscv0cin5gm31vhx"; + rev = "fbd42542686af053f0d162ec4630ffd4fff1cc30"; + sha256 = "0qzkwnnk7kz1hwvcaqlpzi5yspfhhmd2alklc07k056ddzbx52qb"; isUnstable = true; extraPatches = [ (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/ded8f06a3cfee...nixos-zfs-2017-09-12.patch"; - sha256 = "033wf4jn0h0kp0h47ai98rywnkv5jwvf3xwym30phnaf8xxdx8aj"; + url = "https://github.com/Mic92/zfs/compare/fbd42542686af053f0d162ec4630ffd4fff1cc30...nixos-zfs-2018-02-02.patch"; + sha256 = "05wqwjm9648x60vkwxbp8l6z1q73r2a5l2ni28i2f4pla8s3ahln"; }) ]; spl = splUnstable; }; + + zfsLegacyCrypto = common { + # comment/uncomment if breaking kernel versions are known + incompatibleKernelVersion = null; + + # this package should point to a version / git revision compatible with the latest kernel release + version = "2018-02-01"; + + rev = "4c46b99d24a6e71b3c72462c11cb051d0930ad60"; + sha256 = "011lcp2x44jgfzqqk2gjmyii1v7rxcprggv20prxa3c552drsx3c"; + isUnstable = true; + + extraPatches = [ + (fetchpatch { + url = "https://github.com/Mic92/zfs/compare/4c46b99d24a6e71b3c72462c11cb051d0930ad60...nixos-zfs-2018-02-01.patch"; + sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch"; + }) + ]; + + spl = splLegacyCrypto; + }; + } diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 0e77aa1d8ee7d..ba29bfa433a9b 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -1,29 +1,54 @@ -{ stdenv, fetchurl, flex, bison, readline -, enableIPv6 ? false }: +{ lib, stdenv, fetchurl, flex, bison, readline }: -stdenv.mkDerivation rec { - name = "bird-1.6.3"; +with lib; - src = fetchurl { - url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; - sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r"; - }; +let + + generic = { version, sha256, enableIPv6 ? false }: + stdenv.mkDerivation rec { + name = "bird-${version}"; + + src = fetchurl { + inherit sha256; + url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; + }; + + nativeBuildInputs = [ flex bison ]; + buildInputs = [ readline ]; + + patches = [ + (./. + (builtins.toPath "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch")) + ]; - buildInputs = [ flex bison readline ]; + configureFlags = [ + "--localstatedir=/var" + ] ++ optional enableIPv6 "--enable-ipv6"; - patches = [ - ./dont-create-sysconfdir.patch - ]; + meta = { + description = "BIRD Internet Routing Daemon"; + homepage = http://bird.network.cz; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric fpletz ]; + platforms = platforms.linux; + }; + }; - configureFlags = [ - "--localstatedir /var" - ] ++ stdenv.lib.optional enableIPv6 "--enable-ipv6"; +in + +{ + bird = generic { + version = "1.6.3"; + sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r"; + }; + + bird6 = generic { + version = "1.6.3"; + sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r"; + enableIPv6 = true; + }; - meta = { - description = "BIRD Internet Routing Daemon"; - homepage = http://bird.network.cz; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; - platforms = stdenv.lib.platforms.linux; + bird2 = generic { + version = "2.0.1"; + sha256 = "0qyh2cxj7hfz90x3fnczjdm3i9g7vr0nc4l4wjkj9qm0646vc52n"; }; } diff --git a/pkgs/servers/bird/dont-create-sysconfdir.patch b/pkgs/servers/bird/dont-create-sysconfdir-1.patch index 0a11c8a2a8d8c..0a11c8a2a8d8c 100644 --- a/pkgs/servers/bird/dont-create-sysconfdir.patch +++ b/pkgs/servers/bird/dont-create-sysconfdir-1.patch diff --git a/pkgs/servers/bird/dont-create-sysconfdir-2.patch b/pkgs/servers/bird/dont-create-sysconfdir-2.patch new file mode 100644 index 0000000000000..fd86da8a1298c --- /dev/null +++ b/pkgs/servers/bird/dont-create-sysconfdir-2.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index fdd5e6c..45f81a1 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -165,7 +165,7 @@ tags: + # Install + + install: all +- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@ ++ $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) + $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird + $(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl + if test -n "@CLIENT@" ; then \ diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/pkgs/servers/computing/slurm-spank-x11/default.nix new file mode 100644 index 0000000000000..13fad7059afec --- /dev/null +++ b/pkgs/servers/computing/slurm-spank-x11/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, slurm } : +let + version = "0.2.5"; +in +stdenv.mkDerivation { + name = "slurm-spank-x11-${version}"; + version = version; + + src = fetchFromGitHub { + owner = "hautreux"; + repo = "slurm-spank-x11"; + rev = version; + sha256 = "1dmsr7whxcxwnlvl1x4s3bqr5cr6q5ssb28vqi67w5hj4sshisry"; + }; + + buildPhase = '' + gcc -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" \ + -g -o slurm-spank-x11 slurm-spank-x11.c + gcc -I${slurm.dev}/include -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" -shared -fPIC \ + -g -o x11.so slurm-spank-x11-plug.c + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib + install -m 755 slurm-spank-x11 $out/bin + install -m 755 x11.so $out/lib + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/hautreux/slurm-spank-x11; + description = "Plugin for SLURM to allow for interactive X11 sessions"; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ markuskowa ]; + }; +} + + + diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 478fcb9aad7b0..a47d3106443f9 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ 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.4"; + version = "2.6.5"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "1d0d37b5047ecd554d927519d5565c29c1ba9b501c100eb5f3a5af184d75386a"; + sha256 = "33cd676706e2baeb37cf3879ccbc91a1e1cd1ee5d7a082adff4d1e753ce49d46"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 679ca2afd43a3..3f511cd2545c2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.62.1"; + version = "0.63.2"; components = { "nuimo_controller" = ps: with ps; [ ]; "bbb_gpio" = ps: with ps; [ ]; @@ -23,7 +23,7 @@ "sensor.dnsip" = ps: with ps; [ aiodns ]; "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "http" = ps: with ps; [ aiohttp-cors ]; - "sensor.imap" = ps: with ps; [ ]; + "sensor.imap" = ps: with ps; [ aioimaplib ]; "light.lifx" = ps: with ps; [ ]; "scene.hunterdouglas_powerview" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ ]; @@ -160,10 +160,11 @@ "media_player.liveboxplaytv" = ps: with ps; [ ]; "lametric" = ps: with ps; [ ]; "notify.lametric" = ps: with ps; [ ]; - "sensor.luftdaten" = ps: with ps; [ ]; + "sensor.luftdaten" = ps: with ps; [ luftdaten ]; "sensor.lyft" = ps: with ps; [ ]; "notify.matrix" = ps: with ps; [ matrix-client ]; "maxcube" = ps: with ps; [ ]; + "mercedesme" = ps: with ps; [ ]; "notify.message_bird" = ps: with ps; [ ]; "sensor.mfi" = ps: with ps; [ ]; "switch.mfi" = ps: with ps; [ ]; @@ -216,6 +217,7 @@ "light.rpi_gpio_pwm" = ps: with ps; [ ]; "canary" = ps: with ps; [ ]; "sensor.cpuspeed" = ps: with ps; [ ]; + "melissa" = ps: with ps; [ ]; "camera.synology" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ ]; "light.tplink" = ps: with ps; [ ]; @@ -271,6 +273,7 @@ "lutron_caseta" = ps: with ps; [ ]; "lutron" = ps: with ps; [ ]; "notify.mailgun" = ps: with ps; [ ]; + "media_player.mediaroom" = ps: with ps; [ ]; "mochad" = ps: with ps; [ ]; "modbus" = ps: with ps; [ ]; "media_player.monoprice" = ps: with ps; [ ]; @@ -288,12 +291,14 @@ "sensor.otp" = ps: with ps; [ ]; "sensor.openweathermap" = ps: with ps; [ ]; "weather.openweathermap" = ps: with ps; [ ]; + "sensor.pollen" = ps: with ps; [ ]; "qwikswitch" = ps: with ps; [ ]; "rainbird" = ps: with ps; [ ]; "climate.sensibo" = ps: with ps; [ ]; "sensor.serial" = ps: with ps; [ ]; "switch.acer_projector" = ps: with ps; [ pyserial ]; "lock.sesame" = ps: with ps; [ ]; + "goalfeed" = ps: with ps; [ ]; "sensor.sma" = ps: with ps; [ ]; "device_tracker.snmp" = ps: with ps; [ pysnmp ]; "sensor.snmp" = ps: with ps; [ pysnmp ]; @@ -316,9 +321,10 @@ "lirc" = ps: with ps; [ ]; "fan.xiaomi_miio" = ps: with ps; [ ]; "light.xiaomi_miio" = ps: with ps; [ ]; + "remote.xiaomi_miio" = ps: with ps; [ ]; "switch.xiaomi_miio" = ps: with ps; [ ]; "vacuum.xiaomi_miio" = ps: with ps; [ ]; - "media_player.mpd" = ps: with ps; [ ]; + "media_player.mpd" = ps: with ps; [ mpd2 ]; "light.mystrom" = ps: with ps; [ ]; "switch.mystrom" = ps: with ps; [ ]; "nest" = ps: with ps; [ ]; @@ -329,7 +335,7 @@ "sensor.sochain" = ps: with ps; [ ]; "sensor.synologydsm" = ps: with ps; [ ]; "tado" = ps: with ps; [ ]; - "telegram_bot" = ps: with ps; [ ]; + "telegram_bot" = ps: with ps; [ python-telegram-bot ]; "sensor.twitch" = ps: with ps; [ ]; "velbus" = ps: with ps; [ ]; "media_player.vlc" = ps: with ps; [ ]; @@ -380,6 +386,7 @@ "media_player.snapcast" = ps: with ps; [ ]; "sensor.speedtest" = ps: with ps; [ ]; "recorder" = ps: with ps; [ sqlalchemy ]; + "sensor.sql" = ps: with ps; [ sqlalchemy ]; "statsd" = ps: with ps; [ statsd ]; "sensor.steam_online" = ps: with ps; [ ]; "tahoma" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index bce0369cb5293..e61d443690125 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 +{ lib, fetchFromGitHub, python3 , extraComponents ? [] , extraPackages ? ps: [] , skipPip ? true }: @@ -8,17 +8,24 @@ let py = python3.override { packageOverrides = self: super: { yarl = super.yarl.overridePythonAttrs (oldAttrs: rec { - version = "0.18.0"; + version = "1.1.0"; src = oldAttrs.src.override { inherit version; - sha256 = "11j8symkxh0ngvpddqpj85qmk6p70p20jca3alxc181gk3vx785s"; + sha256 = "162630v7f98l27h11msk9416lqwm2mpgxh4s636594nlbfs9by3a"; }; }); aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - version = "2.3.7"; + version = "2.3.10"; src = oldAttrs.src.override { inherit version; - sha256 = "0fzfpx5ny7559xrxaawnylq20dvrkjiag0ypcd13frwwivrlsagy"; + sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964"; + }; + }); + pytest = super.pytest.overridePythonAttrs (oldAttrs: rec { + version = "3.3.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "14zbnbn53yvrpv79ch6n02myq9b4winjkaykzi356sfqb7f3d16g"; }; }); hass-frontend = super.callPackage ./frontend.nix { }; @@ -37,7 +44,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.62.1"; + hassVersion = "0.63.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -50,14 +57,14 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0151prwk2ci6bih0mdmc3r328nrvazn9jwk0w26wmd4cpvnb5h26"; + sha256 = "057xp3l3amzxbzzdqmgbmd0qk6fz29lpdbw3zcbjigjxbdi14h2l"; }; propagatedBuildInputs = [ # From setup.py - requests pyyaml pytz pip jinja2 voluptuous typing aiohttp yarl async-timeout chardet astral certifi - # From the components that are part of the default configuration.yaml - sqlalchemy aiohttp-cors hass-frontend user-agents distro mutagen xmltodict netdisco + requests pyyaml pytz pip jinja2 voluptuous typing aiohttp yarl async-timeout chardet astral certifi attrs + # From http, frontend and recorder components + sqlalchemy aiohttp-cors hass-frontend user-agents ] ++ componentBuildInputs ++ extraBuildInputs; checkInputs = [ @@ -73,9 +80,9 @@ in with py.pkgs; buildPythonApplication rec { tests/components/test_{api,configurator,demo,discovery,frontend,init,introduction,logger,script,shell_command,system_log,websocket_api}.py ''; - makeWrapperArgs = [] ++ stdenv.lib.optional skipPip [ "--add-flags --skip-pip" ]; + makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://home-assistant.io/; description = "Open-source home automation platform running on Python 3"; license = licenses.asl20; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 6e1a789012f37..018405f578db1 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20180130.0"; + version = "20180209.0"; src = fetchPypi { inherit pname version; - sha256 = "0b9klisl7hh30rml8qlrp9gpz33z9b825pd1vxbck48k0s98z1zi"; + sha256 = "b85f0e833871408a95619ae38d5344701a6466e8f7b5530e718ccc260b68d3ed"; }; } diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index aa293921e871b..5af794e75fa41 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -52,10 +52,16 @@ packages = json.loads(output) def name_to_attr_path(req): attr_paths = [] - pattern = re.compile('python3\\.6-{}-\\d'.format(req), re.I) - for attr_path, package in packages.items(): - if pattern.match(package['name']): - attr_paths.append(attr_path) + names = [req] + # E.g. python-mpd2 is actually called python3.6-mpd2 + # instead of python-3.6-python-mpd2 inside Nixpkgs + if req.startswith('python-'): + names.append(req[len('python-'):]) + for name in names: + pattern = re.compile('^python\\d\\.\\d-{}-\\d'.format(name), re.I) + for attr_path, package in packages.items(): + if pattern.match(package['name']): + attr_paths.append(attr_path) # Let's hope there's only one derivation with a matching name assert(len(attr_paths) <= 1) if attr_paths: @@ -64,6 +70,7 @@ def name_to_attr_path(req): return None version = get_version() +print('Generating component-packages.nix for version {}'.format(version)) requirements = fetch_reqs(version=version) build_inputs = {} for component, reqs in requirements.items(): diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix new file mode 100644 index 0000000000000..878211ebf024d --- /dev/null +++ b/pkgs/servers/http/lwan/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, pkgconfig, zlib, cmake, jemalloc }: + +stdenv.mkDerivation rec { + pname = "lwan"; + version = "0.1"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "lpereira"; + repo = pname; + rev = "v${version}"; + sha256 = "1mckryzb06smky0bx2bkqwqzpnq4pb8vlgmmwsvqmwi4mmw9wmi1"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ jemalloc zlib ]; + + meta = with stdenv.lib; { + description = "Lightweight high-performance multi-threaded web server"; + longDescription = "A lightweight and speedy web server with a low memory + footprint (~500KiB for 10k idle connections), with minimal system calls and + memory allocation. Lwan contains a hand-crafted HTTP request parser. Files are + served using the most efficient way according to their size: no copies between + kernel and userland for files larger than 16KiB. Smaller files are sent using + vectored I/O of memory-mapped buffers. Header overhead is considered before + compressing small files. Features include: mustache templating engine and IPv6 + support. + "; + homepage = "https://lwan.ws/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 45ac738c5bb91..b386fadabd46f 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,15 +1,18 @@ -{ coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }: +{ coreutils, db, fetchurl, openldap, openssl, pcre, perl, pkgconfig, stdenv +, enableLDAP ? false +}: stdenv.mkDerivation rec { - name = "exim-4.90"; + name = "exim-4.90.1"; src = fetchurl { url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; - sha256 = "101syariyvv2xxhjyx1zfdvad6303ihp67800s8n4083km98nm4k"; + sha256 = "09ppq8l7cah6dcqwdvpa6r12i6fdcd9lvxlfp18mggj3438xz62w"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ coreutils db openssl pcre perl ]; + buildInputs = [ coreutils db openssl pcre perl ] + ++ stdenv.lib.optional enableLDAP openldap; preBuild = '' sed ' @@ -33,6 +36,11 @@ stdenv.mkDerivation rec { s:^# \(RM_COMMAND\)=.*:\1=${coreutils}/bin/rm: s:^# \(TOUCH_COMMAND\)=.*:\1=${coreutils}/bin/touch: s:^# \(PERL_COMMAND\)=.*:\1=${perl}/bin/perl: + ${stdenv.lib.optionalString enableLDAP '' + s:^# \(LDAP_LIB_TYPE=OPENLDAP2\)$:\1: + s:^# \(LOOKUP_LDAP=yes\)$:\1: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lldap: + ''} #/^\s*#.*/d #/^\s*$/d ' < src/EDITME > Local/Makefile diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index e499dc5de04b3..7de011e586625 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -42,7 +42,7 @@ in pythonPackages.buildPythonApplication rec { 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 + psutil msgpack-python lxml matrix-synapse-ldap3 phonenumbers jsonschema affinity bcrypt ]; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index bf28246884418..422309bc65460 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -2,18 +2,18 @@ buildGoPackage rec { name = "mattermost-${version}"; - version = "4.4.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "0imda96wgr2nkkxs2jfcqszx1fqgmbbrh7zqmgjh6ks3an1v4m3c"; + sha256 = "158sfbg19sp165iavjwwfxx9s4y116yc5h3plsmvlxpdv674k7v3"; }; webApp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz"; - sha256 = "1gnzv9xkqawi36z7v9xsy1gk16x71qf0kn8r059qvyarjlyp7888"; + sha256 = "1rbpl6zfmhfgzz2i1q2ym51ll6j54gk5p6ca99v9kjlm4ipcq9mv"; }; goPackagePath = "github.com/mattermost/mattermost-server"; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index b553a20228642..ea77b32a86660 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { name = "minio-${version}"; - version = "2018-01-18T20-33-21Z"; + version = "2018-02-09T22-40-05Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "102rilh1kjf9y6g6y83ikk42w7g1sbld11md3wm54hynyh956xrs"; + sha256 = "0qxrzmkm5hza5xbx9dkrgadwjg3hykwf79hix3s0laqyksmpj9mk"; }; goPackagePath = "github.com/minio/minio"; @@ -22,7 +22,7 @@ buildGoPackage rec { homepage = https://www.minio.io/; description = "An S3-compatible object storage server"; maintainers = with maintainers; [ eelco bachp ]; - platforms = platforms.x86_64 ++ ["aarch64-linux"]; + platforms = platforms.unix; license = licenses.asl20; }; } diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 1d0b5fb833627..77dcfa43c43f3 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, file, openssl, perl, unzip }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, file, openssl, perl, unzip }: stdenv.mkDerivation rec { name = "net-snmp-5.7.3"; @@ -8,6 +8,19 @@ stdenv.mkDerivation rec { sha256 = "0gkss3zclm23zwpqfhddca8278id7pk6qx1mydpimdrrcndwgpz8"; }; + patches = + let fetchAlpinePatch = name: sha256: fetchpatch { + url = "https://git.alpinelinux.org/cgit/aports/plain/main/net-snmp/${name}?id=f25d3fb08341b60b6ccef424399f060dfcf3f1a5"; + inherit name sha256; + }; + in [ + (fetchAlpinePatch "CVE-2015-5621.patch" "05098jyvd9ddr5q26z7scbbvk1bk6x4agpjm6pyprvpc1zpi0y09") + (fetchAlpinePatch "fix-Makefile-PL.patch" "14ilnkj3cr6mpi242hrmmmv8nv4dj0fdgn42qfk9aa7scwsc0lc7") + (fetchAlpinePatch "fix-includes.patch" "0zpkbb6k366qpq4dax5wknwprhwnhighcp402mlm7950d39zfa3m") + (fetchAlpinePatch "netsnmp-swinst-crash.patch" "0gh164wy6zfiwiszh58fsvr25k0ns14r3099664qykgpmickkqid") + (fetchAlpinePatch "remove-U64-typedef.patch" "1msxyhcqkvhqa03dwb50288g7f6nbrcd9cs036m9xc8jdgjb8k8j") + ]; + preConfigure = '' perlversion=$(perl -e 'use Config; print $Config{version};') diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index d2e08932fe1dc..70c252d395f8b 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "12.0.4"; + version = "12.0.5"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "1dh9knqbw6ph2rfrb5rscdraj4375rqddmrifw6adyga9jkn2hb5"; + sha256 = "0hya524d8wqia5v2wz8cmasi526j97z6d0l1h7l7j442wsn2kgn8"; }; installPhase = '' diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index 3514ae84350df..fd3b2d3aa2869 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "2.1.15"; - sha256 = "1yc6r4gmxz9c4zghzn6bz5wswz7dz61w7p4x9s5gqnixfp2mlapp"; + version = "2.1.19"; + sha256 = "1qlc62j3hf5831yrrbydn3z19zrn6bpirarinys6bmhshr7mhpyr"; }) diff --git a/pkgs/servers/nosql/cassandra/2.2.nix b/pkgs/servers/nosql/cassandra/2.2.nix index b467fcfdff5b3..3d276128c00d1 100644 --- a/pkgs/servers/nosql/cassandra/2.2.nix +++ b/pkgs/servers/nosql/cassandra/2.2.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "2.2.9"; - sha256 = "1wc2l8l7i43r0yc6qqi3wj4pm0969kjkh2pgx80wglzxm7275hv5"; + version = "2.2.11"; + sha256 = "0r39mm5ibdn9dqv11n4x33vcb5247r6fl6r07l6frqp6i36ilvl6"; }) diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/pkgs/servers/nosql/cassandra/3.0.nix index 04348568bafc5..b6621ec954858 100644 --- a/pkgs/servers/nosql/cassandra/3.0.nix +++ b/pkgs/servers/nosql/cassandra/3.0.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.0.9"; - sha256 = "16jdh20cr4h47ldjqlnp2cdnb9zshqvnll6995s2a75d8m030c0g"; + version = "3.0.15"; + sha256 = "1n92wpp5gm41r4agjwjw9ymnnn114pmaqf04c1dx3fksk100wd5g"; }) diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix deleted file mode 100644 index 232fb135bd808..0000000000000 --- a/pkgs/servers/openafs-client/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc, - kernel, glibc, ncurses, perl, kerberos, fetchpatch }: - -stdenv.mkDerivation rec { - name = "openafs-${version}-${kernel.version}"; - version = "1.6.22.1"; - - src = fetchurl { - url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "19nfbksw7b34jc3mxjk7cbz26zg9k5myhzpv2jf0fnmznr47jqaw"; - }; - - nativeBuildInputs = [ autoconf automake flex yacc perl which ] ++ kernel.moduleBuildDependencies; - - buildInputs = [ ncurses ]; - - hardeningDisable = [ "pic" ]; - - preConfigure = '' - ln -s "${kernel.dev}/lib/modules/"*/build $TMP/linux - - patchShebangs . - for i in `grep -l -R '/usr/\(include\|src\)' .`; do - echo "Patch /usr/include and /usr/src in $i" - substituteInPlace $i \ - --replace "/usr/include" "${glibc.dev}/include" \ - --replace "/usr/src" "$TMP" - done - - ./regen.sh - - ${stdenv.lib.optionalString (kerberos != null) - "export KRB5_CONFIG=${kerberos.dev}/bin/krb5-config"} - - configureFlagsArray=( - "--with-linux-kernel-build=$TMP/linux" - ${stdenv.lib.optionalString (kerberos != null) "--with-krb5"} - "--sysconfdir=/etc/static" - "--disable-linux-d_splice-alias-extra-iput" - ) - ''; - - meta = with stdenv.lib; { - description = "Open AFS client"; - homepage = https://www.openafs.org; - license = licenses.ipl10; - platforms = platforms.linux; - maintainers = [ maintainers.z77z ]; - broken = versionOlder kernel.version "3.18"; - }; -} diff --git a/pkgs/servers/openafs/default.nix b/pkgs/servers/openafs/default.nix new file mode 100644 index 0000000000000..3f92299c2a0a2 --- /dev/null +++ b/pkgs/servers/openafs/default.nix @@ -0,0 +1,89 @@ +{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc +, glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43 +, ncurses # Extra ncurses utilities. Only needed for debugging. +, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM +}: + +with (import ./srcs.nix { inherit fetchurl; }); + +stdenv.mkDerivation rec { + name = "openafs-${version}"; + inherit version srcs; + + nativeBuildInputs = [ autoconf automake flex yacc perl which libxslt ]; + + buildInputs = [ ncurses ]; + + patches = stdenv.lib.optional (tsmbac != null) ./tsmbac.patch; + + outputs = [ "out" "dev" "man" "doc" ]; + + preConfigure = '' + + patchShebangs . + for i in `grep -l -R '/usr/\(include\|src\)' .`; do + echo "Patch /usr/include and /usr/src in $i" + substituteInPlace $i \ + --replace "/usr/include" "${glibc.dev}/include" \ + --replace "/usr/src" "$TMP" + done + + for i in ./doc/xml/{AdminGuide,QuickStartUnix,UserGuide}/*.xml; do + substituteInPlace "''${i}" --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \ + "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd" + done + + ./regen.sh + + ${stdenv.lib.optionalString (kerberos != null) + "export KRB5_CONFIG=${kerberos.dev}/bin/krb5-config"} + + export AFS_SYSKVERS=26 + + configureFlagsArray=( + ${stdenv.lib.optionalString (kerberos != null) "--with-krb5"} + "--sysconfdir=/etc" + "--localstatedir=/var" + "--disable-kernel-module" + "--disable-fuse-client" + "--with-html-xsl=${docbook_xsl}/share/xml/docbook-xsl/html/chunk.xsl" + ${stdenv.lib.optionalString (tsmbac != null) "--enable-tivoli-tsm"} + ${stdenv.lib.optionalString (ncurses == null) "--disable-gtx"} + "--disable-linux-d_splice-alias-extra-iput" + ) + '' + stdenv.lib.optionalString (tsmbac != null) '' + export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\"" + export XBSA_XLIBS="-ldl" + ''; + + buildFlags = [ "all_nolibafs" ]; + + postBuild = '' + for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do + make -C "''${d}" html + done + ''; + + postInstall = '' + mkdir -p $doc/share/doc/openafs/{AdminGuide,QuickStartUnix,UserGuide} + cp -r doc/{arch,examples,pdf,protocol,txt} README NEWS $doc/share/doc/openafs + for d in AdminGuide QuickStartUnix UserGuide ; do + cp "doc/xml/''${d}"/*.html "$doc/share/doc/openafs/''${d}" + done + + rm -r $out/lib/{openafs,afs,*.a} + rm $out/bin/kpasswd + rm $out/sbin/{kas,kdb,ka-forwarder,kadb_check} + rm $out/libexec/openafs/kaserver + rm $man/share/man/man{1/kpasswd*,5/kaserver*,8/{ka*,kdb*}} + ''; + + meta = with stdenv.lib; { + outputsToInstall = [ "out" "doc" "man" ]; + description = "Open AFS client"; + homepage = https://www.openafs.org; + license = licenses.ipl10; + platforms = platforms.linux; + maintainers = [ maintainers.z77z maintainers.spacefrogg ]; + }; +} diff --git a/pkgs/servers/openafs/module.nix b/pkgs/servers/openafs/module.nix new file mode 100644 index 0000000000000..8cd9287a7772d --- /dev/null +++ b/pkgs/servers/openafs/module.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, which, autoconf, automake, flex, yacc +, kernel, glibc, perl }: + +with (import ./srcs.nix { inherit fetchurl; }); + +let + modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs"; + kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + +in stdenv.mkDerivation rec { + name = "openafs-${version}-${kernel.version}"; + inherit version src; + + nativeBuildInputs = [ autoconf automake flex perl yacc which ] ++ kernel.moduleBuildDependencies; + + hardeningDisable = [ "pic" ]; + + configureFlags = [ + "--with-linux-kernel-build=${kernelBuildDir}" + "--sysconfdir=/etc" + "--localstatedir=/var" + "--disable-linux-d_splice-alias-extra-iput" + ]; + + preConfigure = '' + patchShebangs . + for i in `grep -l -R '/usr/\(include\|src\)' .`; do + echo "Patch /usr/include and /usr/src in $i" + substituteInPlace $i \ + --replace "/usr/include" "${glibc.dev}/include" \ + --replace "/usr/src" "${kernelBuildDir}" + done + + ./regen.sh -q + + ''; + + buildPhase = '' + make V=1 only_libafs + ''; + + installPhase = '' + mkdir -p ${modDestDir} + cp src/libafs/MODLOAD-*/libafs-${kernel.version}.* ${modDestDir}/libafs.ko + xz -f ${modDestDir}/libafs.ko + ''; + + meta = with stdenv.lib; { + description = "Open AFS client kernel module"; + homepage = https://www.openafs.org; + license = licenses.ipl10; + platforms = platforms.linux; + maintainers = [ maintainers.z77z maintainers.spacefrogg ]; + broken = versionOlder kernel.version "3.18"; + }; + +} diff --git a/pkgs/servers/openafs/srcs.nix b/pkgs/servers/openafs/srcs.nix new file mode 100644 index 0000000000000..9e9ff623e5cd7 --- /dev/null +++ b/pkgs/servers/openafs/srcs.nix @@ -0,0 +1,14 @@ +{ fetchurl }: +rec { + version = "1.6.22.2"; + src = fetchurl { + url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; + sha256 = "15j17igignsfzv5jb47ryczsrz3zsmiqwnj38dx9gzz95807rkyf"; + }; + + srcs = [ src + (fetchurl { + url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; + sha256 = "1lpydca95nx5pmqvplb9n3akmxbzvhhypswh0s589ywxpv3zynxm"; + })]; +} diff --git a/pkgs/servers/openafs/tsmbac.patch b/pkgs/servers/openafs/tsmbac.patch new file mode 100644 index 0000000000000..412765fe8a5b7 --- /dev/null +++ b/pkgs/servers/openafs/tsmbac.patch @@ -0,0 +1,62 @@ +diff -ru3 openafs-1.6.18.1/acinclude.m4 openafs-1.6.18.1.new/acinclude.m4 +--- openafs-1.6.18.1/acinclude.m4 2016-06-21 17:13:39.000000000 +0200 ++++ openafs-1.6.18.1.new/acinclude.m4 2016-11-02 18:44:30.423039662 +0100 +@@ -1373,45 +1373,7 @@ + + dnl check for tivoli + AC_MSG_CHECKING(for tivoli tsm butc support) +-XBSA_CFLAGS="" +-if test "$enable_tivoli_tsm" = "yes"; then +- XBSADIR1=/usr/tivoli/tsm/client/api/bin/xopen +- XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen +- XBSADIR3=/usr/tivoli/tsm/client/api/bin/sample +- XBSADIR4=/opt/tivoli/tsm/client/api/bin/sample +- XBSADIR5=/usr/tivoli/tsm/client/api/bin64/sample +- XBSADIR6=/opt/tivoli/tsm/client/api/bin64/sample +- +- if test -r "$XBSADIR3/dsmapifp.h"; then +- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR3" +- XBSA_XLIBS="-ldl" +- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) +- elif test -r "$XBSADIR4/dsmapifp.h"; then +- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR4" +- XBSA_XLIBS="-ldl" +- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) +- elif test -r "$XBSADIR5/dsmapifp.h"; then +- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR5" +- XBSA_XLIBS="-ldl" +- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) +- elif test -r "$XBSADIR6/dsmapifp.h"; then +- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR6" +- XBSA_XLIBS="-ldl" +- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) +- elif test -r "$XBSADIR1/xbsa.h"; then +- XBSA_CFLAGS="-Dxbsa -I$XBSADIR1" +- XBSA_XLIBS="" +- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) +- elif test -r "$XBSADIR2/xbsa.h"; then +- XBSA_CFLAGS="-Dxbsa -I$XBSADIR2" +- XBSA_XLIBS="" +- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) +- else +- AC_MSG_RESULT([no, missing xbsa.h and dsmapifp.h header files]) +- fi +-else +- AC_MSG_RESULT([no]) +-fi ++AC_MSG_RESULT([yes]) + AC_SUBST(XBSA_CFLAGS) + AC_SUBST(XBSA_XLIBS) + +diff -ru3 openafs-1.6.18.1/src/butc/afsxbsa.c openafs-1.6.18.1.new/src/butc/afsxbsa.c +--- openafs-1.6.18.1/src/butc/afsxbsa.c 2016-06-21 17:13:39.000000000 +0200 ++++ openafs-1.6.18.1.new/src/butc/afsxbsa.c 2016-11-02 18:45:10.734662987 +0100 +@@ -651,7 +651,7 @@ + #if defined(AFS_AIX_ENV) + dynlib = dlopen("/usr/lib/libApiDS.a(dsmapish.o)", RTLD_NOW | RTLD_LOCAL | RTLD_MEMBER); + #elif defined (AFS_AMD64_LINUX26_ENV) +- dynlib = dlopen("/usr/lib64/libApiTSM64.so", RTLD_NOW | RTLD_LOCAL); ++ dynlib = dlopen(XBSA_TSMLIB, RTLD_NOW | RTLD_LOCAL); + #elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV) + dynlib = dlopen("/usr/lib/libApiDS.so", RTLD_NOW | RTLD_LOCAL); + #else diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix index 1ca18d7d3a745..a7a0791b85207 100644 --- a/pkgs/servers/polipo/default.nix +++ b/pkgs/servers/polipo/default.nix @@ -18,5 +18,8 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ phreedom ehmry ]; platforms = platforms.all; + knownVulnerabilities = [ + "Unmaintained upstream: https://github.com/jech/polipo/commit/4d42ca1b5849" + ]; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 85ee3ddcf7441..2f102b58f1419 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -43,7 +43,12 @@ stdenv.mkDerivation rec { sha256 = "0sf92knqkvqmfhrbz4vlsagzqlps72wycpmln5dygicg07a0a8q7"; }; - patches = [ ./caps-fix.patch ]; + patches = [ ./caps-fix.patch ] + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + name = "padsp-fix.patch"; + url = "https://git.alpinelinux.org/cgit/aports/plain/testing/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch?id=167be02bf4618a90328e2b234f6a63a5dc05f244"; + sha256 = "0gf4w25zi123ghk0njapysvrlljkc3hyanacgiswfnnm1i8sab1q"; + }); outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 88d2ae3d68a72..b8ee85d65e748 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -62,6 +62,7 @@ common = rec { # attributes common to both builds "-DPLUGIN_AUTH_GSSAPI_CLIENT=NO" ] ++ optional stdenv.isDarwin "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib" + ++ optional stdenv.hostPlatform.isMusl "-DWITHOUT_TOKUDB=1" # mariadb docs say disable this for musl ; preConfigure = '' diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 1a721e90a8df5..02a620cee5312 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -69,7 +69,7 @@ let fi ''; - postFixup = lib.optionalString (!stdenv.isDarwin) + postFixup = lib.optionalString (!stdenv.isDarwin && stdenv.hostPlatform.libc == "glibc") '' # initdb needs access to "locale" command from glibc. wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix index f0429475be272..777e910038a86 100644 --- a/pkgs/servers/squid/4.nix +++ b/pkgs/servers/squid/4.nix @@ -2,17 +2,21 @@ , expat, libxml2, openssl }: stdenv.mkDerivation rec { - name = "squid-4.0.21"; + name = "squid-4.0.23"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz"; - sha256 = "0cwfj3qpl72k5l1h2rvkv1xg0720rifk4wcvi49z216hznyqwk8m"; + sha256 = "0a8g0zs3xayfkxl8maq823b14lckvh9d5lf7ryh9rx303xh1mdqq"; }; buildInputs = [ perl openldap db cyrus_sasl expat libxml2 openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ]; + prePatch = '' + substituteInPlace configure --replace "/usr/local/include/libxml2" "${libxml2.dev}/include/libxml2" + ''; + configureFlags = [ "--enable-ipv6" "--disable-strict-error-checking" @@ -23,9 +27,7 @@ stdenv.mkDerivation rec { "--enable-removal-policies=lru,heap" "--enable-delay-pools" "--enable-x-accelerator-vary" - ] ++ stdenv.lib.optionals stdenv.isLinux [ - "--enable-linux-netfilter" - ]; + ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter"; meta = with stdenv.lib; { description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 7f1c97bd642b8..8d39fbbcef447 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap +{ stdenv, fetchurl, fetchpatch, perl, openldap, pam, db, cyrus_sasl, libcap , expat, libxml2, openssl }: stdenv.mkDerivation rec { @@ -13,6 +13,19 @@ stdenv.mkDerivation rec { perl openldap db cyrus_sasl expat libxml2 openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ]; + patches = [ + (fetchpatch { + name = "CVE-2018-1000024.patch"; + url = http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_1.patch; + sha256 = "0vzxr4rmybz0w4c1hi3szvqawbzl4r4b8wyvq9vgq1mzkk5invpg"; + }) + (fetchpatch { + name = "CVE-2018-1000027.patch"; + url = http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_2.patch; + sha256 = "1a8hwk9z7h1j0c57anfzp3bwjd4pjbyh8aks4ca79nwz4d0y6wf3"; + }) + ]; + configureFlags = [ "--enable-ipv6" "--disable-strict-error-checking" @@ -23,9 +36,7 @@ stdenv.mkDerivation rec { "--enable-removal-policies=lru,heap" "--enable-delay-pools" "--enable-x-accelerator-vary" - ] ++ stdenv.lib.optionals stdenv.isLinux [ - "--enable-linux-netfilter" - ]; + ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter"; meta = with stdenv.lib; { description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index d4a0145e9b99a..040a2ece303f4 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "5.6.29"; + version = "5.6.30"; src = fetchurl { url = "https://dl.ubnt.com/unifi/${version}/unifi_sysvinit_all.deb"; - sha256 = "05na94mrd1dy95vnwd1ycqx4i38wf0lg67sjg263ilq5l1prdmz8"; + sha256 = "083bh29i7dpn0ajc6h584vhkybiavnln3xndpb670chfrbywxyj4"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 28eeeb1125910..ac60827aeb7bf 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -42,6 +42,6 @@ buildPythonApplication rec { homepage = https://github.com/asciimoo/searx; description = "A privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ matejc fpletz profpatsch ]; + maintainers = with maintainers; [ matejc fpletz ]; }; } diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index f56d22d7b7ee5..c6466598195e1 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -493,6 +493,9 @@ in args.udev ]; patches = commonPatches; + prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t" + ''; configureFlags = [ "--enable-kdrive" # not built by default "--enable-xephyr" diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index 5635c6a73bedf..63c7fbc7a0e02 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages -, fetchurl, readline70 ? null, texinfo ? null, binutils ? null, bison +, fetchurl, readline70 ? null, texinfo ? null, binutils ? null, bison, autoconf , buildPlatform, hostPlatform , interactive ? false }: @@ -51,7 +51,12 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; - patches = upstreamPatches; + patches = upstreamPatches + # https://lists.gnu.org/archive/html/bug-bash/2016-10/msg00006.html + ++ optional (hostPlatform.libc == "musl") (fetchurl { + url = "https://lists.gnu.org/archive/html/bug-bash/2016-10/patchJxugOXrY2y.patch"; + sha256 = "1m4v9imidb1cc1h91f2na0b8y9kc5c5fgmpvy9apcyv2kbdcghg1"; + }); postPatch = optionalString hostPlatform.isCygwin "patch -p2 < ${./cygwin-bash-4.4.11-2.src.patch}"; @@ -65,13 +70,17 @@ stdenv.mkDerivation rec { "bash_cv_dev_stdin=present" "bash_cv_dev_fd=standard" "bash_cv_termcap_lib=libncurses" + ] ++ optionals (hostPlatform.libc == "musl") [ + "--without-bash-malloc" + "--disable-nls" ]; # Note: Bison is needed because the patches above modify parse.y. depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [bison] ++ optional (texinfo != null) texinfo - ++ optional hostPlatform.isDarwin binutils; + ++ optional hostPlatform.isDarwin binutils + ++ optional (hostPlatform.libc == "musl") autoconf; buildInputs = optional interactive readline70; @@ -86,7 +95,7 @@ stdenv.mkDerivation rec { postInstall = '' ln -s bash "$out/bin/sh" - rm $out/lib/bash/Makefile.inc + rm -f $out/lib/bash/Makefile.inc ''; postFixup = if interactive @@ -96,7 +105,7 @@ stdenv.mkDerivation rec { '' # most space is taken by locale data else '' - rm -r "$out/share" "$out/bin/bashbug" + rm -rf "$out/share" "$out/bin/bashbug" ''; meta = with stdenv.lib; { diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 490832d31d8b0..d6c107e995326 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, coreutils, utillinux, nettools, kbd, bc, which, gnused, gnugrep, - groff, man-db, glibc, libiconv, pcre2, + groff, man-db, getent, libiconv, pcre2, gettext, ncurses, python3 , writeText @@ -142,7 +142,7 @@ let sed -e "s| ul| ${utillinux}/bin/ul|" \ -i "$out/share/fish/functions/__fish_print_help.fish" for cur in $out/share/fish/functions/*.fish; do - sed -e "s|/usr/bin/getent|${glibc.bin}/bin/getent|" \ + sed -e "s|/usr/bin/getent|${getent}/bin/getent|" \ -i "$cur" done diff --git a/pkgs/shells/nix-bash-completions/default.nix b/pkgs/shells/nix-bash-completions/default.nix index bb945f404215b..fb6fa24ac334b 100644 --- a/pkgs/shells/nix-bash-completions/default.nix +++ b/pkgs/shells/nix-bash-completions/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.6.2"; + version = "0.6.3"; name = "nix-bash-completions-${version}"; src = fetchFromGitHub { owner = "hedning"; repo = "nix-bash-completions"; rev = "v${version}"; - sha256 = "0w6mimi70drjkdpx5pcw66xy2a4kysjfzmank0kc5vbhrjgkjwyp"; + sha256 = "1zmk9f53xpwk5j6qqisjlddgm2fr68p1q6pn3wa14bd777lranhj"; }; # To enable lazy loading via. bash-completion we need a symlink to the script diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix index 29fb065a6f8bb..2bcff6b809dca 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.7"; + version = "0.3.8"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "spwhitt"; repo = "nix-zsh-completions"; rev = "${version}"; - sha256 = "164x8awia56z481r898pbywjgrx8fv8gfw8pxp4qgbxzp3gwq9iy"; + sha256 = "05ynd38br2kn657g7l01jg1q8ja9xwrdyb95w02gh7j9cww2k06w"; }; installPhase = '' diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index 3374f32738c0d..8cfcb9ecbbead 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2017-12-14"; + version = "2018-01-22"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "c3b072eace1ce19a48e36c2ead5932ae2d2e06d9"; - sha256 = "14nmql4527l4qs4rxb5gczb8cklz8s682ly0l0nmqh36cmvaqx8y"; + rev = "37c2d0ddd751e15d0c87a51e2d9f9849093571dc"; + sha256 = "0x2r7205ps5v5bl1f9vdnry9gxflypaahz49cnhq5f5klb49bakn"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 4b2b79a210466..43b766fdaf2e5 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -20,15 +20,19 @@ stdenv.mkDerivation { buildInputs = [ ncurses pcre ]; + configureFlags = [ + "--enable-maildir-support" + "--enable-multibyte" + "--with-tcsetpgrp" + "--enable-pcre" + ]; preConfigure = '' - configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp --enable-pcre" + configureFlagsArray+=(--enable-zprofile=$out/etc/zprofile) ''; # the zsh/zpty module is not available on hydra # so skip groups Y Z - checkFlagsArray = '' - (TESTNUM=A TESTNUM=B TESTNUM=C TESTNUM=D TESTNUM=E TESTNUM=V TESTNUM=W) - ''; + checkFlags = map (T: "TESTNUM=${T}") (stdenv.lib.stringToCharacters "ABCDEVW"); # XXX: think/discuss about this, also with respect to nixos vs nix-on-X postInstall = '' diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index f7d2c49a66d68..3090b6283e931 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -94,7 +94,7 @@ rec { # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs ++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file - ++ stdenv.lib.optional hostPlatform.isAarch64 pkgs.updateAutotoolsGnuConfigScriptsHook + ++ stdenv.lib.optional (hostPlatform.isAarch64 || hostPlatform.libc == "musl") pkgs.updateAutotoolsGnuConfigScriptsHook ; crossConfig = hostPlatform.config; diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 6fb37f2491446..6fc9d7f0c1010 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -15,8 +15,8 @@ in rec { # Avoid debugging larger changes for now. bzip2_ = bzip2.override (args: { linkStatic = true; }); - # Avoid messing with libkrb5. - curl_ = curl.override (args: { gssSupport = false; }); + # Avoid messing with libkrb5 and libnghttp2. + curl_ = curl.override (args: { gssSupport = false; http2Support = false; }); build = stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 745ad14bc08be..dc5e79fcd4f25 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -96,8 +96,7 @@ let '' Known issues: - - '' + (lib.fold (issue: default: "${default} - ${issue}\n") "" attrs.meta.knownVulnerabilities) + '' + '' + (lib.concatStrings (map (issue: " - ${issue}\n") attrs.meta.knownVulnerabilities)) + '' You can install it anyway by whitelisting this package, using the following methods: diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix new file mode 100644 index 0000000000000..ff0eec893f2ff --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix @@ -0,0 +1,11 @@ +{ + busybox = import <nix/fetchurl.nix> { + url = https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/busybox; + sha256 = "01s6bwq84wyrjh3rdsgxni9gkzp7ss8rghg0cmp8zd87l79y8y4g"; + executable = true; + }; + bootstrapTools = import <nix/fetchurl.nix> { + url = https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz; + sha256 = "0pbqrw9z4ifkijpfpx15l2dzi00rq8c5zg9ghimz5qgr5dx7f7cl"; + }; +} diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix new file mode 100644 index 0000000000000..45ac0d5f9acd0 --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix @@ -0,0 +1,11 @@ +{ + busybox = import <nix/fetchurl.nix> { + url = https://wdtz.org/files/xmz441m69qrlfdw47l2k10zf87fsya6r-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/busybox; + sha256 = "01d0hp1xgrriiy9w0sd9vbqzwxnpwiyah80pi4vrpcmbwji36j1i"; + executable = true; + }; + bootstrapTools = import <nix/fetchurl.nix> { + url = https://wdtz.org/files/xmz441m69qrlfdw47l2k10zf87fsya6r-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/bootstrap-tools.tar.xz; + sha256 = "1r9mz9w8y5jd7gfwfsrvs20qarzxy7bvrp5dlm41hnx6z617if1h"; + }; +} diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix new file mode 100644 index 0000000000000..12093f3400082 --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix @@ -0,0 +1,11 @@ +{ + busybox = import <nix/fetchurl.nix> { + url = https://wdtz.org/files/030q34q7fk6jdfxkgcqp5rzr4yhw3pgx-stdenv-bootstrap-tools-x86_64-unknown-linux-musl/on-server/busybox; + sha256 = "16lzrwwvdk6q3g08gs45pldz0rh6xpln2343xr444960h6wqxl5v"; + executable = true; + }; + bootstrapTools = import <nix/fetchurl.nix> { + url = https://wdtz.org/files/030q34q7fk6jdfxkgcqp5rzr4yhw3pgx-stdenv-bootstrap-tools-x86_64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz; + sha256 = "0ly0wj8wzbikn2j8sn727vikk90bq36drh98qvfx1kkh5k5azm2j"; + }; +} diff --git a/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix b/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix new file mode 100644 index 0000000000000..6118585d545f9 --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix @@ -0,0 +1,18 @@ +{ system, bootstrapFiles }: + +derivation { + name = "bootstrap-tools"; + + builder = bootstrapFiles.busybox; + + args = [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ]; + + tarball = bootstrapFiles.bootstrapTools; + + inherit system; + + # Needed by the GCC wrapper. + langC = true; + langCC = true; + isGNU = true; +} diff --git a/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh new file mode 100644 index 0000000000000..8b5070dc6d6fb --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh @@ -0,0 +1,64 @@ +# Unpack the bootstrap tools tarball. +echo Unpacking the bootstrap tools... +$builder mkdir $out +< $tarball $builder unxz | $builder tar x -C $out + +# Set the ELF interpreter / RPATH in the bootstrap binaries. +echo Patching the bootstrap tools... + +if test -f $out/lib/ld.so.?; then + # MIPS case + LD_BINARY=$out/lib/ld.so.? +else + # i686, x86_64 and armv5tel + LD_BINARY=$out/lib/ld-*so.? +fi + +# On x86_64, ld-linux-x86-64.so.2 barfs on patchelf'ed programs. So +# use a copy of patchelf. +LD_LIBRARY_PATH=$out/lib $LD_BINARY $out/bin/cp $out/bin/patchelf . + +for i in $out/bin/* $out/libexec/gcc/*/*/*; do + if [ -L "$i" ]; then continue; fi + if [ -z "${i##*/liblto*}" ]; then continue; fi + echo patching "$i" + LD_LIBRARY_PATH=$out/lib $LD_BINARY \ + ./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i" +done + +for i in $out/lib/libiconv*.so $out/lib/libpcre* $out/lib/libc.so; do + if [ -L "$i" ]; then continue; fi + echo patching "$i" + $out/bin/patchelf --set-rpath $out/lib --force-rpath "$i" +done + +export PATH=$out/bin + +# Fix the libc linker script. +#cat $out/lib/libc.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libc.so.tmp +#mv $out/lib/libc.so.tmp $out/lib/libc.so +#cat $out/lib/libpthread.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libpthread.so.tmp +#mv $out/lib/libpthread.so.tmp $out/lib/libpthread.so + +# Provide some additional symlinks. +ln -s bash $out/bin/sh +ln -s bzip2 $out/bin/bunzip2 + +# Provide a gunzip script. +cat > $out/bin/gunzip <<EOF +#!$out/bin/sh +exec $out/bin/gzip -d "\$@" +EOF +chmod +x $out/bin/gunzip + +# Provide fgrep/egrep. +echo "#! $out/bin/sh" > $out/bin/egrep +echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep +echo "#! $out/bin/sh" > $out/bin/fgrep +echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep + +# Provide xz (actually only xz -d will work). +echo "#! $out/bin/sh" > $out/bin/xz +echo "exec $builder unxz \"\$@\"" >> $out/bin/xz + +chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/xz diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 4fa141e9155e8..703800deb2ad7 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -6,16 +6,28 @@ { lib , localSystem, crossSystem, config, overlays -, bootstrapFiles ? { # switch - "i686-linux" = import ./bootstrap-files/i686.nix; - "x86_64-linux" = import ./bootstrap-files/x86_64.nix; - "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix; - "armv6l-linux" = import ./bootstrap-files/armv6l.nix; - "armv7l-linux" = import ./bootstrap-files/armv7l.nix; - "aarch64-linux" = import ./bootstrap-files/aarch64.nix; - "mips64el-linux" = import ./bootstrap-files/loongson2f.nix; - }.${localSystem.system} - or (abort "unsupported platform for the pure Linux stdenv") +, bootstrapFiles ? + let table = { + "glibc" = { + "i686-linux" = import ./bootstrap-files/i686.nix; + "x86_64-linux" = import ./bootstrap-files/x86_64.nix; + "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix; + "armv6l-linux" = import ./bootstrap-files/armv6l.nix; + "armv7l-linux" = import ./bootstrap-files/armv7l.nix; + "aarch64-linux" = import ./bootstrap-files/aarch64.nix; + "mips64el-linux" = import ./bootstrap-files/loongson2f.nix; + }; + "musl" = { + "aarch64-linux" = import ./bootstrap-files/aarch64-musl.nix; + "armv6l-linux" = import ./bootstrap-files/armv6l-musl.nix; + "x86_64-linux" = import ./bootstrap-files/x86_64-musl.nix; + }; + }; + archLookupTable = table.${localSystem.libc} + or (abort "unsupported libc for the pure Linux stdenv"); + files = archLookupTable.${localSystem.system} + or (abort "unsupported platform for the pure Linux stdenv"); + in files }: assert crossSystem == null; @@ -40,7 +52,9 @@ let # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...). - bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; }; + bootstrapTools = import (if localSystem.libc == "musl" then ./bootstrap-tools-musl else ./bootstrap-tools) { inherit system bootstrapFiles; }; + + getLibc = stage: stage.${localSystem.libc}; # This function builds the various standard environments used during @@ -82,7 +96,7 @@ let cc = prevStage.gcc-unwrapped; bintools = prevStage.binutils; isGNU = true; - libc = prevStage.glibc; + libc = getLibc prevStage; inherit (prevStage) coreutils gnugrep; name = name; stdenvNoCC = prevStage.ccWrapperStdenv; @@ -95,6 +109,7 @@ let # stdenv.glibc is used by GCC build to figure out the system-level # /usr/include directory. + # TODO: Remove this! inherit (prevStage) glibc; }; overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; }; @@ -113,7 +128,8 @@ in __raw = true; gcc-unwrapped = null; - glibc = null; + glibc = assert false; null; + musl = assert false; null; binutils = null; coreutils = null; gnugrep = null; @@ -135,12 +151,15 @@ in # will search the Glibc headers before the GCC headers). So # create a dummy Glibc here, which will be used in the stdenv of # stage1. - glibc = self.stdenv.mkDerivation { - name = "bootstrap-glibc"; + ${localSystem.libc} = self.stdenv.mkDerivation { + name = "bootstrap-${localSystem.libc}"; buildCommand = '' mkdir -p $out ln -s ${bootstrapTools}/lib $out/lib + '' + lib.optionalString (localSystem.libc == "glibc") '' ln -s ${bootstrapTools}/include-glibc $out/include + '' + lib.optionalString (localSystem.libc == "musl") '' + ln -s ${bootstrapTools}/include-libc $out/include ''; }; gcc-unwrapped = bootstrapTools; @@ -148,7 +167,7 @@ in nativeTools = false; nativeLibc = false; buildPackages = { }; - libc = self.glibc; + libc = getLibc self; inherit (self) stdenvNoCC coreutils gnugrep; bintools = bootstrapTools; name = "bootstrap-binutils-wrapper"; @@ -177,7 +196,9 @@ in binutils = super.binutils_nogold; inherit (prevStage) ccWrapperStdenv - glibc gcc-unwrapped coreutils gnugrep; + gcc-unwrapped coreutils gnugrep; + + ${localSystem.libc} = getLibc prevStage; # A threaded perl build needs glibc/libpthread_nonshared.a, # which is not included in bootstrapTools, so disable threading. @@ -203,7 +224,7 @@ in binutils = prevStage.binutils.override { # Rewrap the binutils with the new glibc, so both the next # stage's wrappers use it. - libc = self.glibc; + libc = getLibc self; }; }; }) @@ -218,8 +239,9 @@ in overrides = self: super: rec { inherit (prevStage) ccWrapperStdenv - binutils glibc coreutils gnugrep + binutils coreutils gnugrep perl patchelf linuxHeaders gnum4 bison; + ${localSystem.libc} = getLibc prevStage; # Link GCC statically against GMP etc. This makes sense because # these builds of the libraries are only used by GCC, so it # reduces the size of the stdenv closure. @@ -247,8 +269,8 @@ in # because gcc (since JAR support) already depends on zlib, and # then if we already have a zlib we want to use that for the # other purposes (binutils and top-level pkgs) too. - inherit (prevStage) gettext gnum4 bison gmp perl glibc zlib linuxHeaders; - + inherit (prevStage) gettext gnum4 bison gmp perl zlib linuxHeaders; + ${localSystem.libc} = getLibc prevStage; binutils = super.binutils.override { # Don't use stdenv's shell but our own shell = self.bash + "/bin/bash"; @@ -267,7 +289,7 @@ in }; cc = prevStage.gcc-unwrapped; bintools = self.binutils; - libc = self.glibc; + libc = getLibc self; inherit (self) stdenvNoCC coreutils gnugrep; name = ""; shell = self.bash + "/bin/bash"; @@ -314,7 +336,9 @@ in inherit (prevStage.stdenv) fetchurlBoot; extraAttrs = { + # TODO: remove this! inherit (prevStage) glibc; + inherit platform bootstrapTools; shellPackage = prevStage.bash; }; @@ -332,18 +356,20 @@ in ++ lib.optional (gawk.libsigsegv != null) gawk.libsigsegv ) # More complicated cases - ++ [ - glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders + ++ (map (x: getOutput x (getLibc prevStage)) [ "out" "dev" "bin" ] ) + ++ [ /*propagated from .dev*/ linuxHeaders binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params ] + ++ lib.optional (localSystem.libc == "musl") libiconv ++ lib.optionals localSystem.isAarch64 [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]; overrides = self: super: { inherit (prevStage) gzip bzip2 xz bash coreutils diffutils findutils gawk - glibc gnumake gnused gnutar gnugrep gnupatch patchelf + gnumake gnused gnutar gnugrep gnupatch patchelf attr acl paxctl zlib pcre; + ${localSystem.libc} = getLibc prevStage; } // lib.optionalAttrs (super.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. inherit (prevStage) binutils binutils-raw; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index ac1d57a227520..d08be79e6c553 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -7,10 +7,14 @@ let }; in with (import ../../../lib).systems.examples; { - armv5tel = make sheevaplug; - scaleway = make scaleway-c1; - pogoplug4 = make pogoplug4; - armv6l = make raspberryPi; - armv7l = make armv7l-hf-multiplatform; - aarch64 = make aarch64-multiplatform; + armv5tel = make sheevaplug; + scaleway = make scaleway-c1; + pogoplug4 = make pogoplug4; + armv6l = make raspberryPi; + armv7l = make armv7l-hf-multiplatform; + aarch64 = make aarch64-multiplatform; + x86_64-musl = make musl64; + i686-musl = make musl32; + armv6l-musl = make muslpi; + aarch64-musl = make aarch64-multiplatform-musl; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index f51a39d5820d3..86801e3f04475 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -4,9 +4,7 @@ let pkgs = import ../../.. { inherit localSystem crossSystem; }; - glibc = if pkgs.hostPlatform != pkgs.buildPlatform - then pkgs.glibcCross - else pkgs.glibc; + libc = pkgs.stdenv.cc.libc; in with pkgs; rec { @@ -46,29 +44,30 @@ in with pkgs; rec { set -x mkdir -p $out/bin $out/lib $out/libexec + '' + (if (hostPlatform.libc == "glibc") then '' # Copy what we need of Glibc. - cp -d ${glibc.out}/lib/ld*.so* $out/lib - cp -d ${glibc.out}/lib/libc*.so* $out/lib - cp -d ${glibc.out}/lib/libc_nonshared.a $out/lib - cp -d ${glibc.out}/lib/libm*.so* $out/lib - cp -d ${glibc.out}/lib/libdl*.so* $out/lib - cp -d ${glibc.out}/lib/librt*.so* $out/lib - cp -d ${glibc.out}/lib/libpthread*.so* $out/lib - cp -d ${glibc.out}/lib/libnsl*.so* $out/lib - cp -d ${glibc.out}/lib/libutil*.so* $out/lib - cp -d ${glibc.out}/lib/libnss*.so* $out/lib - cp -d ${glibc.out}/lib/libresolv*.so* $out/lib - cp -d ${glibc.out}/lib/crt?.o $out/lib - - cp -rL ${glibc.dev}/include $out + cp -d ${libc.out}/lib/ld*.so* $out/lib + cp -d ${libc.out}/lib/libc*.so* $out/lib + cp -d ${libc.out}/lib/libc_nonshared.a $out/lib + cp -d ${libc.out}/lib/libm*.so* $out/lib + cp -d ${libc.out}/lib/libdl*.so* $out/lib + cp -d ${libc.out}/lib/librt*.so* $out/lib + cp -d ${libc.out}/lib/libpthread*.so* $out/lib + cp -d ${libc.out}/lib/libnsl*.so* $out/lib + cp -d ${libc.out}/lib/libutil*.so* $out/lib + cp -d ${libc.out}/lib/libnss*.so* $out/lib + cp -d ${libc.out}/lib/libresolv*.so* $out/lib + cp -d ${libc.out}/lib/crt?.o $out/lib + + cp -rL ${libc.dev}/include $out chmod -R u+w "$out" - # glibc can contain linker scripts: find them, copy their deps, + # libc can contain linker scripts: find them, copy their deps, # and get rid of absolute paths (nuke-refs would make them useless) local lScripts=$(grep --files-with-matches --max-count=1 'GNU ld script' -R "$out/lib") - cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${glibc.out}' | sort -u) + cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${libc.out}' | sort -u) for f in $lScripts; do - substituteInPlace "$f" --replace '${glibc.out}/lib/' "" + substituteInPlace "$f" --replace '${libc.out}/lib/' "" done # Hopefully we won't need these. @@ -76,7 +75,18 @@ in with pkgs; rec { find $out/include -name .install -exec rm {} \; find $out/include -name ..install.cmd -exec rm {} \; mv $out/include $out/include-glibc + '' else if (hostPlatform.libc == "musl") then '' + # Copy what we need from musl + cp ${libc.out}/lib/* $out/lib + cp -rL ${libc.dev}/include $out + chmod -R u+w "$out" + rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video + find $out/include -name .install -exec rm {} \; + find $out/include -name ..install.cmd -exec rm {} \; + mv $out/include $out/include-libc + '' else throw "unsupported libc for bootstrap tools") + + '' # Copy coreutils, bash, etc. cp ${coreutilsMinimal.out}/bin/* $out/bin (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) @@ -115,7 +125,7 @@ in with pkgs; rec { cp -rd ${gcc.cc.out}/libexec/* $out/libexec chmod -R u+w $out/libexec rm -rf $out/libexec/gcc/*/*/plugin - mkdir $out/include + mkdir -p $out/include cp -rd ${gcc.cc.out}/include/c++ $out/include chmod -R u+w $out/include rm -rf $out/include/c++/*/ext/pb_ds @@ -126,6 +136,8 @@ in with pkgs; rec { cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib + '' + lib.optionalString (hostPlatform.libc == "musl") '' + cp -d ${libiconv.out}/lib/libiconv*.so* $out/lib '' + lib.optionalString (hostPlatform != buildPlatform) '' # These needed for cross but not native tools because the stdenv @@ -161,7 +173,7 @@ in with pkgs; rec { mv $out/.pack $out/pack mkdir $out/on-server - tar cvfJ $out/on-server/bootstrap-tools.tar.xz --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack . + XZ_OPT=-9 tar cvJf $out/on-server/bootstrap-tools.tar.xz --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack . cp ${busyboxMinimal}/bin/busybox $out/on-server chmod u+w $out/on-server/busybox nuke-refs $out/on-server/busybox @@ -189,10 +201,17 @@ in with pkgs; rec { bootstrapTools = runCommand "bootstrap-tools.tar.xz" {} "cp ${build}/on-server/bootstrap-tools.tar.xz $out"; }; - bootstrapTools = import ./bootstrap-tools { - inherit (hostPlatform) system; - inherit bootstrapFiles; - }; + bootstrapTools = if (hostPlatform.libc == "glibc") then + import ./bootstrap-tools { + inherit (hostPlatform) system; + inherit bootstrapFiles; + } + else if (hostPlatform.libc == "musl") then + import ./bootstrap-tools-musl { + inherit (hostPlatform) system; + inherit bootstrapFiles; + } + else throw "unsupported libc"; test = derivation { name = "test-bootstrap-tools"; @@ -215,10 +234,17 @@ in with pkgs; rec { grep --version gcc --version + '' + lib.optionalString (hostPlatform.libc == "glibc") '' ldlinux=$(echo ${bootstrapTools}/lib/ld-linux*.so.?) export CPP="cpp -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools}" export CC="gcc -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib" export CXX="g++ -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib" + '' + lib.optionalString (hostPlatform.libc == "musl") '' + ldmusl=$(echo ${bootstrapTools}/lib/ld-musl*.so.?) + export CPP="cpp -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools}" + export CC="gcc -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools} -Wl,-dynamic-linker,$ldmusl -Wl,-rpath,${bootstrapTools}/lib" + export CXX="g++ -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools} -Wl,-dynamic-linker,$ldmusl -Wl,-rpath,${bootstrapTools}/lib" + '' + '' echo '#include <stdio.h>' >> foo.c echo '#include <limits.h>' >> foo.c diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index bad9ccae799dd..ef5afb9176635 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -26,12 +26,12 @@ let in buildPythonPackage rec { pname = "awscli"; - version = "1.14.29"; + version = "1.14.32"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "96edb1dd72fbc13638967fe07c436e95133169759cc962b973bb79ba959bc652"; + sha256 = "09i82nf43pv5v598wvbj4nk1bfc64wp7xzlx5ykaca5m40lkarz0"; }; # No tests included diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 5dddccfe78acd..a578bb4bca279 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -4,6 +4,7 @@ GEM CFPropertyList (2.3.6) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) + atomos (0.1.2) babosa (1.0.2) claide (1.0.2) colored (1.2) @@ -16,7 +17,7 @@ GEM unf (>= 0.0.5, < 1.0.0) dotenv (2.2.1) excon (0.60.0) - faraday (0.13.1) + faraday (0.14.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) @@ -24,8 +25,8 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.1) - fastlane (2.75.1) - CFPropertyList (>= 2.3, < 3.0.0) + fastlane (2.80.0) + CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) bundler (>= 1.12.0, < 2.0.0) @@ -49,16 +50,16 @@ GEM public_suffix (~> 2.0.0) rubyzip (>= 1.1.0, < 2.0.0) security (= 0.1.3) - slack-notifier (>= 1.3, < 2.0.0) + slack-notifier (>= 2.0.0, < 3.0.0) terminal-notifier (>= 1.6.2, < 2.0.0) terminal-table (>= 1.4.5, < 2.0.0) tty-screen (>= 0.6.3, < 1.0.0) - tty-spinner (>= 0.7.0, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.5.2, < 2.0.0) xcpretty (>= 0.2.4, < 1.0.0) xcpretty-travis-formatter (>= 0.0.3) - gh_inspector (1.0.3) + gh_inspector (1.1.1) google-api-client (0.13.6) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.5) @@ -89,7 +90,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_magick (4.5.1) - multi_json (1.13.0) + multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) nanaimo (0.2.3) @@ -109,13 +110,13 @@ GEM faraday (~> 0.9) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - slack-notifier (1.5.1) + slack-notifier (2.3.2) terminal-notifier (1.8.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) tty-cursor (0.5.0) tty-screen (0.6.4) - tty-spinner (0.7.0) + tty-spinner (0.8.0) tty-cursor (>= 0.5.0) uber (0.1.0) unf (0.1.4) @@ -123,8 +124,9 @@ GEM unf_ext (0.0.7.4) unicode-display_width (1.3.0) word_wrap (1.0.0) - xcodeproj (1.5.4) + xcodeproj (1.5.6) CFPropertyList (~> 2.3.3) + atomos (~> 0.1.2) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.2.3) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index a309de07a11ec..c9ddb7b77c049 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -8,6 +8,14 @@ }; version = "2.5.2"; }; + atomos = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10z69hjv30r2w5q5wmlf0cq4jv3w744jrac8ylln8sf45ckqj7wk"; + type = "gem"; + }; + version = "0.1.2"; + }; babosa = { source = { remotes = ["https://rubygems.org"]; @@ -102,10 +110,10 @@ dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gyqsj7vlqynwvivf9485zwmcj04v1z7gq362z0b8zw2zf4ag0hw"; + sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr"; type = "gem"; }; - version = "0.13.1"; + version = "0.14.0"; }; faraday-cookie_jar = { dependencies = ["faraday" "http-cookie"]; @@ -137,18 +145,18 @@ 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" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v5i9wnbmsmvz3xhbkvs1w5qj9b0ib5431i3zlimfasf8h138l9y"; + sha256 = "0saas50qdfipkms66snyg7imvzn1vfngd87dfygj9x8v18bqwvis"; type = "gem"; }; - version = "2.75.1"; + version = "2.80.0"; }; gh_inspector = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1lxvp8xpjd2cazzcp90phy567spp4v41bnk9awgx8absndv70k1x"; + sha256 = "0mpfl279k8yff2ia601b37zw31blwh2plkr501iz6qj8drx3mq3c"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.1"; }; google-api-client = { dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; @@ -262,10 +270,10 @@ multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "05rrhxl08qvd37g5q13v6k8qqbr1ixn6g53ld6rxrvj4lxrjvxns"; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; }; - version = "1.13.0"; + version = "1.13.1"; }; multi_xml = { source = { @@ -368,10 +376,10 @@ slack-notifier = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xavibxh00gy62mm79l6id9l2fldjmdqifk8alqfqy5z38ffwah6"; + sha256 = "1pkfn99dhy5s526r6k8d87fwwb6j287ga9s7lxqmh60z28xqh3bv"; type = "gem"; }; - version = "1.5.1"; + version = "2.3.2"; }; terminal-notifier = { source = { @@ -410,10 +418,10 @@ dependencies = ["tty-cursor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sblbhnscgchnxpbsxa5xmnxnpw13nd4lgsykazm9mhsxmjmhggw"; + sha256 = "1xv5bycgmiyx00bq0kx2bdixi3h1ffi86mwj858gqbxlpjbzsi94"; type = "gem"; }; - version = "0.7.0"; + version = "0.8.0"; }; uber = { source = { @@ -457,13 +465,13 @@ version = "1.0.0"; }; xcodeproj = { - dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"]; + dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04kv04y5yz2zniwwywh5ik29gpnjpsp23yr6w07qn3m243icvi76"; + sha256 = "0zqx24qhax7p91rs1114da0v86cy9m7an1bjwxq6dyccp8g6kb50"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.6"; }; xcpretty = { dependencies = ["rouge"]; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix new file mode 100644 index 0000000000000..fe165b1e66e30 --- /dev/null +++ b/pkgs/tools/admin/lego/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "lego-unstable-${version}"; + version = "2018-02-02"; + rev = "06a8e7c475c03ef8d4773284ac63357d2810601b"; + + src = fetchFromGitHub { + inherit rev; + owner = "xenolf"; + repo = "lego"; + sha256 = "11a9gcgi3317z4lb1apkf6dnbjhf7xni0670nric3fbf5diqfwh2"; + }; + + goPackagePath = "github.com/xenolf/lego"; + goDeps = ./deps.nix; + + meta = with lib; { + description = "Let's Encrypt client and ACME library written in Go"; + license = licenses.mit; + homepage = https://github.com/xenolf/lego; + maintainers = with maintainers; [ andrew-d ]; + }; +} diff --git a/pkgs/tools/admin/lego/deps.nix b/pkgs/tools/admin/lego/deps.nix new file mode 100644 index 0000000000000..6d842c5f3f518 --- /dev/null +++ b/pkgs/tools/admin/lego/deps.nix @@ -0,0 +1,219 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "fd7767e8876b52efa597af4d0ec944e9b2574120"; + sha256 = "1m7yd2vwbgypi9izgyif4k8rifgfmgsh747s1z467qlr5k17cjy5"; + }; + } + { + goPackagePath = "github.com/Azure/azure-sdk-for-go"; + fetch = { + type = "git"; + url = "https://github.com/Azure/azure-sdk-for-go"; + rev = "f111fc2fa3861c5fdced76cae4c9c71821969577"; + sha256 = "1xfm3phjwb222nkhzi16qslj0r374rgvjw99c9wrzzlzkq2qkb38"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "5a06e9ddbe3c22262059b8e061777b9934f982bd"; + sha256 = "0dy80x5gxsq6vf8lpihpgv8cb8mnsk76q4ywxx3cxzfglqdjlwz6"; + }; + } + { + goPackagePath = "github.com/JamesClonk/vultr"; + fetch = { + type = "git"; + url = "https://github.com/JamesClonk/vultr"; + rev = "fa1c0367800db75e4d10d0ec90c49a8731670224"; + sha256 = "1bx2x17aa6wfn4qy9lxk8sh7shs3x5ppz2z49s0xm8qq0rs1qi92"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "fb9d53b0db7e801eb0d4fa021f5860794d845da3"; + sha256 = "0md4bvrr4y5604l3bif7xx1bvhn6cc81v578s6w15mp63k9yjlpn"; + }; + } + { + goPackagePath = "github.com/decker502/dnspod-go"; + fetch = { + type = "git"; + url = "https://github.com/decker502/dnspod-go"; + rev = "f33a2c6040fc2550a631de7b3a53bddccdcd73fb"; + sha256 = "0c5v7y465k8mi5vxhln53pjn3z4h022sh14mngnx71h6szakzykg"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; + sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; + }; + } + { + goPackagePath = "github.com/dnsimple/dnsimple-go"; + fetch = { + type = "git"; + url = "https://github.com/dnsimple/dnsimple-go"; + rev = "e43ab24dc4818cd584429752f69885fbc8a74baa"; + sha256 = "0cq1xjv27nssarmflnh0w4i0l8v74129va4inhi5m2wxrz2247z7"; + }; + } + { + goPackagePath = "github.com/edeckers/auroradnsclient"; + fetch = { + type = "git"; + url = "https://github.com/edeckers/auroradnsclient"; + rev = "1563e622aaca0a8bb895a448f31d4a430ab97586"; + sha256 = "0d1izyqnlqasp56mldrpfnyhzmih2k955jn78ibzhay22dmn8ndr"; + }; + } + { + goPackagePath = "github.com/exoscale/egoscale"; + fetch = { + type = "git"; + url = "https://github.com/exoscale/egoscale"; + rev = "7c8b1e7975be2af74d6e462dbea467e9061f9619"; + sha256 = "00bqam37lkwls4rr209pcrld1rb025nm935h004lgfd8i2xjv5g4"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a"; + sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "5364553f1ee9cddc7ac8b62dce148309c386695b"; + sha256 = "1r56ws5ayza5xk6xlkjvv7wcj6misbm5cyixvyf3pnz8wgja31wp"; + }; + } + { + goPackagePath = "github.com/ovh/go-ovh"; + fetch = { + type = "git"; + url = "https://github.com/ovh/go-ovh"; + rev = "df6beeb652924ef66aa95690b392f62864ad8842"; + sha256 = "1nxgsrbqhznqivjxh67pn8laf4pysja5xyc40bdjvprl9nc40z6q"; + }; + } + { + goPackagePath = "github.com/rainycape/memcache"; + fetch = { + type = "git"; + url = "https://github.com/rainycape/memcache"; + rev = "1031fa0ce2f20c1c0e1e1b51951d8ea02c84fa05"; + sha256 = "02cbhy192vi0d1kwh57mdrg1mkr027ndkvd1y0cx0kn0h6pszggn"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "be8372ae8ec5c6daaed3cc28ebf73c54b737c240"; + sha256 = "1ljfacbhd180yr0lc9myvxxdka0iji2ihsx0fcczja4ik5f2mb5p"; + }; + } + { + goPackagePath = "github.com/timewasted/linode"; + fetch = { + type = "git"; + url = "https://github.com/timewasted/linode"; + rev = "37e84520dcf74488f67654f9c775b9752c232dc1"; + sha256 = "08gpys1c5xkh7f92fq31wb24vjksfnpbhfwini73dlvyi2w25a3c"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "a1c7408de3f632d86eee604a3bb755f1ffb68226"; + sha256 = "1fq0amfgpccf35nll7xw0k6smwrb7h0wy62n70kfd9kvh64n8hbn"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "5119cf507ed5294cc409c092980c7497ee5d6fd2"; + sha256 = "0r8ffhagvzpjrkm25rrlby4h6bsqqlq6kcm01g54iqm7b2yrjy1p"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "f5dfe339be1d06f81b22525fe34671ee7d2c8904"; + sha256 = "01y9j7pjnnld4ipmzjvs0hls0hh698f2sga8cxaw5y6r5j7igaah"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "543e37812f10c46c622c9575afd7ad22f22a12ba"; + sha256 = "0kc816fq1zj5wdw4mfa7w2q26rnh273157w8n0d30xpzl8ba2isr"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "068431dcab1a5817548dd244d9795788a98329f4"; + sha256 = "1yn5qfmmmqbm6k5h8qj5n6ra3xv9aispvjv9kqarxwvv7q5xql83"; + }; + } + { + goPackagePath = "gopkg.in/ini.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/ini.v1"; + rev = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a"; + sha256 = "0mhgxw5q6b0pryhikx3k4wby7g32rwjjljzihi47lwn34kw5y1qn"; + }; + } + { + goPackagePath = "gopkg.in/ns1/ns1-go.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/ns1/ns1-go.v2"; + rev = "1f132c4ac59d2c7022353a8824002a15deb66f1e"; + sha256 = "0fx646hzhi6w58hiwc76hfjxn0dj9vxbrdqkb64lqxymzxzsrfnb"; + }; + } + { + goPackagePath = "gopkg.in/square/go-jose.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/square/go-jose.v1"; + rev = "aa2e30fdd1fe9dd3394119af66451ae790d50e0d"; + sha256 = "0drajyadd6c4m5qv0jxcv748qczg8sgxz28nva1jn39f234m02is"; + }; + } +] diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix index 9537701ebe7f1..2505c012b26b1 100644 --- a/pkgs/tools/archivers/unarj/default.nix +++ b/pkgs/tools/archivers/unarj/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p"; - url = "http://pkgs.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz"; + url = "http://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz"; }; preInstall = '' diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index cb2d29e239dc1..6d979bbf33d8b 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz - http://pkgs.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz + http://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz ]; sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 941c5e343b923..6915f8a907119 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.01.25"; + version = "2018.02.07"; src = fetchzip { url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "18h6gqhh75qdi8krpp0m2pxbxi0n08wrh8xay477jm3vaggyr8s9"; + sha256 = "16hdv114hs5agg288kpbijqw53wdiswjmprpbhy7kgdjnp9ijwxw"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 899845a044c68..b8f3318057b40 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -224,7 +224,7 @@ in pythonPackages.buildPythonApplication rec { description = "Music tagger and library organizer"; homepage = http://beets.radbox.org; license = licenses.mit; - maintainers = with maintainers; [ aszlig domenkozar pjones profpatsch ]; + maintainers = with maintainers; [ aszlig domenkozar pjones ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/backup/backup/default.nix b/pkgs/tools/backup/backup/default.nix index cf97eba8eded8..23affbb8af665 100644 --- a/pkgs/tools/backup/backup/default.nix +++ b/pkgs/tools/backup/backup/default.nix @@ -1,14 +1,15 @@ -{ stdenv, lib, bundlerEnv, ruby_2_1, curl }: +{ stdenv, lib, bundlerEnv, ruby, curl }: bundlerEnv { name = "backup_v4"; - ruby = ruby_2_1; + inherit ruby; gemdir = ./.; buildInputs = [ curl ]; meta = with lib; { + broken = true; # need ruby 2.1 description = "Easy full stack backup operations on UNIX-like systems"; homepage = http://backup.github.io/backup/v4/; license = licenses.mit; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index eb40dfefb83c7..4f0d24a27d906 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { lz4 openssl python3Packages.setuptools_scm ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; propagatedBuildInputs = with python3Packages; [ - cython msgpack + cython msgpack-python ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ llfuse ]; preConfigure = '' diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 783a0796e91b8..5540822c99b5b 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , acl, librsync, ncurses, openssl, zlib, uthash }: stdenv.mkDerivation rec { name = "burp-${version}"; - version = "2.0.54"; + version = "2.1.28"; src = fetchFromGitHub { owner = "grke"; repo = "burp"; rev = version; - sha256 = "1z1w013hqxbfjgri0fan2570qwhgwvm4k4ghajbzqg8kly4fgk5x"; + sha256 = "1i8j15pmnn9cn6cd4dnp28qbisq8cl9l4y3chsmil4xqljr9fi5x"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ librsync ncurses openssl zlib uthash ] ++ stdenv.lib.optional (!stdenv.isDarwin) acl; diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix new file mode 100644 index 0000000000000..b04a1dab40f55 --- /dev/null +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -0,0 +1,27 @@ +{ buildGoPackage, fetchFromGitHub, stdenv }: + +buildGoPackage rec { + + name = "${pname}-${version}"; + pname = "diskrsync"; + version = "unstable-2018-02-03"; + + src = fetchFromGitHub { + owner = "dop251"; + repo = pname; + rev = "2f36bd6e5084ce16c12a2ee216ebb2939a7d5730"; + sha256 = "1rpfk7ds4lpff30aq4d8rw7g9j4bl2hd1bvcwd1pfxalp222zkxn"; + }; + + goPackagePath = "github.com/dop251/diskrsync"; + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Rsync for block devices and disk images"; + homepage = https://github.com/dop251/diskrsync; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; + }; + +} diff --git a/pkgs/tools/backup/diskrsync/deps.nix b/pkgs/tools/backup/diskrsync/deps.nix new file mode 100644 index 0000000000000..684100968e88f --- /dev/null +++ b/pkgs/tools/backup/diskrsync/deps.nix @@ -0,0 +1,21 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/dop251/spgz"; + fetch = { + type = "git"; + url = "https://github.com/dop251/spgz"; + rev = "d50e5e978e08044da0cf9babc6b42b55ec8fe0d5"; + sha256 = "11h8z6cwxw272rn5zc4y3w9d6py113iaimy681v6xxv26d30m8bx"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "1875d0a70c90e57f11972aefd42276df65e895b9"; + sha256 = "1kprrdzr4i4biqn7r9gfxzsmijya06i9838skprvincdb1pm0q2q"; + }; + } +] diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 05cc672ab15e2..8d02e926e57fa 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; # In stdenv-linux, prevent a dependency on bootstrap-tools. - preConfigure = "unset CONFIG_SHELL"; + preConfigure = "CONFIG_SHELL=/bin/sh"; postInstall = "rm -rf $out/share/doc"; diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index f4133f12541f2..72403bd3dc0c2 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, fuse, libarchive }: let - name = "archivemount-0.8.3"; + name = "archivemount-0.8.7"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz"; - sha256 = "1zv1fvik76kpp1q5f2dz01f4fwg1m5a8rl168px47jy9nyl9k277"; + sha256 = "1diiw6pnlnrnikn6l5ld92dx59lhrxjlqms8885vwbynsjl5q127"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index fc4d3f505cdc4..0a5017de53c42 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,29 +1,25 @@ -{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils, liburcu, zlib, libaio }: +{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium +, keyutils, liburcu, zlib, libaio }: stdenv.mkDerivation rec { - name = "bcachefs-tools-unstable-2017-08-28"; + name = "bcachefs-tools-unstable-2018-02-08"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "b1814f2dd0c6b61a12a2ebb67a13d406d126b227"; - sha256 = "05ba1h09rrqj6vjr3q37ybca3nbrmnifmffdyk83622l28fpv350"; + rev = "fc96071b58c28ea492103e7649c0efd5bab50ead"; + sha256 = "0a2sxkz0mkmvb5g4k2v8g2c89dj29haw9bd3bpwk0dsfkjif92vy"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ]; - preConfigure = '' - substituteInPlace cmd_migrate.c --replace /usr/include/dirent.h ${stdenv.lib.getDev stdenv.cc.libc}/include/dirent.h - ''; - installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Tool for managing bcachefs filesystems"; - homepage = http://bcachefs.org/; + homepage = https://bcachefs.org/; license = licenses.gpl2; maintainers = with maintainers; [ davidak ]; platforms = platforms.linux; }; } - diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 7bbfafef819db..dfd522f5a0943 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "cryfs-${version}"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "cryfs"; repo = "cryfs"; rev = "${version}"; - sha256 = "1lrzmzjakv08qjq09a3krllfw5vrgblfxzijpf3lm3yjgih63r1k"; + sha256 = "07f2k2b595m3vkwwlmlc0m7px0nwrrzrph3z6sss9354m0b0lcri"; }; prePatch = '' diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix index 831594973e21a..47ff22ae20ddc 100644 --- a/pkgs/tools/filesystems/exfat/default.nix +++ b/pkgs/tools/filesystems/exfat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "exfat-${version}"; - version = "1.2.7"; + version = "1.2.8"; src = fetchFromGitHub { owner = "relan"; repo = "exfat"; rev = "v${version}"; - sha256 = "1sk4z133djh8sdvx2vvmd8kf4qfly2i3hdar4zpg0s41jpbzdx69"; + sha256 = "0q02g3yvfmxj70h85a69d8s4f6y7jask268vr87j44ya51lzndd9"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/pkgs/tools/filesystems/file-rename/default.nix new file mode 100644 index 0000000000000..1818a517fd252 --- /dev/null +++ b/pkgs/tools/filesystems/file-rename/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, perlPackages, makeWrapper }: + +perlPackages.buildPerlPackage rec { + name = "File-Rename-0.20"; + + src = fetchurl { + url = "mirror://cpan/authors/id/R/RM/RMBARKER/${name}.tar.gz"; + sha256 = "1cf6xx2hiy1xalp35fh8g73j67r0w0g66jpcbc6971x9jbm7bvjy"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/rename \ + --prefix PERL5LIB : $out/lib/perl5/site_perl + ''; + + meta = with stdenv.lib; { + description = "Perl extension for renaming multiple files"; + homepage = http://search.cpan.org/~rmbarker; + license = licenses.artistic1; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix index 3ed145c82f2da..6fb9bd98fb36b 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; src = fetchurl rec { - url = "http://pkgs.fedoraproject.org/repo/pkgs/python-pyblock/" + url = "http://src.fedoraproject.org/repo/pkgs/python-pyblock/" + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2"; sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index 1da01bc2e6070..b86c0e5229af6 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -6,7 +6,7 @@ buildPythonApplication rec { md5_path = "d249f60aa89b1b4facd63f776925116d"; src = fetchurl rec { - url = "http://pkgs.fedoraproject.org/repo/pkgs/pykickstart/" + url = "http://src.fedoraproject.org/repo/pkgs/pykickstart/" + "${name}.tar.gz/${md5_path}/${name}.tar.gz"; sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a"; }; diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index 8a46b302dcdf8..f61c7923d794b 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -31,7 +31,10 @@ stdenv.mkDerivation rec { CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.isDarwin) "-I${cairo.dev}/include/cairo"; - configureFlags = optional (xorg == null) "--without-x"; + configureFlags = [ + "--with-ltdl-lib=${libtool.lib}/lib" + "--with-ltdl-include=${libtool}/include" + ] ++ stdenv.lib.optional (xorg == null) [ "--without-x" ]; postPatch = '' for f in $(find . -name Makefile.in); do diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix new file mode 100644 index 0000000000000..1a2b5b19e37af --- /dev/null +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + version = "1.0.0"; + name = "oxipng-${version}"; + + src = fetchFromGitHub { + owner = "shssoichiro"; + repo = "oxipng"; + rev = "v${version}"; + sha256 = "1w3y9qy72sfz6zv1iizp843fd39rf1qfh7b9mllbn5w8w4hd658w"; + }; + + cargoSha256 = "0mj45svb0nly3cl5d1fmm7nh2zswxpgb56g9xnb4cks5186sn5fi"; + + meta = with stdenv.lib; { + homepage = https://github.com/shssoichiro/oxipng; + description = "A lossless PNG compression optimizer"; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 4fb16b497176c..c50d7ec8fad9a 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, +{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, expat, fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif, python27, libpng, matio ? null, cfitsio ? null, libwebp ? null }: stdenv.mkDerivation rec { - name = "vips-8.3.1"; + name = "vips-${version}"; + version = "8.6.2"; src = fetchurl { - url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz"; - sha256 = "01hh1baar2r474kny24fcq6ddshcvq104207mqxnkis0as6pzjq9"; + url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz"; + sha256 = "18hjwk000w49yjjb41qrk4s39mr1xccisrvwy2x063vyjbdbr1ll"; }; buildInputs = [ pkgconfig glib libxml2 fftw orc lcms imagemagick openexr libtiff libjpeg libgsf libexif python27 libpng + expat ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 77ac02649ad3c..33fea9705acd1 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcppWithoutBoost, +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcpp, libevdev, libudev }: let @@ -12,8 +12,8 @@ in stdenv.mkDerivation { sha256 = "14g4pphvylqdb922va322z1pbp12ap753hcf7zf9sii1ikvif83j"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake libevdev libudev libyamlcppWithoutBoost ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libevdev libudev libyamlcpp ]; prePatch = '' substituteInPlace CMakeLists.txt --replace \ diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 405eb29f6bf95..b744e70a4e2f7 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -8,7 +8,7 @@ let python = python3Packages.python; wrapPython = python3Packages.wrapPython; - version = "1.1"; + version = "1.4"; in stdenv.mkDerivation { name = "autorandr-${version}"; @@ -49,7 +49,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = "${version}"; - sha256 = "05jlzxlrdyd4j90srr71fv91c2hf32diw40n9rmybgcdvy45kygd"; + sha256 = "08i71r221ilc8k1c59w89g3iq5m7zwhnjjzapavhqxlr8y9dcpf5"; }; meta = { diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix index b1ca28a7ca9dd..1c681d4986d7f 100644 --- a/pkgs/tools/misc/bcunit/default.nix +++ b/pkgs/tools/misc/bcunit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "${baseName}-${version}"; baseName = "bcunit"; - version = "3.0"; + version = "3.0.2"; buildInputs = [cmake]; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "1kdq9w8i3nypfz7d43rmv1csqrqpip9p8xfa7vyp52aqkmhrby9l"; + sha256 = "063yl7kxkix76r49qrj0h1qpz2p538d1yw8aih0x4i47g35k00y7"; }; meta = { diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index a1c04f06d144a..97c0251d9d645 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -1,21 +1,25 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perl, AlgorithmDiff, RegexpCommon }: +{ stdenv, fetchFromGitHub, makeWrapper, perl +, AlgorithmDiff, ParallelForkManager, RegexpCommon +}: stdenv.mkDerivation rec { name = "cloc-${version}"; - version = "1.74"; + version = "1.76"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; - rev = version; - sha256 = "1ihma4f6f92jp1mvzr4rjrgyh9m5wzrlxngaxfn7g0a8r2kyi65b"; + rev = "v${version}"; + sha256 = "03z4ar959ximsddd92zchi013lh82ganzisk309y3b09q10hl9k7"; }; setSourceRoot = '' sourceRoot=$(echo */Unix) ''; - buildInputs = [ makeWrapper perl AlgorithmDiff RegexpCommon ]; + buildInputs = [ + makeWrapper perl AlgorithmDiff ParallelForkManager RegexpCommon + ]; makeFlags = [ "prefix=" "DESTDIR=$(out)" "INSTALL=install" ]; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 45995f02c6896..b03a286d20224 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, autoreconfHook, intltool, perl, perlPackages, libxml2 , pciutils, pkgconfig, gtk2, ddccontrol-db +, makeDesktopItem }: let version = "0.4.2"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ddccontrol-${version}"; src = fetchurl { @@ -32,6 +33,24 @@ stdenv.mkDerivation { sed -e "s/chmod 4711/chmod 0711/" -i src/ddcpci/Makefile* ''; + postInstall = '' + mkdir -p $out/share/applications/ + cp $desktopItem/share/applications/* $out/share/applications/ + for entry in $out/share/applications/*.desktop; do + substituteAllInPlace $entry + done + ''; + + desktopItem = makeDesktopItem { + name = "gddccontrol"; + desktopName = "gddccontrol"; + genericName = "DDC/CI control"; + comment = meta.description; + exec = "@out@/bin/gddccontrol"; + icon = "gddccontrol"; + categories = "Settings;HardwareSettings;"; + }; + meta = with stdenv.lib; { description = "A program used to control monitor parameters by software"; homepage = http://ddccontrol.sourceforge.net/; diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix new file mode 100644 index 0000000000000..e4968b12e6cc2 --- /dev/null +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit }: +let + version = "2017-09-18"; +in stdenv.mkDerivation rec { + name = "edid-decode-unstable-${version}"; + + src = fetchgit { + url = "git://anongit.freedesktop.org/xorg/app/edid-decode"; + rev = "f56f329ed23a25d002352dedba1e8f092a47286f"; + sha256 = "1qzaq342dsdid0d99y7kj60p6bzgp2zjsmspyckddc68mmz4cs9n"; + }; + + installPhase = '' + mkdir -p $out/bin + cp edid-decode $out/bin + ''; + + meta = { + description = "EDID decoder and conformance tester"; + homepage = http://cgit.freedesktop.org/xorg/app/edid-decode/; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.chiiruno ]; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 2681d14665cbc..a18c783827151 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "6.2.0"; + version = "6.3.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "1l1p7jlrryd54jwwrwgvs4njr3r59m8xsh31z7db0bzpw3dk7n5k"; + sha256 = "1q666k7rssjd2cbkm8bm2gsn5shlkh756qpam53kibi5ahrwa7dc"; }; cargoSha256 = "1dikix9d46f0ydi81ray2vdvsy6y326w8ql6c89zx0p9cjm8m83r"; @@ -33,6 +33,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/sharkdp/fd"; license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 4eef3f7a9d59a..f79720289bf5d 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { doCheck = !hostPlatform.isDarwin && !(hostPlatform.libc == "glibc" && hostPlatform.isi686) + && (hostPlatform.libc != "musl") && hostPlatform == buildPlatform; outputs = [ "out" "info" ]; diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/tools/misc/geteltorito/default.nix index 7336665594a78..b95c7179141d5 100644 --- a/pkgs/tools/misc/geteltorito/default.nix +++ b/pkgs/tools/misc/geteltorito/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract the initial/default boot image from a CD image if existent"; homepage = https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/; - maintainers = [ maintainers.profpatsch ]; + maintainers = [ maintainers.Profpatsch ]; license = licenses.gpl2; }; diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index d0cb9a2233668..eadb736aeeb2a 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: stdenv.mkDerivation rec { name = "man-db-2.7.5"; @@ -11,8 +11,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; outputMan = "out"; # users will want `man man` to work - nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ libpipeline db groff ]; + nativeBuildInputs = [ pkgconfig makeWrapper groff ] + ++ stdenv.lib.optionals doCheck checkInputs; + buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) + checkInputs = [ libiconv /* for 'iconv' binary */ ]; postPatch = '' substituteInPlace src/man_db.conf.in \ @@ -41,6 +43,18 @@ stdenv.mkDerivation rec { done ''; + postFixup = stdenv.lib.optionalString (buildPackages.groff != groff) '' + # Check to make sure none of the outputs depend on build-time-only groff: + for outName in $outputs; do + out=''${!outName} + echo "Checking $outName(=$out) for references to build-time groff..." + if grep -r '${buildPackages.groff}' $out; then + echo "Found an erroneous dependency on groff ^^^" >&2 + exit 1 + fi + done + ''; + enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix new file mode 100644 index 0000000000000..085e6f41a0915 --- /dev/null +++ b/pkgs/tools/misc/massren/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "massren-${version}"; + version = "1.5.4"; + + src = fetchFromGitHub { + owner = "laurent22"; + repo = "massren"; + rev = "v${version}"; + sha256 = "1bn6qy30kpxi3rkr3bplsc80xnhj0hgfl0qaczbg3zmykfmsl3bl"; + }; + + goPackagePath = "github.com/laurent22/massren"; + + meta = with lib; { + description = "Easily rename multiple files using your text editor"; + license = licenses.mit; + homepage = https://github.com/laurent22/massren; + maintainers = with maintainers; [ andrew-d ]; + }; +} diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index 0e1d3b8f49f30..6f56267ebf726 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://mktorrent.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; - maintainers = with stdenv.lib.maintainers; [viric profpatsch]; + maintainers = with stdenv.lib.maintainers; [viric Profpatsch]; }; } diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix new file mode 100644 index 0000000000000..de69712eb5ee6 --- /dev/null +++ b/pkgs/tools/misc/papis/default.nix @@ -0,0 +1,44 @@ +{ buildPythonApplication, lib, fetchFromGitHub +, argcomplete, arxiv2bib, beautifulsoup4, bibtexparser +, configparser, habanero, papis-python-rofi, pylibgen +, prompt_toolkit, pyparser, python_magic, pyyaml +, requests, unidecode, urwid, vobject, tkinter +, vim +}: + +buildPythonApplication rec { + pname = "papis"; + version = "0.5.2"; + + # Missing tests on Pypi + src = fetchFromGitHub { + owner = "alejandrogallo"; + repo = pname; + rev = "v${version}"; + sha256 = "0cw6ajdaknijka3j2bkkkn0bcxqifk825kq0a0rdbbmc6661pgxb"; + }; + + postPatch = "sed -i 's/configparser>=3.0.0/# configparser>=3.0.0/' setup.py"; + + propagatedBuildInputs = [ + argcomplete arxiv2bib beautifulsoup4 bibtexparser + configparser habanero papis-python-rofi pylibgen + prompt_toolkit pyparser python_magic pyyaml + requests unidecode urwid vobject tkinter + vim + ]; + + # Papis tries to create the config folder under $HOME during the tests + preCheck = '' + mkdir -p check-phase + export HOME=$(pwd)/check-phase + ''; + + + meta = { + description = "Powerful command-line document and bibliography manager"; + homepage = http://papis.readthedocs.io/en/latest/; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/tools/misc/rename/default.nix new file mode 100644 index 0000000000000..e30c2e89349d8 --- /dev/null +++ b/pkgs/tools/misc/rename/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchFromGitHub, buildPerlPackage }: + +buildPerlPackage rec { + name = "rename-${version}"; + version = "1.9"; + src = fetchFromGitHub { + owner = "pstray"; + repo = "rename"; + rev = "d46f1d0ced25dc5849acb5d5974a3e2e9d97d536"; + sha256 = "0qahs1cqfaci2hdf1xncrz4k0z5skkfr43apnm3kybs7za33apzw"; + }; + meta = with stdenv.lib; { + description = "Rename files according to a Perl rewrite expression"; + homepage = http://search.cpan.org/~pederst/rename-1.9/bin/rename.PL; + maintainers = with maintainers; [ mkg ]; + license = with licenses; [ gpl1Plus ]; + }; +} diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 156db640acdfb..1753f52ab1b6c 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { "--enable-colors256" ]; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl + (fetchpatch { + url = https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff; + sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p"; + stripLen = 1; + }); + buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam ++ stdenv.lib.optional stdenv.isDarwin utmp; diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index 9ef0c9ebdf7d5..a9cd9d75de8e2 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -3,14 +3,30 @@ , darwin }: -stdenv.mkDerivation { - name = "screenFetch-2016-10-11"; +let + path = lib.makeBinPath ([ + coreutils gawk gnused findutils + gnugrep ncurses bc + ] ++ lib.optionals stdenv.isLinux [ + procps + xdpyinfo + xprop + ] ++ lib.optionals stdenv.isDarwin (with darwin; [ + adv_cmds + DarwinTools + system_cmds + "/usr" # some commands like defaults is not available to us + ])); + +in stdenv.mkDerivation rec { + name = "screenFetch-${version}"; + version = "3.8.0"; src = fetchFromGitHub { - owner = "KittyKatt"; - repo = "screenFetch"; - rev = "89e51f24018c89b3647deb24406a9af3a78bbe99"; - sha256 = "0i2k261jj2s4sfhav7vbsd362pa0gghw6qhwafhmicmf8hq2a18v"; + owner = "KittyKatt"; + repo = "screenFetch"; + rev = "v${version}"; + sha256 = "00ibv72cb7cqfpljyzgvajhbp0clqsqliz18nyv83bfy3gkf2qs8"; }; nativeBuildInputs = [ makeWrapper ]; @@ -18,40 +34,29 @@ stdenv.mkDerivation { installPhase = '' install -Dm 0755 screenfetch-dev $out/bin/screenfetch install -Dm 0644 screenfetch.1 $out/share/man/man1/screenfetch.1 + install -Dm 0644 -t $out/share/doc/screenfetch CHANGELOG COPYING README.mkdn TODO - # Fix all of the depedencies of screenfetch + # Fix all of the dependencies of screenfetch patchShebangs $out/bin/screenfetch wrapProgram "$out/bin/screenfetch" \ - --set PATH ${lib.makeBinPath ([ - coreutils gawk gnused findutils - gnugrep ncurses bc - ] ++ lib.optionals stdenv.isLinux [ - procps - xdpyinfo - xprop - ] ++ lib.optionals stdenv.isDarwin (with darwin; [ - adv_cmds - DarwinTools - system_cmds - "/usr" # some commands like defaults is not available to us - ]))} + --prefix PATH : ${path} ''; meta = with lib; { description = "Fetches system/theme information in terminal for Linux desktop screenshots"; longDescription = '' - screenFetch is a "Bash Screenshot Information Tool". This handy Bash - script can be used to generate one of those nifty terminal theme - information + ASCII distribution logos you see in everyone's screenshots - nowadays. It will auto-detect your distribution and display an ASCII - version of that distribution's logo and some valuable information to the - right. There are options to specify no ascii art, colors, taking a - screenshot upon displaying info, and even customizing the screenshot - command! This script is very easy to add to and can easily be extended. + screenFetch is a "Bash Screenshot Information Tool". This handy Bash + script can be used to generate one of those nifty terminal theme + information + ASCII distribution logos you see in everyone's screenshots + nowadays. It will auto-detect your distribution and display an ASCII + version of that distribution's logo and some valuable information to the + right. There are options to specify no ascii art, colors, taking a + screenshot upon displaying info, and even customizing the screenshot + command! This script is very easy to add to and can easily be extended. ''; license = licenses.gpl3; - homepage = http://git.silverirc.com/cgit.cgi/screenfetch-dev.git/; - maintainers = with maintainers; [relrod]; + homepage = https://github.com/KittyKatt/screenFetch; + maintainers = with maintainers; [ relrod ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index 30473059d6d94..435a5850920ac 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { description = "Ultrastar karaoke song creation tool"; homepage = https://github.com/UltraStar-Deluxe/UltraStar-Creator; license = licenses.gpl2; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index af443661b6cd7..d9739f7846b7c 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -115,6 +115,6 @@ in stdenv.mkDerivation { description = "Ultrastar karaoke song manager"; homepage = https://github.com/UltraStar-Deluxe/UltraStar-Manager; license = licenses.gpl2; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/tools/misc/uudeview/default.nix b/pkgs/tools/misc/uudeview/default.nix new file mode 100644 index 0000000000000..e66580f25ffb1 --- /dev/null +++ b/pkgs/tools/misc/uudeview/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, tcl, tk }: + +stdenv.mkDerivation rec { + name = "uudeview-0.5.20"; + src = fetchurl { + url = "http://www.fpx.de/fp/Software/UUDeview/download/${name}.tar.gz"; + sha256 = "0dg4v888fxhmf51vxq1z1gd57fslsidn15jf42pj4817vw6m36p4"; + }; + + buildInputs = [ tcl tk ]; + hardeningDisable = [ "format" ]; + configureFlags = [ "--enable-tk=${tk.dev}" "--enable-tcl=${tcl}" ]; + postPatch = '' + substituteInPlace tcl/xdeview --replace "exec uuwish" "exec $out/bin/uuwish" + ''; + + meta = { + description = "The Nice and Friendly Decoder"; + homepage = http://www.fpx.de/fp/Software/UUDeview/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ woffs ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index c4595a1a94e15..0386896d97f83 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2018.01.27"; + version = "2018.02.08"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "14vbm8pr6xdrdbk8j9k4v82rnalbdpk2lcm7n9wj6z6d441ymji9"; + sha256 = "0iq5mav782gz0gm00rry3v7gdxkkx4y1k0p20pvz32ga4id5k1mg"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix new file mode 100644 index 0000000000000..492b72a176edb --- /dev/null +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, bash }: + +stdenv.mkDerivation rec { + name = "zsh-autoenv-${version}"; + version = "2017-12-16"; + + src = fetchFromGitHub { + owner = "Tarrasch"; + repo = "zsh-autoenv"; + rev = "2c8cfbcea8e7286649840d7ec98d7e9d5e1d45a0"; + sha256 = "004svkfzhc3ab6q2qvwzgj36wvicg5bs8d2gcibx6adq042di7zj"; + }; + + buildPhase = ":"; + + installPhase = '' + mkdir -p $out/{bin,share} + cp -R $src $out/share/zsh-autoenv + + cat <<SCRIPT > $out/bin/zsh-autoenv-share + #!${stdenv.shell} + # Run this script to find the fzf shared folder where all the shell + # integration scripts are living. + echo $out/share/zsh-autoenv + SCRIPT + chmod +x $out/bin/zsh-autoenv-share + ''; + + meta = with stdenv.lib; { + description = "Automatically sources whitelisted .autoenv.zsh files"; + longDescription = '' + zsh-autoenv automatically sources (known/whitelisted) + .autoenv.zsh files, typically used in project root directories. + It handles "enter" and "leave" events, nesting, and stashing of + variables (overwriting and restoring). + ''; + homepage = https://github.com/Tarrasch/zsh-autoenv; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix index ae36980a60d87..93a98a10daad0 100644 --- a/pkgs/tools/networking/biosdevname/default.nix +++ b/pkgs/tools/networking/biosdevname/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "biosdevname-${version}"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "dell"; repo = "biosdevname"; rev = "v${version}"; - sha256 = "183k6f9nayhai27y6nizf0sp9bj1kabykj66hcwdzllhrrh505sd"; + sha256 = "19wbb79x9h79k55sgd4dylvdbhhrvfaiaknbw9s1wvfmirkxa1dz"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 16b22e3f25542..dbe2a66393523 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { name = "curl-7.58.0"; src = fetchurl { - url = "http://curl.haxx.se/download/${name}.tar.bz2"; + url = "https://curl.haxx.se/download/${name}.tar.bz2"; sha256 = "0cg7klhf1ksnbw5wvwa802qir877zv4y3dj7swz1xh07g3wq3c0w"; }; diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index ad058174cff16..c5ecb5eb6dade 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -15,7 +15,13 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ help2man ]; - configureFlags = "--with-ncurses-include-dir=${ncurses.dev}/include"; + configureFlags = [ "--with-ncurses-include-dir=${ncurses.dev}/include" ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd + "--disable-rcp" + "--disable-rsh" + "--disable-rlogin" + "--disable-rexec" + ]; # Test fails with "UNIX socket name too long", probably because our # $TMPDIR is too long. @@ -25,7 +31,7 @@ stdenv.mkDerivation rec { postInstall = '' # XXX: These programs are normally installed setuid but since it # fails, they end up being non-executable, hence this hack. - chmod +x $out/bin/{ping,ping6,rcp,rlogin,rsh,traceroute} + chmod +x $out/bin/{ping,ping6,${stdenv.lib.optionalString (!stdenv.hostPlatform.isMusl) ''rcp,rlogin,rsh,''}traceroute} ''; meta = { diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index d69b52a50014a..b9e47ecd7f904 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ stdenv, fetchurl, openssl, fetchpatch }: stdenv.mkDerivation rec { name = "iperf-3.3"; @@ -10,6 +10,23 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; + preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE" + ''; + + patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + (fetchpatch { + url = "http://git.alpinelinux.org/cgit/aports/plain/main/iperf3/build-fixes.patch"; + name = "fix-musl-build.patch"; + sha256 = "0zvfjnqdldh6rc6qggyb310swdnl9qk0m3z1kklnqzgjsh8dskvl"; + }) + (fetchpatch { + url = "http://git.alpinelinux.org/cgit/aports/plain/main/iperf3/remove-pg-flags.patch"; + name = "remove-pg-flags.patch"; + sha256 = "0lnczhass24kgq59drgdipnhjnw4l1cy6gqza7f2ah1qr4q104rm"; + }) +]; + postInstall = '' ln -s iperf3 $out/bin/iperf ''; diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index fe8988dc41d9e..140ea6860fc33 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "keepalived-${version}"; - version = "1.3.6"; + version = "1.4.1"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "05088vv510dlflzyg8sh8l8qfscnvxl6n6pw9ycp27zhb6r5cr5y"; + sha256 = "1d3jnfhj9mpnc27wvgsiz2vr4lnvvccw3v128z16jpyibyv20ph0"; }; buildInputs = [ diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 303204c9c21e0..7538c08249c0a 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -1,39 +1,28 @@ -{ lib, stdenv, fetchurl, go }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -stdenv.mkDerivation rec { - name = "minio-client-${shortVersion}"; +buildGoPackage rec { + name = "minio-client-${version}"; - shortVersion = "20170206"; - longVersion = "2017-02-06T20-16-19Z"; + version = "2018-02-09T23-07-36Z"; - src = fetchurl { - url = "https://github.com/minio/mc/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; - sha256 = "0k66kr7x669jvydcxp3rpvg8p9knhmcihpnjiqynhqgrdy16mr1f"; + src = fetchFromGitHub { + owner = "minio"; + repo = "mc"; + rev = "RELEASE.${version}"; + sha256 = "1mzjqcvl8740jkkrsyycwqminnd0vdl1m2mvq8hnywj8hs816bfd"; }; - buildInputs = [ go ]; + goPackagePath = "github.com/minio/mc"; - unpackPhase = '' - d=$TMPDIR/src/github.com/minio/mc - mkdir -p $d - tar xf $src -C $d --strip-component 1 - export GOPATH=$TMPDIR - cd $d - ''; + buildFlagsArray = [''-ldflags= + -X github.com/minio/mc/cmd.Version=${version} + '']; - buildPhase = '' - mkdir -p $out/bin - go build -o $out/bin/minio-client \ - --ldflags "-X github.com/minio/mc/cmd.Version=${longVersion}" - ''; - - installPhase = "ln -s minio-client $out/bin/mc"; - - meta = { + meta = with stdenv.lib; { homepage = https://github.com/minio/mc; description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.linux; - license = lib.licenses.asl20; + maintainers = with maintainers; [ eelco bachp ]; + platforms = platforms.unix; + license = licenses.asl20; }; } diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 7e1c257ec4b6f..d63df830d0e6f 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { sha256 = "1g6hi03ylhv47sbar3xxgsrar8schqfwn4glckh6m6lni67ndq85"; }; + prePatch = '' + sed -i '20i#include <sys/cdefs.h>' src/ntpd.h + sed -i '19i#include <sys/cdefs.h>' src/log.c + ''; + configureFlags = [ "--with-privsep-path=${privsepPath}" "--with-privsep-user=${privsepUser}" diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index d07770260ff6e..570e85c328153 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/rc_mksid-no-buffer-overflow?h=debian/2.4.7-1%2b4"; sha256 = "1dk00j7bg9nfgskw39fagnwv1xgsmyv0xnkd6n1v5gy0psw0lvqh"; }) + ./musl-fix-headers.patch ]; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/networking/ppp/musl-fix-headers.patch b/pkgs/tools/networking/ppp/musl-fix-headers.patch new file mode 100644 index 0000000000000..d24f628968409 --- /dev/null +++ b/pkgs/tools/networking/ppp/musl-fix-headers.patch @@ -0,0 +1,137 @@ +diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h +index b06eda5..dafa36c 100644 +--- a/include/net/ppp_defs.h ++++ b/include/net/ppp_defs.h +@@ -38,6 +38,8 @@ + #ifndef _PPP_DEFS_H_ + #define _PPP_DEFS_H_ + ++#include <sys/time.h> ++ + /* + * The basic PPP frame. + */ +diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux +index a74c914..7acd2cf 100644 +--- a/pppd/Makefile.linux ++++ b/pppd/Makefile.linux +@@ -126,7 +126,7 @@ LIBS += -lcrypt + endif + + ifdef USE_LIBUTIL +-CFLAGS += -DHAVE_LOGWTMP=1 ++#CFLAGS += -DHAVE_LOGWTMP=1 + LIBS += -lutil + endif + +diff --git a/pppd/magic.h b/pppd/magic.h +index c81213b..305aece 100644 +--- a/pppd/magic.h ++++ b/pppd/magic.h +@@ -42,6 +42,8 @@ + * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $ + */ + ++#include <sys/cdefs.h> ++ + void magic_init __P((void)); /* Initialize the magic number generator */ + u_int32_t magic __P((void)); /* Returns the next magic number */ + +diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c +index 91e9a57..9c0fac3 100644 +--- a/pppd/plugins/rp-pppoe/if.c ++++ b/pppd/plugins/rp-pppoe/if.c +@@ -30,10 +30,6 @@ static char const RCSID[] = + #include <linux/if_packet.h> + #endif + +-#ifdef HAVE_NET_ETHERNET_H +-#include <net/ethernet.h> +-#endif +- + #ifdef HAVE_ASM_TYPES_H + #include <asm/types.h> + #endif +diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c +index a8c2bb4..ca34d79 100644 +--- a/pppd/plugins/rp-pppoe/plugin.c ++++ b/pppd/plugins/rp-pppoe/plugin.c +@@ -46,7 +46,6 @@ static char const RCSID[] = + #include <unistd.h> + #include <fcntl.h> + #include <signal.h> +-#include <net/ethernet.h> + #include <net/if_arp.h> + #include <linux/ppp_defs.h> + #include <linux/if_pppox.h> +diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c +index 3d3bf4e..b5f82d3 100644 +--- a/pppd/plugins/rp-pppoe/pppoe-discovery.c ++++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c +@@ -27,10 +27,6 @@ + #include <linux/if_packet.h> + #endif + +-#ifdef HAVE_NET_ETHERNET_H +-#include <net/ethernet.h> +-#endif +- + #ifdef HAVE_ASM_TYPES_H + #include <asm/types.h> + #endif +@@ -55,6 +51,8 @@ void die(int status) + exit(status); + } + ++#define error(x...) fprintf(stderr, x) ++ + /* Initialize frame types to RFC 2516 values. Some broken peers apparently + use different frame types... sigh... */ + +diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h +index 9ab2eee..4d68147 100644 +--- a/pppd/plugins/rp-pppoe/pppoe.h ++++ b/pppd/plugins/rp-pppoe/pppoe.h +@@ -86,18 +86,6 @@ typedef unsigned long UINT32_t; + + #include <netinet/in.h> + +-#ifdef HAVE_NETINET_IF_ETHER_H +-#include <sys/types.h> +- +-#ifdef HAVE_SYS_SOCKET_H +-#include <sys/socket.h> +-#endif +-#ifndef HAVE_SYS_DLPI_H +-#include <netinet/if_ether.h> +-#endif +-#endif +- +- + + /* Ethernet frame types according to RFC 2516 */ + #define ETH_PPPOE_DISCOVERY 0x8863 +diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c +index 6d71530..86d224e 100644 +--- a/pppd/sys-linux.c ++++ b/pppd/sys-linux.c +@@ -102,19 +102,11 @@ + #define MAX_ADDR_LEN 7 + #endif + +-#if __GLIBC__ >= 2 + #include <asm/types.h> /* glibc 2 conflicts with linux/types.h */ + #include <net/if.h> + #include <net/if_arp.h> + #include <net/route.h> + #include <netinet/if_ether.h> +-#else +-#include <linux/types.h> +-#include <linux/if.h> +-#include <linux/if_arp.h> +-#include <linux/route.h> +-#include <linux/if_ether.h> +-#endif + #include <netinet/in.h> + #include <arpa/inet.h> + diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index 93fc28b48bf23..cac3e3e6361f7 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib ]; + prePatch = '' + sed -i -e 's/u_int32_t/uint32_t/g' -e '1i#include <stdint.h>' src/hash.c + ''; + configureFlags = [ "--with-ssl=${openssl.dev}" "--with-zlib=${zlib.dev}" diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index deac37468360a..0d328c02d3715 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -5,8 +5,10 @@ stdenv.mkDerivation rec { version = "5.44"; src = fetchurl { - url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "1692y69wl7j6yjgnrrzclgzb34bxsaxjzl1dfy47vms7pdfk42lr"; + url = "https://www.stunnel.org/downloads/${name}.tar.gz"; + sha256 = "990a325dbb47d77d88772dd02fbbd27d91b1fea3ece76c9ff4461eca93f12299"; + # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", + # not the output of `nix-prefetch-url` }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index acb5a042ffcc2..80bac726457b3 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A supercharged TLS daemon that allows for easy, strong and consistent deployment"; license = licenses.bsd2; - homepage = https://www.tlspool.org; + homepage = http://www.tlspool.org; maintainers = with maintainers; [ leenaars qknight ]; }; } diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 614447cd5ecf2..cc2f994d0d54d 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; - preFixup = stdenv.lib.optionalString stdenv.isLinux + preFixup = stdenv.lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit # Build libunbound again, but only against nettle instead of openssl. # This avoids gnutls.out -> unbound.lib -> openssl.out. # There was some problem with this on Darwin; let's not complicate non-Linux. diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 81031c0a547cf..31688084af5ac 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl -, libseccomp, busybox -, hostPlatform +, libseccomp, busybox-sandbox-shell +, hostPlatform, buildPlatform , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" @@ -10,17 +10,7 @@ let - sh = busybox.override { - useMusl = true; - enableStatic = true; - enableMinimal = true; - extraConfig = '' - CONFIG_ASH y - CONFIG_ASH_BUILTIN_ECHO y - CONFIG_ASH_BUILTIN_TEST y - CONFIG_ASH_OPTIMIZE_FOR_SIZE y - ''; - }; + sh = busybox-sandbox-shell; common = { name, suffix ? "", src, fromGit ? false }: stdenv.mkDerivation rec { inherit name src; @@ -34,10 +24,10 @@ let nativeBuildInputs = [ pkgconfig ] - ++ lib.optionals (!is20) [ perl ] + ++ lib.optionals (!is20) [ curl perl ] ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ]; - buildInputs = [ curl openssl sqlite xz ] + buildInputs = [ curl openssl sqlite xz bzip2 ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optionals fromGit [ brotli ] # Since 1.12 ++ lib.optional stdenv.isLinux libseccomp @@ -49,15 +39,6 @@ let propagatedBuildInputs = [ boehmgc ]; - # Note: bzip2 is not passed as a build input, because the unpack phase - # would end up using the wrong bzip2 when cross-compiling. - # XXX: The right thing would be to reinstate `--with-bzip2' in Nix. - postUnpack = - '' export CPATH="${bzip2.dev}/include" - export LIBRARY_PATH="${bzip2.out}/lib" - export CXXFLAGS="-Wno-error=reserved-user-defined-literal" - ''; - configureFlags = [ "--with-store-dir=${storeDir}" "--localstatedir=${stateDir}" @@ -71,40 +52,22 @@ let "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}" ] ++ lib.optionals (is20 && stdenv.isLinux) [ "--with-sandbox-shell=${sh}/bin/busybox" - ]; + ] + ++ lib.optional ( + hostPlatform != buildPlatform && hostPlatform ? nix && hostPlatform.nix ? system + ) ''--with-system=${hostPlatform.nix.system}''; makeFlags = "profiledir=$(out)/etc/profile.d"; installFlags = "sysconfdir=$(out)/etc"; - doInstallCheck = true; + doInstallCheck = true; # not cross # socket path becomes too long otherwise preInstallCheck = lib.optional stdenv.isDarwin "export TMPDIR=/tmp"; separateDebugInfo = stdenv.isLinux; - crossAttrs = { - postUnpack = - '' export CPATH="${bzip2.crossDrv}/include" - export NIX_CROSS_LDFLAGS="-L${bzip2.crossDrv}/lib -rpath-link ${bzip2.crossDrv}/lib $NIX_CROSS_LDFLAGS" - ''; - - configureFlags = - '' - --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-dbi=${perlPackages.DBI}/${perl.libPrefix} - --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} - --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} - --disable-init-state - --enable-gc - '' + stdenv.lib.optionalString ( - hostPlatform ? nix && hostPlatform.nix ? system - ) ''--with-system=${hostPlatform.nix.system}''; - - doInstallCheck = false; - }; - enableParallelBuilding = true; meta = { @@ -161,12 +124,12 @@ in rec { nixUnstable = (lib.lowPrio (common rec { name = "nix-2.0${suffix}"; - suffix = "pre5889_c287d731"; + suffix = "pre5943_52c777a7"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "c287d7312103bae5e154c0c4dd493371a22ea207"; - sha256 = "1dwhz93dlk62prh3wfwf8vxfcqjdn21wk0ms65kf5r8ahkfgpgq4"; + rev = "52c777a79318c85c8fbd8c02174a03511de278db"; + sha256 = "0qwmyy7l16djrlksfpjfkfkh5v9s0cyg6ca2809m1qb6swfzqqdf"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; diff --git a/pkgs/tools/package-management/nixops/deps.nix b/pkgs/tools/package-management/nixops/deps.nix new file mode 100644 index 0000000000000..7da38f83e7fe0 --- /dev/null +++ b/pkgs/tools/package-management/nixops/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; + sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "75229eecb7af00b2736e93b779a78429dcb19472"; + sha256 = "1vsjy07kkyx11iz4qsihhykac3ddq3ywdgv6bwrv407504f7x6wl"; + }; + } +] diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix new file mode 100644 index 0000000000000..afb0353e687dd --- /dev/null +++ b/pkgs/tools/package-management/nixops/nixops-dns.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, buildGoPackage +, fetchFromGitHub }: + +buildGoPackage rec { + name = "nixops-dns"; + version = "1.0"; + + goDeps = ./deps.nix; + goPackagePath = "github.com/kamilchm/nixops-dns"; + + src = fetchFromGitHub { + owner = "kamilchm"; + repo = "nixops-dns"; + rev = "v${version}"; + sha256 = "1fyqwk2knrv40zpf71a56bjyaycr3p6fzrqq7gaan056ydy83cai"; + }; + + meta = with lib; { + homepage = https://github.com/kamilchm/nixops-dns/; + description = "DNS server for resolving NixOps machines"; + license = licenses.mit; + maintainers = with maintainers; [ kamilchm sorki ]; + }; +} diff --git a/pkgs/tools/security/eschalot/default.nix b/pkgs/tools/security/eschalot/default.nix new file mode 100644 index 0000000000000..d628a28023a42 --- /dev/null +++ b/pkgs/tools/security/eschalot/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, openssl }: + +stdenv.mkDerivation rec { + pname = "eschalot"; + version = "2018-01-19"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "ReclaimYourPrivacy"; + repo = pname; + rev = "56a967b62631cfd3c7ef68541263dbd54cbbc2c4"; + sha256 = "1iw1jrydasm9dmgpcdimd8dy9n281ys9krvf3fd3dlymkgsj604d"; + }; + + buildInputs = [ openssl ]; + + installPhase = '' + install -D -t $out/bin eschalot worgen + ''; + + meta = with stdenv.lib; { + description = "Tor hidden service name generator"; + homepage = src.meta.homepage; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index ba024328ba5f6..dbd372275bc3c 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kbfs-${version}"; - version = "20171004.40555d"; + version = "1.0.40"; goPackagePath = "github.com/keybase/kbfs"; subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ]; @@ -12,8 +12,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "keybase"; repo = "kbfs"; - rev = "40555dbc9c93a05f3a82053860df30e45c7bd779"; - sha256 = "08wj8fh1ja8kfzvbza5csy9mpfy39lifnzvfrnbj7vyyv88qc3h0"; + rev = "v${version}"; + sha256 = "1bgbzk3ykjb6y5sa5i9f6hwcp8b21dndq7iw9m8fdxh4n4mm6n9p"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix index ce98740e89bd1..b0db3eea5b9e5 100644 --- a/pkgs/tools/security/keybase-gui/default.nix +++ b/pkgs/tools/security/keybase-gui/default.nix @@ -37,10 +37,10 @@ let in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "1.0.33-20171003193427.d9ceb86ac"; + version = "1.0.40-20180127033950.76a4b90c9"; src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; - sha256 = "0sqani2fy5jzqmz35md1bdw2vwpx91l87b6s3x9z53halzq7vfy6"; + sha256 = "1pskmwif5nx32d53kz8vbijv61i50kpjwyy53a37rz5nx3hgj3ar"; }; phases = ["unpackPhase" "installPhase" "fixupPhase"]; unpackPhase = '' @@ -48,7 +48,8 @@ stdenv.mkDerivation rec { tar xf data.tar.xz ''; installPhase = '' - mkdir -p $out/{bin,share} + mkdir -p $out/bin + mv usr/share $out/share mv opt/keybase $out/share/ cat > $out/bin/keybase-gui <<EOF @@ -78,6 +79,9 @@ stdenv.mkDerivation rec { exec $out/share/keybase/Keybase "\$@" EOF chmod +x $out/bin/keybase-gui + + substituteInPlace $out/share/applications/keybase.desktop \ + --replace run_keybase $out/bin/keybase-gui ''; postFixup = '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}:\$ORIGIN" "$out/share/keybase/Keybase" diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index a0fc788a69e91..c221a46d5f969 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "1.0.39"; + version = "1.0.40"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "0b64h536xp8r1q7fa23mf1p8ybnh0fz1n468fp56mvh98vmqys5b"; + sha256 = "05x0h87dinl8zaqikr1sx38bv1n6ymxqp440b384d8y76w66rphi"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/tools/security/nmap/qt.nix new file mode 100644 index 0000000000000..c15d9bf252839 --- /dev/null +++ b/pkgs/tools/security/nmap/qt.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper +, dnsutils, nmap +, qtbase, qtscript, qtwebkit }: + +stdenv.mkDerivation rec { + name = "nmapsi4-${version}"; + version = "0.5-alpha1"; + + src = fetchurl { + url = "mirror://sourceforge/nmapsi/${name}.tar.xz"; + sha256 = "18v9a3l2nmij3gb4flscigxr5c44nphkjfmk07qpyy73fy61mzrs"; + }; + + nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + + buildInputs = [ qtbase qtscript qtwebkit ]; + + enableParallelBuilding = true; + + postPatch = '' + for f in \ + src/platform/digmanager.cpp \ + src/platform/discover.cpp \ + src/platform/monitor/monitor.cpp \ + src/platform/nsemanager.cpp ; do + + substituteInPlace $f \ + --replace '"dig"' '"${dnsutils}/bin/dig"'\ + --replace '"nmap"' '"${nmap}/bin/nmap"' \ + --replace '"nping"' '"${nmap}/bin/nping"' + done + ''; + + postInstall = '' + mv $out/share/applications/kde4/*.desktop $out/share/applications + rmdir $out/share/applications/kde4 + + for f in $out/share/applications/* ; do + substituteInPlace $f \ + --replace Qt4 Qt5 \ + --replace Exec=nmapsi4 Exec=$out/bin/nmapsi4 \ + --replace "Exec=kdesu nmapsi4" "Exec=kdesu $out/bin/nmapsi4" + done + ''; + + meta = with stdenv.lib; { + description = "Qt frontend for nmap"; + homepage = https://www.nmapsi4.org/; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/tools/security/rhash/darwin.patch b/pkgs/tools/security/rhash/darwin.patch deleted file mode 100644 index 76ad8fe9abd98..0000000000000 --- a/pkgs/tools/security/rhash/darwin.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/Makefile b/Makefile -index e40dbc3..e198b93 100644 ---- a/Makefile -+++ b/Makefile -@@ -17,7 +17,7 @@ ALLCFLAGS = -pipe $(CFLAGS) $(ADDCFLAGS) \ - -Wbad-function-cast -Wmissing-prototypes -Wmissing-declarations - LDLIBRHASH = -Llibrhash -lrhash - ALLLDFLAGS = $(LDLIBRHASH) $(LDFLAGS) $(ADDLDFLAGS) --SHAREDLIB = librhash/librhash.so.0 -+SHAREDLIB = librhash/librhash.0.dylib - SHRDLFLAGS = $(LDFLAGS) $(ADDLDFLAGS) - HEADERS = calc_sums.h hash_print.h common_func.h hash_update.h file_mask.h file_set.h find_file.h hash_check.h output.h parse_cmdline.h rhash_main.h win_utils.h version.h - SOURCES = calc_sums.c hash_print.c common_func.c hash_update.c file_mask.c file_set.c find_file.c hash_check.c output.c parse_cmdline.c rhash_main.c win_utils.c -diff --git a/librhash/Makefile b/librhash/Makefile -index 2f9bcc9..0c5aaad 100644 ---- a/librhash/Makefile -+++ b/librhash/Makefile -@@ -28,8 +28,8 @@ PREFIX = /usr/local - INCDIR = $(PREFIX)/include - LIBDIR = $(PREFIX)/lib - LIBRARY = librhash.a --SONAME = librhash.so.0 --SOLINK = librhash.so -+SONAME = librhash.0.dylib -+SOLINK = librhash.dylib - TEST_TARGET = test_hashes - TEST_SHARED = test_shared - # Set variables according to GNU coding standard -@@ -182,8 +182,7 @@ test-dll: $(DLLNAME) test_hashes.o - - # shared and static libraries - $(SONAME): $(SOURCES) -- sed -n '1s/.*/{ global:/p; s/^RHASH_API.* \([a-z0-9_]\+\)(.*/ \1;/p; $$s/.*/local: *; };/p' $(SO_HEADERS) > exports.sym -- $(CC) -fpic $(ALLCFLAGS) -shared $(SOURCES) -Wl,--version-script,exports.sym,-soname,$(SONAME) $(LIBLDFLAGS) -o $@ -+ $(CC) -fpic $(ALLCFLAGS) -dynamiclib $(SOURCES) $(LIBLDFLAGS) -Wl,-install_name,$(PREFIX)/lib/$@ -o $@ - ln -s $(SONAME) $(SOLINK) - # use 'nm -Cg --defined-only $@' to view exported symbols - diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 68c3edc4cd254..485b34cff88db 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -1,32 +1,23 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, which }: stdenv.mkDerivation rec { - version = "1.3.3"; + version = "2018-02-05"; name = "rhash-${version}"; - src = fetchurl { - url = "mirror://sourceforge/rhash/${name}-src.tar.gz"; - sha1 = "0981bdc98ba7ef923b1a6cd7fd8bb0374cff632e"; - sha256 = "0nii6p4m2x8rkaf8r6smgfwb1q4hpf117kkg64yr6gyqgdchnljv"; + src = fetchFromGitHub { + owner = "rhash"; + repo = "RHash"; + rev = "cc26d54ff5df0f692907a5e3132a5eeca559ed61"; + sha256 = "1ldagp931lmxxpyvsb9rrar4iqwmv94m6lfjzkbkshpmk3p5ng7h"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch; + nativeBuildInputs = [ which ]; - installFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; + # configure script is not autotools-based, doesn't support these options + configurePlatforms = [ ]; - # we build the static library because of two makefile bugs - # * .h files installed for static library target only - # * .so.0 -> .so link only created in the static library install target - buildPhase = '' - make lib-shared lib-static build-shared CC=$CC AR=$AR PREFIX=$out - ''; - - # we don't actually want the static library, so we remove it after it - # gets installed - installPhase = '' - make DESTDIR="$out" PREFIX="/" install-shared install-lib-shared install-lib-static - rm $out/lib/librhash.a - ''; + installTargets = [ "install" "install-lib-shared" "install-lib-so-link" ]; + postInstall = "make -C librhash install-headers"; meta = with stdenv.lib; { homepage = http://rhash.anz.ru; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 5192f57582c75..1edd5b60926f7 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { "--with-logpath=/var/log/sudo.log" "--with-iologdir=/var/log/sudo-io" "--with-sendmail=${sendmailPath}" + "--enable-tmpfiles.d=no" ] ++ stdenv.lib.optional withInsults [ "--with-insults" "--with-all-insults" diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix new file mode 100644 index 0000000000000..f1bac7adba108 --- /dev/null +++ b/pkgs/tools/security/theharvester/default.nix @@ -0,0 +1,41 @@ +{ stdenv, makeWrapper, python2Packages, fetchFromGitHub, python2 }: + +stdenv.mkDerivation rec { + pname = "theHarvester"; + version = "2.7.1"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "laramies"; + repo = "${pname}"; + rev = "25553762d2d93a39083593adb08a34d5f5142c60"; + sha256 = "0gnm598y6paz0knwvdv1cx0w6ngdbbpzkdark3q5vs66yajv24w4"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + # add dependencies + propagatedBuildInputs = [ python2Packages.requests ]; + + installPhase = '' + # create dirs + mkdir -p $out/share/${pname} $out/bin + + # move project code + mv * $out/share/${pname}/ + + # make project runnable + chmod +x $out/share/${pname}/theHarvester.py + ln -s $out/share/${pname}/theHarvester.py $out/bin + + wrapProgram "$out/bin/theHarvester.py" --prefix PYTHONPATH : $out/share/${pname}:$PYTHONPATH + ''; + + meta = with stdenv.lib; { + description = "Gather E-mails, subdomains and names from different public sources"; + homepage = "https://github.com/laramies/theHarvester"; + platforms = platforms.all; + maintainers = with maintainers; [ treemo ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index dca6d37d9af3a..93ce486446349 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "augeas-${version}"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { url = "http://download.augeas.net/${name}.tar.gz"; - sha256 = "04q2hr3xj71rdbjdj3jiygi8dbiq1x4szlyavxj1xjiw9jcgd41a"; + sha256 = "0k9nssn7lk58cl5zv3c8kv2zx9cm2yks3sj7q4fd6qdjz9m2bnsj"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ readline libxml2 ]; diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix new file mode 100644 index 0000000000000..2e4133124c11b --- /dev/null +++ b/pkgs/tools/system/bfs/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, bash }: + +stdenv.mkDerivation rec { + name = "bfs-${version}"; + version = "1.2.1"; + + src = fetchFromGitHub { + repo = "bfs"; + owner = "tavianator"; + rev = version; + sha256 = "1dgc31l5d20i0v78c51xga4lr78b5x8dz6yzsvbhlgs0abi0nynx"; + }; + + # Disable fstype test, tries to read /etc/mtab + patches = [ ./tests.patch ]; + postPatch = '' + # Patch tests (both shebangs and usage in scripts) + for f in $(find -type f -name '*.sh'); do + substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash" + done + ''; + doCheck = true; + + makeFlags = [ "PREFIX=$(out)" ]; + buildFlags = [ "release" ]; # "release" enables compiler optimizations + + meta = with stdenv.lib; { + description = "A breadth-first version of the UNIX find command"; + longDescription = '' + bfs is a variant of the UNIX find command that operates breadth-first rather than + depth-first. It is otherwise intended to be compatible with many versions of find. + ''; + homepage = https://github.com/tavianator/bfs; + license = licenses.bsd0; + platforms = platforms.linux; + maintainers = with maintainers; [ yesbox ]; + }; +} diff --git a/pkgs/tools/system/bfs/tests.patch b/pkgs/tools/system/bfs/tests.patch new file mode 100644 index 0000000000000..a30291d7095fd --- /dev/null +++ b/pkgs/tools/system/bfs/tests.patch @@ -0,0 +1,10 @@ +--- a/tests.sh ++++ b/tests.sh +@@ -369,7 +369,6 @@ + test_printf_nul + test_quit_after_print + test_quit_before_print +- test_fstype + test_not + test_and + test_or diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index ea062115402d8..57e3e63ca896f 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.3-4"; src = fetchurl { - url = "http://pkgs.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz"; + url = "http://src.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz"; sha256 = "0g4hyrnd9hpykbf06qvvp3s4yyk7flbd95gilkf7r3w9vqiagvs2"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Consolidate duplicate files via hardlinks"; homepage = https://pagure.io/hardlink; - repositories.git = http://pkgs.fedoraproject.org/cgit/rpms/hardlink.git; + repositories.git = http://src.fedoraproject.org/cgit/rpms/hardlink.git; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 750ff8e59ef23..992067da50f4e 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -1,19 +1,24 @@ { lib, fetchurl, stdenv, ncurses, -IOKit }: +IOKit, python }: stdenv.mkDerivation rec { name = "htop-${version}"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - sha256 = "11zlwadm6dpkrlfvf3z3xll26yyffa7qrxd1w72y1kl0rgffk6qp"; url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz"; + sha256 = "0j07z0xm2gj1vzvbgh4323k4db9mr7drd7gw95mmpqi61ncvwq1j"; }; + nativeBuildInputs = [ python ]; buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; + prePatch = '' + patchShebangs scripts/MakeHeader.py + ''; + meta = with stdenv.lib; { description = "An interactive process viewer for Linux"; homepage = https://hisham.hm/htop/; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 1139c49ddf80b..3cd00b3394cf8 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib kmod which ]; - makeFlags = "SHARED=yes PREFIX=\${out}"; + makeFlags = [ "SHARED=yes" "PREFIX=\${out}" "STRIP=" "HOST=${stdenv.hostPlatform.system}" "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; installTargets = "install install-lib"; diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 5fa55b275fe16..e5b2d54e585d1 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook +{ stdenv, fetchurl, fetchpatch, autoreconfHook , IOKit ? null , ApplicationServices ? null }: let @@ -20,7 +20,14 @@ in stdenv.mkDerivation rec { sha256 = "0m1hllbb78rr6cxkbalmz1gqkl0psgq8rrmv4gwcmz34n07kvx2i"; }; - patches = [ ./smartmontools.patch ]; + patches = [ ./smartmontools.patch ] + # https://www.smartmontools.org/changeset/4603 + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + name = "musl-canonicalize_file_name.patch"; + url = "https://www.smartmontools.org/changeset/4603?format=diff&new=4603"; + sha256 = "06s9pcd95snjkrbfrsjby2lln3lnwjd21bgabmvr4p7fx19b75zp"; + stripLen = 2; + }); postPatch = "cp -v ${driverdb} drivedb.h"; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix index c264b73b50236..ef0b1b3b2ac55 100644 --- a/pkgs/tools/system/supervise/default.nix +++ b/pkgs/tools/system/supervise/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "supervise-${version}"; - version = "1.2.0"; + version = "1.3.0"; src = fetchzip { url = "https://github.com/catern/supervise/releases/download/v${version}/supervise-${version}.tar.gz"; - sha256 = "07v3197nf3jbx2w6jxzyk9b8p5qjj9irpr4jvv5lkfbi7s6rav3k"; + sha256 = "1y3jaqzprlkba2165nlcr250jc3mpxawd5sfjryb3db1nw66al04"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix index 5d6eed458c0d7..10d3a47cc85eb 100644 --- a/pkgs/tools/text/agrep/default.nix +++ b/pkgs/tools/text/agrep/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { sha256 = "14addnwspdf2mxpqyrw8b84bb2257y43g5ccy4ipgrr91fmxq2sk"; }; + # Related: https://github.com/Wikinaut/agrep/pull/11 + prePatch = stdenv.lib.optionalString (stdenv.hostPlatform.isMusl || stdenv.isDarwin) '' + sed -i '1i#include <sys/stat.h>' checkfil.c newmgrep.c recursiv.c + ''; installPhase = '' install -Dm 555 agrep -t "$out/bin" install -Dm 444 docs/* -t "$out/doc" diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index 37447d0fb2ae5..2af9baeb5c515 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python27Packages }: python27Packages.buildPythonApplication rec { - version = "2.16.0"; + version = "2.22.0"; name = "fanficfare-${version}"; nameprefix = ""; src = fetchurl { url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz"; - sha256 = "0c31z7w4b3wz5nahsmnfhvp3srprfsqbp3zyngw4cqw3dm17kvvi"; + sha256 = "1gwr2qk0wff8f69w21ffj6cq8jklqd89vcdhhln6ii1h1kf8k031"; }; propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ]; diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index dfdb25438cfe5..3840811a3e36d 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "patch-2.7.5"; + name = "patch-2.7.6"; src = fetchurl { url = "mirror://gnu/patch/${name}.tar.xz"; - sha256 = "16d2r9kpivaak948mxzc0bai45mqfw73m113wrkmbffnalv1b5gx"; + sha256 = "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc"; }; buildInputs = stdenv.lib.optional doCheck ed; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "ac_cv_func_strnlen_working=yes" ]; - doCheck = true; # not cross; + doCheck = hostPlatform.libc != "musl"; # not cross; meta = { description = "GNU Patch, a program to apply differences to files"; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index b11f3cb4b8cde..6d01c42f93d12 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -2,6 +2,7 @@ , ghostscript #for postscript and html output , psutils, netpbm #for html output , buildPackages +, autoreconfHook }: stdenv.mkDerivation rec { @@ -17,6 +18,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; + patches = [ ./look-for-ar.patch ]; + postPatch = stdenv.lib.optionalString (psutils != null) '' substituteInPlace src/preproc/html/pre-html.cpp \ --replace "psselect" "${psutils}/bin/psselect" @@ -32,6 +35,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ ghostscript psutils netpbm perl ]; + nativeBuildInputs = [ autoreconfHook ]; # Builds running without a chroot environment may detect the presence # of /usr/X11 in the host system, leading to an impure build of the @@ -42,6 +46,8 @@ stdenv.mkDerivation rec { "--without-x" ] ++ stdenv.lib.optionals (ghostscript != null) [ "--with-gs=${ghostscript}/bin/gs" + ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "ac_cv_path_PERL=${perl}/bin/perl" ]; doCheck = true; diff --git a/pkgs/tools/text/groff/look-for-ar.patch b/pkgs/tools/text/groff/look-for-ar.patch new file mode 100644 index 0000000000000..3b4d09c260fad --- /dev/null +++ b/pkgs/tools/text/groff/look-for-ar.patch @@ -0,0 +1,39 @@ +commit 988a001f969262089579958827652da00fda096f +Author: Ben Gamari <ben@smart-cactus.org> +Date: Tue Oct 17 16:15:20 2017 -0400 + + Look for AR + +diff --git a/Makefile.in b/Makefile.in +index bc156ce..cc02126 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -464,7 +464,7 @@ INSTALL_SCRIPT=@INSTALL_SCRIPT@ + INSTALL_DATA=@INSTALL_DATA@ + INSTALL_INFO=@INSTALL_INFO@ + LN_S=@LN_S@ +-AR=ar ++AR=@AR@ + ETAGS=etags + ETAGSFLAGS= + # Flag that tells etags to assume C++. +diff --git a/configure.ac b/configure.ac +index c779165..6d53f5e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -45,6 +45,7 @@ AC_PREREQ([2.62]) + + AC_CONFIG_HEADERS([src/include/config.h:src/include/config.hin]) + AC_CONFIG_SRCDIR([src/roff/groff/groff.cpp]) ++AC_CONFIG_MACRO_DIR([m4]) + + AC_USE_SYSTEM_EXTENSIONS + +@@ -73,6 +74,7 @@ GROFF_PROG_YACC + GROFF_DOC_CHECK + GROFF_MAKEINFO + AC_PROG_RANLIB ++AC_CHECK_TOOL([AR], [ar], [ar]) + GROFF_INSTALL_SH + GROFF_INSTALL_INFO + AC_PROG_INSTALL diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index f494f1911593b..02b57ee3a13b9 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -1,12 +1,18 @@ -{ stdenv, lib, bundlerEnv, ruby, curl }: - -bundlerEnv { - pname = "asciidoctor"; +{ stdenv, lib, bundlerApp, ruby, curl }: +bundlerApp { inherit ruby; - + pname = "asciidoctor"; gemdir = ./.; + exes = [ + "asciidoctor" + "asciidoctor-bespoke" + "asciidoctor-latex" + "asciidoctor-pdf" + "asciidoctor-safe" + ]; + meta = with lib; { description = "A faster Asciidoc processor written in Ruby"; homepage = http://asciidoctor.org/; diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix index 9a60ebf17be8b..dab4bf44a6f9d 100644 --- a/pkgs/tools/video/flvtool2/default.nix +++ b/pkgs/tools/video/flvtool2/default.nix @@ -1,13 +1,14 @@ -{ buildRubyGem, lib, ruby_2_2 }: +{ buildRubyGem, lib, ruby }: buildRubyGem rec { - ruby = ruby_2_2; + inherit ruby; name = "${gemName}-${version}"; gemName = "flvtool2"; version = "1.0.6"; source.sha256 = "0xsla1061pi4ryh3jbvwsbs8qchprchbqjy7652g2g64v37i74qj"; meta = { + broken = true; # depends on ruby 2.2 homepage = https://github.com/unnu/flvtool2; description = "A tool to manipulate Macromedia Flash Video files"; platforms = ruby.meta.platforms; diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 25752afd995b0..5e5f76975baee 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -34,16 +34,6 @@ let }; }); - pathspec = super.pathspec.overridePythonAttrs (oldAttrs: rec { - version = "0.5.0"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - sha256 = "07yx1gxj9v1iyyiy5fhq2wsmh4qfbrx158wi7jb0nx6lah80ffma"; - }; - }); - requests = super.requests.overridePythonAttrs (oldAttrs: rec { version = "2.9.1"; @@ -77,11 +67,11 @@ let in with localPython.pkgs; buildPythonApplication rec { name = "${pname}-${version}"; pname = "awsebcli"; - version = "3.12.1"; + version = "3.12.2"; src = fetchPypi { inherit pname version; - sha256 = "12v3zz69iql4ggiz9x7h27vyq9y9jlm46yczxyg62j89m2iyr5bl"; + sha256 = "19sgx43fyq35rqp0q8zbqavgg0k0n46iy1fqsxvw9lf0g0v62pjh"; }; checkInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 68c4a3c4acb50..8da6bcef49579 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -122,6 +122,7 @@ mapAliases (rec { nmap_graphical = nmap-graphical; # added 2017-01-19 nfsUtils = nfs-utils; # added 2014-12-06 opencl-icd = ocl-icd; # added 2017-01-20 + openssh_with_kerberos = openssh; # added 2018-01-28 owncloudclient = owncloud-client; # added 2016-08 pgp-tools = signing-party; # added 2017-03-26 pidgin-with-plugins = pidgin; # added 2016-06 @@ -146,7 +147,12 @@ mapAliases (rec { rdmd = dtools; # added 2017-08-19 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 - openssh_with_kerberos = openssh; # added 2018-01-28 + ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; + ruby_2_1_0 = throw "deprecated 2018-0213: use a newer version of ruby"; + ruby_2_2_9 = throw "deprecated 2018-0213: use ruby_2_2 instead"; + ruby_2_3_6 = throw "deprecated 2018-0213: use ruby_2_3 instead"; + ruby_2_4_3 = throw "deprecated 2018-0213: use ruby_2_4 instead"; + ruby_2_5_0 = throw "deprecated 2018-0213: use ruby_2_5 instead"; rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62b3eac5e7886..40e1e9899f388 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -79,6 +79,10 @@ with pkgs; { deps = [ autoconf264 automake111x gettext libtool ]; } ../build-support/setup-hooks/autoreconf.sh; + autoPatchelfHook = makeSetupHook + { deps = [ file ]; } + ../build-support/setup-hooks/auto-patchelf.sh; + ensureNewerSourcesHook = { year }: makeSetupHook {} (writeScript "ensure-newer-sources-hook.sh" '' postUnpackHooks+=(_ensureNewerSources) @@ -88,10 +92,19 @@ with pkgs; } ''); + # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with: + # ValueError: ZIP does not support timestamps before 1980 + ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; }; + updateAutotoolsGnuConfigScriptsHook = makeSetupHook { substitutions = { gnu_config = gnu-config;}; } ../build-support/setup-hooks/update-autotools-gnu-config-scripts.sh; + gogUnpackHook = makeSetupHook { + name = "gog-unpack-hook"; + deps = [ innoextract file-rename ]; } + ../build-support/setup-hooks/gog-unpack.sh; + buildEnv = callPackage ../build-support/buildenv { }; # not actually a package buildFHSUserEnv = callPackage ../build-support/build-fhs-userenv { }; @@ -809,7 +822,7 @@ with pkgs; borgbackup = callPackage ../tools/backup/borg { }; - boomerang = callPackage ../development/tools/boomerang { }; + boomerang = libsForQt5.callPackage ../development/tools/boomerang { }; boost-build = callPackage ../development/tools/boost-build { }; @@ -859,6 +872,8 @@ with pkgs; btfs = callPackage ../os-specific/linux/btfs { }; + buildah = callPackage ../development/tools/buildah { }; + burpsuite = callPackage ../tools/networking/burpsuite {}; c3d = callPackage ../applications/graphics/c3d { @@ -1099,6 +1114,8 @@ with pkgs; envconsul = callPackage ../tools/system/envconsul { }; + eschalot = callPackage ../tools/security/eschalot { }; + esptool = callPackage ../tools/misc/esptool { }; esptool-ck = callPackage ../tools/misc/esptool-ck { }; @@ -1239,6 +1256,8 @@ with pkgs; masscan = callPackage ../tools/security/masscan { }; + massren = callPackage ../tools/misc/massren { }; + meritous = callPackage ../games/meritous { }; meson = callPackage ../development/tools/build-managers/meson { }; @@ -1390,6 +1409,8 @@ with pkgs; bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner; + bfs = callPackage ../tools/system/bfs { }; + bgs = callPackage ../tools/X11/bgs { }; biber = callPackage ../tools/typesetting/biber { @@ -1653,7 +1674,7 @@ with pkgs; client-ip-echo = callPackage ../servers/misc/client-ip-echo { }; cloc = callPackage ../tools/misc/cloc { - inherit (perlPackages) perl AlgorithmDiff RegexpCommon; + inherit (perlPackages) perl AlgorithmDiff ParallelForkManager RegexpCommon; }; cloog = callPackage ../development/libraries/cloog { @@ -1727,7 +1748,7 @@ with pkgs; curl = callPackage ../tools/networking/curl rec { fetchurl = fetchurlBoot; - http2Support = !stdenv.isDarwin; + http2Support = true; zlibSupport = true; sslSupport = zlibSupport; scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin; @@ -1811,6 +1832,8 @@ with pkgs; dev86 = callPackage ../development/compilers/dev86 { }; + diskrsync = callPackage ../tools/backup/diskrsync { }; + djbdns = callPackage ../tools/networking/djbdns { }; dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { }; @@ -1895,10 +1918,16 @@ with pkgs; }; doomseeker = callPackage ../applications/misc/doomseeker { }; + doom-bcc = callPackage ../games/zdoom/bcc-git.nix { }; + slade = callPackage ../applications/misc/slade { wxGTK = wxGTK30; }; + sladeUnstable = callPackage ../applications/misc/slade/git.nix { + wxGTK = wxGTK30; + }; + drive = callPackage ../applications/networking/drive { }; driftnet = callPackage ../tools/networking/driftnet {}; @@ -1953,6 +1982,8 @@ with pkgs; ecryptfs-helper = callPackage ../tools/security/ecryptfs/helper.nix { }; + edid-decode = callPackage ../tools/misc/edid-decode { }; + editres = callPackage ../tools/graphics/editres { }; edit = callPackage ../applications/editors/edit { }; @@ -1967,6 +1998,8 @@ with pkgs; mcrcon = callPackage ../tools/networking/mcrcon {}; + uudeview = callPackage ../tools/misc/uudeview { }; + zabbix-cli = callPackage ../tools/misc/zabbix-cli { }; ### DEVELOPMENT / EMSCRIPTEN @@ -2848,6 +2881,8 @@ with pkgs; inform7 = callPackage ../development/compilers/inform7 { }; + infamousPlugins = callPackage ../applications/audio/infamousPlugins { }; + innoextract = callPackage ../tools/archivers/innoextract { }; intecture-agent = callPackage ../tools/admin/intecture/agent.nix { }; @@ -2935,8 +2970,6 @@ with pkgs; jhead = callPackage ../tools/graphics/jhead { }; - jid = callPackage ../development/tools/jid { }; - jing = self.jing-trang; jing-trang = callPackage ../tools/text/xml/jing-trang { }; @@ -3044,6 +3077,8 @@ with pkgs; lbreakout2 = callPackage ../games/lbreakout2 { }; + lego = callPackage ../tools/admin/lego { }; + leocad = callPackage ../applications/graphics/leocad { }; less = callPackage ../tools/misc/less { }; @@ -3214,6 +3249,8 @@ with pkgs; npm2nix = nodePackages.npm2nix; + file-rename = callPackage ../tools/filesystems/file-rename { }; + kea = callPackage ../tools/networking/kea { boost = boost165; }; @@ -3771,6 +3808,8 @@ with pkgs; graphicalSupport = true; }; + nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { }; + nnn = callPackage ../applications/misc/nnn { }; notary = callPackage ../tools/security/notary { }; @@ -3946,6 +3985,8 @@ with pkgs; owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; + oxipng = callPackage ../tools/graphics/oxipng { }; + p2pvc = callPackage ../applications/video/p2pvc {}; p7zip = callPackage ../tools/archivers/p7zip { }; @@ -4388,6 +4429,10 @@ with pkgs; gsettings_desktop_schemas = gnome3.gsettings_desktop_schemas; }; + rename = callPackage ../tools/misc/rename { + inherit (perlPackages) buildPerlPackage; + }; + renameutils = callPackage ../tools/misc/renameutils { }; renderdoc = libsForQt5.callPackage ../applications/graphics/renderdoc { }; @@ -4789,6 +4834,8 @@ with pkgs; staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; + otter-browser = qt5.callPackage ../applications/networking/browsers/otter {}; + privoxy = callPackage ../tools/networking/privoxy { w3m = w3m-batch; }; @@ -4854,6 +4901,8 @@ with pkgs; thc-hydra = callPackage ../tools/security/thc-hydra { }; + theharvester = callPackage ../tools/security/theharvester { }; + thefuck = python3Packages.callPackage ../tools/misc/thefuck { }; thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; @@ -5380,8 +5429,6 @@ with pkgs; platform = { name = "ben_nanonote"; kernelMajor = "2.6"; - # It's not a bcm47xx processor, but for the headers this should work - kernelHeadersBaseConfig = "bcm47xx_defconfig"; kernelArch = "mips"; }; gcc = { @@ -5501,6 +5548,8 @@ with pkgs; zpaq = callPackage ../tools/archivers/zpaq { }; zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { }; + zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; + zsh-git-prompt = callPackage ../shells/zsh-git-prompt { }; zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { }; @@ -5690,9 +5739,7 @@ with pkgs; ''; }); - crystal = callPackage ../development/compilers/crystal { - llvm = llvm_5; - }; + crystal = callPackage ../development/compilers/crystal { }; devpi-client = callPackage ../development/tools/devpi-client {}; @@ -5791,6 +5838,7 @@ with pkgs; libcCross1 = if targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers else if targetPlatform.libc == "libSystem" then darwin.xcode + else if targetPlatform.libc == "musl" then musl else null; binutils1 = wrapBintoolsWith { bintools = binutils-unwrapped; @@ -6330,7 +6378,7 @@ with pkgs; llvm_35 = llvmPackages_35.llvm; llvm_34 = llvmPackages_34.llvm; - llvmPackages = recurseIntoAttrs llvmPackages_4; + llvmPackages = recurseIntoAttrs llvmPackages_5; llvmPackagesSelf = llvmPackages_34.override { stdenv = libcxxStdenv; @@ -6356,7 +6404,11 @@ with pkgs; inherit (stdenvAdapters) overrideCC; }; - llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({ + llvmPackages_4 = callPackage ../development/compilers/llvm/4 { + inherit (stdenvAdapters) overrideCC; + }; + + llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({ inherit (stdenvAdapters) overrideCC; } // stdenv.lib.optionalAttrs stdenv.isDarwin { cmake = cmake.override { @@ -6369,12 +6421,6 @@ with pkgs; stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); - llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({ - inherit (stdenvAdapters) overrideCC; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); - manticore = callPackage ../development/compilers/manticore { }; mentorToolchains = recurseIntoAttrs ( @@ -6699,6 +6745,8 @@ with pkgs; dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; + duktape = callPackage ../development/interpreters/duktape { }; + beam = callPackage ./beam-packages.nix { }; inherit (beam.interpreters) @@ -6855,12 +6903,14 @@ with pkgs; ocropus = callPackage ../applications/misc/ocropus { }; + octopus = callPackage ../applications/science/chemistry/octopus { openblas=openblasCompat; }; + inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524 perl526; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; - php = php71; - phpPackages = php71Packages; + php = php72; + phpPackages = php72Packages; php56Packages = recurseIntoAttrs (callPackage ./php-packages.nix { php = php56; @@ -6885,13 +6935,17 @@ with pkgs; php71 php72; - php-embed = php71-embed; + php-embed = php72-embed; php71-embed = php71.override { config.php.embed = true; config.php.apxs2 = false; }; + php72-embed = php72.override { + config.php.embed = true; + config.php.apxs2 = false; + }; picoc = callPackage ../development/interpreters/picoc {}; @@ -6981,6 +7035,8 @@ with pkgs; pew = callPackage ../development/tools/pew {}; pipenv = callPackage ../development/tools/pipenv {}; + pipewire = callPackage ../development/libraries/pipewire {}; + pyrex = pyrex095; pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { }; @@ -7021,21 +7077,11 @@ with pkgs; bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; inherit (callPackage ../development/interpreters/ruby { inherit (darwin.apple_sdk.frameworks) Foundation; }) - ruby_2_0_0 - ruby_2_1_10 - ruby_2_2_9 - ruby_2_3_6 - ruby_2_4_3 - ruby_2_5_0; - - # Ruby aliases - ruby = ruby_2_3; - ruby_2_0 = ruby_2_0_0; - ruby_2_1 = ruby_2_1_10; - ruby_2_2 = ruby_2_2_9; - ruby_2_3 = ruby_2_3_6; - ruby_2_4 = ruby_2_4_3; - ruby_2_5 = ruby_2_5_0; + ruby_2_3 + ruby_2_4 + ruby_2_5; + + ruby = ruby_2_4; scsh = callPackage ../development/interpreters/scsh { }; @@ -7423,6 +7469,8 @@ with pkgs; libcxx = llvmPackages.libcxx; libcxxabi = llvmPackages.libcxxabi; + librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { }; + libstdcxx5 = callPackage ../development/libraries/libstdc++5 { }; libsigrok = callPackage ../development/tools/libsigrok { }; @@ -7564,6 +7612,8 @@ with pkgs; gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {}; + gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {}; + gnum4 = callPackage ../development/tools/misc/gnum4 { }; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; @@ -7605,6 +7655,8 @@ with pkgs; guile = guile_2_0; }; + hcloud = callPackage ../development/tools/hcloud { }; + help2man = callPackage ../development/tools/misc/help2man { inherit (perlPackages) LocaleGettext; }; @@ -7801,6 +7853,8 @@ with pkgs; postiats-utilities = callPackage ../development/tools/postiats-utilities {}; + postman = callPackage ../development/web/postman {}; + pprof = callPackage ../development/tools/profiling/pprof { }; pyprof2calltree = pythonPackages.callPackage ../development/tools/profiling/pyprof2calltree { }; @@ -7854,9 +7908,7 @@ with pkgs; hammer = callPackage ../development/tools/parsing/hammer { }; - redis-dump = callPackage ../development/tools/redis-dump { - ruby = ruby_2_0; - }; + redis-dump = callPackage ../development/tools/redis-dump { }; redo = callPackage ../development/tools/build-managers/redo { }; @@ -7983,9 +8035,7 @@ with pkgs; tweak = callPackage ../applications/editors/tweak { }; - uhd = callPackage ../development/tools/misc/uhd { - boost = boost165; - }; + uhd = callPackage ../development/tools/misc/uhd { }; uisp = callPackage ../development/tools/misc/uisp { }; @@ -8046,9 +8096,10 @@ with pkgs; yacc = bison; + yaml2json = callPackage ../development/tools/yaml2json { }; + ycmd = callPackage ../development/tools/misc/ycmd { inherit (darwin.apple_sdk.frameworks) Cocoa; - llvmPackages = llvmPackages_5; python = python2; }; @@ -8156,6 +8207,10 @@ with pkgs; beecrypt = callPackage ../development/libraries/beecrypt { }; + belcard = callPackage ../development/libraries/belcard { }; + + belr = callPackage ../development/libraries/belr { }; + beignet = callPackage ../development/libraries/beignet { inherit (llvmPackages_39) llvm clang-unwrapped; }; @@ -8195,6 +8250,8 @@ with pkgs; bwidget = callPackage ../development/libraries/bwidget { }; + bzrtp = callPackage ../development/libraries/bzrtp { }; + c-ares = callPackage ../development/libraries/c-ares { fetchurl = fetchurlBoot; }; @@ -8616,6 +8673,8 @@ with pkgs; getdata = callPackage ../development/libraries/getdata { }; + getdns = callPackage ../development/libraries/getdns { }; + gettext = callPackage ../development/libraries/gettext { }; gflags = callPackage ../development/libraries/gflags { }; @@ -8681,20 +8740,25 @@ with pkgs; stdenv = crossLibcStdenv; }; + muslCross = callPackage ../os-specific/linux/musl { + stdenv = crossLibcStdenv; + }; + # We can choose: libcCrossChooser = name: # libc is hackily often used from the previous stage. This `or` # hack fixes the hack, *sigh*. /**/ if name == "glibc" then targetPackages.glibcCross or glibcCross else if name == "uclibc" then uclibcCross + else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 else if name == "libSystem" then darwin.xcode else throw "Unknown libc"; libcCross = assert targetPlatform != buildPlatform; libcCrossChooser targetPlatform.libc; - # Only supported on Linux - glibcLocales = if stdenv.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null; + # Only supported on Linux, using glibc + glibcLocales = if hostPlatform.libc == "glibc" then callPackage ../development/libraries/glibc/locales.nix { } else null; glibcInfo = callPackage ../development/libraries/glibc/info.nix { }; @@ -9418,6 +9482,8 @@ with pkgs; libetpan = callPackage ../development/libraries/libetpan { }; + libexecinfo = callPackage ../development/libraries/libexecinfo { }; + libfaketime = callPackage ../development/libraries/libfaketime { }; libfakekey = callPackage ../development/libraries/libfakekey { }; @@ -9694,7 +9760,7 @@ with pkgs; }; # On non-GNU systems we need GNU Gettext for libintl. - libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext; + libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; libid3tag = callPackage ../development/libraries/libid3tag { gperf = gperf_3_0; @@ -9874,9 +9940,7 @@ with pkgs; }; libproxy = callPackage ../development/libraries/libproxy { - stdenv = if stdenv.isDarwin - then overrideCC stdenv gcc - else stdenv; + inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation JavaScriptCore; }; libpseudo = callPackage ../development/libraries/libpseudo { }; @@ -10117,23 +10181,6 @@ with pkgs; }; }); - # interception-tools needs this. This should be removed when there is a new - # release of libyamlcpp, i.e. when the version of libyamlcpp is newer than - # 0.5.3. - libyamlcppWithoutBoost = libyamlcpp.overrideAttrs (oldAttrs: rec { - name = "libyaml-cpp-${version}"; - version = "2017-08-25"; - - src = fetchFromGitHub { - owner = "jbeder"; - repo = "yaml-cpp"; - rev = "beb44b872c07c74556314e730c6f20a00b32e8e5"; - sha256 = "1qkr3i5lin6m36w5rbimc7pjx3nx686xnjb6lw00xf67iqrl4h4m"; - }; - - buildInputs = [ cmake ]; - }); - libykneomgr = callPackage ../development/libraries/libykneomgr { }; libytnef = callPackage ../development/libraries/libytnef { }; @@ -10221,8 +10268,6 @@ with pkgs; # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity # grsecEnabled = true; # no more support in nixpkgs ATM - - llvmPackages = llvmPackages_5; }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); @@ -10358,7 +10403,8 @@ with pkgs; }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins {}; + nix-plugins = callPackage ../development/libraries/nix-plugins + { nix = nixUnstable; }; nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; @@ -10387,7 +10433,10 @@ with pkgs; nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { }; - ocl-icd = callPackage ../development/libraries/ocl-icd { }; + ocl-icd-oclhGen = oclh: callPackage ../development/libraries/ocl-icd { opencl-headers = oclh; }; + ocl-icd-oclh_1_2 = ocl-icd-oclhGen opencl-headers_1_2; + ocl-icd-oclh_2_2 = ocl-icd-oclhGen opencl-headers_2_2; + ocl-icd = ocl-icd-oclh_2_2; ode = callPackage ../development/libraries/ode { }; @@ -10414,7 +10463,10 @@ with pkgs; opencascade_oce = opencascade; - opencl-headers = callPackage ../development/libraries/opencl-headers { }; + opencl-headersGen = v: callPackage ../development/libraries/opencl-headers { version = v; }; + opencl-headers_1_2 = opencl-headersGen "12"; + opencl-headers_2_2 = opencl-headersGen "22"; + opencl-headers = opencl-headers_2_2; opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { }; @@ -11115,6 +11167,8 @@ with pkgs; spice_protocol = callPackage ../development/libraries/spice-protocol { }; + spice-up = callPackage ../applications/office/spice-up { }; + sratom = callPackage ../development/libraries/audio/sratom { }; srm = callPackage ../tools/security/srm { }; @@ -11150,6 +11204,8 @@ with pkgs; strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; + subdl = callPackage ../applications/video/subdl { }; + subtitleeditor = callPackage ../applications/video/subtitleeditor { }; suil-qt4 = callPackage ../development/libraries/audio/suil { @@ -11314,7 +11370,7 @@ with pkgs; v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { inherit (python2Packages) python gyp; cctools = darwin.cctools; - stdenv = overrideCC stdenv gcc5; + stdenv = if stdenv.isDarwin then stdenv else overrideCC stdenv gcc5; }; v8_6_x = callPackage ../development/libraries/v8/6_x.nix { @@ -11879,8 +11935,8 @@ with pkgs; bind = callPackage ../servers/dns/bind { }; dnsutils = bind.dnsutils; - bird = callPackage ../servers/bird { }; - bird6 = bird.override { enableIPv6 = true; }; + inherit (callPackages ../servers/bird { }) + bird bird6 bird2; bosun = callPackage ../servers/monitoring/bosun { }; scollector = bosun; @@ -12024,6 +12080,8 @@ with pkgs; lighttpd = callPackage ../servers/http/lighttpd { }; + lwan = callPackage ../servers/http/lwan { }; + mailman = callPackage ../servers/mail/mailman { }; mattermost = callPackage ../servers/mattermost { }; @@ -12105,6 +12163,7 @@ with pkgs; oauth2_proxy = callPackage ../servers/oauth2_proxy { }; + openafs = callPackage ../servers/openafs { tsmbac = null; ncurses = null; }; openpts = callPackage ../servers/openpts { }; openresty = callPackage ../servers/http/openresty { }; @@ -12447,6 +12506,8 @@ with pkgs; slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { }); slurm-llnl-full = slurm-full; # renamed July 2017 + slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { }; + systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; inherit (callPackages ../servers/http/tomcat { }) @@ -12503,11 +12564,12 @@ with pkgs; }; xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix { - inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig + inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig libxslt expat libpng zlib perl mesa_drivers spice_protocol libunwind dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook - autoconf automake libtool xmlto asciidoc flex bison mtdev pixman + autoconf automake libtool mtdev pixman cairo epoxy; + inherit (buildPackages) pkgconfig xmlto asciidoc flex bison; inherit (darwin) apple_sdk cf-private libobjc; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; mesa = mesa_noglu; @@ -12601,6 +12663,7 @@ with pkgs; bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; busybox = callPackage ../os-specific/linux/busybox { }; + busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { }; cachefilesd = callPackage ../os-specific/linux/cachefilesd { }; @@ -12850,8 +12913,9 @@ with pkgs; lkl = callPackage ../applications/virtualization/lkl { }; - linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { }; - linuxHeaders = linuxHeaders_4_4; + inherit (callPackages ../os-specific/linux/kernel-headers { }) + linuxHeaders_4_4 linuxHeaders_4_15; + linuxHeaders = if hostPlatform.isMusl then linuxHeaders_4_15 else linuxHeaders_4_4; kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; @@ -12867,16 +12931,12 @@ with pkgs; ]; }; - linux_hardened_copperhead = callPackage ../os-specific/linux/kernel/linux-hardened-copperhead.nix { + linux_copperhead = callPackage ../os-specific/linux/kernel/linux-copperhead-hardened.nix { kernelPatches = with kernelPatches; [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long kernelPatches.tag_hardened ]; - extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { - inherit stdenv; - inherit (linux_hardened_copperhead) version; - }; }; # linux mptcp is based on the 4.4 kernel @@ -12986,10 +13046,6 @@ with pkgs; linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.p9_fixes - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -13010,8 +13066,6 @@ with pkgs; ]; }; - linux_samus_latest = linux_samus_4_12; - /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -13022,6 +13076,7 @@ with pkgs; callPackage = newScope self; inherit kernel; + inherit (kernel) stdenv; # in particular, use the same compiler by default acpi_call = callPackage ../os-specific/linux/acpi-call {}; @@ -13089,7 +13144,7 @@ with pkgs; rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; - openafsClient = callPackage ../servers/openafs-client { }; + openafs = callPackage ../servers/openafs/module.nix { }; facetimehd = callPackage ../os-specific/linux/facetimehd { }; @@ -13117,7 +13172,7 @@ with pkgs; sch_cake = callPackage ../os-specific/linux/sch_cake { }; inherit (callPackage ../os-specific/linux/spl {}) - splStable splUnstable; + splStable splUnstable splLegacyCrypto; spl = splStable; @@ -13148,7 +13203,7 @@ with pkgs; inherit (callPackage ../os-specific/linux/zfs { configFile = "kernel"; inherit kernel spl; - }) zfsStable zfsUnstable; + }) zfsStable zfsUnstable zfsLegacyCrypto; zfs = zfsStable; }); @@ -13163,7 +13218,6 @@ with pkgs; # Build the kernel modules for the some of the kernels. linuxPackages_beagleboard = linuxPackagesFor pkgs.linux_beagleboard; - linuxPackages_hardened_copperhead = linuxPackagesFor pkgs.linux_hardened_copperhead; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); @@ -13186,26 +13240,40 @@ with pkgs; linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs); # Build a kernel for Xen dom0 + linuxPackages_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; })); + linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); # Hardened linux - linux_hardened = let linux = pkgs.linuxPackages_latest.kernel; in linux.override { + hardenedLinuxPackagesFor = kernel: linuxPackagesFor (kernel.override { extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { inherit stdenv; - inherit (linux) version; + inherit (kernel) version; }; - }; + }); - linuxPackages_hardened = - recurseIntoAttrs (linuxPackagesFor linux_hardened); + linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux); + linux_hardened = linuxPackages_hardened.kernel; + + linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest); + linux_latest_hardened = linuxPackages_latest_hardened.kernel; + + linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; })); + + linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); + + linuxPackages_copperhead_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead); + linux_copperhead_hardened = linuxPackages_copperhead_hardened.kernel; + linux_hardened_copperhead = linux_copperhead_hardened; # alias for backward compatibility # Samus kernels linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12); - linuxPackages_samus_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_latest); + linuxPackages_samus_latest = linuxPackages_samus_4_12; + linux_samus_latest = linuxPackages_samus_latest.kernel; # A function to build a manually-configured kernel linuxManualConfig = pkgs.buildLinux; - buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); + buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/generic.nix {}); keyutils = callPackage ../os-specific/linux/keyutils { }; @@ -13276,6 +13344,17 @@ with pkgs; multipath-tools = callPackage ../os-specific/linux/multipath-tools { }; musl = callPackage ../os-specific/linux/musl { }; + musl-fts = callPackage ../os-specific/linux/musl/fts.nix { }; + musl-getconf = callPackage ../os-specific/linux/musl/getconf.nix { }; + musl-getent = callPackage ../os-specific/linux/musl/getent.nix { }; + getent = + if hostPlatform.isMusl then musl-getent + # This may not be right on other platforms, but preserves existing behavior + else /* if hostPlatform.libc == "glibc" then */ glibc.bin; + + getconf = + if hostPlatform.isMusl then musl-getconf + else lib.getBin stdenv.cc.libc; nettools = callPackage ../os-specific/linux/net-tools { }; @@ -13302,6 +13381,11 @@ with pkgs; go-protobuf = callPackage ../development/tools/go-protobuf { }; + + go-symbols = callPackage ../development/tools/go-symbols { }; + + go-outline = callPackage ../development/tools/go-outline { }; + gocode = callPackage ../development/tools/gocode { }; goconvey = callPackage ../development/tools/goconvey { }; @@ -13316,10 +13400,14 @@ with pkgs; goimports = callPackage ../development/tools/goimports { }; + gopkgs = callPackage ../development/tools/gopkgs { }; + govers = callPackage ../development/tools/govers { }; gotools = callPackage ../development/tools/gotools { }; + gomodifytags = callPackage ../development/tools/gomodifytags { }; + gogoclient = callPackage ../os-specific/linux/gogoclient { }; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; @@ -13654,7 +13742,7 @@ with pkgs; inherit (callPackage ../os-specific/linux/zfs { configFile = "user"; - }) zfsStable zfsUnstable; + }) zfsStable zfsUnstable zfsLegacyCrypto; zfs = zfsStable; @@ -13962,6 +14050,8 @@ with pkgs; papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { }; + papis = python3Packages.callPackage ../tools/misc/papis { }; + pecita = callPackage ../data/fonts/pecita {}; paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix {}; @@ -14474,9 +14564,7 @@ with pkgs; carddav-util = callPackage ../tools/networking/carddav-util { }; - catfish = callPackage ../applications/search/catfish { - pythonPackages = python2Packages; - }; + catfish = callPackage ../applications/search/catfish { }; cava = callPackage ../applications/audio/cava { }; @@ -14630,7 +14718,6 @@ with pkgs; }); darktable = callPackage ../applications/graphics/darktable { - inherit (gnome2) GConf libglade; lua = lua5_3; pugixml = pugixml.override { shared = true; }; }; @@ -14691,10 +14778,10 @@ with pkgs; inherit (callPackage ../applications/virtualization/docker { }) docker_17_12 - docker_18_01; + docker_18_02; docker = docker_17_12; - docker-edge = docker_18_01; + docker-edge = docker_18_02; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -14958,8 +15045,6 @@ with pkgs; emacs25Packages = emacsPackagesGen emacs25 pkgs.emacs25Packages; emacsPackagesNgGen = emacs: import ./emacs-packages.nix { - overrides = (config.emacsPackageOverrides or (p: {})) pkgs; - inherit lib newScope stdenv; inherit fetchFromGitHub fetchgit fetchhg fetchurl; inherit emacs texinfo makeWrapper runCommand; @@ -15103,6 +15188,8 @@ with pkgs; geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; + ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; + gksu = callPackage ../applications/misc/gksu { }; gnss-sdr = callPackage ../applications/misc/gnss-sdr { }; @@ -15918,6 +16005,10 @@ with pkgs; kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; + kubectl = (kubernetes.override { components = [ "cmd/kubectl" ]; }).overrideAttrs(oldAttrs: { + name = "kubectl-${oldAttrs.version}"; + }); + kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; kupfer = callPackage ../applications/misc/kupfer { }; @@ -16358,12 +16449,8 @@ with pkgs; ostinato = callPackage ../applications/networking/ostinato { }; - panamax_api = callPackage ../applications/networking/cluster/panamax/api { - ruby = ruby_2_1; - }; - panamax_ui = callPackage ../applications/networking/cluster/panamax/ui { - ruby = ruby_2_1; - }; + panamax_api = callPackage ../applications/networking/cluster/panamax/api { }; + panamax_ui = callPackage ../applications/networking/cluster/panamax/ui { }; partio = callPackage ../development/libraries/partio {}; @@ -16448,7 +16535,9 @@ with pkgs; mupdf = callPackage ../applications/misc/mupdf { }; - diffpdf = callPackage ../applications/misc/diffpdf { }; + diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; + + diff-pdf = callPackage ../applications/misc/diff-pdf { wxGTK = wxGTK31; }; mlocate = callPackage ../tools/misc/mlocate { }; @@ -16789,6 +16878,8 @@ with pkgs; qmapshack = libsForQt5.callPackage ../applications/misc/qmapshack { }; + qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; + qmetro = callPackage ../applications/misc/qmetro { }; qmidinet = callPackage ../applications/audio/qmidinet { }; @@ -16807,8 +16898,7 @@ with pkgs; qt = qt4; }; - # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8 - qsyncthingtray = libsForQt56.callPackage ../applications/misc/qsyncthingtray { }; + qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; qstopmotion = callPackage ../applications/video/qstopmotion { }; @@ -17147,6 +17237,8 @@ with pkgs; slic3r = callPackage ../applications/misc/slic3r { }; + slic3r-prusa3d = callPackage ../applications/misc/slic3r-prusa3d { }; + curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; cura_stable = callPackage ../applications/misc/cura/stable.nix { curaengine = curaengine_stable; @@ -17278,10 +17370,6 @@ with pkgs; syncthing = callPackage ../applications/networking/syncthing { }; - syncthing012 = callPackage ../applications/networking/syncthing012 { }; - - syncthing013 = callPackage ../applications/networking/syncthing013 { }; - syncthing-gtk = python2Packages.callPackage ../applications/networking/syncthing-gtk { }; syncthing-inotify = callPackage ../applications/networking/syncthing/inotify.nix { }; @@ -17314,7 +17402,7 @@ with pkgs; teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; - taskjuggler = callPackage ../applications/misc/taskjuggler { ruby = ruby_2_0; }; + uaskjuggler = callPackage ../applications/misc/taskjuggler { }; tasknc = callPackage ../applications/misc/tasknc { }; @@ -17534,7 +17622,7 @@ with pkgs; inherit (gnome3) defaultIconTheme; }; - macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; ruby = ruby_2_2; }; + macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; }; vimHugeX = vim_configurable; @@ -17934,7 +18022,6 @@ with pkgs; }; xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; - # v1.3.2 segfaults with qt 5.7 xca = libsForQt5.callPackage ../applications/misc/xca { }; xcalib = callPackage ../tools/X11/xcalib { }; @@ -18125,6 +18212,8 @@ with pkgs; inherit (gnome3) yelp; + yokadi = python3Packages.callPackage ../applications/misc/yokadi {}; + yoshimi = callPackage ../applications/audio/yoshimi { }; inherit (pythonPackages) youtube-dl; @@ -18201,6 +18290,8 @@ with pkgs; physfs = physfs_2; }; + assaultcube = callPackage ../games/assaultcube { }; + astromenace = callPackage ../games/astromenace { }; atanks = callPackage ../games/atanks {}; @@ -18314,10 +18405,18 @@ with pkgs; physfs = physfs_2; }; + # these are here for compatibility d1x_rebirth = dxx-rebirth; - d2x_rebirth = dxx-rebirth; + inherit (callPackages ../games/dxx-rebirth/assets.nix { }) + descent1-assets + descent2-assets; + + inherit (callPackages ../games/dxx-rebirth/full.nix { }) + d1x-rebirth-full + d2x-rebirth-full; + easyrpg-player = callPackage ../games/easyrpg-player { }; eboard = callPackage ../games/eboard { }; @@ -18488,7 +18587,9 @@ with pkgs; libpng = libpng12; }; - mnemosyne = callPackage ../games/mnemosyne { }; + mnemosyne = callPackage ../games/mnemosyne { + python = python3; + }; mrrescue = callPackage ../games/mrrescue { }; @@ -18589,6 +18690,7 @@ with pkgs; quake3pointrelease = callPackage ../games/quake3/content/pointrelease.nix { }; quakespasm = callPackage ../games/quakespasm { }; + vkquake = callPackage ../games/quakespasm/vulkan.nix { }; ioquake3 = callPackage ../games/quake3/ioquake { }; @@ -18916,6 +19018,7 @@ with pkgs; mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { }; nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { }; pixel-saver = callPackage ../desktops/gnome-3/extensions/pixel-saver { }; + remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; }; @@ -18987,7 +19090,7 @@ with pkgs; mkPlasma5 = import ../desktops/plasma-5; attrs = { inherit libsForQt5 lib fetchurl; - inherit (gnome3) gconf; + inherit (gnome3) gconf gsettings_desktop_schemas; }; in recurseIntoAttrs (makeOverridable mkPlasma5 attrs); @@ -19075,7 +19178,14 @@ with pkgs; plink-ng = callPackage ../applications/science/biology/plink-ng/default.nix { }; + raxml = callPackage ../applications/science/biology/raxml { }; + + raxml-mpi = appendToName "mpi" (raxml.override { + mpi = true; + }); + samtools = callPackage ../applications/science/biology/samtools/default.nix { }; + samtools_0_1_19 = callPackage ../applications/science/biology/samtools/samtools_0_1_19.nix { }; snpeff = callPackage ../applications/science/biology/snpeff/default.nix { }; @@ -19380,7 +19490,7 @@ with pkgs; }; z3_4_5_0 = callPackage ../applications/science/logic/z3/4.5.0.nix {}; - z3 = callPackage ../applications/science/logic/z3 {}; + z3 = callPackage ../applications/science/logic/z3 { python = python2; }; aiger = callPackage ../applications/science/logic/aiger {}; @@ -19729,7 +19839,7 @@ with pkgs; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; faust2 = callPackage ../applications/audio/faust/faust2.nix { - llvm = llvm_4; + llvm = llvm_5; }; faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { }; @@ -19867,6 +19977,8 @@ with pkgs; nixopsUnstable = lowPrio (callPackage ../tools/package-management/nixops/unstable.nix { }); + nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; + nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; }; @@ -20103,6 +20215,8 @@ with pkgs; terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; + terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {}; + terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; terragrunt_0_11_1 = callPackage ../applications/networking/cluster/terragrunt/0.11.1.nix { diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index c27a2e7d39d8c..12a62ba3851bf 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -75,7 +75,7 @@ in rec { coqPackages_8_5 = mkCoqPackages coq_8_5; coqPackages_8_6 = mkCoqPackages coq_8_6; coqPackages_8_7 = mkCoqPackages coq_8_7; - coqPackages = coqPackages_8_6; + coqPackages = coqPackages_8_7; coq = coqPackages.coq; } diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index e75c9338f8d4c..1f8039010d7b8 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -44,6 +44,8 @@ in }; libobjc = apple-source-releases.objc4; + + lsusb = callPackage ../os-specific/darwin/lsusb { }; opencflite = callPackage ../os-specific/darwin/opencflite { }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 3acc6d0ebec64..99863eb76a889 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -32,9 +32,7 @@ # `meta` with `platforms` and `homepage` set to something you are # unlikely to want to override for most packages -{ overrides - -, lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, runCommand +{ lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, runCommand , emacs, texinfo, lndir, makeWrapper , trivialBuild diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 22bb6acf81d6d..9f2c93498ea65 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -716,10 +716,10 @@ let self = _self // overrides; _self = with self; { }; bignum = buildPerlPackage rec { - name = "bignum-0.47"; + name = "bignum-0.49"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "b084eac6d676d2acc4d60deed58e6e31b2f572b7b0be1aec9b93be92bad8261a"; + sha256 = "28685b271251927d327851e5951e38649524a4e50cb0d1d35d649e2b814f212d"; }; buildInputs = [ MathBigInt MathBigRat ]; meta = { @@ -2544,10 +2544,10 @@ let self = _self // overrides; _self = with self; { }; CpanelJSONXS = buildPerlPackage rec { - name = "Cpanel-JSON-XS-4.00"; + name = "Cpanel-JSON-XS-4.01"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "4dedf770cab3009b08bca108266b941097ae1c55c674c500e3145e2f23a628ac"; + sha256 = "c8cfd32a8a9508ab7f280452428582c3e46d0bed4ea863c3ec27c34f6920de60"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; @@ -2722,10 +2722,10 @@ let self = _self // overrides; _self = with self; { }; CryptJWT = buildPerlPackage rec { - name = "Crypt-JWT-0.019"; + name = "Crypt-JWT-0.020"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "26aaaaedc153b04bdaaba7df7ac2f7ce3bdf672c8d7111d09347a8d0c794725c"; + sha256 = "0587fc11435aecbbdc19b33f774d05ff31f19750b26a3588af93f33e8000d464"; }; propagatedBuildInputs = [ CryptX JSONMaybeXS ]; meta = { @@ -4834,10 +4834,10 @@ let self = _self // overrides; _self = with self; { }; Encode = buildPerlPackage rec { - name = "Encode-2.93"; + name = "Encode-2.95"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz"; - sha256 = "2d06b0375c84a75cf3762685e6d94c3aef25833fd0427daa0ae87b04ae6f739c"; + sha256 = "d662794c6f834382527f67ca62e1715887f504cfd09e119a1302e584dd3cdcde"; }; meta = { description = "Character encodings in Perl"; @@ -10787,6 +10787,21 @@ let self = _self // overrides; _self = with self; { }; }; + ParallelForkManager = buildPerlPackage rec { + name = "Parallel-ForkManager-1.19"; + src = fetchurl { + url = "mirror://cpan/authors/id/Y/YA/YANICK/${name}.tar.gz"; + sha256 = "f1de2e9875eeb77d65f80338905dedd522f3913822502982f805aa71cde5a472"; + }; + buildInputs = [ TestWarn ]; + meta = { + homepage = https://github.com/dluxhu/perl-parallel-forkmanager; + description = "A simple parallel processing fork manager"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + ParallelPrefork = buildPerlPackage { name = "Parallel-Prefork-0.17"; src = fetchurl { @@ -12859,10 +12874,10 @@ let self = _self // overrides; _self = with self; { }; SubQuote = buildPerlPackage rec { - name = "Sub-Quote-2.003001"; + name = "Sub-Quote-2.005000"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "9d471d8e13e7ce4793d5a5ec04a60fface14dd53be78dd94d228871915cfd1f9"; + sha256 = "44b145111bee7b0001818e77f7ce587153232dbc97351f4c5ed34522372b64ff"; }; buildInputs = [ TestFatal ]; meta = { @@ -15065,6 +15080,8 @@ let self = _self // overrides; _self = with self; { meta = { description = "Line wrapping module with support for multibyte, fullwidth, and combining characters and languages without whitespaces between words"; license = with stdenv.lib.licenses; [ artistic1 gpl2 ]; + # bogus use of glibc, pretty sure, think this is what we have glibcLocales for? + broken = stdenv.hostPlatform.libc != "glibc"; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 91fdbdfc10e22..6ef5b2b496806 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -203,6 +203,8 @@ in { bugseverywhere = callPackage ../applications/version-management/bugseverywhere {}; + dendropy = callPackage ../development/python-modules/dendropy { }; + dbf = callPackage ../development/python-modules/dbf { }; dbfread = callPackage ../development/python-modules/dbfread { }; @@ -239,6 +241,10 @@ in { hdf5 = pkgs.hdf5-mpi; }; + habanero = callPackage ../development/python-modules/habanero { }; + + i3ipc = callPackage ../development/python-modules/i3ipc { }; + intelhex = callPackage ../development/python-modules/intelhex { }; lmtpd = callPackage ../development/python-modules/lmtpd { }; @@ -326,6 +332,8 @@ in { callPackage = pkgs.callPackage; }; + pyparser = callPackage ../development/python-modules/pyparser { }; + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { pythonPackages = self; }; @@ -410,6 +418,8 @@ in { adal = callPackage ../development/python-modules/adal { }; + aioconsole = callPackage ../development/python-modules/aioconsole { }; + aiodns = callPackage ../development/python-modules/aiodns { }; aiofiles = callPackage ../development/python-modules/aiofiles { }; @@ -481,7 +491,7 @@ in { homepage = https://github.com/pazz/alot; description = "Terminal MUA using notmuch mail"; platforms = platforms.linux; - maintainers = with maintainers; [ garbas profpatsch ]; + maintainers = with maintainers; [ garbas ]; }; }; @@ -596,6 +606,8 @@ in { area53 = callPackage ../development/python-modules/area53 { }; + arxiv2bib = callPackage ../development/python-modules/arxiv2bib { }; + chai = callPackage ../development/python-modules/chai { }; chainmap = callPackage ../development/python-modules/chainmap { }; @@ -2223,39 +2235,7 @@ in { ''; }; - celery = buildPythonPackage rec { - name = "celery-${version}"; - version = "4.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/celery/${name}.tar.gz"; - sha256 = "0kgmbs3fl9879n48p4m79nxy9by2yhvxq1jdvlnqzzvkdb2sdmg3"; - }; - - # Fixes testsuite for python-3.6 - # From ubuntu packaging: https://launchpad.net/ubuntu/+archive/primary/+files/celery_4.0.2-0ubuntu1.debian.tar.xz - # (linked from https://launchpad.net/ubuntu/+source/celery) - # https://github.com/celery/celery/pull/3736#issuecomment-274155454 from upstream - patches = [ ../development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch ]; - - # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox - preCheck = '' - export NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols \ - LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so - ''; - postCheck = '' - unset NIX_REDIRECTS LD_PRELOAD - ''; - - buildInputs = with self; [ pytest case ]; - propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ]; - - meta = { - homepage = https://github.com/celery/celery/; - description = "Distributed task queue"; - license = licenses.bsd3; - }; - }; + celery = callPackage ../development/python-modules/celery { pytest = self.pytest_32; }; cerberus = buildPythonPackage rec { name = "Cerberus-${version}"; @@ -2785,65 +2765,9 @@ in { }; }; - cryptography = buildPythonPackage rec { - # also bump cryptography_vectors - pname = "cryptography"; - name = "${pname}-${version}"; - version = "2.0.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a"; - }; - - outputs = [ "out" "dev" ]; - - buildInputs = [ pkgs.openssl self.cryptography_vectors ] - ++ optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security; - propagatedBuildInputs = with self; [ - idna - asn1crypto - packaging - six - ] ++ optional (pythonOlder "3.4") enum34 - ++ optional (pythonOlder "3.3") ipaddress - ++ optional (!isPyPy) cffi; - - checkInputs = with self; [ - pytest - pretend - iso8601 - pytz - hypothesis - ]; - - # The test assumes that if we're on Sierra or higher, that we use `getentropy`, but for binary - # compatibility with pre-Sierra for binary caches, we hide that symbol so the library doesn't - # use it. This boils down to them checking compatibility with `getentropy` in two different places, - # so let's neuter the second test. - postPatch = '' - substituteInPlace ./tests/hazmat/backends/test_openssl.py --replace '"16.0"' '"99.0"' - ''; - - # IOKit's dependencies are inconsistent between OSX versions, so this is the best we - # can do until nix 1.11's release - __impureHostDeps = [ "/usr/lib" ]; - }; - - cryptography_vectors = buildPythonPackage rec { - # also bump cryptography - pname = "cryptography_vectors"; - version = self.cryptography.version; - name = "${pname}-${version}"; + cryptography = callPackage ../development/python-modules/cryptography { }; - src = fetchPypi { - inherit pname version; - sha256 = "beb831aa73663a224f4d7520483ed02da544533bb03b26ec07a5f9a0dd0941e1"; - }; - - # No tests included - doCheck = false; - }; + cryptography_vectors = callPackage ../development/python-modules/cryptography_vectors { }; curtsies = callPackage ../development/python-modules/curtsies { }; @@ -3206,9 +3130,9 @@ in { }; }; - pytest = self.pytest_33; + pytest = self.pytest_34; - pytest_33 = callPackage ../development/python-modules/pytest/default.nix{ + pytest_34 = callPackage ../development/python-modules/pytest/default.nix{ hypothesis = self.hypothesis.override { # hypothesis requires pytest that causes dependency cycle doCheck = false; @@ -3216,6 +3140,15 @@ in { }; }; + # Needed for celery + pytest_32 = self.pytest_34.overrideAttrs( oldAttrs: rec { + version = "3.2.5"; + src = oldAttrs.src.override { + inherit version; + sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81"; + }; + }); + pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; @@ -3328,27 +3261,7 @@ in { }; }; - pytest-mock = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "pytest-mock"; - version = "1.6.0"; - - buildInputs = with self; [ pytest setuptools_scm ]; - propagatedBuildInputs = with self; [ mock ]; - - meta = { - description = "Thin-wrapper around the mock package for easier use with py.test."; - homepage = "https://github.com/pytest-dev/pytest-mock"; - license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; - platforms = platforms.all; - }; - - src = fetchPypi { - inherit pname version; - sha256 = "07qccww4bq9jxlc0fbhlspr13kcsixchsnl8vk4wdiyvsjy7r8c3"; - }; - }; + pytest-mock = callPackage ../development/python-modules/pytest-mock { }; pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; @@ -3690,7 +3603,7 @@ in { buildInputs = with self; [ pytest docutils ]; propagatedBuildInputs = with self; [ - dask six boto3 s3fs tblib locket msgpack click cloudpickle tornado + dask six boto3 s3fs tblib locket msgpack-python click cloudpickle tornado psutil botocore zict lz4 sortedcollections sortedcontainers ] ++ (if !isPy3k then [ singledispatch ] else []); @@ -3842,8 +3755,6 @@ in { }; }); - nose-parameterized = callPackage ../development/python-modules/nose-parameterized {}; - neurotools = buildPythonPackage (rec { name = "NeuroTools-${version}"; version = "0.3.1"; @@ -4601,6 +4512,8 @@ in { }; }; + fpdf = callPackage ../development/python-modules/fpdf { }; + fritzconnection = callPackage ../development/python-modules/fritzconnection { }; frozendict = buildPythonPackage rec { @@ -5864,6 +5777,8 @@ in { paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; + papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { }; + pathspec = callPackage ../development/python-modules/pathspec { }; pathtools = buildPythonPackage rec { @@ -9784,7 +9699,7 @@ in { locustio = callPackage ../development/python-modules/locustio { }; - llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_5;}; + llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm; }; lockfile = buildPythonPackage rec { pname = "lockfile"; @@ -9839,32 +9754,7 @@ in { py_scrypt = callPackage ../development/python-modules/py_scrypt/default.nix { }; - python_magic = buildPythonPackage rec { - name = "python-magic-0.4.10"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-magic/${name}.tar.gz"; - sha256 = "1hx2sjd4fdswswj3yydn2azxb59rjmi9b7jzh94lf1wnxijjizbr"; - }; - - propagatedBuildInputs = with self; [ pkgs.file ]; - - patchPhase = '' - substituteInPlace magic.py --replace "ctypes.util.find_library('magic')" "'${pkgs.file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; - - doCheck = false; - - # TODO: tests are failing - #checkPhase = '' - # ${python}/bin/${python.executable} ./test.py - #''; - - meta = { - description = "A python interface to the libmagic file type identification library"; - homepage = https://github.com/ahupp/python-magic; - }; - }; + python_magic = callPackage ../development/python-modules/python-magic { }; magic = buildPythonPackage rec { name = "${pkgs.file.name}"; @@ -10622,21 +10512,13 @@ in { }; }; - msgpack = buildPythonPackage rec { - name = "msgpack-python-${version}"; - version = "0.4.7"; + msgpack = callPackage ../development/python-modules/msgpack {}; - src = pkgs.fetchurl { - url = "mirror://pypi/m/msgpack-python/${name}.tar.gz"; - sha256 = "0syd7bs83qs9qmxw540jbgsildbqk4yb57fmrlns1021llli402y"; - }; - - checkPhase = '' - py.test + msgpack-python = self.msgpack.overridePythonAttrs { + pname = "msgpack-python"; + postPatch = '' + substituteInPlace setup.py --replace "TRANSITIONAL = False" "TRANSITIONAL = True" ''; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ ]; }; msrplib = buildPythonPackage rec { @@ -11402,7 +11284,7 @@ in { patches = singleton (pkgs.fetchurl { name = "libnotify07.patch"; - url = "http://pkgs.fedoraproject.org/cgit/notify-python.git/plain/" + url = "http://src.fedoraproject.org/cgit/notify-python.git/plain/" + "libnotify07.patch?id2=289573d50ae4838a1658d573d2c9f4c75e86db0c"; sha256 = "1lqdli13mfb59xxbq4rbq1f0znh6xr17ljjhwmzqb79jl3dig12z"; }); @@ -12406,6 +12288,8 @@ in { }; }; + parameterized = callPackage ../development/python-modules/parameterized { }; + paramz = callPackage ../development/python-modules/paramz { }; parsel = buildPythonPackage rec { @@ -12829,6 +12713,8 @@ in { kmsxx = callPackage ../development/libraries/kmsxx { }; + pybase64 = callPackage ../development/python-modules/pybase64 { }; + pylibconfig2 = buildPythonPackage rec { name = "pylibconfig2-${version}"; version = "0.2.4"; @@ -13235,6 +13121,8 @@ in { }; }; + pysam = callPackage ../development/python-modules/pysam { }; + pysaml2 = buildPythonPackage rec { name = "pysaml2-${version}"; version = "3.0.2"; @@ -13392,7 +13280,7 @@ in { md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; src = pkgs.fetchurl rec { - url = "http://pkgs.fedoraproject.org/repo/pkgs/python-pyblock/" + url = "http://src.fedoraproject.org/repo/pkgs/python-pyblock/" + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2"; sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; }; @@ -13777,17 +13665,6 @@ in { pygments = callPackage ../development/python-modules/Pygments { }; - # For Pelican 3.6.3 - pygments_2_0 = self.pygments.overrideAttrs( oldAttrs: rec { - version = "2.0.2"; - name = "Pygments-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/Pygments/${name}.tar.gz"; - sha256 = "7320919084e6dac8f4540638a46447a3bd730fca172afc17d2c03eed22cf4f51"; - }; - }); - pygpgme = callPackage ../development/python-modules/pygpgme { }; pylint = callPackage ../development/python-modules/pylint { }; @@ -14072,7 +13949,7 @@ in { md5_path = "d249f60aa89b1b4facd63f776925116d"; src = pkgs.fetchurl rec { - url = "http://pkgs.fedoraproject.org/repo/pkgs/pykickstart/" + url = "http://src.fedoraproject.org/repo/pkgs/pykickstart/" + "${name}.tar.gz/${md5_path}/${name}.tar.gz"; sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a"; }; @@ -14463,6 +14340,8 @@ in { pylibacl = callPackage ../development/python-modules/pylibacl { }; + pylibgen = callPackage ../development/python-modules/pylibgen { }; + pyliblo = buildPythonPackage rec { name = "pyliblo-${version}"; version = "0.9.2"; @@ -14637,39 +14516,7 @@ in { doCheck = false; }; - pyopenssl = buildPythonPackage rec { - pname = "pyOpenSSL"; - name = "${pname}-${version}"; - version = "17.2.0"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "0d283g4zi0hr9papd24mjl70mi15gyzq6fx618rizi87dgipqqax"; - }; - - outputs = [ "out" "dev" ]; - - preCheck = '' - sed -i 's/test_set_default_verify_paths/noop/' tests/test_ssl.py - # https://github.com/pyca/pyopenssl/issues/692 - sed -i 's/test_fallback_default_verify_paths/noop/' tests/test_ssl.py - ''; - - checkPhase = '' - runHook preCheck - export LANG="en_US.UTF-8" - py.test - runHook postCheck - ''; - - # Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1 - # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. - doCheck = !stdenv.isDarwin; - - buildInputs = [ pkgs.openssl self.pytest pkgs.glibcLocales self.pretend self.flaky ]; - propagatedBuildInputs = [ self.cryptography self.pyasn1 self.idna ]; - }; - + pyopenssl = callPackage ../development/python-modules/pyopenssl { }; pyquery = buildPythonPackage rec { name = "pyquery-${version}"; @@ -14810,6 +14657,7 @@ in { substituteInPlace "setup.cfg" \ --replace "/usr/local/include" "${pkgs.sqlite.dev}/include" \ --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib" + export LDSHARED="$CC -pthread -shared" ''; meta = { @@ -14936,28 +14784,13 @@ in { }; }; - pytz = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "pytz"; - version = "2017.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "12cmd3j46d2gcw08bspvp6s9icfcvx88zjz52n1bli9dyvl5dh7m"; - extension = "zip"; - }; - - checkPhase = '' - python -m unittest discover -s pytz/tests - ''; - - meta = { - description = "World timezone definitions, modern and historical"; - homepage = "http://pythonhosted.org/pytz"; - license = licenses.mit; - }; + pythonnet = callPackage ../development/python-modules/pythonnet { + # `mono >= 4.6` required to prevent crashes encountered with earlier versions. + mono = pkgs.mono46; }; + pytz = callPackage ../development/python-modules/pytz { }; + pytzdata = callPackage ../development/python-modules/pytzdata { }; pyutil = buildPythonPackage (rec { @@ -15027,23 +14860,7 @@ in { pyaml = callPackage ../development/python-modules/pyaml { }; - pyyaml = buildPythonPackage (rec { - name = "PyYAML-3.12"; - - src = pkgs.fetchurl { - url = "http://pyyaml.org/download/pyyaml/${name}.zip"; - sha256 = "19s1lxi0idq4a0bpvld866pv5b16lqxypyswmsdi5ys4210jxj2s"; - }; - - buildInputs = with self; [ pkgs.pyrex ]; - propagatedBuildInputs = with self; [ pkgs.libyaml ]; - - meta = { - description = "The next generation YAML parser and emitter for Python"; - homepage = http://pyyaml.org; - license = licenses.free; # !? - }; - }); + pyyaml = callPackage ../development/python-modules/pyyaml { }; rabbitpy = buildPythonPackage rec { version = "0.26.2"; @@ -15214,20 +15031,7 @@ in { qtpy = callPackage ../development/python-modules/qtpy { }; - quantities = buildPythonPackage rec { - name = "quantities-0.10.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/q/quantities/quantities-0.10.1.tar.gz"; - sha256 = "2d27caf31a5e0c37130ac0c14bfa8f9412a5ff1fbf3378a1d6085594776c4315"; - }; - - meta = with pkgs.stdenv.lib; { - description = "Quantities is designed to handle arithmetic and"; - homepage = http://packages.python.org/quantities; - license = licenses.bsd2; - }; - }; + quantities = callPackage ../development/python-modules/quantities { }; qutip = buildPythonPackage rec { name = "qutip-2.2.0"; @@ -15706,21 +15510,7 @@ in { }; }; - typing = buildPythonPackage rec { - name = "typing-${version}"; - version = "3.5.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/typing/${name}.tar.gz"; - sha256 = "08gz3grrh3vph5ib1w5x1ssnpzvj077x030lx63fxs4kwg3slbfa"; - }; - - meta = { - description = "Backport of typing module to Python versions older than 3.5"; - homepage = "https://docs.python.org/3.5/library/typing.html"; - license = licenses.psfl; - }; - }; + typing = callPackage ../development/python-modules/typing { }; typeguard = callPackage ../development/python-modules/typeguard { }; @@ -15963,22 +15753,7 @@ in { }; }; - simplegeneric = buildPythonPackage rec { - version = "0.8.1"; - name = "simplegeneric-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/simplegeneric/${name}.zip"; - sha256 = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173"; - }; - - meta = { - description = "Simple generic functions"; - homepage = http://cheeseshop.python.org/pypi/simplegeneric; - license = licenses.zpl21; - }; - }; - + simplegeneric = callPackage ../development/python-modules/simplegeneric { }; shortuuid = buildPythonPackage rec { name = "shortuuid-${version}"; @@ -16460,33 +16235,7 @@ in { }; }; - sympy = buildPythonPackage rec { - name = "sympy-1.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sympy/${name}.tar.gz"; - sha256 = "1bpzjwr9hrr7w88v4vgnj9lr6vxcldc94si13n8xpr1rv08d5b1y"; - }; - - buildInputs = [ pkgs.glibcLocales ]; - - propagatedBuildInputs = with self; [ mpmath ]; - - # Bunch of failures including transients. - doCheck = false; - - preCheck = '' - export LANG="en_US.UTF-8" - ''; - - meta = { - description = "A Python library for symbolic mathematics"; - homepage = http://www.sympy.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; - }; + sympy = callPackage ../development/python-modules/sympy { }; pilkit = buildPythonPackage rec { name = "pilkit-1.1.4"; @@ -18069,7 +17818,7 @@ in { meta = { description = "Tree widgets for urwid"; license = licenses.gpl3; - maintainers = with maintainers; [ profpatsch ]; + maintainers = with maintainers; [ ]; }; }; @@ -18322,24 +18071,7 @@ EOF }; }; - webcolors = buildPythonPackage rec { - name = "webcolors-1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/webcolors/${name}.tar.gz"; - sha256 = "304fc95dab2848c7bf64f378356766e692c2f8b4a8b15fa3509544e6412936e8"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - description = "Library for working with color names/values defined by the HTML and CSS specifications"; - homepage = https://bitbucket.org/ubernostrum/webcolors/overview/; - license = licenses.bsd3; - platforms = platforms.unix; - }; - }; + webcolors = callPackage ../development/python-modules/webcolors { }; webencodings = callPackage ../development/python-modules/webencodings { }; @@ -20213,23 +19945,7 @@ EOF propagatedBuildInputs = with self; [ pynacl six ]; }; - pynacl = buildPythonPackage rec { - name = "pynacl-${version}"; - version = "0.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/PyNaCl/PyNaCl-0.3.0.tar.gz"; - sha256 = "1hknxlp3a3f8njn19w92p8nhzl9jkfwzhv5fmxhmyq2m8hqrfj8j"; - }; - - buildInputs = with self; [ pytest coverage ]; - propagatedBuildInputs = with self; [pkgs.libsodium six cffi pycparser]; - - checkPhase = '' - coverage run --source nacl --branch -m pytest - ''; - - }; + pynacl = callPackage ../development/python-modules/pynacl { }; service-identity = callPackage ../development/python-modules/service_identity { }; @@ -20350,26 +20066,7 @@ EOF }; }; - weboob = buildPythonPackage rec { - name = "weboob-1.1"; - disabled = ! isPy27; - - src = pkgs.fetchurl { - url = "https://symlink.me/attachments/download/324/${name}.tar.gz"; - sha256 = "0736c5wsck2abxlwvx8i4496kafk9xchkkzhg4dcfbj0isldih6b"; - }; - - setupPyBuildFlags = ["--qt" "--xdg"]; - - propagatedBuildInputs = with self; [ pillow prettytable pyyaml dateutil gdata requests mechanize feedparser lxml pkgs.gnupg pyqt4 pkgs.libyaml simplejson cssselect futures pdfminer termcolor ]; - - meta = { - homepage = http://weboob.org; - description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; - license = licenses.agpl3; - maintainers = with maintainers; [ ]; - }; - }; + weboob = callPackage ../development/python-modules/weboob { }; datadiff = buildPythonPackage rec { name = "datadiff-1.1.6"; @@ -20545,21 +20242,7 @@ EOF }; }; - dicttoxml = buildPythonPackage rec { - name = "dicttoxml-1.6.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dicttoxml/dicttoxml-1.6.4.tar.gz"; - sha256 = "5f29e95fec56680823dc41911c04c2af08727ee53c1b60e83c489212bab71161"; - }; - - propagatedBuildInputs = with self; [ ]; - - meta = { - description = "Summary"; - homepage = https://github.com/quandyfactory/dicttoxml; - }; - }; + dicttoxml = callPackage ../development/python-modules/dicttoxml { }; markdown2 = callPackage ../development/python-modules/markdown2 { }; @@ -20657,36 +20340,7 @@ EOF trollius = callPackage ../development/python-modules/trollius {}; - neovim = buildPythonPackage rec { - version = "0.2.0"; - name = "neovim-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/neovim/${name}.tar.gz"; - sha256 = "1ywkgbrxd95cwlglihydmffcw2d2aji6562aqncymxs3ld5y02yn"; - }; - - buildInputs = with self; [ nose ]; - - checkPhase = '' - nosetests - ''; - - # Tests require pkgs.neovim, - # which we cannot add because of circular dependency. - doCheck = false; - - propagatedBuildInputs = with self; [ msgpack ] - ++ optional (!isPyPy) greenlet - ++ optional (pythonOlder "3.4") trollius; - - meta = { - description = "Python client for Neovim"; - homepage = "https://github.com/neovim/python-client"; - license = licenses.asl20; - maintainers = with maintainers; [ garbas ]; - }; - }; + neovim = callPackage ../development/python-modules/neovim {}; neovim_gui = buildPythonPackage rec { name = "neovim-pygui-${self.neovim.version}"; @@ -21072,25 +20726,7 @@ EOF }; }; - ovh = buildPythonPackage rec { - name = "ovh-${version}"; - version = "0.4.5"; - doCheck = false; #test needs packages too explicit - buildInputs = with self; [ d2to1 ]; - propagatedBuildInputs = with self; [ requests ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/ovh/ovh-${version}.tar.gz"; - sha256 = "1wf2p1sbg34jpj97r3w5nx9pj6vp0mlprry3vw2xav3dv02qv2af"; - }; - - meta = { - description = "Thin wrapper around OVH's APIs"; - homepage = https://pypi.python.org/pypi/ovh; - license = licenses.bsd2; - maintainers = [ maintainers.makefu ]; - }; - }; + ovh = callPackage ../development/python-modules/ovh { }; willow = buildPythonPackage rec { name = "willow-${version}"; @@ -21754,26 +21390,6 @@ EOF }; }; - pybrain = buildPythonPackage rec { - name = "pybrain-${version}"; - version = "0.3.3"; - - src = pkgs.fetchurl { - url = "https://github.com/pybrain/pybrain/archive/${version}.tar.gz"; - sha256 = "114m99vsrps2gjqfm3i3kxx4nibjhjdzphsy2bhrxa5q3h2q14dz"; - }; - - propagatedBuildInputs = with self; [ scipy ]; - - meta = { - homepage = "http://pybrain.org/"; - description = "Modular Machine Learning Library for Python"; - license = licenses.bsd3; - maintainers = with maintainers; [ NikolaMandic ]; - broken = true; # See https://github.com/NixOS/nixpkgs/pull/29198 - }; - }; - threadpool = buildPythonPackage rec { name = "threadpool-${version}"; version = "1.3.2"; @@ -21832,6 +21448,8 @@ EOF }; }; + python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { }; + irc = buildPythonPackage rec { name = "irc-${version}"; version = "14.2.2"; @@ -22066,24 +21684,7 @@ EOF whoosh = callPackage ../development/python-modules/whoosh { }; - packet-python = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "packet-python"; - version = "1.33"; - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/eb/82/f0506bd964501f958ac6a37e843ccb7bd9e712732886258314d55f0ec710/packet-python-1.33.tar.gz"; - sha256 = "0bmvfmvjm8jx0y8sv0jf5mhv0h3v8idx0sc5myxs7ig200584dd3"; - }; - propagatedBuildInputs = with self; [ requests ]; - - meta = { - description = "A Python client for the Packet API."; - homepage = "https://github.com/packethost/packet-python"; - license = licenses.lgpl3; - maintainers = with maintainers; [ dipinhora ]; - platforms = platforms.all; - }; - }; + packet-python = callPackage ../development/python-modules/packet-python { }; pwntools = callPackage ../development/python-modules/pwntools { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 8e1213f2344d6..61cf865371dfa 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -125,6 +125,17 @@ in android = mapTestOnCross lib.systems.examples.aarch64-multiplatform (linuxCommon // { }); + x86_64-musl = mapTestOnCross lib.systems.examples.musl64 linuxCommon; + rpi-musl = mapTestOnCross lib.systems.examples.muslpi (linuxCommon // { + vim = nativePlatforms; + unzip = nativePlatforms; + ddrescue = nativePlatforms; + lynx = nativePlatforms; + patchelf = nativePlatforms; + buildPackages.binutils = nativePlatforms; + mpg123 = nativePlatforms; + }); + /* Cross-built bootstrap tools for every supported platform */ bootstrapTools = let tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; }; |