diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3482ae16e26..4b9345b087e 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -11,6 +11,7 @@ - [ ] NixOS - [ ] macOS - [ ] Linux +- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) - [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"` - [ ] Tested execution of all binary files (usually in `./result/bin/`) - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). diff --git a/doc/default.nix b/doc/default.nix index 540a209c2ac..cfd51fba257 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -26,7 +26,7 @@ pkgs.stdenv.mkDerivation { extraHeader = ''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" ''; in '' { - pandoc '${inputFile}' -w docbook ${lib.optionalString useChapters "--chapters"} \ + pandoc '${inputFile}' -w docbook ${lib.optionalString useChapters "--top-level-division=chapter"} \ --smart \ | sed -e 's|||' \ diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml index efb2e60cf3a..1a18ed27237 100644 --- a/doc/languages-frameworks/beam.xml +++ b/doc/languages-frameworks/beam.xml @@ -2,60 +2,120 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-beam"> - Beam Languages (Erlang & Elixir) + BEAM Languages (Erlang, Elixir & LFE)
Introduction - In this document and related Nix expressions we use the term - Beam to describe the environment. Beam is - the name of the Erlang Virtial Machine and, as far as we know, - from a packaging perspective all languages that run on Beam are - interchangable. The things that do change, like the build - system, are transperant to the users of the package. So we make - no distinction. + In this document and related Nix expressions, we use the term, + BEAM, to describe the environment. BEAM is the name + of the Erlang Virtual Machine and, as far as we're concerned, from a + packaging perspective, all languages that run on the BEAM are + interchangeable. That which varies, like the build system, is transparent + to users of any given BEAM package, so we make no distinction.
-
+
+ Structure + + All BEAM-related expressions are available via the top-level + beam attribute, which includes: + + + + + interpreters: a set of compilers running on the + BEAM, including multiple Erlang/OTP versions + (beam.interpreters.erlangR19, etc), Elixir + (beam.interpreters.elixir) and LFE + (beam.interpreters.lfe). + + + + + packages: a set of package sets, each compiled with + a specific Erlang/OTP version, e.g. + beam.packages.erlangR19. + + + + + The default Erlang compiler, defined by + beam.interpreters.erlang, is aliased as + erlang. The default BEAM package set is defined by + beam.packages.erlang and aliased at the top level as + beamPackages. + + + To create a package set built with a custom Erlang version, use the + lambda, beam.packagesWith, which accepts an Erlang/OTP + derivation and produces a package set similar to + beam.packages.erlang. + + + Many Erlang/OTP distributions available in + beam.interpreters have versions with ODBC and/or Java + enabled. For example, there's + beam.interpreters.erlangR19_odbc_javac, which + corresponds to beam.interpreters.erlangR19. + + + We also provide the lambda, + beam.packages.erlang.callPackage, which simplifies + writing BEAM package definitions by injecting all packages from + beam.packages.erlang into the top-level context. + +
+
Build Tools
Rebar3 - By default Rebar3 wants to manage it's own dependencies. In the - normal non-Nix, this is perfectly acceptable. In the Nix world it - is not. To support this we have created two versions of rebar3, - rebar3 and rebar3-open. The - rebar3 version has been patched to remove the - ability to download anything from it. If you are not running it a - nix-shell or a nix-build then its probably not going to work for - you. rebar3-open is the normal, un-modified - rebar3. It should work exactly as would any other version of - rebar3. Any Erlang package should rely on - rebar3 and thats really what you should be - using too. + By default, Rebar3 wants to manage its own dependencies. This is perfectly + acceptable in the normal, non-Nix setup, but in the Nix world, it is not. + To rectify this, we provide two versions of Rebar3: + + + + rebar3: patched to remove the ability to download + anything. When not running it via nix-shell or + nix-build, it's probably not going to work as + desired. + + + + + rebar3-open: the normal, unmodified Rebar3. It + should work exactly as would any other version of Rebar3. Any Erlang + package should rely on rebar3 instead. See . + + +
Mix & Erlang.mk - Both Mix and Erlang.mk work exactly as you would expect. There - is a bootstrap process that needs to be run for both of - them. However, that is supported by the - buildMix and buildErlangMk derivations. + Both Mix and Erlang.mk work exactly as expected. There is a bootstrap + process that needs to be run for both, however, which is supported by the + buildMix and buildErlangMk + derivations, respectively.
-
- How to install Beam packages + How to Install BEAM Packages - Beam packages are not registered in the top level simply because - they are not relevant to the vast majority of Nix users. They are - installable using the beamPackages attribute - set. + BEAM packages are not registered at the top level, simply because they are + not relevant to the vast majority of Nix users. They are installable using + the beam.packages.erlang attribute set (aliased as + beamPackages), which points to packages built by the + default Erlang/OTP version in Nixpkgs, as defined by + beam.interpreters.erlang. - You can list the avialable packages in the - beamPackages with the following command: + To list the available packages in + beamPackages, use the following command: @@ -69,115 +129,152 @@ beamPackages.meck meck-0.8.3 beamPackages.rebar3-pc pc-1.1.0 - To install any of those packages into your profile, refer to them by - their attribute path (first column): + To install any of those packages into your profile, refer to them by their + attribute path (first column): $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse - The attribute path of any Beam packages corresponds to the name - of that particular package in Hex or its OTP Application/Release name. + The attribute path of any BEAM package corresponds to the name of that + particular package in Hex or its + OTP Application/Release name.
- Packaging Beam Applications + Packaging BEAM Applications
Erlang Applications
Rebar3 Packages - There is a Nix functional called - buildRebar3. We use this function to make a - derivation that understands how to build the rebar3 project. For - example, the epression we use to build the hex2nix - project follows. + The Nix function, buildRebar3, defined in + beam.packages.erlang.buildRebar3 and aliased at the + top level, can be used to build a derivation that understands how to + build a Rebar3 project. For example, we can build hex2nix as + follows: - {stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }: + { stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }: - buildRebar3 rec { - name = "hex2nix"; - version = "0.0.1"; + buildRebar3 rec { + name = "hex2nix"; + version = "0.0.1"; - src = fetchFromGitHub { - owner = "ericbmerritt"; - repo = "hex2nix"; - rev = "${version}"; - sha256 = "1w7xjidz1l5yjmhlplfx7kphmnpvqm67w99hd2m7kdixwdxq0zqg"; - }; + src = fetchFromGitHub { + owner = "ericbmerritt"; + repo = "hex2nix"; + rev = "${version}"; + sha256 = "1w7xjidz1l5yjmhlplfx7kphmnpvqm67w99hd2m7kdixwdxq0zqg"; + }; beamDeps = [ ibrowse jsx erlware_commons ]; } - The only visible difference between this derivation and - something like stdenv.mkDerivation is that we - have added erlangDeps to the derivation. If - you add your Beam dependencies here they will be correctly - handled by the system. + Such derivations are callable with + beam.packages.erlang.callPackage (see ). To call this package using the normal + callPackage, refer to dependency packages via + beamPackages, e.g. + beamPackages.ibrowse. - If your package needs to compile native code via Rebar's port - compilation mechenism. You should add compilePort = - true; to the derivation. + Notably, buildRebar3 includes + beamDeps, while + stdenv.mkDerivation does not. BEAM dependencies added + there will be correctly handled by the system. + + + If a package needs to compile native code via Rebar3's port compilation + mechanism, add compilePort = true; to the derivation.
Erlang.mk Packages - Erlang.mk functions almost identically to Rebar. The only real - difference is that buildErlangMk is called - instead of buildRebar3 + Erlang.mk functions similarly to Rebar3, except we use + buildErlangMk instead of + buildRebar3. - { buildErlangMk, fetchHex, cowlib, ranch }: - buildErlangMk { - name = "cowboy"; - version = "1.0.4"; - src = fetchHex { - pkg = "cowboy"; - version = "1.0.4"; - sha256 = - "6a0edee96885fae3a8dd0ac1f333538a42e807db638a9453064ccfdaa6b9fdac"; - }; - beamDeps = [ cowlib ranch ]; + { buildErlangMk, fetchHex, cowlib, ranch }: - meta = { - description = ''Small, fast, modular HTTP server written in - Erlang.''; - license = stdenv.lib.licenses.isc; - homepage = "https://github.com/ninenines/cowboy"; - }; + buildErlangMk { + name = "cowboy"; + version = "1.0.4"; + + src = fetchHex { + pkg = "cowboy"; + version = "1.0.4"; + sha256 = "6a0edee96885fae3a8dd0ac1f333538a42e807db638a9453064ccfdaa6b9fdac"; + }; + + beamDeps = [ cowlib ranch ]; + + meta = { + description = '' + Small, fast, modular HTTP server written in Erlang + ''; + license = stdenv.lib.licenses.isc; + homepage = https://github.com/ninenines/cowboy; + }; }
Mix Packages - Mix functions almost identically to Rebar. The only real - difference is that buildMix is called - instead of buildRebar3 + Mix functions similarly to Rebar3, except we use + buildMix instead of buildRebar3. { buildMix, fetchHex, plug, absinthe }: + buildMix { name = "absinthe_plug"; version = "1.0.0"; + src = fetchHex { pkg = "absinthe_plug"; version = "1.0.0"; - sha256 = - "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33"; + sha256 = "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33"; }; - beamDeps = [ plug absinthe]; + + beamDeps = [ plug absinthe ]; meta = { - description = ''A plug for Absinthe, an experimental GraphQL - toolkit''; + description = '' + A plug for Absinthe, an experimental GraphQL toolkit + ''; license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/CargoSense/absinthe_plug"; + homepage = https://github.com/CargoSense/absinthe_plug; + }; + } + + + Alternatively, we can use buildHex as a shortcut: + + + { buildHex, buildMix, plug, absinthe }: + + buildHex { + name = "absinthe_plug"; + version = "1.0.0"; + + sha256 = "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33"; + + builder = buildMix; + + beamDeps = [ plug absinthe ]; + + meta = { + description = '' + A plug for Absinthe, an experimental GraphQL toolkit + ''; + license = stdenv.lib.licenses.bsd3; + homepage = https://github.com/CargoSense/absinthe_plug; }; } @@ -185,18 +282,18 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse
- How to develop + How to Develop
Accessing an Environment - Often, all you want to do is be able to access a valid - environment that contains a specific package and its - dependencies. we can do that with the env - part of a derivation. For example, lets say we want to access an - erlang repl with ibrowse loaded up. We could do the following. + Often, we simply want to access a valid environment that contains a + specific package and its dependencies. We can accomplish that with the + env attribute of a derivation. For example, let's say + we want to access an Erlang REPL with ibrowse loaded + up. We could do the following: - ~/w/nixpkgs ❯❯❯ nix-shell -A beamPackages.ibrowse.env --run "erl" + $ nix-shell -A beamPackages.ibrowse.env --run "erl" Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false] Eshell V7.0 (abort with ^G) @@ -237,20 +334,19 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse 2> - Notice the -A beamPackages.ibrowse.env.That - is the key to this functionality. + Notice the -A beamPackages.ibrowse.env. That is the key + to this functionality.
Creating a Shell Getting access to an environment often isn't enough to do real - development. Many times we need to create a - shell.nix file and do our development inside - of the environment specified by that file. This file looks a lot - like the packaging described above. The main difference is that - src points to project root and we call the - package directly. + development. Usually, we need to create a shell.nix + file and do our development inside of the environment specified therein. + This file looks a lot like the packaging described above, except that + src points to the project root and we call the package + directly. { pkgs ? import "<nixpkgs"> {} }: @@ -264,18 +360,19 @@ let name = "hex2nix"; version = "0.1.0"; src = ./.; - erlangDeps = [ ibrowse jsx erlware_commons ]; + beamDeps = [ ibrowse jsx erlware_commons ]; }; drv = beamPackages.callPackage f {}; in - drv + + drv
- Building in a shell + Building in a Shell (for Mix Projects) - We can leveral the support of the Derivation, regardless of - which build Derivation is called by calling the commands themselv.s + We can leverage the support of the derivation, irrespective of the build + derivation, by calling the commands themselves. # ============================================================================= @@ -335,42 +432,43 @@ analyze: build plt - If you add the shell.nix as described and - user rebar as follows things should simply work. Aside from the + Using a shell.nix as described (see ) should just work. Aside from test, plt, and - analyze the talks work just fine for all of - the build Derivations. + analyze, the Make targets work just fine for all of the + build derivations.
- Generating Packages from Hex with Hex2Nix + Generating Packages from Hex with <literal>hex2nix</literal> - Updating the Hex packages requires the use of the - hex2nix tool. Given the path to the Erlang - modules (usually - pkgs/development/erlang-modules). It will - happily dump a file called - hex-packages.nix. That file will contain all - the packages that use a recognized build system in Hex. However, - it can't know whether or not all those packages are buildable. + Updating the Hex package set + requires hex2nix. Given the + path to the Erlang modules (usually + pkgs/development/erlang-modules), it will dump a file + called hex-packages.nix, containing all the packages that + use a recognized build system in Hex. It can't be determined, however, + whether every package is buildable. - To make life easier for our users, it makes good sense to go - ahead and attempt to build all those packages and remove the - ones that don't build. To do that, simply run the command (in - the root of your nixpkgs repository). that follows. + To make life easier for our users, try to build every Hex package and remove those that fail. + To do that, simply run the following command in the root of your + nixpkgs repository: $ nix-build -A beamPackages - That will build every package in - beamPackages. Then you can go through and - manually remove the ones that fail. Hopefully, someone will - improve hex2nix in the future to automate - that. + That will attempt to build every package in + beamPackages. Then manually remove those that fail. + Hopefully, someone will improve hex2nix in the + future to automate the process.
diff --git a/doc/languages-frameworks/vim.md b/doc/languages-frameworks/vim.md index 5442d706cb0..1d6a4fe8da8 100644 --- a/doc/languages-frameworks/vim.md +++ b/doc/languages-frameworks/vim.md @@ -8,15 +8,48 @@ date: 2016-06-25 You'll get a vim(-your-suffix) in PATH also loading the plugins you want. Loading can be deferred; see examples. -VAM (=vim-addon-manager) and Pathogen plugin managers are supported. -Vundle, NeoBundle could be your turn. +Vim packages, VAM (=vim-addon-manager) and Pathogen are supported to load +packages. -## dependencies by Vim plugins +## Custom configuration + +Adding custom .vimrc lines can be done using the following code: + +``` +vim_configurable.customize { + name = "vim-with-plugins"; + + vimrcConfig.customRC = '' + set hidden + ''; +} +``` + +## Vim packages + +To store you plugins in Vim packages the following example can be used: + +``` +vim_configurable.customize { + vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; { + # loaded on launch + start = [ youcompleteme fugitive ]; + # manually loadable by calling `:packadd $plugin-name` + opt = [ phpCompletion elm-vim ]; + # To automatically load a plugin when opening a filetype, add vimrc lines like: + # autocmd FileType php :packadd phpCompletion + } +}; +``` + +## VAM + +### dependencies by Vim plugins VAM introduced .json files supporting dependencies without versioning assuming that "using latest version" is ok most of the time. -## HOWTO +### Example First create a vim-scripts file having one plugin name per line. Example: diff --git a/lib/customisation.nix b/lib/customisation.nix index 6d6c0234087..98a46ca6c61 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -51,6 +51,24 @@ rec { else { })); + /* `makeOverridable` takes a function from attribute set to attribute set and + injects `override` attibute which can be used to override arguments of + the function. + + nix-repl> x = {a, b}: { result = a + b; } + + nix-repl> y = lib.makeOverridable x { a = 1; b = 2; } + + nix-repl> y + { override = «lambda»; overrideDerivation = «lambda»; result = 3; } + + nix-repl> y.override { a = 10; } + { override = «lambda»; overrideDerivation = «lambda»; result = 12; } + + Please refer to "Nixpkgs Contributors Guide" section + ".overrideDerivation" to learn about `overrideDerivation` and caveats + related to its use. + */ makeOverridable = f: origArgs: let ff = f origArgs; diff --git a/lib/debug.nix b/lib/debug.nix index 5b3878554c5..925e0d405a7 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -20,8 +20,32 @@ rec { traceXMLValMarked = str: x: trace (str + builtins.toXML x) x; # strict trace functions (traced structure is fully evaluated and printed) + + /* `builtins.trace`, but the value is `builtins.deepSeq`ed first. */ traceSeq = x: y: trace (builtins.deepSeq x x) y; + + /* Like `traceSeq`, but only down to depth n. + * This is very useful because lots of `traceSeq` usages + * lead to an infinite recursion. + */ + traceSeqN = depth: x: y: with lib; + let snip = v: if isList v then noQuotes "[…]" v + else if isAttrs v then noQuotes "{…}" v + else v; + noQuotes = str: v: { __pretty = const str; val = v; }; + modify = n: fn: v: if (n == 0) then fn v + else if isList v then map (modify (n - 1) fn) v + else if isAttrs v then mapAttrs + (const (modify (n - 1) fn)) v + else v; + in trace (generators.toPretty { allowPrettyValues = true; } + (modify depth snip x)) y; + + /* `traceSeq`, but the same value is traced and returned */ traceValSeq = v: traceVal (builtins.deepSeq v v); + /* `traceValSeq` but with fixed depth */ + traceValSeqN = depth: v: traceSeqN depth v v; + # this can help debug your code as well - designed to not produce thousands of lines traceShowVal = x: trace (showVal x) x; diff --git a/lib/generators.nix b/lib/generators.nix index 4d3c920b0ae..4419c3c8891 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -90,4 +90,41 @@ rec { * parsers as well. */ toYAML = {}@args: toJSON args; + + /* Pretty print a value, akin to `builtins.trace`. + * Should probably be a builtin as well. + */ + toPretty = { + /* If this option is true, attrsets like { __pretty = fn; val = …; } + will use fn to convert val to a pretty printed representation. + (This means fn is type Val -> String.) */ + allowPrettyValues ? false + }@args: v: with builtins; + if isInt v then toString v + else if isBool v then (if v == true then "true" else "false") + else if isString v then "\"" + v + "\"" + else if null == v then "null" + else if isFunction v then + let fna = functionArgs v; + showFnas = concatStringsSep "," (libAttr.mapAttrsToList + (name: hasDefVal: if hasDefVal then "(${name})" else name) + fna); + in if fna == {} then "<λ>" + else "<λ:{${showFnas}}>" + else if isList v then "[ " + + libStr.concatMapStringsSep " " (toPretty args) v + + " ]" + else if isAttrs v then + # apply pretty values if allowed + if attrNames v == [ "__pretty" "val" ] && allowPrettyValues + then v.__pretty v.val + # TODO: there is probably a better representation? + else if v ? type && v.type == "derivation" then "<δ>" + else "{ " + + libStr.concatStringsSep " " (libAttr.mapAttrsToList + (name: value: + "${toPretty args name} = ${toPretty args value};") v) + + " }" + else "toPretty: should never happen (v = ${v})"; + } diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d4f9d1c31a8..328a5d772db 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -141,6 +141,7 @@ dfoxfranke = "Daniel Fox Franke "; dgonyeo = "Derek Gonyeo "; dipinhora = "Dipin Hora "; + disassembler = "Samuel Leathers "; dmalikov = "Dmitry Malikov "; DmitryTsygankov = "Dmitry Tsygankov "; dmjio = "David Johnson "; @@ -467,6 +468,7 @@ rob = "Rob Vermaas "; robberer = "Longrin Wischnewski "; robbinch = "Robbin C. "; + roberth = "Robert Hensing "; robgssp = "Rob Glossop "; roblabla = "Robin Lambertz "; roconnor = "Russell O'Connor "; @@ -477,6 +479,7 @@ rushmorem = "Rushmore Mushambi "; rvl = "Rodney Lorrimar "; rvlander = "Gaëtan André "; + rvolosatovs = "Roman Volosatovs keys and keyFiles options. + Warning: If you are using NixOps then don't use this + option since it will replace the key required for deployment via ssh. ''; }; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 09fcdd0b72b..01e1659b30b 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -648,34 +648,25 @@ in services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb"; - system.extraDependencies = [ - (pkgs.runCommand "xkb-layouts-exist" { - layouts=cfg.layout; - } '' - missing=() - while read -d , layout - do - [[ -f "${cfg.xkbDir}/symbols/$layout" ]] || missing+=($layout) - done <<< "$layouts," - if [[ ''${#missing[@]} -eq 0 ]] - then - touch $out - exit 0 - fi + system.extraDependencies = singleton (pkgs.runCommand "xkb-layouts-exist" { + inherit (cfg) layout xkbDir; + } '' + sed -n -e ':i /^! \(layout\|variant\) *$/ { + :l; n; /^!/bi; s/^ *\([^ ]\+\).*/\1/p; tl + }' "$xkbDir/rules/base.lst" | grep -qxF "$layout" && exec touch "$out" - cat >&2 <&2 <<-EOF - Some of the selected keyboard layouts do not exist: + The selected keyboard layout definition does not exist: - ''${missing[@]} + $layout - Set services.xserver.layout to the name of an existing keyboard - layout (check ${cfg.xkbDir}/symbols for options). + Set \`services.xserver.layout' to the name of an existing keyboard + layout (check $xkbDir/rules/base.lst for options). - EOF - exit -1 - '') - ]; + EOF + exit 1 + ''); services.xserver.config = '' diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index cb2a17f18f4..779005c0df5 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -11,35 +11,42 @@ import errno import warnings import ctypes libc = ctypes.CDLL("libc.so.6") +import re def copy_if_not_exists(source, dest): if not os.path.exists(dest): shutil.copyfile(source, dest) -def system_dir(generation): - return "/nix/var/nix/profiles/system-%d-link" % (generation) +def system_dir(profile, generation): + if profile: + return "/nix/var/nix/profiles/system-profiles/%s-%d-link" % (profile, generation) + else: + return "/nix/var/nix/profiles/system-%d-link" % (generation) -BOOT_ENTRY = """title NixOS +BOOT_ENTRY = """title NixOS{profile} version Generation {generation} linux {kernel} initrd {initrd} options {kernel_params} """ -def write_loader_conf(generation): +def write_loader_conf(profile, generation): with open("@efiSysMountPoint@/loader/loader.conf.tmp", 'w') as f: if "@timeout@" != "": f.write("timeout @timeout@\n") - f.write("default nixos-generation-%d\n" % generation) + if profile: + f.write("default nixos-%s-generation-%d\n" % (profile, generation)) + else: + f.write("default nixos-generation-%d\n" % (generation)) if not @editor@: f.write("editor 0"); os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf") -def profile_path(generation, name): - return os.readlink("%s/%s" % (system_dir(generation), name)) +def profile_path(profile, generation, name): + return os.readlink("%s/%s" % (system_dir(profile, generation), name)) -def copy_from_profile(generation, name, dry_run=False): - store_file_path = profile_path(generation, name) +def copy_from_profile(profile, generation, name, dry_run=False): + store_file_path = profile_path(profile, generation, name) suffix = os.path.basename(store_file_path) store_dir = os.path.basename(os.path.dirname(store_file_path)) efi_file_path = "/efi/nixos/%s-%s.efi" % (store_dir, suffix) @@ -47,22 +54,26 @@ def copy_from_profile(generation, name, dry_run=False): copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path)) return efi_file_path -def write_entry(generation, machine_id): - kernel = copy_from_profile(generation, "kernel") - initrd = copy_from_profile(generation, "initrd") +def write_entry(profile, generation, machine_id): + kernel = copy_from_profile(profile, generation, "kernel") + initrd = copy_from_profile(profile, generation, "initrd") try: - append_initrd_secrets = profile_path(generation, "append-initrd-secrets") + append_initrd_secrets = profile_path(profile, generation, "append-initrd-secrets") subprocess.check_call([append_initrd_secrets, "@efiSysMountPoint@%s" % (initrd)]) except FileNotFoundError: pass - entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation) - generation_dir = os.readlink(system_dir(generation)) + if profile: + entry_file = "@efiSysMountPoint@/loader/entries/nixos-%s-generation-%d.conf" % (profile, generation) + else: + entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation) + generation_dir = os.readlink(system_dir(profile, generation)) tmp_path = "%s.tmp" % (entry_file) kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir) with open("%s/kernel-params" % (generation_dir)) as params_file: kernel_params = kernel_params + params_file.read() with open(tmp_path, 'w') as f: - f.write(BOOT_ENTRY.format(generation=generation, + f.write(BOOT_ENTRY.format(profile=" [" + profile + "]" if profile else "", + generation=generation, kernel=kernel, initrd=initrd, kernel_params=kernel_params)) @@ -77,29 +88,33 @@ def mkdir_p(path): if e.errno != errno.EEXIST or not os.path.isdir(path): raise -def get_generations(profile): +def get_generations(profile=None): gen_list = subprocess.check_output([ "@nix@/bin/nix-env", "--list-generations", "-p", - "/nix/var/nix/profiles/%s" % (profile), + "/nix/var/nix/profiles/%s" % ("system-profiles/" + profile if profile else "system"), "--option", "build-users-group", ""], universal_newlines=True) gen_lines = gen_list.split('\n') gen_lines.pop() - return [ int(line.split()[0]) for line in gen_lines ] + return [ (profile, int(line.split()[0])) for line in gen_lines ] def remove_old_entries(gens): - slice_start = len("@efiSysMountPoint@/loader/entries/nixos-generation-") - slice_end = -1 * len(".conf") + rex_profile = re.compile("^@efiSysMountPoint@/loader/entries/nixos-(.*)-generation-.*\.conf$") + rex_generation = re.compile("^@efiSysMountPoint@/loader/entries/nixos.*-generation-(.*)\.conf$") known_paths = [] for gen in gens: - known_paths.append(copy_from_profile(gen, "kernel", True)) - known_paths.append(copy_from_profile(gen, "initrd", True)) - for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos-generation-[1-9]*.conf"): + known_paths.append(copy_from_profile(*gen, "kernel", True)) + known_paths.append(copy_from_profile(*gen, "initrd", True)) + for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos*-generation-[1-9]*.conf"): try: - gen = int(path[slice_start:slice_end]) - if not gen in gens: + if rex_profile.match(path): + prof = rex_profile.sub(r"\1", path) + else: + prof = "system" + gen = int(rex_generation.sub(r"\1", path)) + if not (prof, gen) in gens: os.unlink(path) except ValueError: pass @@ -107,6 +122,14 @@ def remove_old_entries(gens): if not path in known_paths: os.unlink(path) +def get_profiles(): + if os.path.isdir("/nix/var/nix/profiles/system-profiles/"): + return [x + for x in os.listdir("/nix/var/nix/profiles/system-profiles/") + if not x.endswith("-link")] + else: + return [] + def main(): parser = argparse.ArgumentParser(description='Update NixOS-related systemd-boot files') parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot') @@ -141,12 +164,14 @@ def main(): mkdir_p("@efiSysMountPoint@/efi/nixos") mkdir_p("@efiSysMountPoint@/loader/entries") - gens = get_generations("system") + gens = get_generations() + for profile in get_profiles(): + gens += get_generations(profile) remove_old_entries(gens) for gen in gens: - write_entry(gen, machine_id) - if os.readlink(system_dir(gen)) == args.default_config: - write_loader_conf(gen) + write_entry(*gen, machine_id) + if os.readlink(system_dir(*gen)) == args.default_config: + write_loader_conf(*gen) # Since fat32 provides little recovery facilities after a crash, # it can leave the system in an unbootable state, when a crash/outage diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 4217f5940ec..eca2d281342 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -72,6 +72,12 @@ in rec { (all nixos.tests.ecryptfs) (all nixos.tests.ipv6) (all nixos.tests.i3wm) + (all nixos.tests.keymap.azerty) + (all nixos.tests.keymap.colemak) + (all nixos.tests.keymap.dvorak) + (all nixos.tests.keymap.dvp) + (all nixos.tests.keymap.neo) + (all nixos.tests.keymap.qwertz) (all nixos.tests.plasma5) #(all nixos.tests.lightdm) (all nixos.tests.login) diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index 82be9bc1d72..1ce2b815784 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -24,7 +24,7 @@ let user = nodes.machine.config.users.extraUsers.alice; in '' startAll; - $machine->waitForText(qr/ALICE/); + $machine->waitForText(qr/select your user/i); $machine->screenshot("sddm"); $machine->sendChars("${user.password}\n"); $machine->waitForFile("/home/alice/.Xauthority"); diff --git a/pkgs/applications/audio/mopidy-local-images/default.nix b/pkgs/applications/audio/mopidy-local-images/default.nix new file mode 100644 index 00000000000..e9538273568 --- /dev/null +++ b/pkgs/applications/audio/mopidy-local-images/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + name = "mopidy-local-images-${version}"; + + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "mopidy"; + repo = "mopidy-local-images"; + rev = "v${version}"; + sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d"; + }; + + propagatedBuildInputs = [ + mopidy + pythonPackages.pykka + pythonPackages.uritools + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/mopidy/mopidy-local-images"; + description = "Mopidy local library proxy extension for handling embedded album art"; + license = licenses.asl20; + maintainers = [ maintainers.rvolosatovs ]; + }; +} diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index e5dbf0aab84..266e221649e 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -8,7 +8,7 @@ let # Please update the stable branch! # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ - version = "1.0.55.487.g256699aa-16"; + version = "1.0.57.474.gca9c9538-30"; deps = [ alsaLib @@ -53,7 +53,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "09rhm0jp5prcvyf8zpw4pl422yiy8nkazcjc3lv61ngpznk3n1r0"; + sha256 = "fe46f2084c45c756bee366f744d2821d79e82866b19942e30bb2a20c1e597437"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index 25842d4a989..3bfee48b8cd 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }: stdenv.mkDerivation rec { - version = "4.8.2"; + version = "4.8.3"; rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time name = "crashplan-${version}-r${rev}"; src = fetchurl { url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz"; - sha256 = "0wh8lcm06ilcyncnp4ckg4yhyf9z3gb6v1kr111j4bpgmnd0v1yf"; + sha256 = "c25d87ec1d442a396b668547e39b70d66dcfe02250cc57a25916ebb42a407113"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 9bf51fc0904..7c0a7df2649 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -1221,10 +1221,10 @@ metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "metar"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/metar-0.2.el"; - sha256 = "0rfzq79llh6ixw02kjpn8s2shxrabvfvsq48pagwak1jl2s0askf"; + url = "https://elpa.gnu.org/packages/metar-0.3.el"; + sha256 = "07gv0v0xwb5yzynwagmvf0n5c9wljy1jg4ympnxpa2d9r1zqc02g"; }; packageRequires = [ cl-lib ]; meta = { @@ -1445,10 +1445,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170606"; + version = "20170622"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20170606.tar"; - sha256 = "0m2gln3wz9v3aflyxxy2317808yy05rrzrjx35spw2d90d10hmkz"; + url = "https://elpa.gnu.org/packages/org-20170622.tar"; + sha256 = "0922lcbr2r7bkswljqzbm5y3ny1n67qfrmf7h7z9hsw2wy0505dp"; }; packageRequires = []; meta = { @@ -1771,10 +1771,10 @@ soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "soap-client"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/soap-client-3.1.2.tar"; - sha256 = "0crfpp2ksqvzf2j3q44qq6z8zh1r10q9kw12cxbmjiih89q01b68"; + url = "https://elpa.gnu.org/packages/soap-client-3.1.3.tar"; + sha256 = "1s5m6dc7z532wchdih2ax2a791khyajjxb2xaw5rklk47yc5v3nk"; }; packageRequires = [ cl-lib ]; meta = { @@ -2100,14 +2100,15 @@ license = lib.licenses.free; }; }) {}; - websocket = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + websocket = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { pname = "websocket"; version = "1.8"; src = fetchurl { url = "https://elpa.gnu.org/packages/websocket-1.8.tar"; sha256 = "0dcxmnnm8z7cvsc7nkb822a1g6w03klp7cijjnfq0pz84p3w9cd9"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://elpa.gnu.org/packages/websocket.html"; license = lib.licenses.free; diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index daea504c24c..629f094bbc1 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -316,12 +316,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "20170608.958"; + version = "20170615.838"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "8fdfbbebf096017ab45cedcff2c43a0a5d8b9686"; - sha256 = "0ik1hh8qs5yjb034zc93fyd6la84mgp6y5gzvpz6rfbjfxy6vf3y"; + rev = "ee692f7cde535f317e440a132b8e60b7c5e34dfd"; + sha256 = "0zg39brrpgdakb6hbylala6ajja09nhbzqf4xl9nzwc7gzpgfl57"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -738,8 +738,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "eba56378cf8d60c4871e0e9d0d0e201d302778ea"; - sha256 = "0d5pwxla9lkrkb2a5c7y4sm6js7jgm2m8i3lja0c5qzw5b50zwxs"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -755,12 +755,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20170327.542"; + version = "20170612.2134"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "eba56378cf8d60c4871e0e9d0d0e201d302778ea"; - sha256 = "0d5pwxla9lkrkb2a5c7y4sm6js7jgm2m8i3lja0c5qzw5b50zwxs"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -801,8 +801,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; - sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; + rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; + sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1011,8 +1011,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "99787dc79ed9ec14a2b87257d6c8ce5b8ec0a0b0"; - sha256 = "103pb0c5g25fsnbjcjgj04aq4damxwhm2fg86fgxihrch8a7bhcn"; + rev = "8af476ac323e56d3c69ec2ecd1c095de56ecd18e"; + sha256 = "0218qfmpjw57842w1wn6p5bkn1qmn39scnnsnc0a1xn8ywz1ivw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1466,12 +1466,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "alchemist"; - version = "20170402.2339"; + version = "20170614.218"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "46d09a6abaa8adf5e06184b77d04638ff3aa9087"; - sha256 = "1wvbn4capcf049y33633b4v8k1aqwi94lscif810f7p3m0xdai30"; + rev = "38c0d2a21e3fedf71eda5f21f51aa79a0fddeb3b"; + sha256 = "1hvkx35hjnpj8jfl41b510mcqfcxbv5msc8zmvd7jmdfx5gcn2d7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1491,8 +1491,8 @@ src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "8bf40e0ed78c3d2b6536bee3a4b50a9f78a0c1a1"; - sha256 = "167lmzh4grz4k47pw0pcq5pqbwjncfgw2wgzhvvg5jp66p7pmwqp"; + rev = "e32d3908e40287648b3e88014aa9c2c977a9b715"; + sha256 = "0993zm6dn2k85pkyvwf63ccqc90z1s8b3qaqpxm9qprinimxff6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1592,12 +1592,12 @@ all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "20170516.158"; + version = "20170623.357"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "7134b7467a7061b57c8cda3503e9644d4ed92a2a"; - sha256 = "0xwj8wyj0ywpy4rcqxz15hkr8jnffn7nrp5fnq56j360v8858q8x"; + rev = "2a0971cbadd39f6a89963351fe3fbcf9ca54566e"; + sha256 = "08a676qnh7vab39zngrllmi0w54k97c9kmig5j3yxr7jki1g5c4y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -2999,12 +2999,12 @@ auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auctex-latexmk"; - version = "20160923.7"; + version = "20170618.936"; src = fetchFromGitHub { owner = "tom-tan"; repo = "auctex-latexmk"; - rev = "0315925ac9a892e73859cf4b720f36f2727f47f1"; - sha256 = "0cdc2wkyqs4c6iypkynm0s540isp7yyyavp80rg5x3cid3hsbinm"; + rev = "4d353522650d7685acbf1d38f7dbc504f734bd84"; + sha256 = "0qvscgffmzqk8lkcg3yk91vciim5ygk2m4crk02qn72ipkw5q13m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk"; @@ -3562,12 +3562,12 @@ auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-minor-mode"; - version = "20170601.1421"; + version = "20170620.1001"; src = fetchFromGitHub { owner = "joewreschnig"; repo = "auto-minor-mode"; - rev = "92871449782f8679f15573ad178b9c2247da8bfd"; - sha256 = "14kh6p34mrqfqyjzr0wvxx4acp72pz2b75w96y3jyhiswvaqfcr1"; + rev = "c91c566cbaf8eac1fff0c7d9eef88308a566cc43"; + sha256 = "0nq95k2wmq17awjz0kvzwnhpnda0813gdyjzlqpzpqb56092sbif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode"; @@ -3730,12 +3730,12 @@ auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }: melpaBuild { pname = "auto-virtualenvwrapper"; - version = "20170518.1442"; + version = "20170618.52"; src = fetchFromGitHub { owner = "robert-zaremba"; repo = "auto-virtualenvwrapper.el"; - rev = "e2fb997e452e62e8bf9f80691941d3d25208e944"; - sha256 = "0c0llr8kpq54zy1k2qjhhln76ii7r0nmgb85s3nrzar5l1z57zqg"; + rev = "516cb0406a98fd5a41d389f37544f11b28b1d027"; + sha256 = "0y82n8354nri2qpz7bn58rbhpjkqiaf82q9izhl6jy12g63g416l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper"; @@ -4403,12 +4403,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20170606.1402"; + version = "20170613.1031"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "be8f3ea35a2f58a218db062934ce3a1a054db3df"; - sha256 = "01pdwvv1pbphnsw3h38x087xbdp5ry1h18bqiiispzvhyc56xvak"; + rev = "0ed117ef35a599f01fa1f9387c84c600faf26c78"; + sha256 = "0bsfn8fvs7mzhi452zdl1wa0sk3m1xm5gb0k83xm37fa1sxl7nkf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4819,12 +4819,12 @@ beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beginend"; - version = "20170605.541"; + version = "20170618.503"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "28806d09207e4a194a39eb385650824a0121e0cd"; - sha256 = "17qhbgq3ciyjjl4a1mm6qn5g5y39plmncad6i4kijcda9kx44w48"; + rev = "0aa6033b55a2833e6f0810ee677c258f6c3e3fbf"; + sha256 = "1qrqdvqhjaz0y0q4298vr85cm73526srirxz7zyalkl172jzwhgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -4882,12 +4882,12 @@ better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "better-defaults"; - version = "20170425.834"; + version = "20170613.2104"; src = fetchFromGitHub { owner = "technomancy"; repo = "better-defaults"; - rev = "6f502fd2d7aa8940a31fd630f883a63e04a002e6"; - sha256 = "15vayr1wy4qzgsv37pg8gjbv6b5zm9r51ql5j5l5q1x1ks9b6w2f"; + rev = "12d9e6dbf24a8a3369b19650d74471b17b27f78d"; + sha256 = "1rx3p6syp6axnxbscg0l73yihgwdq7bdnkcrvfikz79yflxrsnmq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7bb729c1ad8602a5c0c27e81c9442981a54a924a/recipes/better-defaults"; @@ -5136,8 +5136,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "726eea13a3a4d75d630aac29d6b71d74d9dc69e3"; - sha256 = "1r75ysdz6cj97vn46lj4g2a3hsab377f667a8bfs17rz007nddv4"; + rev = "5bd87be2c99196c5342de7ffd56dd9e703a7e400"; + sha256 = "10q6zwhp6501sl92p4ag9bp0awagbkn7757iy0ysprxnpc2ajznf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5592,12 +5592,12 @@ boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "boogie-friends"; - version = "20170521.1917"; + version = "20170621.1207"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie-friends"; - rev = "38ab3efc2021318cd62f9187214b69d34b4afca6"; - sha256 = "01yccb86gzag2anmqj1p196m5374mxnxha1fbhv7krc2avx2j71x"; + rev = "27c372592e19678bda5012f1ec3c60bcf9df78d4"; + sha256 = "1qcjbmkx6qim2j1sbzjjidqhrakjsipay9bdssyfyi4bwwp8mnq2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends"; @@ -6487,12 +6487,12 @@ c-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "c-eldoc"; - version = "20170227.809"; + version = "20170618.845"; src = fetchFromGitHub { owner = "nflath"; repo = "c-eldoc"; - rev = "2232000692f6f891456fecf23c538d5b47302a60"; - sha256 = "0mr49mvjak30c6x8n4c13xi4rjfnbpnizq27f4zmryx5k8w5f9fp"; + rev = "0899f497e98e285d7d2e9cf897e305587b4b0790"; + sha256 = "0yw59pm25a5xrcdl6mv30i08wnhljy6gndvnlpi09vp2dln37kbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/c-eldoc"; @@ -6764,8 +6764,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "camcorder.el"; - rev = "c96b3392c99b9f83c968bffa330ec4356c41518e"; - sha256 = "0am8asrzjs3iwak9c86fxb4zwgx5smbb9ywp0zn4y7j37blygswj"; + rev = "b13d939990e6709492efefc0945798adc1c0fcb9"; + sha256 = "0y8hw463w77rvf7cn5bqjnfww8h8kfkn37wi1kfjfq8hyirw4zrb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/camcorder"; @@ -6783,7 +6783,7 @@ version = "20151009.845"; src = fetchsvn { url = "https://caml.inria.fr/svn/ocaml/trunk/emacs/"; - rev = "16557"; + rev = "16558"; sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw"; }; recipeFile = fetchurl { @@ -6821,12 +6821,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20170203.35"; + version = "20170621.1316"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "25ca2fcbd6b664cc7a20b0cccca3adc19e79917a"; - sha256 = "1fzrczx1aq0q130qrvzq8dssc1qm5qc9pclsyd3zn27xbn5lsag3"; + rev = "b0487f95a7de7a1d6f03cdd05220f633977d65a2"; + sha256 = "0r9v7q7hkdw2q3iifyrb6n9jrssz2rcv2xcc7n1nmg1v40av3ijd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6993,7 +6993,7 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "25057a27543788079e7040bf42b139e0aa0635b5"; + rev = "b2baa9297cce22e628c213549e0a2fe98f2ad643"; sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f"; }; recipeFile = fetchurl { @@ -7035,7 +7035,7 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "25057a27543788079e7040bf42b139e0aa0635b5"; + rev = "b2baa9297cce22e628c213549e0a2fe98f2ad643"; sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f"; }; recipeFile = fetchurl { @@ -7244,8 +7244,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "036c5898eb89e846fa1b86537a5c0569868dbaf0"; - sha256 = "0cz4cwisnlbkclc6cn7rlz7pkpwh5p0646dzrkw92bk5vmwh89pg"; + rev = "e82320b90ebaae9e1f8f1b709455f465a773ed0f"; + sha256 = "0awyj4rp9f2q7562xz52cm8zklsmlm5xyykw7x7n4d0qa72igm3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7284,7 +7284,7 @@ version = "20170201.347"; src = fetchsvn { url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12230"; + rev = "12255"; sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { @@ -7301,12 +7301,12 @@ challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "challenger-deep-theme"; - version = "20170428.301"; + version = "20170623.311"; src = fetchFromGitHub { owner = "MaxSt"; repo = "challenger-deep"; - rev = "a1e32cc882de952b887824bcc100aa095cb87b94"; - sha256 = "0f71ws2an3ivy4hyjqm141xxd7r62xh783n6fp21z7ya4zkzlvb5"; + rev = "22022667437e94c2309c7c77a14268970de16146"; + sha256 = "1prvdrc8wjb7dy8dqj5gvjzzdiz6hqv252inlwcyjrqiq4apipxz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme"; @@ -7427,12 +7427,12 @@ cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheat-sh"; - version = "20170606.727"; + version = "20170616.259"; src = fetchFromGitHub { owner = "davep"; repo = "cheat-sh.el"; - rev = "512c74b0cb0798a75303c5384ee165c8a5f3356b"; - sha256 = "1m65k2gqd5irwk4cj97p33q14shn4cpz0zxcpg4m3bgiwl8qmxhs"; + rev = "ee9a51f4b2a8b2f26008e00a84b6c344b6664e85"; + sha256 = "1hzv0l6vc7zdj93cimmi9rz6i6xsg25yf4rcfqlhcax10bhnjsd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh"; @@ -7908,12 +7908,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170525.255"; + version = "20170620.207"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "7ffc207cf0e56305963e1a3387dce3114325544d"; - sha256 = "1n4pik7fp4xlc0xdcnw649mx2r2qaiv1f5w9bbz1n4r4pqhmy5q7"; + rev = "55a579f56a05d945e6ce5764002d2cadafa581eb"; + sha256 = "1lni2a9gy44xna62w6kfv678j8zk1dawwaqrbyn3mdy1s7d3mcj9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8184,8 +8184,8 @@ version = "20170120.137"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "305184"; - sha256 = "1hs00lf2f2fmxv2abhskrlqr96395j3ywbgs8aacadbzigdx4iq5"; + rev = "306094"; + sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -8570,12 +8570,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20170608.2315"; + version = "20170622.2345"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "eacd330f28513276da18e4d6f2607f9041314c49"; - sha256 = "18hl01h390yhcm7g4ayvyz82m8gc29qv7za5vl10apfch5c6d2gw"; + rev = "197298e93af19f755cc2c54049dc5aeb04ce6553"; + sha256 = "0l5aw6hj0ry58b2ws2m0dlrasp5w8x62qcsbbzilapk2ysb9h787"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8595,8 +8595,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "eacd330f28513276da18e4d6f2607f9041314c49"; - sha256 = "18hl01h390yhcm7g4ayvyz82m8gc29qv7za5vl10apfch5c6d2gw"; + rev = "197298e93af19f755cc2c54049dc5aeb04ce6553"; + sha256 = "0l5aw6hj0ry58b2ws2m0dlrasp5w8x62qcsbbzilapk2ysb9h787"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8826,8 +8826,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "abd1216c1f8a1211d348568bb7695c30505de84e"; - sha256 = "1z3c0wjvk5ry69sjmslvw2mnnri63dk1vk6lbx881fxf67r4wf7f"; + rev = "4c7caf15e4feef244f7e1772c1c932cc790e2cab"; + sha256 = "1bizy68m7ggsbd98dm0c4cchr8r9h3lh3jfvcwcbpvmrlx0w4clm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9176,12 +9176,12 @@ color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-identifiers-mode"; - version = "20161019.1314"; + version = "20170615.1338"; src = fetchFromGitHub { owner = "ankurdave"; repo = "color-identifiers-mode"; - rev = "2b02b8d4ed0233d63a698a7f929b87fcaa8d0048"; - sha256 = "1jqvdask079373q9lgfp058892apx8qcchnrwwwd2zgfnwhjhy1q"; + rev = "d57e162c2dcb926291ded21cbe46b98ad0ca32c8"; + sha256 = "1n12z7qfwgsdvdzzi5gkgkmdaazbrg5064s08xsc6gsfs4rb5d17"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode"; @@ -9593,12 +9593,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20170611.1356"; + version = "20170617.1502"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "950c54721f85e68fd21f1e92991d597fd38685e4"; - sha256 = "1gkjin7ikghh4zbnpbg7gzhdj1hg125h8kq694aa4ag9379vivw7"; + rev = "9dbabd146c5884c1a1940eef010bcf834510a8e2"; + sha256 = "03nrim8r28d6zj7c6vgf5wldyfq7yfpc6yw37cmamkiqi0rhnc40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9769,12 +9769,12 @@ company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-coq"; - version = "20170504.1519"; + version = "20170615.1842"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "eddb16e5ed9bd2945c57054b2c0054dee600b985"; - sha256 = "18l442b2gnbgzn6x1qfdcfqn4ilh646fw694qam9g996vd0ncajb"; + rev = "642c0b5b539692242c476eb00af7bacc91d7fcc0"; + sha256 = "0mykqf03c7fbdb851fqdczb97cq6wq1lkinnjc2jaim5j4hc3gig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -10070,12 +10070,12 @@ company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: melpaBuild { pname = "company-irony"; - version = "20170611.1403"; + version = "20170612.1308"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "company-irony"; - rev = "f68c1b46d64b9f95cfc2a6d611089d0442ed58ba"; - sha256 = "0kfv89vma93qv97vh1ajg74wq62sq7f6gr39pm8hmfvmk0d6y51y"; + rev = "b8001ffc4da7403172835d47bc740cfbac35364d"; + sha256 = "03ym65ckpx6n03l633lwvxiwvcdhm8kjsw91ql1y4f44vijlh2xi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony"; @@ -10242,8 +10242,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "eba56378cf8d60c4871e0e9d0d0e201d302778ea"; - sha256 = "0d5pwxla9lkrkb2a5c7y4sm6js7jgm2m8i3lja0c5qzw5b50zwxs"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10374,8 +10374,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; - sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; + rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; + sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10538,12 +10538,12 @@ company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "20170606.49"; + version = "20170622.146"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "29aba538be5e44da81ad76a6078bb65c1c5e1aa6"; - sha256 = "0fpccpiwwsxg0asdzg0m5hlwdv6jyr7khywnd1rb6kvr8m2qm0hf"; + rev = "43d690e4922dbf44e5deffc89cd06f2b1bd79ad2"; + sha256 = "1vzsh8yj7v4qc5byb73pm25d408c28nm9cm780j289bpgx56p83s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -10894,12 +10894,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170610.2335"; + version = "20170622.1103"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c"; - sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878"; + rev = "f0426613062ba8305ebac41672d853a95cd9bbca"; + sha256 = "0mjh89snhm8lzy52k4wb352k8zljs2mkmx5w92ddhlzsfaf3hdd8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11020,12 +11020,12 @@ counsel-spotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-spotify"; - version = "20170523.1321"; + version = "20170612.1132"; src = fetchFromGitHub { owner = "Lautaro-Garcia"; repo = "counsel-spotify"; - rev = "7cecb359224f24e1e922b513b545187e6774d207"; - sha256 = "0lbh9z0w1czxvrdlbch71gys9wjsc9zr9i6xwq3ah40aydx251x2"; + rev = "dba8c1bf92e15f34f12a9e22b5958a93f10b46c5"; + sha256 = "1j7rzf8mws2yzdvfz8a6k48b5x6cn11lfvfya5s4c90kyy92j8ag"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b386462518a5ebb6454f4d01582df98395239bcc/recipes/counsel-spotify"; @@ -11693,8 +11693,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "1fd1023bd5f2ec2f457f13d0d0a165a98c05fde2"; - sha256 = "0gxn0kdzzsc801h5vhbpnn5p6msj6gv5lpy5qq6gyvvd0djp06mn"; + rev = "3c024a91109657088eda0f858be639c8d40c451c"; + sha256 = "03ppp20d98g824nnc4mnii3yzc58b5x3cbcifznr0pb0i4w5h42f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11960,8 +11960,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "0898a2f2bdc4dd01cc5ffacdf5dad45c9e38e32b"; - sha256 = "0chfmiy1nk12yalq2bd812580fr38x3di5vjf6z2kyi96p11jw6l"; + rev = "9db5c060c2f8c5e38b9865b8496c6057bba3044f"; + sha256 = "0qwjb3jqgnrk515l7931drp8agjc7l8bsrik6dzd5zik5zg7448i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12082,12 +12082,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20170424.247"; + version = "20170620.439"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "764382bdcb1056e96f31a66f7910c16de39c7801"; - sha256 = "0gj2hqcmf88i12vlc6i8pr7r6d1hczqhg7ablnycj673hnzzc5jh"; + rev = "6973f81ae5b97710b617754e7080027e0931eea6"; + sha256 = "1b62ibhcjbfdblr5f6sl5k6vn5hgz7ydipd8qlwslyyiqfypj17n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12100,22 +12100,22 @@ license = lib.licenses.free; }; }) {}; - dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20170508.2347"; + version = "20170622.34"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "05141a7f1ea9c368b469825cdc31c54194740c9d"; - sha256 = "158b083jlx4zi219z63nlim02gj7vds51bxxpvbhyw7222m5ddyv"; + rev = "b4e8e2b735408087a338813fc56979a5f2556d59"; + sha256 = "002m6mpq6kk0dqa3vlpr5dj9fxmyzphzxqgf1zzwrfrig4bipzsp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs"; name = "dante"; }; - packageRequires = [ dash emacs flycheck ]; + packageRequires = [ dash emacs f flycheck s ]; meta = { homepage = "https://melpa.org/#/dante"; license = lib.licenses.free; @@ -12334,12 +12334,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20170523.219"; + version = "20170613.151"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "524e6fe86ba240d4405d3de1c862921fb8085c8d"; - sha256 = "0ipgfwz5xvqm6lk3r3z0pxr49j7rqwsc4zd9d061dh5f9s5vv2qx"; + rev = "1e14307e2d829d3e4d502991d572eb9a5d7f173f"; + sha256 = "1mvafh0zs3kns1l41qry2vf5vfrwllyhgcj97gmvczm9slqxp01a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12380,8 +12380,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "524e6fe86ba240d4405d3de1c862921fb8085c8d"; - sha256 = "0ipgfwz5xvqm6lk3r3z0pxr49j7rqwsc4zd9d061dh5f9s5vv2qx"; + rev = "1e14307e2d829d3e4d502991d572eb9a5d7f173f"; + sha256 = "1mvafh0zs3kns1l41qry2vf5vfrwllyhgcj97gmvczm9slqxp01a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12590,7 +12590,7 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "25057a27543788079e7040bf42b139e0aa0635b5"; + rev = "b2baa9297cce22e628c213549e0a2fe98f2ad643"; sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f"; }; recipeFile = fetchurl { @@ -13106,12 +13106,12 @@ diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diff-hl"; - version = "20170519.1530"; + version = "20170617.1540"; src = fetchFromGitHub { owner = "dgutov"; repo = "diff-hl"; - rev = "63f1687aafb4449761bb19f3f5f1b677ab1b5d91"; - sha256 = "0zaaik87ndbcc77swakhfkh8pbl0zgk5ajq9wfpr7i27mf1x7n2y"; + rev = "09b9354a8e703d24c132ee08d6c92eee1421fbd9"; + sha256 = "03pk4d1l2vqhvp00z06kbgp4jyfw4nlqia6036kgwg2bp5pnc4aj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl"; @@ -13438,12 +13438,12 @@ dired-explorer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-explorer"; - version = "20160809.200"; + version = "20170614.1956"; src = fetchFromGitHub { owner = "jidaikobo-shibata"; repo = "dired-explorer"; - rev = "f9ac7c511c4b2e349952eb4b99635047f3603907"; - sha256 = "03zax8q9wwj4q9l13zsznrx18b6d1rqrfgvmvzlkd3y4sqj2i64w"; + rev = "b02b08d73821512853c6a14113c794dded1df75a"; + sha256 = "1kc2j9iw4rsxkbssn6idfi1avxshn23aiv006a0yx8bhgwclnbq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acd40e02185847dfdcd70b3cacea703133e4356d/recipes/dired-explorer"; @@ -13935,12 +13935,12 @@ direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "20170501.218"; + version = "20170622.1128"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "2cdf87ea96f9a08dee98762b18b5f8a5198ecf63"; - sha256 = "172jyl8v4zy9bbha8nndq63x8svn9xqkafkj3q17z289na8iaylh"; + rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa"; + sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -14801,12 +14801,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170611.1109"; + version = "20170615.437"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "4b6482765e3be2c51a9d8d23bbbfb9a0c80bf4ac"; - sha256 = "0g1883qz5a0fra1hsn6kx9r1hply61ba0bxhb8xx08j2zxbwj65s"; + rev = "55d2f8eb0b6ed6a1964741c61d898c97ed934b7a"; + sha256 = "0wbhjfiidl1fbxhdrpk9f7wc3kvb4nshwzfxd1vrgpx48kaiahgb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15236,7 +15236,7 @@ version = "20130120.1257"; src = fetchsvn { url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1798436"; + rev = "1799660"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -15337,12 +15337,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20170611.1336"; + version = "20170613.1206"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "9743f3f2736c0e84c5dff860a142c78a0c4ed861"; - sha256 = "19pdgwziriamf31vjca3y4fxcz4pcfdhr8ac2djz1gsfslq9n236"; + rev = "aa44169d1d343010e56af0f17bf5448d0dbd2c8f"; + sha256 = "1gz1n1nmb0hbcw0wcm5l87zpi3wr14aqhdi66kqcahqzrk8xz86d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -16597,22 +16597,30 @@ license = lib.licenses.free; }; }) {}; - ein = callPackage ({ cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: + ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20170606.1325"; + version = "20170616.1117"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "d9c81f3d900f2ffd78fd314685023d66d6d16438"; - sha256 = "1vf2bxxk3dj0npgab0yzqfx6dvfh5aj1bhmbpw1xfhssciyg8q47"; + rev = "d3a40af5743c865e71b165600e8f1d0d2b72df53"; + sha256 = "1jsdj0ll6m80xjxgy20ngkdfhak7scx1d474w3s46vvgcjl6z7p2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r"; name = "ein"; }; - packageRequires = [ cl-generic dash deferred request websocket ]; + packageRequires = [ + auto-complete + cl-generic + dash + deferred + request + skewer-mode + websocket + ]; meta = { homepage = "https://melpa.org/#/ein"; license = lib.licenses.free; @@ -16663,12 +16671,12 @@ ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20170328.706"; + version = "20170621.348"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "9595e72e85e7edef0d9df5accf166d232824cd3d"; - sha256 = "0h0ryi027f4vqv9m6dz8dgf9scqmcabcgin692yysxp9b5jkg8d3"; + rev = "438e4f5995285d28fe7dddceacac212c2250dfe2"; + sha256 = "01nxgv2yz9clbqr35kdl36zmip0nkqa45ab6b06npdxpcs4438nq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -17476,8 +17484,8 @@ src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "85319b9e75dea9f79e6d16011ee2a15be11eb9c0"; - sha256 = "1gnjx7ay0c167vnl7k9gxmvm93ipqfs93jmcmvy56rlvc7yyk39x"; + rev = "b15af913435023fb6ce91e4ed79f8e9a1f936f6f"; + sha256 = "15sga6fr6k29cncasfx5n71wspwshag8wcrmwa5py74ba31y98q5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17703,12 +17711,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20170519.1544"; + version = "20170613.1339"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "2cf34afa0c3e7249149a65c0ae89e6c593050f2c"; - sha256 = "0i57dhljf0ymsqlqjr1bz0hxr108k7iiw267s24a3bm3p3ac5lfi"; + rev = "4970cbb55767e5f31913b21fb1ae733b6479ccd0"; + sha256 = "0v0gw8ba073k6n48vrksp1bkrsh0fyg7wmc0mpjf13qcbcwn3ydd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -18235,12 +18243,12 @@ embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "embrace"; - version = "20170508.1526"; + version = "20170615.1131"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "embrace.el"; - rev = "02396165b6672c8c4cc800d25bdcc31e28b7f3da"; - sha256 = "045xdfm1li0wkhrcd2h77bviw7n4bxid7d4f482gala16y9mbjvx"; + rev = "394863dd7271e831cb9c257a1cd2249302ba962a"; + sha256 = "14qs180p5kv1h4p9qsv4jj61pq7d7bsrvwm0wm85lhgpx8v64q7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace"; @@ -18297,11 +18305,11 @@ }) {}; emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20170601.1651"; + version = "20170619.1156"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "0481ca3b8f8d558e545582440dde6dac514818fe"; - sha256 = "1z2kzaw2jr4m189gd8978g6wy6z9wicf1klyh48l623lh7cv48ic"; + rev = "a4ec6697e45a006753bfd79c22f14524748df493"; + sha256 = "07czram3jjhkc3ahjz86qq0fsh8ysdgvlpfyyvj3jmfah1sfk5d7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -18569,12 +18577,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20170528.147"; + version = "20170617.931"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "033e3b2fa171d73b932ecf27df237be2fd6e1c36"; - sha256 = "0x8ydqzacrps0kl3j50ajp8fwxg8vnggvjpjbnrglkpwwn2j1kzr"; + rev = "a93f3d424a2ca07d81debbb024053d0e207e999a"; + sha256 = "09vmn8ya3zbmwycaxw5kvlmfmqk0jn07zzajlrwds65p3k8ddcrl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -18791,12 +18799,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20170611.1428"; + version = "20170618.333"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "86a52709a0c45e2f84737319f8f95abd0ea55ff2"; - sha256 = "10ix3yx916c929i8fj2bqkjjm409mwpjzydji6x8n8v5s8lnw6m2"; + rev = "8c7f659a170a2af248f912e56ec8ac25453fc867"; + sha256 = "0yzdvqmsrssk56czsccakw0qj7xjmck8npmlmf9zy1389aw0g6ji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -19432,8 +19440,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "dd9e39dc2b97e30c03b24a00eb757be7d2c2bdc2"; - sha256 = "1q5pd9a5d5513brw5s2x6652fmmql7y7lcnzv18kw3wc4qvccl24"; + rev = "f52748254f17ba42e344798e8c787a1e3361fa33"; + sha256 = "1jxnzhclsdbszpams4nbz23f3sjv4i966maadrb6x929jab85fm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19658,12 +19666,12 @@ escreen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "escreen"; - version = "20091203.1013"; + version = "20170613.1534"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "escreen"; - rev = "e3fd46225fec70943024d950c6b6c2eb88e00b96"; - sha256 = "0id7820vjbprlpprj4fyhylkjvx00b87mw4n7jnxn1gczvjgafmc"; + rev = "153dc05b2b7e6e2d4cbd7b6cbe8b10d6a70f73f3"; + sha256 = "0xz3dkvgrbgv91dxgdfcir9zld5qsqpzrmp4q6fxqa548advn9ak"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c64c21a42fd8436bd60e490980ad4ed824b212d1/recipes/escreen"; @@ -20263,12 +20271,12 @@ euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "euslisp-mode"; - version = "20170315.2046"; + version = "20170621.945"; src = fetchFromGitHub { owner = "iory"; repo = "euslisp-mode"; - rev = "fbaa35e77eee91da5ce86fbf5342648722b97d7c"; - sha256 = "0y9l6h1824a7sd4w26s1ql8ffim42pcz8szadmwk2v4p64cya76l"; + rev = "16ee25d6d84d0e0b1b153791c51acedafd8d572b"; + sha256 = "1a496xzw6vs6rv7pp6yv3zmjdxbypjz132r6s6595gjcvwrfisr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a7c4b73203d75c5260f1d08845236cbbeae46/recipes/euslisp-mode"; @@ -20389,12 +20397,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20170612.100"; + version = "20170623.34"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "d45772929db630be8226e2786132d46e2c6bdb2c"; - sha256 = "07mc036lz2lj0csg10a8gdqxqsf8mxsjfy3ha9wsrmbqhsvwixn9"; + rev = "d35f3a225feb27002b2aa207e955ca7b305b9ca8"; + sha256 = "07y3rhxcxrmhcjz2pdcx4wlb1q5j95jhkimcj91gw30jvqn89yq5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil"; @@ -20914,12 +20922,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "20170611.1237"; + version = "20170613.510"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-magit"; - rev = "f851e5896fa90ae94dfde3d2a7554b4d5f9e665c"; - sha256 = "127ccll30526b38g64pagagnia8mw0bs9db95xri0n48x4vginkd"; + rev = "91c96e6ffdc6e7d5e49fd9b0ffb7df8794f0f2db"; + sha256 = "1nwibif8syk5dfygzcafsbh41gaxaps187zxdv75z2hbdbvqx1l3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit"; @@ -21124,12 +21132,12 @@ evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "evil-org"; - version = "20170611.1149"; + version = "20170622.1310"; src = fetchFromGitHub { owner = "Somelauw"; repo = "evil-org-mode"; - rev = "4da3d179d71113b906173a974fec933e9f55afa8"; - sha256 = "16d9x89plmy6qrjvc8czrqpc1y53xbcaclc20yd8yyi722sdd4x1"; + rev = "975109dc665f53cef221b3c668612664340b7940"; + sha256 = "0fr0wxd53a0lv2akvayi844fncn8klj88hmld73x2d1igig38p4q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; @@ -21208,12 +21216,12 @@ evil-replace-with-register = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-replace-with-register"; - version = "20161127.2159"; + version = "20170616.813"; src = fetchFromGitHub { owner = "Dewdrops"; repo = "evil-ReplaceWithRegister"; - rev = "c979aa2f4d730d2a741358e357d18544edd46cd2"; - sha256 = "168qqbsjwblhrq92mw0v1f86d3q1m2f5rh37xikj1bk589c2izp9"; + rev = "0d8a67b578849c00a7a50540daf809dd2ee2b476"; + sha256 = "1azxhb41f8ar3p5grdknpdljx85v2i6zjsp2qd7y8ij69kdw2z0b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bd98aebefc13da5a129d1d3f1c8878e4a70654/recipes/evil-replace-with-register"; @@ -21296,8 +21304,8 @@ src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "d6d60b077e31755b6d543337dd165ab7e1c67d36"; - sha256 = "05fxr48r7qilh52ycm6bi108y9kd1zw62mckf8ddhsjrvszx97nb"; + rev = "c23864f13689c6bb80974fd483062074cfa38637"; + sha256 = "05lsb6xl74pxzn59af39mgg9as28kr17mk5yajwsyqfhj8bl1bfq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -21338,8 +21346,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-surround"; - rev = "a4fc4483dff0bb0e544d832a845fdc6fb85c6214"; - sha256 = "0xqvpr8irkv4qw82gcgnnfb9mjavb4jj9a11cw32wqjdg0106dlr"; + rev = "43a266461517d2eb715338da0a31dc6616073116"; + sha256 = "04pzlkblziir91g38kmlmr7p1q5cxjw4q7difwhly3iz567minkq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; @@ -21443,8 +21451,8 @@ src = fetchFromGitHub { owner = "noctuid"; repo = "evil-textobj-anyblock"; - rev = "66dd87d10843f99cb4b7f76e55f00fca9dd48ac3"; - sha256 = "0a0vr4nqnigrdblr0wfxzl6n3xv4sfi7w3rdrsq8n4sywfdzwlap"; + rev = "b611a54e62a6e6ce40bbb8b5094bd88028fc7efd"; + sha256 = "1wgdzl14hrzjsh6wvc83njfd0321rnbhc68mzcvn27g04zx9a1d0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36b734960313d4cb484cebaac0f112781436631c/recipes/evil-textobj-anyblock"; @@ -21691,11 +21699,11 @@ exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exiftool"; - version = "20170301.232"; + version = "20170613.1342"; src = fetchgit { url = "https://git.systemreboot.net/exiftool.el/"; - rev = "b678cffcac678ed0254c5f9e881dc4486816d3c8"; - sha256 = "0afc77iz391y67jlimqzppz59my8ndz7acpp639a24m121xm3zwm"; + rev = "1c9c6feba21b98337665b6f2b4064b2bf5b75af6"; + sha256 = "1m3jn127w95sb4y34f9lb1cv445pxfs4b90f6ia5cjs75706fn03"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool"; @@ -21837,12 +21845,12 @@ exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20170606.2038"; + version = "20170623.446"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "ff656107e55458cb2b453eb4637ad203007068f1"; - sha256 = "1ssbqcrhcprfd1n4bvcbczp3dqhq4hcl75qaz6alc9y11r2jb4ar"; + rev = "d94d4353d4264f006c8c45dd70be4f699640243f"; + sha256 = "0dfsaibb1h9i1m0ckwfsf0xw6mzfzw4h7mwzjql8nslfsq5q7iys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; @@ -22314,12 +22322,12 @@ fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; - version = "20170602.1912"; + version = "20170615.1143"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "fcitx.el"; - rev = "2e3abe356b464b30350c08e243988a3116818b19"; - sha256 = "0cplg10mhr2r3cp4wcaykyvbzilmjma90hkv4h1m8d8xrfdmmi7g"; + rev = "cddd216402c9a9b4228b5f82afa1bd637b2e0c37"; + sha256 = "0kvn9ikxnv9ahz0cqal3drxv95slwbf758sp37irih6fqh3ybgbl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx"; @@ -22604,8 +22612,8 @@ src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "eb9fec502a2622b46301ca49183147b6b1fcaff6"; - sha256 = "1hrdqdps76c1sfq9m9l6nid32lklsli2hgwzd4sl5ypb0zqhn25k"; + rev = "a6e59891973f3e40ca2e414ca66799cc686d8626"; + sha256 = "16wxw5bxb3nmw6glx2iqcfr75fsya1a9kxd6khv46zy5z85n1bng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -23503,12 +23511,12 @@ flycheck-clang-tidy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-clang-tidy"; - version = "20170222.512"; + version = "20170621.202"; src = fetchFromGitHub { owner = "ch1bo"; repo = "flycheck-clang-tidy"; - rev = "fe49836f30b37eae308e2255acbdcb0195d3a2ba"; - sha256 = "14i8f5gid9pnrgsvhibwclv4m53j86i05wbfjfj15aprhbf2ii94"; + rev = "5b1c86477f7d1eaabd781bc83dd1bd105c79335c"; + sha256 = "1zd6rqbrpvjxa9sclkldffb91mgyljh1jcvlvvd2cdlajcv98ciw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a289ac549a7735a12eec85521c32f915b9194b85/recipes/flycheck-clang-tidy"; @@ -23965,12 +23973,12 @@ flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-haskell"; - version = "20170604.447"; + version = "20170622.1248"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-haskell"; - rev = "84a8853d2ed4bd74038bb45d531dfbff0a3b1de0"; - sha256 = "1lzf5wahmbxfqa7944z5gjbs7vfbm5qsv02jc7x3cvj8z22kf4fd"; + rev = "2aeb2ed5cdde7770cd5da9950981390d7b44f74c"; + sha256 = "0h7zb1f0j3b44ad7ikdyv3mhddvh9hfg61g2aic3x3ms8rph86q5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell"; @@ -24431,8 +24439,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; - sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; + rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; + sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24595,12 +24603,12 @@ flycheck-vale = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-vale"; - version = "20170521.109"; + version = "20170619.2322"; src = fetchFromGitHub { owner = "abingham"; repo = "flycheck-vale"; - rev = "7ca0a2a29b6185761bd07369c565774269c909dd"; - sha256 = "1crlyphv00a1zm8wbsysxfxhfasv34bbnckc4a3psnvl913nc1gn"; + rev = "97df981468120aaedeaa4cf8ecfd68b07046d998"; + sha256 = "1zic9mirz2xi25pcj3d6r9sclambyn9q5dp7v9jvvxqkml3vy88c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7693eeb536e601589b49f96d0e2734cd08fad4f2/recipes/flycheck-vale"; @@ -24637,12 +24645,12 @@ flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; - version = "20170327.1418"; + version = "20170614.1434"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "29aba538be5e44da81ad76a6078bb65c1c5e1aa6"; - sha256 = "0fpccpiwwsxg0asdzg0m5hlwdv6jyr7khywnd1rb6kvr8m2qm0hf"; + rev = "43d690e4922dbf44e5deffc89cd06f2b1bd79ad2"; + sha256 = "1vzsh8yj7v4qc5byb73pm25d408c28nm9cm780j289bpgx56p83s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -25498,12 +25506,12 @@ focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "focus"; - version = "20170520.901"; + version = "20170612.743"; src = fetchFromGitHub { owner = "larstvei"; repo = "Focus"; - rev = "155da77a324f28fd37f6167d5c843c491dc3327d"; - sha256 = "0jkfwammgzvfdhs4pg751rkljhrkmbyvqfs762i3smpqw95jqh2w"; + rev = "a84ade00a2b57e47430d5b2df5246069f197356f"; + sha256 = "0qz52gak45nbi6pgsdl3h2a01d89gbzm0glpv1jjy5dvabr98835"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus"; @@ -25748,12 +25756,12 @@ forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forecast"; - version = "20170221.1327"; + version = "20170618.1048"; src = fetchFromGitHub { owner = "cadadr"; repo = "forecast.el"; - rev = "1eb60db1760572e3b1b87f6d672e3aa0812d6d94"; - sha256 = "1imrn4wc744fdcm1pkfjk8gmilzcrjzawbcg6mhdkzsz5cnb7klb"; + rev = "96e37ca81a42061f0e837cc3c4dec1844f682e91"; + sha256 = "0hbz2q9sm70r7sxk56dlnzwh71ckrww7w43xxy3ys1r3p7b3j3aq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast"; @@ -26205,12 +26213,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "20170606.925"; + version = "20170617.1330"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "1020b6ccb5bf7d3eccd9e84b7ab293c87528265e"; - sha256 = "0qbhl4yzn5q156w1gyapj430sxj4iyzgdwh2f5zyl8q791vad9k3"; + rev = "9766952bd7830cb0d319736961af8e42e67d42fe"; + sha256 = "1krncbzdhp6kpypaqdn6fhvxhhc1pvy2ayn4w4ljmsd7wx6zazyi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -26266,8 +26274,8 @@ version = "20170601.1205"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "dc0b8994f00bd46de99398f92bf949a784c7a9ee"; - sha256 = "1wka0ldx68psxjp3bl6xwx48mlnawqccvyig1lr4c5vi1avkf6dk"; + rev = "c53895e03d76de257a92f4f91e4787fc1ca0901e"; + sha256 = "1x21d23543czdrz8pgfz0wc418lm7gns4gz1gbpl6b02l9kqz750"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -26388,12 +26396,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "20170506.1334"; + version = "20170622.701"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "19015c8d84abc84cfd5f39295b02af8af5ef2e94"; - sha256 = "1vp24kgi3hv2j7df6nmczhfy847725c6jpjizmgfl9r2d7d1v9bs"; + rev = "5286c51bbc8e050157f2ab589d9dad45467db57b"; + sha256 = "1ka3z60iqshr1hk7znvjw7kw016q36ixaqqnr7jdjv5z37p7ngqy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26655,12 +26663,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "20170125.1937"; + version = "20170620.2012"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "7639411604552fcb6352afe88522a9ff1c8132fc"; - sha256 = "02pic12kfa9794sz7qj57ca5ld8x1pk0apfr3h2xzr6zdsmsdday"; + rev = "003abd23a7468daa133dfbc7ef85d0d61a0410dc"; + sha256 = "15ck23xv3dz9i4w5xd9lkg0c6rlsyxdz465xrpkr77fq9qw0c4dg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -27033,12 +27041,12 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20170518.358"; + version = "20170614.840"; src = fetchFromGitHub { owner = "tarsius"; repo = "ghub"; - rev = "715dfef4a926228c059674bc68a16e27d4f539ee"; - sha256 = "1y6crh3v3g7g0i225pcp9ff18pcfl5fnpc22yf4wcbf1if7pd2vs"; + rev = "efdc28e3d27dd0847ceece593ecd1e9ed3287c9f"; + sha256 = "0vh6y36b219vg2iwxbcdkdsnpnmb4kkvr9pz2kgiayyqrmz3ck37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub"; @@ -27247,8 +27255,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "622c994183294b02893ff286210bffd5255296df"; - sha256 = "1cyzf8xh6ibq9vypcdg4akqsfr1i202y14mdlr7hh2bkxymcq32i"; + rev = "7987db94c0041f68664d5ed91ce241c31fd8d1d1"; + sha256 = "0bwgxhzd81nh69dbhswdq70y152ikwsxlh23d3ng36kix8s6fgsg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -27726,12 +27734,12 @@ github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-theme"; - version = "20170413.2100"; + version = "20170620.2100"; src = fetchFromGitHub { owner = "philiparvidsson"; repo = "emacs-github-theme"; - rev = "cf3c1325eb33d3593ba1cc4ad692eff287c33779"; - sha256 = "0abrbhhllkimidv4mi95nlzzigbr3qvjnd683rpv6f3sdqwcyw5f"; + rev = "849b0e8939b1ee5a693e268f07ea3d732784c5f7"; + sha256 = "0zbaxwgcnb4mgspqilb8cqls3yqvs1vmvg8lhg33vh8d5wjhfz8y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme"; @@ -28757,8 +28765,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "142b0e64babdb0066d2ffebfedb3c886fe75c680"; - sha256 = "0vccg70zf0c7xx6acffrdvhvvih95fcgxq9dw4bsax46p2pffc6q"; + rev = "85799e8cd3040b960e4dcc544cc9bb7c9cd716c3"; + sha256 = "16khvjfiv4x1rghac2d970875w6jyg2fl7pbj801q0ia5cm7cxz8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -29028,8 +29036,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "98f52561d70fd95cfb7a5155ec9e62282bc55dc2"; - sha256 = "0vqnsyn80h06qi2ypql4j66a9w1dsnd5f95gcnj5dgwk0scgpfxp"; + rev = "aeb6edb322c30b8fb484caad0a37404b58996c84"; + sha256 = "1ks360lfaaka9rhpqmpnzmilys01ikq6k2v9vgldlli5mlm6sbhn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29154,8 +29162,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "816182124457bed620678f9a92b349787cbf87bd"; - sha256 = "19rqjfy8gwmxpmw9qgnd6zi6albrhj5jzj1hgrc5nxagb2gp0ckj"; + rev = "a42584b9f86bf1970ed63b68bc95dc16884d0268"; + sha256 = "06kxwac17rhfa9siw712dlra40dpd5ivc4qnnim44i48cr771a8v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29535,12 +29543,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20170609.1120"; + version = "20170615.513"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "816182124457bed620678f9a92b349787cbf87bd"; - sha256 = "19rqjfy8gwmxpmw9qgnd6zi6albrhj5jzj1hgrc5nxagb2gp0ckj"; + rev = "a42584b9f86bf1970ed63b68bc95dc16884d0268"; + sha256 = "06kxwac17rhfa9siw712dlra40dpd5ivc4qnnim44i48cr771a8v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -29682,12 +29690,12 @@ guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "guess-language"; - version = "20170521.404"; + version = "20170620.308"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "guess-language.el"; - rev = "65dccb18df4d0c766d516c5f1423994bae445b51"; - sha256 = "0w189k3nnkzgh6gqw4zknhjykigym42rxjhcr5xl1b3h3mn0zz7j"; + rev = "1f1602f74d7159e7fb8c90f92ec5a3d1df5429da"; + sha256 = "1764v96sdn3zvpd35ppn31ib4p8cvdrj0bfmbplxg2xhp7xkgmca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language"; @@ -29745,12 +29753,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170608.303"; + version = "20170619.1045"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "af57f5e969004dc5141cdb1d4c77c55ece0c6868"; - sha256 = "0nv85nlcac7k5pld2sg9wsbggq394jlmpcayzkrm81yy8a5grm5d"; + rev = "b2c32f398aade6c83300c20b6fde9b6e8a20c7b1"; + sha256 = "0563mzd54b4qg9icy1d8hksw9lsfajkp18198m84v09cl2zdxvqn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -30253,8 +30261,8 @@ src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "c46bdf129fb7ac241b84e0cfffcd3c7588dfb1af"; - sha256 = "095y6zg8frdl9z7r4xp4dysf93d947srwiylngss8fclav7fjq2y"; + rev = "7eb94b5a5d9478a0da869bd26ba51d08e574d843"; + sha256 = "1bj077gpg2xzzjcriv9zixjqalppv0ya5s3bpxn2w93jkzxa9xd5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -30518,12 +30526,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170611.701"; + version = "20170622.126"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "9f532785d43389339ed73d90357d4aea9d966020"; - sha256 = "0n23yyrvsvp0j9grgwd7fiw808kf9wr4fs3kry771pzq1fg16wg5"; + rev = "8d0ef8f7ba56a78d7c1292d3db65f993518b8a78"; + sha256 = "0y5gp4mmf6p244bpdnnv29gz0psfgh8338m5cns2z923pcllpjg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -30956,22 +30964,22 @@ license = lib.licenses.free; }; }) {}; - helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }: + helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-cider"; - version = "20170209.2316"; + version = "20170617.2254"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "8e092d0d2e9cf27195296c684b4fab831208b98a"; - sha256 = "081wkmp4mcdszyirgifdn4qzpvc9bz3qkvwnlp0c9jzimkizpgsl"; + rev = "7dafd5ba9c961ef22fd3ba617f13a411034f68be"; + sha256 = "01wabgaka3mjllmqm117rv28jxmcp1znaxbgrabgcndhgyd7ycyb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider"; sha256 = "0ykhrvh6mix55sv4j8q6614sibksdlwaks736maamqwl3wk6826x"; name = "helm-cider"; }; - packageRequires = [ cider emacs helm-core seq ]; + packageRequires = [ cider emacs helm-core ]; meta = { homepage = "https://melpa.org/#/helm-cider"; license = lib.licenses.free; @@ -31127,12 +31135,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170611.135"; + version = "20170622.1355"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "9f532785d43389339ed73d90357d4aea9d966020"; - sha256 = "0n23yyrvsvp0j9grgwd7fiw808kf9wr4fs3kry771pzq1fg16wg5"; + rev = "8d0ef8f7ba56a78d7c1292d3db65f993518b8a78"; + sha256 = "0y5gp4mmf6p244bpdnnv29gz0psfgh8338m5cns2z923pcllpjg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -31565,6 +31573,27 @@ license = lib.licenses.free; }; }) {}; + helm-frame = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "helm-frame"; + version = "20170515.1250"; + src = fetchFromGitLab { + owner = "chee"; + repo = "helm-frame"; + rev = "389e6461a423d649b7062ba99a2234bef7770059"; + sha256 = "1z7iwgl1v8nkwyz3h610l97amgq9slrfxxiicsnigc9vgsqlh987"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/febb2599e50518dadb30088bc9576aea2af092a7/recipes/helm-frame"; + sha256 = "18wbwm4r3ra9214whhdbxnjrxzra4pn12wqgq5lxli1khylihm3i"; + name = "helm-frame"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/helm-frame"; + license = lib.licenses.free; + }; + }) {}; helm-fuzzier = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-fuzzier"; @@ -31694,12 +31723,12 @@ helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-git-grep"; - version = "20170530.830"; + version = "20170614.711"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-git-grep"; - rev = "e3ae5f60585ac0213876dca5093aca467db1ac5b"; - sha256 = "0bld5kjzgjhkjcjc7b66kg55yb7pzrbnxfqx79f5glxckbp2pxjr"; + rev = "744cea07dba6e6a5effbdba83f1b786c78fd86d3"; + sha256 = "172m7wbgx9qnv9n1slbzpd9j24p6blddik49z6bq3zdg1vlnf3dv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; @@ -32617,12 +32646,12 @@ helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20170328.2152"; + version = "20170613.14"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "c987e81ededdcb69c5a7b2bb6efc32bc2398ce54"; - sha256 = "06ygcmpdpr7qzpx6l7qlbdif10vpzw009zg8z8yl1p1r30qdcbs0"; + rev = "0e9ba276b3fbc420b8cbdc1b99262ccd5c750db7"; + sha256 = "155df7jyhjgqdks3ba1ca1k8w8aqka9vv3nhzpkvgz7wj84c95pq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -32915,8 +32944,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; - sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; + rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; + sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33205,12 +33234,12 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "20170419.135"; + version = "20170616.1725"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "f88715d495b7f6d65904bd05dee549404ca250d3"; - sha256 = "0sdhbk4vpq5vl9rz5dcfnjmkcvsfw9146f1bvjgfi0fqhb3pq8da"; + rev = "89a7564edc6b23ffba52b02353528b9b6285c729"; + sha256 = "1fqyhx6cnigh40bgzm745cx47zc6mm8rwrz2ym0vpb5bnng6j4m1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -33472,12 +33501,12 @@ helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "helpful"; - version = "20170612.205"; + version = "20170619.1537"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "fdabfe7d88853e052cd5a20614585ed3cc1faeac"; - sha256 = "0x8d28s6fi8lmdyp8nyqi0dryf06703kddws079qr0l4p5jiibxr"; + rev = "c86b39eea2a787557e13a814a626c839d2caef2a"; + sha256 = "0ya4axgq2k7yn1n07gfyc9amz98ffvas0ir8060ba3jhw8bmd940"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -33556,12 +33585,12 @@ hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexo"; - version = "20170308.205"; + version = "20170621.1953"; src = fetchFromGitHub { owner = "kuanyui"; repo = "hexo.el"; - rev = "f7b8803fd81e738e25425e0eeeed4cf2adc6a5e8"; - sha256 = "0hbfgzs4kg2vqm034falm9rhhin9ii0n0rc50qli5v3a85c7ayrw"; + rev = "1f6acb4305484b0177e04b3c55eabf9745e11dd0"; + sha256 = "1ifdm7wkbnjs8jflgf3kjl5800rddjdy5dl5kz5g3qvxk0ma1rgf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo"; @@ -33779,12 +33808,12 @@ hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hierarchy"; - version = "20170605.842"; + version = "20170617.1126"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "hierarchy"; - rev = "d26f566d386a56e752d8ca1c813932d68b088bde"; - sha256 = "1dk5hdcjakxi91q29lbnwvbfhr834sxmsr2mrxr5mqhp3wfg3qga"; + rev = "e71c2970dc4eb90e5473f7a038e7ccba4dac6c36"; + sha256 = "10mlbz3xlbvka5bw5cxymbha5vkkbb9sfziwxgfx5bwrhjp6n90z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; @@ -34256,8 +34285,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "b858104fab63257de4b172b085b28e24ecacfed0"; - sha256 = "1yzmlflzx9gvm0dysgjwi0a5nm7w7diczwqp4zggd4bl8bb45fip"; + rev = "aa0f954c345e85ee8784431af5fa1a529c9cf715"; + sha256 = "0aa67r8isall8h8rwaydzpbap185xh889a09s4b1i3984dvpgm80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -34501,10 +34530,10 @@ }) {}; hl-line-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-line-plus"; - version = "20170604.1526"; + version = "20170621.734"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hl-line+.el"; - sha256 = "09dwllzhw0441fbhkw7nb4isfnll6nbpp0il4yc7wgjvg4s94hw6"; + sha256 = "03bgx651nrnwqbclbfaabkw4h2iaiswnndqgms0w6lp3jjfc10wc"; name = "hl-line+.el"; }; recipeFile = fetchurl { @@ -34582,12 +34611,12 @@ hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "20161102.1337"; + version = "20170621.1257"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "a23312464fc6462d559462a44cd74735e9f73421"; - sha256 = "0sy0fjmh1m36ajzfmxa2j9akws5qa8a4f1qmj3wgj9vdqd043mr8"; + rev = "961db3116f1396dc4f903e3a59824a40e0bbb6a2"; + sha256 = "0w847g7lvzk9br9r73n7rf2ba6wafqrapyigp91f62jicz28lvm1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -34603,12 +34632,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170606.644"; + version = "20170619.945"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "bee9cee09d6909cf35f80582aee5a1de6c90db39"; - sha256 = "0jzl2qjyl7kbb16barh365kl5qziamgv87nx934s608498dyl4j6"; + rev = "d7b62a8dea6ff3e210ed2139dceaf09be8df465a"; + sha256 = "1m7jn89kr2kl03fngcbz28b72lmna8bhilhaq1188mr0hxag8h9a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; @@ -35147,12 +35176,12 @@ hy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hy-mode"; - version = "20151025.543"; + version = "20170621.1354"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "50d7d24a52aefd7079c3f26a90c8eaf3065884a1"; - sha256 = "0wn83n1780bvrzx9p870wln51n9rfdghsxl79dp968dxycyhyxvj"; + rev = "f34bc19e9a58c7014c1f672d0655d2edee997ad2"; + sha256 = "049f3746dfg9jh29904qnk2asym2rjqqgzn1zimk4bs3v8xnys1c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -35193,8 +35222,8 @@ src = fetchFromGitHub { owner = "hydandata"; repo = "hydandata-light-theme"; - rev = "169c0d9ab1272b0f4a1f29eb5f1cd5ffb2365e1e"; - sha256 = "19q63kg1higqxf26bhwnqwvqxpayjq2j24yi54b1wkvwbv5f28nr"; + rev = "0fbc91678ef65e1f65d7ec6792ff0b2f104d16a9"; + sha256 = "0bkj5cw173l829fkgigghs07mc2i84ngvs2y9g6kamrpg6zhq7g8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/413c617f15947782891159a240e0c9014f1f7d11/recipes/hydandata-light-theme"; @@ -36044,12 +36073,12 @@ ids-edit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ids-edit"; - version = "20160324.1522"; + version = "20170621.946"; src = fetchFromGitHub { owner = "kawabata"; repo = "ids-edit"; - rev = "3073f03267dd3527718e1edf1010055b6e55929e"; - sha256 = "18dca47ds5fiihijd1vv7nif44n4b4nv4za2djjfqbhbvizra1fd"; + rev = "8df65dcfe35a06fc70775d485387fd31a1822b64"; + sha256 = "1l8a14f9dpz8ddx99yh7h656ncrvr7s6yqih0rlniak5zxfnxjra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f12d49b6ece6d2ac8ecb80d881db560367ddc4ba/recipes/ids-edit"; @@ -36604,12 +36633,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20170609.923"; + version = "20170622.743"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "e9b0104bb36b1ce349bf048979746e0ad738d43d"; - sha256 = "14a0gpp71045j4hs5s2kmisv3466imzyag7f43r1gsg4b0gp4c8m"; + rev = "b5bd4aab9be3587ce7c6ba58a4aabf00d4dcd907"; + sha256 = "1mpy7645i7nvkj0ixml4db2l11jx8h150c39a4r0ah7m34005rdx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -36646,12 +36675,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20170520.914"; + version = "20170620.808"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "9ba23b0e8369a5dfa17e544288b366008516e6f9"; - sha256 = "079hsk05isagcnj0fbdaxkaj8zfhrvm60zbz35id4101s4053frh"; + rev = "74e84231ec9565c4420019b913e3f16521dea542"; + sha256 = "1lmvdmcy47swgj1nqhq91w50fh9iz0zwn06ygns1z06s9gcqc6sm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -36709,12 +36738,12 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "20170530.1824"; + version = "20170615.335"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "62c1c72d8e2a8e1ca8430010c19be930f54e6daa"; - sha256 = "1w9jgrvly07056f72xf4ink0i8q1xv3rnpv5kbifsjfxzz05crbb"; + rev = "c14a68d1643ac3f439234da6a8275b48cae970d3"; + sha256 = "0b6qp9xljxn4mrh1xcv6fzklq963hrchq8iab4746kvylhn1xmsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -37168,12 +37197,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170611.437"; + version = "20170615.104"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "70c9c524b3de8dce739df7fe0fdb5128fc8adf11"; - sha256 = "1jb28d9mcnn2098lmlq4jfk64jjdfn24pmwl8gax80v4p81b54vm"; + rev = "fe791fbefa4689c944a00a356b331ed0516c5cfe"; + sha256 = "10d9w4hp5hhbvbhbd605vpvzw0vhg862ikwjchq6jyly80kf3a60"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -37501,10 +37530,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20170529.1907"; + version = "20170614.928"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "1lg8gciy9i44y80v9g2h5q8mg6dhi6abx2ssg6jws3nci0y5c0bl"; + sha256 = "19jk4c39bqbqbfwmhkiwqfij556nv82syy99g07s7gz1bqkrm7pl"; name = "isearch+.el"; }; recipeFile = fetchurl { @@ -37729,12 +37758,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170609.943"; + version = "20170621.721"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c"; - sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878"; + rev = "f0426613062ba8305ebac41672d853a95cd9bbca"; + sha256 = "0mjh89snhm8lzy52k4wb352k8zljs2mkmx5w92ddhlzsfaf3hdd8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -37768,6 +37797,27 @@ license = lib.licenses.free; }; }) {}; + ivy-dired-history = callPackage ({ cl-lib ? null, counsel, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-dired-history"; + version = "20170617.812"; + src = fetchFromGitHub { + owner = "jixiuf"; + repo = "ivy-dired-history"; + rev = "3604840f85e4ff2d7ecab6233e820cb2ec5c8733"; + sha256 = "0slisbnfcdx8jv0p67ag6s4l0m0jmrwcpm5a2jm6sai9x67ayn4l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad37f6b04ff45fbffeadefc94db16baa27bcc2ac/recipes/ivy-dired-history"; + sha256 = "1vj073k5m0l8rx9iiisikzl053ad9mlhvbk30f5zmw9sw7b9blyl"; + name = "ivy-dired-history"; + }; + packageRequires = [ cl-lib counsel ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-dired-history"; + license = lib.licenses.free; + }; + }) {}; ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; @@ -37838,8 +37888,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c"; - sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878"; + rev = "f0426613062ba8305ebac41672d853a95cd9bbca"; + sha256 = "0mjh89snhm8lzy52k4wb352k8zljs2mkmx5w92ddhlzsfaf3hdd8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -37922,8 +37972,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; - sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; + rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; + sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -38880,12 +38930,12 @@ js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; - version = "20161212.2125"; + version = "20170617.628"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; - rev = "2f42249c0a18ad2e17cfb272d75aa9fd3ec5e4ec"; - sha256 = "17f99cih28lfral5iq43pjrvimlx0bnigirv44wm81n58widismy"; + rev = "9113cb538c9b9e1a1ccf0b6a4e8197b5f03faa51"; + sha256 = "0m5d9f449g3z3p0gydyaw5gw8b0da6az3nfyvvjvfssacbnrcm8x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; @@ -39111,12 +39161,12 @@ json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }: melpaBuild { pname = "json-mode"; - version = "20170418.1900"; + version = "20170619.1701"; src = fetchFromGitHub { owner = "joshwnj"; repo = "json-mode"; - rev = "c3a7ab350533dddf6d18b4c55423bc0d1b40f3fb"; - sha256 = "1zfzpylckna92zdx1l9ssj3xvrx5fizhypcmmpl2fsm56p97l8c5"; + rev = "39ba450ba5dcc72e317e679a0b61d8aa94383966"; + sha256 = "19qklwzad6qj27jbsms88bbnva4pvl64c89arpf66yjby3hnqbg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode"; @@ -39590,12 +39640,12 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "20170611.1344"; + version = "20170618.919"; src = fetchFromGitHub { owner = "0rdy"; repo = "kaolin-theme"; - rev = "e0c14489867eaafa3ab39bb271e3e466cebb632e"; - sha256 = "0zk2crzqzrbn1051fdkpxzyr6d2rknh7nznnbqyw3k75agiq3lm9"; + rev = "06ab7e6c00d6a176712f27b583fea3823c6c360e"; + sha256 = "141hjj56vax24mjkr0y0h51fc8wk7gjzknljwibaiwbmx9fyfm7f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; @@ -39863,12 +39913,12 @@ keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keymap-utils"; - version = "20161212.957"; + version = "20170614.1134"; src = fetchFromGitHub { owner = "tarsius"; repo = "keymap-utils"; - rev = "a4f6ff724eeade5612c01c6f6bf401f264687793"; - sha256 = "0jgmw8798g3ikhwnic3fbbjld0hj8fvg50q6x78pngf78ws92mkl"; + rev = "0130f32e5ade649dd2738206a80570e450906ef6"; + sha256 = "1bq7zihdj67j94yyv6655mcrxhz99szbf2zi64nwsl60bxz0znb8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils"; @@ -40098,8 +40148,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "27e3b90eae2a0155b22a435f1b6f65c913519db6"; - sha256 = "0c6qxnhmhwsb7gqib40fgg2p7krvmxdx75xka8gh3j47zww0pylp"; + rev = "c3bdd4839c3a205a95f007d620bacfdb731761cc"; + sha256 = "05j6ir26qf6jvlvy8dv6zvivzyrhsxrpdp1h5axvn1wzl4wmzvg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -40868,12 +40918,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20170612.123"; + version = "20170616.2223"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "1afc0c9a3b1a25fdf510c13bf7764f6c4867a897"; - sha256 = "1niww7czhqxn2dpnjbdghplva7l7ymrx77ka3djjln70x0gnvv2v"; + rev = "0e577560f0c01f9e4bbd5280edf113020e65c3f3"; + sha256 = "01ndc6llqfdz8x64k5c1bjvvx47nd2dag4fn48xfsb8vrpnp78i2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -41124,8 +41174,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "e231e8325765cde4ec3faa73d57bb5064a35620b"; - sha256 = "1k2s7s3wq7pgncrj1hs8vbd393kp8zmxygbci5jq4gvymmsb6qza"; + rev = "446f61280f984f17d4b923150f3b5c58f520ecaa"; + sha256 = "1vnck52yj8h0zahqgxlx70h7pqk9dnd5sy3jdl92rkj0bimhqr9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -41439,12 +41489,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20170515.855"; + version = "20170622.803"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "5306bb969047cb12b0fd4c6804198afb719acdb3"; - sha256 = "0lgjxaic8vwxhzm2w0prrydlz0fchk3bwvf0i9j96pi6x227b066"; + rev = "c52da852547356cc0bc51cb549dad57cb818b8aa"; + sha256 = "1hh0cdiaivpggrg3l14m7g3h9fl2rc69fy4hnmak91xf9lap37vz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -41589,8 +41639,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "list-unicode-display"; - rev = "59770cf3572bd36c3e9ba044846dc420c0dca09b"; - sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww"; + rev = "1719e7e90035c78dcc8a780c34cd18e6b3dcc6b1"; + sha256 = "1xy06vlwlhz872099xplzsz7rbyf6jsvcqyg6qpry4b2c57zjx8d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8e2a974a56665b97d7622b0428994edadc88a0/recipes/list-unicode-display"; @@ -41861,8 +41911,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "f6d6d2b0f7ca39f7b64137c4c90241af7099ebe8"; - sha256 = "1kjyf2gj3kj9blyabri3z808krs1a7wq0ffxsz8378pl8dl8vcwc"; + rev = "f066646d1ff5722da365888053371bc734e5f3f0"; + sha256 = "11jqlw58wifx1slfmmsp9lbkd1asalddlcjkmd7sz11wvdjm8hdk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -42280,8 +42330,8 @@ src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-java"; - rev = "5c58fc74872e318b2894f11331bec8f699f34c77"; - sha256 = "0b6n1hlhzqqnih26f412ag77dz5bc550ma9ijcbs0n3vbd5z45hs"; + rev = "ba797f9588944ae917ccbfa15c40ee1e427ea6e5"; + sha256 = "0plccx57j85b53s8nmhkcw8h1hznm147v3ajhzx2j1adbb2j0h3f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java"; @@ -42652,12 +42702,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170609.2322"; + version = "20170621.710"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "622c994183294b02893ff286210bffd5255296df"; - sha256 = "1cyzf8xh6ibq9vypcdg4akqsfr1i202y14mdlr7hh2bkxymcq32i"; + rev = "7987db94c0041f68664d5ed91ce241c31fd8d1d1"; + sha256 = "0bwgxhzd81nh69dbhswdq70y152ikwsxlh23d3ng36kix8s6fgsg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -42680,12 +42730,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "20170429.756"; + version = "20170621.1328"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "b8f191e37d0b3136aa0b00345961b6f7cf2e5789"; - sha256 = "097x8jblz83h750syxxcra9rswmghdwbpnx2xv8wbgwg3axch7rm"; + rev = "15eca25c59bef89da75f9a741d194698d0e708eb"; + sha256 = "184873b01b9dvwjjx6xsfz4v8rwhwsz9knjw7yjggmql20lxdpqq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -42852,8 +42902,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "622c994183294b02893ff286210bffd5255296df"; - sha256 = "1cyzf8xh6ibq9vypcdg4akqsfr1i202y14mdlr7hh2bkxymcq32i"; + rev = "7987db94c0041f68664d5ed91ce241c31fd8d1d1"; + sha256 = "0bwgxhzd81nh69dbhswdq70y152ikwsxlh23d3ng36kix8s6fgsg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -43310,12 +43360,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20170514.1827"; + version = "20170614.306"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "1bdcbcb42248d67029b0288c8572372fc1cafb29"; - sha256 = "1g4vgybkqn8bf95dl0gxd68lv4gw69bxms75s6k85i665fa2njal"; + rev = "d38183e5025beca7873b2e17bc605107e3adece9"; + sha256 = "139y9r3wm7fnshfdmm07m6v4zq5himrx6d4q6vryzhlmfchxfy7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -43486,12 +43536,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20170611.1532"; + version = "20170623.509"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "0fa1d523fe95a15a8cebaaba7d4af3002ddbeef5"; - sha256 = "0y6j5gdlxw9kp961sgdpnkprxdmnndcjd6s3v9jbz8py2k3pqpxx"; + rev = "3154320d8fcd9eb22bcceb39e181ccf930a9739a"; + sha256 = "06nnyl952nizrygil83939mrm4v6qh6y841dxgnbyhbbyryvdval"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -43724,12 +43774,12 @@ mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mastodon"; - version = "20170518.1031"; + version = "20170619.1050"; src = fetchFromGitHub { owner = "jdenen"; repo = "mastodon.el"; - rev = "a9e595142eee69fe84f0ab06f7fde76cef27cdac"; - sha256 = "1wgx8i6ww9w99f0f62p7v626bb6pvdg04hnhqyjgsmb99wzwlpk7"; + rev = "e08bb5794762d22f90e85fd65cef7c143e6b9318"; + sha256 = "0bil0xxava04pd4acjqm3bfqm1kjdk4g0czd4zqvacsp5c9sl2qp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon"; @@ -44057,12 +44107,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20170610.1806"; + version = "20170611.2347"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "f8ebc163a289532ce99134716008440a515e65ea"; - sha256 = "00z9w8nzf1adh6kic485w332dj6m53qdmb99w4aqz70ygq6i2s89"; + rev = "a764751e89ad7bc1717e1d3c6e3b4364b11832d6"; + sha256 = "06vd4lvybfa7kwyplavlbfwln6229g7s7pwbamjdvgz48xgiqym1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -44224,10 +44274,10 @@ }) {}; menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "menu-bar-plus"; - version = "20170412.1036"; + version = "20170618.1417"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/menu-bar+.el"; - sha256 = "1rxy2yp1f5fi5wk8lg04dmg943131rvvqiif1k18n0gajg1x8hxx"; + sha256 = "1ah2yjagpkvwahki81ixviq9pgwnjna8z893xad31rj0qmwr8bzw"; name = "menu-bar+.el"; }; recipeFile = fetchurl { @@ -44248,8 +44298,8 @@ src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "420416f182d2ea2a2285ab4bd22e5898dfb20a83"; - sha256 = "101vk16c5wayd51s8w0mvy99bk7q3gm2gz8i8616wa1lmyszjknh"; + rev = "957e551140587f0cd83d9186a06fba10a38c6084"; + sha256 = "1df6cx7y5i35cmfi5c4b48iys21cszrvlh039cdbkmy6d0pdbvi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -44619,12 +44669,12 @@ mini-header-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mini-header-line"; - version = "20161108.137"; + version = "20170621.521"; src = fetchFromGitHub { owner = "ksjogo"; repo = "mini-header-line"; - rev = "d8c3b6e93ad631d22564c273f61463dc9ded49ba"; - sha256 = "07r231xz45k1b3pzix308jn24s0gl8vgdbcd4vdh6p154znvcbm5"; + rev = "73b6724e0a26c4528d93768191c8aa59e6bce2e5"; + sha256 = "187xynmpgkx498an246ywrqdhyyp2ag1l7yxnm0x0rbfgw67q5j1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/122db5436ff9061713c0d3d8f44c47494067843e/recipes/mini-header-line"; @@ -45448,12 +45498,12 @@ monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monroe"; - version = "20170522.632"; + version = "20170623.103"; src = fetchFromGitHub { owner = "sanel"; repo = "monroe"; - rev = "1705eca01924210504d4270af7dab57278194875"; - sha256 = "19yca80zghb9zmyqdq155743plzzjghkfbi9zb5z8x2fvppixvwn"; + rev = "2bb59ac84e030f7047e7443e2df25185b397a5d3"; + sha256 = "0jcyidk62djd47dv4m53k7wky92982pzz87n8zq1fijqic63iib9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; @@ -45700,8 +45750,8 @@ src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "832e81b7f90f6c2e753f89737c0b57a260544424"; - sha256 = "1ll0ywrzpc5ignddgri8xakf93q1rg8zf7h23hfv8jiiwv3240w5"; + rev = "bca452544b5e200034d0505a767090a975a21a28"; + sha256 = "07bjkcgy2qvnkrlb5ypgbf969ka0pchz305326r7vfswlvkvihdg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -47432,8 +47482,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "d6eb8baf8130ab93140395dceca363774092135d"; - sha256 = "02dwb8xv4rz08wigr6im8rdfjjlhrpf620a7faq1ka2gn41hv1qv"; + rev = "7bbc708ff08f5660f4cff4b3e8c675bec428a1f2"; + sha256 = "1iqv268yvvhs7nxf28105g3ya16js1ibzxl0is13i4hlkx9wiqw1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -47474,8 +47524,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "186571965dccf57d15b9f37c1cca92a57187b7b3"; - sha256 = "1iz48szkby5b3f4935c8pnry84f6mh4f2xklv7zdykrczdqy5b0r"; + rev = "c7346a275c4cdcb59b3961241ddc52b79452d716"; + sha256 = "17vyi7215pwffa1hfsgkmgc1xkxkqqmrmg06rsxdy747mi4vpvr0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -47533,12 +47583,12 @@ nlinum-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, nlinum }: melpaBuild { pname = "nlinum-hl"; - version = "20170609.440"; + version = "20170613.1748"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-nlinum-hl"; - rev = "294037f5231375ac63836637651585f8b82b962d"; - sha256 = "048zm3x62wjp2ym0q8jn4ll0f11nak5i41q6mdcabq3zwg42zbqi"; + rev = "d5ca1490e0cde0605e34a6a17de8cc236c9810da"; + sha256 = "0rj2ay2x7mqnj2vpnndfzr47sldx7i6zxj4nn81yamrdxgv19ajd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b13a886535a5c33fe389a6b616988b7377249625/recipes/nlinum-hl"; @@ -47617,12 +47667,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20170515.1945"; + version = "20170621.1348"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "4bb6640ddc4c9453318133e777f09ca5c429d057"; - sha256 = "0m0grzppcnk447ysyh03dw6nz6vhdnihgf7s4rlqcy0b4qb7fmxw"; + rev = "1f10dbf40266c8e675e2e10f708f87ec61413ab5"; + sha256 = "03dndvbvb3f9ia1sk03zhbi43mq2irxbcxdaazvvyfk021bffbzs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -47803,11 +47853,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20170530.454"; + version = "20170614.349"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "1ec634461ea25d87cc16dbeb1318f8e30a07c9f1"; - sha256 = "00sqb0vl0990c5fxg0znwdfgq20q0zbx1pnhpr3dmnydqzmh7wwr"; + rev = "a83ab29930161d999ad1c45b6eb9cfbaa5e90ceb"; + sha256 = "15gmpvkgf75wiczi2iknyrdffk8q8yqmvkwdcdps0g31m9869iv5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -47989,12 +48039,12 @@ nubox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nubox"; - version = "20170611.725"; + version = "20170619.210"; src = fetchFromGitHub { owner = "martijnat"; repo = "nubox"; - rev = "2c6c1cae665dfc9cd000aacd84b9843eac0c74cb"; - sha256 = "13zjrql7arj0fklvajmr7xr7486i9917b9x54mxzmkwnbas4rg04"; + rev = "84aa965f0cb4bde293237e4cc586643d1f662f83"; + sha256 = "0i1x0sd61c8k4q9ijgxyz21gvj1gah273990qfjzj9a25r4hzvlj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/725948568b8a067762b63475bc400f089f478a36/recipes/nubox"; @@ -48513,12 +48563,12 @@ ob-ml-marklogic = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-ml-marklogic"; - version = "20160508.932"; + version = "20170622.1133"; src = fetchFromGitHub { owner = "ndw"; repo = "ob-ml-marklogic"; - rev = "58e101a8b79d408d5c9da2fbcbc0f38e80eb7208"; - sha256 = "15mzra45jcihgvddv69yxpml34hy15yz2hxcxz6a4la8vk6mw3ky"; + rev = "f678af0f440b3030e311ed6fbc444200be04da91"; + sha256 = "1fszg6bn927bi1dx4zgiq0wr7zxrjv8sjrwgn9mansbljszbmccm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edce412552d4798450493e0a3dbe768f38f77cc7/recipes/ob-ml-marklogic"; @@ -49332,12 +49382,12 @@ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; - version = "20170601.1329"; + version = "20170620.719"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "7ca20bb808dd51adbd83e0c18885c4300548d032"; - sha256 = "0p4adjpa3l6aaz7kd3474aagzfzrnra7mijw4l0himba9ldrh590"; + rev = "7070f2a64de65e0446536fb974c940399a4097a3"; + sha256 = "1hf93rm0vi37rmcgbf1w1a3gqvzszhs979fa8yhk905wl8zhz08a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -49846,8 +49896,8 @@ src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "de138a717813a8c269c07c0d284dfd71265bbf20"; - sha256 = "1nr78r0zsn6s626knay4zybk0222ng5yn6wh8ji7gl0bq47kqq75"; + rev = "17309b16d40fcb850f9d978ffb6f6d987395daad"; + sha256 = "0n2z6y6m14iiypvy97l7rk4d6c452c860sj8f4x8xzizsxapi26y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -49884,12 +49934,12 @@ org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-caldav"; - version = "20170610.945"; + version = "20170615.724"; src = fetchFromGitHub { owner = "dengste"; repo = "org-caldav"; - rev = "57dce0b4f0f234d9f4a72e5f0b811ee399e6d989"; - sha256 = "180amsndil1y24675xbdr9l6qad7lxq1pr7nlqgspmw0nccp0al4"; + rev = "07e6ccda6756754a115d567f2ad3a760514b731d"; + sha256 = "0gaqkbdqkb7v6k2bg21c8c7c38g9rkgk8gy79s4gi6hzd4j717mp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-caldav"; @@ -50259,22 +50309,22 @@ license = lib.licenses.free; }; }) {}; - org-edit-latex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-edit-latex"; - version = "20170420.1738"; + version = "20170621.758"; src = fetchFromGitHub { owner = "et2010"; repo = "org-edit-latex"; - rev = "945f4cffb501d3aa2b1c6dcaef7c18a83c090a89"; - sha256 = "1bwa4sb6yybvl2jdbxmx84s2bivqkil1dxy1y5wypv4cnib5skn3"; + rev = "323d0b39d0284cef730b706dce7c0e58ed35530f"; + sha256 = "0zcllyhx9n9vcr5w87h0hfz25v52lvh5fi717cb7mf3jh89zh842"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex"; sha256 = "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry"; name = "org-edit-latex"; }; - packageRequires = [ emacs ]; + packageRequires = [ auctex emacs org ]; meta = { homepage = "https://melpa.org/#/org-edit-latex"; license = lib.licenses.free; @@ -50579,8 +50629,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "5e35bc1807e0bd9014cd6aa9374b6899f164fa86"; - sha256 = "146ygql276bhb0inbn7bri7jnaxr4d8082ca0k1sal3fcd37a9mn"; + rev = "cc631078ad0ad5def8b726d98c49927232edc5b7"; + sha256 = "12zcvjkn07i738wjyzv1yiyqgavlxbyxhpq8viy26i3kvnckzgv6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -50599,8 +50649,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "5e35bc1807e0bd9014cd6aa9374b6899f164fa86"; - sha256 = "146ygql276bhb0inbn7bri7jnaxr4d8082ca0k1sal3fcd37a9mn"; + rev = "cc631078ad0ad5def8b726d98c49927232edc5b7"; + sha256 = "12zcvjkn07i738wjyzv1yiyqgavlxbyxhpq8viy26i3kvnckzgv6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -51049,12 +51099,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 = "20170611.1357"; + version = "20170623.523"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "b84634891be4323ccba938dc68b971150ae9a609"; - sha256 = "1m8g9laf2fij5vm3sqb087323gqncnww35jx8bbn888zjzxnsiy9"; + rev = "5f2f596eccd776e21c98f68e9b11013c4ea54a75"; + sha256 = "0qriaj0kycygbf2b25nr3nxqwa44j8gzm9lmd35w3h21vh97p66d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -51207,12 +51257,12 @@ org-sync-snippets = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-sync-snippets"; - version = "20170319.902"; + version = "20170614.641"; src = fetchFromGitHub { owner = "abrochard"; repo = "org-sync-snippets"; - rev = "80d89985ae52c3adf445deba851b6eadc794eef3"; - sha256 = "0vgq51im5124f7qzbqbyfyv4qbhjw4z4q1ksz3p5axd9hgir6520"; + rev = "e96bc94ff8865b4d408d90c4f3e39cc7cbb6cec8"; + sha256 = "0913klrly2xb1pxh91yvvfpzpackxn7sqpsajf4q8adbnlkn0w96"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96aff3f39adfa0c68aca8ff8d3b11fbfd889327e/recipes/org-sync-snippets"; @@ -51522,12 +51572,12 @@ org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }: melpaBuild { pname = "org2blog"; - version = "20170611.1836"; + version = "20170617.1730"; src = fetchFromGitHub { owner = "punchagan"; repo = "org2blog"; - rev = "256c0af68004fde8cf35d4824acb938803b10e7c"; - sha256 = "17ib0rsfdw3krvvz9gmfsqsn9gagqlvwh0ydfyaqpdiq9q2nllbs"; + rev = "ba2a943af674fc0703e3b81fc591d8f48758e05d"; + sha256 = "1fgz884m51nmg6ynpzxpblf5bbipzmrz15hhakprr9fr2grp3qzh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; @@ -52194,12 +52244,12 @@ ox-asciidoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-asciidoc"; - version = "20160120.523"; + version = "20170622.346"; src = fetchFromGitHub { owner = "yashi"; repo = "org-asciidoc"; - rev = "da5f66d881c79cc780290d80caa528c1dd219509"; - sha256 = "03ivnvqxc5xdcik4skk32fhr686yv2y5mj8w7v27dhyc0vdpfhvy"; + rev = "83cc8afad239bf386832e1da49fa273ab5a3e466"; + sha256 = "0slv4mp9vlazzd4c503zvqx66dxl6qwr9qrdi1grmshq0vnfxlyb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b268064f09ae5c3d15064b7d197c7af767fb278/recipes/ox-asciidoc"; @@ -52240,8 +52290,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "2080e5fcbce8147ef6931457c678309f7a679c49"; - sha256 = "0kmga1zm8zyby9yrczybrqm0gj56lk29v2nan4rhzhfnb87v9r28"; + rev = "68859169a416700bf031ab696fceac50008c8e7b"; + sha256 = "1cn4h6f0grz461bhjvmvxzqx5ccnyqd9pc7k60549p3p9yw5r735"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -52782,12 +52832,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20170608.1006"; + version = "20170617.2227"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "bef9e37fd8a9cb726e9b8a0e28baddc773a65912"; - sha256 = "10h6zlyhaw8waxd6g1x2xqprq0y9prl3jgndhgnmlq7zcmh7fjrd"; + rev = "1c92011b1a78b043054f7d725a281b5ec5bd46e9"; + sha256 = "0k23bwbxwn7ll9k7fqbv4mr6f4bbrli2xh1d6ix9x6z3nkn8iq4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -53303,12 +53353,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20170430.321"; + version = "20170612.1048"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "f5de68ae43a93f537f6f6b2266ba3952b56ccf2f"; - sha256 = "1g8bjlw0ygwjsf9p8r48bml7zw4jybb2g3r8a7qq5k75dz81k4f7"; + rev = "972d413b4d8284ba67ab43513a6a709692325f20"; + sha256 = "16f2jimhdbqhpgq66qrakk6ajp87ixihgmzvx9aip6icnp10mhgc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -54581,12 +54631,12 @@ phi-search-migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, migemo, phi-search }: melpaBuild { pname = "phi-search-migemo"; - version = "20150116.506"; + version = "20170618.221"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-search-migemo"; - rev = "57623e4b67ee766cbb299da00a212f3ebf7d6fb0"; - sha256 = "1k8hjnkinzdxy9qxldsyvj6npa2sv48m905d1cvxr8lyzpc5hikh"; + rev = "308909ebfc8003d16673f97ca9eb26a667b72969"; + sha256 = "07pi72jnd6k5xj9ypmxa0pbb03r07safpgf8vlp1m0xda5ixl0wf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b78e07146a4e954e050349a1798ac46ecba10bab/recipes/phi-search-migemo"; @@ -54749,12 +54799,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20170609.1728"; + version = "20170621.2242"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "dc30cb8110f395fffbc42c6271141887a0c0ec60"; - sha256 = "1zgyy3mnn6sciy0ml2l0crfqy9mlcy1iqck5kracbbz41ygigsqy"; + rev = "3a9076b6f6146326c1314c580acddce9cbb5a290"; + sha256 = "11ily856xk6i00hqfvfxwjch77sigb5lym10dj0zj689gp8jd0wc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -55524,8 +55574,8 @@ version = "20170419.303"; src = fetchgit { url = "https://git.savannah.gnu.org/git/gettext.git"; - rev = "a6f9caf8cc7614665d1be694485dd7bc30399e0f"; - sha256 = "0gpbixx68bfxvpx3y9fv0v4kgxwacydkwid6gmh1lgjc65ky0fy7"; + rev = "0df827ef0bd0b0f858cc6dfd6ea83a4502e5f13b"; + sha256 = "0z836mvpnm7pvv0b7ygls0s602yaydv1farrazscnx6sk8303qd9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; @@ -56312,12 +56362,12 @@ prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prettier-js"; - version = "20170606.612"; + version = "20170613.2323"; src = fetchFromGitHub { owner = "prettier"; repo = "prettier-emacs"; - rev = "f8ab2e5fb74beaf9e3023baafc118828526c5bb7"; - sha256 = "00gjzw855xa6ahghdlq6yygz6b279xbp47s6vj0rjsyghf65xkf6"; + rev = "4bfc8b3f8e459235dca24796f18a3587d59f4aef"; + sha256 = "1nzb0gf6hac35nnz6scqkfcwgp8ahwzv8qql9g1gkd5vhiag21ac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js"; @@ -56812,12 +56862,12 @@ projectile-git-autofetch = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "projectile-git-autofetch"; - version = "20161109.1429"; + version = "20170612.1011"; src = fetchFromGitHub { owner = "andrmuel"; repo = "projectile-git-autofetch"; - rev = "3d4eae6493607b9a0461c5161d195659c268184b"; - sha256 = "1db4jq4vn9mk8c9ma7yma7q00hwhwba25w2hy8jyagyb83lk2zgj"; + rev = "51b40134000a2411c6342e865e63f74c950a9310"; + sha256 = "0g4g4sjinmigyxs1irxv0yg524iq2hy8za09ksm3wbnbfa7w35ml"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch"; @@ -57152,8 +57202,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "96095f3a8577cd61ded2191d267cca70f221a9c9"; - sha256 = "1ia0krk66l0cl5bklprdk4bbrzv9j8lszvkakcd0fd9ikcdv68a1"; + rev = "eca0f4ee919480a4f516b825cf6809c6a7df4f50"; + sha256 = "1qs2y4nahs8a22hc0cd436l6gf28q5g5jq8q53zhjc6209i0lbkc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -57194,8 +57244,8 @@ src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "04de7bd8a14ea71eaed568127428b8a44f325b24"; - sha256 = "14dbg9cvph8b0shs49g6sfh5xrzpr9nn7c5rzxsnaaijys3z47rn"; + rev = "fb19c2624d209919204a1e247741595c500b5b74"; + sha256 = "0732l03h37xqamnfqbazzbbx99rc8kn8k0rfxrk0ncjmfpj60jiy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide"; @@ -57410,12 +57460,12 @@ puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "puppet-mode"; - version = "20170528.904"; + version = "20170614.2215"; src = fetchFromGitHub { owner = "voxpupuli"; repo = "puppet-mode"; - rev = "c5a0fc884d0f33c3140585c9c7699ce0bc969f63"; - sha256 = "0s9nza9v1qpjip5zig3374bn5jqw8fsn57ayqymbnp70nxdwcw6n"; + rev = "3ffc2de8416b4ea389d5800a4a05d0885d9a8608"; + sha256 = "0dlss3brh4654avq361yma4xbxsv6q5s8qlhp7v470ix88wx4v8r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode"; @@ -57916,8 +57966,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "2e820672609c489458dc2cf39d811e8c10255fe4"; - sha256 = "1nvylps33w5lbxh33qc704rvl998cniwhvwzj1x8fqlsnh1qaxfd"; + rev = "59ce0c377c1b72d4496a483cc00716848047530c"; + sha256 = "0pxg3zmxha9x47nzgfnczx2h8wn6l4ybphiznbxvrwgaakby0bd6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -57933,12 +57983,12 @@ pytest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pytest"; - version = "20161014.815"; + version = "20170614.745"; src = fetchFromGitHub { owner = "ionrock"; repo = "pytest-el"; - rev = "91d8b7fe568527f51c172d6caadaad4f49e53bdd"; - sha256 = "1s2s8bf0r1nidypmqiawj8i6jwb3y3wslgrhr8nzbz8c7lf626s3"; + rev = "013fccd684fc8f2092d6e1ec4203ec574e12051d"; + sha256 = "0yjnq2lyh6jr5xz29n6xxmp4lcy28wrcmw05j0zgcjdshri1pd43"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/33a854a27adbaf57d344340199f90d52747b8450/recipes/pytest"; @@ -58290,12 +58340,12 @@ quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }: melpaBuild { pname = "quelpa"; - version = "20170205.2155"; + version = "20170620.2318"; src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa"; - rev = "a39ab429d6544dff17e933f8d98530da4f8c636f"; - sha256 = "002r4vc2a5yjm448xsk2dsfzm9p1whiwrcb0pccyy2597ba87w55"; + rev = "dbb57da3eba3b5a04ab9b5184634ec139d68ddcd"; + sha256 = "1jszkgf9rkkjscfaijbz84kpbpw46p15zvlvfmvil30gs5vp2pk4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; @@ -58500,12 +58550,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20170607.737"; + version = "20170617.1942"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "02fe949875a7db935693af7d20109d29521b4276"; - sha256 = "0aqv9j36abmhd82fd443khaj3i4mww5xs4f9p3d65glg07wm2j7q"; + rev = "9c5bcb7b7db979b34c6e99ade84b443651d62ab7"; + sha256 = "1cxpjkds24afi5b9i13dkgzv0yy6cgg3r9vsrif8mfhhfrr7sx1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -59514,8 +59564,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "e0d467cfc50546d88f286383ea8ab54aa36cd5a9"; - sha256 = "1lyj4h2qpl88hwxfrk2f1vr729bdyr5vvm8ra8p73rcz40zwdamr"; + rev = "de1239ac489ec2c03801c5a92ad716c82140d3ae"; + sha256 = "04dfir58zhd244a8kci3xs31i691wiqldkfay6819lqvq5pfna5j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -59844,12 +59894,12 @@ remember-last-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "remember-last-theme"; - version = "20170304.29"; + version = "20170619.1433"; src = fetchFromGitHub { owner = "anler"; repo = "remember-last-theme"; - rev = "14b4b5a03bb59b4e7040da96d7c261ee8f7884e9"; - sha256 = "069bzswwaq1disnq0j49c3xq69xrz7rn6z3zc0cv2cspn2hk1x5p"; + rev = "57e8e2a475ea89316dbb5c4d2ea047f56a2cbcdf"; + sha256 = "0sb110rb6pnjnvyqn0kji19bhbn8mk4x32yps00aq2g2v9pc1jzr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/26edcdddaf8dc8c9a18d6b007e0d49d04fe4ccca/recipes/remember-last-theme"; @@ -59865,12 +59915,12 @@ repeatable-motion = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "repeatable-motion"; - version = "20150629.1112"; + version = "20170620.1148"; src = fetchFromGitHub { owner = "willghatch"; repo = "emacs-repeatable-motion"; - rev = "e664b0a4a3e39c4085378a28b5136b349a0afb22"; - sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck"; + rev = "77aa35b27c8a76dc8deef87c9f71ef7e6fd289ee"; + sha256 = "0pm9z0w402430j66167s1az37jxw89sck1b7lm9gjnc3gslh0lpm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0dd56ebaea098715b9c201f07e6196c38977f8e3/recipes/repeatable-motion"; @@ -60260,12 +60310,12 @@ reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reverse-im"; - version = "20170611.2334"; + version = "20170614.230"; src = fetchFromGitHub { owner = "a13"; repo = "reverse-im.el"; - rev = "341e1d7955d9b25778a0e28921abc4d31704ec3b"; - sha256 = "1mcggccv75v9xrd1i1x2csjnk432ws2h93bh5y4wm3sp3ky8lg6d"; + rev = "59368a504a67d1a93f56cd6e58797ca19ab578b4"; + sha256 = "0xsmz92f8bcyq3nq7fwca1x1brrgvd1cg1x6f7j939wmcqql5mnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im"; @@ -60384,12 +60434,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "rg"; - version = "20170603.1202"; + version = "20170622.1135"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "fa63228680add9b30735fec571a3eea572345914"; - sha256 = "0bh23avfdcadfx2awkbd0mld54g6ir0bg1szbwi8m0w9pwa4w4mk"; + rev = "09a5919d8982cfdb8496f0db7deccfb510a7f000"; + sha256 = "1jvinpid3w4p6s4ni0fhg4g8xc3m0c7rd3db2al214xfcn4mbbgr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -60636,12 +60686,12 @@ rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rope-read-mode"; - version = "20170325.831"; + version = "20170620.237"; src = fetchFromGitHub { owner = "marcowahl"; repo = "rope-read-mode"; - rev = "66c02e3efab84e12c2857cb2b56d524e98b7bc87"; - sha256 = "1hmp7k17q5d5i6286x99jmfq954d9ys5347xk3aph9m5pmybvfrf"; + rev = "bbb67d54a31ce238e4a8b1aae677ef055aea27ba"; + sha256 = "1l00km1rrnybskv0rv0kqxdrqimmfwz4mmil64m2d6vl0nqickb0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode"; @@ -60787,8 +60837,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; - sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; + rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; + sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -60849,7 +60899,7 @@ version = "20161115.2259"; src = fetchsvn { url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "59070"; + rev = "59162"; sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; }; recipeFile = fetchurl { @@ -60930,7 +60980,7 @@ version = "20150424.752"; src = fetchsvn { url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "59070"; + rev = "59162"; sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; }; recipeFile = fetchurl { @@ -61364,22 +61414,22 @@ license = lib.licenses.free; }; }) {}; - salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: + salt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: melpaBuild { pname = "salt-mode"; - version = "20170611.420"; + version = "20170620.1518"; src = fetchFromGitHub { owner = "glynnforrest"; repo = "salt-mode"; - rev = "bfcfa72093974f36635413a845e7a5df7c5ea974"; - sha256 = "1x974csw8xyd90xf8ns5h6c0s9fszy02hdmcdax6ywi8vxksmjsy"; + rev = "624603a87aa21a388fdb17daf48e7184ee6e0222"; + sha256 = "14pr58rgrg8v8j594lrkfpwnf98g11jkpfn4n2bfzir100vgxi5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode"; sha256 = "1n7i9d6qpjsdcgbzmbf63y4c7ggxh5wsim8fd0casnrq9bl7ssym"; name = "salt-mode"; }; - packageRequires = [ mmm-jinja2 mmm-mode yaml-mode ]; + packageRequires = [ emacs mmm-jinja2 mmm-mode yaml-mode ]; meta = { homepage = "https://melpa.org/#/salt-mode"; license = lib.licenses.free; @@ -61807,12 +61857,12 @@ scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scratch"; - version = "20170523.2046"; + version = "20170614.1401"; src = fetchFromGitHub { owner = "ieure"; repo = "scratch-el"; - rev = "3363e861cf7c135873ccf273f759d72dd0bb5854"; - sha256 = "0k4y7kqd7izaqpa0xmp7ag84vpnrgz5mi6cgh5ap1vspxg3pycz4"; + rev = "2cdf2b841ce7a0987093f65b0cc431947549f897"; + sha256 = "0wscsndynjmnliajqaz28r1ww81j8wh84zwaaswx51abhwgl0idf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b46813f928eadfa08a1d4bf94ceeb96dbc2a7c72/recipes/scratch"; @@ -63225,12 +63275,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "20170610.1147"; + version = "20170613.1717"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "8b7de952da37f1c04fa1bdf8f54c1cfb6a7c2a8f"; - sha256 = "176rhjyh9f3scbwjkw8h64dbamfcczwjpwv3dpylmjaqzwmfsal3"; + rev = "ff8e0a6d36cd84408dfaa2040cc0fa16db14b531"; + sha256 = "1rf4816278cfzm0w21j5v9abb2icqr0m4iyhgg7k4pl92db79hrx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -63581,12 +63631,12 @@ simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "simplenote2"; - version = "20170317.335"; + version = "20170618.644"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; - rev = "5f267d6289b103d77feb2f038baedeae39deee75"; - sha256 = "07rmwga7qd8g71km5p3g3vjmmiy8cr5snyrvhiwi9lcnai83kc50"; + rev = "78ab3d818633c0d6575cd1895c119bd690003bf6"; + sha256 = "0z9zary8apzjsx031fhy94ggqancm94mjhj335kr743s8zr3511g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; @@ -63623,12 +63673,12 @@ skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "skeletor"; - version = "20170413.2030"; + version = "20170616.1746"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "skeletor.el"; - rev = "376958e6e39dcf32df945c617c230dba3bcc076d"; - sha256 = "152kqsbhn1z3nf55vrrz6iv96c4jkzp2bglgp2bqb37nfh722frz"; + rev = "01c330ec115fc29bba5d9bdf6c15beb4a44e2281"; + sha256 = "0i3axni8y4s5n2s7qbqzz3sadcfhr3369q7qn8psk29qbicjw5wv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e63aefc869900c2af6f958dc138f9c72c63e2b8/recipes/skeletor"; @@ -63749,12 +63799,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170610.841"; + version = "20170612.900"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "b020352573a14e452a5c8a18bbd0ab23539a52cc"; - sha256 = "1nqax756ya008glr1qffqa222hcz45grjwfnncsq48k1nj5b0dpf"; + rev = "94f1a311de0c79c8245784543b05359714550d72"; + sha256 = "1ypsl1vin5h90sr4cc127f8gm23h4pkag6zwfwx53h2yrsj7vvrh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -63812,12 +63862,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20170511.1221"; + version = "20170622.1604"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "7ccaa81b4266d478ed92003fba097756afc6ae19"; - sha256 = "1l4idfy98qh7c3vaxiv91irhw14nz8h2mvfs3g7j4abv51102kx5"; + rev = "74c1a83711a0c2b96e9387f3fa03f387a6713193"; + sha256 = "05rs4da1dgwvcwvbq70angwqh3zjhsxnjvp5rpfvk5lzw9p8ng9r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -64001,12 +64051,12 @@ slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slstats"; - version = "20170602.304"; + version = "20170612.725"; src = fetchFromGitHub { owner = "davep"; repo = "slstats.el"; - rev = "07f515f835c92b6be538d2f39dda31ed281f1054"; - sha256 = "12fzcfw4fxf6g0zadzcr8mx46a8x8969shpcmkn0f8ixn014w7ax"; + rev = "7488623cbe406eaafccc36d293e8c42bbd308085"; + sha256 = "1q3zm9qfivbd1k9kjilwvzhlcbzv6dwnd78bfzzkrppbjcpkxz3n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats"; @@ -64359,8 +64409,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "3656417ec06ba448f940d65e96bddb57fdc79244"; - sha256 = "1vm96cb693mgzf7x9wl3sy3z90rq4mgbrnhy9hb746ypdpkfd3am"; + rev = "f6f0c0a81c1e4265bf95dad49a02579d8e859ac9"; + sha256 = "0srwjvyhqmy3g0dlfs33f93x0f55da0zl9cs35hjls2adwlqk2cr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; @@ -64380,8 +64430,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "3656417ec06ba448f940d65e96bddb57fdc79244"; - sha256 = "1vm96cb693mgzf7x9wl3sy3z90rq4mgbrnhy9hb746ypdpkfd3am"; + rev = "f6f0c0a81c1e4265bf95dad49a02579d8e859ac9"; + sha256 = "0srwjvyhqmy3g0dlfs33f93x0f55da0zl9cs35hjls2adwlqk2cr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme"; @@ -64523,12 +64573,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170606.725"; + version = "20170619.149"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "3bc7f1d38a0b5800e62a612e16fe42d9b0c0e11e"; - sha256 = "1xghvmwx66mns3kzk1jw2g08553qqa50h1sq1jg5n2apjl4gprdh"; + rev = "a806e2fd18e3b9923f570a2ad2ba6323a38a43b5"; + sha256 = "1wfaihamb2h5bf8z8fs2xpm4fxzfhlm4s1j0yv6b6dw2b6g2bx7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -65051,8 +65101,8 @@ src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-solaire-mode"; - rev = "70e3b9cc171d4d9171c652c6d255bf03dcd0ad9a"; - sha256 = "15plb1gh7wz558008653v1xskz0bby477vvs7d7a752vrd8s6jcr"; + rev = "d2744f8d2d8e1af5d5784021bcb8772e163be800"; + sha256 = "0zsm00lggvmps0krlhyb5vvs0m0kikzmamj9mq5hw3k372jv4djm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; @@ -65432,12 +65482,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20170530.434"; + version = "20170621.45"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "d86fc0353cbf1a95df261e40ec5b7292b0d557f3"; - sha256 = "1pj1rdfm2dxri6v2c1m8slpabdmbgqqr0cp23s5w4s39g0mmphvg"; + rev = "b1c41ddd290153fcc1df8f1d0fb54062e9943894"; + sha256 = "1ga6h2jbnkjkf5f1hqg5jy5fw0cwlgzpn2f1mcrj04302i2vliv4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -65474,12 +65524,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20170611.1307"; + version = "20170621.718"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "a7e76aeb0a62f986e0469183728407c7bcbf4993"; - sha256 = "17gbrijf62qdk5s02lish5nf6l8mfqrkly98hpkwzz3js4xkykkb"; + rev = "be01cae704dc73e6a4b53766e655fb0dfba1bbc1"; + sha256 = "0c8mx9ivalgvazhn51lbmskayhdhwnmvq5jp5wi7925p05i0kb3z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -65558,12 +65608,12 @@ sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20170418.231"; + version = "20170619.255"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "a51d4e57974e8d06f7d49ada0fdca656b7470642"; - sha256 = "0ywhqk6n5k0l85zjwbnrivnvxjzqipqrggv06lify6yv18qmyl6s"; + rev = "c06eac2abae29ae55794e61ebd06890909edda7c"; + sha256 = "08w88wv3yd1l87zzwlrfj586hh3l2k1xq80f1mzskr7vkzi2ailx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -67412,8 +67462,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c"; - sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878"; + rev = "f0426613062ba8305ebac41672d853a95cd9bbca"; + sha256 = "0mjh89snhm8lzy52k4wb352k8zljs2mkmx5w92ddhlzsfaf3hdd8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -67555,12 +67605,12 @@ symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symbol-overlay"; - version = "20170604.2240"; + version = "20170615.1919"; src = fetchFromGitHub { owner = "wolray"; repo = "symbol-overlay"; - rev = "3eb0864b65f9fe0e7c98fae7e9bcfd6330c471a0"; - sha256 = "178ny3cbxm2hvmh0f49hvi2m15r72f2by3k076d4rzawab0gnp1p"; + rev = "1c40cd921d573bbbd2cd9770c0bafc484b23a2ad"; + sha256 = "1npgjhjdky298n70n1lh1qi6d1km1d9vy82n2x4rjn45699gkrl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay"; @@ -67700,12 +67750,12 @@ synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "synosaurus"; - version = "20160812.723"; + version = "20170621.957"; src = fetchFromGitHub { owner = "hpdeifel"; repo = "synosaurus"; - rev = "24d194992d9c57df29256257b80960fdb1c4c2a7"; - sha256 = "022fj1pfbjjl6khzmns9pwigwg1cll3vlccf48i8amk4n1m1wgmc"; + rev = "acc4c634eb7c7f6dd9bce8610efa7fc900e9c47b"; + sha256 = "0q8ggyfzvclgxvma2nvkfc89870hmii9cc8022ff0n7729rfj7m0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/synosaurus"; @@ -68185,8 +68235,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "37d65c003224b88108d035732bfa729b2a14e8ab"; - sha256 = "1dva713chyv3y4d689a81zpmrk22spvx56lkdmbvq5hfp467kayq"; + rev = "c823729104873d0d1eeff4256eb15ee4c1dbfa36"; + sha256 = "1zkjyj3jm2q23yfjvrvikrm6c6lvcysnnhivfvvrh0qr7qlqvwfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -68626,8 +68676,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "a4db15583ea15cd7b62c706ea42a38bff9b418fb"; - sha256 = "150snv08wv8fyzp3qif6yvfy1b24rrbdc50vzlz640rmcd6qhk59"; + rev = "3f8a2bc7c2e9a4ac55e8c6f6c60c0634cbe71326"; + sha256 = "104s1mfn6cwi0iqq5ccaca5dzh29gfhfnif8a0mi4qy5ljsp9xng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -68647,8 +68697,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "a4db15583ea15cd7b62c706ea42a38bff9b418fb"; - sha256 = "150snv08wv8fyzp3qif6yvfy1b24rrbdc50vzlz640rmcd6qhk59"; + rev = "3f8a2bc7c2e9a4ac55e8c6f6c60c0634cbe71326"; + sha256 = "104s1mfn6cwi0iqq5ccaca5dzh29gfhfnif8a0mi4qy5ljsp9xng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -69144,8 +69194,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "b8ee72de5bf9318d50846852082325d0f932682b"; - sha256 = "0gaiy81zvhx6d7yfnxy0hlpb8q5crg312xhqxbx8lgw0m702k6a3"; + rev = "c55fdb95340417a4ba2dda41e9e872a4bcc63459"; + sha256 = "13x72ksfpq047xr74v86ycfa6qwymx91bp4r7j08a1qlgw4adgdq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -69202,12 +69252,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170609.753"; + version = "20170621.1159"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "dda031ba33e1c61674c1c17861abef6b5c37fe28"; - sha256 = "17r7vjpcj4wxq8zxvm5bzm8xg0y29ybgff608s8hq6vkbj5sflm2"; + rev = "ec4a2b7a68c2503a6bdb31f1b6977321ad588102"; + sha256 = "1dj29365ia50gf4cicwvpcidlcp67hndyv60w6cgy6fghsslldnn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -69444,8 +69494,8 @@ src = fetchFromGitHub { owner = "aaronbieber"; repo = "tiny-menu.el"; - rev = "f1fc844f514f57fd93602ff5e00c6125b0e93254"; - sha256 = "125ckmfsvzacd5icsnldcbfl4rkxpfal6qfindy80i84vk0qw47g"; + rev = "05563b94537b6eb22aeddedef2a6e59e3f88d073"; + sha256 = "0k0djq60mwhjiwy9dpy9m9bs507b9p19pdl3g2s8sd9i2fk53rfy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82700c97ca40130e7508c151f60220d3f23bf23c/recipes/tiny-menu"; @@ -69503,12 +69553,12 @@ tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tldr"; - version = "20170401.2140"; + version = "20170621.2059"; src = fetchFromGitHub { owner = "kuanyui"; repo = "tldr.el"; - rev = "05da2ac1d82f9918b493e0895e98cd59666d3e28"; - sha256 = "14ni301cn6s793157k1fkz65ab1xgh94n3g12hcj1xnmbdvnlymy"; + rev = "2d80571cbffc5c02aad771da4b00502d86242926"; + sha256 = "14gc1ihiyk7j4vf33r2kq3sbj37gw9s17p3gykj2sfviq295s006"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr"; @@ -69563,25 +69613,6 @@ license = lib.licenses.free; }; }) {}; - todochiku = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "todochiku"; - version = "20150112.1254"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/todochiku.el?revision=16"; - sha256 = "0fhlyjl0a3fd25as185j6dmch0wsrf1zc59q29lhjximg9lk3hr5"; - name = "todochiku.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/todochiku"; - sha256 = "1iq08s5ji6hd8as80qxqkbavnjbx0kcmmjjvhjchmvv93vsn1f96"; - name = "todochiku"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/todochiku"; - license = lib.licenses.free; - }; - }) {}; todotxt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "todotxt"; @@ -70195,12 +70226,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20170607.1239"; + version = "20170622.1241"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "d5878b0ed6da2a561aa795b31848e31e7c696197"; - sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3"; + rev = "b517e31c63239d20055462bd8a1b4f594d7351c3"; + sha256 = "1k5bph4wmxdz354gxmvbjc3q6rgvqjyqc1mwid24qn9rmnl3v9vd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; @@ -70216,12 +70247,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "20170604.315"; + version = "20170615.336"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "d5878b0ed6da2a561aa795b31848e31e7c696197"; - sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3"; + rev = "b517e31c63239d20055462bd8a1b4f594d7351c3"; + sha256 = "1k5bph4wmxdz354gxmvbjc3q6rgvqjyqc1mwid24qn9rmnl3v9vd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -71497,12 +71528,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20170524.2245"; + version = "20170616.1454"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "726eea13a3a4d75d630aac29d6b71d74d9dc69e3"; - sha256 = "1r75ysdz6cj97vn46lj4g2a3hsab377f667a8bfs17rz007nddv4"; + rev = "5bd87be2c99196c5342de7ffd56dd9e703a7e400"; + sha256 = "10q6zwhp6501sl92p4ag9bp0awagbkn7757iy0ysprxnpc2ajznf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -71543,8 +71574,8 @@ src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "06460235d6f6ffd82dd2d973c2ad1004a4a2619b"; - sha256 = "19ffqy52r52c7kjpb54flfilgnfkmxa7pkq5w0mw6xiaw3qvha2w"; + rev = "4fcf11ae5f3ddc5ebc8f8f973fcf3f995c29c38d"; + sha256 = "1pw8h6bwjmr61l7ncl36w9lqxsq4z9pbsi93nc0sfr67ram5ri47"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -72566,12 +72597,12 @@ vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: melpaBuild { pname = "vue-mode"; - version = "20170514.2341"; + version = "20170621.652"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "35d803b19a302e7206d1a54db47b6dcbb674ce88"; - sha256 = "1j7qvj653gf7dwimwl26zvz5ki04bp7vlkwcxqkc9fshcjm5py1q"; + rev = "b5ecf28ec78033ddaac69065492fa4fd1d07637e"; + sha256 = "0bybqffh2fbaah8iyib029v8wq0q9prcaydca4k2fr7hh5snrzwz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -73003,12 +73034,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20170603.632"; + version = "20170613.959"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "290f0ecb43dc6a636e45f55cf95c0d8fbda3fdc2"; - sha256 = "00i697brchwdz3hviq2khhxcih7zi90dym1s5m9vk5azi2qly8ys"; + rev = "8c35710775de9369f0637a9bd5fde39e4074db72"; + sha256 = "02l948kffqp5fds2gka6klv7myphnaakjk68g35sm98nxvzhf5cl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -73108,12 +73139,12 @@ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "20170611.345"; + version = "20170612.1352"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "90a96d21fc3c7edc7c339b343462696bfc6d21ff"; - sha256 = "0q2fdxdlyfggrlgyfbq63n5k7qfjyr08cjy0k4i74sjphdss1bcl"; + rev = "655a364fb1a6c9f3d49a0bbaf338bbf492b5b4d1"; + sha256 = "11dqcch0fcxkqnnfzk9hxmimxckimpj74fz7rx3b7bvkmrh9snyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -74319,12 +74350,12 @@ writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }: melpaBuild { pname = "writeroom-mode"; - version = "20170528.639"; + version = "20170623.327"; src = fetchFromGitHub { owner = "joostkremers"; repo = "writeroom-mode"; - rev = "d3252f54c8f9f37a19d6a21fb2291c3da7a7121a"; - sha256 = "13nbls5qxz5z8firjxaip8m9vzfbbpxmwrmr01njbk4axpwrpj0z"; + rev = "9e924dd7dd83f10b026c89cddef7e1646f1a3869"; + sha256 = "1v7hbmi9dqdqyr3png1xwhg3k05jr2q6jdjmj48bxiixl9zhcq9p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode"; @@ -74382,12 +74413,12 @@ wttrin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: melpaBuild { pname = "wttrin"; - version = "20170322.2041"; + version = "20170614.506"; src = fetchFromGitHub { owner = "bcbcarl"; repo = "emacs-wttrin"; - rev = "00ae9ee54056b16bb20c5b35e6bd262e6bda7eb5"; - sha256 = "09vxi1vm5vsh7q9dqjbya8qrrclwid8r2hq9ycc46mbhx5blyz45"; + rev = "df5427ce2a5ad4dab652dbb1c4a1834d7ddc2abc"; + sha256 = "1ai655f10iayb4vw0ass2j3x83f4vsv90326mnywkzfl3sxd432z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b2b6876562f1fadd4af1ea9b279ac4dc1b21660/recipes/wttrin"; @@ -74529,12 +74560,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20170511.2126"; + version = "20170620.1705"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "7cd242de67d9567c343d5f530134759c2a8115d2"; - sha256 = "10z2c1hbprgi2hil72g4w109namgns4mibgd4v8j9wggphjy8v6y"; + rev = "1ecbe880d6aea24a77a8bd903e2c82225a35caf4"; + sha256 = "14081cmsm5xrcmfpz5jh92ml0yir0fwvn9pxpf4x93x1wmp6d5r7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -74571,12 +74602,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170531.554"; + version = "20170620.1932"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "4d871873024520168572babd174adc203776c71c"; - sha256 = "0xiyh9qam40c2by0qp26x8ki090z2yv0319qrn5d4lsz69ivnpy0"; + rev = "b18be452791b1468ecdd84aea7cac772519218e9"; + sha256 = "00ncmin6azfkfhi4ns39wpjprfgc0bfiqvd5ccapbn12x48y2hra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -75222,12 +75253,12 @@ yahtzee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yahtzee"; - version = "20170608.836"; + version = "20170617.20"; src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "0a4c06ce68868133498e0ce1ab5efdf296fa4862"; - sha256 = "12vmgn118bwrrjpp1a1s47zk1q80gx7pakjhll03vpsyw08yvg13"; + rev = "d7dcf24c1b9a04f4eb482b6c9cc29f80cff3a733"; + sha256 = "1kf2szbiz3fkm72zrjcidwx4cphrwi7gjs24pnh0mii7dxkvmwhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -75534,11 +75565,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20170603.725"; + version = "20170611.1642"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "c996fbcc2e79"; - sha256 = "1ibj0dhpgxa143azr07wkmz86fip247cbk2s5fwj4nrj96z6cw9y"; + rev = "e9299b77df1f"; + sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -75596,12 +75627,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20170515.2255"; + version = "20170622.146"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "29aba538be5e44da81ad76a6078bb65c1c5e1aa6"; - sha256 = "0fpccpiwwsxg0asdzg0m5hlwdv6jyr7khywnd1rb6kvr8m2qm0hf"; + rev = "43d690e4922dbf44e5deffc89cd06f2b1bd79ad2"; + sha256 = "1vzsh8yj7v4qc5byb73pm25d408c28nm9cm780j289bpgx56p83s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -76252,11 +76283,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }: melpaBuild { pname = "zpresent"; - version = "20170608.2201"; + version = "20170620.2134"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "66d2f665daa1"; - sha256 = "1fgggwivp405qm0nvbqk8vrnprimg336mcv3am37yavi9da48fi8"; + rev = "d5aa3fb7d4cd"; + sha256 = "0154cij71gczwpc0rxpa669dx6ds6b383y9f3fi1hh6i6w5dw1dm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index f156494b83f..23b6ff049c1 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -216,8 +216,8 @@ src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "8fdfbbebf096017ab45cedcff2c43a0a5d8b9686"; - sha256 = "0ik1hh8qs5yjb034zc93fyd6la84mgp6y5gzvpz6rfbjfxy6vf3y"; + rev = "ee692f7cde535f317e440a132b8e60b7c5e34dfd"; + sha256 = "0zg39brrpgdakb6hbylala6ajja09nhbzqf4xl9nzwc7gzpgfl57"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -527,12 +527,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d"; - sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -548,12 +548,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d"; - sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -1837,12 +1837,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "666066d30a420d86801d8380f5991f2b82471107"; - sha256 = "1hjyac7dm0yvg5y32fii6508wwhl5q493i8ikf3fszafz03nc6sc"; + rev = "d6222c2959caaca5c4980038756097da8a51e505"; + sha256 = "1w7crkgi2k97zxdqv2k6a88kmz75s5v7p7n8bw8v18dvxx9sfisn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -1900,12 +1900,12 @@ auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auctex-latexmk"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "tom-tan"; repo = "auctex-latexmk"; - rev = "b7053f71f578ffb0d247f8a9e8d5152efd86e096"; - sha256 = "0slihygr74vyijnyzssckapscxmdd7zlgrs0wvmpw9hnjzwwzzql"; + rev = "4d353522650d7685acbf1d38f7dbc504f734bd84"; + sha256 = "0qvscgffmzqk8lkcg3yk91vciim5ygk2m4crk02qn72ipkw5q13m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk"; @@ -2170,6 +2170,27 @@ license = lib.licenses.free; }; }) {}; + auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "auto-minor-mode"; + version = "20170620"; + src = fetchFromGitHub { + owner = "joewreschnig"; + repo = "auto-minor-mode"; + rev = "c91c566cbaf8eac1fff0c7d9eef88308a566cc43"; + sha256 = "0nq95k2wmq17awjz0kvzwnhpnda0813gdyjzlqpzpqb56092sbif"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode"; + sha256 = "1dpdylrpw1pvlmhh229b3lqs07drx9kdhw4vcv5a48qah14dz6qa"; + name = "auto-minor-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/auto-minor-mode"; + license = lib.licenses.free; + }; + }) {}; auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-package-update"; @@ -3460,12 +3481,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "25ca2fcbd6b664cc7a20b0cccca3adc19e79917a"; - sha256 = "1fzrczx1aq0q130qrvzq8dssc1qm5qc9pclsyd3zn27xbn5lsag3"; + rev = "b0487f95a7de7a1d6f03cdd05220f633977d65a2"; + sha256 = "0r9v7q7hkdw2q3iifyrb6n9jrssz2rcv2xcc7n1nmg1v40av3ijd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -3817,12 +3838,12 @@ cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheat-sh"; - version = "1.3"; + version = "1.6"; src = fetchFromGitHub { owner = "davep"; repo = "cheat-sh.el"; - rev = "760cff945839a8397d44ac95aeec94cc28a51691"; - sha256 = "10rr4bnhq2rjd6bx2r0d3cxa7ixk4la58agg5a83y3z52a673rqv"; + rev = "ee9a51f4b2a8b2f26008e00a84b6c344b6664e85"; + sha256 = "1hzv0l6vc7zdj93cimmi9rz6i6xsg25yf4rcfqlhcax10bhnjsd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh"; @@ -4459,12 +4480,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.9.0pre2"; + version = "3.9.0pre4"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "010b50fda71feaff3abec4d13910f4a4bd1f13b0"; - sha256 = "0b77hm5l18fbzphg3wcdzrblbhh65wx7c1b98driky1634kn9j10"; + rev = "8fe54172fcb37e39e0f7e506e575bdd8c7171e8d"; + sha256 = "0yv4avlzg4wbljdi5yfizmhpsf4m5p7gfc8mx5qx91mvjs71jmam"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -5089,12 +5110,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d"; - sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -5284,12 +5305,12 @@ company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590"; - sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w"; + rev = "d042a673b4d717c3ca9d641f120bfe16c994c740"; + sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -5998,12 +6019,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "0.25.2"; + version = "0.26alpha0"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "c9bcf1bed3acf367d6deb0c273cf22db0f18dab2"; - sha256 = "16yd296n0nh96pnkjpdbdz4i7ga4j961pkzm3cbnika26xwndx03"; + rev = "5528995cc6d138456be9b9d42a422a3c5de7800a"; + sha256 = "1fd3335f2ay24nhicncmy1sz0mcdrminphsv630wkifmykarz9zh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -6878,12 +6899,12 @@ direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "2cdf87ea96f9a08dee98762b18b5f8a5198ecf63"; - sha256 = "172jyl8v4zy9bbha8nndq63x8svn9xqkafkj3q17z289na8iaylh"; + rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa"; + sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -8100,12 +8121,12 @@ ein = callPackage ({ cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "0.12.7"; + version = "0.12.8"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "334bb4600051d96d5eb82655e6e2c2ef926e701e"; - sha256 = "07h3za6cwznmgwm5854yyc3paidbjlpwsj71ii7qlga7j00b7ak2"; + rev = "2dcec6a2c4d3258a92f77a35de1899cc00d2f537"; + sha256 = "0n8qvdj88d679ijjqs04cnnhz8prk8s3whijbp3lhlr5n034n8xa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -9571,12 +9592,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.0pre2"; + version = "20.0"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "d106c5fffb3832fffbdf99cca905390fe15d489f"; - sha256 = "14hgl356fjkbx056fqhjif4kjs05ih08r9mi9qj58k0hxpva2l8c"; + rev = "040bdce67f88d833bfb59adae130a4ffb4c180f0"; + sha256 = "12dbay254ivnakwknjn5h55wndb0a0wqx55p156h8hwjhykj2kn0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -10851,11 +10872,11 @@ exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exiftool"; - version = "0.2"; + version = "0.3"; src = fetchgit { url = "https://git.systemreboot.net/exiftool.el/"; - rev = "799076ae62d96e9d502f1189217b04ffdda2dc1a"; - sha256 = "0yfa6w0518179v8hzzwrs6swrc1ak1nkyy0a7lkryrw310107j5n"; + rev = "8dd70ba5214a73960361a0c6220bb4aa72b9e478"; + sha256 = "0sb71bj8djppzac02bpl3v7fy0jlidd4aagg8bmmgyp7zx84xws8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool"; @@ -10955,12 +10976,12 @@ exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "47952c09e74fc0da3135e7ba0d4fef0eb88f98dc"; - sha256 = "14mf388iygirlv7j5db2x5avn70b54mm34kd3y851n6i6yzgz7jw"; + rev = "1304aaf6d09323cb519c93167a75000a81e56247"; + sha256 = "1bs32nq4y94dpq11326d6180maqrq17a8xjiy9rmc2gcizlv60dg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; @@ -12243,12 +12264,12 @@ flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590"; - sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w"; + rev = "d042a673b4d717c3ca9d641f120bfe16c994c740"; + sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -13083,12 +13104,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "1.9.7"; + version = "1.9.8"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "1020b6ccb5bf7d3eccd9e84b7ab293c87528265e"; - sha256 = "0qbhl4yzn5q156w1gyapj430sxj4iyzgdwh2f5zyl8q791vad9k3"; + rev = "9766952bd7830cb0d319736961af8e42e67d42fe"; + sha256 = "1krncbzdhp6kpypaqdn6fhvxhhc1pvy2ayn4w4ljmsd7wx6zazyi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -13362,12 +13383,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "1308c93c1eb6c96c0e322f09fcb784f5df208a04"; - sha256 = "0fva9xmwh887d0fdm8id67azs5rjbqk7qpjlwh7nlhrwgxsnzr7d"; + rev = "003abd23a7468daa133dfbc7ef85d0d61a0410dc"; + sha256 = "15ck23xv3dz9i4w5xd9lkg0c6rlsyxdz465xrpkr77fq9qw0c4dg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -14811,12 +14832,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "9bfdc5ce62c0585b48b154cc460f8664dcd124c3"; - sha256 = "0p00s08fjwh106dag9wyhikzrh0vqd4pzb852b2zrmb7zlhigx65"; + rev = "b63044e5f833781eb7b305bc035392480ee06a82"; + sha256 = "1p0xnhcm7kx4g9wvy18nnij2wfirp0fccv24jz6v1i9bc64n7zka"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -15743,12 +15764,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "05a297dda6fe9dc42e04220275b0bf2a37b56582"; - sha256 = "04l3sjvy5y7ph9h02y4jlasd98bihqn19ngpf2yhc0k5mdhkww1s"; + rev = "70651b7bb2ec750ba408fb704953b3a36f4ca81d"; + sha256 = "0qdfvwdvb5axkx8klwvm3v0jjsf9w595jb6dv0ijdyd5qi2rwyil"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -16079,12 +16100,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "05a297dda6fe9dc42e04220275b0bf2a37b56582"; - sha256 = "04l3sjvy5y7ph9h02y4jlasd98bihqn19ngpf2yhc0k5mdhkww1s"; + rev = "70651b7bb2ec750ba408fb704953b3a36f4ca81d"; + sha256 = "0qdfvwdvb5axkx8klwvm3v0jjsf9w595jb6dv0ijdyd5qi2rwyil"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -16331,12 +16352,12 @@ helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-git-grep"; - version = "0.9.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-git-grep"; - rev = "6ca2fcd44510305cf019815d61bf65eca200c238"; - sha256 = "0qmxccwpv7l5lbhv9n7ylikzcggdr99qzci868ghf33p4zhqyrj5"; + rev = "744cea07dba6e6a5effbdba83f1b786c78fd86d3"; + sha256 = "172m7wbgx9qnv9n1slbzpd9j24p6blddik49z6bq3zdg1vlnf3dv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; @@ -17192,12 +17213,12 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "0.4.3"; + version = "0.5.3"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "0885339369b65bc5d06829d82af734560dc45555"; - sha256 = "088bpikbnsaxsjfq896fcg7y9qgvfbq7iwxsh391yc6h46zgarkk"; + rev = "89a7564edc6b23ffba52b02353528b9b6285c729"; + sha256 = "1fqyhx6cnigh40bgzm745cx47zc6mm8rwrz2ym0vpb5bnng6j4m1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -17696,12 +17717,12 @@ hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "1.7.4"; + version = "1.8.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "a23312464fc6462d559462a44cd74735e9f73421"; - sha256 = "0sy0fjmh1m36ajzfmxa2j9akws5qa8a4f1qmj3wgj9vdqd043mr8"; + rev = "961db3116f1396dc4f903e3a59824a40e0bbb6a2"; + sha256 = "0w847g7lvzk9br9r73n7rf2ba6wafqrapyigp91f62jicz28lvm1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -19162,15 +19183,36 @@ license = lib.licenses.free; }; }) {}; + ivy-dired-history = callPackage ({ cl-lib ? null, counsel, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-dired-history"; + version = "1.0"; + src = fetchFromGitHub { + owner = "jixiuf"; + repo = "ivy-dired-history"; + rev = "3604840f85e4ff2d7ecab6233e820cb2ec5c8733"; + sha256 = "0slisbnfcdx8jv0p67ag6s4l0m0jmrwcpm5a2jm6sai9x67ayn4l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad37f6b04ff45fbffeadefc94db16baa27bcc2ac/recipes/ivy-dired-history"; + sha256 = "1vj073k5m0l8rx9iiisikzl053ad9mlhvbk30f5zmw9sw7b9blyl"; + name = "ivy-dired-history"; + }; + packageRequires = [ cl-lib counsel ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-dired-history"; + license = lib.licenses.free; + }; + }) {}; ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "2d93b1b0ec1705e449f2e0f43073aacc8f1e3242"; - sha256 = "0lrnd5r9ycy2qqggqd0sr6b2w7s28yfm15pgyh0r0rjdxky4a5vm"; + rev = "117369f882f81fb9cc88459a4072a2789138c136"; + sha256 = "0cy02idvhw459a3rlw2aj8hfmxmy7hx9x5d6g3x9nkv1lxkckn9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -20171,12 +20213,12 @@ keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keymap-utils"; - version = "2.1.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "keymap-utils"; - rev = "a4f6ff724eeade5612c01c6f6bf401f264687793"; - sha256 = "0jgmw8798g3ikhwnic3fbbjld0hj8fvg50q6x78pngf78ws92mkl"; + rev = "0130f32e5ade649dd2738206a80570e450906ef6"; + sha256 = "1bq7zihdj67j94yyv6655mcrxhz99szbf2zi64nwsl60bxz0znb8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils"; @@ -22082,12 +22124,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.7.12"; + version = "0.7.13"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "31c68839bd1de8e79fe7bce6bdeade4bacdbc737"; - sha256 = "1hm8w04d0cyy21dnciblz4gg15k5axfvaxx788hfz2pmbp435yni"; + rev = "a764751e89ad7bc1717e1d3c6e3b4364b11832d6"; + sha256 = "06vd4lvybfa7kwyplavlbfwln6229g7s7pwbamjdvgz48xgiqym1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -22145,12 +22187,12 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "420416f182d2ea2a2285ab4bd22e5898dfb20a83"; - sha256 = "101vk16c5wayd51s8w0mvy99bk7q3gm2gz8i8616wa1lmyszjknh"; + rev = "957e551140587f0cd83d9186a06fba10a38c6084"; + sha256 = "1df6cx7y5i35cmfi5c4b48iys21cszrvlh039cdbkmy6d0pdbvi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -23572,12 +23614,12 @@ nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "1.11.9"; + version = "1.11.11"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5d59ec86d4cf07a705407a9e538869dd25ec7d9d"; - sha256 = "0ankhmx4raaims2q0q1yffq5z6hqil01zpj6vynrqi1n7z4rjr90"; + rev = "026f4f9ae881d9196422981f1f85fa3137525014"; + sha256 = "016c0ghqw7wmgdk47biqc0i4bav2igd5ayh6wr9bygrik81n126z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -24349,8 +24391,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "7ca20bb808dd51adbd83e0c18885c4300548d032"; - sha256 = "0p4adjpa3l6aaz7kd3474aagzfzrnra7mijw4l0himba9ldrh590"; + rev = "7070f2a64de65e0446536fb974c940399a4097a3"; + sha256 = "1hf93rm0vi37rmcgbf1w1a3gqvzszhs979fa8yhk905wl8zhz08a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -25151,12 +25193,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 = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "785765d575ef4c28581f6790e9814d75eaeec4ab"; - sha256 = "18f5fppipandbirhhs5jlrk4gl7jxyrswfwr36859433x2wkfj70"; + rev = "db6c52f41faba686a378a8c57356a563f5cef496"; + sha256 = "0kx6w3zz5gmlmr9bx1mdq1k8ykkbnll6m91z90p6f2xm96j627j6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -26294,12 +26336,12 @@ parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsebib"; - version = "2.2"; + version = "2.3.1"; src = fetchFromGitHub { owner = "joostkremers"; repo = "parsebib"; - rev = "621a87d444d9b9c479221fffcd8f7cb5ce2f7717"; - sha256 = "14rvqjd24xwp2pvl4r00jvhvq7p2wndpz3yy1ml9yymkkn1p1hnh"; + rev = "bc31b627c666df576aa37e21c27a2223b3cb91a3"; + sha256 = "1bnqnxkb9dnl0fjrrjx0xn9jsqki2h8ygw3d5dm4bl79smah3qkh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib"; @@ -26793,6 +26835,27 @@ license = lib.licenses.free; }; }) {}; + pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pfuture"; + version = "1.1"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "pfuture"; + rev = "a6c32c69abdb9b91baf8036b88cc4f477f611bd5"; + sha256 = "0ly38dzg754n4s2xs09kaisxs14ikm42d9sjhw9p9xirzqm7zd5j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture"; + sha256 = "15fr9wkpv8v1p22wz7hsyihq7f807ck105c2crfs8y7capfvs53s"; + name = "pfuture"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/pfuture"; + license = lib.licenses.free; + }; + }) {}; ph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ph"; @@ -27948,12 +28011,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "49a56da93ff3ab7d9a2252639344ad28db8cdff6"; - sha256 = "0rq8q7viyy2nfmk2b0pik4amdndi6z51fww3m0p8a7l4yfkn14wb"; + rev = "5532abc15b97f3489183b266b41844306052a3fa"; + sha256 = "1a2s66i3ampwa0yc2mj3b743hcryixqhk1vvskzgyzvglv048cn4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -28491,6 +28554,27 @@ license = lib.licenses.free; }; }) {}; + qt-pro-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "qt-pro-mode"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "EricCrosson"; + repo = "qt-pro-mode"; + rev = "66601441cc728a609765b149ee0d7dcfb74dc8bf"; + sha256 = "0azx8a7kwgn5byijgwar2rib9xv2p9w7w3yyb5bk19g3id2f8gdw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e9af710be77ccde8ffa5f22168d2c8a06b73dd6a/recipes/qt-pro-mode"; + sha256 = "1k3ph9bqvvg6i6n623qrwdpsffs8w9rv9nihmlggb4w30dwqc9nf"; + name = "qt-pro-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/qt-pro-mode"; + license = lib.licenses.free; + }; + }) {}; quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quasi-monochrome-theme"; @@ -30760,12 +30844,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "8b7de952da37f1c04fa1bdf8f54c1cfb6a7c2a8f"; - sha256 = "176rhjyh9f3scbwjkw8h64dbamfcczwjpwv3dpylmjaqzwmfsal3"; + rev = "3c3378afcbcf9a6fc30a1386dcc5465c51d312ad"; + sha256 = "10i93w01272i1ydf6xjm4yx9xaja0yawd246av05aw8cq6nmai9j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -31138,12 +31222,12 @@ slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slstats"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "davep"; repo = "slstats.el"; - rev = "a2f640f724fee7ecbd1cf28fc78297180cd959bc"; - sha256 = "0gzpwcrmlbd7fphgyv6g04wjavd9i3vgn3y1fnh178iswmpsxj62"; + rev = "7488623cbe406eaafccc36d293e8c42bbd308085"; + sha256 = "1q3zm9qfivbd1k9kjilwvzhlcbzv6dwnd78bfzzkrppbjcpkxz3n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats"; @@ -32644,22 +32728,22 @@ license = lib.licenses.free; }; }) {}; - switch-window = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-window"; - version = "1.0.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "dimitri"; repo = "switch-window"; - rev = "cd4b06121aa5bac4c4b13b63526a99008def5f2b"; - sha256 = "1zpfilcaycj0l2q3zyvpjbwp5j3d9rrkacd5swzlr1n1klvbji48"; + rev = "8d37f5660666516ab6c9e6ec1da748ea1669ed4b"; + sha256 = "19bszzslzz8rprch0z3h6xa6pjhrwik7j53i4kj33w306d58gi3f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window"; sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2"; name = "switch-window"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/switch-window"; license = lib.licenses.free; @@ -33695,12 +33779,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.7"; + version = "1.7.5"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "d5878b0ed6da2a561aa795b31848e31e7c696197"; - sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3"; + rev = "b517e31c63239d20055462bd8a1b4f594d7351c3"; + sha256 = "1k5bph4wmxdz354gxmvbjc3q6rgvqjyqc1mwid24qn9rmnl3v9vd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; @@ -33716,12 +33800,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.7"; + version = "1.7.5"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "d5878b0ed6da2a561aa795b31848e31e7c696197"; - sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3"; + rev = "b517e31c63239d20055462bd8a1b4f594d7351c3"; + sha256 = "1k5bph4wmxdz354gxmvbjc3q6rgvqjyqc1mwid24qn9rmnl3v9vd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -35527,12 +35611,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.5.10"; + version = "2.5.11"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "8ae3c7aed92842f5988671c1b3350c65c58857e0"; - sha256 = "1jy5jxkr99a9qp7abmncaphp0xd3y6m3fflvj3fq1wp33i3f7cfn"; + rev = "3385ffdc6faed5a283e26a7ebf89825c700dd395"; + sha256 = "1kznr0zv1y6lwsllpksqjzq2f4bc5a99lg19fmifn7w0dhv6fn0m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -36159,8 +36243,8 @@ version = "1.78"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "c996fbcc2e79"; - sha256 = "1ibj0dhpgxa143azr07wkmz86fip247cbk2s5fwj4nrj96z6cw9y"; + rev = "e9299b77df1f"; + sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -36197,12 +36281,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590"; - sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w"; + rev = "d042a673b4d717c3ca9d641f120bfe16c994c740"; + sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 31d116fa2cb..7e8715f32a9 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 = "20170606"; + version = "20170622"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20170606.tar"; - sha256 = "11x6s30j6k0y3jfzcp16qyqn48mki9j18iblnpl5dr1bk8kyvd0x"; + url = "http://orgmode.org/elpa/org-20170622.tar"; + sha256 = "0z4ypv6q4nx4icir69xchzn58xzndnxlkg0v4pb62gqghdxng6vy"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20170606"; + version = "20170622"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20170606.tar"; - sha256 = "0r6a5spzdbx6qdz5aziycmhjxm392v7iifv7mnln4s5lgnsswb1h"; + url = "http://orgmode.org/elpa/org-plus-contrib-20170622.tar"; + sha256 = "0ix4gmr6y9nrna9sc9cy30533mxlnvlfnf25492ky6dkssbxb10s"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index d599bc12315..d1807a684ee 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -12,7 +12,7 @@ let # Sorted alphabetically - buildClion = { name, version, src, license, description, wmClass }: + buildClion = { name, version, src, license, description, wmClass, update-channel }: lib.overrideDerivation (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "CLion"; @@ -54,7 +54,7 @@ let ''; }); - buildDataGrip = { name, version, src, license, description, wmClass }: + buildDataGrip = { name, version, src, license, description, wmClass, update-channel }: (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "DataGrip"; @@ -71,7 +71,7 @@ let }; }); - buildGogland = { name, version, src, license, description, wmClass }: + buildGogland = { name, version, src, license, description, wmClass, update-channel }: (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "Gogland"; @@ -89,7 +89,7 @@ let }; }); - buildIdea = { name, version, src, license, description, wmClass }: + buildIdea = { name, version, src, license, description, wmClass, update-channel }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "IDEA"; @@ -106,7 +106,7 @@ let }; }); - buildPhpStorm = { name, version, src, license, description, wmClass }: + buildPhpStorm = { name, version, src, license, description, wmClass, update-channel }: (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "PhpStorm"; @@ -123,7 +123,7 @@ let }; }); - buildPycharm = { name, version, src, license, description, wmClass }: + buildPycharm = { name, version, src, license, description, wmClass, update-channel }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "PyCharm"; @@ -150,7 +150,7 @@ let propagatedUserEnvPkgs = [ python ]; }; - buildRider = { name, version, src, license, description, wmClass }: + buildRider = { name, version, src, license, description, wmClass, update-channel }: lib.overrideDerivation (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "Rider"; @@ -176,7 +176,7 @@ let ''; }); - buildRubyMine = { name, version, src, license, description, wmClass }: + buildRubyMine = { name, version, src, license, description, wmClass, update-channel }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "RubyMine"; @@ -189,7 +189,7 @@ let }; }); - buildWebStorm = { name, version, src, license, description, wmClass }: + buildWebStorm = { name, version, src, license, description, wmClass, update-channel }: (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "WebStorm"; @@ -221,18 +221,20 @@ in sha256 = "045pkbbf4ypk9qkhldz08i7hbc6vaq68a8v9axnpndnvcrf0vf7g"; }; wmClass = "jetbrains-clion"; + update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml }; datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2017.1"; + version = "2017.1.4"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "91ee6a1e43d75a45ae51829835e457da85262410d89e617324d0239ba5625dfa"; + sha256 = "c351e44a176add5b1fc7462e780b3fbe157691c3e23552d9d6b6531ee3830338"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; + update-channel = "datagrip_2017_1"; }; gogland = buildGogland rec { @@ -245,6 +247,7 @@ in sha256 = "0q2f8bi2i49j0xcpn824sihz2015jhn338cjaqy0jd988nxik6jk"; }; wmClass = "jetbrains-gogland"; + update-channel = "gogland_1.0_EAP"; }; idea14-community = buildIdea rec { @@ -257,6 +260,7 @@ in sha256 = "1i4mdjm9dd6zvxlpdgd3bqg45ir0cfc9hl55cdc0hg5qwbz683fz"; }; wmClass = "jetbrains-idea-ce"; + update-channel = "IDEA14.1"; }; idea-community = buildIdea rec { @@ -269,6 +273,7 @@ in sha256 = "1w1knq969dl8rxlkhr9mw8cr2vszn384acwhspimrd3zs9825r45"; }; wmClass = "jetbrains-idea-ce"; + update-channel = "IDEA_Release"; }; idea14-ultimate = buildIdea rec { @@ -281,6 +286,7 @@ in sha256 = "1hhga1i2zbsipgq283gn19kv9n94inhr1bxh2yx19gz7yr4r49d2"; }; wmClass = "jetbrains-idea"; + update-channel = "IDEA14.1"; }; idea15-ultimate = buildIdea rec { @@ -293,6 +299,7 @@ in sha256 = "012aap2qn0jx4x34bdv9ivrsr86vvf683srb5vpj27hc4l6rw6ll"; }; wmClass = "jetbrains-idea"; + update-channel = null; }; idea-ultimate = buildIdea rec { @@ -305,18 +312,20 @@ in sha256 = "0byrsbsscpzb0syamzpavny879src5dlclnissa7173rh8hgkna4"; }; wmClass = "jetbrains-idea"; + update-channel = "IDEA_Release"; }; phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2017.1"; + version = "2017.1.4"; 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 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm"; + sha256 = "0zrbcziznz6dwh56snr27752xcsnl2gsxzi6jiraplkd92f2xlaf"; }; wmClass = "jetbrains-phpstorm"; + update-channel = "PS2017.1"; }; phpstorm10 = buildPhpStorm rec { @@ -329,54 +338,59 @@ in sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm"; }; wmClass = "jetbrains-phpstorm"; + update-channel = "WI10"; }; pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2017.1.3"; + version = "2017.1.4"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "06sai589zli5xaggfk4g0j0grbw9mya9qlwabmxh9414qq3bzvbd"; + sha256 = "1e69ab29215a9c8c4626de6727df433ae0d9f6ed46eba2a6f48ffa52c2b04256"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; + update-channel = "PyCharm_Release"; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2017.1.3"; + version = "2017.1.4"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1wzgh83504px7q93h9xkarih2qjchiavgysy4di82q7377s6xd0c"; + sha256 = "bbae5602b9cf6d26ccce9e1bf8b388d79c27cf89673d1a56f248bf0a50e518ed"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; + update-channel = "PyCharm_Release"; }; rider = buildRider rec { name = "rider-${version}"; - version = "171.3655.1246"; + version = "171.4456.575"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/resharper/riderRS-${version}.tar.gz"; - sha256 = "90f9f8f1919e0f1dad42387f1a308483448323b089c13c409f3dd4d52992266b"; + sha256 = "9b7f46e9c800a091f2cdbe9fda08041729e2abc0ce57252731da659b2424707b"; /* updated by script */ }; wmClass = "jetbrains-rider"; + update-channel = "rider1.0EAP"; }; ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2017.1"; + version = "2017.1.4"; description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "6c27f43ddc385ffba2cb2f011b80ab46d9b128d0fccf3b4ea43272fe36401a3a"; + sha256 = "06jk0anlnc4gr240i51kam47shdjgda6zg3hglk5w3bpvbyix68z"; }; wmClass = "jetbrains-rubymine"; + update-channel = "rm2017.1"; }; ruby-mine7 = buildRubyMine rec { @@ -389,6 +403,7 @@ in sha256 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l"; }; wmClass = "jetbrains-rubymine"; + update-channel = null; }; ruby-mine8 = buildRubyMine rec { @@ -401,18 +416,20 @@ in sha256 = "0hipxib7377232w1jbf8h98bmh0djkllsrq3lq0w3fdxqglma43a"; }; wmClass = "jetbrains-rubymine"; + update-channel = null; }; webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2017.1.3"; + version = "2017.1.4"; 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 = "0g4b0x910231ljdj18lnj2mlzmzyl12lv3fsbsz6v45i1kwpwnvc"; + sha256 = "0aw2728wknss5vn2fkgz8rkm5vwk031305f32dirfrh51bvmq2zm"; }; wmClass = "jetbrains-webstorm"; + update-channel = "WS_Release"; }; webstorm10 = buildWebStorm rec { @@ -425,6 +442,7 @@ in sha256 = "0a5s6f99wyql5pgjl94pf4ljdbviik3b8dbr1s6b7c6jn1gk62ic"; }; wmClass = "jetbrains-webstorm"; + update-channel = null; }; webstorm11 = buildWebStorm rec { @@ -437,5 +455,6 @@ in sha256 = "17agyqdyz6naxyx6p0y240ar93gja0ypw01nm2qmfzvh7ch03r24"; }; wmClass = "jetbrains-webstorm"; + update-channel = null; }; } diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl new file mode 100755 index 00000000000..fecdeb0cae8 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/update.pl @@ -0,0 +1,74 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i perl -p perl perlPackages.LWPProtocolhttps perlPackages.FileSlurp + +use strict; +use List::Util qw(reduce); +use File::Slurp; +use LWP::Simple; + +sub semantic_less { + my ($a, $b) = @_; + $a =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg; + $b =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg; + return $a lt $b; +} + +sub get_latest_versions { + my @channels = get("http://www.jetbrains.com/updates/updates.xml") =~ /()/gs; + my %h = {}; + for my $ch (@channels) { + my ($id) = $ch =~ /^)/gs; + my $latest_build = reduce { + my ($aversion) = $a =~ /^]*version="([^"]+)"/; die "no version in $a" unless $aversion; + my ($bversion) = $b =~ /^]*version="([^"]+)"/; die "no version in $b" unless $bversion; + semantic_less($aversion, $bversion) ? $b : $a; + } @builds; + next unless $latest_build; + + # version as in download url + my ($latest_version) = $latest_build =~ /^]*version="([^"]+)"/; + ($latest_version) = $latest_build =~ /^]*fullNumber="([^"]+)"/ if $latest_version =~ / /; + + $h{$id} = $latest_version; + } + return %h; +} + +my %latest_versions = get_latest_versions(); +#for my $ch (sort keys %latest_versions) { +# print("$ch $latest_versions{$ch}\n"); +#} + +sub update_nix_block { + my ($block) = @_; + my ($channel) = $block =~ /update-channel\s*=\s*"([^"]+)"/; + if ($channel) { + die "unknown update-channel $channel" unless $latest_versions{$channel}; + my ($version) = $block =~ /version\s*=\s*"([^"]+)"/; + die "no version in $block" unless $version; + if ($version eq $latest_versions{$channel}) { + print("$channel is up to date at $version\n"); + } else { + print("updating $channel: $version -> $latest_versions{$channel}\n"); + my ($url) = $block =~ /url\s*=\s*"([^"]+)"/; + # try to interpret some nix + my ($name) = $block =~ /name\s*=\s*"([^"]+)"/; + $name =~ s/\$\{version\}/$latest_versions{$channel}/; + $url =~ s/\$\{name\}/$name/; + $url =~ s/\$\{version\}/$latest_versions{$channel}/; + die "$url still has some interpolation" if $url =~ /\$/; + + my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; + die "invalid sha256 in $url.sha256" unless $sha256; + + $block =~ s#version\s*=\s*"([^"]+)".+$#version = "$latest_versions{$channel}"; /* updated by script */#m; + $block =~ s#sha256\s*=\s*"([^"]+)".+$#sha256 = "$sha256"; /* updated by script */#m; + } + } + return $block; +} + +my $nix = read_file 'default.nix'; +$nix =~ s/(= build\w+ rec \{.+?\n \};\n)/update_nix_block($1)/gse; +write_file 'default.nix', $nix; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 9bfa3998926..7e8a85cf48a 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -5,13 +5,13 @@ let # qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ]; in stdenv.mkDerivation rec { name = "tiled-${version}"; - version = "0.18.2"; + version = "1.0.1"; src = fetchFromGitHub { owner = "bjorn"; repo = "tiled"; rev = "v${version}"; - sha256 = "087jl36g6w2g5l70gz573iwyvx3r7i8fijl3y4mmmf8pyqdyq1n2"; + sha256 = "062ja3j84v5s4qslp01gqif8c6i1klkkxpxyyrrvjhxmbyn6nmgd"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 121afdf2084..ccac9dd0ed1 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,19 +1,19 @@ -{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules +{ mkDerivation, lib, fetchurl, fetchpatch, cmake, extra-cmake-modules , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash , boost, libraw, fftw, eigen, exiv2, lcms2, gsl, openexr , openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase +, qtmultimedia, qtx11extras }: mkDerivation rec { name = "krita-${version}"; - ver_min = "3.1.3"; - version = "${ver_min}"; + version = "3.1.4"; src = fetchurl { - url = "http://download.kde.org/stable/krita/${ver_min}/${name}.tar.gz"; - sha256 = "125js6c8aw4bqhs28pwnl3rbgqx5yx4zsklw7bfdhy3vf6lrysw1"; + url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz"; + sha256 = "1al27v17s70hihk2mcmz3l2g6rl9qzpxaifapdfpkyias6q3f63l"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; @@ -23,6 +23,14 @@ mkDerivation rec { ki18n kitemmodels kitemviews kwindowsystem kio kcrash boost libraw fftw eigen exiv2 lcms2 gsl openexr openjpeg opencolorio vc poppler_qt5 curl ilmbase + qtmultimedia qtx11extras + ]; + + patches = [ + (fetchpatch { + url = "https://github.com/KDE/krita/commit/2f59d0d1.patch"; + sha256 = "0sdlcjn6i3faln3c0aczw3pg4pvmccgszmy8n914mgsccrqrazlr"; + }) ]; NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 0fa168e0a23..66498b0d280 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -2054,7 +2054,7 @@ version = "17.04.2"; src = fetchurl { url = "${mirror}/stable/applications/17.04.2/src/marble-17.04.2.tar.xz"; - sha256 = "1z24infjp65d2s2zlcvr0v9425a6wxwkaz262mvqqvx64qmhd6ca"; + sha256 = "1c6xmpkqilxd9zxz8kz7g47hwsa4hw27qcy96wxcg24hg8b5zr09"; name = "marble-17.04.2.tar.xz"; }; }; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 5845fe85ccb..f4cbc142d6b 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,29 +5,23 @@ }: stdenv.mkDerivation rec { - version = "2.84.0"; + version = "3.1.1"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1kvnmb6hsby4bdnx70bcy32f4dz1axzlr310dr6mkvnc8bqw59km"; + sha256 = "1lh1gz0915r49igfhy1icz79qx36s3d8m32qlih0g3zn7jahp86g"; }; patches = [ # Patches from Debian that: # - disable plugin installation (very insecure) - # - disables loading of web bug for privacy # - switches the version update from enabled to disabled by default (fetchpatch { name = "disable_plugins.patch"; url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/disable_plugins.py-20111220183043-dcl08ccfagjxt1dv-1/disable_plugins.py"; sha256 = "19spdx52dhbrfn9lm084yl3cfwm6f90imd51k97sf7flmpl569pk"; }) - (fetchpatch { - name = "links_privacy.patch"; - url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/linksprivacy.patch-20160417214308-6hvive72pc0r4awc-1/links-privacy.patch"; - sha256 = "0f6pq2b7q56pxrq2j8yqd7bksc623q2zgq29qcli30f13vga1w60"; - }) (fetchpatch { name = "no_updates_dialog.patch"; url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/no_updates_dialog.pa-20081231120426-rzzufl0zo66t3mtc-16/no_updates_dialog.patch"; @@ -57,6 +51,7 @@ stdenv.mkDerivation rec { ] ++ (with python2Packages; [ apsw cssselect cssutils dateutil lxml mechanize netifaces pillow python pyqt5 sip + regex msgpack # the following are distributed with calibre, but we use upstream instead chardet cherrypy html5lib_0_9999999 odfpy routes ]); diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch index 71cc688f7da..45e27984ed5 100644 --- a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch +++ b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch @@ -1,34 +1,12 @@ -diff --git a/setup/extensions.json b/setup/extensions.json -index 1f6d1fb..1273904 100644 ---- a/setup/extensions.json -+++ b/setup/extensions.json -@@ -211,16 +211,5 @@ - "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c", - "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h", - "libraries": "mtp" -- }, -- { -- "name": "unrar", -- "sources": "unrar/rar.cpp unrar/strlist.cpp unrar/strfn.cpp unrar/pathfn.cpp unrar/savepos.cpp unrar/smallfn.cpp unrar/global.cpp unrar/file.cpp unrar/filefn.cpp unrar/filcreat.cpp unrar/archive.cpp unrar/arcread.cpp unrar/unicode.cpp unrar/system.cpp unrar/isnt.cpp unrar/crypt.cpp unrar/crc.cpp unrar/rawread.cpp unrar/encname.cpp unrar/resource.cpp unrar/match.cpp unrar/timefn.cpp unrar/rdwrfn.cpp unrar/consio.cpp unrar/options.cpp unrar/ulinks.cpp unrar/errhnd.cpp unrar/rarvm.cpp unrar/secpassword.cpp unrar/rijndael.cpp unrar/getbits.cpp unrar/sha1.cpp unrar/extinfo.cpp unrar/extract.cpp unrar/volume.cpp unrar/list.cpp unrar/find.cpp unrar/unpack.cpp unrar/cmddata.cpp unrar/filestr.cpp unrar/scantree.cpp calibre/utils/unrar.cpp", -- "inc_dirs": "unrar", -- "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE", -- "windows_defines": "SILENT RARDLL UNRAR", -- "haiku_defines": "LITTLE_ENDIAN SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _BSD_SOURCE", -- "haiku_libraries": "bsd", -- "optimize_level": 2, -- "windows_libraries": "User32 Advapi32 kernel32 Shell32" - } - ] diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py index 938ab24..1e095f8 100644 --- a/src/calibre/ebooks/metadata/archive.py +++ b/src/calibre/ebooks/metadata/archive.py -@@ -44,7 +44,7 @@ class ArchiveExtract(FileTypePlugin): - description = _('Extract common e-book formats from archives ' - '(zip/rar) files. Also try to autodetect if they are actually ' - 'cbz/cbr files.') +@@ -44,7 +44,7 @@ + description = _('Extract common e-book formats from archive files ' + '(ZIP/RAR). Also try to autodetect if they are actually ' + 'CBZ/CBR files.') - file_types = set(['zip', 'rar']) + file_types = set(['zip']) supported_platforms = ['windows', 'osx', 'linux'] on_import = True - diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 14c6c18f91c..34f403fda89 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec { ecdsa jsonrpclib pbkdf2 - protobuf3_0 + protobuf3_2 pyaes pycrypto pyqt4 diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 4fe62179b25..595c58db992 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.23"; + version = "0.24.1"; goPackagePath = "github.com/gohugoio/hugo"; src = fetchFromGitHub { - owner = "spf13"; + owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "0phw5pcmrmryxb83jzifhqh3vx20qiwh4dkk802v38fw07z1hvki"; + sha256 = "0zphxi11rny6wh1ysz7508fdrsbxj3n138q2bkkqaz0rrdab710a"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 2b844943865..4a3f4ff15cb 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/BurntSushi/toml"; - rev = "b26d9c308763d68093482582cea63d69be07a0f0"; - sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry"; + rev = "8fb9fdc4f82fd3495b9086c911b86cc3d50cb7ab"; + sha256 = "0igg0cwc0cihsxrii203h1r5y2lmaclc164cjhyv2hpfsvb11zlg"; }; } { @@ -58,8 +58,8 @@ fetch = { type = "git"; url = "https://github.com/cpuguy83/go-md2man"; - rev = "bcc0a711c5e6bbe72c7cb13d81c7109b45267fd2"; - sha256 = "097l5ln1b08x5hc41qhiybzlyjfcm6kjllgv6pgsgxlx8irz459j"; + rev = "23709d0847197db6021a51fdb193e66e9222d4e7"; + sha256 = "1a87v4cnd5y5whcdkjcqjpg1s5pxqhrspdxrsk2af49zsw9fsj9f"; }; } { @@ -76,8 +76,8 @@ fetch = { type = "git"; url = "https://github.com/eknkc/amber"; - rev = "f0d8fdb67f9f4a2c0d02fb6ce4830b8b6754de10"; - sha256 = "148q8ng5kzv1n8wz5dx9fjhz7kz1l34n8vmksnfwhnqg82b77vsy"; + rev = "5fa7895500976542b0e28bb266f42ff1c7ce07f5"; + sha256 = "1mviw7ivw5yj1w6f8mfwaxpmbdl8c7n2wrpxnqkbcs8snpi0f6wq"; }; } { @@ -220,8 +220,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "26ae43fdeeea7db6778850f76cc828b232da1e13"; - sha256 = "06gz20ywqbsy4sfsjjay60y7km9m07l9qvmarr7fldqfi8xgl1f4"; + rev = "fe7536c3dee2596cdd23ee9976a17c22bdaae286"; + sha256 = "0h5ri6sj755v1vrgcb7wdp6c15vdgq8wydpzgphggz4pl535b0h6"; }; } { @@ -283,8 +283,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "ca57f0f5dba473a8a58765d16d7e811fb8027add"; - sha256 = "1lycnfkby5c7aamvwgxwq6ivzyvd8r761zkdignww1rmnqmiwd2h"; + rev = "b4dbd37a01839e0653eec12aa4bbb2a2ce7b2a37"; + sha256 = "1bgdjikafz58403qpdrqhmi3p99gc5gipibmhfw0hj2xzijb01kx"; }; } { @@ -328,8 +328,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "0967fc9aceab2ce9da34061253ac10fb99bba5b2"; - sha256 = "016syis0rvccp2indjqi1vnz3wk7c9dhkvkgam0j79sb019kl80f"; + rev = "c1de95864d73a5465492829d7cb2dd422b19ac96"; + sha256 = "0fvx40qhzzfw5nq4hl3sxqik6qdd8l9jcmzm6f9r9p605n2dakqm"; }; } { @@ -337,8 +337,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "4d4bfba8f1d1027c4fdbe371823030df51419987"; - sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp"; + rev = "f6abca593680b2315d2075e0f5e2a9751e3f431a"; + sha256 = "0n2vidr9zyf6k296grnc6d3rk9hd6qw7mwvnfixlxm8g5y46rzl9"; }; } { @@ -355,8 +355,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "7e9105388ebff089b3f99f0ef676ea55a6da3a7e"; - sha256 = "0q3nx9px0bddpfnh2d5h56hsvbfx483jz93j6vanxqnysizgfc1n"; + rev = "850760c427c516be930bc91280636328f1a62286"; + sha256 = "0kyf8km2pz259jmfqk5xcd7gnj9l98kjz12zrvq26n1c4043bmkz"; }; } { @@ -364,8 +364,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "5961165da77ad3a2abf3a77ea904c13a76b0b073"; - sha256 = "0r4zb2pafrjyjb0alfnxbxkfc27iikkfdqhpklrm790j2x9xrp89"; + rev = "ddf80d0970594e2e4cccf5a98861cad3d9eaa4cd"; + sha256 = "1ipggkh5rwqcmb8zwf2i7dbnyz6r205c5glkg2cpw4hykr5w0id8"; }; } { @@ -373,8 +373,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "dbc2be9168a660ef302e04b6ff6406de6f967473"; - sha256 = "1hz9d7wnxwlvhlgmqrxjdx9fihx30f9ww6ir2l74l8ping1g6w1j"; + rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a"; + sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj"; }; } { @@ -382,8 +382,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "19e51611da83d6be54ddafce4a4af510cb3e9ea4"; - sha256 = "09pcfzx7nrma0gjv93jx57c28farf8m1qm4x07vk5505wlcgvvfl"; + rev = "9e2f80a6ba7ed4ba13e0cd4b1f094bf916875735"; + sha256 = "02nahm6a4s3f1p76qdcgcwczp8662bqpii0r67p9cm9gp8x1lxqh"; }; } { diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index 743a20b6bfc..0d8db33bc17 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -11,6 +11,7 @@ , qca-qt5 , libfakekey , libXtst +, qtx11extras }: stdenv.mkDerivation rec { @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { knotifications libfakekey libXtst + qtx11extras ]; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index e103f62fd3c..9e83aa50a77 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, +{ stdenv, fetchFromGitHub, fetchpatch, cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror , withKeePassHTTP ? true }: @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { sha256 = "1znnw2xpv58x0rbpmm4y662377mbmcilhf8mhhjsz8vhahms33a8"; }; + patches = [ + (fetchpatch { # qt 4.9 + url = "https://github.com/keepassxreboot/keepassxc/commit/2b6059dee3a95591d787e8b8c931cd68c059d43f.patch"; + sha256 = "1v140z358rk75f7wsqawpai3x8v8qcqalnv9r0l1d4p1gxm1j766"; + }) + ]; + cmakeFlags = optional (withKeePassHTTP) [ "-DWITH_XC_HTTP=ON" ]; buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror ]; diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index 4a25f88ac75..8db48a7b3e6 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -15,6 +15,7 @@ , konsole , kparts , kwindowsystem +, qtx11extras }: let @@ -39,6 +40,7 @@ in mkDerivation rec { knotifyconfig kparts kwindowsystem + qtx11extras ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 75f2dcda6a6..993d81ff96e 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -12,10 +12,11 @@ mkChromiumDerivation (base: rec { sandboxExecutableName = "__chromium-suid-sandbox"; installPhase = '' - mkdir -p "$libExecPath" + mkdir -p "$libExecPath/swiftshader" cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" + cp -v "$buildPath/swiftshader/"*.so "$libExecPath/swiftshader/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" if [ -e "$buildPath/libwidevinecdmadapter.so" ]; then diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 5645e1cebaa..14a0a54feda 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitlbee-facebook-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "jgeboski"; repo = "bitlbee-facebook"; - sha256 = "0qclyc2zz8144dc42bhfv2xxrahpiv9j2iwq9h3cmfxszvkb8r3s"; + sha256 = "08ibjqqcrmq1a5nmj8z93rjrdabi0yy2a70p31xalnfrh200m24c"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 0af0c0b1d1b..446156fbe4c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,33 +1,35 @@ { mkDerivation, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake , qtbase, qtimageformats , breakpad, gtk3, libappindicator-gtk3, dee -, ffmpeg, openalSoft, minizip +, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio +, gcc }: mkDerivation rec { name = "telegram-desktop-${version}"; - version = "1.0.27"; + version = "1.1.7"; # Submodules src = fetchgit { url = "https://github.com/telegramdesktop/tdesktop"; rev = "refs/tags/v${version}"; - sha256 = "05g88g6h2a7f9biliicg81fqssx0y3akd3y5r2q2b5h8q3igqrfc"; + sha256 = "0y0nc8d4vlhsmzayy26zdxc5jaiwcv0rb2s1v5fwnnx71gf89m2w"; }; tgaur = fetchgit { url = "https://aur.archlinux.org/telegram-desktop-systemqt.git"; - rev = "b4d169076ed12ec01941a95499774d5caa6fc00e"; - sha256 = "0pmm6slabg9xazgs0ffnp8v0hx3vnpdfgymvapwqpm3h9mwk22x9"; + rev = "83af81905de7fc5dc9fbea8f5318d56fa8a6efc6"; + sha256 = "0v7g7y5cmxzp2yrcj6ylwzxlzr9yrqs2badzplm7sg012nc69yf9"; }; buildInputs = [ gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip + libopus alsaLib libpulseaudio ]; - nativeBuildInputs = [ pkgconfig gyp cmake ]; + nativeBuildInputs = [ pkgconfig gyp cmake gcc ]; - patches = [ "${tgaur}/aur-build-fixes.patch" ]; + patches = [ "${tgaur}/tdesktop.patch" ]; enableParallelBuilding = true; @@ -48,10 +50,18 @@ mkDerivation rec { "-I${qtbase.dev}/include/${x}" "-I${qtbase.dev}/include/${x}/${qtbase.version}" "-I${qtbase.dev}/include/${x}/${qtbase.version}/${x}" + "-I${libopus.dev}/include/opus" + "-I${alsaLib.dev}/include/alsa" + "-I${libpulseaudio.dev}/include/pulse" ]) [ "QtCore" "QtGui" ]; CPPFLAGS = NIX_CFLAGS_COMPILE; preConfigure = '' + + pushd "Telegram/ThirdParty/libtgvoip" + patch -Np1 -i "${tgaur}/libtgvoip.patch" + popd + sed -i Telegram/gyp/telegram_linux.gypi \ -e 's,/usr,/does-not-exist,g' \ -e 's,appindicator-0.1,appindicator3-0.1,g' \ @@ -63,6 +73,7 @@ mkDerivation rec { -e "s,/usr/bin/rcc,rcc,g" gyp \ + -Dbuild_defines=${GYP_DEFINES} \ -Gconfig=Release \ --depth=Telegram/gyp \ --generator-output=../.. \ diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 4cfde1f9b07..5b86e79e99a 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -8,6 +8,7 @@ , kconfig , kconfigwidgets , kcoreaddons +, kcrash , kdbusaddons , kemoticons , kglobalaccel @@ -17,6 +18,7 @@ , kitemviews , knotifications , knotifyconfig +, kwindowsystem , kio , kparts , kwallet @@ -27,13 +29,13 @@ let pname = "konversation"; - version = "1.6.2"; + version = "1.7.2"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn"; + sha256 = "0616h59bsw5c3y8lij56v3fhv9by0rwdfcaa83yfxqg4rs26xyaz"; }; buildInputs = [ @@ -42,6 +44,7 @@ in mkDerivation rec { kconfig kconfigwidgets kcoreaddons + kcrash kdbusaddons kdoctools kemoticons @@ -52,6 +55,7 @@ in mkDerivation rec { kitemviews knotifications knotifyconfig + kwindowsystem kio kparts kwallet diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 17816e6a735..94ffda9fede 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -21,12 +21,12 @@ let in stdenv.mkDerivation rec { - version = "1.8"; + version = "1.9"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "10km0437lg9ms6f16h20s89l2w9f9g597rykybxb16s95ql48z08"; + sha256 = "0xfnhaxmvxdxs3ic0qs5lwq3yl4pi5ib99p0p5lv3v2vldqlm4lc"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index 2712388ffe7..b4b730d3343 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "geogebra-${version}"; - version = "5-0-361-0"; + version = "5-0-369-0"; preferLocalBuild = true; src = fetchurl { url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"; - sha256 = "14kidnk8bidklv474zqipv3f77qnfmc697pl407v0rja481c649a"; + sha256 = "0b5015z1ff3ksnkmyn2hbfwvhqp1572pdn8llpws32k7w1lb0jnk"; }; srcIcon = fetchurl { diff --git a/pkgs/applications/science/misc/root/ROOT-8728-extra.patch b/pkgs/applications/science/misc/root/ROOT-8728-extra.patch index ec8c160c6f3..a396a848f14 100644 --- a/pkgs/applications/science/misc/root/ROOT-8728-extra.patch +++ b/pkgs/applications/science/misc/root/ROOT-8728-extra.patch @@ -1,16 +1,3 @@ -diff --git a/core/base/inc/ROOT/StringConv.hxx b/core/base/inc/ROOT/StringConv.hxx -index 629fc18..4efa54a 100644 ---- a/core/base/inc/ROOT/StringConv.hxx -+++ b/core/base/inc/ROOT/StringConv.hxx -@@ -89,7 +89,7 @@ EFromHumanReadableSize FromHumanReadableSize(std::string_view str, T &value) - size_t size = str.size(); - size_t cur; - // Parse leading numeric factor -- const double coeff = stod(str, &cur); -+ const double coeff = stod(static_cast(str), &cur); - - // Skip any intermediate white space - while (cur(im)); -diff -aru a/core/base/inc/TString.h b/core/base/inc/TString.h ---- a/core/base/inc/TString.h -+++ b/core/base/inc/TString.h -@@ -106,7 +106,7 @@ - char operator[](Ssiz_t i) const; // Index with bounds checking - - operator std::string_view() const { return std::string_view(Data(),fExtent); } -- operator std::string() const { return std::string_view(Data(),fExtent).to_string(); } -+ operator std::string() const { return static_cast(std::string_view(Data(),fExtent)); } - - const char *Data() const; - Ssiz_t Length() const { return fExtent; } diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 726f6352c95..8916a9fd167 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "root-${version}"; - version = "6.09.02"; + version = "6.10.00"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "0fc6b0l7bw66cyckxs4ikvyzcv1zlfx88205jx153smdhih0jj2k"; + sha256 = "1rxqcpqf1b3sxig5xbh3mkvarhg9lgj2f0gv0j48klfw8kgfwlsp"; }; buildInputs = [ cmake pcre pkgconfig python2 zlib libxml2 lzma gsl ] @@ -23,10 +23,6 @@ stdenv.mkDerivation rec { ./thisroot.patch # https://sft.its.cern.ch/jira/browse/ROOT-8728 - (fetchpatch { - url = "https://sft.its.cern.ch/jira/secure/attachment/20025/0001-std-string_view-has-no-more-to_string.patch"; - sha256 = "0ngyk960xfrcsj4vhr1ax8h85fx0g1cfycxi3k35a6ych2zmyg8q"; - }) ./ROOT-8728-extra.patch ]; @@ -47,6 +43,7 @@ stdenv.mkDerivation rec { "-Dfftw3=OFF" "-Dfitsio=OFF" "-Dfortran=OFF" + "-Dimt=OFF" "-Dgfal=OFF" "-Dgviz=OFF" "-Dhdfs=OFF" @@ -66,7 +63,8 @@ stdenv.mkDerivation rec { "-Dxml=ON" "-Dxrootd=OFF" ] - ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include"; + ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include" + ++ stdenv.lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; enableParallelBuilding = true; diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 141ef44b77e..6dbc75e9c06 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -51,6 +51,5 @@ buildPythonApplication rec { homepage = https://github.com/spyder-ide/spyder/; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor fridh ]; }; } diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 32e8f9d23f4..7567b3d3511 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -17,11 +17,10 @@ with stdenv.lib; let python = python2; buildType = "release"; - - extpack = "996f783996a597d3936fc5f1ccf56edd31ae1f8fb4d527009647d9a2c8c853cd"; - extpackRev = "114002"; - main = "7ed0959bbbd02826b86b3d5dc8348931ddfab267c31f8ed36ee53c12f5522cd9"; - version = "5.1.18"; + extpack = "244e6f450cba64e0b025711050db3c43e6ce77e12cd80bcd08796315a90c8aaf"; + extpackRev = "115126"; + main = "fcc918000b8c5ece553541ec10a9182410a742b7266257c76dda895dcd389899"; + version = "5.1.22"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 38f452efe6c..3c9f28f4f2d 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "f2951b49f48a560fbc1afe9d135d1f3f82a3e158b9002278d05d978428adca8a"; + sha256 = "54df14f234b6aa484b94939ab0f435b5dd859417612b65a399ecc34a62060380"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; @@ -139,7 +139,7 @@ stdenv.mkDerivation { meta = { description = "Guest additions for VirtualBox"; - longDescriptions = '' + longDescription = '' Various add-ons which makes NixOS work better as guest OS inside VirtualBox. This add-on provides support for dynamic resizing of the X Display, shared host/guest clipboard support and guest OpenGL support. diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch index 8d408d3494e..bd29ca9a65a 100644 --- a/pkgs/applications/virtualization/virtualbox/hardened.patch +++ b/pkgs/applications/virtualization/virtualbox/hardened.patch @@ -1,8 +1,8 @@ diff --git a/include/iprt/mangling.h b/include/iprt/mangling.h -index 70c596a..78972ed 100644 +index c1daa8f..8618371 100644 --- a/include/iprt/mangling.h +++ b/include/iprt/mangling.h -@@ -1068,6 +1068,7 @@ +@@ -1440,6 +1440,7 @@ # define RTPathStripSuffix RT_MANGLER(RTPathStripSuffix) # define RTPathStripFilename RT_MANGLER(RTPathStripFilename) # define RTPathStripTrailingSlash RT_MANGLER(RTPathStripTrailingSlash) @@ -10,7 +10,7 @@ index 70c596a..78972ed 100644 # define RTPathTemp RT_MANGLER(RTPathTemp) # define RTPathTraverseList RT_MANGLER(RTPathTraverseList) # define RTPathUnlink RT_MANGLER(RTPathUnlink) -@@ -1105,6 +1106,7 @@ +@@ -1478,6 +1479,7 @@ # define RTProcGetAffinityMask RT_MANGLER(RTProcGetAffinityMask) # define RTProcGetExecutablePath RT_MANGLER(RTProcGetExecutablePath) # define RTProcGetPriority RT_MANGLER(RTProcGetPriority) @@ -19,10 +19,10 @@ index 70c596a..78972ed 100644 # define RTProcQueryParent RT_MANGLER(RTProcQueryParent) # define RTProcQueryUsername RT_MANGLER(RTProcQueryUsername) diff --git a/include/iprt/path.h b/include/iprt/path.h -index 7e42754..b4de4c8 100644 +index 8bd42bc..2c23d3e 100644 --- a/include/iprt/path.h +++ b/include/iprt/path.h -@@ -1049,6 +1049,15 @@ RTDECL(int) RTPathCalcRelative(char *pszPathDst, size_t cbPathDst, +@@ -1064,6 +1064,15 @@ RTDECL(int) RTPathCalcRelative(char *pszPathDst, size_t cbPathDst, RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath); /** @@ -39,10 +39,10 @@ index 7e42754..b4de4c8 100644 * * @returns iprt status code. diff --git a/include/iprt/process.h b/include/iprt/process.h -index 2760306..0ce6c92 100644 +index 043653e..1070280 100644 --- a/include/iprt/process.h +++ b/include/iprt/process.h -@@ -313,6 +313,16 @@ RTR3DECL(const char *) RTProcShortName(void); +@@ -327,6 +327,16 @@ RTR3DECL(const char *) RTProcShortName(void); RTR3DECL(char *) RTProcGetExecutablePath(char *pszExecPath, size_t cbExecPath); /** @@ -60,11 +60,11 @@ index 2760306..0ce6c92 100644 * * The way this work is that it will spawn a detached / backgrounded / diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp -index c39d2f7..896b352 100644 +index ce0f288..6193108 100644 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp -@@ -1415,18 +1415,19 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo - NOREF(fRelaxed); +@@ -1489,9 +1489,9 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo + bool fBad = !fRelaxed || pFsObjState->Stat.st_gid != 2 /*bin*/ || suplibHardenedStrCmp(pszPath, "/usr/lib/iconv"); #else NOREF(fRelaxed); - bool fBad = true; @@ -75,23 +75,11 @@ index c39d2f7..896b352 100644 return supR3HardenedSetError3(VERR_SUPLIB_WRITE_NON_SYS_GROUP, pErrInfo, "An unknown (and thus untrusted) group has write access to '", pszPath, "' and we therefore cannot trust the directory content or that of any subdirectory"); - } - - /* -- * World must not have write access. There is no relaxing this rule. -+ * World must not have write access. -+ * There is no relaxing this rule, except when it comes to the Nix store. - */ -- if (pFsObjState->Stat.st_mode & S_IWOTH) -+ if (pFsObjState->Stat.st_mode & S_IWOTH && suplibHardenedStrCmp(pszPath, "/nix/store")) - return supR3HardenedSetError3(VERR_SUPLIB_WORLD_WRITABLE, pErrInfo, - "World writable: '", pszPath, "'"); - diff --git a/src/VBox/Main/src-server/MachineImpl.cpp b/src/VBox/Main/src-server/MachineImpl.cpp -index 95dc9a7..39170bc 100644 +index 320c569..9bfe41f 100644 --- a/src/VBox/Main/src-server/MachineImpl.cpp +++ b/src/VBox/Main/src-server/MachineImpl.cpp -@@ -7326,7 +7326,7 @@ HRESULT Machine::i_launchVMProcess(IInternalSessionControl *aControl, +@@ -7543,7 +7543,7 @@ HRESULT Machine::i_launchVMProcess(IInternalSessionControl *aControl, /* get the path to the executable */ char szPath[RTPATH_MAX]; @@ -101,10 +89,10 @@ index 95dc9a7..39170bc 100644 szPath[cchBufLeft++] = RTPATH_DELIMITER; szPath[cchBufLeft] = 0; diff --git a/src/VBox/Main/src-server/NetworkServiceRunner.cpp b/src/VBox/Main/src-server/NetworkServiceRunner.cpp -index e9e1ba62..4d1c1e1 100644 +index 1e38d99..5e43dda 100644 --- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp +++ b/src/VBox/Main/src-server/NetworkServiceRunner.cpp -@@ -79,7 +79,7 @@ int NetworkServiceRunner::start() +@@ -85,7 +85,7 @@ int NetworkServiceRunner::start(bool aKillProcOnStop) /* get the path to the executable */ char exePathBuf[RTPATH_MAX]; @@ -114,7 +102,7 @@ index e9e1ba62..4d1c1e1 100644 char *substrBs = strrchr(exePathBuf, '\\'); char *suffix = substrSl ? substrSl : substrBs; diff --git a/src/VBox/Main/src-server/generic/NetIf-generic.cpp b/src/VBox/Main/src-server/generic/NetIf-generic.cpp -index 8559d2a..2177f27 100644 +index 98dc91a..43a819f 100644 --- a/src/VBox/Main/src-server/generic/NetIf-generic.cpp +++ b/src/VBox/Main/src-server/generic/NetIf-generic.cpp @@ -47,7 +47,7 @@ static int NetIfAdpCtl(const char * pcszIfName, const char *pszAddr, const char @@ -126,7 +114,7 @@ index 8559d2a..2177f27 100644 if (RT_FAILURE(rc)) { LogRel(("NetIfAdpCtl: failed to get program path, rc=%Rrc.\n", rc)); -@@ -90,7 +90,7 @@ static int NetIfAdpCtl(HostNetworkInterface * pIf, const char *pszAddr, const ch +@@ -89,7 +89,7 @@ static int NetIfAdpCtl(HostNetworkInterface * pIf, const char *pszAddr, const ch int NetIfAdpCtlOut(const char * pcszName, const char * pcszCmd, char *pszBuffer, size_t cBufSize) { char szAdpCtl[RTPATH_MAX]; @@ -135,7 +123,7 @@ index 8559d2a..2177f27 100644 if (RT_FAILURE(rc)) { LogRel(("NetIfAdpCtlOut: Failed to get program path, rc=%Rrc\n", rc)); -@@ -202,7 +202,7 @@ int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVirtualBox, +@@ -201,7 +201,7 @@ int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVirtualBox, progress.queryInterfaceTo(aProgress); char szAdpCtl[RTPATH_MAX]; @@ -145,7 +133,7 @@ index 8559d2a..2177f27 100644 { progress->i_notifyComplete(E_FAIL, diff --git a/src/VBox/Runtime/r3/path.cpp b/src/VBox/Runtime/r3/path.cpp -index be2ad8f..7ddf105 100644 +index 944848e..744a261 100644 --- a/src/VBox/Runtime/r3/path.cpp +++ b/src/VBox/Runtime/r3/path.cpp @@ -81,6 +81,12 @@ RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath) @@ -162,7 +150,7 @@ index be2ad8f..7ddf105 100644 { #if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE) diff --git a/src/VBox/Runtime/r3/process.cpp b/src/VBox/Runtime/r3/process.cpp -index 7bde6af..2656cae 100644 +index 2aab645..9795f21 100644 --- a/src/VBox/Runtime/r3/process.cpp +++ b/src/VBox/Runtime/r3/process.cpp @@ -111,6 +111,26 @@ RTR3DECL(char *) RTProcGetExecutablePath(char *pszExecPath, size_t cbExecPath) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index a5f81ef1794..8e060b87ebd 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,6 +1,7 @@ {stdenv, git, cacert}: let urlToName = url: rev: let - base = baseNameOf (stdenv.lib.removeSuffix "/" url); + inherit (stdenv.lib) removeSuffix splitString last; + base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); matched = builtins.match "(.*).git" base; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 3d656eba5ff..9e4f346f7a5 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -120,9 +120,8 @@ hash_from_ref(){ url_to_name(){ local url=$1 local ref=$2 - # basename removes the / and .git suffixes local base - base=$(basename "$url" .git) + base=$(basename "$url" .git | cut -d: -f2) if [[ $ref =~ ^[a-z0-9]+$ ]]; then echo "$base-${ref:0:7}" diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 2275a065594..36130289fba 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,5 +1,10 @@ -{ stdenv, cacert, git, rust, rustRegistry }: +{ stdenv, callPackage, path, cacert, git, rust, rustRegistry }: + +let + rustRegistry' = rustRegistry; +in { name, depsSha256 +, rustRegistry ? rustRegistry' , src ? null , srcs ? null , sourceRoot ? null @@ -11,6 +16,8 @@ , ... } @ args: let + lib = stdenv.lib; + fetchDeps = import ./fetchcargo.nix { inherit stdenv cacert git rust rustRegistry; }; diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 8ac65dcae35..693de6d78c6 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "unifont-${version}"; - version = "9.0.06"; + version = "10.0.01"; ttf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.ttf"; - sha256 = "0r96giih04din07wlmw8538izwr7dh5v6dyriq13zfn19brgn5z2"; + sha256 = "0yfz5y4vidb7h6csv6k8h0mx808psdn4vx4842bnyz0fkyhr9h3y"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.pcf.gz"; - sha256 = "11ivfzpyz54rbz0cvd437abs6qlv28q0qp37kn27jggxlcpfh8vd"; + sha256 = "0shlr5804knh14qnv270yzsyfndw6na5ajbx4kvx20gfyxzcsi76"; }; buildInputs = [ mkfontscale mkfontdir ]; diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index e101d4e14c5..a592a623510 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -43,17 +43,26 @@ let propagate = out: let setupHook = { writeScript }: - writeScript "setup-hook.sh" '' - # Propagate $${out} output - propagatedUserEnvPkgs+=" @${out}@" + writeScript "setup-hook" '' + if [ "$hookName" != postHook ]; then + postHooks+=("source @dev@/nix-support/setup-hook") + else + # Propagate $${out} output + propagatedUserEnvPkgs="$propagatedUserEnvPkgs @${out}@" - # Propagate $dev so that this setup hook is propagated - # But only if there is a separate $dev output - if [ "$outputDev" != out ]; then - if [ -n "$crossConfig" ]; then - propagatedBuildInputs+=" @dev@" - else - propagatedNativeBuildInputs+=" @dev@" + if [ -z "$outputDev" ]; then + echo "error: \$outputDev is unset!" >&2 + exit 1 + fi + + # Propagate $dev so that this setup hook is propagated + # But only if there is a separate $dev output + if [ "$outputDev" != out ]; then + if [ -n "$crossConfig" ]; then + propagatedBuildInputs="$propagatedBuildInputs @dev@" + else + propagatedNativeBuildInputs="$propagatedNativeBuildInputs @dev@" + fi fi fi ''; diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index abfb85a867c..77f1002c08a 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -13,4 +13,5 @@ mkDerivation { plasma-framework plasma-workspace qtx11extras ]; outputs = [ "out" "dev" "bin" ]; + enableParallelBuilding = false; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index b866ebab0e5..b28a1e87fb6 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -20,8 +20,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ isocodes libdbusmenu libSM libXcursor libXtst pam wayland - ]; - propagatedBuildInputs = [ + baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets diff --git a/pkgs/development/beam-modules/build-hex.nix b/pkgs/development/beam-modules/build-hex.nix index ff6e47e5a80..27ce64582f3 100644 --- a/pkgs/development/beam-modules/build-hex.nix +++ b/pkgs/development/beam-modules/build-hex.nix @@ -1,13 +1,14 @@ { stdenv, buildRebar3, fetchHex }: { name, version, sha256 +, builder ? buildRebar3 , hexPkg ? name , ... }@attrs: with stdenv.lib; let - pkg = self: buildRebar3 (attrs // { + pkg = self: builder (attrs // { src = fetchHex { pkg = hexPkg; diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 1fd899c53c9..d1a2a785a9c 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -1,16 +1,53 @@ -{ stdenv, pkgs }: +{ stdenv, pkgs, erlang }: let - self = rec { - hexPackages = import ./hex-packages.nix { stdenv = stdenv; callPackage = self.callPackage; pkgs = pkgs; }; - callPackage = pkgs.lib.callPackageWith (pkgs // self // hexPackages); - buildRebar3 = callPackage ./build-rebar3.nix {}; - buildHex = callPackage ./build-hex.nix {}; - buildErlangMk = callPackage ./build-erlang-mk.nix {}; - buildMix = callPackage ./build-mix.nix {}; + inherit (stdenv.lib) getVersion versionAtLeast makeExtensible; - ## Non hex packages - hex = callPackage ./hex {}; - webdriver = callPackage ./webdriver {}; - }; -in self // self.hexPackages + lib = pkgs.callPackage ./lib.nix {}; + + # FIXME: add support for overrideScope + callPackageWithScope = scope: drv: args: stdenv.lib.callPackageWith scope drv args; + mkScope = scope: pkgs // scope; + + packages = self: + let + defaultScope = mkScope self; + callPackage = drv: args: callPackageWithScope defaultScope drv args; + in + import ./hex-packages.nix { + inherit pkgs stdenv callPackage; + } // { + inherit callPackage erlang; + beamPackages = self; + + rebar = callPackage ../tools/build-managers/rebar { }; + rebar3-open = callPackage ../tools/build-managers/rebar3 { + hermeticRebar3 = false; + }; + rebar3 = callPackage ../tools/build-managers/rebar3 { + hermeticRebar3 = true; + }; + + hexRegistrySnapshot = callPackage ./hex-registry-snapshot.nix { }; + fetchHex = callPackage ./fetch-hex.nix { }; + + buildRebar3 = callPackage ./build-rebar3.nix {}; + buildHex = callPackage ./build-hex.nix {}; + buildErlangMk = callPackage ./build-erlang-mk.nix {}; + buildMix = callPackage ./build-mix.nix {}; + + # BEAM-based languages. + elixir = if versionAtLeast (lib.getVersion erlang) "18" + then callPackage ../interpreters/elixir { debugInfo = true; } + else throw "Elixir requires at least Erlang/OTP R18."; + lfe = callPackage ../interpreters/lfe { }; + + # Non hex packages + hex = callPackage ./hex {}; + webdriver = callPackage ./webdriver {}; + + hex2nix = callPackage ../tools/erlang/hex2nix {}; + cuter = callPackage ../tools/erlang/cuter {}; + relxExe = callPackage ../tools/erlang/relx-exe {}; + }; +in makeExtensible packages diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index ae2705613f0..009bfb4975b 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{ pkgs, stdenv }: rec { @@ -12,6 +12,15 @@ rec { callPackage = callPackageWith pkgs; + /* Erlang/OTP-specific version retrieval, returns 19 for OTP R19 */ + getVersion = x: + let + parse = drv: (builtins.parseDrvName drv).version; + in builtins.replaceStrings ["B" "-"] ["." "."] ( + if builtins.isString x + then parse x + else x.version or (parse x.name)); + /* Uses generic-builder to evaluate provided drv containing OTP-version specific data. diff --git a/pkgs/development/beam-modules/mix-bootstrap b/pkgs/development/beam-modules/mix-bootstrap index c4a1b364daa..6c9a20c6de2 100755 --- a/pkgs/development/beam-modules/mix-bootstrap +++ b/pkgs/development/beam-modules/mix-bootstrap @@ -3,18 +3,16 @@ %%! -smp enable %%% --------------------------------------------------------------------------- %%% @doc -%%% The purpose of this command is to prepare a rebar3 project so that -%%% rebar3 understands that the dependencies are all already -%%% installed. If you want a hygienic build on nix then you must run -%%% this command before running rebar3. I suggest that you add a -%%% `Makefile` to your project and have the bootstrap command be a -%%% dependency of the build commands. See the nix documentation for +%%% The purpose of this command is to prepare a mix project so that mix +%%% understands that the dependencies are all already installed. If you want a +%%% hygienic build on nix then you must run this command before running mix. I +%%% suggest that you add a `Makefile` to your project and have the bootstrap +%%% command be a dependency of the build commands. See the nix documentation for %%% more information. %%% -%%% This command designed to have as few dependencies as possible so -%%% that it can be a dependency of root level packages like rebar3. To -%%% that end it does many things in a fairly simplistic way. That is -%%% by design. +%%% This command designed to have as few dependencies as possible so that it can +%%% be a dependency of root level packages like mix. To that end it does many +%%% things in a fairly simplistic way. That is by design. %%% %%% ### Assumptions %%% @@ -37,7 +35,7 @@ main(Args) -> %% @doc %% This takes an app name in the standard OTP - format -%% and returns just the app name. Why? because rebar is doesn't +%% and returns just the app name. Why? Because rebar doesn't %% respect OTP conventions in some cases. -spec fixup_app_name(file:name()) -> string(). fixup_app_name(Path) -> diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index 6d9adaa1518..3538f85a75f 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -23,6 +23,8 @@ in stdenv.mkDerivation { buildInputs = [ cmake pkgconfig libffi llvm_35 ] ++ stdenv.lib.optional doCheck perl; + patches = [ ./link-llvm.patch ]; + inherit doCheck; checkTarget = "tests"; diff --git a/pkgs/development/compilers/dale/link-llvm.patch b/pkgs/development/compilers/dale/link-llvm.patch new file mode 100644 index 00000000000..3facec91874 --- /dev/null +++ b/pkgs/development/compilers/dale/link-llvm.patch @@ -0,0 +1,10 @@ +--- dale-39e16d8e89fa070de65a673d4462e783d530f95a-src.org/CMakeLists.txt 2017-06-22 08:01:05.839531242 +0100 ++++ dale-39e16d8e89fa070de65a673d4462e783d530f95a-src/CMakeLists.txt 2017-06-22 07:59:11.777566801 +0100 +@@ -78,6 +78,7 @@ + execute_process (COMMAND ${LLVM_CONFIG} --libs + OUTPUT_VARIABLE LLVM_LIBS + OUTPUT_STRIP_TRAILING_WHITESPACE) ++STRING(REGEX REPLACE " " ";" LLVM_LIBS "${LLVM_LIBS}") + if (${D_LLVM_VERSION_MINOR} GREATER 4) + execute_process (COMMAND ${LLVM_CONFIG} --system-libs + OUTPUT_VARIABLE LLVM_SYSTEM_LIBS diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 464ea25aee1..abf477189f0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -37,6 +37,7 @@ self: super: { hasql-postgres = dontCheck super.hasql-postgres; hspec-expectations = dontCheck super.hspec-expectations; hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; }; + hspec-core = super.hspec-core.override { silently = dontCheck super.silently; temporary = dontCheck super.temporary; }; HTTP = dontCheck super.HTTP; nanospec = dontCheck super.nanospec; options = dontCheck super.options; @@ -62,14 +63,16 @@ self: super: { # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful. # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/ - git-annex = ((overrideCabal super.git-annex (drv: { + git-annex = (overrideCabal (super.git-annex.overrideScope (self: super: { + optparse-applicative = self.optparse-applicative_0_14_0_0; + })) (drv: { src = pkgs.fetchgit { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; sha256 = "1psyklfyjf4zqh3qxjn11sp2jiwvp8mfxqvsi1wggqpidfmk39jx"; }; - }))).override { + })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index 58a3002b035..c2a7e001405 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -80,4 +80,8 @@ self: super: { # Needs nats on pre 7.6.x compilers. semigroups = addBuildDepend super.semigroups self.nats; + # Newer versions don't compile any longer. + network_2_6_3_1 = dontCheck super.network_2_6_3_1; + network = self.network_2_6_3_1; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index b3f78e5b753..911fb8640f4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -72,13 +72,14 @@ self: super: { # Newer versions require bytestring >=0.10. tar = super.tar_0_4_1_0; - # Needs void on pre 7.10.x compilers. + # These builds need additional dependencies on old compilers. conduit = addBuildDepend super.conduit self.void; - - # Needs tagged on pre 7.6.x compilers. reflection = addBuildDepend super.reflection self.tagged; - - # Needs nats on pre 7.6.x compilers. semigroups = addBuildDepend super.semigroups self.nats; + optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; + + # Newer versions don't compile any longer. + network_2_6_3_1 = dontCheck super.network_2_6_3_1; + network = self.network_2_6_3_1; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 3b61b7bc065..8a6d22bcc7e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -97,8 +97,13 @@ self: super: { # Needs tagged on pre 7.6.x compilers. reflection = addBuildDepend super.reflection self.tagged; - # These builds Need additional dependencies on pre 7.6.x compilers. + # These builds need additional dependencies on old compilers. semigroups = addBuildDepends super.semigroups (with self; [nats bytestring-builder tagged unordered-containers transformers]); QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]); + optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; + + # Newer versions don't compile any longer. + network_2_6_3_1 = dontCheck super.network_2_6_3_1; + network = self.network_2_6_3_1; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 4ef1aa56211..43ec45bf821 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -93,12 +93,13 @@ self: super: { # Needs void on pre 7.10.x compilers. conduit = addBuildDepend super.conduit self.void; - # Needs additional inputs on pre 7.10.x compilers. + # Needs additional inputs on old compilers. semigroups = addBuildDepends super.semigroups (with self; [bytestring-builder nats tagged unordered-containers transformers]); lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); distributive = addBuildDepend super.distributive self.semigroups; QuickCheck = addBuildDepend super.QuickCheck self.semigroups; void = addBuildDepends super.void (with self; [hashable semigroups]); + optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; # Need a newer version of Cabal to interpret their build instructions. cmdargs = addSetupDepend super.cmdargs self.Cabal_1_24_2_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 1a151efcf38..a97cbfde4fc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -143,12 +143,13 @@ self: super: { hashable = dontCheck super.hashable; unordered-containers = dontCheck super.unordered-containers; - # Needs additional inputs on pre 7.10.x compilers. + # Needs additional inputs on old compilers. semigroups = addBuildDepends super.semigroups (with self; [nats tagged unordered-containers]); lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); distributive = addBuildDepend super.distributive self.semigroups; QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]); void = addBuildDepends super.void (with self; [hashable semigroups]); + optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; # Haddock doesn't cope with the new markup. bifunctors = dontHaddock super.bifunctors; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 80b70b9fad3..c6db553f9cb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 8.18 + # LTS Haskell 8.19 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -58,8 +58,8 @@ default-package-overrides: - aeson-extra ==0.4.0.0 - aeson-generic-compat ==0.0.1.0 - aeson-injector ==1.0.8.0 - - aeson-pretty ==0.8.4 - - aeson-qq ==0.8.1 + - aeson-pretty ==0.8.5 + - aeson-qq ==0.8.2 - aeson-utils ==0.3.0.2 - Agda ==2.5.2 - airship ==0.6.0 @@ -190,7 +190,7 @@ default-package-overrides: - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 - attoparsec-iso8601 ==1.0.0.0 - - audacity ==0.0.1.1 + - audacity ==0.0.1.2 - authenticate ==1.3.3.2 - authenticate-oauth ==1.6 - auto ==0.4.3.1 @@ -217,7 +217,7 @@ default-package-overrides: - base64-string ==0.2 - basic-prelude ==0.6.1.1 - bcrypt ==0.0.10 - - bench ==1.0.4 + - bench ==1.0.5 - benchpress ==0.2.2.9 - bencode ==0.6.0.0 - bento ==0.1.0 @@ -318,7 +318,7 @@ default-package-overrides: - calendar-recycling ==0.0 - call-stack ==0.1.0 - camfort ==0.901 - - carray ==0.1.6.6 + - carray ==0.1.6.7 - cartel ==0.18.0.2 - case-insensitive ==1.2.0.10 - cased ==0.1.0.0 @@ -367,7 +367,7 @@ default-package-overrides: - classy-prelude ==1.2.0.1 - classy-prelude-conduit ==1.2.0 - classy-prelude-yesod ==1.2.0 - - clay ==0.12.1 + - clay ==0.12.2 - clckwrks ==0.24.0.3 - clckwrks-cli ==0.2.17.1 - clckwrks-plugin-media ==0.6.16.3 @@ -408,7 +408,7 @@ default-package-overrides: - conduit-connection ==0.1.0.3 - conduit-extra ==1.1.16 - conduit-iconv ==0.1.1.1 - - conduit-parse ==0.1.2.0 + - conduit-parse ==0.1.2.1 - ConfigFile ==1.1.4 - configuration-tools ==0.2.15 - configurator ==0.3.0.0 @@ -564,9 +564,9 @@ default-package-overrides: - dockerfile ==0.1.0.1 - docopt ==0.7.0.5 - doctemplates ==0.1.0.2 - - doctest ==0.11.2 + - doctest ==0.11.3 - doctest-discover ==0.1.0.7 - - dotenv ==0.3.3.0 + - dotenv ==0.3.4.0 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 - download ==0.3.2.5 @@ -649,7 +649,7 @@ default-package-overrides: - extensible ==0.3.7 - extensible-effects ==1.11.0.4 - extensible-exceptions ==0.1.1.4 - - extra ==1.5.2 + - extra ==1.5.3 - extract-dependencies ==0.2.0.1 - fail ==4.9.0.0 - farmhash ==0.1.0.5 @@ -669,7 +669,7 @@ default-package-overrides: - feature-flags ==0.1.0.1 - feed ==0.3.12.0 - FenwickTree ==0.1.2.1 - - fft ==0.1.8.5 + - fft ==0.1.8.6 - fgl ==5.5.3.1 - fgl-arbitrary ==0.2.0.3 - file-embed ==0.0.10 @@ -697,7 +697,7 @@ default-package-overrides: - fold-debounce ==0.2.0.5 - fold-debounce-conduit ==0.1.0.5 - foldl ==1.2.5 - - foldl-statistics ==0.1.4.4 + - foldl-statistics ==0.1.4.6 - folds ==0.7.3 - FontyFruity ==0.5.3.2 - force-layout ==0.4.0.6 @@ -705,7 +705,7 @@ default-package-overrides: - format-numbers ==0.1.0.0 - formatting ==6.2.4 - fortran-src ==0.1.0.4 - - foundation ==0.0.10 + - foundation ==0.0.11 - Frames ==0.1.9 - free ==4.12.4 - free-vl ==0.1.4 @@ -740,7 +740,7 @@ default-package-overrides: - ghc-mod ==5.7.0.0 - ghc-paths ==0.1.0.9 - ghc-prof ==1.3.0.2 - - ghc-syb-utils < 0.3 + - ghc-syb-utils ==0.2.3.2 - ghc-tcplugins-extra ==0.2 - ghc-typelits-extra ==0.2.3 - ghc-typelits-knownnat ==0.2.4 @@ -936,7 +936,7 @@ default-package-overrides: - happy ==1.19.5 - HaRe ==0.8.4.0 - harp ==0.4.2 - - hasbolt ==0.1.1.2 + - hasbolt ==0.1.1.3 - hashable ==1.2.6.0 - hashable-time ==0.2.0.1 - hashmap ==1.3.2 @@ -1033,7 +1033,7 @@ default-package-overrides: - holy-project ==0.2.0.1 - hOpenPGP ==2.5.5 - hopenpgp-tools ==0.19.4 - - hopfli ==0.2.1.1 + - hopfli ==0.2.2.1 - hosc ==0.15 - hostname ==1.0 - hostname-validate ==1.0.0 @@ -1104,7 +1104,7 @@ default-package-overrides: - http-api-data ==0.3.7.1 - http-client ==0.5.7.0 - http-client-openssl ==0.2.0.5 - - http-client-tls ==0.3.5 + - http-client-tls ==0.3.5.1 - http-common ==0.8.2.0 - http-conduit ==2.2.3.1 - http-date ==0.0.6.1 @@ -1159,7 +1159,7 @@ default-package-overrides: - imm ==1.1.0.0 - immortal ==0.2.2 - include-file ==0.1.0.3 - - incremental-parser ==0.2.5 + - incremental-parser ==0.2.5.1 - indentation-core ==0.0 - indentation-parsec ==0.0 - indents ==0.4.0.0 @@ -1224,7 +1224,7 @@ default-package-overrides: - json-rpc-generic ==0.2.1.2 - json-schema ==0.7.4.1 - json-stream ==0.4.1.3 - - JuicyPixels ==3.2.8.1 + - JuicyPixels ==3.2.8.2 - JuicyPixels-extra ==0.1.1 - JuicyPixels-scale-dct ==0.1.1.2 - jvm ==0.1.2 @@ -1309,7 +1309,7 @@ default-package-overrides: - loch-th ==0.2.1 - log ==0.7 - log-base ==0.7.1 - - log-domain ==0.11 + - log-domain ==0.11.1 - log-elasticsearch ==0.7 - log-postgres ==0.7 - logfloat ==0.13.3.3 @@ -1319,7 +1319,7 @@ default-package-overrides: - logict ==0.6.0.2 - loop ==0.3.0 - lrucache ==1.2.0.0 - - lrucaching ==0.3.1 + - lrucaching ==0.3.2 - lucid ==2.9.8.1 - lucid-svg ==0.7.0.0 - lzma-conduit ==1.1.3.1 @@ -1370,11 +1370,11 @@ default-package-overrides: - microlens-aeson ==2.2.0.1 - microlens-contra ==0.1.0.1 - microlens-ghc ==0.4.8.0 - - microlens-mtl ==0.1.10.0 - - microlens-platform ==0.3.8.0 + - microlens-mtl ==0.1.11.0 + - microlens-platform ==0.3.9.0 - microlens-th ==0.4.1.1 - midi ==0.2.2.1 - - midi-music-box ==0.0.0.3 + - midi-music-box ==0.0.0.4 - mighty-metropolis ==1.2.0 - mime-mail ==0.4.13.1 - mime-mail-ses ==0.3.2.3 @@ -1388,9 +1388,9 @@ default-package-overrides: - mmap ==0.5.9 - mmorph ==1.0.9 - mnist-idx ==0.1.2.8 - - mockery ==0.3.4 + - mockery ==0.3.5 - modify-fasta ==0.8.2.3 - - monad-control ==1.0.1.0 + - monad-control ==1.0.2.0 - monad-coroutine ==0.9.0.3 - monad-extras ==0.6.0 - monad-http ==0.1.0.0 @@ -1423,10 +1423,10 @@ default-package-overrides: - mono-traversable ==1.0.2 - mono-traversable-instances ==0.1.0.0 - monoid-extras ==0.4.2 - - monoid-subclasses ==0.4.3.1 + - monoid-subclasses ==0.4.3.2 - monoid-transformer ==0.0.3 - monoidal-containers ==0.3.0.1 - - morte ==1.6.7 + - morte ==1.6.9 - mountpoints ==1.0.2 - mstate ==0.2.7 - mtl ==2.2.1 @@ -1558,7 +1558,7 @@ default-package-overrides: - parsers ==0.12.5 - partial-handler ==1.0.2 - partial-isomorphisms ==0.2.2.1 - - patat ==0.5.2.0 + - patat ==0.5.2.2 - path ==0.5.13 - path-extra ==0.0.3 - path-io ==1.2.2 @@ -1594,7 +1594,7 @@ default-package-overrides: - pinchot ==0.24.0.0 - pipes ==4.3.4 - pipes-attoparsec ==0.5.1.5 - - pipes-bytestring ==2.1.4 + - pipes-bytestring ==2.1.5 - pipes-cacophony ==0.4.1 - pipes-category ==0.2.0.1 - pipes-concurrency ==2.0.7 @@ -1657,7 +1657,7 @@ default-package-overrides: - primitive ==0.6.1.0 - printcess ==0.1.0.3 - probability ==0.2.5.1 - - process-extras ==0.7.1 + - process-extras ==0.7.2 - product-profunctors ==0.7.1.0 - profiteur ==0.4.3.0 - profunctor-extras ==4.0 @@ -1671,7 +1671,7 @@ default-package-overrides: - proto-lens-arbitrary ==0.1.0.2 - proto-lens-combinators ==0.1.0.7 - proto-lens-descriptors ==0.2.1.0 - - proto-lens-optparse ==0.1.0.2 + - proto-lens-optparse ==0.1.0.3 - proto-lens-protoc ==0.2.1.0 - protobuf ==0.2.1.1 - protobuf-simple ==0.1.0.4 @@ -1868,7 +1868,7 @@ default-package-overrides: - set-cover ==0.0.8 - set-monad ==0.2.0.0 - setenv ==0.1.1.3 - - setlocale ==1.0.0.4 + - setlocale ==1.0.0.5 - sets ==0.0.5.2 - SHA ==1.6.4.2 - shake ==0.15.11 @@ -1920,7 +1920,7 @@ default-package-overrides: - sourcemap ==0.1.6 - sparkle ==0.4.0.2 - sparse-linear-algebra ==0.2.9.7 - - spdx ==0.2.1.0 + - spdx ==0.2.2.0 - speculation ==1.5.0.3 - speedy-slice ==0.3.0 - sphinx ==0.6.0.2 @@ -2058,7 +2058,7 @@ default-package-overrides: - tdigest-Chart ==0 - telegram-api ==0.6.3.0 - template ==0.2.0.10 - - temporary ==1.2.0.4 + - temporary ==1.2.1 - temporary-rc ==1.2.0.3 - termcolor ==0.2.0.0 - terminal-progress-bar ==0.1.1.1 @@ -2067,7 +2067,7 @@ default-package-overrides: - test-fixture ==0.5.0.1 - test-framework ==0.8.1.1 - test-framework-hunit ==0.3.0.2 - - test-framework-quickcheck2 < 0.4 + - test-framework-quickcheck2 ==0.3.0.4 - test-framework-smallcheck ==0.2 - test-framework-th ==0.2.4 - test-invariant ==0.4.5.0 @@ -2094,6 +2094,7 @@ default-package-overrides: - textlocal ==0.1.0.5 - tf-random ==0.5 - tfp ==1.0.0.2 + - th-abstraction ==0.2.2.0 - th-data-compat ==0.0.2.2 - th-desugar ==1.6 - th-expand-syns ==0.4.3.0 @@ -2102,7 +2103,7 @@ default-package-overrides: - th-lift-instances ==0.1.11 - th-orphans ==0.13.3 - th-reify-compat ==0.0.1.1 - - th-reify-many ==0.1.6 + - th-reify-many ==0.1.7 - th-to-exp ==0.0.1.0 - th-utilities ==0.2.0.1 - these ==0.7.3 @@ -2149,7 +2150,7 @@ default-package-overrides: - tuple ==0.3.0.2 - tuple-th ==0.2.5 - tuples-homogenous-h98 ==0.1.1.0 - - turtle ==1.3.5 + - turtle ==1.3.6 - turtle-options ==0.1.0.4 - twitter-feed ==0.2.0.11 - twitter-types ==0.7.2.2 @@ -2236,7 +2237,7 @@ default-package-overrides: - vector-algorithms ==0.7.0.1 - vector-binary-instances ==0.2.3.5 - vector-buffer ==0.4.1 - - vector-fftw ==0.1.3.7 + - vector-fftw ==0.1.3.8 - vector-instances ==3.4 - vector-sized ==0.5.1.0 - vector-space ==0.10.4 @@ -2349,14 +2350,14 @@ default-package-overrides: - xdg-basedir ==0.2.2 - xeno ==0.1 - xenstore ==0.1.1 - - xhtml ==3000.2.1 + - xhtml ==3000.2.2 - xlsior ==0.1.0.1 - xlsx ==0.4.3 - xlsx-tabular ==0.2.2 - xml ==1.3.14 - xml-basic ==0.1.2 - xml-conduit ==1.4.0.4 - - xml-conduit-parse ==0.3.1.0 + - xml-conduit-parse ==0.3.1.1 - xml-conduit-writer ==0.1.1.1 - xml-hamlet ==0.4.1 - xml-html-qq ==0.1.0.1 @@ -2372,7 +2373,7 @@ default-package-overrides: - xss-sanitize ==0.3.5.7 - yackage ==0.8.1 - yahoo-finance-api ==0.2.0.2 - - yaml ==0.8.23 + - yaml ==0.8.23.1 - Yampa ==0.10.6 - YampaSynth ==0.2 - yes-precure5-command ==5.5.3 @@ -2398,24 +2399,24 @@ default-package-overrides: - yesod-table ==2.0.3 - yesod-test ==1.5.6 - yesod-websockets ==0.2.6 - - yi-core ==0.13.5 - - yi-frontend-vty ==0.13.5 - - yi-fuzzy-open ==0.13.5 - - yi-ireader ==0.13.5 - - yi-keymap-cua ==0.13.5 - - yi-keymap-emacs ==0.13.5 - - yi-keymap-vim ==0.13.5 - - yi-language ==0.13.5 - - yi-misc-modes ==0.13.5 - - yi-mode-haskell ==0.13.5 - - yi-mode-javascript ==0.13.5 + - yi-core ==0.13.7 + - yi-frontend-vty ==0.13.7 + - yi-fuzzy-open ==0.13.7 + - yi-ireader ==0.13.7 + - yi-keymap-cua ==0.13.7 + - yi-keymap-emacs ==0.13.7 + - yi-keymap-vim ==0.13.7 + - yi-language ==0.13.7 + - yi-misc-modes ==0.13.7 + - yi-mode-haskell ==0.13.7 + - yi-mode-javascript ==0.13.7 - yi-rope ==0.8 - - yi-snippet ==0.13.5 + - yi-snippet ==0.13.7 - yjtools ==0.9.18 - yoga ==0.0.0.1 - youtube ==0.2.1 - zero ==0.1.4 - - zeromq4-haskell ==0.6.5 + - zeromq4-haskell ==0.6.6 - zip ==0.1.11 - zip-archive ==0.3.1 - zippers ==0.2.3 @@ -2448,6 +2449,7 @@ extra-packages: - hpack < 0.18 # required by stack-1.4.0 - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms + - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 - primitive == 0.5.1.* # required to build alex with GHC 6.12.3 - QuickCheck < 2 # required by test-framework-quickcheck and its users diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 58ab8024369..584ea5eb71d 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -461,4 +461,7 @@ self: super: builtins.intersectAttrs super { liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint; liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell); + # Haskell OpenCV bindings need contrib code enabled in the C++ library. + opencv = super.opencv.override { opencv3 = pkgs.opencv3.override { enableContrib = true; }; }; + } diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 6b5812cd07f..32fa46f111d 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -3,6 +3,8 @@ , packageSetConfig ? (self: super: {}) , overrides ? (self: super: {}) , initialPackages ? import ./hackage-packages.nix +, configurationCommon ? import ./configuration-common.nix +, configurationNix ? import ./configuration-nix.nix }: let @@ -15,8 +17,8 @@ let inherit ghc extensible-self; }; - commonConfiguration = import ./configuration-common.nix { inherit pkgs; }; - nixConfiguration = import ./configuration-nix.nix { inherit pkgs; }; + commonConfiguration = configurationCommon { inherit pkgs; }; + nixConfiguration = configurationNix { inherit pkgs; }; extensible-self = makeExtensible (extends overrides diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 38d74178e2e..97a3adaf220 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -34,7 +34,7 @@ , license , maintainers ? [] , doCoverage ? false -, doHaddock ? (!ghc.isHaLVM or true) +, doHaddock ? !(ghc.isHaLVM or false) , passthru ? {} , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3ad53530c40..65ad24320c8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2866,8 +2866,8 @@ self: { ({ mkDerivation, array, base, libdevil }: mkDerivation { pname = "Codec-Image-DevIL"; - version = "0.2.3"; - sha256 = "1kv3hns9f0bhfb723nj9szyz3zfqpvy02azzsiymzjz4ajhqmrsz"; + version = "0.2.4"; + sha256 = "1kzphhzh0ad2mf76mr67b6pl77yrapyakvrwlkvhcx8gp5afy4zk"; libraryHaskellDepends = [ array base ]; librarySystemDepends = [ libdevil ]; description = "An FFI interface to the DevIL library"; @@ -8827,6 +8827,26 @@ self: { license = "LGPL"; }) {}; + "HaXml_1_25_4" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , polyparse, pretty, random + }: + mkDerivation { + pname = "HaXml"; + version = "1.25.4"; + sha256 = "1d8xq37h627im5harybhsn08qjdaf6vskldm03cqbfjmr2w6fx6p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers filepath polyparse pretty random + ]; + executableHaskellDepends = [ base directory polyparse pretty ]; + homepage = "http://projects.haskell.org/HaXml/"; + description = "Utilities for manipulating XML documents"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Hach" = callPackage ({ mkDerivation, base, containers, network, old-locale, text, time , vty, vty-ui @@ -10502,23 +10522,6 @@ self: { }) {}; "JuicyPixels" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl - , primitive, transformers, vector, zlib - }: - mkDerivation { - pname = "JuicyPixels"; - version = "3.2.8.1"; - sha256 = "013il9pnglb2mbiz5bbk1wg4mw2yvyi07fjv2zvmmml7p18fs9dk"; - 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_8_2" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl , primitive, transformers, vector, zlib }: @@ -10533,7 +10536,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 @@ -20631,6 +20633,8 @@ self: { pname = "active"; version = "0.2.0.13"; sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx"; + revision = "1"; + editedCabalFile = "15z0n337bglkn1a3hx2gvh64jx311nmsa4vijynmwp2hq11rgvm6"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -21462,28 +21466,6 @@ self: { }) {}; "aeson-pretty" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , cmdargs, scientific, text, unordered-containers, vector - }: - mkDerivation { - pname = "aeson-pretty"; - version = "0.8.4"; - sha256 = "028527bymhvvry5knaqwjj32x3v15flj6d1c9zqy6gwqp87ji3zx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base-compat bytestring scientific text - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson attoparsec base bytestring cmdargs - ]; - homepage = "http://github.com/informatikr/aeson-pretty"; - description = "JSON pretty-printing library and command-line tool"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-pretty_0_8_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , cmdargs, scientific, text, unordered-containers, vector }: @@ -21503,32 +21485,9 @@ self: { homepage = "http://github.com/informatikr/aeson-pretty"; description = "JSON pretty-printing library and command-line tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-qq" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim - , haskell-src-meta, hspec, parsec, scientific, template-haskell - , text, vector - }: - mkDerivation { - pname = "aeson-qq"; - version = "0.8.1"; - sha256 = "1z8kh3qjc4khadz1ijdqm7fbk7dh17sisqhpwd3c9aibj2927k9d"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat haskell-src-meta parsec - scientific template-haskell text vector - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat ghc-prim haskell-src-meta hspec - parsec scientific template-haskell text vector - ]; - homepage = "http://github.com/zalora/aeson-qq"; - description = "JSON quasiquoter for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "aeson-qq_0_8_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim , haskell-src-meta, hspec, parsec, scientific, template-haskell , text, vector @@ -21548,7 +21507,6 @@ self: { homepage = "https://github.com/sol/aeson-qq#readme"; description = "JSON quasiquoter for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-quick" = callPackage @@ -28447,28 +28405,6 @@ self: { }) {}; "audacity" = callPackage - ({ mkDerivation, base, bytestring, deepseq, directory - , explicit-exception, filepath, non-empty, storable-record - , storablevector, tagchup, transformers, utility-ht, xml-basic - }: - mkDerivation { - pname = "audacity"; - version = "0.0.1.1"; - sha256 = "1hmb87h4ynlzcgspqw3g9jzjkfwf5l5n96dws3jppbvhkbhk7lzi"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring deepseq directory explicit-exception filepath - non-empty storable-record storablevector tagchup transformers - utility-ht xml-basic - ]; - homepage = "http://hub.darcs.net/thielema/audacity"; - description = "Interchange with the Audacity sound signal editor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "audacity_0_0_1_2" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory , explicit-exception, filepath, non-empty, storable-record , storablevector, tagchup, transformers, utility-ht, xml-basic @@ -31110,25 +31046,6 @@ self: { }) {}; "bench" = callPackage - ({ mkDerivation, base, criterion, optparse-applicative, silently - , text, turtle - }: - mkDerivation { - pname = "bench"; - version = "1.0.4"; - sha256 = "1q376q5jy3i99smx06dma4d05jdxmcfyfskjkj7bmm3g84fdwxas"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base criterion optparse-applicative silently text turtle - ]; - homepage = "http://github.com/Gabriel439/bench"; - description = "Command-line benchmark tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "bench_1_0_5" = callPackage ({ mkDerivation, base, criterion, optparse-applicative, silently , text, turtle }: @@ -34639,6 +34556,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blockchain" = callPackage + ({ mkDerivation, aeson, async, base, byteable, bytestring + , cryptonite, deepseq, either, errors, hashable, hspec, memory, mtl + , QuickCheck, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "blockchain"; + version = "0.0.2"; + sha256 = "1abd2p587p3kvg3zyn3qmlhk0lw42cs18f7msgkcz07r2k99r047"; + libraryHaskellDepends = [ + aeson base byteable bytestring cryptonite either errors hashable + memory mtl text time transformers unordered-containers + ]; + testHaskellDepends = [ + aeson async base byteable bytestring cryptonite deepseq either + errors hashable hspec memory mtl QuickCheck text time transformers + unordered-containers + ]; + homepage = "https://github.com/TGOlson/blockchain"; + description = "Generic blockchain implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blockhash" = callPackage ({ mkDerivation, base, bytestring, JuicyPixels , optparse-applicative, primitive, vector, vector-algorithms @@ -37145,8 +37085,8 @@ self: { }: mkDerivation { pname = "c-mosquitto"; - version = "0.1.0.0"; - sha256 = "0gyd0h905mi23a8xmg1cyhl3yj6qcq1gqr2yyiv3xav8hf1crszm"; + version = "0.1.0.1"; + sha256 = "0scghhz6d9i3rbdl95dvfc03ds99nx0hgmsx29n1d8v8bvvmkpz4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38473,6 +38413,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cacophony_0_10_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring + , bytestring, criterion, cryptonite, deepseq, directory, exceptions + , free, hlint, lens, memory, monad-coroutine, mtl, safe-exceptions + , text, transformers + }: + mkDerivation { + pname = "cacophony"; + version = "0.10.0"; + sha256 = "1hjxzpbnp5qzbjl9m0hyvlr7yflfgxr5kqbviamhpgc0lj5igizv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cryptonite exceptions free lens memory + monad-coroutine mtl safe-exceptions transformers + ]; + testHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring directory hlint + text + ]; + benchmarkHaskellDepends = [ + async base base16-bytestring bytestring criterion deepseq + ]; + homepage = "https://github.com/centromere/cacophony#readme"; + description = "A library implementing the Noise protocol"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "caf" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -39212,23 +39181,6 @@ self: { }) {}; "carray" = callPackage - ({ mkDerivation, array, base, binary, bytestring, ix-shapable - , QuickCheck, syb - }: - mkDerivation { - pname = "carray"; - version = "0.1.6.6"; - sha256 = "1h22n68qpk6zfx0yfyj66ccwhxisw6ijziy5jmqqx9g605n16l4z"; - libraryHaskellDepends = [ - array base binary bytestring ix-shapable QuickCheck syb - ]; - testHaskellDepends = [ array base ix-shapable QuickCheck ]; - benchmarkHaskellDepends = [ array base ]; - description = "A C-compatible array library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "carray_0_1_6_7" = callPackage ({ mkDerivation, array, base, binary, bytestring, ix-shapable , QuickCheck, syb }: @@ -39243,7 +39195,6 @@ self: { benchmarkHaskellDepends = [ array base ]; description = "A C-compatible array library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "carte" = callPackage @@ -39844,6 +39795,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cassava-conduit_0_4_0_0" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, cassava + , conduit, conduit-extra, containers, criterion, mtl, QuickCheck + , text + }: + mkDerivation { + pname = "cassava-conduit"; + version = "0.4.0.0"; + sha256 = "1pl3vbkyjvgz08ijm75rdxnxx5h27mya7bgzi9jpws7v2dwxlg22"; + libraryHaskellDepends = [ + array base bifunctors bytestring cassava conduit conduit-extra + containers mtl text + ]; + testHaskellDepends = [ + base bytestring cassava conduit conduit-extra QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/domdere/cassava-conduit"; + description = "Conduit interface for cassava package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cassava-megaparsec" = callPackage ({ mkDerivation, base, bytestring, cassava, containers, hspec , hspec-megaparsec, megaparsec, unordered-containers, vector @@ -41198,6 +41172,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "checkers_0_4_7" = callPackage + ({ mkDerivation, array, base, QuickCheck, random }: + mkDerivation { + pname = "checkers"; + version = "0.4.7"; + sha256 = "15rb9j7hsdpnf57nw115z74bbk794x705bha8kz0qgb1rlpwpngr"; + libraryHaskellDepends = [ array base QuickCheck random ]; + description = "Check properties on standard classes and data structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "chell" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, options, patience , random, template-haskell, text, transformers @@ -41854,6 +41840,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "circle-packing_0_1_0_6" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "circle-packing"; + version = "0.1.0.6"; + sha256 = "06z8irwrjxxgk5xqlpy6a9mjl44kp9pgx2xpslhgxrd31nll9vk4"; + libraryHaskellDepends = [ base ]; + description = "Simple heuristic for packing discs of varying radii in a circle"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "circlehs" = callPackage ({ mkDerivation, aeson, base, http-client, http-client-tls, mtl , servant, servant-client, text, time, transformers @@ -42487,20 +42485,6 @@ self: { }) {}; "clay" = callPackage - ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: - mkDerivation { - pname = "clay"; - version = "0.12.1"; - sha256 = "0yl65gjg2g99g2wz8l825514821dky990968zs8y899ksrnp5qzd"; - libraryHaskellDepends = [ base mtl text ]; - testHaskellDepends = [ base hspec hspec-expectations mtl text ]; - homepage = "http://fvisser.nl/clay"; - description = "CSS preprocessor as embedded Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clay_0_12_2" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: mkDerivation { pname = "clay"; @@ -43722,6 +43706,34 @@ self: { license = "GPL"; }) {}; + "cmv" = callPackage + ({ mkDerivation, aeson, base, BiobaseInfernal, BiobaseTypes + , BiobaseXNA, BioHMM, bytestring, cmdargs, colour, containers + , diagrams-cairo, diagrams-lib, directory, either-unwrap, filepath + , mtl, parsec, ParsecTools, PrimitiveArray, StockholmAlignment + , SVGFonts, template-haskell, text, vector + }: + mkDerivation { + pname = "cmv"; + version = "1.0.2"; + sha256 = "107cwha465c7i2yi1k9m2csf9kdszrix7295d1q0dhklwi0fll8d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base BiobaseInfernal BiobaseTypes BiobaseXNA BioHMM colour + containers diagrams-cairo diagrams-lib directory either-unwrap + filepath mtl parsec ParsecTools PrimitiveArray StockholmAlignment + SVGFonts text vector + ]; + executableHaskellDepends = [ + aeson base BiobaseInfernal BiobaseXNA BioHMM bytestring cmdargs + colour containers diagrams-lib directory either-unwrap filepath + parsec StockholmAlignment template-haskell text vector + ]; + description = "Detailed visualization of CMs, HMMs and their comparisions"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "cnc-spec-compiler" = callPackage ({ mkDerivation, ansi-terminal, array, base, binary, bytestring , containers, directory, fgl, filepath, graphviz, HaXml, haxr @@ -46176,28 +46188,6 @@ self: { }) {}; "conduit-parse" = callPackage - ({ mkDerivation, base, conduit, dlist, hlint, mtl, parsers - , resourcet, safe, safe-exceptions, tasty, tasty-hunit, text - , transformers - }: - mkDerivation { - pname = "conduit-parse"; - version = "0.1.2.0"; - sha256 = "05yfggq2g8ifwgb4w12i9n7hgjydvyk9i3bkszxk0ba51rmiyqhm"; - libraryHaskellDepends = [ - base conduit dlist mtl parsers safe safe-exceptions text - transformers - ]; - testHaskellDepends = [ - base conduit hlint mtl parsers resourcet safe-exceptions tasty - tasty-hunit - ]; - homepage = "https://github.com/k0ral/conduit-parse"; - description = "Parsing framework based on conduit"; - license = "unknown"; - }) {}; - - "conduit-parse_0_1_2_1" = callPackage ({ mkDerivation, base, conduit, conduit-combinators, dlist, hlint , mtl, parsers, resourcet, safe, safe-exceptions, tasty , tasty-hunit, text, transformers @@ -46217,7 +46207,6 @@ self: { homepage = "https://github.com/k0ral/conduit-parse"; description = "Parsing framework based on conduit"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-resumablesink" = callPackage @@ -48071,6 +48060,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "country" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, hashable, primitive + , text, unordered-containers + }: + mkDerivation { + pname = "country"; + version = "0.1"; + sha256 = "108j6wvismx69p9a13rskr4lsfiicjpfhk0397sgxn2jawaz5vim"; + libraryHaskellDepends = [ + base bytestring ghc-prim hashable primitive text + unordered-containers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/andrewthad/country#readme"; + description = "Country data type and functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "country-codes" = callPackage ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, text }: mkDerivation { @@ -48223,6 +48230,27 @@ self: { license = "LGPL"; }) {}; + "cpphs_1_20_8" = callPackage + ({ mkDerivation, base, directory, old-locale, old-time, polyparse + }: + mkDerivation { + pname = "cpphs"; + version = "1.20.8"; + sha256 = "1bh524asqhk9v1s0wvipl0hgn7l63iy3js867yv0z3h5v2kn8vg5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory old-locale old-time polyparse + ]; + executableHaskellDepends = [ + base directory old-locale old-time polyparse + ]; + homepage = "http://projects.haskell.org/cpphs/"; + description = "A liberalised re-implementation of cpp, the C pre-processor"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cprng-aes" = callPackage ({ mkDerivation, base, byteable, bytestring, cipher-aes, criterion , crypto-random, mtl @@ -49019,7 +49047,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "criterion_1_2_0_0" = callPackage + "criterion_1_2_1_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat, binary , bytestring, cassava, code-page, containers, deepseq, directory , exceptions, filepath, Glob, HUnit, js-flot, js-jquery @@ -49030,8 +49058,8 @@ self: { }: mkDerivation { pname = "criterion"; - version = "1.2.0.0"; - sha256 = "0rbmfjgxba7qsp79lj7k00yzphmknimqh5r20nw1bc6i1v4civ6f"; + version = "1.2.1.0"; + sha256 = "0hbhm6fcbvh38m8hazlzjh3z09adjrzcv5jq63792bvnm24bpx6r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51917,6 +51945,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "data-diverse" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, lens, tagged }: + mkDerivation { + pname = "data-diverse"; + version = "0.2.0.0"; + sha256 = "1lffgpy3pz0hyq6l4r7l4aqsldgis5wbd9jpllankhfxghxx9gvn"; + libraryHaskellDepends = [ base containers ghc-prim lens tagged ]; + testHaskellDepends = [ base hspec lens ]; + homepage = "https://github.com/louispan/data-diverse#readme"; + description = "Extensible records and polymorphic variants"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-dword" = callPackage ({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty , tasty-quickcheck, template-haskell @@ -55780,6 +55821,8 @@ self: { pname = "diagrams-lib"; version = "1.4.1.2"; sha256 = "0w16cljv9jcvn46hd19qvw1bfvxijlak286nap9qbvyavq2qhvjb"; + revision = "2"; + editedCabalFile = "0na2aqk7aw2f1nq62r1zwmv3f5h9yx61b0b5qxmsazgyvqjgc3z3"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -55977,6 +56020,8 @@ self: { pname = "diagrams-svg"; version = "1.4.1"; sha256 = "11vzcsqgkc8jzm5dw82swgqzahck541mz2l9jkkwfdaq09w16sff"; + revision = "1"; + editedCabalFile = "12cp0898pplap5skhq43xsxh0m2ilv5lz9zw2fhkkjmnr4pbl2dx"; libraryHaskellDepends = [ base base64-bytestring bytestring colour containers diagrams-core diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl @@ -58103,6 +58148,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dlist-nonempty" = callPackage + ({ mkDerivation, base, base-compat, Cabal, criterion, deepseq + , dlist, dlist-instances, QuickCheck, quickcheck-instances + , semigroupoids + }: + mkDerivation { + pname = "dlist-nonempty"; + version = "0.1"; + sha256 = "13nkf2kgm8pd1vicd2lm2z99m04bs65pm1kjn4k4a2259h3hd0m8"; + libraryHaskellDepends = [ + base base-compat deepseq dlist semigroupoids + ]; + testHaskellDepends = [ + base Cabal QuickCheck quickcheck-instances + ]; + benchmarkHaskellDepends = [ + base base-compat criterion dlist dlist-instances + ]; + homepage = "https://github.com/phadej/dlist-nonempty"; + description = "Non-empty difference lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dmc" = callPackage ({ mkDerivation, base, hspec, process, QuickCheck }: mkDerivation { @@ -58457,33 +58525,6 @@ self: { }) {}; "doctest" = 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.11.2"; - sha256 = "12wlc7qxpr8i46inj8jgq6s224l4h5vka3zw7ibpjhddligdwlh7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat code-page deepseq directory filepath ghc ghc-paths - process syb transformers - ]; - executableHaskellDepends = [ base ]; - 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; - }) {}; - - "doctest_0_11_3" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process , QuickCheck, setenv, silently, stringbuilder, syb, transformers @@ -58508,7 +58549,6 @@ self: { 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 @@ -58791,33 +58831,6 @@ self: { }) {}; "dotenv" = callPackage - ({ mkDerivation, base, base-compat, exceptions, hspec - , hspec-megaparsec, megaparsec, optparse-applicative, process, text - , transformers - }: - mkDerivation { - pname = "dotenv"; - version = "0.3.3.0"; - sha256 = "1n6klccf3rd5l6m0nbbdb6abwgfrjyi19x2g3sjxh3fhqqb1qigg"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat exceptions megaparsec text transformers - ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - transformers - ]; - testHaskellDepends = [ - base base-compat exceptions hspec hspec-megaparsec megaparsec text - transformers - ]; - homepage = "https://github.com/stackbuilders/dotenv-hs"; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dotenv_0_3_4_0" = callPackage ({ mkDerivation, base, base-compat, exceptions, hspec , hspec-megaparsec, megaparsec, optparse-applicative, process, text , transformers @@ -58842,7 +58855,6 @@ self: { homepage = "https://github.com/stackbuilders/dotenv-hs"; description = "Loads environment variables from dotenv files"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dotfs" = callPackage @@ -59704,8 +59716,8 @@ self: { }: mkDerivation { pname = "duckling"; - version = "0.1.0.0"; - sha256 = "16h07ny99a6vndpwy5m3iiikkc0ygrsg1a9l9aklmlcydprlcmvq"; + version = "0.1.1.0"; + sha256 = "0c81cjah5iy3p2p9g4z1k0mxwg1256l93m53bnk7pr37439vwnx6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62438,6 +62450,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "entropy_0_3_8" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , process, unix + }: + mkDerivation { + pname = "entropy"; + version = "0.3.8"; + sha256 = "1l3lfigqvdlmxkz1wl7zdkmc0i2r5p6z4xzhiw8xdsbsw7aljfkl"; + setupHaskellDepends = [ base Cabal directory filepath process ]; + libraryHaskellDepends = [ base bytestring unix ]; + homepage = "https://github.com/TomMD/entropy"; + description = "A platform independent entropy source"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "enumerable" = callPackage ({ mkDerivation, base, control-monad-omega, tagged }: mkDerivation { @@ -63373,6 +63401,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "esqueleto_2_5_3" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, conduit, containers + , hspec, HUnit, monad-control, monad-logger, persistent + , persistent-sqlite, persistent-template, QuickCheck, resourcet + , tagged, text, transformers, unordered-containers + }: + mkDerivation { + pname = "esqueleto"; + version = "2.5.3"; + sha256 = "10n49rzqmblky7pwjnysalyy6nacmxfms8dqbsdv6hlyzr8pb69x"; + libraryHaskellDepends = [ + base blaze-html bytestring conduit monad-logger persistent + resourcet tagged text transformers unordered-containers + ]; + testHaskellDepends = [ + base conduit containers hspec HUnit monad-control monad-logger + persistent persistent-sqlite persistent-template QuickCheck + resourcet text transformers + ]; + homepage = "https://github.com/bitemyapp/esqueleto"; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ess" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -63941,21 +63994,22 @@ self: { }) {}; "eventful-core" = callPackage - ({ mkDerivation, aeson, base, containers, hlint, hspec - , http-api-data, HUnit, path-pieces, sum-type-boilerplate + ({ mkDerivation, aeson, base, containers, contravariant, hlint + , hspec, http-api-data, HUnit, path-pieces, sum-type-boilerplate , template-haskell, text, transformers, uuid }: mkDerivation { pname = "eventful-core"; - version = "0.1.2"; - sha256 = "0vlhn54qiwi6cvvf9r4nwgnlp747y3i1nh9y2dxr8g9zkpj0wcyn"; + version = "0.1.3"; + sha256 = "1lify1ama6a479w0mcvr4qmp0mrfgwf6nsy902hrx20sn5ik02h9"; libraryHaskellDepends = [ - aeson base containers http-api-data path-pieces + aeson base containers contravariant http-api-data path-pieces sum-type-boilerplate template-haskell text transformers uuid ]; testHaskellDepends = [ - aeson base containers hlint hspec http-api-data HUnit path-pieces - sum-type-boilerplate template-haskell text transformers uuid + aeson base containers contravariant hlint hspec http-api-data HUnit + path-pieces sum-type-boilerplate template-haskell text transformers + uuid ]; homepage = "https://github.com/jdreaver/eventful#readme"; description = "Core module for eventful"; @@ -63970,8 +64024,8 @@ self: { }: mkDerivation { pname = "eventful-dynamodb"; - version = "0.1.2"; - sha256 = "0q8wvnxcprh4gz74d4jsia5ripgn87lb2mw037mrf817g0w63dgl"; + version = "0.1.3"; + sha256 = "1ymzryyz77705vwb05nhjhw6sz2ksjfpld5g569pnbdlr03m257y"; libraryHaskellDepends = [ aeson amazonka amazonka-dynamodb base bytestring conduit eventful-core lens safe text unordered-containers vector @@ -63994,8 +64048,8 @@ self: { }: mkDerivation { pname = "eventful-memory"; - version = "0.1.2"; - sha256 = "0kq8f6x7q19vlwgfz7mwlisik0j5wi8pxwlliyv2ispa37rlmvgx"; + version = "0.1.3"; + sha256 = "0r35bg40j4bdpf5ibxi5acjnmdl9piaysyzswapwcjq4jyibcdk9"; libraryHaskellDepends = [ base containers eventful-core mtl safe stm ]; @@ -64015,8 +64069,8 @@ self: { }: mkDerivation { pname = "eventful-postgresql"; - version = "0.1.2"; - sha256 = "0aim6907mkjxlwiwkhmjmmfcbagkaq7z633447xr4mw931v8k84l"; + version = "0.1.3"; + sha256 = "0vc36qfi2q1im60nwzb9ivpsz7kk2y83rbzbbv4b2mjk3cvvjnyr"; libraryHaskellDepends = [ aeson base bytestring eventful-core eventful-sql-common mtl persistent text @@ -64038,8 +64092,8 @@ self: { }: mkDerivation { pname = "eventful-sql-common"; - version = "0.1.2"; - sha256 = "05q1v64l007saazflvp70sz4579dpzpr08qcgzhg2b1m2ga3pwhn"; + version = "0.1.3"; + sha256 = "0mddqciaiq90cgf0syw0y1qvvkpvqbx0lkx8mwz3g8zf57h98awc"; libraryHaskellDepends = [ aeson base bytestring eventful-core mtl persistent persistent-template text uuid @@ -64056,8 +64110,8 @@ self: { }: mkDerivation { pname = "eventful-sqlite"; - version = "0.1.2"; - sha256 = "191c8fcw7wyr9bvviz1h9nbwcyrh5sl31arv4s9b3rjw847zg50j"; + version = "0.1.3"; + sha256 = "08xk3kyxm23843kr2y9l39d9d9ykcahz2q2730c1skgnwcd3y0c2"; libraryHaskellDepends = [ aeson base bytestring eventful-core eventful-sql-common mtl persistent text uuid @@ -64074,14 +64128,14 @@ self: { "eventful-test-helpers" = callPackage ({ mkDerivation, aeson, aeson-casing, base, eventful-core, extra - , hspec, monad-logger + , hspec, monad-logger, text }: mkDerivation { pname = "eventful-test-helpers"; - version = "0.1.2"; - sha256 = "17i55zi9npjj7c97lc6fzad5aak46agcr73d5lv3yycm4lk2hj1g"; + version = "0.1.3"; + sha256 = "16ba3184niy3dsh6h08czj7x0bd4abx7ji2aaddd5pvxra9494xl"; libraryHaskellDepends = [ - aeson aeson-casing base eventful-core extra hspec monad-logger + aeson aeson-casing base eventful-core extra hspec monad-logger text ]; homepage = "https://github.com/jdreaver/eventful#readme"; description = "Common module used for eventful tests"; @@ -65180,8 +65234,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.5.2"; - sha256 = "0qz0h2nckd0sqzx264q2j0dw66i5glp2vfih3wlm0a2kxcnw1p27"; + version = "1.5.3"; + sha256 = "0w4csmpzj88vkgyngyw4i91f9hfali50xqrqyycr4jh0qyq5sjx4"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -66746,23 +66800,6 @@ self: { }) {}; "fft" = callPackage - ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable - , QuickCheck, storable-complex, syb, transformers - }: - mkDerivation { - pname = "fft"; - version = "0.1.8.5"; - sha256 = "07xab7lw5k01s41sf20v50dxwayg8nlsal6lx0vn4d9ggr6hlags"; - libraryHaskellDepends = [ - array base carray ix-shapable storable-complex syb transformers - ]; - libraryPkgconfigDepends = [ fftw fftwFloat ]; - testHaskellDepends = [ base carray QuickCheck storable-complex ]; - description = "Bindings to the FFTW library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; - - "fft_0_1_8_6" = callPackage ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable , QuickCheck, storable-complex, syb, transformers }: @@ -66777,7 +66814,6 @@ self: { testHaskellDepends = [ base carray QuickCheck storable-complex ]; description = "Bindings to the FFTW library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; "fftwRaw" = callPackage @@ -67957,6 +67993,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fizzbuzz-as-a-service" = callPackage + ({ mkDerivation, async, base, bytestring, network-simple + , optparse-applicative + }: + mkDerivation { + pname = "fizzbuzz-as-a-service"; + version = "0.1.0.0"; + sha256 = "1h7spka2igi1yz1dwl1192i4g74wlxp3m011mi6s6j35xpvll99l"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base bytestring network-simple optparse-applicative + ]; + homepage = "https://github.com/chris-martin/haskell-libraries"; + description = "FizzBuzz as a service"; + license = stdenv.lib.licenses.asl20; + }) {}; + "flac" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , directory, exceptions, filepath, FLAC, hspec, mtl, temporary @@ -68542,8 +68596,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.2.7"; - sha256 = "03x9322rqafviaxfwkiq2g1jlsqh6hw6q4x9ywa6pi7s45d2rm78"; + version = "0.5.2.9"; + sha256 = "1pkmfya8vr9rrms0p2wyj4qwmi9ahp4hd1vaapdag686c4084dsg"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -68883,31 +68937,6 @@ self: { }) {}; "foldl-statistics" = callPackage - ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random - , profunctors, quickcheck-instances, semigroups, statistics, tasty - , tasty-quickcheck, vector - }: - mkDerivation { - pname = "foldl-statistics"; - version = "0.1.4.4"; - sha256 = "1lihrkc3k3h8mdkbvlwvq0xf9cbhszy50ykshg7yv1y4zdcwqk0q"; - libraryHaskellDepends = [ - base foldl math-functions profunctors semigroups - ]; - testHaskellDepends = [ - base foldl profunctors quickcheck-instances semigroups statistics - tasty tasty-quickcheck vector - ]; - benchmarkHaskellDepends = [ - base criterion foldl mwc-random statistics vector - ]; - homepage = "http://github.com/Data61/foldl-statistics#readme"; - description = "Statistical functions from the statistics package implemented as Folds"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; - }) {}; - - "foldl-statistics_0_1_4_6" = callPackage ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random , profunctors, quickcheck-instances, statistics, tasty , tasty-quickcheck, vector @@ -68927,7 +68956,7 @@ self: { homepage = "http://github.com/Data61/foldl-statistics#readme"; description = "Statistical functions from the statistics package implemented as Folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "foldl-transduce" = callPackage @@ -69172,6 +69201,8 @@ self: { pname = "force-layout"; version = "0.4.0.6"; sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp"; + revision = "1"; + editedCabalFile = "1ydj5ng7wsi9jg6xw9bg8c7wrsg2jpnvjkjvzxaf6n8sjs0gxhvw"; libraryHaskellDepends = [ base containers data-default-class lens linear ]; @@ -69642,8 +69673,8 @@ self: { }: mkDerivation { pname = "foundation"; - version = "0.0.10"; - sha256 = "0ihrdgsn4ivpyhck0qqcfqx2xza1spqv81sd071i151yfyvl1a5p"; + version = "0.0.11"; + sha256 = "0jgxcr532vb7376h43l88g0rjgbil2caqnknmznfsprawy6a9s1v"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck @@ -84502,6 +84533,8 @@ self: { pname = "hackertyper"; version = "0.1.0.1"; sha256 = "17c77f687874bfwahmzcz2v6k8z9p4fv555r5r1f38snsdi825gf"; + revision = "1"; + editedCabalFile = "1slyp8ncpiv204yxb2p7z0kwz4xhqv8czfrx4p78cbbhrlkmgnpm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -86818,8 +86851,8 @@ self: { }: mkDerivation { pname = "happstack-static-routing"; - version = "0.4.2"; - sha256 = "0g8b94mfhajgs99rgvzfrlc19cxm5a0j6cgrrlrdhgfx7lggc9h2"; + version = "0.6.0.0"; + sha256 = "18r7nb6558yvspc486sxckb8708wsvgqgagaycg1qbdxbfhnshhg"; libraryHaskellDepends = [ base containers happstack-server list-tries transformers ]; @@ -87214,28 +87247,6 @@ self: { }) {}; "hasbolt" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , data-binary-ieee754, data-default, hex, hspec, network - , network-simple, QuickCheck, text, transformers - }: - mkDerivation { - pname = "hasbolt"; - version = "0.1.1.2"; - sha256 = "13razc8k8ik008hssxrmypw9a8idr0rm3j37dn8957wklb2634d8"; - libraryHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 data-default - hex network network-simple text transformers - ]; - testHaskellDepends = [ - base bytestring containers hex hspec QuickCheck text - ]; - homepage = "https://github.com/zmactep/hasbolt#readme"; - description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hasbolt_0_1_1_3" = callPackage ({ mkDerivation, base, binary, bytestring, containers , data-binary-ieee754, data-default, hex, hspec, network , network-simple, QuickCheck, text, transformers @@ -87448,6 +87459,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashable_1_2_6_1" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim + , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, unix + }: + mkDerivation { + pname = "hashable"; + version = "1.2.6.1"; + sha256 = "0ymv2mcrrgbdc2w39rib171fwnhg7fgp0sy4h8amrh1vw64qgjll"; + revision = "1"; + editedCabalFile = "1saaj9izz0faj85svdd45z4iygqb9z8i130br9vlqp3py7f2ymzz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring deepseq ghc-prim integer-gmp text + ]; + testHaskellDepends = [ + base bytestring ghc-prim HUnit QuickCheck random test-framework + test-framework-hunit test-framework-quickcheck2 text unix + ]; + benchmarkHaskellDepends = [ + base bytestring criterion ghc-prim integer-gmp siphash text + ]; + homepage = "http://github.com/tibbe/hashable"; + description = "A class for types that can be converted to a hash value"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashable-extras" = callPackage ({ mkDerivation, base, bifunctors, bytestring, directory, doctest , filepath, hashable, transformers, transformers-compat @@ -93774,6 +93814,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hexpat_0_20_13" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, expat, List + , text, transformers, utf8-string + }: + mkDerivation { + pname = "hexpat"; + version = "0.20.13"; + sha256 = "1l9zfp69r3xaxi2znjwpcrx7xckcqvaahv2c0qgkqq61a7ka1qa6"; + libraryHaskellDepends = [ + base bytestring containers deepseq List text transformers + utf8-string + ]; + librarySystemDepends = [ expat ]; + homepage = "http://haskell.org/haskellwiki/Hexpat/"; + description = "XML parser/formatter based on expat"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) expat;}; + "hexpat-iteratee" = callPackage ({ mkDerivation, base, bytestring, containers , extensible-exceptions, hexpat, iteratee, List, parallel @@ -96092,8 +96151,8 @@ self: { pname = "hledger-iadd"; version = "1.2.1"; sha256 = "07jrd8cfy9srazad440b1c24m6s6fvla9jzrksr64gz6vkxkc9mw"; - revision = "1"; - editedCabalFile = "114csw9ss3inki8kl2vgb04dpf1nnyp2i5jj3cx6m4d5l3m32yx6"; + revision = "2"; + editedCabalFile = "08a8r9cbljpjykqwgij7ilcd9rprq0jxx09gc7vvq8ml7rhg5yv8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97073,8 +97132,8 @@ self: { }: mkDerivation { pname = "hnormalise"; - version = "0.4.1.0"; - sha256 = "0mmkd0nidkffp80nn8yn9i1x7cqsi8qs2qyfgp36sjay58y92744"; + version = "0.4.1.1"; + sha256 = "0q25mds552c87f2xs7s82b749drg3r41qswy0k8jmyz5dsc9wcir"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98130,20 +98189,6 @@ self: { }) {}; "hopfli" = callPackage - ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }: - mkDerivation { - pname = "hopfli"; - version = "0.2.1.1"; - sha256 = "1pqz7f0bvvvmirjrzr1jich4853d6rc99jiwpcj6sb3c75wb5ibc"; - libraryHaskellDepends = [ base bytestring zlib ]; - testHaskellDepends = [ base bytestring hspec QuickCheck zlib ]; - homepage = "https://github.com/ananthakumaran/hopfli"; - description = "Bidings to Google's Zopfli compression library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hopfli_0_2_2_1" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }: mkDerivation { pname = "hopfli"; @@ -98675,8 +98720,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.18.0"; - sha256 = "1z738mw0kzic4wx5dpihh1c1gimpjkl14wl6w2nmmdfx2bdjm5rv"; + version = "0.18.1"; + sha256 = "1ssawa6187m0xzn7i5hn154qajq46jlpbvz1s28qk4bigpv38m7k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98700,29 +98745,29 @@ self: { "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec - , interpolate, mockery, pretty, QuickCheck, temporary, text + , interpolate, mockery, pretty, QuickCheck, split, temporary, text , unordered-containers, vector, yaml }: mkDerivation { pname = "hpack-convert"; - version = "1.0.0"; - sha256 = "0l90sc6fn0c5yv653h7gv2k2wx6bcfksfb3zv6b2vkn54c8q4ldm"; + version = "1.0.1"; + sha256 = "1qwrbx22d3gvxa4hr4mk37vw9cms0gq1h8xaqphw7rpgs2iycfkp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base-compat bytestring Cabal containers deepseq - directory filepath Glob pretty text unordered-containers vector - yaml + directory filepath Glob pretty split text unordered-containers + vector yaml ]; executableHaskellDepends = [ aeson base base-compat bytestring Cabal containers deepseq - directory filepath Glob pretty text unordered-containers vector - yaml + directory filepath Glob pretty split text unordered-containers + vector yaml ]; testHaskellDepends = [ aeson aeson-qq base base-compat bytestring Cabal containers deepseq directory filepath Glob hspec interpolate mockery pretty QuickCheck - temporary text unordered-containers vector yaml + split temporary text unordered-containers vector yaml ]; homepage = "https://github.com/yamadapc/hpack-convert#readme"; description = "Convert Cabal manifests into hpack's package.yamls"; @@ -100133,6 +100178,17 @@ self: { license = "LGPL"; }) {}; + "hsI2C" = callPackage + ({ mkDerivation, base, bytestring, unix }: + mkDerivation { + pname = "hsI2C"; + version = "0.1.2"; + sha256 = "0ma8klvyv4rnfxkag99vm4nvw77yppcv63p6829b4ynsa9vyv9rn"; + libraryHaskellDepends = [ base bytestring unix ]; + description = "I2C access for Haskell and Linux"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsSqlite3" = callPackage ({ mkDerivation, base, bindings-sqlite3, bytestring, mtl , utf8-string @@ -104046,29 +104102,6 @@ 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"; - sha256 = "1jgwca2dn269c7z14yasj0i1qayz5lvxxqf72m0y62cqwx4hdm5h"; - 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_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, connection , containers, criterion, cryptonite, data-default-class, exceptions , hspec, http-client, http-types, memory, network, network-uri @@ -104089,7 +104122,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 @@ -108125,17 +108157,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ilist_0_3_0_0" = callPackage - ({ mkDerivation, base, criterion, hspec, lens, transformers, vector + "ilist_0_3_1_0" = callPackage + ({ mkDerivation, base, criterion, hspec, lens, loop, transformers + , vector }: mkDerivation { pname = "ilist"; - version = "0.3.0.0"; - sha256 = "0k3rxifpxq5qrkn6ak2rm379v554c70rq2c13j3df471hb3hs6y8"; + version = "0.3.1.0"; + sha256 = "15zy584mjk85kr69acs1r7dfsr7g2mgy2bbfyrla5rbp23fy3678"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec transformers ]; benchmarkHaskellDepends = [ - base criterion lens transformers vector + base criterion lens loop transformers vector ]; homepage = "http://github.com/aelve/ilist"; description = "Optimised list functions for doing index-related things"; @@ -108780,26 +108813,6 @@ self: { }) {}; "incremental-parser" = callPackage - ({ mkDerivation, base, bytestring, checkers, criterion, deepseq - , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text - }: - mkDerivation { - pname = "incremental-parser"; - version = "0.2.5"; - sha256 = "1hbsm1g8avph1n107c32d1r3bbk6kli6rg7a1k03wf3dx04d43vx"; - libraryHaskellDepends = [ base monoid-subclasses ]; - testHaskellDepends = [ - base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq monoid-subclasses text - ]; - homepage = "https://github.com/blamario/incremental-parser"; - description = "Generic parser library capable of providing partial results from partial input"; - license = "GPL"; - }) {}; - - "incremental-parser_0_2_5_1" = callPackage ({ mkDerivation, base, bytestring, checkers, criterion, deepseq , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text }: @@ -108817,7 +108830,6 @@ self: { homepage = "https://github.com/blamario/incremental-parser"; description = "Generic parser library capable of providing partial results from partial input"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "incremental-sat-solver" = callPackage @@ -111082,8 +111094,8 @@ self: { pname = "irc-dcc"; version = "2.0.1"; sha256 = "1pyj4ngh6rw0k1cd9nlrhwb6rr3jmpiwaxs6crik8gbl6f3s4234"; - revision = "2"; - editedCabalFile = "1zw5a6aj2jfl482197v741rjsrc13bsirq0a290qbjsyyib9jjzk"; + revision = "3"; + editedCabalFile = "1kc4yzm5k0s069dhyncj5rmxnbfjjn8ynx182wp9v5qhylgicx98"; libraryHaskellDepends = [ attoparsec base binary bytestring io-streams iproute irc-ctcp mtl network path safe-exceptions transformers utf8-string @@ -111190,8 +111202,8 @@ self: { }: mkDerivation { pname = "ircbot"; - version = "0.6.5"; - sha256 = "1bay1r0x4b8kk07g1p1476p2ppv6jyryiya6q5fn8icn94x77sza"; + version = "0.6.5.1"; + sha256 = "1cam9f7ppxj7yh1am0qjkh8b19haggrqdmkd26xik1ymn7nq9iyd"; libraryHaskellDepends = [ base bytestring containers directory filepath irc mtl network parsec random SafeSemaphore stm time unix @@ -112270,6 +112282,19 @@ self: { license = "GPL"; }) {}; + "japanese-holidays" = callPackage + ({ mkDerivation, base, doctest, hspec, QuickCheck, time }: + mkDerivation { + pname = "japanese-holidays"; + version = "0.1.0.0"; + sha256 = "1phlq2jzvkdr9askpnbryc7aw6mk7121kh2fz5wqr23cs8mg5m6b"; + libraryHaskellDepends = [ base time ]; + testHaskellDepends = [ base doctest hspec QuickCheck time ]; + homepage = "http://github.com/cohei/japanese-holidays#readme"; + description = "Japanese holidays utility"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "jarfind" = callPackage ({ mkDerivation, array, base, binary, bytestring, regex-tdfa , zip-archive @@ -112994,8 +113019,8 @@ self: { }: mkDerivation { pname = "jsaddle"; - version = "0.9.2.0"; - sha256 = "0ymq70kwwi60f1rgjnjz914xv465zrnbbw5z351439qg572f8mvg"; + version = "0.9.2.1"; + sha256 = "0527hsra6x9iblv1i8k145waha861zx5khk0f7c7sqar72qmrzj4"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring containers deepseq filepath ghc-prim http-types lens primitive process ref-tf @@ -114728,6 +114753,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "katip_0_4_0_0" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , bytestring, containers, criterion, deepseq, directory, either + , exceptions, hostname, microlens, microlens-th, monad-control, mtl + , old-locale, quickcheck-instances, regex-tdfa, resourcet + , semigroups, string-conv, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, time + , time-locale-compat, transformers, transformers-base + , transformers-compat, unagi-chan, unix, unordered-containers + }: + mkDerivation { + pname = "katip"; + version = "0.4.0.0"; + sha256 = "1l9zpq7gr5madmqmm4cp3p6lid0krxaf6gki2qcxlkvsm39cr9vz"; + libraryHaskellDepends = [ + aeson async auto-update base bytestring containers either + exceptions hostname microlens microlens-th monad-control mtl + old-locale resourcet semigroups string-conv template-haskell text + time transformers transformers-base transformers-compat unagi-chan + unix unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring directory microlens quickcheck-instances + regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck + template-haskell text time time-locale-compat unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson async base blaze-builder criterion deepseq text time + transformers unix + ]; + homepage = "https://github.com/Soostone/katip"; + description = "A structured logging framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "katip-elasticsearch" = callPackage ({ mkDerivation, aeson, async, base, bloodhound, containers , criterion, deepseq, enclosed-exceptions, exceptions, http-client @@ -117874,6 +117935,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-sally" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers, text + }: + mkDerivation { + pname = "language-sally"; + version = "0.1.1.0"; + sha256 = "10ddikcavh7ppmm5issii7mv9nagrs0841cngz3alfw0sw6bw47v"; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring containers text + ]; + description = "AST and pretty printer for Sally"; + license = stdenv.lib.licenses.isc; + }) {}; + "language-sh" = callPackage ({ mkDerivation, base, directory, filepath, mtl, parsec, pcre-light }: @@ -120451,6 +120526,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lifted-async_0_9_2" = 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.9.2"; + sha256 = "14p8fbbvcr35kkv8ayxlsqcfn55am9lyzmszciww13y8mx7b214z"; + 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 @@ -122295,8 +122393,8 @@ self: { }: mkDerivation { pname = "llvm-hs"; - version = "4.1.0.0"; - sha256 = "02692n5vllv025r6c79kc5z52rxcj3m8d1q6b1fsk1i5mkpp6rlh"; + version = "4.2.0"; + sha256 = "12rclc9l85yqh1h0y7m6m65fpb81crzafmkcwq90vl7i5bf1bv1j"; setupHaskellDepends = [ base Cabal containers ]; libraryHaskellDepends = [ array attoparsec base bytestring containers exceptions llvm-hs-pure @@ -122821,16 +122919,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "log_0_9_0_0" = callPackage - ({ mkDerivation, aeson, base, bloodhound, bytestring, exceptions - , http-client, http-types, log-base, log-elasticsearch - , log-postgres, process, random, tasty, tasty-hunit, text, time - , transformers + "log_0_9_0_1" = callPackage + ({ mkDerivation, aeson, base, bloodhound, bytestring, ekg + , exceptions, hpqtypes, http-client, http-types, log-base + , log-elasticsearch, log-postgres, process, random, tasty + , tasty-hunit, text, text-show, time, transformers + , transformers-base }: mkDerivation { pname = "log"; - version = "0.9.0.0"; - sha256 = "16hrygsprq55xh69hvgwppf9cx164fza0n7ss2w7nh6k0dg6rb11"; + version = "0.9.0.1"; + sha256 = "1gjh3i0j2q72hc1gnn4knc5qhb2zc7d4pi5a22jd0dqgpkmdaay3"; libraryHaskellDepends = [ base log-base log-elasticsearch log-postgres ]; @@ -122838,6 +122937,10 @@ self: { aeson base bloodhound bytestring exceptions http-client http-types process random tasty tasty-hunit text time transformers ]; + benchmarkHaskellDepends = [ + base ekg hpqtypes random text text-show transformers + transformers-base + ]; homepage = "https://github.com/scrive/log"; description = "Structured logging solution with multiple backends"; license = stdenv.lib.licenses.bsd3; @@ -122863,30 +122966,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "log-domain" = callPackage - ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq - , directory, distributive, doctest, filepath, generic-deriving - , hashable, safecopy, semigroupoids, semigroups, simple-reflect - , vector + "log-base_0_7_1_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq + , exceptions, monad-control, monad-time, mtl, semigroups, stm, text + , time, transformers-base, unordered-containers }: mkDerivation { - pname = "log-domain"; - version = "0.11"; - sha256 = "1js2havkab64qvhw22pkiq7zas7yl7vn9hir7i4ifqwv5ddwsl27"; + pname = "log-base"; + version = "0.7.1.1"; + sha256 = "0kxng0pvql8sv4wk3x1bx0a0mqjsr3ynbixps9l1zrmsisp01344"; libraryHaskellDepends = [ - base binary bytes cereal comonad deepseq distributive hashable - safecopy semigroupoids semigroups vector + aeson aeson-pretty base bytestring deepseq exceptions monad-control + monad-time mtl semigroups stm text time transformers-base + unordered-containers ]; - testHaskellDepends = [ - base directory doctest filepath generic-deriving semigroups - simple-reflect - ]; - homepage = "http://github.com/ekmett/log-domain/"; - description = "Log-domain arithmetic"; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (base package)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "log-domain_0_11_1" = callPackage + "log-domain" = callPackage ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal , comonad, deepseq, distributive, doctest, generic-deriving , hashable, safecopy, semigroupoids, semigroups, simple-reflect @@ -122907,7 +123007,6 @@ self: { homepage = "http://github.com/ekmett/log-domain/"; description = "Log-domain arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log-effect" = callPackage @@ -122950,7 +123049,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "log-elasticsearch_0_9_0_0" = callPackage + "log-elasticsearch_0_9_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , bloodhound, bytestring, deepseq, http-client, http-client-tls , log-base, semigroups, text, text-show, time, transformers @@ -122958,8 +123057,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.9.0.0"; - sha256 = "005r1mkyq0ci3gww1qmp6k9n8739gmhjlbrzpq0ymxra7wd3c98c"; + version = "0.9.0.1"; + sha256 = "01xfr3rq3s1zp7fw60857c4jvlliy6v9dzx6sip3sbzl3b4hcg1x"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring deepseq http-client http-client-tls log-base semigroups text @@ -122992,6 +123091,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "log-postgres_0_7_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base + , mtl, semigroups, split, text, text-show, time + , unordered-containers, vector + }: + mkDerivation { + pname = "log-postgres"; + version = "0.7.0.1"; + sha256 = "0gfb7xss31fqjlvxs8pywlhzmckgz98srimwhsp819mb9vrysjrn"; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring deepseq + hpqtypes http-client lifted-base log-base mtl semigroups split text + text-show time unordered-containers vector + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (PostgreSQL back end)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-utils" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, data-default , exceptions, hpqtypes, http-types, invariant, kontra-config @@ -123843,20 +123963,18 @@ self: { "loup" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring - , conduit, lifted-async, lifted-base, monad-control - , optparse-generic, preamble, shakers, time, turtle - , unordered-containers, uuid, yaml + , conduit, lifted-async, lifted-base, optparse-generic, preamble + , shakers, time, turtle, unordered-containers, uuid, yaml }: mkDerivation { pname = "loup"; - version = "0.0.5"; - sha256 = "1c42rp22r37l0fbmd5i463f9pfv7nqchi1rcchv7mcc3wwzyzymq"; + version = "0.0.8"; + sha256 = "0chb4pp8czc0i0nn0dx78r7j7gr3d9mi0f51kdrimk301dpcca29"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-swf base bytestring conduit lifted-async - lifted-base monad-control preamble time turtle unordered-containers - uuid yaml + lifted-base preamble time turtle unordered-containers uuid yaml ]; executableHaskellDepends = [ base optparse-generic shakers ]; homepage = "https://github.com/swift-nav/loup"; @@ -123928,27 +124046,6 @@ self: { }) {}; "lrucaching" = callPackage - ({ mkDerivation, base, base-compat, containers, deepseq, hashable - , hspec, psqueues, QuickCheck, transformers, vector - }: - mkDerivation { - pname = "lrucaching"; - version = "0.3.1"; - sha256 = "1mijn42qd938xx3pd2fi3njfk37rag4xw1f19m3mh7vj1nk7wa1g"; - revision = "1"; - editedCabalFile = "0q7hzsc7l64x9gdcxfims25nzqqwammwj91wqv4qjwahgkasmkyn"; - libraryHaskellDepends = [ - base base-compat deepseq hashable psqueues vector - ]; - testHaskellDepends = [ - base containers deepseq hashable hspec QuickCheck transformers - ]; - homepage = "https://github.com/cocreature/lrucaching#readme"; - description = "LRU cache"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lrucaching_0_3_2" = callPackage ({ mkDerivation, base, base-compat, containers, deepseq, hashable , hspec, psqueues, QuickCheck, transformers, vector }: @@ -123965,7 +124062,6 @@ self: { homepage = "https://github.com/cocreature/lrucaching#readme"; description = "LRU cache"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ls-usb" = callPackage @@ -128472,22 +128568,6 @@ self: { }) {}; "microlens-mtl" = callPackage - ({ mkDerivation, base, microlens, mtl, transformers - , transformers-compat - }: - mkDerivation { - pname = "microlens-mtl"; - version = "0.1.10.0"; - sha256 = "17dk2i7ggpipyjnb01wdlqcg4fnmgdbq7xhm34zaw97k03qc9pmi"; - libraryHaskellDepends = [ - base microlens mtl transformers transformers-compat - ]; - homepage = "http://github.com/aelve/microlens"; - description = "microlens support for Reader/Writer/State from mtl"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-mtl_0_1_11_0" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat }: @@ -128501,27 +128581,9 @@ self: { homepage = "http://github.com/aelve/microlens"; description = "microlens support for Reader/Writer/State from mtl"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-platform" = callPackage - ({ mkDerivation, base, hashable, microlens, microlens-ghc - , microlens-mtl, microlens-th, text, unordered-containers, vector - }: - mkDerivation { - pname = "microlens-platform"; - version = "0.3.8.0"; - sha256 = "113g10zij6afjfm022cdxsmicccp51h17mn5wzj75pidjq85l6z3"; - libraryHaskellDepends = [ - base hashable microlens microlens-ghc microlens-mtl microlens-th - text unordered-containers vector - ]; - homepage = "http://github.com/aelve/microlens"; - description = "Feature-complete microlens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-platform_0_3_9_0" = callPackage ({ mkDerivation, base, hashable, microlens, microlens-ghc , microlens-mtl, microlens-th, text, unordered-containers, vector }: @@ -128536,7 +128598,6 @@ self: { homepage = "http://github.com/aelve/microlens"; description = "Feature-complete microlens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-th" = callPackage @@ -128698,27 +128759,6 @@ self: { }) {}; "midi-music-box" = callPackage - ({ mkDerivation, base, containers, diagrams-lib - , diagrams-postscript, event-list, midi, non-empty - , optparse-applicative, utility-ht - }: - mkDerivation { - pname = "midi-music-box"; - version = "0.0.0.3"; - sha256 = "0hg199mpy0gd20sgp04djf487970j2wzlvba6xhkbg2nxvzcx676"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base containers diagrams-lib diagrams-postscript event-list midi - non-empty optparse-applicative utility-ht - ]; - homepage = "http://hub.darcs.net/thielema/midi-music-box"; - description = "Convert MIDI file to music box punch tape"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "midi-music-box_0_0_0_4" = callPackage ({ mkDerivation, base, containers, diagrams-lib , diagrams-postscript, event-list, midi, non-empty , optparse-applicative, utility-ht @@ -129766,26 +129806,6 @@ self: { }) {}; "mockery" = callPackage - ({ mkDerivation, base, base-compat, bytestring, directory, filepath - , hspec, logging-facade, temporary - }: - mkDerivation { - pname = "mockery"; - version = "0.3.4"; - sha256 = "0f19b057cphfslw3brc690v4hq86xwjlllfc9idbilfgz7s3bzih"; - libraryHaskellDepends = [ - base base-compat bytestring directory filepath logging-facade - temporary - ]; - testHaskellDepends = [ - base base-compat bytestring directory filepath hspec logging-facade - temporary - ]; - description = "Support functions for automated testing"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mockery_0_3_5" = callPackage ({ mkDerivation, base, base-compat, bytestring, directory, filepath , hspec, logging-facade, temporary }: @@ -129803,7 +129823,6 @@ self: { ]; description = "Support functions for automated testing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modbus-tcp" = callPackage @@ -130117,14 +130136,14 @@ self: { }: mkDerivation { pname = "mollie-api-haskell"; - version = "0.1.0.2"; - sha256 = "0mg2c24721w1mmdw0azmng2blsad11ghf4i0ynb4jk7bwgqi6j1d"; + version = "0.2.0.0"; + sha256 = "1k2sx65d486dzb9xs2byi3p4ppacj2qjknhqx2kd0020zi7w9s5n"; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-client http-client-openssl http-types mtl text time ]; testHaskellDepends = [ base ]; - homepage = "https://github.com/paramanders/mollie-api-haskell"; + homepage = "https://github.com/paramander/mollie-api-haskell"; description = "Mollie API client for Haskell http://www.mollie.com"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -130268,22 +130287,6 @@ self: { }) {}; "monad-control" = callPackage - ({ mkDerivation, base, stm, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "monad-control"; - version = "1.0.1.0"; - sha256 = "1x018gi5irznx5rgzmkr2nrgh26r8cvqwkcfc6n6y05pdjf21c6l"; - libraryHaskellDepends = [ - base stm transformers transformers-base transformers-compat - ]; - homepage = "https://github.com/basvandijk/monad-control"; - description = "Lift control operations, like exception catching, through monad transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monad-control_1_0_2_0" = callPackage ({ mkDerivation, base, stm, transformers, transformers-base , transformers-compat }: @@ -130297,7 +130300,6 @@ self: { homepage = "https://github.com/basvandijk/monad-control"; description = "Lift control operations, like exception catching, through monad transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-control-aligned" = callPackage @@ -130700,6 +130702,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-mock" = callPackage + ({ mkDerivation, base, constraints, exceptions, hspec + , monad-control, mtl, transformers-base + }: + mkDerivation { + pname = "monad-mock"; + version = "0.1.0.0"; + sha256 = "0ax46lh6j2xxs6xidj1i6jw2yv2i1p79807fcwfqrkb1rl6xchx4"; + libraryHaskellDepends = [ + base constraints exceptions monad-control mtl transformers-base + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/cjdev/monad-mock#readme"; + description = "A monad transformer for mocking mtl-style typeclasses"; + license = stdenv.lib.licenses.isc; + }) {}; + "monad-open" = callPackage ({ mkDerivation, base, exceptions, mtl, transformers }: mkDerivation { @@ -131687,8 +131706,8 @@ self: { pname = "monoid-extras"; version = "0.4.2"; sha256 = "07r86ip6jfa2ka84dpilap01g1pg8r5bqz2nk7js6mlnbh2lxzqk"; - revision = "1"; - editedCabalFile = "1nmrv2i3lg0rdl0rkxnhxl160j14p1x1ikz1b6jbr00yxxs8zdry"; + revision = "2"; + editedCabalFile = "04h78r48rg2ppi53869vb8y226g135fxgy9ryi1v08nqsiqi1vvw"; libraryHaskellDepends = [ base groups semigroupoids semigroups ]; benchmarkHaskellDepends = [ base criterion ]; description = "Various extra monoid-related definitions and utilities"; @@ -131732,28 +131751,6 @@ self: { }) {}; "monoid-subclasses" = callPackage - ({ mkDerivation, base, bytestring, containers, primes, QuickCheck - , quickcheck-instances, tasty, tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "monoid-subclasses"; - version = "0.4.3.1"; - sha256 = "1kc34w94w59vd3s4ird0mwksv9gqwmb4d4m2gld6155n2rwx0w51"; - revision = "1"; - editedCabalFile = "1fplps682kir8phq2fkzrnbp8qf9i29rgikg47wc5diw70g2wy26"; - libraryHaskellDepends = [ - base bytestring containers primes text vector - ]; - testHaskellDepends = [ - base bytestring containers primes QuickCheck quickcheck-instances - tasty tasty-quickcheck text vector - ]; - homepage = "https://github.com/blamario/monoid-subclasses/"; - description = "Subclasses of Monoid"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monoid-subclasses_0_4_3_2" = callPackage ({ mkDerivation, base, bytestring, containers, primes, QuickCheck , quickcheck-instances, tasty, tasty-quickcheck, text, vector }: @@ -131771,7 +131768,6 @@ self: { homepage = "https://github.com/blamario/monoid-subclasses/"; description = "Subclasses of Monoid"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoid-transformer" = callPackage @@ -132048,37 +132044,6 @@ self: { }) {}; "morte" = callPackage - ({ mkDerivation, alex, array, base, binary, code-page, containers - , criterion, deepseq, Earley, http-client, http-client-tls - , microlens, microlens-mtl, mtl, optparse-applicative, pipes - , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit - , tasty-quickcheck, text, text-format, transformers - }: - mkDerivation { - pname = "morte"; - version = "1.6.7"; - sha256 = "16h33fk02zyjf73xvz73p5aqvvv2i6ax8b42fv87rybabsa3h0j5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary containers deepseq Earley http-client - http-client-tls microlens microlens-mtl pipes system-fileio - system-filepath text text-format transformers - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ - base code-page optparse-applicative text text-format - ]; - testHaskellDepends = [ - base mtl QuickCheck system-filepath tasty tasty-hunit - tasty-quickcheck text transformers - ]; - benchmarkHaskellDepends = [ base criterion system-filepath text ]; - description = "A bare-bones calculus of constructions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "morte_1_6_9" = callPackage ({ mkDerivation, alex, array, base, binary, code-page, containers , criterion, deepseq, Earley, http-client, http-client-tls , microlens, microlens-mtl, mtl, optparse-applicative, pipes @@ -132107,7 +132072,6 @@ self: { benchmarkHaskellDepends = [ base criterion system-filepath text ]; description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mosaico-lib" = callPackage @@ -135779,6 +135743,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "network_2_6_3_1" = callPackage + ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework + , test-framework-hunit, unix + }: + mkDerivation { + pname = "network"; + version = "2.6.3.1"; + sha256 = "1rl2gl37cf4k0ddsq93q15fwdz1l25nhl4w205krbh7d5dg5y12p"; + libraryHaskellDepends = [ base bytestring unix ]; + testHaskellDepends = [ + base bytestring doctest HUnit test-framework test-framework-hunit + ]; + homepage = "https://github.com/haskell/network"; + description = "Low-level networking interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network" = callPackage ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework , test-framework-hunit, unix @@ -137025,8 +137007,8 @@ self: { ({ mkDerivation, async, base, bytestring, template-haskell, unix }: mkDerivation { pname = "ngx-export"; - version = "0.3.2.1"; - sha256 = "0rmvws1k58iqlcb0h0089l4niki1v90hr15mifjj2jbzrmlas26n"; + version = "0.3.2.2"; + sha256 = "1755v5gjbygiywb91a071iys69rp240pl6p2k3w18qm8z74zk7gp"; libraryHaskellDepends = [ async base bytestring template-haskell unix ]; @@ -139784,8 +139766,8 @@ self: { }: mkDerivation { pname = "opencv"; - version = "0.0.0.0"; - sha256 = "1y2mjb6a6iym6h6m7c214lwrmcjhm9snsqgf1jrbq27fr346mrkb"; + version = "0.0.1.1"; + sha256 = "095vljv7y7am7dfn7hp9rncfcbcmmqvgzwgw6iwrp6s3z0qv10jn"; configureFlags = [ "--with-gcc=${stdenv.cc}/bin/c++" "--with-ld=${stdenv.cc}/bin/c++" ]; @@ -139817,8 +139799,8 @@ self: { }: mkDerivation { pname = "opencv-extra"; - version = "0.0.0.0"; - sha256 = "18r1y9ppw5i324fyfcbc3wm40gg16816javaxmsny5jc0vbl56gq"; + version = "0.1.0.0"; + sha256 = "1ah6jipanqag0vk4fjd35rr5xi479w2iym0ix6wd9g9zswb89k8j"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bindings-DSL bytestring containers inline-c inline-c-cpp @@ -143635,28 +143617,6 @@ self: { }) {}; "patat" = callPackage - ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base - , bytestring, containers, directory, filepath, mtl - , optparse-applicative, pandoc, skylighting, terminal-size, text - , time, unordered-containers, yaml - }: - mkDerivation { - pname = "patat"; - version = "0.5.2.0"; - sha256 = "1rpl61n8i0x01fbhr9k8ac8hw3azjrik4vxlwrx7i9n3ncdga7q5"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base bytestring containers - directory filepath mtl optparse-applicative pandoc skylighting - terminal-size text time unordered-containers yaml - ]; - homepage = "http://github.com/jaspervdj/patat"; - description = "Terminal-based presentations using Pandoc"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "patat_0_5_2_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , bytestring, containers, directory, filepath, mtl, network , network-uri, optparse-applicative, pandoc, skylighting @@ -143677,7 +143637,6 @@ self: { homepage = "http://github.com/jaspervdj/patat"; description = "Terminal-based presentations using Pandoc"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "patch-combinators" = callPackage @@ -145686,16 +145645,22 @@ self: { "pg-store" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , haskell-src-meta, mtl, postgresql-libpq, scientific - , template-haskell, text, time + , hashable, haskell-src-meta, mtl, postgresql-libpq, QuickCheck + , scientific, tagged, template-haskell, test-framework + , test-framework-quickcheck2, text, time }: mkDerivation { pname = "pg-store"; - version = "0.2"; - sha256 = "1dl33jspcs2lv30h9ji58iydf5l7mhzirjmg8j4wwkgb87zzn928"; + version = "0.4.2"; + sha256 = "1i1ma0m7qmn2v2qswv5kj1rbbfscqirkcvyr5nf07czbghwpx1v6"; libraryHaskellDepends = [ - aeson attoparsec base blaze-builder bytestring haskell-src-meta mtl - postgresql-libpq scientific template-haskell text time + aeson attoparsec base blaze-builder bytestring hashable + haskell-src-meta mtl postgresql-libpq scientific tagged + template-haskell text time + ]; + testHaskellDepends = [ + base bytestring mtl postgresql-libpq QuickCheck scientific + test-framework test-framework-quickcheck2 text ]; homepage = "https://github.com/vapourismo/pg-store"; description = "Simple storage interface to PostgreSQL"; @@ -145857,8 +145822,8 @@ self: { ({ mkDerivation, base, bytestring, containers, text }: mkDerivation { pname = "phaser"; - version = "1.0.0.0"; - sha256 = "06m7a61fs6kmd4pgfj1zp7ijzprkdaximynzjv9wm9ynz3fplkzs"; + version = "1.0.0.1"; + sha256 = "1ig3hcalfg2qxb092krii6zv95kvq0kng4acvq7l3wz03x66wj29"; libraryHaskellDepends = [ base bytestring containers text ]; homepage = "https://github.com/quickdudley/phaser"; description = "Incremental multiple pass parser library"; @@ -146613,21 +146578,6 @@ self: { }) {}; "pipes-bytestring" = callPackage - ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse - , transformers - }: - mkDerivation { - pname = "pipes-bytestring"; - version = "2.1.4"; - sha256 = "1svd8ssdqf8lp083g3lray823854i178hhn4ys3qhlxa53g74gvc"; - libraryHaskellDepends = [ - base bytestring pipes pipes-group pipes-parse transformers - ]; - description = "ByteString support for pipes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-bytestring_2_1_5" = callPackage ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse , transformers }: @@ -146640,7 +146590,6 @@ self: { ]; description = "ByteString support for pipes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-bzip" = callPackage @@ -148033,6 +147982,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ploton" = callPackage + ({ mkDerivation, base, hspec, optparse-applicative, process }: + mkDerivation { + pname = "ploton"; + version = "0.1.0.0"; + sha256 = "0iv4ngwf7zj20wglpa2klj5a39nfqmwbh7s1kivrlia1mi0xck3d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base optparse-applicative process ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/ishiy1993/ploton#readme"; + description = "A useful cli tool to draw figures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plots" = callPackage ({ mkDerivation, adjunctions, base, base-orphans, colour , containers, data-default, diagrams-core, diagrams-lib, directory @@ -149583,6 +149548,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "postgresql-schema_0_1_11" = callPackage + ({ mkDerivation, base, basic-prelude, optparse-applicative + , postgresql-simple, shelly, text, time, time-locale-compat + }: + mkDerivation { + pname = "postgresql-schema"; + version = "0.1.11"; + sha256 = "1xhaqxc389dghf77hlz6zy6pa6phxv8by42lzs91ymjhvwhnb7bl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base basic-prelude postgresql-simple shelly text + ]; + executableHaskellDepends = [ + base basic-prelude optparse-applicative shelly text time + time-locale-compat + ]; + homepage = "https://github.com/mfine/postgresql-schema"; + description = "PostgreSQL Schema Management"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-simple" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, bytestring-builder, case-insensitive, containers @@ -150258,8 +150246,8 @@ self: { }: mkDerivation { pname = "preamble"; - version = "0.0.37"; - sha256 = "1qli01x2cbh8sfr4fxbyiq88n28cdmmziaz5qaqa3ii3wm1ajjaf"; + version = "0.0.39"; + sha256 = "019apng4q6hz14xnjjs6iyzkrr13pw4pclr9h39s2qjc17xjwc4d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150948,10 +150936,8 @@ self: { }: mkDerivation { pname = "prettyprinter-ansi-terminal"; - version = "1.0.1"; - sha256 = "03vdnkvrwmny0y8p7bkw43l8x6a3b39nw20ii87pys4jr7aadd7c"; - revision = "1"; - editedCabalFile = "1yc598kz1p4w0whhl7h7b62fx4lcsyph908anscq299w89xp40lh"; + version = "1.1"; + sha256 = "0z2vi26qhrw5z36yy449x5yynv3wyx1c02z4m2lf7la7r9jwwfbj"; libraryHaskellDepends = [ ansi-terminal base prettyprinter text ]; testHaskellDepends = [ base doctest ]; homepage = "http://github.com/quchen/prettyprinter"; @@ -150979,15 +150965,13 @@ self: { }: mkDerivation { pname = "prettyprinter-compat-ansi-wl-pprint"; - version = "1"; - sha256 = "1w84df99n1fwzwyflfjh6bsbrv03yzdsq8b42ziqcb3m1mq5hf1v"; - revision = "2"; - editedCabalFile = "1bcj2y4b4pj028lllljpj52m622h6rv0qngfyq2xc8jzn7pls5ca"; + version = "1.0.1"; + sha256 = "0gzpjddnxl4z8pvb0lyal13jbr94dk900k8g4qwcq9fs26vnnb81"; libraryHaskellDepends = [ base prettyprinter prettyprinter-ansi-terminal text ]; homepage = "http://github.com/quchen/prettyprinter"; - description = "Prettyprinter compatibility module for previous users of the ansi-wl-pprint package"; + description = "Drop-in compatibility package to migrate from »ansi-wl-pprint« to »prettyprinter«"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -151295,8 +151279,8 @@ self: { }: mkDerivation { pname = "privileged-concurrency"; - version = "0.6"; - sha256 = "0ns24fvxjdjlhqb0f9fh73r6q8al9ixi197nc30g5b2b7csnixv7"; + version = "0.6.1"; + sha256 = "0dky434kdnb84a4wxlx3jcg1f7c7g4xh0llfiqv48wpk7lwkaic2"; libraryHaskellDepends = [ base contravariant lifted-base monad-control stm transformers-base ]; @@ -151426,24 +151410,6 @@ self: { }) {}; "process-extras" = callPackage - ({ mkDerivation, base, bytestring, data-default, deepseq - , generic-deriving, HUnit, ListLike, mtl, process, text - }: - mkDerivation { - pname = "process-extras"; - version = "0.7.1"; - sha256 = "03ykpjk2li6392vwqi1vi4pwvqbzyady98xbhq7vjq2rh8l64pyj"; - 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_2" = callPackage ({ mkDerivation, base, bytestring, data-default, deepseq , generic-deriving, HUnit, ListLike, mtl, process, text }: @@ -151459,7 +151425,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 @@ -152321,6 +152286,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proto-lens-arbitrary_0_1_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, lens-family + , proto-lens, QuickCheck, text + }: + mkDerivation { + pname = "proto-lens-arbitrary"; + version = "0.1.0.3"; + sha256 = "029liw55v5k9f5bsfpsadd85sgrriwvrhfk242d2wfp3fypafd39"; + libraryHaskellDepends = [ + base bytestring containers lens-family proto-lens QuickCheck text + ]; + homepage = "https://github.com/google/proto-lens"; + description = "Arbitrary instances for proto-lens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-combinators" = callPackage ({ mkDerivation, base, Cabal, data-default-class, HUnit , lens-family, lens-family-core, proto-lens, proto-lens-protoc @@ -152362,21 +152344,6 @@ self: { }) {}; "proto-lens-optparse" = callPackage - ({ mkDerivation, base, optparse-applicative, proto-lens, text }: - mkDerivation { - pname = "proto-lens-optparse"; - version = "0.1.0.2"; - sha256 = "1mi4q21i7zzlk6bs8p6ir07bfw2n1kavamxb90v90vdjy42bdbyn"; - libraryHaskellDepends = [ - base optparse-applicative proto-lens text - ]; - homepage = "https://github.com/google/proto-lens"; - description = "Adapting proto-lens to optparse-applicative ReadMs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "proto-lens-optparse_0_1_0_3" = callPackage ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; @@ -159943,6 +159910,8 @@ self: { pname = "repa"; version = "3.4.1.2"; sha256 = "0myw05dicby7dhkmjvv9wphfnnx2jj3dxaa50357n76zysxhpy2p"; + revision = "1"; + editedCabalFile = "0pagab03fw7xp1vvgrc87g6g6zdr60plqhjjxk3fwwm1gs0jj61k"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -160458,6 +160427,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "req_0_3_0" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder + , bytestring, case-insensitive, connection, data-default-class + , hspec, hspec-core, http-api-data, http-client, http-client-tls + , http-types, mtl, QuickCheck, retry, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "req"; + version = "0.3.0"; + sha256 = "1wmj2grzkdwhi2cksp4xzxlrb99y9wysjxzvbbfy75dz2pkkwz3m"; + libraryHaskellDepends = [ + aeson authenticate-oauth base blaze-builder bytestring + case-insensitive connection data-default-class http-api-data + http-client http-client-tls http-types mtl retry text time + transformers + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive + data-default-class hspec hspec-core http-client http-types mtl + QuickCheck retry text time unordered-containers + ]; + homepage = "https://github.com/mrkkrp/req"; + description = "Easy-to-use, type-safe, expandable, high-level HTTP library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "req-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , http-client, req, resourcet, temporary, transformers, weigh @@ -160484,6 +160481,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "req-conduit_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec + , http-client, req, resourcet, temporary, transformers, weigh + }: + mkDerivation { + pname = "req-conduit"; + version = "0.2.0"; + sha256 = "0yf5lmmf3fv4lfxyrk0kpzk8p0pzhfany05d7ny8l11mr99grpwg"; + libraryHaskellDepends = [ + base bytestring conduit http-client req resourcet transformers + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra hspec req resourcet temporary + transformers + ]; + benchmarkHaskellDepends = [ + base bytestring conduit conduit-extra req resourcet temporary weigh + ]; + homepage = "https://github.com/mrkkrp/req-conduit"; + description = "Conduit helpers for the req HTTP client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reqcatcher" = callPackage ({ mkDerivation, base, http-client, http-types, HUnit, lens , network, tasty, tasty-hunit, text, wai, warp, wreq @@ -164216,8 +164237,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "2.2.3"; - sha256 = "1hqq3qz6xbbc2di85larf3ixj2gxsn6vhcxdhzxfn72lxdr9xgir"; + version = "2.2.6"; + sha256 = "0b26wd3mnpx4yx9q4nyacl43wisqjrck4b8lzykyzdn0fg7xlscc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167295,8 +167316,8 @@ self: { }: mkDerivation { pname = "servant-auth-token"; - version = "0.4.7.0"; - sha256 = "0237kjsvgi6wfn8qisbf93w3irp73i00728zd4v1z3s5a435kgff"; + version = "0.4.7.1"; + sha256 = "0mswxxq2b6n1f3laz15y87nxnsw5l1bmpl9kfdif4spd286wgaa8"; libraryHaskellDepends = [ aeson-injector base bytestring containers mtl pwstore-fast servant-auth-token-api servant-server text time transformers uuid @@ -167316,8 +167337,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-acid"; - version = "0.4.1.0"; - sha256 = "0m1kpjyl9s6xxmmg6sxq2ipg2ylw0ccvwbqzjg0lx26h9h44wzai"; + version = "0.4.1.1"; + sha256 = "01y3dis2v984a7g4hfl28ygac6jp6dcr5kzp8b45c4lywsi6pd7a"; libraryHaskellDepends = [ acid-state aeson-injector base bytestring containers ghc-prim monad-control mtl safe safecopy servant-auth-token @@ -167336,8 +167357,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.4.2.1"; - sha256 = "06sn1k17acznmldknlqhfdvlb7cs7wiihsjcfk5xs9wzc6ssrvqf"; + version = "0.4.2.2"; + sha256 = "0dnaqhri1hg1c3gmlpnpyk21q4cq9j513fnd3g1m9k7mkc6h6bgv"; libraryHaskellDepends = [ aeson aeson-injector base lens raw-strings-qq servant servant-docs servant-swagger swagger2 text @@ -167357,8 +167378,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-leveldb"; - version = "0.4.2.0"; - sha256 = "09pnqdm6n3l5nivcrlczjp4sax0l1cg3l42hxwkw0s0prwvq1vi8"; + version = "0.4.2.1"; + sha256 = "0i7h05jsc0r644prgifbvj7xrjpr7qsmwhqcc93p33f1wznn9h5n"; libraryHaskellDepends = [ aeson-injector base bytestring concurrent-extra containers exceptions lens leveldb-haskell monad-control mtl resourcet safe @@ -167380,8 +167401,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-persistent"; - version = "0.5.1.0"; - sha256 = "0kvhk4wd8qdiaqjgs3k8s8jlxhph9jddpgq8caf7yldw6wz2kqi2"; + version = "0.5.1.1"; + sha256 = "09np7cilm1ij7ra06zyx7wqcm8ynras0q6fsfkkklpr5w632ifh1"; libraryHaskellDepends = [ aeson-injector base bytestring containers monad-control mtl persistent persistent-template servant-auth-token @@ -167403,8 +167424,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-rocksdb"; - version = "0.4.2.0"; - sha256 = "0268i74lf0ib7kc6nc8nqyfdn761vkdgjl1xyjcz8c8vlg0624vb"; + version = "0.4.2.1"; + sha256 = "0zl5xr12pnz99798pz1rn6q2msir57df97h6xayj3167zmmdv2fy"; libraryHaskellDepends = [ aeson-injector base bytestring concurrent-extra containers exceptions lens monad-control mtl resourcet rocksdb safe @@ -168492,7 +168513,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-subscriber_0_6_0_0" = callPackage + "servant-subscriber_0_6_0_1" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder , bytestring, case-insensitive, containers, directory, filepath , http-types, lens, lifted-base, monad-control, monad-logger @@ -168502,10 +168523,8 @@ self: { }: mkDerivation { pname = "servant-subscriber"; - version = "0.6.0.0"; - sha256 = "0pa0zwb8qqs6y2fcs8acwljym9jmha273gb2v5nyhhfyimdl8x8q"; - revision = "1"; - editedCabalFile = "16r1ry5zd67mj5f2mi2sv9ls3vvc6y78ryijp8fcw1rif7mynf7h"; + version = "0.6.0.1"; + sha256 = "0fbqmh0lzcb0ixw09ldjddz21xcfy7knfwhh3hfzlgy08xmqb89x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168890,16 +168909,18 @@ self: { }) {}; "serviette" = callPackage - ({ mkDerivation, aeson, base, bytestring, generic-deriving, text }: + ({ mkDerivation, aeson, base, bytestring, generic-deriving, text + , text-show + }: mkDerivation { pname = "serviette"; - version = "0.1.0.4"; - sha256 = "1i5k12y547z3l2hb4h1zafvv9sbfh5x60hajjw78dnk2p4v1gzl4"; + version = "0.1.0.6"; + sha256 = "00bh2c73g11bglw5z96g9d1bqkcd783byd3jrf5amgay28xk2l5d"; libraryHaskellDepends = [ - aeson base bytestring generic-deriving text + aeson base bytestring generic-deriving text text-show ]; homepage = "https://github.com/v0d1ch/serviette#readme"; - description = "JSON to raw Sql string"; + description = "JSON to Sql"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -169080,18 +169101,6 @@ self: { }) {}; "setlocale" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "setlocale"; - version = "1.0.0.4"; - sha256 = "1sd73zgpijr9xjdj5p562cmlcxmx5iff5k8xh9b6rpcgrgnnlf9j"; - libraryHaskellDepends = [ base ]; - homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale"; - description = "Haskell bindings to setlocale"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "setlocale_1_0_0_5" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "setlocale"; @@ -169101,7 +169110,6 @@ self: { homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale"; description = "Haskell bindings to setlocale"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "setoid" = callPackage @@ -170242,18 +170250,18 @@ self: { }: mkDerivation { pname = "shikensu"; - version = "0.3.3"; - sha256 = "15a2favvch2ph3sh0y1915vzqisl3bhkpnqp1kfmlyzpdw75h8yn"; + version = "0.3.7"; + sha256 = "1gi1l8rs093s2jxyqwpg7yjbyjc9km87hdxai2j832viwrd828b5"; libraryHaskellDepends = [ aeson base bytestring directory filepath flow Glob text unordered-containers ]; testHaskellDepends = [ - aeson base bytestring directory filepath flow tasty tasty-hunit - text unordered-containers + aeson base bytestring directory filepath flow Glob tasty + tasty-hunit text unordered-containers ]; - homepage = "https://github.com/icidasset/shikensu#README"; - description = "A small toolset for building static websites"; + homepage = "https://github.com/icidasset/shikensu#readme"; + description = "Run a sequence of functions on in-memory representations of files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -170264,10 +170272,8 @@ self: { }: mkDerivation { pname = "shine"; - version = "0.1.0.0"; - sha256 = "1839whd680f1jm0789i6aqlkfbs8af6szzpfyhxzbxhdqjrz63mj"; - revision = "1"; - editedCabalFile = "06hzxlhb2ijhiq3vw74pbanjzfid0mk2j1cxvaz8w61yg2sq01b5"; + version = "0.2.0.1"; + sha256 = "07d990gkvgd804a6k85n0m8cxss6855gsgg7d52r341l1l706aca"; libraryHaskellDepends = [ base ghcjs-dom ghcjs-prim keycode mtl time transformers ]; @@ -170284,8 +170290,8 @@ self: { pname = "shine-varying"; version = "0.1.0.0"; sha256 = "13mnzf8i9y7ifn73mvsrzv0dh01vc20cymqli29j384z1491sc40"; - revision = "1"; - editedCabalFile = "133i3r6kv109vq5hn1y6yq06p79hkfk4cd7qgb6caidgn422cm7v"; + revision = "3"; + editedCabalFile = "1icg7mcfw6zrdf884kh2g0ss2lki0zf0b3r0yqzmz4h2cwvxl910"; libraryHaskellDepends = [ base ghcjs-dom keycode shine varying ]; testHaskellDepends = [ base ghcjs-dom keycode shine varying ]; homepage = "https://github.com/fgaz/shine-varying"; @@ -170582,6 +170588,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "si-clock" = callPackage + ({ mkDerivation, base, bytestring, hsI2C, time, transformers }: + mkDerivation { + pname = "si-clock"; + version = "0.1.1"; + sha256 = "1wcw3ws1125lpazar5934v93y76shdl279ll02z8911d3hcx0vh5"; + libraryHaskellDepends = [ + base bytestring hsI2C time transformers + ]; + description = "An interface to the Silicon Labs Si5351 clock chip"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sibe" = callPackage ({ mkDerivation, base, Chart, Chart-cairo, containers , data-default-class, deepseq, directory, hmatrix, JuicyPixels @@ -172824,8 +172843,8 @@ self: { ({ mkDerivation, base, hspec, megaparsec, QuickCheck, text }: mkDerivation { pname = "smiles"; - version = "0.1.0.1"; - sha256 = "1bmnzwb8i6l8frfwzac1lv6r2iwipd84pwchnl9pam6w7gj0ncck"; + version = "0.1.1.0"; + sha256 = "054s7c6xbakbv0kc64iyv1gsqnddgv8kc07hplk8ksbzg8q5x8jz"; libraryHaskellDepends = [ base megaparsec text ]; testHaskellDepends = [ base hspec megaparsec QuickCheck text ]; homepage = "https://github.com/zmactep/smiles#readme"; @@ -175584,21 +175603,6 @@ self: { }) {}; "spdx" = callPackage - ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }: - mkDerivation { - pname = "spdx"; - version = "0.2.1.0"; - sha256 = "1wl0r4q6li6srvcbp4h1bk4k164vd7z8fcy12ixms7r0iq4xdw57"; - revision = "1"; - editedCabalFile = "0qffjk0iz3fnd4099n9bqzakpma6ffw6znk99x67j3i8qdmk1fmd"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ base tasty tasty-quickcheck ]; - homepage = "https://github.com/phadej/spdx"; - description = "SPDX license expression language"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "spdx_0_2_2_0" = callPackage ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }: mkDerivation { pname = "spdx"; @@ -175609,7 +175613,6 @@ self: { homepage = "https://github.com/phadej/spdx"; description = "SPDX license expression language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spe" = callPackage @@ -177184,6 +177187,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stack2nix" = callPackage + ({ mkDerivation, async, base, bytestring, Cabal, containers + , data-fix, directory, filepath, Glob, hnix, monad-parallel + , optparse-applicative, process, SafeSemaphore, temporary, text + , yaml + }: + mkDerivation { + pname = "stack2nix"; + version = "0.1.2.0"; + sha256 = "1zq5d9f4livy3gkwcw4gajzil96klfbn2pzr7gnh74c323i9df9y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring Cabal containers data-fix directory filepath + Glob hnix monad-parallel process SafeSemaphore temporary text yaml + ]; + executableHaskellDepends = [ base Cabal optparse-applicative ]; + description = "Convert stack.yaml files into Nix build instructions."; + license = stdenv.lib.licenses.mit; + }) {}; + "stackage" = callPackage ({ mkDerivation, base, stackage-build-plan, stackage-cabal , stackage-cli, stackage-install, stackage-sandbox, stackage-setup @@ -178968,6 +178992,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stratosphere_0_4_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory + , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "stratosphere"; + version = "0.4.3"; + sha256 = "0cwqni8n13jkk3m6blvppmx5lgnb91mc19xfa51xlpsfcdsfm101"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring hashable lens template-haskell + text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring directory hashable hlint lens + tasty tasty-hspec template-haskell text unordered-containers + ]; + homepage = "https://github.com/frontrowed/stratosphere#readme"; + description = "EDSL for AWS CloudFormation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stratum-tool" = callPackage ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder , cmdargs, connection, containers, curl, curl-aeson, network, stm @@ -181367,6 +181416,70 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "symantic" = callPackage + ({ mkDerivation, base, containers, ghc-prim, mono-traversable + , symantic-document, symantic-grammar, text, transformers + }: + mkDerivation { + pname = "symantic"; + version = "6.0.0.20170623"; + sha256 = "0g4gfy8hjdwg95hr2jka2b3jvhb5dy27m71sb8kidbk954si8fhy"; + libraryHaskellDepends = [ + base containers ghc-prim mono-traversable symantic-document + symantic-grammar text transformers + ]; + description = "Library for Typed Tagless-Final Higher-Order Composable DSL"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-document" = callPackage + ({ mkDerivation, ansi-terminal, base, text }: + mkDerivation { + pname = "symantic-document"; + version = "0.0.0.20170623"; + sha256 = "0va9q2lp6vp81sm0vfm10s7ybp34i89bk6p2ry2f0fcr0lhb09i0"; + libraryHaskellDepends = [ ansi-terminal base text ]; + description = "Document symantics"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-grammar" = callPackage + ({ mkDerivation, base, megaparsec, tasty, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "symantic-grammar"; + version = "0.0.0.20170623"; + sha256 = "0ds1r71n96kjsr60l5jlv4kb56v7pplrwp93bzni6hiddfm6g917"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base megaparsec tasty tasty-hunit text transformers + ]; + description = "Library for symantic grammars"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-lib" = callPackage + ({ mkDerivation, base, containers, ghc-prim, megaparsec + , monad-classes, mono-traversable, symantic, symantic-grammar + , tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "symantic-lib"; + version = "0.0.2.20170623"; + sha256 = "10wj4p8dj2qb3qk73gkikfazq5szg8yrhjwdhj37xks7hvsfqgsv"; + libraryHaskellDepends = [ + base containers ghc-prim monad-classes mono-traversable symantic + symantic-grammar text transformers + ]; + testHaskellDepends = [ + base containers megaparsec monad-classes mono-traversable symantic + symantic-grammar tasty tasty-hunit text transformers + ]; + description = "Symantics for common types"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "symbol" = callPackage ({ mkDerivation, base, containers, deepseq }: mkDerivation { @@ -183665,6 +183778,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-hspec_1_1_3_2" = callPackage + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random + , tagged, tasty, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-hspec"; + version = "1.1.3.2"; + sha256 = "0n4pn89jz9i8d7mxsdp6ynwkg5gjyaipdy261parx64m3nxi4vcv"; + libraryHaskellDepends = [ + base hspec hspec-core QuickCheck random tagged tasty + tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/mitchellwrosen/tasty-hspec"; + description = "Hspec support for the Tasty test framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-html" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers, filepath , generic-deriving, mtl, stm, tagged, tasty, text, transformers @@ -183842,14 +183973,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-quickcheck_0_9" = callPackage + "tasty-quickcheck_0_9_1" = callPackage ({ mkDerivation, base, pcre-light, QuickCheck, random, tagged , tasty, tasty-hunit }: mkDerivation { pname = "tasty-quickcheck"; - version = "0.9"; - sha256 = "00h7vvmadiq07bzd9dpi8maw1apshz66si9vkkqzxmgvnv9src33"; + version = "0.9.1"; + sha256 = "03db6aknm5rdl14mn98lxhb38357ywvs7agygyz1hbc5iv7rggxa"; libraryHaskellDepends = [ base QuickCheck random tagged tasty ]; testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; homepage = "http://documentup.com/feuerbach/tasty"; @@ -184733,22 +184864,6 @@ self: { }) {}; "temporary" = callPackage - ({ mkDerivation, base, directory, exceptions, filepath - , transformers, unix - }: - mkDerivation { - pname = "temporary"; - version = "1.2.0.4"; - sha256 = "0qk741yqnpd69sksgks2vb7zi50rglp9m498lzw4sh268a017rsi"; - libraryHaskellDepends = [ - base directory exceptions filepath transformers unix - ]; - homepage = "http://www.github.com/feuerbach/temporary"; - description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "temporary_1_2_1" = callPackage ({ mkDerivation, base, base-compat, directory, exceptions, filepath , tasty, tasty-hunit, transformers, unix }: @@ -184765,7 +184880,6 @@ self: { homepage = "https://github.com/feuerbach/temporary"; description = "Portable temporary file and directory support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "temporary-rc" = callPackage @@ -187247,23 +187361,6 @@ self: { }) {}; "th-reify-many" = callPackage - ({ mkDerivation, base, containers, mtl, safe, template-haskell - , th-expand-syns - }: - mkDerivation { - pname = "th-reify-many"; - version = "0.1.6"; - sha256 = "1b76zjxkj0v0n8zj9l0nwav2irm0c43rx6qjihfw8klmmxvx59df"; - libraryHaskellDepends = [ - base containers mtl safe template-haskell th-expand-syns - ]; - testHaskellDepends = [ base template-haskell ]; - homepage = "http://github.com/mgsloan/th-reify-many"; - description = "Recurseively reify template haskell datatype info"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-reify-many_0_1_7" = callPackage ({ mkDerivation, base, containers, mtl, safe, template-haskell , th-expand-syns }: @@ -187278,7 +187375,6 @@ self: { homepage = "http://github.com/mgsloan/th-reify-many"; description = "Recurseively reify template haskell datatype info"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-sccs" = callPackage @@ -187613,6 +187709,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "thread-local-storage_0_1_2" = callPackage + ({ mkDerivation, atomic-primops, base, containers, criterion }: + mkDerivation { + pname = "thread-local-storage"; + version = "0.1.2"; + sha256 = "0nfl0i9g0d2z199a824ja6vb2h9nqswizv0hn266j0mpid1p3hl5"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ atomic-primops base ]; + benchmarkHaskellDepends = [ atomic-primops base criterion ]; + homepage = "https://github.com/rrnewton/thread-local-storage"; + description = "Several options for thread-local-storage (TLS) in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threadPool" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -187744,8 +187855,8 @@ self: { }: mkDerivation { pname = "threepenny-editors"; - version = "0.2.0.11"; - sha256 = "0wq8s88l3pdl2n00gfyzg99dg2fd7d7gcq7pssxhg3z4rv72fdif"; + version = "0.2.0.13"; + sha256 = "159zqxcnlvn03hqyy3d1gxd7hmr2ky11x7sa3n67m5xl2in3qrjb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187929,19 +188040,20 @@ self: { }) {}; "throwable-exceptions" = callPackage - ({ mkDerivation, base, either, safe-exceptions, tasty + ({ mkDerivation, base, doctest, either, safe-exceptions, tasty , tasty-discover, tasty-hunit, template-haskell, text }: mkDerivation { pname = "throwable-exceptions"; - version = "0.1.0.5"; - sha256 = "1f4aaj37j0wni1qgshf1n72kid74wz4gj6dydzzasrxq4ls51cvn"; + version = "0.1.0.7"; + sha256 = "1afxzk9xvxlvi13ysda9gcv6zzr7njcvi5p15lbn9bg68nrwqazj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base safe-exceptions template-haskell ]; executableHaskellDepends = [ base safe-exceptions ]; testHaskellDepends = [ - base either safe-exceptions tasty tasty-discover tasty-hunit text + base doctest either safe-exceptions tasty tasty-discover + tasty-hunit text ]; homepage = "https://github.com/aiya000/hs-throwable-exceptions#README.md"; description = "throwable-exceptions gives the easy way to throw exceptions"; @@ -189512,8 +189624,8 @@ self: { }: mkDerivation { pname = "tmp-postgres"; - version = "0.1.0.6"; - sha256 = "0h3rhli1vm0rq2943fz1z4l26s6nzrx5sccwdx6wc998wbgbdq15"; + version = "0.1.0.7"; + sha256 = "0cx0b0743fv2p651sf6s95aqhpq8rk20mxdk06dw8v8bgdyvncq2"; libraryHaskellDepends = [ base directory network process temporary unix ]; @@ -191829,29 +191941,6 @@ self: { }) {}; "turtle" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock - , criterion, directory, doctest, foldl, hostname, managed - , optional-args, optparse-applicative, process, semigroups, stm - , system-fileio, system-filepath, temporary, text, time - , transformers, unix, unix-compat - }: - mkDerivation { - pname = "turtle"; - version = "1.3.5"; - sha256 = "0ry3d42s3g3hbdg8gjdlcadd0cfmf4harb30w4l2r6p94vj25453"; - libraryHaskellDepends = [ - ansi-wl-pprint async base bytestring clock directory foldl hostname - managed optional-args optparse-applicative process semigroups stm - system-fileio system-filepath temporary text time transformers unix - unix-compat - ]; - testHaskellDepends = [ base doctest system-filepath temporary ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Shell programming, Haskell-style"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "turtle_1_3_6" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , criterion, directory, doctest, foldl, hostname, managed , optional-args, optparse-applicative, process, semigroups, stm @@ -191872,7 +191961,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "turtle-options" = callPackage @@ -194137,6 +194225,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unfoldable_0_9_4" = callPackage + ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck + , random, transformers + }: + mkDerivation { + pname = "unfoldable"; + version = "0.9.4"; + sha256 = "0qqjr060d79g5lnsdzx9ff6ava78441h8wvkn38hs7y3rvzw9vzd"; + libraryHaskellDepends = [ + base containers ghc-prim one-liner QuickCheck random transformers + ]; + homepage = "https://github.com/sjoerdvisscher/unfoldable"; + description = "Class of data structures that can be unfolded"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unfoldable-restricted" = callPackage ({ mkDerivation, base, constraints, containers, hashable , transformers, unfoldable, unit-constraint, unordered-containers @@ -197470,19 +197575,6 @@ self: { }) {}; "vector-fftw" = callPackage - ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: - mkDerivation { - pname = "vector-fftw"; - version = "0.1.3.7"; - sha256 = "0xl1gymdl20j4n4z7rn9ngm4yfzkc2q75af5ls15rd5zsqk1ihp3"; - libraryHaskellDepends = [ base primitive storable-complex vector ]; - librarySystemDepends = [ fftw ]; - homepage = "http://hackage.haskell.org/package/vector-fftw"; - description = "A binding to the fftw library for one-dimensional vectors"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) fftw;}; - - "vector-fftw_0_1_3_8" = callPackage ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: mkDerivation { pname = "vector-fftw"; @@ -197493,7 +197585,6 @@ self: { homepage = "http://hackage.haskell.org/package/vector-fftw"; description = "A binding to the fftw library for one-dimensional vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fftw;}; "vector-functorlazy" = callPackage @@ -198959,6 +199050,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_0_20_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, HUnit, iproute, lifted-base, network, old-locale + , resourcet, streaming-commons, stringsearch, text, time + , transformers, unix, unix-compat, vault, void, wai, wai-logger + , word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.0.20.0"; + sha256 = "0w8r0azjhl132sa8wzqjd8vs359h8dc7l6afr3g5wbw1kr9clqxd"; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types iproute lifted-base network + old-locale resourcet streaming-commons stringsearch text time + transformers unix unix-compat vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + base blaze-builder bytestring case-insensitive cookie fast-logger + hspec http-types HUnit resourcet text time transformers wai zlib + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "Provides some basic WAI handlers and middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai @@ -202573,19 +202694,19 @@ self: { "wolf" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring , conduit, directory, exceptions, filemanip, filepath, http-types - , lifted-async, lifted-base, monad-control, optparse-generic - , preamble, process, resourcet, shakers, time, uuid, yaml + , lifted-async, lifted-base, optparse-generic, preamble, process + , shakers, time, uuid, yaml }: mkDerivation { pname = "wolf"; - version = "0.3.18"; - sha256 = "08wpjp1m6szx2sp4g7h03ks7r2ryadzz3a3apchd2vymhlb1qaxb"; + version = "0.3.19"; + sha256 = "1bgwcklmxygc7f44nrcckdccdwg7f1y4s1qhfzn33ji1dkkhdp8m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-swf base bytestring conduit directory exceptions filemanip filepath http-types lifted-async lifted-base - monad-control preamble process resourcet time uuid yaml + preamble process time uuid yaml ]; executableHaskellDepends = [ base optparse-generic shakers ]; homepage = "https://github.com/swift-nav/wolf"; @@ -203195,6 +203316,8 @@ self: { pname = "writer-cps-morph"; version = "0.1.0.2"; sha256 = "1n6m7wpxvvnxgkjz8qfiqz9jn2d83qb9wj4gmp476fg8vjvhf7g9"; + revision = "1"; + editedCabalFile = "0dqpbpaidwa7ahk0n7pv397mv7ncr26p3vcrjh1xzl6vk26bdah5"; libraryHaskellDepends = [ base mmorph writer-cps-transformers ]; homepage = "https://github.com/louispan/writer-cps-morph#readme"; description = "MFunctor instance for CPS style WriterT and RWST"; @@ -204529,28 +204652,6 @@ self: { }) {}; "xml-conduit-parse" = callPackage - ({ mkDerivation, base, conduit, conduit-parse, containers - , data-default, exceptions, hlint, parsers, resourcet, tasty - , tasty-hunit, text, xml-conduit, xml-types - }: - mkDerivation { - pname = "xml-conduit-parse"; - version = "0.3.1.0"; - sha256 = "1mbjqmp9bib6m49y3lrfpspc05ihjddj10lqz30nq89ys36sma32"; - libraryHaskellDepends = [ - base conduit conduit-parse containers exceptions parsers text - xml-conduit xml-types - ]; - testHaskellDepends = [ - base conduit conduit-parse data-default hlint parsers resourcet - tasty tasty-hunit - ]; - homepage = "https://github.com/k0ral/xml-conduit-parse"; - description = "Streaming XML parser based on conduits"; - license = "unknown"; - }) {}; - - "xml-conduit-parse_0_3_1_1" = callPackage ({ mkDerivation, base, conduit, conduit-parse, containers , data-default, exceptions, hlint, parsers, resourcet, tasty , tasty-hunit, text, xml-conduit, xml-types @@ -204570,7 +204671,6 @@ self: { homepage = "https://github.com/k0ral/xml-conduit-parse"; description = "Streaming XML parser based on conduits"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-conduit-writer" = callPackage @@ -205750,8 +205850,8 @@ self: { ({ mkDerivation, base, word8 }: mkDerivation { pname = "yabi"; - version = "0.1.1.0"; - sha256 = "05avn1m1mmgvzx9vkjy0fyyy38vmz39km0b190lz7lhy9qrwa2bb"; + version = "0.2.0.0"; + sha256 = "1iihmhq87z5k9wzv8j8ydyy100m0401yqm576z27fk01i1a6fq3x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base word8 ]; @@ -205911,37 +206011,6 @@ self: { }) {}; "yaml" = callPackage - ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat - , bytestring, conduit, containers, directory, filepath, hspec - , HUnit, libyaml, mockery, resourcet, scientific, semigroups - , template-haskell, temporary, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; - version = "0.8.23"; - sha256 = "0p0ya8vgydsjc9nvc92kncz7239lixjh1rdw3gprnqs2h8a3f428"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - filepath resourcet scientific semigroups template-haskell text - transformers unordered-containers vector - ]; - libraryPkgconfigDepends = [ libyaml ]; - executableHaskellDepends = [ aeson base bytestring ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat bytestring conduit directory hspec - HUnit mockery resourcet temporary text transformers - unordered-containers vector - ]; - homepage = "http://github.com/snoyberg/yaml/"; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libyaml;}; - - "yaml_0_8_23_1" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat , bytestring, conduit, containers, directory, filepath, hspec , HUnit, libyaml, mockery, resourcet, scientific, semigroups @@ -205970,7 +206039,6 @@ self: { homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libyaml;}; "yaml-combinators" = callPackage @@ -206518,6 +206586,8 @@ self: { pname = "yesod-angular-ui"; version = "0.1.1.0"; sha256 = "08rr8w4bibjjchgfp1j9gywldr8v10vg8ddmkxj6dx5b6w2kvm8k"; + revision = "1"; + editedCabalFile = "1nak49v5ggsmpgawa8q8li88vf1nw6kn0f9fii7d6xbnfxpx6w6x"; libraryHaskellDepends = [ base blaze-html containers directory hjsmin mtl resourcet shakespeare template-haskell text transformers yesod yesod-core @@ -207407,6 +207477,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form-richtext_0_1_0_1" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-html, shakespeare, text + , xss-sanitize, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-form-richtext"; + version = "0.1.0.1"; + sha256 = "0bmngw13lgacni8xn5jwpnf77qf0nmg3cqhb0mshp7cccky7cg7y"; + libraryHaskellDepends = [ + base blaze-builder blaze-html shakespeare text xss-sanitize + yesod-core yesod-form + ]; + homepage = "http://github.com/geraldus/yesod-form-richtext#readme"; + description = "Various rich-text WYSIWYG editors for Yesod forms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-gitrepo" = callPackage ({ mkDerivation, base, directory, enclosed-exceptions, http-types , lifted-base, process, temporary, text, wai, yesod-core @@ -208215,6 +208303,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-test_1_5_7" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, containers, cookie + , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base + , monad-control, network, persistent, pretty-show, text, time + , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core + , yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.5.7"; + sha256 = "04q1hp09wbr4y77v0296c9z9hp5rgaz5pvahw6p1hk3vfypjlss2"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + case-insensitive containers cookie hspec-core html-conduit + http-types HUnit monad-control network persistent pretty-show text + time transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers hspec html-conduit http-types HUnit + lifted-base text wai xml-conduit yesod-core yesod-form + ]; + homepage = "http://www.yesodweb.com"; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -208458,18 +208574,19 @@ self: { "yi-core" = callPackage ({ mkDerivation, array, attoparsec, base, binary, bytestring - , containers, data-default, directory, dlist, dynamic-state, dyre - , exceptions, filepath, hashable, Hclip, ListLike - , microlens-platform, mtl, old-locale, oo-prototypes, parsec - , pointedlist, process, process-extras, safe, semigroups, split - , tasty, tasty-hunit, tasty-quickcheck, text, text-icu, time - , transformers-base, unix, unix-compat, unordered-containers - , word-trie, xdg-basedir, yi-language, yi-rope + , containers, criterion, data-default, deepseq, directory, dlist + , dynamic-state, dyre, exceptions, filepath, hashable, Hclip + , ListLike, microlens-platform, mtl, old-locale, oo-prototypes + , parsec, pointedlist, process, process-extras, quickcheck-text + , safe, semigroups, split, tasty, tasty-hunit, tasty-quickcheck + , text, text-icu, time, transformers-base, unix, unix-compat + , unordered-containers, word-trie, xdg-basedir, yi-language + , yi-rope }: mkDerivation { pname = "yi-core"; - version = "0.13.5"; - sha256 = "0ac8drczsiigic6q086dqz7qx0jf3zqhpkvz7ld81ybw1gs4jjxq"; + version = "0.13.7"; + sha256 = "0i2n8jx15fic32kakppj9lz935dcm0090b736f8w711x6aib6nmg"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state dyre exceptions filepath hashable @@ -208482,10 +208599,19 @@ self: { array attoparsec base binary bytestring containers data-default directory dlist dynamic-state dyre exceptions filepath hashable Hclip ListLike microlens-platform mtl old-locale oo-prototypes - parsec pointedlist process process-extras safe semigroups split - tasty tasty-hunit tasty-quickcheck text text-icu time - transformers-base unix unix-compat unordered-containers word-trie - xdg-basedir yi-language yi-rope + parsec pointedlist process process-extras quickcheck-text safe + semigroups split tasty tasty-hunit tasty-quickcheck text text-icu + time transformers-base unix unix-compat unordered-containers + word-trie xdg-basedir yi-language yi-rope + ]; + benchmarkHaskellDepends = [ + array attoparsec base binary bytestring containers criterion + data-default deepseq directory dlist dynamic-state dyre exceptions + filepath hashable Hclip ListLike microlens-platform mtl old-locale + oo-prototypes parsec pointedlist process process-extras safe + semigroups split text text-icu time transformers-base unix + unix-compat unordered-containers word-trie xdg-basedir yi-language + yi-rope ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor core library"; @@ -208587,15 +208713,15 @@ self: { "yi-frontend-vty" = callPackage ({ mkDerivation, base, containers, data-default, dlist , microlens-platform, pointedlist, stm, text, vty, yi-core - , yi-language + , yi-language, yi-rope }: mkDerivation { pname = "yi-frontend-vty"; - version = "0.13.5"; - sha256 = "1crpl6810xiz4mk4yj56w9anxs7yz09m12gmi859vjp0sbglrrsv"; + version = "0.13.7"; + sha256 = "0sgk9cx6q7mxjc1w7396mrrlds0gbilky2w04j4cj7c57nq42n93"; libraryHaskellDepends = [ base containers data-default dlist microlens-platform pointedlist - stm text vty yi-core yi-language + stm text vty yi-core yi-language yi-rope ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Vty frontend for Yi editor"; @@ -208628,8 +208754,8 @@ self: { }: mkDerivation { pname = "yi-fuzzy-open"; - version = "0.13.5"; - sha256 = "0bcyxlq66mmcdwn44knpkrzfki201jkcyiadnqy1bfwq8p8ky757"; + version = "0.13.7"; + sha256 = "0gqab3cdl2mrdp7wymhn6gy63mnd438m6ax6wis22kq1xpc5hdqd"; libraryHaskellDepends = [ base binary containers data-default directory filepath mtl text transformers-base vector yi-core yi-language yi-rope @@ -208676,8 +208802,8 @@ self: { }: mkDerivation { pname = "yi-ireader"; - version = "0.13.5"; - sha256 = "0j3v7ph93qlf40q5abcv2396hjnz4l5a81yd292sm1w3jp5pbzhg"; + version = "0.13.7"; + sha256 = "1f4nj22nkk33s3w8gwa38cab50232laifkc4kd89ybaj4w9yawfj"; libraryHaskellDepends = [ base binary bytestring containers data-default microlens-platform text yi-core yi-language yi-rope @@ -208711,8 +208837,8 @@ self: { }: mkDerivation { pname = "yi-keymap-cua"; - version = "0.13.5"; - sha256 = "1iap9lgzj2gg3yqrpli4alhklsppfnlczrjqddidc8vy174017nl"; + version = "0.13.7"; + sha256 = "0fm2kgafmzbn8fvksl0mx0c5r0aqvdmnh6pnp5ql5xr73k4n4pmf"; libraryHaskellDepends = [ base microlens-platform text yi-core yi-keymap-emacs yi-rope ]; @@ -208746,8 +208872,8 @@ self: { }: mkDerivation { pname = "yi-keymap-emacs"; - version = "0.13.5"; - sha256 = "05h4xgg7w1m0hiimrx9xrhjc53h0vdhgsaal7g0sb0bgrilx06c0"; + version = "0.13.7"; + sha256 = "1whxh7jznfq27ps9wnqaarhc8dcmfx19i01m0h6pbh7zmlyl2ddn"; libraryHaskellDepends = [ base containers filepath Hclip microlens-platform mtl oo-prototypes semigroups text transformers-base yi-core yi-language yi-misc-modes @@ -208788,8 +208914,8 @@ self: { }: mkDerivation { pname = "yi-keymap-vim"; - version = "0.13.5"; - sha256 = "01s9qx2yd297gda53j7f9kv39lxy09qj4kk8ms21ajjzj7q4hyn3"; + version = "0.13.7"; + sha256 = "0d91lpcrsbwwacqycmkdmxkwnx7rn116cj76ddb7wrnikaj6vv1j"; libraryHaskellDepends = [ attoparsec base binary containers data-default directory filepath Hclip microlens-platform mtl oo-prototypes pointedlist safe @@ -208846,8 +208972,8 @@ self: { }: mkDerivation { pname = "yi-language"; - version = "0.13.5"; - sha256 = "1zgw4amvmm0qhid8mcdakb4q8vlasnk5vqy9hsx9v0nc6w6c36fm"; + version = "0.13.7"; + sha256 = "1cfa44fv2kvsk695ny9rvi3ih55d3gzak5873zmb35bdc64v2k66"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -208901,8 +209027,8 @@ self: { }: mkDerivation { pname = "yi-misc-modes"; - version = "0.13.5"; - sha256 = "1a91p4yrs38ra93szds00rm5w5lgbm672lhs65c7vwqk300w52aq"; + version = "0.13.7"; + sha256 = "0gyy7rg0wgblsilx83hrdb0fgc54skhljxw2csq41qdb5z756nqg"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform semigroups text yi-core yi-language yi-rope @@ -208943,8 +209069,8 @@ self: { }: mkDerivation { pname = "yi-mode-haskell"; - version = "0.13.5"; - sha256 = "16bg0kr21zdwcbclmyl4b7y3g0nza21vmn804c3r2lz4d95v68s3"; + version = "0.13.7"; + sha256 = "00p9hmvdd3llm0xnm0xrz8n9a74jh8lmazsm9ng4c3l0a5f3kxqq"; libraryHaskellDepends = [ array base binary data-default microlens-platform text yi-core yi-language yi-rope @@ -208988,8 +209114,8 @@ self: { }: mkDerivation { pname = "yi-mode-javascript"; - version = "0.13.5"; - sha256 = "071qhr626zkpc1472jvk54mc9nmcqw3hnyp1nqmy2v5h7yqb4v8m"; + version = "0.13.7"; + sha256 = "0fifk329g66r2k5a0j4jw8lcwlxc9v4r66sggrizgcqmcfxj895a"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -209056,20 +209182,21 @@ self: { }) {}; "yi-snippet" = callPackage - ({ mkDerivation, base, binary, containers, data-default, free, lens - , mtl, tasty-hunit, tasty-th, text, vector, yi-core, yi-rope + ({ mkDerivation, base, binary, containers, data-default, free + , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector + , yi-core, yi-rope }: mkDerivation { pname = "yi-snippet"; - version = "0.13.5"; - sha256 = "04xblqv2sglwzgplfcn737v7gk0w6zfyf2l72c01jv0sq247rdpk"; + version = "0.13.7"; + sha256 = "18h67vc2fb35jfmz4zq3sc7av5nrl5cqa8q5vhdywhhhp6bsvi00"; libraryHaskellDepends = [ - base binary containers data-default free lens mtl text vector - yi-core yi-rope + base binary containers data-default free microlens-platform mtl + text vector yi-core yi-rope ]; testHaskellDepends = [ - base binary containers data-default free lens mtl tasty-hunit - tasty-th text vector yi-core yi-rope + base binary containers data-default free microlens-platform mtl + tasty-hunit tasty-th text vector yi-core yi-rope ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Snippet support for yi"; @@ -209731,8 +209858,8 @@ self: { }: mkDerivation { pname = "zeromq4-haskell"; - version = "0.6.5"; - sha256 = "1hp7k5kzj6fbv0jkvcgxx6pg0nd200dsa4ynwd658s92i37vd6bf"; + version = "0.6.6"; + sha256 = "1pblwyn2lly3px9843g4a2wpkqhnffd53kam1b9kx31zpplfhbx8"; libraryHaskellDepends = [ async base bytestring containers exceptions monad-control semigroups transformers transformers-base @@ -209746,15 +209873,15 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) zeromq;}; - "zeromq4-haskell_0_6_6" = callPackage + "zeromq4-haskell_0_6_7" = callPackage ({ mkDerivation, async, base, bytestring, containers, exceptions , monad-control, QuickCheck, semigroups, tasty, tasty-hunit , tasty-quickcheck, transformers, transformers-base, zeromq }: mkDerivation { pname = "zeromq4-haskell"; - version = "0.6.6"; - sha256 = "1pblwyn2lly3px9843g4a2wpkqhnffd53kam1b9kx31zpplfhbx8"; + version = "0.6.7"; + sha256 = "1kjgmy8pbq9b00s8ak469afwgvhvnyyk7430x20amw01jcjbicll"; libraryHaskellDepends = [ async base bytestring containers exceptions monad-control semigroups transformers transformers-base diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index cc161e3ca2d..6ed8d0864ca 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -130,7 +130,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { in generateExprs name src {}) overrides; # : { root : Path - # , source-overrides : Defaulted (Either Path VersionNumber + # , source-overrides : Defaulted (Either Path VersionNumber) # , overrides : Defaulted (HaskellPackageOverrideSet) # } -> NixShellAwareDerivation # Given a path to a haskell package directory whose cabal file is diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix new file mode 100644 index 00000000000..8866d9848e7 --- /dev/null +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -0,0 +1,10 @@ +{ mkDerivation, fetchurl }: + +mkDerivation rec { + version = "20.0"; + sha256 = "12dbay254ivnakwknjn5h55wndb0a0wqx55p156h8hwjhykj2kn0"; + + prePatch = '' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' + ''; +} diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index d130a328dba..afd6391d719 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,11 +1,11 @@ { fetchurl, fetchpatch, stdenv }: stdenv.mkDerivation rec { - name = "gsl-2.3"; + name = "gsl-2.4"; src = fetchurl { url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "1yxdzqjwmi2aid650fa9zyr8llw069x7lm489wx9nnfdi6vh09an"; + sha256 = "16yfs5n444s03np1naj6yp1fsysd42kdscxzkg0k2yvfjixx0ijd"; }; patches = [ diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 8ab1d1b99b6..d92e7d19c65 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -41,17 +41,26 @@ let propagate = out: let setupHook = { writeScript }: - writeScript "setup-hook.sh" '' - # Propagate $${out} output - propagatedUserEnvPkgs+=" @${out}@" + writeScript "setup-hook" '' + if [ "$hookName" != postHook ]; then + postHooks+=("source @dev@/nix-support/setup-hook") + else + # Propagate $${out} output + propagatedUserEnvPkgs="$propagatedUserEnvPkgs @${out}@" - # Propagate $dev so that this setup hook is propagated - # But only if there is a separate $dev output - if [ "$outputDev" != out ]; then - if [ -n "$crossConfig" ]; then - propagatedBuildInputs+=" @dev@" - else - propagatedNativeBuildInputs+=" @dev@" + if [ -z "$outputDev" ]; then + echo "error: \$outputDev is unset!" >&2 + exit 1 + fi + + # Propagate $dev so that this setup hook is propagated + # But only if there is a separate $dev output + if [ "$outputDev" != out ]; then + if [ -n "$crossConfig" ]; then + propagatedBuildInputs="$propagatedBuildInputs @dev@" + else + propagatedNativeBuildInputs="$propagatedNativeBuildInputs @dev@" + fi fi fi ''; diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix index 62bcc0065b3..311f07241d6 100644 --- a/pkgs/development/libraries/kde-frameworks/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks/kjs.nix @@ -1,12 +1,12 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - qtbase, + pcre, qtbase, }: mkDerivation { name = "kjs"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ qtbase ]; + buildInputs = [ pcre qtbase ]; } diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index 33209f2fd44..eedc0993d73 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -5,7 +5,10 @@ stdenv.mkDerivation rec { version = "7.6.0"; src = fetchurl { - url = "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz"; + urls = [ + "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz" + "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz" + ]; sha256 ="03ylfr29g9zc0r6b6axz3i68alj5qmxgzknxwam3jlx0sz8hcb4f"; }; diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 328c5db0b65..756def8ad90 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -2,14 +2,14 @@ , fixedPoint ? false, withCustomModes ? true }: let - version = "1.1.5"; + version = "1.2"; in stdenv.mkDerivation rec { name = "libopus-${version}"; src = fetchurl { - url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"; - sha256 = "1r33nm7b052dw7gsc99809df1zmj5icfiljqbrfkw2pll0f9i17b"; + url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz"; + sha256 = "1ad9q2g9vivx409jdsslv1hrh5r616qz2pjm96y8ymsigfl4bnvp"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index dc4a00e6dd9..85b4d562720 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -15,6 +15,7 @@ , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableEigen ? false, eigen +, enableOpenblas ? false, openblas , enableCuda ? false, cudatoolkit, gcc5 , AVFoundation, Cocoa, QTKit }: @@ -130,6 +131,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen + ++ lib.optional enableOpenblas openblas ++ lib.optionals enableCuda [ cudatoolkit gcc5 ] ++ lib.optional enableContrib protobuf3_1 ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ]; @@ -141,7 +143,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; cmakeFlags = [ - "-DWITH_IPP=${if enableIpp then "ON" else "OFF"}" + "-DWITH_IPP=${if enableIpp then "ON" else "OFF"} -DWITH_OPENMP=ON" (opencvFlag "TIFF" enableTIFF) (opencvFlag "JASPER" enableJPEG2K) (opencvFlag "WEBP" enableWebP) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index c7ab69e5169..2d08f37c8c2 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -13,19 +13,13 @@ let majorVersion = "1.10"; in stdenv.mkDerivation rec { - name = "openmpi-${majorVersion}.1"; + name = "openmpi-${majorVersion}.7"; src = fetchurl { url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2"; - sha256 = "14p4px9a3qzjc22lnl6braxrcrmd9rgmy7fh4qpanawn2pgfq6br"; + sha256 = "142s1vny9gllkq336yafxayjgcirj2jv0ddabj879jgya7hyr2d0"; }; - # Bug in openmpi implementation for zero sized messages - # Patch required to make mpi4py pass. Will NOT - # be required when openmpi >= 2.0.0 - # https://www.open-mpi.org/community/lists/users/2015/11/28030.php - patches = [ ./nbc_copy.patch ]; - buildInputs = [ gfortran ] ++ optional (stdenv.isLinux || stdenv.isFreeBSD) libibverbs; diff --git a/pkgs/development/libraries/openmpi/nbc_copy.patch b/pkgs/development/libraries/openmpi/nbc_copy.patch deleted file mode 100644 index d496c7cc2d7..00000000000 --- a/pkgs/development/libraries/openmpi/nbc_copy.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 4ee20ba31dd64b8f899447cdad78ec2379acfce7 -Author: Gilles Gouaillardet -Date: Tue Nov 10 08:59:03 2015 +0900 - - fix NBC_Copy for legitimate zero size messages - - (back ported from commit open-mpi/ompi@0bd765eddd33e3d4ac18ec644c60a5c160cb48dc) - (back ported from commit open-mpi/ompi@9a70765f27fdf17e70e1a115754fef7e5f16132a) - -diff --git a/ompi/mca/coll/libnbc/nbc_internal.h b/ompi/mca/coll/libnbc/nbc_internal.h -index bf2f1cb..81be8cc 100644 ---- a/ompi/mca/coll/libnbc/nbc_internal.h -+++ b/ompi/mca/coll/libnbc/nbc_internal.h -@@ -501,7 +501,14 @@ static inline int NBC_Copy(void *src, int srccount, MPI_Datatype srctype, void * - } else { - /* we have to pack and unpack */ - res = MPI_Pack_size(srccount, srctype, comm, &size); -- if (MPI_SUCCESS != res || 0 == size) { printf("MPI Error in MPI_Pack_size() (%i:%i)\n", res, size); return (MPI_SUCCESS == res) ? MPI_ERR_SIZE : res;} -+ if (MPI_SUCCESS != res) { -+ printf ("MPI Error in MPI_Pack_size() (%i:%i)", res, size); -+ return res; -+ } -+ -+ if (0 == size) { -+ return OMPI_SUCCESS; -+ } - packbuf = malloc(size); - if (NULL == packbuf) { printf("Error in malloc()\n"); return res; } - pos=0; - diff --git a/pkgs/development/libraries/qt-5/5.8/fetch.sh b/pkgs/development/libraries/qt-5/5.8/fetch.sh deleted file mode 100644 index 2e21cdefba6..00000000000 --- a/pkgs/development/libraries/qt-5/5.8/fetch.sh +++ /dev/null @@ -1,3 +0,0 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/ \ - http://download.qt.io/community_releases/5.8/5.8.0-final/ \ - -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch deleted file mode 100644 index b5c21f064a4..00000000000 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: qtbase-opensource-src-5.8.0/src/corelib/io/qsettings.cpp -=================================================================== ---- qtbase-opensource-src-5.8.0.orig/src/corelib/io/qsettings.cpp -+++ qtbase-opensource-src-5.8.0/src/corelib/io/qsettings.cpp -@@ -1134,6 +1134,23 @@ QConfFileSettingsPrivate::QConfFileSetti - confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false)); - confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false)); - -+#if !defined(Q_OS_WIN) -+ // Add directories specified in $XDG_CONFIG_DIRS -+ const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS")); -+ if (!pathEnv.isEmpty()) { -+ const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts); -+ if (!pathEntries.isEmpty()) { -+ int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those. -+ for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) { -+ const QString& path = pathEntries.at(k); -+ if (!application.isEmpty()) -+ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false)); -+ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false)); -+ } -+ } -+ } -+#endif -+ - for (i = 0; i < NumConfFiles; ++i) { - if (confFiles[i]) { - spec = i; -Index: qtbase-opensource-src-5.8.0/src/corelib/io/qsettings_p.h -=================================================================== ---- qtbase-opensource-src-5.8.0.orig/src/corelib/io/qsettings_p.h -+++ qtbase-opensource-src-5.8.0/src/corelib/io/qsettings_p.h -@@ -246,7 +246,7 @@ public: - F_Organization = 0x1, - F_User = 0x0, - F_System = 0x2, -- NumConfFiles = 4 -+ NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis - }; - - QSettings::Format format; diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix deleted file mode 100644 index 871fb21c106..00000000000 --- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel - -, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst -, fontconfig, freetype, harfbuzz, icu, dbus -, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus -, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent -, alsaLib -, libcap -, pciutils -, systemd - -, bison, flex, git, which, gperf -, coreutils -, pkgconfig, python2 -, enableProprietaryCodecs ? true - -, lib, stdenv # lib.optional, needsPax -}: - -with stdenv.lib; - -qtSubmodule { - name = "qtwebengine"; - qtInputs = [ qtquickcontrols qtlocation qtwebchannel ]; - buildInputs = [ bison flex git which gperf ]; - nativeBuildInputs = [ pkgconfig python2 coreutils ]; - doCheck = true; - outputs = [ "out" "dev" "bin" ]; - - enableParallelBuilding = true; - - preConfigure = '' - export MAKEFLAGS=-j$NIX_BUILD_CORES - substituteInPlace ./src/3rdparty/chromium/build/common.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/toolchain.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - - # Fix library paths - sed -i \ - -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \ - -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \ - -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \ - src/core/web_engine_library_info.cpp - '' + optionalString (!stdenv.isDarwin) '' - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ - src/3rdparty/chromium/device/udev_linux/udev?_loader.cc - - sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ - src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc - ''; - - qmakeFlags = optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs"; - - propagatedBuildInputs = [ - # Image formats - libjpeg libpng libtiff libwebp - - # Video formats - srtp libvpx - - # Audio formats - libopus - - # Text rendering - harfbuzz icu - ] - ++ optionals (!stdenv.isDarwin) [ - dbus zlib minizip snappy nss protobuf jsoncpp libevent - - # Audio formats - alsaLib - - # Text rendering - fontconfig freetype - - libcap - pciutils - - # X11 libs - xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst - xlibs.libXcomposite - ]; - patches = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; - postInstall = '' - cat > $out/libexec/qt.conf <app_libpaths.reset(app_libpaths); diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/libressl.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/libressl.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/qgtk-env.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/qgtk-env.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qnativesocketengine-type-pun.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/qnativesocketengine-type-pun.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtbase/qnativesocketengine-type-pun.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/qnativesocketengine-type-pun.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.9/qtbase/series similarity index 88% rename from pkgs/development/libraries/qt-5/5.8/qtbase/series rename to pkgs/development/libraries/qt-5/5.9/qtbase/series index f3387694518..4f354e87c84 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/series @@ -1,7 +1,6 @@ dlopen-resolv.patch tzdir.patch dlopen-libXcursor.patch -xdg-config-dirs.patch library-paths.patch libressl.patch dlopen-gl.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/tzdir.patch similarity index 88% rename from pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/tzdir.patch index b8c05815a78..d57f24c3ed0 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/tzdir.patch @@ -1,7 +1,7 @@ -Index: qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp +Index: qtbase-opensource-src-5.9.0/src/corelib/tools/qtimezoneprivate_tz.cpp =================================================================== ---- qtbase-opensource-src-5.8.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp +--- qtbase-opensource-src-5.9.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp ++++ qtbase-opensource-src-5.9.0/src/corelib/tools/qtimezoneprivate_tz.cpp @@ -70,7 +70,11 @@ typedef QHash Q // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() @@ -15,7 +15,7 @@ Index: qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -642,12 +646,16 @@ void QTzTimeZonePrivate::init(const QByt +@@ -643,12 +647,16 @@ void QTzTimeZonePrivate::init(const QByt if (!tzif.open(QIODevice::ReadOnly)) return; } else { diff --git a/pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix rename to pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix rename to pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/import-paths.patch b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/import-paths.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtdeclarative/import-paths.patch rename to pkgs/development/libraries/qt-5/5.9/qtdeclarative/import-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/series similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtdeclarative/series rename to pkgs/development/libraries/qt-5/5.9/qtdeclarative/series diff --git a/pkgs/development/libraries/qt-5/5.8/qtdoc.nix b/pkgs/development/libraries/qt-5/5.9/qtdoc.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtdoc.nix rename to pkgs/development/libraries/qt-5/5.9/qtdoc.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.9/qtgraphicaleffects.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtgraphicaleffects.nix rename to pkgs/development/libraries/qt-5/5.9/qtgraphicaleffects.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.9/qtimageformats.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtimageformats.nix rename to pkgs/development/libraries/qt-5/5.9/qtimageformats.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtlocation.nix b/pkgs/development/libraries/qt-5/5.9/qtlocation.nix similarity index 73% rename from pkgs/development/libraries/qt-5/5.8/qtlocation.nix rename to pkgs/development/libraries/qt-5/5.9/qtlocation.nix index 0eabe04e478..6270bc577cf 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtlocation.nix @@ -8,4 +8,6 @@ qtSubmodule { moveToOutput "$qtPluginPrefix" "$bin" moveToOutput "$qtQmlPrefix" "$bin" ''; + # Linking with -lclipper fails with parallel build enabled + enableParallelBuilding = false; } diff --git a/pkgs/development/libraries/qt-5/5.8/qtmacextras.nix b/pkgs/development/libraries/qt-5/5.9/qtmacextras.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtmacextras.nix rename to pkgs/development/libraries/qt-5/5.9/qtmacextras.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix rename to pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.9/qtquickcontrols.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtquickcontrols.nix rename to pkgs/development/libraries/qt-5/5.9/qtquickcontrols.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix rename to pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.9/qtscript/0001-glib-2.32.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtscript/0001-glib-2.32.patch rename to pkgs/development/libraries/qt-5/5.9/qtscript/0001-glib-2.32.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.9/qtscript/default.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtscript/default.nix rename to pkgs/development/libraries/qt-5/5.9/qtscript/default.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtsensors.nix b/pkgs/development/libraries/qt-5/5.9/qtsensors.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtsensors.nix rename to pkgs/development/libraries/qt-5/5.9/qtsensors.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.9/qtserialport/default.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix rename to pkgs/development/libraries/qt-5/5.9/qtserialport/default.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch b/pkgs/development/libraries/qt-5/5.9/qtserialport/qtserialport-dlopen-udev.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch rename to pkgs/development/libraries/qt-5/5.9/qtserialport/qtserialport-dlopen-udev.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/series b/pkgs/development/libraries/qt-5/5.9/qtserialport/series similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtserialport/series rename to pkgs/development/libraries/qt-5/5.9/qtserialport/series diff --git a/pkgs/development/libraries/qt-5/5.8/qtsvg.nix b/pkgs/development/libraries/qt-5/5.9/qtsvg.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtsvg.nix rename to pkgs/development/libraries/qt-5/5.9/qtsvg.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.9/qttools/cmake-paths.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch rename to pkgs/development/libraries/qt-5/5.9/qttools/cmake-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix b/pkgs/development/libraries/qt-5/5.9/qttools/default.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qttools/default.nix rename to pkgs/development/libraries/qt-5/5.9/qttools/default.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/series b/pkgs/development/libraries/qt-5/5.9/qttools/series similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qttools/series rename to pkgs/development/libraries/qt-5/5.9/qttools/series diff --git a/pkgs/development/libraries/qt-5/5.8/qttranslations.nix b/pkgs/development/libraries/qt-5/5.9/qttranslations.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qttranslations.nix rename to pkgs/development/libraries/qt-5/5.9/qttranslations.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtwayland.nix b/pkgs/development/libraries/qt-5/5.9/qtwayland.nix similarity index 88% rename from pkgs/development/libraries/qt-5/5.8/qtwayland.nix rename to pkgs/development/libraries/qt-5/5.9/qtwayland.nix index 7b7bd2f6ebc..3e5deea7ec1 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtwayland.nix @@ -8,6 +8,6 @@ qtSubmodule { outputs = [ "out" "dev" "bin" ]; postInstall = '' moveToOutput "$qtPluginPrefix" "$bin" - moveToOutput "$qtQmlPrefix "$bin" + moveToOutput "$qtQmlPrefix" "$bin" ''; } diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix b/pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix rename to pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix new file mode 100644 index 00000000000..1684e6aac70 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix @@ -0,0 +1,113 @@ +{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel + +, bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which + +, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst +, fontconfig, freetype, harfbuzz, icu, dbus +, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus +, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent +, alsaLib +, libcap +, pciutils +, systemd + +, enableProprietaryCodecs ? true + +, lib, stdenv # lib.optional, needsPax +}: + +with stdenv.lib; + +qtSubmodule { + name = "qtwebengine"; + qtInputs = [ qtquickcontrols qtlocation qtwebchannel ]; + nativeBuildInputs = [ + bison coreutils flex git gperf ninja pkgconfig python2 which + ]; + doCheck = true; + outputs = [ "out" "dev" "bin" ]; + + enableParallelBuilding = true; + + postPatch = + # Patch Chromium build tools + '' + ( cd src/3rdparty/chromium; patchShebangs . ) + '' + # Patch Chromium build files + + '' + substituteInPlace ./src/3rdparty/chromium/build/common.gypi \ + --replace /bin/echo ${coreutils}/bin/echo + substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/toolchain.gypi \ + --replace /bin/echo ${coreutils}/bin/echo + substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \ + --replace /bin/echo ${coreutils}/bin/echo + '' + # Patch library paths in Qt sources + + '' + sed -i \ + -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \ + -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \ + -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \ + src/core/web_engine_library_info.cpp + '' + # Patch library paths in Chromium sources + + optionalString (!stdenv.isDarwin) '' + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + src/3rdparty/chromium/device/udev_linux/udev?_loader.cc + + sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ + src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc + ''; + + preConfigure = '' + export MAKEFLAGS=-j$NIX_BUILD_CORES + ''; + + qmakeFlags = + [ + # Use system Ninja because bootstrapping it is fragile + "WEBENGINE_CONFIG+=use_system_ninja" + ] ++ optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs"; + + propagatedBuildInputs = [ + # Image formats + libjpeg libpng libtiff libwebp + + # Video formats + srtp libvpx + + # Audio formats + libopus + + # Text rendering + harfbuzz icu + ] + ++ optionals (!stdenv.isDarwin) [ + dbus zlib minizip snappy nss protobuf jsoncpp libevent + + # Audio formats + alsaLib + + # Text rendering + fontconfig freetype + + libcap + pciutils + + # X11 libs + xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst + xlibs.libXcomposite + ]; + patches = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + postInstall = '' + cat > $out/libexec/qt.conf < %% @doc %% This takes an app name in the standard OTP - format -%% and returns just the app name. Why? because rebar doesn't +%% and returns just the app name. Why? Because rebar doesn't %% respect OTP conventions in some cases. -spec fixup_app_name(string()) -> string(). fixup_app_name(FileName) -> @@ -180,14 +180,14 @@ make_sure_registry_snapshot_exists(RegistrySnapshot) -> erlang:halt(1) end. --spec gather_required_data_from_the_environment(#data{}) -> {ok, map()}. +-spec gather_required_data_from_the_environment(#data{}) -> {ok, #data{}}. gather_required_data_from_the_environment(ArgData) -> {ok, ArgData#data{ version = guard_env("version") - , erl_libs = os:getenv("ERL_LIBS", []) - , plugins = os:getenv("buildPlugins", []) + , erl_libs = get_env("ERL_LIBS", []) + , plugins = get_env("buildPlugins", []) , root = code:root_dir() , name = guard_env("name") - , compile_ports = nix2bool(os:getenv("compilePorts", "")) + , compile_ports = nix2bool(get_env("compilePorts", "")) , registry_snapshot = guard_env("HEX_REGISTRY_SNAPSHOT")}}. -spec nix2bool(any()) -> boolean(). @@ -196,9 +196,17 @@ nix2bool("1") -> nix2bool("") -> false. +get_env(Name) -> + os:getenv(Name). +get_env(Name, Def) -> + case get_env(Name) of + false -> Def; + Val -> Val + end. + -spec guard_env(string()) -> string(). guard_env(Name) -> - case os:getenv(Name) of + case get_env(Name) of false -> stderr("Expected Environment variable ~s! Are you sure you are " "running in a Nix environment? Either a nix-build, " diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index e3f6e3c623c..7e11cf53199 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "9.2.0"; + version = "9.3.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "0x6pwh3wjq2czvzb8rl8npa8a58snwf1f9dwr6rbbxijaf886jfc"; + sha256 = "1svml4k1zkmnw49sg4ipzl4fzvxx9rbj0643lwf6vm55j8xykhrq"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "1y6i5dn1l1qlwyg95qw4sff2y9zypxwmvsw4mb0555vf157h88kg"; + sha256 = "0xbbbjd7hvhlzi47rzf09fzcpkd7jrf80xk1y736px75yyvq3jr2"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "0gz6byjnnfn9acy40hcbyzdql4199xn0yvjx2cfjjjzd9kryjrxp"; + sha256 = "0ddsh31sqjp9xs6mv5jbmqvjq2hcy6j21grrn1m73z8blk4ylxsd"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index d768f68576c..c8378e06df6 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -10,11 +10,11 @@ assert stdenv.isLinux -> (utillinux != null); stdenv.mkDerivation rec { name = "creduce-${version}"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { url = "http://embed.cs.utah.edu/creduce/${name}.tar.gz"; - sha256 = "0pf5q0n8vkdcr1wrkxn2jzxv0xkrir13bwmqfw3jpbm3dh2c3b6d"; + sha256 = "0h8s4d54q6cl6i45x3143l2xmr29b2yhr3m0n5qqx63sr5csip1n"; }; buildInputs = [ diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index e9da64b112b..f438e72b64e 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "hound-unstable-${version}"; - version = "20160919-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "f95e9a9224b8878b9cd8fac0afb6d31f83a65ca7"; + version = "20170324"; + rev = "effbe5873f329fcdf982e906b756b535e2804ebc"; goPackagePath = "github.com/etsy/hound"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "etsy"; repo = "hound"; - sha256 = "0d4mhka7f8x8xfjrjhl5l0v06ng8kc868jrajpv5bjkxsj71nwbg"; + sha256 = "0zc769lygad5an63z5mivaggbmm07d9ynngi2jx3f7651wpji4aw"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 42b0094c2cc..fe1bb771fca 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -62,15 +62,15 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2017-06-21"; + version = "2017-06-22"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "6e4a7a30f731c42e64e24ccbf8f25110c02776ab"; - sha256 = "0j7s4slmwrmwywvfkxdpg4wgxnfqjzv9dzwvni2n21sbbwjyqgij"; + rev = "803833aba77e1082c14857aa26933fc7fe5ae190"; + sha256 = "1cnxpsan8l6fnbr73n0qxxq1szlda1n3qfkk9k9ic8ijk7md4pvs"; }; buildInputs = diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 733399ebf7d..9e29487a2f3 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lttng-tools-${version}"; - version = "2.9.3"; + version = "2.9.5"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; - sha256 = "0kmj0ya5625mn2khbnghhsdmjr66xs0mhrvbrsdvrp3pm6mbmrm6"; + sha256 = "073kzfiwgvz7c10hihjwn1p53hh1jwvdkkway0jj2rbczjv9x0vp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 2d3fc656052..8994d0c3512 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -4,7 +4,7 @@ # ./configure ... # [...] # LTTng-UST will be built with the following options: -# +# # Java support (JNI): Disabled # sdt.h integration: Disabled # [...] @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "lttng-ust-${version}"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; - sha256 = "1bsxxaqhkh9bwr1ll5acb41hvis2lhkl00h5ra2wdps27y31lm2d"; + sha256 = "196snxrs1p205jz566rwxh7dqzsa3k16c7vm6k7i3gdvrmkx54dq"; }; buildInputs = [ liburcu ]; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix new file mode 100644 index 00000000000..aef851e6476 --- /dev/null +++ b/pkgs/development/tools/nailgun/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchMavenArtifact, fetchFromGitHub, bash, jre, makeWrapper }: + +let + version = "0.9.1"; + nailgun-server = fetchMavenArtifact { + groupId = "com.martiansoftware"; + artifactId = "nailgun-server"; + inherit version; + sha256 = "09ggkkd1s58jmpc74s6m10d3hyf6bmif31advk66zljbpykgl625"; + }; +in +stdenv.mkDerivation rec { + name = "nailgun-${version}"; + + src = fetchFromGitHub { + owner = "martylamb"; + repo = "nailgun"; + rev = "1ad9ad9d2d17c895144a9ee0e7acb1d3d90fb66f"; + sha256 = "1f8ac5kg7imhix9kqdzwiav1bxh8vljv2hb1mq8yz4rqsrx2r4w3"; + }; + + makeFlags = "PREFIX=$(out)"; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + install -D ng $out/bin/ng + + makeWrapper ${jre}/bin/java $out/bin/ng-server \ + --add-flags '-cp ${nailgun-server.jar}:$CLASSPATH com.martiansoftware.nailgun.NGServer' + ''; + + meta = with stdenv.lib; { + description = "Client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead"; + homepage = http://martiansoftware.com/nailgun/; + license = licenses.apsl20; + platforms = platforms.linux; + maintainer = with maintainers; [ volth ]; + }; +} diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix new file mode 100644 index 00000000000..acf7edf0145 --- /dev/null +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -0,0 +1,41 @@ +{stdenv, fetchurl, jre}: + +stdenv.mkDerivation rec { + name = "antlr-${version}"; + version = "4.7"; + src = fetchurl { + url ="http://www.antlr.org/download/antlr-${version}-complete.jar"; + sha256 = "0r08ay63s5aajix5j8j7lf7j7l7wiwdkr112b66nyhkj5f6c72yd"; + }; + + unpackPhase = "true"; + + installPhase = '' + mkdir -p "$out"/{share/java,bin} + cp "$src" "$out/share/java/antlr-${version}-complete.jar" + + echo "#! ${stdenv.shell}" >> "$out/bin/antlr" + echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' -Xmx500M org.antlr.v4.Tool \"\$@\"" >> "$out/bin/antlr" + + echo "#! ${stdenv.shell}" >> "$out/bin/grun" + echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' org.antlr.v4.gui.TestRig \"\$@\"" >> "$out/bin/grun" + + chmod a+x "$out/bin/antlr" "$out/bin/grun" + ln -s "$out/bin/antlr"{,4} + ''; + + inherit jre; + + meta = with stdenv.lib; { + description = "Powerful parser generator"; + longDescription = '' + ANTLR (ANother Tool for Language Recognition) is a powerful parser + generator for reading, processing, executing, or translating structured + text or binary files. It's widely used to build languages, tools, and + frameworks. From a grammar, ANTLR generates a parser that can build and + walk parse trees. + ''; + homepage = http://www.antlr.org/; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 79c400fd334..6ac192e6375 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -4,13 +4,13 @@ rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; - version = "0.24.0"; + version = "0.25.5"; src = fetchFromGitHub { owner = "servo"; repo = "rust-bindgen"; rev = "v${version}"; - sha256 = "1nzva8g5nj7m2w8vax86p4rd02ci8793nhnm7sf76ajr4hfnx323"; + sha256 = "0hv90h279frbxjay5g5vphds6wj3fiid9f2vmg1nr8887y4nif0k"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib" ''; - depsSha256 = "1l8c48y67azzwmv4hzghia1c53b5dw6qiv22cgv8zbyrg20aj8as"; + depsSha256 = "0ylm1wzf9aqcyfmmgpb18bdp5c5d73pnnjw13cv373511mkj1y0m"; doCheck = false; # A test fails because it can't find standard headers in NixOS diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix new file mode 100644 index 00000000000..b6a76001ad0 --- /dev/null +++ b/pkgs/games/qgo/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, makeWrapper, qmake, qt56 }: + +stdenv.mkDerivation rec { + name = "qgo-${version}"; + version = "unstable-2016-06-23"; + + meta = with stdenv.lib; { + description = "A Go client based on Qt5"; + longDescription = '' + qGo is a Go Client based on Qt 5. It supports playing online at + IGS-compatible servers (including some special tweaks for WING and LGS, + also NNGS was reported to work) and locally against gnugo (or other + GTP-compliant engines). It also has rudimentary support for editing SGF + files and parital support for CyberORO/WBaduk, Tygem, Tom, and eWeiqi + (developers of these backends are currently inactive, everybody is welcome + to take them over). + + Go is an ancient Chinese board game. It's called "圍棋(Wei Qi)" in + Chinese, "囲碁(Yi Go)" in Japanese, "바둑(Baduk)" in Korean. + ''; + homepage = "https://github.com/pzorin/qgo"; + license = licenses.gpl2; + maintainers = with maintainers; [ zalakain ]; + }; + + src = fetchFromGitHub { + owner = "pzorin"; + repo = "qgo"; + rev = "1e65b0c74914e534ea4d040f8f0ef8908383e374"; + sha256 = "1xzkayclmhsi07p9mnbf8185jw8n5ikxp2mik3x8qz1i6rmrfl5b"; + }; + + patches = [ ./fix-paths.patch ]; + postPatch = '' + sed -i 's|@out@|'"''${out}"'|g' src/src.pro src/defines.h + ''; + nativeBuildInputs = [ makeWrapper qmake ]; + # qt58 does not provide platform plugins + # We need lib/qt*/plugins/platforms/libqxcb.so + buildInputs = with qt56; [ qtbase.out qtmultimedia qttranslations ]; + enableParallelBuilding = true; + postFixup = '' + # libQt5XcbQpa is a platform plugin dependency and doesn't get linked + patchelf --add-needed libQt5XcbQpa.so.5 $out/bin/qgo + wrapProgram $out/bin/qgo \ + --set QT_QPA_PLATFORM_PLUGIN_PATH "${qt56.qtbase}/lib/qt-5.6/plugins/platforms/" + ''; +} diff --git a/pkgs/games/qgo/fix-paths.patch b/pkgs/games/qgo/fix-paths.patch new file mode 100644 index 00000000000..c1d1e399ec1 --- /dev/null +++ b/pkgs/games/qgo/fix-paths.patch @@ -0,0 +1,50 @@ +diff --git a/src/defines.h b/src/defines.h +index 5d40955..82d0627 100644 +--- a/src/defines.h ++++ b/src/defines.h +@@ -48,7 +48,7 @@ + * GNUgo default level + */ + #define DEFAULT_ENGINE "gnugo" +-#define DEFAULT_ENGINE_PATH "/usr/games/" ++#define DEFAULT_ENGINE_PATH "" + #define DEFAULT_ENGINE_OPTIONS "--mode gtp --quiet --level 10" + + +@@ -220,8 +220,8 @@ extern QString applicationPath; + #define SOUND_PATH_PREFIX "qGo.app/Contents/Resources/Sounds/" + #define TRANSLATIONS_PATH "qGo.app/Contents/Resources/Translations/" + #else +- #define SOUND_PATH_PREFIX "/usr/share/qgo/sounds/" +- #define TRANSLATIONS_PATH "/usr/share/qgo/languages" ++ #define SOUND_PATH_PREFIX "/@out@/share/qgo/sounds/" ++ #define TRANSLATIONS_PATH "/@out@/share/qgo/languages" + #endif + + #endif +diff --git a/src/src.pro b/src/src.pro +index f989ce7..b7d691f 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -165,17 +165,17 @@ SOURCES += displayboard.cpp \ + newgamedialog.cpp + + unix*:!macx-* { +- QGO_INSTALL_PATH = /usr/share/qgo +- QGO_INSTALL_BIN_PATH = /usr/bin ++ QGO_INSTALL_PATH = @out@/share/qgo ++ QGO_INSTALL_BIN_PATH = /@out@/bin + +- icon.path = /usr/share/pixmaps ++ icon.path = @out@/share/pixmaps + icon.files = resources/pics/qgo.png + icon.files += resources/pics/qgo_16x16.xpm + icon.files += resources/pics/qgo_32x32.xpm + icon.files += resources/pics/qgo_48x48.png + icon.files += resources/pics/qgo_48x48.xpm + INSTALLS += icon +- desktopfile.path = /usr/share/applications ++ desktopfile.path = @out@/share/applications + desktopfile.files = qgo.desktop + INSTALLS += desktopfile + } diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix index 861d8cf14de..2218b75a2e0 100644 --- a/pkgs/misc/lilypond/with-fonts.nix +++ b/pkgs/misc/lilypond/with-fonts.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { install -m755 -Dt $out/bin ${lilypond}/bin/* for p in $out/bin/*; do - substituteInPlace $p --replace "exec -a ${lilypond}" "exec -a $out" + substituteInPlace $p --replace "exec -a \"${lilypond}" "exec -a \"$out" done ''; } diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 2a2be06fde6..55765a520da 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { installFlags = "DESTDIR=\${out} PREFIX="; + patchPhase = "sed -i '/chmod u+s/d' Makefile"; + preBuild = optionalString (conf != null) '' cp ${writeText "config.def.h" conf} config.def.h ''; diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index 031afeeca2f..0e5e87245f3 100644 --- a/pkgs/misc/screensavers/vlock/default.nix +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation { }; prePatch = '' - sed -i -e '/INSTALL/s/-[og] [^ ]*//g' Makefile modules/Makefile + sed -i -e '/INSTALL/ { + s/-[og] [^ ]*//g; s/4711/755/ + }' Makefile modules/Makefile ''; patches = [ ./eintr.patch ]; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 028ce53275c..adaca90650d 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -7,12 +7,12 @@ let sha256 = "12k1f1iarm29j8k16mhw83xx7r3bama4lp0fchhnj7iwxrpgs4gh"; }; in stdenv.mkDerivation rec { - name = "iwd-unstable-2017-04-21"; + name = "iwd-unstable-2017-06-02"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; - rev = "f64dea81b8490e5e09888be645a4325419bb269c"; - sha256 = "0maqhx5264ykgmwaf90s2806i1kx2028if34ph2axlirxrhdd3lg"; + rev = "6c64ae34619bf7f18cba007d8b0374badbe7c17e"; + sha256 = "19rkf6lk213hdfs40ija7salars08zw6k5i5djdlpcn1j6y69i36"; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ec90620fce1..c46ee1b9331 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -593,7 +593,10 @@ with stdenv.lib; FW_LOADER_USER_HELPER_FALLBACK? n # Disable various self-test modules that have no use in a production system - ARM_KPROBES_TEST? n + ${optionalString (versionOlder version "4.9") '' + ARM_KPROBES_TEST? n + ''} + ASYNC_RAID6_TEST? n ATOMIC64_SELFTEST? n BACKTRACE_SELF_TEST? n diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix index 92525b115ee..f74b8f62120 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.11.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.11.6"; + version = "4.11.7"; extraMeta.branch = "4.11"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ccna0hrqcza3jz83gaxlcg5vijl83w5w3g87v93a5x06ky9nlr5"; + sha256 = "1v94lkc4lzb2k9c3y7j6h4zx827abcy7jqm9jlp5n15dlbmj6bsk"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 521f53e309b..38d63a22f70 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.33"; + version = "4.9.34"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0d2cai3bq1bkmisbsl6l27di765xmzn3lscwray30ldbssijpjpm"; + sha256 = "0ij55aqdhqf92a79n9xqw0p32bsksw4zxpn2zhcylhgsn78mkl8k"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index ae47a3842f7..36a01921512 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -1,9 +1,9 @@ { stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args: let - version = "4.11.6"; - revision = "c"; - sha256 = "1n1j1y5g5fcvgpqjfq14fbg4cm32k420kbazipqbi84h9zwifa69"; + version = "4.11.7"; + revision = "a"; + sha256 = "0gvg0gnhl2hi0zw705zh1a8wrwm9831jmw5llr1miq6av7hgxw7n"; in import ./generic.nix (args // { diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 2f5b50b3b58..d323c277814 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "lttng-modules-${version}"; name = "${pname}-${kernel.version}"; - version = "2.9.1"; + version = "2.9.3"; src = fetchurl { url = "http://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2"; - sha256 = "0m0d8sp7fj1qha7qz1204yzpsyfd8a8fawjbvdlmk9jc4piqy1v2"; + sha256 = "1zms8q199489ym0x1ri54napyi6pva80641x9x3qg9q23flbq4gr"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index ee9d25dfe20..facab712826 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "microcode-intel-${version}"; - version = "20161104"; + version = "20170511"; src = fetchurl { - url = "http://downloadmirror.intel.com/26400/eng/microcode-${version}.tgz"; - sha256 = "1lg3bvznvwcxf66k038c57brkcxfva8crpnzj5idmczr5yk4q5bh"; + url = "http://downloadmirror.intel.com/26798/eng/microcode-${version}.tgz"; + sha256 = "18w1ysklvkf4l9xgnl1wvhbgr3wbdaiphv56056pafs0hwnzsxrg"; }; buildInputs = [ libarchive ]; diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix index f666ac3e135..3cb9179f535 100644 --- a/pkgs/os-specific/linux/statifier/default.nix +++ b/pkgs/os-specific/linux/statifier/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, gcc_multi, glibc_multi }: -let version = "1.7.3"; in +let version = "1.7.4"; in stdenv.mkDerivation { name = "statifier-${version}"; src = fetchurl { url = "mirror://sourceforge/statifier/statifier-${version}.tar.gz"; - sha256 = "0jc67kq3clkdwvahpr2bjp2zix4j7z7z8b7bcn1b3g3sybh1cbd6"; + sha256 = "03lzkla6knjhh186b43cac410x2fmhi28pkmzb3d211n3zp5i9y8"; }; buildInputs = [ gcc_multi glibc_multi ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 57c3acbd534..f1ae382aa38 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.5.1"; + version = "2.5.2"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "1643q2pj5sjhgv19jp8r2bhvqyk6mmlajdmr6qhjcbhql30cs23c"; + sha256 = "286671a4ee35a5207b2e45fd0812962b481b1b543bf3d5df3a8c319c26e2f5e9"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 1fec8ef11b7..b0c493b6248 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "667002dc3ee0b0f755628997ef4f71be769a06fb8b9ccd935db329c8709c2af4"; + sha256 = "cc9631fe1a92628e81e74b324a7f70c0b29840d426de05d7d045fdf85ab01117"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix new file mode 100644 index 00000000000..554634d5a79 --- /dev/null +++ b/pkgs/servers/mail/mailhog/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "MailHog-${version}"; + version = "1.0.0"; + rev = "v${version}"; + + goPackagePath = "github.com/mailhog/MailHog"; + + src = fetchFromGitHub { + inherit rev; + owner = "mailhog"; + repo = "MailHog"; + sha256 = "0r6zidkffb8q12zyxd063jy0ig2x93llna4zb5i2qjh9gb971i83"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Web and API based SMTP testing"; + homepage = "https://github.com/mailhog/MailHog"; + maintainers = with maintainers; [ disassembler ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/mail/mailhog/deps.nix b/pkgs/servers/mail/mailhog/deps.nix new file mode 100644 index 00000000000..9967c3a549a --- /dev/null +++ b/pkgs/servers/mail/mailhog/deps.nix @@ -0,0 +1,191 @@ +[ + { + goPackagePath = "github.com/gorilla/pat"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/pat"; + rev = "cf955c3d1f2c27ee96f93e9738085c762ff5f49d"; + sha256 = "1jnhdhba3cwgsgv6qf7shvmk2nbbp8z30n9cimz9w6vd940ipisf"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "1ea25387ff6f684839d82767c1733ff4d4d15d0a"; + sha256 = "1nh1nzxcsgd215x4xn59wc4cbqfa8zvhvnnx5p8fkrn4bj1cgak4"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "bcd8bc72b08df0f70df986b97f95590779502d31"; + sha256 = "0majd18zn8v1b1agn015vnk3xk2v8j5nyckczlf72gm3kaq3icga"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "3ab3a8b8831546bd18fd182c20687ca853b2bb13"; + sha256 = "17y94ngp1yrswq5pxxy97naiw6jgxz2yvm8zydi83gfixdgs99fc"; + }; + } + { + goPackagePath = "github.com/ian-kent/go-log"; + fetch = { + type = "git"; + url = "https://github.com/ian-kent/go-log"; + rev = "5731446c36ab9f716106ce0731f484c50fdf1ad1"; + sha256 = "1qr0myg68r9zq43fnx0rbnxcny2jpyg3gc269pc2riskqk0a731d"; + }; + } + { + goPackagePath = "github.com/ian-kent/envconf"; + fetch = { + type = "git"; + url = "https://github.com/ian-kent/envconf"; + rev = "c19809918c02ab33dc8635d68c77649313185275"; + sha256 = "1085863rnx4h0q9xvg4zlsc7xf7jngfmjrq83cpcv1ayi664mzdx"; + }; + } + { + goPackagePath = "github.com/ian-kent/goose"; + fetch = { + type = "git"; + url = "https://github.com/ian-kent/goose"; + rev = "c3541ea826ad9e0f8a4a8c15ca831e8b0adde58c"; + sha256 = "0v98d2554vlrm8mzk2zx8wj3daq076273w0zs8ww1aa57a1l74qv"; + }; + } + { + goPackagePath = "github.com/ian-kent/linkio"; + fetch = { + type = "git"; + url = "https://github.com/ian-kent/linkio"; + rev = "77fb4b01842cb4b019137c0227df9a8f9779d0bd"; + sha256 = "0fixidplxzmw7aakw19d64nvrykwm5xk55fj1q74n70s8j5d8hiq"; + }; + } + { + goPackagePath = "github.com/mailhog/MailHog-Server"; + fetch = { + type = "git"; + url = "https://github.com/mailhog/MailHog-Server"; + rev = "50f74a1aa2991b96313144d1ac718ce4d6739dfd"; + sha256 = "1h0qs66bvgygpq0sz3w6y445vm3pvlrljr5x7xr13y0087mrpjla"; + }; + } + { + goPackagePath = "github.com/mailhog/MailHog-UI"; + fetch = { + type = "git"; + url = "https://github.com/mailhog/MailHog-UI"; + rev = "24b31a47cc5b65d23576bb9884c941d2b88381f7"; + sha256 = "0309jmryhx3n0yksssk2j4xkh1xb01468i5f2sy3a83xkz9p3d54"; + }; + } + { + goPackagePath = "github.com/mailhog/http"; + fetch = { + type = "git"; + url = "https://github.com/mailhog/http"; + rev = "2e653938bf190d0e2fbe4825ce74e5bc149a62f2"; + sha256 = "18j03lvyis7z0mv3fym3j9a7pi2qvnhggmhpxnjbwvwb86dhxjm8"; + }; + } + { + goPackagePath = "github.com/mailhog/mhsendmail"; + fetch = { + type = "git"; + url = "https://github.com/mailhog/mhsendmail"; + rev = "002527025ef50364446d7560600aedc5daaa1997"; + sha256 = "11l2y0xb7hwk0zs7pwif3xkclhz32sc0jff3jkaxi3jdf3q3kz91"; + }; + } + { + goPackagePath = "github.com/mailhog/data"; + fetch = { + type = "git"; + url = "https://github.com/mailhog/data"; + rev = "024d554958b5bea5db220bfd84922a584d878ded"; + sha256 = "0dgh0pcsn0xrxsn1qlxgdssaimch57kxj5vyvhqjnsdnh814g9vf"; + }; + } + { + goPackagePath = "github.com/mailhog/smtp"; + fetch = { + type = "git"; + url = "https://github.com/mailhog/smtp"; + rev = "0c4e9b7e0625fec61d0c30d7b2f6c62852be6c54"; + sha256 = "1w46w3asdxsgzyall16hi2s4jvkka1k3a1l52ryfhrzg187krir6"; + }; + } + { + goPackagePath = "github.com/mailhog/storage"; + fetch = { + type = "git"; + url = "https://github.com/mailhog/storage"; + rev = "6d871fb23ecd873cb10cdfc3a8dec5f50d2af8fa"; + sha256 = "1ya0xigm2xysin59zlp2sbqncnmw9h77r9dn9k7vxhf0z8vvbibk"; + }; + } + { + goPackagePath = "github.com/ogier/pflag"; + fetch = { + type = "git"; + url = "https://github.com/ogier/pflag"; + rev = "32a05c62658bd1d7c7e75cbc8195de5d585fde0f"; + sha256 = "1lyrr9wx0j087mnpsxcbspjcgh9a5c6bqwrasd8s237jlyc50qmj"; + }; + } + { + goPackagePath = "github.com/tinylib/msgp"; + fetch = { + type = "git"; + url = "https://github.com/tinylib/msgp"; + rev = "02d047e07459c5a7b02b1244161d0f2f6d8f660d"; + sha256 = "12y7qz1x266m0a0w3zwd49achxbh036yhkmx93xfs2283xh70q1r"; + }; + } + { + goPackagePath = "github.com/philhofer/fwd"; + fetch = { + type = "git"; + url = "https://github.com/philhofer/fwd"; + rev = "1612a298117663d7bc9a760ae20d383413859798"; + sha256 = "155l0nvvblpx0fy683q6bzins7csh8fw7yf64hbia8hc7wh0gjdl"; + }; + } + { + goPackagePath = "github.com/t-k/fluent-logger-golang"; + fetch = { + type = "git"; + url = "https://github.com/t-k/fluent-logger-golang"; + rev = "0f8ec08f2057a61574b6943e75045fffbeae894e"; + sha256 = "0ic5bj87wpq1kncixd5mklwqn1jjwqfqfvkyl0mrnwp3p5p24v5c"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6"; + sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "d90005c5262a3463800497ea5a89aed5fe22c886"; + sha256 = "1z81k6mnfk07hkrkw31l16qycyiwa6wzyhysmywgkh58sm5dc9m7"; + }; + } +] diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 618bc17d0a7..a1d5ce4147f 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.5.5.3634"; - vsnHash = "995f1dead"; - sha256 = "0zk2zv7r4mf582gfbv4ahxzl8pbspzkf3514qmqhhx2z4grng49h"; + version = "1.5.7.4016"; + vsnHash = "25d94bad9"; + sha256 = "0lc1shlyg7rvzfpjm9kww7rva33b3bip2bms64a4d5nb3lj4wilh"; }; in stdenv.mkDerivation rec { @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { homepage = http://plex.tv/; license = licenses.unfree; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice pjones ]; + maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice pjones lnl7 ]; description = "Media / DLNA server"; longDescription = '' Plex is a media server which allows you to store your media and play it diff --git a/pkgs/servers/sql/postgresql/plv8/default.nix b/pkgs/servers/sql/postgresql/plv8/default.nix new file mode 100644 index 00000000000..15863373562 --- /dev/null +++ b/pkgs/servers/sql/postgresql/plv8/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, v8, perl, postgresql }: + +stdenv.mkDerivation rec { + name = "plv8-${version}"; + version = "2.0.3"; + + nativeBuildInputs = [ perl ]; + buildInputs = [ v8 postgresql ]; + + src = fetchFromGitHub { + owner = "plv8"; + repo = "plv8"; + rev = "v${version}"; + sha256 = "0cn7ynckmdb08dkzjilvc55xz61d1jiya7yrnphizw404j84y3qc"; + }; + + preConfigure = '' + substituteInPlace Makefile --replace '-lv8_libplatform' '-lv8_libplatform -lv8_libbase' + ''; + + installPhase = '' + mkdir -p $out/bin + install -D plv8.so -t $out/lib + install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "PL/v8 - A Procedural Language in JavaScript powered by V8"; + homepage = https://pgxn.org/dist/plv8/; + maintainers = with maintainers; [ volth ]; + platforms = platforms.linux; + license = licenses.postgresql; + }; +} diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 798d00b0be1..b2a63e9532b 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -89,13 +89,13 @@ in stdenv.mkDerivation rec { name = "fish-${version}"; - version = "2.5.0"; + version = "2.6.0"; etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; src = fetchurl { url = "http://fishshell.com/files/${version}/${name}.tar.gz"; - sha256 = "19djav128nkhjxgfhwhc32i5y9d9c3karbh5yg67kqrdranyvh7q"; + sha256 = "1yzx73kg5ng5ivhi68756sl5hpb8869110l9fwim6gn7f7bbprby"; }; buildInputs = [ ncurses libiconv pcre2 ]; @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { # Python: Autocompletion generated from manpages and config editing propagatedBuildInputs = [ coreutils gnugrep gnused bc - python which groff gettext + python groff gettext ] ++ optional (!stdenv.isDarwin) man-db; postInstall = '' diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index c41553b562d..8c9f7433058 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -2,31 +2,21 @@ stdenv.mkDerivation rec { name = "upx-${version}"; - version = "3.93"; - src = fetchFromGitHub { - owner = "upx"; - repo = "upx"; - rev = "v${version}"; - sha256 = "03ah23q85hx3liqyyj4vm8vip2d47bijsimagqd39q762a2rin3i"; + version = "3.94"; + src = fetchurl { + url = "https://github.com/upx/upx/releases/download/v3.94/upx-3.94-src.tar.xz"; + sha256 = "08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1"; }; buildInputs = [ ucl zlib perl ]; - lzmaSrc = fetchFromGitHub { - owner = "upx"; - repo = "upx-lzma-sdk"; - rev = "v${version}"; - sha256 = "16vj1c5bl04pzma0sr4saqk80y2iklyslzmrb4rm66aifa365zqj"; - }; - preConfigure = " export UPX_UCLDIR=${ucl} - cp -a $lzmaSrc/* src/lzma-sdk - export UPX_LZMADIR=`pwd`/src/lzma-sdk cd src "; - buildPhase = "make CHECK_WHITESPACE=true"; + makeFlags = [ "CHECK_WHITESPACE=true" ]; + installPhase = "mkdir -p $out/bin ; cp upx.out $out/bin/upx"; meta = { diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index 4fb71b688c3..9e21ab5e38f 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -1,49 +1,47 @@ -{ stdenv, fetchFromGitHub, zlib, libusb1, cmake, qt5, enableGUI ? false }: +{ stdenv, fetchFromGitHub, cmake +, zlib, libusb1 +, enableGUI ? false, qtbase ? null }: -let version = "1.4.1-37-gb6fe7f8"; in - -stdenv.mkDerivation { - name = "heimdall-${version}"; +stdenv.mkDerivation rec { + name = "heimdall-${if enableGUI then "gui-" else ""}${version}"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Benjamin-Dobell"; repo = "Heimdall"; rev = "v${version}"; - sha256 = "10c71k251wxd05j6c76qlar5sd73zam1c1g2cq3cscqayd7rzafg"; + sha256 = "1ygn4snvcmi98rgldgxf5hwm7zzi1zcsihfvm6awf9s6mpcjzbqz"; }; - buildInputs = [ zlib libusb1 cmake ]; + buildInputs = [ + zlib libusb1 + ] ++ stdenv.lib.optional enableGUI qtbase; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_TYPE=Release" "-DDISABLE_FRONTEND=${if enableGUI then "OFF" else "ON"}" - ] ++ stdenv.lib.optionals enableGUI [ - "-DQt5Widgets_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Widgets" - "-DQt5Gui_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Gui" - "-DQt5Core_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Core" ]; preConfigure = '' # Give ownership of the Galaxy S USB device to the logged in user. substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"' - - # Fix version string reported by the executable. - sed -i -e 's/version = "v.*"/version = "v${version}"/' heimdall/source/Interface.cpp ''; installPhase = '' - mkdir -p $out/bin $out/share/doc/heimdall $out/lib/udev/rules.d - cp "bin/"* $out/bin/ - cp ../Linux/README $out/share/doc/heimdall - cp ../heimdall/60-heimdall.rules $out/lib/udev/rules.d + mkdir -p $out/{bin,share/doc/heimdall,lib/udev/rules.d} + install -m755 -t $out/bin bin/* + install -m644 -t $out/lib/udev/rules.d ../heimdall/60-heimdall.rules + install -m644 ../Linux/README $out/share/doc/heimdall/README.linux + install -m644 ../OSX/README.txt $out/share/doc/heimdall/README.osx ''; enableParallelBuilding = true; - meta = { - homepage = "http://www.glassechidna.com.au/products/heimdall/"; + meta = with stdenv.lib; { + homepage = http://www.glassechidna.com.au/products/heimdall/; description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 6d961c69b13..ee5c37ef6bb 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff +{ fetchurl, fetchpatch, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff , tcl-8_5, darwin }: stdenv.mkDerivation rec { @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0ssjqpa0dwwzbylc0drmlbq922qcw8crffc0rpr805xr6n4k8zgr"; }; + patches = [ + # fix regression https://github.com/oetiker/rrdtool-1.x/issues/794 + (fetchpatch { + url = "https://github.com/oetiker/rrdtool-1.x/compare/0f28f99...f1edd12.patch"; + sha256 = "10g56zy0rdjpv3kvvmf6vvaysmla05wi8byy3l0xrz2x8m02ylqq"; + }) + ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext perl libxml2 pango cairo groff ] diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index f02c4148481..a528f5f394f 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, zlib, openssl, libevent, ncurses, cmake, ruby, libmsgpack, libssh }: +{ stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig +, zlib, openssl, libevent, ncurses, ruby, libmsgpack, libssh }: stdenv.mkDerivation rec { name = "tmate-${version}"; @@ -11,17 +12,17 @@ stdenv.mkDerivation rec { sha256 = "0pfl9vrswzim9ydi1n652h3rax2zrmy6sqkp0r09yy3lw83h4y1r"; }; - buildInputs = [ autoconf automake pkgconfig libtool zlib openssl libevent ncurses cmake ruby libmsgpack libssh ]; + dontUseCmakeConfigure = true; - dontUseCmakeConfigure=true; + buildInputs = [ libtool zlib openssl libevent ncurses ruby libmsgpack libssh ]; + nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; + enableParallelBuilding = true; - preConfigure = "./autogen.sh"; - - meta = { - homepage = http://tmate.io/; + meta = with stdenv.lib; { + homepage = http://tmate.io/; description = "Instant Terminal Sharing"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 585ffe1d3b1..3ef4188052b 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { --replace /usr/bin/ping ${inetutils}/bin/ping \ --replace /usr/bin/ping6 ${inetutils}/bin/ping substituteInPlace src/devices/nm-arping-manager.c \ - --replace '("arping", NULL, NULL);' '("arping", "${inetutils}/bin/arping", NULL);' + --replace '("arping", NULL, NULL);' '("arping", "${iputils}/bin/arping", NULL);' substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe ${kmod}/bin/modprobe substituteInPlace data/84-nm-drivers.rules \ --replace /bin/sh ${stdenv.shell} diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 62d544ff408..e08a5941ba9 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { for lt in languagetool{,-commandline,-server};do cat > $out/bin/$lt <